Raise min gcc/binutil versions to match upstream configure checks. Also split version logic between host and target.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 54 insertions, 51 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 80a56b71b092..4823b777d367 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,10 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.880 2012/08/14 16:06:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.881 2012/08/14 16:12:33 vapier Exp $
+
+  14 Aug 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.16.0.ebuild,
+  glibc-9999.ebuild:
+  Raise min gcc/binutil versions to match upstream configure checks.  Also split
+  version logic between host and target.
 
   14 Aug 2012; Mike Frysinger <vapier@gentoo.org> files/eblits/src_unpack.eblit:
   Fix inverted version logic with libgcc_eh #431304 by David Flogeras.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index f222b04e7651..e52cebd10305 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -69,26 +69,26 @@ EBUILD glibc-2.14.1-r3.ebuild 9236 SHA256 8fde5d10c272410de322c5b5c0584c848bb9c6
 EBUILD glibc-2.14.ebuild 9133 SHA256 34b2dfe2284e5e7e93c8d8fb1e96b76c362d896dda57739e013c3768c317f009 SHA512 b4283b88f9bdee04c8d73195c5623dfde4814b5bf8eade03d15d4fcfda204e8d79b10f6e390c2267d43fd0805cad2ebe68967f0ee73faf27620b57280e780a5d WHIRLPOOL de92b754a8a16b6cccca183c94a2c7c714d6faa7acc23621c9a95ec600360c2f80505c636671396ad3cb3e678d84a8bf1dc02ea103c89c96e72f16b21a52c12c
 EBUILD glibc-2.15-r1.ebuild 8868 SHA256 cfdca1617c499a8aa6a2ebfef1459e6944d5ffbd4615c4feaf932f7566bf0744 SHA512 cc91aefd221685e2ed3fd017486417b628d52ea18b458c3503e77c9f87c8bb8beeb36d156f357c97a08d105ef6d387a3cd1cfb5be65a8d8a53892abab6d819e9 WHIRLPOOL 0f35e0477d927382d0bc5be6b75dad324335c1ed9196a87436b7adedce5960ae35b955aa7ba01f6b1bb974e41a4665efae414f60bbbf863be753cb75005217f0
 EBUILD glibc-2.15-r2.ebuild 8422 SHA256 8b9d47e1fd0bc81b8667960ce49e9473401473984eed58356cb939379c7dbd9c SHA512 962d8ec99edd7456e94eb6390d1b9c0ace6c38bb513d928ec4ba83f35e530f35e5fe5cdd8c4260fc4dc4915a526411d68204e6ffce44a6ca082cae48044e3c12 WHIRLPOOL 9aa28d46f4c5a091e12e7ef1ddf99c91eabe7e8402c5fd88a0f2cddcb595efcd2c3c0a27656f5df5c1e207a80927bec3e52dc783af3fad7c1538d13abdeb8b28
-EBUILD glibc-2.16.0.ebuild 8407 SHA256 f1dfa8d88b37d7ccbd26921f7df9cb74c2336b71de06cad9579c7b927cd8e555 SHA512 d3ec58498842b4939f72454101c2e20399748dd6af55df6095a07b6f6cbf1e6fad000af071e4e7dc0f411966c30946090dac118416ec24273e50d2cdfb5c29aa WHIRLPOOL da40cf2405259f412b44a716637580faae053e9c5c0c9517ffa491a15899dd25481c24ca038246168e873cd4089b3c75b87b585a1bea2e0d4d87b525c8525021
+EBUILD glibc-2.16.0.ebuild 8209 SHA256 62b306b4ecd7fce4317f0d6aa64c740516211de2e8f3e0a4572d7b0724971030 SHA512 6b15541276e801e50771fcbbc331068e919c64c9eb887627f46e46ca2f7ef03165b0b63be2cc6b28a8e3ae97b3b0f9f6e1023c0646d3f9e9a5506b601f04e5fa WHIRLPOOL 035672a22c37e4bd6007d6f49d45e1355dcb8f797309affb77b9fc17d7e8aaee76411dc23bd03cdc9b37715dcdeeeda90dc10430ceb96a9f6408318b2c33b483
 EBUILD glibc-2.9_p20081201-r3.ebuild 7501 SHA256 2c1456201280ec5098c8e4e733d8ceaef027b5a39ed9e641651a4f8ba1a1f2c4 SHA512 f75cf0abe31cd3c3fa44337e4bb3230aeb7176b6c2600e42b037c4487559e21a8a140e6c60af31da4f72d3613a009bfc441ed7b81ee8fe8d5e814c4db4acf9f6 WHIRLPOOL e7e07b8feec41113be60d0023f9a6126ba420314859221d6544a00b33e3d29d5bbb49501d7da7bb100d8cf147128d4875085a31ffe83a66fb19fd9f6ee3a3fc7
-EBUILD glibc-9999.ebuild 8330 SHA256 5f604ccd07df5378b670a3a85c8b5af0bd901e9c264a67ae524b895cbf2d353b SHA512 90c04f2eec816abbad19e2dfb45f81160bd449e3fff1a82b9fddae6cde2b51883956e320bd9cc3b4cd9a4fac04bf75ff8ce49ccc4e0455e9142bd5d26242d18d WHIRLPOOL 95ab339a91c45072f97e2e668ff51d12cd5983e6ce9e33f27978bee904ad77d3dc2a0268dce4d2f33fe98be61f106fd16e7e0f67d6cc4e13b0d109d0c226a80f
-MISC ChangeLog 48274 SHA256 730be527cd8490a081fec20a7be9787fb7ad650af0dd20b54b6b68ccae769cb4 SHA512 091a5aa7d8a6c94872f174d616fefb7dcd5f6166b071d4f71aa48d97ec5093aff87127cb82e53f152e6758cd60a9b390a1e68b1476f4cc36073f2d1dbe9728a9 WHIRLPOOL 2709715dfc3f6b5c74fc0cea97004066748d717052c98681b00bb54b7ba0278e15eeb63e5e9eb3fdf3a0ea202c51f802630908479186fcbf2b7eed7217c596a5
+EBUILD glibc-9999.ebuild 8132 SHA256 bd1f262bea88bea7ea9cfa8d4e97d74f912461a1095b78b520d836dee55cee85 SHA512 86d0a57f091539c315d468f83f32dac81364e42e5ba147d495b682c03f5fef4d22610c17a38dd3c64cd5229a884f60fed61875cf98bb0b9fe3959adc255ca7a7 WHIRLPOOL a6544d634c579c33584311ea8849e8cc6ef9c62615f538274daa0cca9c26e1eba27c7bcbc8eaca58a9f85ea893cc6ee05e95421c2af0e2530d89b578c3af5e5c
+MISC ChangeLog 48489 SHA256 a48a0d85cf3f80b6178997a4dd916b24856950b96768342c8346d751034ddd9b SHA512 dba11d6f1e7ad728261c112f3efb9a74db221fba7ba266e60c0118c5dfcf413ea7a1fba09d75ce2cd28d2135468e77f70daf6cb5673638d851331edb21039dc0 WHIRLPOOL e736608e095201c3aefb90154ca96ec6db9372bc09fb28e85c9ec0e24e7a66710d0a5ebccf3d84267fe2717f88a4db627d69b18d483d36d519025d227da418a0
 MISC ChangeLog-2007 108587 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17 SHA512 405c93cd08d102ad1a9e40975563e645e982b5baa238280c38118b46b7c828ca924c73766c254cf24eaff255b16b3f4c8133d2e174cf3e47b704ff49d754640e WHIRLPOOL 4ab79bcd243bd4281898e93987b49a2dc44fb7ef2df9073708dd12223bd01f595dab8f08f342bd5dd8d0fc955ee031b11ce70e1cdc118f7dcc5b63f90d785e9b
 MISC metadata.xml 406 SHA256 e6cbc11651d304035d704081701900a8b373ee3a0ed2f3f4a7e3f3a8d926a731 SHA512 3afe4ea0be7d1707571c23a7aae8490620a83d748ad672a18ce602503f37179cfc12d3bed0c18398c2cc8e74005d2c51ac320fd1722364e5df2cb3599488c164 WHIRLPOOL 1c3f5e0cc851c976259c6749f6a611d6cf415a063b2229e65ae9dea80e623a52514acbf977b3e439009379c4ea9aa491e6c423c7aac70a1c8fd573c4f40816dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQKnd0AAoJELEHsLL7fEFWqT4P/3uMkHq6JZLEru/5gKugNJEI
-lUhM3P8jLv38hzBvOXafVKcZeFckZWmzoziTAlrMVXcYcHI9U0gVwUqnTexXJEyM
-0ISo9XSu6E12xTaCIT0G4n5RRjKPCcDnbJ6Gaeoc6Hu7t7dsCu2CF/reNzp6ph0H
-M+3qVaKkxB+XMeA7wiN0cEsHuWnzVWjPSYZOcAdNdz4nVvWiTUHJBeuYaB2oTf7F
-3j/Vhl0O7EBsX5bPTVn9rNmQkvB9dYEjTtp32ShyKu/JIbDnbIFQDrLbOgweqEhZ
-4lrzq8wI/Qq2H/Ijd6gH94u46vLOTFpn3YRJicdyDcvM3ljE/LxKGbn3nlm+H2xL
-PI0NmN1gYzNTtDjLjOHlyEEup9Vq8h3JAbFYC7aWTGpuI8z24s7vbSzvQDKE76EK
-FugtoVOPL6i3fsDxjzN4SfmSC6ejjFGUH2aGmoCFdengCRui9ULyG9rBBSr3FyQt
-sOMzns6QveNf9GMM0PrPm9GEjTC58AMoJ5WnyJWxYKdHyRgkUY0L9ZtBxxRxQcai
-mSXq1mLQgCyoPPytSEUbqkyL683IDg2UYP9gcnB3m4ckRCT/TiX2CblZNmYk9qXU
-eQUbGR01EOjSv6DendgUUgO6nhSZlt5Zi2kpzPsK+l6p40ZAkxnvJeZSz93o4eUo
-mR6DL4s05mXng7Ze3pOz
-=5tlQ
+iQIcBAEBCAAGBQJQKnj5AAoJELEHsLL7fEFWeaIQAMPFDcLfBCtEUZK85R+yaLrJ
+XiIDAhPgPtAHBq+uUFqgYRjBmdQDea1zEbMDF/chd0JZU4/yi8Y2R5Z/nq60/kjc
+zT4s+ZyKluBKu/DjvVLHxZpnEnuMzto+H1F/ZYSxuLr0WaCUP3JJGR8tAjm+0BVa
+BdvklQbkt/dEUM0wTaEBUJsJH5mtw1SN4hV0uYWeBB+Im7wLg8wTYk8pSiRWU+Qv
+YP9+dvmrUrdc4GEa9Q7/IFrIshica5COd+Jzvj0AEZsAVBay+VW65jk0DW4q4WYw
+Pqa5sL3zj1ORWXDB4DbdMVSKPEkWGecrQcFLz6SR/GbXMW36+HmduNSFB/clfOqV
+LmoNtF5FcgKKh12rMLYDJ1rxLGe9AOrbnzahys5/sTOb06iOkK6qX6dvv0zYu2jZ
+Ju97NUJH0Jta+UMfF00F0CzXv0hoEATNWr3mC74OPHbcnpKOwHkc1SZZtAKRBvZQ
+vAhkd/i0lTkCRFlmPwm3TyCdNxi7kFZV6iz5Hj6xn4pEaffRnuiyxpuOFdtHKNJB
+Ub/RKGdVIHinowRUCGQiMhIK5jORhxcfq02+gfyLY4kiuVQHPL9ryt54e+BocDl8
+JDspGVeNpIrW3EUgKWjudedT8JCkKKO4l/LnJfS23YFhlZ2BgnPj+Zf0FfEuzCqS
+kjKHuqRrTShAjUiFwqhK
+=hCcp
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
index d4325bdf889d..43277f3391db 100644
--- a/sys-libs/glibc/glibc-2.16.0.ebuild
+++ b/sys-libs/glibc/glibc-2.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.5 2012/08/13 22:48:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.6 2012/08/14 16:12:33 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -72,18 +72,10 @@ is_crosscompile() {
 # Everyone knows 2.2 > 0, duh.
 SLOT="2.2"
 
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-	x86? ( >=sys-devel/gcc-4.3 )
-	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-	ppc? ( >=sys-devel/gcc-4.1.0 )
-	ppc64? ( >=sys-devel/gcc-4.1.0 )
-	>=sys-devel/binutils-2.15.94
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
+# General: We need a new-enough binutils/gcc to match upstream baseline.
+# arch: we need to make sure our binutils/gcc supports TLS.
+DEPEND=">=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
@@ -91,11 +83,18 @@ RDEPEND="!sys-kernel/ps3-sources
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+	DEPEND+=" !crosscompile_opts_headers-only? (
+		>=${CATEGORY}/binutils-2.20
+		>=${CATEGORY}/gcc-4.3
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
 else
-	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
-	RDEPEND="${RDEPEND}
+	DEPEND+="
+		>=sys-devel/binutils-2.20
+		>=sys-devel/gcc-4.3
+		virtual/os-headers
+		!vanilla? ( >=sys-libs/timezone-data-2012c )"
+	RDEPEND+="
 		vanilla? ( !sys-libs/timezone-data )
 		!vanilla? ( sys-libs/timezone-data )"
 fi
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 7039f7ac8c4c..79b18a99aa2b 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.13 2012/08/13 22:48:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.14 2012/08/14 16:12:33 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -72,18 +72,10 @@ is_crosscompile() {
 # Everyone knows 2.2 > 0, duh.
 SLOT="2.2"
 
-# General: We need a new-enough binutils for as-needed
-# arch: we need to make sure our binutils/gcc supports TLS
-DEPEND=">=sys-devel/gcc-3.4.4
-	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
-	x86? ( >=sys-devel/gcc-4.3 )
-	amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 )
-	ppc? ( >=sys-devel/gcc-4.1.0 )
-	ppc64? ( >=sys-devel/gcc-4.1.0 )
-	>=sys-devel/binutils-2.15.94
-	>=app-misc/pax-utils-0.1.10
-	virtual/os-headers
-	!<sys-apps/sandbox-1.2.18.1-r2
+# General: We need a new-enough binutils/gcc to match upstream baseline.
+# arch: we need to make sure our binutils/gcc supports TLS.
+DEPEND=">=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
 	!<sys-apps/portage-2.1.2
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
@@ -91,11 +83,18 @@ RDEPEND="!sys-kernel/ps3-sources
 	!sys-libs/nss-db"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
+	DEPEND+=" !crosscompile_opts_headers-only? (
+		>=${CATEGORY}/binutils-2.20
+		>=${CATEGORY}/gcc-4.3
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
 else
-	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
-	RDEPEND="${RDEPEND}
+	DEPEND+="
+		>=sys-devel/binutils-2.20
+		>=sys-devel/gcc-4.3
+		virtual/os-headers
+		!vanilla? ( >=sys-libs/timezone-data-2012c )"
+	RDEPEND+="
 		vanilla? ( !sys-libs/timezone-data )
 		!vanilla? ( sys-libs/timezone-data )"
 fi