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

Package-Manager: portage-2.1.1_pre2-r7

5 files changed, 36 insertions, 41 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/Manifest b/sys-libs/libstdc++-v3/Manifest
index 4f56d359d487..f73a5d69865e 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,29 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libstdc++_amd64_multilib_hack.patch 350 RMD160 c2c906288b4e8076e807b4ac4d26c8ff8e6ad504 SHA1 64a2d8fcfbc3f97ae689d1c3ecfe93eb7bb0a56b SHA256 00429f6904da7dfdf9bd1d94f5a0baec03026a057b72ad3ae808f5040f0b02dd
 MD5 b2a96584f4cee72362695ba44c911c40 files/libstdc++_amd64_multilib_hack.patch 350
 RMD160 c2c906288b4e8076e807b4ac4d26c8ff8e6ad504 files/libstdc++_amd64_multilib_hack.patch 350
 SHA256 00429f6904da7dfdf9bd1d94f5a0baec03026a057b72ad3ae808f5040f0b02dd files/libstdc++_amd64_multilib_hack.patch 350
-DIST gcc-3.3.3.tar.bz2 23279245 RMD160 3b5ba141491781626170ca530963b25976b42a99 SHA256 9ac6618495b7dd2ff0cd50abd76fe3c51287efcc724340687407f9fc250bdc6a
-DIST gcc-3.3.4.tar.bz2 23331664 RMD160 c6ba864feb97f0e00b2d9034f491188ca32abbf5 SHA256 3f409186acee739641341e5486e30ea9acecc039452e97a9eb850afbc6c3a691
+DIST gcc-3.3.3.tar.bz2 23279245 RMD160 3b5ba141491781626170ca530963b25976b42a99 SHA1 a9efbc34c5dd7fc48f7d700461de4fc014968cab SHA256 9ac6618495b7dd2ff0cd50abd76fe3c51287efcc724340687407f9fc250bdc6a
+DIST gcc-3.3.4.tar.bz2 23331664 RMD160 c6ba864feb97f0e00b2d9034f491188ca32abbf5 SHA1 f1690df8d2f0c60ada0c8d0c9c350063aa00f705 SHA256 3f409186acee739641341e5486e30ea9acecc039452e97a9eb850afbc6c3a691
 DIST gcc-3.3.6.tar.bz2 23972413 RMD160 b32c7a08c690857f0ac52dda3deb47cf5775d967 SHA1 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f
-EBUILD libstdc++-v3-3.3.3-r1.ebuild 8016 RMD160 27a3b2304a7fe26fa18b431b5612e3749ad04c19 SHA1 1c412c8e268752140f1fda5576d34a81ae00108b SHA256 f3f08ac501088b55b4eccc74fba65d3ebfde0341fcd2923414bf541a20e4f9f6
-MD5 c39f677f58a43d75395563e625973860 libstdc++-v3-3.3.3-r1.ebuild 8016
-RMD160 27a3b2304a7fe26fa18b431b5612e3749ad04c19 libstdc++-v3-3.3.3-r1.ebuild 8016
-SHA256 f3f08ac501088b55b4eccc74fba65d3ebfde0341fcd2923414bf541a20e4f9f6 libstdc++-v3-3.3.3-r1.ebuild 8016
-EBUILD libstdc++-v3-3.3.4.ebuild 8418 RMD160 5e11132bed14050314fbb6b5d744032e782ab6cb SHA1 56c58f36921eb342ccb4b51f0beae3bd9359e99b SHA256 2d57c47590645fe11ac8ff098f11c233b4770d8e3e61762b1a79b4a75593d7cb
-MD5 fe059bdd52eacab70ca8e9cce37679b4 libstdc++-v3-3.3.4.ebuild 8418
-RMD160 5e11132bed14050314fbb6b5d744032e782ab6cb libstdc++-v3-3.3.4.ebuild 8418
-SHA256 2d57c47590645fe11ac8ff098f11c233b4770d8e3e61762b1a79b4a75593d7cb libstdc++-v3-3.3.4.ebuild 8418
-EBUILD libstdc++-v3-3.3.6.ebuild 8429 RMD160 46c714e85fcf3e4a75197443807afa4b1bb081c6 SHA1 d71f73669c895fc4edeb836cbed387259cc75986 SHA256 da1cd6c5e6d86c4228e3db9a2e4a67302a267321f430c1e4bc8651962b7f21f4
-MD5 9d4d14ce4bbd656802b4b258ddf1b35f libstdc++-v3-3.3.6.ebuild 8429
-RMD160 46c714e85fcf3e4a75197443807afa4b1bb081c6 libstdc++-v3-3.3.6.ebuild 8429
-SHA256 da1cd6c5e6d86c4228e3db9a2e4a67302a267321f430c1e4bc8651962b7f21f4 libstdc++-v3-3.3.6.ebuild 8429
-MISC ChangeLog 7009 RMD160 202b6fb047b6c960cb9924100ec7a1fdd3e42d35 SHA1 acc0f142a983b1f3d9b9ca6436f88b63bc409f99 SHA256 f3fa3f9736bddf8579eceb3b75e45c70ce4b096649d7eef8de707da84c27c83d
-MD5 4f32a9172e39c07d2e95aef3f7638bba ChangeLog 7009
-RMD160 202b6fb047b6c960cb9924100ec7a1fdd3e42d35 ChangeLog 7009
-SHA256 f3fa3f9736bddf8579eceb3b75e45c70ce4b096649d7eef8de707da84c27c83d ChangeLog 7009
+EBUILD libstdc++-v3-3.3.3-r1.ebuild 8011 RMD160 5c05c2903b7c8140733578038f26af1b682ca80d SHA1 4c7b0126c021ef089e10695fe1baa8c1f31dc940 SHA256 1c12c46f674586af4d61547e626b1db1b17555bcd8782c205a4b81dc9e2781ee
+MD5 b995745da53d640e72788acf0f2d4b9d libstdc++-v3-3.3.3-r1.ebuild 8011
+RMD160 5c05c2903b7c8140733578038f26af1b682ca80d libstdc++-v3-3.3.3-r1.ebuild 8011
+SHA256 1c12c46f674586af4d61547e626b1db1b17555bcd8782c205a4b81dc9e2781ee libstdc++-v3-3.3.3-r1.ebuild 8011
+EBUILD libstdc++-v3-3.3.4.ebuild 8413 RMD160 766547ec86a1956a28fa4a0d5c33fe4e4286832e SHA1 ad9f3691686056b3c48ed7c43ab7402d41428f0e SHA256 c9f591f86074e9b2ac6e0ad1ef26895aaf0269e3d7ebeadb06cae98e98cd67c8
+MD5 6a0674003122bc1e62e705ed6558db09 libstdc++-v3-3.3.4.ebuild 8413
+RMD160 766547ec86a1956a28fa4a0d5c33fe4e4286832e libstdc++-v3-3.3.4.ebuild 8413
+SHA256 c9f591f86074e9b2ac6e0ad1ef26895aaf0269e3d7ebeadb06cae98e98cd67c8 libstdc++-v3-3.3.4.ebuild 8413
+EBUILD libstdc++-v3-3.3.6.ebuild 8425 RMD160 352a426671fcaa046bd8827cefc832ef0b898b77 SHA1 4f574747b314417ea5614e3b25661033038d8cfd SHA256 a88d8a4b00a1dbf1317cc3df4d5fdaa99bd96b07adc20602946a2f3a8f773295
+MD5 045176dac40f7979e652652b3d608bd7 libstdc++-v3-3.3.6.ebuild 8425
+RMD160 352a426671fcaa046bd8827cefc832ef0b898b77 libstdc++-v3-3.3.6.ebuild 8425
+SHA256 a88d8a4b00a1dbf1317cc3df4d5fdaa99bd96b07adc20602946a2f3a8f773295 libstdc++-v3-3.3.6.ebuild 8425
+MISC ChangeLog 7218 RMD160 a2b681893da18d9d252abcaf27f4482a75d793e8 SHA1 6333a0377019c354270af3cf3d6668916496df33 SHA256 f2012e21f7587ecbf69eb844ad1488ced75215dd3585ccd96c34a9dbdc4530b2
+MD5 77cb47d3aff6f854430c7a2f848b0012 ChangeLog 7218
+RMD160 a2b681893da18d9d252abcaf27f4482a75d793e8 ChangeLog 7218
+SHA256 f2012e21f7587ecbf69eb844ad1488ced75215dd3585ccd96c34a9dbdc4530b2 ChangeLog 7218
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -37,10 +34,3 @@ SHA256 311158ee454cb63138f0e64527822e793f9454016f3f882963833275346944b8 files/di
 MD5 26d8346ec1e7c7409f128d03c8cda398 files/digest-libstdc++-v3-3.3.6 238
 RMD160 095c46dbd9b98385f72ef36785528bbd22511f89 files/digest-libstdc++-v3-3.3.6 238
 SHA256 d0497e354c64b49b77e2da91c1a51cb3323a651441f4f8a3b2507cdc7a7007fc files/digest-libstdc++-v3-3.3.6 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwB5+AiZjviIA2XgRAtVnAKDsxotgjhO71FHVEh5w/3h4mcKagQCeOSJs
-g+1J8UAzB++PDkeNcsMWSBk=
-=5jdB
------END PGP SIGNATURE-----
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}