gentoo Easter resync : 12.04.2020

54 files changed, 329 insertions, 299 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8a3def0eff60..654a91c48a09 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 fb2da841cd33..e739bc400d34 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -2,7 +2,7 @@ AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162
 DIST bash-completion-2.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c9578104aa4c8c736801fd27c7268e4de70424eebbb5d1e4d1841273b1c4e169da4f369f2f65276349ead4aa7944aa193b2 SHA512 d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.10.ebuild 4698 BLAKE2B 69c4c1682b5f0114965c8909678465760f5bd6e3971b049b9fc7c6a0870d451470ef0135b00cdbb7e21439bddc1204545c6b22d542f92a4ecf08d9454aeffbe1 SHA512 8d0d0a8d1681237f22a5890e8d6d6851ef781940b6fc06934e4179ec20bb7ba0a5da4c54b308aa1ef8154af93f2fcb5b844215e133f707f0e42100495571ac71
-EBUILD bash-completion-2.9-r1.ebuild 4774 BLAKE2B 9bb5a015182ff6e6b96c078f4d2c884f568a6d68a3c88be901db9d5fd4cc0ed02e08af3b007af112c3dbed6073231d57663a0ee25238875a04df66cd17b380ac SHA512 739563c3ebfef2b455b25cd3cfaac7cedb43c9872cfdb47afe93591b59052a7dc073b87f4ea2b719e22c4e0ce78c151e2930cdc7430700b793d7e3c472ba8409
+EBUILD bash-completion-2.10.ebuild 4694 BLAKE2B 513fbe0f35bb1fc7cb2865ed7ac6fd3fb6a1168833cc254c31777d31c06d8ec3c9189010cb0f7ecc7ed5dea3388975c42f849a364e897af446d73cf249226d02 SHA512 f2c8c3da453145f1b002410048c44e579dbc42babd1d58cf153f3925e7f62018e9db37a776338ef09ae2e601cb2abb24d748b74691578b960e92524f6ad34113
+EBUILD bash-completion-2.9-r1.ebuild 4771 BLAKE2B 3a4848e0ad8c489b24868a9fdad27ecbf8e64734395e5a48d96dabcc2a335ba02feb96bdbe988a1ac675ca688090672e800d3baabdb83ec6c75fe383225beafe SHA512 34e8ede11736a4382c0049c1b4152473efe8f27c38d895416e83c19b40af0cd64461eec30dac9f8f8dcdb3d1e1ae734540236c3ad8dcaff23b999d3ca37e12a0
 EBUILD bash-completion-9999.ebuild 4702 BLAKE2B 1f8284b4cd7f93912eccdc0e90a6ff65939bc1df16d2701783bd1f00afe49c60701819438dd95548ca4654ef83713a6a644cecfaf1d642d537882e0eb147ec76 SHA512 46cb8472ea55fd468eca090474a1488389427265f9eb1d20a2b20011c5f6af19bd0f89b1c507667edc52f406b004215bb8f1c0ef2f7fa7dbd6b5949aa2978434
 MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.10.ebuild b/app-shells/bash-completion/bash-completion-2.10.ebuild
index b7f92eb8702c..7412e879aa23 100644
--- a/app-shells/bash-completion/bash-completion-2.10.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="+eselect test"
 RESTRICT="test"
 
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
index 0be4bfcf37f1..c7c30545e25b 100644
--- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="+eselect test"
 RESTRICT="test"
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 730a9ef1fe83..f6b4a4c22011 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -391,15 +391,15 @@ DIST bash50-013 2328 BLAKE2B 8797fe0b8e01027222af9798ee8d57d161bfbedb617b257e914
 DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa56fd44916ead691e4d698de3ba118ff0f8fc8eadade7a980551134eb0daf18b0767ff9601a4b4 SHA512 e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91
 DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
-EBUILD bash-2.05b_p13.ebuild 4601 BLAKE2B b345544b854893f65d2b65067a4433562a33f99ed468648392660810c9bd050b96338b078c94e046423de8f014d70d710b663ef48c2389cd6a373a506b7eab43 SHA512 6e2a6bf3492b3d3713a352b476075cb79c5fd85ceb268e5f30185db6126feccbb7327381668576c633b3c302e14852365aff9a832d6462d3e82a63f03064b363
-EBUILD bash-3.0_p22.ebuild 4734 BLAKE2B cef09d227fd7a77ca19375755888a8f73f70082f9738c81db2b88c0cbf7098f808bd6e8a93e1bd8ea74c2afdc4734c6d9bac91cf86534f61d5bee00ba6c3fe19 SHA512 138ff1a92c343f65ba4fd5d7312cd3b56719236d948b2b4545d602b799dbf20008d16de873704445cb19e45351a554fd8d6fefa3884b481f721f10f24a4eeb83
-EBUILD bash-3.1_p23.ebuild 4415 BLAKE2B 5d66f9aca081afdfc7d342a65ae53b3819bc666f2b70bc3e9379456e3d77ee3017b04c56c12056da86ef7a62ae2bed862ebcec89f11fb8ca752ca2eaaa30d7bc SHA512 208a767dfea73971a1276cf205c71e759e207f805acac13d5fd2634f2a11ed5791d8f1cd5aacf305fee5c02b4296148b8801ce91fac1aed8610452024a5caa99
-EBUILD bash-3.2_p57.ebuild 4522 BLAKE2B fc833dd0d73ebb3005aa945114dd5dda5acab4c28561661b956ae24ca154d4a87f30b7946135c4a8642e54ac7c8272dd09f2306ea72ec889742b7731ff57ef9c SHA512 cedac6e1b522c5abc0fb5d90f2aabc237f62dd1e0e3bcf68066d959b7d4cb484b8a5cfeaf61b9f2aed0e00ba4fc55d2e41f9e52400006100be6c8bd9180f1028
-EBUILD bash-4.0_p44.ebuild 4396 BLAKE2B e3aff1b822053a1abb9c4a4ced40b3981a181f83b019162f9f4601a3a1e5794abef8ffe8efc7aed2f62bba3f95782f4c4b084963cc5af94fd599f1372e26032d SHA512 9f451b7469ff0f19e04ce960ecc9123964248166f3c1d86ed6c21cefb91c7be83fdac3fa8b1047486275eb5e95a675df4453475829643254d0c5dac51b46299a
-EBUILD bash-4.1_p17.ebuild 4130 BLAKE2B 24e3fd94c8a75411f1214bdfad25eced1298d290bc76d092df2920d835a53a2dffe6b8bd9bf449de5829008ac8cbf3df40c837a152391f41e10328a440db1bc3 SHA512 1b7d7ba71a15801510295c0e612f1405d06351c855ac8e1e3bfa0324d5fc37df03f507b634f2ddf2c515c766d00af9ba840e69e18381aab28f2436be2be1f59a
-EBUILD bash-4.2_p53.ebuild 4320 BLAKE2B 24c89e3c331c5b4f0e7f0dcf4ac069717e2dfdcee32bcee94d086a272210c1f1206455b8901a1f9fcffc336a56b924e0c6b4e3ffdf4f895aacbee283e2938985 SHA512 66a03cc64cfde2e72905605d9312c6e70b65b58d960e6e15ab6888f6fcffbe0ab012c919b5f994bf58ffeb0ee76de65266894e13afa6a82debd0cd81201ba9cb
-EBUILD bash-4.3_p48-r2.ebuild 5618 BLAKE2B 8687afff77ab6a1979c90a27457ec8a9aa8551b1d886c73515e5ed71992e2f19e85089fcf0fd7f07decb9dd1ebf223817ee5ccb8b7ba3c9b3cdb9db4d366c3eb SHA512 7d3845c4df771da968a0e8797362adab344011f0756aa3ba27ae13f25d3ee02c3d946208cba7686533aa9c493af95adbaebd36b0462f8fc6284851518a24a4a1
-EBUILD bash-4.4_p23-r1.ebuild 7308 BLAKE2B bff65714bf516b63669af0ab5d749958b2c9dff6c5c7fd760e55a991a1d8dc360d90cf29893e92fd54599a761e1e4c6e6c2f102d41e1f46a95b4d4bc7582639c SHA512 d988b2861b6592b3fa79c16548872cd2a0521e7b59df771d3f909c06367c98f003057b44c1a881ddb9ae936db8498d7fc4d08cf269ad0724387172307935b7ce
-EBUILD bash-5.0_p11.ebuild 7368 BLAKE2B 315c68138bc5740cfdef24eea0a9f404367637224d1ccd7327a651e776d69a774579662ad86516d82345be6c5da0b9be6379e9f552ba923ab6f6e72a2977670e SHA512 4824cd234275abb0d41ac9f5fe889c2da1701d48e17f3ae889f09f988938a2c08858094564a28b86656947fcf8a8db4856e67fc0fb121b5d4a054bd01cc3e5a6
-EBUILD bash-5.0_p16.ebuild 7368 BLAKE2B 315c68138bc5740cfdef24eea0a9f404367637224d1ccd7327a651e776d69a774579662ad86516d82345be6c5da0b9be6379e9f552ba923ab6f6e72a2977670e SHA512 4824cd234275abb0d41ac9f5fe889c2da1701d48e17f3ae889f09f988938a2c08858094564a28b86656947fcf8a8db4856e67fc0fb121b5d4a054bd01cc3e5a6
+EBUILD bash-2.05b_p13.ebuild 4599 BLAKE2B c91f4240977a878fb3fcdaf0fc3bc77ff19fb4db77e98048eece13a432952ad3ac0aa387810bd91f7ec3cdebd2d3ff4bae2a8c0f250672f2821671b43fa92ffc SHA512 ed510ffed067978d263e21b8db7bca758dedb3782ba0ded76141803c213582c9760c586147a4aa32070c5bbe7769db750d1dce6ef3a483c33bad8b8d6a5bc9a2
+EBUILD bash-3.0_p22.ebuild 4732 BLAKE2B 08d496770a205201da2ea69828d8e8a9728609e98788b394b40abcc0dadddc006c164bfcca7621dc151581c20775a3d851557e9510f58a24c1dcde1897e09a49 SHA512 6756d1b615c98a037201bfa8c2e6936d57fea747a78cc4ff1c8162a24174863eb4abb96a67b4e3bcb0da842dbb82ef0633a5e3fb1c6db89a450d75a9b8d58db9
+EBUILD bash-3.1_p23.ebuild 4413 BLAKE2B 82e65d976dfcc8d667dfd0041f260f2f4ba66e978c1f5c49a7c6ced1b83b1f09a854e811c6b8f53b20ecd7752a2528b03c12e7c14ef39804ad43f23fa8324303 SHA512 6ac89e26b5d0a7fe78ce73519200fc814bdd8bc3351dd8d16ae7315de89e7e7b08034cd0278a2982fcb78aa5b8c6965f5763d2f6e2991504a313bcbb4b345903
+EBUILD bash-3.2_p57.ebuild 4520 BLAKE2B b7e09a3b166f43e848790cc73b56b69ca958cdbcc47c53d74f7c768b4ed19bf752f2912e4fee72a135f734022ee16bd79ee0fb7572d1e9be56728a3cb5e0218a SHA512 5f1b6bc5ecd7693590ff60f261a080330339e1b9e61c69be7617929630ae873cfd1ad4e38d77cc4c549a877e2735cd2dd736c2e1f3fb825a54ece04d48dbffd0
+EBUILD bash-4.0_p44.ebuild 4394 BLAKE2B 9da1d4a842ff141205b266015a344e2b6a03475158d31c3e882f9c8378951a92606e736ffd0e746debb554c4a89801d36b451f197cd9a4f8bd0baed0feea64e9 SHA512 c5a9e77f8a340f075b527e2df6665a906b8c0350e20226db61bf4c8f54b58c7054b8e82cfb560b312cfe2be6dc3719c88e465328681092a2f1505bae4cd24ebe
+EBUILD bash-4.1_p17.ebuild 4128 BLAKE2B 0ac2800c57c962bf2fbe5fc4dfabb4c26138229651a68070c98f732e240f30aeb173cb2a424c3f99e92f36c6bfe0ac36ec608bc6ff45ec56f34eefcb068971fb SHA512 14616a3d1e26a448f4f89327998fda4ee488019faa704d35cb738732353b4358a8581ffd8aab9cd9288d112254889fe1a3f250cb911b47011cf3a210a3e1ccb1
+EBUILD bash-4.2_p53.ebuild 4318 BLAKE2B 979526637999c583b2dc40ae53bdbbc9cb0a19ac96eb33a840bf4afaa6736fffd547d940879fe57904173ce4bb0469a241461aa7d43e8dcf351c91797f2d2414 SHA512 a6f50056f8cb18657aca7691767e168159465c5a9e18aa8d5d91baf151b22d0463baf0d61b535f3a9db4772c22e3153360c5d27cade86be4333434184016768c
+EBUILD bash-4.3_p48-r2.ebuild 5616 BLAKE2B c2b1dd5158d9e1e54ce4a55480074b1fd567f56d83de99c290d5400255d6e3f4d93f9dc47a23411e51cd3a0128ca42f346ca6808a11803ea0fb1cc27574c3d32 SHA512 f8263bcfa00e313334d1a321515e5890c9023ef487ab104c862e3ff96e2036724c3f82d5c38a07ad760cfaac813cb4a0ea430d5187661c9ddb8af7da607b361b
+EBUILD bash-4.4_p23-r1.ebuild 7306 BLAKE2B b44ca28462fe2bf71be9489efcaf3753fe92d66168dec9516e5a9ce913ba89ef03ea8895282f93bdf7432c844d8a2b172627bec5cb241686d6e78558c3c90642 SHA512 5951cb0fe23ff113c9c6d2e02939d36490c03f978c35691d2420381f6cbd8de57ee91b1f0d94ce1ca68c14d98a4f45ef61eb3f848acb3185e88ba2a769f15c36
+EBUILD bash-5.0_p11.ebuild 7364 BLAKE2B b4e5d6d31823963a153e4550d84f7ccfdb6cb7d1ec03082bdf4b2ac64ff525c559d87ebfce56a7df630dd63389aa068735c05429b2f134a1eab2897e99f1cdac SHA512 34db5bd4b01c479149b825130fdc0a55c04fea401183084d9c1824a68ec7a7d07c51f691be2afd3742ff9511014ddab8539edc97adc7cbe42748cf8a1b96df19
+EBUILD bash-5.0_p16.ebuild 7364 BLAKE2B b4e5d6d31823963a153e4550d84f7ccfdb6cb7d1ec03082bdf4b2ac64ff525c559d87ebfce56a7df630dd63389aa068735c05429b2f134a1eab2897e99f1cdac SHA512 34db5bd4b01c479149b825130fdc0a55c04fea401183084d9c1824a68ec7a7d07c51f691be2afd3742ff9511014ddab8539edc97adc7cbe42748cf8a1b96df19
 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 82c731d649ff..bf0a00d9d9d3 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -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 sh 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 d668b9488b61..ef7c0490adfd 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -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 sh 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 4b36d5159675..dc0b295022ff 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -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 sh 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 9a282724c023..c8f0a3b2e70b 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -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 sh 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 5f9de7a05e4f..149db9cf062f 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -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 sh 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 e420136d4d5b..b8b60119ee98 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -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 sh 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 b0332823540e..90493fd20355 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -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 sh 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 9554bd27ba51..1a621b57e37a 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -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 sh 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-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index 867a266dbcde..c37d924ea24c 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
index bdce76098cbe..1cb910d9157b 100644
--- a/app-shells/bash/bash-5.0_p11.ebuild
+++ b/app-shells/bash/bash-5.0_p11.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
index bdce76098cbe..1cb910d9157b 100644
--- a/app-shells/bash/bash-5.0_p16.ebuild
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -46,7 +46,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bashish/Manifest b/app-shells/bashish/Manifest
index 3dfe873bae3a..f9e172a06469 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 453 BLAKE2B 3cc4d4f360c6b54a19ee6a127ef1113a21476af75f5f26ced88f810934977af04be0caa231a4a2590e0e5ed283ab3cc0ec1c224f5732af350a766a2cc98d418b SHA512 9ed9d7ff9def2a70120ed1f27455572287e1712c2dff513bb078ca8c9f6b514c88b9996e15af8c50b4ad716df98989c0bc1c8e85e89b2453b1edf20187bdc5ea
+EBUILD bashish-2.2.4.ebuild 454 BLAKE2B 3799fac034c7d5cef2d32ff1620c46add537123add5114ee4397d003c62c951fb83f02f094077b76dbf71968430a8e59bdd724a8f7f772d21145d8e5e5dd7737 SHA512 2a1b6d9ffeb120184947386b22e2ada759e9f7f8ec024f61b4c7e2aa3022c1e1933cc386fe300fe2e6ee930b7d478ffda09c1d5f256bfed1d8fadeba923265f2
 MISC metadata.xml 321 BLAKE2B 4d6417b841d5655787653a290d82255d20cbf2dbb1f7ccee2962f4b0fdd1e2910747bd9827c96a2652d6ba1d743e42faf0c592c03d6b843e9fbdd2a4defac3f5 SHA512 c5237f9a6c236c670f85b4c684ac0dfeea3d4f8af3d31d3197618a24bd3317c6ca84fec660eae0fa6318a5f9a099294077e8351431d546184fa3785469068529
diff --git a/app-shells/bashish/bashish-2.2.4.ebuild b/app-shells/bashish/bashish-2.2.4.ebuild
index 3c4aa869b7df..05a7175ea435 100644
--- a/app-shells/bashish/bashish-2.2.4.ebuild
+++ b/app-shells/bashish/bashish-2.2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/bashish/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-util/dialog-1.0"
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 16f40fd5bfb0..7c95713009d4 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -5,7 +5,8 @@ AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff9
 DIST dash-0.5.10.1.tar.gz 225253 BLAKE2B 55dbdca7f01d19656e002d6e210bcae920619e2e88d4d174a3e08cbbc40bf867ece3f24ce9690ec64f95b1f0995ab35cabc08381ac031a33b55282cec0b09e73 SHA512 7ca3bbcf8bac84d359cde710a9ab393f05cf8522e969a2c110d2e71620e53f349387128045e68738dc621afe0b48f43ae3d32851187f2ae02d49b3e2575ffa6b
 DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
 DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
-EBUILD dash-0.5.10.1-r2.ebuild 2144 BLAKE2B 993dd53a287bab6a660331ab88dc369688f1d70db9fb39749ade1b4d943916e484627e8ef746841e4aa5bb16795924ecf3286903be28423fbc3b24ed6bf91b59 SHA512 1193f962824e9255bc178bfacbee52fa8631b52903d667e8f3c904b26ced1c596a522450a6dd5dc9f1025e16ca4f6f952f81e96cbf81613ab30589e06b5192f6
-EBUILD dash-0.5.10.2.ebuild 2249 BLAKE2B bb1552561ed51bf94c514fe4dd8beddd6c14184c3a7ede04fdff5b000b1fe12ad51ee1e46faebd21cf50f09cd7e562e15db83e89125c1f9252d21eb323cb7b60 SHA512 7b98a1dcef2690d98a34e1dbb5a1e829bac2bf03eea3761ee9b322d14d7ad1a9cadf08c117040210c901bfaca93ccdbb193421cc1148492323cbc25faba3d105
-EBUILD dash-0.5.9.1-r3.ebuild 2100 BLAKE2B 201dba73ca658a2a91900d900236271356fc3d34f3d9dc6c3938d44e25dcc9f125d9dc1a302860b3417a2ba8dac3549a006626039ef4dfb16c9995a57fe4648b SHA512 e3b8405a662a05adbd6415b65abc12218374e02c288330a73c39da154a3457dfc9b04c0a47f4b4e3cadffc6a18e9efeb1719f463912cc7781ac16a7cd6b0832a
+EBUILD dash-0.5.10.1-r2.ebuild 2137 BLAKE2B 474472455ed9807e0174ebbafe18429f968466775ba78ec46d66f3e622db37ed6d2919a1f57da4c19c830b997dfbba113de656ab96add7c2f7aad7f0ef2b66c5 SHA512 2e9b16cac8090b4429fe6b8a8381d1ea92e2bd6a870ae508c1ea3f3f9fd900324a5ebbf87b9ac565b6a0b0e9af1e4ae49dfd16f90f5e4adbbb9764711724d7c8
+EBUILD dash-0.5.10.2-r1.ebuild 1557 BLAKE2B 4db90f27e28afe026c8e7c6e6a2f80d2ca31850dc3accd46399b39dc4bed85fad7cb707096ddb9fad319f61fb89819b18cb18956966c3a4528819b86ecf396af SHA512 3add9fa1ddfd5abd6b807cb5401b90315cc7c89d0406797238f95c9174892ba3fe84507780da7c263d4795440cb4351fe7cde3146ccdf3bcfcf5ba8f4061177a
+EBUILD dash-0.5.10.2.ebuild 2242 BLAKE2B 3c07b2e20dd6a37525e5eca1a2e7a9a7f9cad3488d1dcb3b0486615a79ed43866c00817c1d5b244fdc9572d242c0a12c266b804f35359d03625d8f3d2a627231 SHA512 3758d747dde92e5660f7d3b0d0752d978387b9165568c65f21d5e964af34d983473508a74e363594aba1b9e8502ae9c35b1e61fc44cd013981540720a37c8894
+EBUILD dash-0.5.9.1-r3.ebuild 2097 BLAKE2B b0b5217070496dba9ad28d466a20ec60d7e215ce08d232dd709a07db513d43734b4d82f551c14b4c3793555b4c0d6dc7e1cb2dbe9c1bf0db28b320b8408c693b SHA512 3fd4a0426acd6a10011c248f415e9c206fb027b18a83c7eab4d4c049ef50ff034e3a7f3c5def9b11dd4ec0b3d0f9a7121764606d5820e351dd0e3348fc902cdc
 MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6
diff --git a/app-shells/dash/dash-0.5.10.1-r2.ebuild b/app-shells/dash/dash-0.5.10.1-r2.ebuild
index 09d6f32c73f1..16020298e800 100644
--- a/app-shells/dash/dash-0.5.10.1-r2.ebuild
+++ b/app-shells/dash/dash-0.5.10.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static vanilla"
 
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild b/app-shells/dash/dash-0.5.10.2-r1.ebuild
new file mode 100644
index 000000000000..f04c97dff904
--- /dev/null
+++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Debian Almquist Shell"
+HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
+SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit static"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.9.1-format-security.patch" )
+
+src_prepare() {
+	default
+
+	# Fix the invalid sort
+	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
+
+	# Use pkg-config for libedit linkage
+	sed -i \
+		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
+		configure || die
+}
+
+src_configure() {
+	# don't redefine stat on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export ac_cv_func_stat64=yes
+
+		# if your headers strictly adhere to POSIX, you'll need this too
+		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
+	fi
+	append-cppflags -DJOBS=$(usex libedit 1 0)
+	use static && append-ldflags -static
+	# Do not pass --enable-glob due to #443552.
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-fnmatch
+		$(use_with libedit)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-shells/dash/dash-0.5.10.2.ebuild b/app-shells/dash/dash-0.5.10.2.ebuild
index 4935f47043ac..4610e6318673 100644
--- a/app-shells/dash/dash-0.5.10.2.ebuild
+++ b/app-shells/dash/dash-0.5.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static vanilla"
 
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild
index 3bb8502baaac..4463f80ecbca 100644
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static vanilla"
 
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2ee5122b06bb..a1cf288ffe13 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -5,7 +5,7 @@ DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
 DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
-EBUILD fish-3.0.2.ebuild 1642 BLAKE2B eea0911019da09f2690aa0767c43cb463ef5ea18fe53f0e6b31e8e138e2b8335aca207a0ec2ed527e46c841824634533cc16360226a3cd8a17ad94db536386ef SHA512 6261192db56af260ab3c86f2ae650cc23c89a00267fa11dc9d1a6efe6811ba63c894fda64031efdc7a5b7e05bb88ad3915ffa12e0268724628483ea31e8bf468
+EBUILD fish-3.0.2.ebuild 1649 BLAKE2B 08f38170ceb58a9d88ba60a9cdc075f7ccc6bc69befd7236ec2651575c185f54cba34544e0f608997d5709cab1a2b199780e48b9e14ac372ac3c5c8e7615fe00 SHA512 1ae171d8908347ae0e9eac499423b95769d8bbcc116af39635622114bdbb142a2afb77b6e73f8bfe5df2e962c68ed7fd834f2bf925f4bdebb0d4ab84e8783573
 EBUILD fish-3.1.0.ebuild 1551 BLAKE2B d2d5f4ea2df29bc5c9264d6cd1f2c10b54f86c911a1eb7603b418b382ca05d5724722fff19bc1e2d7e7d1b2b33d4cdff34307156eb13b0df8040695089aae3fd SHA512 c62f84c67bb47f4fadb7da8fbec7f7fe23ba60ab657514cf1efe1371c0749940301cac384ed9f5f181d38507c6e36c63e9ab6c50bdb9391630e6eff187420a64
-EBUILD fish-9999.ebuild 1551 BLAKE2B d2d5f4ea2df29bc5c9264d6cd1f2c10b54f86c911a1eb7603b418b382ca05d5724722fff19bc1e2d7e7d1b2b33d4cdff34307156eb13b0df8040695089aae3fd SHA512 c62f84c67bb47f4fadb7da8fbec7f7fe23ba60ab657514cf1efe1371c0749940301cac384ed9f5f181d38507c6e36c63e9ab6c50bdb9391630e6eff187420a64
+EBUILD fish-9999.ebuild 1571 BLAKE2B ac710d0493195aa67c3b75cc09e4082961c19e36eb654bd3e08cc23130b1b4337a62ff690eb1611431f17434578006d3810d29098b09e54ec5392754043481de SHA512 10db344a2da9151b78856dca5fd09028fed22af201afbf12a7c244de478c6052c97b791ba94f81a588ce2372d041872afc823a203146de223cde2a30fad31c17
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 4d88d4b1e94b..214ff1c5b51e 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index bba5b8321d52..24e78364e25d 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -27,6 +27,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libpcre2-10.32[pcre32]
+	sys-apps/coreutils
 	sys-libs/ncurses:0=[unicode]
 "
 
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index b282630ac627..96ad0002eb23 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
 DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
-EBUILD gentoo-bashcomp-20180302.ebuild 747 BLAKE2B 5c9f46adf70752cb663519a195c2ec910d1ca733befe67e6730f90d02af2a0e643f3eb344ddb4687a9ab3df1bcdc72573057c0ab5b89923bdb63ff85da7c1266 SHA512 44e43cbdeee6c301a3d94b661350fc315f54731d415f1360139e53c5db711bdd4401de36431938939ce066237eaabfa2082d691fb4db0f4db045b4e22de89e07
-EBUILD gentoo-bashcomp-20190211.ebuild 748 BLAKE2B f8ed101f5b7973e630db35bcea976deb76420fc11585530e06a13638af8e6fe5f144a9997a94714c16093bb24c4579022da9a480f9679b73483ada44330286b5 SHA512 3d7f6703f2f6db51c634c8db2699356ec2c1a46eb4e1b83a797264904b2e916bc03cc4332b073779202c859912a0ec9b7d9891fac883750dc66a2bd99595c981
+EBUILD gentoo-bashcomp-20180302.ebuild 744 BLAKE2B 79e049b8badb4ac977ac7dc2cd2322cfa22baa717d827aa3034532b017432cef76fee54feb0db7a7c54ea87b4497b5dc7d5bfb2c22a98e31d1d2991216132114 SHA512 9b4da0add28c7af16350430d37962153b92945f08406cbeace1a2b571f9df4ca7f15d96a78b54b45ac9c48ecf27b35d45effeaff4a6241333ec59a283701ec77
+EBUILD gentoo-bashcomp-20190211.ebuild 744 BLAKE2B d17a499c6ebcfdb2d79e729177880a808508dc2ea79643152161c2121fb0edea9d31c3c6e07bdef9dcc8dc8090b8a5acabbf3908fd487172a2994b03a587f9be SHA512 71a6f1fd8732d08c40dc5b9c44310e8e572b081da7522e9d4d40805c73044facffe13e5ccec6d4a2e4bfa2e3b19bfd0c47c250cc297505a1f3e710c3032ec409
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
index fe0d3af5665d..e3c155d43b44 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 6d55f70fdebf..8a686b160318 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index d29053ddf24d..a9e7a591e078 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-zsh-completions-20180228.tar.gz 23246 BLAKE2B a6e4004aa7592cbb097cad55fe9d7286f39bd264d8c463ed22e665ca6a60732b0bc8678a0ac09715e2f34abbadd0e4466d783fdb228ce364bcbe13fb7f097649 SHA512 2b3dcfb910e297eb2f03f4ad9f3749b379ceb60f8b6cbcb7c7d03b7921b79aa21f8d3aa50931c5d4eff52f988a208f1a810c6da7c20720be7a3f2ce4a4564788
-EBUILD gentoo-zsh-completions-20180228.ebuild 753 BLAKE2B d3feaf1c87bb5a4c1d2f54722788563192c613365bd5a28d2a2b2fded2b3ea3b237af94bde33026651f66aa1a534315f8575f8afd39fe3fce20994decbe68bf5 SHA512 be72ec65deade5243ebc4cc0463e7f8a7b26716c48214d99c4ed0b4d95de89aaeb920ff2cc4809092b231b65649c27a49fa39ce5db06012a0ff1677eff1838a3
-EBUILD gentoo-zsh-completions-99999999.ebuild 747 BLAKE2B 4a886821b7c439c7adce36bcd0932f95f48a90a1b32477b3a0b90547d87b93a4f6d3884d8de7ec5a1cb8730464c2e5c1642fe0272e1f464875b536d36dc4354f SHA512 7d76b6b44be384ac01b1c1e2c0a2642d9982244b24729dfd449df7e7f98b83fc76e76c5e1423774ddcc200d0fcc35d0206cd7c97f4499dfda5b1840c96b4abad
+EBUILD gentoo-zsh-completions-20180228.ebuild 750 BLAKE2B 795ff6c227359e0bef57ccb7c45d83906af6418181e5bf1882ef4189a75b9befa5bac1a9f81178356686ac3d74de103826e4a8ed59816cac32e48557b2c8ee18 SHA512 9929cf566fa49567915c96acd012a33257316f7c3c7f7acf510ac6c6c735e5d37f5182ea7d7898d248af953817daad617060ee27d08dccbc58e3edc261769cfa
+EBUILD gentoo-zsh-completions-99999999.ebuild 744 BLAKE2B 289150e4cc87ff018e37354b0b0694d0632d816e0bc050e077ea034ef1f7a77fe402e05efc24c0fd470081973ebcad839902f963c1eedce3a2bf7e1497fbe83e SHA512 6fa215827e110dd8cbe3b70835d1ac4d5fb24f553d673511d667c65beea015b445ecd41adcb3ce7113eca433f42e1581aca88986c0c3e62bf94b08c1b80e9b17
 MISC metadata.xml 264 BLAKE2B 8020d5ed518f5d0046da3b51ca0cb5be5e6afca0f743dd117dd8057b707c4b8dff58487491fd61592b625793837c30408a9029cf8ab74e0d7efac7d7ad205dcc SHA512 baa3e290eb539d5a9c615585e8701a9656d1f2e5096de544cadd8f84f4bacbee6f5c3874af59942b2933506a60cfea5d60538fd9e38135f711ffb50fbad2f034
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
index 0f79d7908bf6..ff98a19ddf2a 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
index 8d75cc2beafc..07a895d2cda4 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+	KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 fi
 
 DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 4ae8a471a6e4..f2f2f0431b66 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,4 +1,7 @@
 AUX hstr-2.0-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
+AUX hstr-2.1-fix-ncurses-configure.patch 2626 BLAKE2B 69fb12826fcab4f086b9e951b4e75daf84565f96c519776593d4b6f5f6d16c1745867742849b590bc29e1ab58ca1609f85a5645713da688c5e53fc22712c3c81 SHA512 65e29a8e2b5840d335d741072df44d2a36b260c24cd6e8df68b45b4bd2d6cb18e729d0b695703b95bb968dfc44c6dde28f26ab61c458444200c40862a6281a99
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
+DIST hstr-2.1.tar.gz 1244067 BLAKE2B aa37f26a5ba8ee465a03212cc80e55b9581e59cbb535f17fda8e59bed062f0b0065d456d8566927c089595b92270b83235f0bf73f26ac88704bd933c1926cd5b SHA512 ea217ac2b6dcb7e283f83d15524b47f88c5c8cfb82e5728537750a2ec8526f03304503a5bb67970d893e10057aba087aa86a67548aa361c892b6ee3e81903122
 EBUILD hstr-2.0.ebuild 642 BLAKE2B 83c4bdcd14bea1f873828f3856183a529144bca3876b960895b86c2c1f2bb82d66d48d9d68a541aa719c9e07f2a072ce7d77783bc32dbc2a5db89de945503140 SHA512 30d50d5190f4476969aa97af6e1af4111f91cbe457fca2b51b34c9c4ac42e24d9e68fb305cd1898c3088faa23ad581b27c03084fc306992b8af4b657304d6a07
+EBUILD hstr-2.1.ebuild 644 BLAKE2B 94d5fe5cb75e3e6c718de6b62c55456393c1ecbb2e3250c9d746000ebb048d04ab0c156c65838d15f9cd284dcb54e0f3956be7778243abf0b8f7da0886832a70 SHA512 64c8372683a3b43ce27845c0b168e99263fc6b06defc2ebd498654711c683873e9bcf9e8c2317be19a19c8f4e4ab2f4b82d9a310b7c702a3481d03676776f204
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
new file mode 100644
index 000000000000..215fd5cedfc9
--- /dev/null
+++ b/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
@@ -0,0 +1,81 @@
+diff --git a/configure.ac b/configure.ac
+index 1676ec8..73c8be5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,39 +47,33 @@ then
+ fi
+ 
+ # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed
+-AC_CHECK_LIB(ncursesw, killwchar, [],
+-[
+-    AC_CHECK_LIB(ncurses, killwchar, [], 
+-    [
+-        AC_SUBST([NCURSESW_CFLAGS])
+-        AC_SUBST([NCURSESW_LIBS])
+-        if pkg-config --exists ncursesw
+-        then
+-            AC_MSG_NOTICE([Module ncursesw found])
+-            NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+-            NCURSESW_LIBS=`pkg-config --libs ncursesw`
+-        else
+-            if pkg-config --exists ncurses
+-            then
+-                AC_MSG_NOTICE([Module ncurses found])
+-                NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+-                NCURSESW_LIBS=`pkg-config --libs ncurses`
+-            else
+-                AS_CASE([$host_os],
+-                  [darwin*],
+-                    [
+-                      AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
+-                      AC_CHECK_HEADER(curses.h)
+-                    ],
+-                  [
+-                    AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
+-                    AC_CHECK_HEADER(ncursesw/curses.h)
+-                  ]
+-                )
+-            fi
+-        fi
+-    ]) # FAIL of ncurses
+-]) # FAIL of ncursesw
++AC_SUBST([NCURSESW_CFLAGS])
++AC_SUBST([NCURSESW_LIBS])
++if pkg-config --exists ncursesw
++then
++		AC_MSG_NOTICE([Module ncursesw found])
++		NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
++		NCURSESW_LIBS=`pkg-config --libs ncursesw`
++else
++		if pkg-config --exists ncurses
++		then
++				AC_MSG_NOTICE([Module ncurses found])
++				NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
++				NCURSESW_LIBS=`pkg-config --libs ncurses`
++		else
++				AS_CASE([$host_os],
++					[darwin*],
++						[
++							AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
++							AC_CHECK_HEADER(curses.h)
++						],
++					[
++						AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
++						AC_CHECK_HEADER(ncursesw/curses.h)
++					]
++				)
++		fi
++fi
+ 
+ 
+ # 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 = 						\
+ install-exec-hook:
+ 	ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT)
+ 
+-hstr_LDADD = $(NCURSES_LIBS)
++hstr_LDADD = $(NCURSESW_LIBS)
diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild
new file mode 100644
index 000000000000..f9bffba4e61d
--- /dev/null
+++ b/app-shells/hstr/hstr-2.1.ebuild
@@ -0,0 +1,33 @@
+# 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}/${P}-fix-ncurses-configure.patch )
+
+src_prepare() {
+	default
+	sed \
+		-e 's:-O2::g' \
+		-i src/Makefile.am || die
+	eautoreconf
+}
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 6fdaeb5fdd5e..83b4896783f7 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,4 +1,6 @@
 DIST mksh-R57.tgz 419604 BLAKE2B 11af09535ace3fdd982189fb7d7f3e5961776c3bdbf6b981f4f1506a66ebdbd893efb9aa50a5a36fd8b3b7bd3e149021aad154888dc81e0de29f41e91eeb583c SHA512 7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3
-EBUILD mksh-57-r2.ebuild 1614 BLAKE2B 2b25675e79c568c3083a52d7e2d8d24056374685076949e245c873e909c66272590b6545029539948123632b7b46bc5293c1740f9e64ceaf5aeff4deddeebe42 SHA512 c9ffb1af5dda9aa37785fd30187cf8e44385d4cfd7bd65ee652f569f8d43b3f4a324bcbebef93ae97d241a55dd48d97602aae7c0e562564a44a98e4183101437
-EBUILD mksh-9999.ebuild 1604 BLAKE2B 26c835c620d0ce8b0af908df5e309fff652a835759dc07f28442f1ba63f8406a7f68e672a46bf08d4b777554d8128310f2e2ccf3171316682c84f4210e26c374 SHA512 d7b105454422ef6ecbab9d8ec6cb3c4e3786dce1e692eb827ab6c0c6b82817337d3516abdab7eae1e3e244a4f5bda35674b5be7804b2e6e519b5eeaebf7e0692
+DIST mksh-R58.tgz 435617 BLAKE2B c5dd16effc8c08ac5f4a3986a14d786990b64d9da76b1b7d27de8a2dfbfa6fe172e9c58681df8f428a1e3548e54b5f6b037714a924f1053bfa3eedacc8eba173 SHA512 711351f8bbe8e44fcf9e7963f8e749938ec3ccb362fafd5350d44593841c2acb6d54ffa115dbb6b83c30865728a4c5274c05feedb063e293361e2830d263d80f
+EBUILD mksh-57-r2.ebuild 1634 BLAKE2B d52a0e303f6497382783afef1022ae09ae2a7a0a8d8cd070bbc23aaeb2f24c318540713fa476a267e8b91a074349065b5ed803b08b9de0beddd23d4f392d87d2 SHA512 2175d226c2e61da5dfa3d38930302e448971be92c6db47567edc82bf36a7db296db9e3fe0f6ff340d2b38c0f93e6d97ad5490eb269ed6f3c031685604f9f20b1
+EBUILD mksh-58.ebuild 1592 BLAKE2B d446f1a29cd10d3d9d19f88eab9a37a3e2ef38eccaa210d4366156fb5498f4e7e2752ea8dd51ba52179072e206a88c974cbf4387ca32f6256683e6086b5098e6 SHA512 149e584f485bc1a49dafe104946a569ad6f167217773cf25d680864abfb000d11a028e1b89ae59148955eb7d6c4c20e9a2220962bef138d171c151269e270d59
+EBUILD mksh-9999.ebuild 1592 BLAKE2B d446f1a29cd10d3d9d19f88eab9a37a3e2ef38eccaa210d4366156fb5498f4e7e2752ea8dd51ba52179072e206a88c974cbf4387ca32f6256683e6086b5098e6 SHA512 149e584f485bc1a49dafe104946a569ad6f167217773cf25d680864abfb000d11a028e1b89ae59148955eb7d6c4c20e9a2220962bef138d171c151269e270d59
 MISC metadata.xml 565 BLAKE2B 7bbb94f30f910e5a73f6fca91db59bd8b9825e358903bfc3116222c9bcb9927b5609b4c31bb5f36db5898023631a0d8dd2ad8d6a218136bb2e1786337db58fed SHA512 a10bf827859a6176fef847313a096d8ce04dfb6a271452602f8fe3638c8aeb7da11a5ea7a9d30257e516d8344365e30372e4c16d31d23c19e97c3d7ddd333914
diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild
index 39d98636a3f9..d1d0012bb68b 100644
--- a/app-shells/mksh/mksh-57-r2.ebuild
+++ b/app-shells/mksh/mksh-57-r2.ebuild
@@ -11,10 +11,10 @@ if [[ $PV = 9999 ]]; then
 	ECVS_MODULE="mksh"
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
-	KEYWORDS="amd64 ppc x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 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 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/mksh/mksh-58.ebuild b/app-shells/mksh/mksh-58.ebuild
new file mode 100644
index 000000000000..a3e79a49d42e
--- /dev/null
+++ b/app-shells/mksh/mksh-58.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+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"
+fi
+
+DESCRIPTION="MirBSD Korn Shell"
+# Host is TLSv1.0-only, keep to http for compatibility with modern browsers
+HOMEPAGE="http://mirbsd.de/mksh"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="lksh static test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-lang/perl
+		sys-apps/ed
+	)
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	if use lksh; then
+		cp -pr "${S}" "${S}"_lksh || die
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	use static && export LDSTATIC="-static"
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+
+	if use lksh; then
+		pushd "${S}"_lksh >/dev/null || die
+		CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
+			sh Build.sh -r -L || die
+		popd >/dev/null || die
+	fi
+
+	sh Build.sh -r || die
+}
+
+src_install() {
+	into /
+	dobin mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+
+	if use lksh; then
+		dobin "${S}"_lksh/lksh
+		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 ff84abaff24a..a3e79a49d42e 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-if [[ $PV = 9999 ]]; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit cvs
 	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
 	ECVS_MODULE="mksh"
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
-	KEYWORDS=""
 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 5967f98388ac..885f2ce9479b 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,3 +1,3 @@
 DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
-EBUILD push-2.0-r1.ebuild 643 BLAKE2B d980af27d4f14e230a3645ab3a17e7536cfcb4c24d83873c30a59657a50db8962c1ae46712da6e18b0432b766ac3f845ab905cb91236359897b5f0d8cd32cb7a SHA512 e2c0799acb240a053d0162b68758fbdf7f8e9652725c470ad651fd3f4024e6ecfbad0db8b7598a665726656d5d932a6163dda7ed5c7bba231ff7b8540a510131
+EBUILD push-2.0-r1.ebuild 640 BLAKE2B b4d5973bc0b1f1a16326c0d886cc7cf844af312e2792524befd0ffb474eedc62a3158387508f8ee7c4ef2fa5166330f33ff7711ad51878cddcdf026df7a99137 SHA512 8922475dbd40d4c4e883d377702ff02355b99494039fc73e45149f11ae6310789cdb80099900705ea1170b72f107ef8aec4ad2e92384271a42cb1feef41b55a5
 MISC metadata.xml 698 BLAKE2B 69740256ef4db99512953ae2e9b896410814d64f45c8fd6f2b45628948e1c7bf3ed66e53605c0611e30bf9af75d59b554b6c8bfa942777d55a3db1fb0e4bb944 SHA512 ebd59b8ea97e30788644f33eaa98c2618fa2f90a62bc17bb5c9027253df3c04b6ab1e25671dfcbbf31101bb4cfe2aa2236c7d287a40b49a2b83c09734967fbc1
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index 02beb3e3b74c..0c989dc8978a 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index 626317289b81..e6e3e5fc1ac4 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,3 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
-EBUILD quoter-3.0_p2-r1.ebuild 762 BLAKE2B f6cf95639dc28e39d85de64ac30876f099591ee8bbc69263299c700c65b926658d0d64e76c79aae5bf389f60bd97d3d85a728534c7b2959ba34a2663d8ab8cc3 SHA512 5e750aff67ad8231be5914f0cb4c3daae2da5cb7f8f376173d54216b48a56b8d20ddf54da1aab390a177300fad84aabf8d41eed2b7e2ec48bc4255e0bc5f4fe0
+EBUILD quoter-3.0_p2-r1.ebuild 759 BLAKE2B 834746ed908c95f45f09c08e4a93a1e0a054b606628f79a10a48be823660cc73ff2f4157d51438ffb2ac92f6e0fb48559db69025832a994029448b6e6816973d SHA512 8da8ce840b416bfa2ce03e653e33d0ca06dec49b6a43016ef69a164c95b1ac54650e6e4b88432e888536b8e2a2b27c2620dd4dfd5219f028460e7b979051c447
 MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index 4c8b9a03f92c..8807c9311811 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 src_configure() {
 	tc-export CC
diff --git a/app-shells/sash/Manifest b/app-shells/sash/Manifest
index 70d98535dc58..286df5300159 100644
--- a/app-shells/sash/Manifest
+++ b/app-shells/sash/Manifest
@@ -1,4 +1,4 @@
 AUX sash-3.7-builtin.patch 465 BLAKE2B 9665d97abbb0da68065dee7934f9604f59436af5522a45dad3331ec3540e86634c7e1415f18be2868297b3261f0fa829ba2e6329723c61746f18d913357b3165 SHA512 3c278b7a6570195d62aee65582edffa74e12a68cd684b7855256083b45c99a5a8f6506e2c59ab4edbd1ba094e7d512dfe7c90a79945f2be5261a5975d5b95d23
 DIST sash-3.8.tar.gz 53049 BLAKE2B 151e24e3f1f56231a12fa332505ad21586c97c7bb9cc3858e12ea4aa410d4e30da4af8201b4e24f0b960f2f142c964ac1996f3475ec9a104bdc52a5e1a55c010 SHA512 e544721dbb5d13d2184531a2caa4b90fb29fc360e2b80f64adb2433cbe4e5588171f3567bde03b520fbe7cbd0f3007e0e9c9c41cb16570709b03cedc2dfbe291
-EBUILD sash-3.8.ebuild 937 BLAKE2B f4a6ec622487826ce309485738f89da31320c0dc02be5d07641aec41ca8c67af1078b872df75680bf5b8b912a4b90a9161cc2fc662260c81a8e0a055d09d9b30 SHA512 d8358a4899b3f2944edf90383e99019632ae6d67ec65fef2868314f2031fa2e3e78c93e52ff0d5897de909102a3b9fbeb38a0fa12c0c08312f496d85c5369d51
+EBUILD sash-3.8.ebuild 934 BLAKE2B 60c8cae14aa0ca3eedc8afdd172c254c3b8f0763ac5d624e86e94df5069129d466837d56d5692a3dfe8891f0e342be86a76cf0d7d55de52e009884e49b19f516 SHA512 4cfabe493a5f0abf6972e6715e5797bc9ea2543697edecb5b6ea4680e1e6d0fe427682145294a99d00b9a15f287178b6907a90b50f4428109b827cc1e3a61bd6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/sash/sash-3.8.ebuild b/app-shells/sash/sash-3.8.ebuild
index c927bf54bedb..e4b05f67096c 100644
--- a/app-shells/sash/sash-3.8.ebuild
+++ b/app-shells/sash/sash-3.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.canb.auug.org.au/~dbell/programs/${P}.tar.gz"
 
 LICENSE="sash"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static"
 
 DEPEND="
@@ -23,7 +23,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/sash-3.7-builtin.patch
 
 	sed \
-		-e "s:-O3:${CFLAGS}:" \
+		-e "s|-O3|${CFLAGS}|" \
 		-e '/strip/d' \
 		-i Makefile || die
 	sed \
diff --git a/app-shells/smrsh/Manifest b/app-shells/smrsh/Manifest
index c90af7547d9f..ea4a98165910 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 1175 BLAKE2B 928d3ea6fe817a6f827d7ff7b5f13fba4dff80b10cc7cbb5de1f1047fdc23a7c645c9ead90c122d68d43d06cb233a2648cfdda06be5abc8bc4c97a70f6f72305 SHA512 7353c73a2c1dcff8c63ce067f43834a5cdf8a93d0b1c0bf0a31999f60cf78b29bc87da0f464fc060715f286919da093d778e0848af38e19d65be52f1d6ef5448
+EBUILD smrsh-8.15.2.ebuild 1172 BLAKE2B afd0972cc1e481836a7789aa84fb5313cc96adf00dbd9827b6ba9623a1f61824ae65eafbab6c10ac9bbf8748ba0056130ef9569d35de7ba482fb6829c4d60fb3 SHA512 8cf7eabb2b0a96dd02f1e9833e3292b659271161cd2381809297acb3a0a60507ad65e9b1b1fc112c4720f90364c5f42b9b5be6ede72fc42186716d27443e2b73
 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 a3333b5cad37..5679f879ea94 100644
--- a/app-shells/smrsh/smrsh-8.15.2.ebuild
+++ b/app-shells/smrsh/smrsh-8.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,8 +26,8 @@ src_prepare() {
 		-e "s:/usr/adm/sm.bin:/var/lib/smrsh:g" \
 		-i README -i smrsh.8 || die "sed failed"
 
-	sed -e "s:@@confCCOPTS@@:${CFLAGS}:" \
-		-e "s:@@confLDOPTS@@:${LDFLAGS}:" \
+	sed -e "s|@@confCCOPTS@@|${CFLAGS}|" \
+		-e "s|@@confLDOPTS@@|${LDFLAGS}|" \
 		-e "s:@@confCC@@:$(tc-getCC):" "${FILESDIR}/site.config.m4" \
 		> "${S}/devtools/Site/site.config.m4" || die "sed failed"
 }
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index f5c77e7cb1ae..e34673717d22 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -7,6 +7,6 @@ AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1
 DIST tcsh-6.20.00.tar.gz 1001696 BLAKE2B dfebde21c70f236e1070a93621a331ce1a53efab4496c44f25b51e98e843a8d0e3ca503da46a4fc0177b57b682e3ecc07f8120cde25ecf466c8ff094df5f9463 SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
 DIST tcsh-6.21.00.tar.gz 1001909 BLAKE2B 7f2be382a3a344d55e0785eace79377e20dd2cd2eb9e9533168fbb6286631cdcd35bdc06cd42d9439a29a7cd1a911416bfe6b0245065535aebdf5adb58d2c301 SHA512 d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
-EBUILD tcsh-6.20.00.ebuild 2644 BLAKE2B 9c59dcbeafc88e9c6e27208908ac6ce1299e8a5be2b2d9e688d409f2f1337b7c5746408e3ef078aa9e26a5629978f0c1123e6474b8dd5fceb9881bedf13bc7ef SHA512 c8b9b75466ea9eb9277e172d1d04f9d69980157fca0b95ea9f8e83a6ffb386a1455f9615d5186d857abe369592162d84ee888a3d52cee9c139b0f6903e02253e
-EBUILD tcsh-6.21.00-r1.ebuild 2752 BLAKE2B 9441edb70fe9da9c342bc4e88b45d19443e96b3b354bcdf47c766ef6e033e8d9dbe729cc1a632abf583d0814ba68d2cd7717988c403cbde0987aa240d245a7a8 SHA512 76eb26101ffd99e01af6cf06100921c5fe95f085040eb2bbe11af53f5e5aea232b21d79db3b4e084086ba27c095907aa221e74a8ce4be6a0b53f9146487b7398
+EBUILD tcsh-6.20.00.ebuild 2642 BLAKE2B 601b77ce442c4c81ba5b268ea6ca467ce3fc06624add8c2f191a9fa5da89fd6f54dbb6a05e2e137d3c966423bc27f98058ff9bdb88c6698701e222a80eccf759 SHA512 93ab1acefb0f0efa5c83ac0f1a22107b5e90b5caa17b32d1961554dcb115466f8482a4007d939dac2b2da6816d1aade02313057097f053d766404812e5605842
+EBUILD tcsh-6.21.00-r1.ebuild 2748 BLAKE2B bef89c082fee0b060df3bed0485feec42eeaecd69ac05a6e2dde14fbf01f7b5c47c1ea5804d5da1dc4d10e938858faf0f3dec78e4d0f335eb359029fcbd16dbf SHA512 e77a37522359267d6999e6abb3b54b0fe34e012e6707e4ccbf198ef5ae2ca3b8183fdb4d1606707815cc6becf7783171a58ff10eac0a9a7811ad06f6f2d5b260
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index d02c0a5fa385..783c52ebb84b 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 
diff --git a/app-shells/tcsh/tcsh-6.21.00-r1.ebuild b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
index 8adadc2e6cc4..98eb5f002506 100644
--- a/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index d7b4e0154b83..930a1d9c6cd3 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,11 +2,8 @@ AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0
 AUX zprofile-4 1273 BLAKE2B df8730eceb621ffe6b38a9185e1ca0a46d6ac2cc5e28e3e9888a2f26f4a6adedc6adfd39744b20aa450a613284b9670dffe02038f40f78edff22e951e209dbf5 SHA512 fbe89782f757bf351a60f691e40d70786324b8b8eea90ca5e788ae349fa5642daa24969e303af6029b8d38d0b5505ba422523081b91ae7b71fec388624ad48d0
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
 AUX zsh-5.7.1-ncurses_colors.patch 1379 BLAKE2B dafadc92d84237182f44accfe0ff4e76f664d5a203af4b4f160ef86751e582cd6475f25666b252296c0d579b055e35721866872ea869726a6c934184c24c3f67 SHA512 6e8a4e41dacf9464435726e8a7db65ff02c104c6328f4acdf24963d08786051ea6845558beb102f47ab7ffc3116f572d1f6b3263a69e7673653f80bd2280d5e2
-DIST zsh-5.7.1-doc.tar.xz 3062112 BLAKE2B cb67aada97d79b4b5b1116fb0737294785a2a510c2f4396cf77b671b62631e778ee9d57a32dcd257e079a9e4c35acaeeb68c0ec951b6ae8d8d8b647c05ef365c SHA512 e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c
-DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879654a376ce838986211af4bddb7ab521a8a35cc06701f730a75a9778c633726b447f31845f5c140ec1e8d80 SHA512 a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
 DIST zsh-5.8-doc.tar.xz 3088696 BLAKE2B f738bf15b137e84df91fff8500b6c309884d8a1777e3158807f6028a411ae3f345e6ccba49bdff04c6607c4eb06fc2913313e84e1f78be0a0f92d23e46ba87db SHA512 38cc549818eb9c6952051b714dd2008d99605aba4ca4f614e62b033c9b067dd2031fff766ac5c1efe5bb52eae32bd482dea5df2b2d46decb7ecdb458f3da9d52
 DIST zsh-5.8.tar.xz 3193284 BLAKE2B b1186dd27aede3318763d7c42253e919e60d00a018d085b2de7e8d985c872e9756a3ce112f623a088ec0878abd7a38d04dfa5ec552ef0f0a72e623191a7ba5e3 SHA512 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533
-EBUILD zsh-5.7.1-r1.ebuild 6040 BLAKE2B 47d603e484c1ede076575eeee7ef8c2d3e06b2bdc9f3300c30aa9a726f138d23acf52c284bedf7a6a1e30b6fd312f08d4b1a48766c4316c51122559a255de1b3 SHA512 98fdb4a06741c7b250a96c6ed6690ef3033010912305ac0af680bbb3155188c9801d1de966fd3ddc6edf2da4e144b77c844a6e239f6ba035284affa79a19cf28
-EBUILD zsh-5.8.ebuild 6049 BLAKE2B fd54fc6bf4b482854832dca43b3ee6de22100e111aa6c5ef67c9e8d3ca425a6f9ce063c2e2ea4e2a5892f921dba16da0aee79fda15818be2beee1eea509d36c4 SHA512 9d027ecde0a35d2796440528bd93034ced65239c4d1400236aa0721b303184d88610e04c8bd0ee172598aa49ddb43eae72eb6afa658cf9b509d8bf0754058c6e
-EBUILD zsh-9999.ebuild 5988 BLAKE2B 75c08411ac48ed84ff2b2f870ef8b5495cbbfa601039c328c6fff902736876d5c21f2237dbf82f345feec4b03337349bf842fa165ba9f0f31212b1c105ee8d0a SHA512 528ad315f72b5237313d6438da799cbe8288c85e2150a8cdbc7c623b70ad6238f31ae67d212a4ba5e5beb2351e384128f4780700756e30de88bc1355cb5c06e7
+EBUILD zsh-5.8.ebuild 6037 BLAKE2B ad6c3099910aa4cd2a34fca033a40ee8df3fa95ad5a9a26e83ebb281669de5e521c206facef606987f2fce4be45d42ffbc5dba7b06bce221acc93d15b02e916a SHA512 81f47c35b7e18b5cfd38ac55b41999a0fcbf2f1d6663081595797deaad7fc41022ccedb2ae4824476e04e0eef221a8691bbf02232bf9aa21d9658115f6e16e9a
+EBUILD zsh-9999.ebuild 5984 BLAKE2B 2867a5fd00d4fd69b2d365252fa904661ae22f0b4d6d62a47d1f710950ca46f30de43d9761dfe33441d609dad036af833b72a67ec33adc965038b84a3ef88692 SHA512 e7add6a23a2e166833dbe321f6a7602ed2c3223096e29a020c85532a71c6ce7e6dd2bd794c23653aac6123de8ac456e865a7de4a90af18ac9f02ebf88d24f7e1
 MISC metadata.xml 514 BLAKE2B 63d77a851911c67bbf8bd722cd8a4766bd0ff0184c2cc6bd2629b27186ea1bdba9b15bed73cee6a261ff499a22a9ef9b8582b22b76eb3752709553bf49e92071 SHA512 bb460e1e123c3f9b7bcad9a6abfcd42ac69f9a2071d6b2dcbee968c3fe82b9bb940e28021b1d619642d99fc595f492247b1a97e6ad51133be73bbb5fd997ef0d
diff --git a/app-shells/zsh/zsh-5.7.1-r1.ebuild b/app-shells/zsh/zsh-5.7.1-r1.ebuild
deleted file mode 100644
index 38bb5002a8fa..000000000000
--- a/app-shells/zsh/zsh-5.7.1-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic prefix
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
-		https://www.zsh.org/pub/old/${P}.tar.xz
-		mirror://sourceforge/${PN}/${P}.tar.xz
-		doc? (
-			https://www.zsh.org/pub/${P}-doc.tar.xz
-			mirror://sourceforge/${PN}/${P}-doc.tar.xz
-		)"
-fi
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="https://www.zsh.org/"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1:0=
-	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
-	caps? ( sys-libs/libcap )
-	pcre? (
-		>=dev-libs/libpcre-3.9
-		static? ( >=dev-libs/libpcre-3.9[static-libs] )
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	!<sys-apps/baselayout-2.4.1
-"
-DEPEND="sys-apps/groff
-	${RDEPEND}"
-PDEPEND="
-	examples? ( app-doc/zsh-lovers )
-"
-if [[ ${PV} == 9999* ]] ; then
-	DEPEND+=" app-text/yodl
-		doc? (
-			sys-apps/texinfo
-			app-text/texi2html
-			virtual/latex-base
-		)"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.7.1-ncurses_colors.patch"
-)
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# fix zshall problem with soelim
-		ln -s Doc man1 || die
-		mv Doc/zshall.1 Doc/zshall.1.soelim || die
-		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
-
-		# add openrc specific options for init.d completion
-		eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
-	fi
-
-	default
-
-	hprefixify configure.ac
-	if [[ ${PV} == 9999* ]] ; then
-		sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-etcdir="${EPREFIX}"/etc/zsh
-		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
-		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
-		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
-		--enable-function-subdirs
-		--with-tcsetpgrp
-		--with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
-		$(use_enable maildir maildir-support)
-		$(use_enable pcre)
-		$(use_enable caps cap)
-		$(use_enable unicode multibyte)
-		$(use_enable gdbm)
-	)
-
-	if use static ; then
-		myconf+=( --disable-dynamic )
-		append-ldflags -static
-	fi
-	if use debug ; then
-		myconf+=(
-			--enable-zsh-debug
-			--enable-zsh-mem-debug
-			--enable-zsh-mem-warning
-			--enable-zsh-secure-free
-			--enable-zsh-hash-debug
-		)
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --enable-libs=-liconv )
-		append-ldflags -Wl,-x
-	fi
-
-	econf "${myconf[@]}"
-
-	if use static ; then
-		# compile all modules statically, see Bug #27392
-		# removed cap and curses because linking failes
-		sed -e "s,link=no,link=static,g" \
-			-e "/^name=zsh\/cap/s,link=static,link=no," \
-			-e "/^name=zsh\/curses/s,link=static,link=no," \
-			-i "${S}"/config.modules || die
-		if ! use gdbm ; then
-			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
-				"${S}"/config.modules || die
-		fi
-	fi
-}
-
-src_compile() {
-	default
-
-	if [[ ${PV} == 9999* ]] && use doc ; then
-		emake -C Doc everything
-	fi
-}
-
-src_test() {
-	addpredict /dev/ptmx
-	local i
-	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
-		rm "${S}"/Test/${i} || die
-	done
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install $(usex doc "install.info" "")
-
-	insinto /etc/zsh
-	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
-	newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
-
-	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
-	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
-
-	local i
-
-	# install miscellaneous scripts (bug #54520)
-	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
-		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
-		-i {Util,Misc}/* || die
-	for i in Util Misc ; do
-		insinto /usr/share/zsh/${PV%_*}/${i}
-		doins ${i}/*
-	done
-
-	# install header files (bug #538684)
-	insinto /usr/include/zsh
-	doins config.h Src/*.epro
-	for i in Src/{zsh.mdh,*.h} ; do
-		sed -e 's@\.\./config\.h@config.h@' \
-			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
-			-i "${i}"
-		doins "${i}"
-	done
-
-	dodoc ChangeLog* META-FAQ NEWS README config.modules
-
-	if use doc ; then
-		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
-		dodoc Doc/zsh.{dvi,pdf}
-		docinto html
-		dodoc Doc/*.html
-		popd >/dev/null
-	fi
-
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you want to enable Portage completions and Gentoo prompt,"
-		elog "emerge app-shells/gentoo-zsh-completions and add"
-		elog "	autoload -U compinit promptinit"
-		elog "	compinit"
-		elog "	promptinit; prompt gentoo"
-		elog "to your ~/.zshrc"
-		echo
-		elog "Also, if you want to enable cache for the completions, add"
-		elog "	zstyle ':completion::complete:*' use-cache 1"
-		elog "to your ~/.zshrc"
-		echo
-		elog "Note that a system zprofile startup file is installed. This will override"
-		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
-		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
-		elog "or other user startup files that are sourced after the system zprofile."
-		echo
-		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
-		elog "one method is to use a separate path-setting file that is conditionally sourced"
-		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
-		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
-		echo
-		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
-		echo
-	fi
-}
diff --git a/app-shells/zsh/zsh-5.8.ebuild b/app-shells/zsh/zsh-5.8.ebuild
index 394c7e4ed886..58f678476fd8 100644
--- a/app-shells/zsh/zsh-5.8.ebuild
+++ b/app-shells/zsh/zsh-5.8.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
 		mirror://sourceforge/${PN}/${P}.tar.xz
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 503a4d64a9e4..05ebb94bf2e1 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
 		mirror://sourceforge/${PN}/${P}.tar.xz