gentoo resync : 30.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
commit: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree: e907cb121b30e3c1df1710719c0ddf4029597a47 /app-shells
parent: db063b515939ab15261136b24e4bc44386335c0c (diff)
35 files changed, 410 insertions, 629 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 471f24270365..f0dbd1e23db0 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index e04232a0f5e6..7c6ce1fce675 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,5 +1,5 @@
 AUX autoconf-mktime-2.53.patch 4812 BLAKE2B 153e7d9d2b57a0946c759545327ba95d64b79ac955fd4da2664b267ffee4766280ed3faf5d4bd3ce916c71ab56eb388b018ad0ddbc3374cbab7eb034ba91d4cc SHA512 52fd04b9ba576ef28a66647307b550e9da074867c2cfd9d517948f3029521d94ca01f3e43b49544ecf6ed1139f8ac4f8beb36470e7e225a65557a6b5fb5348ec
-AUX autoconf-mktime-2.59.patch 4686 BLAKE2B b911b5f7eafabb8e930bc997a25b1fdcfb4a8f223c21a6034e80a635bb0a5d58dc2d1e6cfb3dee09c67a67990a3cf36c998a3b407f390dde6abcb9621bc8be5c SHA512 4ac3951b72fcc50bc90d4fdd6286fc0ce01100d928b51f41043cf7c6f6adaddd7b19bb346bf21f306ce6cbe619750dfe18755c122e3f1a237fb07c02b25594a8
+AUX autoconf-mktime-2.59.patch 4690 BLAKE2B ad0c681d0139c7cdf08c7104621106d84cbdfa5d4e65867e4289088cbcfab5153fbcc30332956f54c876a0b61c841e5da73556039d2cacde00e89280731654e3 SHA512 5d903e598577e4227749580e7aa2d598e58f5aa7ae7cb232c370971da59ce8022b3acd825559a6dbddb44f640d3172d061bf157e424a4942a300d5563eb7d245
 AUX bash-2.05b-destdir.patch 598 BLAKE2B eaf7581e28c74548e4ea421b7ada2e725ea6e835b3ff4badd4b4430dbdd554af7660af3a2a3419513eca7996f95eb886f81b055a168f009ca7960f35c7eed2d2 SHA512 d453ff834c7a4b5b74e395e496493d77f98ec0e1aa1d7cf8ff0d8260b2a0602067da65a18d5dc9dbedc1d79c8b50395dd97f7091a6d55ff0bae52ed1b2b007bd
 AUX bash-2.05b-empty-herestring.patch 667 BLAKE2B d21552652550bfffd50221c074778c5fc54a46385f701654db7714fdedd7aed78a094eca5a7764401c276fa195b6c1bb45002c90fcb661b55ab80a2957bcc2d4 SHA512 311626129c33546b42a16788a566958f15b48aec40989828498ce45c50ffc450c1b3d3413cc7cbaeef44699d64962c968d38dda0ed810cce389b572228221be4
 AUX bash-2.05b-fix-job-warning.patch 341 BLAKE2B 98859dc6cc61f35f05e1446b343a2df727a823c2cc6eb843d135473ca8c250a77660d7d3c4849de4a9e78f56ecf37381897ce091fa9055fec210aecbb0eed8c8 SHA512 5ede03f96f8061d6ea99c473cd8625aedd745b9545a5af4bfa371907a4446e57d8d4d75e934ee38ae6654a0521f203d7e54d7b111e594bd4efff2ab0491b0a20
@@ -8,43 +8,43 @@ AUX bash-2.05b-parallel-build.patch 426 BLAKE2B 621b7a0fc43e4dbcabbdd052e0dc4a79
 AUX bash-2.05b-protos.patch 692 BLAKE2B 2b6d4290a6b94d98d2579eaf3f1fac4229321e7032ef34915128d879c2e4bfdaca57e37702cd8665ffac28bc51e4b2eb3d713a77ca600a833269f26fe44e1551 SHA512 77a5d48d629cd127db6f7163fd9ee4e67c22b92007cb5e9fc9f51c83427f809dd74f176a521a7d8e342127419c872c01e29b921f48cea5cb8e788ff5f51faaa1
 AUX bash-2.05b-rbash.patch 616 BLAKE2B 9c943a1987a3558735aa9d7edfb74a5a0cf6bc8be956194d6457f9e0dae8ff4050e916eabda834a2f418c03327bec2039e11837229815c1bf200dd3ded1b62f2 SHA512 bc4a6132a36b65794843930e34abd199d9c5df7838c49ec3edf47f92e0f09877a31df051689a8267eaadfbb743934c2f4f25ab8a2ca07d1561dd6ec8c337a53f
 AUX bash-3.0-afs.patch 633 BLAKE2B 078765894c95e242feaa2d86f0613989a20b9550f6c29081445107834e60a17be4bd9b048a638bba627763ca0dd239956daef1d167b54193a5e0675b473203d6 SHA512 833515f5b4040ffb7e65b410aa860da73a2bf1d9b4da7ea74ec41581fcb27b0ebafdcbb041abf4c1cebaa3d7b43ee6ea11f7c7ecec5759530ce0184ac6029f3f
-AUX bash-3.0-crash.patch 1191 BLAKE2B 32fcfcc8cea44ecbdc3d574a80ec38eba3886ef45983e64529e6be575a63d4f57c5cf6a6c84754b741b7af190f083b5a326c1afc4025e140bd1fd52133bf22bd SHA512 e9fa172d76e1a3924c4795b7bb26a0487ab50f2d0714178076b6b9f85d7712ffeb4165bd591cac97c4c2288e39fa2bdf3794f29a7f2fd28e2d971041d16ff0a5
+AUX bash-3.0-crash.patch 1144 BLAKE2B ef90dd624da0cadb3cf75ee1d632187e17d845a1bd25d1756142f21b8c4a3fb0706b7a3a18d32e34c25c9bc950c92993bd9193981628e4181a942eb735d57770 SHA512 de2e982af985e07b7425a09afbdf4b70b6f0fa47f9126c5da35636bd1748f28803664ec71c52d15be19e84410e147c8128888a109faeba4d60eb531ecff7890e
 AUX bash-3.0-darwin-conn.patch 969 BLAKE2B 0a2dd39b1a1df5888cf03bc1cf59e17a7b0fc09334a13125ec385849ba21be45638e25c9d375e48db7aff3bba3c1844eae54925e75c937789e88128c39c0fc7a SHA512 cc85dbf39df3289e40ba33626d2a0ad511145ea3cc8dcbed136ad128181022bd70c3a4f7f8e3146bcd027d7999deefefe8496d5eb70ff1a70235950a01f9376f
 AUX bash-3.0-histtimeformat.patch 1784 BLAKE2B 10c9bae29f06832474dbfe038bae5e4b99dce795c7c04360a2813cba2962d86f44af53599d7b4ab3687c0378c9f9d910f4659444caea828c063a368caa9e4a29 SHA512 36ce1afa92707a4c43f212119fb2562fee0f1283bee94d892869611de1f34869b1dcf737746ac1887c1ee8165079bdb4ae6cb353a3cbefdf1cbbffb8b43a23e6
 AUX bash-3.0-jobs.patch 1438 BLAKE2B 1107d79b268df413c6ae03e4522f804f32bda4b9c98199e47eb45a1a4af69e1d31fd043b686cb048b310a3e9e36db46db5eee1574fbb649fe06b9395409f19c0 SHA512 d52b64f989e82f45c0305233333d2b004afb3ceda232a2144a56a21310b91749009d89639e323b4b63dcf92aff27c29d425af7e62ff9de9b164072669693ded0
 AUX bash-3.0-locale.patch 3492 BLAKE2B cec73c4f807172da52406a21cbdbd630449709aab4d51ea5a969065595eb339576cbb456dc62b6c0aae92a888498810c349e88c4abbeebfa355b401c397eeb7a SHA512 c216b5877eb87660f5f3309280b9852917dad50936261d22611fa7a0f5e26a2efb7383fc13884105fd0798c6576f203396f185e8441a14f03067d5aed6e3f6b3
 AUX bash-3.0-manpage.patch 498 BLAKE2B 6e1d4b03fc3f62e6021b0a79ed0955ea268d8fdf384a7211869f6806b891e5516bceabb13f3c044edaf182141bcbaccbdd3e3717bc0ca961023e8b7fa4ef937c SHA512 2492344828ad51d52dc4591b0df9e45e38904f5fc1bc6408b14815cf8809641b218c030cca0d830ddf3b18776bbc99e76aa0035b15e6e966ff1aa0a7914121fd
 AUX bash-3.0-multibyteifs.patch 6099 BLAKE2B 377cfffa517f316ba866e7adcf986dd92b8ef859a6f46a622b97f92694b3e1d5061bf2039c061c0878555f10144fb6e4c81e06b9045697c1587d1e3e5fe2f5ce SHA512 3c0a5e565dc1f0b38172d6417eded435b1d5482eb8d33beb850b53178130e7d08e1cd6051a08aa93c845902c0ad5d688f8a74671222eb269cae6bddf33a99342
-AUX bash-3.0-pgrp-pipe-fix.patch 462 BLAKE2B f9c13a14cbd5d34ca2bfc7838d64df21757527569088c419ee9d123e9338f4f0564d63810d224b133a15e2bddf48709297324fb728e9b0c08d4b694238d1c026 SHA512 9d5e647407fd66a8c285568d6af8a171a8cc327b22c08ed903eb783b8a3978e5117ff1a0f4798550a0e4d519347d7068b548377fb60bcf5eff16dfb92aa11d67
+AUX bash-3.0-pgrp-pipe-fix.patch 410 BLAKE2B f1ce60171c4495aa3c8ff7843b484adecb12962015f17a0a7cceaefccf0494f45691cdd85ee50de145e37ccf9b91bee8134098b7f6e01087d7c96d9f040bda24 SHA512 ee7061bba01c38ebeb8d03828a915e6f21548316dd38af04f33175d1fa464f89526052f849d1e5ed3235924999d6c6e7be89cda69bbfa1cb9c1718d0a6833296
 AUX bash-3.0-protos.patch 1618 BLAKE2B a11aea928e0ec54e239834959714c96c0e3746ad9d8a2941f42bc12b7e257e8077be22e42ed744253871e19a21b2cd4e5ec8008b4e0599f19b2300142f2cd672 SHA512 b129beb6d0e8df83bcd1a2f8a4e56f60fa1d7566355a7ba73cbb4c267f074ce5aa8f5abd5da8bc45529b6101dd3111e3b427d49abe6d64b370704e9608ace099
 AUX bash-3.0-pwd.patch 717 BLAKE2B a834beb35b89f7b058d80fa06710ceb78bdf64214ea5a2a903e7afb6d05cfcd5b4b71f0cc3f3e4e2b9a1b13d10511bf6fd9eb1eaa1c45d224dbe9766dd3598ba SHA512 3766c9efab53754292227c21074e0fa176924956664eaa5d33ef562d14e864ac0c06fe0f03a565b0ade0bcbc0c97ec8a532ee7a31567dcca34cf84978f7ab805
 AUX bash-3.0-rbash.patch 405 BLAKE2B 0e35d1aa7a674c4def64c6dedecfb402fe6842c742f4df77312d4057959b7864e3c79f242bbc15108908e99077c34ed1e3cd63509a814e8f1ddcd31d306d473d SHA512 b247afab23cef742ec48c19012b79da52c1f1386cdc256a237742cc04f9ce64835a42f833b67ac5ed60424672484e6ffb262d5c80e253290062e21ce39357348
-AUX bash-3.0-read-builtin-pipe.patch 689 BLAKE2B 2189d76b5470feb845482e6598b78e78f23f2212f33286ad6dd27d00d687828702b2290bc3941294a1bb312aaab6d409b317064ce7e319ece5f6c529fc7766dc SHA512 f89717f0b33311a491c3e2e80ac75000a7b92f78febf986324a351107b71dafdeda8bdd3d5c292fb82798355fc21d5d562305ea759815a32bc0e7b1772f8c4d3
+AUX bash-3.0-read-builtin-pipe.patch 693 BLAKE2B 1f95af33371236119118d9cc92e0ae86264ca6af110483f619817996b5eb0333e8295ad8a2d09366854ede7ac163bf877cab9eeee1139ced131282f436983559 SHA512 0b06841acc959a9141f2e3072906703ee455501902db91946c1da8c9142dbe4d6d8b1cd06a2ba9eceb840a8229f82d33b61b125167c0e23c5af2a1bddce375fe
 AUX bash-3.0-read-memleak.patch 416 BLAKE2B 4fc13e44b5dcc7a3a76dcdfcc3e2d17904ce9ebc46c88a21b3b7142b1301bdf9518582a81256e582adf468caf0c4d68aa77d5e6e6d66d39b3d152a34512fa1cf SHA512 97361f9e14e2547a67da475a0bfd20c1be70534d745845d4918e98665d4182da231923c8365f881561db63b90d5e40def1f1b7f0bc98016c8d8c2e8aeb4e4407
 AUX bash-3.0-strnlen.patch 4976 BLAKE2B 9cde9d95df2b815071ea7aaafc9f59a98577b1302c76bc643a56d23bcae75e3f75083acfa043bbbd8abbce97b08ed6ae00f7f069c4ec495a966369388984f407 SHA512 390845441ad608d0938ca8ed5f9f06f28e6fe45462864072c19b3af302cc6cdb0a7f4fa9f0ee4dadc3ed19a73e06457044be47ad9c327a81f3de4ed7bb70aaf3
 AUX bash-3.0-subshell.patch 1219 BLAKE2B 2171bb8885dc2a5070cc7138e0999e615fd4982f0fa4a390acc8ef6877cd3ab896d676dfe0c2fc78d0436fa41b6765e159baa2953874257b01523b50d300e8ac SHA512 ede172d08b8220f44ba12f803285192b82a505d4d2549914ef563c66d6f19c3a14acd5af3f30fe096dc6c360e9aef71b89f23c468e55c06e61be19d6ce17a68f
-AUX bash-3.0-trap-fg-signals.patch 641 BLAKE2B d713ee86241c8c2ddd5eb704f6ecbb2dbb0bd43e3eee3520e4749aebf1507438866507f5d68864d30117ed2ccc5e6b42f673e7e0b35f267e4f43f69536c1a9df SHA512 5644591aaaf6a2f5e5fa4d41aa4e26c5d53e2efe6ad5838729a2da709e04c539a4a83325f707269d59b5aa0609130dc888ada0b9ec96fe85536800218de8ad6d
+AUX bash-3.0-trap-fg-signals.patch 645 BLAKE2B 7a317c624463ad226367756ce4a23793e08a287dd6dbaa61bf64dd6ed945c7cbdfbf53732904eb785952a7ee707b45a5baaf631bb4c60a2c4b263420d0dba86f SHA512 ba3677afcf72a9830d1ee2a9d5167204e9881f0002f31cc557be6d0d6b4aa4631e47e98a39620d46118725c27811a79f0bc9dc10adb82c82f2051859fce3cc10
 AUX bash-3.0-ulimit.patch 5226 BLAKE2B 23ce5aee0854df8b19d885d8b51df828dd7d40ba6f67956ada76de6abb590d166e79977f0ce1bdda32937358a0626b21dd37df7c96ef95b064b866829fa8ccca SHA512 1cbf210ceb840a959530506777dc4ffb34862ec6f1bc4b65a68c77c8b1b3ce02168d7283dad8d64e218169125d041a25c4e604c3a4327ceee53f806d77067011
-AUX bash-3.0-volatile-command.patch 512 BLAKE2B 6817f943f165a40c032a31aa3e57b40f3db250baf00349376c9238a252908c86976beea9841e3d5dd09839e5881cbf2d164fba9a2b3365f825560e388f2aad2c SHA512 55511691ed6880d58b54e2ce24d5fe14be2dc1ab8cc3d8ed25068dd8f831202958b7f470b361a294a05c3f202e5df6304cf54978c04dc71e915a959fad218223
+AUX bash-3.0-volatile-command.patch 442 BLAKE2B ade700db1a17f79c029d5d97cf1108c8388f234993465060086a1d53d960ee9450f30376a64547593aa6a787dfd37d5819893cc16e7d1de6345e622ab51d1e8d SHA512 0ffb1a276d83f74c5bf1fbee14d535569e75c3584e1977adc3d92b45123c735b7c5b677c4ff6a6ce5a5faece628eadc66438f3c2ba6e2edbf9d20eac5f6a4154
 AUX bash-3.1-dev-fd-buffer-overflow.patch 557 BLAKE2B ef7874e23012e051673b695a96f8be714834e43f2e282f5591e1b6b50e99edaebce585e784623a8b74a018301fdee3a5bcf425c4c480767d550b2c793c3388fb SHA512 3db03dc6e8c5fd9542788cb84854a0849a0f87ff07e95adf57aaee21c7edcb1293ae47ad8b83e0e0513431ba9826fcb45b847ccd9d87efb32b91ac7fc0cb415e
 AUX bash-3.1-dev-fd-test-as-user.patch 437 BLAKE2B 1a235dc6192e3f9de5779768151b6dba34e57d0eb0875db36001943023d7813facb4cf46916105fca2d64bcba3c3ef325fc265771aad5093b2f048563d03bca5 SHA512 eb9907741b68513c53128221c240a1325735c1ceec2a4ac0df74ed85126404c3347a3d97181ada5b28686e17600653de9dfadfa9985812049de45741c81876b7
 AUX bash-3.1-fix-dash-login-shell.patch 1749 BLAKE2B ae26669a67196265fc301f0372b050bf74386288a128469647c31731aded2e7607c20dc41c1dbe404b423b1f464e646756d770ff7f9bd5974dca75d5f288e29c SHA512 f1ec4e9e6c119cba8d7df35d3cdb53b8bcf990b8577d0488a750dfdbd6781413981d2939ff3995977706ed927284aa0049ce36f64a126d6375fbed1210affb7d
 AUX bash-3.1-protos.patch 1580 BLAKE2B 99a5ed84fc5d3b90a69202e5c7bbeacf96fe15fb202ca0f30d1f8d0b2ab6f511bbc8cb30d94756e7b4b7d9fc764aa61b07b523ba356f4b99ecba6853b0816d7d SHA512 19a17cd5a1f245a46047575670b3f7d2d37d6beb445a9ae3df373d5bc70b19386811fd7c9119a3051b1a39534e60a8b144151c5e95c44eeddf2c899d9e932536
-AUX bash-3.1-ulimit.patch 3736 BLAKE2B 88dff11a0f39cab66801a87831934310863a9f73109e5dec73ae11c20e58173a40039d97123f830d8b44891ac05f583e9c4a7c38eb6266bde03363f30891f521 SHA512 ce92df5cd0b0d98d1c09ad061e56fda0498cc64ee580604a2dab6408347c2a0a6758038f2f6c37092312dd6c82eb99da99119758170d817b913e96b4c24f5d34
+AUX bash-3.1-ulimit.patch 3748 BLAKE2B d5db6fcb27b3618444f968a0a54afcca39f35d990a0c1961cff6666fdbce3ae697fd961eebd3ee2bb540cb9889548f7f5e231e6108e01416cfa03e0d1b500395 SHA512 85cfcc2bbb57b5f13b933a6fcdd8d31b94f9bbcdf6750792297eb72f719f98f69d561a0a7b696ec440a123b762ff5a67e7c4d994d69d93b460219e873155d3c8
 AUX bash-3.2-dev-fd-test-as-user.patch 1104 BLAKE2B bd6c70942fa0f02f02d723c4897b8bf26894e6809d54edface87621dff96b1762e3fb16f81a56a9fe04dc7fe29e982b9762de69db0f5e3af016eb559ba87e775 SHA512 fe4478d4423f7a9cce4af46207e2adcea2de17591c8cbc888695177a0b5efb9ab060d7980f6679ca66f6e99f1fa7b632fea6f002364c588996a4287cc5313689
 AUX bash-3.2-ldflags-for-build.patch 1172 BLAKE2B 8fb65436f504e46639ba959ddb7d7549fca6cfc4aefda0d4e871fcd7575e20dcb36ee3e4f318e20c9106b0b19dd6b2d6d2f3d6cac2b4e04c50d5807287c04906 SHA512 5ee27f6e2f3665ee4de4d47114ae03dc20d8050f1e4496d29796d892f9c96019a5dac8ec5672ba1818c0326d1151969bd03f9466089d6432468bc2cf56a1dd09
 AUX bash-3.2-loadables.patch 5355 BLAKE2B 55f280075d220ea3cff2763951b940ffb1277ddb870eec62f61f4140c8faf3317d5aaa7d4925b11eeadd4df8eace2a39e3f02d12aae5360f68cb6422db7543ad SHA512 8255659ea5737a6edc97c29a772c3b40c634190d869c67ed585e9169d18bba08d625b6a56b8e3abf200fa4798c4ee5d9411807fabed8c123b4afa1fd3d7be50d
-AUX bash-3.2-process-subst.patch 272 BLAKE2B f497396cd0b6c345b0603933579b4c13d5093f50b9b8e6df1f4ef9f3c93e13f9904a67fbdf7d61503e897dfaab12b581e2cb76c75313ce0eaac8004385b96ad9 SHA512 609b093f8f56beaaa1e41a3fc6a2261d302a938df911e2765e819bf71ad3c7da14444ca01f7e655b9bd7b9f08297520e18320c85f16f16425cb2e583e422c6ab
+AUX bash-3.2-process-subst.patch 276 BLAKE2B 1f1656e70542a26944546e10c56395ef16400721f4c105b303795eea5aed7c66bd89d4349b81fac82c3e9c552cc6c452b84e92c32887641a71196de7655ad297 SHA512 f509c469e0cf4da3cc01771af1392cf1f2ad3badfb24df8b6be69d8798013c67ec158be3239bbf31b37c16dbf7dab08b6fc44c47a9d70c90e44e797a8a99c96f
 AUX bash-3.2-protos.patch 1376 BLAKE2B f5205d8d02aafc39fc8834f5fd98c609e14cec54bad3501e492499df1d56f0aad23ef1597e6e90720f420720e6c6d69653f64855724e9ca41b8480f5a835fbad SHA512 38fda9326bc92cdd10b9f4fac91d1ae8b37aca303376f9cbb59376f06136ed6d765421626d253931350e6ce5f6a34de9016eaab862de1deaee20c62d53d017a5
-AUX bash-3.2-session-leader.patch 2098 BLAKE2B d9418c37870dcc8900fbf9110e7e21e676aba2742c01feb36971a8f71925dc68555f4ce62e31f38a68079c1d2d37ef04671684dfb0e34826065af53dab0f327b SHA512 5b2cc930adbb49531971548b57a56cc4a6ba5850ef68f968b566e854e9e419767b1ba95d2186b26d9fe14e06e289f9bb471d39eb7a5f1a04874b0ca98c3e48cb
-AUX bash-3.2-ulimit.patch 449 BLAKE2B f3661f3cb7e198d212dbe7be34c82712a0ca022ef2febfd5af4d0edc59a4339e54abb59ab04e5013f8123729c121c69d630ff49884c2ec363a0d6ca6488c46a0 SHA512 a03a59691c14d16f2b6eb48836c4f292369c7dbc61df3e13c1dcd023fd69618c6a8e4230dc9997701b3c12b208318b0ecaebf3fbeb7d601e0f94a2840a1cd88e
+AUX bash-3.2-session-leader.patch 2021 BLAKE2B c3c92e4c00227329624b31c6f8b6c1b239731069c54d10640120c515c7af10bd90bddc61b8a483943e334a11dbefcaa7fd1574223d35d8f2093ea7c3b223e04e SHA512 ad2a8580ab9895d9be36820c872b97d005167b0424ee1816587155ffdfc3dc43717bbff9a611e3e307fad7529fa351aa40bbd14fa3bf6bb4b3335a8a22df2690
+AUX bash-3.2-ulimit.patch 453 BLAKE2B c8c617e3f0f130aa33d28c859f6c71310695b46aea8e0cdf51cada012f898a903d39571ba4cccdb2c8449cbe0be66ab28efd0a572ad84b17e8295765ab2b5ff9 SHA512 c3c1f9d682e4374f57d1051d17d7342b6fb03844db5240c27a6e4176575f021b56df88556359ae8abd1077373d98f4d1d6cb9ef2536be69b6a6f5b0b06d7d652
 AUX bash-4.0-configure.patch 749 BLAKE2B 4d97e6c343537859068702082dd5ebe8a7abb4ee3de1330b200b04563b84265184f938b8f9bba454b46698b146f44e69c617b0a579c601c392f290bce36722a9 SHA512 b7df205a424c8b345e7ddac0c112b59b473cb1a76350f0b22e002e3e5f2f3594d8350573f8c624835582591a97a518fe62028ec8e3c2ea73a3eeb94872ee7a95
 AUX bash-4.0-ldflags-for-build.patch 512 BLAKE2B 09e617a76b541067b6733dee05b40b023df34ec0610537320e394964b40eb2f6fd47c8e821d333e5f7ae0b5c0e6d4aafdeba8abd330bfb8ccbad19b8d9b0282b SHA512 58298b4f76fdbbcce0c22a90ecd554fd5c5e485260ac8aeedadebfa6b2347c41fe99a1d4d8487e70cfbd7bed075e3efb12736e57516a45e0431821f6f243cd46
 AUX bash-4.0-negative-return.patch 748 BLAKE2B b582bab3822eb5175180e9f5495cd7fe4cdb45b78cb27f9ccadbd0c932808e118b658c0fbe356a2b209ceb4ab4804987449bfc337291b2a82bb1b1ff7fdab1ab SHA512 08bf99a64fafaa5d31c68337c6943c24353dc28b478a0678749dbcd21777c95e911d416f379f03499bbe5bf25edb7a36d35b51ae6b6cdf17f8c767d2cc620092
 AUX bash-4.0-parallel-build.patch 2237 BLAKE2B 883426410c469687cd592a10acc2aaab97dc3a78ad4589bdb06061a1de6a18c65aa50ed032180aa0de8cb9498888e4dc511eb256e1b228a65bd9ec5a80c77b0c SHA512 007ae35eb0f5027fc8f490df0270c52cc36648020aa9be717e548be68c85bf532492ddb6b34df169be4a2b4f788dd89b81d4b2872a26428683b421a9360af2b4
-AUX bash-4.1-fbsd-eaccess.patch 843 BLAKE2B 4cce932e14d37ebc62212a8e6ac7543cf3ce72b31734b51777b785c4af82c32a118282a89208ea441c4e7753ac6fdab54eed4f7a465d09ef52f2ea3b94e363c1 SHA512 9616f7d8461302b1544b7eabc0fa1dc8dd682497b9512b67cb343046ee2baa0598efe7013d6730dc77824179073bd4bb1b4c14da721a72a03e7d9a1b1f2c9dd9
+AUX bash-4.1-fbsd-eaccess.patch 847 BLAKE2B a2a35f4b2563e00e82743057ae45762d480d315662130d9fc386b8922cbc21ccc9d2079a2fd0a880866879be8983e90aea0fcd1a1d1ac918ddeae31ee18301d5 SHA512 336bbd91c7badb6d3a0004224be508f9f98765dd2fb523084330da6e272bd1a88f871e074312b043ea4dc11b1582b75ebf33fa5ec0f1e32ae6b7e37e1ad55a55
 AUX bash-4.1-parallel-build.patch 829 BLAKE2B 9a2b41f426fca028e7ff231b1858f0908f0579db94c8e0bac2fefe2cbbc0c8574d294635e343c16bdc3e3ee9d6e03d6c52f9c107c358e821cee9199507bbe2c8 SHA512 4378b430b5238bccee1d9d368e094bb567481ff551bc1ee3331fb29f9a37e13d833daf56524b9d7a2649549c9ff372a73ba659ac4b5fee93dd584d03149a4db5
-AUX bash-4.2-dev-fd-buffer-overflow.patch 1329 BLAKE2B 884e7632019b8699023487b95e885f4d5387e224c2ef8e82855aaa97d3fb2c7c2344297d5f0062353cb3c46c43cd7065c337d3c9ca489ad0c261339ce5641215 SHA512 677ca63179f208c7fb00803dee407be34e2e5e275d12a355f7fa2c6d80e6fabe28499f657d1c927070dd9e291a0eb7b5c737527c2660eedfdf5109e59636635c
+AUX bash-4.2-dev-fd-buffer-overflow.patch 1255 BLAKE2B 61df074a224f6244d0821b06035040cef7e262bc1f77a7b64476048c9639a32ca471606a49ae2cf8e9d819ec5bc8cc4953be270301654f1e0541d771aec394e5 SHA512 c05a73f96d0c8c6e65d2bda1818bb28d6561f6004f7e1dadbce92a6a475d81169449a891a1d84b264df777253f354b984ffbae63af0e4e7948c04fe5b1c21832
 AUX bash-4.2-execute-job-control.patch 865 BLAKE2B c115ed8a46542b246c4526ecadda73389e95d9e5c1aec51bc43bc6e3d06c1b6196efd00689c3fb279268671aeff8a9039ed09a6f8c860ed408595db41020b4f2 SHA512 c2d45f5e9668a8717137c533ced119315cf03c63fb373e5636c65383a399227e1d2aaef846452a0d3316db20b0b4cc41bde55c9aba2a9a02c1c31462d2273577
 AUX bash-4.2-no-readline.patch 287 BLAKE2B 24d5c367440cdefc0a2e709e32867535e5dc3a617fd1f7b4703f572608385fa864a215aa690e1948db7bd1fdc33b00593ea56d289f98519b95980107194018d3 SHA512 558b6bc3a7588ca83190264c842a0eb79d838ebe8002f3aecf8a4dbbbbfa770a3568e2f35496ab80683c0317f15afbeb5748bd0c0027c7afbcb0419217dd5847
 AUX bash-4.2-parallel-build.patch 4448 BLAKE2B daf719a2fac8e18403401f68f7192a595fc31ab12f968e60d690c7453559b604b6c8d9d18c6973cf12c2f66b347739eeeda36dc611a1a5f420b7f6108a2e5a2a SHA512 44690ed868ed95b7949b21a308f402af64d46873a8eb023f44e3f12381719e66b5c123c75d496ccb3d51b10b7102ae041dc41d55131ff9835757731afb9f7711
@@ -54,9 +54,9 @@ AUX bash-4.3-arrayfunc.patch 439 BLAKE2B 8fd293185d6ebed88788999a671aae6d490ecff
 AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 BLAKE2B 34644cc552d50cfd1db1904164fa69c84a315a8e0b0660bd0377669db532cca6af8f02f8e32d57ea117696f3caaf7a00e765773cf19c840a9aec57b3fd72f99a SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356
 AUX bash-4.3-protos.patch 174 BLAKE2B 02d65bba8a12ab7d280a66d7e292e2ba6eea026fc252d302ee8a167e14bbccb9d3906a75728c9fe617b202ef63649fed13d82ff7407a71ee36baee6e1ad1c944 SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0
 AUX bash-4.4-jobs_overflow.patch 331 BLAKE2B 6897770ef49b5f3def669abaec3d18fd8c799fc54192c4a21a25da6a63390e0ae980cff88e0e8e74987a70c997a4205aa740bb6c7b60aad2dfbe4bcf595d958e SHA512 4b5d5c053b8bdad203a3440c084631fba2df79ccdb9cb0c0c41ece2af749382f4a8b2e9750cf0abff6558c91a5afed477cc1d49fd0911c913fe3d517da9faf42
-AUX bash-4.4-popd-offset-overflow.patch 1069 BLAKE2B b23ce9f427cdf252aebdf7330828074230f9b22b5bb59b712d1b148ecbf73aea78ce4e29d353198235b25fa19c4046405c8ae6eeb7fd1cf299d05b732f7cc37b SHA512 535f61b2e0c6423031520700be423750e9177ec96055be781aee5dbdd01c720c1dbc30fffa73b88464527981193c1c6a74ec4139753ef4f40a5bb0f55c4de61c
+AUX bash-4.4-popd-offset-overflow.patch 995 BLAKE2B b44284ae2fe99126d6866945dab8a229d330980786ca6322f288ac2e0b4f3be92bf36ca0e8b42d712e97be67474a9c83509dbf1d4754dd55d385d752311565cb SHA512 8ee83abda21420e2092e447abc03a6255e1386bc6cf52bf806c02c639407f79291b925923a8a4d54fb0500c521cda674861649224110d5b031dbb8cb2c1a827f
 AUX bash-4.4-set-SHOBJ_STATUS.patch 410 BLAKE2B beddcd4ea00cf6814615896e9842a607280d56086165c38338bfdc8e92922f92219f30419f47dd1bd65939f2a3e48fced612db1332a9ee357465816b4939c678 SHA512 9a723b712279e640396bdaa18f4b5ec48fcbbf253573b0aa1e2e6e2cd9200d8d8a082fb3816154aaff0dd81de2e7a66babbdd682e50e4fc2e93dfaa1af17f04d
-AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd44d1e162511c1aaf272bdb4d4c382e100908c16a17e4bef622134116e153f96f61fae4d7985e58cb881012058250a2e7f5 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0
+AUX bash-4.x-deferred-heredocs.patch 1181 BLAKE2B 3afb0e6d6e9b1220133a862bc44c13a5989c4d21ab456098ee19f8dc8adfd0dfff6c83e3c42fc622487b05a33d614c08e69f400796ff6f1ee9c56c74a94f6867 SHA512 167d6344cef96f2c0e732450c3174c5cd74df822f71c415d145d531fb192fc9c684dcdff1a982b87824becd2bdbdf3fb5ab47dcaa4c7a35905b42d25ad0710aa
 AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999
 AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
@@ -392,15 +392,14 @@ DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46c
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
 DIST bash50-017 6517 BLAKE2B d8ec55e796fa2b17774fdf846c7b24ab1428a1dd94210e0d6b3174f99afe7f9c7f33448e1116c81f43407cb8d95390dd634cb8bd543046699898f471ffd68433 SHA512 d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
 DIST bash50-018 1242 BLAKE2B e5f811ede6938e3b09d2ca658dc2ff2b30d6debed4334369ddf7755992cd1c591188595465552f4b5d0ab7d2d62759ff0b4f14a07466650cde0d25778b26df7c SHA512 cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c
-EBUILD bash-2.05b_p13.ebuild 4600 BLAKE2B 6bf0599ce8ce0885c9e873a512fdd5f6d6afb94ab11098adc72df89946ddb7e291597923dc1dd82ac74d2967e41a05b58caeae34f2e93db1863da30c77954b5d SHA512 a20d87b518ec64acfcebd921a433214755f4a9b278d030deaf7b1c3038013a2daab47b475f560f18c1280a41857e4f84b6d4c813b6cd7f5ced072f3d62b54a69
-EBUILD bash-3.0_p22.ebuild 4733 BLAKE2B debacfdaee9f129e5135f994473e0e135d19360ee085ab15d09e48a560713fc00e7d607af0bdb577c6b870f9c9906bab41ce2361f5c0ab940ac35b7b35a31df7 SHA512 35ce9ba9085fa6eb72f7c9aba4caf32ea95a4d337b0949efb29be4d611d34e0703d33a8b3c1872882f12ca1971cdaef0e63b6d62da3f01cc7804edd1c5cc0c4b
-EBUILD bash-3.1_p23.ebuild 4414 BLAKE2B 54f79841105ae9f31025de47be4eed9a5c823f168a0cbda35a9984231664f9a44141240825b20cbf83b13f55e4ce08febd16a1c6ad4c07268ea7a8156d87169d SHA512 b91f3cb231850c331ba22e8d68df1a235b00799dda1c0579f1bf33192dc3387b3e96e1a0ebb3f73be606748022ee8c77342707184259d0642985d565d21918ba
-EBUILD bash-3.2_p57.ebuild 4521 BLAKE2B 2d33e812093e18fb63ada4a8fe5bc287ee6a99b54d71678e9d88b0b2e8549332c80361e1f5788e644e3aa4e7eb4da71f06453fa14241f86e3bb3d38533cf008e SHA512 5c5c91352b705b340e4e5eeb506f1cd331beb001786b6a4a49c802a30f513480e9b122dcd5842d3a4141e5ce5e75ff01c30bdcb6804ae4f2b13d00cc4ad52b77
-EBUILD bash-4.0_p44.ebuild 4395 BLAKE2B 0d9d0f3ec78ebcdb3de84b35821f32706b422665d18dabd60f56ec3a2f79305a29d83198a6988b2b8ff55d0aff8f4bf6d3a3cfdb2cf769b90d09a4dd83212865 SHA512 3a6b71a0b9994feea21e680b34f1e39332f19753d7e1f158844697f98ec12456adadb8e8646555c327690785e3c9f1333593e98b37b8b1a73155e3f8a95e500e
-EBUILD bash-4.1_p17.ebuild 4129 BLAKE2B 45cdcbdb040da11e2299730d3efbca1d6321f9059589e97131f9f192e6de40cdc4ee6a55857c0763732e25be60a2b1d8361d0e4da637440231180e8729b2d1d4 SHA512 2b2a7e816906f9f09d4b7bb94b215fb8dc7d0fb911a3136fad54c2ebf9a285a31101923721ac835d43a75458e08b2d479bd9cd82cf2e1106f2b6f662804186b0
-EBUILD bash-4.2_p53.ebuild 4319 BLAKE2B 38bbc2970101a2828ed508e7e0ad4574389eeac1867dc963b8a14ddfb74f6f7395ade37b2604391c7745416f99913dec6f663ba95adc623a85157163f265522e SHA512 d11094b1734e9fd63b1bbd174c771fe3a7a48bc1c550fb2283fe4d49d490d63db173216a275840feb4dff229a874d7a80939a8af22b4780feb9e1bc8aa244a31
-EBUILD bash-4.3_p48-r2.ebuild 5617 BLAKE2B 5febb079acc827cab20644f938f9b2526fb6f478c0bbb8d9868db7bf8378fecca1216cb539f857400bcdabde08d34c159f2f32fdcb05e6c059574ca8a366ee3d SHA512 e4ade3179cbffd11e928be37b721d9d42aa29287035efbdae230ac5340173988712aeff3beca1c5a937270f9092b9ceb71589e5e41199b8608503e739c7111f9
-EBUILD bash-4.4_p23-r2.ebuild 5678 BLAKE2B 9d8b60a26838050aa18131b6967c6a196559b9521789d1a82f1ebf8dd42eb6a1ad0c4a0022c4046021aa120b7b3b9dff15c91f0b2ebd601a01d7878cc82bfa31 SHA512 608c289575ba3eeb3417c69557888b317da4b9189551db87a5e3484274201b3a4ceb5c61cec01fdfdd0374d6eb46420eec4471ef46430dfdf56475ac43ea3d35
-EBUILD bash-5.0_p17.ebuild 7303 BLAKE2B b2444276a28b999222cd9010dd59969a0f0d82b688813c93a122fed323653e5e816ca9d5b59e064f25b089732c41fa00d075f80e0b423147c08f93f736e4e75c SHA512 5c8280ff54b2c1ae1b0b16e56c898ea41bdb49cd8d2dc89806c6b878d9f43cb7a4c7d40d2793713fe21f90f0afc9613f28a0dd767824963c9893879db438e722
-EBUILD bash-5.0_p18.ebuild 7303 BLAKE2B b2444276a28b999222cd9010dd59969a0f0d82b688813c93a122fed323653e5e816ca9d5b59e064f25b089732c41fa00d075f80e0b423147c08f93f736e4e75c SHA512 5c8280ff54b2c1ae1b0b16e56c898ea41bdb49cd8d2dc89806c6b878d9f43cb7a4c7d40d2793713fe21f90f0afc9613f28a0dd767824963c9893879db438e722
+EBUILD bash-2.05b_p13.ebuild 4543 BLAKE2B 3b70f93aa3e5f59b52bab0568923a077d6fc4ec5abef0ea282a18386e2b2d85af29654060d041b8ba9cc2b568641828c81da0ea4f0455dc92f0748c4901e52ac SHA512 51baa538e499d80534cd0f91df750a21dd0c3350b69ec4903b8224fdb95c980086afb7083577cccbc91fd8695d3ba1dd4a2c556f70dafd98ab6812a3cf13b231
+EBUILD bash-3.0_p22.ebuild 4617 BLAKE2B d04481c86ae777b3bb13668fa2405aa572328a123448fc66145a6175684d1fc78c2bf9b61edcd30e041983c35d16d7c89fc1fb53489b3e2e673610be2ea5e7a2 SHA512 4e5a298caf873b57c73eb246f5ff5060a953618476fa8ad1511890140314b9462402bac42c2fd8f92ad7988d88189a36eb9ca5b368d02eed1484ef9d6c22d9dc
+EBUILD bash-3.1_p23.ebuild 4360 BLAKE2B 96ca1523842d6d754c8a488ba097090e1e98e625edf4959858aab84cac4d2a9bd9f9da1a9d427d8faa1c9fdc1e1747e78b9d8b49e1cae55824ee207423ba366f SHA512 a37842aeb9a612fc61709b8a5a7865129f5e90c4280d3f978995e2e427ac060179ece6db51dfb3363a9e02960e0ea9b0a3b1858adc92f313741879f37ca4e98f
+EBUILD bash-3.2_p57.ebuild 4453 BLAKE2B 386e7e9ce25c91baef153b1cb1d91fcfea2e17f7c6e83a12f2067bd7016efe9eb9a96cf47969326d5ab37f223da53d81c3e9d0193132db6172ddf41aa69447b7 SHA512 7b39f55c82daaa4cb88a047a6bf5ad01052e562e0f1530c64fa20371ef4ffd029cc7fea18e4b00e34685a1804ff07f1dbc1ad904c973007e8508fb7df2d194ed
+EBUILD bash-4.0_p44.ebuild 4369 BLAKE2B c9557ce8780b6f47f47ddf139345a7f9d062ff00dc71a4fec46d4d021a8d95897592dc24d4eae38c0773373353da5d5573fba04f30d67f457b56fad5d0580bb6 SHA512 90d80a8e29b87f6c94aad029297110e7e4a96e2e1698842b4ee366c3249b71db7229f2b414f8b69f93fbe8890ab03b2c0f63308c0ef04cf0fa63a79f7c07be28
+EBUILD bash-4.1_p17.ebuild 4124 BLAKE2B d17c74fda8b0a75402c8271d9e32ae05e7bca330c3bbad340b3945d6dbbcc88eb71d998efc9646e843e24cba2e1f5e04e3e5fa4000d7621dcda29c62c241d650 SHA512 fad7de090214845eb1449b1c79cb14bda73c1e1dad86d6d12d49aa437748015faa45b55438afe2bcd8a6414a04bd4cd30d9c73fb9c97acd51b4b05f9f1192940
+EBUILD bash-4.2_p53.ebuild 4307 BLAKE2B 25b0d8fedf6e27496188b6a9f6ec9a5c07777c2e2578339fbe88c6f992e29c9d35ba9d68b1cd9bbd76b7efc50c5b3e62bc541d5a29736acdd99944a7b811e506 SHA512 84b05e0ca648b0aada8bb8b0ff17f65ee95dd56651d8be9c282280bda304ac8ec40a4057e957df746a8c187cf7f4a93c6fe8dd09e7bdc1b9fee9b6f4f64f4fb8
+EBUILD bash-4.3_p48-r2.ebuild 5591 BLAKE2B b4bce2b54f7bf77f4c1a3d7590cd3935b1b8ce0d27412edb4e4a27157fee436da2370b3d5e470d6e95687db88e2e07d8be1a9b320dbdd87ac0ca9e73ab2eca0e SHA512 d290cf92a469b5d6d8b2f92822598c28233a190e78a8fb6e315b9937e0da87d2ce98c9e258aa16c6d5b663983861554391e1d56a4eafc565dd9a38053402d4ca
+EBUILD bash-4.4_p23-r2.ebuild 5701 BLAKE2B 260e42ee211a70c51beed56ba3d35b087bc9017e03a9a9dbd3440a9c4bd8edbc1147c9e9e917f7ecaef81b02486641312441aa14908aa538923781233771ca9d SHA512 81d05faecefa75068c0f6a870a1be657395090f94210ac4b3328823092cc4bb582b2fe005282e5fa0c008206b42ffefeb8ddde4ae05a436c6161a89fb42c65dc
+EBUILD bash-5.0_p18.ebuild 7326 BLAKE2B 11b8ec26218f4437c8374b38fbc9c298ddb1e89aafa63d62033168c0deae14e0dab52e9fd0744f4332d640effff1ef66629ff161037ca4cb2284b4dd9290adfd SHA512 0021573137611e44aded1226e00a492786fe26a7e0131bcc57f4be3a3ad554b660468944709a75a15a431fa9625f989430c9eeda504706f640abe8c8782f8305
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index f5a44266db77..9c9eb79db32a 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -43,7 +43,19 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.05b-destdir.patch
+	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	"${FILESDIR}"/${PN}-2.05b-protos.patch
+	"${FILESDIR}"/${PN}-2.05b-empty-herestring.patch
+	"${FILESDIR}"/${PN}-2.05b-rbash.patch #26854
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-2.05b-jobs.patch
+	"${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,28 +71,28 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(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
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/${PN}-2.05b-destdir.patch
-	epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
-	epatch "${FILESDIR}"/${PN}-2.05b-protos.patch
-	epatch "${FILESDIR}"/${PN}-2.05b-empty-herestring.patch
-	epatch "${FILESDIR}"/${PN}-2.05b-rbash.patch #26854
-	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	epatch "${FILESDIR}"/${PN}-2.05b-jobs.patch
-	epatch "${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
-	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		--without-gnu-malloc
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# Force pgrp synchronization
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -118,18 +130,7 @@ src_configure() {
 	# This old autoconf script does not re-exec itself properly and fails when
 	# /bin/sh is not bash.  Rather than try to regen everything, just force the
 	# use of bash directly.
-	CONFIG_SHELL="/bin/bash" \
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		--without-gnu-malloc \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	CONFIG_SHELL="/bin/bash" econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index cfd3e4195cb0..6437d45fb536 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -43,7 +43,22 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	"${FILESDIR}"/${PN}-3.0-protos.patch
+	"${FILESDIR}"/${PN}-3.0-rbash.patch #26854
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124
+	# read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
+	"${FILESDIR}"/${PN}-3.0-{afs,crash,jobs,manpage,pwd,ulimit,histtimeformat,locale,multibyteifs,subshell,volatile-command}.patch
+	"${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
+	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+	"${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
+	"${FILESDIR}"/${PN}-3.0-strnlen.patch
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,36 +74,28 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(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
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
-	epatch "${FILESDIR}"/${PN}-3.0-protos.patch
-	epatch "${FILESDIR}"/${PN}-3.0-rbash.patch #26854
-	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	epatch "${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124
-	# read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
-	for i in afs crash jobs manpage pwd ulimit histtimeformat \
-	         locale multibyteifs subshell \
-	         volatile-command
-	do
-		epatch "${FILESDIR}"/${PN}-3.0-${i}.patch
-	done
-	epatch "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
-	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	epatch "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
-	epatch "${FILESDIR}"/${PN}-3.0-strnlen.patch
-	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		--without-gnu-malloc
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# Force pgrp synchronization
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -123,17 +130,7 @@ src_configure() {
 	# 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 \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index 05a7f9dd6087..ad1a7e46c428 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # 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}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -43,7 +43,19 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-3.1-protos.patch
+	"${FILESDIR}"/${PN}-3.1-ulimit.patch
+	"${FILESDIR}"/${PN}-3.0-read-memleak.patch
+	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+	"${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch #118257
+	"${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,28 +71,28 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(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
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	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}"/${PN}-3.1-fix-dash-login-shell.patch #118257
-	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
-	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		--without-gnu-malloc
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# Force pgrp synchronization
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -115,17 +127,7 @@ src_configure() {
 	# 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 \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 1c31b22879b6..f555e3f03de1 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit 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}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -43,7 +43,21 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/autoconf-mktime-2.59.patch #220040
+	"${FILESDIR}"/${PN}-3.2-loadables.patch
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-3.2-protos.patch
+	"${FILESDIR}"/${PN}-3.2-session-leader.patch #231775
+	"${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
+	"${FILESDIR}"/${PN}-3.2-process-subst.patch
+	"${FILESDIR}"/${PN}-3.2-ulimit.patch
+	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+	"${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
+	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,30 +73,28 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(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
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # 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.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-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 "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		--without-gnu-malloc
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# Force pgrp synchronization
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -117,17 +129,7 @@ src_configure() {
 	# 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 \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index a3dd97b7f88c..560929519b51 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # 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}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -43,7 +43,18 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-configure.patch #304901
+	"${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
+
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
+	"${FILESDIR}"/${PN}-4.0-negative-return.patch
+	"${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
+	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,28 +70,32 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(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
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # 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
-	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
-	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	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
-	epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
-	sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
-
-	epatch_user
+	default
+
+	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c || die # needs fpurge() decl
+	sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in || die #267613
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--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)
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
@@ -111,18 +126,7 @@ src_configure() {
 	# 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 \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index bf95280c8391..9c68ac62d283 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # 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}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -43,7 +43,14 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
+
+	"${FILESDIR}"/${PN}-4.1-parallel-build.patch
+	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,23 +66,31 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(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
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # 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
-	epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+	default
 
-	epatch_user
+	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c || die # needs fpurge() decl
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--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)
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	myconf+=( --without-lispdir ) #335896
 
@@ -108,18 +123,7 @@ src_configure() {
 	# 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 \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 000f5397f9cd..1e566e163edc 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -40,12 +40,20 @@ LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
 	nls? ( virtual/libintl )
 	readline? ( >=sys-libs/readline-6.2[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-# we only need yacc when the .y files get patched (bash42-005)
 DEPEND="${RDEPEND}
-	virtual/yacc
 	static? ( ${LIB_DEPEND} )"
+# we only need yacc when the .y files get patched (bash42-005)
+BDEPEND="virtual/yacc"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
+	"${FILESDIR}"/${PN}-4.2-parallel-build.patch
+	"${FILESDIR}"/${PN}-4.2-no-readline.patch
+	"${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
+	"${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -61,28 +69,33 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(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
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
-	epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-4.2-no-readline.patch
-	epatch "${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
-	epatch "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
+	touch -r . doc/* || die
 
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--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)
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
@@ -113,18 +126,7 @@ src_configure() {
 	# 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 \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index 97bf26b8e8fc..d535737ea7ee 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit flag-o-matic toolchain-funcs multilib
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -46,7 +46,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2:0=
 RDEPEND="${DEPEND}
 	!<sys-apps/portage-2.1.6.7_p1"
 # we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
+BDEPEND="virtual/yacc"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
@@ -55,7 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.4-popd-offset-overflow.patch #600174
 )
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -75,26 +75,36 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
 
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
+	touch -r . doc/* || die
 
-	epatch "${PATCHES[@]}"
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		$(use_enable mem-scramble)
+		$(use_with mem-scramble bash-malloc)
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
@@ -145,19 +155,7 @@ src_configure() {
 			configure || die
 	fi
 	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {
diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
index 645851b12aff..518e64ef49f9 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
+inherit flag-o-matic toolchain-funcs multilib prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 is_release() {
 	case ${PV} in
 	*_alpha*|*_beta*|*_rc*) return 1 ;;
@@ -19,7 +19,7 @@ is_release() {
 }
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -58,7 +58,7 @@ RDEPEND="
 	${DEPEND}
 "
 # we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
+#BDEPEND="virtual/yacc"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -87,8 +87,8 @@ src_prepare() {
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
 
@@ -97,7 +97,7 @@ src_prepare() {
 
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
+	touch -r . doc/* || die
 
 	eapply_user
 }
diff --git a/app-shells/bash/bash-5.0_p17.ebuild b/app-shells/bash/bash-5.0_p17.ebuild
deleted file mode 100644
index c40437fdc3a0..000000000000
--- a/app-shells/bash/bash-5.0_p17.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-is_release() {
-	case ${PV} in
-	*_alpha*|*_beta*|*_rc*) return 1 ;;
-	*) return 0 ;;
-	esac
-}
-[[ ${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
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.0"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
-	${DEPEND}
-"
-# we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-history-append.patch
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-)
-
-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
-	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
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		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
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--disable-profiling
-		--with-curses
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# 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+=( --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=${READLINE_VER%%_*}
-
-	# 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 :(.
-
-	if is_release ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					dodoc ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/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 "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index c40437fdc3a0..37017ab29296 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
+inherit flag-o-matic toolchain-funcs multilib prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 is_release() {
 	case ${PV} in
 	*_alpha*|*_beta*|*_rc*) return 1 ;;
@@ -19,7 +19,7 @@ is_release() {
 }
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	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 " "$@")
@@ -58,7 +58,7 @@ RDEPEND="
 	${DEPEND}
 "
 # we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
+#BDEPEND="virtual/yacc"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -90,8 +90,8 @@ src_prepare() {
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
 
@@ -100,7 +100,7 @@ src_prepare() {
 
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
+	touch -r . doc/* || die
 
 	eapply -p0 "${PATCHES[@]}"
 	eapply_user
diff --git a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch
index 3ac3ad1da867..33055a7be61a 100644
--- a/app-shells/bash/files/autoconf-mktime-2.59.patch
+++ b/app-shells/bash/files/autoconf-mktime-2.59.patch
@@ -1,6 +1,6 @@
 http://bugs.gentoo.org/220040
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -5299,26 +6059,25 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
diff --git a/app-shells/bash/files/bash-3.0-crash.patch b/app-shells/bash/files/bash-3.0-crash.patch
index 984e85d82ed3..38577e2a67ea 100644
--- a/app-shells/bash/files/bash-3.0-crash.patch
+++ b/app-shells/bash/files/bash-3.0-crash.patch
@@ -14,8 +14,8 @@
 
 Thanks for the report.  Here's a quick fix:
 
-*** arrayfunc.c~	Sat Nov  6 15:08:29 2004
---- arrayfunc.c	Mon Jan 31 11:56:21 2005
+*** a/arrayfunc.c
+--- b/arrayfunc.c
 ***************
 *** 709,713 ****
   	  return ((char *)NULL);
diff --git a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
index 35b0b7d05924..46df6213b7a4 100644
--- a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
+++ b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
@@ -6,8 +6,8 @@ http://bugs.gentoo.org/92349
 
 Patch from upstream
 
-*** jobs.c  Wed Sep  8 11:08:16 2004
---- jobs.c      Thu Jun 30 17:21:26 2005
+*** a/jobs.c
+--- b/jobs.c
 ***************
 *** 3456,3459 ****
 --- 3901,3907 ----
diff --git a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
index 466e45ae3004..0b90cc3dc2b2 100644
--- a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
+++ b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
@@ -7,8 +7,8 @@ http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00168.html
 http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00173.html
 http://bugs.gentoo.org/show_bug.cgi?id=87093
 
---- builtins/read.def
-+++ builtins/read.def
+--- a/builtins/read.def
++++ b/builtins/read.def
 @@ -276,7 +276,7 @@
    input_is_tty = isatty (fd);
    if (input_is_tty == 0)
diff --git a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
index cde18326ed2d..c7010511853f 100644
--- a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
+++ b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
@@ -2,8 +2,8 @@ Don't barf on handled signals inside of scripts.  Makes for nicer output.
 
 patch by Martin Schlemmer <azarah@gentoo.org>
 
---- jobs.c
-+++ jobs.c
+--- a/jobs.c
++++ b/jobs.c
 @@ -2893,11 +2893,11 @@
  		}
  	      else if (IS_FOREGROUND (job))
diff --git a/app-shells/bash/files/bash-3.0-volatile-command.patch b/app-shells/bash/files/bash-3.0-volatile-command.patch
index 8b89b35914b1..87b9f25ffc21 100644
--- a/app-shells/bash/files/bash-3.0-volatile-command.patch
+++ b/app-shells/bash/files/bash-3.0-volatile-command.patch
@@ -4,8 +4,8 @@ Ripped from Debian
 #     being optimized away as dead code.  In reality, the use of setjmp/longjmp
 #     makes it not dead code at all.
 
---- eval.old	2003-12-18 23:44:15.000000000 -0500
-+++ eval.c	2005-10-03 01:59:31.000000000 -0400
+--- a/eval.c
++++ b/eval.c
 @@ -63,7 +63,7 @@
  reader_loop ()
  {
diff --git a/app-shells/bash/files/bash-3.1-ulimit.patch b/app-shells/bash/files/bash-3.1-ulimit.patch
index 432fb54966b8..8c2474825cf1 100644
--- a/app-shells/bash/files/bash-3.1-ulimit.patch
+++ b/app-shells/bash/files/bash-3.1-ulimit.patch
@@ -3,8 +3,8 @@ Ripped from Fedora
 Add support for RLIMIT_NICE/RLIMIT_RTPRIO and add missing documentation
 for many other options
 
---- builtins/ulimit.def
-+++ builtins/ulimit.def
+--- a/builtins/ulimit.def
++++ b/builtins/ulimit.def
 @@ -24,7 +24,7 @@
  $BUILTIN ulimit
  $FUNCTION ulimit_builtin
@@ -58,8 +58,8 @@ for many other options
  #ifdef RLIMIT_STACK
    { 's',	RLIMIT_STACK, 1024,	"stack size",		"kbytes" },
  #endif
---- doc/bashref.texi
-+++ doc/bashref.texi
+--- a/doc/bashref.texi
++++ b/doc/bashref.texi
 @@ -3833,7 +3833,7 @@
  @item ulimit
  @btindex ulimit
@@ -89,8 +89,8 @@ for many other options
  @item -s
  The maximum stack size.
  
---- doc/bash.1
-+++ doc/bash.1
+--- a/doc/bash.1
++++ b/doc/bash.1
 @@ -8490,7 +8490,7 @@
  returns true if any of the arguments are found, false if
  none are found.
diff --git a/app-shells/bash/files/bash-3.2-process-subst.patch b/app-shells/bash/files/bash-3.2-process-subst.patch
index bd0b3f4e1792..94877c62b316 100644
--- a/app-shells/bash/files/bash-3.2-process-subst.patch
+++ b/app-shells/bash/files/bash-3.2-process-subst.patch
@@ -1,7 +1,7 @@
 Fix process substitution on BSD
 
---- execute_cmd.c
-+++ execute_cmd.c
+--- a/execute_cmd.c
++++ b/execute_cmd.c
 @@ -2672,6 +2672,7 @@
  
  	  do_piping (pipe_in, pipe_out);
diff --git a/app-shells/bash/files/bash-3.2-session-leader.patch b/app-shells/bash/files/bash-3.2-session-leader.patch
index 82f7d9806333..2e9286f34d40 100644
--- a/app-shells/bash/files/bash-3.2-session-leader.patch
+++ b/app-shells/bash/files/bash-3.2-session-leader.patch
@@ -7,8 +7,8 @@ condition.  A result is that the child can then not then execute some commands
 (like stty) from its init script (e.g. .bashrc).  The result I (and others)
 have seen is that the bash shell will hang while reading the init script.
 
-*** jobs.c.20080704	2008-07-10 15:14:13.000000000 -0400
---- jobs.c	2008-07-10 15:17:59.000000000 -0400
+*** a/jobs.c
+--- b/jobs.c
 ***************
 *** 266,269 ****
 --- 266,270 ----
diff --git a/app-shells/bash/files/bash-3.2-ulimit.patch b/app-shells/bash/files/bash-3.2-ulimit.patch
index a0975cb6e9a8..19ea7e6e5e33 100644
--- a/app-shells/bash/files/bash-3.2-ulimit.patch
+++ b/app-shells/bash/files/bash-3.2-ulimit.patch
@@ -1,7 +1,7 @@
 add missing docs for -e and -r options
 
---- builtins/ulimit.def
-+++ builtins/ulimit.def
+--- a/builtins/ulimit.def
++++ b/builtins/ulimit.def
 @@ -24,7 +24,7 @@
  $BUILTIN ulimit
  $FUNCTION ulimit_builtin
diff --git a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
index 576a8a47a619..3c5b5dd98d9b 100644
--- a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
+++ b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
@@ -4,8 +4,8 @@ executable files when run by root on FreeBSD.
 See http://bugs.gentoo.org/303411
 
 Patch from Johan Hattne <johan.hattne@utsuthwestern.edu>
---- lib/sh/eaccess.c.orig
-+++ lib/sh/eaccess.c
+--- a/lib/sh/eaccess.c.orig
++++ b/lib/sh/eaccess.c
 @@ -198,11 +198,19 @@
       char *path;
       int mode;
diff --git a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
index bef960ab980c..d50c269b7e71 100644
--- a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
+++ b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
@@ -20,8 +20,8 @@ buffer to avoid buffer overflow.
 
 Patch (apply with `patch -p0'):
 
-*** ../bash-4.2-patched/lib/sh/eaccess.c	2011-01-08 20:50:10.000000000 -0500
---- lib/sh/eaccess.c	2012-06-04 21:06:43.000000000 -0400
+*** bash-4.2/lib/sh/eaccess.c
+--- bash-4.2/lib/sh/eaccess.c
 ***************
 *** 83,86 ****
 --- 83,88 ----
diff --git a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
index c6ef19d03f5a..cc6b622eca34 100644
--- a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
+++ b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
@@ -1,8 +1,8 @@
 https://bugs.gentoo.org/600174
 https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00099.html
 
-*** ../bash-4.4-patched/builtins/pushd.def	2016-01-25 13:31:49.000000000 -0500
---- builtins/pushd.def	2016-10-28 10:46:49.000000000 -0400
+*** bash-4.4/builtins/pushd.def
+--- bash-4.4/builtins/pushd.def
 ***************
 *** 366,370 ****
       }
diff --git a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
index 698d277a3db5..c6a6de44d36d 100644
--- a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
+++ b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
@@ -3,8 +3,8 @@ http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
 
 fix heredocs handling in `set` output
 
-*** ../bash-4.1-patched/print_cmd.c	2009-09-16 15:32:26.000000000 -0400
---- print_cmd.c	2010-03-22 21:15:30.000000000 -0400
+*** bash-4.1/print_cmd.c
+--- bash-4.1/print_cmd.c
 ***************
 *** 114,117 ****
 --- 114,123 ----
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index c10e4582fb8e..a14ddc199dc5 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,5 +1,5 @@
 DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72
 DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4
 EBUILD dash-0.5.11.1.ebuild 1521 BLAKE2B 4c5f48602cf369d52316295260aee45ae5a7fcfcc83d4323db37b97dc1c040601a8cd5a52b9bae1c60f4f6f89d8294a56c73344d18a6b09a16db4e2dd7867863 SHA512 dca19866abb5ecee64b869e36a588b9b96a5304753fc8cffe556559b4823549b4816fd6a59d019829a187b4a1c9ea5108b970a503a8cf304a09d081b8c1f3abe
-EBUILD dash-0.5.11.2.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
+EBUILD dash-0.5.11.2.ebuild 1581 BLAKE2B 243f8799b9d9880dc5c509c7e6cb46118dda935ca3de82ff1719df58bd543a1a8c568984e60e6a5ff7fcc90913e7bc65ced4a8fc4eb2af689c8a1c431ec21c14 SHA512 0aea111fb42467fdd55f154901ffa0e6de882c636922f6dd5f0a4ce88b0bfdb538be1657f2bc3f6080fe1f681003427aa7d262bbc09340e7228c4d306fec3278
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild
index 9482c8379d58..1d6d3b324589 100644
--- a/app-shells/dash/dash-0.5.11.2.ebuild
+++ b/app-shells/dash/dash-0.5.11.2.ebuild
@@ -32,9 +32,10 @@ src_prepare() {
 }
 
 src_configure() {
-	# don't redefine stat on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
+		# don't redefine stat, open, dirent, etc. on Solaris
 		export ac_cv_func_stat64=yes
+		export ac_cv_func_open64=yes
 
 		# if your headers strictly adhere to POSIX, you'll need this too
 		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index 374971973787..ba920f4cadd7 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1,5 +1,6 @@
 AUX 2.7-ldflags.patch 837 BLAKE2B a1a873a898f3090dab586b968a755e1920ab20158237b9f375a9da2df18d87ba0b3cdf2f671a02ec3163f1ee95436a0c0537b2f7fccc0f8326f1fe25fdcc73c3 SHA512 85872900eeb44e46685b9a229bddd569d06d131ba4c187b44ee916a8ae1e705e10a47b87432c36d855021a0e0e3880c5fe80279a9694ac42f473a06ef3a33565
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
 EBUILD powerline-2.7-r1.ebuild 743 BLAKE2B bd93e5352b00bd1bd73db6e5dc7d6ee85e0f4d30ec05e7b62d54ef79d7ba368a8d560b2d008cb6476716f19133614aea9a6eaf52ec3cd6aa126462c87d4a5bbd SHA512 c967665b40de94391df7a9e33cc20371fc7d2146865d63ec6c9bbb4a6ca0441e8bf16fd09aed8ff28451821471df7853aa8f3a21c3aaf6e4fd74a6abe49757a4
+EBUILD powerline-2.7-r2.ebuild 745 BLAKE2B 1bbe903317cd5777cf3fd949d996e1d5c91fadf4162df2bdd500330ae30a78363a066dd434fdd3e1286723d967128e5d9fc96d7f4c578daea6cbded150d7c871 SHA512 a94f981b1459f581a012cb4fa707a60ac17dd230ed39368fa1387cc91b9227042523c21f39adc5bd560e173ab3765e0ade11677f7a92706e5a4fe7440e0be7da
 EBUILD powerline-9999.ebuild 730 BLAKE2B 5d75497b2323d373e00df5deabaa205d6286363f4181f409e8cecaf614b0bb7ed4c3b624b61fe54f5d94c27307cdf97bd69109e8ba508b62e76a1c9693428bdf SHA512 c08cdb58cc2b88a88860eefdcc03a7894b4bf2765ff0ed23cf257c36c4436e8153ed336838c13035e21334c7571452bb48f4d098b60047100a4add9fd88b1a34
 MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/powerline-2.7-r2.ebuild b/app-shells/powerline/powerline-2.7-r2.ebuild
new file mode 100644
index 000000000000..27ced1c237a2
--- /dev/null
+++ b/app-shells/powerline/powerline-2.7-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="The ultimate statusline/prompt utility."
+HOMEPAGE="https://github.com/powerline/powerline"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/powerline/powerline"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-status/${PN}-status-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+S="${WORKDIR}/${PN}-status-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/2.7-ldflags.patch
+)
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index d0bb576cfd97..09e9aaaa1006 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,5 +1,5 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
 DIST quoter-4.2.tar.gz 11128 BLAKE2B 6b13a8eabae57c50c12dcbf9a65e28990ee6d74ee2c45c4a6127f5ed98c2ae029fd5d00f82444c46ab6a21057c6279e9f3d19c432f921d04ca3bf3eaa9507cb0 SHA512 0080ae6d5f5308b9e2f9e414619049f10246c221a9524f9f0dc0d329af3592694ae9d6ef6a086615b895c5f6598fbed7ec7164b5a847d11108fbe3687316c02d
 EBUILD quoter-3.0_p2-r1.ebuild 759 BLAKE2B 834746ed908c95f45f09c08e4a93a1e0a054b606628f79a10a48be823660cc73ff2f4157d51438ffb2ac92f6e0fb48559db69025832a994029448b6e6816973d SHA512 8da8ce840b416bfa2ce03e653e33d0ca06dec49b6a43016ef69a164c95b1ac54650e6e4b88432e888536b8e2a2b27c2620dd4dfd5219f028460e7b979051c447
-EBUILD quoter-4.2.ebuild 768 BLAKE2B d8824eb44ad83bdcc0630f983f7b2db41af9769c950effd75544dfa492782abe4f3ed02e8ccf7acf5cff69ca4b506c531bcf0391d399fd3fbcba73c7aa8306cb SHA512 0d71a65f004e0de0f8d4d7d614417d80eb9daae4c3fbcdd6fca78dc19a8cd75ef73e915de5dd5c41670accbe7d74fe299b5d5b57096ec237d0a076d1c050ee13
+EBUILD quoter-4.2.ebuild 760 BLAKE2B f42451c8e5f1bf953ef42d36a75c383d04b2286917568677664233471e79b11c57a3fd8752b5e33576ec1d743ea3a86c6bf6ae0ae8fae5c9d424af2a28f2cc1b SHA512 4115e6b4d9b2a2ea6eb0966cdc8d6639dc9ae9b7d861547d29ff91e62f9d63c8d7c76f4d49e410ea5a796ace7e9035538d563b22f36afaf1c8cfc6ec3787589b
 MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
index 71913b702e01..88f395fbbcf9 100644
--- a/app-shells/quoter/quoter-4.2.ebuild
+++ b/app-shells/quoter/quoter-4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 src_configure() {
 	tc-export CC
diff --git a/app-shells/squirrelsh/Manifest b/app-shells/squirrelsh/Manifest
index 6824db201d24..6f636fdea837 100644
--- a/app-shells/squirrelsh/Manifest
+++ b/app-shells/squirrelsh/Manifest
@@ -5,5 +5,5 @@ AUX squirrelsh-no-strip.patch 903 BLAKE2B cefa3bb32d03e26f9aba808fcdfd9d8c7a7d2c
 AUX squirrelsh-remove-forced-abi.patch 653 BLAKE2B 92710dce7c0375d8a2a5a9cde5300f9d7630a9296e82a2c7b15311f1298615e85a974af9fa77def60ef2a0e966e00decc5e4ac236f6c1e4257f1e4241277c85f SHA512 6e2b43c7ecff32fda8e2655722f97f48a0a92f6fe5e1e3aeb28bc3b5459fccefa3aa4c04aca016001661af229c59982caf7b09209d7004c2dd397493c873cd50
 AUX squirrelsh-rename-LDFLAGS.patch 4981 BLAKE2B 405bf56a8dec4ac1c0e62d3cbdc4c3b6fbcd38b443304607b42f85132e22ebb79211939fa651271db56702b7de5b0f46515f38ea57ed43b048fad14aeee6bb6b SHA512 eb8058878bd23332dd58970caac5121838bd52b7a63249013b305b09a95a1ca5914a526e4d0d052772f32086d1e2237feae56bfc4549987e71a6db60ffff6cd3
 DIST squirrelsh-1.2.7-src.tar.bz2 673462 BLAKE2B a2e6a1e0c3e3c5eeb329ec33596514e09657439723d34069b66b744f525318d237d15e951bf4c8fe364d50091cd8dcb2d25cae837ebdfd5a219c0bab20d1adce SHA512 7db82cad969ba209cae6b2d1c4cf76ba10acbf79c051f4340556ae81dc98d36dfb6f1f6993e9198e5a5254eaaab3fbaca3d01fc547c2f303572060b2093af78a
-EBUILD squirrelsh-1.2.7.ebuild 1236 BLAKE2B 50b41fd9d2258fe2672e337fece7f91ace21268f9bc6e153103a921ca1f37e286f192d5937aeadadc01e959a2db7de265774d43bbf2805acef6eb81ca808968f SHA512 9896f2d4d7c3c0a3af6e65c86173a242064e96612dcd67b615ef5d60af5fe6b519ceedf0ee6fd509aa6b2a95245df12e7b907616541713731bbd4b2bc5d62e6f
+EBUILD squirrelsh-1.2.7.ebuild 1167 BLAKE2B ba7db136e263b1bfb66376490a8202f35ee61284d1600f4c7b2cb60a3f4fc8e927402ec11622f4e8d08f8b731720a51b0f1083d7bc409b0260941ab0e64cba90 SHA512 58aece63e60420b1561ca26e154a09ebdeb745eb83d7ec48ba3beb67097d9edc3f917b4bcdd3e49645a8b63a8eaeaa84dc8a82cc4539d2724cd56b38dbf3c0d0
 MISC metadata.xml 332 BLAKE2B 6464cdd0e8725292d93f94ecb29a117c1f8e142d12cc1b12c41b2b3677dd1a124fad1131f5827b26af08b67179df50f515bfc4f18ccb9aac15dfe3f801d7ba06 SHA512 31dc8fbee7db81a55b9a4256dfa391404218cc076c63b72e7a980649207cc2d2716b5652f90c639270b8f1ce634724dfd3103bb7a08698b6c089f2d98100fcdb
diff --git a/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild b/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
index 9e5aaceff7b0..fd133167dcdd 100644
--- a/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
+++ b/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Cross-platform object-oriented scripting shell using the squirrel language"
 HOMEPAGE="http://squirrelsh.sourceforge.net/"
@@ -18,14 +18,14 @@ RDEPEND="dev-libs/libpcre"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rename-LDFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-no-strip.patch
-	epatch "${FILESDIR}"/${PN}-fix-in_LDFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-remove-forced-abi.patch
-	epatch "${FILESDIR}"/${PN}-no-docs.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-rename-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-no-strip.patch
+	"${FILESDIR}"/${PN}-fix-in_LDFLAGS.patch
+	"${FILESDIR}"/${PN}-remove-forced-abi.patch
+	"${FILESDIR}"/${PN}-no-docs.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_configure() {
 	#This package uses a custom written configure script
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
commit	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree	e907cb121b30e3c1df1710719c0ddf4029597a47 /app-shells
parent	db063b515939ab15261136b24e4bc44386335c0c (diff)