- switch default ordering of gcc-config and eselect-compiler to work around portage bug

(Portage version: 2.1.1_pre2-r7)

4 files changed, 18 insertions, 13 deletions

diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog
index 15f9293164f8..d249a258828c 100644
--- a/sys-libs/libstdc++-v3/ChangeLog
+++ b/sys-libs/libstdc++-v3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libstdc++-v3
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.47 2006/07/21 00:23:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.48 2006/08/14 17:27:15 solar Exp $
+
+  14 Aug 2006; <solar@gentoo.org> libstdc++-v3-3.3.3-r1.ebuild,
+  libstdc++-v3-3.3.4.ebuild, libstdc++-v3-3.3.6.ebuild:
+  - switch default ordering of gcc-config and eselect-compiler to work around
+  portage bug
 
   21 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   libstdc++-v3-3.3.6.ebuild:
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
index 5a2cfe03c384..d154405fc506 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild,v 1.39 2006/06/06 01:20:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild,v 1.40 2006/08/14 17:27:15 solar Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -141,19 +141,19 @@ DEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-devel/gcc-3.3.3_pre20040130
 	!build? ( >=sys-libs/ncurses-5.2-r2
 	          nls? ( sys-devel/gettext ) )"
 
 RDEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
index 875c5eef037a..605a3c2cf70a 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.22 2006/06/06 01:20:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.23 2006/08/14 17:27:15 solar Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -145,19 +145,19 @@ DEPEND="virtual/libc
 	!nptl? ( elibc_glibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-devel/gcc-3.3.3_pre20040130
 	!build? ( >=sys-libs/ncurses-5.2-r2
 	          nls? ( sys-devel/gettext ) )"
 
 RDEPEND="virtual/libc
 	!nptl? ( elibc_glibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
index d2a57540f29c..b29bdf27d028 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.10 2006/07/21 00:23:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.11 2006/08/14 17:27:15 solar Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -145,19 +145,19 @@ DEPEND="virtual/libc
 	!nptl? ( elibc_glibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-devel/gcc-3.3.3_pre20040130
 	!build? ( >=sys-libs/ncurses-5.2-r2
 	          nls? ( sys-devel/gettext ) )"
 
 RDEPEND="virtual/libc
 	!nptl? ( elibc_glibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 
-PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
+PDEPEND="|| ( sys-devel/gcc-config app-admin/eselect-compiler )"
 
 src_unpack() {
 	unpack ${A}