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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 189 insertions, 3 deletions

diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index 1acd5f061ff6..b81961eea520 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/lam-mpi
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.69 2008/11/18 14:35:25 jer Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.70 2009/01/25 21:01:30 jsbronder Exp $
+
+*lam-mpi-7.1.4-r1 (25 Jan 2009)
+
+  25 Jan 2009; Justin Bronder <jsbronder@gentoo.org>
+  +files/lam-mpi-7.1.4-libtool.patch, +lam-mpi-7.1.4-r1.ebuild:
+  Patch to fix when using libtool-2.2+, #228183. Also remove sweep to avoid
+  file conflict with media-libs/sweep, #245439 c2.
 
   18 Nov 2008; Jeroen Roovers <jer@gentoo.org> lam-mpi-7.1.4.ebuild:
   Stable for HPPA (bug #245439).
diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest
index 331646a954a4..beef66c7ce22 100644
--- a/sys-cluster/lam-mpi/Manifest
+++ b/sys-cluster/lam-mpi/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 7.1.2-lam_prog_f77.m4.patch 529 RMD160 1693107a9e2fa7fbef0e6b59f082ab8082a61522 SHA1 263b63c1ca7a32621338e54bcf98cee8e4345eb6 SHA256 5164b1f5d6abffc93f1ec113ca1711e34938246d9d3f43318375ecc90201bf9b
 AUX 7.1.2-liblam-use-extra-libs.patch 490 RMD160 f52c0c3490a5d7dd9fa3993032c64c5fd7ef4295 SHA1 dad163d483a8a35cf4cb3a5cb7c572e7f21fabf8 SHA256 580a84ef0364d9ea9bf204024906d18b7b00338e48cfafdc04f2d82d9c4b6870
 AUX 7.1.4-as-needed.patch 3713 RMD160 eec6deda8b43b6033d4b8487cfbe43b05f2924c6 SHA1 da07f00b60aa20ceb9d3629cc6e5ee1fed9c135d SHA256 3eb3e1a6ca0f657c0676cd16ee883e27c65093cd19a48ba675f41c8f8ecf03d8
+AUX lam-mpi-7.1.4-libtool.patch 757 RMD160 9cf13e2e3b2a11a1e2027c88b6f75302ca0d3651 SHA1 0a4404ce2648d99a6b3a007722881d0995734a07 SHA256 edbff0e9524b0549339aa645cceaf89f5d7fe696e34670d84eb27873ee516fac
 DIST lam-7.0.4.tar.bz2 5695492 RMD160 ae75911857fd92cac68d0ffe4fcae8936a049131 SHA1 74258e0eca6d82e4a7898d577166dbe7c37afc11 SHA256 c420553fa033327b7e091115ba55befa141d2b580537e6511021c806a1d188bc
 DIST lam-7.1.2.tar.bz2 7851483 RMD160 4aeb62d41dc0b6f910424feb1046c6925bd620c4 SHA1 fa0c3278f9420b218fa7a4ef9b052ec6d93baa0c SHA256 b3826e79f1a674ed275d2a0e32895aefe63d4278126bd5fa01dbe43cc1c1960b
 DIST lam-7.1.4.tar.bz2 7865813 RMD160 6c9c6338391472d4cd2572c409cb92360e7fd799 SHA1 ce8a983004f31d5960d34efe3ed9ac489e9dfc9d SHA256 d66c205f57d9ffc38dbfb81faef8b586ef2b9e08853034c0472ef4ae45803d2e
 EBUILD lam-mpi-7.0.4.ebuild 1482 RMD160 df6743f26ad6df6f15bf27d010539470d73685c7 SHA1 8d429fd88c782acc3176f69d8aa80ba9cd55d849 SHA256 7b5fdc8cdba559a3586599bb7b03884e1cfddd35868ca14a30e74b42bc5bd7ce
 EBUILD lam-mpi-7.1.2.ebuild 2633 RMD160 e8bc046655650384f71714f5459dcae141cf5e16 SHA1 71ebfe8171b09d1e751b058120a06c4a5cb9191e SHA256 978bf9ff2fefa41d0d6a8a4c9ec9846399a1578028c349df993d9fb27bb6e7c6
+EBUILD lam-mpi-7.1.4-r1.ebuild 4422 RMD160 50ed749b4923de6635be3792c8f495d714ecd042 SHA1 294f8ee19f22e3725847c150ae7abb840a76dbd9 SHA256 166ef9f43861cf593119a83b1d46a6910353016361ca493f468ff9483a562d14
 EBUILD lam-mpi-7.1.4.ebuild 3989 RMD160 334f39ea183e242c6b2f12d9248ba492c686e4bf SHA1 68b6ae5e072cc5a00ee2ebb25b04a5ea8bf6c83c SHA256 80344730af0d7046afdca0223de04fcdae19ee7422a4370ced9f06b4db6ba69b
-MISC ChangeLog 11610 RMD160 c3af4ca207ea880afe36a34cf4d2ac257fc7f15a SHA1 95f8800a9ec393b10f90e0a071151ad99ecd3acc SHA256 b06100afdfb641780ac3258a933b1236ee5b31127faeb34927239da8ebce48f1
+MISC ChangeLog 11894 RMD160 73066e32aac34ad862a4ab4be49f8b82676bd0a2 SHA1 5c9ec178927af3c36158fd29c5058d7fef224b33 SHA256 aefa3d0b47ac6e6ce4fc14f90bfd4bc4b6cfc3032e94ec994b68b2f2c0dae3b1
 MISC metadata.xml 506 RMD160 b07d8e3f5f1b8a9b4c9ab9106e0219382256ef59 SHA1 7f2fa66c0847b74f32827241201d30a0d9050759 SHA256 98f3e810fe814223972ecdf54cbb519ce2d687cc5bbac4ef739d44d0efe451b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkl80zYACgkQ4MrvBE1wQ8l2mQCgi4ImeDRMjpuk9t9plZm8yzVm
+ow8AnRA7HnC5uLklxaV1kpmrDRfGPfXc
+=3wZk
+-----END PGP SIGNATURE-----
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 000000000000..661c70f588e4
--- /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
new file mode 100644
index 000000000000..fcacafab0e3a
--- /dev/null
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.1 2009/01/25 21:01:30 jsbronder Exp $
+
+inherit autotools eutils fortran flag-o-matic multilib portability
+
+IUSE="crypt pbs fortran xmpi romio examples"
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="the LAM MPI parallel computing environment"
+SRC_URI="http://www.lam-mpi.org/download/files/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.lam-mpi.org"
+DEPEND="pbs? ( sys-cluster/torque )
+	!sys-cluster/mpich
+	!sys-cluster/openmpi
+	!sys-cluster/mpich2"
+
+RDEPEND="${DEPEND}
+	crypt? ( net-misc/openssh )
+	!crypt? ( net-misc/netkit-rsh )"
+
+SLOT="6"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="lam-mpi"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"/romio/util/
+	sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in
+
+	for i in "${S}"/share/memory/{ptmalloc,ptmalloc2,darwin7}/Makefile.in; do
+	  sed -i -e 's@^\(docdir = \)\$(datadir)/lam/doc@\1'/usr/share/doc/${PF}'@' ${i}
+	done
+
+	cd "${S}"
+	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.
+	# TODO:  Already applied upstream, will be in 7.1.5
+	for f in config/*.m4; do
+		sed -i 's:^\(int main(int argc, char\)[^{]*\([{]\?\):\1** argv) \2:g' $f
+	done
+
+	# eautoreconf doesn't work correctly as lam-mpi uses their own
+	# LAM_CONFIG_SUBDIR instead of AC_CONFIG_SUBDIRS.  Even better, they use
+	# variables inside of the definitions, so --trace doesn't work.
+	for f in $(find ./ -name 'configure.ac'); do
+		pushd $(dirname $f) &>/dev/null
+		eautoreconf
+		popd &>/dev/null
+	done
+	eautoreconf
+}
+
+pkg_setup() {
+	einfo
+	elog "LAM/MPI is now in a maintenance mode. Bug fixes and critical patches"
+	elog "are still being applied, but little real new work is happening in"
+	elog "LAM/MPI. This is a direct result of the LAM/MPI Team spending the"
+	elog "vast majority of their time working on our next-generation MPI"
+	elog "implementation, http://www.openmpi.org"
+	elog "  ---From the lam-mpi hompage.  Please consider upgrading."
+	einfo
+	# fortran_pkg_setup should -not- be run here.
+}
+
+src_compile() {
+	local myconf
+
+	if use crypt; then
+		myconf="${myconf} --with-rsh=ssh"
+	else
+		myconf="${myconf} --with-rsh=rsh"
+	fi
+
+	if ! use pbs; then
+		# See: http://www.lam-mpi.org/MailArchives/lam/2006/05/12445.php
+		rm -rf "${S}"/share/ssi/boot/tm
+	elif has_version "<=sys-cluster/torque-2.1.6"; then
+		# Newer versions dropped the conflicting names and can
+		# be installed to nice directories.
+		append-ldflags -L/usr/$(get_libdir)/pbs/lib
+	fi
+
+	# Following the above post to the mailing list, we'll get
+	# rid of bproc, globus and slurm as well, none of which are
+	# in the current tree.
+	rm -rf "${S}"/share/ssi/boot/{bproc,globus,slurm}
+
+	if use fortran; then
+		fortran_pkg_setup
+		# this is NOT in pkg_setup as it is NOT needed for RDEPEND right away it
+		# can be installed after merging from binary, and still have things fine
+		myconf="${myconf} --with-fc=${FORTRANC}"
+	else
+		myconf="${myconf} --without-fc"
+	fi
+
+	econf \
+		--with-ltdl-include=/usr/include \
+		--with-ltdl-lib=/usr/$(get_libdir) \
+		--disable-ltdl-install \
+		$(use_with xmpi trillium) \
+		--sysconfdir=/etc/lam-mpi \
+		--enable-shared \
+		--with-threads=posix \
+		$(use_with romio) \
+		${myconf} || die "econf failed."
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# 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 [ -f "${D}"/usr/bin/sweep ]; then
+		rm -f "${D}"/usr/bin/sweep || die
+	fi
+
+	# There are a bunch more tex docs we could make and install too,
+	# but they are replicated in the pdfs!
+	dodoc README HISTORY VERSION
+	dodoc "${S}"/doc/{user,install}.pdf
+
+	if use examples; then
+		cd "${S}"/examples
+		dodir /usr/share/${P}/examples
+		find -name README -or -iregex '.*\.[chf][c]?$' >"${T}"/testlist
+		while read p; do
+			treecopy $p "${D}"/usr/share/${P}/examples ;
+		done < "${T}"/testlist
+	fi
+}