Testing the libstdc++ virtual before marking it stable. Then we can remove it from all of the gcc ebuilds and put it into the binary ebuilds that require it.

(Portage version: 2.1_pre1)

4 files changed, 13 insertions, 7 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 256f102b2b6e..ca551d0155e9 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.477 2005/12/17 01:44:31 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.478 2005/12/20 21:08:16 halcy0n Exp $
+
+  20 Dec 2005; Mark Loeser <halcy0n@gentoo.org> gcc-4.0.1.ebuild,
+  gcc-4.0.2-r2.ebuild, gcc-4.1.0_beta20051216.ebuild:
+  Testing the libstdc++ virtual before marking it stable. Then we can remove
+  it from all of the gcc ebuilds and put it into the binary ebuilds that
+  require it.
 
 *gcc-4.1.0_beta20051216 (17 Dec 2005)
 
diff --git a/sys-devel/gcc/gcc-4.0.1.ebuild b/sys-devel/gcc/gcc-4.0.1.ebuild
index aa1671be652d..e60ae5f152cb 100644
--- a/sys-devel/gcc/gcc-4.0.1.ebuild
+++ b/sys-devel/gcc/gcc-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.1.ebuild,v 1.10 2005/11/21 01:12:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.1.ebuild,v 1.11 2005/12/20 21:08:16 halcy0n Exp $
 
 PATCH_VER="1.0"
 PATCH_GCC_VER="4.0.1"
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	>=${CATEGORY}/binutils-2.16.1"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
-	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
+	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( =virtual/libstdc++-3.3 ) ) ) )"
 
 pkg_postinst() {
 	toolchain_pkg_postinst
diff --git a/sys-devel/gcc/gcc-4.0.2-r2.ebuild b/sys-devel/gcc/gcc-4.0.2-r2.ebuild
index b56e25876ef0..330a78978cfe 100644
--- a/sys-devel/gcc/gcc-4.0.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.2-r2.ebuild,v 1.1 2005/12/13 01:52:43 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.2-r2.ebuild,v 1.2 2005/12/20 21:08:16 halcy0n Exp $
 
 PATCH_VER="1.3"
 PATCH_GCC_VER="4.0.2"
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND}
 	>=${CATEGORY}/binutils-2.16.1"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
-	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
+	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( =virtual/libstdc++-3.3 ) ) ) )"
 
 src_unpack() {
 	gcc_src_unpack
diff --git a/sys-devel/gcc/gcc-4.1.0_beta20051216.ebuild b/sys-devel/gcc/gcc-4.1.0_beta20051216.ebuild
index d751d5fbf668..47eb4509e0b5 100644
--- a/sys-devel/gcc/gcc-4.1.0_beta20051216.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0_beta20051216.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.1.0_beta20051216.ebuild,v 1.1 2005/12/17 01:44:32 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051216.ebuild,v 1.2 2005/12/20 21:08:16 halcy0n Exp $
 
 ETYPE="gcc-compiler"
 
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 	>=${CATEGORY}/binutils-2.16.1"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
-	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
+	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( =virtual/libstdc++-3.3 ) ) ) )"
 
 pkg_setup() {
 	if [ -z $I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS ] ; then