Version bump (bug #409315).

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

3 files changed, 37 insertions, 33 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index a1eff0b22895..0ae9c0365e22 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.876 2012/05/18 21:28:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.877 2012/05/22 04:46:22 dirtyepic Exp $
+
+*gcc-4.7.0 (22 May 2012)
+
+  22 May 2012; Ryan Hill <dirtyepic@gentoo.org> -gcc-4.5.3-r1.ebuild,
+  +gcc-4.7.0.ebuild:
+  Version bump (bug #409315).
 
   18 May 2012; Mike Frysinger <vapier@gentoo.org> files/fix_libtool_files.sh:
   Use `.` rather than `source` now that we use /bin/sh as pointed out by pesa.
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 38a86faa89e9..61c907f3523d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -130,9 +130,7 @@ DIST gcc-4.5.2-patches-1.1.tar.bz2 21127 RMD160 5964d25a2d8a24c3a2413e8241d7ef70
 DIST gcc-4.5.2-piepatches-v0.4.5.tar.bz2 14232 RMD160 1dae00d58a896660521e6d331ae8d368953d7cc2 SHA1 4780770af04cb749a0730dcdd9a6929f20dde692 SHA256 b209fcb0cdf819b355c23a0d59aa10f543d492dbe624a1758776050634e4f5ad
 DIST gcc-4.5.2-uclibc-patches-1.0.tar.bz2 3011 RMD160 eecfc8de792ef593691f7243c7baa1e71f653461 SHA1 57cd45cbf51dd554c8cb1b0488ea1e68084ecd2c SHA256 d9440bff9b913a02ee23e6e9fdacb18ceed2c56e2620dbdedb5b9d5a39811a2c
 DIST gcc-4.5.2.tar.bz2 66328720 RMD160 e1e9f590f5cf5f7029f1941328529a22919ee609 SHA1 ad5c440526c98fd17a74eab80c031af6b64d9c90 SHA256 1d9362275ffd9d19fd41f1c3dae0805d6e3991c4d5aa80851f2eaf1bbaa21f88
-DIST gcc-4.5.3-patches-1.0.tar.bz2 20246 RMD160 b28e2a2db41b5cb465729b9199120f640f2edb80 SHA1 5496e51ac2bccdebc183695b5e60cb9d9afa61a2 SHA256 de2d0f3f06018194864274cf8c0ac57e42857e7503d0e047e5a17e5bbba204e8
 DIST gcc-4.5.3-patches-1.5.tar.bz2 23625 RMD160 cff2e5db9ef5bbe3daf5f7d36fc1af9257331968 SHA1 1a19e6454ecfbf07f5c305f51b85e5f2aed02069 SHA256 825a7008aeb1a9374dd8f65f1f675dbf7c07e3d50e857245e920a9673e9af087
-DIST gcc-4.5.3-piepatches-v0.4.5.tar.bz2 14261 RMD160 8fe13c8cf57f1ea9004f041bcc806c77f87c4653 SHA1 7ac73fc6444a01136b28816f3b7fa7852c2b8113 SHA256 ba01d8d74e9d0a544faaaafc2ef84504ac5b1c177f0b964638d7d6bcc0b0e56d
 DIST gcc-4.5.3-piepatches-v0.4.7.tar.bz2 14638 RMD160 3976e2390acb6d0ada68b697150522fa4bc67682 SHA1 326d230873059c635daf8120afeaeeef1bd3cd52 SHA256 fe3414a85b6b0a1e4ff758c008bbefc7411148ccb9af70cb1a0af179eba55a32
 DIST gcc-4.5.3-uclibc-patches-1.0.tar.bz2 3015 RMD160 af8fad2ca0a948f25bff2b4f4f9868a99c7ceae7 SHA1 679698942814c9b3caaa5d220d672c87df50fa26 SHA256 7ddb8ac57b42c0de07a9afb3338c05d884da3c606f80cf21ee767f9c4682e3f6
 DIST gcc-4.5.3.tar.bz2 66374586 RMD160 d07aa90f2186b4e082dfd5ad5d5188c097fb6247 SHA1 73c45dfda5eef6b124be53e56828b5925198cc1b SHA256 0a8847af44a9b33813b199997a73139517c96adfd519eaf24c79d4d9d09f65de
@@ -152,6 +150,10 @@ DIST gcc-4.6.3-patches-1.3.tar.bz2 83071 RMD160 4e8c94ce83421ed1138439f946321763
 DIST gcc-4.6.3-piepatches-v0.5.1.tar.bz2 14861 RMD160 b43a135b650a1da0d0cb3ae837d1b80e8abcf0fd SHA1 c8dac6580dc935b596fda75bcbbc1d1a5c1d2c55 SHA256 d0d207eeacfc83e3bef66a7e85617a481725c2a48d5b36fe5b8b8ddc8983da73
 DIST gcc-4.6.3-uclibc-patches-1.0.tar.bz2 3023 RMD160 6487e89d892687c51f4d764979c90133ae4c0a07 SHA1 26581caab046ba4a03041557db641f2899d518af SHA256 4219a3582c5f98bf8437bfc3feb8c264f8aabd8078caaddef46dd38be33f089f
 DIST gcc-4.6.3.tar.bz2 71999439 RMD160 9abb2f940d08fc84f2d91b6a6ce8d662ca889269 SHA1 ce317ca5c8185b58bc9300182b534608c578637f SHA256 e8f5853d4eec2f5ebaf8a72ae4d53c436aacf98153b2499f8635b48c4718a093
+DIST gcc-4.7.0-patches-1.0.tar.bz2 12574 RMD160 f315f1d19fce074b2939a43aa85404cb22ffd58f SHA1 f491932f9f679e0a2d89dd4b55d3cab3ca02aa01 SHA256 1fa65da2af62a1968f572c1908c7ca4eb00902781ec144ec65519b9779e3f80d
+DIST gcc-4.7.0-piepatches-v0.5.3.tar.bz2 14635 RMD160 3ac7f667ccc458acf1c7713c9dd3102e32a2df7e SHA1 c3d086f6781e8b963141d8844bf492493b50dd47 SHA256 8ae1d16dbb782b551a197c07c3cc12eb0ccd5d0e0c8f02c92bd678c3d96b62dd
+DIST gcc-4.7.0-uclibc-patches-1.0.tar.bz2 3009 RMD160 ec51ca359c66b672dd183c9da69e57aa9675b03d SHA1 5c200835e799c7e367083564b088271b04b2b9e3 SHA256 a961197c952731cc6dec7b1467ec28ceab532b21b6406d4a87542ad678fd9066
+DIST gcc-4.7.0.tar.bz2 82518546 RMD160 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4 SHA1 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82 SHA256 a680083e016f656dab7acd45b9729912e70e71bbffcbf0e3e8aa1cccf19dc9a5
 DIST gdc-0.24-src.tar.bz2 1012099 RMD160 f0f33cc02d88ea1174030988c2006cb90029392a SHA1 2be913fe061429c1a279e4cf882e947d34946303 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a
 DIST protector-3.2.2-10.tar.gz 24556 RMD160 905b1ef473435230f7f4519ecf0f8a3d4c66e4e5 SHA1 c3a45f3fc450f1bd282af88a94d4b3d427d23072 SHA256 ad8401650ee0f7162e844cea492aa6151de77e8d0236cacc999aada69d511bab
 EBUILD gcc-2.95.3-r10.ebuild 968 RMD160 8fc6483dfd4640f7b9f8301f573869b6f1c13b84 SHA1 4794c19961414eea6f4d182e5617c71e915b573c SHA256 75a5a012b7f145b0ffa9004b89bdc54279b616377f2ce5806d3325639ed283ab
@@ -176,29 +178,19 @@ EBUILD gcc-4.4.6-r1.ebuild 1711 RMD160 521993d85e26b3ad278984fc4af56251c1806a2b
 EBUILD gcc-4.4.7.ebuild 1718 RMD160 675ebe1f1c841dabf942dd229829023c07da469f SHA1 d47be7d2c3aa02d90fdc1d7c4177352dbfbed7d2 SHA256 ed304d04b572625950fa1953a085810ffba3a43f728f976860b2883fd198c83b
 EBUILD gcc-4.5.1-r1.ebuild 1724 RMD160 dabac95091738214a64d6d244b1f947d679fc559 SHA1 599949002715e90e1c77e4fd7d810bcee855e38c SHA256 d511735848d360970549e58ec4922973f8d296338aa7396f35ab61e5fcab3b09
 EBUILD gcc-4.5.2.ebuild 1721 RMD160 09a18301829997ba1b9fd4854e3848949f712b99 SHA1 eddae49045c97b3d66773b7f16cdcc919fac825b SHA256 b862988c2dacff60388b2396d9c37ca280767405995e30fd9779c0acbef1fdc3
-EBUILD gcc-4.5.3-r1.ebuild 1621 RMD160 4f6e377dc194782f7a19be85dbab8b5086bea4df SHA1 0e7941f07f1a42fbcc81142b4dca55adc672d023 SHA256 7fef42809de74a4012f58660dd560f03618c5c4d68de21ae526dc5272e3475ca
 EBUILD gcc-4.5.3-r2.ebuild 1634 RMD160 00759355836471ba846d3f16a9f48fbe202ad533 SHA1 e8670fea24f71931f695b523fa7c918913b9d7ad SHA256 cb624621007f3bef1947a7520e96630398a063900b4d8df4e186c1bfc2b75cdf
 EBUILD gcc-4.6.0.ebuild 1623 RMD160 29f5683ab4975360aa24ac264042fab9f1bc918e SHA1 4d3b851f6955e6bfd772972b8fe322c2cc3d019d SHA256 ab03519885e1d3cafee27ea28f9284060036887846513fa01bfd7e2dbcde75cb
 EBUILD gcc-4.6.1-r1.ebuild 1626 RMD160 47f6c790dbb9fdea9ad7a5a6b16aeaec97cea3ef SHA1 d93f4ab1b3a2d3f22273d462fed0bf4960197ed3 SHA256 1edd9ec21b0853f303c7c4e51fcdaa10275bb2198abb92614c3ed885257c76ff
 EBUILD gcc-4.6.2.ebuild 1775 RMD160 b0169618375c6f5df874cae17659e4c6e5949dd6 SHA1 fbe5aa9e877ce1777daa00bfd2b8c1922129696b SHA256 3c46fd9cc4d04e8d7ba47508cc1d019c87c566e28af295c080a7d11292f330c3
 EBUILD gcc-4.6.3.ebuild 1775 RMD160 635ac69b1fc3a3bc2087cffe0e6db84fa09b1593 SHA1 6f16fc141e5bcfa9c5c4b612aa7ae4a90e8500d4 SHA256 1c75315c8f980dee7d8da5c8df334b9f93647d8852bf0a6a763420c2bd3dd9e6
-MISC ChangeLog 39980 RMD160 feae5f09e4e2dd1b044989a248b3d4e042176dd2 SHA1 3c979205cb71b28ffbf690b0cea8a2aa1993ed68 SHA256 0b58f575ae3dc974cce1afc4a2ea36a0bc9cb2b92486cd929e518875884e5b6e
+EBUILD gcc-4.7.0.ebuild 1778 RMD160 306f735301a62c2a775a53a340857c44fb4b9736 SHA1 5e698fe56a8bb0df8898fd103d5aef32d022bb78 SHA256 dd32be72d9a7643c1195499f06788193fe3b09fc02875c4ffa89f39d31981479
+MISC ChangeLog 40131 RMD160 7aee36ed29d86a2e081378e6e1e279047e2a3808 SHA1 739ba70c619a521e74bd5845b7f0d5355440ab3d SHA256 4e8887b8369329a24d59c80e6d2425556bd717bd500b97047b1ca3f11899761d
 MISC ChangeLog-2006 112483 RMD160 335030144d35ee6877d6e8354e17acf317e217a4 SHA1 778c790389c779f52b81ba1a09980eb2bdc3bb9e SHA256 108a7803efc91b08dd27ca4a83468637222a0685760f63bce724cb486fbc4022
 MISC metadata.xml 2017 RMD160 def531c42aa4d5cba94dcab8664d46f17791cb22 SHA1 a57fb26695634a23cd94b1a3a192efb8db03ed55 SHA256 b8397e7ce9649b9086d020ee865f1ccd616b338cdae5be3d57494fd15748d132
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPtr9DAAoJELEHsLL7fEFW30sP/jR5GRjSTLCt3y46WnJGfEyL
-CfwlNNX20Cm6OZVpvwMFBqUXoEKGCVR8ZMY2nn+xk4si7+zup1Nfl3J3c7zaczn1
-2aSv1EP4/pbI9ASwvDz2p75lqPyO7cQth6bED0CVNp7wnTymPEiXDYulCyuCrxGn
-QKHHGABcYyUD9pToqLnBIRsBnqdzRUCyk028DK+DEi0m1I2dE0ajLt0Vo0/1Lkdc
-vyl5XBd7eE7mmxGrdyvDdmSClQ9qwwQvl2c6MGmanatPiI9M9qb230UZjR9zzaAr
-okepUL4KXHBYpf/97/fAFIxhnxnPUjPPIhdI66xaDF3FkJi61GlR3aRAi88NX2kK
-npjpM/G2KtlHz58coEJwPlVBpqb/OW5/XA4WuJGz4UD5HcsiiHPUYxv+LJ5nsNZZ
-vVgtEese75KjDbrFUUIf6fjpDx0zToepV+mrSqI7bplE9+jOipv9qDRM2SU3DQSZ
-T12AtoQvciQ4kZ50JTJgGkbiDkoGTXcTqQCMxU9my4aH32XfjYdlLLg3q+oyFpte
-DBF0FwrnShKp3OGZrBuApQTFK1ay8s1rRPJsDSa8DIYK8FmLwCdWY54+PdSSzcJa
-bpKdX+2OzzKIwCOqF1nLVhrZ2XubZtsCcxqaG/TMgDOzTrIKVcQgv6ejTrB5RM3t
-oaYtYGhzYj5HIUy8rQ3G
-=LjDq
+iEYEARECAAYFAk+7HFcACgkQiqiDRvmkBmJ3ywCfa57fDlEwlbP2mCPwFZNL54uy
+w+kAoKF9J1RnRDpyHmKCx0Rh5ObfNq+w
+=hH2P
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-4.5.3-r1.ebuild b/sys-devel/gcc/gcc-4.7.0.ebuild
index e84eabaf5c6b..1644bd5642c1 100644
--- a/sys-devel/gcc/gcc-4.5.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.3-r1.ebuild,v 1.9 2011/11/09 19:22:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.0.ebuild,v 1.1 2012/05/22 04:46:22 dirtyepic Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
-PIE_VER="0.4.5"
+PIE_VER="0.5.3"
 SPECS_VER="0.2.0"
 SPECS_GCC_VER="4.4.3"
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
@@ -22,36 +22,42 @@ inherit toolchain
 DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	amd64? ( multilib? ( gcj? ( app-emulation/emul-linux-x86-xlibs ) ) )
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
+	>=${CATEGORY}/binutils-2.18"
+
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
 
 src_unpack() {
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	# drop the x32 stuff once 4.7 goes stable
+	case ${CHOST} in
+	x86_64*) has x32 $(get_all_abis) || EPATCH_EXCLUDE+=" 80_all_gcc-4.6-x32.patch" ;;
+	esac
+
 	toolchain_src_unpack
 
 	use vanilla && return 0
 
-	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
 }
 
 pkg_setup() {
 	toolchain_pkg_setup
 
-	if use lto ; then
-		ewarn
-		ewarn "LTO support is still experimental and unstable."
-		ewarn "Any bugs resulting from the use of LTO will not be fixed."
-		ewarn
-	fi
+	ewarn
+	ewarn "LTO support is still experimental and unstable."
+	ewarn "Any bugs resulting from the use of LTO will not be fixed."
+	ewarn
 }