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

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

5 files changed, 14 insertions, 13 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/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() {