Readded 1040_all_2.3.3-localedef-fix-trampoline.patch which got lost during a glibc bump. Shoud address bug #85718. Also, let --with-__thread be controlled by linuxthread-tls instead of !glibc-compat20.

(Portage version: 2.0.51.22-r2)

4 files changed, 14 insertions, 18 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a0b06b20e466..0866343248cf 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.364 2005/07/17 11:16:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.365 2005/07/22 19:40:38 eradicator Exp $
+
+  22 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.5-r1.ebuild:
+  Readded 1040_all_2.3.3-localedef-fix-trampoline.patch which got lost during
+  a glibc bump. Shoud address bug #85718. Also, let --with-__thread be
+  controlled by linuxthread-tls instead of !glibc-compat20.
 
   17 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
   glibc-2.3.5-r1.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6775e3acda86..df877bb56255 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f6fa08a7719bb532fbaa9cc0ea34318d ChangeLog 78343
 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 4565f5dc6d4d808c672dfcf1c39a45e5 glibc-2.3.5-r1.ebuild 39994
+MD5 dc59ea6b0fdbae0787e6e8df997dd000 glibc-2.3.5-r1.ebuild 40011
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 45b53d55a7990f579c81cc9698091b8b glibc-2.2.5-r10.ebuild 4454
 MD5 90fe324466be29f9a8d0aeaaf2c5195c glibc-2.3.4.20050125-r1.ebuild 38956
@@ -18,7 +15,7 @@ MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
 MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
 MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
-MD5 75a0b557cb509aa85c10d0e277679125 files/digest-glibc-2.3.5-r1 515
+MD5 24e5a7eec6b28c1eb1c442981fe12ff3 files/digest-glibc-2.3.5-r1 515
 MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
@@ -129,10 +126,3 @@ MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch
 MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 MD5 b80890f83185acef8aeff622a1574e0b files/2.3.4/glibc-2.3.4-fix-_dl_next_tls_modid-assert.patch 9140
 MD5 ee692cfc6e7c810a2785093948638bbc files/2.3.4/glibc234-alpha-xstat.patch 7653
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC4IA4ArHZZzCEUG0RAgtSAJ4lKr2mJr9mZhey4c/7855wYENragCeM1xr
-Yn6uRxrVwr2oVJ5huuZwuyY=
-=g1ec
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5-r1 b/sys-libs/glibc/files/digest-glibc-2.3.5-r1
index 47a4631dca3a..e978f46cdd9b 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.5-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.5-r1
@@ -1,7 +1,7 @@
 MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139
 MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946
 MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118
-MD5 d8ff97afc442c4136ceb60de0980a71f glibc-2.3.5-patches-1.5.tar.bz2 19505
+MD5 a9f7fa3c8b39b1b2ff3ae71c417df6ee glibc-2.3.5-patches-1.6.tar.bz2 20350
 MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
 MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846
 MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index eef2772871c0..3602967e7c84 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.3 2005/07/17 11:16:32 eradicator Exp $
+# $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 $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="2.3.5"
 GLIBC_INFOPAGE_VERSION="2.3.5"
 
 # Gentoo patchset
-PATCH_VER="1.5"
+PATCH_VER="1.6"
 
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
@@ -48,7 +48,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp profile"
+IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -853,7 +853,7 @@ glibc_do_configure() {
 		if want_tls ; then
 			myconf="${myconf} --with-tls"
 
-			if want__thread && ! use glibc-compat20 ; then
+			if want__thread && use linuxthreads-tls ; then
 				myconf="${myconf} --with-__thread"
 			else
 				myconf="${myconf} --without-__thread"