Openmpi-1.2.6 bump (#218204). Fix src_test(), (#216120 c6).

Package-Manager: portage-2.1.4.4

3 files changed, 109 insertions, 5 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 7d82bed31e4f..02fd72dd5e31 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.17 2008/04/18 20:35:22 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.18 2008/04/21 14:18:35 jsbronder Exp $
+
+*openmpi-1.2.6 (21 Apr 2008)
+
+  21 Apr 2008; Justin Bronder <jsbronder@gentoo.org> +openmpi-1.2.6.ebuild:
+  Openmpi-1.2.6 bump (#218204).  Fix src_test(), (#216120 c6).
 
   18 Apr 2008; Justin Bronder <jsbronder@gentoo.org> openmpi-1.2.5.ebuild:
   Added ~ppc, #216120
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 7a6c965c3244..53b94878955b 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA1
 
 DIST openmpi-1.2.5.tar.bz2 3554443 RMD160 609a2070d69bbcde883d2f0d1d6364c5903ae59f SHA1 c217798453782cb9e25d58daf845aa6fdc62fcbf SHA256 3c3aed872c17165131c77bd7a12fe8aec776cb23da946b7d12840db93ab79322
+DIST openmpi-1.2.6.tar.bz2 3556676 RMD160 abb72266e44cb5e3a2450a4936f3744edef77cf4 SHA1 b2960e2fd7432816cb70302a6b6c2f55fbd62cab SHA256 e5b27af5a153a257b1562a97bbf7164629161033934558cefd8e1e644a9f73d3
 EBUILD openmpi-1.2.5.ebuild 2404 RMD160 b1b34826f7642556f67e98ce8e82b195906074c3 SHA1 cfbb569fc286eb43433193879608c36f87b1c6b9 SHA256 c6f8211413d9cfb9914fbc81fb1be5bcf6b118297adc152fa8f63fbcb0120a08
-MISC ChangeLog 3747 RMD160 729d1b6774065047c0bf351dc02347a0c6a8a48a SHA1 12a9a817c39f5c6d2004ab4275273cf539b0b92c SHA256 1814fb91044b374f9b054eff0a99354f4a4a63613da311ff7418beacf0657016
+EBUILD openmpi-1.2.6.ebuild 2545 RMD160 45afac2266c3985bb2683c7000c47114cf748c07 SHA1 9781637d463350c29bfcf32cf431eb2a222511ba SHA256 1ee13bcc6f781e2ec79f8b3beaa02e79c2f5aa5d33a7a71bfb9532553968d79a
+MISC ChangeLog 3917 RMD160 d4f2779cbaf7975cd2b48927f288f2299578b301 SHA1 656136822940320f4a00c22cca60e68795afe133 SHA256 c102efd2c8b5412446b4454488b95cc96b27e6b28d8f9462a99251355ee3f5a4
 MISC metadata.xml 231 RMD160 37dd476ccaceaa37796cf29fd01af8fcfa2b4c61 SHA1 87cab1ccad4db7724c4292e4f32dd19accdcf2fa SHA256 b5305a12d2e3e9f9fdf645e98b0108c1bd8f5b5da32589a25bf7b0f0d74f1213
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFICQUo4MrvBE1wQ8kRAgVbAJ4tPByVO5XQyPX0/JSthCSdxEsINgCeM1AV
-Pyvu9xQdN0XbvFG4G/Dt5jU=
-=6/m1
+iD8DBQFIDKFn4MrvBE1wQ8kRApHBAJ9zvu9lmx6fkHPypG7sD5w7P4Bs+wCeOVjQ
+cUgY9P+QGk4XVta1sXP6Wpk=
+=I88V
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.2.6.ebuild b/sys-cluster/openmpi/openmpi-1.2.6.ebuild
new file mode 100644
index 000000000000..e0e2e1718acb
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.2.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.6.ebuild,v 1.1 2008/04/21 14:18:35 jsbronder Exp $
+
+inherit eutils multilib flag-o-matic toolchain-funcs fortran
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v1.2/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86 ~ppc"
+IUSE="pbs fortran nocxx threads romio heterogeneous smp ipv6"
+RDEPEND="pbs? ( sys-cluster/torque )
+	!sys-cluster/mpich
+	!sys-cluster/lam-mpi
+	!sys-cluster/mpich2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use threads; then
+		ewarn
+		ewarn "WARNING: use of threads is still disabled by default in"
+		ewarn "upstream builds."
+		ewarn "You may stop now and set USE=-threads"
+		ewarn
+		epause 5
+	fi
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+
+	if use fortran; then
+		FORTRAN="g77 gfortran ifc"
+		fortran_pkg_setup
+	fi
+}
+
+src_compile() {
+	local myconf="
+		--sysconfdir=/etc/${PN}
+		--without-xgrid
+		--enable-pretty-print-stacktrace
+		--enable-orterun-prefix-by-default
+		--without-slurm"
+
+	if use threads; then
+		myconf="${myconf}
+			--enable-mpi-threads
+			--with-progress-threads
+			--with-threads=posix"
+	fi
+
+	if use fortran; then
+		if [[ "${FORTRANC}" = "g77" ]]; then
+			myconf="${myconf} --disable-mpi-f90"
+		elif [[ "${FORTRANC}" = "gfortran" ]]; then
+			# Because that's just a pain in the butt.
+			myconf="${myconf} --with-wrapper-fflags=-I/usr/include"
+		elif [[ "${FORTRANC}" = if* ]]; then
+			# Enabled here as gfortran compile times are huge with this enabled.
+			myconf="${myconf} --with-mpi-f90-size=medium"
+		fi
+	else
+		myconf="${myconf}
+			--disable-mpi-f90
+			--disable-mpi-f77"
+	fi
+
+	econf ${myconf} \
+		$(use_enable !nocxx mpi-cxx) \
+		$(use_enable romio romio-io) \
+		$(use_enable smp smp-locks) \
+		$(use_enable heterogeneous) \
+		$(use_with pbs tm) \
+		$(use_enable ipv6) \
+	|| die "econf failed"
+
+	emake  || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README AUTHORS NEWS VERSION
+}
+
+src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	cd "${S}"
+	emake -j1 check || die "emake check failed"
+}