Fix from upstream for missing symbol versions in multilib builds #304239.

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

3 files changed, 13 insertions, 11 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index ee8566e1203a..61e32c465b91 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.811 2011/04/13 03:35:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.812 2011/06/09 16:47:30 vapier Exp $
+
+  09 Jun 2011; Mike Frysinger <vapier@gentoo.org> gcc-3.3.6-r1.ebuild:
+  Fix from upstream for missing symbol versions in multilib builds #304239.
 
   13 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> gcc-4.6.0.ebuild:
   Patchset bump. Fixes a couple ICEs and a wrong-code -ftree-vectorize bug.
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 617c5c817b22..31b13a3138d7 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 3.2.1/gcc31-loop-load-final-value.patch 3324 RMD160 8bb0e9133923821daf2e9d10a27a0a1930e00bbd SHA1 c73dc6e19a76a1dcbb11a15ff5ff04b11a9f0343 SHA256 70aa8433fb19c95f334b6cbc155cae22a3b61a6892ed9e18f95860509d0091a8
 AUX 3.2.1/gcc32-arm-disable-mathf.patch 2229 RMD160 40c451d6912473ba39adb72e91d6f507c1045a38 SHA1 6a74ff0312caf8a0ead67dd7aef8d32897cc5d6b SHA256 808368680a4635cdf46844e63342a8ca387769b2323ef99f90530d3bbc622587
@@ -70,7 +70,7 @@ DIST gcc-3.2.2.tar.bz2 20311217 RMD160 7036ffb7eb5bbe4e3cf59ee5dacd7071bac475fc
 DIST gcc-3.2.3-manpages.tar.bz2 129510 RMD160 1f066a3f0de918766a25b24a580e8e52eb9876df SHA1 a4cbb70b96621cb9156cf9a92d01e4a9b4e4bdec SHA256 219efe9cff7d18f7fe8d11721d18f4eb48645c866738b13f3d7c13eb910befee
 DIST gcc-3.2.3-tls-update.patch.bz2 396362 RMD160 a24434ec6ff6ff734a5e8b6254f0dce55c5cdcba SHA1 f62a98975032bf91ce793e27a2073bf15a98eaec SHA256 36d26ca6e00a0a09ab2716abd05c07f18239039ae7e28fdec68c3fab4f5dd4af
 DIST gcc-3.2.3.tar.bz2 20662887 RMD160 64b599c5ee29475785c910ccaf9ccc41ee5244e7 SHA1 86d0af66a78ae2fb39c63403569d0f4349cf93fb SHA256 9229434cfdfb79d3183149ac09e1093be642d4be377cc491e75c23b856243fda
-DIST gcc-3.3.6-patches-1.6.tar.bz2 48814 RMD160 3f25b67015c6e4d874690c48d23292a670501e0c SHA1 aba4661d50787aad26849497d45194804bf21b73 SHA256 c692f8f00d16947e13dd86ca974e419c35d1befee9ee915fa6c50a741487ef63
+DIST gcc-3.3.6-patches-1.7.tar.bz2 50642 RMD160 f602f30a7a2444fbac667d756ef301723ba5e556 SHA1 d840d27e40c39cb572ac42f33de340a09c61f912 SHA256 bdcf002b324497d0ad2344bf914cf00f6f4200b37c6304ed7a44fdd0f9b4c2fc
 DIST gcc-3.3.6-piepatches-v8.7.8.tar.bz2 27532 RMD160 4702eae72925b4be0aa71e338344512daf61f2d7 SHA1 602b3b2ae3c98ae95449cc707bf49142dc009561 SHA256 eb2dad189225664c5ad35f467592e7b44f5801a17f61829154283e800646e7d5
 DIST gcc-3.3.6-ssp-1.0.tar.bz2 21355 RMD160 26b72f90bb0fe2809013eeb3112e0f31e9e35311 SHA1 3ebfa7bbf8e4b316464175f664014e2721bbb766 SHA256 6d365ae529c61730e2a4137677d38e014bb51b569a7f870684287e25cff4f666
 DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 RMD160 bbca9281e73bf6a26e2cfea370e006b99838e4a9 SHA1 f6d1714d1fe24a470e1c3b37150be394cb7ab93f SHA256 c007f38cb0c57291adf0b367f31e14c84dd1d6f48a388896eb63b6cd4328e418
@@ -140,7 +140,7 @@ EBUILD gcc-2.95.3-r9.ebuild 7864 RMD160 e045bc69182bb0531317ec3d8f04da7da1d44cf0
 EBUILD gcc-3.1.1-r2.ebuild 9184 RMD160 66df1e08c96f35400c6c3fac1401dd2bf310c6be SHA1 7ca6d353b9acef3b7a6849e49abb0d2bb5cab3a2 SHA256 c622f0e3e7d2b614d68ef42d6fdd8e955a6e533a9f7a5d22f038c7aac668e9d5
 EBUILD gcc-3.2.2.ebuild 509 RMD160 aea48d62c14870971ffc3edb5dacaa7936eeaa81 SHA1 19bfe77cc4fe37db0223edae2ccd9f5348e5305a SHA256 a2d240f60b6bd5a68d05eb99f64b3d0d1b600e6edecb44a64684e1447dea4c06
 EBUILD gcc-3.2.3-r4.ebuild 17614 RMD160 07074833ecd49012ba2d1c8f62d40e004a763377 SHA1 9e57b7567590b82e8861df221aee3f26aba7ceca SHA256 3c9f2002f5ae146059aaf47cfbffd00b38db6624aaaf4843aae918db7af83abd
-EBUILD gcc-3.3.6-r1.ebuild 2955 RMD160 4d1707852d966a232e94b44bec70fb9f2593dac6 SHA1 526a83ef50eba417aa947bec482e33d6eb937b87 SHA256 cd7746d041c66b88c79ce072459944d7f99269f17ba7af9ec2c01790487f652e
+EBUILD gcc-3.3.6-r1.ebuild 2894 RMD160 7148f58bb62891bd21fc76ea5d41900d26b65808 SHA1 fab76b8eaf5dde8fd9f63d0644a72ec5b5610284 SHA256 c815c7ac72f97d60f6b89956668abbf3ff89ed274d8a2ef40973d629e0c65a49
 EBUILD gcc-3.4.6-r2.ebuild 5011 RMD160 19280488ad16880c0a7d4a40ec4b03f628d99d30 SHA1 3eeea1300fb0900713b91d4d4d4c922ceaa25b47 SHA256 10fd9abd6cc5c78e038eab9f68b01055c5e9c8053c9c6cf813341bdea3a0b466
 EBUILD gcc-4.0.4.ebuild 1762 RMD160 9783548a0fc48f49045530c0c7a32d169b97afa4 SHA1 72db0d4b898ad0beec1c3d83ea6c36660ea09a39 SHA256 8045a39cbe6b97a39052170cc73c2c627a1a8569513799b5602a2b4c5be23dfc
 EBUILD gcc-4.1.2.ebuild 1941 RMD160 c2a6f9c1d4314a22f84f1aad774193f6d539c9d7 SHA1 0688c78c61988f11238bf0abd44d204937a7a1a0 SHA256 e9e8fa542e2cf7193bb5c9c561323574f811a272cf41462994ffb7f807c183e8
@@ -155,12 +155,12 @@ EBUILD gcc-4.4.5.ebuild 2366 RMD160 9bb1cbfaef7f3eff56b6bda345b0bdf6287e3a12 SHA
 EBUILD gcc-4.5.1-r1.ebuild 2439 RMD160 ce2532fb9b3839a5ee4513be9aea2479a897b770 SHA1 945dc165e00a7c16af618deba17d6798e7db4f74 SHA256 3f87569cf34796dc12f44503aa52f996358960954f6367ae0bd97fdd4c3f45b4
 EBUILD gcc-4.5.2.ebuild 2436 RMD160 dc5eb0fe02af4d4ad6a764a3d92c23f6f82ec57f SHA1 2d22f2c22456c446b3dc3e9258b531134afe1476 SHA256 a3a1a464ab2bdd44b8d7420584a2f0034afbe5bb99ef284f374aff7fefcead3a
 EBUILD gcc-4.6.0.ebuild 2135 RMD160 514713baddb62e95ef4fdd30a1c1ccb2a11c3013 SHA1 7727927a5cfc989925a50af50cb47b253b7c058f SHA256 db7cfb4491f9db558fd600aaab64dcdec8e1f78145851b8c050f9a58bb1d6883
-MISC ChangeLog 141569 RMD160 acb4262d01046ea7bc0dd82e3e0d17af06d3d9bb SHA1 17c9e22ce4dd470cf9adecf3d2063260d8e8ad33 SHA256 44da18fa0b904169da898fcdf1421ed3ea7e89086de5723588f8f027a6d3a88c
+MISC ChangeLog 141714 RMD160 f59ca8c15afcd0864d43c08684bfc37b702de0fa SHA1 ad840aabd03bdce54fb66f47b8f8a5c3188a9e75 SHA256 0471b69b3b2551aa79c4a0f50d6ad3803f5ab5799c65f58546d05e1db2a3bca9
 MISC metadata.xml 1779 RMD160 e9dbd39ca85e9670fe386e8057434b95832594d1 SHA1 0256dfa49577f02a2e89068863d05a998fa92c7e SHA256 674a9156491bc32329b197d0646e13fa675318903435744fda4b79372e198804
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2lG5UACgkQiqiDRvmkBmJy9wCgvmuJBMwd+9wfgXM+ZbdWg+Bh
-168AoJkGvM+m4FoDxybeeUiMV/rI0WQN
-=a4Vs
+iF4EAREIAAYFAk3w+SgACgkQaC/OocHi7JZ02gEAlwO/euIL759JEUe8q7VmTsjW
+jlfJyjvfo7UGsrjoWuAA/3BhZa2z4DO5DIl/7rEmgqXevFKcrb5GWgnGwXcHejli
+=seE+
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-3.3.6-r1.ebuild b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
index 97cfc9054923..e4957b8bc870 100644
--- a/sys-devel/gcc/gcc-3.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.16 2011/03/08 03:05:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.17 2011/06/09 16:47:30 vapier Exp $
 
 MAN_VER=""
-PATCH_VER="1.6"
+PATCH_VER="1.7"
 UCLIBC_VER="1.0"
 PIE_VER="8.7.8"
 PP_VER="1.0"
@@ -81,7 +81,6 @@ src_unpack() {
 
 	# misc patches that havent made it into a patch tarball yet
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-	epatch "${FILESDIR}"/3.3.6/gcc-3.3.6-cross-compile.patch
 
 	# Anything useful and objc will require libffi. Seriously. Lets just force
 	# libffi to install with USE="objc", even though it normally only installs