Use array for configure options.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 61 insertions, 54 deletions

diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index e1330cbd9c23..ca66237afc8f 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/vim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.480 2014/12/13 20:40:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.481 2014/12/23 08:20:28 radhermit Exp $
+
+  23 Dec 2014; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild:
+  Use array for configure options.
 
   13 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> vim-7.4.273.ebuild,
   vim-7.4.488.ebuild, vim-7.4.527.ebuild, vim-7.4.542.ebuild, vim-9999.ebuild:
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 783423eb5636..d90eda3d2d1e 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -13,25 +13,17 @@ EBUILD vim-7.4.273.ebuild 11591 SHA256 014baae49b7e6bfafc2f55997d75738f048ee7b33
 EBUILD vim-7.4.488.ebuild 11944 SHA256 bacdd6a7ed9f18723f30ab5e0787c7ebc5866d4049b4054fcb891714b2423e05 SHA512 09c0897b2ed5785e1ce0297c98bd79e799bad7062e44f0aa210fd397a30e1f6acb754273587e488a5eed02994eda77c74a78c071d43eb644353d36fe21d4b85c WHIRLPOOL 4bdbda58d50ce9178659b601b1d132a8c1cc1b17a1a2a1ed6f8f3ad3c9fce063a698e103f06633d05d0dc1bdb66a782019ec0b868a9612a7a016b37785d51a8d
 EBUILD vim-7.4.527.ebuild 11944 SHA256 deeb77a5c2ac1eafc87a9ffc8bea469b4e87b0a1e533d0db27e6cff658e4eee1 SHA512 74f7fc2d72e016d7420a8f57a874f31119f90ef9186fdd7bb761b43e022912604dcea86b1258d13a58e075957894ba813f32fc07f6308473786793d3f1d125a8 WHIRLPOOL 2f2a907d68ffbe1ec64b0b8c9113eb7f5df0da39092d71f0e9d6ec8df847c87700b095fc8261f163b936f06c66dabb29c9fd482c1ce14b0cb5d2379c509b1c26
 EBUILD vim-7.4.542.ebuild 11935 SHA256 78161e8ce156c8db4670ba3d01825a1f674150b312f35eaad0760c473cbd5c1c SHA512 ad66c4d545794c212d2c15ff31b7da7b3d332440cc78e2786baea12175d2cfb8d3c30b744c7ee5e50640ba4e60e53b7223565517c317fb58a4cd51ea28e6cfd7 WHIRLPOOL 5d6ee6f2202054a1e301d127f574338b32f84a9ee8e24e6bce3a911421e8d9d27a3290b844c75403703e04a721337889e9ab905b3ee7fab71426e1f3afbc9a67
-EBUILD vim-9999.ebuild 11942 SHA256 452c7bd8ede4bb04c13250c03161fca014b4d39daf59121ec68caccdf1ef54d0 SHA512 19a7c609c930dbff425544457317e26487535508505d02e334bf771750c5a0b3cab8cb7b5d6580d47b14cf89e9ad55979fba97013027521d3ea37726b6f448dc WHIRLPOOL fb577838d62c10e41d6de469f936f666b6a15aac2738bb500030b42fdb334c357692e83cff7d04e30ad2b0a8193b5f2f19e888434432c41c30d1f9cfd371eb2a
-MISC ChangeLog 65003 SHA256 9ff2e0caf37538aed2656f1e0fe2bbbd2749dff648b1701daf77d1f74ddeb2cd SHA512 d3c4200929e7607d20ce22b974b12307ef1804fd4185ec0bb8ddb5eac161a6e2680e4c4d9ad8882b287e47d8f0fd0f29db5591d29ea41a128aafe43b5d6ebc31 WHIRLPOOL be2324201ec94fa7dca35787e4ee134a3b8de4c449ab56083f36811c9c6d46c18a52fae3a9975c415ca3a653b3e901dad4542e6ddad27683e8efa9787763ed95
+EBUILD vim-9999.ebuild 11856 SHA256 5d81136f52fe6466958fa96e43fd0b814023b987d210920f859e7a586ec3b0b4 SHA512 d0a2085b8a88c93305b247482682eb3c514f516bc58335da022acd3ba52a7b61e826a917aaca0eccbf978e37fbfe8fd0dabf01a6fcfaf268db1b74691c139100 WHIRLPOOL 42ac82234f318e958c15fa4111b1d13bf5f89bbfc409f2064ef2b41c24da3d4f6d73e9d2b3650bcba7be80abd1675db2d41cd39fdad3817012edc85e5c220bf2
+MISC ChangeLog 65105 SHA256 63e056154436dcb8ae540c9c0c5b3172fac196ec2ad9683a79bb276ac165b908 SHA512 64e41cc7d584e0e67b935eceedfee6b5e28863a456960e427b7e3e1392ce90e3c507ce55795fd7917892631e9dd292ce93ec6332ba9d235b779c5f3176347a57 WHIRLPOOL 74d7e5a181df343fab02e161f75895a55eac5b3737d2c54ea6ce53693041234666e9b27debd5f493342bd04851c86b935dc7486eae45fc89d013bb26f8da31d4
 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUjKQ0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcFBAP/jO9VXXWoEXfIp4ThbtOPitM
-5HXHn4NhGjziaFVoQc3qORFCzbqGlP/5pX+ihnLwuDptsJsuNLvFPnNWwd/ZcDMh
-e1g/9Oh+eYkqTiebXAe6NG6cI9DVEU4Drq9JoXQEAD8RX68PpLn/Ql+SZuMKuRZQ
-g8Pij7lG7AWkewNSjwQJM5fPCxXpIYFeLcgjHzaRl5mT/9JIRSq+LvWLD1fDs9jx
-o6vOpm6M1v/RbVT9Bievg0/fut8XC/RqGJ422rLw5nesMVXNA5prmu+8Kx3VMvsv
-eNyr1qPnzbuz/fy3qrP40Bu+PCR27erma0KHz/w8+1b67yT1eq+eeEDTplaXrOmr
-CVljGneacQl9C5TkVJDybkJ89DZnJDf7hfwJU5Xavu3n5UV7ERK8TY+ZJplOps2e
-9GaucQm6s2/FTefd4FqoWZ1Ymli/P2ruBNqKO32dQSKFEYVJSGTAhfhLhyhH8mP6
-JCQkYbv5A5R9F7O6tO/DYMTiAJFkuFPbbfYOGIMaaFXVYd+7otNdk6yq2AaU7/rP
-s0SOC03W5JTtwpmfMXqq3MluQWJJ+dG8xnqnt5BSN6OJB23o4hg1V1PHpo0TSRXk
-vkQOn3RrIxYW7CWZVVraAIln+glWvQuOZJ0EDNHCVtOBH66D7JxCMBz8oltotp2c
-37zwf5tidJm/cD1iTkGP
-=PNI+
+iQEcBAEBCAAGBQJUmSXeAAoJEEqz6FtPBkyjwHoH+wVFeBPsJNuV2aLtMipM4LwS
+gK4j7JGNoRINOk/HcPkAVRgeZsz8hoTFJw3NAo0Cxm9/MaYhkzH7R5o5WpUfViUb
+GbxDrRphcrFirFyZ6AhE9azbVV/TIfkz8zhvPKoy341usGFKnY7+iPqaDJ56zL/6
+3T19fnM32FOCx2qukDPrQ1MjXzlDjPxCteQ2IVi4wXtnhI+8SIqblZSPP894PbOi
+4bRs7geyU1HAufobTyKd9/RgKzgAv/8wzKqnsDkK/jlCV1ayXwqWoQ1laguCQT/Y
+yAcecH7WY6e7ZnFshER3rhEdgatwmuuV3cpNTdOOtoqokAH8wlRi+ggqiodNs+A=
+=gY3w
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 2f9c6b022713..864c491ced9b 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.18 2014/12/13 20:40:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.19 2014/12/23 08:20:28 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -151,7 +151,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myconf=()
 
 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
@@ -178,47 +178,55 @@ src_configure() {
 	done
 
 	if use minimal ; then
-		myconf="--with-features=tiny \
-			--disable-nls \
-			--disable-multibyte \
-			--disable-acl \
-			--enable-gui=no \
-			--without-x \
-			--disable-darwin \
-			--disable-luainterp \
-			--disable-perlinterp \
-			--disable-pythoninterp \
-			--disable-mzschemeinterp \
-			--disable-rubyinterp \
-			--disable-selinux \
-			--disable-tclinterp \
-			--disable-gpm"
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
 	else
 		use debug && append-flags "-DDEBUG"
 
-		myconf="--with-features=huge --enable-multibyte"
-		myconf+=" $(use_enable acl)"
-		myconf+=" $(use_enable cscope)"
-		myconf+=" $(use_enable gpm)"
-		myconf+=" $(use_enable lua luainterp)"
-		myconf+=" $(use_with luajit)"
-		myconf+=" $(use_enable nls)"
-		myconf+=" $(use_enable perl perlinterp)"
-		myconf+=" $(use_enable racket mzschemeinterp)"
-		myconf+=" $(use_enable ruby rubyinterp)"
-		myconf+=" $(use_enable selinux)"
-		myconf+=" $(use_enable tcl tclinterp)"
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+		)
 
 		if use python ; then
 			if [[ ${EPYTHON} == python3* ]] ; then
-				myconf+=" --enable-python3interp"
+				myconf+=( --enable-python3interp )
 				export vi_cv_path_python3="${PYTHON}"
 			else
-				myconf+=" --enable-pythoninterp"
+				myconf+=( --enable-pythoninterp )
 				export vi_cv_path_python="${PYTHON}"
 			fi
 		else
-			myconf+=" --disable-pythoninterp --disable-python3interp"
+			myconf+=(
+				--disable-pythoninterp
+				--disable-python3interp
+			)
 		fi
 
 		# --with-features=huge forces on cscope even if we --disable it. We need
@@ -230,18 +238,22 @@ src_configure() {
 
 		# don't test USE=X here ... see bug #19115
 		# but need to provide a way to link against X ... see bug #20093
-		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
 	fi
 
 	# Let Portage do the stripping. Some people like that.
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 
 	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
+	use prefix && myconf+=( --without-local-dir )
 
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
-		${myconf}
+		"${myconf[@]}"
 }
 
 src_compile() {