Changed CHOST->CTARGET for 486/586 linuxthreads workaround. Set keywords in 2.3.5-r1 to ~amd64 ~sparc ~x86 in prep to remove from package.mask.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 17 insertions, 12 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 72aaafeddc0a..9fd3eadc5a56 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.366 2005/07/23 20:01:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.367 2005/07/23 20:07:50 eradicator Exp $
+
+  23 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5-r1.ebuild:
+  Changed CHOST->CTARGET for 486/586 linuxthreads workaround. Set keywords in
+  2.3.5-r1 to ~amd64 ~sparc ~x86 in prep to remove from package.mask.
 
   22 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.5-r1.ebuild, glibc-2.3.5.20050421.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 69171d936184..98060769106a 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dd614225c18271e67a790d18262df15e ChangeLog 78664
+MD5 f30956176e1b3bdcdbf78481329ba0a7 ChangeLog 78915
 MD5 a8f4dc1ccc7e3d1689d811eb66323ea1 glibc-2.3.2-r12.ebuild 22448
 MD5 3b73a40944514533bab9ee36370dd062 glibc-2.3.3.20040420-r2.ebuild 21681
 MD5 44c27cc7abe11dd4962146851f9cd2ba glibc-2.3.4.20040619-r2.ebuild 21356
 MD5 3ec5d17c9cfd78688ca51a889dd354a7 glibc-2.3.4.20040808-r1.ebuild 27705
-MD5 cb26cd840dfadaf1a8c89cd05d446cf6 glibc-2.3.5-r1.ebuild 40011
+MD5 3cc28d5a813150f7937218484f0cb829 glibc-2.3.5-r1.ebuild 40062
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 45b53d55a7990f579c81cc9698091b8b glibc-2.2.5-r10.ebuild 4454
 MD5 90fe324466be29f9a8d0aeaaf2c5195c glibc-2.3.4.20050125-r1.ebuild 38956
-MD5 0ff5dfbf92d98af3e5b72d4b8af6c46f glibc-2.3.5.ebuild 40621
+MD5 907b98972939ba77f8232fd72273f65e glibc-2.3.5.ebuild 40625
 MD5 9ce1e9b6a86131d38ce6111692f813bf glibc-2.3.5.20050421.ebuild 40651
 MD5 eecc93f8d5fd4a51f0d455a75ad917d1 glibc-2.3.4.20041102-r1.ebuild 34259
 MD5 2d538b6127a106ba8c43319ffe3f816d glibc-2.3.4.20041102-r2.ebuild 41249
@@ -132,7 +132,7 @@ MD5 ee692cfc6e7c810a2785093948638bbc files/2.3.4/glibc234-alpha-xstat.patch 7653
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC4qJMArHZZzCEUG0RArqxAJ48W8dJwB4UhK5zaRiPeAYiElYNGgCfW5bH
-u8fvlHu4JIpqHGHbFmNg44U=
-=b0cO
+iD8DBQFC4qOzArHZZzCEUG0RAt4BAJ95W8/p54Bu3+d9GBu9bgorJVDGOgCfVuNx
+wd/Z6+ZU3VWHMcwGYlmGICg=
+=TLBZ
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index 3602967e7c84..ec293d205817 100644
--- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.4 2005/07/22 19:40:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.5 2005/07/23 20:07:50 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 BRANCH_UPDATE=""
 
@@ -850,7 +850,7 @@ glibc_do_configure() {
 	use profile && myconf="${myconf} --enable-profiling"
 
 	if [ "$1" == "linuxthreads" ] ; then
-		if want_tls ; then
+		if want_tls && [[ ${CTARGET} != "i486-pc-linux-gnu" && ${CTARGET} != "i586-pc-linux-gnu" ]] ; then
 			myconf="${myconf} --with-tls"
 
 			if want__thread && use linuxthreads-tls ; then
diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild
index 611eac4c2b34..2fd75185bc54 100644
--- a/sys-libs/glibc/glibc-2.3.5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.36 2005/07/22 05:11:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.37 2005/07/23 20:07:50 eradicator Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -883,7 +883,7 @@ glibc_do_configure() {
 	want_omitfp && myconf="${myconf} --enable-omitfp"
 
 	if [ "$1" == "linuxthreads" ] ; then
-		if want_tls && [[ ${CHOST} != "i486-pc-linux-gnu" && ${CHOST} != "i586-pc-linux-gnu" ]] ; then
+		if want_tls && [[ ${CTARGET} != "i486-pc-linux-gnu" && ${CTARGET} != "i586-pc-linux-gnu" ]] ; then
 			myconf="${myconf} --with-tls"
 
 			if want__thread ; then