Respect LDFLAGS, #335590. Fix metadata.

(Portage version: 2.2_rc80/git/Linux x86_64, signed Manifest commit)

6 files changed, 165 insertions, 5 deletions

diff --git a/sys-cluster/mpe2/ChangeLog b/sys-cluster/mpe2/ChangeLog
new file mode 100644
index 000000000..a106039ba
--- /dev/null
+++ b/sys-cluster/mpe2/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sys-cluster/mpe2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  13 Sep 2010; Justin Bronder <jsbronder@gentoo.org>
+  +files/slog2sdk-trace_rlog-makefile-fixes.patch, mpe2-1.0.6_p1.ebuild,
+  +files/slog2sdk-trace_sample-makefile-fixes.patch, metadata.xml:
+  Respect LDFLAGS, #335590. Fix metadata.
+
diff --git a/sys-cluster/mpe2/Manifest b/sys-cluster/mpe2/Manifest
index e96a16854..f76824359 100644
--- a/sys-cluster/mpe2/Manifest
+++ b/sys-cluster/mpe2/Manifest
@@ -1,3 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX slog2sdk-trace_rlog-makefile-fixes.patch 2734 RMD160 43e2aa5c7b83fce702e27d21c87dbbfbb00c7f4f SHA1 1077071d79b20bfec3a4ba7ab0be3724d2aa5ab8 SHA256 015ac2a9bed7d84a9e101c437b54c689e79f293c318e022a1d6884ed3571545e
+AUX slog2sdk-trace_sample-makefile-fixes.patch 2746 RMD160 a64dd4d6f574297b533d6631762ab9b022a74c26 SHA1 d370094c222b983d336c40302d4075735c268461 SHA256 e611b08f6c7a2cdccee7d37075ff1f8ab4bce84458b40bc859c87f541d54fd2a
 DIST mpe2-1.0.6p1.tar.gz 9313216 RMD160 1c52f379c3fff4bac5c68505ca657584d8092f7f SHA1 bc810c7a1f3ef5b9cf2563278053afadbc2029f2 SHA256 23cfef2b8a0a27408b5bdadeb216ba3adb3b02bf40d0fa6fc0a110cefd8c5863
-EBUILD mpe2-1.0.6_p1.ebuild 3534 RMD160 5cc948ba5f2c109a16c25e5edf965139576b45c1 SHA1 1ffdb0c1cb303ac63d6f14ffe5ad65a9d449d63e SHA256 e6b7f30a7f312cb93e013bb23889121c923131b3d973136738f8c97c84d9cd5e
-MISC metadata.xml 262 RMD160 28b216487d02e3543ce0ceac0e7e3fd60cbe63bc SHA1 b700ba0837d2e5d604092b3b44960885c785c5b4 SHA256 c34f39ce5df0360b6bd1b55f67e26f35a8d482be2082951e27102ff850c58be5
+EBUILD mpe2-1.0.6_p1.ebuild 3662 RMD160 26815f722a5c325ceb85adf2e2bba8217b3335c8 SHA1 8be97102e1a2741ccb8faf393c7091cd1d3c87a1 SHA256 3158cd9e058e8bc9004045ef7514c4b61eea98ac62e670328186792078fbb917
+MISC ChangeLog 353 RMD160 e81974b33423bad92db6a1b95c97b34cc746a36d SHA1 bbace030b2b6e75993fed9479cdce4f724106280 SHA256 77ade5771076853879d398d45d582c6261796055ba0f4ce131d83e8d101eb8de
+MISC metadata.xml 259 RMD160 3288242cfd053d6b014e4d69d02f37eac4e8ca75 SHA1 15229a4dacc8a1d795b2e19612c45b61d64ad280 SHA256 51ab93c579e7aa6293a3478a36318bca710b3a79d6008a77643495fa2af1526b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyObpAACgkQ4MrvBE1wQ8lBDgCffkY1i1/qtiR72KEYa7UrUq62
+F4YAmQEgoSHVf/OtCGZ+uVpuhda0DYgj
+=O1pZ
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch
new file mode 100644
index 000000000..4f2119ec6
--- /dev/null
+++ b/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch
@@ -0,0 +1,68 @@
+From 5bc91497bd4b3d2e4e962ffb2d5b9b471c4183c2 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Mon, 13 Sep 2010 14:18:51 -0400
+Subject: [PATCH 1/2] slog2sdk/trace_rlog makefile fixes
+
+- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK.
+- Do not install libraries during the compile phase.
+---
+ src/slog2sdk/trace_rlog/src/Makefile.in |   19 ++++++++-----------
+ 1 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/src/slog2sdk/trace_rlog/src/Makefile.in b/src/slog2sdk/trace_rlog/src/Makefile.in
+index 9b289b8..2d772e0 100644
+--- a/src/slog2sdk/trace_rlog/src/Makefile.in
++++ b/src/slog2sdk/trace_rlog/src/Makefile.in
+@@ -48,7 +48,8 @@ RM               = @RM@
+ 
+ JNI_INC          = @JNI_INC@
+ CFLAGS           = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@
+-LDFLAGS          = -module -no-undefined -avoid-version @LDFLAGS@
++LDFLAGS          = @LDFLAGS@
++LIBLDFLAGS       = -module -no-undefined -avoid-version @LDFLAGS@
+ 
+ # memory leak checker
+ MEMLIBS          = @DEBUG_LIBS@
+@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$
+ 
+ $(libbuild_dir)/$(LIB_TRACE): $(LOBJ)
+ 	if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \
+-	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
++	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
+ 	               -export-symbols $(srcdir)/JavaTraceInput.sym \
+ 	               -rpath $(libbuild_dir) ; \
+ 	else \
+-	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
++	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
+ 	               -rpath $(libbuild_dir) ; \
+ 	fi
+-	$(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir)
+-	$(LIBTOOL) --finish $(libbuild_dir)
+ 
+ INSTALL_LIBSO: $(LOBJ)
+ 	if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \
+-	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
++	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
+ 	               -export-symbols $(srcdir)/JavaTraceInput.sym \
+ 	               -rpath $(LIBDIR) ; \
+ 	else \
+-	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
++	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
+ 	               -rpath $(LIBDIR) ; \
+ 	fi
+-	$(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR)
+-	$(LIBTOOL) --finish $(LIBDIR)
+ 
+ $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T)
+-	$(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS)
++	$(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS)
+ 
+ $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E)
+-	$(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS)
++	$(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS)
+ 
+ clean:
+ 	@-$(RM) *.@OBJEXT@ *.lo *.la
+-- 
+1.7.1
+
diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch
new file mode 100644
index 000000000..717911ffb
--- /dev/null
+++ b/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch
@@ -0,0 +1,68 @@
+From b23d8d40cf62d03cad7ce777565069368e040a96 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Mon, 13 Sep 2010 14:22:10 -0400
+Subject: [PATCH 2/2] slog2sdk/trace_sample makefile fixes
+
+- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK.
+- Do not install libraries during the compile phase.
+---
+ src/slog2sdk/trace_sample/src/Makefile.in |   19 ++++++++-----------
+ 1 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/src/slog2sdk/trace_sample/src/Makefile.in b/src/slog2sdk/trace_sample/src/Makefile.in
+index f716fff..8d3641a 100644
+--- a/src/slog2sdk/trace_sample/src/Makefile.in
++++ b/src/slog2sdk/trace_sample/src/Makefile.in
+@@ -48,7 +48,8 @@ RM               = @RM@
+ 
+ JNI_INC          = @JNI_INC@
+ CFLAGS           = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@
+-LDFLAGS          = -module -no-undefined -avoid-version @LDFLAGS@
++LDFLAGS          = @LDFLAGS@
++LIBLDFLAGS       = -module -no-undefined -avoid-version @LDFLAGS@
+ 
+ # memory leak checker
+ MEMLIBS          = @DEBUG_LIBS@
+@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$
+ 
+ $(libbuild_dir)/$(LIB_TRACE): $(LOBJ)
+ 	if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \
+-	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
++	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
+ 	               -export-symbols $(srcdir)/JavaTraceInput.sym \
+ 	               -rpath $(libbuild_dir) ; \
+ 	else \
+-	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
++	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
+ 	               -rpath $(libbuild_dir) ; \
+ 	fi
+-	$(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir)
+-	$(LIBTOOL) --finish $(libbuild_dir)
+ 
+ INSTALL_LIBSO: $(LOBJ)
+ 	if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \
+-	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
++	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
+ 	               -export-symbols $(srcdir)/JavaTraceInput.sym \
+ 	               -rpath $(LIBDIR) ; \
+ 	else \
+-	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
++	    $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
+ 	               -rpath $(LIBDIR) ; \
+ 	fi
+-	$(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR)
+-	$(LIBTOOL) --finish $(LIBDIR)
+ 
+ $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T)
+-	$(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS)
++	$(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS)
+ 
+ $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E)
+-	$(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS)
++	$(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS)
+ 
+ clean:
+ 	@-$(RM) *.@OBJEXT@ *.lo *.la
+-- 
+1.7.1
+
diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml
index a9bd7f630..eea896bed 100644
--- a/sys-cluster/mpe2/metadata.xml
+++ b/sys-cluster/mpe2/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hp-cluster</herd>
+	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 		<name>Justin Bronder</name>
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
index cda046424..347724f38 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -28,7 +28,6 @@ RDEPEND="!minimal? ( >=virtual/jre-1.4 )
 S="${WORKDIR}"/${MY_P}
 MPE_IMP=""
 
-
 # README:
 # This ebuild is created to handle building with both mpich2 and openmpi.
 # However, without empi (in the science overlay), and some further
@@ -74,6 +73,9 @@ src_unpack() {
 
 	# Don't assume path contains ./
 	sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in
+
+	epatch "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch
+	epatch "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch
 }
 
 src_compile() {