Move patches out of $FILESDIR and into patch tarball.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25 x86_64
RepoMan-Options: --force

3 files changed, 13 insertions, 19 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 6ca5ffb68af4..58de74d3f136 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.654 2008/06/22 10:52:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.655 2008/06/22 11:03:02 vapier Exp $
+
+  22 Jun 2008; Mike Frysinger <vapier@gentoo.org> gcc-3.2.2.ebuild:
+  Move patches out of $FILESDIR and into patch tarball.
 
   22 Jun 2008; Mike Frysinger <vapier@gentoo.org>
   +files/3.2.3/gcc-3.2.3-poisoned-malloc.patch, gcc-3.2.3-r4.ebuild:
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 28fe7e4da30e..db5a762b32e1 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -63,7 +63,7 @@ DIST gcc-2.95.3.tar.bz2 9848842 RMD160 09cca1860ce897000df19643dfd944ae28366a1d
 DIST gcc-2.95.3.tar.gz 12911721 RMD160 2c506b7e80cb2b4d9953f4f9753d581cb885f610 SHA1 535d27038d161c0e7c2662702e11a48aa97ef622 SHA256 2a950e220c2f64c4abf781be3bb6d4c472ef8b3685873e77061788df85c6d5da
 DIST gcc-3.1.1.tar.bz2 20515451 RMD160 f1acf2739009281ffae61ceb54612d1ee795578f SHA1 75d9479d79cde4aff27617942e7fbab0ec6af5f5 SHA256 95399ef09c38cf9bde4a98909623d6a7f93ca0061857f9938af8b1970459672f
 DIST gcc-3.1.1_final-patches-1.0.tbz2 29791 RMD160 4406f8007e658b6b5205680b85badb20eb3b19dc SHA1 a4fa2adbdff55a9ade162952b8ed063b107d2503 SHA256 8ed2d7ca951ec195bef6ccdeb0325c673e1991890f11f2f24e4d0277537466d6
-DIST gcc-3.2.2-patches-1.0.tar.bz2 41284 RMD160 f6b953c283fc8c92ebd3b7bafc50199268c223aa SHA1 9d3148e1f0b9af61b4f6d5aa57e20d9367706231 SHA256 e2e9e948614081f645856352b8a76b79bb168ebadc4c62295e8e82fcf3ff4134
+DIST gcc-3.2.2-patches-1.1.tar.bz2 42302 RMD160 8cc90d3e0fd5664edd9424a439febf61df049df6 SHA1 0e0f8048676d0ea653d2b7edc0438930e4342295 SHA256 c648227c8cad24f8fbeb6febff13168a692f8886ba3770a1278e3d0a3cd80ea6
 DIST gcc-3.2.2.tar.bz2 20311217 RMD160 7036ffb7eb5bbe4e3cf59ee5dacd7071bac475fc SHA1 2959c19b4b5c6678f0d9d3bbff859cb02790e7b0 SHA256 7035a828b75b425093be26b5748c182696cc0fd948988312c2a2147cae59d4aa
 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
@@ -105,7 +105,7 @@ DIST protector-3.2.2-10.tar.gz 24556 RMD160 905b1ef473435230f7f4519ecf0f8a3d4c66
 EBUILD gcc-2.95.3-r10.ebuild 1202 RMD160 8199972a39cfc93ee6a0922826acfd430111b54f SHA1 3f0f7f8c66085f185dd15e478039b464f040a367 SHA256 3e5ea2199ca2ea2a8cf82ff37b45be74ec14d1cdb6c20c6f513a1f3258e3cf95
 EBUILD gcc-2.95.3-r9.ebuild 7864 RMD160 e045bc69182bb0531317ec3d8f04da7da1d44cf0 SHA1 84771ad4d945143a7483c764bc0abf8d013c7150 SHA256 6a471d851a3c0e5aca1f2f61005875e6b10e271836f177bc5911d755d273a247
 EBUILD gcc-3.1.1-r2.ebuild 9210 RMD160 206881516627ab93359924637597ea1675c132fd SHA1 1743ac9b185d94574d55170cdaab3305ba052260 SHA256 86f05a36ba0410c596362c239179a15d6e27efeb8dafb05eb607df4b57b1c8b2
-EBUILD gcc-3.2.2.ebuild 764 RMD160 0b34c75dc19bd62bb0fd7cb9df492e84c7668087 SHA1 8c5172d19da4a454be3175496541fab5df6c68f3 SHA256 ab928e3853e60027de0e9d243c5f64e8436e4378d6c9d1b19095be5cd6d1e343
+EBUILD gcc-3.2.2.ebuild 509 RMD160 aea48d62c14870971ffc3edb5dacaa7936eeaa81 SHA1 19bfe77cc4fe37db0223edae2ccd9f5348e5305a SHA256 a2d240f60b6bd5a68d05eb99f64b3d0d1b600e6edecb44a64684e1447dea4c06
 EBUILD gcc-3.2.3-r4.ebuild 17649 RMD160 aecbd724a1fa19583ee698ae4d4830e3f24584cd SHA1 75a60060bdbe92aa15f105b5929d204efeeddbc0 SHA256 07ff62c0fc364fd9d2475e1d1fc53a2e1efdd723f9d65604969f56e4879c2f95
 EBUILD gcc-3.3.6-r1.ebuild 3034 RMD160 1bc231c7233bf8dfef63a3d340917b175f018b7d SHA1 487cf95ce0cc943e2ea50b98540320e47ccd3911 SHA256 7a5427f30ae8ed2bf42c1dc6880eb2bcd63fba221d726af018d8e5d4ec4eb445
 EBUILD gcc-3.4.6-r2.ebuild 4971 RMD160 f09a9bef26f8e3fff4cac10cc046558f9a101d08 SHA1 cbbeae05295366e8dce2622e9419dd97bf373513 SHA256 af0cb45af3d506360bd12326e7d26fa5dd5d25b8ef87f154c70f584f297cfd5b
@@ -116,12 +116,12 @@ EBUILD gcc-4.2.3.ebuild 1769 RMD160 16752e4a1c72dd6aa1143882f43aa412fd72fb43 SHA
 EBUILD gcc-4.2.4.ebuild 1769 RMD160 0af4f09a3847ac051dda0b0e5e20d697e1a2c09b SHA1 bb67abfb574eb7aa758c97728f1432f4cb61bf1b SHA256 65ec615fac911b8586e9a04ef6e8bb0df0424b4b606a0484f7d5009b53455d2d
 EBUILD gcc-4.3.0.ebuild 1699 RMD160 fd909faa401f16e47bd2c1b38a4d2a79e4925098 SHA1 f4aa6a50eb8247a43cc29cdafb5132420755421c SHA256 f39c784180f65d9e150b6651be28dc2a35937cf91cefe04c837e9968180e633e
 EBUILD gcc-4.3.1.ebuild 1739 RMD160 2c9a0d8e561a20c9b9dd57b9ce164819207aaf65 SHA1 8a3eced23988be4eb76b7647df6e12d82de60c6d SHA256 e3ebd5a15fbf4cde5f10fe13092f298178dbbdda2ffd8cda2f66096d6e96bad2
-MISC ChangeLog 119695 RMD160 d2511250f3b14004c13c18c64d5226f191ae1980 SHA1 3e87b958fb82cf66a13800391b8bd48b603a8613 SHA256 e11febd63bca5bff67f3b3229b5fff413dfe01b85f1082e16ca11eca5ebc320a
+MISC ChangeLog 119820 RMD160 2a85676ec2907bde4f5c0f6e7ca68ab516eb8f2f SHA1 7c482e1b0f0cb8413bd6e16d89eb262bc03e9775 SHA256 d8a5ee4d338414d0c15e1af5d13d3158531220a487ff4865f22ae89678614d3e
 MISC metadata.xml 254 RMD160 60385b0c366defb69c143de944cf493ae827159a SHA1 ed95d876046d97d214e8694c6c3ec5da02872354 SHA256 23239f4f1c5656fc1f22cc2da40e602ea2351b9403e7f32ed7113debc1d1b139
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkheLwwACgkQ67wieSYcaxe5DQCdFtsEvkeNjzfJoTmcJcPp1Ecr
-KWIAoOgkuR7aMQ3eb/Ie8wckmW7sUeDS
-=Ut6g
+iEYEARECAAYFAkheMWwACgkQ67wieSYcaxddOACfRfhDOVxsdPofCsMB2BXZAysL
+F94An07YNtpGrzjPuEEBHm4TX88+SCjK
+=Lb8B
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-3.2.2.ebuild b/sys-devel/gcc/gcc-3.2.2.ebuild
index 8d5aa4ee45fd..6ffd3092d69c 100644
--- a/sys-devel/gcc/gcc-3.2.2.ebuild
+++ b/sys-devel/gcc/gcc-3.2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.29 2007/06/24 18:14:41 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.2.ebuild,v 1.30 2008/06/22 11:03:02 vapier Exp $
 
 # This version is really meant JUST for the ps2
 
 MAN_VER=""
-PATCH_VER="1.0"
+PATCH_VER="1.1"
 UCLIBC_VER=""
 PIE_VER=""
 PP_VER=""
@@ -20,12 +20,3 @@ inherit toolchain eutils
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++ and java compilers"
 
 KEYWORDS=""
-
-src_unpack() {
-	gcc_src_unpack
-
-	epatch "${FILESDIR}"/3.2.2/gcc32-pr7768.patch
-	epatch "${FILESDIR}"/3.2.2/gcc32-pr8213.patch
-	epatch "${FILESDIR}"/3.2.2/gcc-3.2.2-cross-compile.patch
-	epatch "${FILESDIR}"/3.2.2/gcc-3.2.2-no-COPYING-cross-compile.patch
-}