Version bump. Remove slurm USE flag as slurm isn't in the tree. Let configure find libtorque via pbs-config.

Package-Manager: portage-2.1.3.19

4 files changed, 114 insertions, 6 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 6bb79bd76713..c51f4b166400 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2007/12/13 22:39:53 jsbronder Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.12 2008/01/17 01:52:43 jsbronder Exp $
+
+*openmpi-1.2.5 (17 Jan 2008)
+
+  17 Jan 2008; Justin Bronder <jsbronder@gentoo.org> +openmpi-1.2.5.ebuild:
+  Version bump.  Remove slurm USE flag as slurm isn't in the tree.  Let
+  configure find libtorque via pbs-config.
 
   13 Dec 2007; Justin Bronder <jsbronder@gentoo.org> openmpi-1.2.4.ebuild:
   Minor fixes to sys-cluster/openmpi-1.2.4, thanks to dberkholz for pointing
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index b356f7376add..ab3d1c61b4cc 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,6 +1,7 @@
 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
 DIST openmpi-1.2.4.tar.bz2 3541543 RMD160 3eea820f19fcc69b4c1813331aa43171549aad25 SHA1 c3291cced086265e99705c4da77e9324eb5de018 SHA256 594a3a0af69cc7895e0d8f9add776a44bf9ed389794323d0b1b45e181a97e538
+DIST openmpi-1.2.5.tar.bz2 3554443 RMD160 609a2070d69bbcde883d2f0d1d6364c5903ae59f SHA1 c217798453782cb9e25d58daf845aa6fdc62fcbf SHA256 3c3aed872c17165131c77bd7a12fe8aec776cb23da946b7d12840db93ab79322
 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
@@ -17,10 +18,14 @@ EBUILD openmpi-1.2.4.ebuild 2411 RMD160 342475c1994aa29464181f02157319a7c6d9063c
 MD5 5a27486f64569179b9f77377eb4aa443 openmpi-1.2.4.ebuild 2411
 RMD160 342475c1994aa29464181f02157319a7c6d9063c openmpi-1.2.4.ebuild 2411
 SHA256 caa2a264818bc6a609acf9ad0e8aabd2f606d1a70cb5e5e6b55fdf9376f9505e openmpi-1.2.4.ebuild 2411
-MISC ChangeLog 2895 RMD160 590b8d0046a0393a3f8a8d8de7c0635bcf66e0c6 SHA1 44f0638aaeb6abe973b4fb280e5043d4aa8a0ae6 SHA256 b1adf10f324ba88a670106bb53a5da85f31a976fb9107f50230943ff557aad68
-MD5 e2773e3e127b097d3f60cd8c81e407a8 ChangeLog 2895
-RMD160 590b8d0046a0393a3f8a8d8de7c0635bcf66e0c6 ChangeLog 2895
-SHA256 b1adf10f324ba88a670106bb53a5da85f31a976fb9107f50230943ff557aad68 ChangeLog 2895
+EBUILD openmpi-1.2.5.ebuild 2378 RMD160 4e6869657bdc986643789d77fb9759e817f22c75 SHA1 ebe9b5f73b6eb0fa66f2f4372afc2312b460c069 SHA256 d0fca783c10b31acb7d7d41054aa20082e53eb0a78426539851d268c1891e9c1
+MD5 610d208a90acfe442444becd32173a27 openmpi-1.2.5.ebuild 2378
+RMD160 4e6869657bdc986643789d77fb9759e817f22c75 openmpi-1.2.5.ebuild 2378
+SHA256 d0fca783c10b31acb7d7d41054aa20082e53eb0a78426539851d268c1891e9c1 openmpi-1.2.5.ebuild 2378
+MISC ChangeLog 3117 RMD160 ded455541e4385516c163cdb954ebffb1bae7fb9 SHA1 15ed5492f95724274eb1d282be0bcb8ef8cdbd24 SHA256 37dba7d222a01d035c545034b6a1d8fdd5e5be74b9f9fe2014febb28f73001ad
+MD5 5a9d0598590838555fb965731f58f888 ChangeLog 3117
+RMD160 ded455541e4385516c163cdb954ebffb1bae7fb9 ChangeLog 3117
+SHA256 37dba7d222a01d035c545034b6a1d8fdd5e5be74b9f9fe2014febb28f73001ad ChangeLog 3117
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 MD5 6be723a646638c71a36096e65e6ef8f0 metadata.xml 163
 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 metadata.xml 163
@@ -37,3 +42,6 @@ SHA256 57b7cea0c0eb89c38a14e532c74fc799dac7436ee476825e1f45496cfd2e3a2c files/di
 MD5 f6a738b2c429bf6b9e1a1f7fb4e007ab files/digest-openmpi-1.2.4-r1 247
 RMD160 76d039d49ec8c7ab4ac1555cc483006a59f8f67e files/digest-openmpi-1.2.4-r1 247
 SHA256 57b7cea0c0eb89c38a14e532c74fc799dac7436ee476825e1f45496cfd2e3a2c files/digest-openmpi-1.2.4-r1 247
+MD5 efa1d58d8362cb830b402a712d3449ff files/digest-openmpi-1.2.5 247
+RMD160 d11e56a1f83c45ed6d4a5e1e286dd373fafa7dca files/digest-openmpi-1.2.5 247
+SHA256 82369507a591b441719a0c2f9707404c5bf74c9b191a343da2d3372273a6949e files/digest-openmpi-1.2.5 247
diff --git a/sys-cluster/openmpi/files/digest-openmpi-1.2.5 b/sys-cluster/openmpi/files/digest-openmpi-1.2.5
new file mode 100644
index 000000000000..48e9849525fa
--- /dev/null
+++ b/sys-cluster/openmpi/files/digest-openmpi-1.2.5
@@ -0,0 +1,3 @@
+MD5 c6e82aab6cdcd425bf29217e8317d7dc openmpi-1.2.5.tar.bz2 3554443
+RMD160 609a2070d69bbcde883d2f0d1d6364c5903ae59f openmpi-1.2.5.tar.bz2 3554443
+SHA256 3c3aed872c17165131c77bd7a12fe8aec776cb23da946b7d12840db93ab79322 openmpi-1.2.5.tar.bz2 3554443
diff --git a/sys-cluster/openmpi/openmpi-1.2.5.ebuild b/sys-cluster/openmpi/openmpi-1.2.5.ebuild
new file mode 100644
index 000000000000..378270af1b4d
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.2.5.ebuild
@@ -0,0 +1,91 @@
+# 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.5.ebuild,v 1.1 2008/01/17 01:52:43 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 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
+}