gentoo resync : 28.04.2021

51 files changed, 284 insertions, 191 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index d948e92be61c..660d94408896 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 254f024f1f53..4b432d24ae47 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,5 +1,5 @@
 DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3 SHA512 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
 EBUILD bash-completion-2.11.ebuild 3950 BLAKE2B bc1283c36737d32489613a1eea5a3085261892d002f05b74c9144f6453f1fa484c9d2ee2e378b3317628ff9a46001ac2fa06aa8c18654084310c2f25fb0fd991 SHA512 45172cdf69f7a86cfb2f7b9b07b279ba04b298c33b8eaded593d730209cdbaccabd8af29d21d2f30d461d30cbd746cd277a4bca3dea4add8ffdebc552bb664e2
-EBUILD bash-completion-9999.ebuild 3895 BLAKE2B 69a51c4ec428012d17546105198b9c4b51e3a6f1df848376d0f3ef008a6cfabcd36e4bb5ce246b177f887f92ce94db5ee059d0e4350f4da6eb62a3c5642c2073 SHA512 24ed09097a8164e18272c0dba458ba83acdb59b3a889567efd3d94db7b454f744c0ead9db9f32c34a1c328bd8ab81c44e79ece643cdc8ce675df1a3b155b41b5
+EBUILD bash-completion-9999.ebuild 3905 BLAKE2B 86242be9deb7bfb5cf3587167a92f4615a099bb143f2d92e382be8e9ecc45ce1dad3a140030c25daf1a69e213c84ff59d889963e1c39a94273d54b4be39a2878 SHA512 3241298fdeefa87925c6de6a94760318ef2fddc26d195bb2872b758cd35d376a2715e2a1f0a07ddf5b49efc58abc13a6a386889248b289bd1507f04dea83a089
 MISC metadata.xml 1439 BLAKE2B bd8b7a31daf2b9a9b094b053c8f0b3bce069107ae00aa95ba8386e259e79d7a95ad4f2b8a3ed9a7a5b6f2b7204d3d74770a3c929a54a563eb5678ecdaac14be8 SHA512 d7c85fab833584f2ffb08c4601e7900511e640adf532ee80b9a047254e8f2ff9bb781a02f02d5ef2a5247f5b6be31be68181d557618101c792a0dd0cd13e89d2
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index f473e128f55f..70ce84b4ed82 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-inherit autotools git-r3 python-any-r1
+inherit autotools git-r3 python-any-r1 user-info
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion"
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 212e3aca1ccd..353f5e1add85 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -399,17 +399,17 @@ DIST bash51-001 2894 BLAKE2B 7918eb48d4afe91a167eed666f0d15ca220e002d824cfc5ebb7
 DIST bash51-002 1575 BLAKE2B 70336d2ef04c63fa29a625a2719c0b36f7e34818cadbb4b09e1434d72d6695dd882c758a00f2ea48f38d3918abc15f494780825b7d2f7cfc6c747a3be89ac497 SHA512 923e7822a9629645347d3aea0058fb5e2d52223507159a62369309f264612df44a84931c19e0ccb3852e98ce672dfbd454477090b4041b5a0de477c94eb61088
 DIST bash51-003 1800 BLAKE2B 6dd284666273016d3b9007537502d75ad7c4e1347c3a13dcdab2325e4f191a149180ee86f9904fc96291ed8217e1d26dcd2b8b20c283ea616f322dbd293d1998 SHA512 01e952dcfdae58624723d64912ea3444eed2fdcd266ba1a929b95ec3abd70f914bf400607c3f7bb7a94ac2925f794f91f37c1929d5bb987de2ba7f60a19cb8bd
 DIST bash51-004 3745 BLAKE2B dbbe2713c1cc4aa6de99366c1d91e136d1a7a86ac11108e8dd1aea3823ba0f9e005f48f1507acd1f86ce2f3c2f4ac60ae04ff066e5587229e7f19aefbe4d6e39 SHA512 10ff24cd91a2cd88818bfa7218050843af6b409e43fcca89f5ec70d8266020c6c2a55132426271f165cd0f154f49eb0f8ec2761b80fc066c921b83120bb543ce
-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 5675 BLAKE2B e024d196ea9d17cccd70284f1db07d00252d862f257c2a4484705258820493a8d35c894858a7ac31f505a0ba7eb23a4a0c6126a049bff5154582db7ae081f18d SHA512 e6afcbe5db9c1160d600edead7bbb72dba88f427dcd0c34023cfb1ce2857475a5e5cb152e89398a92d187c32599fc44783805d50256e4fcb3c53984eb33522ff
-EBUILD bash-5.0_p11-r1.ebuild 7451 BLAKE2B 991013ae8a8e1d934762e63174d2b6e57dfadba16f624a15d1e36d36c85f881ddad40efded0a4a5a1abe30ff801cc5a321f9f9027cda1a72b4071be4f6bb1aaf SHA512 99915fa62a10a0eab23285e0ea082a08d68a4fb1eadd1aabef114867a64544e34cb4969667d64724de656dc4a7968c9ea61c164d755ec206ff84e141e67265ef
-EBUILD bash-5.0_p18.ebuild 7284 BLAKE2B 8a3781c21e3022604316428792c90a51c9da8641bac747e1cd2e018dc32a556be1a35b52196b4c723114a2e745da662cbeba8bbe1e62fb407bee9a8641c417da SHA512 aa6fc8edba678dbbfca3f4d2159f7c5b82475f4e2b35f65a72a1c456518464fde38a3facd369bb6f40d306496a99ae6689fa303aa98d9d91d832a53d75969ad9
+EBUILD bash-2.05b_p13.ebuild 4549 BLAKE2B a1d8917f1a837628536bf79c37d57130f076a8317bc61f3d594a24cd864282795440e3e5c2819d4c7491054522048cc4ba71f6cd83b65d4c4c3d5a9bc625421f SHA512 f67fb794e132226c93a79e39921ae86c74c88b8b210a7cedf6f2f3b1f8bb93fcd9b56bcc57cde9a3f888b6636816fbebe488760152e56e230b0019c23650dee1
+EBUILD bash-3.0_p22.ebuild 4623 BLAKE2B 7ef511efe3fdf36b5fe2481f2714427cb1c445c5b3bd51ea804f176074552acf536140463c57c2fd6dbeae2bd0626bd1610e40309988b61ccb48c160ea5fc00c SHA512 e877c108bf6a8044be5325b870db792a600a755a1d93debe6f0f7075ac7976fac8513640e196fec2b0e9d065ab91880bddff273dc564cc244a4dc83c63b1be1d
+EBUILD bash-3.1_p23.ebuild 4366 BLAKE2B edc4fae3b55e7357b022d16f52fb73f3b8bcc667fab09360a63233f48ba54f37e05e3f71cb092b33c58bc31e4334ff2e2156471d3f40892f5754598f902604cb SHA512 bb6516e0e2e1fb777606c1686ae91409961dafb177e13ae4e94ab0fa04db15fef2f6dac9130a486683a6fd456551fb4d0524158a6fc39afb173efd87af9d0be6
+EBUILD bash-3.2_p57.ebuild 4459 BLAKE2B 23363f764816350120875d743e118e893333202e784c095ce2af763b1c460d28737a81d0dd03d9b180b2bdb05a00fe17c44790942de76d6a12ddd2354d75d7a0 SHA512 3ede03a4a34a0c524bc0784f553e32a0781cc1b681c370014459c714403dbf0b0de47356b08defee2e579d8b8b879e3e3043147ea980258d6d7cc4b56002539f
+EBUILD bash-4.0_p44.ebuild 4375 BLAKE2B a7975e0db29fd4dd3686a5e61d0826fb2e7fe18516f308d9d73c5d610449841c9d6de7e7c1869c456072cfb6db74461a9453eee3d27b630d82491d3215d48af0 SHA512 48a083d5f57e1f1c5f2f2aa3602a8b1345623b50da054fe419adbe4cd5790de0fa2b9cf8b9579a056fe534d463b72039acd42defc9191b888bbb29d611600d41
+EBUILD bash-4.1_p17.ebuild 4130 BLAKE2B 23a5ffd5341fb638f405976f37a405f321c9fed27f842f72249bc474ff8fec93ebddb816405808a13b275f488e607655c0f9e47aafe4ec3f464dc5fa91699679 SHA512 d77a8dde63af54d7a032b6a95acfdab1ed588b50a0994173d345e848222e47a00099a1195b59d00f9d13b1fc836d69f097ae45dcb464aab73fb6d04a87784a83
+EBUILD bash-4.2_p53.ebuild 4313 BLAKE2B 39e2d061565c6ecff359b71591e8aabd2dbb4821f6fa8c7938ac557f6fb7472e5387210457e22240c99c788caee40f8612a06f9366b55b7438806745d1e805c6 SHA512 0e81222bce3031774cbbf380899521764c8571c39d78e13a83591d735cd0b6add6072eae8f908eaa323a9ad4a8830848ce2484486b7060fb8ab2b172c2827510
+EBUILD bash-4.3_p48-r2.ebuild 5597 BLAKE2B 280ad021ee5107cddf1511c24199a925208bdc8d9afa1408bd89994c9cb52c7c7fab8f31076307fb6b70a10fcc30f39735992dbda8616cd1e3dac59cdf8663af SHA512 445928a50f4dc6e18f778066d6d5e4f2cd1e9647de1c43e6b3b89b562596cf24a277eb01f325dced549efb97a479c43d6a32a49d6e5c6cf4bead1782cbda4136
+EBUILD bash-4.4_p23-r2.ebuild 5676 BLAKE2B 8dbdfdc76c2d844f119556d7dc7690e86788d46823ed1e5bbd31546eaf9ad03d5cbc83f771b3d56342a4acf843e513f54171161c042430dcfe6b3e44c26912c9 SHA512 bfd35296355f83e92d633024ec756422ee5a74b6a6a2a3750a6d56a9a65465af2dd4aa73713ba0d4500066a1e6a4adcf175e174fd4d427414f8cb6ee989e0ac5
+EBUILD bash-5.0_p11-r1.ebuild 7452 BLAKE2B 761a8e88db4bd6c92ff09275c896a160b6af04bc28e7f9659683ce9b14461a0b28152c983d72245977a54f219462f89ed9cf6a297e43c4b79b612a6078566085 SHA512 4115f924509c6a250187f79163b2ce3eb1211b5f990cb95f84cb9f82ceaae1a95e182dca344cf3b7e525229c104c4c76576b96b8860e6bc381335998bcacbfb3
+EBUILD bash-5.0_p18.ebuild 7285 BLAKE2B 0f98107fb95b4e2e7e3d25ea13b1154f5aaef35167243fc9fb86ab078ddcbfcc0cff859d5732d61db02b855cf0fc3372cff65ad66fe62042861dd7d728e9b6e6 SHA512 1cd8cf6afbb1e4c8f3ab9be21b7d4e9cd949b22bfc5f6eb507d1185266dfb10192900d293dd082b8a72766f4488a4444e3d86d829fdbc1b04b1416e27b50ea09
 EBUILD bash-5.1.ebuild 7327 BLAKE2B f6a4f27c58e267bbbee3bef19231acbee6e5d9258af5468619da425032c03f6a9eb1d8a009319d2d7ccfee170f83ed4edda72c1e495a94375a73d6d25ce7bb9b SHA512 42a40ecb51c4a4834e1d11070bb7a218eb115bea9fece77d3c50f2d614ffb72c9a5412b784fc76879f2d70e46ec7b2a7a854669c04150780669cbce619897567
 EBUILD bash-5.1_p4.ebuild 7275 BLAKE2B 017818d2a5347f8daaea32470f3d365de2359c7c65ae6d361f119a7805353bccb4d539f0f414975050ea0169b7591ed993e7a313b3271fed03340f2cc2e5bd51 SHA512 94131f52fffa504048e85be4f3ad6cec37242c363717edd9a400825dea59e8d4fb3083d7286ea0dc876c5c44751db8ec545f37d7e4dd8b03eb76bfdd982fc6f1
 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 9c9e3fec805e..cdacaa870073 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index d6a10f4002e5..9cb8f4f7c86e 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index cf6a8d6a93cb..1b7c72acdbfd 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 2a5bfa279ff9..be7420d869e7 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="afs +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 878f660af57e..2814366f9f94 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index 198646cc65f4..da915e1f0dd5 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 1ab928bd118a..30c860c3ff58 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="afs mem-scramble +net nls +readline static"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index bb767f76384c..14f08b6aed1d 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0=
diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
index f039711106da..3badc1359f27 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-5.0_p11-r1.ebuild b/app-shells/bash/bash-5.0_p11-r1.ebuild
index 99fbb1ab59de..bb06e48ea224 100644
--- a/app-shells/bash/bash-5.0_p11-r1.ebuild
+++ b/app-shells/bash/bash-5.0_p11-r1.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index e22d27a3b3ba..80582cbf2ae4 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bashish/Manifest b/app-shells/bashish/Manifest
index e42e0e1fd841..bf08552eb88f 100644
--- a/app-shells/bashish/Manifest
+++ b/app-shells/bashish/Manifest
@@ -1,3 +1,3 @@
 DIST bashish-2.2.4.tar.gz 241565 BLAKE2B 06a7f350669afc7f5139bdf0ab620b787c71d729f0a0e73a532fdb4c3c93792a6715b962a71f1004d2937c8f69171a4b73524aec7ca86fe8d1642262b2750060 SHA512 667ad91c71c99b2f0975eaf64ce4c2be1e60ce921e7232842fae62b6fdd9eca073c5941d5fd9b1af0d77dbb08e9ace3e0c43ed113761c2442f99f762ad581d46
-EBUILD bashish-2.2.4.ebuild 455 BLAKE2B b00cac5e912edce267ca5af4f834b95d6afc1bad5df5d3f717405b3e2253012c159ae49cc3ffb2202645868d8001be40e133d1f70a7bc7545aabf10c9cf1917d SHA512 a185521defef9782638817cfa963156b7032f6ccf9fa716d3d894ddd8508bad4f38a7cc7497dd5a2cee23edb98c1fc9dcbdb5bd085e534a716a0feac5421a3a4
+EBUILD bashish-2.2.4.ebuild 356 BLAKE2B 9175e9efb274354677f85532de4c540efc6252cecceac032bf09fa76a5d910b3579e096c0c2d83b42c71a174d828a3f697eda84ea8900310f2282d7f0ed72851 SHA512 5942584ebe7b3112e74287cafba8740158ae378296b1b28b29319f3bde5c20c2715dac2ae6a470a708a44772aee204ba3ba41ada82df13ff214f5b26154f3f2c
 MISC metadata.xml 244 BLAKE2B 31bafecf43e39e8a9a943a84798de698faea745180878607e178dc51da730258f77341935c0772057c02cc89d1aa0ab787b0e63a46826ad17ac6506f4233ca58 SHA512 cd15de3a328adca58c595a4089effd70b96ff6d4a79dec4a7149e05b957af122cd826a57e97b5c3ca2b0a9b84f4da4a63b4eaf4706794927d9103c6be6b49938
diff --git a/app-shells/bashish/bashish-2.2.4.ebuild b/app-shells/bashish/bashish-2.2.4.ebuild
index 1f0c21f0de9d..e10a381bafc5 100644
--- a/app-shells/bashish/bashish-2.2.4.ebuild
+++ b/app-shells/bashish/bashish-2.2.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Text console theme engine"
 HOMEPAGE="http://bashish.sourceforge.net/"
@@ -10,11 +10,5 @@ SRC_URI="mirror://sourceforge/bashish/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
-IUSE=""
 
 RDEPEND=">=dev-util/dialog-1.0"
-
-src_install() {
-	default
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die "mv docs failed"
-}
diff --git a/app-shells/esh/Manifest b/app-shells/esh/Manifest
index d60e6c048d1f..0b1150112d8e 100644
--- a/app-shells/esh/Manifest
+++ b/app-shells/esh/Manifest
@@ -1,3 +1,3 @@
 DIST esh-0.8.5.tar.gz 214040 BLAKE2B 8fbcfed21a9dc156f496cd650e1f7d4242f869d753b147070e51c357531353b9028de7cd405334e7171f805bf048d032310063e8fe2776de976557b080b2946e SHA512 2473cc2418f70533136305f47dfe59bee560206a8b58c080e2113297dd82483e867937bda1b015069a7220552b4d03346a3b71026a24a2795b0b499e355490a0
-EBUILD esh-0.8.5-r2.ebuild 1035 BLAKE2B 10f5eb2f9b69196a8d5c310eac1cb46ec47db65ef5ddbe0d8c36ca4ca443fa214f103c0c7221e6999b5c325d06b6245ae849dff77fa8b9bc32633fb48092d671 SHA512 f16ba2db0e0a5bb8ca0030d64f813c2d8ba84e8631db0db764d72c26b6a272d53822a7248adff2de47c234d6469455338fbb52007373ef0654477a072e39c60e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD esh-0.8.5-r2.ebuild 1370 BLAKE2B c47baedc53b8f8bff6107e86a991982d2db0835e7c1c4642ae5eaaf4d6527fab07549d18edf1bfd8fd78c25ee2bbcd519d721473124c3db4e61cce2399e4dedc SHA512 1ee1334d77d6ecc635afb098a15e50480492da6fa26c7c72f4da842e0d542aaf4f583fc6413ebe9a0d19e018c47bb817ccc8b9f2737fd4b6c3d55477f102da2b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-shells/esh/esh-0.8.5-r2.ebuild b/app-shells/esh/esh-0.8.5-r2.ebuild
index 052258caf92d..164a969d91f4 100644
--- a/app-shells/esh/esh-0.8.5-r2.ebuild
+++ b/app-shells/esh/esh-0.8.5-r2.ebuild
@@ -1,43 +1,51 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A UNIX Shell with a simplified Scheme syntax"
 HOMEPAGE="http://slon.ttk.ru/esh/"
 SRC_URI="http://slon.ttk.ru/esh/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=sys-libs/readline-4.1"
+DEPEND=">=sys-libs/readline-4.1:="
 RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
+
+	# For some reason, this tarball has binary files in it for x86.
+	# Make clean so we can rebuild for our arch and optimization.
 	emake clean
 
 	sed -i \
 		-e 's|-g ||' \
 		-e 's|-DMEM_DEBUG ||' \
 		-e 's|^CFLAGS|&+|g' \
-		-e 's|$(CC) |&$(CFLAGS) $(LDFLAGS) |g' \
+		-e 's|$(CC) |&$(CFLAGS) $(CPPFLAGS) $(INC) $(LDFLAGS) $(LIB) $(LIBS)|g' \
 		-e 's:-ltermcap::' \
+		-e "s:/usr/include/readline:${ESYSROOT}/usr/include/readline:" \
+		-e "s:LIB=-readline:$($(tc-getPKG_CONFIG) --libs readline):" \
 		Makefile || die
 }
 
 src_compile() {
-	# For some reason, this tarball has binary files in it for x86.
-	# Make clean so we can rebuild for our arch and optimization.
-
 	use debug && append-flags -DMEM_DEBUG
 
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags readline)"
+
 	emake \
 		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} \$(INC)" \
+		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 }
 
@@ -45,7 +53,10 @@ src_install() {
 	dobin esh
 	doinfo doc/esh.info
 	dodoc CHANGELOG CREDITS GC_README HEADER READLINE-HACKS TODO
-	dohtml doc/*.html
+
+	docinto html
+	dodoc doc/*.html
+
 	docinto examples
 	dodoc examples/*
 }
diff --git a/app-shells/esh/metadata.xml b/app-shells/esh/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/app-shells/esh/metadata.xml
+++ b/app-shells/esh/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index c11d11d59ca6..5937e2c6a91b 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,9 +1,9 @@
 AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693
 DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
-DIST fish-3.2.0.tar.xz 3403640 BLAKE2B 740e20d428ef67b25352d56e5f2ca5732bbcb8310082dc1ca4f66c173d0380a5ab86328d6c1f8d899844d78bfd9547323a02d2c4caf5e82817ad01260bba3a7e SHA512 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face
 DIST fish-3.2.1.tar.xz 3409808 BLAKE2B ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517 SHA512 bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
+DIST fish-3.2.2.tar.xz 3411748 BLAKE2B f8b20b6c56c54f84f347b930b71528dbd61a4f53adfd8addec05314c9d15992257cea89ce854adef2eecf3adfb07e6fa576b9d45c2e362ff360b24cf1edf3afc SHA512 e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a
 EBUILD fish-3.1.2.ebuild 1559 BLAKE2B 6591d08cf4f1a160d5b133436b7e11ac4eabfa506710ad2edd61c3b98894f32265073102acf83dfffffdd4d4af67549240f7e8097cfe74691663ce0ec5d2b4f4 SHA512 b0d4f615573a43b5407262629d40c3f3a60d3007ea53978173b29ac9a996a72a528f538f83f1ce7810948dc606509494e2b92e6ab1c846129aed29d3b7c9d754
-EBUILD fish-3.2.0.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
 EBUILD fish-3.2.1.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
+EBUILD fish-3.2.2.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
 EBUILD fish-9999.ebuild 2060 BLAKE2B 5a651a8b576ca581417bff04896b83ae81e58ad8c4e02f37b0b7fca967e5727614070f204e6e9ad43cd009ab30969e4f4d20ce8a6c1f4c60e3ab57b6d00d046f SHA512 21d9f9fd522e11994409e3356cd6f73072842369a3f36a0defb071e1545ee26afb4fc8822f76316ff80ad16322f22bde9081b812bc9dbcdc3d33ba9fd4790dae
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.2.0.ebuild b/app-shells/fish/fish-3.2.2.ebuild
index e2662c513ae4..e2662c513ae4 100644
--- a/app-shells/fish/fish-3.2.0.ebuild
+++ b/app-shells/fish/fish-3.2.2.ebuild
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 4cd4ad4f0d79..988403184451 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,8 +1,6 @@
-AUX hstr-2.0-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
+AUX hstr-2.0-fix-ncurses-configure.patch 2493 BLAKE2B 32e198aea7efd9416526feaf85e06029f05ec26aa982ceaacbb7f505ff8a4e7995a8222a3f033ca270b9f09ecf0465b56f9c3ec5b15dd202fa26e0f7e011062d SHA512 3c43179ce88a35599d44c60af5f4287383c0612eace067f2097e26bb2ab6d05573e8486ae83b9d1f6d222a65fb4466c64c4d0a34b15cce8bef4b75af0ec0b7ab
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
-DIST hstr-2.1.tar.gz 1244067 BLAKE2B aa37f26a5ba8ee465a03212cc80e55b9581e59cbb535f17fda8e59bed062f0b0065d456d8566927c089595b92270b83235f0bf73f26ac88704bd933c1926cd5b SHA512 ea217ac2b6dcb7e283f83d15524b47f88c5c8cfb82e5728537750a2ec8526f03304503a5bb67970d893e10057aba087aa86a67548aa361c892b6ee3e81903122
 DIST hstr-2.2.tar.gz 1246786 BLAKE2B f14091fea391dada79798c957b0b1094aff73b7ab4f8d9fd53c1070924556a7ff59f6f5a2e49b36dcd46ca6f93c5f8cd0fcfef07d5f7458d4bbe021546ccdc7a SHA512 c133edaa63a2be76356c08e52303d4133b11803e3ac6f915566a8d1b4651991b14d43974618061b2fc98c49e21b650ff6b9ac8168512e76566e327f90a550e4a
-EBUILD hstr-2.0.ebuild 642 BLAKE2B 83c4bdcd14bea1f873828f3856183a529144bca3876b960895b86c2c1f2bb82d66d48d9d68a541aa719c9e07f2a072ce7d77783bc32dbc2a5db89de945503140 SHA512 30d50d5190f4476969aa97af6e1af4111f91cbe457fca2b51b34c9c4ac42e24d9e68fb305cd1898c3088faa23ad581b27c03084fc306992b8af4b657304d6a07
-EBUILD hstr-2.1.ebuild 649 BLAKE2B e71c9b05847367cbd4b9f2fdb2f00343a7d27b49e7e891958760876bae7daff742b357fcd384df029e3fa4d3b5e10c3a5d491ec5910b67aaaf813709ac3db890 SHA512 56b66c6985ffdce179d99e2456c95a87ff26eaebcbda4dec771786ddf5120d13381dac342c62d97f8ccb39fded57431041061bc2562150c666d570019699fa61
-EBUILD hstr-2.2.ebuild 649 BLAKE2B 268080b28c8b2dbdba9f584de178436943fab23b4f948c7b6238e65a12c958e9e5ebf5bbd16c936b86c84e8dabcbd2964767ea6e8b591ba6a380805a0461263c SHA512 6ea14affa91828e04a70a400ae951e8da07ab1a3a119fcc9a05ca2c50eda7734052ea1fd4abd2f0cd31a9be859f27cb43bb66b9cd4e22cd9b95714e855da8524
+EBUILD hstr-2.0.ebuild 686 BLAKE2B af341513a351df74714b6f3b49f47b2639f9bde238f59b4920ecd864d21712bb020f88a6068252a80f21c99cde5ce1e25b75c541a59e1daab0be6285178c7bc1 SHA512 d99bc7f83dd0229e5946cd284ceabb6efc20100692ca0664d8b728f1d2cebda5b23b432621f1d73a3da64ce2832be2c61fa2fdb2521802d4b7a3f46585160f4b
+EBUILD hstr-2.2.ebuild 703 BLAKE2B 1070254d71d89cb1d756b10821dc68be2f7ee5b1fdc2d7a4ca5da57f1f1359077b429460a04e1534877e2385e362c54cf3b67c6137f0b4006634f23822c0fdf8 SHA512 7d0d1e289ce09ebda054711598f38a04123a1dc50693272d7a617383e18033a5fea9dc74f657f15fdcbb1fb00a2a05c2850a2c7c618eec75ebc526d12a7b586d
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch
index 215fd5cedfc9..9b5c089b67d8 100644
--- a/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch
+++ b/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index 1676ec8..73c8be5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -47,39 +47,33 @@ then
@@ -44,14 +42,14 @@ index 1676ec8..73c8be5 100644
 +if pkg-config --exists ncursesw
 +then
 +		AC_MSG_NOTICE([Module ncursesw found])
-+		NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+		NCURSESW_LIBS=`pkg-config --libs ncursesw`
++		NCURSESW_CFLAGS=`${PKG_CONFIG} --cflags ncursesw`
++		NCURSESW_LIBS=`${PKG_CONFIG} --libs ncursesw`
 +else
-+		if pkg-config --exists ncurses
++		if ${PKG_CONFIG} --exists ncurses
 +		then
 +				AC_MSG_NOTICE([Module ncurses found])
-+				NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+				NCURSESW_LIBS=`pkg-config --libs ncurses`
++				NCURSESW_CFLAGS=`${PKG_CONFIG} --cflags ncursesw`
++				NCURSESW_LIBS=`${PKG_CONFIG} --libs ncurses`
 +		else
 +				AS_CASE([$host_os],
 +					[darwin*],
@@ -69,8 +67,6 @@ index 1676ec8..73c8be5 100644
  
  
  # Checks for libraries.
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7640d21..17a82b7 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -37,4 +37,4 @@ hstr_SOURCES = 						\
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
index b2332147a9b4..3c117b21f991 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Shell history suggest box"
 HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
@@ -22,12 +22,18 @@ DEPEND="
 
 DOCS=( CONFIGURATION.md README.md )
 
-PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-ncurses-configure.patch
+)
 
 src_prepare() {
 	default
+
 	sed \
 		-e 's:-O2::g' \
 		-i src/Makefile.am || die
+
+	tc-export PKG_CONFIG
+
 	eautoreconf
 }
diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild
deleted file mode 100644
index 95a0c74991ac..000000000000
--- a/app-shells/hstr/hstr-2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Shell history suggest box"
-HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
-SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CONFIGURATION.md README.md )
-
-PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch )
-
-src_prepare() {
-	default
-	sed \
-		-e 's:-O2::g' \
-		-i src/Makefile.am || die
-	eautoreconf
-}
diff --git a/app-shells/hstr/hstr-2.2.ebuild b/app-shells/hstr/hstr-2.2.ebuild
index 08f0c98ba78d..0033ce507cfd 100644
--- a/app-shells/hstr/hstr-2.2.ebuild
+++ b/app-shells/hstr/hstr-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Shell history suggest box"
 HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
@@ -17,17 +17,24 @@ RDEPEND="
 	sys-libs/ncurses:0=[unicode]"
 
 DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
+	${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( CONFIGURATION.md README.md )
 
-PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0-fix-ncurses-configure.patch
+)
 
 src_prepare() {
 	default
+
 	sed \
 		-e 's:-O2::g' \
 		-i src/Makefile.am || die
+
+	tc-export PKG_CONFIG
+
 	eautoreconf
 }
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 0646a2562ffe..4b4c7ceea156 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -20,6 +20,7 @@ DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e5
 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom_package-0.1.20.crate 883 BLAKE2B b72ca1dac1e8745b3a8b49423c73340b0876eb507ecefb619bdc47c48b1320c2f2653bea9f370c0988b3103ff543ac6c22f915b7c48ab108af15126f8187047d SHA512 6152ce07fabbbb3176484e38493dc1099ebe4a56b573361a92fb624f8bb784ecd8f16f8ecdef988699156aace636548c8300b205371a90fbf14379cb257b41ae
 DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
@@ -29,6 +30,7 @@ DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
 DIST mcfly-0.5.3.tar.gz 201851 BLAKE2B e9be0b18ca8bfc423fd01634544f8795da3334f69c3a7fb1782322f96daa41d954ac69af88ea76294b4379fc5acd3aa677e92cb2ecc72df0941347b735f259ef SHA512 058a2cd95eb6f2bc0ff7af4f56b109e18624e86c8924da96d79ec032aeed11c5a710f38216ee9958d8affedbeee429241bae4a6fa5570d7812becfb2f4176632
+DIST mcfly-0.5.6.tar.gz 202647 BLAKE2B 9acd3eb94c3c36991a2f990d9cab8b327e064e639651c1664e2306ed3e2716609c0c9e8aeed8e4bf26c0e5daab078b61f982342ab06964bede644dda039ae341 SHA512 0e715a292df56170056aef3de9310671e6e6763741b5b918c14f55d74f24f8310a284e22e7697b994d304044a7fafdbc42049694b688f05c5598582ea743da1b
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
@@ -63,4 +65,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD mcfly-0.5.3-r1.ebuild 2166 BLAKE2B 10190f9501ccd89ccb0d3e982cce820aff107a6812f0edfad6a9dcdd62efcbd7fa08d1d46dada41ac12218540cf2806f8cd3d8c3a3a8bee84149f6f0afb1dc6a SHA512 8282d58d80feab34defd073b9c4386b9961335cf1394ad5ad6931b7e722172fa59f86e0349501b6b14aeabb5b5d5889027c6db9b0f5a54ef40d797b106a1e309
+EBUILD mcfly-0.5.6.ebuild 2190 BLAKE2B c926c5b3688ddf33d86cb8988109bb02b0d47e157ebf229b22ba443562d2485b297ade3f5a5f7a0e5c0f5e87e8dce8accb0599fe051c32a4e0b3c0d51e4c5c1f SHA512 52c9103b3528dfbaadfbddea4d447eb16e79f099792291f262c8de37f36adf69b68497579ffba2cf710782053cca8222e5c66e74dc160f16bdb9b7495e0b5116
 MISC metadata.xml 905 BLAKE2B dc23375a7d313454fbaf67f8b5312fe0acd5b9acbc5ed597fcb0027ea420519ef230b245eed61dbdc3c8779a5f87af18be5223c7cf9dcaa0e9619facad93442f SHA512 cc6209e5eb422500ff6a2d50c43424f1da0fb628929aa2093ec5ee844ef3d0afc5f234a4ce95c5edb5bf89d9ad60f624663d4d7e70f32a8b07ae02cb6cb0809a
diff --git a/app-shells/mcfly/mcfly-0.5.6.ebuild b/app-shells/mcfly/mcfly-0.5.6.ebuild
new file mode 100644
index 000000000000..8873fee30d3b
--- /dev/null
+++ b/app-shells/mcfly/mcfly-0.5.6.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.10
+ansi_term-0.11.0
+arrayref-0.3.6
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.0
+base64-0.11.0
+bitflags-1.2.1
+blake2b_simd-0.5.10
+bstr-0.2.12
+byteorder-1.3.4
+cc-1.0.52
+cfg-if-0.1.10
+clap-2.33.0
+constant_time_eq-0.1.5
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+dirs-2.0.2
+dirs-sys-0.3.4
+either-1.6.1
+getrandom-0.1.14
+getrandom_package-0.1.20
+hermit-abi-0.1.12
+itertools-0.9.0
+itoa-0.4.5
+lazy_static-1.4.0
+libc-0.2.69
+libsqlite3-sys-0.10.0
+linked-hash-map-0.5.3
+lru-cache-0.1.2
+memchr-2.3.3
+numtoa-0.1.0
+pkg-config-0.3.17
+ppv-lite86-0.2.6
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+redox_termios-0.1.1
+redox_users-0.3.4
+regex-1.3.7
+regex-automata-0.1.9
+regex-syntax-0.6.17
+relative-path-1.0.0
+rusqlite-0.15.0
+rust-argon2-0.7.0
+ryu-1.0.4
+serde-1.0.106
+shellexpand-2.0.0
+strsim-0.8.0
+termion-1.5.5
+textwrap-0.11.0
+thread_local-1.0.1
+time-0.1.43
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+vcpkg-0.2.8
+vec_map-0.8.2
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Context-aware bash history search replacement (ctrl-r)"
+HOMEPAGE="https://github.com/cantino/mcfly"
+SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="/usr/bin/mcfly"
+
+src_install() {
+	cargo_src_install
+
+	insinto "/usr/share/${PN}"
+	doins "${PN}".{bash,fish,zsh}
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "To start using ${PN}, add the following to your shell:"
+	elog
+	elog "~/.bashrc"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.bash"
+	elog "[[ -f ${p} ]] && source ${p}"
+	elog
+	elog "~/.config/fish/config.fish"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.fish"
+	elog "if test -r ${p}"
+	elog "    source ${p}"
+	elog "    mcfly_key_bindings"
+	elog
+	elog "~/.zsh"
+	local p="${EPREFIX}/usr/share/${PN}/${PN}.zsh"
+	elog "[[ -f ${p} ]] && source ${p}"
+}
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 1c8a4048349a..089604bebc69 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,4 +1,4 @@
 DIST mksh-R59c.tgz 442736 BLAKE2B 4e1b6e6fc69b27d01e262a5622191515fa71d29e81a3f10fb60458542506874b49f60f9af1e28c1cd266c63c91e3287579ab6bda00c39b7388445b19c969fa22 SHA512 f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340
-EBUILD mksh-59c.ebuild 1670 BLAKE2B 08685aa312d079dbe4ecdd949cba7ee2d6827b51a7f18228b5b2884abce29326414c40ad3149e09083b8a7007f5cd180dfe494745c84f264cec8bebf2f73c901 SHA512 3096facaedafef124771d462d1033adbdc06e31f2c32201c5701bf69e01ecfa31b1b92c1ee0de8438543cb86f16b4bf1dc2b36223adb24009ed583f7b07c976c
-EBUILD mksh-9999.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
+EBUILD mksh-59c.ebuild 1670 BLAKE2B 280eb2f02ed77dd96e2c174c7d11a4609ec72c069da95ec5a2174fa96029f3648866da75099853f820ba64f70b7b48cc112d9b2fd42ca6be0f0d8e856cd0f6ca SHA512 c175cc225ce9d3aa8cddecb40a4620241e7ecc902fabd53f0689ab29aa492936237cbfcc9c8a8d3ee5d510b464c33970ebfa644b9fc561a85597f06837d37c52
+EBUILD mksh-9999.ebuild 1677 BLAKE2B f982dd420a14f10299e9109dbdcc592941e7b1a928a911756df854e30bf62161b34bfa63814295606334192beb4d4659bfb28301d44091561de78bc42669604e SHA512 11045c9d7a2284c090afdd37f17f53d7bcb98898c8a680a458273eca5111302e7227f44fdfda9e196e1d6c984b5d94f20479e75a0caf5f60efb4cea3c6ec16bd
 MISC metadata.xml 595 BLAKE2B be131f5babf31d1c99d0e744fdaea55fe9e3eddaf23464de024bf103b3064b53786c30cd07d95ad284df2bcbf62cec4c2df6c8a9b0de0026c2745b4bce30c04c SHA512 e60a0606ef2ecbddc1c4a0f4180714ae75b24ca9cfc011b017502938e74cb0d8bb6a69759e8ce727b06c9d863bccb2ca6ddfb19bb7551b3c74c6912e7847d862
diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-59c.ebuild
index 281e6b0e895a..e66f17ebd1bd 100644
--- a/app-shells/mksh/mksh-59c.ebuild
+++ b/app-shells/mksh/mksh-59c.ebuild
@@ -6,11 +6,11 @@ EAPI=7
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit cvs
 	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
 	ECVS_MODULE="mksh"
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
+	inherit cvs
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
@@ -57,6 +57,18 @@ src_compile() {
 	sh FAQ2HTML.sh || die
 }
 
+src_test() {
+	einfo "Testing regular mksh."
+	./mksh test.sh -v || die
+
+	if use lksh; then
+		einfo "Testing lksh, POSIX long-bit mksh."
+		pushd "${S}"_lksh >/dev/null || die
+		./lksh test.sh -v || die
+		popd >/dev/null || die
+	fi
+}
+
 src_install() {
 	into /
 	dobin mksh
@@ -71,15 +83,3 @@ src_install() {
 		doman "${S}"_lksh/lksh.1
 	fi
 }
-
-src_test() {
-	einfo "Testing regular mksh."
-	./mksh test.sh -v || die
-
-	if use lksh; then
-		einfo "Testing lksh, POSIX long-bit mksh."
-		pushd "${S}"_lksh >/dev/null || die
-		./lksh test.sh -v || die
-		popd >/dev/null || die
-	fi
-}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index d1e1e13e083f..c94ae683a150 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,11 +6,11 @@ EAPI=7
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit cvs
 	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
 	ECVS_MODULE="mksh"
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
+	inherit cvs
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
@@ -57,6 +57,18 @@ src_compile() {
 	sh FAQ2HTML.sh || die
 }
 
+src_test() {
+	einfo "Testing regular mksh."
+	./mksh test.sh -v || die
+
+	if use lksh; then
+		einfo "Testing lksh, POSIX long-bit mksh."
+		pushd "${S}"_lksh >/dev/null || die
+		./lksh test.sh -v || die
+		popd >/dev/null || die
+	fi
+}
+
 src_install() {
 	into /
 	dobin mksh
@@ -71,15 +83,3 @@ src_install() {
 		doman "${S}"_lksh/lksh.1
 	fi
 }
-
-src_test() {
-	einfo "Testing regular mksh."
-	./mksh test.sh -v || die
-
-	if use lksh; then
-		einfo "Testing lksh, POSIX long-bit mksh."
-		pushd "${S}"_lksh >/dev/null || die
-		./lksh test.sh -v || die
-		popd >/dev/null || die
-	fi
-}
diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index a0370e3f7807..bfd73bd1e0b6 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -1,3 +1,3 @@
 DIST posh-debian-0.14.1.tar.bz2 208385 BLAKE2B 0670d529f0d2f3b27e212d0efd66b42de4d37a6ce99f18d6fdd0b681a61ed313df5a9cecfee840eacb95df73b611fa3fa24163529d59423a3c0ac3f33bf5cccc SHA512 2beb8af9edbc318da243a82e1fbaec4ac81ec166b3e602f6b37867e4bbe548247a299dd748df4da88b2ff2930785945d91c5b84b563c339bc239299ecf67beec
-EBUILD posh-0.14.1.ebuild 613 BLAKE2B 605d2e8f93c8522d898b87fb26b67c72ee89811a9913cf5ffe9b98d70c33e3236b3cd87623d039c02f392247ba6ceee09d9fd3ba5793725a054c581e76356d26 SHA512 440cae993fa6278eac079691cb1c025296b12be156c9b452024d17268889d0c1794638f91bf79c652d77bdb10efc5104094ebf149545aed9746c6b5880fd93a8
+EBUILD posh-0.14.1.ebuild 577 BLAKE2B 9465a46ffc4b8c242c253d0507d6b290c7df748f53802eb3c4f8a9e33f06f86eeadee814721c1e6ebafdc236add85ffb758bc633019cad7caccaba4921bb27e9 SHA512 c22337831f521f3e41808fa3509bf403c05ec97c3a454d7b5a10e5c2ddee9bf22a033fcf306971762eed688905b25b55186da3ce7b173b946b28637eb13c2108
 MISC metadata.xml 217 BLAKE2B 2c342b84369a3ba13606f35f163ee0aab11a086c23c83066fb5fd7d0ffcac5282b2cbb228982745c8ae1c1575b7d1605556f3562175ee150de6c701d86e347c8 SHA512 94cad0e7f10d53a2ee488ff9be4c417377f7cc6fed1ea4bad878364978cdbeb648974764477a18d2b222ad9111082ef0e00b14832ec7318646a47b56c58c828e
diff --git a/app-shells/posh/posh-0.14.1.ebuild b/app-shells/posh/posh-0.14.1.ebuild
index e2a2f5104576..98d4635a2a89 100644
--- a/app-shells/posh/posh-0.14.1.ebuild
+++ b/app-shells/posh/posh-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,9 +15,6 @@ S=${WORKDIR}/${MY_P}
 LICENSE="GPL-2+ BSD public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
 
 src_prepare() {
 	default
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 7cdb20bb9025..6c5baa101b68 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,5 +1,5 @@
 DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
 DIST push-3.4.tar.gz 2839 BLAKE2B cc7dcdb0208b1eb9d36963acbbc1e0c852c4164d5ba2a35bd52848338bab7f66073c9c780c82e28b3f1bdd55d81f26f5281694ba76214fd7631f946e0fdc199c SHA512 aa118f42210b40d790c0b274045ff45c2067cf894731228f5065eb44a723fd813549204797c365329f409e36f564ec22f6d956341b1f2b62964b918e76991344
-EBUILD push-2.0-r1.ebuild 620 BLAKE2B 89f4886c11fde3b8517b3074762106c064a5845c007531d443c03d856ac4ece3c7c3c75919a4b102b3a3e31315532f8b42968973ea637762fac72b82e3d8a243 SHA512 ded5e16ddb090c0a7755dd60b349ae29f1f0c8ac43547a16f4885d47396d80f94a345bbb52ed21d5a6e11784b66bcc7ba9ac8a69221bf7c79e95dfce6cf6fb4e
-EBUILD push-3.4.ebuild 637 BLAKE2B 6f07c0760ba128436384b080bbc129a204f7d7a20478dc6dd3aeaedbef84ccfbf1115ab6aac98eedc98c90f96925e2b449164164af922b5ecb62f321b59c0a1c SHA512 a0b46d08a44eefe76b82297e2335d42d558c07e57b4e71763c66d76178ea3ce5765a6c8f03063bd786f2ec925600a52d3aee4992a09326a38ec992c0112703bf
+EBUILD push-2.0-r1.ebuild 621 BLAKE2B e39739ad26722cbfb26638d9a896f84d3edc82968c9ca181c165c9cc6cfa025c043d1acc2f6051ad3c16bcf66d960c5eaf7ce7ae031ac6d24f0fe755653d1269 SHA512 604731f23b1d82090668971c46030e31c891e049899c87b8d5944905e9ca47e03c8e06febad7847693e406410d93344d823f11e82a8662e3254d5f8555dda214
+EBUILD push-3.4.ebuild 638 BLAKE2B 0894e435d3cdde944121e7d647c2949823f16723ee39968791e54258966d949983ab210c9cb0048f48267025335ace99c9f4d17829653a816390391b83ba101a SHA512 08001b4ae1e999156052bd85f2c0d56c0cc598aad5032662eff336809f441cffe44a91c2862639610797ce154ce60f51a27358a269df7e9a27bce14b50032a10
 MISC metadata.xml 737 BLAKE2B b64b1dae15d9407cdb648b3f994f15f8f408291d7ac95d396054b6c134705440572564437df1f01250ae8c96f3bfbcd0588df7fc7b844d4ec66868b7cf8c5e17 SHA512 e799dcca6af8e1fd5b2b6f79c3bcebfc0d413205428070d4dd0f712aacf5b8e54b1f5b1e84bdc4480cc186df1d8223e70300f361c018f01bc8d0e408bb97145b
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index 8703d5d2b912..0b0c030545bc 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/push/push-3.4.ebuild b/app-shells/push/push-3.4.ebuild
index e6bb2c8e3cc0..c819b031441a 100644
--- a/app-shells/push/push-3.4.ebuild
+++ b/app-shells/push/push-3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 src_compile() { :; }
 
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index 8c5b084879ac..d5fc06b78683 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,3 @@
 DIST quoter-4.2.tar.gz 11128 BLAKE2B 6b13a8eabae57c50c12dcbf9a65e28990ee6d74ee2c45c4a6127f5ed98c2ae029fd5d00f82444c46ab6a21057c6279e9f3d19c432f921d04ca3bf3eaa9507cb0 SHA512 0080ae6d5f5308b9e2f9e414619049f10246c221a9524f9f0dc0d329af3592694ae9d6ef6a086615b895c5f6598fbed7ec7164b5a847d11108fbe3687316c02d
-EBUILD quoter-4.2.ebuild 739 BLAKE2B 0e1cbda6e96a1db548442639b62bb230979d75897905ffb1b6f3907decc39a4212a25475d060f2ba73b14fd701976894d72294a6a9876d0f4829edb89a93bbfe SHA512 bc18ab71e72a702cddc099f17a96d21b9c235e3690b1c80d59b8d1e01349425b2c6cd4bb4d4ade4ac5f96006a4e6d37570f1234dc849df6ec856d2dd93c35713
+EBUILD quoter-4.2.ebuild 740 BLAKE2B 1945f135cdefc13ad59eb7232889ed70884e97e4dfe8321cc9259f2f85a6127c5a942483e2a430a7acabb855655386c8c12be7bfb9fa51fc950485bdda024700 SHA512 c0a407386803ac859ccff782e69b7df113be3e5c184970c41d6f169b0c5b0cbf3840d706137219bfad631a8314245b686f236dd16876fb6515769d6594f7e73d
 MISC metadata.xml 714 BLAKE2B 9d6a9477d138f59c78f61104957d666f0b31f13c27ace4fc0cddaeb4e4845e612a4341edd65fd4ed898b4d694eaf9e9aae11ad70ad641df4ead3a9757aad0fb1 SHA512 330770668bc41847ec6605cade82a2170b897d3de2a3c970a9b30b77fe9a551b20e52cde1181de2160b396c723f5191d93a508f685fade4aa522658ee9fe2178
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
index e88b2824b1b7..3516054fa1e3 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 src_configure() {
 	tc-export CC
diff --git a/app-shells/shish/Manifest b/app-shells/shish/Manifest
index 6e5c7ceeaf36..90f4f0171bc9 100644
--- a/app-shells/shish/Manifest
+++ b/app-shells/shish/Manifest
@@ -1,3 +1,3 @@
 DIST shish-0.7-pre3.tar.bz2 189207 BLAKE2B dc5f12bf75da6c1843a0cb2f35d3d4e06bd65082598979c07cae55dc56cc25eea77a2727ab1848d42a969b87b36a30cc27b392f24020435b2a207e86c7ed7a0a SHA512 b8269394a3b2a06d1ab48224b81c041ffa4b0a08d6849fc8081fad38aad34e179c12198a1b8e94703cf17e029f88068af87ffd2ef4051ff8e24886fa96b39c98
-EBUILD shish-0.7_pre3-r1.ebuild 1124 BLAKE2B 15d0dba2a89c86a694027b9c3fece9832adc7a4cece5f3788098012dbc9b91c97161ebe7acc99ef1afb3d8836bf36bc7e9f03bccb42a0a303ffa6b50563391ba SHA512 10b5f2efa21a3972be694a020fe7224837b07548c0aa3b1776135dacebc14d493b5d7737e68a19fa2345f42f07ee324d650ec29195fe775d8cf22c33af6c3d3e
+EBUILD shish-0.7_pre3-r1.ebuild 1120 BLAKE2B cab7381850a95d8c5ac9548d4734d02d9c19065515f6cdd389728b47cf06fa5f4b47ce42155011095141a17e6727bcdd986c8ab06a2261702e020c3c6d35226f SHA512 238a2f5fdda6ef3fb2479661ba74356a0cc835ad130aa349d91b24fb168a1a59f781c62d8d9ffbcb9c6301133183254597b833a6963eb9256aa03ad52849da60
 MISC metadata.xml 239 BLAKE2B b2686587f8cce11c2771d4e8e6c71108e2665261561a6c89c7a0a57d5cf70866ff643761b3a3f7f5a85f35b180f62b6fd77cfa5e22a02e9b6b5bd463b4c6aedf SHA512 4103ab440f482f120bfa4fee4954d61fe78f020f7d15da74294223ea361a4d952495c71533ced054585c7001fb213d93a554f3caf4538f973bd7e7ce371f5398
diff --git a/app-shells/shish/shish-0.7_pre3-r1.ebuild b/app-shells/shish/shish-0.7_pre3-r1.ebuild
index 11fee89ec6d7..10c7d469d2dc 100644
--- a/app-shells/shish/shish-0.7_pre3-r1.ebuild
+++ b/app-shells/shish/shish-0.7_pre3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -11,6 +11,7 @@ MY_P="${PN}-${MY_PV}"
 DESCRIPTION="The diet shell"
 HOMEPAGE="http://www.blah.ch/shish/"
 SRC_URI="http://www.blah.ch/${PN}/pkg/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,15 +21,11 @@ IUSE="debug diet"
 DEPEND="diet? ( dev-libs/dietlibc )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( AUTHORS BUGS ChangeLog README TODO )
 
-pkg_setup() {
-	use diet && export CC="diet $(tc-getCC) -nostdinc"
-}
-
 src_prepare() {
+	default
+
 	# Respect CFLAGS, bug #439974
 	sed -i \
 		-e '/CFLAGS="$CFLAGS/d' \
@@ -37,6 +34,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use diet && export CC="diet $(tc-getCC) -nostdinc"
+
 	econf \
 		$(use_enable debug) \
 		--disable-quiet # bug 439974
@@ -53,7 +52,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Updating ${ROOT}etc/shells"
-	( grep -v "^/bin/shish$" "${ROOT}"etc/shells; echo "/bin/shish" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
+	einfo "Updating ${EROOT}/etc/shells"
+	( grep -v "^/bin/shish$" "${EROOT}"/etc/shells; echo "/bin/shish" ) > "${T}"/shells
+	mv -f "${T}"/shells "${EROOT}"/etc/shells
 }
diff --git a/app-shells/smrsh/Manifest b/app-shells/smrsh/Manifest
index ea4a98165910..00fbb272dab0 100644
--- a/app-shells/smrsh/Manifest
+++ b/app-shells/smrsh/Manifest
@@ -1,4 +1,4 @@
 AUX site.config.m4 524 BLAKE2B 79841306c8d161fa2f96deb2295acacf6d6c5e26519fa4fb92bddcb7fc29d862cbc297ac242b355165571f2a78eef4e5ffd97c47a31710956ab98e24aefb57ec SHA512 9461e85b83fdf8d13649d1a63ae630ce91c94c8707237f8855c0a5567e550e08e3f7b5297c105f9fa5a8d5639dd5f411245191ab1c3ac5931ad0ae6b3251577d
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
-EBUILD smrsh-8.15.2.ebuild 1172 BLAKE2B afd0972cc1e481836a7789aa84fb5313cc96adf00dbd9827b6ba9623a1f61824ae65eafbab6c10ac9bbf8748ba0056130ef9569d35de7ba482fb6829c4d60fb3 SHA512 8cf7eabb2b0a96dd02f1e9833e3292b659271161cd2381809297acb3a0a60507ad65e9b1b1fc112c4720f90364c5f42b9b5be6ede72fc42186716d27443e2b73
+EBUILD smrsh-8.15.2.ebuild 1170 BLAKE2B 965c846aed8a69ebb0504b7578b683902e681a08e0bae30f87f4603b7fa672f4dee307d112115334a6eb0a5ec7ccf08388bdd8b91e3c95c585d729082c7eb2c0 SHA512 064aa3e7e472bb548c955365ba22ef72c96b83c695ca586129d5de6e1126d9195ae7946ac647dd90681d33f1367fbc5605be8cd271ccba080aa5b5bae5d3128b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/smrsh/smrsh-8.15.2.ebuild b/app-shells/smrsh/smrsh-8.15.2.ebuild
index 5679f879ea94..d253f8f3657c 100644
--- a/app-shells/smrsh/smrsh-8.15.2.ebuild
+++ b/app-shells/smrsh/smrsh-8.15.2.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Sendmail restricted shell, for use with MTAs other than Sendmail"
 HOMEPAGE="http://www.sendmail.org/"
 SRC_URI="ftp://ftp.fu-berlin.de/unix/mail/sendmail/sendmail.${PV}.tar.gz"
+S="${WORKDIR}/sendmail-${PV}"
 
 LICENSE="Sendmail"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="!mail-mta/sendmail"
 DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/sendmail-${PV}"
+	sys-devel/m4"
 
 src_prepare() {
-	cd "${S}/${PN}"
+	cd "${S}/${PN}" || die
+
+	default
+
 	sed -e "s:/usr/libexec:/usr/sbin:g" \
 		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
 		-i README -i smrsh.8 || die "sed failed"
@@ -33,8 +34,8 @@ src_prepare() {
 }
 
 src_compile() {
-	cd "${S}/${PN}"
-	/bin/sh Build
+	cd "${S}/${PN}" || die
+	/bin/sh Build || die
 }
 
 src_install() {
@@ -44,10 +45,9 @@ src_install() {
 	doman "${PN}.8"
 	dodoc README
 
-	keepdir "/var/lib/${PN}"
+	keepdir /var/lib/${PN}
 }
 
 pkg_postinst() {
 	elog "smrsh is compiled to look for programs in /var/lib/smrsh."
-	echo
 }
diff --git a/app-shells/soapbox/Manifest b/app-shells/soapbox/Manifest
index 7347cc116fbc..c1b9ecdf5744 100644
--- a/app-shells/soapbox/Manifest
+++ b/app-shells/soapbox/Manifest
@@ -1,3 +1,3 @@
 DIST soapbox-0.3.1.tar.bz2 19947 BLAKE2B bbf271d1e48b43e1aa7a274e0020b69a7f389374b7ac14ec2084bca4cd8f1cc5312082a33e6f79527dd92756d88631eb77a37256d0315c45853bab0176a8a95e SHA512 c74420e6ea7e088347c897c275095fce5ecd093af9eb7f95ece4959d174fcc79e600704b6116ba9f36534fc8139dee70393db33ab22cd8f870cd77c449e2f430
-EBUILD soapbox-0.3.1-r2.ebuild 850 BLAKE2B 3bd2889bd5f86f195890f63404f1efae39cd895fb081d912c0059ec270e9724ada786931ffa7570b61b56f0ff5cfd0854d5ea8b4fda640772be0187b04fae481 SHA512 f1b7327375bfd4c6cbf3fcc6a3fecacc120fd005e430d7cf76e3924b76be4eee3cb4baaf9f921fd27b49439036a39bcc62ab5a15b2813a004a335c7339628067
+EBUILD soapbox-0.3.1-r2.ebuild 841 BLAKE2B 431af2facb01d80c78a8190e6def956c642c1d5c96c01e783ad892817d33a21185488e76d4e8ef0e29a635e1c66242f5f415749f3e35fcb3cf3dcb42ccc65901 SHA512 38fbb706d94a09c30a5e524cce4e1fbfeb117ea4510971716a82afa18cd2c951d042ef8198b042bb96916a53c18933c571a4934f759f50f476ddc23b292d95d3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/soapbox/soapbox-0.3.1-r2.ebuild b/app-shells/soapbox/soapbox-0.3.1-r2.ebuild
index 0dee6af50c31..b8ded42ec5eb 100644
--- a/app-shells/soapbox/soapbox-0.3.1-r2.ebuild
+++ b/app-shells/soapbox/soapbox-0.3.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A preload (sandbox) library to restrict filesystem writes"
 HOMEPAGE="http://dag.wieers.com/home-made/soapbox/"
@@ -12,9 +12,10 @@ SRC_URI="http://dag.wieers.com/home-made/soapbox/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
 
 src_prepare() {
+	default
+
 	sed -i soapbox.sh \
 		-e "s|0.3.0|${PV}|g" \
 		-e "s:/lib:/usr/$(get_libdir):" \
diff --git a/app-shells/squirrelsh/Manifest b/app-shells/squirrelsh/Manifest
index 6f636fdea837..a2f8ba4b3cba 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 1167 BLAKE2B ba7db136e263b1bfb66376490a8202f35ee61284d1600f4c7b2cb60a3f4fc8e927402ec11622f4e8d08f8b731720a51b0f1083d7bc409b0260941ab0e64cba90 SHA512 58aece63e60420b1561ca26e154a09ebdeb745eb83d7ec48ba3beb67097d9edc3f917b4bcdd3e49645a8b63a8eaeaa84dc8a82cc4539d2724cd56b38dbf3c0d0
+EBUILD squirrelsh-1.2.7.ebuild 1176 BLAKE2B 72c1895670ffb0b9f64d71dc4727238f2e8822c88d95502926d31bf08952032b7f5b613ea9b6478d90b36af443c549a767d40ee28fe816d24bb2c1052fb787a6 SHA512 9e4e55135edfb6ab009bc3bc9471d3a820114ac62057cf8d9355d243c668f2eb6c56165f0f77fa0bc1f5b1e4239383e52556a1f73e2101564b0fae3daf368950
 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 fd133167dcdd..2a89668fd0ab 100644
--- a/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
+++ b/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/libpcre"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-rename-LDFLAGS.patch
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 423c3b0e5c7d..cfefcab73099 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -5,5 +5,5 @@ AUX tcsh-6.21.00-no-nls.patch 386 BLAKE2B 5df1b205d76e29b68530f50b661329e851ce46
 AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1d6f3c41cb30d8eb22181cf053bbe39302c9dcb14191383e755f47c08fa1a0dd3fc20cc7f813cf9737e60850327a7e71 SHA512 eef51644cde4bf27a614a1f099b5f21e46600ca396e4baafa6ece005f3fb4901ab1862176ee715b7294216894f6a2d84c1a5b1c38c1086cf95914f6f44358595
 DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34becf02eda8802d7f5e2194082bf96c46323d606c2e6bd2a26aaed303bae3132d03515274407c63b713583dde7 SHA512 32d271b568c63265ea4c98494f5e60b37c3a3fc2594e8763b8f6f0b09018ab9db7ef6f951120b37f7880ccf04ba3a2559e30dc08d24f4ba9dc36853238d55980
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
-EBUILD tcsh-6.22.02.ebuild 2847 BLAKE2B 24cc441ec48f6e2004c681b0695c4c46376e1232b0b7708d84aab36705a5c007313360080716adab2853a9f7cf703eec121f7134f8179eb5373a7f5f3322eef6 SHA512 cc65db6bd80685b28e5bab9032ebfc195bdc1011c5210509582d5dddcd859b7f9db4350b6d4d57d51916541bb90d1b8351469185f66fffb79ae42927ef45b34d
+EBUILD tcsh-6.22.02.ebuild 2848 BLAKE2B 69a2feb7be32236da46fbec033e30ecf3645d3ebe4f82ae4a0fb3d3686e0ccad57746d086a8cffa36c697e45c2b1638793b38b1d687e02c26d0b3e4abf9e02f2 SHA512 8dbe5a06213546dd27b940a472bf158e7424ae55e570e83d903d6b9e5b7575b070f48dc701401f619ba194b1c4d9199fb43d130ca420b2fa544635ceae60c0fc
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.22.02.ebuild b/app-shells/tcsh/tcsh-6.22.02.ebuild
index 5170f861ce10..b5d2662737f5 100644
--- a/app-shells/tcsh/tcsh-6.22.02.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.02.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic autotools prefix
+inherit epatch flag-o-matic autotools prefix
 
 CONFVER="1.9"
 
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 86c774085d8c..2cfff0c867da 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST zsh-completions-0.31.0.tar.gz 247806 BLAKE2B 1923013feab9800f2dd0eef7b2263b0e252dd35b21d865e3f42f7946eeba2d1a882179e05fd16fdf473006646896ef87ca1da5cbc9bf69b52c66bcf99e82c010 SHA512 3f707e96c5d08103359304905cd36889d2b8dae82f0ea3781048a8fbd2f1db509abc1a181dc75215552214a59ee532d207897167fdb3850a5b1cc40e13b2b108
 DIST zsh-completions-0.32.0.tar.gz 273885 BLAKE2B 73400a13543f63c45fd32d78752f0294e3eaef9a63d41700aa004e445f123673c8bd8cba7aa3c0969fee0e188ea019b3f92cae2a6de341bf9b2f0f5842792785 SHA512 f1ef5dab3343675a9d82f6df0db4f541196d1904386becc94753b69a4515229ddcc133fe491c33e4a736ea0789c667f50306e60fbe5e61b97d0b3fd4946bf69a
 EBUILD zsh-completions-0.31.0.ebuild 818 BLAKE2B fd9238a601a7fb790cb9736931ac8211ebd2b5cd8ec192286d3ab86917bc3c2d53dcc42f5b7d73b678c9912df61d4b69973236183cbc4d13ac971568714f372f SHA512 e02e1d59619fd1ddf24ba39f40dc92e4628438bfa7ecc45d3fd02af754c3376088160450bd6723809b1f20d291273f586d69a637436ee930cc3d0b25102c1c8c
-EBUILD zsh-completions-0.32.0.ebuild 819 BLAKE2B 61e533c9d46fcb94e9a0f8b7fb53ccaeff60a676e22c958e044d83828b3f18736cc3f52dd6e7b936dd9d2e85630bd80e42738f99da53f22b3e5de4614ba96d70 SHA512 721b5c31f558ac75e65d610085e64915dbdb8816941449258ca1e1e08b1b2e975fa1dbc3278678e1f82b9c9a93e37c672ea1477be5cea22bd7c96dda9e5b92e0
+EBUILD zsh-completions-0.32.0.ebuild 817 BLAKE2B 0316487f3fcdff889bfec03a72c792468bce8cdc36dc1b0339f827045a4ec258d8bf4ad7f754244b5f8237465db9f606279405f218af6f0e78c8f5bffaddc379 SHA512 a71de29396fa8d94495d1ef00b53a844cbec0ae2dacaa851b73852987390f5b91970e8a1345a260e8ddff0a65b792369eb4723e49a86b0cd7e68c248193da215
 EBUILD zsh-completions-9999.ebuild 824 BLAKE2B 0a600a312e772b208d2d5ed551a83a5932caa643cc9690f06d97c61566f4eb30099a8e895ac1e11c51034d1cd5359eb937a1b0689ec782d1e204c8ac859f3cab SHA512 05404cb95a57230944e4c83636634a7b1a34674dc2cad14243d86dde54453b9334461f9e348561a17d51113ea3c1da3960debb483a8427da6cedfce4449dbdf6
 MISC metadata.xml 287 BLAKE2B 4fc6f5facc5b1a0002e5910677c2a10bc05bad985b664bf1b0369c31803594b2360ee4b74c05ed08115b2c5c7f696fd5ef1fcca60df9744564b6051d59a2c142 SHA512 801d3f30ce96bb8acd812bb4e34f447717c886b05f6dc328dc375ed896f419a15f964f5a808682a9977cb0c12ead6a1cd78657f3f71e18d4a57c6616865558b1
diff --git a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
index 7a3a90c7a581..04ae1f13c3f6 100644
--- a/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.32.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"