Clean up src_configure: use proper arrays to hold flags, and use $ARCH rather than...

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/net-libs/iojs/ChangeLog b/net-libs/iojs/ChangeLog
index ed2333b7666cf1dc95e10fe92499d4de37337ecb..0be11175d3561a67620aa177765aa6a91dfa3465 100644 (file)
--- a/net-libs/iojs/ChangeLog
+++ b/net-libs/iojs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/iojs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.7 2015/02/16 11:28:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.8 2015/02/16 11:48:45 vapier Exp $
+
+  16 Feb 2015; Mike Frysinger <vapier@gentoo.org> iojs-1.2.0.ebuild:
+  Clean up src_configure: use proper arrays to hold flags, and use $ARCH rather
+  than $CHOST matching to look up the target arch.
 
   16 Feb 2015; Mike Frysinger <vapier@gentoo.org>
   +files/iojs-1.2.0-pkgconfig.patch, iojs-1.2.0.ebuild:

diff --git a/net-libs/iojs/Manifest b/net-libs/iojs/Manifest
index 699f9f088f12a7d095539e751dca4dd25fb1394f..0c2389f4e22505e93721657b3139764519f4545a 100644 (file)
--- a/net-libs/iojs/Manifest
+++ b/net-libs/iojs/Manifest
@@ -8,23 +8,23 @@ DIST iojs-v1.2.0.tar.xz 12327228 SHA256 d33b448d173a0df675c471d24a33db57208c30b3
 EBUILD iojs-1.0.4-r1.ebuild 3206 SHA256 884a98f1736ded1fdc73b076307054763eead3cbb69fb6198b7238832cfc6f46 SHA512 99519f8f678ada8dc6c25645866e382a5994cdb4d65792bfad43a3e2018599d02d2762d51b6b2961622b3eaf5da1c005bc78d762e506c92ed4045da8c6800a7d WHIRLPOOL 65edebb0c07bc39bdf00eb368f37a08e2c3e9e46bce29c4cb43942fc1e9cacc6e1e5ff39e89f3749a43b58c31636dbd9e1b7fccd703bdda7a852f078194ef3dc
 EBUILD iojs-1.0.4.ebuild 2944 SHA256 4a78febd3440bc5fa021312c3994e462e5da8ed0e916003369bd0398bdd46e56 SHA512 15888b7647b29f50e9488a6497672aa2a686c1646b1403914cacfc51ce5b87a73417bbc0e384e4551fcdd2f631a33e4ffd5b089a692f4ac674c11ecde51824f7 WHIRLPOOL 22becab91f294b04ff7207fdd594e5639d51d9168d8bc6344f3332f88dede4e0dbfac03e0e46ef3bfe211f7f5caa08211d306563fbec1a236801747b6317fec0
 EBUILD iojs-1.1.0.ebuild 3203 SHA256 d861b5e857e2ec150b7469e2928f13642944323027dd249406e7782fa7e8739e SHA512 fc9630b1e2b9db03f5a9e9aa7239321cd197b661bbcb9564b04755d25ef12bd92160abec20067a46a3ebd0160650713e00707c4e8ce87219a6fd799824c6133b WHIRLPOOL 84b40270e7f440c9caef7cff80ef2c30c18ce9830f66eb4c0316cba14c84e1e6fb9ab8cc9b59ae7f978c5433836470e7efae8d7d69467e7b4527c4a6b426fdd0
-EBUILD iojs-1.2.0.ebuild 3241 SHA256 6f15bde32fa1b6decdb02cc10ddbcb9c6c794f9cc7f5c360936813da1b4b34e8 SHA512 f3715e5bd6dbb9b2d0aa4d56d903e2a12ad92e0dbe61cd4fa1c05d70efa1def2eebd01ee7dc69f913c4ad6d9ef4cf0c9798756979ea06fdec5c6621490b06c88 WHIRLPOOL 38f9cc68b8e664b4f950ac9e586d3496368c3b053ea5d742d999937f34f6d1570edadaa6a532f04b47f2c87ab089decbb8ac9897c8d17a82e263c6c7c29c4519
-MISC ChangeLog 1154 SHA256 07da5a62895fcf8ffc5b0d1486a29fdcab8d45d0c17f59c8e8b26dadde220a55 SHA512 b92f4dee5c47f5dd216caaf3eea128b65ecc143b036106b030b8a37d53db7778b8e23460885cf1140d98c44ff938ecbf999cb71e3462aa0adabd99f479f2d83c WHIRLPOOL dc5186d9c11f11a75d10e15500fc5b0314c7cd62f87e824749ee9849d19e154468ca30beeb682c5f5cd1502d7b35cd20b023f978afe3fe70de021b157b80a9c4
+EBUILD iojs-1.2.0.ebuild 3195 SHA256 f7e13540a836867b4d91487b16578b86494eb4b37769d69c5911494576f5295b SHA512 2cf9e93a24d94e0567f221cf62c07fad49abd201d0336a59c8863c2f93270bcc4beb22cd4f3a8ebbc1109eba775d32470ee1cf3ef08cb17ce6078d2934aea72b WHIRLPOOL 6e00ed6628948d8cc60f38f02f0d996db636d1c91f62b5c7296965099aa5120dbd576bd22e07ce75e345149b52a91a84caa81f46473bb7c57316ede455bca76c
+MISC ChangeLog 1355 SHA256 be3bf2d883e10987925259d45a99ca2b7723988f00065cbcd116bb7ea9e41c2e SHA512 93dfb6e7d6c8752765fd6335fc463346245dba0fd702f3c2f2f8e8c28ee7641164893390eac66d2b4b941ec7f7e38c3904f66e0de16eb5558b2f02d49be9e67d WHIRLPOOL 4f1963f4bda2da61beaa2dea3aed9b08de483c230048ac29a815505ce130185428246e244f5125380ba4505fcf55e697c91ed37dba59d72135b06e4acb0b9ecf
 MISC metadata.xml 545 SHA256 ea98b41b3fe8288a7b38649098871f33c897916aaa34c718f8b849bc35d15c12 SHA512 f32b1eced5dada7827c10bb7b59986400d8dce58dc8c2c0b03d3acd0886b539d2c0afa7956c8a0d1b1ae1894eae31c520368c524bd4c7fb5930180fc8bc4b035 WHIRLPOOL f3fe5d3c70386787eae1cc856f7a57d775738096777074b50678f45ed7e5c9c2575c21a452e75d9a5d06245c85c17434593a7b3d0b5f0c4ec932fd3c7a8b84aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4dRwAAoJEPGu1DbS6WIAOFEQAJn9x9IYrZwyWeaKOVrexk75
-BNdYICeZC5i/gARArmTxZ0aevrryJ8pBAXSNJ9pYX69oateFEV3q/GaIvfQ0FNHq
-ehDsitb7V/zR8Pq9IEFKOhZsUSn+Mk+pRx06AB5vde33P2SrSSoC/UE/SuPquWaW
-7nmdWfvRgMJptT9wkUnDpJj1h+iKzLJgy0JhdvqGdFUMFPGBH9JvWsp7MpVTie3L
-qzjapM9PbMkfdYH2fdNwrnpT7M5flFhtFpXGqvOem4Z0e3OuHCnC94P3My3ZxcuT
-jCHvGktrCIYfjgLAXlQ/W1ZAYv5Ic27LWbELy3YE3G1/At1kr8aKTgd0FTIByX2q
-shEpj54hU8BWNVQhnHvBZsciZVvpeMOR+hpSyu02Q8G9ZiT+neitEGZBpN+akAe2
-BrZSMxuAhnROxBi6JyQM3z/SgT/11bkeUxgbLA/YV6Qvx9C+bONqQNCJjcYQRoKx
-fqUQX6EJLFffSoYMdgo242aeW+DUZfWN+qWtEsrlumFsuY9TL0SsYgMKuQ90xkIK
-AWfiRDc9UyzdAGTkYMsQWWClQZNv/jsvBciHlTkswf9xlHpd43JmfbcZRRcmAoVU
-EL9J0Laez98MyDhe4equ+KSZPFR5dhLw675074dsGUI/FqQr4Zy68dqZxiTIV0kW
-lBw0HF6cx8L4Cgx//Y2q
-=UYem
+iQIcBAEBCAAGBQJU4dkeAAoJEPGu1DbS6WIASS0P/jgfJgZTFXY1DKldbGzHVYYL
+kLQZFkNvbCw54whHVOfjC5mjRfWt+ktYA6wCxZow6G3l5gPjXmtrbfYFYsZ7PpNg
+zVHfdJBr5PC+ikwypQsaMO3dIDfMYGgnh5lPgJfc/BvFLzUspmwiy5qdyQ4UFS62
+d06EUsomSTi18bFkgYSB/LwtPsLTTXnYkE1ZftD5lPe7DSdoegNd47V41zQ7rfBv
+OGdh6U4U9V9u6gjBnANJWm7YZME+5cHH/PVBttGpDgTnB0cunJIhp8Qc4VJoRSMt
+CPueG8fV/GsWPgPJnqFTas4CXR5n6wjcD5sfZAUdt9tAL6k8w7qgtlgBSFPeJTtZ
+n7lyIRuZDPgMEZh3Si9iag0+TgB89kbd0mHgvI3rZIhNZSrVAZ0Nyj3gF2TPZuTq
+gN43EV9NQvCxym+6XS7thYnkjE+2i2d7pHN4wNohnbPOBOg2aaIkuvPfr9HodgnY
+fJ9b8t3hYFYiUlpW0EhlTst4xi16q7siT38lcx8lFu92i57Dsej+MmmHP8/6V0K8
+3k3uvpjBeScvAf8AdhqNQ9UXQkySX10eahE7MDywDeMNGosYgDXECv2IOeLTYSjD
+Vj92zXGOI5iG4iUc3EO8Kzo0tsJORyWsg5eSmqHUB4y5eKo4t5H9EaQNoYBsjNbG
+ama+RnNGk/pTNTQXjK19
+=5PRD
 -----END PGP SIGNATURE-----

diff --git a/net-libs/iojs/iojs-1.2.0.ebuild b/net-libs/iojs/iojs-1.2.0.ebuild
index da4b514401e7a5c356f176fb9d71f3ebabbcde3b..c504a8e88044cc5d11227ee04af159dd84143159 100644 (file)
--- a/net-libs/iojs/iojs-1.2.0.ebuild
+++ b/net-libs/iojs/iojs-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild,v 1.4 2015/02/16 11:28:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild,v 1.5 2015/02/16 11:48:45 vapier Exp $
 
 EAPI=5
 
@@ -62,43 +62,40 @@ src_prepare() {
        # It doesn't really belong upstream , so it'll just be removed until someone
        # with more gentoo-knowledge than me (jbergstroem) figures it out.
        rm test/parallel/test-stdout-close-unref.js
+}
 
+src_configure() {
        tc-export CC CXX PKG_CONFIG
        export V=1
-}
 
-src_configure() {
-       local myconf=""
+       local myconf=()
        local myarch=""
-       ! use npm && myconf="--without-npm"
-       use icu && myconf+=" --with-intl=system-icu"
-       use snapshot && myconf+=" --with-snapshot"
-
-       case ${CHOST} in
-               i?86-*)
-                       myarch="ia32"
-                       ;;
-               x86_64-*)
-                       if [[ $ABI = x86 ]]; then
-                               myarch="ia32"
-                       elif [[ $ABI = x32 ]]; then
-                               myarch="x32"
-                       else
-                               myarch="x64"
-                       fi ;;
-               arm*-*)
-                       myarch="arm"
-                       ;;
-               *) die "Unrecognized CHOST: ${CHOST}"
+       ! use npm && myconf+=( --without-npm )
+       use icu && myconf+=( --with-intl=system-icu )
+       use snapshot && myconf+=( --with-snapshot )
+
+       case ${ARCH} in
+       x86) myarch="ia32";;
+       amd64)
+               case ${ABI} in
+               x86) myarch="ia32";;
+               x32) myarch="x32";;
+               *) myarch="x64";;
+               esac
+               ;;
+       arm) myarch="arm";;
+       *) die "Unrecognized ARCH ${ARCH}";;
        esac
 
-       "${PYTHON}" configure --prefix="${EPREFIX}"/usr \
+       "${PYTHON}" configure \
+               --prefix="${EPREFIX}"/usr \
                --shared-openssl \
                --shared-libuv \
                --shared-http-parser \
                --shared-zlib \
                --dest-cpu=${myarch} \
-               --without-dtrace ${myconf} || die
+               --without-dtrace \
+               "${myconf[@]}" || die
 }
 
 src_install() {