added an ebuild with a proper version number. new features in this ebuild include the makecheck USE flag for having glibc run tests on itself and the ability to install only the locales that you want. a new configuration file has been added for controlling this feature: /etc/locales.build. a default should be installed when you emerge this version of glibc, please read the comments for a description of this file's format.

5 files changed, 242 insertions, 411 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 6e5e9c9ad18c..e05cd625a0f5 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,17 @@
 # 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.163 2004/06/02 21:23:05 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.164 2004/06/03 21:38:34 lv Exp $
+
+*glibc-2.3.4.20040602 (03 Jun 2004)
+
+  03 Jun 2004; Travis Tilley <lv@gentoo.org> -glibc-2.3.3.20040602.ebuild,
+  +glibc-2.3.4.20040602.ebuild:
+  added an ebuild with a proper version number. new features in this ebuild
+  include the makecheck USE flag for having glibc run tests on itself and the
+  ability to install only the locales that you want. a new configuration file
+  has been added for controlling this feature: /etc/locales.build. a default
+  should be installed when you emerge this version of glibc, please read the
+  comments for a description of this file's format.
 
   02 Jun 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> glibc-2.3.3_pre20040420-r1.ebuild:
   Mased stable on ppc
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0994a2f4a991..a1f8461a6800 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,129 +1,130 @@
-MD5 392a9656c907af61d3ac52256eb5e51f ChangeLog 33168
-MD5 b141dc6e9c4183e869f6d95f0f015b99 glibc-2.2.5-r9.ebuild 10002
-MD5 c1f9466ec8250dd47beb7a71f7c536fe glibc-2.3.1-r5.ebuild 10719
-MD5 081030d4ac6e9b8879727089b52b28fd glibc-2.3.2-r10.ebuild 19418
-MD5 6ae51bfd7e5cc6af9b1ea678354a8760 glibc-2.3.2-r2.ebuild 17968
+MD5 8d9eb3b90c582ab6b42ab52d6c335df8 glibc-2.3.3_pre20040420-r1.ebuild 20195
+MD5 37180d536733ae205d0db321571cd5ca glibc-2.3.3_pre20040117-r1.ebuild 19232
 MD5 6ac96ce0f33c3d794730111609c45576 glibc-2.3.2-r3.ebuild 17308
-MD5 32383b07afc0abdbb3a8da5fe539a696 glibc-2.3.2-r9.ebuild 18657
-MD5 12e44c22b22d0443c73ae231301cc532 glibc-2.3.3.20040602.ebuild 21016
+MD5 40b73d3cb79e611b0b6a3385f1601e32 glibc-2.3.3_pre20040207.ebuild 19594
 MD5 c09629c691d99b48b52e8ee8083cd1da glibc-2.3.3_pre20031210.ebuild 19015
-MD5 37180d536733ae205d0db321571cd5ca glibc-2.3.3_pre20040117-r1.ebuild 19232
+MD5 eeff6a97091a5189c86c79a8d4496b86 glibc-2.3.3_pre20040529.ebuild 21321
+MD5 081030d4ac6e9b8879727089b52b28fd glibc-2.3.2-r10.ebuild 19418
 MD5 03c72a7da4b62b7c73dbb67b70252a20 glibc-2.3.3_pre20040117.ebuild 18526
-MD5 40b73d3cb79e611b0b6a3385f1601e32 glibc-2.3.3_pre20040207.ebuild 19594
-MD5 8d9eb3b90c582ab6b42ab52d6c335df8 glibc-2.3.3_pre20040420-r1.ebuild 20195
-MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 6ae51bfd7e5cc6af9b1ea678354a8760 glibc-2.3.2-r2.ebuild 17968
+MD5 c1f9466ec8250dd47beb7a71f7c536fe glibc-2.3.1-r5.ebuild 10719
+MD5 392a9656c907af61d3ac52256eb5e51f ChangeLog 33168
 MD5 8e0c5284b715af1e90ed2c0e2184599c glibc-2.3.3_pre20040420.ebuild 19887
-MD5 eeff6a97091a5189c86c79a8d4496b86 glibc-2.3.3_pre20040529.ebuild 21321
+MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 891d3c89f329dafcd510b0d8175133b8 glibc-2.3.4.20040602.ebuild 15515
+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 d1ca8e4a3be112d9a5d5c81177c36da3 files/digest-glibc-2.3.3.20040602 231
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r5 141
-MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r10 312
 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 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312
-MD5 4555143fbcd20978747f7864f2f7fc01 files/digest-glibc-2.3.3_pre20040207 312
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420 312
+MD5 7be2db5a70ca652f71c7d6ede0636768 files/digest-glibc-2.3.4.20040602 75
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420-r1 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 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 d1ca8e4a3be112d9a5d5c81177c36da3 files/digest-glibc-2.3.3.20040602 231
-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 56a7a0273e0666eb40b0c6b45d62881d files/2.2.5/glibc-2.2.5-arm-sysdeps-fix.diff 362
+MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
+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 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 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 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 b12e1a7de85cd82bcb341863643c9ffd files/2.2.5/glibc-2.2.5-dns-network-overflow.diff 365
 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 96914104dbdc2807c84549c3d20cb47c files/2.2.5/glibc-2.2.5-sparc32-semctl.patch 6311
+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 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 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 66d8b78875e17e2d385a4d52af9698c4 files/2.3.1/glibc-2.3.1-ctype-compat.patch 728
-MD5 4f8ecd70003c5ca153ff7c204c54c1cf files/2.3.1/glibc-2.3.1-elf-machine-rela-mips.patch 1246
+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 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 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 0da8ef4341ed31232e1c9e0da96f9c79 files/2.3.1/glibc-2.3.1-getgrouplist.patch 1680
-MD5 235976914abfab3408d8d63cb4ffebe2 files/2.3.1/glibc-2.3.1-inline-syscall-mips.patch 7753
+MD5 41599dc27ba12b5f2428056dc0ebb1d1 files/2.3.1/glibc23-08-hppa-configure.dpatch 4704
 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
-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 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 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 5a528678247e6bafe92d2483383afd5b files/2.3.1/glibc23-00-hppa-pthreads.dpatch 29951
+MD5 f15c6dec40cefa86dae48a7dcb3b779a files/2.3.1/glibc-2.3.1-librt-mips.patch 396
+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 b8f6b8b0ed8649fc9af439adef7472f2 files/2.3.1/glibc23-01-hppa-dl-machine.dpatch 12226
-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 1968bc39ae8224c1dee9534781203d2e files/2.3.1/glibc-2.3.1-locale.patch 8666
 MD5 a91843899c8ef4b59341313915f177b4 files/2.3.1/glibc23-05-hppa-buildhack.dpatch 1134
-MD5 2b746db4988cf7f5c6824302561b7eb5 files/2.3.1/glibc23-06-hppa-tests.dpatch 21021
 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 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 080146d608b878d517b5cf4c29f0ef08 files/2.3.2/glibc-2.3.2-alpha-crti.patch 378
-MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
+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 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 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
+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 2f6605aae9bc4e538af783c0b2be3a7f files/2.3.2/glibc-2.3.2-decc-compaq.patch 1422
-MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
+MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
 MD5 8d75a288ff9aa450717048b43497c82c files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch 1945
-MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
+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 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
+MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
 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 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 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 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
+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 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 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
 MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
-MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
-MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
-MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
-MD5 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
+MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
+MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069
 MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff 1425
-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 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 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
 MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287
-MD5 9e2c8ac6d3fa8494ecb962b675f412b5 files/2.3.3/ssp.c 3936
+MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.3.20040602 b/sys-libs/glibc/files/digest-glibc-2.3.3.20040602
deleted file mode 100644
index 3fe678317bf6..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.3.3.20040602
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 581acc5e4b205c1e43c7cf024e6ef969 glibc-2.3.3.20040602.tar.bz2 13673215
-MD5 894b8969cfbdf787c73e139782167607 glibc-linuxthreads-2.3.2.tar.bz2 216310
-MD5 c7c27c0821245d98a0568a475c08f4e9 glibc-2.3.2-hppa-patches-p1.tar.bz2 18793
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040602 b/sys-libs/glibc/files/digest-glibc-2.3.4.20040602
new file mode 100644
index 000000000000..89098986c68d
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20040602
@@ -0,0 +1 @@
+MD5 44f3fcc6d76c9ce94b9be482e330631c glibc-2.3.4-20040602.tar.bz2 13767024
diff --git a/sys-libs/glibc/glibc-2.3.3.20040602.ebuild b/sys-libs/glibc/glibc-2.3.4.20040602.ebuild
index 773c3c80ad73..471974c4770e 100644
--- a/sys-libs/glibc/glibc-2.3.3.20040602.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040602.ebuild
@@ -1,8 +1,8 @@
 # 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.20040602.ebuild,v 1.2 2004/06/02 20:05:55 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040602.ebuild,v 1.1 2004/06/03 21:38:34 lv Exp $
 
-IUSE="nls pic build nptl erandom hardened"
+IUSE="nls pic build nptl erandom hardened makecheck"
 
 inherit eutils flag-o-matic gcc
 
@@ -37,24 +37,9 @@ export CFLAGS="${CFLAGS//-O?} -O2"
 export CXXFLAGS="${CFLAGS}"
 export LDFLAGS="${LDFLAGS//-Wl,--relax}"
 
-# Minimum kernel version for --enable-kernel
-export MIN_KV="2.4.1"
-# Minimum kernel version for enabling TLS and NPTL ...
-# NOTE: do not change this if you do not know what
-#       you are doing !
-export MIN_NPTL_KV="2.6.0"
-
-#MY_PV="${PV/_}"
-MY_PV="2.3.2"
-#S="${WORKDIR}/${P%_*}"
-#S="${WORKDIR}/${PN}-${MY_PV}"
-S="${WORKDIR}/libc/"
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="http://dev.gentoo.org/~lv/glibc-2.3.3.20040602.tar.bz2
-	http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${MY_PV}.tar.bz2
-	ftp://sources.redhat.com/pub/glibc/snapshots/glibc-linuxthreads-${MY_PV}.tar.bz2
-	hppa? ( mirror://gentoo/${PN}-2.3.2-hppa-patches-p1.tar.bz2 )"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+SRC_URI="http://dev.gentoo.org/~lv/glibc-2.3.4-20040602.tar.bz2"
+HOMEPAGE="http://sources.redhat.com/glibc/"
 
 #KEYWORDS="~x86 ~mips ~sparc ~amd64 -hppa ~ia64 ~ppc" # breaks on ~alpha
 #KEYWORDS="-* ~amd64 ~ppc64 ~mips"
@@ -64,10 +49,14 @@ SLOT="2.2"
 LICENSE="LGPL-2"
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
+# We also need linux-headers-2.6.6 if using NPTL. Including kernel headers is
+# incredibly unreliable, and this new linux-headers release from plasmaroo
+# should work with userspace apps, at least on amd64 and ppc64.
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	virtual/os-headers
+	nptl? ( =sys-kernel/linux-headers-2.6.6 )
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
 	sys-apps/baselayout
@@ -75,93 +64,114 @@ RDEPEND="virtual/os-headers
 
 PROVIDE="virtual/glibc"
 
+setup_flags() {
+	# -freorder-blocks for all but ia64 s390 s390x
+	use ppc || append-flags "-freorder-blocks"
 
-# Try to get a kernel source tree with version equal or greater
-# than $1.  We basically just try a few default locations.  The
-# version need to be that which KV_to_int() returns ...
-get_KHV() {
-	local headers=
-
-	[ -z "$1" ] && return 1
-
-	# - First check if linux-headers are installed (or symlink
-	#   to current kernel ...)
-	# - Ok, do we have access to the current kernel's headers ?
-	# - Last option ... maybe its a weird bootstrap with /lib
-	#   binded to the chroot ...
-
-	# We do not really support more than 2 arguments ...
-	if [ -n "$2" ]
+	# Sparc/Sparc64 support
+	if use sparc
 	then
-		headers="$2"
-	else
-		headers="${ROOT}/usr/include \
-				 usr/src/linux/include \
-				 ${ROOT}/usr/src/linux/include \
-		         /lib/modules/`uname -r`/build/include \
-		         ${ROOT}/lib/modules/`uname -r`/build/include"
-	fi
 
-	for x in ${headers}
-	do
-		local header="${x}/linux/version.h"
+		# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+		replace-flags "-fcall-used-g7" ""
+		append-flags "-fcall-used-g6"
 
-		if [ -f ${header} ]
+		# Sparc64 Only support...
+		if [ "${PROFILE_ARCH}" = "sparc64" ]
 		then
 
-			local version="`grep 'LINUX_VERSION_CODE' ${header} | \
-				sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`"
+			# Get rid of -mcpu options, the CHOST will fix this up
+			replace-flags "-mcpu=ultrasparc" ""
+			replace-flags "-mcpu=v9" ""
 
-			if [ "${version}" -ge "$1" ]
-			then
-				echo "${x}"
+			# Get rid of flags known to fail
+			replace-flags "-mvis" ""
 
-				return 0
-			fi
+			# Setup the CHOST properly to insure "sparcv9"
+			# This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler
+			[ "${CHOST}" == "sparc-unknown-linux-gnu" ] && \
+				export CHOST="sparcv9-unknown-linux-gnu"
 		fi
-	done
+	fi
+
+	# temporary fix for a few gcc 3.4 related problems
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		append-flags -fno-unit-at-a-time
+	fi
+
+}
+
+want_nptl() {
+	(use amd64 || use ppc || use ppc64 || use sparc || use s390 || \
+		use ia64 || use alpha) && return 0
+	use x86 && if [ "${CHOST/-*}" = "i486" -o "${CHOST/-*}" = "i586" -o \
+		"${CHOST/-*}" = "i686" ] ; then return 0 ; fi
+	return 1
+}
 
+want_tls() {
+	(use amd64 || use ia64 || use s390 || use alpha || use sparc || \
+		use ppc || use ppc64 || use x86) && return 0
 	return 1
 }
 
-use_nptl() {
-	# Enable NPTL support if:
-	# - We have 'nptl' in USE
-	# - We have linux-2.5 or later kernel (should prob check for 2.4.20 ...)
-	if [ -n "`use nptl`" -a "`get_KV`" -ge "`KV_to_int ${MIN_NPTL_KV}`"  ]
+do_makecheck() {
+	ATIME=`mount | awk '{ print $3,$6 }' | grep ^\/\  | grep noatime`
+	if [ "$ATIME" = "" ]
 	then
-		# Enable NPTL support if:
-		# - We have 'x86' in USE and:
-		#   - a CHOST of "i486-pc-linux-gnu"
-		#   - a CHOST of "i586-pc-linux-gnu"
-		#   - a CHOST of "i686-pc-linux-gnu"
-		# - Or we have 'alpha' in USE
-		# - Or we have 'amd64' in USE
-		# - Or we have 'mips' in USE
-		# - Or we have 'ppc' in USE
-		case ${ARCH} in
-			"x86")
-				if [ "${CHOST/-*}" = "i486" -o \
-				     "${CHOST/-*}" = "i586" -o \
-					 "${CHOST/-*}" = "i686" ]
-				then
-					return 0
-				fi
-				;;
-			"alpha"|"amd64"|"ia64"|"mips"|"ppc"|"ppc64"|"sparc")
-				return 0
-				;;
-			*)
-				return 1
-				;;
-		esac
+		cd ${WORKDIR}/build
+		make check || die
+	else
+		ewarn "remounting / without noatime option so that make check"
+		ewarn "does not fail!"
+		sleep 2
+		mount / -o remount,atime
+		cd ${WORKDIR}/build
+		make check || die
+		einfo "remounting / with noatime"
+		mount / -o remount,noatime
 	fi
+}
 
-	return 1
+install_locales() {
+	unset LANGUAGE LANG LC_ALL
+	cd ${WORKDIR}/build
+	make PARALLELMFLAGS="${MAKEOPTS}" \
+		install_root=${D} localedata/install-locales || die
+	keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
+}
+
+setup_locales() {
+	if use nls
+	then
+		einfo "nls in USE, installing -ALL- locales..."
+		install_locales
+	fi
+
+	if [ -e /etc/locales.build ]
+	then
+		einfo "Installing locales in /etc/locales.build..."
+		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
+		cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+			>> SUPPORTED.locales
+		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
+		install_locales || die
+	elif [ -e ${FILESDIR}/locales.build ]
+	then
+		einfo "Installing locales in ${FILESDIR}/locales.build..."
+		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
+		cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
+			>> SUPPORTED.locales
+		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
+		install_locales || die
+	else
+		einfo "Installing -ALL- locales..."
+		install_locales || die
+	fi
 }
 
 pkg_setup() {
-	die "this ebuild is broken and shouldnt be used yet!"
 	# We need gcc 3.2 or later ...
 	if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ]
 	then
@@ -173,52 +183,7 @@ pkg_setup() {
 
 	echo
 
-	if use_nptl
-	then
-		# The use_nptl should have already taken care of kernel version,
-		# arch and CHOST, so now just check if we can find suitable kernel
-		# source tree or headers ....
-		einfon "Checking for sufficient version kernel headers ... "
-		if ! get_KHV "`KV_to_int ${MIN_NPTL_KV}`" &> /dev/null
-		then
-			echo "no"
-			echo
-			eerror "Could not find a kernel source tree or headers with"
-			eerror "version ${MIN_NPTL_KV} or later!  Please correct this"
-			eerror "and try again."
-			die "Insufficient kernel headers present!"
-		else
-			echo "yes"
-		fi
-	fi
-
-	if [ "$(KV_to_int $(uname -r))" -gt "`KV_to_int '2.5.68'`" ]
-	then
-		local KERNEL_HEADERS="$(get_KHV "`KV_to_int ${MIN_NPTL_KV}`")"
-
-		einfon "Checking kernel headers for broken sysctl.h ... "
-		if ! gcc -I"${KERNEL_HEADERS}" \
-		         -c ${FILESDIR}/test-sysctl_h.c -o ${T}/test1.o &> /dev/null
-		then
-			echo "yes"
-			echo
-			eerror "Your version of:"
-			echo
-			eerror "  ${KERNEL_HEADERS}/linux/sysctl.h"
-			echo
-			eerror "is broken (from a user space perspective).  Please apply"
-			eerror "the following patch:"
-			echo
-			eerror "*******************************************************"
-			cat ${FILESDIR}/fix-sysctl_h.patch
-			eerror "*******************************************************"
-			die "Broken linux/sysctl.h header included in kernel sources!"
-		else
-			echo "no"
-		fi
-	fi
-
-	if use_nptl
+	if want_nptl
 	then
 		einfon "Checking gcc for __thread support ... "
 		if ! gcc -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null
@@ -244,28 +209,12 @@ pkg_setup() {
 }
 
 src_unpack() {
-
-	local LOCAL_P="${PN}-${MY_PV}"
-
-	unpack glibc-2.3.3.20040602.tar.bz2
-
+	unpack ${A}
 	# Extract pre-made man pages.  Otherwise we need perl, which is a no-no.
 	mkdir -p ${S}/man; cd ${S}/man
-	use_nptl || tar xjf ${FILESDIR}/glibc-manpages-2.3.2.tar.bz2
+	want_nptl || tar xjf ${FILESDIR}/glibc-manpages-2.3.2.tar.bz2
 
 	cd ${S}
-	# Extract our threads package ...
-	if (! use_nptl)
-	then
-		unpack glibc-linuxthreads-${MY_PV}.tar.bz2
-	fi
-
-	if use_nptl
-	then
-		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-redhat-nptl-fixes.patch
-	else
-		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-redhat-linuxthreads-fixes.patch
-	fi
 
 	# To circumvent problems with propolice __guard and
 	# __guard_setup__stack_smash_handler
@@ -274,13 +223,13 @@ src_unpack() {
 	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" ]
 	then
 		cd ${S}
-		epatch ${FILESDIR}/2.3.3/${LOCAL_P}-propolice-guard-functions-v3.patch
+		epatch ${FILESDIR}/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch
 		cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
 			die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"
 	fi
 
 	# patch this regardless of architecture, although it's ssp-related
-	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-frandom-detect.patch
+	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-frandom-detect.patch
 
 	#
 	# *** PaX related patches starts here ***
@@ -313,56 +262,9 @@ src_unpack() {
 	# *** PaX related patches ends here ***
 	#
 
-	# Sanity check the forward and backward chunk pointers in the
-	# unlink() macro used by Doug Lea's implementation of malloc(3).
-	cd ${S}; epatch ${FILESDIR}/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff
-
-	# Fix an assert when running libc.so from commandline, bug #34733.
-#	cd ${S}; epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-rtld-assert-fix.patch
-
-	# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-#	cd ${S}/io; epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch
-
-	# This add back glibc 2.2 compadibility.  See bug #8766 and #9586 for more info,
-	# and also:
-	#
-	#  http://lists.debian.org/debian-glibc/2002/debian-glibc-200210/msg00093.html
-	#
-	# We should think about remoing it in the future after things have settled.
-	#
-	# Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it.
-	#
-	# <azarah@gentoo.org> (26 Oct 2002).
-	#cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-ctype-compat-v3.patch
-
-	# One more compat issue which breaks sun-jdk-1.3.1.  See bug #8766 for more
-	# info, and also:
-	#
-	#   http://sources.redhat.com/ml/libc-alpha/2002-04/msg00143.html
-	#
-	# Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it.
-	#
-	# <azarah@gentoo.org> (30 Oct 2002).
-	#cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libc_wait-compat.patch
-
-	# One more compat issue ... libc_stack_end is missing from ld.so.
-	# Got this one from diffing redhat glibc tarball .. would help if
-	# they used patches and not modified tarball ...
-	#
-	# <azarah@gentoo.org> (7 Nov 2002).
-#	cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-stack_end-compat.patch
-
-	# The mathinline.h header omits the middle term of a ?: expression.  This
-	# is a gcc extension, but since the ISO standard forbids it, it's a
-	# GLIBC bug (bug #27142).  See also:
-	#
-	#   http://bugs.gentoo.org/show_bug.cgi?id=27142
-	#
-#	cd ${S}; epatch ${FILESDIR}/2.3.2/${LOCAL_P}-fix-omitted-operand-in-mathinline_h.patch
-
 	# We do not want name_insert() in iconvconfig.c to be defined inside
 	# write_output() as it causes issues with trampolines/PaX.
-	cd ${S}; epatch ${FILESDIR}/2.3.2/${LOCAL_P}-iconvconfig-name_insert.patch
+	cd ${S}; epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-iconvconfig-name_insert.patch
 
 	# A few patches only for the MIPS platform.  Descriptions of what they
 	# do can be found in the patch headers.
@@ -373,9 +275,9 @@ src_unpack() {
 		cd ${S}
 		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-fpu-cw-mips.patch
 		epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch
-		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-mips-add-n32-n64-sysdep-cancel.patch
-		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-mips-configure-for-n64-symver.patch
-		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-mips-pread-linux2.5.patch
+		epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-mips-add-n32-n64-sysdep-cancel.patch
+		epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-mips-configure-for-n64-symver.patch
+		epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-mips-pread-linux2.5.patch
 		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-dl-machine-calls.diff
 		epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040420-mips-incl-sgidefs.diff
 	fi
@@ -386,7 +288,7 @@ src_unpack() {
 		# Fix compatability with compaq compilers by ifdef'ing out some
 		# 2.3.2 additions.
 		# <taviso@gentoo.org> (14 Jun 2003).
-		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-decc-compaq.patch
+		epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-decc-compaq.patch
 
 		# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
 #		epatch ${FILESDIR}/2.3.2/${LOCAL_P}-alpha-pwrite.patch
@@ -394,7 +296,7 @@ src_unpack() {
 
 	if [ "${ARCH}" = "amd64" ]
 	then
-		cd ${S}; epatch ${FILESDIR}/2.3.2/${LOCAL_P}-amd64-nomultilib.patch
+		cd ${S}; epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-amd64-nomultilib.patch
 	fi
 
 	if [ "${ARCH}" = "ia64" ]
@@ -409,25 +311,6 @@ src_unpack() {
 		:
 	fi
 
-	if [ "${ARCH}" = "hppa" ]
-	then
-		local x=
-
-		cd ${WORKDIR}
-		unpack ${LOCAL_P}-hppa-patches-p1.tar.bz2
-		cd ${S}
-		EPATCH_EXCLUDE="0[123459]0* 055* 1[2379]0* 200* 230*"
-		for x in ${EPATCH_EXCLUDE}
-		do
-			rm -f ${WORKDIR}/${LOCAL_P}-hppa-patches/${x}
-		done
-		for x in ${WORKDIR}/${LOCAL_P}-hppa-patches/*
-		do
-			epatch ${x}
-		done
-		epatch ${FILESDIR}/2.3.1/glibc23-07-hppa-atomicity.dpatch
-	fi
-
 	cd ${S}
 
 	# Fix permissions on some of the scripts
@@ -448,48 +331,7 @@ src_unpack() {
 	use build || (use hardened && sed -e 's/^LDFLAGS-rtld += $(relro.*/LDFLAGS-rtld += -Wl,-z,norelro/' -i ${S}/Makeconfig)
 }
 
-setup_flags() {
-	# -freorder-blocks for all but ia64 s390 s390x
-	use ppc || append-flags "-freorder-blocks"
-
-	# Sparc/Sparc64 support
-	if use sparc
-	then
-
-		# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-		replace-flags "-fcall-used-g7" ""
-		append-flags "-fcall-used-g6"
-
-		# Sparc64 Only support...
-		if [ "${PROFILE_ARCH}" = "sparc64" ]
-		then
-
-			# Get rid of -mcpu options, the CHOST will fix this up
-			replace-flags "-mcpu=ultrasparc" ""
-			replace-flags "-mcpu=v9" ""
-
-			# Get rid of flags known to fail
-			replace-flags "-mvis" ""
-
-			# Setup the CHOST properly to insure "sparcv9"
-			# This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler
-			[ "${CHOST}" == "sparc-unknown-linux-gnu" ] && \
-				export CHOST="sparcv9-unknown-linux-gnu"
-		fi
-	fi
-
-	# temporary fix for a few gcc 3.4 related problems
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		append-flags -fno-unit-at-a-time
-	fi
-
-}
-
 src_compile() {
-	local myconf=
-	local myconf_nptl=
-
 	setup_flags
 
 	# These should not be set, else the
@@ -502,75 +344,49 @@ src_compile() {
 
 	use hardened && myconf="${myconf} --enable-bind-now"
 
-	if use_nptl
+	if (use nptl && want_nptl && want_tls)
 	then
-		local kernelheaders="$(get_KHV "`KV_to_int ${MIN_NPTL_KV}`")"
-
-		# NTPL and Thread Local Storage support.
-		myconf="${myconf} --with-tls --with-__thread \
-		                       --enable-add-ons=nptl \
-		                       --enable-kernel=${MIN_NPTL_KV} \
-		                       --with-headers=${kernelheaders}"
+		myconf="${myconf} \
+		--enable-add-ons=nptl \
+		--with-tls --with-__thread \
+		--enable-kernel=2.6.6"
 	else
-		myconf="${myconf} --without-__thread \
-		                  --enable-add-ons=linuxthreads"
-		use build && myconf="${myconf} --without-tls" || \
-					 myconf="${myconf} --with-tls"
-
-		# If we build for the build system we use the kernel headers from the target
-		# We also now set it without "build" as well, else it might use the
-		# current kernel's headers, which might just fail (the linux-headers
-		# package is usually well tested...)
-#		( use build || use sparc ) \
-#			&& myconf="${myconf} --with-headers=${ROOT}usr/include"
-		myconf="${myconf} --with-headers=${ROOT}usr/include"
-
-		# If kernel version and headers in ${ROOT}/usr/include are ok,
-		# then enable --enable-kernel=${MIN_KV} ...
-		if [ "`get_KV`" -ge "`KV_to_int ${MIN_KV}`" -a \
-		     -n "$(get_KHV "`KV_to_int ${MIN_KV}`" "${ROOT}/usr/include")" ]
-		then
-			myconf="${myconf} --enable-kernel=${MIN_KV}"
-		else
-			myconf="${myconf} --enable-kernel=2.2.5"
-		fi
+		myconf="${myconf} --enable-add-ons=linuxthreads --without-__thread"
 	fi
 
-	einfo "Configuring GLIBC..."
-	rm -rf ${S}/buildhere
-	mkdir -p ${S}/buildhere
-	cd ${S}/buildhere
-	../configure --build=${CHOST} \
-		--host=${CHOST} \
-		--with-gd=no \
+	# we dont want to enable tls ourselves, as this can cause catalyst to fail
+	# for some people on some archs.
+	want_tls || myconf="${myconf} --without-tls"
+
+	rm -rf ${WORKDIR}/build
+	mkdir -p ${WORKDIR}/build
+	cd ${WORKDIR}/build
+	${S}/configure --disable-profile \
+		--without-gd \
 		--without-cvs \
-		--disable-profile \
+		--with-headers=/usr/include \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--libexecdir=/usr/lib/misc \
 		${myconf} || die
 
-	einfo "Building GLIBC..."
-	cd ${S}/buildhere
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-#	einfo "Doing GLIBC checks..."
-#	make check
+	make || die
 }
 
 src_install() {
-	local buildtarget="buildhere"
-
 	setup_flags
 
 	# These should not be set, else the
 	# zoneinfo do not always get installed ...
 	unset LANGUAGE LANG LC_ALL
 
+	cd ${WORKDIR}/build
+
 	einfo "Installing GLIBC..."
 	make PARALLELMFLAGS="${MAKEOPTS}" \
 		install_root=${D} \
-		install -C ${buildtarget} || die
+		install || die
 
 	# If librt.so is a symlink, change it into linker script (Redhat)
 	if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]
@@ -596,23 +412,21 @@ EOF
 
 	if [ -z "`use build`" ]
 	then
-		einfo "Installing Info pages..."
-		make PARALLELMFLAGS="${MAKEOPTS}" \
-			install_root=${D} \
-			info -C ${buildtarget} || die
+		cd ${WORKDIR}/build
 
-		einfo "Installing Locale data..."
+		# we make the CVS snapshot info pages with -i, as they're occasionally
+		# broken and it really has zero functional effect on the glibc
+		# install other than a lack of documentation :)
+		einfo "Installing Info pages..."
 		make PARALLELMFLAGS="${MAKEOPTS}" \
 			install_root=${D} \
-			localedata/install-locales -C ${buildtarget} || die
+			info -i
 
-		# Compatibility hack: this locale has vanished from glibc,
-		# but some other programs are still using it.
-		keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
+		setup_locales
 
 		einfo "Installing man pages and docs..."
 		# Install linuxthreads man pages
-		use_nptl || {
+		want_nptl || {
 			dodir /usr/share/man/man3
 			doman ${S}/man/*.3thr
 		}
@@ -621,6 +435,7 @@ EOF
 		insinto /etc
 		doins ${FILESDIR}/nscd.conf
 
+		cd ${S}
 		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
 	else
@@ -629,7 +444,7 @@ EOF
 		einfo "Installing Timezone data..."
 		make PARALLELMFLAGS="${MAKEOPTS}" \
 			install_root=${D} \
-			timezone/install-others -C ${buildtarget} || die
+			timezone/install-others -C ${WORKDIR}/build || die
 	fi
 
 	if [ "`use pic`" ]
@@ -661,6 +476,12 @@ EOF
 
 	# Some things want this, notably ash.
 	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
+
+	# This is our new config file for building locales
+	insinto /etc
+	doins ${FILESDIR}/locales.build
+
+	use makecheck && do_makecheck
 }
 
 pkg_postinst() {