Bump EAPI. Add the vt use flag for VampirTrace. Add blocker against dev-libs/libotf when vt is enabled #265710.

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

4 files changed, 123 insertions, 6 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index d4f00c81513c..f61d770ed1ff 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.50 2009/07/05 14:41:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.51 2009/08/13 01:41:11 jsbronder Exp $
+
+*openmpi-1.3.3 (13 Aug 2009)
+
+  13 Aug 2009; Justin Bronder <jsbronder@gentoo.org> +openmpi-1.3.3.ebuild:
+  Bump EAPI. Add the vt use flag for VampirTrace. Add blocker against
+  dev-libs/libotf when vt is enabled #265710.
 
   05 Jul 2009; Markus Meier <maekke@gentoo.org> openmpi-1.2.9.ebuild:
   amd64 stable, bug #266555
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index fc85abdf2e18..0af2fb9eb696 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 DIST openmpi-1.2.6.tar.bz2 3556676 RMD160 abb72266e44cb5e3a2450a4936f3744edef77cf4 SHA1 b2960e2fd7432816cb70302a6b6c2f55fbd62cab SHA256 e5b27af5a153a257b1562a97bbf7164629161033934558cefd8e1e644a9f73d3
 DIST openmpi-1.2.9.tar.bz2 3562494 RMD160 072d9a646345e6438e7b4559e06a210fbc06cae6 SHA1 b383e47799b2c615daa32029b98bb2ca6fe09be2 SHA256 0eb36abe09ba7bf6f7a70255974e5d0a273f7f32d0e23419862c6dcc986f1dff
 DIST openmpi-1.3.2.tar.bz2 6500228 RMD160 36407d0c954def912ef4518334cdfbc2d884ba0f SHA1 0600736aa434daa1a55ae58eaa56850c9a0d173f SHA256 c93ed90962d879a2923bed17171ed9217036ee1279ffab0925ea7eead26105d8
+DIST openmpi-1.3.3.tar.bz2 6695647 RMD160 209972fdbf52787ea0482d9b89fad2c1f59e6e87 SHA1 f668feb22ff0a4c4d9b438e4e69a97b08aa73234 SHA256 e1425853282da9237f5b41330207e54da1dc803a2e19a93dacc3eca1d083e422
 EBUILD openmpi-1.2.6-r1.ebuild 2532 RMD160 0d0e7f85c7764797d8bded07e2d1fb91a8a6858b SHA1 c74630f95029072d564762d65bfffb8b6043e67d SHA256 301f428d8e5de3a07dc43c186e83b1ff0c03e2a0988f53f84494617f8e4cc24b
 EBUILD openmpi-1.2.9.ebuild 2823 RMD160 1b05caedb585b52458228863800e0241f39974eb SHA1 733fcb75b95420ffee67198e9c4f1b98d869bfed SHA256 88858dbb7733f3b62a5d2a3888372518ec6dd5a5d691df4f85b01b7841841835
 EBUILD openmpi-1.3.2.ebuild 2977 RMD160 aad1c2972933380903c7a4d6c73a1ca27cb97e04 SHA1 aaf852405ee06ef0780ef64d8d30f94c2d9e4512 SHA256 c13ad89b5218d1bec717b72cba72278dde2b25b910d91ae95f06e7a870d3b6ca
-MISC ChangeLog 8197 RMD160 0f9fd0cbe603681b9b00ba68098d7bc05cabc040 SHA1 229e60428f4cbea1de89d1310f6c15650603dc1e SHA256 e5233e535810690edde3ece386cd09f21ed4309ed52a128b774d6cd1f418a166
-MISC metadata.xml 540 RMD160 a5b5c04dd211c373c43c715206de09ae13de4b4e SHA1 fb854d405b9851b16a3dff692972e98025171df8 SHA256 e49a74498fcf55e4182ece91514ab02ac2b2ce2570e05bb6ce409a19ba9a1a71
+EBUILD openmpi-1.3.3.ebuild 2894 RMD160 17b606e8b5cf92870940384577626f4ef83f061a SHA1 3594463bb2520fe7a99c06c28ed905d41ef123d6 SHA256 e09f9370b7218aafead4b278cf16aafe202d1d732a565bc16760d7a47a8023e8
+MISC ChangeLog 8423 RMD160 3980c7bd8ba0d8c6da7d73d635df70671368d919 SHA1 fdf4e48e73c7b470ec4401749d4d6b6445b2b466 SHA256 f5d70cd2b6aeeb5ab03a2bf72d76f3368423003db74505109c456fbddc2f7ace
+MISC metadata.xml 600 RMD160 b60367dc458961c4d9ba4b4b548e31298e5aa6bf SHA1 11cdf219d236e2b6ce89b026f2ca8e0829de6758 SHA256 63dc7d01a07d5f1d2c9541075a52e62f12b36d7cf2d6510e38cb2bc5d539b055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpQu6cACgkQkKaRLQcq0GI+uQCfY7fch7YOZqpsayPEYM1czbxw
-ox0An2uG1RLRvYtuAKzC2PGZpoXNtloN
-=wJfh
+iEYEARECAAYFAkqDb0EACgkQ4MrvBE1wQ8mpBgCeMQTaSxp6eAkuq3o56teEJVCU
+mTAAnA4N2sfBVdKljO87wKmVL6qpskwP
+=KD3v
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 55fde8d86d3f..55ecc51ff6d4 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -11,5 +11,6 @@
 		<flag name='pbs'>Add support for the Portable Batch System (PBS)</flag>
 		<flag name='romio'>Build the ROMIO MPI-IO component</flag>
 		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
+		<flag name='vt'>Enable bundled VampirTrace support</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-1.3.3.ebuild b/sys-cluster/openmpi/openmpi-1.3.3.ebuild
new file mode 100644
index 000000000000..f5e309d28174
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.3.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.3.3.ebuild,v 1.1 2009/08/13 01:41:11 jsbronder Exp $
+
+EAPI=2
+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.3/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+RESTRICT="mpi-threads? ( test )"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+cxx fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
+RDEPEND="pbs? ( sys-cluster/torque )
+	vt? ( !dev-libs/libotf )
+	!sys-cluster/mpich
+	!sys-cluster/lam-mpi
+	!sys-cluster/mpich2
+	!sys-cluster/mpiexec"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use mpi-threads; then
+		ewarn
+		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
+
+	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_prepare() {
+	# 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_configure() {
+	local myconf="
+		--sysconfdir=/etc/${PN}
+		--without-xgrid
+		--enable-pretty-print-stacktrace
+		--enable-orterun-prefix-by-default
+		--without-slurm"
+
+	if use mpi-threads; then
+		myconf="${myconf}
+			--enable-mpi-threads
+			--enable-progress-threads"
+	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
+
+	! use vt && myconf="${myconf} --enable-contrib-no-build=vt"
+
+	econf ${myconf} \
+		$(use_enable cxx mpi-cxx) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_with pbs tm) \
+		$(use_enable ipv6) \
+	|| die "econf 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"
+}