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

Package-Manager: portage-2.1.1_pre2-r7

6 files changed, 35 insertions, 39 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 2ab752d79ad9..4d867ba3d761 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.476 2006/08/05 01:05:13 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.477 2006/08/14 16:30:57 solar Exp $
+
+  14 Aug 2006; <solar@gentoo.org> glibc-2.3.4.20041102-r2.ebuild,
+  glibc-2.3.4.20050125-r1.ebuild, glibc-2.3.5-r2.ebuild,
+  glibc-2.3.5-r3.ebuild:
+  - switch default ordering of gcc-config and eselect-compiler to work around
+  portage bug
 
   05 Aug 2006; Danny van Dyk <kugelfang@gentoo.org> glibc-2.3.6-r4.ebuild,
   glibc-2.4-r3.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index f67261ea632a..8fd2793d984b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -500,22 +497,22 @@ EBUILD glibc-2.3.4.20041102-r1.ebuild 34394 RMD160 859903be38444149495142abc5654
 MD5 d6e4167a8a9e696bc8537f54cbfa9e6e glibc-2.3.4.20041102-r1.ebuild 34394
 RMD160 859903be38444149495142abc56542b2be9cb680 glibc-2.3.4.20041102-r1.ebuild 34394
 SHA256 b9e3e46470b93300b49a6d5c62fecd03704b2528085f1734628356e06b6c25ac glibc-2.3.4.20041102-r1.ebuild 34394
-EBUILD glibc-2.3.4.20041102-r2.ebuild 41432 RMD160 78b92a734e0fccaacb8160f88a6f302b8f6699e9 SHA1 46e9399d1a505131127f6cc7c809039b48b2f0f0 SHA256 1a0abdfff6987a97d8a8095d7f85c76b1925d2f8de15a736cebda9c6d413c765
-MD5 bf08343c4781a88888f05e98a5904a78 glibc-2.3.4.20041102-r2.ebuild 41432
-RMD160 78b92a734e0fccaacb8160f88a6f302b8f6699e9 glibc-2.3.4.20041102-r2.ebuild 41432
-SHA256 1a0abdfff6987a97d8a8095d7f85c76b1925d2f8de15a736cebda9c6d413c765 glibc-2.3.4.20041102-r2.ebuild 41432
-EBUILD glibc-2.3.4.20050125-r1.ebuild 39616 RMD160 65dcb51e3776bd0efbcd7106288067416f084ef9 SHA1 20e5a024c9fab1d2ae9b2b76e1bed7600c71f9db SHA256 11dbcac405f38f061ca28a5b7026d511c82b54960d94736d83d9aabdd5709f44
-MD5 bbd507a5f3867962e25f68e3d0fc00d7 glibc-2.3.4.20050125-r1.ebuild 39616
-RMD160 65dcb51e3776bd0efbcd7106288067416f084ef9 glibc-2.3.4.20050125-r1.ebuild 39616
-SHA256 11dbcac405f38f061ca28a5b7026d511c82b54960d94736d83d9aabdd5709f44 glibc-2.3.4.20050125-r1.ebuild 39616
-EBUILD glibc-2.3.5-r2.ebuild 39908 RMD160 7e09cabffe48dbd6ca1ac41909911cf3e607ca1d SHA1 9301b3efc016b5bb25152e1232cc7eb8160e40fa SHA256 cfbba0d90732c66ec4ba277edfeb6cd5f13f6ac09bee8ad95ef2998e2e8c7fbc
-MD5 7e3fccae5d9dd5d8986e5355e584dda9 glibc-2.3.5-r2.ebuild 39908
-RMD160 7e09cabffe48dbd6ca1ac41909911cf3e607ca1d glibc-2.3.5-r2.ebuild 39908
-SHA256 cfbba0d90732c66ec4ba277edfeb6cd5f13f6ac09bee8ad95ef2998e2e8c7fbc glibc-2.3.5-r2.ebuild 39908
-EBUILD glibc-2.3.5-r3.ebuild 39523 RMD160 2e8d2cbe0449e4917848fc76184d94ae3ae0067f SHA1 adf98a29e25966a0a6b3fec21968afd7400f3bca SHA256 b0e0d52bf9b9bad9f31a7d9b7698d2360d5f8dfb1563383574911f61c416dd71
-MD5 2ec6bf7c1622dd38a9f1f5d19ffcdf91 glibc-2.3.5-r3.ebuild 39523
-RMD160 2e8d2cbe0449e4917848fc76184d94ae3ae0067f glibc-2.3.5-r3.ebuild 39523
-SHA256 b0e0d52bf9b9bad9f31a7d9b7698d2360d5f8dfb1563383574911f61c416dd71 glibc-2.3.5-r3.ebuild 39523
+EBUILD glibc-2.3.4.20041102-r2.ebuild 41427 RMD160 5fe7ad25dff1c86b02d861af7a35a95aa73b533d SHA1 f52243b367d69d643f9f028e5a2bb4eefd124a53 SHA256 6d80ff839fd27d715f0fafb10826bfaf14c4c87c310d2f873553eb8427f379b9
+MD5 5ae4c949f4073387a8c61aef5c0d174e glibc-2.3.4.20041102-r2.ebuild 41427
+RMD160 5fe7ad25dff1c86b02d861af7a35a95aa73b533d glibc-2.3.4.20041102-r2.ebuild 41427
+SHA256 6d80ff839fd27d715f0fafb10826bfaf14c4c87c310d2f873553eb8427f379b9 glibc-2.3.4.20041102-r2.ebuild 41427
+EBUILD glibc-2.3.4.20050125-r1.ebuild 39611 RMD160 f6536d1665116efed8f1bf190bc08dca6c53c09b SHA1 e7c25bc3d952e0352badbf14dd63f9004505543d SHA256 ce953f3ba6b7472e6294427820c3bcf288fc2a441de7090202cac7044ca48088
+MD5 8ed3ac68d1d606522ad7fbab7c1835ee glibc-2.3.4.20050125-r1.ebuild 39611
+RMD160 f6536d1665116efed8f1bf190bc08dca6c53c09b glibc-2.3.4.20050125-r1.ebuild 39611
+SHA256 ce953f3ba6b7472e6294427820c3bcf288fc2a441de7090202cac7044ca48088 glibc-2.3.4.20050125-r1.ebuild 39611
+EBUILD glibc-2.3.5-r2.ebuild 39907 RMD160 5413f19afc7a20d5d04abfafcd0924f28737c8f9 SHA1 0cbeca59b08b7e8480960fd836cd6de7c2491add SHA256 d3c18aff35c0cdd5b04450c19a1947aaea8baffc7092da224dbd7e3fd91b7324
+MD5 5312908d7e2b8836232a2bea6730b5e2 glibc-2.3.5-r2.ebuild 39907
+RMD160 5413f19afc7a20d5d04abfafcd0924f28737c8f9 glibc-2.3.5-r2.ebuild 39907
+SHA256 d3c18aff35c0cdd5b04450c19a1947aaea8baffc7092da224dbd7e3fd91b7324 glibc-2.3.5-r2.ebuild 39907
+EBUILD glibc-2.3.5-r3.ebuild 39519 RMD160 d0d8230abe09b352e406dab17d7c7923ca4b8919 SHA1 d7a02a41676ff78945b1c64dbaba7c0ca77cad17 SHA256 f2b292211c8d18eac71331a4ff7a75761f37a51058741338008aaffef35dcce6
+MD5 945f80ce15135ffdcfa7cdf6503907b1 glibc-2.3.5-r3.ebuild 39519
+RMD160 d0d8230abe09b352e406dab17d7c7923ca4b8919 glibc-2.3.5-r3.ebuild 39519
+SHA256 f2b292211c8d18eac71331a4ff7a75761f37a51058741338008aaffef35dcce6 glibc-2.3.5-r3.ebuild 39519
 EBUILD glibc-2.3.6-r3.ebuild 43134 RMD160 ccee382a34bace29a032b560f0eef789f3a2ce65 SHA1 3e5c5430a57f52147f64d23932e584ee1b36e82b SHA256 90787f969f2e852df04108e8eb41cd6b94caf44a50386c17e01ad6eccd4c1f48
 MD5 7ab5df396baff8ddd8278ad407d0f9aa glibc-2.3.6-r3.ebuild 43134
 RMD160 ccee382a34bace29a032b560f0eef789f3a2ce65 glibc-2.3.6-r3.ebuild 43134
@@ -528,10 +525,10 @@ EBUILD glibc-2.4-r3.ebuild 38643 RMD160 00e7be588352cf307499a86b8973d35f9fdd19f7
 MD5 ee68876b3cc8c1129e82cb13391e2b11 glibc-2.4-r3.ebuild 38643
 RMD160 00e7be588352cf307499a86b8973d35f9fdd19f7 glibc-2.4-r3.ebuild 38643
 SHA256 4db386a7e47e4b7c3f2b1ce286c1ff6631b06123e8630d20661ccc8ae7a4a532 glibc-2.4-r3.ebuild 38643
-MISC ChangeLog 95845 RMD160 327b2e764f87dd7ea1aaf0315ff7d24d983b5b7d SHA1 dd588361920a27832b7e62c2cfaa571b40044f99 SHA256 60c085c60b64a199d41b56061c08585b8877d49b07e83a49034fba64a9f91f9d
-MD5 0aaaf96f611c4c4408dcbbe7afd758fa ChangeLog 95845
-RMD160 327b2e764f87dd7ea1aaf0315ff7d24d983b5b7d ChangeLog 95845
-SHA256 60c085c60b64a199d41b56061c08585b8877d49b07e83a49034fba64a9f91f9d ChangeLog 95845
+MISC ChangeLog 96082 RMD160 8896f044a23d0bc3088e0f905144b7a97d509254 SHA1 3c1efd94bdbb18bc8ec2bd20cc9ab2e4a22fd7c0 SHA256 b158a4456a22594afba9fc861479858a18a7a0c168495b712428ceda90f16cf2
+MD5 e91b03f88b4695878655ff6f300b9660 ChangeLog 96082
+RMD160 8896f044a23d0bc3088e0f905144b7a97d509254 ChangeLog 96082
+SHA256 b158a4456a22594afba9fc861479858a18a7a0c168495b712428ceda90f16cf2 ChangeLog 96082
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -575,10 +572,3 @@ SHA256 e780eefdde60f4ab9870c81854b0226ff2bf3b19e13149e83e146ce9a3e7b6b4 files/di
 MD5 0839b75709d53cb72b9a3f6039d220a5 files/digest-glibc-2.4-r3 1575
 RMD160 c82aed2e0f3f556b051d7e3a1fc13c202f67bf2f files/digest-glibc-2.4-r3 1575
 SHA256 f22d43e9647ef7c83b51e5102caaca7e38b3d16783e6097b1a3cbe4b0957070e files/digest-glibc-2.4-r3 1575
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFE0/GJ5mJXAu5GbtIRApqJAJ49e0l1Bla4hE3tp52BYqGSc3iQxgCcD1i7
-F5MN30fSTvxr874HBA6EOkU=
-=yja7
------END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
index 80f808439dce..e69fb05a1756 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-r2.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/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.14 2006/05/30 19:45:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.15 2006/08/14 16:30:57 solar Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1114,7 +1114,7 @@ RESTRICT="nostrip multilib-pkg-force"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.9 )
+	|| ( >=sys-devel/gcc-config-1.3.9 app-admin/eselect-compiler )
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index 4e9960cc51d2..27d01d57bb66 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-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/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.70 2006/05/30 19:45:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.71 2006/08/14 16:30:57 solar Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1059,7 +1059,7 @@ RESTRICT="nostrip multilib-pkg-force"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.9 )
+	|| ( >=sys-devel/gcc-config-1.3.9 app-admin/eselect-compiler )
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
index bc38568a1467..800628141014 100644
--- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r2.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/glibc/glibc-2.3.5-r2.ebuild,v 1.29 2006/07/04 21:06:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.30 2006/08/14 16:30:57 solar Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1012,7 +1012,7 @@ RESTRICT="nostrip multilib-pkg-force"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.9 )
+	|| ( >=sys-devel/gcc-config-1.3.9 app-admin/eselect-compiler )
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild
index 6a15e6039a13..39b5cfaae672 100644
--- a/sys-libs/glibc/glibc-2.3.5-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r3.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/glibc/glibc-2.3.5-r3.ebuild,v 1.28 2006/07/28 14:52:33 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.29 2006/08/14 16:30:57 solar Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1002,7 +1002,7 @@ RESTRICT="nostrip multilib-pkg-force"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} )
 	>=sys-devel/binutils-2.15
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.9 )
+	|| ( >=sys-devel/gcc-config-1.3.9 app-admin/eselect-compiler )
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"