Fix for EPREFIX with whitespaces, thanks Arfrever for help

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

5 files changed, 48 insertions, 47 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 26076f846e58..551b52984e1c 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.76 2010/12/16 15:59:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.77 2010/12/19 18:12:39 jlec Exp $
+
+  19 Dec 2010; Justin Lecher <jlec@gentoo.org> openmpi-1.4.1.ebuild,
+  openmpi-1.4.2.ebuild, openmpi-1.4.3.ebuild:
+  Fix for EPREFIX with whitespaces, thanks Arfrever for help
 
   16 Dec 2010; Justin Lecher <jlec@gentoo.org> openmpi-1.4.1.ebuild,
   openmpi-1.4.2.ebuild, openmpi-1.4.3.ebuild:
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index c80ea507414d..34695900b42a 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -5,15 +5,15 @@ AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949
 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
 DIST openmpi-1.4.3.tar.bz2 6626909 RMD160 087532de57244c03941421162caa9e5537b4eba1 SHA1 9d24b6969d73605904855eb32d40d6b07e231932 SHA256 220b72b1c7ee35469ff74b4cfdbec457158ac6894635143a33e9178aa3981015
-EBUILD openmpi-1.4.1.ebuild 2837 RMD160 6cd33f395c294577921df8e2ed0cee052f887668 SHA1 c61dc3f083c39de2bb875a91f0d00438119257fc SHA256 4d0e882167e5db048155a4c46f66e3e782e36f1eafa002c8b5efc5e33f4c97a6
-EBUILD openmpi-1.4.2.ebuild 2745 RMD160 ca3910a4cfac63e25b9f43cd15cee264e40e8815 SHA1 541e1059dc13d3f70994feee23be98811a4cb718 SHA256 5de183372dc57023af38cdd7a3ea032c9cf6bda3d7cd4ea0d449178cf704b0ef
-EBUILD openmpi-1.4.3.ebuild 2732 RMD160 4e150ed418f4a8b1acd402bdba4ad9a81c694579 SHA1 b89d4b0e3ee27fbc3ad8ccc79296f69849b3662d SHA256 5d31fe7ae818ecdbe4207bd58a62097e13599cf5c0487367eb739e4cd463c43f
-MISC ChangeLog 11611 RMD160 6455739553afdb883e9255f696c963d75a1fb45d SHA1 a7f75b5ae1e81fe22816a35f789afd8a38e8d312 SHA256 0a95430f65dd0830cfff6f55df03cc71064aa9493e1aa7a7aae97520360c463d
+EBUILD openmpi-1.4.1.ebuild 2823 RMD160 0ef45a455152eeb445286407b616121f7f1dea98 SHA1 3483f8f2651a3c9151e818e302b22800f25d9d4c SHA256 f9567b3228d43a280db3a0eb709a2c4c52eb7f2cb4f8b92efd9e2ed4ca4612e5
+EBUILD openmpi-1.4.2.ebuild 2731 RMD160 6ae620167371036b4c6d718acbd07986d80c0d13 SHA1 66ffdd3bab000a27d293562f80242ff3b0a4c35a SHA256 8d778f74c88372ea25f51b559f78ba5ff20fd6652c2b355ad8aa2c6aed308940
+EBUILD openmpi-1.4.3.ebuild 2719 RMD160 6820abaa875c4ba62de21e4748b130d875ebaab5 SHA1 367433d0ece1b9326602a181b09eb29704bb8e3d SHA256 bac98931af2c4fbadf596eea7955fb57231bed3fa85e474c3f94a918cff1182b
+MISC ChangeLog 11788 RMD160 4733c2ace055fd239756f95ffdb53db65724eae9 SHA1 f73f896700827d9ae5c187854a01014240f2c0b1 SHA256 ccb26045b4c3e546628a47ba90b7d906a37908db837c17f241bfb011ad3bbbb5
 MISC metadata.xml 597 RMD160 460d07513dd43e74dcb1b8654d7952e8ce02f9ca SHA1 49f72060bb7b3e35020affbe574c09251c896b7f SHA256 a366b9394dfb038cf8913c7710395ea5d38609b268361320cb64346ca413e18a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0ORi4ACgkQgAnW8HDreRaocQCfVVMPD1Z9xoAY2BGo88ppRw/t
-0kAAn0NjXMoOIt6+R6tO0nMMdhGsUZtR
-=fvwL
+iEYEARECAAYFAk0OSx0ACgkQgAnW8HDreRZDAQCeLpyyujf45MyEDdU9x6IvvLZJ
+GmIAoKg56yseDudP/WdCchhtrxpcWonk
+=VsZ2
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.4.1.ebuild b/sys-cluster/openmpi/openmpi-1.4.1.ebuild
index 8e25c443df6d..c3186de2f7ef 100644
--- a/sys-cluster/openmpi/openmpi-1.4.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.11 2010/12/19 17:51:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.1.ebuild,v 1.12 2010/12/19 18:12:39 jlec Exp $
 
 EAPI=2
 inherit eutils multilib flag-o-matic toolchain-funcs
@@ -58,17 +58,17 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="
+	local myconf=(
 		--sysconfdir=/etc/${PN}
 		--without-xgrid
 		--enable-pretty-print-stacktrace
 		--enable-orterun-prefix-by-default
-		--without-slurm"
+		--without-slurm)
 
 	if use mpi-threads; then
-		myconf="${myconf}
+		myconf+=(${myconf}
 			--enable-mpi-threads
-			--enable-progress-threads"
+			--enable-progress-threads)
 	fi
 
 	if use fortran; then
@@ -76,28 +76,27 @@ src_configure() {
 			myconf="${myconf} --disable-mpi-f90"
 		elif [[ $(tc-getFC) =~ if ]]; then
 			# Enabled here as gfortran compile times are huge with this enabled.
-			myconf="${myconf} --with-mpi-f90-size=medium"
+			myconf+=(${myconf} --with-mpi-f90-size=medium)
 		fi
 	else
-		myconf="${myconf}
+		myconf+=(${myconf}
 			--disable-mpi-f90
-			--disable-mpi-f77"
+			--disable-mpi-f77)
 	fi
 
-	! use vt && myconf="${myconf} --enable-contrib-no-build=vt"
+	! 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"
+		$(use_enable ipv6)
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README AUTHORS NEWS VERSION
+	dodoc README AUTHORS NEWS VERSION || die
 }
 
 src_test() {
diff --git a/sys-cluster/openmpi/openmpi-1.4.2.ebuild b/sys-cluster/openmpi/openmpi-1.4.2.ebuild
index 44024f00eccf..8919802f4f31 100644
--- a/sys-cluster/openmpi/openmpi-1.4.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2010/12/19 17:51:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.2.ebuild,v 1.10 2010/12/19 18:12:39 jlec Exp $
 
 EAPI=3
 inherit eutils multilib flag-o-matic toolchain-funcs
@@ -54,46 +54,45 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="
-		--sysconfdir="${EPREFIX}/etc/${PN}"
+	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="${myconf}
+		myconf+=(${myconf}
 			--enable-mpi-threads
-			--enable-progress-threads"
+			--enable-progress-threads)
 	fi
 
 	if use fortran; then
 		if [[ $(tc-getFC) =~ g77 ]]; then
-			myconf="${myconf} --disable-mpi-f90"
+			myconf+=(${myconf} --disable-mpi-f90)
 		elif [[ $(tc-getFC) =~ if ]]; then
 			# Enabled here as gfortran compile times are huge with this enabled.
-			myconf="${myconf} --with-mpi-f90-size=medium"
+			myconf+=(${myconf} --with-mpi-f90-size=medium)
 		fi
 	else
-		myconf="${myconf}
+		myconf+=(${myconf}
 			--disable-mpi-f90
-			--disable-mpi-f77"
+			--disable-mpi-f77)
 	fi
 
-	! use vt && myconf="${myconf} --enable-contrib-no-build=vt"
+	! 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"
+		$(use_enable ipv6)
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README AUTHORS NEWS VERSION
+	dodoc README AUTHORS NEWS VERSION || die
 }
 
 src_test() {
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index bced64769119..4c3b4177c385 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.4 2010/12/19 17:51:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.3.ebuild,v 1.5 2010/12/19 18:12:39 jlec Exp $
 
 EAPI=3
 inherit eutils multilib flag-o-matic toolchain-funcs
@@ -54,45 +54,44 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="
+	local myconf=(
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--enable-pretty-print-stacktrace
 		--enable-orterun-prefix-by-default
-		--without-slurm"
+		--without-slurm)
 
 	if use mpi-threads; then
-		myconf="${myconf}
+		myconf+=(${myconf}
 			--enable-mpi-threads
-			--enable-progress-threads"
+			--enable-progress-threads)
 	fi
 
 	if use fortran; then
 		if [[ $(tc-getFC) =~ g77 ]]; then
-			myconf="${myconf} --disable-mpi-f90"
+			myconf+=(${myconf} --disable-mpi-f90)
 		elif [[ $(tc-getFC) =~ if ]]; then
 			# Enabled here as gfortran compile times are huge with this enabled.
-			myconf="${myconf} --with-mpi-f90-size=medium"
+			myconf+=(${myconf} --with-mpi-f90-size=medium)
 		fi
 	else
-		myconf="${myconf}
+		myconf+=(${myconf}
 			--disable-mpi-f90
-			--disable-mpi-f77"
+			--disable-mpi-f77)
 	fi
 
-	! use vt && myconf="${myconf} --enable-contrib-no-build=vt"
+	! 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"
+		$(use_enable ipv6)
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README AUTHORS NEWS VERSION
+	dodoc README AUTHORS NEWS VERSION || die
 }
 
 src_test() {