Bring in latest openmpi-1.2.7 with empi support. Remove old 1.2.5, cleanup repoman warnings.

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1294 32389bae-6d03-0410-99cf-db05cde120eb

4 files changed, 44 insertions, 21 deletions

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 01e375797..9f53a9249 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,7 +1,7 @@
 AUX eselect.mpi.openmpi 231 RMD160 a3f09385b6f2c4872398758f8195c156e07b3921 SHA1 660be0ad7d06a386173c714942bca32b01908aa9 SHA256 363bd1efd2bf2593ee34145cc9e6f0c9705c204368c380d07088ba0d041b446d
-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-r1.ebuild 2566 RMD160 de3dfa4f26b56dbe986f2dabe3bfb86599c6bddc SHA1 ed0788ea913c90ee1066c6f49c87bb3aeb874baa SHA256 3f3e00767829686095a6dbd5c190b2eec34b0a644cf6405658021edc890c04c5
-EBUILD openmpi-1.2.6-r2.ebuild 2679 RMD160 c02f4c875b0bd105f8887406accb52ffe51f7ff1 SHA1 807f50d6cb8b1fb31ec8a114c57e08995ba93dd7 SHA256 ec7039a4aa321a6333590e88b7d68c7d6914a24c30df962c8b961710f9f0374c
+DIST openmpi-1.2.7.tar.bz2 3555597 RMD160 6707fba2f2de240c25f6135cd37bb42eb78c6590 SHA1 fd377ff52c5b6f61c293b0daa9d681046e673e22 SHA256 d66c7f0bb11494023451651d0e61afaef9d2199ed9a91ed08f0dedeb51541c36
+EBUILD openmpi-1.2.6-r2.ebuild 2674 RMD160 6a84e61ac4291e62bc1fb5db4c6e24e218150507 SHA1 95e06d19adfaa871b09b54c80787302da5fd24b8 SHA256 169d84d00b4468a5e063b4a9cc601ed60af5c53c596e20676927a41a30fc371f
+EBUILD openmpi-1.2.7-r2.ebuild 2952 RMD160 90a10f049aa7e4fe93d78ccf9823313e2c4cf76a SHA1 150e74cabe57285afa9c453d3ae8fb44d278f5ae SHA256 36f2979ebfa3d0aeebdcf7feb79fcbc415a8dcade47d9f8881874abfb6bcb6d5
 MISC ChangeLog 3407 RMD160 22e4c4a7a1d5438ec4990c8a452ddbed01068c29 SHA1 47f21280d9b5dc2c0419f0a670ecc9e7eaf412a0 SHA256 46c753e31a0119ef4e69798347d7a0178f36b6912405c8be4bfdfa7344f4e63c
-MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
+MISC metadata.xml 714 RMD160 3a1b1cfafed8b2a9f674bbf03613a176a3c33894 SHA1 99ad99472912c4dd79eb9b1efd2439ff57f0becc SHA256 5139ae14e69e5edca9117ec6f4bb4f5c7654f41ef5050d5d777d47f0b1d05236
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 8f0aa7fc4..54a1b2b42 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>hp-cluster</herd>
+    <herd>hp-cluster</herd>
+    <maintainer>
+        <email>jsbronder@gentoo.org</email>
+    </maintainer>
+    <use>
+        <flag name='heterogeneous'>Enable features required for heterogeneous
+        platform support</flag>
+        <flag name='pbs'>Add support for the Portable Batch System (PBS)</flag>
+        <flag name='romio'>Build the ROMIO MPI-IO component</flag>
+        <flag name='smp'>Enable smp locks in atomic ops.  Recommended for
+        SMP/multi-threaded environments.</flag>
+        <flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
+    </use>
 </pkgmetadata>
+
diff --git a/sys-cluster/openmpi/openmpi-1.2.6-r2.ebuild b/sys-cluster/openmpi/openmpi-1.2.6-r2.ebuild
index b18c9cbbd..8730be405 100644
--- a/sys-cluster/openmpi/openmpi-1.2.6-r2.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4.ebuild,v 1.2 2007/12/13 22:39:53 jsbronder Exp $
 
@@ -43,7 +43,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	# Fix --as-needed problems with f77 and f90.
@@ -89,7 +89,6 @@ src_compile() {
 		$(use_with pbs tm)
 		$(use_enable ipv6)"
 	mpi_src_compile
-		
 }
 
 src_install () {
diff --git a/sys-cluster/openmpi/openmpi-1.2.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.2.7-r2.ebuild
index 201e51479..cdf4d9697 100644
--- a/sys-cluster/openmpi/openmpi-1.2.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4.ebuild,v 1.2 2007/12/13 22:39:53 jsbronder Exp $
 
@@ -13,7 +13,8 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v1.2/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pbs fortran nocxx threads romio heterogeneous smp ipv6"
+RESTRICT="mpi-threads? ( test )"
+IUSE="fortran heterogeneous ipv6 mpi-threads nocxx pbs romio threads"
 RDEPEND="pbs? ( sys-cluster/torque )
 	$(mpi_imp_deplist)"
 DEPEND="${RDEPEND}"
@@ -21,11 +22,11 @@ DEPEND="${RDEPEND}"
 pkg_setup() {
 	MPI_ESELECT_FILE="eselect.mpi.openmpi"
 	mpi_pkg_setup
-	if use threads; then
+	if use mpi-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 "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
+		ewarn "default and officially unsupported by upstream."
+		ewarn "You may stop now and set USE=-mpi-threads"
 		ewarn
 		epause 5
 	fi
@@ -43,12 +44,19 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	# Fix --as-needed problems with f77 and f90.
 	sed -i 's:^libs=:libs=-Wl,--no-as-needed :' \
 		ompi/tools/wrappers/mpif{77,90}-wrapper-data.txt.in
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	if use threads; then
+		echo 'oob_tcp_listen_mode = listen_thread' \
+			>> opal/etc/openmpi-mca-params.conf
+	fi
 }
 
 src_compile() {
@@ -58,11 +66,10 @@ src_compile() {
 		--enable-orterun-prefix-by-default
 		--without-slurm"
 
-	if use threads; then
+	if use mpi-threads; then
 		mpi_conf_args="${mpi_conf_args}
 			--enable-mpi-threads
-			--with-progress-threads
-			--with-threads=posix"
+			--with-progress-threads"
 	fi
 
 	if use fortran; then
@@ -84,13 +91,11 @@ src_compile() {
 	mpi_conf_args="
 		${mpi_conf_args}
 		$(use_enable !nocxx mpi-cxx)
-		$(use_enable romio romio-io)
-		$(use_enable smp smp-locks)
+		$(use_enable romio io-romio)
 		$(use_enable heterogeneous)
 		$(use_with pbs tm)
 		$(use_enable ipv6)"
 	mpi_src_compile
-		
 }
 
 src_install () {
@@ -98,3 +103,9 @@ src_install () {
 	mpi_dodoc README AUTHORS NEWS VERSION
 }
 
+src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	cd "${S}"
+	mpi_do_make -j1 check || die "emake check failed"
+}
+