Make sure we disable the x32 patch for non-x86_64 targets too.

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

5 files changed, 31 insertions, 36 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 7d60109c74b0..13b9197ad402 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.824 2012/03/23 03:08:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.825 2012/03/23 17:39:06 vapier Exp $
+
+  23 Mar 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.14.1-r1.ebuild,
+  glibc-2.14.1-r2.ebuild, glibc-2.15.ebuild:
+  Make sure we disable the x32 patch for non-x86_64 targets too.
 
   23 Mar 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15.ebuild:
   Update hashes to match official release tarballs.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index e0887cc718b8..6a26c9d69735 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -61,30 +61,30 @@ EBUILD glibc-2.12.1-r3.ebuild 8632 RMD160 a660a9c9d7d651781fb55a757124137c368f38
 EBUILD glibc-2.12.2.ebuild 8632 RMD160 d6edafe5297fd625f9fc2828d930d40569e18f8b SHA1 5a4e5d36b2b99509bc0f9e8a32c88ef8d4e4f5d4 SHA256 363fdb68f3f18a0549977b8efa325f78c6b16ae1b57ef80510ac685bee94fdb7
 EBUILD glibc-2.13-r2.ebuild 8558 RMD160 4c0284795ac095d466c245dea773fbbd58ae3658 SHA1 a10398572b706507c370274267b7f8ed2b8d6bec SHA256 53acef5334c74a0c37c0ecd218d92cd42d4a9a224d83e0768f0842e0fb204ea0
 EBUILD glibc-2.13-r4.ebuild 8549 RMD160 e865f806a6c30e23985d72dec2f10c661574b07b SHA1 45bd9d3285dc3b40eb0d8c68385629cd050a7677 SHA256 a721ea5373d025a388c302921bff66ee5525a541402655f76dfb600eaf87e00e
-EBUILD glibc-2.14.1-r1.ebuild 8908 RMD160 9728d6b90d2ca3b15ddeb001249064cef46f387a SHA1 ef3aa9e4e46b63accf38a067f999aa29453f36e9 SHA256 ee78c892c838a54676c64b28329bb85defe670a2173388ebf702120b95b17ba1
-EBUILD glibc-2.14.1-r2.ebuild 8908 RMD160 57ec83b1d189f24709640edf45cf21c10eb1e070 SHA1 e196832d63ec9bc3a535686f253d0b45fb4affbe SHA256 8d05d3d33169f3a0171ff28e7e7482381ee67b8aff4cf4bc6a54d8e6af420321
+EBUILD glibc-2.14.1-r1.ebuild 8900 RMD160 c709d275cb82a9d5b32debbe262daaa560e5815f SHA1 fa9f1c68ceb50e2b64d506d2525bd0c8e4fa1ee3 SHA256 221bb9461a297854e92bd138e5d2dee72862b27a176334fdb9983f40c0a82b16
+EBUILD glibc-2.14.1-r2.ebuild 8900 RMD160 dbfca372d6d8efe0e92c548f59a7c8e9f7c138d7 SHA1 9040c972acccbbb273541208979bca1ccad01486 SHA256 72fed1bc1008fafced407806ca7a1b3515fb2e70fb1edba75ebc98f27fa9fce4
 EBUILD glibc-2.14.1.ebuild 8753 RMD160 43a94456bf81f29ab459a8184eb90e33c0df2b7d SHA1 16835011f75f5f9368a3773cc14ab3ff4b25bb21 SHA256 5cfcec552f246453bb34c4a84b4a173cd6068d8e5d9ea6f76109cd9867078e63
 EBUILD glibc-2.14.ebuild 8752 RMD160 c3482206a91b6584a53fcff6cee56bad61a4fa12 SHA1 f25ddfac08f9a28716fd749ab066eab45ae8e5b9 SHA256 eb21477c36c3beee53ac8e9089c92c7ca86f1b58dd93bbeee5210539d9035720
-EBUILD glibc-2.15.ebuild 8533 RMD160 16a263d8d171045acd621804ba631207f9cebeb6 SHA1 bb2cac3e14399ed9747e60643dd87fe1ec37b930 SHA256 0125b270c81f91d26cabc677aa153f6b8e7bd190224aed9851cd8804d17311ee
+EBUILD glibc-2.15.ebuild 8526 RMD160 623efc220f125178da0f740c046e91dfe4430c62 SHA1 36fd1e6ccdfa0402007aa684ff4ffa87fc85c2d2 SHA256 6312b9fbbc71a19733f00ea94540ccfd28e3a9bc3361fa5745f0f3258f7cec38
 EBUILD glibc-2.9_p20081201-r3.ebuild 7693 RMD160 d29e97a48c7d73ad524b00ee84ace31482d6cefa SHA1 1d2bc39eab289370c28036e578eb8b1e08558a31 SHA256 48f8eb185d511128b482a84be56d4d3e7bd655ee01d408b09600efd1be5f8397
 EBUILD glibc-9999.ebuild 8352 RMD160 6b856a7d19ecce635402e7a19377c3c773b2ea60 SHA1 50c96ba402f80d6dc7655acf825d393f0839f5cf SHA256 a3dec3020bde78dff2315a72c6557491f2abf26698083b5d1c36c1d85e467905
-MISC ChangeLog 39220 RMD160 55121f49978abeebf863143ce24eefe7e72f05db SHA1 b2870e8d08f9f4f1d4a42275ceaa0d4e4844f4bd SHA256 984b5705e3e82cf38dfa0c3631b01f6b7a0bef716b2a02948b4254c1c4360d40
+MISC ChangeLog 39405 RMD160 6e42b23c2e7493ab0074f0c306ce43deba5c196f SHA1 2437e5912484c9faa374c813c4a94fc038250aaf SHA256 8bde9d4de4b5daae72a17df0e9ddbe7f76628c38154b54360a1cecbc78a0a8b4
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPa+lLAAoJELEHsLL7fEFWik8P/jth0IWhiLhfdCHgj9n0dp0Z
-9eBYwNFU/MJi0W3ldq1Bn93ccF60KGwepsvik05FV/L6LskuSh3XzJt3uCmqqOmB
-oKuqgL4dV66PR3cKa04Fx5TLM7LepMNSk2en6Bj8MihMs4HLsz5XILZ0YXDyQoMD
-jEPL/ULVvUcwgUzKDPLkACguyTi9ftQMr1ihlmgoRgmD6KG4fB55nsscrqC2Vav+
-noAHQQEDKBpH31Mu+YMV+Vh4ihBxfeGBh66GAOswNOlW3ey+jq5uefIrKWlDAPkV
-OSwGnqmF6lMGEc3/WOigh7eLR1EBUK99QxHnbSnhkTw2HEBlzgFSfUGmGUFRujBa
-ktXZf0XB7d59y/0eZnXG6lZAqTxnn0pHE/+u1SxL9wvWd9uX0jocf6xOUDuk40Jr
-8HmdOzLB7WzrBkEx+5zUwM7rGbRIXvNC51BEwIWtZwtpC21Sgyx15uU8LlaBft8/
-01F4tUxNmVc0EeQXz8URsXMyOJOeetzQSak41LbzK55Uqw0xAuLmyF907sf7s+XC
-6luzfABo/dSVVxcxCpEJoQ8exx/JbJZSQgqiVAKbnZeWVUKTEpJydUV7PV9oRQCw
-goqZbc0Kke+82WEa+hQ5jWENDSQF24DPQK2xn1dkOYpqf/yMuv5efOO5jNLEBXFp
-7WxwXVBMdTkmt4g2+Yqy
-=C5yj
+iQIcBAEBAgAGBQJPbLVFAAoJELEHsLL7fEFWtLUP/jaDrehC6usfk91kvEY/US0J
+j43Ht9Ome3BHMB/snMsPlQdL8IKHB04NsIxWpSlETFV35A1/0TOXzVaquuzDEEdf
+puDfyj7wGsG+Vw6dlW5rvKybztG0kM3BwksOAE85QTBtS4xGiBen3gwyEQPcxFJK
+EcEXS3SSOeB9D4u5An/3b2na/BHCg5qvFaSvGn/MNbSvUF5ezZSwDkyq5qoTyMzU
+XEbQxWvuewc07rNLVodlZ5X26pmEcP/WHnKv5zKPwbv1m2mf7tG3KbgWMz2/FU2q
+7gViEoaEFvU9a4JdtQlrPA5Mr4GqLCNegFRlPSNBl8bY5dDIELwL7yiFcCLOARBW
+HM/YWUMFN1TAWE/30vQIU5yCfPcHRMglK7vBI/qhJ57BsiC4afCgCm9UZdaxykx7
+MfZMV6HY+BPdiWUcsHhc/vzuTfQau4wu5J6O2LPIKGy8VCsq8be0EHQpCj/me8q6
+I598UoaCDcVeODRvylB7bCZWu9wOfsdDhQRKw3ZilYNOOS36G8rVLWE3pDVx30fC
+Ucn2+kPVPoudqiJTla1MDN9PUskdME1OlF1r7wkj0LEAIz4w+g1wfKuow5uAnq3y
+buHuFDp2DS/xgJQ20EwtTwOKzCfKgzs4BT/zXJVWHOsIIErqpIaxMWqOyN8mlCJJ
+GUZrtepz1HpPv9fvRMZ2
+=JPbm
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.14.1-r1.ebuild b/sys-libs/glibc/glibc-2.14.1-r1.ebuild
index 31ef5606dadf..6cfbdd9425f1 100644
--- a/sys-libs/glibc/glibc-2.14.1-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r1.ebuild,v 1.3 2012/01/17 23:51:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r1.ebuild,v 1.4 2012/03/23 17:39:06 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -205,11 +205,8 @@ pkg_setup() {
 }
 
 eblit-src_unpack-pre() {
-	case ${CHOST} in
-	x86_64*)
-		has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-2.14.1-x32.patch"
-		;;
-	esac
+	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
+		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.14.1-r2.ebuild b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
index cac6a94ae4a3..8b67e74498fa 100644
--- a/sys-libs/glibc/glibc-2.14.1-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.4 2012/02/16 02:59:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.5 2012/03/23 17:39:06 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -205,11 +205,8 @@ pkg_setup() {
 }
 
 eblit-src_unpack-pre() {
-	case ${CHOST} in
-	x86_64*)
-		has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-2.14.1-x32.patch"
-		;;
-	esac
+	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
+		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.15.ebuild b/sys-libs/glibc/glibc-2.15.ebuild
index 14ea6a76cf61..d64297456910 100644
--- a/sys-libs/glibc/glibc-2.15.ebuild
+++ b/sys-libs/glibc/glibc-2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.8 2012/03/23 03:08:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.9 2012/03/23 17:39:06 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
 
@@ -191,11 +191,8 @@ for x in setup {pre,post}inst ; do
 done
 
 eblit-src_unpack-pre() {
-	case ${CHOST} in
-	x86_64*)
-		has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
-		;;
-	esac
+	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
+		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {