gentoo resync : 05.02.2020

41 files changed, 77 insertions, 54 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 25589dc99313..01fbc69ef3db 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index eeff1d4cc9dd..e253f6d7ba5b 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -3,7 +3,7 @@ AUX autojump-22.2.4-fix-autojump.fish-bugs.patch 2100 BLAKE2B 5aef4c4363b0a34238
 DIST autojump-22.2.4.tar.gz 52724 BLAKE2B 42d5db90d4a29c63f5cd79437ca005f9f6382a607ab9284244fd6bbcf539509c5043df71ab305a5e8420ec225f8d651411d327833762737e0a5ad828ac021d2b SHA512 bdfca07bb57b3a2733a2085af14f23c3e980b1b00db1c90247c2341ac73f60f171bdde29dd9917aac0808d0b8f2902d48096c990e09281745a71755f5abc921c
 DIST autojump-22.5.1.tar.gz 54721 BLAKE2B ea3a852dddc13ece5ff177be0b3f384e5dcb19795d31d22edae90dba19fe3e78a4b78f48f08c338521d89d57af6251d5690c62eab445229812adb154286b0d5c SHA512 ed1bb28b62d14a481d5c8ee8ebbfc286d21ca54c961904f81ac123c784e17810217dfe1689bdd4b50fd7a9d72509c0cb13583a9817074f6afe26dc3144f64243
 DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140
-EBUILD autojump-22.2.4-r4.ebuild 2105 BLAKE2B ed5777b3ac224467f44dcdbccf86e7b4e40375341054ed4347cac5f75dfda05156bfed090bb5741e26e5f15cc3fdd7c00703d486c02522a0bbf20ad7edd1a030 SHA512 a92e42e387042a6de06a54d3dd51043c6bda4e0317e274aab4127ce1ea750b4907f90d99a46d73f573fefb33e1c80c3294eedcaee47c91ac129784d7456b4e9d
-EBUILD autojump-22.5.1.ebuild 1912 BLAKE2B abaae4ba838a95deaef514933cd8b8d03d2b3cbdc58fad9c8f8ffe08ddec4dee76035ed4c3952a821cda1e344d538e6059bb4263b3aacd540d9f37acabf09841 SHA512 1acfe4d6e05c5a7a1022a3b13223252cfbcc6ba8119e25d4e54c5ff47f299030cde581b61e3e66bfaa55e88d5a0c981ca05a71945f5dc905322fea9963fe91b8
-EBUILD autojump-22.5.3.ebuild 1927 BLAKE2B 64be8ad70b84237f5236eeb2cf0b41ddbce5fb6eb44b3443f5ba768f9b41780ffc677d26d4576552d4a9534f58cef4b8ae1e3904b06877ec811359144ac14b56 SHA512 1d8cb5e922f8965f6bbd45a915b976fb17e06e70881f746afbc1982ce853997e46c079fdc289c4e95fd40a83d199a30fc4445401a0486c1673d45bc2b5e045f9
+EBUILD autojump-22.2.4-r4.ebuild 2099 BLAKE2B e397cba8017516becef5073c70f8f4c147b5422cf115047928a4de8131ebd83579ea882d9470001095cfc76cfc5730cea100fc12f098eea2e6786e4dddca497b SHA512 00acd5242387bea3b63a500d5a21a5783c74bd60284d90ace76c2962af07696fccb3885a1ba372868352402a3eaf936aa31bb6286c9b09aceb82a9b22b7b92da
+EBUILD autojump-22.5.1.ebuild 1906 BLAKE2B ccdb4a0c1d1cbcede3cc3d1ff75c65eaf8cbf5da144c0f5f9f34c7d5904cde654c8dd9819ee90ee6bce9486016df6ccbbe1f0f1d88c6004c4f8d422ac8762240 SHA512 bbf08769ee09b308ab9e28adb6ecf1cacfa125801e982999b1f7adb511b1f666c4767fa4add5a68c56d4d0c2d0465c5ef48e13a031306df95566385ae7a46526
+EBUILD autojump-22.5.3.ebuild 1921 BLAKE2B 8faa33cafd1e4574b768c4e2eb79d7b2295faf9a97b6b9e915a706c8bee113400c30b07df1be72750cdb1c6a70cc6a389713858e852f9fbc8a127d4e6ca88aae SHA512 29f07a2173b0d14c33f95841d7b15f33ea8bbdd874e7e63ee97e9f70b8f100c8d781798dee9d09395a8b895848ec40ca38906772104bf72b17190c5ee0901c83
 MISC metadata.xml 490 BLAKE2B 33ef64a70f2b0d3211861a9ae667a4ed930f850a0198661cd3371024ac6193c80d3121ca188f48cac4732741fdea08e918c8ef78161a921127ec82b1064dd1c1 SHA512 c7742421c4211de2b774bb6136261863bd69a93debe3f1ab4b921e9f19a7581ef2711fbe2090ada92b60f799cd6683368e48d974ab9698ae3c2b5f768cd34db9
diff --git a/app-shells/autojump/autojump-22.2.4-r4.ebuild b/app-shells/autojump/autojump-22.2.4-r4.ebuild
index 4883114a037c..cbaa265735d3 100644
--- a/app-shells/autojump/autojump-22.2.4-r4.ebuild
+++ b/app-shells/autojump/autojump-22.2.4-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 python-r1 vcs-snapshot
 
diff --git a/app-shells/autojump/autojump-22.5.1.ebuild b/app-shells/autojump/autojump-22.5.1.ebuild
index 0da2af83294b..245a0758bb79 100644
--- a/app-shells/autojump/autojump-22.5.1.ebuild
+++ b/app-shells/autojump/autojump-22.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 python-r1 vcs-snapshot
 
diff --git a/app-shells/autojump/autojump-22.5.3.ebuild b/app-shells/autojump/autojump-22.5.3.ebuild
index 656a01d92f43..71d13b787032 100644
--- a/app-shells/autojump/autojump-22.5.3.ebuild
+++ b/app-shells/autojump/autojump-22.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 python-r1 vcs-snapshot prefix
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/wting/${PN}/archive/release-v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~hppa ~mips ~ppc ~ppc64 x86 ~x64-macos"
 IUSE="ipython test"
 REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index c34ce8d50c34..ab84c534a8c0 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -3,6 +3,6 @@ DIST bash-completion-2.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c95
 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 4706 BLAKE2B 8b6b8dd3e0146034f139cce31067317b2c28d46d50609cadd59d1100dbbfb6c7097a3cc8486fea18b4de94b32a971f441001e4c52a6b169a5c3e2d9e228b5eb5 SHA512 a6ead8364de47c9ed3682e5cf00a93eaa4d649507aa21bd91320e6afa8cebab46aad7548e643db91600ab40f0c40a873362c3c73d96640d2c78222960b6bc579
-EBUILD bash-completion-2.9-r1.ebuild 4773 BLAKE2B b8683762da9d36c7a1802d4522b627b7bccfa47d5ce5645cac3d53e24b18da58e8b79f8364312aa5a508c978c22a36d77cd20e35ba3c3e09f8dfc8d92fc660f5 SHA512 4bd49afc0a7e1550947462163e865ec8d61dda2257ec5206b1dff0020215b8a8b797843f2d327b8e10e64ca07a75142c3afc09b06da53843181279e04328921a
+EBUILD bash-completion-2.9-r1.ebuild 4774 BLAKE2B 9bb5a015182ff6e6b96c078f4d2c884f568a6d68a3c88be901db9d5fd4cc0ed02e08af3b007af112c3dbed6073231d57663a0ee25238875a04df66cd17b380ac SHA512 739563c3ebfef2b455b25cd3cfaac7cedb43c9872cfdb47afe93591b59052a7dc073b87f4ea2b719e22c4e0ce78c151e2930cdc7430700b793d7e3c472ba8409
 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.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
index c6a790cafbd9..0be4bfcf37f1 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 ~sh 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 4d2490aba453..c8a4e94684c8 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -386,15 +386,15 @@ DIST bash50-008 2622 BLAKE2B 9919e24840f32a44a9040fd8fa9fb482da1859223e70e75d21d
 DIST bash50-009 1095 BLAKE2B 4a9b2035173dd23f9c8ac5474e573080112d9edcf918816b5dd41e880f212f66c2c80dd41793ec62449c487fec1ad2c57b353a00c0976a782098fa6be76d0f23 SHA512 6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833
 DIST bash50-010 6407 BLAKE2B 94792141dedbb8d2c9f9355c94eec56b1fa84459291c61ac31e9ee9a67e80edb95234b67ab59c5f3f039d596275c9b154544439bc730256beaf303e6cbf99c4c SHA512 8ca2cea0264bc0401414207fd8752d4d6eda64be3bb10fdc22529fa2bcedb84e6ab257ba2badc7078ece7f2ae1e2964635926f227eea7aed58166e82871322c2
 DIST bash50-011 1870 BLAKE2B 7307aa709810ea3e9fbc0db6a558cb6a660736677edf56904721599be5c0a6e69b74cc01fb3988f1b06e7f8bcce512a3b5d773b7ebb3a7397a0e4815e84f48ce SHA512 05833d6c85f3795a9c100246335f39155c1b5d190e073bf382269c2bbceb13a2de3f85dbe1dd5d4c7824fcca481febe3bdbb4c555e1f2de86bec05fcf6f5871e
-EBUILD bash-2.05b_p13.ebuild 4603 BLAKE2B f8f21b18f1a21ff882a97c63c9e0085fa14d8427a415f7bb55009270725b84b747561840f0f062f7fc676fa3348c9d7b2b85550bdecb9dd92f0c1f78f6701598 SHA512 986d855ddd7bcc5be352c9e4a912cb5f2403ae50158a9074f08aa30d46d508fbdf4c8c7245b7e9b18b5584f18ee0472130c922e70721900f72d407e8d8048269
-EBUILD bash-3.0_p22.ebuild 4736 BLAKE2B a4dbd0f5c2cd05b11a16eb3c21edc790b127427aadb85afcbfc5913298ae8efcf00089ccb4838090398d1e54f0631dd7249fd98d5e76ff8403519133ba5131ac SHA512 aeba1ef9ad4af0f9b654118023f241e48ed6c87018be99f87ba242e6b5c30a3082e370461a003bea134ed853ccb0df3a45252d347abb711b06f7de2c825c54f1
-EBUILD bash-3.1_p23.ebuild 4417 BLAKE2B 044424765cd932e2d0a7ef69d201685f981a845e6a1700a6e3d60a4a8fdf8284d12b554622673915f8c46c2d7692abd3290e0630afb271b43166947517ae08e8 SHA512 dd19587163fb4b6ec589d0b78ac606282981afb366ac719ca2128673e8130335e9b25cf41e87cad593c60879dc9b5ace65b7b01ddf6239c63fe672035bf4e1fb
-EBUILD bash-3.2_p57.ebuild 4524 BLAKE2B b987054a5ad5f7801594d517b042dbd4e27b503c975dec91c6e8de2cc983a90c69ca95711f9cecaae570607eea35224f8ba0f970e54ab647f410564db2d62e77 SHA512 921da0631fa1a18ed1ab8c26d72bcf29f8c64842c1b2f2fe03b25fcf0013e6b21c7d289ac04dda12f40a98219337946e8d16136611052bae56d29cb83dada4cf
-EBUILD bash-4.0_p44.ebuild 4398 BLAKE2B e0dc54e134b2f6c7c3175506f0420db27b9003021985ba78a571a7a42421c0b19a60a4ec87c1a86afe54e3520a8f8dfc47f40d173b8f36de58051f6bbca8ad33 SHA512 f00b6e8dd2acafbbd51461fd7bdfe9c274d0748773103c468392d8c0228a8b50bf71b1047a73ee9d4e6d0909dd54d53d277c1cc4d612ae289804dd6bdf38d7a8
-EBUILD bash-4.1_p17.ebuild 4132 BLAKE2B da5b2a68a31e1bd8ce4449b98c1e761e22968fafc603ba5683af00fdc2dcbef3d5eafda8fdb7d06b9d05f6a008dd6fa568d7c6a2c1f0c9e408f372fe854e335f SHA512 0fa821e4afc57fa72bd22eb810974fc10415cc61658470e635ac22576f646c36d2ecb60308c38b2a5b0f2c5dc13db1fb01324cc0df09f6e81c8f9a48b33424cc
-EBUILD bash-4.2_p53.ebuild 4322 BLAKE2B 55e06dfb5b2060a755cca04fb81dc3b65529927cc08c27332173a6827c97fe60c886367a31e384a7169610640350a89ac4f4e687d5aaddbce3c29453c02e18fa SHA512 4757ccb07ef19bdae161a749e168efabd4c23ed20a2616bf1bd899a38b281e3e8109caf0760d8dd9c2831b8b4f79be73a825b8712c74a4c4ef59a1258114ad00
-EBUILD bash-4.3_p48-r2.ebuild 5620 BLAKE2B 1431dd7e2d87639b4eb81f4226efded25b031631a109a40bf484414fbebd09ea008b4c477c7a5bee8c0d4e04d823d1f851f05497588095932b7aabc8a7824b33 SHA512 74eee8666cabd50e4bc3c2688b5ce88d442c1ae84bac6db1dab8d7715618c370ae9c0c8a582c29f9d003dfa8af01b3b6f2a9d0b966aece2b3c53eac33107eaa5
-EBUILD bash-4.4_p23-r1.ebuild 7367 BLAKE2B 338337c754da83e8d67939efb38b255031684b02ea2f52cb01a6092b9f0f5c800d6a8bae2d3f358842cacffc6cf1b090a2d1f543e252c7c16fd5ebaa072a5f07 SHA512 aa6bcb8605b362bf7fc0d32a44cbd3c4ea2018e329f495efa860a8f77a38c55dbe636ea1a18583e4dc871b4af417e1149107fb89a18268c72d8e83f449a3f258
+EBUILD bash-2.05b_p13.ebuild 4604 BLAKE2B 0813fddad287f8ad0424e39ccd0f3155bc312d833856e22123c8454c110022bd0a1c1daa33fd88f39ae936bf04a080e9a54b8cd49342c8f99a851b8ad3e17a0e SHA512 059d1e4464566c9c9785125a8a393184ea0a4445f43c7898fcaab5201b0988b65445812c57a97ce6b0b6a7c1cc65fddc06b001d80915d4c54af4dc6f9124bcfd
+EBUILD bash-3.0_p22.ebuild 4737 BLAKE2B 6ca8a22f0aace907dbf7eb57804c602ed39395198045a94fa31b34c98b3f4b80b7077247dabee7351639043a33f797ea861d7cbbc1f6327805b3bc289d27adf9 SHA512 53aad975e2703a6d0766b2a9399cefb3e031a151df5dc63fbdb648868e86bcab647d818efc0b7f473f4e57bfb83d8758f595dabc41cf8d1209432537bd8e843b
+EBUILD bash-3.1_p23.ebuild 4418 BLAKE2B af3f33a9cb2cdcb95956d2aa7c674411efc12777779ebee5b929f7e74c7deaa894ae799e20451f444d572e382ddd0c863841aa98751779d12329179a8874708f SHA512 e80b15131bcffa55092dfef44172d8514cd8740ae4f4a5814354bc000a318f563833c8c84bcbe88983d02360ed122ff904ad7a3374d70a01b1b9a40e0a14227d
+EBUILD bash-3.2_p57.ebuild 4525 BLAKE2B 7efd7e5cfea45762a0ff4778df106db54c907a8a7a771b825916614dec8939f89b8c444a3d51daeea36442ef1e386760e98f81e5bcc2f0d9c4a8c5f5c41f0428 SHA512 485584f890ce944811c639c6453139c2f0a230dba0b2cf6131014b57b7a282482eca8d3a38c6d12b6f0fe524642c0570fe6a6ba7a5a4645af28c07bc791b4af0
+EBUILD bash-4.0_p44.ebuild 4399 BLAKE2B 6cc34f761ae5da2c995dbb7006500f67a85e7f58f7b07d5e469eb30376bea80c132562b107bc2666f6abf1cd831dc74d4032c6df931a02c39a1e2d94dd2ed4c0 SHA512 ba5c51b09cdfb0c1ef52a09484c982a001f80081ae818b517209cec88be5f1a239c5b2caca0593d0f2e737f81d850d252701ae2bbf5da78e717dd120b77218cc
+EBUILD bash-4.1_p17.ebuild 4133 BLAKE2B 5d96b78c54d663e381bb94394aa18d93625f5412b072d7a648197004b0283ffd5bf8a0cf88ddd714a90697658151d8bed82ed808fe6e908eddd8b450ef7d51f2 SHA512 22b43e3c49d8ee1029824123f1a09be99a99b6a26520f1f8f86484e8da9841422306677e1282dbcddebd7fc280144e09572cb8439af00b1a43bed769433ad967
+EBUILD bash-4.2_p53.ebuild 4323 BLAKE2B c228182e505b67d7d598a1b3b707c785302615fae5ef4f510d3ee064ec99886da86dd61d961bccc85fe1feec49bd0b4c82a80ecad4f36580584cb8484656321d SHA512 d025a58818251cd00568c16d5b6675f1b20ec79b745fa51c5c1d7934a69d9690dab6b088d841164c42195c88fe768e18e00eae72ed41f3c6e8456740283b3a1e
+EBUILD bash-4.3_p48-r2.ebuild 5621 BLAKE2B 7197e814c59e552720f8c25e634c283c12eaaf18910e25b29deff79ce53031fef0599372f6f6a3380cd98c34a234cae02b9a136053af10f56ab57d67b789a017 SHA512 6959eecb84e85f77e415f16e0df5314f2fa2b0fbef90723de6878e7f5539732a340f119c12a92ff915e3fbce5f7eff20a039ca642fd5d5f963e0b97a0c9e6e83
+EBUILD bash-4.4_p23-r1.ebuild 7368 BLAKE2B 7f070e824465c6868d2c09cbb97b44570be88a52f0930984db2c4cf1b9715e7897e227dfc8ff556c3c995d00b63b9073b7f5c4974bd05ee270ae483c49457aa6 SHA512 a9c6a27d042f003344f05fee3b3c68441dca8fca5ef16df81e118f8905b2ef43aa68f1028e16def30ae32bfb9abb7b28ea495e176b00f7529c14dd058cb436cd
 EBUILD bash-5.0_p11.ebuild 7428 BLAKE2B a912551c6ab6cbcdd504baa74286935b7f83ef31c3db4fe144a93fb3ac24b2cfa057331710b9ab88aa1d9a4cb46b4ea48eaa427ca0c696a880f926ed346dc406 SHA512 36735b4668d3e65cc18db9bdacf7bd3030f7a5629f4876317ddd24f660194dc8ff661587fabdf4da0aa8f30b2bd3d0f355e915cea97aa51f7c67f7b5c698da82
 EBUILD bash-5.0_p9.ebuild 7488 BLAKE2B 1de7e377d32bb1b08699fe8b418f5fbbbf7cf92fa865f2bc14dddc3010fa78b0803aa4dfa489888a812698b5646bcceb4bfdb7951fe647454b6f5cc90cf48b0f SHA512 f63c093db4c160bfe41ff2605d42f4aa184bac33ff6b0d89fb025571c88907bea3a2a5b71486bfac238ca1d842abf93fe671147b68bead2c0f9b5d498a4428d0
 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 4466c5224c6a..d00193a9b179 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 sh 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 af9fa50a09c8..281a07ddcac7 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 sh 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 13eff9614006..39d7e5c07b3b 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 sh 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 f5dc3ced6a0b..4bfd22c58328 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 sh 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 6314d1a2db46..72bd396350e0 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 sh 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 64ec6b5d048c..5fce8861d5b3 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 sh 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 ce7537725a2a..6b916eee6298 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 sh 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 ac2d9d1c0b0a..60c235373319 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 sh 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 60bd977a1007..ebd7c146c238 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 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"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bashish/Manifest b/app-shells/bashish/Manifest
index fb872b07a53b..d81a255d63ab 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 9acf1959f9bea2e8e836c90a9747e5acd4cfd718117c4941d459a2740dc72a992e0f8a0671dbd9a2dd7fb5bdf1ceaebbd8a0eb82e4ce9f5b43e9e032d5cf6149 SHA512 3923e1c335637b8bab1f76f9c7c3973f85135e32cff33134c1cce8125d9ab25434ba3c5130be7102ba3588391807ea3eddb842c64255011f72b517c214705e37
+EBUILD bashish-2.2.4.ebuild 456 BLAKE2B 512b1d170c2f6007bf3b39408bda98268a1bec74f8a2691d496a7e0c1970366a3b964be8866792cecc8389caad0ccb035b52507cffc6b40cd42c359b63804858 SHA512 d76a228c58bc763758d763b4d72d6b6502c75a99bd138b54d38d5aadc955c8a3d824be54d8293af4a0e4e30685296173720cf4eb863f12297c7e14b07bb5f22f
 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 dab12500462c..38199202367c 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 56fb9bdd1df8..d9548d2f50f8 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -7,5 +7,5 @@ DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b
 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 2102 BLAKE2B 4afafb3ed350dead0d0383877b612b8891d4241f742fbf7bac0f28f7c42bf0e29a59f5f512fbdc9914197cc930241b789e74239a33757f4383527cfe6b563b98 SHA512 9145720f7d1e33a8c6c60f265ba7574bed868893bb8190726afdd9ffb09a18f4c624f761ffe08746f2ec9f68f69611f8751684a04827bd480bb783056a9928ef
+EBUILD dash-0.5.9.1-r3.ebuild 2103 BLAKE2B d771311f2f19a282a0691eb918fa750e28de6ecf0ecc3ba6ced32329e90b937ffb385eeb1adfe53836324364ca7a82d3b254690da839f01b68c3eabb08dce557 SHA512 e3bf9f29a7a44a4845b5d4eb0b6296afa2067b423883b3e1ecead705c21bf4c8b78d05360a70b936e4f1f817fd273a1dfe7440f3cb6f24e5df9a983b153997ac
 MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6
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 44c8851d7e4a..01f2111a4c16 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 ~sh 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 0b3bc607f5fa..5880bf59cc53 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -5,5 +5,5 @@ DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
 EBUILD fish-3.0.2.ebuild 1636 BLAKE2B c6596d235523292dc48628cd49233cdeaa2e1a515dbee4670daa8c3113e079a106d8e57ec368fa5b080816232322dc622d188e328836aec6b7ab0f809ee95098 SHA512 4844329691943c21fcde1024b259dfb4316db8512f9537bcf0610bf6a34ddaa76dd9fe25773849f05db82c77dd9d623ec32fb399b7339f37ddeedd0f51fc92e0
-EBUILD fish-9999.ebuild 1570 BLAKE2B b619d8fcf2ff1108547bdc462a4b6feb33a326a530f40c05b2da744e01f8ce82d53f4fd211f54f6dafee1c4a260eb9336c4250bc2ea9d9d3580e93d8b222b5c7 SHA512 ac53907f491994b01351bbf0c6c649e9a9616288ca1d0a802b9b0aad91d1d9cabd5c00bf46976b19308351142ff618ba3b614c4a3d6aebb53cbec36f44b69ad7
+EBUILD fish-9999.ebuild 1545 BLAKE2B fd23d23d813a9f9ca5309a2cf60e3b275b746e76a13cc27fc9ba4c5fa0df7a6fd60fe1f25d44ee79d842cc850df74d6992a4aaf10c9dde8af95dc9e454d37563 SHA512 41e8f5fddf53c6cbb43097a4cff062474d89e575b8923f706ac98b32916c7856ebee2b220adaa5684a3992b2c55cc53c10de3f09869c49218289c6d91a4346ca
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index e718e3cbc309..8d135c75a1fc 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-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
@@ -50,7 +50,6 @@ src_configure() {
 		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
 		-DCURSES_NEED_NCURSES=ON
-		-DINTERNAL_WCWIDTH=OFF
 		-DBUILD_DOCS="$(usex doc)"
 		-DWITH_GETTEXT="$(usex nls)"
 	)
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 0957095083fd..33da7df03456 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 732 BLAKE2B e6acc8effc21b74e198ab9a4fa00a3c0e6d20d532740d13429a66c25579deb7f99d6fcca833a292655b7d2f0c1dea4d1d8610723177d2bac9c53eeca13e8e795 SHA512 bd80dc75dd743b0989a16fd1fee01b427618ef0f93da5b260a436254217c1f6f0c73a187c99a6968a346397ae65dfdb9afcc12b0a7081b78041e29a854b65d08
+EBUILD gentoo-bashcomp-20180302.ebuild 733 BLAKE2B 456fbabf34865e1abf3a9562c71c2c3d21183f58f0ea0e6a27cb099573ca88c573e58be9d8fe4a2daf19838ff7ea2e2c0701339b65d7e485c9722684c7991397 SHA512 d5fe6776fc097ab63162600e03d4b47aed37bc6b6d709c06b2747e90e1e67e718767c8606ad972745cbeb6636b26af9d56acf0a8c6beb64700c17a6b6b617480
 EBUILD gentoo-bashcomp-20190211.ebuild 731 BLAKE2B debd7174305a45a66434f640309ed73552b3c2de71a235a0395bfaa96faa9f18cb2226d5ab3b9fb39dae3ee3bc9d7297979c921058e4a05accafd799d0f80557 SHA512 088797a6a93da38333d2702e82c8e868793dd2d6b08ea17966b54d7eeb1504c6d3e6595433d9ba1c8ac790a278cb61afc6db429137cbdb47e1974eea9b755d38
 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 00f22aebf44c..7dd04476f8d2 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 ~sh 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-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index d6dd496ebf0a..d46d478604d9 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 752 BLAKE2B f2ce8ba36cc26a33bd46695c99a855b169251e38e087db8117559b9c5fa78ea483263839dc57281687dccd2503c2a0e9be5519f816efebeba5ec16d6a7f24ba7 SHA512 ed145ad66ee9f8c7b888ce80da3b85ab942f20dd3e0d18d28a8446a496a3a3bd3c26381712e20a0bc35b6e65dc72007615ee4e50b45dd21ab889e79d0aad6475
-EBUILD gentoo-zsh-completions-99999999.ebuild 749 BLAKE2B 6fcaf920e884fc2f3a74a80d77e8d48f1b4be968a764e63447701c74e4bd22239e860db3169126943f901d59428da7f342aae9966e9ae85313e78f3dcc47c9c5 SHA512 141b3cae869c3a877a44093ea8ab444ced6247db21c70c11c6e87fb052379e3dd1df638740a7f16a6b41e775c50e9f52505f280b46e974fed7bcd71debb1b2c5
+EBUILD gentoo-zsh-completions-20180228.ebuild 753 BLAKE2B 04aa982991bdc17e980474b7a250620c883340c8ce2321208720e57080ddaa5d49c49f692c62183746c35c5bed431e7791c2ca7ad9d88646b80545b025ff7fe1 SHA512 4b0f8e50ddfc87802a76e0e8058ffe4c45a06542bd5a82e89254e6ac8723ad9a551f968284ecc157d7f62e9bfc4723f938b1c3d57491f0bf126d17a4f21b5252
+EBUILD gentoo-zsh-completions-99999999.ebuild 750 BLAKE2B ccaa0bb19d13dafed86f51f7c52c7468b42a660976eb225c0466612a81dbde545dc69e154436bdaa5a049b700979f6326600bf172a74f1cfcbcc47703df25d94 SHA512 4c75d3d56c266f918dd59976ee0061e3f83f907e02415621b770e1592c1112b75292e8881ed54e086337c9d4d09c9815bf6f2f6f7d01359c289f593774dbea24
 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 99a1ffef87d4..9fa4cb2fdce7 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 ~sh 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 e298a90ce1cf..02e6aa4199ac 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 ~sh 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/push/Manifest b/app-shells/push/Manifest
index e44d9b975197..1422662c432a 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 663 BLAKE2B a92a9787c2d432409c068162ec0620a9d4b6921cd3906e1f0f7cb6e47a7efc295ad3a36578adee2f255d2d9d24271ad50caf5dc876a9734ceb6851d31993e5c0 SHA512 64ee88d4f28bc921be372205150cfc062fea6dd64874dad260e17be181c754ce07ba42f8f9736aa930e9df6809cb2186ed64e1fd4bb203a7dc6fe84e8cfe2bdd
+EBUILD push-2.0-r1.ebuild 664 BLAKE2B 316415e62abb0b841bd3aa6293993a43a2786b7b9d24a9ab9728e26f7a9e7adfe4fa3e7fb4ddb840556e4e9296f53f4f94fc66cf8c178a2b47bdfc8f532bfb79 SHA512 68f5bc3132dfeaf4c14a5b3d9c8078a1cd01dc84e91f3f6e7c3d7b844ebb56f63bf43dceb7ca593ba861b703dce354357d1b6f023e0eca4e7a840d26c594444f
 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 3ff826c4584e..1f04d497e6b3 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-r1.ebuild
@@ -10,7 +10,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 ~sh 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 617688ad5887..cd1dbcab6f8e 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 774 BLAKE2B 635fb949c974ad8e7c14ceae60689b996b757d0472721a2a0fa77d21c5d6df4ad62997180375676f60ef9b709d85b39c025e12bd1a0542a5a92467f2e79ed727 SHA512 24da9c60cecc14c4a9ce6b4fe4bdc230cf50268ab557d8be8167d36be7b1d0c88134a97caf2ee83d20de66061a38c164315ac8c46814397d4d7774ec67266959
+EBUILD quoter-3.0_p2-r1.ebuild 775 BLAKE2B 993ed95ec6b55394488f3152e52e65b580aaf19f0cce8afb445f783b42300eb0479f975e424f377fce36067e1574ff175c702fcc5d2c941e031f5d7b500fc08f SHA512 5268bb6b5153206a5a09425998137b84a9ceac13caba905d4a1a2fe2b34d10b9e60bf740678d3e70442372367b3d529876fef3e40936067e9e8397c7147b56e5
 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 c4f0dee8c0b4..5b356137fbda 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 ~sh 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 7b555cab4945..70d98535dc58 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 936 BLAKE2B 3b2bd634e7121606768615836fdde0e51a7b8aae27b83dae33302e8041f586a001eba2f97e44098b7fb27a8ecba9dff719dc91fd52b8a147cd5831d4c0c42531 SHA512 0255a9fc325f1bf8fc71159734294b85e974151107820fb1e50fe46748e773628e93d06661517d38e236a77e59bd858aa1e6edf3b76f878ac8461463c6d7691e
+EBUILD sash-3.8.ebuild 937 BLAKE2B f4a6ec622487826ce309485738f89da31320c0dc02be5d07641aec41ca8c67af1078b872df75680bf5b8b912a4b90a9161cc2fc662260c81a8e0a055d09d9b30 SHA512 d8358a4899b3f2944edf90383e99019632ae6d67ec65fef2868314f2031fa2e3e78c93e52ff0d5897de909102a3b9fbeb38a0fa12c0c08312f496d85c5369d51
 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 34f0ebd3d9cf..c927bf54bedb 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 ~sh sparc x86"
 IUSE="static"
 
 DEPEND="
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 9fea8f4c3dae..2ce4c094a26f 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,11 +1,12 @@
 AUX tcsh-6.18.01-aix.patch 474 BLAKE2B c794769b5ddb354ebbcad902df18db735f06b3e098069e025e5b976b3fdf3758104b48881a94f38f620ba8cb5b307ee3f5a61f528988bd31ff9edd19efb58872 SHA512 ae5dd2f5aee7c14734e775b55f780aa430dd2efc8407b671308215c69e3b97ad37a3b54ad2bc7fabe84b1806997a78ccd15b06ac59491c93dcad14bb14032bd5
 AUX tcsh-6.20.00-debian-dircolors.patch 506 BLAKE2B 584808b9bd488c41a8b375d18b976ef89256771b9282b248c0ac4e500ea5dedb07a05af60c3a5995b511dce49ac95db1b0beb2ae2db11de241e9eea2a72c52cd SHA512 c761857c343c833aea5061baeb54dd86f7a8804424b7ea2009d05fd57b92ba3b892c05fe48a8f4e00a6eee39515086063a9c518004d726626dc5c466958a6dad
 AUX tcsh-6.20.00-use-ncurses-tinfo.patch 382 BLAKE2B 99d794389e3f65607887eae8df4d8af9f9361604f0d70e96a45f3a2b3ec648a6f04f335b2de8fb8b9b6c7441be6009ca38f9f8479ddd9e3e831c4cf0c0b48863 SHA512 d6e2346a0ed093651be7073b04cd31ec1bd587c52fc9a21295405699fed2a63d6ea8415e7c0d29e0f03732288b4a8749e14c9ee85c39a1b4f8e51cfa996166c3
+AUX tcsh-6.21.00-fno-common.patch 613 BLAKE2B bd9d68b9f4a7655d519a49c8937d150e8d4521fea2f1be26b3827369905d865e2115ff2a51a1d491b3ce2c80352d0845cdbc127d808f58556842fa5555dde41b SHA512 d67b82c6dcb7042c8d6e33d97c30b6937244af0667ac9b5928f4316b4bb69e4080f7d609271f2e1beed03b5d896bbc70c171e9f9a58684ab29409918ad77f40d
 AUX tcsh-6.21.00-no-nls.patch 386 BLAKE2B 5df1b205d76e29b68530f50b661329e851ce46206306662e150452ffc340e82d2347a0d1407c3a4aed6ee5f1b93257d0dece87b37ebc51f4240ac83a110f471e SHA512 9ece39f524b0d377dd907772c37e9412cb4a700db5d828aa404a0b231b758638cdf1215d026ba574486c2a00b49f20888e7f5683ac4f712845fa484118a8109f
 AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1d6f3c41cb30d8eb22181cf053bbe39302c9dcb14191383e755f47c08fa1a0dd3fc20cc7f813cf9737e60850327a7e71 SHA512 eef51644cde4bf27a614a1f099b5f21e46600ca396e4baafa6ece005f3fb4901ab1862176ee715b7294216894f6a2d84c1a5b1c38c1086cf95914f6f44358595
 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 2643 BLAKE2B 1a91321f67f53006b82c6e04a2467ea83812ceb52366c22bb8ecf6e11966f7ceeb0b518068e6dfb0a97688a0febf454e962069075f9e3ff9ba3b03576d940484 SHA512 6f38defcf12bae3924f97ef25e533012d50e3217064052c1adee07aa96946abcf5b611e5a3586897a5f51e1ce850ba8de4970df99b76fbb3b224fd5ba21fba11
-EBUILD tcsh-6.21.00.ebuild 2695 BLAKE2B 43b3801a20c5616c145ba1d0ac5e6527cb3003113feace99579c665b1fe1f9d5096ac45c4cf4f4dd1373384df1df1a3afd74ec8c6ced6a98e6299f560cd687fc SHA512 4f42a4d14eb965215d53fde9c345438a02244ec6e0e321039288dd2ccd7930195c8e24098085a06c98a66221d6b39c435068df8cbbd721f5fc717257abf1b651
+EBUILD tcsh-6.20.00.ebuild 2644 BLAKE2B a1a2ed7602648aed4142a9f540463242d61f7b33dd8f975d490a8d0edc3f45e4a72da13d76f179bb000f58b20089c95616020bfa4ec8e8433ffc7c45067a6fd4 SHA512 00488c0466476831c68d4b8778a8e1b81792985310bb92a3ed612d6563d7a77cda4208230d2fd0cd54849691172ee59c8a90e43c9fb274a0e36d9941c1d66833
+EBUILD tcsh-6.21.00-r1.ebuild 2752 BLAKE2B 9441edb70fe9da9c342bc4e88b45d19443e96b3b354bcdf47c766ef6e033e8d9dbe729cc1a632abf583d0814ba68d2cd7717988c403cbde0987aa240d245a7a8 SHA512 76eb26101ffd99e01af6cf06100921c5fe95f085040eb2bbe11af53f5e5aea232b21d79db3b4e084086ba27c095907aa221e74a8ce4be6a0b53f9146487b7398
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch b/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
new file mode 100644
index 000000000000..b5a0cf0600a0
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.21.00-fno-common.patch
@@ -0,0 +1,22 @@
+From 6974bc35a5cda6eab748e364bd76a860ca66968b Mon Sep 17 00:00:00 2001
+From: zoulasc <christos@zoulas.com>
+Date: Sat, 11 Jan 2020 11:16:51 -0500
+Subject: [PATCH] Remove extra variable definition that cause -fno-common build
+ to fail (Werner Fink)
+
+---
+ tc.sig.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tc.sig.c b/tc.sig.c
+index 77659ca..576605a 100644
+--- a/tc.sig.c
++++ b/tc.sig.c
+@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */
+ int phup_disabled; /* = 0; */
+ int pchild_disabled; /* = 0; */
+ int pintr_disabled; /* = 0; */
+-int handle_interrupt; /* = 0; */
+ 
+ int
+ handle_pending_signals(void)
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index d598e0bea3d3..00e1bb6dabfc 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 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"
 IUSE="nls doc"
 RESTRICT="test"
 
diff --git a/app-shells/tcsh/tcsh-6.21.00.ebuild b/app-shells/tcsh/tcsh-6.21.00-r1.ebuild
index 8085148f47f9..8adadc2e6cc4 100644
--- a/app-shells/tcsh/tcsh-6.21.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.00-r1.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=6
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.18.01-aix.patch
 	"${FILESDIR}"/${PN}-6.21.00-no-nls.patch
 	"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
+	"${FILESDIR}"/${PN}-6.21.00-fno-common.patch # upstream
 )
 
 src_prepare() {
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index f07a4a14552f..54d32dd79348 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -6,8 +6,8 @@ DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8
 DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b4431630ab305abc9f1ef722698f7c565d0aa421b0d94c21f2c830f9d529709fd62a4205be1a20acf0f94a845a SHA512 f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2
 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
-EBUILD zsh-5.6.2.ebuild 5796 BLAKE2B 23454fd9fe184d2a52d325f35785f73da3c87aa8016d267458edeae5194bb0e0981b7b6b6e9c815a844cee79e5203ddcb1ff33e926ebcad9eb6b0db5d222d215 SHA512 f7e89fef58005a2e8d51c8b24487557dabde870624fc8e33d8efc2c6b78c0d7e14e523ecf17a4682c3834d855492de98afaf5e3f5cd8107d9a6276dbb5492095
-EBUILD zsh-5.7.1-r1.ebuild 6042 BLAKE2B 64636e84b44364b9cc715ad93d0a18e85f0fa00ba6d84d9974171c1a2354a96e13a13b24bf7e212a38c62b1e6f00cd21311f5a6625ee8f34c38475892b196ba0 SHA512 7d0c7c6663f01073f5b7d5ee675e12748d195f82224b1971766a599163613b252ef46fb31738936a200b38a2b003cfa106cadad8a96ec9aaba59176b644e31a7
+EBUILD zsh-5.6.2.ebuild 5797 BLAKE2B 17f8943283cfc9017edf67fe0d0143dcb9735a8dfac911edb91b7b39aa6279fecf1276a1fd1f4a4f25ebf18616364db9577b357ebd2fa9cb7f344b4d90213089 SHA512 50aa86839509b771e7950e638c47bf5bfec841791020917d0b920194e4a0d3ed508b19a4ad64ff90ac418693883e673c11f44e6ba38d6b7b01858eb25eff0b90
+EBUILD zsh-5.7.1-r1.ebuild 6041 BLAKE2B 137f5a1424e84233763e6e005cca77e9a34c6b73131e14b7af8be179c246c1b079d46ab6e59b43de4a604873996264ab8446b740228f54800ecca635a6f467ff SHA512 af0ca99f0dbce4ecbb1508ed776fcbb793bc7fcf2e77f921899f83e46e9ca8e2661350e62e6d65aca91c3da0000969316b19df83916cdab4f8e095c54038827a
 EBUILD zsh-5.7.1.ebuild 5918 BLAKE2B 157c02c1885f49e39ef74ffcb4a8f3725cab0ab3bb909a163da7d4f9987e26c39d6ba63e3456a39deefd84442236498f839f5761c1dc92b53f60c10e38cff863 SHA512 dd61bccc222da83e4b4bb05fcb36aa929068698f7006f9425f90c0800763e1541acfdde472bb9e030d8246548d5ce6a6463445839823576d04df4b264063f973
 EBUILD zsh-9999.ebuild 5988 BLAKE2B 75c08411ac48ed84ff2b2f870ef8b5495cbbfa601039c328c6fff902736876d5c21f2237dbf82f345feec4b03337349bf842fa165ba9f0f31212b1c105ee8d0a SHA512 528ad315f72b5237313d6438da799cbe8288c85e2150a8cdbc7c623b70ad6238f31ae67d212a4ba5e5beb2351e384128f4780700756e30de88bc1355cb5c06e7
 MISC metadata.xml 514 BLAKE2B 63d77a851911c67bbf8bd722cd8a4766bd0ff0184c2cc6bd2629b27186ea1bdba9b15bed73cee6a261ff499a22a9ef9b8582b22b76eb3752709553bf49e92071 SHA512 bb460e1e123c3f9b7bcad9a6abfcd42ac69f9a2071d6b2dcbee968c3fe82b9bb940e28021b1d619642d99fc595f492247b1a97e6ad51133be73bbb5fd997ef0d
diff --git a/app-shells/zsh/zsh-5.6.2.ebuild b/app-shells/zsh/zsh-5.6.2.ebuild
index 09079224b904..23ca1e3f5987 100644
--- a/app-shells/zsh/zsh-5.6.2.ebuild
+++ b/app-shells/zsh/zsh-5.6.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	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 ~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
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
diff --git a/app-shells/zsh/zsh-5.7.1-r1.ebuild b/app-shells/zsh/zsh-5.7.1-r1.ebuild
index 10d572f4e759..100ce07d9dfe 100644
--- a/app-shells/zsh/zsh-5.7.1-r1.ebuild
+++ b/app-shells/zsh/zsh-5.7.1-r1.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 ~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