Version Bump, EAPI bump, drop patch included upstream

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

3 files changed, 128 insertions, 2 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 27efba823e63..3ad6adcd8f1f 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.67 2010/06/25 19:02:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.68 2010/06/30 18:36:56 jsbronder Exp $
+
+*openmpi-1.4.2 (30 Jun 2010)
+
+  30 Jun 2010; Justin Bronder <jsbronder@gentoo.org> +openmpi-1.4.2.ebuild:
+  Version Bump, EAPI bump, drop patch included upstream
 
   25 Jun 2010; Raúl Porcel <armin76@gentoo.org> openmpi-1.4.1.ebuild:
   Add ~ia64 wrt #324417
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index d9a67813a22e..5d1d82113c22 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
 DIST openmpi-1.4.1.tar.bz2 6571835 RMD160 c6fd5f0871eb5f963fe58270f5340a2629f5fd68 SHA1 c5107c03a9fc738dfb4f309b470d052becfdde19 SHA256 d4d71d7c670d710d2d283ea60af50d6c315318a4c35ec576bedfd0f3b7b8c218
+DIST openmpi-1.4.2.tar.bz2 6630550 RMD160 2c9fbcc8f77e7fa28e2bd062875d484548cc0b79 SHA1 3e85092433d0e399cc7a51c018f9d13562f78b80 SHA256 19129e3d51860ad0a7497ede11563908ba99c76b3a51a4d0b8801f7e2db6cd80
 EBUILD openmpi-1.4.1.ebuild 2929 RMD160 df0697cb9713b9ba61c86867eaa7ef2f1a98f944 SHA1 635a5c95dab558717a74ac08ec727b51d23f526a SHA256 00b663db7adde6fb9ed609fa69e439751895273fc0976e0c35ca2f150aa7cde1
-MISC ChangeLog 10389 RMD160 6590fac2104569beea46b06dc4444758cb922d15 SHA1 04b15ec96cc619d5a1363576b87e995574fe5313 SHA256 e5743844c987e662dd1ac2c04471b8ad3d86e167b6e0ea7d25c75edb60408436
+EBUILD openmpi-1.4.2.ebuild 2845 RMD160 d85799efa2d582c65f959ec93183cf9db5701dec SHA1 ed1c31299214db0aeff89ed7e6cab516270809cb SHA256 53879abd963a3c12e4b860dbe0aae5fcf9ca4167587c08b0833e9bb3dcc29785
+MISC ChangeLog 10554 RMD160 58c55a7ba160a773d15bba4a58709dc53ab189d1 SHA1 ecf032d49b8a865d91e842a34d476eba08125b8d SHA256 57c74076b5e11f9129689a96361e5836661f4714458a6f24cb452b3cabc0d747
 MISC metadata.xml 600 RMD160 b60367dc458961c4d9ba4b4b548e31298e5aa6bf SHA1 11cdf219d236e2b6ce89b026f2ca8e0829de6758 SHA256 63dc7d01a07d5f1d2c9541075a52e62f12b36d7cf2d6510e38cb2bc5d539b055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkwrjs0ACgkQ4MrvBE1wQ8mhMgCbBNpcehEIDNf5FC9zH4/3sUJw
+0+sAnRzA7Kcj9mtHh1PLFrenG8lsqyV6
+=aZzV
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.4.2.ebuild b/sys-cluster/openmpi/openmpi-1.4.2.ebuild
new file mode 100644
index 000000000000..83db49d9e0a7
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.4.2.ebuild
@@ -0,0 +1,109 @@
+# 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.2.ebuild,v 1.1 2010/06/30 18:36:56 jsbronder Exp $
+
+EAPI=3
+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 ~ia64 ~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"
+
+	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"
+}