Bump sys-cluster/openmpi-1.2.4 (Bug #166787). Change virtual/pbs to sys-cluster/torque. Add use flags nocxx romio slurm heterogeneous smp and ipv6. Disable xgrid support (OS X). Include /usr/include by default with gfortran and mpif77.

Package-Manager: portage-2.1.3.19

5 files changed, 103 insertions, 11 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index e7afbfe73387..0a02142f04d5 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.9 2007/04/26 06:12:57 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.10 2007/12/13 02:10:15 jsbronder Exp $
+
+*openmpi-1.2.4 (13 Dec 2007)
+
+  13 Dec 2007; Justin Bronder <jsbronder@gentoo.org> +openmpi-1.2.4.ebuild:
+  Bump sys-cluster/openmpi-1.2.4 (Bug #166787).  Change virtual/pbs to
+  sys-cluster/torque.  Add use flags nocxx romio slurm heterogeneous smp and
+  ipv6.  Disable xgrid support (OS X).  Include /usr/include by default with
+  gfortran and mpif77.
 
   26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
   Update for cluster herd split to hp-cluster and ha-cluster.
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index fa8187c57c23..479624c3609a 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,17 +1,22 @@
 DIST openmpi-1.1.1.tar.bz2 3213827 RMD160 664ce83191dbe1c18d1848d4b0a57c8b7a899398 SHA1 3bd9eb1fd4af5d4f89df028a6cd6861ed1839b01 SHA256 dc31aaec986c4ce436dbf31e73275ed1a9391432dcad7609de8d0d3a78d2c700
 DIST openmpi-1.1.2.tar.bz2 3222389 RMD160 823f3f828ed9dd9af48d33d1fe50596fa0eee42b SHA1 5a427c66c432c2d7c5a6f8bd458ca02a39ae3756 SHA256 3bd8d9fe40b356be7f9c3d336013d3865f8ca6a79b3c6e7ef28784f6c3a2b8e6
-EBUILD openmpi-1.1.1.ebuild 1895 RMD160 5c600f65f061fadcc50d222071486ec44a27b104 SHA1 67abefc4467bce325a4afe9b60370c082e75803f SHA256 a0f431a5a8138ae9745091215280f32506d4e18475a5bdcdb2be708830d8d9c2
-MD5 9d4ae1ab379a4f5fffc796cf06ebfd5e openmpi-1.1.1.ebuild 1895
-RMD160 5c600f65f061fadcc50d222071486ec44a27b104 openmpi-1.1.1.ebuild 1895
-SHA256 a0f431a5a8138ae9745091215280f32506d4e18475a5bdcdb2be708830d8d9c2 openmpi-1.1.1.ebuild 1895
+DIST openmpi-1.2.4.tar.bz2 3541543 RMD160 3eea820f19fcc69b4c1813331aa43171549aad25 SHA1 c3291cced086265e99705c4da77e9324eb5de018 SHA256 594a3a0af69cc7895e0d8f9add776a44bf9ed389794323d0b1b45e181a97e538
+EBUILD openmpi-1.1.1.ebuild 1895 RMD160 53aec0cddb04882faaa7b12776f28ca5c497f83a SHA1 57015677bedd3199a10ca364d271e48862a93aeb SHA256 9c6c8c7704f88528440660a0f954b24d2789214154e4769a365f2c54ed4b9d4a
+MD5 f3e7d1f329e458f2abae8e4ac9b4d40b openmpi-1.1.1.ebuild 1895
+RMD160 53aec0cddb04882faaa7b12776f28ca5c497f83a openmpi-1.1.1.ebuild 1895
+SHA256 9c6c8c7704f88528440660a0f954b24d2789214154e4769a365f2c54ed4b9d4a openmpi-1.1.1.ebuild 1895
 EBUILD openmpi-1.1.2.ebuild 1895 RMD160 3cc617c1ebc26bf6075e5324de4749a64730587b SHA1 8b31cd13f2cdd2786dee68d3e2514f0d0b8a550a SHA256 efc6d17a52e7e2e2636b2fef22d72795c0bc13ef3073814f5c2993b6419ea49b
 MD5 edd67161c0e800ba443382fdce1ed06e openmpi-1.1.2.ebuild 1895
 RMD160 3cc617c1ebc26bf6075e5324de4749a64730587b openmpi-1.1.2.ebuild 1895
 SHA256 efc6d17a52e7e2e2636b2fef22d72795c0bc13ef3073814f5c2993b6419ea49b openmpi-1.1.2.ebuild 1895
-MISC ChangeLog 2374 RMD160 7d74383bd0a2975d31db298e066b7290b96ec3a8 SHA1 1a70cad128bff1a0a28835a8658b3f228106f903 SHA256 a44482f19c36dc6b934dc150434cf4efa0f22bb6d9e1a87d91fbe78441a1102a
-MD5 1d960b0777b77c8f10d52f4636a665ae ChangeLog 2374
-RMD160 7d74383bd0a2975d31db298e066b7290b96ec3a8 ChangeLog 2374
-SHA256 a44482f19c36dc6b934dc150434cf4efa0f22bb6d9e1a87d91fbe78441a1102a ChangeLog 2374
+EBUILD openmpi-1.2.4.ebuild 1867 RMD160 38e19f1e9aea2a025cfef61990538636db069778 SHA1 322a5d88d3d5353c83088bf42fe1e52c33f0dd2d SHA256 11235f847a6237d8367e5441af489b688a379b0cff4751aca56b71c51071b60d
+MD5 08bb7b1e86244b0494f63dab84df24f5 openmpi-1.2.4.ebuild 1867
+RMD160 38e19f1e9aea2a025cfef61990538636db069778 openmpi-1.2.4.ebuild 1867
+SHA256 11235f847a6237d8367e5441af489b688a379b0cff4751aca56b71c51071b60d openmpi-1.2.4.ebuild 1867
+MISC ChangeLog 2730 RMD160 8070fef8e8f66fab96446b44af7b34fa86751d76 SHA1 f27e10d02c88f2933144a42c823488e97ad48e90 SHA256 b9dbd73062ab465d600284466545786ab8ee0ce8f65608dc41df7a911f78700a
+MD5 ff9e5005cab2ee631e072d0f7623fd2b ChangeLog 2730
+RMD160 8070fef8e8f66fab96446b44af7b34fa86751d76 ChangeLog 2730
+SHA256 b9dbd73062ab465d600284466545786ab8ee0ce8f65608dc41df7a911f78700a ChangeLog 2730
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 MD5 6be723a646638c71a36096e65e6ef8f0 metadata.xml 163
 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 metadata.xml 163
@@ -22,3 +27,6 @@ SHA256 5be0bb3d0abc8f4c244ab1cfc11f45ec692f7a15a7b6caad344156d9dd11077c files/di
 MD5 44f7d3571937a75e0a4967b867207f4b files/digest-openmpi-1.1.2 247
 RMD160 05692bbe844231718a8016aeaf9caf9cc359f682 files/digest-openmpi-1.1.2 247
 SHA256 cf22f3c1a55dbb344465ef1e85bb217b86f362cd1145230df30c8c98f268de93 files/digest-openmpi-1.1.2 247
+MD5 f6a738b2c429bf6b9e1a1f7fb4e007ab files/digest-openmpi-1.2.4 247
+RMD160 76d039d49ec8c7ab4ac1555cc483006a59f8f67e files/digest-openmpi-1.2.4 247
+SHA256 57b7cea0c0eb89c38a14e532c74fc799dac7436ee476825e1f45496cfd2e3a2c files/digest-openmpi-1.2.4 247
diff --git a/sys-cluster/openmpi/files/digest-openmpi-1.2.4 b/sys-cluster/openmpi/files/digest-openmpi-1.2.4
new file mode 100644
index 000000000000..f19425117f77
--- /dev/null
+++ b/sys-cluster/openmpi/files/digest-openmpi-1.2.4
@@ -0,0 +1,3 @@
+MD5 311b38c597f54d8d6b277225ef458666 openmpi-1.2.4.tar.bz2 3541543
+RMD160 3eea820f19fcc69b4c1813331aa43171549aad25 openmpi-1.2.4.tar.bz2 3541543
+SHA256 594a3a0af69cc7895e0d8f9add776a44bf9ed389794323d0b1b45e181a97e538 openmpi-1.2.4.tar.bz2 3541543
diff --git a/sys-cluster/openmpi/openmpi-1.1.1.ebuild b/sys-cluster/openmpi/openmpi-1.1.1.ebuild
index 7fddaf4f90aa..461f57ff8ba5 100644
--- a/sys-cluster/openmpi/openmpi-1.1.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.1.1.ebuild,v 1.7 2007/07/14 22:18:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.1.1.ebuild,v 1.8 2007/12/13 02:10:15 jsbronder Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs fortran
 
diff --git a/sys-cluster/openmpi/openmpi-1.2.4.ebuild b/sys-cluster/openmpi/openmpi-1.2.4.ebuild
new file mode 100644
index 000000000000..a0c8e49f3c5c
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.2.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 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.1 2007/12/13 02:10:15 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="~amd64 ~x86"
+IUSE="pbs fortran nocxx threads romio slurm heterogeneous smp ipv6"
+RDEPEND="pbs? ( sys-cluster/torque )
+	!sys-cluster/mpich
+	!sys-cluster/lam-mpi
+	!sys-cluster/mpich2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	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"
+
+	if use threads; then
+		myconf="${myconf}
+			--enable-mpi-threads
+			--with-progress-threads
+			--with-threads=posix"
+	fi
+
+	if [[ -n "${FORTRANC}" ]]; 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"
+		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 heterogeneous) \
+		$(use_with pbs tm /usr/$(get_libdir)/pbs) \
+		$(use_with slurm) \
+		$(use_enable ipv6) \
+	|| die "econf failed"
+
+	emake  || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README AUTHORS NEWS VERSION
+}