Update prototype headers, drop Mandrake/readline patches that are not needed, and pull back in the old version.h parallel build fix.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

9 files changed, 128 insertions, 98 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index ef53048c570a..2a49997b9b0b 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.419 2014/10/08 16:10:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.420 2014/10/19 20:16:14 vapier Exp $
+
+  19 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-2.05b-parallel-build.patch, +files/bash-3.1-protos.patch,
+  -files/bash-3.1-gentoo.patch, -files/bash-3.2-parallel-build.patch,
+  bash-3.1_p23.ebuild, bash-3.2_p57.ebuild, files/bash-3.2-protos.patch:
+  Update prototype headers, drop Mandrake/readline patches that are not needed,
+  and pull back in the old version.h parallel build fix.
 
   08 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -bash-3.1_p21.ebuild,
   -bash-3.1_p22.ebuild, -bash-3.2_p55.ebuild, -bash-3.2_p56.ebuild,
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index b481afdb0352..cfd07698cee9 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 AUX autoconf-mktime-2.53.patch 4812 SHA256 f8fd7249e0eaac1a258198b7e2dd435fb287dd826d2b2b85c171f3c801bf5a9b SHA512 52fd04b9ba576ef28a66647307b550e9da074867c2cfd9d517948f3029521d94ca01f3e43b49544ecf6ed1139f8ac4f8beb36470e7e225a65557a6b5fb5348ec WHIRLPOOL 71319dc34c773c9773cc96339cb7b461115311ce42a3758f53a0eb6c7f8c1fadcec0de43f4b226de183867faa53982e8bf3919221e33474d0a1e44f73d32b15e
 AUX autoconf-mktime-2.59.patch 4686 SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba SHA512 4ac3951b72fcc50bc90d4fdd6286fc0ce01100d928b51f41043cf7c6f6adaddd7b19bb346bf21f306ce6cbe619750dfe18755c122e3f1a237fb07c02b25594a8 WHIRLPOOL bd4304863415e6e5b79a2df330b9add8e5378de54db2c24a3ea97c41125886204a77997ba179c42a901532ddf49314a91e1937df31d396ac8d4d6c7d612f442d
+AUX bash-2.05b-parallel-build.patch 426 SHA256 74244a0b736396213bb2b9d7dcbc99d21b979d8102b3a04bdd91f65cc5ec7d56 SHA512 1ae173412ef3dad6b874cf6461479a0291e8dce2b0f1464450d41cc5a1e833e66860d7c2ed5c14e55fd082a95fdfa6164ae677aff0192fd2e02f1eedafe06992 WHIRLPOOL c1a6ad3c1dcc053992a68608c9bf3e11895d080343859698f6be06443efb2d0a6fa8445f5b16aaaedb6dd35db29fa48e47bf1f98a890a7ee3c3daeccacd7bcca
 AUX bash-3.0-read-memleak.patch 416 SHA256 c9be95964762fe11cd0154149f02bd0501da9394ea5034dc60ed8d6b2d1db4b9 SHA512 97361f9e14e2547a67da475a0bfd20c1be70534d745845d4918e98665d4182da231923c8365f881561db63b90d5e40def1f1b7f0bc98016c8d8c2e8aeb4e4407 WHIRLPOOL 230fa5d03010df8c7be84d085c4db2c79105752725d9a8f12ad31f7e482492743453273b8b39b2d19f508d02cc890cd2afcf5c07d02c676ccbde2d507970ac86
 AUX bash-3.0-trap-fg-signals.patch 641 SHA256 6a87cba12a8d2873be89c0721dfa405f05508b23841e4b5041a22f57698e1b03 SHA512 5644591aaaf6a2f5e5fa4d41aa4e26c5d53e2efe6ad5838729a2da709e04c539a4a83325f707269d59b5aa0609130dc888ada0b9ec96fe85536800218de8ad6d WHIRLPOOL 48aeafb472ba96caa5ddf61fe5fa3d75ddb42747fd1f5e31e908415d46fc8977651916d507cfe3092ee7a41e873d05e1ff0efc6396c6ddec3beb6f0845422c81
 AUX bash-3.1-dev-fd-test-as-user.patch 437 SHA256 8831820eb8db6ac47179b49af2a570c26a2ae9fa1f4b195bb956ecc6cf4abf8c SHA512 eb9907741b68513c53128221c240a1325735c1ceec2a4ac0df74ed85126404c3347a3d97181ada5b28686e17600653de9dfadfa9985812049de45741c81876b7 WHIRLPOOL 0fb5eb0ec459f77f71e8b7e19d76e4cd78076812dfdf7a2b72ec93a2ae99ce19bfe6410d5f63a7acd6684450d821a33197a4d53d55c3b980dbb0481ab190287f
 AUX bash-3.1-fix-dash-login-shell.patch 1749 SHA256 c33a999dc92355daf9556eb4d078910b80cb4bddac0ca343e530f85242eea2cd SHA512 f1ec4e9e6c119cba8d7df35d3cdb53b8bcf990b8577d0488a750dfdbd6781413981d2939ff3995977706ed927284aa0049ce36f64a126d6375fbed1210affb7d WHIRLPOOL 8610634cfdf63f1502375c83fd5aaef97780a0f40c2d476fe5b0f2325066046f1c3a4f1e9f7ed6bc62feaec1c61959eab0a74a5996845d31c1c4349663051c29
-AUX bash-3.1-gentoo.patch 1525 SHA256 ea9b45c2a71a972094e3d0044530ea75ef88562370d1d528ddccdb44bb53d42c SHA512 19a3b642b828bbb0c3331eb09b1a28abdcac6de4b7b456b20766126ff02558969ffe8ded36ed96ce5ea0bf7a9029cd036b045700a23406ce92d705306b11bc41 WHIRLPOOL 5b5dd84aa969059bf34745058762f7770c2f7c7c549bd5c1487d24661549104171de3b0eea7f3fbd9259fa423f55e302ba663616a88ed9cc23b72a81ddaafdb7
+AUX bash-3.1-protos.patch 1580 SHA256 7d96044c28287854d9cc07fdd2e90c3deada49e386086676f9d59855581b7a1a SHA512 19a17cd5a1f245a46047575670b3f7d2d37d6beb445a9ae3df373d5bc70b19386811fd7c9119a3051b1a39534e60a8b144151c5e95c44eeddf2c899d9e932536 WHIRLPOOL 43e3ba78d972db2ce33a9ead349a29dbc78b37606ba54eac7cf5343e59307c51f6d7ae0554e26c82c1af01a95d288a6be8209aeada10659a5df9aa39b1c7f03b
 AUX bash-3.1-ulimit.patch 3736 SHA256 e27d41117dab8814e3812833d2038ca4f5d5fde8a0da2322eb3111a6a6245443 SHA512 ce92df5cd0b0d98d1c09ad061e56fda0498cc64ee580604a2dab6408347c2a0a6758038f2f6c37092312dd6c82eb99da99119758170d817b913e96b4c24f5d34 WHIRLPOOL 37939e6514d30c8234a372ec7e2d41b6327a80695fae8d7d8a576b2f0e1783a9025e9a74083d62afcaee43702f07c2a544b2a096cba0b5fc1a30283cd2a9e71d
 AUX bash-3.2-dev-fd-test-as-user.patch 1104 SHA256 f1c8ea4628a85e094f12cf88bc2436fc748cc1c67f2204fdbca222b46a30e858 SHA512 fe4478d4423f7a9cce4af46207e2adcea2de17591c8cbc888695177a0b5efb9ab060d7980f6679ca66f6e99f1fa7b632fea6f002364c588996a4287cc5313689 WHIRLPOOL 4318384e7072100e650060520aa357698c0993331a9e1933f70af71af0c00b95c85bcc86da764ed0877cf3c066039b003f2ee2e676044cee81d4149facb5fdaa
 AUX bash-3.2-ldflags-for-build.patch 1172 SHA256 f325df461e7ec87a8450eeb7db7ac9aa897ddf6c248bbce6ef5e6cd82044fc7e SHA512 5ee27f6e2f3665ee4de4d47114ae03dc20d8050f1e4496d29796d892f9c96019a5dac8ec5672ba1818c0326d1151969bd03f9466089d6432468bc2cf56a1dd09 WHIRLPOOL 73068ed5105c30fbe3f353f424146efda53df4a0067caf4cb265600cc4aea11de8a4de2f15357a63df2890838abca849b13c1a98a08d79f340c64cf05e05becc
 AUX bash-3.2-loadables.patch 5355 SHA256 e081fe84f4d253c5192d260a3e1af76ff7ece45c1739b327f46884a158c70b1a SHA512 8255659ea5737a6edc97c29a772c3b40c634190d869c67ed585e9169d18bba08d625b6a56b8e3abf200fa4798c4ee5d9411807fabed8c123b4afa1fd3d7be50d WHIRLPOOL a78360956f4c2cb8a7dde02e65012116af5828f136b4ffa0724a47e2716baae6e934c3e65eabc44ab9bd7a909400aae18a2e88b1427784c888d4e7991ba11155
-AUX bash-3.2-parallel-build.patch 686 SHA256 0ad808cff4f93abbdb07d9b4bdb7fcdb203fa391395e4d9d2180d6032b4bf06e SHA512 c43e4026fcd2dc5bcbfcb05624fd7d8a8f42e87d93b2ed75bc4a50a29b2115153c805288eb8e7bcec43e21125a541dab60cca23625dbb0f8b0c944e59ddfddbd WHIRLPOOL e5bb10b9fb1c5c34f858662b781e0989f8c2da76824294a82341dfb5a3ddf29db45b52dcb320fe108c488b7347ce5f9ae63528fe4ecd2ad7e86576aeebfa77f5
 AUX bash-3.2-process-subst.patch 272 SHA256 cd198d922094fca30fba456decf22fb57b678802db4e4375b5193d95b6371843 SHA512 609b093f8f56beaaa1e41a3fc6a2261d302a938df911e2765e819bf71ad3c7da14444ca01f7e655b9bd7b9f08297520e18320c85f16f16425cb2e583e422c6ab WHIRLPOOL a4098114fdcdaf1f710e754712dac5435b2846deb1206b0bf001f91e46cd60be27b5e29ce847cbc666042ab60c77eadbe541934b2200d06e72caa0b821ab357b
-AUX bash-3.2-protos.patch 1106 SHA256 2c9a9d655d9da8e7d5dbc8535f1da2c831a6fb9067e5ff65beb906b25d6ff9ad SHA512 4989efed2ea1fb337983da9af55cf0a47cb64b006edbfba444d21c5660e05e9dd28a447d512ab3970211589f093ed091acf9833cfd29df3c06ef0fdadae520bc WHIRLPOOL fed37807b019056d93a085deb024f5586405831469fa97b2b99b8a6e519b239093fc5fe15a3de3408dd2e3d724d276cde71fd43bd613189f307a757574e5b08f
+AUX bash-3.2-protos.patch 1376 SHA256 1468c93a7363a0940a18f37e7b8525a7f13ea5ea64c73c4ac531fb927db98719 SHA512 38fda9326bc92cdd10b9f4fac91d1ae8b37aca303376f9cbb59376f06136ed6d765421626d253931350e6ce5f6a34de9016eaab862de1deaee20c62d53d017a5 WHIRLPOOL a50bc84d503b7d1f0c27e166a86bb9ffd3dd55a954381f3c26cdeec53c95f1f241e0b99bc527de17d3de56473865f22dcb1718f889125731859555711497723c
 AUX bash-3.2-session-leader.patch 2098 SHA256 533861310e7cba05f315ff56af32aaca5e4bdf7c2a450d4e616bb14fdf4a1f3d SHA512 5b2cc930adbb49531971548b57a56cc4a6ba5850ef68f968b566e854e9e419767b1ba95d2186b26d9fe14e06e289f9bb471d39eb7a5f1a04874b0ca98c3e48cb WHIRLPOOL dd5d333cbfbfee4eecd518601aaaa793d7397fa84997f4050a2450001d6f426ac53423ddc69c4994541c7d6dc3c1f4393ee51d82dfdf561b70d5afc45a6d4494
 AUX bash-3.2-ulimit.patch 449 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381 SHA512 a03a59691c14d16f2b6eb48836c4f292369c7dbc61df3e13c1dcd023fd69618c6a8e4230dc9997701b3c12b208318b0ecaebf3fbeb7d601e0f94a2840a1cd88e WHIRLPOOL e9572281bab77791a629c4a513544c16d1db976a0fd6149590fc26f6c02d29de316aab1adfa7c49344554ca8d58d254a3625da6ed9a2a9bf6639ddbc3a6de1eb
 AUX bash-4.0-configure.patch 749 SHA256 12419ea6f91178608b0fe028d85b4e0daac5c339a52fbbb79d77d97a2f6bf010 SHA512 b7df205a424c8b345e7ddac0c112b59b473cb1a76350f0b22e002e3e5f2f3594d8350573f8c624835582591a97a518fe62028ec8e3c2ea73a3eeb94872ee7a95 WHIRLPOOL 6ebc68332a94118bf61a5b667c008d9e1b9a162a80bf5936b896d8ec34e150bed2efdcc562e3c33343200f1a49c066ffabd7382df78000a0116987ee62d004ad
@@ -268,28 +268,28 @@ DIST bash43-027 6889 SHA256 1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663
 DIST bash43-028 69606 SHA256 e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d SHA512 4317380539e3a93167f195eddd0acf0c75a5d86d5ef243cb7f7dca43e745badc3ebbc081b099678ac17dc03d9a3ed4a3ff3c6636bb1887e73e94b8ff9ced7c88 WHIRLPOOL f01e8fe2c09a7bdefacd7114cc8377f7ccd65de6c3bafac05595f1400f330ba0ba63ce97fe7b9b49957639c75438bb5ceb853890094cb0c4e43fadc1795b89b6
 DIST bash43-029 1824 SHA256 4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292 SHA512 e25783c7557c1cda8344ba779d59f83e26b90b0aca393b5f7ee389e0583ccf81eba394589e992b33eb6c969083a8a4ff7fc8ce52059cab3b71289d085d381f07 WHIRLPOOL 857275184a8a449461b5aebba12d8231e1e33a2119693fa2c865ead18d4c462dea8151cfc3e0d121c2e5569d9984856ba69820aaa54399ddc77bb849ea9de890
 DIST bash43-030 63206 SHA256 85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b SHA512 ae41a9a5326ceb8e7105e359be097e14876160f6357bfa7c5cd3c4a495a629be762c3db671754c2cffc6abb34998aad91dde4a449ba16a0c6da844bac53feca4 WHIRLPOOL 2184fa715fb90de89f18ba2b27dca612b684a85e9228d58ccf2d62a96a2e575929b3e1a47fbb5809e4c231a6657084be4a076271cfdd5b8b7dde493f2cb40a01
-EBUILD bash-3.1_p23.ebuild 4459 SHA256 1e77190ba3c9456965fbbb1973563f8a3b7af2b003ccdcc25db331637b5cbcc1 SHA512 04f3e490ce32a2e07b9eff6ccb5c693ab64572eb7f69012fc941015e1e16302956e874f2778bf7c53b084a1d1818fbe6c3bbd491ba80f6cebc8ddc350f4434d9 WHIRLPOOL 04bdb7926bfdf07ff74c9565955bb07f2a8d4e4451b522f9100eb5ca20009e422654cef5670226ff2e3c5c9fff885143ad53b796efec249c2ee1581b1c7eee4b
-EBUILD bash-3.2_p57.ebuild 4636 SHA256 dc835aaa63548f88745fe4dba7824541922ce9e26d86d77cb67a0f8f903e43ee SHA512 a008e2192ef4473a0c255ad5e0c40fda3a7c4023c5b85bafb4a429dcfe975d6f6d64ee3e213ce99d31c270361507eb3df229e517b849d2132d530db708826649 WHIRLPOOL b2627ceffe52e24127b8c0883da3c288f4c4a175f6536dfd9e56a3c64688738b8d87705a18a4992113a4b059a9146da7710db8b08a87cfb3eea5a0b49280096d
+EBUILD bash-3.1_p23.ebuild 4522 SHA256 56c377e1567ccf918947e8148ffa48a24f8d08c8611f2dc16b2ababc23730126 SHA512 4bd88c7ffcbc3e569e262c3b012459549fe243e74b45371df890cebe71bf987bc18f7bac4d7ce66ab211542aef62805453b6796aaaf3f43e1163484538b3ac68 WHIRLPOOL b52250570b9d941292a0bacf05c6714726bf8b9be0c2bc4cc9d7ed70ab53928199a0701fd08ecc0d68f2dc2df1274ff88590c872e9a7ef03dbc78db25843dc91
+EBUILD bash-3.2_p57.ebuild 4591 SHA256 bdb294f5741c71afa3543643a4a45110fb236b91ad62df9eeda155caa3f5e247 SHA512 6c761a84baaebbe9db2a7778ea36a90cecb91b1a6a4959d065ec64c1997ac7142e8746e0449a0c87d686f467d341beb0db8f0edaec46f4407ba070939089a5eb WHIRLPOOL 0e5882207595197cd51a53cf627a8c2d26b986811b272d7d25e63e3929e0b5f43089880bac3c04a13901dc1add6d06b252c2d9b43b1518443d4582db5323b790
 EBUILD bash-4.0_p44.ebuild 4465 SHA256 519ec4d3711308bfde07453e811dd9e3f18131b63d9495e3013db0446521af16 SHA512 d81fc446ccf4d81e64c446b04c90cccb44955439e535c60fdf311ed31d38d7328b6027bc5b154798aac080a5ad05163dcb99129b5e857b975c8772b97bb5b397 WHIRLPOOL 155c814869dfcada7da70a5224e9e8ef3e7dac4c6696ee9e8f6e6bbefbf352bcb30d14a08e1fe76bbe302b79260a5a41cfa2424f582984788442b2f0e2451f4d
 EBUILD bash-4.1_p17.ebuild 4200 SHA256 51ef8ecaf92d851c4949c91456a5c0325a328ca3b32afcb2f42a09fde87a025e SHA512 2f55461af1796f5c4dd759b46b9d42cf8cda8fb3d912887460e2d4d36198dd58fbd04b6b60aefc25970442607012bbfa972a43911bba938ef7806e4ce93fc708 WHIRLPOOL 51af146187f894f65f68d8de3e9dd03970817bafe5fa4f9d4efed7da81024af19ff1e78717f7a144091955613818385ee08ed0a5c7e8bbacd523788edbeacd50
 EBUILD bash-4.2_p53.ebuild 6629 SHA256 c6f50d54aebaede7c66c5090b4bd5d8b7ebb8e5a1064dfbd34d0d8b3cc00ccd5 SHA512 87a7b0b0afc63bb7bc60bf1a594368df6db7f0c5451ca9c04e558da5e4d28e673afbbb2186026d51e671ff958a421731af141a75f18a8714067df5eced79b716 WHIRLPOOL b8e488e8bbba07cf0de70720d0d0186eb133fe3ee1325901000cf7900aa8d0531b466cfb4d4c76789d1ee8156c0b14be6e4c60534e435303a361569416809602
 EBUILD bash-4.3_p30.ebuild 7162 SHA256 75206d0502007a037694a7aec75793c3012c0a12e30a77fe64bdf9c068aa00f0 SHA512 f54aaa886d8a123403a2f93495c7a22caeda1d446a03bb8096858caa287e35c64f47a4f79fc46690d79a5b697415f41102368f37c7490e69ce5d4ee4c5c06687 WHIRLPOOL a41ed611298a4b4dfb8ebdbf06e1078189790e637381117518be23760e90a2d930169bc3a797785981841e1ff7e3a93679e9adacde174829edb205dbb47dc63a
-MISC ChangeLog 70611 SHA256 e3ceb253c70ef2cc8d4bbf796da9db7fd6b0f0bc72a08010a494b81c6cebb9c1 SHA512 99f12730ecbf1abad5cc850808d99fcf100be90a1aa68fb33bef7ef83837714a5e8cdbace2ae9f0ca62e546e35786b0416eaf8f0908f63176b4f8b05fa475ae6 WHIRLPOOL 4f4bf89533f2cf3bef70830a31e407fa58fcc1bde7b6558e7eb64bea5afca9d000b8bb750d664e6e5bd82c5c58448cca3d572dc0dd62b03d5f3838bece9fd19c
+MISC ChangeLog 71008 SHA256 02ca4a18db72605a65ac8738acb2ad4ee7605d624e45f9fc16fd0c336877c52b SHA512 1c23b58993fb91116a410ea5d5af5310cda176c322bc012f5ab157590eb72877c80ed47b37e83f3c7923cb511d843a76819896a2ad550c8680fb74c71745c021 WHIRLPOOL d2bc6a70d4bf370d20d94640565568e83c1c002c67ad8e788fef3e5a88c743539010f41c7e765e63f0a9af58d3b2eec65745baaa81ff574c428ac205283385b8
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUNWHjAAoJEPiazRVxLXTFh9gP/2FAADRWKt2kafHWFLNNSeLR
-Ae8MyHmW6czl6bM6bsTKqG3eAyllG876zq8uMqs774ZItB0V3JtlkE4hHwPIzzdG
-pUPvkwfelTCp7ChEabdWbplD5HfohNkCav/OqFaHT8jHyudJUJ+Wpuu7uKYZHZ85
-q1CA8C5erFS5Id4ERU0KfR0oJCT7MgaTPRlATibcrtSM2h68IjkHBkhvYkq5Raw9
-N/OH99pPnfD0mY8lnDGvzHg0DKPhATricufw0BNwFWUo9qAgZeMqhyBoeyYQrdTC
-FDYKybLyiVMiQOhd96HzsKV7QkyDyRaGIVk2V7zsCQH+V3Eb1ZMF9E52/WryhEzu
-6j1FEwKghV5ArcVpa71vP8VllKfVRd0mDA9aa3G7/DNxE+Fx7dUt5SPhJcKK+8dF
-WV+NsaLFqNqllxSL8qEAjMs+Xta6XAbZXngwgnKv8TeJyr/Hq+zgcZnumT+/w0O6
-JNOK2GQUiJNVp/echUVFkoXLYj0zQxxvn9Dx/1Yf3W2AZF9CX+I92egea+ke9koL
-ySZ7pILUSgTO9iwjkjWbZOvCIKRLFZV0uYMRTtzLsKs4TVnffNGwlg5x+S1A7Mul
-mmo0JvfyXm5Hlw+hm5wJvpDe/m3XKlKavaEU9T3y+WOrjbyyGXcRBJZWTRKSF0d8
-SfXje/Htq3RQhcwymWFH
-=DFUi
+iQIcBAEBCAAGBQJURBwQAAoJEPGu1DbS6WIAYMgP/i+B5R31alv2stjPXJiqJjLn
+YKo1FD2JwWBn2GtvH58qpbK1j36SzbLCNUKk4KrmouwhTjNCTO/zsJe7piyjqnc0
+zi2L1De3daPtKnN1PYvv6mH8GmdHEBag/du3AMXv7AEia0XxRfRrxBUX+5PZ6kyv
+k6w3gW4xC473knSr919G95VWgWeYDPawqXBZmkw8xTHLXyvbYO6myNHdkIX89JbV
+jCCOknu+XRQaJzp+2U7f5e1ckZr+cV2fUTj+qHldh11zkmeUOnxvsyBepzvxUZkp
+b/C3izxh8nHuiDHTbxkDUcFXAy9/Xrexi6k+pKOT2H6Fx2/PMcli5BObq7l0HDS8
+6oqz9CM8B9KZlHE0eRBXENkzhi8DiTrJW/1sQT9oFhbhWkjasNx4DUFTyuzM4eiN
+YNPDN4DJv8SCI8l/459HwkI0w7YAvirVfrPXAR2iJlMa5vUf63pugODPEveda1RG
+uMbRSE/hFY5xCErLf2cfIzrokMIyT8147MHuLZ+NJSeGZZDplMbtivvNfwOrGSbL
+Uhaezt5eO6DrLW4KY2zsdC+LJZLfFVkVYN3qLOYReRcbsLXvbBblTnni4vf5UyHH
+rNTxErkCAtIDFaKJsosagn1Icwu9E4LZavwBTdgeUem+nP+OFg0xXCfqklYDMwRs
+3OssOh6W25QDV0wvQ6R0
+=UzjQ
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index 5928106fda0f..fb8332eabe5a 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p23.ebuild,v 1.4 2014/10/08 06:21:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p23.ebuild,v 1.5 2014/10/19 20:16:14 vapier Exp $
 
 EAPI="4"
 
@@ -65,13 +65,14 @@ src_prepare() {
 	touch lib/{readline,termcap}/Makefile.in # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
 	epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	epatch "${FILESDIR}"/${PN}-3.1-protos.patch
 	epatch "${FILESDIR}"/${PN}-3.1-ulimit.patch
 	epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch
 	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	epatch "${FILESDIR}"/bash-3.1-fix-dash-login-shell.patch #118257
-	epatch "${FILESDIR}"/bash-3.1-dev-fd-test-as-user.patch #131875
+	epatch "${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch #118257
+	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index be9ffb2140eb..007b8b7f8be1 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p57.ebuild,v 1.4 2014/10/08 06:21:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p57.ebuild,v 1.5 2014/10/19 20:16:14 vapier Exp $
 
 EAPI="4"
 
@@ -66,11 +66,10 @@ src_prepare() {
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
 	epatch "${FILESDIR}"/autoconf-mktime-2.59.patch #220040
-	epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
 	epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
+	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
 	epatch "${FILESDIR}"/${PN}-3.2-protos.patch
 	epatch "${FILESDIR}"/${PN}-3.2-session-leader.patch #231775
-	epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
 	epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
 	epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
 	epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch
diff --git a/app-shells/bash/files/bash-2.05b-parallel-build.patch b/app-shells/bash/files/bash-2.05b-parallel-build.patch
new file mode 100644
index 000000000000..382ffd6dfd5e
--- /dev/null
+++ b/app-shells/bash/files/bash-2.05b-parallel-build.patch
@@ -0,0 +1,15 @@
+Fix parallel make
+
+http://bugs.gentoo.org/41002
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -604,7 +604,7 @@
+ 
+ config.h:	stamp-h 
+ 
+-stamp-h:	config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
++stamp-h:	version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
+ 	CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
+ 
+ config.status:	$(srcdir)/configure
diff --git a/app-shells/bash/files/bash-3.1-gentoo.patch b/app-shells/bash/files/bash-3.1-gentoo.patch
deleted file mode 100644
index a3a62d108c58..000000000000
--- a/app-shells/bash/files/bash-3.1-gentoo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Collection of fixes from mandrake
-
---- bash-3.1/doc/builtins.1
-+++ bash-3.1/doc/builtins.1
-@@ -8,8 +8,5 @@
- let, local, logout, popd, printf, pushd, pwd, read, readonly, return, set,
- shift, shopt, source, suspend, test, times, trap, type, typeset,
- ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
--.SH BASH BUILTIN COMMANDS
--.nr zZ 1
--.so bash.1
- .SH SEE ALSO
- bash(1), sh(1)
---- bash-3.1/Makefile.in
-+++ bash-3.1/Makefile.in
-@@ -658,7 +658,7 @@
- 
- config.h:	stamp-h 
- 
--stamp-h:	config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
-+stamp-h:	version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
- 	CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
- 
- config.status:	$(srcdir)/configure
-@@ -666,7 +666,7 @@
- 
- # comment out for distribution
- $(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
--	cd $(srcdir) && autoconf
-+	cd $(srcdir)
- 
- # for chet
- reconfig: force
---- bash-3.1/parse.y
-+++ bash-3.1/parse.y
-@@ -389,7 +389,9 @@
- 			}
- 	;
- 
--word_list:	WORD
-+word_list:
-+			{ $$ = (WORD_LIST *)NULL; }
-+	|	WORD
- 			{ $$ = make_word_list ($1, (WORD_LIST *)NULL); }
- 	|	word_list WORD
- 			{ $$ = make_word_list ($2, $1); }
-@@ -1186,7 +1186,7 @@
- 
- #if defined (READLINE)
- char *current_readline_prompt = (char *)NULL;
--char *current_readline_line = (char *)NULL;
-+unsigned char *current_readline_line = (unsigned char *)NULL;
- int current_readline_line_index = 0;
- 
- static int
diff --git a/app-shells/bash/files/bash-3.1-protos.patch b/app-shells/bash/files/bash-3.1-protos.patch
new file mode 100644
index 000000000000..32ae8cfe91a3
--- /dev/null
+++ b/app-shells/bash/files/bash-3.1-protos.patch
@@ -0,0 +1,67 @@
+move prototypes around so they show up when needed
+
+--- a/jobs.h
++++ b/jobs.h
+@@ -182,6 +182,7 @@
+ 
+ extern int count_all_jobs __P((void));
+ 
++extern void close_pgrp_pipe __P((void));
+ extern void terminate_current_pipeline __P((void));
+ extern void terminate_stopped_jobs __P((void));
+ extern void hangup_all_jobs __P((void));
+--- a/lib/glob/strmatch.c
++++ b/lib/glob/strmatch.c
+@@ -25,9 +25,6 @@
+ #include "strmatch.h"
+ 
+ extern int xstrmatch __P((char *, char *, int));
+-#if defined (HAVE_MULTIBYTE)
+-extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
+-#endif
+ 
+ int
+ strmatch (pattern, string, flags)
+--- a/lib/glob/strmatch.h
++++ b/lib/glob/strmatch.h
+@@ -57,6 +57,7 @@
+ 
+ #if HANDLE_MULTIBYTE
+ extern int wcsmatch __P((wchar_t *, wchar_t *, int));
++extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
+ #endif
+ 
+ #endif /* _STRMATCH_H */
+--- a/builtins/echo.def
++++ b/builtins/echo.def
+@@ -31,6 +31,8 @@
+ #include <stdio.h>
+ #include "../shell.h"
+ 
++#include "common.h"
++
+ $BUILTIN echo
+ $FUNCTION echo_builtin
+ $DEPENDS_ON V9_ECHO
+--- a/lib/sh/winsize.c
++++ b/lib/sh/winsize.c
+@@ -55,6 +55,7 @@
+ #if defined (READLINE)
+ extern void rl_set_screen_size __P((int, int));
+ #endif
++extern void sh_set_lines_and_columns __P((int, int));
+ 
+ void
+ get_new_window_size (from_sig, rp, cp)
+--- a/support/bashversion.c
++++ b/support/bashversion.c
+@@ -47,6 +47,9 @@
+ extern char *dist_version;
+ extern int patch_level;
+ 
++extern char *shell_version_string __P((void));
++extern void show_shell_version __P((int));
++
+ char *shell_name = "bash";
+ char *progname;
+ 
diff --git a/app-shells/bash/files/bash-3.2-parallel-build.patch b/app-shells/bash/files/bash-3.2-parallel-build.patch
deleted file mode 100644
index 0ee049106297..000000000000
--- a/app-shells/bash/files/bash-3.2-parallel-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/189671
-http://lists.gnu.org/archive/html/bug-bash/2007-08/msg00081.html
-
---- bash-3.2/Makefile.in
-+++ bash-3.2/Makefile.in
-@@ -584,7 +584,9 @@
- 	@( { test "${RL_LIBDIR}" = "${libdir}" && exit 0; } || \
- 		cd ${RL_LIBDIR} && $(MAKE) $(MFLAGS) libreadline.a) || exit 1
- 
--$(HISTORY_LIBRARY): config.h $(HISTORY_SOURCE)
-+# prevent parallel build race conditions in the lib/readline/ subdir
-+# by depending on libreadline.a when applicable
-+$(HISTORY_LIBRARY): config.h $(HISTORY_SOURCE) $(READLINE_DEP)
- 	@echo making $@ in ${HIST_LIBDIR}
- 	@( { test "${HIST_LIBDIR}" = "${libdir}" && exit 0; } || \
- 		cd ${HIST_LIBDIR} && $(MAKE) $(MFLAGS) libhistory.a) || exit 1
diff --git a/app-shells/bash/files/bash-3.2-protos.patch b/app-shells/bash/files/bash-3.2-protos.patch
index c6a997422b43..0a9ea74adfb0 100644
--- a/app-shells/bash/files/bash-3.2-protos.patch
+++ b/app-shells/bash/files/bash-3.2-protos.patch
@@ -43,3 +43,15 @@ move prototypes around so they show up when needed
  /* Non-zero means SIGINT has already ocurred. */
  extern volatile int interrupt_state;
  extern volatile int terminating_signal;
+--- a/support/bashversion.c
++++ b/support/bashversion.c
+@@ -47,6 +47,9 @@
+ extern char *dist_version;
+ extern int patch_level;
+ 
++extern char *shell_version_string __P((void));
++extern void show_shell_version __P((int));
++
+ char *shell_name = "bash";
+ char *progname;
+