gentoo resync : 17.02.2020

45 files changed, 133 insertions, 210 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 83268eeaaf7e..093a84f044e5 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index ab84c534a8c0..a6c1a3924de7 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -2,7 +2,7 @@ AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162
 DIST bash-completion-2.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c9578104aa4c8c736801fd27c7268e4de70424eebbb5d1e4d1841273b1c4e169da4f369f2f65276349ead4aa7944aa193b2 SHA512 d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.10.ebuild 4706 BLAKE2B 8b6b8dd3e0146034f139cce31067317b2c28d46d50609cadd59d1100dbbfb6c7097a3cc8486fea18b4de94b32a971f441001e4c52a6b169a5c3e2d9e228b5eb5 SHA512 a6ead8364de47c9ed3682e5cf00a93eaa4d649507aa21bd91320e6afa8cebab46aad7548e643db91600ab40f0c40a873362c3c73d96640d2c78222960b6bc579
+EBUILD bash-completion-2.10.ebuild 4705 BLAKE2B d5248984f9f524ed77e3561272577a5b5777ceb73ca01ea4ba84c70f930cf76783fcd0ed76b5070eef84ebf240a8c82bbe405b85d8b1da179158b3017533f591 SHA512 d99b155ffb89e8e81e3d329f2d06a138a84cf96f16f88a07b9af277cdb201812d77ebf94459cded10f44020d7e539196a87b42e567e4e77c1d0c156c006e7dde
 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.10.ebuild b/app-shells/bash-completion/bash-completion-2.10.ebuild
index 955cc44aeaf1..888d95a724f1 100644
--- a/app-shells/bash-completion/bash-completion-2.10.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 cc0fff6501bc..ec0c2e5715b1 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -391,15 +391,15 @@ DIST bash50-013 2328 BLAKE2B 8797fe0b8e01027222af9798ee8d57d161bfbedb617b257e914
 DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa56fd44916ead691e4d698de3ba118ff0f8fc8eadade7a980551134eb0daf18b0767ff9601a4b4 SHA512 e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91
 DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
-EBUILD bash-2.05b_p13.ebuild 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_p16.ebuild 7428 BLAKE2B 2ec57c0463ecfcb9a663099f8af5516aab2e36a1236c0510d4b3a85467d7a25d9dd40774501f112538744c29061002dc4a8a37bdb9f2ee305568aa1150411bfd SHA512 3337e6e8927d017fa0a8c71b9e893b34d1e1191b2c7291d0d4314033a3426e729f1478769edb6ba144b174989341e5caec483978758fc49337934ad0b170b670
+EBUILD bash-2.05b_p13.ebuild 4601 BLAKE2B b345544b854893f65d2b65067a4433562a33f99ed468648392660810c9bd050b96338b078c94e046423de8f014d70d710b663ef48c2389cd6a373a506b7eab43 SHA512 6e2a6bf3492b3d3713a352b476075cb79c5fd85ceb268e5f30185db6126feccbb7327381668576c633b3c302e14852365aff9a832d6462d3e82a63f03064b363
+EBUILD bash-3.0_p22.ebuild 4734 BLAKE2B cef09d227fd7a77ca19375755888a8f73f70082f9738c81db2b88c0cbf7098f808bd6e8a93e1bd8ea74c2afdc4734c6d9bac91cf86534f61d5bee00ba6c3fe19 SHA512 138ff1a92c343f65ba4fd5d7312cd3b56719236d948b2b4545d602b799dbf20008d16de873704445cb19e45351a554fd8d6fefa3884b481f721f10f24a4eeb83
+EBUILD bash-3.1_p23.ebuild 4415 BLAKE2B 5d66f9aca081afdfc7d342a65ae53b3819bc666f2b70bc3e9379456e3d77ee3017b04c56c12056da86ef7a62ae2bed862ebcec89f11fb8ca752ca2eaaa30d7bc SHA512 208a767dfea73971a1276cf205c71e759e207f805acac13d5fd2634f2a11ed5791d8f1cd5aacf305fee5c02b4296148b8801ce91fac1aed8610452024a5caa99
+EBUILD bash-3.2_p57.ebuild 4522 BLAKE2B fc833dd0d73ebb3005aa945114dd5dda5acab4c28561661b956ae24ca154d4a87f30b7946135c4a8642e54ac7c8272dd09f2306ea72ec889742b7731ff57ef9c SHA512 cedac6e1b522c5abc0fb5d90f2aabc237f62dd1e0e3bcf68066d959b7d4cb484b8a5cfeaf61b9f2aed0e00ba4fc55d2e41f9e52400006100be6c8bd9180f1028
+EBUILD bash-4.0_p44.ebuild 4396 BLAKE2B e3aff1b822053a1abb9c4a4ced40b3981a181f83b019162f9f4601a3a1e5794abef8ffe8efc7aed2f62bba3f95782f4c4b084963cc5af94fd599f1372e26032d SHA512 9f451b7469ff0f19e04ce960ecc9123964248166f3c1d86ed6c21cefb91c7be83fdac3fa8b1047486275eb5e95a675df4453475829643254d0c5dac51b46299a
+EBUILD bash-4.1_p17.ebuild 4130 BLAKE2B 24e3fd94c8a75411f1214bdfad25eced1298d290bc76d092df2920d835a53a2dffe6b8bd9bf449de5829008ac8cbf3df40c837a152391f41e10328a440db1bc3 SHA512 1b7d7ba71a15801510295c0e612f1405d06351c855ac8e1e3bfa0324d5fc37df03f507b634f2ddf2c515c766d00af9ba840e69e18381aab28f2436be2be1f59a
+EBUILD bash-4.2_p53.ebuild 4320 BLAKE2B 24c89e3c331c5b4f0e7f0dcf4ac069717e2dfdcee32bcee94d086a272210c1f1206455b8901a1f9fcffc336a56b924e0c6b4e3ffdf4f895aacbee283e2938985 SHA512 66a03cc64cfde2e72905605d9312c6e70b65b58d960e6e15ab6888f6fcffbe0ab012c919b5f994bf58ffeb0ee76de65266894e13afa6a82debd0cd81201ba9cb
+EBUILD bash-4.3_p48-r2.ebuild 5618 BLAKE2B 8687afff77ab6a1979c90a27457ec8a9aa8551b1d886c73515e5ed71992e2f19e85089fcf0fd7f07decb9dd1ebf223817ee5ccb8b7ba3c9b3cdb9db4d366c3eb SHA512 7d3845c4df771da968a0e8797362adab344011f0756aa3ba27ae13f25d3ee02c3d946208cba7686533aa9c493af95adbaebd36b0462f8fc6284851518a24a4a1
+EBUILD bash-4.4_p23-r1.ebuild 7375 BLAKE2B 34cf8b0f87964f308f00cf95872ebb75ce7752c188db87117a0e05009bafc14ee5fa8f144d4c4fc55939c05c91edea35f2b301a2e9080f1078a1c62bca4941cd SHA512 b75ba013b86ab787a701f92541aafb5dcb663ea6dc77f40a83432c5e552c3d9f280d0033ec23f02731cd4aaef2febc97a2250174bad652a76ad15b2720cba992
+EBUILD bash-5.0_p11.ebuild 7435 BLAKE2B 5b53775f5e973ebfbc0ef6c1a2c4a6dedcc68b27419e4a34e9b4d4d5fa1598027064e1a34741afadfaa935df6de1b3565d1bcd62ab48bd3fd72de557c2eaa492 SHA512 e6218fe2fbb2fab1879b09a70b7a0f2739ddb5b482db794150eec720acb5be48c5ccc6fad966eb6fa857e94dbae6af7fdc650be48dec9cfeaec7655fc002fc5a
+EBUILD bash-5.0_p16.ebuild 7435 BLAKE2B 5b53775f5e973ebfbc0ef6c1a2c4a6dedcc68b27419e4a34e9b4d4d5fa1598027064e1a34741afadfaa935df6de1b3565d1bcd62ab48bd3fd72de557c2eaa492 SHA512 e6218fe2fbb2fab1879b09a70b7a0f2739ddb5b482db794150eec720acb5be48c5ccc6fad966eb6fa857e94dbae6af7fdc650be48dec9cfeaec7655fc002fc5a
 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 d00193a9b179..82c731d649ff 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index 281a07ddcac7..d668b9488b61 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index 39d7e5c07b3b..4b36d5159675 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 4bfd22c58328..9a282724c023 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 72bd396350e0..5f9de7a05e4f 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index 5fce8861d5b3..e420136d4d5b 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 6b916eee6298..b0332823540e 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index 60c235373319..9554bd27ba51 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index ebd7c146c238..7f7ec01858ef 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic toolchain-funcs multilib prefix
+inherit eutils flag-o-matic toolchain-funcs multilib prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
diff --git a/app-shells/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
index 172ecd51ad88..514ef9e6aaa1 100644
--- a/app-shells/bash/bash-5.0_p11.ebuild
+++ b/app-shells/bash/bash-5.0_p11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multilib prefix
+inherit eutils flag-o-matic toolchain-funcs multilib prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
index dadb54e7e863..514ef9e6aaa1 100644
--- a/app-shells/bash/bash-5.0_p16.ebuild
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multilib prefix
+inherit eutils flag-o-matic toolchain-funcs multilib prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
diff --git a/app-shells/bashish/Manifest b/app-shells/bashish/Manifest
index d81a255d63ab..3dfe873bae3a 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 456 BLAKE2B 512b1d170c2f6007bf3b39408bda98268a1bec74f8a2691d496a7e0c1970366a3b964be8866792cecc8389caad0ccb035b52507cffc6b40cd42c359b63804858 SHA512 d76a228c58bc763758d763b4d72d6b6502c75a99bd138b54d38d5aadc955c8a3d824be54d8293af4a0e4e30685296173720cf4eb863f12297c7e14b07bb5f22f
+EBUILD bashish-2.2.4.ebuild 453 BLAKE2B 3cc4d4f360c6b54a19ee6a127ef1113a21476af75f5f26ced88f810934977af04be0caa231a4a2590e0e5ed283ab3cc0ec1c224f5732af350a766a2cc98d418b SHA512 9ed9d7ff9def2a70120ed1f27455572287e1712c2dff513bb078ca8c9f6b514c88b9996e15af8c50b4ad716df98989c0bc1c8e85e89b2453b1edf20187bdc5ea
 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 38199202367c..3c4aa869b7df 100644
--- a/app-shells/bashish/bashish-2.2.4.ebuild
+++ b/app-shells/bashish/bashish-2.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index d9548d2f50f8..16f40fd5bfb0 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 2103 BLAKE2B d771311f2f19a282a0691eb918fa750e28de6ecf0ecc3ba6ced32329e90b937ffb385eeb1adfe53836324364ca7a82d3b254690da839f01b68c3eabb08dce557 SHA512 e3bf9f29a7a44a4845b5d4eb0b6296afa2067b423883b3e1ecead705c21bf4c8b78d05360a70b936e4f1f817fd273a1dfe7440f3cb6f24e5df9a983b153997ac
+EBUILD dash-0.5.9.1-r3.ebuild 2100 BLAKE2B 201dba73ca658a2a91900d900236271356fc3d34f3d9dc6c3938d44e25dcc9f125d9dc1a302860b3417a2ba8dac3549a006626039ef4dfb16c9995a57fe4648b SHA512 e3b8405a662a05adbd6415b65abc12218374e02c288330a73c39da154a3457dfc9b04c0a47f4b4e3cadffc6a18e9efeb1719f463912cc7781ac16a7cd6b0832a
 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 01f2111a4c16..3bb8502baaac 100644
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index efd1e8f2513e..2ee5122b06bb 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,7 +3,9 @@ AUX fish-2.7.1-fix-printf-o-handling-on-ppc.patch 408 BLAKE2B 61ca4723e06eb2c969
 AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6b6f53e28be5832285e91092f4fbb7e5efc31bb1ab7ca2fbf9bec1b91e2f7d57817f5ddee38f2b3f120589fcbea1668f5 SHA512 07fb970b7eec223c3427b6058134101a5c032006d8ec16f2873352e9c701c38fe254506e9ff4e05f2ad684bd192c764452ec957af44a04f1beccf7f47bf58bb0
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
+DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
 EBUILD fish-3.0.2.ebuild 1642 BLAKE2B eea0911019da09f2690aa0767c43cb463ef5ea18fe53f0e6b31e8e138e2b8335aca207a0ec2ed527e46c841824634533cc16360226a3cd8a17ad94db536386ef SHA512 6261192db56af260ab3c86f2ae650cc23c89a00267fa11dc9d1a6efe6811ba63c894fda64031efdc7a5b7e05bb88ad3915ffa12e0268724628483ea31e8bf468
-EBUILD fish-9999.ebuild 1545 BLAKE2B fd23d23d813a9f9ca5309a2cf60e3b275b746e76a13cc27fc9ba4c5fa0df7a6fd60fe1f25d44ee79d842cc850df74d6992a4aaf10c9dde8af95dc9e454d37563 SHA512 41e8f5fddf53c6cbb43097a4cff062474d89e575b8923f706ac98b32916c7856ebee2b220adaa5684a3992b2c55cc53c10de3f09869c49218289c6d91a4346ca
+EBUILD fish-3.1.0.ebuild 1551 BLAKE2B d2d5f4ea2df29bc5c9264d6cd1f2c10b54f86c911a1eb7603b418b382ca05d5724722fff19bc1e2d7e7d1b2b33d4cdff34307156eb13b0df8040695089aae3fd SHA512 c62f84c67bb47f4fadb7da8fbec7f7fe23ba60ab657514cf1efe1371c0749940301cac384ed9f5f181d38507c6e36c63e9ab6c50bdb9391630e6eff187420a64
+EBUILD fish-9999.ebuild 1551 BLAKE2B d2d5f4ea2df29bc5c9264d6cd1f2c10b54f86c911a1eb7603b418b382ca05d5724722fff19bc1e2d7e7d1b2b33d4cdff34307156eb13b0df8040695089aae3fd SHA512 c62f84c67bb47f4fadb7da8fbec7f7fe23ba60ab657514cf1efe1371c0749940301cac384ed9f5f181d38507c6e36c63e9ab6c50bdb9391630e6eff187420a64
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.1.0.ebuild b/app-shells/fish/fish-3.1.0.ebuild
new file mode 100644
index 000000000000..bba5b8321d52
--- /dev/null
+++ b/app-shells/fish/fish-3.1.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32[pcre32]
+	sys-libs/ncurses:0=[unicode]
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( dev-tcltk/expect )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
+		-DBUILD_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake_build -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 8d135c75a1fc..bba5b8321d52 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index aae68493ba8b..b282630ac627 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 750 BLAKE2B add404bd23f06ab6ba580f829d39d3f539a9539cd1448aa07e795b5b374e9a66e0b823c0aed31f07d98c485d324dc0be4bbc7917128c6bbc511fb8ef1e556348 SHA512 8275afdf9b16f34c3ba17c189546fb6022a897cfc5c05eda9ce867cfd29c287b93339de595f082480af5ba4f99513e0a140bc1efe38775c402d1275196d4a1c7
-EBUILD gentoo-bashcomp-20190211.ebuild 748 BLAKE2B c60b95f875ffbb2becd17afc634e9ab2cf32572d94bb2a4e9be047702f22a7f4de50ca8c2075d4f281ccc49d2f24796167b7a9d3d34b2929895add9288684968 SHA512 1ddbb88dff3ecdc1a318a6b3f2e74b2b11c4c3bf77d636c237b87172d95615f4d6cf08cea8a0b0f32ce678bd3ce32d76c94ea38427a612de9fddae621551d762
+EBUILD gentoo-bashcomp-20180302.ebuild 747 BLAKE2B 5c9f46adf70752cb663519a195c2ec910d1ca733befe67e6730f90d02af2a0e643f3eb344ddb4687a9ab3df1bcdc72573057c0ab5b89923bdb63ff85da7c1266 SHA512 44e43cbdeee6c301a3d94b661350fc315f54731d415f1360139e53c5db711bdd4401de36431938939ce066237eaabfa2082d691fb4db0f4db045b4e22de89e07
+EBUILD gentoo-bashcomp-20190211.ebuild 748 BLAKE2B f8ed101f5b7973e630db35bcea976deb76420fc11585530e06a13638af8e6fe5f144a9997a94714c16093bb24c4579022da9a480f9679b73483ada44330286b5 SHA512 3d7f6703f2f6db51c634c8db2699356ec2c1a46eb4e1b83a797264904b2e916bc03cc4332b073779202c859912a0ec9b7d9891fac883750dc66a2bd99595c981
 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 049875ede2c9..fe0d3af5665d 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index eb66ceedc060..6d55f70fdebf 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.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
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index d46d478604d9..d29053ddf24d 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-zsh-completions-20180228.tar.gz 23246 BLAKE2B a6e4004aa7592cbb097cad55fe9d7286f39bd264d8c463ed22e665ca6a60732b0bc8678a0ac09715e2f34abbadd0e4466d783fdb228ce364bcbe13fb7f097649 SHA512 2b3dcfb910e297eb2f03f4ad9f3749b379ceb60f8b6cbcb7c7d03b7921b79aa21f8d3aa50931c5d4eff52f988a208f1a810c6da7c20720be7a3f2ce4a4564788
-EBUILD gentoo-zsh-completions-20180228.ebuild 753 BLAKE2B 04aa982991bdc17e980474b7a250620c883340c8ce2321208720e57080ddaa5d49c49f692c62183746c35c5bed431e7791c2ca7ad9d88646b80545b025ff7fe1 SHA512 4b0f8e50ddfc87802a76e0e8058ffe4c45a06542bd5a82e89254e6ac8723ad9a551f968284ecc157d7f62e9bfc4723f938b1c3d57491f0bf126d17a4f21b5252
-EBUILD gentoo-zsh-completions-99999999.ebuild 750 BLAKE2B ccaa0bb19d13dafed86f51f7c52c7468b42a660976eb225c0466612a81dbde545dc69e154436bdaa5a049b700979f6326600bf172a74f1cfcbcc47703df25d94 SHA512 4c75d3d56c266f918dd59976ee0061e3f83f907e02415621b770e1592c1112b75292e8881ed54e086337c9d4d09c9815bf6f2f6f7d01359c289f593774dbea24
+EBUILD gentoo-zsh-completions-20180228.ebuild 753 BLAKE2B d3feaf1c87bb5a4c1d2f54722788563192c613365bd5a28d2a2b2fded2b3ea3b237af94bde33026651f66aa1a534315f8575f8afd39fe3fce20994decbe68bf5 SHA512 be72ec65deade5243ebc4cc0463e7f8a7b26716c48214d99c4ed0b4d95de89aaeb920ff2cc4809092b231b65649c27a49fa39ce5db06012a0ff1677eff1838a3
+EBUILD gentoo-zsh-completions-99999999.ebuild 747 BLAKE2B 4a886821b7c439c7adce36bcd0932f95f48a90a1b32477b3a0b90547d87b93a4f6d3884d8de7ec5a1cb8730464c2e5c1642fe0272e1f464875b536d36dc4354f SHA512 7d76b6b44be384ac01b1c1e2c0a2642d9982244b24729dfd449df7e7f98b83fc76e76c5e1423774ddcc200d0fcc35d0206cd7c97f4499dfda5b1840c96b4abad
 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 9fa4cb2fdce7..0f79d7908bf6 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.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
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 02e6aa4199ac..8d75cc2beafc 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 85ab05de95e5..6fdaeb5fdd5e 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,8 +1,4 @@
-DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
 DIST mksh-R57.tgz 419604 BLAKE2B 11af09535ace3fdd982189fb7d7f3e5961776c3bdbf6b981f4f1506a66ebdbd893efb9aa50a5a36fd8b3b7bd3e149021aad154888dc81e0de29f41e91eeb583c SHA512 7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3
-EBUILD mksh-56c.ebuild 992 BLAKE2B 1ecbe94f3d96371818512d89b3f077402118058f382f1e3dfd9f57826eb783256bc193b4697272626cce52ccb8fe29a479646107750e1db94859b95b7bb7c524 SHA512 1f17fcf0f5cae5de4128feded4c1c92c9d75b3c507deb7e265058251c225bbb852c9ad305ac5bac0f4fb8739eb38c325e0f85c33dc1fa10fe6ede6e4a71a41b6
-EBUILD mksh-57-r1.ebuild 1037 BLAKE2B c9e511b80490286bc0743126b858018658d372d7a8a76dc313eb485fed4a908a1985c2d26a737324a3ecac8629d1dfa24b8d9eed719dddeb94abaf016d8b0cf6 SHA512 3534b627236192a846cb6993973820af5c4ebee5514273c05e5d3eefd091c99f96fb4af4d510f8121c60115c9bb6e03b2f5356dacca9ea7395f06cd6601ff86d
-EBUILD mksh-57-r2.ebuild 1604 BLAKE2B 26c835c620d0ce8b0af908df5e309fff652a835759dc07f28442f1ba63f8406a7f68e672a46bf08d4b777554d8128310f2e2ccf3171316682c84f4210e26c374 SHA512 d7b105454422ef6ecbab9d8ec6cb3c4e3786dce1e692eb827ab6c0c6b82817337d3516abdab7eae1e3e244a4f5bda35674b5be7804b2e6e519b5eeaebf7e0692
-EBUILD mksh-57.ebuild 995 BLAKE2B 0e9efe4a046e26c35f3b5882e6fc6f81adb85f47acd9e84f7de768e6557e2725dcea05a18b30d8ff26e20383a452a4ba434c6dfebcb8476ce7c03fef8a2aa8da SHA512 e259c3b4c8cacc5655ea5fe444cacbcab8d646e4a1dbff949dfc8ffe2fb032a8c51cf1017c23f7b4191309285d08936a31a7791f0104384264865495f973e616
+EBUILD mksh-57-r2.ebuild 1614 BLAKE2B 2b25675e79c568c3083a52d7e2d8d24056374685076949e245c873e909c66272590b6545029539948123632b7b46bc5293c1740f9e64ceaf5aeff4deddeebe42 SHA512 c9ffb1af5dda9aa37785fd30187cf8e44385d4cfd7bd65ee652f569f8d43b3f4a324bcbebef93ae97d241a55dd48d97602aae7c0e562564a44a98e4183101437
 EBUILD mksh-9999.ebuild 1604 BLAKE2B 26c835c620d0ce8b0af908df5e309fff652a835759dc07f28442f1ba63f8406a7f68e672a46bf08d4b777554d8128310f2e2ccf3171316682c84f4210e26c374 SHA512 d7b105454422ef6ecbab9d8ec6cb3c4e3786dce1e692eb827ab6c0c6b82817337d3516abdab7eae1e3e244a4f5bda35674b5be7804b2e6e519b5eeaebf7e0692
 MISC metadata.xml 565 BLAKE2B 7bbb94f30f910e5a73f6fca91db59bd8b9825e358903bfc3116222c9bcb9927b5609b4c31bb5f36db5898023631a0d8dd2ad8d6a218136bb2e1786337db58fed SHA512 a10bf827859a6176fef847313a096d8ce04dfb6a271452602f8fe3638c8aeb7da11a5ea7a9d30257e516d8344365e30372e4c16d31d23c19e97c3d7ddd333914
diff --git a/app-shells/mksh/mksh-56c.ebuild b/app-shells/mksh/mksh-56c.ebuild
deleted file mode 100644
index dcdea2831de2..000000000000
--- a/app-shells/mksh/mksh-56c.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/mksh/mksh-57-r1.ebuild b/app-shells/mksh/mksh-57-r1.ebuild
deleted file mode 100644
index ba0d160f76a5..000000000000
--- a/app-shells/mksh/mksh-57-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ $PV = 9999 ]]; then
-	inherit cvs
-	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
-	ECVS_MODULE="mksh"
-	ECVS_USER="_anoncvs"
-	ECVS_AUTH="ext"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MirBSD Korn Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-LICENSE="BSD"
-SLOT="0"
-IUSE="static test"
-RESTRICT="!test? ( test )"
-RDEPEND="static? ( dev-libs/klibc )"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-lang/perl
-		sys-apps/ed
-	)
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	sh Build.sh -r || die
-}
-
-src_install() {
-	into /
-	dobin mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh -v || die
-}
diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild
index ff84abaff24a..39d98636a3f9 100644
--- a/app-shells/mksh/mksh-57-r2.ebuild
+++ b/app-shells/mksh/mksh-57-r2.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
@@ -11,10 +11,10 @@ if [[ $PV = 9999 ]]; then
 	ECVS_MODULE="mksh"
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
-	KEYWORDS=""
+	KEYWORDS="amd64 ppc x86"
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/mksh/mksh-57.ebuild b/app-shells/mksh/mksh-57.ebuild
deleted file mode 100644
index ffb798a60331..000000000000
--- a/app-shells/mksh/mksh-57.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MirBSD KSH Shell"
-HOMEPAGE="http://mirbsd.de/mksh"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-DEPEND="static? ( dev-libs/klibc )"
-RDEPEND=""
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	tc-export CC
-	# we want to build static with klibc
-	if use static ; then
-		unset CC
-		export CC="/usr/bin/klcc"
-		export LDSTATIC="-static"
-	fi
-	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	sh Build.sh -r || die
-}
-
-src_install() {
-	exeinto /bin
-	doexe mksh
-	doman mksh.1
-	dodoc dot.mkshrc
-}
-
-src_test() {
-	./test.sh || die
-}
-
-pkg_postinst() {
-	ebegin "Updating /etc/shells"
-	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
-	mv -f "${T}"/shells "${ROOT}"etc/shells
-	eend $?
-}
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index c467686faaa4..f86dbfc1c1b4 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1,4 +1,4 @@
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
-EBUILD powerline-2.7.ebuild 707 BLAKE2B c375be05471fc48b30c7459eb603e690c4b31e2afa7edf6564e5c25720c9b56c9fe57eb09ef93aae185c8ec9b2546efaa8a3aae83532fbffdb6b86f816a23881 SHA512 99257f3b2352db6523f74035e255a2751723585cd08106e636a16a761dcc856d102d70a39a083bd377f3780222ad2a67b7509ea62f4698c5f41a0ff59319a5ed
-EBUILD powerline-9999.ebuild 707 BLAKE2B c375be05471fc48b30c7459eb603e690c4b31e2afa7edf6564e5c25720c9b56c9fe57eb09ef93aae185c8ec9b2546efaa8a3aae83532fbffdb6b86f816a23881 SHA512 99257f3b2352db6523f74035e255a2751723585cd08106e636a16a761dcc856d102d70a39a083bd377f3780222ad2a67b7509ea62f4698c5f41a0ff59319a5ed
+EBUILD powerline-2.7.ebuild 697 BLAKE2B bbf4002244911524b210c3f051c9d5c2e2ec380fbaa3a413f9fbc98b357cc05e77bb2f5bf145d70c50630245e6f03f7dc73864b81544d09d3c0716dc29c0506d SHA512 05f969b77f3ad5033078bc79de74d6ac5b5717d18fcde20c37153aae549cc3756985f96585f11e594fde744b6e1c86ac87143826aaaa0dcb6b6e3ee715d498a6
+EBUILD powerline-9999.ebuild 730 BLAKE2B 5d75497b2323d373e00df5deabaa205d6286363f4181f409e8cecaf614b0bb7ed4c3b624b61fe54f5d94c27307cdf97bd69109e8ba508b62e76a1c9693428bdf SHA512 c08cdb58cc2b88a88860eefdcc03a7894b4bf2765ff0ed23cf257c36c4436e8153ed336838c13035e21334c7571452bb48f4d098b60047100a4add9fd88b1a34
 MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/powerline-2.7.ebuild b/app-shells/powerline/powerline-2.7.ebuild
index b4811ba4f661..946e4c10304a 100644
--- a/app-shells/powerline/powerline-2.7.ebuild
+++ b/app-shells/powerline/powerline-2.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-shells/powerline/powerline-9999.ebuild b/app-shells/powerline/powerline-9999.ebuild
index b4811ba4f661..52de334811b2 100644
--- a/app-shells/powerline/powerline-9999.ebuild
+++ b/app-shells/powerline/powerline-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -12,11 +12,12 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/powerline/powerline"
 	EGIT_BRANCH="develop"
+	S="${WORKDIR}/powerline-${PV}"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-status/${PN}-status-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-status-${PV}"
 fi
-S="${WORKDIR}/${PN}-status-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 1422662c432a..845705d0dff7 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 664 BLAKE2B 316415e62abb0b841bd3aa6293993a43a2786b7b9d24a9ab9728e26f7a9e7adfe4fa3e7fb4ddb840556e4e9296f53f4f94fc66cf8c178a2b47bdfc8f532bfb79 SHA512 68f5bc3132dfeaf4c14a5b3d9c8078a1cd01dc84e91f3f6e7c3d7b844ebb56f63bf43dceb7ca593ba861b703dce354357d1b6f023e0eca4e7a840d26c594444f
+EBUILD push-2.0-r1.ebuild 664 BLAKE2B 86a1be1bfd9535eb253032fae259f51b5da8ec311d08410d807fc9084097c64a350ca33fc3cd105a07e021f0a23ac6c1916311189f268b22de3474b851919fd6 SHA512 1403476d13395d0480c250c8b82d6e462faa3dd2827b7c43af8382987f0e51fc6d41bbbd5c742dd8f263d30460d7e7ecaf138f708231daab3716dd705810e015
 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 1f04d497e6b3..d1657efa64f1 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-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
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index cd1dbcab6f8e..607f4d9b35bd 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 775 BLAKE2B 993ed95ec6b55394488f3152e52e65b580aaf19f0cce8afb445f783b42300eb0479f975e424f377fce36067e1574ff175c702fcc5d2c941e031f5d7b500fc08f SHA512 5268bb6b5153206a5a09425998137b84a9ceac13caba905d4a1a2fe2b34d10b9e60bf740678d3e70442372367b3d529876fef3e40936067e9e8397c7147b56e5
+EBUILD quoter-3.0_p2-r1.ebuild 775 BLAKE2B c3d6afa1c114e2d37a57f8215f9a8d37a08b2bd6c134b25cd95cbc7e0a5536e6d8da8a06e233c58c77bd989e3e54a0e180824db27369277f1b0ce6eeb5373abd SHA512 64ff813813e571009ef4a4a614a3669b30961a6de33e3a6ac9a7b63fa3b3546e36b77eb3240b37c34d3602cfb6d39ba6df1ab26c6e3bab2022997996b426290e
 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 5b356137fbda..944f18a4fc0e 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 2ce4c094a26f..f5c77e7cb1ae 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -7,6 +7,6 @@ AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1
 DIST tcsh-6.20.00.tar.gz 1001696 BLAKE2B dfebde21c70f236e1070a93621a331ce1a53efab4496c44f25b51e98e843a8d0e3ca503da46a4fc0177b57b682e3ecc07f8120cde25ecf466c8ff094df5f9463 SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
 DIST tcsh-6.21.00.tar.gz 1001909 BLAKE2B 7f2be382a3a344d55e0785eace79377e20dd2cd2eb9e9533168fbb6286631cdcd35bdc06cd42d9439a29a7cd1a911416bfe6b0245065535aebdf5adb58d2c301 SHA512 d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
-EBUILD tcsh-6.20.00.ebuild 2644 BLAKE2B a1a2ed7602648aed4142a9f540463242d61f7b33dd8f975d490a8d0edc3f45e4a72da13d76f179bb000f58b20089c95616020bfa4ec8e8433ffc7c45067a6fd4 SHA512 00488c0466476831c68d4b8778a8e1b81792985310bb92a3ed612d6563d7a77cda4208230d2fd0cd54849691172ee59c8a90e43c9fb274a0e36d9941c1d66833
+EBUILD tcsh-6.20.00.ebuild 2644 BLAKE2B 9c59dcbeafc88e9c6e27208908ac6ce1299e8a5be2b2d9e688d409f2f1337b7c5746408e3ef078aa9e26a5629978f0c1123e6474b8dd5fceb9881bedf13bc7ef SHA512 c8b9b75466ea9eb9277e172d1d04f9d69980157fca0b95ea9f8e83a6ffb386a1455f9615d5186d857abe369592162d84ee888a3d52cee9c139b0f6903e02253e
 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/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index 00e1bb6dabfc..d02c0a5fa385 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.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
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 54d32dd79348..e166e5744f21 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 5797 BLAKE2B 17f8943283cfc9017edf67fe0d0143dcb9735a8dfac911edb91b7b39aa6279fecf1276a1fd1f4a4f25ebf18616364db9577b357ebd2fa9cb7f344b4d90213089 SHA512 50aa86839509b771e7950e638c47bf5bfec841791020917d0b920194e4a0d3ed508b19a4ad64ff90ac418693883e673c11f44e6ba38d6b7b01858eb25eff0b90
-EBUILD zsh-5.7.1-r1.ebuild 6041 BLAKE2B 137f5a1424e84233763e6e005cca77e9a34c6b73131e14b7af8be179c246c1b079d46ab6e59b43de4a604873996264ab8446b740228f54800ecca635a6f467ff SHA512 af0ca99f0dbce4ecbb1508ed776fcbb793bc7fcf2e77f921899f83e46e9ca8e2661350e62e6d65aca91c3da0000969316b19df83916cdab4f8e095c54038827a
+EBUILD zsh-5.6.2.ebuild 5797 BLAKE2B 964eb4646bee2ef50ab8af221aa67e61b77d034d87a58db1e57e1e1cf283b4e908955a39f1a7b04a17b360254f6a75637d8d91befb5111b4ece9f1cf7b58fb7f SHA512 85d52f571d15b6dfab51804aa2162ae450471a6c1fd18cc187117cf82324569916cf6b8b308e07601339131191d040549410784a8f38b4acad08fd2436a17cb3
+EBUILD zsh-5.7.1-r1.ebuild 6040 BLAKE2B 47d603e484c1ede076575eeee7ef8c2d3e06b2bdc9f3300c30aa9a726f138d23acf52c284bedf7a6a1e30b6fd312f08d4b1a48766c4316c51122559a255de1b3 SHA512 98fdb4a06741c7b250a96c6ed6690ef3033010912305ac0af680bbb3155188c9801d1de966fd3ddc6edf2da4e144b77c844a6e239f6ba035284affa79a19cf28
 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 23ca1e3f5987..aa8fb589ad6a 100644
--- a/app-shells/zsh/zsh-5.6.2.ebuild
+++ b/app-shells/zsh/zsh-5.6.2.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
diff --git a/app-shells/zsh/zsh-5.7.1-r1.ebuild b/app-shells/zsh/zsh-5.7.1-r1.ebuild
index 100ce07d9dfe..38bb5002a8fa 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