Added a patch for mips which fixes a compile bug with newer binutils. Also removed an RDEPEND for portage-1.9.0 which seems to be triggering a bug in repoman. If this change affects anyone, yell at me.

5 files changed, 78 insertions, 41 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index cb3ce32d338d..1f178daf71ba 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.142 2004/04/18 16:24:33 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.143 2004/04/24 08:21:10 kumba Exp $
+
+  24 Apr 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch,
+  glibc-2.3.2-r10.ebuild, glibc-2.3.2-r3.ebuild:
+  Added a patch for mips which fixes a compile bug with newer binutils. Also
+  removed an RDEPEND for portage-1.9.0 which seems to be triggering a bug in
+  repoman. If this change affects anyone, yell at me.
+
+  24 Apr 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch,
+  glibc-2.3.2-r10.ebuild, glibc-2.3.2-r3.ebuild:
+  Added a patch for mips which fixes a compile bug with newer binutils. Also
+  removed an RDEPEND for portage-1.9.0 which seems to be triggering a bug in
+  repoman. If this change affects anyone, yell at me.
 
 *glibc-2.3.2-r10 (18 Apr 2004)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 45df3f54be9e..b2f30e8fb4e8 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,37 @@
+MD5 de00f7d8f50e6a0418c5081aab6d39e0 ChangeLog 29448
+MD5 b141dc6e9c4183e869f6d95f0f015b99 glibc-2.2.5-r9.ebuild 10002
+MD5 c675fc65c82674fa5dedece6e8c82ffd glibc-2.3.1-r5.ebuild 10872
+MD5 334737fe30ce1cb7a5af7c2d8f6e94cf glibc-2.3.2-r10.ebuild 18975
+MD5 2d68e9260ea54822015d849e930623df glibc-2.3.2-r2.ebuild 17924
+MD5 b2bb0c3c7c8ac1969de7d71dd2ba12f9 glibc-2.3.2-r3.ebuild 17317
+MD5 710007bfa23141efc12c168e51a9dfa2 glibc-2.3.2-r9.ebuild 18611
+MD5 ffd10287df8992da037e5c4eae817b3d glibc-2.3.3_pre20031210.ebuild 18970
+MD5 ddcc8af8d100e7638cd465c0508e7388 glibc-2.3.3_pre20040117-r1.ebuild 19187
+MD5 199699ee4b4f6c1029ad5c487a7318f8 glibc-2.3.3_pre20040117.ebuild 18481
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 04c966289d59e96a3e5d5e3fb94dc838 glibc-2.3.3_pre20040207.ebuild 19549
+MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
+MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r5 141
+MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296
+MD5 6b4ab93e3890f58e0845bbe51923eeb1 files/digest-glibc-2.3.2-r3 205
+MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312
+MD5 b5f28bc50aafc5ed560d7eef910dbe8b files/digest-glibc-2.3.3_pre20031210 148
+MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117 312
+MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312
+MD5 4555143fbcd20978747f7864f2f7fc01 files/digest-glibc-2.3.3_pre20040207 312
+MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
+MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
+MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
+MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
+MD5 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755
+MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
+MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
+MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
+MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
+MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
+MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
+MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r10 312
+MD5 026be2442305eef0a3e3ff897a14768e files/glibc-framestate-USING_SJLJ_EXCEPTIONS.patch 440
 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
@@ -17,24 +51,6 @@ MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.dif
 MD5 993732f56fdecf36f672198112fc5d5c files/2.2.5/glibc-2.2.5-threadsig.diff 636
 MD5 a50da56218f9aabc347d7e1130961cec files/2.2.5/glibc-2.2.5.divbyzero.patch 1694
 MD5 e9d9d086e8ed29ed49252d4cd0050f66 files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
-MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
-MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r5 141
-MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296
-MD5 6b4ab93e3890f58e0845bbe51923eeb1 files/digest-glibc-2.3.2-r3 205
-MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117 312
-MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312
-MD5 4555143fbcd20978747f7864f2f7fc01 files/digest-glibc-2.3.3_pre20040207 312
-MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
-MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
-MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
-MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
-MD5 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755
-MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
-MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
-MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
-MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
-MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
-MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
 MD5 21506827cc2094c80d3c0c0e8ef3569c files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 MD5 66d8b78875e17e2d385a4d52af9698c4 files/2.3.1/glibc-2.3.1-ctype-compat.patch 728
@@ -75,6 +91,7 @@ MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand
 MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
 MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445
 MD5 15ac94e1ccc48f31120960dfe006818a files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch 2262
+MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
 MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
 MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
 MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
@@ -84,27 +101,12 @@ MD5 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-fun
 MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069
 MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
 MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
-MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
 MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
-MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
+MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
 MD5 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
+MD5 df41c3a20ead370c2208599cf4251f3d files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch 612
 MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
 MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff 1425
+MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752
 MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
 MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
-MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752
-MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r10 312
-MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312
-MD5 b5f28bc50aafc5ed560d7eef910dbe8b files/digest-glibc-2.3.3_pre20031210 148
-MD5 0aedfd964e35a565c839748a44d349ac ChangeLog 28710
-MD5 b141dc6e9c4183e869f6d95f0f015b99 glibc-2.2.5-r9.ebuild 10002
-MD5 2d68e9260ea54822015d849e930623df glibc-2.3.2-r2.ebuild 17924
-MD5 3ad8953f39f8ffd4d2039a866e10af5f glibc-2.3.2-r3.ebuild 17354
-MD5 199699ee4b4f6c1029ad5c487a7318f8 glibc-2.3.3_pre20040117.ebuild 18481
-MD5 c675fc65c82674fa5dedece6e8c82ffd glibc-2.3.1-r5.ebuild 10872
-MD5 04c966289d59e96a3e5d5e3fb94dc838 glibc-2.3.3_pre20040207.ebuild 19549
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 c64682f8f983241ba47ba9ec8f009aa7 glibc-2.3.2-r10.ebuild 18903
-MD5 ddcc8af8d100e7638cd465c0508e7388 glibc-2.3.3_pre20040117-r1.ebuild 19187
-MD5 ffd10287df8992da037e5c4eae817b3d glibc-2.3.3_pre20031210.ebuild 18970
-MD5 710007bfa23141efc12c168e51a9dfa2 glibc-2.3.2-r9.ebuild 18611
diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch
new file mode 100644
index 000000000000..03c6a6b1ec4f
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch
@@ -0,0 +1,21 @@
+--- sysdeps/mips/dl-machine.h.org	Thu Apr 15 11:24:26 2004
++++ sysdeps/mips/dl-machine.h	Thu Apr 15 11:38:28 2004
+@@ -474,7 +474,7 @@
+ 	" STRINGXP(PTR_LA) " $25, _dl_start_user\n\
+ 	.globl _dl_start_user\n\
+ 	.type _dl_start_user,@function\n\
+-	.ent _dl_start_user\n\
++	.aent _dl_start_user\n\
+ _dl_start_user:\n\
+ 	" STRINGXP(SETUP_GP) "\n\
+ 	" STRINGXV(SETUP_GP64($18,_dl_start_user)) "\n\
+@@ -512,8 +512,7 @@
+ 	" STRINGXP(PTR_LA) " $2, _dl_fini\n\
+ 	# Jump to the user entry point.\n\
+ 	move $25, $17\n\
+-	jr $25\n\
+-	.end _dl_start_user\n\t"\
++	jr $25\n\t"\
+ 	_RTLD_EPILOGUE(ENTRY_POINT)\
+ 	".previous"\
+ );
diff --git a/sys-libs/glibc/glibc-2.3.2-r10.ebuild b/sys-libs/glibc/glibc-2.3.2-r10.ebuild
index a84646701476..92a803e35cd3 100644
--- a/sys-libs/glibc/glibc-2.3.2-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r10.ebuild,v 1.3 2004/04/24 07:49:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r10.ebuild,v 1.4 2004/04/24 08:21:10 kumba Exp $
 
 IUSE="nls pic build nptl"
 
@@ -350,6 +350,7 @@ src_unpack() {
 		epatch ${FILESDIR}/2.3.2/${P}-mips-add-n32-n64-sysdep-cancel.patch
 		epatch ${FILESDIR}/2.3.2/${P}-mips-configure-for-n64-symver.patch
 		epatch ${FILESDIR}/2.3.2/${P}-mips-pread-linux2.5.patch
+		epatch ${FILESDIR}/2.3.2/${P}-mips-fix-nested-entend-pairs.patch
 	fi
 
 	if [ "${ARCH}" = "alpha" ]
diff --git a/sys-libs/glibc/glibc-2.3.2-r3.ebuild b/sys-libs/glibc/glibc-2.3.2-r3.ebuild
index 19d548e5ab61..749a22305fb0 100644
--- a/sys-libs/glibc/glibc-2.3.2-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r3.ebuild,v 1.15 2004/03/25 06:55:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r3.ebuild,v 1.16 2004/04/24 08:21:10 kumba Exp $
 
 IUSE="nls pic build nptl"
 
@@ -71,8 +71,7 @@ DEPEND=">=sys-devel/gcc-3.2
 
 RDEPEND="virtual/os-headers
 	sys-apps/baselayout
-	nls? ( sys-devel/gettext )
-	build? ( >=sys-apps/portage-1.9.0 )"
+	nls? ( sys-devel/gettext )"
 
 PROVIDE="virtual/glibc"