Bump, #349076. Re-enable tests with mpi-threads. Add prefix stuff.

4 files changed, 19 insertions, 23 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index ddb9746e8..7d40e55b5 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sys-cluster/openmpi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openmpi-1.5.1 (01 Feb 2011)
+
+  01 Feb 2011; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.4.2-r1.ebuild,
+  +openmpi-1.5.1.ebuild:
+  Bump, #349076.  Re-enable tests with mpi-threads.  Add prefix stuff.
+
   16 Dec 2010; Justin Lecher <jlec@gentoo.org> openmpi-1.4.2-r1.ebuild:
   Removal of fortran.eclass, #348851
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 4c88a3262..aede05899 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX eselect.mpi.openmpi 225 RMD160 cf81165864aaad2833f7a8300c20376210a575dd SHA1 8b50b90346b52b831a59ec0abd8e3dbebad2b94e SHA256 df4d363e9fbab74c234b75f426b7f38ef83d16da2b099222c0dde4a2c3ece687
 AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
-DIST openmpi-1.4.2.tar.bz2 6630550 RMD160 2c9fbcc8f77e7fa28e2bd062875d484548cc0b79 SHA1 3e85092433d0e399cc7a51c018f9d13562f78b80 SHA256 19129e3d51860ad0a7497ede11563908ba99c76b3a51a4d0b8801f7e2db6cd80
-EBUILD openmpi-1.4.2-r1.ebuild 2860 RMD160 25d56a7109f0320d1609c96309aef0f86fbf882a SHA1 5080559033ad1b6097afea75cd5d8fb0123aff12 SHA256 6545de817901c18e072c669072ce0a6f884344b9eb83434ba3e7fdd617ab60a9
-MISC ChangeLog 3009 RMD160 da7b8c02162b48b74157cfe4f762ac12d9d33a17 SHA1 2e9106423c9b26fe24483610730328dd8edda557 SHA256 27790c4cc8a49dbbc357f41adbff59806d6ac8c6a9a9a901ea739b872cdbb8ba
-MISC metadata.xml 706 RMD160 d497cb759e382f2b07d5233f99f391e5c6f667d3 SHA1 870215f9b18002f5dc24fa742b0e740a8d730e4f SHA256 11a597b8ce26a8293a4b7ad9f0373c0c57ad99425ede80e8136747fab504807e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0OWkoACgkQgAnW8HDreRaRBwCgx/E1zt3U6dOOcM6ssvt3DDpG
-NYUAoLHPZ8jRydAdkOpJKLx3cvww8N/4
-=ljME
------END PGP SIGNATURE-----
+DIST openmpi-1.5.1.tar.bz2 7410701 RMD160 25b5b6e68c28eb406bee148d65908f876e7bd35b SHA1 fe21acc211fe60e30dc6bef1c83a70c34e093998 SHA256 c28bb0bd367ceeec08f739d815988fca54fc4818762e6abcaa6cfedd6fd52274
+EBUILD openmpi-1.5.1.ebuild 2902 RMD160 7c35394bee13c14f160a3cac2af20d331c639acc SHA1 ad807136dcdd65f70fc181cf629040cf942fd567 SHA256 b463d19bfd97394d0fbb258633215f0ec19301072c3a65cfc891b1c970ce7e5e
+MISC ChangeLog 3215 RMD160 41b0a58469a3572dc607289f6809fef15623fef3 SHA1 0d0fbf4d782cbb39d3514e97983bfa22cdf3049c SHA256 5b9cd99b38d9f4814bee77a645100cfeebd07ff52952579d953f2c6be5202ca1
+MISC metadata.xml 656 RMD160 223aeb0c645345a35fc674e30cc9f17d936db762 SHA1 f0af00a84589ada70477d0fa12afe21c57a16071 SHA256 809b9f410e784da55e240612ca9542e718f25f65819acda4b3429b22114619e6
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 3b7de719d..f583154b3 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hp-cluster</herd>
+	<herd>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
@@ -13,6 +13,5 @@
 		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
 		<flag name='vt'>Enable bundled VampirTrace support</flag>
 		<flag name='infiniband'>Enable infiniband support</flag>
-		<flag name='dapl'>Enable dapl support</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-1.4.2-r1.ebuild b/sys-cluster/openmpi/openmpi-1.5.1.ebuild
index 8c316cb0a..25bea8d17 100644
--- a/sys-cluster/openmpi/openmpi-1.4.2-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2007/12/13 22:39:53 jsbronder Exp $
 
@@ -10,18 +10,19 @@ 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"
+SRC_URI="http://www.open-mpi.org/software/ompi/v1.5/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RESTRICT="mpi-threads? ( test )"
-IUSE="+cxx fortran heterogeneous ipv6 infiniband mpi-threads pbs romio threads vt"
+#RESTRICT="mpi-threads? ( test )"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 infiniband mpi-threads pbs romio threads vt"
 RDEPEND="pbs? ( sys-cluster/torque )
 		vt? (
 			!dev-libs/libotf
 			!app-text/lcdf-typetools
 		)
 		infiniband? ( sys-infiniband/libibverbs )
+		elibc_FreeBSD? ( dev-libs/libexecinfo )
 		$(mpi_imp_deplist)"
 DEPEND="${RDEPEND}"
 
@@ -59,10 +60,10 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--without-xgrid
 		--enable-pretty-print-stacktrace
 		--enable-orterun-prefix-by-default
-		--without-slurm)
+		--without-slurm
+		)
 
 	if use mpi-threads; then
 		myconf+=(--enable-mpi-threads