[gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/, eclass/

[gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/, eclass/

[Justin Bronder]

commit:     8de3d2e7b5bca71a3d0fd216520c45f76d7146d0
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 14:17:55 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 14:22:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8de3d2e7

mpi.eclass:  Improve handling of unclassed dep strings

Instead of requiring a list of packages to block when calculating the
dep list for an unclassed ebuild, simply inject a dep string.  This
will allow the use of USE-conditional blockers.

---
 eclass/mpi.eclass                            |   21 +++++++++------------
 sys-cluster/mpich2/ChangeLog                 |    5 ++++-
 sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild |    4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/eclass/mpi.eclass b/eclass/mpi.eclass
index e992e9a..361b0e7 100644
--- a/eclass/mpi.eclass
+++ b/eclass/mpi.eclass
@@ -31,8 +31,9 @@ __MPI_ALL_CLASSABLE_PNS="openmpi mpich2 lam-mpi"
 # Generic Functions that are used by Implementations and Packages #
 ###################################################################
 
-# @ECLASS-VARIABLE: MPI_UNCLASSED_BLOCKERS
-# @DESCRIPTION: Packages that are blockers when not using a classed install.
+# @ECLASS-VARIABLE: MPI_UNCLASSED_DEP_STR
+# @DESCRIPTION: String inserted into the deplist when not using a classed
+# install.
 
 # @FUNCTION: mpi_classed
 # @USAGE:
@@ -196,20 +197,18 @@ mpi_dosym()     { _mpi_do "dosym"        $*; }
 # @FUNCTION: mpi_imp_deplist
 # @USAGE:
 # @RETURNS: Returns a deplist that handles the blocking between mpi
-# implementations, and any blockers as specified in MPI_UNCLASSED_BLOCKERS
+# implementations, and any blockers as specified in MPI_UNCLASSED_DEP_STR
 mpi_imp_deplist() {
 	local c="sys-cluster"
 	local pn ver
-	
+
 	mpi_classed && c="${CATEGORY}"
 	ver=""
 	for pn in ${__MPI_ALL_IMPLEMENTATION_PNS}; do
 		ver="${ver} !${c}/${pn}"
 	done
-	if ! mpi_classed; then
-		for pn in ${MPI_UNCLASSED_BLOCKERS}; do
-			ver="${ver} !${MPI_UNCLASSED_BLOCKERS}"
-		done
+	if ! mpi_classed && [ -n "${MPI_UNCLASSED_DEP_STR}" ]; then
+		ver="${ver} ${MPI_UNCLASSED_DEP_STR}"
 	else
 		ver="${ver} sys-cluster/empi"
 	fi
@@ -288,10 +287,8 @@ mpi_pkg_deplist() {
 		ver="${ver}[${usedeps:1}]"
 	fi
 
-	if ! mpi_classed && [ -n "${MPI_UNCLASSED_BLOCKERS}" ]; then
-		for pn in ${MPI_UNCLASSED_BLOCKERS}; do
-			ver="${ver} !${pn}"
-		done
+	if ! mpi_classed && [ -n "${MPI_UNCLASSED_DEP_STR}" ]; then
+		ver="${ver} ${MPI_UNCLASSED_DEP_STR}"
 	fi
 
 	for pn in ${__MPI_ALL_IMPLEMENTATION_PNS}; do

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 11c31eb..9bbe99a 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Mar 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.2.1_p1-r2.ebuild:
+  Use MPI_UNCLASSED_DEP_STR over MPI_UNCLASSED_BLOCKERS
+
   16 Dec 2010; Justin Lecher <jlec@gentoo.org> mpich2-1.2.1_p1-r2.ebuild,
   mpich2-1.3.ebuild:
   Removal of fortran.eclass, #348851

diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
index 94ba4c0..ae50b11 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.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: $
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran threads romio mpi-threads"
 
-MPI_UNCLASSED_BLOCKERS="media-sound/mpd"
+MPI_UNCLASSED_DEP_STR="!media-sound/mpd"
 
 COMMON_DEPEND="dev-libs/libaio
 	romio? ( net-fs/nfs-utils )