Only apply libffi-without-libgcj.patch if we're -build. Bump the gcc-4 version and make a note to report bugs upstream.

(Portage version: 2.0.51.16)

11 files changed, 83 insertions, 114 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 54d3b9b065f0..21790943fcf2 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.383 2005/02/12 19:32:22 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.384 2005/02/26 12:40:21 eradicator Exp $
+
+*gcc-4.0.0_alpha20050213 (17 Feb 2005)
+
+  17 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  gcc-3.3.5-r1.ebuild, gcc-3.3.5.20050130.ebuild, gcc-3.4.3-r1.ebuild,
+  gcc-3.4.3.20050110.ebuild, -gcc-4.0.0_alpha20050123.ebuild,
+  -gcc-4.0.0_alpha20050130.ebuild, +gcc-4.0.0_alpha20050213.ebuild:
+  Only apply libffi-without-libgcj.patch if we're -build. Bump the gcc-4
+  version and make a note to report bugs upstream.
 
   12 Feb 2005; <plasmaroo@gentoo.org> gcc-3.3.5.20050130.ebuild:
   Mark -ia64 as bootstrapping fails with this version.
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 67305ba9eaf7..52f3a71dd123 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -9,57 +9,41 @@ MD5 b930e75f158771567380d1abf1747561 gcc-3.3.3-r3.ebuild 23575
 MD5 4d259bee0558a49537a53efed59945c8 gcc-3.3.3-r6.ebuild 24965
 MD5 6e1c8f988e525b2149c19d5c2293ce9d gcc-3.3.4-r1.ebuild 24856
 MD5 9a9822248261869763b3bc44d1d0748d gcc-3.3.4-r2.ebuild 24649
-MD5 f953b9af7b2b047a9ebb948de1ac0d7f gcc-3.3.5-r1.ebuild 3770
 MD5 026c988062231208a5ff4b40ef50e55d gcc-3.4.1-r3.ebuild 31433
 MD5 a00a988dba51eceb014f2e5252d62c53 gcc-3.4.2-r2.ebuild 13505
-MD5 9de7e8b8480805228a9d3ea77a4a1391 gcc-3.4.3-r1.ebuild 5309
 MD5 e1dd8a063189d88b781ac008892e2da5 gcc-3.4.3.ebuild 13231
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 f9d04582c2868ca2365c0ec9b1fe6637 gcc-3.4.3.20050110.ebuild 5308
-MD5 91d30881a8ef615f0376edf64ca88b0b gcc-3.3.5.20050130.ebuild 3669
-MD5 eb75bb021785fba9e52e83c2558f468b gcc-4.0.0_alpha20050123.ebuild 1293
-MD5 f77a0592c6e6c6d1c0db28052acb4304 gcc-4.0.0_alpha20050130.ebuild 1293
+MD5 2919ec27ca82cd9aab7b163b61e9bbc3 gcc-3.3.5-r1.ebuild 3784
+MD5 4971de27715e1d06bd242ec44acff059 gcc-3.3.5.20050130.ebuild 3683
+MD5 72f3638ed54df5c816073daf78e194c4 gcc-3.4.3-r1.ebuild 5323
+MD5 692bfcc4c1dae12efb3c9dd16292885d gcc-3.4.3.20050110.ebuild 5322
+MD5 f77a0592c6e6c6d1c0db28052acb4304 gcc-4.0.0_alpha20050213.ebuild 1293
 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24
 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24
-MD5 456037b22f0662c84d2360c7a15a6d75 files/digest-gcc-3.3.5.20050130 540
+MD5 47eeaf2ebd915e107081602b157b4e45 files/digest-gcc-2.95.3-r8 137
+MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
+MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
+MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361
+MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
+MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
 MD5 5a9db19cd5ad6ad16b0f838d525d842a files/digest-gcc-3.3.3-r3 522
-MD5 9b68e03bb1a6a1494399c8a6537bb766 files/digest-gcc-3.4.3-r1 527
-MD5 a3edf5e9d8bb500178f8dd29c1f9eadd files/digest-gcc-3.3.5-r1 442
 MD5 3fd5a29d44b89f4fb220fccaa968fc05 files/digest-gcc-3.3.3-r6 442
+MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r1 442
+MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r2 442
+MD5 a3edf5e9d8bb500178f8dd29c1f9eadd files/digest-gcc-3.3.5-r1 442
+MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r3 442
+MD5 69687aac826654ad375b7eae45a01e0b files/digest-gcc-3.4.2-r2 443
 MD5 d197c7ddd1a614b89bddbc3babb31c3b files/digest-gcc-3.4.3 442
+MD5 9b68e03bb1a6a1494399c8a6537bb766 files/digest-gcc-3.4.3-r1 527
 MD5 e7e6f6800c5b2e5840cf837e4bd6e1a6 files/digest-gcc-3.4.3.20050110 536
-MD5 69687aac826654ad375b7eae45a01e0b files/digest-gcc-3.4.2-r2 443
-MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r1 442
-MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
-MD5 1acd56209164ab837c5f91723434464e files/fix_libtool_files.sh 1712
-MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361
-MD5 47eeaf2ebd915e107081602b157b4e45 files/digest-gcc-2.95.3-r8 137
-MD5 d1be641db83c2e12e5e5fa7804e50bc0 files/digest-gcc-4.0.0_alpha20050123 71
-MD5 e529648ecf001568e2016887bf0ec28d files/digest-gcc-4.0.0_alpha20050130 71
 MD5 60e02a7ee2f579ac72ab223679d81e7a files/gcc-spec-env.patch 819
-MD5 ea2cf3df0d89a26d5fdc1a531176e395 files/pro-police-docs.patch 3287
 MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
 MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
+MD5 ea2cf3df0d89a26d5fdc1a531176e395 files/pro-police-docs.patch 3287
 MD5 07b57d62aa1a8cd4d1cd37984ebe2053 files/scan_libgcc_linked_ssp.sh 861
-MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
-MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r2 442
-MD5 40e6872c09149a81973f01a78c80bbb7 files/digest-gcc-3.2.3-r4 279
-MD5 e58b6c1f3122b79a5d0d273acc3c008c files/digest-gcc-3.3.2-r7 361
-MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r3 442
-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 57ea5e7145dc1322b30f3ce6d6683978 files/3.4.3/gcc-3.4.3-cross-compile.patch 628
-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 1acd56209164ab837c5f91723434464e files/fix_libtool_files.sh 1712
+MD5 456037b22f0662c84d2360c7a15a6d75 files/digest-gcc-3.3.5.20050130 540
+MD5 7ff01b5670d35515df459af670fed06b files/digest-gcc-4.0.0_alpha20050213 71
 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
@@ -83,35 +67,49 @@ 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 b398b7415b93423ff04952c6e69bdb4d files/3.3.1/gcc331-pp-fixup.patch 407
-MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
 MD5 9e7ed6184a1cdcb69db29f1de26c2d18 files/3.3.2/gcc332-altivec-fix.patch 1607
-MD5 c8fd3851ccee57651e43cac458dba7c1 files/awk/fixlafiles.awk 7837
-MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830
+MD5 d9ae122db2768f8e504dfef256d4991f files/3.3.2/gcc332-gentoo-branding.patch 874
+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 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 9ba0bd0b103cf9535927ad7c482fe780 files/3.3.3/gcc333-debian-arm-getoff.patch 3501
+MD5 25eda9981106a55c413d1df3d3a87db5 files/3.3.3/gcc333-debian-arm-ldm.patch 3383
 MD5 cd87c02e4896f47bf6029eef0dc29468 files/3.3.3/gcc333-gentoo-branding.patch 874
+MD5 e5812da37c1862908a29cdae004c4e52 files/3.3.3/gcc333-pr15693.patch 3927
+MD5 bb0078854a778b2a279cfb15d8933c29 files/3.3.3/gcc333-ssp-3.3.2_1-fixup.patch 2598
 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 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 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 2970ce4d26f78bbb7e76f1d41a177bfb files/3.4.2/gcc34-fix-sse2_pinsrw.patch 901
-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 a720c913b78bcfbd7f63319130fadd4a files/3.4.2/810-arm-bigendian-uclibc.patch 1139
+MD5 27120401d2355e5d959b8d2d55eba310 files/3.3.4/gcc334-gentoo-branding.patch 876
+MD5 5fb5b49f3f16cc9e7e27e582c92ffa2f files/3.3.4/libffi-without-libgcj.patch 890
+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 17b3190d64e34ed7709d022b326d08ae files/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch 563
+MD5 66edf32babf498517ca56fa44c901f26 files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch 894
 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 31470a0e018eb2cdfe68c71039ede80f files/3.4.0/gcc34-multi32-hack.patch 2445
 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 86ae592deb82c4564eb61f770fe5f8a7 files/3.4.1/gcc-3.4.1-gentoo-branding.patch 759
+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 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 a720c913b78bcfbd7f63319130fadd4a files/3.4.2/810-arm-bigendian-uclibc.patch 1139
+MD5 f3a1b668077c6486c542dcef1cdd9672 files/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers.patch 12545
+MD5 b2922cfe76692e7d2b373a0a255f405e files/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch 14248
+MD5 2970ce4d26f78bbb7e76f1d41a177bfb files/3.4.2/gcc34-fix-sse2_pinsrw.patch 901
+MD5 2c1ce849de55d8c81af4e081dbb2f5e4 files/3.4.2/gcc34-m32-no-sse2.patch 1058
+MD5 57ea5e7145dc1322b30f3ce6d6683978 files/3.4.3/gcc-3.4.3-cross-compile.patch 628
+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 c8fd3851ccee57651e43cac458dba7c1 files/awk/fixlafiles.awk 7837
+MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830
diff --git a/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050123 b/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050123
deleted file mode 100644
index 79c7892cbdc3..000000000000
--- a/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050123
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57a7ed876e8de3c88e5e85e748051515 gcc-4.0-20050123.tar.bz2 28469783
diff --git a/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050130 b/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050130
deleted file mode 100644
index 15528510d370..000000000000
--- a/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050130
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5040ba840d0367c378f73c739418b3e2 gcc-4.0-20050130.tar.bz2 28507941
diff --git a/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050213 b/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050213
new file mode 100644
index 000000000000..6bf191368aa8
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-4.0.0_alpha20050213
@@ -0,0 +1 @@
+MD5 56c68edf4047dc42aeda22186cedb40b gcc-4.0-20050213.tar.bz2 29069021
diff --git a/sys-devel/gcc/gcc-3.3.5-r1.ebuild b/sys-devel/gcc/gcc-3.3.5-r1.ebuild
index fcbffdaaca91..22ec62c47e49 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.19 2005/02/12 20:58:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5-r1.ebuild,v 1.20 2005/02/26 12:40:21 eradicator Exp $
 
 GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~lv/GCC/"
 #GCC_MANPAGE_VERSION="3.3.4"
@@ -103,7 +103,7 @@ src_unpack() {
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs
 	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
+	if use !build && use objc && ! use gcj ; then
 		epatch ${FILESDIR}/3.3.4/libffi-without-libgcj.patch
 		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
 	fi
diff --git a/sys-devel/gcc/gcc-3.3.5.20050130.ebuild b/sys-devel/gcc/gcc-3.3.5.20050130.ebuild
index bf94da89472d..0444f6153608 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.9 2005/02/12 20:58:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130.ebuild,v 1.10 2005/02/26 12:40:21 eradicator Exp $
 
 GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/gcc/"
 #GCC_MANPAGE_VERSION="3.3.5"
@@ -102,7 +102,7 @@ src_unpack() {
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs
 	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
+	if use !build && use objc && ! use gcj ; then
 		epatch ${FILESDIR}/3.3.4/libffi-without-libgcj.patch
 		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
 	fi
diff --git a/sys-devel/gcc/gcc-3.4.3-r1.ebuild b/sys-devel/gcc/gcc-3.4.3-r1.ebuild
index 42efb9719dfb..29a243756050 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.27 2005/02/12 20:58:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3-r1.ebuild,v 1.28 2005/02/26 12:40:21 eradicator Exp $
 
 GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~lv/GCC/"
 #GCC_MANPAGE_VERSION="none"
@@ -95,7 +95,7 @@ src_unpack() {
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs
 	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
+	if use !build && use objc && ! use gcj ; then
 		epatch ${FILESDIR}/3.4.3/libffi-without-libgcj.patch
 		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
 	fi
diff --git a/sys-devel/gcc/gcc-3.4.3.20050110.ebuild b/sys-devel/gcc/gcc-3.4.3.20050110.ebuild
index 5341b2b37aac..fc822438260d 100644
--- a/sys-devel/gcc/gcc-3.4.3.20050110.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3.20050110.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.ebuild,v 1.16 2005/02/12 20:58:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.20050110.ebuild,v 1.17 2005/02/26 12:40:21 eradicator Exp $
 
 GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/gcc/"
 #GCC_MANPAGE_VERSION="none"
@@ -93,7 +93,7 @@ src_unpack() {
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs
 	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
+	if use !build && use objc && ! use gcj ; then
 		epatch ${FILESDIR}/3.4.3/libffi-without-libgcj.patch
 		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
 	fi
diff --git a/sys-devel/gcc/gcc-4.0.0_alpha20050130.ebuild b/sys-devel/gcc/gcc-4.0.0_alpha20050130.ebuild
deleted file mode 100644
index 9fe96cd9b039..000000000000
--- a/sys-devel/gcc/gcc-4.0.0_alpha20050130.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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_alpha20050130.ebuild,v 1.6 2005/02/12 20:58:20 vapier Exp $
-
-GCC_MANPAGE_VERSION="none"
-ETYPE="gcc-compiler"
-
-inherit toolchain
-
-DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
-HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-*"
-
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-config-1.3.1
-	>=sys-libs/zlib-1.1.4
-	!sys-devel/hardened-gcc
-	!uclibc? (
-		>=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 ) )
-	fortran? ( dev-libs/gmp )
-	!build? (
-		gcj? (
-			gtk? ( >=x11-libs/gtk+-2.2 )
-			>=media-libs/libart_lgpl-2.1
-		)
-		>=sys-libs/ncurses-5.2-r2
-		nls? ( sys-devel/gettext )
-	)"
-
-
-if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
-fi
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.15.90.0.1.1-r1"
-
-PDEPEND="sys-devel/gcc-config
-	!nocxx? ( !n32? ( !n64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
diff --git a/sys-devel/gcc/gcc-4.0.0_alpha20050123.ebuild b/sys-devel/gcc/gcc-4.0.0_alpha20050213.ebuild
index 9e01663c8c6e..53582ff71dfe 100644
--- a/sys-devel/gcc/gcc-4.0.0_alpha20050123.ebuild
+++ b/sys-devel/gcc/gcc-4.0.0_alpha20050213.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_alpha20050123.ebuild,v 1.6 2005/02/12 20:58:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.0_alpha20050213.ebuild,v 1.1 2005/02/26 12:40:21 eradicator Exp $
 
 GCC_MANPAGE_VERSION="none"
 ETYPE="gcc-compiler"
@@ -44,3 +44,12 @@ DEPEND="${RDEPEND}
 
 PDEPEND="sys-devel/gcc-config
 	!nocxx? ( !n32? ( !n64? ( !uclibc? ( !build? ( sys-libs/libstdc++-v3 ) ) ) ) )"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	einfo "This gcc-4 ebuild is provided for your convenience, and the use"
+	einfo "of this compiler is not supported by the Gentoo Developers."
+	einfo "Please file bugs related to gcc-4 with upstream developers."
+	einfo "Compiler bugs should be filed at http://gcc.gnu.org/bugzilla/"
+}