- update gcc to use libc expanded variable elibc_uclibc vs uclibc so USE=-* works

12 files changed, 134 insertions, 134 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index ab72b334458e..9350bc5add17 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,129 +1,141 @@
-MD5 9b386065bf12fc9ff6b6856d7ca4f38d gcc-3.4.4.ebuild 4709
-MD5 50bab632895f2e1985d8b9c41b5f663f ChangeLog 85703
-MD5 32233b4175cc076b602394c34d4b4ee1 gcc-2.95.3-r8.ebuild 7485
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6b2e7c08fa9c1270c9a946d73ad57cc3 gcc-3.3.5-r1.ebuild 3744
+MD5 926048c09b54755ca4d0bc3a2eb7bdda gcc-4.0.0.ebuild 1748
+MD5 71b180bed94dca00dddf253f7bd6508f gcc-3.2.3-r4.ebuild 19841
 MD5 37f3db1694d592dc3a3db07507390b76 gcc-3.1.1-r2.ebuild 9270
-MD5 3196c90905902891b12b4d08372c0eb5 gcc-2.95.3-r9.ebuild 7524
 MD5 37ae28535bb42708bc729e53512ad369 gcc-3.3.2-r5.ebuild 21306
+MD5 2458d69151160bb559e8756566e6899f gcc-4.0.1_beta20050526.ebuild 1523
+MD5 cd6f4dc57fafba3ffd9ae59511dc6b18 gcc-3.3.6.ebuild 2847
+MD5 9b386065bf12fc9ff6b6856d7ca4f38d gcc-3.4.4.ebuild 4709
+MD5 3196c90905902891b12b4d08372c0eb5 gcc-2.95.3-r9.ebuild 7524
+MD5 60bb772b074a2a4a48032178a6c8cacc gcc-3.4.3.20050110-r2.ebuild 5083
 MD5 3e3bc1c3e3953428824c0fd3f206c48b gcc-3.3.2-r7.ebuild 21757
+MD5 0033c4558f78934e599c3f3b2c2579c9 gcc-3.3.5.20050130-r2.ebuild 3176
+MD5 22583bfbc351f0715fefcf199efa7c79 gcc-3.4.1-r3.ebuild 31176
 MD5 9718cbc7f6f1b2f19ff801f4c2e62721 gcc-3.2.2.ebuild 511
+MD5 32233b4175cc076b602394c34d4b4ee1 gcc-2.95.3-r8.ebuild 7485
+MD5 6aa36c9b1ad52c119d0439c9ed385186 gcc-3.4.3.20050110-r1.ebuild 5273
+MD5 50c6ff5aba9160ccfc43cd3291e54fd5 gcc-3.4.3-r1.ebuild 5303
+MD5 f48d775399111107754c6039c3206156 gcc-3.3.5.20050130-r1.ebuild 3175
+MD5 50bab632895f2e1985d8b9c41b5f663f ChangeLog 85703
 MD5 db8f65e7648911fb9d8484c13e77676e gcc-3.3.2.ebuild 16816
-MD5 2db26494ddce8e007dbfb8b7eb1bc1f5 gcc-3.3.5-r1.ebuild 3733
-MD5 240c9f26c319c0f305822d43d6daee5e gcc-3.4.3.20050110-r2.ebuild 5188
-MD5 a0f4d49c616b296178d6c19a55eca324 gcc-3.3.5.20050130.ebuild 3639
-MD5 52f962955096119cdc38ad5e7d8a39f4 gcc-3.4.1-r3.ebuild 31388
-MD5 db5b3c82ae204a37c1fc32abb483ea3e gcc-3.4.3-r1.ebuild 5292
-MD5 bc37c0ac3a97a24a620d5daf28f1447e gcc-3.3.5.20050130-r1.ebuild 3170
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 c392a44ca903757861e82537248eecf0 gcc-3.4.3.20050110-r1.ebuild 5262
-MD5 6042b09e83d1b96d7a210d9b190edda8 gcc-3.3.5.20050130-r2.ebuild 3171
-MD5 71b180bed94dca00dddf253f7bd6508f gcc-3.2.3-r4.ebuild 19841
-MD5 00945759e5c0408c07e1e32250346008 gcc-3.3.6.ebuild 2842
-MD5 42c5a3e7932037566fd006feede86609 gcc-4.0.0.ebuild 1743
-MD5 9cbde71055f4b4eeb3c277cece66f8a6 gcc-4.0.1_beta20050526.ebuild 1519
+MD5 cac771c83c0651bacc80e783963ee7ae gcc-3.3.5.20050130.ebuild 3650
 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24
 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24
-MD5 8b1c64514ddf33d26914a58dc6ed11c2 files/digest-gcc-4.0.0 380
-MD5 a570da9000df56c70620ec2e36e864a3 files/digest-gcc-2.95.3-r8 137
+MD5 456037b22f0662c84d2360c7a15a6d75 files/digest-gcc-3.3.5.20050130 540
+MD5 7f2bf81dfe5bd01ac373d19b599e072f files/digest-gcc-3.4.3.20050110-r1 616
+MD5 a98425f9d4389f8df683d7f809563d8d files/digest-gcc-3.4.3.20050110-r2 616
+MD5 ea2cf3df0d89a26d5fdc1a531176e395 files/pro-police-docs.patch 3287
 MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r2 140
 MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
-MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
 MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
 MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
 MD5 a3edf5e9d8bb500178f8dd29c1f9eadd files/digest-gcc-3.3.5-r1 442
-MD5 456037b22f0662c84d2360c7a15a6d75 files/digest-gcc-3.3.5.20050130 540
 MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r3 442
-MD5 b29f3bde3e23f17cd9a9bb4a5b026ea1 files/digest-gcc-3.3.5.20050130-r1 620
-MD5 1acd56209164ab837c5f91723434464e files/fix_libtool_files.sh 1712
 MD5 9b68e03bb1a6a1494399c8a6537bb766 files/digest-gcc-3.4.3-r1 527
-MD5 7f2bf81dfe5bd01ac373d19b599e072f files/digest-gcc-3.4.3.20050110-r1 616
-MD5 5f8142917f9d5c1ef9811fcbce8cc72a files/digest-gcc-3.4.4 450
-MD5 f80fd6ebeeea00d3e1649dfccdd85062 files/gcc-spec-env.patch 893
-MD5 ea2cf3df0d89a26d5fdc1a531176e395 files/pro-police-docs.patch 3287
-MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
-MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
-MD5 07b57d62aa1a8cd4d1cd37984ebe2053 files/scan_libgcc_linked_ssp.sh 861
-MD5 a98425f9d4389f8df683d7f809563d8d files/digest-gcc-3.4.3.20050110-r2 616
+MD5 b29f3bde3e23f17cd9a9bb4a5b026ea1 files/digest-gcc-3.3.5.20050130-r1 620
 MD5 9e216fb231a24884fe548b31864296b8 files/digest-gcc-3.3.5.20050130-r2 620
+MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
+MD5 1acd56209164ab837c5f91723434464e files/fix_libtool_files.sh 1712
 MD5 9bf3066b08fcf3297eb76fbfd33d18ee files/digest-gcc-3.2.2 137
-MD5 4ecf0f5cb735c81ca4b61a9c6db74269 files/digest-gcc-2.95.3-r9 139
+MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
 MD5 1bb392684e6482aa2cd940f1f12aea11 files/digest-gcc-3.3.6 453
+MD5 5f8142917f9d5c1ef9811fcbce8cc72a files/digest-gcc-3.4.4 450
+MD5 8b1c64514ddf33d26914a58dc6ed11c2 files/digest-gcc-4.0.0 380
+MD5 a570da9000df56c70620ec2e36e864a3 files/digest-gcc-2.95.3-r8 137
+MD5 4ecf0f5cb735c81ca4b61a9c6db74269 files/digest-gcc-2.95.3-r9 139
+MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
+MD5 f80fd6ebeeea00d3e1649dfccdd85062 files/gcc-spec-env.patch 893
 MD5 d65be3584d1f5750adaed9b92949d389 files/digest-gcc-4.0.1_beta20050526 71
-MD5 50f1f564c568b9e28231c592d4df2f36 files/3.4.4/gcc-3.4.4-cross-compile.patch 1728
-MD5 e2cd1d050aba4fc977380a1a17bb50bd files/3.4.4/gcc-3.4.4-fix-sse2-pinsrw.patch 4740
-MD5 27120401d2355e5d959b8d2d55eba310 files/3.3.4/gcc334-gentoo-branding.patch 876
-MD5 5fb5b49f3f16cc9e7e27e582c92ffa2f files/3.3.4/libffi-without-libgcj.patch 890
-MD5 86ae592deb82c4564eb61f770fe5f8a7 files/3.4.1/gcc-3.4.1-gentoo-branding.patch 759
-MD5 df06b1cf70425c78e2e59136ed372ab4 files/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch 729
-MD5 14fec2000fc63536d4cf22195e88e14f files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch 781
-MD5 cd770c23ece7458db5e6c5067f262ce0 files/3.4.1/gcc-3.4.1-glibc-is-native.patch 760
-MD5 7cb2138ac2df6f8674d19974e966a45b files/3.4.1/gcc-3.4.1-mips-n32only.patch 614
-MD5 aa8e15a63d797df37bbd4e489ed0267f files/3.4.1/gcc-3.4.1-mips-n64only.patch 614
-MD5 3f6d070c2a4a899e7d879fdb55eecba4 files/3.4.3/libffi-nogcj-lib-path-fix.patch 1691
-MD5 007c62d92efd70fd44c4d2e6a326036b files/3.4.3/libffi-without-libgcj.patch 1658
-MD5 7434140298091f759eba5e9706264130 files/3.4.3/libssp.patch 2029
-MD5 0b31c7f32c0c28bafdd75c5c0dfc16a5 files/3.4.3/gcc-3.4.3-cross-compile.patch 2919
-MD5 4a62ecf1101f7973ea9a60dc4cb98c43 files/3.4.3/35_all_pr18987-fix.patch 748
-MD5 7c29f54dd8d50385ac42fae65459c744 files/3.3.5/gcc-3.3.5-ffecom_gfrt_basictype-prototype.patch 538
-MD5 184cb0a87ee2fa0197dec6f4902ef4c8 files/3.3.5/gcc-3.3.5-no-COPYING-cross-compile.patch 1192
+MD5 07b57d62aa1a8cd4d1cd37984ebe2053 files/scan_libgcc_linked_ssp.sh 861
+MD5 f6b6f7c3577eccb694066bb54dd8075a files/3.3/gcc33-gentoo-branding-1.patch 870
+MD5 d047c78a9141b16915d8ec3f54d1e246 files/3.3/gcc33-coreutils-compat.patch.bz2 3462
+MD5 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570
+MD5 088e0807e677010cafe4e590e8711be1 files/3.3/gcc33-no-multilib-amd64.patch 343
+MD5 d6ee829d1712436361f5f1daf7b14e83 files/3.3/gcc33-gentoo-branding.patch 890
+MD5 f8c48b2e721c21d83582f5884bfb79c7 files/awk/fixlafiles.awk 7830
+MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830
+MD5 51719a174883702ef1851fac4cc79398 files/3.2.1/gcc32-strip-dotdot.patch 2071
 MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
-MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
-MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
-MD5 38131a537835873acb08c415d27a013e files/3.2.1/gcc32-athlon-alignment.patch 509
 MD5 7978d1aaf6bae19163e83c110dec1b38 files/3.2.1/gcc32-sparc32-hack.patch 2192
-MD5 51719a174883702ef1851fac4cc79398 files/3.2.1/gcc32-strip-dotdot.patch 2071
+MD5 38131a537835873acb08c415d27a013e files/3.2.1/gcc32-athlon-alignment.patch 509
+MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
+MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
 MD5 17f15202b98a8dd84d0f4b67eff2d868 files/3.2.2/gcc32-pr7768.patch 1789
-MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.2/gcc32-pr8213.patch 2036
 MD5 465eeaf6008c25dc69ff502dc2a9d8e0 files/3.2.2/gcc322-ggc_page-speedup.patch 872
-MD5 52ef1426cb70a472182503502b768058 files/3.2.3/gcc-3.2.3-mergel-fix.patch 2749
-MD5 a3315d69ba1be0bc1518a75027896bf3 files/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch 3534
-MD5 1f4f8ca52d2dda4a5dc3a9b8f130841c files/3.2.3/gcc-323-propolice-version.patch 700
-MD5 c9c45dab64bab25e716859626ad7f94f files/3.2.3/gcc32-c++-classfn-member-template.patch 3219
+MD5 9f5b59d7567b90894d8d32cf99f910cc files/3.2.2/gcc32-pr8213.patch 2036
 MD5 494d917cc15c81c9cead4a8c17d4d00d files/3.2.3/gcc32-mklibgcc-serialize-crtfiles.patch 926
+MD5 c9c45dab64bab25e716859626ad7f94f files/3.2.3/gcc32-c++-classfn-member-template.patch 3219
 MD5 99db7c1a41babe024f0c6859c30a87ee files/3.2.3/gcc323-gentoo-branding.patch 2058
+MD5 52ef1426cb70a472182503502b768058 files/3.2.3/gcc-3.2.3-mergel-fix.patch 2749
+MD5 a3315d69ba1be0bc1518a75027896bf3 files/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch 3534
 MD5 869b9a1ea49bf8b07c8405d2f1d76270 files/3.2.3/gcc323-hppa-default_assemble_visibility.patch 571
-MD5 d047c78a9141b16915d8ec3f54d1e246 files/3.3/gcc33-coreutils-compat.patch.bz2 3462
-MD5 f6b6f7c3577eccb694066bb54dd8075a files/3.3/gcc33-gentoo-branding-1.patch 870
-MD5 d6ee829d1712436361f5f1daf7b14e83 files/3.3/gcc33-gentoo-branding.patch 890
-MD5 088e0807e677010cafe4e590e8711be1 files/3.3/gcc33-no-multilib-amd64.patch 343
-MD5 453122edf63d75cca3a6c56a6dac45b0 files/3.3/gcc33-propolice-version.patch 570
-MD5 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874
+MD5 1f4f8ca52d2dda4a5dc3a9b8f130841c files/3.2.3/gcc-323-propolice-version.patch 700
 MD5 b398b7415b93423ff04952c6e69bdb4d files/3.3.1/gcc331-pp-fixup.patch 407
-MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
+MD5 d3e53318166d71a05d2b51bd44502270 files/3.3.1/gcc331-gentoo-branding.patch 874
 MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607
-MD5 f8c48b2e721c21d83582f5884bfb79c7 files/awk/fixlafiles.awk 7830
-MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830
-MD5 053b213d6994cef2ad995aa516ed937a files/stubs/gcc-3.4-htb-stub.patch 722
-MD5 cb27bc36a5b9a1175a5f3bdf38647814 files/stubs/gcc-3.3-ssp-stub.patch 1735
-MD5 37e756238508fe9f9e2b9ba6a7ca67ca files/stubs/gcc-4.0-htb-stub.patch 722
-MD5 d71c91009df788366867cb67fc875d6d files/stubs/gcc-3.4-ssp-stub.patch 1068
-MD5 0f8035bc5ae6126fd9380ba9dcdcc271 files/stubs/gcc-3.3-htb-stub.patch 2195
-MD5 d71c91009df788366867cb67fc875d6d files/stubs/gcc-4.0-ssp-stub.patch 1068
+MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
+MD5 25eda9981106a55c413d1df3d3a87db5 files/3.3.3/gcc333-debian-arm-ldm.patch 3383
+MD5 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040426-gentoo-branding.patch 820
 MD5 cd87c02e4896f47bf6029eef0dc29468 files/3.3.3/gcc333-gentoo-branding.patch 874
+MD5 e5812da37c1862908a29cdae004c4e52 files/3.3.3/gcc333-pr15693.patch 3927
+MD5 308a0e53f03e9cb74b3d12c2633cbee2 files/3.3.3/gcc-uclibc-3.3-loop.patch 433
 MD5 0e8d94bbc14fbb3fbad1df4f404b39ef files/3.3.3/gcc333-ssp-3.3_7-fixup.patch 2616
-MD5 4b249bff27ab6328436e6289ac9f9cfc files/3.3.3/gcc333_pre20040215-gentoo-branding.patch 839
-MD5 f317331e0b196ca455ca9554479cd8eb files/3.3.3/gcc333_pre20040322-gentoo-branding.patch 817
 MD5 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040408-gentoo-branding.patch 820
-MD5 3210d5fd70806c44d4426c3dceebd480 files/3.3.3/gcc333_pre20040408-stack-size.patch 653
-MD5 43c60f04779324d74d3aac52224bed95 files/3.3.3/gcc333_pre20040426-gentoo-branding.patch 820
+MD5 bb0078854a778b2a279cfb15d8933c29 files/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch 2598
+MD5 ee700275f341541af37d56bd15dcf863 files/3.3.3/gcc-3.3.3-norelro.patch 606
+MD5 f317331e0b196ca455ca9554479cd8eb files/3.3.3/gcc333_pre20040322-gentoo-branding.patch 817
 MD5 9ba0bd0b103cf9535927ad7c482fe780 files/3.3.3/gcc333-debian-arm-getoff.patch 3501
-MD5 25eda9981106a55c413d1df3d3a87db5 files/3.3.3/gcc333-debian-arm-ldm.patch 3383
 MD5 ff6d7b5082c5e39fab8a5d8932c1a8b7 files/3.3.3/gcc-3.3.3-uclibc-add-ssp.patch 461
-MD5 308a0e53f03e9cb74b3d12c2633cbee2 files/3.3.3/gcc-uclibc-3.3-loop.patch 433
-MD5 bb0078854a778b2a279cfb15d8933c29 files/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch 2598
+MD5 4b249bff27ab6328436e6289ac9f9cfc files/3.3.3/gcc333_pre20040215-gentoo-branding.patch 839
 MD5 66df5567226338b7504bbd3c25cea92c files/3.3.3/gcc-3.3.3-libiberty-pic.patch 370
-MD5 ee700275f341541af37d56bd15dcf863 files/3.3.3/gcc-3.3.3-norelro.patch 606
-MD5 e5812da37c1862908a29cdae004c4e52 files/3.3.3/gcc333-pr15693.patch 3927
-MD5 b2922cfe76692e7d2b373a0a255f405e files/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch 14248
+MD5 3210d5fd70806c44d4426c3dceebd480 files/3.3.3/gcc333_pre20040408-stack-size.patch 653
+MD5 5fb5b49f3f16cc9e7e27e582c92ffa2f files/3.3.4/libffi-without-libgcj.patch 890
+MD5 27120401d2355e5d959b8d2d55eba310 files/3.3.4/gcc334-gentoo-branding.patch 876
+MD5 7c29f54dd8d50385ac42fae65459c744 files/3.3.5/gcc-3.3.5-ffecom_gfrt_basictype-prototype.patch 538
+MD5 184cb0a87ee2fa0197dec6f4902ef4c8 files/3.3.5/gcc-3.3.5-no-COPYING-cross-compile.patch 1192
+MD5 bae93db3186aa0fc25d659b7799ef499 files/3.4.0/gcc34-ppc64-m32-m64-multilib-only.patch 825
+MD5 17b3190d64e34ed7709d022b326d08ae files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch 563
+MD5 c919e0a2cd429d0121b6133c1b4e41a6 files/3.4.0/gcc34-ice-hack.patch 8605
+MD5 31470a0e018eb2cdfe68c71039ede80f files/3.4.0/gcc34-multi32-hack.patch 2445
+MD5 c7ed491e4bcee6cae89067d4e1c899a8 files/3.4.0/gcc34-ia64-lib64.patch 1395
+MD5 06580106a905e8fa2ff23aa190f9d82c files/3.4.0/gcc-3.4.0-r6-gentoo-branding.patch 781
+MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587
+MD5 66edf32babf498517ca56fa44c901f26 files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch 894
+MD5 cd770c23ece7458db5e6c5067f262ce0 files/3.4.1/gcc-3.4.1-glibc-is-native.patch 760
+MD5 aa8e15a63d797df37bbd4e489ed0267f files/3.4.1/gcc-3.4.1-mips-n64only.patch 614
+MD5 7cb2138ac2df6f8674d19974e966a45b files/3.4.1/gcc-3.4.1-mips-n32only.patch 614
+MD5 86ae592deb82c4564eb61f770fe5f8a7 files/3.4.1/gcc-3.4.1-gentoo-branding.patch 759
+MD5 14fec2000fc63536d4cf22195e88e14f files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch 781
+MD5 df06b1cf70425c78e2e59136ed372ab4 files/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch 729
 MD5 f2395cf0f72d870e263d0dcec18fdd67 files/3.4.2/gcc34-fix-sse2_pinsrw.patch 1268
 MD5 2c1ce849de55d8c81af4e081dbb2f5e4 files/3.4.2/gcc34-m32-no-sse2.patch 1058
 MD5 f3a1b668077c6486c542dcef1cdd9672 files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers.patch 12545
-MD5 00cca5c6d608d147bf379a38fe3b2d45 files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch 14576
+MD5 b2922cfe76692e7d2b373a0a255f405e files/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch 14248
 MD5 a720c913b78bcfbd7f63319130fadd4a files/3.4.2/810-arm-bigendian-uclibc.patch 1139
-MD5 06580106a905e8fa2ff23aa190f9d82c files/3.4.0/gcc-3.4.0-r6-gentoo-branding.patch 781
-MD5 c7ed491e4bcee6cae89067d4e1c899a8 files/3.4.0/gcc34-ia64-lib64.patch 1395
-MD5 66edf32babf498517ca56fa44c901f26 files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch 894
-MD5 31470a0e018eb2cdfe68c71039ede80f files/3.4.0/gcc34-multi32-hack.patch 2445
-MD5 c919e0a2cd429d0121b6133c1b4e41a6 files/3.4.0/gcc34-ice-hack.patch 8605
-MD5 bae93db3186aa0fc25d659b7799ef499 files/3.4.0/gcc34-ppc64-m32-m64-multilib-only.patch 825
-MD5 17b3190d64e34ed7709d022b326d08ae files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch 563
-MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587
+MD5 00cca5c6d608d147bf379a38fe3b2d45 files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch 14576
+MD5 007c62d92efd70fd44c4d2e6a326036b files/3.4.3/libffi-without-libgcj.patch 1658
+MD5 0b31c7f32c0c28bafdd75c5c0dfc16a5 files/3.4.3/gcc-3.4.3-cross-compile.patch 2919
+MD5 3f6d070c2a4a899e7d879fdb55eecba4 files/3.4.3/libffi-nogcj-lib-path-fix.patch 1691
+MD5 4a62ecf1101f7973ea9a60dc4cb98c43 files/3.4.3/35_all_pr18987-fix.patch 748
+MD5 7434140298091f759eba5e9706264130 files/3.4.3/libssp.patch 2029
+MD5 e2cd1d050aba4fc977380a1a17bb50bd files/3.4.4/gcc-3.4.4-fix-sse2-pinsrw.patch 4740
+MD5 50f1f564c568b9e28231c592d4df2f36 files/3.4.4/gcc-3.4.4-cross-compile.patch 1728
+MD5 0f8035bc5ae6126fd9380ba9dcdcc271 files/stubs/gcc-3.3-htb-stub.patch 2195
+MD5 37e756238508fe9f9e2b9ba6a7ca67ca files/stubs/gcc-4.0-htb-stub.patch 722
+MD5 d71c91009df788366867cb67fc875d6d files/stubs/gcc-3.4-ssp-stub.patch 1068
+MD5 cb27bc36a5b9a1175a5f3bdf38647814 files/stubs/gcc-3.3-ssp-stub.patch 1735
+MD5 053b213d6994cef2ad995aa516ed937a files/stubs/gcc-3.4-htb-stub.patch 722
+MD5 d71c91009df788366867cb67fc875d6d files/stubs/gcc-4.0-ssp-stub.patch 1068
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQpqJ9p4WFLgrx1GWAQINHAP8C11AJWnL+ghK5mycy/lJI+fwuN8A5kDM
+BRWNdKp/lVBVFHWwhLX4a6Nwxvif6AZWq1YwNRWZQKv8fKTYIWm5gLLAL0Hu3hB8
+2tZI17j1g3J2ogALnV7qkmDLfR5q54r87mFNUNAj3c3zDrAgCPrNOakFSjSjuOm8
+0ahMg53Irt4=
+=v34q
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-3.3.5-r1.ebuild b/sys-devel/gcc/gcc-3.3.5-r1.ebuild
index b57ccbae7d9b..835a4eedf180 100644
--- a/sys-devel/gcc/gcc-3.3.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5-r1.ebuild,v 1.23 2005/05/24 05:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5-r1.ebuild,v 1.24 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER="3.3.5"
 #BRANCH_UPDATE="20041025"
@@ -51,7 +51,7 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-config-1.3.6
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	!elibc_uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
@@ -77,7 +77,7 @@ PDEPEND="sys-devel/gcc-config"
 src_unpack() {
 	gcc_src_unpack
 
-	if [ -n "${PATCH_VER}" ] && use uclibc ; then
+	if [ -n "${PATCH_VER}" ] && use elibc_uclibc ; then
 		mv ${S}/gcc-3.3.2/libstdc++-v3/config/os/uclibc ${S}/libstdc++-v3/config/os/ || die
 		mv ${S}/gcc-3.3.2/libstdc++-v3/config/locale/uclibc ${S}/libstdc++-v3/config/locale/ || die
 		epatch ${FILESDIR}/3.3.3/gcc-uclibc-3.3-loop.patch
diff --git a/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild b/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
index b58e48a1ca80..4bd5d98f77fa 100644
--- a/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild,v 1.7 2005/05/24 05:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild,v 1.8 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER="3.3.5"
 PATCH_VER="1.4"
@@ -47,7 +47,7 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	!elibc_uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
diff --git a/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild b/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild
index 98bc11c914fe..7e1e5d8349fe 100644
--- a/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild,v 1.2 2005/05/24 05:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r2.ebuild,v 1.3 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER="3.3.5"
 PATCH_VER="1.5"
@@ -47,7 +47,7 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	!elibc_uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
diff --git a/sys-devel/gcc/gcc-3.3.5.20050130.ebuild b/sys-devel/gcc/gcc-3.3.5.20050130.ebuild
index 27de5a6eee1f..13edc48ef25d 100644
--- a/sys-devel/gcc/gcc-3.3.5.20050130.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5.20050130.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130.ebuild,v 1.15 2005/05/24 05:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130.ebuild,v 1.16 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER="3.3.5"
 PATCH_VER="1.2"
@@ -47,7 +47,7 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	!elibc_uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
@@ -77,7 +77,7 @@ src_unpack() {
 	sed -e 's/3\.3\.6/3.3.5/' -i ${S}/gcc/version.c
 
 
-	if [ -n "${PATCH_VER}" ] && use uclibc ; then
+	if [ -n "${PATCH_VER}" ] && use elibc_uclibc ; then
 		mv ${S}/gcc-3.3.2/libstdc++-v3/config/os/uclibc ${S}/libstdc++-v3/config/os/ || die
 		mv ${S}/gcc-3.3.2/libstdc++-v3/config/locale/uclibc ${S}/libstdc++-v3/config/locale/ || die
 		epatch ${FILESDIR}/3.3.3/gcc-uclibc-3.3-loop.patch
diff --git a/sys-devel/gcc/gcc-3.3.6.ebuild b/sys-devel/gcc/gcc-3.3.6.ebuild
index db863f68e8f5..c56f2acdfdd1 100644
--- a/sys-devel/gcc/gcc-3.3.6.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.3 2005/05/25 03:29:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.4 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER=""
 PATCH_VER="1.1"
@@ -42,7 +42,7 @@ KEYWORDS="-*"
 RDEPEND=">=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	!uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
+	!elibc_uclibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
diff --git a/sys-devel/gcc/gcc-3.4.1-r3.ebuild b/sys-devel/gcc/gcc-3.4.1-r3.ebuild
index d81bcb910e88..c68db41bfc0f 100644
--- a/sys-devel/gcc/gcc-3.4.1-r3.ebuild
+++ b/sys-devel/gcc/gcc-3.4.1-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r3.ebuild,v 1.18 2005/05/24 04:28:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r3.ebuild,v 1.19 2005/05/30 03:35:06 solar Exp $
 
-IUSE="static nls bootstrap build multilib gcj gtk fortran objc hardened uclibc n32 n64 emul-linux-x86"
+IUSE="static nls bootstrap build multilib gcj gtk fortran objc hardened n32 n64 emul-linux-x86"
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -22,10 +22,6 @@ KEYWORDS="-* ~amd64 mips ppc64 ~x86 -hppa ppc s390"
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
 DEPEND="virtual/libc
-	!s390? ( !uclibc? (
-		>=sys-libs/glibc-2.3.3_pre20040420-r1
-		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
-	) )
 	!sys-devel/hardened-gcc
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )
@@ -41,10 +37,6 @@ DEPEND="virtual/libc
 		nls? ( sys-devel/gettext )
 	)"
 RDEPEND="virtual/libc
-	!s390? ( !uclibc? (
-		>=sys-libs/glibc-2.3.3_pre20040420-r1
-		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
-	) )
 	>=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
@@ -52,7 +44,7 @@ RDEPEND="virtual/libc
 
 PDEPEND="sys-devel/gcc-config"
 [ "${ABI}" != "n32" ] && [ "${ABI}" != "n64" ] && PDEPEND="${PDEPEND}
-	!n32? ( !n64? ( !s390? ( !uclibc? ( sys-libs/libstdc++-v3 ) ) ) )"
+	!n32? ( !n64? ( !s390? ( !elibc_uclibc? ( sys-libs/libstdc++-v3 ) ) ) )"
 
 
 # <<--------------------SRC_URI variables-------------------->>
@@ -261,7 +253,7 @@ glibc_have_ssp() {
 		&& local libc_prefix="/lib64/" \
 		|| local libc_prefix="/lib/"
 
-	use uclibc \
+	use elibc_uclibc \
 		&& local libc_file="libc.so.0" \
 		|| local libc_file="libc.so.6"
 
@@ -382,7 +374,7 @@ do_patch_tarball() {
 		# the uclibc patches need autoconf to be run
 		# for build stage we need the updated files though
 		use build || ( cd ${S}/libstdc++-v3; autoconf; cd ${S} )
-		#use build && use uclibc && ewarn "uclibc in build stage is not supported yet" && exit 1
+		#use build && use elibc_uclibc && ewarn "uclibc in build stage is not supported yet" && exit 1
 
 	elif use multilib && [ "${ARCH}" = "amd64" ]
 	then
@@ -406,7 +398,7 @@ do_piessp_patches() {
 		# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
 		epatch ${WORKDIR}/piepatch/def
 		# disable relro/now
-		use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
+		use elibc_uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
 	fi
 
 	# non-default SSP support.
@@ -603,7 +595,7 @@ src_compile() {
 	# uclibc uses --enable-clocale=uclibc (autodetected)
 	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
 
-	if ! use uclibc
+	if ! use elibc_uclibc
 	then
 		# it's getting close to a time where we are going to need USE=glibc, uclibc, bsdlibc -solar
 		myconf="${myconf} --enable-__cxa_atexit --enable-clocale=gnu"
diff --git a/sys-devel/gcc/gcc-3.4.3-r1.ebuild b/sys-devel/gcc/gcc-3.4.3-r1.ebuild
index b6f7bc97bb8d..bb09999b1f6d 100644
--- a/sys-devel/gcc/gcc-3.4.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3-r1.ebuild,v 1.36 2005/05/24 05:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3-r1.ebuild,v 1.37 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER="3.4.3"
 BRANCH_UPDATE="20041125"
@@ -50,7 +50,7 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-config-1.3.6-r4
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	!uclibc? (
+	!elibc_uclibc? (
 		>=sys-libs/glibc-2.3.3_pre20040420-r1
 		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
 	)
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
 PDEPEND="sys-devel/gcc-config
-	!nocxx? ( !mips? ( !ia64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
+	!nocxx? ( !mips? ( !ia64? ( !elibc_uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
 
 src_unpack() {
 	gcc_src_unpack
diff --git a/sys-devel/gcc/gcc-3.4.3.20050110-r1.ebuild b/sys-devel/gcc/gcc-3.4.3.20050110-r1.ebuild
index 235330b06747..03614e6809ed 100644
--- a/sys-devel/gcc/gcc-3.4.3.20050110-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3.20050110-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.20050110-r1.ebuild,v 1.6 2005/05/24 05:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.20050110-r1.ebuild,v 1.7 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER="3.4.3"
 PATCH_VER="1.2"
@@ -50,7 +50,7 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	!uclibc? (
+	!elibc_uclibc? (
 		>=sys-libs/glibc-2.3.3_pre20040420-r1
 		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
 	)
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
 PDEPEND="sys-devel/gcc-config
-	!nocxx? ( !mips? ( !ia64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
+	!nocxx? ( !mips? ( !ia64? ( !elibc_uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
 
 src_unpack() {
 	gcc_src_unpack
diff --git a/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild b/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild
index a12d1ff3da29..08ce2c08596f 100644
--- a/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild,v 1.4 2005/05/24 05:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.20050110-r2.ebuild,v 1.5 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER="3.4.3"
 PATCH_VER="1.3"
@@ -50,10 +50,6 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-config-1.3.10
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	elibc_glibc? (
-		>=sys-libs/glibc-2.3.3_pre20040420-r1
-		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
-	)
 	amd64? ( multilib? ( >=app-emulation/emul-linux-x86-glibc-1.1 ) )
 	!build? (
 		gcj? (
@@ -74,7 +70,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
 PDEPEND="sys-devel/gcc-config
-	!nocxx? ( !mips? ( !ia64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
+	!nocxx? ( !mips? ( !ia64? ( !elibc_uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
 
 src_unpack() {
 	gcc_src_unpack
diff --git a/sys-devel/gcc/gcc-4.0.0.ebuild b/sys-devel/gcc/gcc-4.0.0.ebuild
index b692d43db53f..81b4636cae1c 100644
--- a/sys-devel/gcc/gcc-4.0.0.ebuild
+++ b/sys-devel/gcc/gcc-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.0.ebuild,v 1.4 2005/05/26 02:46:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.0.ebuild,v 1.5 2005/05/30 03:35:06 solar Exp $
 
 MAN_VER=""
 PATCH_VER="1.0"
@@ -22,7 +22,7 @@ KEYWORDS="-*"
 RDEPEND=">=sys-devel/gcc-config-1.3.1
 	>=sys-libs/zlib-1.1.4
 	!sys-devel/hardened-gcc
-	!uclibc? (
+	!elibc_uclibc? (
 		>=sys-libs/glibc-2.3.3_pre20040420-r1
 		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
 	)
diff --git a/sys-devel/gcc/gcc-4.0.1_beta20050526.ebuild b/sys-devel/gcc/gcc-4.0.1_beta20050526.ebuild
index 92cd06070a24..2fb451b0ed7b 100644
--- a/sys-devel/gcc/gcc-4.0.1_beta20050526.ebuild
+++ b/sys-devel/gcc/gcc-4.0.1_beta20050526.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.1_beta20050526.ebuild,v 1.1 2005/05/28 02:04:26 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.1_beta20050526.ebuild,v 1.2 2005/05/30 03:35:06 solar Exp $
 
 ETYPE="gcc-compiler"
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/binutils-2.15.97"
 
 PDEPEND="sys-devel/gcc-config
-	!nocxx? ( !n32? ( !n64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
+	!nocxx? ( !n32? ( !n64? ( !elibc_uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
 
 pkg_postinst() {
 	toolchain_pkg_postinst