Use the common gcc patchset.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 24 insertions, 26 deletions

diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog
index 9e1cc4d1154c..9b26a8d48012 100644
--- a/sys-libs/libstdc++-v3/ChangeLog
+++ b/sys-libs/libstdc++-v3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libstdc++-v3
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.56 2009/02/05 04:12:56 je_fro Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.57 2009/02/15 22:58:32 vapier Exp $
+
+  15 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/libstdc++-v3-open_missing_mode.patch, libstdc++-v3-3.3.6.ebuild:
+  Use the common gcc patchset.
 
   05 Feb 2009; Jeff Gardner <je_fro@gentoo.org>
   +files/libstdc++-v3-open_missing_mode.patch, libstdc++-v3-3.3.6.ebuild:
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index b1198027aa09..045321917450 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,10 +1,15 @@
-AUX libstdc++-v3-open_missing_mode.patch 580 RMD160 eb4c35abea58a911efd859ba6514fb1697bcb3f4 SHA1 787b6e40d34e5cffe0df70fa4b2e86928da5357a SHA256 92aeb209304af3f5506aad3ddc0c89d9e231fc68f24ec5d20850af38a40317bf
-AUX libstdc++_amd64_multilib_hack.patch 350 RMD160 c2c906288b4e8076e807b4ac4d26c8ff8e6ad504 SHA1 64a2d8fcfbc3f97ae689d1c3ecfe93eb7bb0a56b SHA256 00429f6904da7dfdf9bd1d94f5a0baec03026a057b72ad3ae808f5040f0b02dd
-DIST gcc-3.3.3.tar.bz2 23279245 RMD160 3b5ba141491781626170ca530963b25976b42a99 SHA1 a9efbc34c5dd7fc48f7d700461de4fc014968cab SHA256 9ac6618495b7dd2ff0cd50abd76fe3c51287efcc724340687407f9fc250bdc6a
-DIST gcc-3.3.4.tar.bz2 23331664 RMD160 c6ba864feb97f0e00b2d9034f491188ca32abbf5 SHA1 f1690df8d2f0c60ada0c8d0c9c350063aa00f705 SHA256 3f409186acee739641341e5486e30ea9acecc039452e97a9eb850afbc6c3a691
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST gcc-3.3.6-patches-1.6.tar.bz2 48814 RMD160 3f25b67015c6e4d874690c48d23292a670501e0c SHA1 aba4661d50787aad26849497d45194804bf21b73 SHA256 c692f8f00d16947e13dd86ca974e419c35d1befee9ee915fa6c50a741487ef63
 DIST gcc-3.3.6.tar.bz2 23972413 RMD160 b32c7a08c690857f0ac52dda3deb47cf5775d967 SHA1 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f
-EBUILD libstdc++-v3-3.3.3-r1.ebuild 7946 RMD160 6c2473450808b18b4301658ec0a1b100d5f87788 SHA1 a5b5d5bfb1871ca2747a7dde4a16dad08299a4d2 SHA256 d2f79334c52f163527ccd342aaefd4650ac148a984c13b8ec7bc6b35b97fd411
-EBUILD libstdc++-v3-3.3.4.ebuild 8352 RMD160 9acd9cb0a96645a294d8d0d4402fe606f50cee59 SHA1 5880218dd4a66ed44762c6dd70a13e9dbfe1713c SHA256 9b35d92a25a7d9babaa31c4292b88a403419afa86a9d28fe7de34c85d9c6f9db
-EBUILD libstdc++-v3-3.3.6.ebuild 8453 RMD160 02bb4f5d52d5ed06a3af0af6c3fc4b5e0cb21b7b SHA1 87e18c3f8332be6032e8a1cf0cb458ea86f91e06 SHA256 e2ef7fd2de4f689a10a9a8b6d776eb62db86e382067849ebf2621dda708f3881
-MISC ChangeLog 8477 RMD160 1b675815e6fed64aee13facbee2d240f298a2fce SHA1 c039712e40f74994aa1d6d2ade7d4006ea97a07e SHA256 60818eb4575f0f87c4f5f68b5992379c4640e3d2fb33f4af22159b0f5cc42f18
+EBUILD libstdc++-v3-3.3.6.ebuild 8491 RMD160 4da36125577f9dea2cc76392ce4b3a5dceb2ff7d SHA1 6899fd852b84cf847f62926377704938af130818 SHA256 92fbe03d6e7218c76b39367efedcf2592555fe09953eca427a209865d84a3206
+MISC ChangeLog 8633 RMD160 cb04f4f606d8ffaf6b57a6d12b40f80e5d37b5d2 SHA1 c9ada16753702394e835e6d91dc97612a6a222ff SHA256 f2e4336da5dc376adc05676fac0b06bcc35507a1921bd1d369e141f4dcc0f0ce
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmYnh4ACgkQn/5bYzqsSmE2SwCeJa/fvIwrcu17z4Dc7gnx+oM6
+HSAAnAkCVWTQEVCGRStLJGydrF2zK/1i
+=jlzj
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch
deleted file mode 100644
index 610fae2bb39b..000000000000
--- a/sys-libs/libstdc++-v3/files/libstdc++-v3-open_missing_mode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru /var/tmp/portage/sys-libs/libstdc++-v3-3.3.6/work/gcc-3.3.6/gcc/collect2.c /root/hardened/gcc-3.3.6/gcc/collect2.c
---- /gcc-3.3.6/gcc/collect2.c	2003-12-08 20:02:39.000000000 +0100
-+++ /gcc-3.3.6/gcc/collect2.c	2008-06-19 01:04:21.000000000 +0200
-@@ -1572,7 +1572,7 @@
-   if (redir)
-     {
-       /* Open response file.  */
--      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT);
-+      redir_handle = open (redir, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR);
- 
-       /* Duplicate the stdout and stderr file handles
- 	 so they can be restored later.  */
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
index 4087f68bb076..71cdb541060f 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.20 2009/02/05 04:12:56 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.21 2009/02/15 22:58:32 vapier Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -105,6 +105,7 @@ S=${WORKDIR}/gcc-${PV}
 # Theoretical cross compiler support
 [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
 
+PATCH_VER="1.6"
 LOC="/usr"
 #MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
 #MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
@@ -118,7 +119,8 @@ DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
 # We will handle /usr/include/g++-v3/ with gcc-config ...
 STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
 
-SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2"
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2
+	mirror://gentoo/gcc-${PV}-patches-${PATCH_VER}.tar.bz2"
 
 DESCRIPTION="Compatibility package for running binaries linked against a pre gcc 3.4 libstdc++"
 HOMEPAGE="http://gcc.gnu.org/libstdc++/"
@@ -158,8 +160,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-
-	epatch "${FILESDIR}"/libstdc++-v3-open_missing_mode.patch || die "epatch failed"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 
 	# Fixup libtool to correctly generate .la files with portage
 	elibtoolize --portage --shallow