Move older versions into SLOTs for easier testing #479574 by Michał Górny.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

11 files changed, 525 insertions, 678 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 7f9098690463..9f7a7520c0e2 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.345 2013/06/05 00:13:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.346 2013/12/22 13:42:06 vapier Exp $
+
+  22 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/autoconf-mktime-2.53.patch, -files/bash-3.0-configs.patch,
+  -files/bash-3.0-etc-inputrc.patch, -files/bash-3.1-bash-logger.patch,
+  bash-3.1_p17.ebuild, bash-3.2_p51.ebuild, bash-4.0_p38.ebuild,
+  bash-4.1_p11.ebuild, files/bash-3.1-gentoo.patch:
+  Move older versions into SLOTs for easier testing #479574 by Michał Górny.
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index e7081b6cf3b8..53a1859000b5 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,15 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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-3.0-configs.patch 2538 SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f SHA512 4b1c0aef6b0d72e68f01dee094f9e72ba802c175aad6c9034326e11a065d92d617dbc2c289edb01880119d6c3bc454c4785fc7b7e15634ba797e3077bd4f373d WHIRLPOOL 42c229f208e3c784bfd88bfe50825d31cee265dc9a3ab4078de027df69de7a73b372b8e82dbadd95ec25dbe890581322bc017a78d9348ff5c9dabb140394b7a0
-AUX bash-3.0-etc-inputrc.patch 1443 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025 SHA512 cbcdac81740cf8057c8ebba0a986b6794d5936b3ee4c621e3680db744c0cafe8b391ab556cccc35e486dff0a6d68dcc070a26679b1ae475ed704e671f83a1c52 WHIRLPOOL f26279fa19f17eeaf908401ab561f397a98ce8fa0dbb9562f5dcba997a1cc8e687a41838c1f4b95724976dcbe325a06454e935ec1da175c05d501c0853320a86
 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-bash-logger.patch 2241 SHA256 46e171b1b457ecadaec9fdd73a671a69f95076e9126b799e427b36f5bb47bca1 SHA512 ef36813c5c4fad522419a016afc36bf8073f47633944ffd6d241a1c3139b37597955c26c18cd0221375b5a8324b3a2739899be4e1ac815c1be374e23e70566a3 WHIRLPOOL a57b8e7e719321e9e8eb8303e052d30f654341a904369cb4cf20ef2c23e4fb6179bc6f26a4f4cee16e781e21a80f0f06cc279c640b8c3d3da86afca5ba53ef73
 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 2005 SHA256 7cd63a3e66de5f885824e6c02c29f004e08eb5bd6b6c189bc8021c5893aeae3f SHA512 111d34b3d532e6936b85fc39a0efbc715c98775e1dca11f7373ad8f6700e5ed9f1672c313aeb886dad7f52e7ac2e5b640e6fcb4793985a39e61d292a4d691a1f WHIRLPOOL 9d7c2bd47aed5e6c27a52374a6959bb4f61155a66fb7afa6fba6943a52ea5f7ce652159be093e2e1c98a87ff4fe018142d1011b62d906cbd682546d030cdf2a9
+AUX bash-3.1-gentoo.patch 1525 SHA256 ea9b45c2a71a972094e3d0044530ea75ef88562370d1d528ddccdb44bb53d42c SHA512 19a3b642b828bbb0c3331eb09b1a28abdcac6de4b7b456b20766126ff02558969ffe8ded36ed96ce5ea0bf7a9029cd036b045700a23406ce92d705306b11bc41 WHIRLPOOL 5b5dd84aa969059bf34745058762f7770c2f7c7c549bd5c1487d24661549104171de3b0eea7f3fbd9259fa423f55e302ba663616a88ed9cc23b72a81ddaafdb7
 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
@@ -204,32 +202,31 @@ DIST bash42-042 1571 SHA256 faaa5c1f456517b258b2a65eaa664dd6a01eeff73c8ca4447c3a
 DIST bash42-043 2110 SHA256 dc2683840f3e890a9c5f85338366ff6cd923285e558eb46aa818a03fa67c5c57 SHA512 70503181c392faf565ef0b23a2f6d1614836ffb9c04791cc4bfb31aff7786fd5efab4072034a4cfba0035595140cf7f9461b1565e4854ec34823cbd4f5ab419d WHIRLPOOL e988a962aac3ed9cd1f105cc5c9a477aaa52defdb049be8d9cd37da40177664507c06550193855cddea3b0a9fea3a04ec027ad14eea845317ee67e1b89697076
 DIST bash42-044 1871 SHA256 10d32d6c9ccdedb1d826f46468631d475f9dcf983fac087766e16df7b99766e6 SHA512 e94cf93c5760225d4ac16f9c73078c3ce9913ffe1e20ffed8fa31084a0efd3dd63762b5437221f6b570078667e3ec19d882169ffe0ba4c498e258e56f17d2511 WHIRLPOOL 23e3fd1ed1a708eead2ce463c0e5acd720accbe9727462b7fd3916b14b8eabf2339c1f7b1dc973249e075bff4fa566753ae43c540ce3ddc84b5cdd72814d568d
 DIST bash42-045 1572 SHA256 ddb7eff0f59d394a483b09feec3771d9026f81ba90afac32846a19b172b2986d SHA512 64f62b19c79eb2c581feda2b9f3c36196b3a794ee9996f6d72078fbb0b8c5878aa2d8ff3e2698cf9769e42083704dd9342bb108212d02aeb79875fad70895560 WHIRLPOOL 02fa25cf02c831675a78a5625e0ba5606b52eb9f3dbdf546cd62983d83cea7fd159b535df94b3c8d39907a7739de7459b69cde3583f28d952a54b384122d264e
-DIST readline51-001 2042 SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774 SHA512 94dbe326f551099aac9658e80cf5489cdecf0a06f4986b1ebf0f6b678f1e2e50e31353e459e1b71a186f17c933180bf30a821cb262708ef6425c5987eb6d66e0 WHIRLPOOL 10546875add30ab9d2c9b60f6d90dd9cc6745e02cbec1ab8913517c6bdbc3d894d97652d04de148e6423fd8666831255996d9862e8e532ad06390757859a8f64
-EBUILD bash-3.1_p17.ebuild 4644 SHA256 5cfa12364bdd1421827788a87fd11caa4134898b4d557df717e0f651ff6ed931 SHA512 098f35549dcb2483b57dc167c05ba60d092078b43ebb587580b7d33d3232eb92a090ae4d85aec22b14cadfd0dd9183c9cf9c94d923d554aaa6fb3200a30c54a4 WHIRLPOOL ff799e36d08c0e59e15d6f670436057b2ff26620dc454f28692107134ea28274e249a1a60bb8442353aab68cd8b1bf56dd0bf77e61e400e560d78196160c0751
-EBUILD bash-3.2_p51.ebuild 5864 SHA256 490653a9868ba93a572ef0e4b8d26e0bfc3a93b6cf83813a47a7b9078ef13c63 SHA512 c00e53f3f2d92e404f38cc82fde8fe0073b4ff21b81d789fbe3577b931a040f98895666735ea0318ef0e6cf32438e7035a37d0ffa686f324c91e6b9e47ec2991 WHIRLPOOL 80de9884361e62712f024ea22f2e69b4f470942fddfe6d3d7d12df70331a78e747b6a5c4a2a80f64d6ba8f887e029a8156024e6dae79f3ee6360bb666d2cf1ab
-EBUILD bash-4.0_p38.ebuild 5624 SHA256 5b4f8eb489e6db9b068532a55fad5b379d22f86c397c16a3b6b892d558707d2a SHA512 03ddd07c10b548694c4ff50d044040ef88c12d3ec242ecb67e419798259cb885b99477bb24861982ea8dfc843a868a01ee92cb6f1c430eb3c476436bb2fe9230 WHIRLPOOL 75f9ab9afd3286ebc97d6325b86268b2a8214b26c5158c77b9aec17d1584be50647ea972131a28aa5b331cf9acdcf0690d2d0c4a7ca0da94f6ea34ab8c05efec
-EBUILD bash-4.1_p11.ebuild 5664 SHA256 ac909f86646bcf807fb81d734706a9d151d4d5a7d2d1c8e55ab5c6c48c54770b SHA512 6d0c88c5fa23128e587ec46f694ada17fe04bc75108067511bda7eb6e433a672398ecefc1e2e09427ca668ae9546e7cf3a69ff9b48a529bac0212870ee1c27fe WHIRLPOOL 3e96f5578a2b4e17beb2adde580a1e6ccee156a3df0bdb6801c9e6c8244a4023e94f97454f37ae92d67a5e903ef32c3ad454ca0e9976446b8fcabd4746455c80
+EBUILD bash-3.1_p17.ebuild 4453 SHA256 5de270d46156cdfe953fb8ce0295ddf64950a11905998827c907447de3067ca1 SHA512 217e0627baa8d69c30e99e241fb1e4a071dace0af4f2572d2a6ba17f391104c065869febe3a9a2b802f521a339335d1559127eee344949fcee87d816a632c94b WHIRLPOOL b3b0e4649f0bde2fceac123e0fb7c721a1702405ae0c8ee73c05dd4fbf5f9843c02a998c4a6505f1e3b7cae5547972403d7b8cacc0b7471c5cf025825c4b3e82
+EBUILD bash-3.2_p51.ebuild 4629 SHA256 98018e7c80b62649515ced23260ca5d7c191350d4b685c909561cbcbd029dc6e SHA512 4c0d5efe132c9b03b3cbd9f5b20838b3a1174abb21e380f32a2680f4206d77bec79506c18974ab7d00ee42e18ed9907547f1f740d76f959f53fc39250554381e WHIRLPOOL 50e816701ef3e5b523cbb8bb0e181176dc3b24d1fb667f50445ac68b7cda62bf525878f8a2f17fff619516c32671bbfdf690003b820f52ce0a10f2bf52eddbad
+EBUILD bash-4.0_p38.ebuild 4458 SHA256 b6676df1dd7e9c0139e9c499965c7c9b88af9059ec959d91151997c10daf1b68 SHA512 45264d1118c93c11b55f88f49c2f587330f9333cae8313403f570734f86cd8388767e30e9e7e8febb48d2a2f7d36972eb2483edd055f27447af16ed7a582d971 WHIRLPOOL 5a41f6d09510d8a6a24cbccb99a20a3a123873e3e3fbdb9c1afe54ef8288466834ffa7afc6a5bbe4bfc3f8c48ca1377b581f199350250ae2e00779a4162d7813
+EBUILD bash-4.1_p11.ebuild 4193 SHA256 321e3e62ab7c3e06a4ce19387c0800f4119914700cf7015b527b313e8d01127a SHA512 476351617785e9fa962f3df62079bfbd7ec33222b86fc455d65df676db17cb2db087fe72297aea51848f8d863ede75c8f8e0c53e5ac5473209acbb6f01f80804 WHIRLPOOL 39e9a822e00b48e1baa185467727b8dd784d04c4820c905724ef5c8325e9af18d04b4f3e6ebb9b398679f497250de464ee609b738442387c8ea4e275395a236a
 EBUILD bash-4.2_p37.ebuild 6311 SHA256 c807f0def9dc9dcac9958cb7a9606dd9f1ce33142933dcf0f8cd3276434f86ea SHA512 f72570af7efb4e07b5b5e67fb81f6c12f8b177f75592b2b12da606371ee63001c43126a2da03ef41e140894e47935c21df3a8235e10da9131a4f3bdd51c35575 WHIRLPOOL 54c55493d4f9443e33ee97421abca38237c4027d2bfe0f5c43b04e56cf35b795ca08d33e62517b79a193045dd67b1286b05630621f47bc376e26a276322dcce4
 EBUILD bash-4.2_p39-r1.ebuild 6511 SHA256 b475371f82ad19450b1eaace2eb3162e6dd86a5dfbd41ac6164232cdc11795a8 SHA512 19a40132ab1da0f46dd281803694fce1648f2386dc11ff1c8f283f861abd8d041ad9f09f1ab1fe2ff96101c8bd8d3e3daac3d2811c31c595d741e232bdbef06e WHIRLPOOL c8d75740f8264e7cf80cc8ab492340e9afb9a290e80f7bee9f40c3cc40b60a40ca6180a5211a613ee091d0e2884b5057565c1b2bbd8426152421c0fd2059659f
 EBUILD bash-4.2_p39.ebuild 6321 SHA256 d021ad20244b04d4a6b5f8f7d920aba2b2d7bc760e200d245f29860ef91bb9a2 SHA512 9484e4a61f61dcfddb420a1829a41463db2e4827e4f0bb7de47f84423f32eff0644097fcaa5b6c4b0313dc91d3ecb9f3134f4e420343540d69118612ddf571a2 WHIRLPOOL 75be42a4bebd19b2e2cfbdf3dafc6f981a7daa2a29068c1df31e76d848aa4a5c8a6ccba181e4fab72a82deddcb21e3076ef660f9e7dd1764053da54436da45d9
 EBUILD bash-4.2_p42.ebuild 6530 SHA256 d4d4d953e0e4c6dc2afc84b6c599252ab31694bb098e997a6c84fed2f741442d SHA512 5fc7c1f398e9cc8cc576d3c87ff905d95f5c221181a62556e3642f97cbca83aed7a29d62afe6840607de78a873cc40e27d5b14e3ca4d5e7dfe24abb795c28c44 WHIRLPOOL 790b9f29420bd9779ad329dcded1261ee690ea2053df2599da869da8068b8dfad24e1bf93de22ebb4bf968c62bcd450167f5e05df52515627e2769065ac6ad1e
 EBUILD bash-4.2_p45.ebuild 6517 SHA256 29148ad458bab624257119473ad2c21e91ce8b4148c3effe5b5a805accd32d0e SHA512 6fbdd17eb33408479047b12811a8add6886b2e0448b1f54bf647599e31ba403d76c8247ec026a784e3d234a4c42a5b44947e0ac539e1b3ec36db12c0901b7915 WHIRLPOOL 26ef36cccbf144d3e37b60397e5b628e20cc63731990906836f58b4cf5f1f83096ea17c2661b346bd3c75c41a79b8ac0005a7c5f0fea71e80abb2750532fae27
-MISC ChangeLog 52385 SHA256 f5757564c575837a6463c40c343817657f8c792b8f31860b92fc130b631c295e SHA512 5437ac6a73d28d01be663f2e4e8f5596fb3218ce2858e47feafd888422a6e6759fca489f843f7b5bd430af81e2b46ee826016945b43e5d9f83da4bbf61bc50a0 WHIRLPOOL 6485771d6638499fcd4bea9e95a1e1f53c0bc536a1b1e74c7a68cd5d0694069d84754ecf568d2081b90ee86768d900cc733ffc6960665664ce1ade090c6a5264
+MISC ChangeLog 52772 SHA256 340f7d2b930c682f189d920df73f72b164de1013d692052da3f1de26f3e01be7 SHA512 570f39180b8d50ad69784f148e852bc5f913ea541057701c687b25b2d6e70028a3672336ea02d8aee3f632756e4a989ffb10a17528299f86f24055e6cdb413bf WHIRLPOOL 06002878ba102671948cd86e59a28a9a239c2ebb66c63fc7cae6808e1465befc03b6e0b6c224b85df2e4c69da4e790bef4a84bf389071d9147ad7dd65d1bbec6
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRroKUAAoJELEHsLL7fEFWuuYP/iF722RSoiELKSThuiVZ9wKu
-gzlO5w+eMt0mwUKmSHx1CrFYTv4brvhObLEQR54H3pr4aNZkKLfLV09XqjpaKXNs
-DxuiTR/axI/2Zr7mY75bXxwxIKUzbaDyRnizYD0c7A//DgJh5aAX+WPG3It6eRm2
-rUWxd51cYhw8nO8n0+IKUS8MIXjTV9b+51kEXUOle/DO+rSfBLx+e/3IPqJH58Dl
-PbAM7+CQfqZORhLCSJCmUolkivGL0nvagpUr3PupSed9laA8esBp1CCIf/6Wkoa4
-ukshJH9wkVpT7NvSusMbgwqyDIbbG9GgOls2/Fp14zYXyxw4JWYFWUqoKzN0NPbs
-BlCrr9w4lagXS9YYvN6eTN3ymuNUUEOEbDF9XN4dn9fOFUSxb7lRnM2vrumAfVBh
-strPoyw9Tb9accfqK2AusT/p4bfpkR6nY7ehjv9Tfarb209y4ViFhqluJfQEtSWU
-uuQQnMiwWfOjURnsIePN9PSYfmZP01putfSZdGpbrSsanV4ffWHR3cqj2W5p0AFW
-ME6CNaXRdB1pcP6RNNZN4fn4yASLknSXNGVH997S2jEuBPkVOt+iLuqObmuozvs0
-5Q+X2UtJEumZQyJ2C4hXv7KmKXcVqRO84nxc3u7eksp5Am6JXOflKuGEkZhcpGj+
-5EKVquCoZcTh7VQHYpwb
-=ixfO
+iQIcBAEBCAAGBQJStuwyAAoJELEHsLL7fEFWzcoQAKG0ACaCgZ5NHqBbL/QH4GgI
+UfZQ2wjVyJIYvE6sxzlMnszCSSzVJ3BY76Fx2bEllfTrI8AFa63L15Qo9MpxesID
+CKYiBbsy0TAML9QMJNVvjM78z5wva3ukxMX14t+4NZhXPuin1yva+v1TTXEwOfxu
+2L0DBeuRKNDrR3kDNeeelL3J0XZe72LZf2ilinGu5SYgYC67E284ZqzCXWjZmQjL
+3zCnIrabR+jxNwz6xn1koqBk1VYDuL5hbLj6k3VqP1DamnACoJdqhA4OUzib15ax
+5+jp5YAfn42Fyi4FdyPfM+rdftimMvTArtRauW9MQNkeeLTJsWnGMbFM2wLFVzuj
+E4R/xpWU9QY05Mf6c/dNxX0VnPU9PgB5tpVmS57q4DRGVw/LePQAEyZb0n5AUks/
+c1CddRv7RaMVdyhk5VBsD3yVR+5lbfrbCNCjr8kVD78GuJYXmS/m7yHy2TGjmj+B
+OJULYKc/HggOX9LhAsnluhwkKb1Bl5xsekbULs5u0z/Dy3X7lVdjU0Enzou2C/X7
+iBGs5VD1wOzxASuNa6c3sJSOSpEAsnuGoaN3Gu3fA7IZhopMYcksWlwhSt38N0A1
+r/zbt0B1jO+ldXJEyBr7jkWVx0adfQ21Iu93Beiq7Acdde/kOi6OA19wssHaTsT/
+nmyERAMt+xt6p7bIASh7
+=26yD
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.1_p17.ebuild b/app-shells/bash/bash-3.1_p17.ebuild
index 53ce6dc494b1..d4ea74bbcbc8 100644
--- a/app-shells/bash/bash-3.1_p17.ebuild
+++ b/app-shells/bash/bash-3.1_p17.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p17.ebuild,v 1.24 2012/11/19 22:26:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p17.ebuild,v 1.25 2013/12/22 13:42:06 vapier Exp $
+
+EAPI="4"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -8,143 +10,137 @@ inherit eutils flag-o-matic toolchain-funcs
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/
 PLEVEL=${PV##*_p}
 MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
 MY_P=${PN}-${MY_PV}
-READLINE_VER=5.1
-READLINE_PLEVEL=1
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-# Hit the GNU mirrors before hitting Chet's site
-#		printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
-#			${MY_PV} ${MY_PV/\.} ${i}
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz
-	ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz
-	$(for ((i=1; i<=PLEVEL; i++)); do
-		printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \
-			${MY_PV} ${MY_PV/\.} ${i}
-	done)
-	$(for ((i=1; i<=READLINE_PLEVEL; i++)); do
-		printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \
-			${READLINE_VER} ${READLINE_VER/\.} ${i}
-		printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \
-			${READLINE_VER} ${READLINE_VER/\.} ${i}
-	done)"
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="${MY_PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger nls vanilla"
+IUSE="afs +net nls +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
+	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+}
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
+}
 
+src_prepare() {
 	# Include official patches
-	local i
-	for ((i=1; i<=PLEVEL; i++)); do
-		epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i})
-	done
-	cd lib/readline
-	for ((i=1; i<=READLINE_PLEVEL; i++)); do
-		epatch "${DISTDIR}"/readline${READLINE_VER/\.}-$(printf '%03d' ${i})
-	done
-	cd ../..
-
-	if ! use vanilla ; then
-		# Fall back to /etc/inputrc
-		epatch "${FILESDIR}"/${PN}-3.0-etc-inputrc.patch
-		# Add more ulimit options (from Fedora)
-		epatch "${FILESDIR}"/${MY_P}-ulimit.patch
-		# Fix a memleak in read_builtin (from Fedora)
-		epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch
-		# Don't barf on handled signals in scripts
-		epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-		# Fix -/bin/bash login shell #118257
-		epatch "${FILESDIR}"/bash-3.1-fix-dash-login-shell.patch
-		# Fix /dev/fd test with FEATURES=userpriv #131875
-		epatch "${FILESDIR}"/bash-3.1-dev-fd-test-as-user.patch
-		# Log bash commands to syslog #91327
-		if use bashlogger ; then
-			echo
-			ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-			ewarn "This will log ALL output you enter into the shell, you have been warned."
-			ebeep
-			epause
-			epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
-		fi
-	fi
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
 
-	epatch "${FILESDIR}"/${PN}-3.0-configs.patch
+	# Clean out local libs so we know we use system ones
+	rm -rf lib/{readline,termcap}/*
+	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}-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_user
 }
 
-src_compile() {
-	filter-flags -malign-double
+src_configure() {
+	local myconf=()
 
-	local myconf=
+	# Force pgrp synchronization
+	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
+	export bash_cv_pgrp_pipe=yes
 
-	# Always use the buildin readline, else if we update readline
-	# bash gets borked as readline is usually not binary compadible
-	# between minor versions.
-	#myconf="${myconf} $(use_with !readline installed-readline)"
-	myconf="${myconf} --without-installed-readline"
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC
 
 	# Don't even think about building this statically without
 	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to use with bugs ;).
+	# don't come crying to us with bugs ;).
 	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf="${myconf} --disable-nls"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=6.2
 
 	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses
-	myconf="${myconf} --with-curses"
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
 
+	tc-export AR #444070
 	econf \
+		--with-installed-readline=. \
+		--with-curses \
 		$(use_with afs) \
+		$(use_enable net net-redirections) \
 		--disable-profiling \
 		--without-gnu-malloc \
-		${myconf} || die
-	emake -j1 || die "make failed"	# see bug 102426
+		$(use_enable readline) \
+		$(use_enable readline history) \
+		$(use_enable readline bang-history) \
+		"${myconf[@]}"
 }
 
-src_install() {
-	einstall || die
+src_compile() {
+	emake -j1 #102426
+}
 
-	dodir /bin
-	mv "${D}"/usr/bin/bash "${D}"/bin/
-	[[ ${USERLAND} != "BSD" ]] && dosym bash /bin/sh
-	dosym bash /bin/rbash
+src_install() {
+	into /
+	newbin bash bash-${SLOT}
 
-	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
+	newman doc/bash.1 bash-${SLOT}.1
+	newman doc/builtins.1 builtins-${SLOT}.1
 
-	sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
-	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+	insinto /usr/share/info
+	newins doc/bashref.info bash-${SLOT}.info
+	dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
 
-	doman doc/*.1
 	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-	dosym bash.info.gz /usr/share/info/bashref.info.gz
-}
-
-pkg_preinst() {
-	if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then
-		mkdir -p "${ROOT}"/etc/bash
-		mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/
-	fi
-
-	# our bash_logout is just a place holder so dont
-	# force users to go through etc-update all the time
-	if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then
-		rm -f "${D}"/etc/bash/bash_logout
-	fi
 }
diff --git a/app-shells/bash/bash-3.2_p51.ebuild b/app-shells/bash/bash-3.2_p51.ebuild
index 6bc0b582d41b..b09b4f64b088 100644
--- a/app-shells/bash/bash-3.2_p51.ebuild
+++ b/app-shells/bash/bash-3.2_p51.ebuild
@@ -1,46 +1,46 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p51.ebuild,v 1.5 2012/11/19 22:26:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p51.ebuild,v 1.6 2013/12/22 13:42:06 vapier Exp $
 
-EAPI=1
+EAPI="4"
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
 PLEVEL=${PV##*_p}
 MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
 MY_P=${PN}-${MY_PV}
-READLINE_VER=5.2
-READLINE_PLEVEL=0 # both readline patches are also released as bash patches
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz
-	ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz
-	$(for ((i=1; i<=PLEVEL; i++)); do
-		printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \
-			${MY_PV} ${MY_PV/\.} ${i}
-		printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \
-			${MY_PV} ${MY_PV/\.} ${i}
-	done)
-	$(for ((i=1; i<=READLINE_PLEVEL; i++)); do
-		printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \
-			${READLINE_VER} ${READLINE_VER/\.} ${i}
-		printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \
-			${READLINE_VER} ${READLINE_VER/\.} ${i}
-	done)"
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger +net nls plugins vanilla"
+SLOT="${MY_PV}"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="afs +net nls +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
+	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.5
-	!<sys-apps/paludis-0.26.0_alpha5"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -54,134 +54,93 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	cd "${S}"
+}
 
+src_prepare() {
 	# Include official patches
-	local i
-	for ((i=1; i<=PLEVEL; i++)); do
-		epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i})
-	done
-	cd lib/readline
-	for ((i=1; i<=READLINE_PLEVEL; i++)); do
-		epatch "${DISTDIR}"/readline${READLINE_VER/\.}-$(printf '%03d' ${i})
-	done
-	cd ../..
-
-	if ! use vanilla ; then
-		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}-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
-
-		# Fix process substitution on BSD.
-		epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
-
-		epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch
-		# Don't barf on handled signals in scripts
-		epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-		epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
-		# Log bash commands to syslog #91327
-		if use bashlogger ; then
-			echo
-			ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-			ewarn "This will log ALL output you enter into the shell, you have been warned."
-			ebeep
-			epause
-			epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
-		fi
-	fi
-
-	epatch "${FILESDIR}"/${PN}-3.0-configs.patch
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+
+	# Clean out local libs so we know we use system ones
+	rm -rf lib/{readline,termcap}/*
+	touch lib/{readline,termcap}/Makefile.in # for config.status
+	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}-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
+	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+	epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
+
+	epatch_user
 }
 
-src_compile() {
-	local myconf=
+src_configure() {
+	local myconf=()
+
+	# Force pgrp synchronization
+	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
+	export bash_cv_pgrp_pipe=yes
 
-	# Always use the buildin readline, else if we update readline
-	# bash gets borked as readline is usually not binary compadible
-	# between minor versions.
-	#myconf="${myconf} $(use_with !readline installed-readline)"
-	myconf="${myconf} --without-installed-readline"
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC
 
 	# Don't even think about building this statically without
 	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to use with bugs ;).
+	# don't come crying to us with bugs ;).
 	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf="${myconf} --disable-nls"
+	use nls || myconf+=( --disable-nls )
 
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses
-	myconf="${myconf} --with-curses"
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=6.2
 
-	# Default path is to use /usr/local/..... regardless.  This little
-	# magic will set the default path to /usr/..... and keep us from
-	# worrying about the rest of the path getting out of sync with the
-	# ebuild code.
-	eval $(echo export $(ac_default_prefix=/usr; eval echo $(grep DEBUGGER_START_FILE= configure)))
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
 
-	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	tc-export AR #444070
 	econf \
+		--with-installed-readline=. \
+		--with-curses \
 		$(use_with afs) \
 		$(use_enable net net-redirections) \
 		--disable-profiling \
 		--without-gnu-malloc \
-		${myconf} || die
-	emake || die "make failed"
-
-	if use plugins ; then
-		emake -C examples/loadables all others || die
-	fi
+		$(use_enable readline) \
+		$(use_enable readline history) \
+		$(use_enable readline bang-history) \
+		"${myconf[@]}"
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-
-	dodir /bin
-	mv "${D}"/usr/bin/bash "${D}"/bin/ || die
-	dosym bash /bin/rbash
+	into /
+	newbin bash bash-${SLOT}
 
-	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
+	newman doc/bash.1 bash-${SLOT}.1
+	newman doc/builtins.1 builtins-${SLOT}.1
 
-	sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
-	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+	insinto /usr/share/info
+	newins doc/bashref.info bash-${SLOT}.info
+	dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
 
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die
-	fi
-
-	doman doc/*.1
 	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then
-		mkdir -p "${ROOT}"/etc/bash
-		mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${ROOT}/bin/sh ]]; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${ROOT}"/bin/sh)
-		local tmp=$(emktemp "${ROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${ROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${ROOT}/bin/sh ]]; then
-		ln -sf bash "${ROOT}"/bin/sh
-	fi
 }
diff --git a/app-shells/bash/bash-4.0_p38.ebuild b/app-shells/bash/bash-4.0_p38.ebuild
index ad597ff476ea..793e0b3e1163 100644
--- a/app-shells/bash/bash-4.0_p38.ebuild
+++ b/app-shells/bash/bash-4.0_p38.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p38.ebuild,v 1.5 2012/11/19 22:26:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p38.ebuild,v 1.6 2013/12/22 13:42:06 vapier Exp $
 
-EAPI="1"
+EAPI="4"
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs
 
 # Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/
 PLEVEL=${PV##*_p}
 MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
 MY_P=${PN}-${MY_PV}
 [[ ${PV} != *_p* ]] && PLEVEL=0
-READLINE_VER=6.0
-READLINE_PLEVEL=0 # both readline patches are also released as bash patches
 patches() {
 	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
@@ -31,19 +30,17 @@ patches() {
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)
-	$(patches ${READLINE_PLEVEL} readline ${READLINE_VER})"
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger mem-scramble +net nls plugins vanilla"
+SLOT="${MY_PV}"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="afs mem-scramble +net nls +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
+	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.5
-	!<sys-apps/paludis-0.26.0_alpha5"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -57,37 +54,31 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	cd "${S}"
+}
 
+src_prepare() {
 	# Include official patches
 	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	cd lib/readline
-	[[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER})
-	cd ../..
+
+	# Clean out local libs so we know we use system ones
+	rm -rf lib/{readline,termcap}/*
+	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}-4.0-configure.patch #304901
 	epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
-
-	if ! use vanilla ; then
-		sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
-		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
-		epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
-		epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
-		epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
-		# Log bash commands to syslog #91327
-		if use bashlogger ; then
-			ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-			ewarn "This will log ALL output you enter into the shell, you have been warned."
-			ebeep
-			epause
-			epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
-		fi
-		sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
-	fi
+	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
+	epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
+	epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
+	epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
+	epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
+	sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
+
+	epatch_user
 }
 
-src_compile() {
-	local myconf=
+src_configure() {
+	local myconf=()
 
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762
@@ -99,83 +90,51 @@ src_compile() {
 		-DNON_INTERACTIVE_LOGIN_SHELLS \
 		-DSSH_SOURCE_BASHRC
 
-	# Always use the buildin readline, else if we update readline
-	# bash gets borked as readline is usually not binary compadible
-	# between minor versions.
-	#myconf="${myconf} $(use_with !readline installed-readline)"
-	myconf="${myconf} --without-installed-readline"
-
 	# Don't even think about building this statically without
 	# reading Bug 7714 first.  If you still build it statically,
 	# don't come crying to us with bugs ;).
 	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf="${myconf} --disable-nls"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=6.2
 
 	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses
-	myconf="${myconf} --with-curses"
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
 
-	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	tc-export AR #444070
 	econf \
+		--with-installed-readline=. \
+		--with-curses \
 		$(use_with afs) \
 		$(use_enable net net-redirections) \
 		--disable-profiling \
 		$(use_enable mem-scramble) \
 		$(use_with mem-scramble bash-malloc) \
-		${myconf} || die
-	emake || die "make failed"
-
-	if use plugins ; then
-		emake -C examples/loadables all others || die
-	fi
+		$(use_enable readline) \
+		$(use_enable readline history) \
+		$(use_enable readline bang-history) \
+		"${myconf[@]}"
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	into /
+	newbin bash bash-${SLOT}
 
-	dodir /bin
-	mv "${D}"/usr/bin/bash "${D}"/bin/ || die
-	dosym bash /bin/rbash
+	newman doc/bash.1 bash-${SLOT}.1
+	newman doc/builtins.1 builtins-${SLOT}.1
 
-	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
+	insinto /usr/share/info
+	newins doc/bashref.info bash-${SLOT}.info
+	dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
 
-	sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
-	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die
-	fi
-
-	doman doc/*.1
 	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then
-		mkdir -p "${ROOT}"/etc/bash
-		mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${ROOT}/bin/sh ]]; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${ROOT}"/bin/sh)
-		local tmp=$(emktemp "${ROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${ROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${ROOT}/bin/sh ]]; then
-		ln -sf bash "${ROOT}"/bin/sh
-	fi
 }
diff --git a/app-shells/bash/bash-4.1_p11.ebuild b/app-shells/bash/bash-4.1_p11.ebuild
index 38f99c06d248..bfb4f47bdb67 100644
--- a/app-shells/bash/bash-4.1_p11.ebuild
+++ b/app-shells/bash/bash-4.1_p11.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p11.ebuild,v 1.5 2012/11/19 22:26:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p11.ebuild,v 1.6 2013/12/22 13:42:06 vapier Exp $
 
-EAPI="1"
+EAPI="4"
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs
 
 # Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/
 PLEVEL=${PV##*_p}
 MY_PV=${PV/_p*}
 MY_PV=${MY_PV/_/-}
 MY_P=${PN}-${MY_PV}
 [[ ${PV} != *_p* ]] && PLEVEL=0
-READLINE_VER=6.1
-READLINE_PLEVEL=0 # both readline patches are also released as bash patches
 patches() {
 	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
@@ -32,19 +30,17 @@ patches() {
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)
-	$(patches ${READLINE_PLEVEL} readline ${READLINE_VER})"
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
+SLOT="${MY_PV}"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="afs mem-scramble +net nls +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
+	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -54,32 +50,32 @@ pkg_setup() {
 		eerror "as it breaks LFS (struct stat64) on x86."
 		die "remove -malign-double from your CFLAGS mr ricer"
 	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
 }
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	cd "${S}"
+}
 
+src_prepare() {
 	# Include official patches
 	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	cd lib/readline
-	[[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER})
-	cd ../..
+
+	# Clean out local libs so we know we use system ones
+	rm -rf lib/{readline,termcap}/*
+	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}-4.1-fbsd-eaccess.patch #303411
+	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
+	epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
 
-	if ! use vanilla ; then
-		sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
-		epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
-	fi
+	epatch_user
 }
 
-src_compile() {
-	local myconf=
+src_configure() {
+	local myconf=()
+
+	myconf+=( --without-lispdir ) #335896
 
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762
@@ -89,102 +85,53 @@ src_compile() {
 		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
 		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
 		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Always use the buildin readline, else if we update readline
-	# bash gets borked as readline is usually not binary compadible
-	# between minor versions.
-	#myconf="${myconf} $(use_with !readline installed-readline)"
-	myconf="${myconf} --without-installed-readline"
+		-DSSH_SOURCE_BASHRC
 
 	# Don't even think about building this statically without
 	# reading Bug 7714 first.  If you still build it statically,
 	# don't come crying to us with bugs ;).
 	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf="${myconf} --disable-nls"
+	use nls || myconf+=( --disable-nls )
 
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses
-	myconf="${myconf} --with-curses"
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=6.2
 
-	myconf="${myconf} --without-lispdir" #335896
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
 
-	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	tc-export AR #444070
 	econf \
+		--with-installed-readline=. \
+		--with-curses \
 		$(use_with afs) \
 		$(use_enable net net-redirections) \
 		--disable-profiling \
 		$(use_enable mem-scramble) \
 		$(use_with mem-scramble bash-malloc) \
-		${myconf} || die
-	emake || die "make failed"
-
-	if use plugins ; then
-		emake -C examples/loadables all others || die
-	fi
+		$(use_enable readline) \
+		$(use_enable readline history) \
+		$(use_enable readline bang-history) \
+		"${myconf[@]}"
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-
-	dodir /bin
-	mv "${D}"/usr/bin/bash "${D}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
+	into /
+	newbin bash bash-${SLOT}
 
-	sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
-	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+	newman doc/bash.1 bash-${SLOT}.1
+	newman doc/builtins.1 builtins-${SLOT}.1
 
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
+	insinto /usr/share/info
+	newins doc/bashref.info bash-${SLOT}.info
+	dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
 
-	doman doc/*.1
 	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then
-		mkdir -p "${ROOT}"/etc/bash
-		mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${ROOT}/bin/sh ]]; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${ROOT}"/bin/sh)
-		local tmp=$(emktemp "${ROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${ROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${ROOT}/bin/sh ]]; then
-		ln -sf bash "${ROOT}"/bin/sh
-	fi
 }
diff --git a/app-shells/bash/files/autoconf-mktime-2.53.patch b/app-shells/bash/files/autoconf-mktime-2.53.patch
new file mode 100644
index 000000000000..7632b63f4f79
--- /dev/null
+++ b/app-shells/bash/files/autoconf-mktime-2.53.patch
@@ -0,0 +1,199 @@
+https://bugs.gentoo.org/220040
+
+--- a/configure
++++ b/configure
+@@ -12393,22 +12393,25 @@ else
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ /* Test program from Paul Eggert and Tony Leneis.  */
+-#if TIME_WITH_SYS_TIME
++#ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
+ #else
+-# if HAVE_SYS_TIME_H
++# ifdef HAVE_SYS_TIME_H
+ #  include <sys/time.h>
+ # else
+ #  include <time.h>
+ # endif
+ #endif
+ 
+-#if HAVE_UNISTD_H
++#include <limits.h>
++#include <stdlib.h>
++
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+ 
+-#if !HAVE_ALARM
++#ifndef HAVE_ALARM
+ # define alarm(X) /* empty */
+ #endif
+ 
+@@ -12416,6 +12419,7 @@ else
+ #undef putenv
+ 
+ static time_t time_t_max;
++static time_t time_t_min;
+ 
+ /* Values we'll use to set the TZ environment variable.  */
+ static const char *const tz_strings[] = {
+@@ -12424,9 +12428,9 @@ static const char *const tz_strings[] = {
+ };
+ #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
+ 
+-/* Fail if mktime fails to convert a date in the spring-forward gap.
++/* Return 0 if mktime fails to convert a date in the spring-forward gap.
+    Based on a problem report from Andreas Jaeger.  */
+-static void
++static int
+ spring_forward_gap ()
+ {
+   /* glibc (up to about 1998-10-07) failed this test. */
+@@ -12445,23 +12449,27 @@ spring_forward_gap ()
+   tm.tm_min = 0;
+   tm.tm_sec = 0;
+   tm.tm_isdst = -1;
+-  if (mktime (&tm) == (time_t)-1)
+-    exit (1);
++  return mktime (&tm) != (time_t) -1;
+ }
+ 
+-static void
+-mktime_test (now)
++static int
++mktime_test1 (now)
+      time_t now;
+ {
+   struct tm *lt;
+-  if ((lt = localtime (&now)) && mktime (lt) != now)
+-    exit (1);
+-  now = time_t_max - now;
+-  if ((lt = localtime (&now)) && mktime (lt) != now)
+-    exit (1);
++  return ! (lt = localtime (&now)) || mktime (lt) == now;
+ }
+ 
+-static void
++static int
++mktime_test (now)
++     time_t now;
++{
++  return (mktime_test1 (now)
++	  && mktime_test1 ((time_t) (time_t_max - now))
++	  && mktime_test1 ((time_t) (time_t_min + now)));
++}
++
++static int
+ irix_6_4_bug ()
+ {
+   /* Based on code from Ariel Faigon.  */
+@@ -12474,11 +12482,10 @@ irix_6_4_bug ()
+   tm.tm_sec = 0;
+   tm.tm_isdst = -1;
+   mktime (&tm);
+-  if (tm.tm_mon != 2 || tm.tm_mday != 31)
+-    exit (1);
++  return tm.tm_mon == 2 && tm.tm_mday == 31;
+ }
+ 
+-static void
++static int
+ bigtime_test (j)
+      int j;
+ {
+@@ -12500,8 +12507,39 @@ bigtime_test (j)
+ 	     && lt->tm_wday == tm.tm_wday
+ 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
+ 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
+-	exit (1);
++	return 0;
+     }
++  return 1;
++}
++
++static int
++year_2050_test ()
++{
++  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
++     ignoring leap seconds.  */
++  unsigned long int answer = 2527315200UL;
++
++  struct tm tm;
++  time_t t;
++  tm.tm_year = 2050 - 1900;
++  tm.tm_mon = 2 - 1;
++  tm.tm_mday = 1;
++  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
++  tm.tm_isdst = -1;
++
++  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
++     instead of "TZ=America/Vancouver" in order to detect the bug even
++     on systems that don't support the Olson extension, or don't have the
++     full zoneinfo tables installed.  */
++  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
++
++  t = mktime (&tm);
++
++  /* Check that the result is either a failure, or close enough
++     to the correct answer that we can assume the discrepancy is
++     due to leap seconds.  */
++  return (t == (time_t) -1
++	  || (0 < t && answer - 120 <= t && t <= answer + 120));
+ }
+ 
+ int
+@@ -12515,9 +12553,15 @@ main ()
+      isn't worth using anyway.  */
+   alarm (60);
+ 
+-  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
+-    continue;
+-  time_t_max--;
++  for (;;)
++    {
++      t = (time_t_max << 1) + 1;
++      if (t <= time_t_max)
++	break;
++      time_t_max = t;
++    }
++  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
++
+   delta = time_t_max / 997; /* a suitable prime number */
+   for (i = 0; i < N_STRINGS; i++)
+     {
+@@ -12525,17 +12569,22 @@ main ()
+ 	putenv (tz_strings[i]);
+ 
+       for (t = 0; t <= time_t_max - delta; t += delta)
+-	mktime_test (t);
+-      mktime_test ((time_t) 60 * 60);
+-      mktime_test ((time_t) 60 * 60 * 24);
+-
+-      for (j = 1; 0 < j; j *= 2)
+-        bigtime_test (j);
+-      bigtime_test (j - 1);
++	if (! mktime_test (t))
++	  return 1;
++      if (! (mktime_test ((time_t) 1)
++	     && mktime_test ((time_t) (60 * 60))
++	     && mktime_test ((time_t) (60 * 60 * 24))))
++	return 1;
++
++      for (j = 1; ; j <<= 1)
++	if (! bigtime_test (j))
++	  return 1;
++	else if (INT_MAX / 2 < j)
++	  break;
++      if (! bigtime_test (INT_MAX))
++	return 1;
+     }
+-  irix_6_4_bug ();
+-  spring_forward_gap ();
+-  exit (0);
++  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
diff --git a/app-shells/bash/files/bash-3.0-configs.patch b/app-shells/bash/files/bash-3.0-configs.patch
deleted file mode 100644
index 84e96242d845..000000000000
--- a/app-shells/bash/files/bash-3.0-configs.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- bash-3.0/config.h.in
-+++ bash-3.0/config.h.in
-@@ -197,7 +197,7 @@
- 
- /* System paths */
- 
--#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
-+#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail"
- 
- /* Characteristics of the system's header files and libraries that affect
-    the compilation environment. */
---- bash-3.0/config-bot.h
-+++ bash-3.0/config-bot.h
-@@ -178,4 +178,18 @@
- /******************************************************************/
- 
- /* If you don't want bash to provide a default mail file to check. */
--/* #undef DEFAULT_MAIL_DIRECTORY */
-+/* DP: - don't define a default DEFAULT_MAIL_DIRECTORY, because it
-+ * DP:   can cause a timeout on NFS mounts.
-+ */
-+#undef DEFAULT_MAIL_DIRECTORY
-+
-+/* Force pgrp synchronization
-+ * (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653)
-+ *
-+ * The session will hang cases where you 'su' (not 'su -') and
-+ * then run a piped command in emacs.
-+ * This problem seem to happen due to scheduler changes kernel
-+ * side - although reproduceble with later 2.4 kernels, it is
-+ * especially easy with 2.6 kernels.
-+ */
-+#define PGRP_PIPE 1
---- bash-3.0/config-top.h
-+++ bash-3.0/config-top.h
-@@ -52,14 +52,14 @@
- /* The default value of the PATH variable. */
- #ifndef DEFAULT_PATH_VALUE
- #define DEFAULT_PATH_VALUE \
--  "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
-+  "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
- #endif
- 
- /* The value for PATH when invoking `command -p'.  This is only used when
-    the Posix.2 confstr () function, or CS_PATH define are not present. */
- #ifndef STANDARD_UTILS_PATH
- #define STANDARD_UTILS_PATH \
--  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
-+  "/bin:/usr/bin:/sbin:/usr/sbin"
- #endif
- 
- /* Default primary and secondary prompt strings. */
-@@ -74,14 +74,16 @@
- 
- /* System-wide .bashrc file for interactive shells. */
- /* #define SYS_BASHRC "/etc/bash.bashrc" */
-+#define SYS_BASHRC "/etc/bash/bashrc" /* #26952 */
- 
- /* System-wide .bash_logout for login shells. */
- /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
-+#define SYS_BASH_LOGOUT "/etc/bash/bash_logout" /* #90488 */
- 
- /* Define this to make non-interactive shells begun with argv[0][0] == '-'
-    run the startup files when not in posix mode. */
--/* #define NON_INTERACTIVE_LOGIN_SHELLS */
-+#define NON_INTERACTIVE_LOGIN_SHELLS
- 
- /* Define this if you want bash to try to check whether it's being run by
-    sshd and source the .bashrc if so (like the rshd behavior). */
--/* #define SSH_SOURCE_BASHRC */
-+#define SSH_SOURCE_BASHRC /* #24762 */
diff --git a/app-shells/bash/files/bash-3.0-etc-inputrc.patch b/app-shells/bash/files/bash-3.0-etc-inputrc.patch
deleted file mode 100644
index 204e7978d3c1..000000000000
--- a/app-shells/bash/files/bash-3.0-etc-inputrc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Patch readline's bind.c so that /etc/inputrc is read as a last resort
-following ~/.inputrc.  This is better than putting INPUTRC in
-the environment because INPUTRC will override even after the
-user creates a ~/.inputrc
-
---- bash-3.0/lib/readline/bind.c.agriffis	2004-03-03 22:39:32.000000000 -0500
-+++ bash-3.0/lib/readline/bind.c	2004-08-02 13:53:02.365731918 -0400
-@@ -781,6 +781,7 @@
-      1. the filename used for the previous call
-      2. the value of the shell variable `INPUTRC'
-      3. ~/.inputrc
-+     4. /etc/inputrc
-    If the file existed and could be opened and read, 0 is returned,
-    otherwise errno is returned. */
- int
-@@ -789,17 +790,20 @@
- {
-   /* Default the filename. */
-   if (filename == 0)
-+    filename = last_readline_init_file;
-+  if (filename == 0)
-+    filename = sh_get_env_value ("INPUTRC");
-+  if (filename == 0 || *filename == 0)
-     {
--      filename = last_readline_init_file;
--      if (filename == 0)
--        filename = sh_get_env_value ("INPUTRC");
--      if (filename == 0)
--	filename = DEFAULT_INPUTRC;
-+      /* If there's trouble reading DEFAULT_INPUTRC then fall back to
-+       * the system inputrc
-+       */
-+      filename = DEFAULT_INPUTRC;
-+      if (_rl_read_init_file (filename, 0) == 0)
-+	return 0;
-+      filename = "/etc/inputrc";
-     }
- 
--  if (*filename == 0)
--    filename = DEFAULT_INPUTRC;
--
- #if defined (__MSDOS__)
-   if (_rl_read_init_file (filename, 0) == 0)
-     return 0;
diff --git a/app-shells/bash/files/bash-3.1-bash-logger.patch b/app-shells/bash/files/bash-3.1-bash-logger.patch
deleted file mode 100644
index 4f6df31c455a..000000000000
--- a/app-shells/bash/files/bash-3.1-bash-logger.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Add support for logging bash commands via syslog().
-Useful for deploying in honeypot environments.
-
-http://bugs.gentoo.org/91327
-http://www.nardware.co.uk/Security/html/bashlogger.htm
-
---- bashhist.c
-+++ bashhist.c
-@@ -705,7 +705,7 @@
- {
-   hist_last_line_added = 1;
-   hist_last_line_pushed = 0;
--  add_history (line);
-+  add_history (line, 1);
-   history_lines_this_session++;
- }
- 
---- lib/readline/histexpand.c
-+++ lib/readline/histexpand.c
-@@ -1222,9 +1222,7 @@
- 
-   if (only_printing)
-     {
--#if 0
--      add_history (result);
--#endif
-+      add_history (result, 1);
-       return (2);
-     }
- 
---- lib/readline/histfile.c
-+++ lib/readline/histfile.c
-@@ -262,7 +262,7 @@
- 	  {
- 	    if (HIST_TIMESTAMP_START(line_start) == 0)
- 	      {
--		add_history (line_start);
-+		add_history (line_start, 0);
- 		if (last_ts)
- 		  {
- 		    add_history_time (last_ts);
---- lib/readline/history.c
-+++ lib/readline/history.c
-@@ -31,6 +31,8 @@
- 
- #include <stdio.h>
- 
-+#include <syslog.h>
-+
- #if defined (HAVE_STDLIB_H)
- #  include <stdlib.h>
- #else
-@@ -246,10 +250,23 @@
- /* Place STRING at the end of the history list.  The data field
-    is  set to NULL. */
- void
--add_history (string)
--     const char *string;
-+add_history (string, logme)
-+     const char *string;
-+     int logme; /* 0 means no sending history to syslog */
- {
-   HIST_ENTRY *temp;
-+  if (logme) {
-+    char trunc[600]; /* arbitrary max size of 600 bytes */
-+    if (strlen(string) < sizeof(trunc)) {
-+      syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s",
-+        getpid(), getuid(), string);
-+    } else {
-+      memcpy(trunc, string, sizeof(trunc));
-+      trunc[sizeof(trunc) - 1] = '\0';
-+      syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s(++TRUNC)",
-+        getpid(), getuid(), trunc);
-+    }
-+  }
- 
-   if (history_stifled && (history_length == history_max_entries))
-     {
---- lib/readline/history.h
-+++ lib/readline/history.h
-@@ -80,7 +80,7 @@
- 
- /* Place STRING at the end of the history list.
-    The associated data field (if any) is set to NULL. */
--extern void add_history PARAMS((const char *));
-+extern void add_history PARAMS((const char *, int ));
- 
- /* Change the timestamp associated with the most recent history entry to
-    STRING. */
diff --git a/app-shells/bash/files/bash-3.1-gentoo.patch b/app-shells/bash/files/bash-3.1-gentoo.patch
index 481bc588a3c9..a3a62d108c58 100644
--- a/app-shells/bash/files/bash-3.1-gentoo.patch
+++ b/app-shells/bash/files/bash-3.1-gentoo.patch
@@ -11,19 +11,6 @@ Collection of fixes from mandrake
 -.so bash.1
  .SH SEE ALSO
  bash(1), sh(1)
---- bash-3.1/lib/readline/complete.c
-+++ bash-3.1/lib/readline/complete.c
-@@ -1544,9 +1544,7 @@
-   if (rl_filename_completion_desired)
-     {
-       filename = tilde_expand (text);
--      s = (nontrivial_match && rl_completion_mark_symlink_dirs == 0)
--		? LSTAT (filename, &finfo)
--		: stat (filename, &finfo);
-+      s = stat (filename, &finfo);
-       if (s == 0 && S_ISDIR (finfo.st_mode))
- 	{
- 	  if (_rl_complete_mark_directories /* && rl_completion_suppress_append == 0 */)
 --- bash-3.1/Makefile.in
 +++ bash-3.1/Makefile.in
 @@ -658,7 +658,7 @@