clean up ebuild (use epatch !) and provide virtual/libc

2 files changed, 188 insertions, 169 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 37ac787beee9..11473004ed52 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,147 +1,157 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 047303eb5a4498c2b5a44bb32bbc7473 ChangeLog 41511
+MD5 09322fc193bfc6722271d668f387b692 glibc-2.2.5-r9.ebuild 9760
+MD5 09031b34e444666a53e42bd0782eb7b9 glibc-2.3.2-r2.ebuild 17967
 MD5 70f57cd1c2c1b4d3c349e7843ecaf233 glibc-2.3.3.20040420.ebuild 20417
-MD5 a8d00e0469f9342f5bd75ac8bddace58 glibc-2.3.3_pre20040117-r1.ebuild 19231
-MD5 c3acc7603286964f3a31f0bb096a2283 glibc-2.3.3_pre20040207.ebuild 19594
-MD5 eb64996f4acac7f0a415d2961943d6db glibc-2.3.3_pre20031210.ebuild 19014
-MD5 bcff98c4d3bc60232bbc11adbc9d4394 glibc-2.3.3_pre20040529.ebuild 21577
-MD5 4fe688f455342823cd8ea7f42cfcd04f glibc-2.3.4.20040619.ebuild 20027
-MD5 500e6e5f9aff2002b74b66b13ee4ec8f glibc-2.3.2-r10.ebuild 19417
-MD5 4775292436571e2d6f12f1246d0ab92c glibc-2.3.4.20040605.ebuild 16525
-MD5 20dc5abbb068cc17adce2f43c8b62304 glibc-2.3.4.20040605-r1.ebuild 17333
 MD5 20ce59539e5e56595ef322c73fd4f089 glibc-2.3.3_pre20040117.ebuild 18525
-MD5 09031b34e444666a53e42bd0782eb7b9 glibc-2.3.2-r2.ebuild 17967
 MD5 dad8f7d2452254605b4a5dc26e99a27a glibc-2.3.1-r5.ebuild 10719
-MD5 047303eb5a4498c2b5a44bb32bbc7473 ChangeLog 41511
-MD5 faf32599370ecd096e684997be0a0875 glibc-2.3.3_pre20040420.ebuild 19886
+MD5 c3acc7603286964f3a31f0bb096a2283 glibc-2.3.3_pre20040207.ebuild 19594
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 7ddad499eea9afae91c5bc11f31c5495 glibc-2.2.5-r9.ebuild 9998
+MD5 500e6e5f9aff2002b74b66b13ee4ec8f glibc-2.3.2-r10.ebuild 19417
+MD5 a8d00e0469f9342f5bd75ac8bddace58 glibc-2.3.3_pre20040117-r1.ebuild 19231
+MD5 eb64996f4acac7f0a415d2961943d6db glibc-2.3.3_pre20031210.ebuild 19014
 MD5 ae83c2fdda4a8e99c665cc0314d9ab51 glibc-2.3.2-r9.ebuild 18656
-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 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420 312
+MD5 faf32599370ecd096e684997be0a0875 glibc-2.3.3_pre20040420.ebuild 19886
+MD5 4775292436571e2d6f12f1246d0ab92c glibc-2.3.4.20040605.ebuild 16525
+MD5 bcff98c4d3bc60232bbc11adbc9d4394 glibc-2.3.3_pre20040529.ebuild 21577
+MD5 20dc5abbb068cc17adce2f43c8b62304 glibc-2.3.4.20040605-r1.ebuild 17333
+MD5 4fe688f455342823cd8ea7f42cfcd04f glibc-2.3.4.20040619.ebuild 20027
 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 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
+MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117 312
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312
-MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
-MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312
-MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605 150
-MD5 b7931e47a5aecc95ac1ddaa6828bd47b files/digest-glibc-2.3.4.20040619 228
+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 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312
 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 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605 150
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3_pre20040420 312
 MD5 268eda0de40469d19bb7ff5c5cb7ec82 files/digest-glibc-2.3.3_pre20040529 312
-MD5 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
-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 b7931e47a5aecc95ac1ddaa6828bd47b files/digest-glibc-2.3.4.20040619 228
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420 312
 MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605-r1 150
-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 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 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
+MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
+MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
+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 0e3ced9c3c484f502dcade7ffffa15f4 files/2.3.2/ssp.c 3935
-MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
-MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.2/glibc-2.3.2-got-fix.diff 752
-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 0e27dbd2a3b85a0e14625294296fad9a files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
 MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
-MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff 1425
-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 62f7e62583aaa70645d9c847b6a84299 files/2.3.2/glibc-2.3.2-frandom-detect.patch 1770
-MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.2/glibc-2.3.2-pt_pax.diff 1470
-MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
+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 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 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 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 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 026be2442305eef0a3e3ff897a14768e files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch 440
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.2/glibc-2.3.2-frandom-detect.patch 1770
+MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
+MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.2/glibc-2.3.2-got-fix.diff 752
+MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
+MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff 1425
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
+MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.2/glibc-2.3.2-pt_pax.diff 1470
 MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.2/glibc-2.3.2-signal-ssp.diff 1431
-MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069
+MD5 fb13e4f68a567426cba3db7623844610 files/2.3.2/ssp.c 3936
+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 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/mips-addabi.diff 1720
-MD5 75b0564e75dfe204b729f0fa80481f00 files/2.3.3/ssp.c 3935
-MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/mips-syscall.h.diff 1199
-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 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/semtimedop.diff 602
 MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
-MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/mips-nolib3264.diff 1166
-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 84fa9a725c22975d735a2f91543a5cca files/2.3.3/mips-sysify.diff 2138
+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 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 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
-MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
-MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
+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
+MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/mips-addabi.diff 1720
+MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/mips-nolib3264.diff 1166
+MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/mips-syscall.h.diff 1199
+MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/mips-sysify.diff 2138
+MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/semtimedop.diff 602
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA3ETrHTu7gpaalycRAo6vAJ9nQu2xU6EktXrc008aRWx/pH4btACghxWX
+O22DJNW+NMFKLRTrLsSw/gE=
+=d/mj
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.2.5-r9.ebuild b/sys-libs/glibc/glibc-2.2.5-r9.ebuild
index 87dc1cb6e5b5..de63ba83b602 100644
--- a/sys-libs/glibc/glibc-2.2.5-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.2.5-r9.ebuild
@@ -1,16 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r9.ebuild,v 1.5 2004/06/24 23:04:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r9.ebuild,v 1.6 2004/06/25 15:27:54 vapier Exp $
 
-IUSE="nls pic build debug"
-
-inherit flag-o-matic gcc
-
-filter-flags "-fomit-frame-pointer -malign-double"
-
-# Sparc support
-replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
-replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
+inherit flag-o-matic gcc eutils
 
 # Recently there has been a lot of stability problem in Gentoo-land.  Many
 # things can be the cause to this, but I believe that it is due to gcc3
@@ -32,17 +24,29 @@ replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
 # problems.
 #
 # <azarah@gentoo.org> (13 Oct 2002)
-strip-flags
+do_filter_flags() {
+	strip-flags
+
+	filter-flags -fomit-frame-pointer -malign-double
+
+	# Sparc support
+	replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
+
+	# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
+	filter-flags -O?
+	append-flags -O2
+}
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
+HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2
 	 ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
-KEYWORDS="x86 ppc sparc alpha"
-SLOT="2.2"
 LICENSE="LGPL-2"
+SLOT="2.2"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE="nls pic build debug"
 
 # Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade)
 # drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
@@ -52,12 +56,7 @@ RDEPEND="virtual/os-headers
 	sys-apps/baselayout
 	nls? ( sys-devel/gettext )
 	build? ( >=sys-apps/portage-1.9.0 )"
-
-PROVIDE="virtual/glibc"
-
-# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-export CFLAGS="${CFLAGS//-O?} -O2"
-export CXXFLAGS="${CFLAGS}"
+PROVIDE="virtual/glibc virtual/libc"
 
 src_unpack() {
 	unpack glibc-${PV}.tar.bz2 || die
@@ -65,8 +64,8 @@ src_unpack() {
 
 	# Security
 	# Fix for http://www.cert.org/advisories/CA-2003-10.html
-	einfo "Applying glibc-xdr_security.patch"
-	patch -p1 < ${FILESDIR}/glibc-xdr_security.patch > /dev/null || die
+	EPATCH_SINGLE_MSG="Applying glibc-xdr_security.patch" \
+		epatch ${FILESDIR}/glibc-xdr_security.patch
 
 	#extract pre-made man pages.  Otherwise we need perl, which is a no-no.
 	mkdir man; cd man
@@ -77,111 +76,121 @@ src_unpack() {
 	# This patch apparently eliminates compiler warnings for some versions of gcc.
 	# For information about the string2 patch, see:
 	# http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html
-	einfo "Applying string2.h patch..."
-	cd ${S}; patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff > /dev/null || die
+	cd ${S}
+	EPATCH_SINGLE_MSG="Applying string2.h patch..." \
+		epatch ${FILESDIR}/glibc-2.2.4-string2.h.diff
 
 	# This next one is a new patch to fix thread signal handling.  See:
 	# http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html
 	# (Added by drobbins on 05 Mar 2002)
-	einfo "Applying threadsig patch..."
-	patch -p0 < ${FILESDIR}/${PV}/${P}-threadsig.diff > /dev/null || die
+	EPATCH_SINGLE_MSG="Applying threadsig patch..." \
+		epatch ${FILESDIR}/${PV}/${P}-threadsig.diff
 
 	# This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files
-	einfo "Applying test-lfs-timeout patch..."
-	cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch > /dev/null || die
+	cd ${S}/io
+	EPATCH_SINGLE_MSG="Applying test-lfs-timeout patch..." \
+		epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch
 
 	# A buffer overflow vulnerability exists in multiple implementations of DNS
 	# resolver libraries.  This affects glibc-2.2.5 and earlier. See bug #4923
 	# and:
 	#
 	#   http://www.cert.org/advisories/CA-2002-19.html
-	einfo "Applying dns-network-overflow patch..."
-	cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-dns-network-overflow.diff >	/dev/null || die
+	cd ${S}
+	EPATCH_SINGLE_MSG="Applying dns-network-overflow patch..." \
+		epatch ${FILESDIR}/${PV}/${P}-dns-network-overflow.diff
 
 	# Security update for sunrpc
 	# <aliz@gentoo.org>
-	einfo "Applying sunrpc-overflow patch..."
-	cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sunrpc-overflow.diff > /dev/null || die
+	cd ${S}
+	EPATCH_SINGLE_MSG="Applying sunrpc-overflow patch..." \
+		epatch ${FILESDIR}/${PV}/${P}-sunrpc-overflow.diff
 
 	if [ "${ARCH}" = "x86" -o "${ARCH}" = "ppc" ]; then
 		# This patch fixes the nvidia-glx probs, openoffice and vmware probs and such..
 		# http://sources.redhat.com/ml/libc-hacker/2002-02/msg00152.html
-		einfo "Applying divdi3 patch..."
-		cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-divdi3.diff > /dev/null || die
+		cd ${S}
+		EPATCH_SINGLE_MSG="Applying divdi3 patch..." \
+			epatch ${FILESDIR}/${PV}/${P}-divdi3.diff
 	fi
 
 	# A bug in the getgrouplist function can cause a buffer overflow if
 	# the size of the group list is too small to hold all the user's groups.
 	#
 	#  https://rhn.redhat.com/errata/RHSA-2003-325.html
-	einfo "Applying getgrouplist patch..."
-	cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-getgrouplist.patch > /dev/null || die
+	cd ${S}
+	EPATCH_SINGLE_MSG="Applying getgrouplist patch..." \
+		epatch ${FILESDIR}/${PV}/${P}-getgrouplist.patch
 
 	if [ "${ARCH}" = "ppc" ]; then
-	        # This patch fixes the absence of sqrtl on PPC
-	        # http://sources.redhat.com/ml/libc-hacker/2002-05/msg00012.html
-	        einfo "Applying ppc-sqrtl patch..."
-	        cd ${S}; patch -p0 < ${FILESDIR}/${PV}/${P}-ppc-sqrtl.diff > /dev/null || die
+		# This patch fixes the absence of sqrtl on PPC
+		# http://sources.redhat.com/ml/libc-hacker/2002-05/msg00012.html
+		cd ${S}
+		EPATCH_SINGLE_MSG="Applying ppc-sqrtl patch..."
+			epatch ${FILESDIR}/${PV}/${P}-ppc-sqrtl.diff
 	fi
 
 	# Some gcc-3.1.1 fixes.  This works fine for other versions of gcc as well,
 	# and should generally be ok, as it just fixes define order that causes scope
 	# problems with gcc-3.1.1.
 	# (Azarah, 14 Jul 2002)
-	einfo "Applying gcc311 patch..."
-	cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-gcc311.patch > /dev/null || die
+	cd ${S}
+	EPATCH_SINGLE_MSG="Applying gcc311 patch..." \
+		epatch ${FILESDIR}/${PV}/${P}-gcc311.patch
 
 	if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -ge "2" ]; then
 		cd ${S}
 		# http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2002/08/0228.html
 		# <azarah@gentoo.org> (13 Oct 2002)
-		einfo "Applying divbyzero patch..."
-		patch -p1 < ${FILESDIR}/${PV}/${P}.divbyzero.patch > /dev/null || die
+		EPATCH_SINGLE_MSG="Applying divbyzero patch..." \
+			epatch ${FILESDIR}/${PV}/${P}.divbyzero.patch
 		einfo "Applying restrict_arr patch..."
-		patch -p1 < ${FILESDIR}/${PV}/${P}.restrict_arr.patch > /dev/null || die
+			epatch ${FILESDIR}/${PV}/${P}.restrict_arr.patch
 	fi
 
 	# Some patches to fixup build on alpha
 	if [ "${ARCH}" = "alpha" ]; then
 		cd ${S}
-		einfo "Applying alpha-gcc3-fix patch..."
-		patch -p1 < ${FILESDIR}/${PV}/${P}-alpha-gcc3-fix.diff > /dev/null || die
-		einfo "Applying alpha-pcdyn-fix patch..."
-		patch -p1 < ${FILESDIR}/${PV}/${P}-alpha-pcdyn-fix.diff > /dev/null || die
+		EPATCH_SINGLE_MSG="Applying alpha-gcc3-fix patch..." \
+			epatch ${FILESDIR}/${PV}/${P}-alpha-gcc3-fix.diff
+		EPATCH_SINGLE_MSG="Applying alpha-pcdyn-fix patch..." \
+			epatch ${FILESDIR}/${PV}/${P}-alpha-pcdyn-fix.diff
 	fi
 
 	# Some patches to fixup build on sparc
-
-	if use sparc > /dev/null
+	if use sparc
 	then
-		einfo "Applying sparc-mathinline patch..."
-		cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sparc-mathinline.patch > /dev/null || die
+		cd ${S}
+
+		EPATCH_SINGLE_MSG="Applying sparc-mathinline patch..." \
+			epatch ${FILESDIR}/${PV}/${P}-sparc-mathinline.patch
 
-		einfo "Applying sparc-misc patch..."
-		cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sparc-misc.diff > /dev/null || die
+		EPATCH_SINGLE_MSG="Applying sparc-misc patch..." \
+			epatch ${FILESDIR}/${PV}/${P}-sparc-misc.diff
 
 		if [ "${PROFILE_ARCH}" = "sparc64" ]
 		then
-			einfo "Applying seemant's -fixups patch..."
-			cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sparc64-fixups.diff > /dev/null || die
+			EPATCH_SINGLE_MSG="Applying seemant's -fixups patch..." \
+				epatch ${FILESDIR}/${PV}/${P}-sparc64-fixups.diff
 		fi
 
-		einfo "Applying nall's sparc32-semctl patch..."
-		cd ${S}
-		patch -p1 < ${FILESDIR}/${PV}/${P}-sparc32-semctl.patch > /dev/null || die
+		EPATCH_SINGLE_MSG="Applying nall's sparc32-semctl patch..." \
+			epatch ${FILESDIR}/${PV}/${P}-sparc32-semctl.patch
 	fi
 
 	# Some patches to fixup build on arm
 	if [ "${ARCH}" = "arm" ]; then
 		cd ${S}
-		einfo "Applying ARM sysdep patch..."
-		patch -p0 < ${FILESDIR}/${PV}/${P}-arm-sysdeps-fix.diff || die
-		einfo "Applying ARM errlist patch..."
-		patch -p0 < ${FILESDIR}/${PV}/${P}-arm-errlist-fix.diff || die
+		EPATCH_SINGLE_MSG="Applying ARM sysdep patch..." \
+			epatch ${FILESDIR}/${PV}/${P}-arm-sysdeps-fix.diff
+		EPATCH_SINGLE_MSG="Applying ARM errlist patch..." \
+			epatch ${FILESDIR}/${PV}/${P}-arm-errlist-fix.diff
 	fi
 }
 
 src_compile() {
+	do_filter_flags
+
 	local myconf=""
 
 	# If we build for the build system we use the kernel headers from the target
@@ -193,7 +202,8 @@ src_compile() {
 	rm -rf buildhere
 	mkdir buildhere
 	cd buildhere
-	../configure --host=${CHOST} \
+	../configure \
+		--host=${CHOST} \
 		--with-gd=no \
 		--without-cvs \
 		--enable-add-ons=linuxthreads \
@@ -221,7 +231,7 @@ src_install() {
 		install_root=${D} \
 		install -C buildhere || die
 
-	if [ -z "`use build`" ]
+	if ! use build
 	then
 		einfo "Installing Info pages..."
 		make PARALLELMFLAGS="${MAKEOPTS}" \
@@ -248,7 +258,7 @@ src_install() {
 		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
 	fi
 
-	if [ "`use pic`" ]
+	if use pic
 	then
 		find ${S}/buildhere -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
 		find ${S}/buildhere -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
@@ -291,4 +301,3 @@ pkg_postinst() {
 		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
 	fi
 }
-