Drop eselect-compiler from DEPENDs since it has been dropped from the tree.

Package-Manager: portage-2.2_pre5

17 files changed, 83 insertions, 75 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index cb0443789028..213f63be9d25 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.645 2008/03/18 11:41:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.646 2008/03/20 20:39:50 vapier Exp $
+
+  20 Mar 2008; Mike Frysinger <vapier@gentoo.org> gcc-2.95.3-r9.ebuild,
+  gcc-2.95.3-r10.ebuild, gcc-3.2.3-r4.ebuild, gcc-3.3.6-r1.ebuild,
+  gcc-3.4.6-r2.ebuild, gcc-4.0.3.ebuild, gcc-4.0.4.ebuild,
+  gcc-4.1.0-r1.ebuild, gcc-4.1.1-r3.ebuild, gcc-4.1.2.ebuild,
+  gcc-4.2.0.ebuild, gcc-4.2.1.ebuild, gcc-4.2.2.ebuild, gcc-4.2.3.ebuild,
+  gcc-4.3.0.ebuild:
+  Drop eselect-compiler from DEPENDs since it has been dropped from the tree.
 
   18 Mar 2008; Mike Frysinger <vapier@gentoo.org> gcc-4.3.0.ebuild:
   Fold mpfr/gmp depend updates from toolchain overlay #213687.
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index d332cdb0cd1b..b9cca652df8d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -112,29 +112,29 @@ DIST gcc-4.3.0-uclibc-patches-1.0.tar.bz2 17838 RMD160 5e16b03dea3cab960d5c6c2e7
 DIST gcc-4.3.0.tar.bz2 59321957 RMD160 33f18764fc4b5dffa902fd50bee6eb1e31816e4a SHA1 d6ae7f024b99ba9b85f253fdeb00a9a1d6f1fc8d SHA256 e0488144c6913cfe69b4ba2c36905aec45ff5e07febfa47091699a2982b5131c
 DIST gdc-0.24-src.tar.bz2 1012099 RMD160 f0f33cc02d88ea1174030988c2006cb90029392a SHA1 2be913fe061429c1a279e4cf882e947d34946303 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a
 DIST protector-3.2.2-10.tar.gz 24556 RMD160 905b1ef473435230f7f4519ecf0f8a3d4c66e4e5 SHA1 c3a45f3fc450f1bd282af88a94d4b3d427d23072 SHA256 ad8401650ee0f7162e844cea492aa6151de77e8d0236cacc999aada69d511bab
-EBUILD gcc-2.95.3-r10.ebuild 1230 RMD160 7f06546226bfb32676a3a0c25385e6fc817a09ed SHA1 896e3ac088bf15b2945403e952fb9dd89b40468b SHA256 4077a79324d948bd7e68580261e370dd843469c45f01770556ffa84386d37cd0
-EBUILD gcc-2.95.3-r9.ebuild 7903 RMD160 0298b55ffb7ea5caf4b645dabaee15a00cdd11fa SHA1 692818eae4b6ce9dee0d3ab3c2174b82b480dffd SHA256 dab34f723cb46402826e207b2f9593bf83674116a9b309b874013152daf2d4f3
+EBUILD gcc-2.95.3-r10.ebuild 1202 RMD160 8199972a39cfc93ee6a0922826acfd430111b54f SHA1 3f0f7f8c66085f185dd15e478039b464f040a367 SHA256 3e5ea2199ca2ea2a8cf82ff37b45be74ec14d1cdb6c20c6f513a1f3258e3cf95
+EBUILD gcc-2.95.3-r9.ebuild 7864 RMD160 e045bc69182bb0531317ec3d8f04da7da1d44cf0 SHA1 84771ad4d945143a7483c764bc0abf8d013c7150 SHA256 6a471d851a3c0e5aca1f2f61005875e6b10e271836f177bc5911d755d273a247
 EBUILD gcc-3.1.1-r2.ebuild 9210 RMD160 206881516627ab93359924637597ea1675c132fd SHA1 1743ac9b185d94574d55170cdaab3305ba052260 SHA256 86f05a36ba0410c596362c239179a15d6e27efeb8dafb05eb607df4b57b1c8b2
 EBUILD gcc-3.2.2.ebuild 764 RMD160 0b34c75dc19bd62bb0fd7cb9df492e84c7668087 SHA1 8c5172d19da4a454be3175496541fab5df6c68f3 SHA256 ab928e3853e60027de0e9d243c5f64e8436e4378d6c9d1b19095be5cd6d1e343
-EBUILD gcc-3.2.3-r4.ebuild 19661 RMD160 6e2844e517260f7d20c1acfe0143a753ca8b46bc SHA1 2dc7b02a3faef484e1e8c15c714c7b0fdb2f9c8a SHA256 49f4d118eab8ae50bc44b77c1ce2468fabd04572e9cfaa722189bbf58ad6301c
-EBUILD gcc-3.3.6-r1.ebuild 3102 RMD160 368aeb2066052ed7dfb255b8d8ce7a275aaad8c2 SHA1 6d0f6741de8372194a1c91a09ad0ac6e4069b9e7 SHA256 211bda2fe09784faca2bf10883aac7c905e393ea636552b27eb033cb0005fefb
-EBUILD gcc-3.4.6-r2.ebuild 5039 RMD160 cc9aea4a7a347a042451cff34f0dc3f3a315fc17 SHA1 6a17f3188eaf4479850b325e5feabf498967187b SHA256 c825ab08cb5aaddf29ce57a43054caa8a794c8a0fb9b811686a7dc2bd8b06e28
-EBUILD gcc-4.0.3.ebuild 1810 RMD160 d2040829d68435c84b86a8ea8a827c6054e47eea SHA1 028dfda0b1737ce284ad49ba520cb2da98e2e0c1 SHA256 60a79bc27baf05b4aa1cd0bc7bef50e45824a807a1db410b170235bc625ef8de
-EBUILD gcc-4.0.4.ebuild 1805 RMD160 b081f8b1810f6c748a96f817f9f4bd8926976c34 SHA1 8459969d5fd85c0a8c857996a986d84a7281b41a SHA256 5112f4fdfaeb5b1f0c9525285a4ccdb70ce61a58b82bee8676cc7d03691bfb53
-EBUILD gcc-4.1.0-r1.ebuild 1768 RMD160 8f1c5ea114957ac3741c2fa481e233b9671ce182 SHA1 8e142f0287f347b5c2870704f94f5f15adb307f2 SHA256 55e55a5df52a7d026d2d815482a2ccb6a6d1e41ecacc6864cd781fe1431f7fd3
-EBUILD gcc-4.1.1-r3.ebuild 1972 RMD160 ac7f432ce789cdc297c1e5ce46b6545a3068d588 SHA1 a227dbb177f25e49482b0f2b36c392764ccbdae0 SHA256 bf171b789ea2587590e1a3e561e6dba364f434f88b29e50399435611eb0adc19
-EBUILD gcc-4.1.2.ebuild 1980 RMD160 b6a7e367f564dbe103d54b3fbd223ff691678500 SHA1 92358bb74871e898741f1edaae7388b40f70deb3 SHA256 cb7da5abf98806a60c882ef2dcdb925b5a7a9d0403141d90415dacdf89ac4f0b
-EBUILD gcc-4.2.0.ebuild 1816 RMD160 b986241b2bda28838142e7bc9a8ccfe37f1baf92 SHA1 7c9c3cc889ad3019c777100a9ce8df29defe2df6 SHA256 70adc1eaacac5a89f7232a86b3235a820ed28e4bba53102baff0221114445d83
-EBUILD gcc-4.2.1.ebuild 1813 RMD160 4604c592c0cbe8011e0118d1c062804e4be629ee SHA1 9c74764544787f576e8fbd55c80440832b5abbd3 SHA256 72cda651f50a2c5aee0f0155f2e97d3b8b51212e7e7e18f6132031b1e52a24d6
-EBUILD gcc-4.2.2.ebuild 1803 RMD160 c97536e94132cfeb5aafbade5326e4f374dd49d9 SHA1 7ad5243cf1d5b263c24f9399e393e05e82e56009 SHA256 47e264381e79e449bbc1aaa72116308b1d6a84d2714b7e62ab9aec272e872eb2
-EBUILD gcc-4.2.3.ebuild 1837 RMD160 6fab826376ccfe7f46cd6f7b03dba9ad1f1e7406 SHA1 31dba50329f52a8ec0f5b2a2931510f92ed24435 SHA256 47b068f84344e8d7d6f09362b6fb6c86f73e7443a526f688a861513acdf59bdc
-EBUILD gcc-4.3.0.ebuild 1738 RMD160 54fe0086f64333e10e828ce628e21dd894b19ac2 SHA1 b83c35c3f1338157cd93527f2c17f899f54c7391 SHA256 f1bb42eb1c8b5764d501f3a3309d8bc1a0a779d1d6a3f88d49bae2481b929b8f
-MISC ChangeLog 118128 RMD160 cb2c00f6e5cac2d2ad371dcf647a87a7858a733c SHA1 b3e061b876e4e804c37a89dceb44d805994a062c SHA256 2e81883abb6941c16df0ee0f9be076d3845a1d6fac3f3142e065c3125811cec1
+EBUILD gcc-3.2.3-r4.ebuild 19586 RMD160 3d8a3431f79d5c2260ab9937f5d5a062eea5651f SHA1 27cbe4f14ec13c234d87563d99e0f0f49117cfba SHA256 c126e93889037dcc6e49c85cb1bae25908b9e81c9b5c56164e8eeae456f53b71
+EBUILD gcc-3.3.6-r1.ebuild 3034 RMD160 1bc231c7233bf8dfef63a3d340917b175f018b7d SHA1 487cf95ce0cc943e2ea50b98540320e47ccd3911 SHA256 7a5427f30ae8ed2bf42c1dc6880eb2bcd63fba221d726af018d8e5d4ec4eb445
+EBUILD gcc-3.4.6-r2.ebuild 4971 RMD160 f09a9bef26f8e3fff4cac10cc046558f9a101d08 SHA1 cbbeae05295366e8dce2622e9419dd97bf373513 SHA256 af0cb45af3d506360bd12326e7d26fa5dd5d25b8ef87f154c70f584f297cfd5b
+EBUILD gcc-4.0.3.ebuild 1739 RMD160 2f1a481e621c775a93db07b550c257dd58a05855 SHA1 15f3ca86618433b6a4e5e8d135cb098cc2dc059e SHA256 33ce59a5e842d37d3d1212174c0fdb61feda9a1e155626ca1928339b0498fb14
+EBUILD gcc-4.0.4.ebuild 1734 RMD160 3953be8492c74240714ce06a2bd68ea50c934c99 SHA1 cb4b12b4267513211a6723be0459efdb20ee37f6 SHA256 0d7702ffa051eac77908f8fb5d6030b5526823c2929bf924924a3777dbe8ce81
+EBUILD gcc-4.1.0-r1.ebuild 1697 RMD160 728ba95b63c95275a422aa899e1e9803c63b083f SHA1 b18274efd94eabd1b733f8157aa7b31fa3e7bc7f SHA256 4dcebd7e4d36929fa745939c4e60511bcc99e1b7117a62ea0ee57d67f9f90f72
+EBUILD gcc-4.1.1-r3.ebuild 1901 RMD160 18073bdf42a044f0300c7bc5f4b9bea9d81e8918 SHA1 16e36d778f0b84985b585b6ff61262bca9fd2384 SHA256 5062bd24ad9ec30dcd4878e7a58249e81d99ce1cc56b29999e9164ab634ada30
+EBUILD gcc-4.1.2.ebuild 1912 RMD160 6a8ce01883c6618f8520ac236ec3325321ee2628 SHA1 225f1a53295045eb36b3aeae3ff0b209562e4e1a SHA256 de5021d57d178bf3020ed8facb38d1fa11791bbfbf9a0e9fcab93aa3b747bd9a
+EBUILD gcc-4.2.0.ebuild 1746 RMD160 32e447f0e3815e85e11740d049ada97a493a9b14 SHA1 d3a50c6e84a8f35c1ee84d561619959fe6941c1c SHA256 9b7de438fcd08ed46c89899d996ff893e1c7ab7e3647b5c3b94b4e4b3542a4c0
+EBUILD gcc-4.2.1.ebuild 1745 RMD160 926dca78d862510ab7965493877650dd8093e66f SHA1 956a39bd2d7b1a0594753b1eea0b145762cde590 SHA256 255e314987a3e0aa209b584008fe91625df3f38dedde6899347a62187067dc97
+EBUILD gcc-4.2.2.ebuild 1735 RMD160 358ebb4238ed02defc525784b340b2d6c713a06e SHA1 1a998a8377237e97652d9fc7aff0b0cfeeba6900 SHA256 f142d6bf02ce3069a71b118e32e11c2370c653b27f3e2693427255c29dd361a8
+EBUILD gcc-4.2.3.ebuild 1769 RMD160 16752e4a1c72dd6aa1143882f43aa412fd72fb43 SHA1 c08a4b4e84ebf7aa41b30270dc1d2eb6ec7c87f5 SHA256 bab53008fb91629a0db9b299628ec74110e5d00d1c13b875db2255b84a04bd04
+EBUILD gcc-4.3.0.ebuild 1670 RMD160 89649156e6df6c60a38cadd6886b6710750cd708 SHA1 32d41d1c774f2372dec3c57a78cb0f961862befd SHA256 f233fc23e3207314bcdd3e4d3f872b5f12a073f6f50b5162cc8f46397c122873
+MISC ChangeLog 118561 RMD160 f54a532ab731e1af17bc35c10c0ec2c465496ccc SHA1 0c716f1b31c845980ae599e61daafd6759395bef SHA256 88f4cdb3037fb5250857e5ebe460c9340d9870529a3fc196777a398b1d231015
 MISC metadata.xml 254 RMD160 60385b0c366defb69c143de944cf493ae827159a SHA1 ed95d876046d97d214e8694c6c3ec5da02872354 SHA256 23239f4f1c5656fc1f22cc2da40e602ea2351b9403e7f32ed7113debc1d1b139
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH36rBj9hvisErhMIRAtC0AJ4haskJPqWTa0QpFKnOoxrjL7iZUACgn5N4
-diWyq48iL2t2gxKpM91mr/I=
-=YsKI
+iD8DBQFH4swXj9hvisErhMIRAmNBAJ92b4V69W+HSkLNnc6jFS6fLlR8awCeLKI3
+b0zIRSkt74sO8S+kAqnTwvw=
+=fJk2
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-2.95.3-r10.ebuild b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
index c92c06ed1304..e54d0c287506 100644
--- a/sys-devel/gcc/gcc-2.95.3-r10.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r10.ebuild,v 1.3 2006/12/31 08:52:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r10.ebuild,v 1.4 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.3"
 SPLIT_SPECS="no"
@@ -17,7 +17,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 DEPEND="${RDEPEND}
 	!build? ( nls? ( sys-devel/gettext ) )"
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 
 [[ $(tc-arch ${TARGET}) == "alpha" ]] && GENTOO_PATCH_EXCLUDE="10_all_new-atexit.patch"
 
diff --git a/sys-devel/gcc/gcc-2.95.3-r9.ebuild b/sys-devel/gcc/gcc-2.95.3-r9.ebuild
index 2888cb658586..71414f8e96ad 100644
--- a/sys-devel/gcc/gcc-2.95.3-r9.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r9.ebuild,v 1.6 2007/06/26 02:52:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r9.ebuild,v 1.7 2008/03/20 20:39:50 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs versionator fixheadtails gnuconfig
 
@@ -70,7 +70,7 @@ else
 	SLOT="${GCC_BRANCH_VER}"
 fi
 
-RDEPEND="|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.2.3 )
+RDEPEND=">=sys-devel/gcc-config-1.4
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
diff --git a/sys-devel/gcc/gcc-3.2.3-r4.ebuild b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
index cdb70d9fbac1..4c2fb916305a 100644
--- a/sys-devel/gcc/gcc-3.2.3-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.2.3-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.25 2007/07/15 04:37:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.26 2008/03/20 20:39:50 vapier Exp $
 
 inherit eutils flag-o-matic libtool versionator
 
@@ -111,14 +111,14 @@ SLOT="${GCC_BRANCH_VER}"
 DEPEND=">=sys-libs/glibc-2.3.2-r3
 	mips? ( >=sys-devel/binutils-2.13.90.0.16 )
 	!mips? ( >=sys-devel/binutils-2.13.90.0.18 )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	>=sys-devel/gcc-config-1.4
 	!build? ( >=sys-libs/ncurses-5.2-r2
 		nls? ( sys-devel/gettext ) )"
 
 # this glibc has the glibc guard symbols which are needed for the propolice functions to get moved to glibc
 # out of the libgcc in this gcc release, however, the propolice patch itself is not defused by this removal
 RDEPEND=">=sys-libs/glibc-2.3.2-r3
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	>=sys-devel/gcc-config-1.4
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
diff --git a/sys-devel/gcc/gcc-3.3.6-r1.ebuild b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
index 4ffec0a5692e..3345cd7fd43f 100644
--- a/sys-devel/gcc/gcc-3.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r1.ebuild,v 1.11 2007/12/29 18:18:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.12 2008/03/20 20:39:50 vapier Exp $
 
 MAN_VER=""
 PATCH_VER="1.5"
@@ -40,7 +40,7 @@ KEYWORDS="~amd64 ~x86"
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
-RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+RDEPEND=">=sys-devel/gcc-config-1.4
 	>=sys-libs/zlib-1.1.4
 	elibc_glibc? ( >=sys-libs/glibc-2.3.2-r9 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
@@ -69,7 +69,7 @@ fi
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 
 src_unpack() {
 	gcc_src_unpack
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index 96155adab5bb..d4e2c67a1823 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.19 2007/09/05 22:20:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.20 2008/03/20 20:39:50 vapier Exp $
 
 MAN_VER=""
 PATCH_VER="1.5"
@@ -47,7 +47,7 @@ KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sh sparc x86 ~x86-fbsd"
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
 # .eh_frame ld optimisation and symbol visibility support, but it hasnt been
 # well tested in gentoo on any arch other than amd64!!
-RDEPEND="|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+RDEPEND=">=sys-devel/gcc-config-1.4
 	>=sys-libs/zlib-1.1.4
 	virtual/libiconv
 	elibc_glibc? (
@@ -79,7 +79,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.875
 	>=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 app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 
 src_unpack() {
 	gcc_src_unpack
diff --git a/sys-devel/gcc/gcc-4.0.3.ebuild b/sys-devel/gcc/gcc-4.0.3.ebuild
index a7924921f020..2ade94c22974 100644
--- a/sys-devel/gcc/gcc-4.0.3.ebuild
+++ b/sys-devel/gcc/gcc-4.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.3.ebuild,v 1.13 2007/07/22 06:35:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.3.ebuild,v 1.14 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -25,7 +25,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-* ~ia64"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	fortran? (
 		dev-libs/gmp
 		dev-libs/mpfr
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.0.4.ebuild b/sys-devel/gcc/gcc-4.0.4.ebuild
index a25be9c86f93..e85b3aae5598 100644
--- a/sys-devel/gcc/gcc-4.0.4.ebuild
+++ b/sys-devel/gcc/gcc-4.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.2 2007/07/22 06:35:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.3 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -25,7 +25,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-* ~ia64"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	fortran? (
 		dev-libs/gmp
 		dev-libs/mpfr
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.1.0-r1.ebuild b/sys-devel/gcc/gcc-4.1.0-r1.ebuild
index d7ebc5697970..fe9a7dab1c9c 100644
--- a/sys-devel/gcc/gcc-4.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0-r1.ebuild,v 1.15 2007/07/22 06:35:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0-r1.ebuild,v 1.16 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.8"
 UCLIBC_VER="1.1"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-* ~amd64 ~hppa ~ppc s390 ~x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.1.1-r3.ebuild b/sys-devel/gcc/gcc-4.1.1-r3.ebuild
index ec3bb285abdf..1ed907070929 100644
--- a/sys-devel/gcc/gcc-4.1.1-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.1.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1-r3.ebuild,v 1.15 2007/07/22 06:35:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.1-r3.ebuild,v 1.16 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.10"
 UCLIBC_VER="1.1"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-* alpha amd64 arm hppa ia64 mips ppc ppc64 ~s390 sparc ~sparc-fbsd x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index 1ba7e013eb08..de2de67a481c 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.19 2008/03/16 00:24:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.20 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -20,7 +20,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="-* alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.2.0.ebuild b/sys-devel/gcc/gcc-4.2.0.ebuild
index 1b0ab2200406..b689657f4f06 100644
--- a/sys-devel/gcc/gcc-4.2.0.ebuild
+++ b/sys-devel/gcc/gcc-4.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.0.ebuild,v 1.10 2007/08/01 09:11:50 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.0.ebuild,v 1.11 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc -ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" #ppc64: 179218
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.2.1.ebuild b/sys-devel/gcc/gcc-4.2.1.ebuild
index b58f86a3c88b..33eed024a47b 100644
--- a/sys-devel/gcc/gcc-4.2.1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.1.ebuild,v 1.1 2007/10/07 02:12:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.1.ebuild,v 1.2 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc -ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" #ppc64: 179218
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.2.2.ebuild b/sys-devel/gcc/gcc-4.2.2.ebuild
index 6f02041cbe9f..7e9885e22a58 100644
--- a/sys-devel/gcc/gcc-4.2.2.ebuild
+++ b/sys-devel/gcc/gcc-4.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.2.ebuild,v 1.3 2007/12/31 15:40:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.2.ebuild,v 1.4 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.2.3.ebuild b/sys-devel/gcc/gcc-4.2.3.ebuild
index 2bd38b083918..967375b65b6c 100644
--- a/sys-devel/gcc/gcc-4.2.3.ebuild
+++ b/sys-devel/gcc/gcc-4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.3.ebuild,v 1.2 2008/02/16 22:53:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.3.ebuild,v 1.3 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.3.0.ebuild b/sys-devel/gcc/gcc-4.3.0.ebuild
index fa911e9ef447..c13af2a8432d 100644
--- a/sys-devel/gcc/gcc-4.3.0.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.0.ebuild,v 1.2 2008/03/18 11:41:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.0.ebuild,v 1.3 2008/03/20 20:39:50 vapier Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS=""
 
 RDEPEND=">=sys-libs/zlib-1.1.4
-	|| ( >=sys-devel/gcc-config-1.3.12-r4 app-admin/eselect-compiler )
+	>=sys-devel/gcc-config-1.4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
 	ppc? ( >=${CATEGORY}/binutils-2.17 )
 	ppc64? ( >=${CATEGORY}/binutils-2.17 )
 	>=${CATEGORY}/binutils-2.15.94"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND=">=sys-devel/gcc-config-1.4"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi