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

(Portage version: 2.2_pre5)

16 files changed, 64 insertions, 56 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/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