Workaround for bug #90236 in 2.3.5. Bump of infopages in 2.3.5-r1.

(Portage version: 2.0.51.22-r1)

5 files changed, 12 insertions, 18 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 9ec65cafbf10..a0b06b20e466 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.363 2005/07/15 21:37:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.364 2005/07/17 11:16:32 eradicator Exp $
+
+  17 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild,
+  glibc-2.3.5-r1.ebuild:
+  Workaround for bug #90236 in 2.3.5.  Bump of infopages in 2.3.5-r1.
 
   15 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5.ebuild:
   Stable on x86. This pushes fixes for the nslookup bug and bugs #74555,
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 939c34a963bf..8088097920b1 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3f1cc6cce9b0a866c060abc9a7f56a50 ChangeLog 78170
 MD5 27fdc1158ea8cb334742f6b3d4a1c087 glibc-2.3.2-r12.ebuild 22297
 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 6e47fda8e00c9c1bb0ba0d524eebea73 glibc-2.3.5-r1.ebuild 39997
+MD5 b71a514e75e58acec8f4f982fd546748 glibc-2.3.5-r1.ebuild 39994
 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 c4e875a781a4250b5fd7ae9ac4ea27c6 files/digest-glibc-2.3.5-r1 518
+MD5 75a0b557cb509aa85c10d0e277679125 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
@@ -128,10 +125,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)
-
-iD8DBQFC2CyTArHZZzCEUG0RAmUdAJ9hnNTszOpVwxvzcQhEeL/j2iFYyQCfZsB/
-dV/BItcmZ82zDK3a5fxPggo=
-=aGCu
------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 d1ce61688d1b..47a4631dca3a 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.5-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.5-r1
@@ -3,5 +3,5 @@ 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 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148
-MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898
+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 62379d3726ff..eef2772871c0 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.2 2005/07/15 21:04:52 eradicator Exp $
+# $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 $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -24,7 +24,7 @@ BRANCH_UPDATE=""
 GLIBC_MANPAGE_VERSION="2.3.5"
 
 # From manual
-GLIBC_INFOPAGE_VERSION="2.3.4-r1"
+GLIBC_INFOPAGE_VERSION="2.3.5"
 
 # Gentoo patchset
 PATCH_VER="1.5"
diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild
index c8e0bc33b026..dc4c07085773 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.33 2005/07/15 21:26:05 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.34 2005/07/17 11:16:32 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 ; then
+		if want_tls && [[ ${CHOST} != "i586-pc-linux-gnu" ]] ; then
 			myconf="${myconf} --with-tls"
 
 			if want__thread ; then