Prefer to avoid eval and use a bash array for myconf instead, it's less

error-prone
Package-Manager: portage-2.1_pre4-r1

3 files changed, 74 insertions, 34 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index ce3672c41ec4..64fd803a2cae 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.100 2006/02/07 21:45:37 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.101 2006/02/07 23:43:37 agriffis Exp $
+
+  07 Feb 2006; Aron Griffis <agriffis@gentoo.org> libperl-5.8.8.ebuild:
+  Prefer to avoid eval and use a bash array for myconf instead, it's less
+  error-prone
 
   07 Feb 2006; Michael Cummings <mcummings@gentoo.org> libperl-5.8.8.ebuild:
   src update
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 91db828a8507..2958c18ac2d2 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,27 +1,61 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d860c4d6196c9fefee12dddf6e5eb75d ChangeLog 14843
+MD5 420b799a7938b66fdc78dec5333d1e8f ChangeLog 15003
+RMD160 051ad320879928e89859c3dfb7d1a57846ec9cfc ChangeLog 15003
+SHA256 4cc19a8e0d89f04afda8f418e286514ba9ee74ad7cfe9275c70de3dd7416f92e ChangeLog 15003
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
+RMD160 65b25cf2b098d17ae8354e087ff03f8c4a79a081 files/digest-libperl-5.8.6 64
+SHA256 0f4931ee9ace7fa9c9aedf2213b09a91789c1887d78d17c829c4b479aec9e4f3 files/digest-libperl-5.8.6 64
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6-r1 64
+RMD160 65b25cf2b098d17ae8354e087ff03f8c4a79a081 files/digest-libperl-5.8.6-r1 64
+SHA256 0f4931ee9ace7fa9c9aedf2213b09a91789c1887d78d17c829c4b479aec9e4f3 files/digest-libperl-5.8.6-r1 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
+RMD160 21381de31d6da67594744081be0a94da3fd067ff files/digest-libperl-5.8.7 64
+SHA256 681fd892979121a8ff1ead060881146194c9fd448b77f94d6f88cdb5b3cce34c files/digest-libperl-5.8.7 64
 MD5 f408b45cbe8f14c380ae6ffce87c01c4 files/digest-libperl-5.8.8 65
+RMD160 25b183ec478f7aba6ba98471e97a9fd9f96a6478 files/digest-libperl-5.8.8 65
+SHA256 d083e2a403dd2011be23b6a000310da291fb19d2b9be606b324a2c7088187902 files/digest-libperl-5.8.8 65
 MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
+RMD160 d8a1b40e86094a63f60783f550afd1087bb5a5f0 files/libperl-5.8.2-uclibc.patch 573
+SHA256 a054e63156fb2f1c167c2806f4d8c1a97a85dc0eecf2bd737bb63c92f079e98d files/libperl-5.8.2-uclibc.patch 573
 MD5 b67f84d9f78688c8d1d06503241d0f6d files/libperl-5.8.8-lib64.patch 3393
+RMD160 406206c33b10b4af8cb2d1aba2fa6aadf5d9eea6 files/libperl-5.8.8-lib64.patch 3393
+SHA256 3efe8048934093a1a66bc37b22fbb56a6e10df2940bb85b57802c9129c9bd1bd files/libperl-5.8.8-lib64.patch 3393
 MD5 f6c5dc893c771f72cc183c946628d35e files/libperl-5.8.8-reorder-INC.patch 3046
+RMD160 73bc824bebee8889073656a7b547dc63b35696dc files/libperl-5.8.8-reorder-INC.patch 3046
+SHA256 136ca6c6cfaa3467f6a164f26b34ff06cc55823ca5723118764589cc15d37aed files/libperl-5.8.8-reorder-INC.patch 3046
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
+RMD160 ea221c4f1a284ad28b30e9354222859ac1c6392e files/libperl-create-libperl-soname.patch 417
+SHA256 cf417526a71b7c8a5015171fdefb6d7a52dbd6914762bb628d2662f6c28c7f61 files/libperl-create-libperl-soname.patch 417
 MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
+RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc files/libperl-noksh.patch 611
+SHA256 0861f7f54c184e99a0ffeebeab9420d969d2002f921bc3fb14841a1e24be1f5e files/libperl-noksh.patch 611
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
+RMD160 4a889fa029fb77e7454ed0c6f7870359340df672 files/libperl-reorder-INC.patch 1141
+SHA256 4e075cb6b6b418ab3b2a6f6b9af633ac51cc7d7749330d3981fa69d0f2d16564 files/libperl-reorder-INC.patch 1141
 MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
+RMD160 d8a1b40e86094a63f60783f550afd1087bb5a5f0 files/libperl-uclibc.patch 573
+SHA256 a054e63156fb2f1c167c2806f4d8c1a97a85dc0eecf2bd737bb63c92f079e98d files/libperl-uclibc.patch 573
 MD5 9fe69fdbfc5ff4096e83a0aea7ac96c8 libperl-5.8.6-r1.ebuild 10587
+RMD160 3e90e297dd0da471431f69a298bdc13e5c7294d6 libperl-5.8.6-r1.ebuild 10587
+SHA256 30719e97a85da4241d1fc942713de8dcdfb878da691d578ed5b7ee9b54929e59 libperl-5.8.6-r1.ebuild 10587
 MD5 8138254c857a5c439bfc0c39c9a9dc9b libperl-5.8.6.ebuild 10591
+RMD160 672aefcff30ffa5cbe158edf24e890daed90a476 libperl-5.8.6.ebuild 10591
+SHA256 c09672b88f4fe48814ff426715aaeea46cb13d9b304d7d6396ab4cafb4a360ed libperl-5.8.6.ebuild 10591
 MD5 4bc541a781cafd9a9e54efd62d45b1e7 libperl-5.8.7.ebuild 10987
-MD5 8e95758465f1e9889d4c6bef818f424f libperl-5.8.8.ebuild 11586
+RMD160 807450f51a594759dc7b8522e0223a9fa21a6ce5 libperl-5.8.7.ebuild 10987
+SHA256 a78bfd1ed6a1ac81673a6467b4fcc7787003f1dda3a67f21448611a6dd4bf3e7 libperl-5.8.7.ebuild 10987
+MD5 8597435b151e94ebb8994e21269aeae5 libperl-5.8.8.ebuild 11404
+RMD160 aa566000a608ff6cd265d98e03379f6fedda95db libperl-5.8.8.ebuild 11404
+SHA256 9d936152f9b5f5c512e7b4fdffd2d5965b5f8e55d2b29279ceacbccebf820627 libperl-5.8.8.ebuild 11404
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
+SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD6RUEtG5z4I8BtQoRAg7VAJ9Pla8grg7Q5wk6UrUmEHH/lBTddgCggGGr
-xVUw27xoMzPXRpbNwixdLhQ=
-=ZaaF
+iD8DBQFD6TCzJrHF4yAQTrARAtc1AKCHcHYunU1bbaMQweejAJhOYEqf5ACgxHm0
+Kq9F3KXOaRs8lDBcM+rgIY0=
+=0Oe6
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/libperl-5.8.8.ebuild b/sys-devel/libperl/libperl-5.8.8.ebuild
index 4b20079a122f..ef32b0d5bd56 100644
--- a/sys-devel/libperl/libperl-5.8.8.ebuild
+++ b/sys-devel/libperl/libperl-5.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.8.ebuild,v 1.3 2006/02/07 21:45:37 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.8.ebuild,v 1.4 2006/02/07 23:43:37 agriffis Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -138,7 +138,13 @@ src_unpack() {
 	use amd64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
 }
 
+myconf() {
+	myconf=( "${myconf[@]}" "$@" )
+}
+
 src_compile() {
+	declare -a myconf
+
 	# Perl has problems compiling with -Os in your flags
 	# some arches and -O do not mix :)
 	use arm && replace-flags -O? -O1
@@ -152,7 +158,6 @@ src_compile() {
 	use ppc && filter-flags -mpowerpc-gpopt
 
 	export LC_ALL="C"
-	local myconf=""
 
 	case ${CHOST} in
 		*-freebsd*) osname="freebsd" ;;
@@ -167,7 +172,7 @@ src_compile() {
 	then
 		einfo "using ithreads"
 		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
+		myconf -Dusethreads
 		myarch=${CHOST}
 		myarch="${myarch%%-*}-${osname}-thread"
 	else
@@ -194,65 +199,62 @@ src_compile() {
 		has_version '=sys-libs/db-1*' && myndbm='D'
 	fi
 
-	myconf="${myconf} -${myndbm}i_ndbm -${mygdbm}i_gdbm -${mydb}i_db"
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
 
 	if use mips
 	then
 		# this is needed because gcc 3.3-compiled kernels will hang
 		# the machine trying to run this test - check with `Kumba
 		# <rac@gentoo.org> 2003.06.26
-		myconf="${myconf} -Dd_u32align"
+		myconf -Dd_u32align
 	fi
 
 	if use debug
 	then
 		CFLAGS="${CFLAGS} -g"
-		myconf="${myconf} -DDEBUGGING"
+		myconf -DDEBUGGING
 	fi
 
 	if use sparc
 	then
-		myconf="${myconf} -Ud_longdbl"
+		myconf -Ud_longdbl
 	fi
 
 	if use alpha && "$(tc-getCC)" == "ccc"
 	then
 		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf="${myconf} -Ui_db -Ui_ndbm"
+		myconf -Ui_db -Ui_ndbm
 	fi
 
 	rm -f config.sh Policy.sh
 
-	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=\"$(get_ml_incdir)\""
+	[[ -n "${ABI}" ]] && myconf "-Dusrinc=$(get_ml_incdir)"
 
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=\"/usr/$(get_libdir)/libc.a\""
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
 
 	if [[ $(get_libdir) != "lib" ]] ; then
-		myconf="${myconf} -Dlibpth=\"/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)\""
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
 	fi
 
-	# We have to eval below, else above -Dlibpth is not seen by perl as one
-	# argument ...
-	eval $(echo \
 	sh Configure -des \
-		-Darchname=\"${myarch}\" \
-		-Dcccdlflags=\"-fPIC\" \
-		-Dccdlflags=\"-rdynamic\" \
-		-Dcc=\"$(tc-getCC)\" \
-		-Dprefix=\"/usr\" \
-		-Dvendorprefix=\"/usr\" \
-		-Dsiteprefix=\"/usr\" \
-		-Dlocincpth=\" \" \
-		-Doptimize=\"${CFLAGS}\" \
+		-Darchname="${myarch}" \
+		-Dcccdlflags="-fPIC" \
+		-Dccdlflags="-rdynamic" \
+		-Dcc="$(tc-getCC)" \
+		-Dprefix="/usr" \
+		-Dvendorprefix="/usr" \
+		-Dsiteprefix="/usr" \
+		-Dlocincpth=" " \
+		-Doptimize="${CFLAGS}" \
 		-Duselargefiles \
 		-Duseshrplib \
-		-Dman3ext=\"3pm\" \
-		-Dlibperl=\"${LIBPERL}\" \
+		-Dman3ext="3pm" \
+		-Dlibperl="${LIBPERL}" \
 		-Dd_dosuid \
 		-Dd_semctl_semun \
-		-Dcf_by=\"Gentoo\" \
+		-Dcf_by="Gentoo" \
 		-Ud_csh \
-		${myconf}) || die "Unable to configure"
+		"${myconf[@]}" || die "Unable to configure"
 
 	emake -j1 -f Makefile depend || die "Couldn't make libperl$(get_libname) depends"
 	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl$(get_libname)"