Fix up pax patch due to local variable renames #379321 by Sven Vermeulen.

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

3 files changed, 21 insertions, 32 deletions

diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index dfe0ce7ee9ab..c877ca1f241e 100644
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/binutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.417 2011/08/22 02:45:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.418 2011/08/22 02:47:31 vapier Exp $
+
+*binutils-2.21.1-r1 (22 Aug 2011)
+
+  22 Aug 2011; Mike Frysinger <vapier@gentoo.org> +binutils-2.21.1-r1.ebuild:
+  Fix up pax patch due to local variable renames #379321 by Sven Vermeulen.
 
   22 Aug 2011; Mike Frysinger <vapier@gentoo.org> -binutils-2.21.51.0.1.ebuild,
   -binutils-2.21.51.0.2.ebuild, -binutils-2.21.51.0.3.ebuild,
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 14a739453cb5..6c1d933a427d 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -17,25 +17,8 @@ DIST binutils-2.20.1-patches-1.1.tar.bz2 14913 RMD160 5a850d8ee3880153f614e9ef65
 DIST binutils-2.20.1.tar.bz2 17501436 RMD160 2ab2de504a85840d1ec227eff50b5f4d2cad581e SHA1 fd2ba806e6f3a55cee453cb25c86991b26a75dee SHA256 228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8
 DIST binutils-2.21-patches-1.0.tar.bz2 8577 RMD160 78de2941174c9b9abf97e3bd19bd4c2fc3d7f73e SHA1 1f65e478b1bf20a2e107fefa72d0d2555ed38552 SHA256 5c6bcdd3e3faf8336c83cdbfd50999dc035b87d8101a6dad572718d6bc341c97
 DIST binutils-2.21.1-patches-1.0.tar.bz2 9168 RMD160 b475a318e371d550d01678da18ac8f4d58c149ec SHA1 1a835aa2ed8c268075a96b6694256410bfaf859d SHA256 f0c3ad8f984242dbc8a4f45b9594fb12dc9a45d348930038ac24c5726aafa716
+DIST binutils-2.21.1-patches-1.1.tar.bz2 9197 RMD160 47b1c3bc12793428f2709b6160dfd5242330ecd1 SHA1 d458c7f3b451ddf9ea9275a1fb7901728f73b0d9 SHA256 2dcfdec5f18a5bf391a973b080228d5b80c5bfc2939b835f95c764a319b988d7
 DIST binutils-2.21.1.tar.bz2 18890094 RMD160 1b36120beda5efddc3194ee56c3099421ca5ca07 SHA1 f188490772cc902ec44a76545887bff60dbfa22d SHA256 f769b64350a02fbee009e1582cc12b6ed43b41985de65effb741e258e075dd05
-DIST binutils-2.21.51.0.1-patches-1.0.tar.bz2 7581 RMD160 da240f0f65d9209d4fce4671deb992202c048100 SHA1 b0332d1c54b723ca64dc1016b7ec68a6283dc61b SHA256 0b4a70ed67a2fc5f98c41dcda3c736ff16b912840715076367380a90f74b64c4
-DIST binutils-2.21.51.0.1.tar.bz2 17134719 RMD160 43df4ae3955bb5a1a9d5f1e257493c452b845e68 SHA1 8b22fbc38bcf832d522d7e26e63f59dda713bbcc SHA256 88b01fb63b8189704b1fb16af12750fcad9d4b0503cd369837ce43d7670224f2
-DIST binutils-2.21.51.0.2-patches-1.0.tar.bz2 7576 RMD160 7c6bcf870ebbe2ec2a30d400f49e07f1987a673c SHA1 cbeda11cd32d6a7b6457c3e54332d845e4a038fa SHA256 5898732f0b569ff3af713118bb1bc91732049fe2f30b497a8af134a215518f0c
-DIST binutils-2.21.51.0.2.tar.bz2 17221661 RMD160 4fcf4df0c2e498a32aeb575bab8fb08197a63439 SHA1 629665838e3a4160dc1dc22388edbc805a6cb6d6 SHA256 1c170b985dd12d49d3c5867c319d9eb0eb732c3b96833eadfc52c6d3f4e71c4c
-DIST binutils-2.21.51.0.3-patches-1.0.tar.bz2 7586 RMD160 05c9a8b78965508c829f78a155c2a09aff76b67e SHA1 18d7c8ff468607ef180a923cd9b27336314a6be7 SHA256 63b733d6556f0b96ad4afd785cb039068a08b47d61a825eb8ad4e1e732c7dccf
-DIST binutils-2.21.51.0.3.tar.bz2 17242745 RMD160 0d5382b9b5da7d94bed295229ba7656259868485 SHA1 770f67b6217d08b582e3868251cd92dedcf617d6 SHA256 01d28923b6233dad7280dca71344e4e6df60f531049edb564b5708886ea67d03
-DIST binutils-2.21.51.0.4-patches-1.0.tar.bz2 7592 RMD160 c49cd04d505a7e030fe0a94dbd5922115a3fc4c8 SHA1 711f1792476405886b01c21474bc5cd436567c27 SHA256 3d03e632b1d287aec9115e1aad3269d10bf2830bf717cc4798400a8ed4172855
-DIST binutils-2.21.51.0.4.tar.bz2 17239261 RMD160 2a771f15c64048b11ea376a8ad3b2865dc312e14 SHA1 0c00e1261a202daffe547a1be876102a984725f5 SHA256 807ae33ab0d087ce6c3f4d09277bd5f0870e2305a828fd21ab083c5a6ecd6670
-DIST binutils-2.21.51.0.5-patches-1.0.tar.bz2 7580 RMD160 10e5c3e141c07391a32c9a2ac430606612860f6b SHA1 fc63539e66a11b4875247fa848d15f9e54d9d8c9 SHA256 6bdb82be2371a93d8970063f8bcdf4e84050020d3a05cfb871935eb944028282
-DIST binutils-2.21.51.0.5.tar.bz2 17367454 RMD160 4c15eb03b4b7a1035e5830ee195c0e5fdd748eab SHA1 c9fbb5555cd0724cac4cddc281847555a1378558 SHA256 74420b083bdfa0a8aebbbfea10f6a6742ebfc1cbd68e282db98892743db6ad8e
-DIST binutils-2.21.51.0.6-patches-1.0.tar.bz2 7595 RMD160 3d5e2765a91abf6386fd3b3bfc62ba3414488188 SHA1 4fabe5a69e865ff911f7bfa1cb1de3763acbee39 SHA256 f3917a66304f8052d8f2e84a26601d7f6740d43292965fb245dd528686e7fc30
-DIST binutils-2.21.51.0.6.tar.bz2 17339826 RMD160 a60e1dac66499c475dc8db2b86522b9b440d185d SHA1 bf00e4d702b66305e64cd78d1dc41d92f2162837 SHA256 455fdb2d862934c69da7ddffe40f0f35332e33ed50eda1dde02e7d793ce86a99
-DIST binutils-2.21.51.0.7-patches-1.0.tar.bz2 7575 RMD160 f89c3245eda59f4939479fcc43e1a8ece9e19ce3 SHA1 1f80c325dec80b0e5e73c62f205951bb9e6195de SHA256 c636f48790ae3e6ca0f7c251b15ff9ce459c796c28e14c27acc5859e3c9b6f6e
-DIST binutils-2.21.51.0.7.tar.bz2 17348729 RMD160 b1bd2ddfee8a5def16955c00aac378e4dc91826a SHA1 c26a91be1191c852c70e647e92e602720f924bf9 SHA256 800beb151b4d29721b4f867c1f20c6475db49c1c7d341723069668ce535109a6
-DIST binutils-2.21.51.0.8-patches-1.0.tar.bz2 7521 RMD160 d4c6a6133cbcc273fe355c9d7812e8ee13834355 SHA1 8baac73a994b2413e93f6c01233b5e683c1b92ad SHA256 9f8f8cc3b293ebf43137815d60ef091e6fccce2d6a32c93449fa79b2bfba07df
-DIST binutils-2.21.51.0.8.tar.bz2 17495106 RMD160 7689813ec298ba3b615dbb521bbfc5866f8e8197 SHA1 25ab12151393b3e948c4119100a17c022adac948 SHA256 ed900edfa378dab736d14cd9f5d9c8b044436450e5ccfab141a68852d77e3bfd
-DIST binutils-2.21.51.0.9-patches-1.0.tar.bz2 7362 RMD160 d20b9736bfe612b7bc36456527b8ffe27307a207 SHA1 b3f7191166c20f8c9fa870f6a5e623c18806cb03 SHA256 57daac99a5e51d8f91a4643dd27f4310f3fdc934f8e4ce20678046301543446f
-DIST binutils-2.21.51.0.9.tar.bz2 17529103 RMD160 7e3cbdfb19b26ab52a59c55b630082b31dac2fc0 SHA1 9049243c9fbf6fce71fbe3f1dcf712032de6e741 SHA256 a01916cf8d3e6d60a627b1a747fcf3067e1ed04bcff30ce65e2885272cb328ce
 DIST binutils-2.21.52.0.1-patches-1.0.tar.bz2 7364 RMD160 815c2664101a100b275401c51b845ee1d910af68 SHA1 eaa56651f1cd1d9888c0883727c7d6d19828116e SHA256 3339d2635379cc57da09a9b43e3bbd4348c062bfb870a9f5960c5f4058e08b33
 DIST binutils-2.21.52.0.1.tar.bz2 17745521 RMD160 5e9a0331bd30b7e4cb1061f34a78a276c978ac87 SHA1 78ecff2dd371ab8df53bbb20440515ecab78f5c9 SHA256 39a6b98b95566dadda0271bf132311cc45b391ec5c43a52436168d089e37f1aa
 DIST binutils-2.21.52.0.2-patches-1.0.tar.bz2 7387 RMD160 f0eccf1d22ae4f552052f9225f148fa757386317 SHA1 fdd2cbb929ef160b3874e871f578c44eebbfe168 SHA256 cdaa31ba6871c8168f49264c2b7d70f270964abccc474959c2f8c26bc35ff7e3
@@ -51,27 +34,19 @@ EBUILD binutils-2.18-r3.ebuild 355 RMD160 92d95081318db458875d3f0552d6cfc96d0377
 EBUILD binutils-2.18-r4.ebuild 372 RMD160 890b491bc8468ca60c1881f5066e18bb27cb3ac6 SHA1 36674ec39ad16c9f03d4a509007a534b2a10d162 SHA256 9030b924daae916cf311bc04f50e1ac35b1de45544cfef6f88c38ba1c0e3f375
 EBUILD binutils-2.19.1-r1.ebuild 391 RMD160 1be2cd3f0760acb79a40ad159723c205cebe9d59 SHA1 14aa1bbeee9bebbdbe4089bb463daf8e51a78e77 SHA256 17b0a1a6de936fa0f11536e6d9c8459de66baeeadb41c7dba2e7d5becee46ecf
 EBUILD binutils-2.20.1-r1.ebuild 385 RMD160 e7f21393af35af7fc9d19cdba46bd9b6397a101c SHA1 c9ccd4c9e4907080edb3f1bddd0822be9af493a1 SHA256 653ba497edeb3c3ffb9d2bc1333e1e56ebf6378a12d0e87e19ae2948bde4cbc5
+EBUILD binutils-2.21.1-r1.ebuild 395 RMD160 df3074add876499b1affe47240cc285e485f1b00 SHA1 f6de9c1de738edbb920eb5504a5d55cd97d76e9e SHA256 d317321cafdf711b8be83beec0cf8cc8bcaddd0aa00a27f2473b9ede7384627e
 EBUILD binutils-2.21.1.ebuild 392 RMD160 5cfb359cbfde8d48dd18b386cb9adabbce70e039 SHA1 0169a14d22480477294b6794bc1edc89a6be3c9e SHA256 032e735928991a0b9044a34b47c0a3ba79cd4f6b058cc810ffaaf27b5e5f8149
-EBUILD binutils-2.21.51.0.1.ebuild 299 RMD160 ce5500d48760b621031aa73acf2ba4af2887ee29 SHA1 6d9c670661b40aa13680d2cfc605b5708823d220 SHA256 c7bfda41f8f215a0ca0213f7d26ab2f25a0610f53f41bdb074aa14e14340525f
-EBUILD binutils-2.21.51.0.2.ebuild 299 RMD160 ad2a2f88dc8dab83bf1d78769f3586ee794002f4 SHA1 96c6959551122b29dd5f2bb0c7b70f85af32c67b SHA256 514bc06fde5d5ec02f61ccda236af6ea09323e3b82dacbe79416cf9d3c2f4c85
-EBUILD binutils-2.21.51.0.3.ebuild 299 RMD160 5faef26b075748b982b490a627a811455e08aca7 SHA1 9a3fedcd2ec836faee7235a5541786e4483405b7 SHA256 e8a2a9dc9e405952a827e6cd8845fd9e80f61b75565602926041e8d31de7f3bf
-EBUILD binutils-2.21.51.0.4.ebuild 299 RMD160 e7ebda87b4aa0d5d95c2eb032cefbc972ded9e4a SHA1 8f6ceaff1c058a2ebbf03cf2847af8940690d643 SHA256 12f817736e15cf37c43feb313b2936d4aecbb2c273caa5065292450cfd8534b4
-EBUILD binutils-2.21.51.0.5.ebuild 299 RMD160 7a3b6fb184e05b436d5265899ec19c625aca9abf SHA1 f0f88deb9c7019f14568917453123d9824d2738f SHA256 60cdc7277152709127c10bb3d94b3aced337d40d0eae7eec95248f489efd659b
-EBUILD binutils-2.21.51.0.6.ebuild 299 RMD160 fd9e5af27d7f932991f75a1aec6d2eb8544e60be SHA1 827d9962eec49c3831d03e3be50f84712fbd5565 SHA256 b606d29ac86e507f3813dcaf37531bfbd2713b7c9328836d1f96c979dd28499b
-EBUILD binutils-2.21.51.0.7.ebuild 299 RMD160 de734ada23ba4d00482228b355827749f8a04b6e SHA1 7b6c92267caa4a7313512e2b490d313ede5940a2 SHA256 374fec5870e33b7dd87d75d77a7b8a0b51dd99a3f980653c33fd45ded6dd683b
-EBUILD binutils-2.21.51.0.8.ebuild 299 RMD160 7cc3b9068712246722608b893c2253baa9b4e9bd SHA1 ebe8cb14fbc77a23514135b33fc31e4d04edf2e1 SHA256 73a4cfad800da478a8f0a0bd6e73dcd9c0c4b23a927baa67acd7a1ed8ca75fe0
-EBUILD binutils-2.21.51.0.9.ebuild 299 RMD160 be143f6d1ffe605beb47d6c3512ebf7dd053c00e SHA1 ab181ba3e9a4d2a6898467d7cbf05992411e57ab SHA256 1815dbd5012087568eee7eb40854d7ade709bacb42262e01c69f1ab36cf544a2
 EBUILD binutils-2.21.52.0.1.ebuild 299 RMD160 fd689e58ea476fb0b4201e42984999edb08a4cc5 SHA1 1049ba2a2ef3be3cf573fff6079de9c64a56cddf SHA256 0504de46fce5ab6a0c652c5dc6bf1812b79535eafad0c65d7f63dc7220ab47f7
 EBUILD binutils-2.21.52.0.2.ebuild 299 RMD160 de59bb08ba17d0dfa2da8170f7f1748226aefccd SHA1 64e6884cabbfd4471cdd7c96f3bb57aa63ea2359 SHA256 742686fef92fa415bff92ece7bfb2e3f3c7b84595174f97b5fd18bfc1ddf4cc9
 EBUILD binutils-2.21.53.0.1.ebuild 299 RMD160 bdd34aeefbba9a951ab4ceb98d2273e4f73d56bd SHA1 b04f8d49208427fcfd45976a7b80c1af4636b866 SHA256 a1eca2c7ca527d74b368d740fcecf25d5936c46a0ab10258ca40c6bea3c2f939
 EBUILD binutils-2.21.53.0.2.ebuild 299 RMD160 4684e7a3ca5a1c09b338036e239cfa59f05c96ec SHA1 f7a9b8cdd037cb4fea3b0be5d0aa9eb4121512d3 SHA256 524427da096cc4077480dfafc60895151e96774f842d856a0737c6add211278f
 EBUILD binutils-2.21.ebuild 392 RMD160 babe2510f1b0b7e8618f604c92a6236a6552b525 SHA1 38f2aa8d49f9177dbca40982b0038e2f955ebc88 SHA256 339c77957e2d9743efb60e00711510dffb6f7c5bd0553c35a00f95157d0afce9
-MISC ChangeLog 70182 RMD160 596deb6d9ee522cb199a31758aa6cb7f1ca8f12d SHA1 beded4569e757f9a808b3a067de98d17735ee049 SHA256 a45fe96251ffa37a6683ae5017941fc33f7641a1adce0794187b12b1e390a150
+MISC ChangeLog 70742 RMD160 cd7e87f11bc8fc00e27929c73cbf46c3b986ed32 SHA1 425ca772b908a3862d56fdded1f82de1cdbf4408 SHA256 b4018b3edfc80b3bc50d83698e067b43210f30690d08e01bc6c2157549625aae
 MISC metadata.xml 386 RMD160 c7d423f8beaf5a89ed58b4438d3090ad38ee6efa SHA1 929a22d4a3a63a181ff80a4d7e6344ac227e6a25 SHA256 58db91727c014c22db0fde315c25cb22c59dc5c15af5d30ee4c01a248500b67c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5DO0wACgkQaC/OocHi7JZsWgD+OYij6uSR9x4CZpS8p2FROgIK
-7n/ORXSJ5xtFU51FPC4A/AtxZNhRifzgAzA5eITzDxwsY0lCYXhppJ8Hyd5WSX4z
-=l4HD
+iF4EAREIAAYFAk5Rw0kACgkQaC/OocHi7JawIAD/aVFwdM5N6dhODzpoqSitIU8H
+UAT9CXkdnByClbQeEIcA/0X2k4sfvNVaZnM18/69iIl2NpwKqWD2RY8thV3duu+2
+=HNCO
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils/binutils-2.21.1-r1.ebuild b/sys-devel/binutils/binutils-2.21.1-r1.ebuild
new file mode 100644
index 000000000000..5cc44d290f47
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.21.1-r1.ebuild
@@ -0,0 +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/binutils/binutils-2.21.1-r1.ebuild,v 1.1 2011/08/22 02:47:31 vapier Exp $
+
+PATCHVER="1.1"
+ELF2FLT_VER=""
+inherit toolchain-binutils
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd"