Drop x32 patches for now as these are old and no longer work #418225 by Ostashevskyi Viktor.

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

6 files changed, 32 insertions, 31 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 02bff8560f48..813e9d0d8785 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.853 2012/05/31 04:49:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.854 2012/06/01 05:34:40 vapier Exp $
+
+  01 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.14.1-r2.ebuild,
+  glibc-2.14.1-r3.ebuild, glibc-2.15-r1.ebuild, glibc-2.15-r2.ebuild:
+  Drop x32 patches for now as these are old and no longer work #418225 by
+  Ostashevskyi Viktor.
 
   31 May 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.14.1-r3.ebuild:
   Backport arm hardfp patch to stable version too #417287 by Raúl Porcel.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 66bbc208db02..aa7847dd3d03 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -61,30 +61,30 @@ EBUILD glibc-2.12.1-r3.ebuild 8620 RMD160 8bde7fa348def78bd2a609def9f167ef843cf1
 EBUILD glibc-2.12.2.ebuild 8619 RMD160 9684d35857f7145cad4db9e3e49fe37ef6768299 SHA1 9f17aecf4675047e9afb7295488e72f6b86f50d3 SHA256 e27a8ade3a9c711d71b53079a34a35db0093005f7b08afa029a13dfd09b87b89
 EBUILD glibc-2.13-r2.ebuild 8545 RMD160 461a07ca82e70f80930c18716d31200503ff5d08 SHA1 bf80577c58e9da8f53c789e8bdd3a39d9510f802 SHA256 47300292e3598fe74207f1627eb1f98578f82560104bbe02f0be0b5946222650
 EBUILD glibc-2.13-r4.ebuild 8535 RMD160 1e9fa84c74b9c0ab09e06b84306b488d537bc00f SHA1 eca40c7e723b8eeac4282fbd0b8ed84ebce2963f SHA256 ee964ff56ef921d0c1ca6e58123bf2d2ec4b0c43eb6a6ca45ad7bf5b752921d3
-EBUILD glibc-2.14.1-r2.ebuild 8905 RMD160 fe5975027559e747fcc00af3b4d7e745a82c7945 SHA1 e63db5f11586a97a305affec605aa87f88056dbe SHA256 04cd638edd59c92597233edc14471780eead6287642656b812e19c8fe2c64a8e
-EBUILD glibc-2.14.1-r3.ebuild 8902 RMD160 556d5f449d1498e63e74a4656ed28fe1981bee60 SHA1 e4e508cc01b9c6072e5b07b9f1d44fd54bd26527 SHA256 781f44ad11c161788a5bf6f79282ec24904d53587234af08eb45e16c8dd75bfe
+EBUILD glibc-2.14.1-r2.ebuild 8845 RMD160 ca533e45ee4a2e054797431f3f12a2cc1b66cf6a SHA1 556621ea05a800b6d817d4b790931ffaaf9f8cf5 SHA256 2df5637bcf506b644feb2941beac4043731f508e70e4626243fef74bfac1affd
+EBUILD glibc-2.14.1-r3.ebuild 8842 RMD160 c1fc548dd66acbaf3afeec573ed90222eb9f8389 SHA1 9d096be0c596ea99a012b879c302a02143b4cc4c SHA256 1069ed6152b66010afb6a39c5f2323e902748d347d7fd8d3c070ab3b8bdfc46b
 EBUILD glibc-2.14.ebuild 8739 RMD160 0cf8007db758513dbe73ecb747182591923ea03b SHA1 b9fb14a5c62cc69e827037a7ea3acf56b62dc4e7 SHA256 8a2129dec1c258364aab30c9dc73d9e64e6f167e14f49a3160f41f4674ea714e
-EBUILD glibc-2.15-r1.ebuild 8533 RMD160 2039bf3f8747013a3af426eb5cc58c391826439b SHA1 1db4d84bce4f2132795424e21937edd6c487bced SHA256 0a34f2cd344abdb9f0588a9266d65295d2bfe5f98e990b99dee7fbd25231cee5
-EBUILD glibc-2.15-r2.ebuild 8157 RMD160 8729367a3fb83dd6ef3193e7d5a571ae4326c3b6 SHA1 c4e93aadb25449cfdb6ceb5af28a54841667fa40 SHA256 c136a68d9c9b032538a2570b0fae2e802f9977f342b96f48c81adca1df68f799
+EBUILD glibc-2.15-r1.ebuild 8473 RMD160 18aae0b3f7a12253857b42e3a161d4a2f0ff6c5f SHA1 7dcb3925795dc949fc24b69c4c2bd2af3025c3fa SHA256 79863bb6a8b27bf08f57aef93f63b7c636c6f2e5fb70dfa5205c1416def9e9fb
+EBUILD glibc-2.15-r2.ebuild 8097 RMD160 16c2d936e422a342d825f09da956050f6932db3c SHA1 ef9351c2a84c11ce89ee388123efb2bcb1f49d42 SHA256 646bb41a784b4060dc90fe793a0bf718a46cd8a65d4906595835f9be3bf739f2
 EBUILD glibc-2.9_p20081201-r3.ebuild 7680 RMD160 3baebfd0be6aed5c3d03fdbfd46a19a9dad83428 SHA1 958f7f408c36a584bf4f0151089d5e5dbdb838b5 SHA256 342058f41b7338fc4fdd9e0ba5b4931e0e13babc53c04028f4798906e74ac988
 EBUILD glibc-9999.ebuild 8358 RMD160 317e86067a3688b8f06a40c7a7ebb0f70b473290 SHA1 5a160e2c0b7ff594dd0727751e289650d924e3f0 SHA256 726ccd559e26f740d0607677e7f1512ecf7ab6425ad3e4ea0a27ba3adc9ea752
-MISC ChangeLog 43639 RMD160 7b535cbd733764cf3fe2c82e80f9bb034cae3c87 SHA1 8e08ebb76815e59b7f1c533fc56e098cbb006b65 SHA256 0fdaae6ec95f0e960f1a2b2742046151011f93cb5c82ef8e75cac7014acca1ec
+MISC ChangeLog 43881 RMD160 1fcf56dd54da1dee83d5be13eb39d0bbc2a71f2b SHA1 a26cdf7e988a05793be9e774c89f6ab62dd523dc SHA256 6af7ca84bbeb559b383ad2b3de9c7e94d55b27673ea87e9afc441feeee251d7d
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
 MISC metadata.xml 276 RMD160 532073ae23585e45260005f9cb7faff78a2f34d4 SHA1 840d8831dbc1a441fe86d812f874961026b5fd66 SHA256 b6767fa81e801d5bb20ba7c96f91674159dddcdedb23e49fb24e93c3a879fd04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPxvhhAAoJELEHsLL7fEFWWvAP/1G6YUBIUZL297klwGjMwfjr
-uAzPJA1/mntPsfYI73Nc3eXwem+FQ/qQSDL1ZesJcULN85VsQplszCWwOP6q2OAu
-g1MFI9yreulman68sHdTeKU7N1ms6xX1nUeyS1jNJLhaMqrqAUciGf3gZgGZBCn0
-F9VEN589pHujwnJMXHDNuE4dARA8O0sAPqB1l3Vct4/AZF5yoOmS6LmOzXyHoobZ
-xbhzWDyR0AwmfZq2GGPdhgG9u7/S3j6VeZB7cQlvVRnOv/xYAtCsjP16h5va3moC
-JUwZHgH2+A5DStlfPhDI73VmPRIXufyaQyzyKFQd3C//qT9HFyFVLozzZjiL5tBH
-3Nu+bGOuLjgiI41ULIv3ijais5JswAF0DE8zKGo1rcqZ4Tu7+lY0eBOKlDels2Xj
-F036/fr5Ga4Q3mqTWZAOkin9By+76LtOTQZhlt6xFbQfJr7z3pZXwgwQncF5CI6d
-aVUpLTISYOfgYTPIMCGGLT9gAstacGrF9X5MrP9Pg2HA8hsOdhzASoeD6bk5npPl
-KlxCuivk3NyBCGoFDOfUqQEVYQdIK0Jl0/6snPgqWhi1wPPw5wmXXGHwmaSDOhpO
-msB7YfPNgwr9bp3RNtZb2keUxe4uj+2cQgQs39Zb3uE7yJ8hbJMKGJ6jnt4d1hqp
-ycGSHUChPI2ysfF8cFpM
-=5C4z
+iQIcBAEBAgAGBQJPyFR7AAoJELEHsLL7fEFWOxoP/3i33SQTeNrP1rpLSIf2A4c4
+d0AzTTh3oMbjxT8+8RVoGnWP9nhGXfjD/VGJrFJ6j5ypFmwHWhI6gIPPU+lnTiSL
+wI30ormP3bLiXaj2CFOqX+fbn8zK5AACJsIDDSa7g6nWNS3He+rgEf4nQZXfYhZ5
+uyBxbUtqEWFlyFWIZAXxZ3mT2Uxk9F2TQrpojJIkSH1GBp3dmturdAl381vqMCdy
+L4PNHktftzvLbcPSTTF6rEw6u9i17tQsGlzssxc1SSlGBicNBY9p3DcYYj1urbMZ
+URRSKkIWHIK15kMtVRMVDaXgE2z1prMJLRQ9NUQ3UOUQt5alvxxk4GY3NVU6AKoR
+IZHg8rU00PQrYmDyxGsST9o0C45dTbQGy9WYxt/p4XphbB/kY0nDdFk7LXR3AtV8
+D45h28WhOG1v3ah9oZRMnC58D3Jbd0Nkra3AWozEW/+eNp/guKs2qeEhEcBrQO8p
+7AK3HgqTM6Gsk6oFwz3Y1+f2YVwIRBUlKzxp96nJ2cD7Hk77/a+zoZkUTvTAIYlD
+GCHj/5MPY3wsweb6lvkjyapMpZiNVnhTNzs86l7EG5thZsP0qco1Of2gI/6cjocM
+lxGzk0hxJ7h3p0l1f5kJbVMh7NwKmVjTSPRl8MO4ZsgHspp6alpzaldKT1SNE8Zn
+x/pe+JUgItYjp8EansK8
+=sk08
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.14.1-r2.ebuild b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
index 1631e59f7596..e908fea3b308 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.7 2012/04/21 15:54:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.8 2012/06/01 05:34:40 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -205,8 +205,7 @@ pkg_setup() {
 }
 
 eblit-src_unpack-pre() {
-	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
-		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.14.1-r3.ebuild b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
index 09df2efb05a9..9fd710da4f39 100644
--- a/sys-libs/glibc/glibc-2.14.1-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r3.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-r3.ebuild,v 1.15 2012/05/31 04:49:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r3.ebuild,v 1.16 2012/06/01 05:34:40 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -205,8 +205,7 @@ pkg_setup() {
 }
 
 eblit-src_unpack-pre() {
-	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
-		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild
index fdd162198d5a..0e7867d9e52d 100644
--- a/sys-libs/glibc/glibc-2.15-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.15-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.15-r1.ebuild,v 1.6 2012/05/09 23:37:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.7 2012/06/01 05:34:40 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
 
@@ -192,8 +192,7 @@ for x in setup {pre,post}inst ; do
 done
 
 eblit-src_unpack-pre() {
-	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
-		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
index e1900eff92aa..099a54df93d9 100644
--- a/sys-libs/glibc/glibc-2.15-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.15-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.15-r2.ebuild,v 1.1 2012/05/18 05:04:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.2 2012/06/01 05:34:40 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
 
@@ -188,8 +188,7 @@ for x in setup {pre,post}inst ; do
 done
 
 eblit-src_unpack-pre() {
-	[[ ${CHOST} == x86_64* ]] && has x32 $(get_all_abis) \
-		|| GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
+	GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 }
 
 eblit-src_unpack-post() {