Patch to fix when using libtool-2.2+, #228183. Also remove sweep to avoid file conflict with media-libs/sweep, #245439 c2.

4 files changed, 43 insertions, 3 deletions

diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index bfb0d5544..9efe43187 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-cluster/lam-mpi
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.65 2008/01/31 07:07:18 dberkholz Exp $
 
+  25 Jan 2009; Justin Bronder <jsbronder@gentoo.org>
+  +sys-cluster/lam-mpi/files/lam-mpi-7.1.4-libtool.patch:
+  Patch to fix when using libtool-2.2+, #228183. Also remove sweep to avoid
+  file conflict with media-libs/sweep, #245439 c2.
+
   29 Apr 2008; Justin Bronder <jsbronder@gentoo.org> ChangeLog:
   Call eautoreconf in every required directory by hand as AC_CONFIG_SUBDIRS
   isn't used and autotools.eclass can't find everything. 
diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest
index 588afc522..ae2608ff0 100644
--- a/sys-cluster/lam-mpi/Manifest
+++ b/sys-cluster/lam-mpi/Manifest
@@ -2,7 +2,8 @@ AUX 7.1.2-lam_prog_f77.m4.patch 529 RMD160 1693107a9e2fa7fbef0e6b59f082ab8082a61
 AUX 7.1.2-liblam-use-extra-libs.patch 490 RMD160 f52c0c3490a5d7dd9fa3993032c64c5fd7ef4295 SHA1 dad163d483a8a35cf4cb3a5cb7c572e7f21fabf8 SHA256 580a84ef0364d9ea9bf204024906d18b7b00338e48cfafdc04f2d82d9c4b6870
 AUX 7.1.4-as-needed.patch 3702 RMD160 ba3dd579d482d67ec47721a764ebe5cf9c12de6f SHA1 635660a50dcd4bb176fd62a234895383e37ebcb4 SHA256 8e2792244742180ca5f9e829c16597ad9a85e955f8fd512a81515c304ed4e2cf
 AUX eselect.mpi.lam-mpi 197 RMD160 bde4d1483f8069eeca30d9f8a3f9007feabc2436 SHA1 911dc7fd2421d4ed8ae4cb63fd53be9d1973b92e SHA256 5d6e53a8ea31317cb327e17c21f852271d8b324fe59925c88ebc561b2b6e7de8
+AUX lam-mpi-7.1.4-libtool.patch 757 RMD160 9cf13e2e3b2a11a1e2027c88b6f75302ca0d3651 SHA1 0a4404ce2648d99a6b3a007722881d0995734a07 SHA256 edbff0e9524b0549339aa645cceaf89f5d7fe696e34670d84eb27873ee516fac
 DIST lam-7.1.4.tar.bz2 7865813 RMD160 6c9c6338391472d4cd2572c409cb92360e7fd799 SHA1 ce8a983004f31d5960d34efe3ed9ac489e9dfc9d SHA256 d66c205f57d9ffc38dbfb81faef8b586ef2b9e08853034c0472ef4ae45803d2e
-EBUILD lam-mpi-7.1.4-r1.ebuild 3762 RMD160 f6ab319a94fa7ba60dae8f62856a862aa73ec264 SHA1 d1227c61f9d1375b61c07f21257212e4e214a951 SHA256 139c7b12f31359ca405f23f70a354214b5d0937a49878fe7d6d2d9d2c31e1554
+EBUILD lam-mpi-7.1.4-r1.ebuild 4112 RMD160 61860a5a4cc1722109e9bce282bf4895a16b7e8e SHA1 dd49ad1fce60709216289206bd5e59fcafd2bbe9 SHA256 747f903318301354d49a01d66da72fd60eb2d3719ae2c1b182b4dbc2dd9640a6
 MISC ChangeLog 11394 RMD160 4757bf338b07da5a7faf8021290860c9ab2d0099 SHA1 8eb431c97a7e651b2d24a8608074b741b5f97202 SHA256 5570dcc2d15b23edf7767a8196b603a994df749dbbaef882a6cd8cfb83156012
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
diff --git a/sys-cluster/lam-mpi/files/lam-mpi-7.1.4-libtool.patch b/sys-cluster/lam-mpi/files/lam-mpi-7.1.4-libtool.patch
new file mode 100644
index 000000000..661c70f58
--- /dev/null
+++ b/sys-cluster/lam-mpi/files/lam-mpi-7.1.4-libtool.patch
@@ -0,0 +1,25 @@
+--- configure.in.orig   2008-08-05
++++ configure.in    2008-08-05
+@@ -2188,7 +2188,9 @@
+ # 1.5) because it has support for a lot more things than older
+ # versions of libtool (which are generally installed by default).
+ 
+-AC_LIBLTDL_CONVENIENCE(share/libltdl)
++LT_INIT
++LT_CONFIG_LTDL_DIR(share/libltdl)
++AC_WITH_LTDL
+ AC_SUBST(LTDLINCL)
+ AC_SUBST(LIBLTDL)
+ AC_LIBTOOL_DLOPEN
+--- config/lam_get_libtool_linker_flags.m4 2009-01-25 18:36:24.711775913 +0000
++++ config/lam_get_libtool_linker_flags.m4  2009-01-25 18:44:34.313772215 +0000
+@@ -94,6 +94,8 @@
+     -L${libdir}) ;;
+     -L${prefix}/lib) ;;
+     -L${exec_prefix}/lib) ;;
++    libtool:) ;;
++    link:) ;;
+     -l*)
+    extra_libs="$extra_libs [$]1"
+         LAM_LOG_MSG([added to EXTRA_LIBS: [$]1])
+
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
index 61a3169d8..cfdf15232 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
@@ -37,6 +37,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch
 	epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch
 	epatch "${FILESDIR}"/7.1.4-as-needed.patch
+	epatch "${FILESDIR}"/${PN}-7.1.4-libtool.patch
 
 	# gcc-4.3.0 fix.  char *argv[] -> char **argv.
 	# replaces a few more than necessary, but should be harmless.
@@ -110,6 +111,7 @@ src_compile() {
 }
 
 src_install () {
+	local d=${D}$(mpi_root)
 	emake DESTDIR="${D}" install || die
 
 	# There are a bunch more tex docs we could make and install too,
@@ -117,12 +119,19 @@ src_install () {
 	mpi_dodoc README HISTORY VERSION
 	mpi_dodoc "${S}"/doc/{user,install}.pdf
 
+	# With USE=xmpi /usr/bin/sweep is installed.  However it's just
+	# a bash script to call bfctl -R and it causes file collisions
+	# with media-sound/sweep.  Hence, we remove it, see man bfcfl.
+	if ! mpi_classed && [ -f "${d}"/usr/bin/sweep ]; then
+		rm -f "${d}"/usr/bin/sweep || die
+	fi
+
 	if use examples; then
 		cd "${S}"/examples
 		mpi_dodir /usr/share/${P}/examples
 		find -name README -or -iregex '.*\.[chf][c]?$' >"${T}"/testlist
 		while read p; do
-			treecopy $p "${D}"/$(mpi_root)/usr/share/${P}/examples ;
+			treecopy $p "${d}"/usr/share/${P}/examples ;
 		done < "${T}"/testlist
 	fi