fixed string quoting issue in bug 201182

Package-Manager: portage-2.1.4_rc7

3 files changed, 25 insertions, 19 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 40abf0365d5d..02ae9db5de64 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.22 2007/12/03 06:03:02 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.23 2007/12/12 05:20:45 nerdboy Exp $
+
+  12 Dec 2007; Steve Arnold <nerdboy@gentoo.org> mpich2-1.0.6.ebuild:
+  fixed string quoting issue in bug 201182, although I can't reproduce
+  bug #201977 at the moment...
 
 *mpich2-1.0.6 (03 Dec 2007)
 
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 028233f49cf9..eaff01ba8b99 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -57,14 +57,14 @@ EBUILD mpich2-1.0.5_p4.ebuild 6140 RMD160 6201f8e82c836dae1625eabedb9dded7df225d
 MD5 f5493661b52b16c7f5494db0d216253e mpich2-1.0.5_p4.ebuild 6140
 RMD160 6201f8e82c836dae1625eabedb9dded7df225dbd mpich2-1.0.5_p4.ebuild 6140
 SHA256 f8ad7e2459842c1784c74d593d2ba59e9843b710c80ba3ca71005be1130e0f30 mpich2-1.0.5_p4.ebuild 6140
-EBUILD mpich2-1.0.6.ebuild 10287 RMD160 9fe9291828051c7f7b3df86f3ff593059fe7dfce SHA1 b9cee386cff4e507fa8a473a5adb81e92acd9d27 SHA256 d5454eee5b2c42aae4e9c858f3a9f6d952114397c2f95cfa28d6c89c99e70754
-MD5 d49d24adf2c9a41b80c044dc9a2a7e85 mpich2-1.0.6.ebuild 10287
-RMD160 9fe9291828051c7f7b3df86f3ff593059fe7dfce mpich2-1.0.6.ebuild 10287
-SHA256 d5454eee5b2c42aae4e9c858f3a9f6d952114397c2f95cfa28d6c89c99e70754 mpich2-1.0.6.ebuild 10287
-MISC ChangeLog 5334 RMD160 7a820b0836a5de58e76b4caee1045d249def8b0f SHA1 a476b329f133249721f5ea0f57c632f4bbd3395d SHA256 ae8ebb43a3757dc34e2641992553a31dd2dcd081783bb034c5a7659398cdd470
-MD5 d61624b7ba1a7d73e7a0d9a151f35286 ChangeLog 5334
-RMD160 7a820b0836a5de58e76b4caee1045d249def8b0f ChangeLog 5334
-SHA256 ae8ebb43a3757dc34e2641992553a31dd2dcd081783bb034c5a7659398cdd470 ChangeLog 5334
+EBUILD mpich2-1.0.6.ebuild 10292 RMD160 ae8d901fe6cb066af273af8a08143d10fe3b51aa SHA1 ad60eea860ce9c39a945fce2112490a29864ea06 SHA256 c55d53f4a80536ee1fc7283daa22320a737d3c1750e2e5ac3f33c6c3ecd6fbee
+MD5 686bc9037f253636fb03704118be51c4 mpich2-1.0.6.ebuild 10292
+RMD160 ae8d901fe6cb066af273af8a08143d10fe3b51aa mpich2-1.0.6.ebuild 10292
+SHA256 c55d53f4a80536ee1fc7283daa22320a737d3c1750e2e5ac3f33c6c3ecd6fbee mpich2-1.0.6.ebuild 10292
+MISC ChangeLog 5507 RMD160 5c5aa70e930464f2cc040a512911a073e4620028 SHA1 8cf594426058144d97b13fc21b94dfe3349a3b8d SHA256 689ecf4c49addcc3aab9337789bc74f132fbc6e7b207e8d8f5d21978b95b791b
+MD5 60f97987c43e4fae048b84fdacf32370 ChangeLog 5507
+RMD160 5c5aa70e930464f2cc040a512911a073e4620028 ChangeLog 5507
+SHA256 689ecf4c49addcc3aab9337789bc74f132fbc6e7b207e8d8f5d21978b95b791b ChangeLog 5507
 MISC metadata.xml 252 RMD160 10123b1072a83227cac20dfe2a5065a3a6851563 SHA1 571c3db0391f894cb0bcbda2e3c5bd561482aca6 SHA256 cbf48aa7f9f6669327e88c9825ece05758d93afffa5c30b9b28568131b008367
 MD5 f3a1d3eb35133f846cfa104bad3643ad metadata.xml 252
 RMD160 10123b1072a83227cac20dfe2a5065a3a6851563 metadata.xml 252
diff --git a/sys-cluster/mpich2/mpich2-1.0.6.ebuild b/sys-cluster/mpich2/mpich2-1.0.6.ebuild
index e8d22b56c497..8aedb1e49135 100644
--- a/sys-cluster/mpich2/mpich2-1.0.6.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild,v 1.2 2007/12/03 07:21:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild,v 1.3 2007/12/12 05:20:45 nerdboy Exp $
 
 inherit autotools distutils eutils flag-o-matic fortran java-pkg-2
 
@@ -182,15 +182,16 @@ src_compile() {
 	fi
 
 	if use mpe-sdk; then
-	    mpe_conf='--with-java=${JDK_TOPDIR} --with-java2=${JDK_TOPDIR} \
+	    mpe_conf="--with-java=${JDK_TOPDIR} --with-java2=${JDK_TOPDIR} \
 		--enable-slog2=build \
-		--with-mpicc="${WORKDIR}"/build/bin/mpicc \
-		--with-mpif77="${WORKDIR}"/build/bin/mpif77 \
+		--with-mpicc=\"${WORKDIR}\"/build/bin/mpicc \
+		--with-mpif77=\"${WORKDIR}\"/build/bin/mpif77 \
 		--enable-collchk --enable-graphics=yes --enable-wrappers \
 		--with-trace-libdir=/usr/$(get_libdir)/mpe/trace_rlog \
 		--with-flib_path_leader=-Wl,-L --enable-mpich \
-		--enable-misc --enable-callstack --enable-logging'
-	    use debug && mpe_conf=" ${mpe_conf} --enable-g"
+		--enable-misc --enable-callstack --enable-logging"
+
+	    use debug && mpe_conf="${mpe_conf} --enable-g"
 
 	    sed -i -e "s:fpic:fPIC:g" \
 		src/mpe2/src/slog2sdk/trace_sample/configure \
@@ -219,7 +220,7 @@ src_compile() {
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc/"${PN}" \
 		--prefix=/usr --exec-prefix=/usr \
-		--datadir=/usr/share/${PN} || die "configure failed"
+		--datadir=/usr/share/"${PN}" || die "configure failed"
 
 	# no parallel make here
 	use fortran && export FFLAGS="-fPIC"
@@ -256,12 +257,13 @@ src_test() {
 	elog "Using ./configure --prefix=${TEST} --with-mpi=${TEST} etc..."
 	echo
 
-	"${S}"/configure --with-mpi="${TEST}" \
-	    --exec-prefix="${TEST}" \
+	export LD_LIBRARY_PATH="${TEST}/lib:$LD_LIBRARY_PATH"
+
+	"${S}"/configure \
+	    --exec-prefix="${TEST}" --with-mpi="${TEST}" \
 	    --disable-f90 --with-mpich2="${TEST}" $(use_enable threads) \
 	    || die "configure test failed"
 
-	export LD_LIBRARY_PATH="${TEST}/lib:$LD_LIBRARY_PATH"
 	nice --adjustment=3 make testing || die "make testing failed"
 
 	"${TEST}"/bin/mpdallexit