Add workaround for still broken #133327 / #228907.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25 x86_64

5 files changed, 25 insertions, 11 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index dae1fcfd04c1..61e2f76e8ad0 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.585 2008/06/22 17:39:55 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.586 2008/06/23 00:48:43 vapier Exp $
+
+  23 Jun 2008; Mike Frysinger <vapier@gentoo.org> glibc-2.6.1.ebuild,
+  glibc-2.7-r2.ebuild, glibc-2.8_p20080602.ebuild:
+  Add workaround for still broken #133327 / #228907.
 
   22 Jun 2008; Friedrich Oslage <bluebird@gentoo.org>
   glibc-2.8_p20080602.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 40109c596859..56352896de89 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a
 AUX 2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433 RMD160 4eda3122052714ea216ab402ea5a3a7f4654f48e SHA1 afb44c9a12e3d4ee28c61dd62522244c09776da4 SHA256 8e68949febc8b14941d15b9afd914b158db11d282d19c528f75a0b58c379dcce
 AUX 2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053 RMD160 429e2065d45c4c68aa5f39eacf6d8ae5fbda63c8 SHA1 001a4af11de2029bcbb01a0afc4051cb4119807a SHA256 db4c92f86d3404ba4cc2f4d28e17517ed09124efcb518394d9c1df27d8540962
@@ -182,9 +185,16 @@ EBUILD glibc-2.5-r2.ebuild 38677 RMD160 16c6bb911b3d97f1e8a9632f220f27b94a156833
 EBUILD glibc-2.5-r3.ebuild 38677 RMD160 fd1ba0c2b4a9aee52666be1b00bf67f5090fa04d SHA1 8838c614b1c58f5279a5e98389c5ea56ab2ecf97 SHA256 417b99032cd614026678bf3b83a4effab7e774d46cd2285f805d00ddbbf0d694
 EBUILD glibc-2.5-r4.ebuild 38679 RMD160 94adde51f8b61d6eeeffd917c0d03618f0e242b6 SHA1 b5ba47757ed8fd11e3a73cdf7491e3cea9a796d0 SHA256 3a8b5fca45f9511719a8abaca4d481b9c6813e9926aa48cae9983ad9b63417c9
 EBUILD glibc-2.5.1.ebuild 38754 RMD160 4f351c8e74913b579d558df61f7e85df1550a26a SHA1 45d207e25f3b8a1752dfb0df4bdac06945991c46 SHA256 d108a1c5a82bece216b4b469f234b9d5c979431d0ab2f053fbe4c873d9dd2ba2
-EBUILD glibc-2.6.1.ebuild 12261 RMD160 1ef3d84987844169ebe237946e34c89cc00cfaed SHA1 b0f355d3ca7259c448fd9e91fce3c1711f12d727 SHA256 82f4f06abec1e9bd264f671998aac6d2707916c30ee6eb588c462dc2f0e07fa1
+EBUILD glibc-2.6.1.ebuild 12292 RMD160 c753458ea55bca8e868e53d2f5e17adfd7746402 SHA1 20a8ac455cf8ef3330581f6c7235f12c858fb289 SHA256 7cd0f49183d6553fbf84fb6046a75496389ca5caf620b201620c081e2cf94308
 EBUILD glibc-2.6.ebuild 39505 RMD160 87c1e6fd2f982345133c1bb85424cdb80a1b71c8 SHA1 1792f6be2d12f8a4c8f4759fb00e18754459cf52 SHA256 edb61c6412783b34b6071cad06c916bf075389543206698505f9a80bfb7edafe
-EBUILD glibc-2.7-r2.ebuild 12314 RMD160 9c44845b791f48984dd255172bf8c269ba2f805d SHA1 082dbd43f0b2a1d1e9d5333e3f710f7bda9af466 SHA256 bd006bc0b9bcef0e4870110e625dadd1b6e5e153f7ea42071b6cc623e0356a7a
-EBUILD glibc-2.8_p20080602.ebuild 12947 RMD160 ee356c58301060436358521bd9dae225dd2880ab SHA1 49b5913af2e635981422cd3021719cb904ed2897 SHA256 e6a72e179fe715af145e592fa4a0856ea9f93be0c111c00aef8eec0761b3a05f
-MISC ChangeLog 110890 RMD160 d3d061b2f2c8fb68d446c01bfec7fe6da4010750 SHA1 05dc085dba05d7167d4fdeec9272743956f1f73e SHA256 6f2545f772e2f9966a3ad991282464b01825aa54c12dadf4e7cd3dfc259da2da
+EBUILD glibc-2.7-r2.ebuild 12345 RMD160 0304a11d7717a5fe6bc909848fe4847716599834 SHA1 cba178dedd21bffafa00e2e80997ade52aa68f36 SHA256 763c0d5cb68f1fad559c3b438f84309176aa7ccc2873864deac11bbd142d9fd8
+EBUILD glibc-2.8_p20080602.ebuild 12976 RMD160 15e5a91ddf539b2be4937cb3f4f768970b7184e2 SHA1 7881e4f4a0d523c77580baa4ead91d289683c8d0 SHA256 0a013cd8f7f4abbf4eb31dc04d053a2246827e7fd349a51e1cde1149f650e0b8
+MISC ChangeLog 111063 RMD160 40eada785b2a7790a639ae0e4c37d5935d297c35 SHA1 806412828252dfefe3cf24c4daf903dfdab8dae1 SHA256 e799d0de807196a18aae90b4633184c2466743cccc696e090e83c085279c18a4
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhe8vEACgkQ67wieSYcaxctNgCcDzYrn+IoRxj5rTEXpcYJFTxk
+1e8AoOgNEtewd8ZdjzCJgGXiCqBNBucy
+=TKOE
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.6.1.ebuild b/sys-libs/glibc/glibc-2.6.1.ebuild
index 01ce29951a58..19449b932395 100644
--- a/sys-libs/glibc/glibc-2.6.1.ebuild
+++ b/sys-libs/glibc/glibc-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.1.ebuild,v 1.24 2008/06/22 01:26:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.1.ebuild,v 1.25 2008/06/23 00:48:43 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -27,7 +27,7 @@ NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl require
 
 [[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER:-2.6.20}
 
-IUSE="debug gd nls hardened multilib selinux glibc-omitfp profile vanilla ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd nls hardened multilib selinux glibc-omitfp profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}
 
 # Here's how the cross-compile logic breaks down ...
diff --git a/sys-libs/glibc/glibc-2.7-r2.ebuild b/sys-libs/glibc/glibc-2.7-r2.ebuild
index decf3245ee59..66fc9106acbe 100644
--- a/sys-libs/glibc/glibc-2.7-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r2.ebuild,v 1.8 2008/06/22 01:26:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r2.ebuild,v 1.9 2008/06/23 00:48:43 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -25,7 +25,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}
 
 # Here's how the cross-compile logic breaks down ...
diff --git a/sys-libs/glibc/glibc-2.8_p20080602.ebuild b/sys-libs/glibc/glibc-2.8_p20080602.ebuild
index 05c6087528af..e5d773e1959a 100644
--- a/sys-libs/glibc/glibc-2.8_p20080602.ebuild
+++ b/sys-libs/glibc/glibc-2.8_p20080602.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602.ebuild,v 1.5 2008/06/22 17:39:55 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602.ebuild,v 1.6 2008/06/23 00:48:43 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...