gentoo resync : 14.12.2020

14 files changed, 46 insertions, 29 deletions

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 3076b662ec2c..aac77c284ca1 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -59,8 +59,9 @@ AUX bash-4.4-set-SHOBJ_STATUS.patch 410 BLAKE2B beddcd4ea00cf6814615896e9842a607
 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-5.1-parallel_make.patch 472 BLAKE2B fa6432b4a92f868eae1162f39de2860c94970c90a7209b445099bf1771d06b3545ebec13e7b18754b016f0d822bfc01983e994d25ca00bab3ab4494e27d7b3a3 SHA512 9137f58f568142fb1d8cb554adbc382fbdf317b5090f609672d2c4a1dde4a4a5c0d1ca3df6b28c8c196b660956e9bc34bbf1b76f8133d1099b65f4648f6051b9
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
-AUX bashrc 3555 BLAKE2B 31b62f62632feb74cfadb5b831dd862eace55a603c24c07b50826070f599b0571962b315f7f45edb1a0dba91d7a36fa2b852215e9071012b02d0869cb6e5ab6a SHA512 4c2fded17c5346222939fac5b0a13913bdc062b93a4963ad33fe41cf00a04860b5006ec4c762acb6ce7e36e83f368d5c3427b8bc359ba6cba73d6114f219604e
+AUX bashrc 3566 BLAKE2B c8013229792e6ece99d08615543d34935b8ef1604cfc48ad651ea64ae60cb39b6d945c46fa046d4fdd453a70eb46d065113defb11aa167f1a18f5b4246363828 SHA512 d7cda4637aa57f6a5500a421b7a0767a7ef9f526cbeb601f9cbe71164628189ca80258402d97074909b1437b65b708f1be3b867d66243022f628f7a0473ac98a
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
 AUX dot-bashrc 551 BLAKE2B e245955936f0e036073e7fe153bd01181ae7206a73b45b0411e8d1a6eb0b7131dce260755eed00d2639848eebaefacf7c13087d4315b17f85fbafa6eba4c9fd8 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b
@@ -74,7 +75,7 @@ DIST bash-4.2.tar.gz 7009201 BLAKE2B 52a4432ae401121ff187487a75a6541ce001c24d7d2
 DIST bash-4.3.tar.gz 7955839 BLAKE2B 398461e90a1ab6fd726b1a9db41c4c2a1e184034e3b96029bd17097338f1f9869d1c2216bde0b5b3c8e561629824348a0da3045cc425914e8e024180a175efe4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651
 DIST bash-4.4.tar.gz 9377313 BLAKE2B ac0e481dd4f2d5b91eea4f0156f1fc398ef8bd1ccd941366aa9b041be576114c51e1ff1431ec871e96fb72257c2a05a0ebcbd88c43c221610fef7dfdb2502fc0 SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29
 DIST bash-5.0.tar.gz 10135110 BLAKE2B a6c4d79144aa0c0f4a9433d618085c0d46b792b1de429b161f9f0266b55c099e13e44416c0886758a6f29411f5ceb79bfb0ec4eda47473f2713ae0b8081d6d3e SHA512 bb4519f06e278f271d08722b531e49d2e842cc3e0b02a6b3eee422e2efcb5b6226111af43f5e5eae56beb85ac8bfebcd6a4aacbabb8f609e529aa4d571890864
-DIST bash-5.1-rc3.tar.gz 10402411 BLAKE2B 0347d9b6eab98aab0941f838cea6447c5703b0957631b32bede6aa1ab94f3f5e728441708092872aa1fff85a02aabc98490b5d13b3ddb824b7ed3cdcc8ac0c1b SHA512 44717b843d3bbae057147eb9ca28e83d3f4290f832fb1674ffc4c0bcffcb9999929947d9798e0dfcc6e3aa8dc63412698fde28b306ce9ac41482e22fb327387f
+DIST bash-5.1.tar.gz 10458638 BLAKE2B 42059556694b604911b5b7936f94d42d8923f2931f3ebacefd95454274c7baadb1ec97629a524c1542e2e282dae66f1389334f8edc572ca8ee841cc3ac449ba7 SHA512 c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
@@ -393,15 +394,15 @@ 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 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
-EBUILD bash-5.1_rc3.ebuild 7321 BLAKE2B 40aea529cfe66b96c63a3def92db857580ebd249c083657891c2bcfe841ee9bcefa7883eb71e577d6c4441e2088b52d4ee71c537da388b74a79a7013ef7f33bc SHA512 ec3f215cb8e99b48bef746dcce878373dacfefadd2e04855d93b0135efb5b43d3d0c2320c0e4f8a699cda79463c0bb0b95ecf17bc35ae6c625abe5d561b63cb0
+EBUILD bash-2.05b_p13.ebuild 4548 BLAKE2B f5ac7b9f3fcef74d69143b4ed3e52a27f8cca8265bd86da9fcd00cb18dd14911e06c91bce9a0226656971a187cf570a7dcf16a564f5be42323fa18b98ecd1a21 SHA512 2229e0c4ac2bf9832827ab7658e44164eec90ae69111676f2bb58f0029560962f7e9f7e30429fa5e78c3258b1f220b163721ef2dd78dde516538a033c858f976
+EBUILD bash-3.0_p22.ebuild 4622 BLAKE2B 0a0513f83591b961ce99d5e68365c5b8e7ff518e8f6a2bd3fa21602e36bdedc254ebae6444dd3a1ddb89de7f4df53114d09ab8eddb26f8ebf0d0943f20fd2bd2 SHA512 a4968dd92901cd8a463847add32acbdcb7cc3e106d12b67b666e269d7c63033324a8aa5a391df367972849e9041f4ac12cb22e1dbebf948a08d8e8caf8065b0a
+EBUILD bash-3.1_p23.ebuild 4365 BLAKE2B a2332dc18bef4209dcd60c6810ffdb62b25e2ae88b45ebaa8c8ddd4e8ae15cee6064808170348dd91aa2a1a3a8d7cfe6b27f3bfe14e3377000040b6752b365a8 SHA512 254d2d624a13b2086029d4ef6a9fc5212befc9963c02558f6d49eefb115ea52b3686e3c3c59a8690f0c150f553d1bbd5ad7d20887d261cb28e7e953fa3d99ae7
+EBUILD bash-3.2_p57.ebuild 4458 BLAKE2B 4a3c7756bf34700368fdc6cb4a4b4d2c8859af94781c0c4a1da8fa1d914c8bb40bcafe079fcdfffcc9e8e1484d945469f5eceea1e32384e73c18576a8df5faab SHA512 c7153a54b6a69f9b10f03b8c4069193c77e502e82dab73fb6cf65d30b88fbfa206fdcbc7276380fa2fc06fe1d837673eb6783258fb94c51601ce64162d5cdf92
+EBUILD bash-4.0_p44.ebuild 4374 BLAKE2B 29142cdd914c8990d87e0a84e17e27c270e76e4d89542f4478fa29b8fa142c8a387c14e337df9b8ae125d58dfab35e3c899b1e60c717852fc7199ddd5ef60dd9 SHA512 d25693d7faa545ba3de8a143d2312928648ae4a0079aa8f89030ed279d843eea197fb125901991c6055db750fbb2b3a19772dbd84eef1ba4aa99d3ef38ce8504
+EBUILD bash-4.1_p17.ebuild 4129 BLAKE2B b985ccdc6a54a13ae8a025ca914ebe4658cb1607852699c52e1d0b46d3804b11f1388bb2a87d498eca8e9f309d1b370421a7b863992110d3aaec91d3cc564e72 SHA512 dbfdb9ebb3c7892c5f7652c6749521576fe48153e2229e2d976555f111a58e7a2a2bd46cc56d807375c0d9743d81460a7c6addc36cf0a1e309d3c34cd5e8077e
+EBUILD bash-4.2_p53.ebuild 4312 BLAKE2B 3c38e3c0cbacb50e00221f3450dd3b1e18f8c23b86ee481ffd87789e7ab00d686d0aac1690a0a36d85b7d1af09d74bcb9c3203947f2282c3b8758bf9f1724926 SHA512 51a53607941c6dfd5e78deab48e8788b3004a2fb90f57b531cf6eae9484be33a9d3ffac6a09c9bdd0ded9511a2da5f60e03f17231525652d8c898ae0fe0e4dd5
+EBUILD bash-4.3_p48-r2.ebuild 5596 BLAKE2B 89b41a1e0e072dcee85e09b50ce10e4a9b6fb6efdac740982332aa029968ac3382ddb695148e361912ad44bd8a29aa5d972343ef403adc1efe406efd8c6c9248 SHA512 1857bc7a01ad80757271db0e3a404d6b171341a99d9cac4059d3f7ff0a88cd4ead1ab871098ed6ca8cf9ad19e4bf0f48c103d1958b4bf5eace410de404c1d258
+EBUILD bash-4.4_p23-r2.ebuild 5706 BLAKE2B 7ab2b8715a769e1305bf8f0dc6f5218190cdd9e53f318391ba8f8acc51c4b207f36f2ccc7384c1c40ded840bcd555310270916b26cd663fad13a1b7e5224dc7d SHA512 0b318d5015a4e1a0a30a0c84405ab146730daa4a7d46a54223748fcb2a11edfc8150d39f28fc20a86c1cc791170fbf071749ed69ec4648748b3e124290bf4d80
+EBUILD bash-5.0_p18.ebuild 7315 BLAKE2B cefd5cc7c8cc55667911d3846b91bb8d0c76aee4fc719a5ed43f9619254847cee314b97c3cbcbc32fa34ec4012ebc79bb58c410164e6d7184a3ba35330d13465 SHA512 d9809be61511431777290dc2e95aa6dd736b403998514f9d9b88eefdaf3a73a5d4c0dc5626493d4eb847d00e21bc6899c74bcd3af304a1a81f0616b31cbdee08
+EBUILD bash-5.1.ebuild 7358 BLAKE2B b4ac6789ad3ca644f712797583fbe1c2d6374c8d275bd67e209aff8504dd11dde502052a7054a3cc638e33194ffb198e184b7e57d685e23f1945c302dd9be5eb SHA512 da8d2f4e79dcf675b8712136b315d019bc1b7088e9479315e4b2de4f3298a245ea28ef2707d74eb39ca22ff12cb94411aba9bc590668cd5da4fcc47e8bc1b310
 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 9c9eb79db32a..9c9e3fec805e 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 	# Clean out local libs so we know we use system ones
 	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
+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 
 	default
 }
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index 6437d45fb536..d6a10f4002e5 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -79,7 +79,7 @@ src_prepare() {
 	# Clean out local libs so we know we use system ones
 	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
+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 
 	default
 }
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index ad1a7e46c428..cf6a8d6a93cb 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 	# Clean out local libs so we know we use system ones
 	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
+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 
 	default
 }
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index f555e3f03de1..2a5bfa279ff9 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
 	# Clean out local libs so we know we use system ones
 	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
+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 
 	default
 }
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 560929519b51..878f660af57e 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 	# Clean out local libs so we know we use system ones
 	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
+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 
 	default
 
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index 9c68ac62d283..198646cc65f4 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
 	# Clean out local libs so we know we use system ones
 	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
+	sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 
 	default
 
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 1e566e163edc..1ab928bd118a 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 	# Clean out local libs so we know we use system ones
 	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
+	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
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index d535737ea7ee..bb767f76384c 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -81,7 +81,7 @@ src_prepare() {
 	if [[ ${PV} != *_rc* ]] ; then
 		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
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 	fi
 
 	# Avoid regenerating docs after patches #407985
diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
index 518e64ef49f9..7e210e06b833 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
 	if is_release ; then
 		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
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 	fi
 
 	# Prefixify hardcoded path names. No-op for non-prefix.
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index 37017ab29296..034c887986cc 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -92,7 +92,7 @@ src_prepare() {
 	if is_release ; then
 		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
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 	fi
 
 	# Prefixify hardcoded path names. No-op for non-prefix.
@@ -247,7 +247,7 @@ pkg_preinst() {
 		# 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)
+		local tmp="${T}"/sh
 		ln -sf "${target}" "${tmp}"
 		mv -f "${tmp}" "${EROOT}"/bin/sh
 	fi
diff --git a/app-shells/bash/bash-5.1_rc3.ebuild b/app-shells/bash/bash-5.1.ebuild
index afb1bae1d19b..5d6585b3abe7 100644
--- a/app-shells/bash/bash-5.1_rc3.ebuild
+++ b/app-shells/bash/bash-5.1.ebuild
@@ -34,7 +34,7 @@ patches() {
 }
 
 # The version of readline this bash normally ships with.
-READLINE_VER="8.1_rc3"
+READLINE_VER="8.1"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
@@ -92,7 +92,7 @@ src_prepare() {
 	if is_release ; then
 		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
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
 	fi
 
 	# Prefixify hardcoded path names. No-op for non-prefix.
@@ -103,6 +103,7 @@ src_prepare() {
 	touch -r . doc/* || die
 
 	eapply -p0 "${PATCHES[@]}"
+	eapply "${FILESDIR}/${PN}-5.1-parallel_make.patch"
 	eapply_user
 }
 
@@ -247,7 +248,7 @@ pkg_preinst() {
 		# 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)
+		local tmp="${T}"/sh
 		ln -sf "${target}" "${tmp}"
 		mv -f "${tmp}" "${EROOT}"/bin/sh
 	fi
diff --git a/app-shells/bash/files/bash-5.1-parallel_make.patch b/app-shells/bash/files/bash-5.1-parallel_make.patch
new file mode 100644
index 000000000000..b341a8a06e28
--- /dev/null
+++ b/app-shells/bash/files/bash-5.1-parallel_make.patch
@@ -0,0 +1,15 @@
+bashline.c:65:10: fatal error: builtins/builtext.h: No such file or directory
+   65 | #include "builtins/builtext.h"  /* for read_builtin */
+      |          ^~~~~~~~~~~~~~~~~~~~~
+
+--- bash-5.1/Makefile.in
++++ bash-5.1/Makefile.in
+@@ -584,6 +584,8 @@
+ 	ls -l $(Program)
+ 	-$(SIZE) $(Program)
+ 
++$(CSOURCES): $(DEFDIR)/builtext.h
++
+ .build:	$(SOURCES) config.h Makefile version.h $(VERSPROG)
+ 	@echo
+ 	@echo "	  ***********************************************************"
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index 8d9c29738b62..2f3dc7755455 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -38,7 +38,7 @@ shopt -s histappend
 
 # Change the window title of X terminals 
 case ${TERM} in
-	[aEkx]term*|rxvt*|gnome*|konsole*|interix)
+	[aEkx]term*|rxvt*|gnome*|konsole*|interix|tmux*)
 		PS1='\[\033]0;\u@\h:\w\007\]'
 		;;
 	screen*)
@@ -80,7 +80,7 @@ else
 	# Some systems (e.g. BSD & embedded) don't typically come with
 	# dircolors so we need to hardcode some terminals in here.
 	case ${TERM} in
-	[aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;;
+	[aEkx]term*|rxvt*|gnome*|konsole*|screen|tmux|cons25|*color) use_color=true;;
 	esac
 fi