cleanup

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 35 insertions, 28 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index e7d66e5e3c69..fd2b9cc9dd13 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.97 2012/02/03 20:44:18 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.98 2012/02/03 21:55:52 jsbronder Exp $
+
+*openmpi-1.5.4-r3 (03 Feb 2012)
+
+  03 Feb 2012; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.5.4-r2.ebuild,
+  +openmpi-1.5.4-r3.ebuild:
+  cleanup
 
 *openmpi-1.4.4 (03 Feb 2012)
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 4e2d03af1bef..86e8474e714d 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -10,13 +10,13 @@ DIST openmpi-1.5.4.tar.bz2 7629620 RMD160 6e172309b102cf6382b4b516d07e0133466485
 EBUILD openmpi-1.4.2.ebuild 2755 RMD160 5be40f5b45218df0650df27b24d33a5ec1e60164 SHA1 a58f360b08cec0343d27e9d7de239f8dcb3a5f8d SHA256 b9c496e2acf4b01687ed4224b440f81536245295a18779396cbceebe3334d7ca
 EBUILD openmpi-1.4.3.ebuild 2744 RMD160 02938b75b03428624d1164872db274dd75ede792 SHA1 15d0a7c5a28570eb70d430e9e54fc53e83b749cd SHA256 78434f6a7137ed809324c9428ec3e74a9f0ad7c3fea81d3a9ae4800f38e6aae2
 EBUILD openmpi-1.4.4.ebuild 2737 RMD160 c63e98d77ab23859f1f5af12c3fec0100aa2f205 SHA1 d90d89fa04917aac3a266734468e87514f5169c4 SHA256 341cec42f196b62edbee8168e7f165c6a4bddbc020cebecf2207e02401b919f3
-EBUILD openmpi-1.5.4-r2.ebuild 3584 RMD160 270c0d92777842db7ec79d466117cbc7a4de3fb5 SHA1 8993d7079ddef7ec6b8ce6d28a7efab5815b1b94 SHA256 e56e54e4f42a3fdc801867885336909248aedee7020b3339c719cea6ee092687
-MISC ChangeLog 14639 RMD160 07ed21a34bae5d7eb4c6555cfd5f526a91842f05 SHA1 cc7c9c89054f86367ff88d16236c824562fccce3 SHA256 38b75027d183aacef15d1d1d1fae3da31a9ea3bd219bd4a9cdf613b833346d4e
+EBUILD openmpi-1.5.4-r3.ebuild 3767 RMD160 188a35607f001a8b6d362e63add25851268be7d5 SHA1 07bef61a6b69cdad9ff0f4f01d8aa557df018927 SHA256 2e390c670cd327160a4b048c3e6d44e8234deb85ed0a3dc13d4b59d69e6cbb16
+MISC ChangeLog 14790 RMD160 f1aa871aa721fd7eb6c43ab659c79ced9dc69efc SHA1 8520a9df685be6abf0a5e09bc07ebf570d04c714 SHA256 22c3419aff1dc0beefc32d18d8e66fcc1a007d28535ae20fcb12cc9b3abe303f
 MISC metadata.xml 975 RMD160 f018d88bafb6fff084b8fca9587e7c530c08f738 SHA1 9843ccb5ca4ab77ef4d469b0435bc6d34d684121 SHA256 6013730050494223daac882d90da64f6f72ed76ac850a53cabd95e7d57dda8ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8sRycACgkQ4MrvBE1wQ8mXhQCfb0V6CwH1lU4emcJhBa5Gfxda
-b9QAniyLh/0jWrFjLjjEDZ+F6ebBb2Ri
-=7R5u
+iEYEARECAAYFAk8sV+4ACgkQ4MrvBE1wQ8lhFQCgpcWAYiINtM/CRlBvROuuUU4S
++JsAnjwwy8VkRAASecKXrBIMMP+wqXA/
+=Rqv9
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild b/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild
index 624de8b2b87f..3c0df1af4dc3 100644
--- a/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild,v 1.1 2012/01/20 13:15:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild,v 1.1 2012/02/03 21:55:52 jsbronder Exp $
 
 EAPI=4
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
@@ -10,34 +10,31 @@ 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.5/downloads/${MY_P}.tar.bz2"
+SRC_URI="http://www.open-mpi.org/software/ompi/v${P%.*}/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 knem mpi-threads
-	+numa pbs open-mx psm romio sctp slurm threads vt"
+	+numa open-mx pbs psm romio sctp slurm threads vt"
 
-REQUIRED_USE="^^ (
-					( !slurm !pbs )
-					( slurm !pbs )
-					( !slurm pbs )
-				)
-			psm? ( infiniband )"
+REQUIRED_USE="slurm? ( !pbs )
+	pbs? ( !slurm )
+	psm? ( infiniband )"
 
 RDEPEND="
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
 	fortran? ( virtual/fortran )
-	pbs? ( sys-cluster/torque )
 	infiniband? ( sys-infiniband/openib )
+	knem? ( sys-cluster/knem )
+	numa? ( sys-process/numactl )
+	open-mx? ( sys-cluster/open-mx )
+	pbs? ( sys-cluster/torque )
+	psm? ( sys-infiniband/infinipath-psm )
 	sctp? ( net-misc/lksctp-tools )
 	vt? (
 		!dev-libs/libotf
 		!app-text/lcdf-typetools
 	)
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	knem? ( sys-cluster/knem )
-	numa? ( sys-process/numactl )
-	open-mx? ( sys-cluster/open-mx )
-	psm? ( sys-infiniband/infinipath-psm )
 	>=sys-apps/hwloc-1.3
 	!sys-cluster/mpich
 	!sys-cluster/lam-mpi
@@ -82,8 +79,7 @@ src_configure() {
 		)
 
 	if use mpi-threads; then
-		myconf+=(
-			--enable-mpi-thread-multiple
+		myconf+=(--enable-mpi-thread-multiple
 			--enable-opal-multi-threads
 			)
 	fi
@@ -93,10 +89,10 @@ src_configure() {
 			myconf+=(--disable-mpi-f90)
 		elif [[ $(tc-getFC) =~ if ]]; then
 			# Enabled here as gfortran compile times are huge with this enabled.
-			myconf+=( --with-mpi-f90-size=medium )
+			myconf+=(--with-mpi-f90-size=medium)
 		fi
 	else
-		myconf+=( --disable-mpi-f90 --disable-mpi-f77 )
+		myconf+=(--disable-mpi-f90 --disable-mpi-f77)
 	fi
 
 	! use vt && myconf+=(--enable-contrib-no-build=vt)
@@ -111,10 +107,15 @@ src_configure() {
 		$(use_enable cxx mpi-cxx) \
 		$(use_enable romio io-romio) \
 		$(use_enable heterogeneous) \
-		$(use_with pbs tm) \
-		$(use_with slurm) \
 		$(use_enable ipv6) \
-		$(use_with sctp sctp)
+		$(use_with infiniband openib "${EPREFIX}"/usr) \
+		$(use_with knem knem "${EPREFIX}"/usr) \
+		$(use_with numa libnuma "${EPREFIX}"/usr) \
+		$(use_with open-mx mx "${EPREFIX}"/usr) \
+		$(use_with pbs tm) \
+		$(use_with psm psm "${EPREFIX}"/usr) \
+		$(use_with sctp sctp) \
+		$(use_with slurm)
 }
 
 src_install () {