drop eselect compiler from these snapshot ebuilds too

54 files changed, 82 insertions, 82 deletions

diff --git a/sys-devel/gcc/gcc-4.1.0_alpha20080630.ebuild b/sys-devel/gcc/gcc-4.1.0_alpha20080630.ebuild
index 21e7e40..81fda75 100644
--- a/sys-devel/gcc/gcc-4.1.0_alpha20080630.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0_alpha20080630.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20090325.ebuild b/sys-devel/gcc/gcc-4.2.0_alpha20090325.ebuild
index c5c57ef..f9c43d3 100644
--- a/sys-devel/gcc/gcc-4.2.0_alpha20090325.ebuild
+++ b/sys-devel/gcc/gcc-4.2.0_alpha20090325.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	fortran? (
 		>=dev-libs/gmp-4.2.1
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100103.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100103.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100103.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100103.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100110.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100110.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100110.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100110.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100117.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100117.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100117.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100117.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100124.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100124.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100124.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100124.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100131.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100131.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100131.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100131.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100207.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100207.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100207.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100207.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100214.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100214.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100214.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100214.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100221.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100221.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100221.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100221.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100228.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100228.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100228.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100228.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100307.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100307.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100307.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100307.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100314.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100314.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100314.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100314.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100321.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100321.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100321.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100321.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100328.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100328.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100328.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100328.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100404.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100404.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100404.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100404.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100411.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100411.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100411.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100411.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100418.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100418.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100418.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100418.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100425.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100425.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100425.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100425.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100502.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100502.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100502.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100502.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100509.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100509.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100509.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100509.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100516.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100516.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100516.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100516.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100523.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100523.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100523.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100523.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100530.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100530.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100530.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100530.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100606.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100606.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100606.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100606.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100613.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100613.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100613.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100613.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100620.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100620.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100620.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100620.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 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_alpha20100627.ebuild b/sys-devel/gcc/gcc-4.3.0_alpha20100627.ebuild
index 4b78f37..7a1148d 100644
--- a/sys-devel/gcc/gcc-4.3.0_alpha20100627.ebuild
+++ b/sys-devel/gcc/gcc-4.3.0_alpha20100627.ebuild
@@ -13,7 +13,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.3.12-r4
 	virtual/libiconv
 	>=dev-libs/gmp-4.2.1
 	>=dev-libs/mpfr-2.3
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r4
 	>=sys-devel/bison-1.875
 	>=${CATEGORY}/binutils-2.16.1"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.3.6 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100105.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100105.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100105.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100105.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100112.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100112.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100112.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100112.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100119.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100119.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100119.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100119.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100126.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100126.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100126.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100126.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100202.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100202.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100202.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100202.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100209.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100209.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100209.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100209.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100216.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100216.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100216.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100216.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100223.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100223.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100223.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100223.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100302.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100302.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100302.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100302.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100309.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100309.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100309.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100309.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100316.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100316.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100316.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100316.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100323.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100323.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100323.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100323.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100330.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100330.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100330.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100330.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100406.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100406.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100406.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100406.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100413.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100413.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100413.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100413.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100420.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100420.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100420.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100420.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100427.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100427.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100427.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100427.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100504.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100504.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100504.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100504.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100511.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100511.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100511.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100511.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100518.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100518.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100518.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100518.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100525.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100525.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100525.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100525.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100601.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100601.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100601.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100601.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100608.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100608.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100608.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100608.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100615.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100615.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100615.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100615.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100622.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100622.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100622.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100622.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
diff --git a/sys-devel/gcc/gcc-4.4.0_alpha20100629.ebuild b/sys-devel/gcc/gcc-4.4.0_alpha20100629.ebuild
index d44f97c..50ab483 100644
--- a/sys-devel/gcc/gcc-4.4.0_alpha20100629.ebuild
+++ b/sys-devel/gcc/gcc-4.4.0_alpha20100629.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
 	>=${CATEGORY}/binutils-2.18"
-PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
+PDEPEND="sys-devel/gcc-config"
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi