backport some simple fixes; one for building with ethereal #175313 and one for libstdc++ versioning with newer binutils versions

Package-Manager: portage-2.1.2.7

3 files changed, 16 insertions, 16 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 10efdde512b0..01ceada9ee8b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -341,7 +341,7 @@ DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 RMD160 89e42889420fbab22e418261d
 DIST gcc-3.4.5.tar.bz2 28254232 RMD160 611ad033a76ada49d43529fc694142e856a039fa SHA1 389bcc98e391545e501c05557a8651104beac059 SHA256 be5738a94076052453894dd7d35b1efbb017bba1da0b28495d145f98fe018a09
 DIST gcc-3.4.6-patches-1.0.tar.bz2 53093 RMD160 f340ae3c80e73525b4f893d0d5eed80714ba6816 SHA1 001a510c97bf36702ab92d0156a16714cb0c0723 SHA256 f6b23e32d93bebf837dc845bf989ddd599e272fcba7aae55be3ecafd7e620d0c
 DIST gcc-3.4.6-patches-1.2.tar.bz2 54757 RMD160 d4e1240b9e45b7661b7f8bf4f57bb2c9cac17686 SHA1 be5868d0ba17d0d8952cda5a82064aaca9168cb3 SHA256 43253a8defa6111bd6f107178cc46f425ec81efe0eb26b730c11c422a4d4de26
-DIST gcc-3.4.6-patches-1.4.tar.bz2 55772 RMD160 bdc96bf39b806a30d566d18dfe1f0b4b2f34af22 SHA1 df0fb3e152b0eed266493cc62ea2bfb728ddcce0 SHA256 ee3ba71670f9fd3857035744563a21ae8238c679ebef54502e5d298d4d1af04a
+DIST gcc-3.4.6-patches-1.5.tar.bz2 57250 RMD160 15dd24bf2c8fcff195ce0645fd5bd593602883d8 SHA1 5afebec06f81760ab77fbc6beaf16d2d3bd6e44b SHA256 e294cf73e905a3e67831bd73b37085ba521f786ccc8e6ffe7e948a6cee2f9c7f
 DIST gcc-3.4.6-piepatches-v8.7.10.tar.bz2 8207 RMD160 b74560140ce242d0e3c7db113c13f77ca7b5a9b9 SHA1 ebdc62a02671d4d101383f6749f27f5ce92c9f97 SHA256 8ed5bbaebc2ce54071063c12e6a11b9913bd9d993d33a51dec52e7b42f477cc6
 DIST gcc-3.4.6-ssp-1.0.tar.bz2 34468 RMD160 0f668e3ffc08297b5ebe3d5cbb9575426008e096 SHA1 d5c6634632b340657e416ecd2ab5b43048c75c23 SHA256 27ff25099ca8617fe2a76cf8ea06acaab39cff9eb91ef64c84971ba324a664e9
 DIST gcc-3.4.6.tar.bz2 28193401 RMD160 b15003368cedc7964f6ceaee0c39ddc43a46c442 SHA1 97b290fdc572c8e490b3b39f243e69bacad23c2b SHA256 7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39
@@ -433,10 +433,10 @@ EBUILD gcc-3.4.6-r1.ebuild 5009 RMD160 3f8fd3f0ea6f4ca02fb5df9648dc46767ce3ac4d
 MD5 28e177ac0e76ddc01c90ccc76d16f39a gcc-3.4.6-r1.ebuild 5009
 RMD160 3f8fd3f0ea6f4ca02fb5df9648dc46767ce3ac4d gcc-3.4.6-r1.ebuild 5009
 SHA256 bca8e6927a0e59899ebc3be627c0fe2f2cdfe8449b4f436d7973e46bb872cfff gcc-3.4.6-r1.ebuild 5009
-EBUILD gcc-3.4.6-r2.ebuild 5045 RMD160 14ae3ad433e15fb163d58ceafcf6431ba0ed4e9e SHA1 934744dbb4679e69aa622643e069e6ce108e89cc SHA256 171c35e449e4f8d55ff20f8222ce0eea222e4a64907135a31b7d0e65fec42629
-MD5 25d8e6b323061ff9ea9adda15e53a44f gcc-3.4.6-r2.ebuild 5045
-RMD160 14ae3ad433e15fb163d58ceafcf6431ba0ed4e9e gcc-3.4.6-r2.ebuild 5045
-SHA256 171c35e449e4f8d55ff20f8222ce0eea222e4a64907135a31b7d0e65fec42629 gcc-3.4.6-r2.ebuild 5045
+EBUILD gcc-3.4.6-r2.ebuild 5046 RMD160 92619f1ce55727f483923e6db812a3f6e83c1962 SHA1 5050bc42b3cef3721c9ac985986f7ec8fdef8aec SHA256 7ea4a253fc35906aeca6c7a119c35b4427ee21583937d52059436eba260dbca5
+MD5 aee4161f7aa0d681ec5924883c0c7385 gcc-3.4.6-r2.ebuild 5046
+RMD160 92619f1ce55727f483923e6db812a3f6e83c1962 gcc-3.4.6-r2.ebuild 5046
+SHA256 7ea4a253fc35906aeca6c7a119c35b4427ee21583937d52059436eba260dbca5 gcc-3.4.6-r2.ebuild 5046
 EBUILD gcc-3.4.6.ebuild 5095 RMD160 04f28233c5d7841688c23c15e47b6126f534ce85 SHA1 5873e6e54e4d6ba4a3956f181ef203eccd427b3e SHA256 b490f163bade079aaca77a744a19bf615ecf031b605884525f87c15449ada721
 MD5 4e7b3555d1cf06090c59c24e72447f52 gcc-3.4.6.ebuild 5095
 RMD160 04f28233c5d7841688c23c15e47b6126f534ce85 gcc-3.4.6.ebuild 5095
@@ -529,9 +529,9 @@ SHA256 7772b2d8bd9b56746d23614ce24b0e956b5ead8e72f82f5f46f9f54bd1973bb1 files/di
 MD5 96431bba97375c719d931304dd595a90 files/digest-gcc-3.4.6-r1 1623
 RMD160 8334b39b452fb81d9403c1b53592eab727b03be7 files/digest-gcc-3.4.6-r1 1623
 SHA256 b76a6a42081d8b640392a3d58a97db8c863e2b9f58c6e95b89b96f7411da6e0c files/digest-gcc-3.4.6-r1 1623
-MD5 d33e571be2ba95bc53b97fce0c07700d files/digest-gcc-3.4.6-r2 1870
-RMD160 853f8de42d52e6bff756e4bd3596ff78f2fd75c6 files/digest-gcc-3.4.6-r2 1870
-SHA256 8f5f84e21a0daded660c17a063263b21a80cecb3451ed3607ec6d750234131f7 files/digest-gcc-3.4.6-r2 1870
+MD5 b471def3634d3e6e4894a52609fd7196 files/digest-gcc-3.4.6-r2 1870
+RMD160 22f8736f9410bf55c555a3761179a3bb41494f70 files/digest-gcc-3.4.6-r2 1870
+SHA256 4751ad41bdd6ee286261742d57885298467ae8c9115a3f0fe8859d3ce50a049e files/digest-gcc-3.4.6-r2 1870
 MD5 aa9ad39bfeddc2081944f4423f23dcfe files/digest-gcc-4.0.3 1370
 RMD160 4324c6fb1c83b84b5f6047aaafad939253f1db29 files/digest-gcc-4.0.3 1370
 SHA256 6d920f64c4a6949a047f6da14638df614455738aa08687870973cbb9b6052b77 files/digest-gcc-4.0.3 1370
@@ -559,7 +559,7 @@ SHA256 084a60903cec8827f009fbb2e6129c7c4f20b7b5f2b068ab5432fc7bd6578bbc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGTm4u8bi6rjpTunYRAsYvAKDFyKQ48vp1pa3/IISclFAH8IxzkwCfau/j
-P+19g1qsbUrFD70USpeAJAE=
-=NEa9
+iD8DBQFGTnPQ8bi6rjpTunYRAuF4AKCYtnCLaAAhai5e05w3p2cwMdsFtgCgxkYt
+b2g6bgfntRInNvk13qIKcV8=
+=1Vmy
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.6-r2 b/sys-devel/gcc/files/digest-gcc-3.4.6-r2
index 8ee898441175..348455620db0 100644
--- a/sys-devel/gcc/files/digest-gcc-3.4.6-r2
+++ b/sys-devel/gcc/files/digest-gcc-3.4.6-r2
@@ -4,9 +4,9 @@ SHA256 a29adc9260071f5928f2e491803b73117ee176e4b19b56ce421aa3ca461370b2 bounds-c
 MD5 90aa9cb64d7edcd9a2306abe910cbe3b gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923
 RMD160 89e42889420fbab22e418261d248a89ee2bbbe9b gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923
 SHA256 5b92fac2afe835a127976fdb6602fb5628cf28e67dd19e8289768a3bb8631ec2 gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923
-MD5 cc05b66335b2fd31076f70bc3a8de225 gcc-3.4.6-patches-1.4.tar.bz2 55772
-RMD160 bdc96bf39b806a30d566d18dfe1f0b4b2f34af22 gcc-3.4.6-patches-1.4.tar.bz2 55772
-SHA256 ee3ba71670f9fd3857035744563a21ae8238c679ebef54502e5d298d4d1af04a gcc-3.4.6-patches-1.4.tar.bz2 55772
+MD5 062052e9bf8370ce434bd17bb79208ca gcc-3.4.6-patches-1.5.tar.bz2 57250
+RMD160 15dd24bf2c8fcff195ce0645fd5bd593602883d8 gcc-3.4.6-patches-1.5.tar.bz2 57250
+SHA256 e294cf73e905a3e67831bd73b37085ba521f786ccc8e6ffe7e948a6cee2f9c7f gcc-3.4.6-patches-1.5.tar.bz2 57250
 MD5 6f43591e4b221c17f6cec4ceffcc04c6 gcc-3.4.6-piepatches-v8.7.10.tar.bz2 8207
 RMD160 b74560140ce242d0e3c7db113c13f77ca7b5a9b9 gcc-3.4.6-piepatches-v8.7.10.tar.bz2 8207
 SHA256 8ed5bbaebc2ce54071063c12e6a11b9913bd9d993d33a51dec52e7b42f477cc6 gcc-3.4.6-piepatches-v8.7.10.tar.bz2 8207
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index 1198a80e7396..b8e55dd21636 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.16 2007/04/30 20:13:27 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.17 2007/05/19 03:49:15 vapier Exp $
 
 MAN_VER=""
-PATCH_VER="1.4"
+PATCH_VER="1.5"
 UCLIBC_VER="1.1"
 UCLIBC_GCC_VER="3.4.5"
 PIE_VER="8.7.10"