gentoo resync : 13.10.2019

44 files changed, 162 insertions, 168 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 04bffcaad664..76f6dbb5d650 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 21b735cf8381..4d2490aba453 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 4613 BLAKE2B c9eae8a532057dab41ca20640f7b85e9f0d8b11eacd84c91b0dc478dcc906cd14976e02b086e2fbc1786661f27ddfce0b8631211461ed77cced2037058e99338 SHA512 f933883acba8f96a5f0390b11650981291c8048211e832a6d3bcc6f41cafe9372380051f804e22958934803c4d8cac83d1bdb604689c313bddeb67446106bff8
-EBUILD bash-3.0_p22.ebuild 4746 BLAKE2B f8840c82f5cfbcf224d1504d3cbadc3eabe015d991a8c41de978562cc0c806b6baed999d085774594deb620dd714fb8d020ccc89d65c3e622745875528b61b57 SHA512 c39a3f5b22a8b462e6b2abf63a13454559b358002e0efb16640fb9caa04cbd9b416640cf25df98b9fdcaaca465bbf083c0687dc08e122c8b965e2761b01b37f6
-EBUILD bash-3.1_p23.ebuild 4427 BLAKE2B baf534ac2cf5a872673b355532b0b9ea8d4836df331f7e50425733815862435ffa44eb9cd95b1dbdd53a29010638b516deb16c8e72a44d5fa135eaea23c34bf5 SHA512 40e91cad8af0682565d4eed7ad2f6184e1624746a8f6ea1ce21bed459e45bcdc8157aa45cc7f89d1ce5c7f1f827707a839bc89a513956b827a50a5e3bc877959
-EBUILD bash-3.2_p57.ebuild 4534 BLAKE2B e1a52abe31b056271064462cbfd95b00d469292a9cf19d20c582196122ad27c11b35b45d9037f2ffb6259af6059fd4eb18b4b1ae96df0f544c320dabbbc9e90c SHA512 6b36f66125d94e8de15d8cb0408652d2cedae02bb0a3af1f8f1c007bd088532daa19d2aaf6359df38b677cd8a13c5e0b439c787f1fe63bf6572eaae121151472
-EBUILD bash-4.0_p44.ebuild 4408 BLAKE2B 13955f4505ba051f1880ce023f2f12e9531433473463c717099f66b1cfb103381d9ffdd6f6948a2e05875445f4e2a43b09f0053066829e71d53bdaf55f37fa89 SHA512 c50783ef42181a245900a7df3578a75b47af48b0e48d5478d6739be48c2487b6d8de866b0e7f26cae18e67aac6f4e8aa6b54da77c22f61ce43a8e79cca296257
-EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e3217346511b3b70e6fc55b6e697c4991e3f505420eb295da5d973b4faceb7edbfca03b91c278bf01b7464602 SHA512 e5f5e135c543aa5dfac81936b1b25e9894aa62918c01214f48abc6a4d1d1251fda8be3566164d324b8644822745f634dd7e4265805d276be822fc190fe2e8146
-EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84c988cdbb663af4b529e1207cc68d0030fa4d88e4028fa7bef08847df170a274ccba316213cceb7401163ed00 SHA512 d3cae3853f6c3b735dd9083b9f7d16bd96aac1ba29ba49e8d5e62140ebdb97f4c9d36e3bc36fcd96f32685236fe6bb80d53015b9dbb20a829968aa535a949a3f
-EBUILD bash-4.3_p48-r2.ebuild 5642 BLAKE2B f5d114b98272cf7e6a900707e0abc4798cc1b85bf509f3260487959dad69a35a0badae19e1522e4746bb74c06f00a767a50c6a3199339c42036f3d92924722af SHA512 e83786756c9e65c08e78137396b393e04a7950d9393c6206491d7d7b13eb46fb4504fe34335706aa0835b6abc651e9578bf6157d6248de8e7fc2dc1a90cba927
-EBUILD bash-4.4_p23-r1.ebuild 7389 BLAKE2B cffb239c13ab880e815dc9e5884020f2287cdbb3074e39862223fc3d3d56d64af121f4f04528e7e94b06df4fe4d520c805cf6a8f32088860cd7c4ffa2e612e2e SHA512 d9f730ce6353e99953eb95e1417d5e109ccf3612d5148087c2eab7c742d6cba979da5468ec260f3d258a9870a3b6b216dd45c67b2a79fa6fe818d6ba88a113c0
-EBUILD bash-5.0_p11.ebuild 7450 BLAKE2B 8a1d1f0f46fd23c612d3fdc78a491e70c8cc087ea6a8dc098e64162d87e4c17e9374cf22c17ba9c20b4cc5c0bc6db2bf0794a8927d4609b007eb5a14ebcfdc1f SHA512 9f8aee55faa591310def5084b5295daf3a70add729457b3bfc1028b53c59244823d0c4ebc30e698f20a47ce6b0b76c98595b5c9e001601724733e687be167aa7
-EBUILD bash-5.0_p9.ebuild 7510 BLAKE2B 9cfca8fca829418072d0f952255af9167b029bd9a23a37f5398286990ba87509bb7f39d0286c7cc718c2f19e0266a54dd1c927fa67294d04567f9489922bcb45 SHA512 1b8601b167d891a8a684c0562d2cb03c657602a6240045f0378b5e2278b3e4001215ae014719a84f1cfed5d86ea41d375c9c93e4395b4dde0488864c62ccfae6
+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-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 f71b3095d371..4466c5224c6a 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 ~x86-fbsd"
+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 f151644345e3..af9fa50a09c8 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 ~x86-fbsd"
+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 0c59e126c8cb..13eff9614006 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 ~x86-fbsd"
+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 45b87b1ccdcd..f5dc3ced6a0b 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 ~x86-fbsd"
+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 81a46b777c87..6314d1a2db46 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 ~x86-fbsd"
+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 3f7e9351c247..64ec6b5d048c 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 ~x86-fbsd"
+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 5f2b94134fba..ce7537725a2a 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 ~amd64-fbsd ~x86-fbsd"
+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 84f4b4cf49d9..ac2d9d1c0b0a 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 ~amd64-fbsd ~x86-fbsd"
+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 185406438614..60bd977a1007 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-fbsd ~x86-fbsd ~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/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
index 9600b9ed36bb..172ecd51ad88 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-fbsd ~x86-fbsd ~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/bash/bash-5.0_p9.ebuild b/app-shells/bash/bash-5.0_p9.ebuild
index 38244a7b24fd..e112f72e3aa0 100644
--- a/app-shells/bash/bash-5.0_p9.ebuild
+++ b/app-shells/bash/bash-5.0_p9.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-fbsd ~x86-fbsd ~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/bashdb/Manifest b/app-shells/bashdb/Manifest
index b6315b29f364..ff7d1d08af5d 100644
--- a/app-shells/bashdb/Manifest
+++ b/app-shells/bashdb/Manifest
@@ -8,5 +8,5 @@ EBUILD bashdb-4.3.0.91-r2.ebuild 823 BLAKE2B 76e207846110a1c811ef649e5416543abe8
 EBUILD bashdb-4.4.0.92.ebuild 837 BLAKE2B 633488ec8ba934ff9a78b00f60ef9a7ab3623caf82658411cd876af9bad656b04dd040ac68e5b7feab89aeb8899f662fb6260a3cf203d0a069ca0115c8ef8c85 SHA512 986bf2b35d7b8d3a22225c3082077334909311b5a1e3b203af391ce17a93223054c592f759526277c7f88e3f69636a543f8db89c4641a77eff3ad199db020df0
 EBUILD bashdb-4.4.0.94.ebuild 837 BLAKE2B 235d50ad42282afbe67ef7a6ce742461983610f6061f42de8fcd190e15312aabbe79fd98bb4ee9a2f6d977d93d6595a130e6401a215ed5ee1fc872ccdcfc67b9 SHA512 f9adef378b907f9ed78e433c39a67a0801b664774b63c1aa76615b9e414491997549c71398952818d7e69c58c49ada1e0049bbae3fbc0789b4f7cd59efa4b4b2
 EBUILD bashdb-4.4.1.0.0.ebuild 1039 BLAKE2B 7a0c8e1b2f6c9540427f905cb374045d4e328445ab782da5981522d1147f38bfc9f4037caf3ff0f5265511e452eefca338859163dc8be2cd0e78d2c6ca3cf52f SHA512 c63ec5fffb2954227002d697d8e85263c8b5224f69b308111c3acd89ee236f1ee649c368bc528f3657e06af468db780e3f5d641f807bf16aeb24c6d3a0955683
-EBUILD bashdb-4.4.1.0.1.ebuild 1039 BLAKE2B 7a0c8e1b2f6c9540427f905cb374045d4e328445ab782da5981522d1147f38bfc9f4037caf3ff0f5265511e452eefca338859163dc8be2cd0e78d2c6ca3cf52f SHA512 c63ec5fffb2954227002d697d8e85263c8b5224f69b308111c3acd89ee236f1ee649c368bc528f3657e06af468db780e3f5d641f807bf16aeb24c6d3a0955683
+EBUILD bashdb-4.4.1.0.1.ebuild 1035 BLAKE2B e6ba503594afcea73547da2b937945929285b50ba84afbb1efd5456c15a586ec792d8d7d585c692d50d8d2f733de741c69056e5b7b1173e516c4518419d2c575 SHA512 7e9d014345b909c635481975bbb1229cbfefc8440b3940507efb2e7bb65a2209a83d9960946018705de6e05ef88adf4b6ce7e50a199024b286e43ed19104bd58
 MISC metadata.xml 333 BLAKE2B 3d15d5b1c4dc17fb6eb805020e6cacb0b835ec4113cccec2756d5b3ccd6be5ce427383598b136f9e13280452e1d9252a609671d3016fffd14ccd898fa7553ad8 SHA512 eb1b078a7e431900181f558710bba93fb5c4633733364664e85e07b4bd05c8ba7492948d4a3ac8cb4866f128b116d82b5b6f1c8b2966318fb9ed61a9c78dda82
diff --git a/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild b/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
index 2e08dfbbd120..2a5f481e651b 100644
--- a/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
+++ b/app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 
 DEPEND="!>=app-shells/bash-${PV:0:1}.$((${PV:2:1}+1))"
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 64b102a2f82a..0957095083fd 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 754 BLAKE2B 2710c6b2625132ab96e2816ea6e0959f4b7ea9d509ab4f7fb10798d6a2977e2d503f1991c4531db61fb92ec0a93eef58aa36b4930c1e20fae79207baf0ec35ee SHA512 915c00c55a783b550a373ad9c4b3b89fc4920b80e9e47878789a10614c671847c526def6e152134a2b7b08cccbe1b0ed25c581ce07e9db1eed34cbce99b4d234
-EBUILD gentoo-bashcomp-20190211.ebuild 753 BLAKE2B 8532699668e0912e0b6de7b5a3b9bc62a316f8f11e214f54ad5d6105c0662520e7e94ca3089f151673c2cee6bdbcfd7f594a8b97eba0db05f75c40defb2a5ce7 SHA512 df859cb7971261d2005ed7e877e9ae76a757372cb3524b085dfa9f1b7e8d926ba95c7ca3a7c38c0b5255c293d071c4584b1b1d4ded499c3a2f558ab6d7621fdb
+EBUILD gentoo-bashcomp-20180302.ebuild 732 BLAKE2B e6acc8effc21b74e198ab9a4fa00a3c0e6d20d532740d13429a66c25579deb7f99d6fcca833a292655b7d2f0c1dea4d1d8610723177d2bac9c53eeca13e8e795 SHA512 bd80dc75dd743b0989a16fd1fee01b427618ef0f93da5b260a436254217c1f6f0c73a187c99a6968a346397ae65dfdb9afcc12b0a7081b78041e29a854b65d08
+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 ce7c619fd0f5..00f22aebf44c 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-fbsd ~x86-fbsd ~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-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 645f24d76822..7e03f0ec3362 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-fbsd ~x86-fbsd ~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"
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index fcbafadc0dcf..b18a49539a1d 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-zsh-completions-20150103.tar.gz 23759 BLAKE2B 9e48cad8b98df4de9479f06ab394e689f2169c6b52e062806b2051f18b86a6f80b660f472fe48b94bb0aff10095d7fcb9e097aa38710d6f3969cb03cfa4aff5c SHA512 4d87edda071d98672df79e3dbb9565757c0738bc50751d31e5dfefab4f17523387fb2342906ecc0600ce86d888ab4a785756bbb1daf37ca56a3ce1af9e5ae173
 DIST gentoo-zsh-completions-20180228.tar.gz 23246 BLAKE2B a6e4004aa7592cbb097cad55fe9d7286f39bd264d8c463ed22e665ca6a60732b0bc8678a0ac09715e2f34abbadd0e4466d783fdb228ce364bcbe13fb7f097649 SHA512 2b3dcfb910e297eb2f03f4ad9f3749b379ceb60f8b6cbcb7c7d03b7921b79aa21f8d3aa50931c5d4eff52f988a208f1a810c6da7c20720be7a3f2ce4a4564788
-EBUILD gentoo-zsh-completions-20150103.ebuild 771 BLAKE2B c65368b319701900a3df63d3fc927b784776c07678bc040926d6e2629f4d2424028ed0485bac0963e4791ce65febe8043e59d96bc482e506bdf059ce6adebe28 SHA512 f9eb8af6a85e8d5a0ad67ad9c96c26cc9471e484bab7d88ea921a0d49e8d9fccf3edf47c8785a8ad356904808d3724bd37c121158ddce8d32df16a228122cf24
-EBUILD gentoo-zsh-completions-20180228.ebuild 774 BLAKE2B 79a36e8460536c616174a7f8cf6e7fbd814a8760de0bec49de0b16b43a0c5115cceed9af981a3eaa7339d6ef52a80d2e8042877422b11ef4ce13fba79e70d0d2 SHA512 8e36b27e29ad356b15e12e16d01e8fc182aa310b5257b2b88c1ddeb52d706adc084d822763d5def5a78b453d286b39f1efd057532a59ee2e35aa8f860ad1253d
-EBUILD gentoo-zsh-completions-99999999.ebuild 771 BLAKE2B 7436e2dd771079cc966ec435d850a24086e82c9e33c22dd8a1b0f731ffe8c34701f2ab1718d2699fb1d97bf986901442ecf5bf380f7feba63531831fac9a338a SHA512 51c32e89ab85b75c7415c85dfa06670423a3e1944be0cce715fb416a238196faebc881220c275853a18d69153bf13607638ea127e15727df562e10106f104270
+EBUILD gentoo-zsh-completions-20150103.ebuild 749 BLAKE2B 3dc0cdc039b46e168e9df3c122e3296f039be0e52b5167439bffb41e9ee7812607c98ef4b49568b6b6a9a8d1d89ca38d779ee1f1aa5f5518e9c571bee1c11bbf SHA512 c8b4cc5e74530e7e513efba127aaf16cdb1762b374bf2c6ae860902ee7bd231382e2f3b0adc28ddbedadeb551c1717236a06f1333387107e46ffffd72da86933
+EBUILD gentoo-zsh-completions-20180228.ebuild 752 BLAKE2B f2ce8ba36cc26a33bd46695c99a855b169251e38e087db8117559b9c5fa78ea483263839dc57281687dccd2503c2a0e9be5519f816efebeba5ec16d6a7f24ba7 SHA512 ed145ad66ee9f8c7b888ce80da3b85ab942f20dd3e0d18d28a8446a496a3a3bd3c26381712e20a0bc35b6e65dc72007615ee4e50b45dd21ab889e79d0aad6475
+EBUILD gentoo-zsh-completions-99999999.ebuild 749 BLAKE2B 6fcaf920e884fc2f3a74a80d77e8d48f1b4be968a764e63447701c74e4bd22239e860db3169126943f901d59428da7f342aae9966e9ae85313e78f3dcc47c9c5 SHA512 141b3cae869c3a877a44093ea8ab444ced6247db21c70c11c6e87fb052379e3dd1df638740a7f16a6b41e775c50e9f52505f280b46e974fed7bcd71debb1b2c5
 MISC metadata.xml 350 BLAKE2B c8d3cbed9f1d2cc6511612f05448d7826ca031448c936a2ec18ad2bc8af628c3531a248c63cc2f46f0037c2b9305051df2b3d05808d5d7721c39560c0621bfd9 SHA512 06072032aaba8a33b43231772067bbadedc05abe289933b54108d30e6acd81fab23e621db91dd1269df46a171bb11c3903e8e942a7ce964c1229e44912702d59
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
index cf137815c472..8a03144af909 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.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-fbsd ~x86-fbsd ~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/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
index 0139664c96ac..99a1ffef87d4 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-fbsd ~x86-fbsd ~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 f25ef6864f7d..e298a90ce1cf 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-fbsd ~x86-fbsd ~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/hstr/Manifest b/app-shells/hstr/Manifest
index bdbbc7f1cb4d..fd05e9a80504 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,3 +1,3 @@
 DIST hstr-2.0.tar.gz 1242802 BLAKE2B 24f1a870e6aa12b6544a38601c6bc654e01aa1a185c4f7735559aa3220ed8d9fb840e298526b9e4a177000f2ec5c08caee5da97e13783e4114bde5276ee1e85e SHA512 50d5e8e61aa853dab0093f4225d3329e98bc59609d8d59abf832cd4cb616d78a2fa091d1ad8d16f3543276c4ead95a419f33a13a96f423bf93dc648da32740b7
-EBUILD hstr-2.0.ebuild 596 BLAKE2B dcd36d416a1ff7750e5f387ff9091fa3cc862555ecb7bf19823176dd8552a6aba6540e661b9f0e8309b7aab9d7109ef1f689e1c65297b5116a264801fdeac072 SHA512 fe8b9608e569f0790ef9a3f0f9524c3a675f779252e9764e368f4566251e94813978da81dc881c7d7fc0e1f3ebb7c34163fe872aa89aac6b34a80ca5cd99005e
+EBUILD hstr-2.0.ebuild 584 BLAKE2B d0474503726d6db4141e3a7b23850e5360556f19defd5d0ae9f4e068304d78d35ed622d399133d5909c100e663ed83560ed6cb099d6425fe8f4da0fc9eeb22cd SHA512 561bc4fac391c4337f3da85cb99f2e004a7ee7d1ae674242e1ec6c19c7ca42b1dedaeac35ea1404636fd42d9274e3cf708dc57c4a2266c60c4cf7df8b5923e4a
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
index 0f78fdf6d9a8..206760fd98b8 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]"
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 17dcebcc0fc9..c1161dff95d5 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,8 +1,6 @@
-DIST ksh-2020.0.0-alpha1-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765
-DIST ksh-2020.0.0-alpha1-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad
-DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981
-DIST ksh-2020.0.0-beta1.tar.gz 2022254 BLAKE2B 650ad8ea1140bdbe1fb9fc3e2ecbceedb4605525523584d9ac8a067511ed385f1c83d284c781b31140760500f3de13d1ad8fc695c9c553a3285d5c286a99c7ea SHA512 6f54cdc3c59b44055cc6b670b38ce1685463c841a093a28c5f974dd153eaec3b8924308b353ed7c29a0ec3917ee87cfe57b6cabaca9841633d3599d9c6731330
-EBUILD ksh-2020.0.0_alpha1.ebuild 897 BLAKE2B 1443fede77e9081c7365dfcc875d551c3a044906cb655eca8fc09b5a71b26158ffc0bf4f30ae0341ad207bf2f70d3f7eb8f9180a7179136d07f321ea210c7ec2 SHA512 7a4bb61849e9f76d10afe299bee4c25594fa0547006bbbf2636d28c19f264631847bbd5159a690d2a40da9179ef3d761d213c2f341b0373428dcf0739942bbd3
-EBUILD ksh-2020.0.0_beta1.ebuild 700 BLAKE2B f402dd243201aed831b1f6dd097e58fe108a0f5f75d31446c22cbf8750b6757e186abf564dd18498b8a35918cde04f3680d34d8546a25e145deb8a37cc5e8a1f SHA512 496e89142f08dde07852dc6d6db8756b2e0b3cadce077a2ad53e5d680265a7774fd21460acd6e744a583a8896f2e3c492986fcf759210ae72d97604695e11682
+AUX ksh-2020.0.0-ensure-user-set.patch 1017 BLAKE2B 8a0d9fd9fd8940969741214f6ba9251ae1b404bae80385d79428ab7231a5809bafcaa5033084af0582872171666e89b590b7c2cfba1ded740da49c77b1751888 SHA512 bea76ef4350d2813395bbfaa682b97a34548292efe9986a1d63dde2476bbfbfd21dc9b10ccb7ac3bcf33e9aeb3c0eebdcffb22a3b6472302597473ac994b2493
+AUX ksh-2020.0.0-skip-api-test.patch 1394 BLAKE2B bcf521012bb197d234b119dc56ddc068f8ec3e46b6f4c6d82e1043629368bfcabd1a5d360bae702777e5b01914ac70c9edbdce5ee0bba7e9f69916a3c38b1820 SHA512 e4314599821b3f654b4c87900aa696930953a96b984f43ca00fd17aa91b968ed8f277944c6736ebddae4ee7086e9806f84e3432b24450565d1c679bdbb39e01a
+DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792
+EBUILD ksh-2020.0.0.ebuild 1033 BLAKE2B b930755c2170d179ce1537efbf45606b79392444b0307eb95d119e56accf91b7a0c4511933e4594c6957f261daaef71331ddf1e2f5932c66d8b913a0e1688f4a SHA512 e0005f7021cc75f96e6e89a19c384c18def298d53b63a3a45a49d9498d94824bfaaa993f9e6dca4a02a03f3913a530ca02ff104ba2c7a935c246d492cd4ce882
 EBUILD ksh-9999.ebuild 700 BLAKE2B f402dd243201aed831b1f6dd097e58fe108a0f5f75d31446c22cbf8750b6757e186abf564dd18498b8a35918cde04f3680d34d8546a25e145deb8a37cc5e8a1f SHA512 496e89142f08dde07852dc6d6db8756b2e0b3cadce077a2ad53e5d680265a7774fd21460acd6e744a583a8896f2e3c492986fcf759210ae72d97604695e11682
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch b/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch
new file mode 100644
index 000000000000..9f5d70f4d33c
--- /dev/null
+++ b/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch
@@ -0,0 +1,30 @@
+From cb9f6d3498622b46de021a7f4798512d203747e9 Mon Sep 17 00:00:00 2001
+From: Kurtis Rader <krader@skepticism.us>
+Date: Sun, 1 Sep 2019 15:44:40 -0700
+Subject: [PATCH] Ensure USER is set when unit tests run
+
+Related #1391
+---
+ src/cmd/ksh93/tests/util/run_test.sh | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/cmd/ksh93/tests/util/run_test.sh b/src/cmd/ksh93/tests/util/run_test.sh
+index 20d24ed1fda..ebc74770cae 100644
+--- a/src/cmd/ksh93/tests/util/run_test.sh
++++ b/src/cmd/ksh93/tests/util/run_test.sh
+@@ -62,6 +62,15 @@ fi
+ #
+ export OS_NAME=$(uname -s | tr '[A-Z]' '[a-z]')
+ 
++#
++# Make sure $USER is set. A CI/CB environment might not set it.
++# See https://github.com/att/ast/issues/1391
++#
++if [[ -z $USER ]]
++then
++    export USER=$(id -un)
++fi
++
+ # TODO: Enable the `io` test on Travis macOS once we understand why it dies from an abort().
+ # I'm not seeing that failure happen on either of my macOS 10.12 or 10.13 systems.
+ if [[ $test_name == io && $OS_NAME == darwin && $CI == true ]]
diff --git a/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch b/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch
new file mode 100644
index 000000000000..f832d175454e
--- /dev/null
+++ b/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch
@@ -0,0 +1,36 @@
+From d89753b5d38482f4a3f17ba3b7d09ab07cfe7419 Mon Sep 17 00:00:00 2001
+From: Kurtis Rader <krader@skepticism.us>
+Date: Sun, 1 Sep 2019 13:47:40 -0700
+Subject: [PATCH] Skip API test if build type != debug
+
+Fixes #1390
+---
+ src/lib/libast/tests/misc/meson.build | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/libast/tests/misc/meson.build b/src/lib/libast/tests/misc/meson.build
+index 67a178762fa..a4c864428d8 100644
+--- a/src/lib/libast/tests/misc/meson.build
++++ b/src/lib/libast/tests/misc/meson.build
+@@ -10,6 +10,12 @@ tests_to_skip = [
+     ['freebsd', 'debug'],
+ ]
+ 
++# Non-debug build types affect the behavior of `backtrace()`. Which means it will almost certainly
++# break the "debug" test. See https://github.com/att/ast/issues/1390.
++if get_option('buildtype') != 'debug'
++    tests_to_skip += [['*', 'debug']]
++endif
++
+ foreach test_name: tests
+     # If the platform doesn't have an execinfo.h header there is no point in trying to run the
+     # debug.c unit test.
+@@ -18,7 +24,7 @@ foreach test_name: tests
+     endif
+     skip_test = false
+     foreach skip : tests_to_skip
+-        if system == skip[0] and test_name == skip[1]
++        if ('*' == skip[0] or system == skip[0]) and test_name == skip[1]
+             warning('skipping ' + test_name + ' on ' + system)
+             skip_test = true
+             # break  # Not until meson 0.49
diff --git a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild b/app-shells/ksh/ksh-2020.0.0.ebuild
index 2ccad3528bf3..c2f9bb7797eb 100644
--- a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild
+++ b/app-shells/ksh/ksh-2020.0.0.ebuild
@@ -24,6 +24,23 @@ SLOT="0"
 
 RDEPEND="!app-shells/pdksh"
 
+PATCHES=(
+	"${FILESDIR}"/ksh-2020.0.0-ensure-user-set.patch
+	"${FILESDIR}"/ksh-2020.0.0-skip-api-test.patch
+)
+
+src_test() {
+	local cmd=(
+		meson test
+		-C "${BUILD_DIR}"
+		--num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})"
+	)
+
+	echo "${cmd[@]}" >&2
+	# https://github.com/att/ast/issues/1392
+	env -u T "${cmd[@]}" || die
+}
+
 src_install() {
 	meson_src_install
 	dodir /bin
diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
deleted file mode 100644
index 3c91825f17c5..000000000000
--- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
-HOMEPAGE="https://github.com/att/ast"
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz
-	https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ${MY_P}-solaris.patch
-	https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ${MY_P}-conftab.patch"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CPL-1.0 EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="!app-shells/pdksh"
-
-PATCHES=(
-	"${DISTDIR}"/${MY_P}-solaris.patch
-	"${DISTDIR}"/${MY_P}-conftab.patch
-)
-
-src_install() {
-	meson_src_install
-	dodir /bin
-	mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die
-}
diff --git a/app-shells/peco/Manifest b/app-shells/peco/Manifest
index 7edc925218b3..4b4c3288366b 100644
--- a/app-shells/peco/Manifest
+++ b/app-shells/peco/Manifest
@@ -2,14 +2,10 @@ DIST github.com-google-btree-0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz 141
 DIST github.com-jessevdk-go-flags-8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz 54382 BLAKE2B 5bb4a8609bb8d430e1e0adfca5f09bf8c8884832e0b248e93fd2b9e9f83d5fb816dff9afc46fdbfb65a97efa65e346b54898c14d26a302cdba6a4406a7e3a41a SHA512 65bd90bb6c3d9070ff415f514f2dd113bf886c0a2bcfcf3dbec6fe789df9f27683a4df83d71426f63d00a208b3b581cf791755d71f8dc0c7f7a684a38b7c8401
 DIST github.com-lestrrat-go-pdebug-2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz 5178 BLAKE2B f90e9d643bc6e2829bea16c5ccd65db5235b5bbca7c5a6da0bab8ee99c6b6e517b94a896dbadbdd3f92208c33aa9342c77c79e83e648a9721183fba192135b13 SHA512 b974046135b8fe7f4272eb0f335f30bea93fb25ec9813a733dd34a2342cd6174a2a67ecd595db51e37eee03ffb5155a67cb86afb74b8b99a151d7cbc9aa52ac7
 DIST github.com-mattn-go-runewidth-737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz 6862 BLAKE2B c74b5450128e0093d5ae7b37871024fbe9c8e6bf166520dfc32482e2636ba3c0981e3224d843cbde880fa218872c65b37a1046ef4823d7cc3c786ec5fa0bd969 SHA512 ff8389d189ed1480929954d2567026984d93910a6fa7cdc3c6a925e8dc876a3df10298b08bd7bbf6f7d90914d64212928b2b1b3032ee4bd89974a2938a77f853
-DIST github.com-nsf-termbox-go-abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8.tar.gz 30257 BLAKE2B dd54f93c97a6c471b097d955b07eb126b3e5047c9afd594a49de7eac1d6863f78978e43843ab37226bc6f820cc646e7c6a67b3c70fb7fd20887f1952f4b49114 SHA512 0d4f18366c471aacf0d6fc92c716287d66b1f97ad922af23f4edd030697141d34c8013e62848c10827bf35f7cfb6b6153e29609b41fe36886139a074b1517a65
 DIST github.com-nsf-termbox-go-e2050e41c8847748ec5288741c0b19a8cb26d084.tar.gz 31443 BLAKE2B 821aa359d41a5aada4e184ad38159db5a6d1d581940fad86e175745757eb9451ccdf82de17217d8ddcbee87e5ae3390bba0e64ae656981a91623b952b214bdfa SHA512 81c1f9ce6c507404ee79238c655d7c043c895358ef38256c2e9b95498d88149e8aa6ba37659ec2ce42b46e200d87b043c6922e0d784538e7b9dfe9771ff73ea0
 DIST github.com-pkg-errors-248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz 11334 BLAKE2B 7d703863f2420dab1975063ab8fe27d4b1b203bfda9f279d288cf50b2ff97e94417fc6cd5dbbe1575b4ba8de3e64efbb1e2903965a3735b9bd6308126fb299c9 SHA512 ee488416799f9359958e1cf68cd17a13019a11687dccee7db2633fcd361c7a48da0f6afec6275977f09a38f8475625b66d9f51a4003d2337d07aadf091f5e1d9
 DIST github.com-stretchr-testify-18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz 83549 BLAKE2B 7bdaac806a8ea401ad991f995e1f94fa2983debe6ed8ec4f54462a6f7641084c2ffe14814ad265aa825aa2132fc357d023fce43540e7ea3a433a16064cd3e833 SHA512 e9af02a015b8eff0c83ba7ad6236d83804f75206586ac7a260c2ee663764aa41af445420f296d793ab7ebd3ac9f346dfdd5f1bfda20a4cbdf0a7b29452c7ce37
-DIST peco-0.5.1.tar.gz 76247 BLAKE2B 6ac3b8222a8b9847fcdf402532674a51c28be01ac94162b452437ef2862079146bdcf0b3cb3eceb871a96ddda6e8334b04511f90a43b4331e7852541be440009 SHA512 ed940949917ea00556d6484e427c6a98bff8506cbeae95fedbdab8579fe5ec0bb800a901a32a268752ec3502fa4cae8033ad38422ca341b1375370e1b25cad0c
-DIST peco-0.5.2.tar.gz 76546 BLAKE2B 55a640195f8c025457c460b3bb30e28e742b82c85bb9cdde7ef075bde6ed42249d7346c3fd8aebad756e072c75fc9d6ed6b5e1fc873026ea069134c8dfe0e78b SHA512 13d1d72d932e335a60fa07442bdc03cef775ad038f4281f4cdf6eb114123995b824f25c3dcb89122678dee12dea6f041fe11d38fc4b663f9aca799010e6e14e0
 DIST peco-0.5.3.tar.gz 77415 BLAKE2B 9f060e191550d39eed8dbf4b4379e424886476589e40af2c8bd2758c90636c6e9ab8e7551a32726f1f2d3338c7e59d47432d58f6493f03bbd3b8670095e27382 SHA512 c1b5678b369caa35e3bd2679eee857762c73bcc8a815d83e136fa1c30e48728a60f22be5d92132c8a733d591728f9293a973fc387502db79f5676ae1f45c6774
-EBUILD peco-0.5.1.ebuild 1373 BLAKE2B 00c1fba7eb7c606a35c81033f43db8b1e6b394d36a68b07c7ff262b74d5bd514b7d63f9c7a15378249a5fc30bdf8dd41e199f021e4d9dd08db1112c616cce4ce SHA512 d1654ec3ecbc1c370ea029a486d9cb1cebdaec16cb6315b631d0c0f48ce1c58c9375b8d62e5ec42e078a7a01c129f25d2e06657c3b30295db9108e9fc57911d0
-EBUILD peco-0.5.2.ebuild 1361 BLAKE2B a09e77191a4708da48de51adb9250e7b7afaa2dd0070c6251c4b586852c021369f32db673f78532dbd6ed6050532b8d7c648927d78ca180e996270bfd9ef0314 SHA512 306cc0a0c6f052c2d6941c7854da3a3d4367715186879da6a48671f61cd64239af4ca042a6064c548766614cc8520e53da0f5e08d337a605933f495abaa40f4f
-EBUILD peco-0.5.3.ebuild 1573 BLAKE2B 15c7660fbca3b7aad33e1bc40ea5d708dcd0da50c81086ea620faaf6a1a98d1d631bc08f7ae759cfccb50558579869d072fb7237f23d8a50bf2bc3c944c3f0fa SHA512 33cca7c9e4fd73ae4ad42e5ec4ef8f89440ca6eb50ce461d373fb2eb91a1bd33f4f4ca523e736e7fec1a0b3386a9d756677c9cc8870c2baef921a75d779d03f7
+EBUILD peco-0.5.3-r1.ebuild 1591 BLAKE2B 6c3cb74040b59eb901b9e06672bfee82c7775996a65daefbaff1f47c8c09447adbec43029ae294c99caf726343074051a3362da8ee3b1c8d1c5c499c7f05c091 SHA512 191048f7f616216f7a295f285f2f94ac27708434291f334d9da15636d926748b0df735e00e3f33a9533514f3a6983777eb285f236282343f2f6e6761de33b5d0
+EBUILD peco-0.5.3.ebuild 1591 BLAKE2B 606d3404cee5fb38b0290ce3dd59fb5fc0308eb7c28c67d85f586c3fbff25b979d1eaafc78c76b2922ecfcfaa82ca40ac086dc2da1f488d36712a57d4a535ed9 SHA512 fb9e2909748a9064c3cd5894d19353fcc6b7481cafe8e41354f0e99a7d5d5f539a9c8c4542a95db615b4c280f7e5ffec93118dab5d18bec2a0dad495a592aae2
 MISC metadata.xml 666 BLAKE2B e1594259e0f02808e487707acd6d8d1dcf20510aa92410aa03953606bace24777316a408c9079e342c8c6f7ab5680058fea2bfc65e5614751c7580aed78f00e2 SHA512 aab34e7bd48c51784cf3b1119c596893d56113b5a90dfa7e2782ca11e78d0ce2f80a9fdcde4e81e6fb6802a3075ba20bcd19fa9fb162fe2c68bdc1e91d3b6ef7
diff --git a/app-shells/peco/peco-0.5.1.ebuild b/app-shells/peco/peco-0.5.1.ebuild
deleted file mode 100644
index 3d8169733f2d..000000000000
--- a/app-shells/peco/peco-0.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/google/btree 0c3044bc8bada22db67b93f5760fe3f05d6a5c25"
-	"github.com/jessevdk/go-flags 8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"
-	"github.com/lestrrat/go-pdebug 2e6eaaa5717f81bda41d27070d3c966f40a1e75f"
-	"github.com/mattn/go-runewidth 737072b4e32b7a5018b4a7125da8d12de90e8045"
-	"github.com/nsf/termbox-go abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"
-	"github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302"
-	"github.com/stretchr/testify 18a02ba4a312f95da08ff4cfc0055750ce50ae9e"
-)
-
-EGO_PN="github.com/peco/${PN}"
-
-inherit golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Simplistic interactive filtering tool"
-HOMEPAGE="https://github.com/peco/peco"
-SRC_URI="
-	${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-go/glide
-	dev-go/go-spew"
-
-src_prepare() {
-	default
-
-	# Don't install dependencies
-	sed -i '/peco\$(SUFFIX):/s/ installdeps//' \
-		src/${EGO_PN}/Makefile || die "sed failed"
-}
-
-src_compile() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
-}
-
-src_install() {
-	dobin src/${EGO_PN}/releases/peco_linux_amd64/peco
-
-	local DOCS=( src/${EGO_PN}/Changes src/${EGO_PN}/README.md )
-	einstalldocs
-}
diff --git a/app-shells/peco/peco-0.5.2.ebuild b/app-shells/peco/peco-0.5.3-r1.ebuild
index 2f611583f620..b548d1894884 100644
--- a/app-shells/peco/peco-0.5.2.ebuild
+++ b/app-shells/peco/peco-0.5.3-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGO_VENDOR=( "github.com/google/btree 0c3044bc8bada22db67b93f5760fe3f05d6a5c25"
 	"github.com/jessevdk/go-flags 8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"
 	"github.com/lestrrat/go-pdebug 2e6eaaa5717f81bda41d27070d3c966f40a1e75f"
 	"github.com/mattn/go-runewidth 737072b4e32b7a5018b4a7125da8d12de90e8045"
-	"github.com/nsf/termbox-go abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"
+	"github.com/nsf/termbox-go e2050e41c8847748ec5288741c0b19a8cb26d084"
 	"github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302"
 	"github.com/stretchr/testify 18a02ba4a312f95da08ff4cfc0055750ce50ae9e" )
 
@@ -15,36 +15,40 @@ EGO_PN="github.com/peco/${PN}"
 
 inherit golang-vcs-snapshot
 
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
 DESCRIPTION="Simplistic interactive filtering tool"
 HOMEPAGE="https://github.com/peco/peco"
-SRC_URI="${ARCHIVE_URI}
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
-DEPEND="dev-go/glide
-	dev-go/go-spew"
+DEPEND="test? ( dev-go/glide )"
 
-DOCS=( src/${EGO_PN}/Changes src/${EGO_PN}/README.md )
+DOCS=( src/"${EGO_PN}"/{Changes,README.md} )
 
 src_prepare() {
 	default
 
-	# Don't install dependencies
-	sed -i '/peco\$(SUFFIX):/s/ installdeps//' \
-		src/${EGO_PN}/Makefile || die "sed failed"
+	# Don't install dependencies, make build verbose
+	sed -i -e '/peco\$(SUFFIX):/s/ installdeps//' \
+		-e '/test:/s/ installdeps//' \
+		-e '/go build/s/-o/-v -x -o/' \
+		-e '/go test -v/s#$(INTERNAL_BIN_DIR)/$(THIS_GOOS)/$(THIS_GOARCH)/##' \
+		src/"${EGO_PN}"/Makefile || die "sed failed"
 }
 
 src_compile() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
+	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" build
+}
+
+src_test() {
+	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" test
 }
 
 src_install() {
-	dobin src/${EGO_PN}/releases/peco_linux_amd64/peco
 	einstalldocs
+	dobin src/"${EGO_PN}"/releases/peco_linux_amd64/peco
 }
diff --git a/app-shells/peco/peco-0.5.3.ebuild b/app-shells/peco/peco-0.5.3.ebuild
index 958bad43d524..c40d5b888512 100644
--- a/app-shells/peco/peco-0.5.3.ebuild
+++ b/app-shells/peco/peco-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/peco/peco"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 8fb816aa310c..e44d9b975197 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 685 BLAKE2B efd6015d3450fc8ea514936bd003d7946b9735e7ba2a6e96f0abb01b498a4f32aaf1297f4040ae98c630906a1c3ae3d9d01347fce370371acfceab09d530e547 SHA512 bdd787c28f1e2fd31adcecd6c6ba11fe367b29b89e6441a3df446cefb8ddc17b66d561013346e2c073a3b6f1188198271fe350a62b10b854447f36fbcffbdd78
+EBUILD push-2.0-r1.ebuild 663 BLAKE2B a92a9787c2d432409c068162ec0620a9d4b6921cd3906e1f0f7cb6e47a7efc295ad3a36578adee2f255d2d9d24271ad50caf5dc876a9734ceb6851d31993e5c0 SHA512 64ee88d4f28bc921be372205150cfc062fea6dd64874dad260e17be181c754ce07ba42f8f9736aa930e9df6809cb2186ed64e1fd4bb203a7dc6fe84e8cfe2bdd
 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 d16b2e0640cf..3ff826c4584e 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-fbsd ~x86-fbsd ~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 e9d97d7a325d..617688ad5887 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 796 BLAKE2B 056e545068c311b7a2d795041384275ce13e0d70b448bc860085fb27f4411935ed8e68f4d8e8e5f2d08c6c714c17e4a731b4607f1b06c2d52b3cf90f97e20d92 SHA512 781bbbc238246136a280788e9349bf2697de2967af41c521b4b382b7743e7105f2d7861eeb41275ea85cb51504fe37d5503db8fc26bcdbb4bf45c31ddf1c5fe3
+EBUILD quoter-3.0_p2-r1.ebuild 774 BLAKE2B 635fb949c974ad8e7c14ceae60689b996b757d0472721a2a0fa77d21c5d6df4ad62997180375676f60ef9b709d85b39c025e12bd1a0542a5a92467f2e79ed727 SHA512 24da9c60cecc14c4a9ce6b4fe4bdc230cf50268ab557d8be8167d36be7b1d0c88134a97caf2ee83d20de66061a38c164315ac8c46814397d4d7774ec67266959
 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 07be4e136b7c..c4f0dee8c0b4 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-fbsd ~x86-fbsd ~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/tcsh/Manifest b/app-shells/tcsh/Manifest
index 77202a7cbd07..b5404225c95b 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -6,6 +6,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 2666 BLAKE2B 39f2c0351674773e9e53b5a3c2b53a92fb7c67ccdf17daffe8c39e67a60256472db7fce023fca677283aea36f92537c0869bcd78c3998eb81e5c1497daf8d970 SHA512 d2a9e1afeb3f376402b4e0963884a6817d2767bdef93a75751868f6470b2a377df4b042b4f22b7994a597bf57ad2a82777434822d0d1782c479f5ad158506811
-EBUILD tcsh-6.21.00.ebuild 2717 BLAKE2B b4c41e00e208649b674b20a67bfe3e4715e3917e7f53a03651cd48a4c20c4aafee10b9ace59df0500567dd3166a8194c9e9bf69e5006e8c2fa4ea791970b8b85 SHA512 1f65a60e43a5847363f774e906279ed600058802f4a76cbcffd1035b796000ff9b15c160e582985d38ad1edb8fda3041ce5ba09b672fd5b6e2a11c03199a1e00
+EBUILD tcsh-6.20.00.ebuild 2644 BLAKE2B 9bbd15bae9458a6ee8a006c0d42e37b93dd601481727774cd5ed9768e9f44c20b7a0b719ff401c493dc04c487a5a168945b96c9023c0b2c98b735214ba8e4016 SHA512 ec8d5a4cee39bf34c006272aabd9d0c92ee43a473966b61b70203e96ead403af5938e6ecdde499207404e9adecebae92d1e93704fba7479335a9eca3f726c75c
+EBUILD tcsh-6.21.00.ebuild 2695 BLAKE2B 43b3801a20c5616c145ba1d0ac5e6527cb3003113feace99579c665b1fe1f9d5096ac45c4cf4f4dd1373384df1df1a3afd74ec8c6ced6a98e6299f560cd687fc SHA512 4f42a4d14eb965215d53fde9c345438a02244ec6e0e321039288dd2ccd7930195c8e24098085a06c98a66221d6b39c435068df8cbbd721f5fc717257abf1b651
 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 4ab98e6e596a..aa6dc07e85ae 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-fbsd ~x86-fbsd ~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.ebuild
index 3dc6aa72e6bf..8085148f47f9 100644
--- a/app-shells/tcsh/tcsh-6.21.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.21.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-fbsd ~x86-fbsd ~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/zsh/Manifest b/app-shells/zsh/Manifest
index 8c06873dfa47..d764305ac50a 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -6,7 +6,7 @@ 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 5818 BLAKE2B 9c13880d309a3633d212bfa6558fd2e90449e69bf31b824ec281c082680a0e65e2a530dc834edc1cad3d3730dce91ce9ade93711fc99dd482fc7cb2ccf49972b SHA512 0190157e6f8c505b9ff00e1c40ad533fdfe82bd838c4ca1ffad52ec4fc2f90ba61b0ec5d16153d8bad33e63328e9e9c3aedf3039bba8a476e5785961c564dae7
-EBUILD zsh-5.7.1.ebuild 5940 BLAKE2B 3d7f046f35cf0482c7eb7c7953fb05e1d0ee69820de63f136a41729096f2053191941a8e22e457e2734d2cced098297b396c28b58a5dd8572ed8e1ccd99621e6 SHA512 ed8776a949260bbe6b5fa57ed4aad3c4afb9458e4ac725aa7cfe7d48bc01b75471ff9fdb1a3d525d46b28638f26ff14954e8e9161361396f35de1f6820f38e76
-EBUILD zsh-9999.ebuild 5916 BLAKE2B 8a5c637277b376af1b0cd2fa0e0e851081f482b329b3eae6367606a7601b95eeb7b6228f8703044d380dfd412bf21ea99936b6d4f06d6cf1b28c83bf1004aa28 SHA512 216628b3adc05829d3132593d36b45ccea3fc93cc40bb9e92fe6acfdcd8c1ca00ce7bf16eb23e34cc986235ed77c6e356abd6f059457bc653b7dfb3b5b9e9d9f
+EBUILD zsh-5.6.2.ebuild 5796 BLAKE2B 23454fd9fe184d2a52d325f35785f73da3c87aa8016d267458edeae5194bb0e0981b7b6b6e9c815a844cee79e5203ddcb1ff33e926ebcad9eb6b0db5d222d215 SHA512 f7e89fef58005a2e8d51c8b24487557dabde870624fc8e33d8efc2c6b78c0d7e14e523ecf17a4682c3834d855492de98afaf5e3f5cd8107d9a6276dbb5492095
+EBUILD zsh-5.7.1.ebuild 5918 BLAKE2B 157c02c1885f49e39ef74ffcb4a8f3725cab0ab3bb909a163da7d4f9987e26c39d6ba63e3456a39deefd84442236498f839f5761c1dc92b53f60c10e38cff863 SHA512 dd61bccc222da83e4b4bb05fcb36aa929068698f7006f9425f90c0800763e1541acfdde472bb9e030d8246548d5ce6a6463445839823576d04df4b264063f973
+EBUILD zsh-9999.ebuild 5894 BLAKE2B d421ee14a23f359781a2b6ac242a96ace0b09509057cebb155c0f1cf02fe6e7fd5278890654001ff606b7903e74fc802b8035486bed1a51f3f78a804e4505d33 SHA512 64a7cbe8d309f3fc598e9984f0a15644f94a50fbd3e2e8f047b712a50ece4f55bf94253f57175e14bb3e3c77b9a1d9c9606c109f3eab31e814986ba0e6f62b27
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.6.2.ebuild b/app-shells/zsh/zsh-5.6.2.ebuild
index 09315ecb9b23..09079224b904 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-fbsd ~x86-fbsd ~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.ebuild b/app-shells/zsh/zsh-5.7.1.ebuild
index 03b1e1d45531..c9003dab0f4e 100644
--- a/app-shells/zsh/zsh-5.7.1.ebuild
+++ b/app-shells/zsh/zsh-5.7.1.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-fbsd ~x86-fbsd ~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
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 2d05ce7a473d..73b57b6dba70 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.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-fbsd ~x86-fbsd ~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