fixed header dependency based on NPTL use flag

3 files changed, 95 insertions, 89 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index e05cd625a0f5..7f6ad938d1b7 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.164 2004/06/03 21:38:34 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.165 2004/06/04 01:19:21 jhuebel Exp $
+
+  03 Jun 2004; Jason Eric Huebel <jhuebel@gentoo.org>
+  glibc-2.3.3_pre20040529.ebuild:
+  fixed header dependency based on NPTL use flag
 
 *glibc-2.3.4.20040602 (03 Jun 2004)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 30034ea8ec04..da91cd6b8b09 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,130 +1,130 @@
-MD5 8d9eb3b90c582ab6b42ab52d6c335df8 glibc-2.3.3_pre20040420-r1.ebuild 20195
-MD5 37180d536733ae205d0db321571cd5ca glibc-2.3.3_pre20040117-r1.ebuild 19232
+MD5 93a75d058eca5c9de4a1c144b0c7fa1f ChangeLog 33888
+MD5 b141dc6e9c4183e869f6d95f0f015b99 glibc-2.2.5-r9.ebuild 10002
+MD5 c1f9466ec8250dd47beb7a71f7c536fe glibc-2.3.1-r5.ebuild 10719
+MD5 6ae51bfd7e5cc6af9b1ea678354a8760 glibc-2.3.2-r2.ebuild 17968
 MD5 6ac96ce0f33c3d794730111609c45576 glibc-2.3.2-r3.ebuild 17308
-MD5 40b73d3cb79e611b0b6a3385f1601e32 glibc-2.3.3_pre20040207.ebuild 19594
+MD5 32383b07afc0abdbb3a8da5fe539a696 glibc-2.3.2-r9.ebuild 18657
 MD5 c09629c691d99b48b52e8ee8083cd1da glibc-2.3.3_pre20031210.ebuild 19015
-MD5 eeff6a97091a5189c86c79a8d4496b86 glibc-2.3.3_pre20040529.ebuild 21321
-MD5 081030d4ac6e9b8879727089b52b28fd glibc-2.3.2-r10.ebuild 19418
+MD5 37180d536733ae205d0db321571cd5ca glibc-2.3.3_pre20040117-r1.ebuild 19232
 MD5 03c72a7da4b62b7c73dbb67b70252a20 glibc-2.3.3_pre20040117.ebuild 18526
-MD5 6ae51bfd7e5cc6af9b1ea678354a8760 glibc-2.3.2-r2.ebuild 17968
-MD5 c1f9466ec8250dd47beb7a71f7c536fe glibc-2.3.1-r5.ebuild 10719
-MD5 ca0ba00ab824cb60084e52d0115101b4 ChangeLog 33745
-MD5 8e0c5284b715af1e90ed2c0e2184599c glibc-2.3.3_pre20040420.ebuild 19887
+MD5 40b73d3cb79e611b0b6a3385f1601e32 glibc-2.3.3_pre20040207.ebuild 19594
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 081030d4ac6e9b8879727089b52b28fd glibc-2.3.2-r10.ebuild 19418
+MD5 8e0c5284b715af1e90ed2c0e2184599c glibc-2.3.3_pre20040420.ebuild 19887
+MD5 8d9eb3b90c582ab6b42ab52d6c335df8 glibc-2.3.3_pre20040420-r1.ebuild 20195
+MD5 5c6ad09e28dedadd290989e99422b1a2 glibc-2.3.3_pre20040529.ebuild 21424
 MD5 ec61dfd9fe1d3132a1e1902eabae290e glibc-2.3.4.20040602.ebuild 15551
-MD5 b141dc6e9c4183e869f6d95f0f015b99 glibc-2.2.5-r9.ebuild 10002
-MD5 32383b07afc0abdbb3a8da5fe539a696 glibc-2.3.2-r9.ebuild 18657
-MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
-MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
-MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
-MD5 c02420990c4908a6336d81ea5192a37e files/glibc-manpages-2.3.1.tar.bz2 14755
 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 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
+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 7be2db5a70ca652f71c7d6ede0636768 files/digest-glibc-2.3.4.20040602 75
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420-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 b5f28bc50aafc5ed560d7eef910dbe8b files/digest-glibc-2.3.3_pre20031210 148
-MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117 312
-MD5 4555143fbcd20978747f7864f2f7fc01 files/digest-glibc-2.3.3_pre20040207 312
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420 312
-MD5 268eda0de40469d19bb7ff5c5cb7ec82 files/digest-glibc-2.3.3_pre20040529 312
-MD5 04a66432c1faec180a8f84d866ed2555 files/locales.build 681
+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 04a66432c1faec180a8f84d866ed2555 files/locales.build 681
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r10 312
-MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
-MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
-MD5 93c2f3cb1c07d9a39da245b065c74f6c files/2.2.5/glibc-2.2.5-divdi3.diff 9752
-MD5 7481046043f42ecf4ac0a218abc896fc files/2.2.5/glibc-2.2.5-gcc311.patch 534
-MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.diff 2460
-MD5 e9d9d086e8ed29ed49252d4cd0050f66 files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
-MD5 a12b84b5af2808f5c0223259f7a9610c files/2.2.5/glibc-2.2.5-sparc-mathinline.patch 1014
-MD5 b07a316cbba4ddc1e1bb094a3056f12f files/2.2.5/glibc-2.2.5-ppc-semctl.diff 1337
-MD5 1c3b30834a25149e4738eead113462ad files/2.2.5/glibc-2.2.5-getgrouplist.patch 708
-MD5 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420-r1 312
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420 312
+MD5 268eda0de40469d19bb7ff5c5cb7ec82 files/digest-glibc-2.3.3_pre20040529 312
+MD5 7be2db5a70ca652f71c7d6ede0636768 files/digest-glibc-2.3.4.20040602 75
+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
-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 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
+MD5 93c2f3cb1c07d9a39da245b065c74f6c files/2.2.5/glibc-2.2.5-divdi3.diff 9752
 MD5 b12e1a7de85cd82bcb341863643c9ffd files/2.2.5/glibc-2.2.5-dns-network-overflow.diff 365
+MD5 7481046043f42ecf4ac0a218abc896fc files/2.2.5/glibc-2.2.5-gcc311.patch 534
+MD5 1c3b30834a25149e4738eead113462ad files/2.2.5/glibc-2.2.5-getgrouplist.patch 708
+MD5 b07a316cbba4ddc1e1bb094a3056f12f files/2.2.5/glibc-2.2.5-ppc-semctl.diff 1337
 MD5 c34a3c6bf21274a506090f05b7ea60ff files/2.2.5/glibc-2.2.5-ppc-sqrtl.diff 715
 MD5 c7783e49497814c3d86bd63bbed2a9b3 files/2.2.5/glibc-2.2.5-sandbox.diff 438
+MD5 a12b84b5af2808f5c0223259f7a9610c files/2.2.5/glibc-2.2.5-sparc-mathinline.patch 1014
 MD5 6bdfb930ffdfdeb6b2ee823fefe42513 files/2.2.5/glibc-2.2.5-sparc-misc.diff 12252
-MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
-MD5 6afbd6fe65c0e2034587ba6d1da427a3 files/2.2.5/glibc-2.2.5-sparc64-fixups.diff 1407
 MD5 96914104dbdc2807c84549c3d20cb47c files/2.2.5/glibc-2.2.5-sparc32-semctl.patch 6311
-MD5 2474bda0015ede78a23190c3051a599b files/2.3.1/glibc-2.3.1-tst-rndseek-mips.patch 446
+MD5 6afbd6fe65c0e2034587ba6d1da427a3 files/2.2.5/glibc-2.2.5-sparc64-fixups.diff 1407
+MD5 e6dc1e4d7839d2bb08c6865466791183 files/2.2.5/glibc-2.2.5-sunrpc-overflow.diff 2460
+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 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
-MD5 5a528678247e6bafe92d2483383afd5b files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
-MD5 afaf2540d2803ac066eb2555f2019a6f files/2.3.1/glibc-2.3.1-exit-syscall-mips.patch 633
 MD5 4f8ecd70003c5ca153ff7c204c54c1cf files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch 1246
-MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
-MD5 035d42c51f2397339c1518baa06e3a81 files/2.3.1/glibc23-04-hppa-fcntl64.dpatch 2085
-MD5 1f715052e230f60a1e5c5f72b193f0bf files/2.3.1/glibc-2.3.1-sscanf.patch 392
+MD5 afaf2540d2803ac066eb2555f2019a6f files/2.3.1/glibc-2.3.1-exit-syscall-mips.patch 633
+MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
+MD5 4123a64b0004d505d22d811ba4aae451 files/2.3.1/glibc-2.3.1-ftw.patch 4622
 MD5 0da8ef4341ed31232e1c9e0da96f9c79 files/2.3.1/glibc-2.3.1-getgrouplist.patch 1680
-MD5 41599dc27ba12b5f2428056dc0ebb1d1 files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
+MD5 235976914abfab3408d8d63cb4ffebe2 files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
-MD5 75983ceba061c090373c14394d08d32c files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
-MD5 a49946706c7f248294896eeb64308a09 files/2.3.1/glibc23-03-hppa-mcontext.dpatch 1402
-MD5 1e95cbf4aed1619831947cdd35c73108 files/2.3.1/glibc23-hppa-shmlba.dpatch 1754
-MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
-MD5 e1cbb66f3d9823cf5a05ce52b2223acf files/2.3.1/glibc-2.3.1-ulps-mips.patch 27618
+MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
 MD5 f15c6dec40cefa86dae48a7dcb3b779a files/2.3.1/glibc-2.3.1-librt-mips.patch 396
+MD5 1968bc39ae8224c1dee9534781203d2e files/2.3.1/glibc-2.3.1-locale.patch 8666
+MD5 cdbf2aacfaae7737f89ae733f148169c files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
+MD5 1f715052e230f60a1e5c5f72b193f0bf files/2.3.1/glibc-2.3.1-sscanf.patch 392
 MD5 d84791059f1b4e7b157b3bbefe783208 files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
-MD5 235976914abfab3408d8d63cb4ffebe2 files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
+MD5 2474bda0015ede78a23190c3051a599b files/2.3.1/glibc-2.3.1-tst-rndseek-mips.patch 446
+MD5 75983ceba061c090373c14394d08d32c files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch 848
+MD5 e1cbb66f3d9823cf5a05ce52b2223acf files/2.3.1/glibc-2.3.1-ulps-mips.patch 27618
+MD5 5a528678247e6bafe92d2483383afd5b files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
 MD5 b8f6b8b0ed8649fc9af439adef7472f2 files/2.3.1/glibc23-01-hppa-dl-machine.dpatch 12226
-MD5 1968bc39ae8224c1dee9534781203d2e files/2.3.1/glibc-2.3.1-locale.patch 8666
+MD5 7f8ec486f1669036429acc8b272c453e files/2.3.1/glibc23-02-hppa-min-kern-unwind-fde.dpatch 1728
+MD5 a49946706c7f248294896eeb64308a09 files/2.3.1/glibc23-03-hppa-mcontext.dpatch 1402
+MD5 035d42c51f2397339c1518baa06e3a81 files/2.3.1/glibc23-04-hppa-fcntl64.dpatch 2085
 MD5 a91843899c8ef4b59341313915f177b4 files/2.3.1/glibc23-05-hppa-buildhack.dpatch 1134
-MD5 dc18731db5bd28b8bd2074fc9177fd35 files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
-MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
 MD5 2b746db4988cf7f5c6824302561b7eb5 files/2.3.1/glibc23-06-hppa-tests.dpatch 21021
-MD5 4123a64b0004d505d22d811ba4aae451 files/2.3.1/glibc-2.3.1-ftw.patch 4622
-MD5 7f8ec486f1669036429acc8b272c453e files/2.3.1/glibc23-02-hppa-min-kern-unwind-fde.dpatch 1728
-MD5 cdbf2aacfaae7737f89ae733f148169c files/2.3.1/glibc-2.3.1-prelinkfix.patch 5005
-MD5 21506827cc2094c80d3c0c0e8ef3569c files/2.3.1/glibc-2.3.1-ctype-compat-v2.patch 1468
-MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
-MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
+MD5 dc18731db5bd28b8bd2074fc9177fd35 files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
+MD5 41599dc27ba12b5f2428056dc0ebb1d1 files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
+MD5 1e95cbf4aed1619831947cdd35c73108 files/2.3.1/glibc23-hppa-shmlba.dpatch 1754
 MD5 080146d608b878d517b5cf4c29f0ef08 files/2.3.2/glibc-2.3.2-alpha-crti.patch 378
-MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
-MD5 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch 5107
-MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
-MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
-MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
-MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506
 MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
-MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
+MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506
+MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
 MD5 2f6605aae9bc4e538af783c0b2be3a7f files/2.3.2/glibc-2.3.2-decc-compaq.patch 1422
-MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
+MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
 MD5 8d75a288ff9aa450717048b43497c82c files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch 1945
-MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
-MD5 026be2442305eef0a3e3ff897a14768e files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch 440
-MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
+MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
+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 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
-MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
 MD5 15ac94e1ccc48f31120960dfe006818a files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch 2262
-MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
-MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
-MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
-MD5 df41c3a20ead370c2208599cf4251f3d files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch 612
-MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
 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
+MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
+MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
+MD5 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch 5107
 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 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
+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 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
+MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
+MD5 026be2442305eef0a3e3ff897a14768e files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch 440
+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 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
-MD5 9e2c8ac6d3fa8494ecb962b675f412b5 files/2.3.3/ssp.c 3936
-MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
-MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
-MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
-MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497
-MD5 69d86fa55810b4d327d0cb35042c034f files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch 538
 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 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
+MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497
 MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287
-MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
+MD5 9e2c8ac6d3fa8494ecb962b675f412b5 files/2.3.3/ssp.c 3936
+MD5 69d86fa55810b4d327d0cb35042c034f files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch 538
diff --git a/sys-libs/glibc/glibc-2.3.3_pre20040529.ebuild b/sys-libs/glibc/glibc-2.3.3_pre20040529.ebuild
index beeb54afcb50..335cbea346b1 100644
--- a/sys-libs/glibc/glibc-2.3.3_pre20040529.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3_pre20040529.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.3_pre20040529.ebuild,v 1.6 2004/06/02 09:35:44 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20040529.ebuild,v 1.7 2004/06/04 01:19:21 jhuebel Exp $
 
 IUSE="nls pic build nptl erandom hardened"
 
@@ -66,7 +66,9 @@ LICENSE="LGPL-2"
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
 DEPEND=">=sys-devel/gcc-3.2.3-r1
-	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
+	nptl? ( >=sys-devel/gcc-3.3.1-r1 
+		amd64? ( >=sys-kernel/linux-headers-2.6.6 ) )
+	amd64? ( !nptl? ( =sys-kernel/linux-headers-2.4* ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	virtual/os-headers
 	nls? ( sys-devel/gettext )"