Bump sys-cluster/openmpi-1.4.1 and workaround bad wrapper include path

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

3 files changed, 125 insertions, 5 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 6977c1291e41..a8794e597cf9 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.57 2010/01/06 22:40:44 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.58 2010/01/20 02:24:37 jsbronder Exp $
+
+*openmpi-1.4.1 (20 Jan 2010)
+
+  20 Jan 2010; Justin Bronder <jsbronder@gentoo.org> +openmpi-1.4.1.ebuild:
+  Bump sys-cluster/openmpi-1.4.1 and workaround bad wrapper include path
 
   06 Jan 2010; Justin Bronder <jsbronder@gentoo.org>
   -openmpi-1.2.6-r1.ebuild:
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 522ead32cfc7..83b073867f1b 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -3,17 +3,19 @@ Hash: SHA1
 
 DIST openmpi-1.2.9.tar.bz2 3562494 RMD160 072d9a646345e6438e7b4559e06a210fbc06cae6 SHA1 b383e47799b2c615daa32029b98bb2ca6fe09be2 SHA256 0eb36abe09ba7bf6f7a70255974e5d0a273f7f32d0e23419862c6dcc986f1dff
 DIST openmpi-1.3.3.tar.bz2 6695647 RMD160 209972fdbf52787ea0482d9b89fad2c1f59e6e87 SHA1 f668feb22ff0a4c4d9b438e4e69a97b08aa73234 SHA256 e1425853282da9237f5b41330207e54da1dc803a2e19a93dacc3eca1d083e422
+DIST openmpi-1.4.1.tar.bz2 6571835 RMD160 c6fd5f0871eb5f963fe58270f5340a2629f5fd68 SHA1 c5107c03a9fc738dfb4f309b470d052becfdde19 SHA256 d4d71d7c670d710d2d283ea60af50d6c315318a4c35ec576bedfd0f3b7b8c218
 DIST openmpi-1.4.tar.bz2 6699638 RMD160 61f7665c69ea019d347b983062a1eee0ae807c9b SHA1 8e98ceae223f52f147d5151779ed1a43f2865a7f SHA256 fa55edef1bd8af256e459d4d9782516c6998b9d4698eda097d5df33ae499858e
 EBUILD openmpi-1.2.9-r1.ebuild 2873 RMD160 55f7cbbdf1195ff0e38c1650cbad012ad94a7cb4 SHA1 8be8cb53e0117e13534fd1fb2047ead7a24de000 SHA256 2415fdbe95179b446171eda0f663cb98eed90768777c67c27760939608a63c44
 EBUILD openmpi-1.2.9.ebuild 2823 RMD160 1b05caedb585b52458228863800e0241f39974eb SHA1 733fcb75b95420ffee67198e9c4f1b98d869bfed SHA256 88858dbb7733f3b62a5d2a3888372518ec6dd5a5d691df4f85b01b7841841835
 EBUILD openmpi-1.3.3.ebuild 2774 RMD160 b2c7c589b8ab4ad4f179e3f3409b2f354ef22a02 SHA1 a5beaf4e619f44b0e960235021c855708271a6a8 SHA256 e1c14c6cf809803104f984b8d1b18d4d4a56c4d72ea08d49455995ff6515280b
+EBUILD openmpi-1.4.1.ebuild 3031 RMD160 7830809a520d60eddddad3b45ff1761eb700a733 SHA1 181f870a28f0dec065ae1cde8b440b9183c2009c SHA256 5b45b7462e35180c5cb1fba001a43e27fc1ae80cedb63448391ffa1035fc2f13
 EBUILD openmpi-1.4.ebuild 2836 RMD160 17c2e96ad15053e22e60b91fed67cd8f07bb37bb SHA1 1d45b5a9fa173677aae8153ec4717695dfbb7f8f SHA256 5367352a5d2a87caffa1100997236d43e5fad392198c8741af423a407cc16cc7
-MISC ChangeLog 9194 RMD160 92da41ebc11017efb8ebe86f3559deabdb101521 SHA1 e089124da3481bdd0f75472e46df71fe71bb246e SHA256 348165a8bb6f080191f5d62559a12884bf00266666097f3ebe6e059cbf5bfa78
+MISC ChangeLog 9374 RMD160 03201471a0b114a78c3dad86f33c1764f3ab0d67 SHA1 ff8fc4b2a04a6947e95ec4259da2f050143bfd64 SHA256 f1872c7bdb72a2198928449f11578f1ec7906899b0ad1e9bda7b6767f6cd1605
 MISC metadata.xml 600 RMD160 b60367dc458961c4d9ba4b4b548e31298e5aa6bf SHA1 11cdf219d236e2b6ce89b026f2ca8e0829de6758 SHA256 63dc7d01a07d5f1d2c9541075a52e62f12b36d7cf2d6510e38cb2bc5d539b055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAktFEXEACgkQ4MrvBE1wQ8kVAQCfTqwT7ZyCQpi2Rsl35+QbocRd
-glQAoIZRBc5DWRbqmVLPdF74rTxo9hTH
-=W9JY
+iEYEARECAAYFAktWaW8ACgkQ4MrvBE1wQ8l4xACeOPWCGHK4jLi70FI8tAeveivX
+Mw8An2ei1LemfUg0SWwFSuklhdwakmQa
+=9Vz/
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.4.1.ebuild b/sys-cluster/openmpi/openmpi-1.4.1.ebuild
new file mode 100644
index 000000000000..b1aa9b39fc71
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.4.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.1.ebuild,v 1.1 2010/01/20 02:24:37 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.4/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+RESTRICT="mpi-threads? ( test )"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
+RDEPEND="pbs? ( sys-cluster/torque )
+	vt? (
+		!dev-libs/libotf
+		!app-text/lcdf-typetools
+	)
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	!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"
+
+	# Workaround for #288147 which also caused packages like hdf5 to fail.
+	# http://www.open-mpi.org/community/lists/users/2009/12/11419.php
+	c="${c} --includedir=$(mpi_root)usr/include/${PN}"
+
+	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}" = 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"
+}