diff options
| -rw-r--r-- | app-editors/gvim/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/gvim/Manifest | 28 | ||||
| -rw-r--r-- | app-editors/gvim/gvim-9999.ebuild | 67 | ||||
| -rw-r--r-- | app-editors/vim/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/vim/Manifest | 28 | ||||
| -rw-r--r-- | app-editors/vim/vim-9999.ebuild | 82 |
6 files changed, 114 insertions, 101 deletions
diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog index cdcfd99a1e67..12dda2cbbdaa 100644 --- a/app-editors/gvim/ChangeLog +++ b/app-editors/gvim/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/gvim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.447 2014/12/14 10:58:01 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.448 2014/12/23 08:25:35 radhermit Exp $ + + 23 Dec 2014; Tim Harder <radhermit@gentoo.org> gvim-9999.ebuild: + Use array for configure options. 14 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> gvim-7.4.273.ebuild, gvim-7.4.488.ebuild, gvim-7.4.527.ebuild, gvim-7.4.542.ebuild, diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 827b712b417c..d39fd9d01e23 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -16,25 +16,17 @@ EBUILD gvim-7.4.273.ebuild 12242 SHA256 7274038e826623944a35c4d4b396cd10509e6132 EBUILD gvim-7.4.488.ebuild 12501 SHA256 e310aab40f3e9aeac9d090bd7b0f31498c53bd39fd41be0d58b27ed5044c040e SHA512 a241f40144e3f0d7cf09095694502fd10df1ef9472391b7c91e4d4cb7f078f58b52229ad07d7afe88860c892e4377607c26dbc624be1e521ac0a09ae35f3c148 WHIRLPOOL 15d95903380208806f3dfc8b1dae459e75c46f6fbc7baf44923b42e2222ce1202387d71289d5024ffa5a8e4457114c8bc682829a6979d4395faabcb02a7f5711 EBUILD gvim-7.4.527.ebuild 12501 SHA256 c208c8777b8127eb4c57f6add60afeaf8f1404148bafeabe7530082e7554aec5 SHA512 0e703f35517dcfa7677f6c8c28f79e103086637225900fb300a42543328ab56d93c0777f278c4b32a138af76339edff45ea80ff43651b6e2b23fcab0da670b09 WHIRLPOOL ba5aaf23db506711541a8262a0d4a33799190de4cef0c41ebce1166df1f9c48deac53a5305e49d00430a4ea740734ad37250240ca6d335cfe3bef8eeada39d25 EBUILD gvim-7.4.542.ebuild 12492 SHA256 2e7bf0cb9190f2b052cea32b2227ca53542646c101d2c79a2fcdf6586c76a386 SHA512 a082a237bbfb5bfbeecc6bd4a0688790cf7f2bc6c75a2aa645b42e751fd0912d6f4b9a43a2ae15a5fa681eb4ea2ae9e28335af51d793451d76b144008309f46f WHIRLPOOL 3555c34aadd70cca7305893ee5c9aa5ed712319c5fffa49467a47a720b8e44b4d5ce16da61b08d56c90e5c34f32acbc6f3918a8c39fea47ba61822317876e5af -EBUILD gvim-9999.ebuild 12499 SHA256 baa9325b284f7b4d75dd7c3d8d7d620c65a87fbb35f7e56abbd233f007a4651d SHA512 c97d05547fd78eb64810c7733fbfa777bc3668c527788f5a53dfbc54662b96809d06d13191b45f4ce29f242480e9db4f59e0286989cbe5e22d3f161e633c580b WHIRLPOOL 2b5720235eeaa6dc27e8d4207d77ead643e542488d45127f4ec79c90e037b77de5dacfbaadec33c4205db26761ca5f77862bf17e5ffa61749549024cf6a70f52 -MISC ChangeLog 61612 SHA256 1757fc377576715a7de4085dea013994100252e62a7b2c125c0579d32d440cc4 SHA512 0109ab1ff2dab61e64fa236d6cad321e151a216d79397489c290e22424e34555ceaf447b0e0f3d882664261019356860bdc5625355bb7fd62bb3c5605cf7223b WHIRLPOOL 910b5fd63f345f2ffe1b9dc1652dd66471a71b22044ffc3c547103e6f3a82f7f743b09407933800c5e9747733daeedd564451538b2cea2b372150fc3e30ddb33 +EBUILD gvim-9999.ebuild 12427 SHA256 6d21cd3e512dd6fc4c0b1fd261a64ce8ab1cb0a02d8c449f8e6112886ca353cb SHA512 9a4fdf602960224d23d4d30874188c73ee6786593f259b872c24e0d0451b73a7824965679f4c6d52d67b6e55c6028fd01cf9a5375510f94a79ebd19a017d2bab WHIRLPOOL 49a2c817926379bf4972aba8753f7c8c309d8473af3772994b462771d06453ba34907d5ba58e6d088eb5b50bd078d2565475c1880d8d5ffbe7313cd445f956a7 +MISC ChangeLog 61715 SHA256 db49390e534413722ad2c232f21b128342d9fe0d23465d7916748d8901c87080 SHA512 2f188621e173065c85c82b1c93ad9eb30da8d43e9260d7297a87f84b34ea593a649d27c71c30fad093cb015bf55db927041c01c10e2f2a6e33658f4c6d5b8c52 WHIRLPOOL d49ac9336da0270421547c750a96c4c3bdde46c38a4bc67d3809f2c22f1698f3a396b184fbc55e30f81d83b915406fcab30c7917a5794021c224205fa5d089ad MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCABmBQJUjW06XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF -QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcbOYQALLBZKh3cxilynoWmZqgjnzo -wdk1A4rjW2xbfoa1mKbcT+8qN3lMzLTe3Z2q5/UQUp+ReZS6qDAgA5kGn6lmGH3F -XfxMOlMPlc/FiwufhyG45ROPvnrcOubEU2ePs2vWqiz5D15apUBrFcS3g6HO+DBe -Um2A2TsOCf6Njj+kItpx1vbzCKE05TMi5I30olwgkTCJdVKyatw/evrBXDO+76zE -IgFWw5AewnXVun7wzOHJSWuNKJBIQVeSHDs1kRm8eizzvPsZGe3W976m1nX2o/VN -t27EtWrbJxKj38BSrQe7cA0Vza58Km254bOSYWZa1M9vpyStnnp3Fszk50kP1pDQ -pbESTe8qi4gMc0sQHN2+OXdNj/tG03lWRSD1HYwhoIfPdJ7gkGq82NlkQPwQblD1 -aiG0p7vfGYLTFIwKrV2tGXhRFExOFiAEaqP8ab/CZrdzOEoZACwjYH7PYtZ4hHus -D+c0QZzTs1pMmMGl0dL9z/w5GMt56QZlN3NrHk3iDphoDYe4pt+oqADAXQpXSUnG -pGKH38KooPr6ehRM61XdNVQ9A8d6WtnY0mQUXMelpJx/cLSiREP3agrKJ69mPn+b -vkZ9Gg2eLcFuEOBNrftaUM+YuFL1zNoPzFXWnV0RY9xN5oQYsoQ/vASg2XPUPO5E -EdLO3ZKB7z4Cw56dXq0H -=+AxU +iQEcBAEBCAAGBQJUmScLAAoJEEqz6FtPBkyjBbUIAKPGSWFtDZV+pBuq0fXonrvd +LuzSr2FCigGEgEK+9qY1VjJQpO4A/mWsSiuQuFd+lNIQmWPU8k/MVjNXiYB6kch6 +CHEkOJfhr0tf2Z1Seo2P2wVqBwkfXVDZNz/rL5nNxaAGH28IVv4PGdOr2yE+1lE7 +IJIHeJKIuhEPUnLCFpjFmWE0gw6KXJ2gvmqXL6//S1CK+YVrYkxXGqufBlhiG2FQ +UaxLWcrNOZr97OVDO3faw7te0Ltc2UN3wzY4U15PTI3JG7Yw5mdhlQc4FwOpNMUe +rXXxETYwr4IiozkyPtoP60cPQgFgoX5yMO9wSzzGApVTdTiQ38kelbKtH6WLXmw= +=ukXR -----END PGP SIGNATURE----- diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index b93c21a1751d..6bccf6fd2c03 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-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/gvim/gvim-9999.ebuild,v 1.21 2014/12/14 10:58:01 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.22 2014/12/23 08:25:35 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 @@ -179,30 +179,37 @@ src_configure() { use debug && append-flags "-DDEBUG" - myconf="--with-features=huge --disable-gpm --enable-multibyte" - myconf+=" $(use_enable acl)" - myconf+=" $(use_enable cscope)" - myconf+=" $(use_enable lua luainterp)" - myconf+=" $(use_with luajit)" - myconf+=" $(use_enable netbeans)" - 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 session xsmp)" - myconf+=" $(use_enable tcl tclinterp)" + myconf=( + --with-features=huge + --disable-gpm + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable lua luainterp) + $(use_with luajit) + $(use_enable netbeans) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable session xsmp) + $(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 @@ -222,25 +229,28 @@ src_configure() { echo ; echo if use aqua ; then einfo "Building gvim with the Carbon GUI" - myconf+=" --enable-darwin --enable-gui=carbon" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) elif use gtk ; then - myconf+=" --enable-gtk2-check" + myconf+=( --enable-gtk2-check ) if use gnome ; then einfo "Building gvim with the Gnome 2 GUI" - myconf+=" --enable-gui=gnome2" + myconf+=( --enable-gui=gnome2 ) else einfo "Building gvim with the gtk+-2 GUI" - myconf+=" --enable-gui=gtk2" + myconf+=( --enable-gui=gtk2 ) fi elif use motif ; then einfo "Building gvim with the MOTIF GUI" - myconf+=" --enable-gui=motif" + myconf+=( --enable-gui=motif ) elif use neXt ; then einfo "Building gvim with the neXtaw GUI" - myconf+=" --enable-gui=nextaw" + myconf+=( --enable-gui=nextaw ) else einfo "Building gvim with the Athena GUI" - myconf+=" --enable-gui=athena" + myconf+=( --enable-gui=athena ) fi echo ; echo @@ -248,7 +258,7 @@ src_configure() { 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 ) if [[ ${CHOST} == *-interix* ]]; then # avoid finding of this function, to avoid having to patch either @@ -259,8 +269,9 @@ src_configure() { econf \ --with-modified-by=Gentoo-${PVR} \ - --with-vim-name=gvim --with-x \ - ${myconf} + --with-vim-name=gvim \ + --with-x \ + "${myconf[@]}" } src_compile() { 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() { |