gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-eselect
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
71 files changed, 144 insertions, 166 deletions
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 1baa517747db..0a18bacdfd36 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-awk/Manifest b/app-eselect/eselect-awk/Manifest
index e7e1d57d1bc3..a4450321731e 100644
--- a/app-eselect/eselect-awk/Manifest
+++ b/app-eselect/eselect-awk/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-awk-0.2.tar.gz 1541 BLAKE2B 4ad07b02869672bef3c905a7417706344ccc11a9a46fcfe85cefa95881a4e727c11481bcefe17f96a77f1adc64d5ad3b1f2dfcc259bfcb8365d03ad68d88d365 SHA512 ef00ac8e8b962c17dc8094d64e5cbf44654a747cc648a5cf38346c3a90e0d685726693094ac265398b40d9d325600073ea2c4905b813f1e40fbfc7627930a5de
-EBUILD eselect-awk-0.2.ebuild 497 BLAKE2B b22413789391e76909ea36d07aaa1035673ccd6b30eb9f1742ee285c52fcd04f9fcf2695f4e7833dd33edc55db251415ef76a1627e642831c29746b55040a974 SHA512 c9429e27f1c7bea023f3e61348586da87cd3accce8d17160737b0182c6a23176c82a85121e27919d8c293dc8ae8c37e3bf481a814aeaa1c962afc1c3be41f2f3
+EBUILD eselect-awk-0.2.ebuild 495 BLAKE2B e6e4a21f35ba22f3a05edba0b0f7947dca73bf27c8218159c516d23535a72fecc6e6248e593179c79b5a437edc5e4a28c97e4e64bcc168b9a57945d32e7a2a24 SHA512 25aaddf83a441aad6cbb9e9036b869462b1d1b4ed416ae16eac96af198caab009d76696e301bec14b4e7a72a712a0b50a82f9783e37b73aeb2a670615cde89ca
 MISC metadata.xml 372 BLAKE2B 7d8462555c43bd348728c94113ea20312aca3d126874bfa2d2e8ffcff87df07ba9de74cc9d3c1f2d51b3779ed742a3c05d80549735406ef6f499e4343c468dd2 SHA512 dcd1c89d7c9e64f49ea4531c40482c7911e6b7f2873691d0dbb395ea179bf1a1be3bd4da9633e802e164ac837b5f3212844094c2a4773af7ab415e9005241b1e
diff --git a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
index 18d876f7bc9b..e96c3c4b1175 100644
--- a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
+++ b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-macos"
 IUSE=""
 
 src_install() {
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index d4ed74edf813..da41c99a02e9 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -1,6 +1,6 @@
 AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338ecfa1c08b9667ae97bb2875d6ae9958d797a416524de28540a4a95597c36d25df340bbe956ed95d342 SHA512 25f9250c3fae6d31871ca08260f1cd6597d9263fe51d3d696dd55c8648b604ea52b705dc5d128c7d9677cc1cd63f9aa1e31e124bdf52374eaf02f991db0045f2
-AUX blas.eselect-0.2 4952 BLAKE2B 14d60fdbae1dded65d6846f7e1fb6214994b7fce6d7d6340f9261e1e9081a46d21084c622ca2dcf2568dc07e0110b925ffc957e254d24850f741d943fa22f91c SHA512 a85f27c9808debaf9f47831c9d35194084bf0db818d3b8264532a7956b084633d9d462dfdda4a84f9a011721dbfc3abc419465e887a7ff9d17328f43a8f91790
+AUX blas.eselect-0.2 4948 BLAKE2B 1d96b09958669a85b6276ebe29f146cd592c141b11454c0c981c24e6a93f17779399300bfe540aa89c11f2399ef6a716728e3e2297e0cab8a1652b96a0c5ca94 SHA512 f312bb665fd70ec479fcd1e2fe11b50ccf8b6e80b8513e41a648328f521e7fc0639e83bc615afa177f780d3ec3d37ebee0c4755d2d03a3a604d71562791b4b11
 AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
-EBUILD eselect-blas-0.1.ebuild 698 BLAKE2B 1306fa0450bff379ab7ff7d96de8423768e77fd1ea1767ea8551ae456f17a27b8b91db77a693b85c667f30543b87175a7c1074795644df63d26360c2754b3b58 SHA512 e462124280970e30b0edb23b55d5855987efbb22382bb360b9181448b769b66d530d224af6e1cb9500a93613e58517b0bb70393a0c3a259d97950db796a72965
-EBUILD eselect-blas-0.2.ebuild 672 BLAKE2B 7424616d655654cdf538bf38f0f4497c54a80efdb1ea439404e557e6183941133e1bb56d53c8328d6e252b81252ff43ff8ebd831af53d741fed50b7907bb583b SHA512 3495bb279b3398b471078720184f80bcd52caeaeb1226fbfafa9c6544bf93841b0458286fe98adcabbba7a9c09770acba90321846876d78841e84bcb6cee6c14
+EBUILD eselect-blas-0.1.ebuild 699 BLAKE2B 5c6b8c0a6bc222efc70382c458b082d9d5360bea2d8b6ec22d448a6ffbbf71d34ea0bde803d12b8d204a66ef7d928bc89262c2a57a3709c031b35390da705845 SHA512 d3caee097a979becdb4b5ab672819839b2b94f87840ef0a81e9d788b1c281a0dfbd13c977d527c3ee9dd9dc640c48fd61989325f8e88af4ae5f213e238afc339
+EBUILD eselect-blas-0.2.ebuild 673 BLAKE2B 81fdfb1ce14e0447de85faa926c8e80104ecc5f11b51404c3938e65af60f822fa9acb4816f29f7090a3b8b5ae2cd5e9729fb6f3b168b82bd3c3cde297d08c048 SHA512 b9121419b32132f1d78a87264fc48a6fdafda2f89a24b9e9ad8cde14375d86cd6b100fb86b74024372b47b1a84a819e273b168f9a5ee9f842a40dc855e777a59
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
index 89f44df5a332..cb35f6bc2b92 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
index 9d8758a4028e..23b589fc28c8 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-eselect/eselect-blas/files/blas.eselect-0.2 b/app-eselect/eselect-blas/files/blas.eselect-0.2
index 001ddb941e82..f860674acec6 100644
--- a/app-eselect/eselect-blas/files/blas.eselect-0.2
+++ b/app-eselect/eselect-blas/files/blas.eselect-0.2
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2019 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 inherit config tests multilib skel
@@ -63,7 +63,7 @@ do_list() {
 		done
 		libdirs=( $@ )
 	fi
-	
+
 	for libdir in ${libdirs[@]}; do
 		[[ ! -d ${EROOT}/usr/$libdir ]] || [[ -L ${EROOT}/usr/$libdir ]] && continue
 		targets=( $(find_targets_in $libdir) )
diff --git a/app-eselect/eselect-cblas/Manifest b/app-eselect/eselect-cblas/Manifest
index f8f91cdf23f7..bd487e6e6efb 100644
--- a/app-eselect/eselect-cblas/Manifest
+++ b/app-eselect/eselect-cblas/Manifest
@@ -1,4 +1,4 @@
 AUX cblas.eselect-0.1 352 BLAKE2B 37d0a10ae67971ff3282620343b971e6ab495c69017b9bf37e0d94f7ac1672e9d861d5f86958483a526ed1e0b2b76f2ca61a352238db349370ae298fc435e9ca SHA512 3f030c57d59a48817ee1eeafb3e967395c57f7f46724ffe134fcc58e6b4a3f37cad368fb4ab7f7e3cecf9a91bee4f7e1ef315dfcae6d0abbd80c7f85decc4f76
 AUX cblas.eselect.5 2084 BLAKE2B e53c8453fb20a575affa39a8d8980f4726561aa0ddbf16e59e9ad715c8c0d333bb23a767a415bb726099d2e2fb1ea943ca7421fb09d90c94922aa7a3d06b801d SHA512 1cc53334d65439a00bd3836bfaa5e130d946d0878d6a440974ff218d79aa10d3099edc7a84c94b300d742b96153d535649cd1580e2bd226d784a4dddc4a3cd41
-EBUILD eselect-cblas-0.1.ebuild 642 BLAKE2B 745c4ef0e191b9a9bfa8db897359e99ced9c08f31c578a1b3fc5a8f3fb7e4012fdc11edb819e1d5233da044b187bf11834cd396e626972bfd253383cea5ec155 SHA512 a94db916daceb41d9ff66695e3138ba0bacdb32a177f6a4e06f8f9faa3bbbf1106574d9f717a928a8ff6892555cbb4a7bb1dd62181baa8540b721e966b81ea32
+EBUILD eselect-cblas-0.1.ebuild 640 BLAKE2B 1519e5a65be84795617c8ea1fcde989e98862b9e59925bdc7a67a2fcc1e3efb9756dfa698cdfba670be9e79034a61ca8f6ac198ef68899e62ce26e24ed120f49 SHA512 89a5ef113d99611b4084f5385169ff7017555d9f83ea676c8f6cbeebdc75a6fd6a56eca62158ab4f2f98e15b670e6ca343cad8fbdeabafa1c286d9ee5e626457
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
index 6ab3f61ca044..cd29138e1f0d 100644
--- a/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
+++ b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-eselect/eselect-cdparanoia/Manifest b/app-eselect/eselect-cdparanoia/Manifest
index 3efa98900c63..41ac1b4bcb5b 100644
--- a/app-eselect/eselect-cdparanoia/Manifest
+++ b/app-eselect/eselect-cdparanoia/Manifest
@@ -1,3 +1,3 @@
 AUX cdparanoia.eselect-0.1 364 BLAKE2B dbdf0c69f8ab295bed4529d7c2178f4c5bb64862d7192eb37c280eba47fd566fdb1ba60109b3e289e35e9a55b4d6fb32dfe06f19ca51d4cc76df6ced769679ce SHA512 000d15d17432e7fd7d1e6c56b3ac6069f6ae20a08e20f0380879695bbba726102469fda8ef862f3e23fd8878b1a986e60f4d8194cf19a85eb39b6bf5378a262e
-EBUILD eselect-cdparanoia-0.1.ebuild 654 BLAKE2B 463770089980bd2c97646882e839ff64a3bb49f1a60f9fae1553160665c3c76f0280eb05544aaa19adb6a53901c59305b53a7d610e8fa94aa9084eacd1a95120 SHA512 313fdc722078d5e386bf039175cec24c44ef47a8c5747d3c75d0b4142902117f742047c7424db4dadb3d64280cdd43453957b54259ff8a861d3bf84abaa45030
+EBUILD eselect-cdparanoia-0.1.ebuild 651 BLAKE2B dd05158066aee04516ad3b4a9826cab48f261fc2194e266164956d01287ee77a1dbf2f2a18d9d1a53511d7430f8840f4aa1311add5de582b4a1ece407a099083 SHA512 a11637fecd37dc489d631a5497bd2dc20a10d93464ab382bd02eb25736f31eef7446606570e0162dbaa2d2fc6754aae8ebffb5a9a397a4dd7be2a3c8a908c845
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
index ca758ec34d0c..8921ba1af394 100644
--- a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
+++ b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
@@ -9,7 +9,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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-ctags/Manifest b/app-eselect/eselect-ctags/Manifest
index 07f4c3540a33..7f935a3dae00 100644
--- a/app-eselect/eselect-ctags/Manifest
+++ b/app-eselect/eselect-ctags/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-emacs-1.18.tar.xz 8964 BLAKE2B 218a9cb043bb00b853e3c51230632f9cdd28a0d2f0ca96bfb9f6840615059993edadd1ea3447d3c6b6411a6a4edda6c1ff34428659f3fa09ab306e53b5501885 SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa
-EBUILD eselect-ctags-1.18.ebuild 739 BLAKE2B e39c88e7f1c120c21c8eb8fb5637dcb2c00790ed8f38155b93d8c8abacab3338f8b651accc0c623bd21ff3c5e3334468b948a24cf5601d1a61d1c8947c843410 SHA512 7ec34bad21c8158e32e49a4b77bb3ba83a131893c6b31617987d5f5124cb68ba78a22a1f3ca4b6ba2da101a5a3d2330bfbb069c262500dbf5ac6e623561fc218
+EBUILD eselect-ctags-1.18.ebuild 736 BLAKE2B 6e355ab7eb9f670ace96cb2e71603242688c1973ea6e0aff36fc48dc64b52abfe3dc454886b27a792930057097e24faf832673016d8ed2f1928f5da7b43a9de6 SHA512 8c887b3e69b58b4db5aa76f58ef6e4c9a1839a69aea788f8889864b0514a7e2ac7571ec29a80c393bedf5933b3e7c235f66aa7cc06056bfe1deae0db4fedd363
 MISC metadata.xml 274 BLAKE2B 0479233cbfe07bfd76f3c32823b32f1ad64475493953c4b031b1ace2d6c37abf5724419dfc16d3b8d46abfb427ac97d1644e16db360c47478ccc99ae4ac85c52 SHA512 12dd98956a96447d194ed521858ff1df2fa88d7f6b4373ddffed97c91bee3358889651d3f7120b364a4a329b76f75453459d7f1e027f65eb5fa2c7d7cb809f30
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
index 4b9a20a690f4..c5555b4b6d3c 100644
--- a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.2.3"
 
diff --git a/app-eselect/eselect-electron/Manifest b/app-eselect/eselect-electron/Manifest
index 125d22c02b08..53502dd31545 100644
--- a/app-eselect/eselect-electron/Manifest
+++ b/app-eselect/eselect-electron/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-electron-2.1.tar.gz 9658 BLAKE2B c5bcd58f5b82c3c9f4cb1e6cfb26665b7524b0d973a717437a18f5ee66fa5fe30bdd4e82673efc8199dc4a637a0b93ba537a62fc060d68b3bde7370138f815ce SHA512 6ba30b1e4d55e01cd9df3ab30038a45dba80c6191e676169e28b3f9881b4154db5edfe8569cafe77022b467e9383a291b1e6c49e296a8ed90582b2c6d1489c47
-EBUILD eselect-electron-2.1.ebuild 659 BLAKE2B 9369d3d1d1ba614ff52ac38a4d1cc2652a041818b09fb07adb52464c7bed3697d2bafecdfb8cdb0164139529de2b4d89c0fc0f9cd0c75677b5431bfea4232dbe SHA512 44e56710c0c9167b3d9dfb27809e716bae33093507bbeb3663b470e963aea42a87f554df877b84df6b7453f8b9e49d2b363840239ebe14c949b205af693488fc
+EBUILD eselect-electron-2.1.ebuild 655 BLAKE2B 4cd072d3856299dfc86e776fcc764dad9e7c05cc03ea03bfa8f5c62b8f79bbf97f861b473f60e1b4659b48122b44f771ecdaae0be0dcdeb6fa34584938f72ed6 SHA512 350af545abbd6b740426369a295f630d2b52044bb50de4c531aa1777d4a213251706830a34b46a277af8e2de4d09fe5a2448ec9420c11752e8da1de8917cbaed
 MISC metadata.xml 254 BLAKE2B 628a9ae5d877a1cfc867e2a95d461fac653b17cf76bb83b22852821c68acc8ab8a0798019cc1508a0c314c746d3aca72ab0e565be5daa5f829fa0efa5e5d5116 SHA512 2b50869af59565463b4f65eefa16489d6073fcb19825004229cc9eadca26d7827644a23f2f031a34d68f18eaca988ea081f426ac3b70879f57878ddc87a8ffdd
diff --git a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
index 428fa0fc7f1c..a860e35738ec 100644
--- a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
+++ b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://github.com/elprans/${PN}/archive/v${PV}.tar.gz -> eselect-electron-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-emacs/Manifest b/app-eselect/eselect-emacs/Manifest
index b9410740a9c5..17be72349c5a 100644
--- a/app-eselect/eselect-emacs/Manifest
+++ b/app-eselect/eselect-emacs/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-emacs-1.18.tar.xz 8964 BLAKE2B 218a9cb043bb00b853e3c51230632f9cdd28a0d2f0ca96bfb9f6840615059993edadd1ea3447d3c6b6411a6a4edda6c1ff34428659f3fa09ab306e53b5501885 SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa
-EBUILD eselect-emacs-1.18.ebuild 723 BLAKE2B e96055977bc34727029bffe3c2e405c1c2f4ca5b7cb7c2317146010970c63ace3b4ac45d42b7a48de3eb613f2db1c0ab555640fa5ca56b9ebaf2f6768d736917 SHA512 fb891bed028f43babca13e4729727d3c7c5ac8c80988ab74871a5976ddeff6243500a6ed1efbba0c81c54e761c1960f612ae2a561bc29e85cc4c89c4579afa4e
+EBUILD eselect-emacs-1.18.ebuild 720 BLAKE2B 54f14a68ed5eb1387a86710a66554d8683838216fce42c07d6fcb6fb041801a71aee208f61b3c66763fff31d9fd28454a882dfff0fcf176bc128231b32c46f88 SHA512 cb74ede2e2e857b5a9dd727f88e5f712452d0204f9abc651a455b3d4792eefeda11a3ad5a9e83b28d88f17bcac81de68a43f5407b2bb2785cfd98a6379783fc7
 MISC metadata.xml 274 BLAKE2B 0479233cbfe07bfd76f3c32823b32f1ad64475493953c4b031b1ace2d6c37abf5724419dfc16d3b8d46abfb427ac97d1644e16db360c47478ccc99ae4ac85c52 SHA512 12dd98956a96447d194ed521858ff1df2fa88d7f6b4373ddffed97c91bee3358889651d3f7120b364a4a329b76f75453459d7f1e027f65eb5fa2c7d7cb809f30
diff --git a/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild b/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
index 4a78250bc05c..cb40113a3b88 100644
--- a/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
+++ b/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.2.6
 	~app-eselect/eselect-ctags-${PV}"
diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
index eca1d75c4a80..eac82f30621d 100644
--- a/app-eselect/eselect-fontconfig/Manifest
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -1,3 +1,3 @@
 DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
-EBUILD eselect-fontconfig-1.1-r1.ebuild 749 BLAKE2B 68b1d2db9bef22d15b94e15e64f03ea59044cf47a5ddfb2d0bb5bff6870d6a32965a8a82f60cf88629ac3929fc91441670d1c4f42d68a130ea13a472e985fd54 SHA512 43d9565314ac10dcb8b420d580c7b46063983c5d43ca0e1cfd160f287e477608fcc1965eb24a64491132133c944756842159fcdc59bb4d1d4ffd13ec73067ff3
+EBUILD eselect-fontconfig-1.1-r1.ebuild 747 BLAKE2B 6da6b27af5d0120b46cde48b8ad600c66cc8d835a585f4940c3806a9af3fbbfbf90ceec450bdddc51922787dbe75c3801942797e65b78236aae4bfd8ca83baf1 SHA512 540fd4857e7d19adfdbc503b409bf8b1b9bf3dc5d5b1978f2792034cb51d4279d1cae3e43c93d8ee3e23131d4455aaf785388edc12c79df5a00ec39783a3165f
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index 3904c3a61476..a63d53ce3ff7 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3
diff --git a/app-eselect/eselect-iptables/Manifest b/app-eselect/eselect-iptables/Manifest
new file mode 100644
index 000000000000..b74cb504327c
--- /dev/null
+++ b/app-eselect/eselect-iptables/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-iptables-20200319.tar.xz 1584 BLAKE2B be7cad34ef41a6b3c1b25470f2cef7bc2de33d83b5b0846a52695c0d09d9770368abd8d59a00a4edbc0ecbc91b83648de2e6686c7ee8a46036369558f5ed1e16 SHA512 828d8b0b1f41af2ad807c33f4e529411dc5feb21b37c76e8f19f0b7bf3d90ccb61db6b2e0b2ef353acfa4ea95b4a375da4fe769132b1fc6a7879acef6e10db9a
+EBUILD eselect-iptables-20200319.ebuild 522 BLAKE2B f73a944f56cc2a83512e79b66446fbf2fd10b1f80c96e453a7cfe1fb0588f961be63c240705bbb2194a99e0c5dd90428b01db973ba88710bb57ce4324dd2dcf1 SHA512 55f377955febb244ce53460e855c8a1d36bd69e2e72b6d8340265285773dafe96249947c919944f3b0161898eba26ae57cfcffcd827157aeb76a4a4343d90eb1
+MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild
new file mode 100644
index 000000000000..89c49dbd9740
--- /dev/null
+++ b/app-eselect/eselect-iptables/eselect-iptables-20200319.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Manages the {,/usr}/sbin/iptables symlink"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="app-admin/eselect"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins iptables.eselect
+}
diff --git a/app-eselect/eselect-iptables/metadata.xml b/app-eselect/eselect-iptables/metadata.xml
new file mode 100644
index 000000000000..4eb20a048df2
--- /dev/null
+++ b/app-eselect/eselect-iptables/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-lapack/Manifest b/app-eselect/eselect-lapack/Manifest
index 69c0ab11ccbe..a9d2aded335a 100644
--- a/app-eselect/eselect-lapack/Manifest
+++ b/app-eselect/eselect-lapack/Manifest
@@ -1,4 +1,4 @@
-AUX lapack.eselect-0.2 4897 BLAKE2B 2f6dab00f59c0556dcff1d944b8042460521dbc099175552ec8a3aa272d0d16eae7b178747372b2c2e503c22c3cb0fbb2443967c964bf10daa667141d08ebeca SHA512 16c3fef58525de4a50a3daf14ff70b47c506246f22b71937c6aa2fb4131e9ef3bfe736844ce0f8b6b95275a89fbbbc1bd2f036496f3202693a52fcf2fb90cd13
+AUX lapack.eselect-0.2 4893 BLAKE2B 45fe2cd27bc259d406e06900dd36cff0071f2221a6dcbf2b7772e625fd9b58b492720ae73395ca199b30ecde6a8da55f71534c4f4a117c1f5d5ca9b03166898e SHA512 eb974937b9e2b67abdd618aece834bb8fc32f15b0d943dace66dd982dfd39e66a3a05bc6f71fc0aa7e4e6e595deeee601370cbc0b812996ded938e47784415cc
 AUX lapack.eselect.5 2406 BLAKE2B 12da8dafd86ee178455de3476bfd6f4b2f24318244c4b387b46e45ea7a0b3ed4f33b05207f3f1201f17af4bea2a01798d6de0eb579db3503d27ed3d90f8edec7 SHA512 8659833ef7ff6e78d0592bb2ea34f04647fda68b388d60f7a39f0cd21dc2c5d198b369aae14f2d742d6c6a77cb3da9a46d1ea34a2ee8d403d5faab537dd7b940
-EBUILD eselect-lapack-0.2.ebuild 636 BLAKE2B 242a8077548205e9a38d2b08b21a8bf49da6ab843c8ac55a8678266dab402875341760939e4016b0c569a862c0ef42dc272fa5c952e300775d8af621d21e1c40 SHA512 50a8eb10c408dbc6d018976a65e2f64dbc3dc23a5289fb615838b4259ad027615149e7fb40aea70f05b1a6461c27faa203f5bced6a1455b31272ab2f559a87d4
+EBUILD eselect-lapack-0.2.ebuild 637 BLAKE2B a0bc3ea4974034cc14db44ecfaf9249238490f39bdb8a570f7e076bf5bfb777aa36c0b52feefe669834278ccac2df70218ddd8a6e6ceee26cd4c7f7abb0f7b84 SHA512 bab6d196b952365e41ed5dcccaf8ca1947023f2a01eb5aacefd54c7491531b6024843960e7a59234c7ec11f1902d3972dcf66503cbeaf79afcb4307eda935db8
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
index 8eb2ff83c6d2..6cb46d64419b 100644
--- a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
+++ b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-eselect/eselect-lapack/files/lapack.eselect-0.2 b/app-eselect/eselect-lapack/files/lapack.eselect-0.2
index 76c038e13f8c..985da0d9ebd1 100644
--- a/app-eselect/eselect-lapack/files/lapack.eselect-0.2
+++ b/app-eselect/eselect-lapack/files/lapack.eselect-0.2
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 2019 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU GPL version 2 or later
 
 inherit config tests multilib skel
@@ -62,7 +62,7 @@ do_list() {
 		done
 		libdirs=( $@ )
 	fi
-	
+
 	for libdir in ${libdirs[@]}; do
 		[[ ! -d ${EROOT}/usr/$libdir ]] || [[ -L ${EROOT}/usr/$libdir ]] && continue
 		targets=( $(find_targets_in $libdir) )
diff --git a/app-eselect/eselect-lib-bin-symlink/Manifest b/app-eselect/eselect-lib-bin-symlink/Manifest
index b6ebe5f19d02..6c8513879894 100644
--- a/app-eselect/eselect-lib-bin-symlink/Manifest
+++ b/app-eselect/eselect-lib-bin-symlink/Manifest
@@ -1,4 +1,4 @@
 DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 BLAKE2B 59ffe0897a57115debf185344eb7fef5177394337c02dde6f67e79114e53f411edd5e5854c86beb4884eca6a51282a0dc09ee94e82cb0d0d0fd7e54a99e660ed SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd
-EBUILD eselect-lib-bin-symlink-0.1.1-r1.ebuild 624 BLAKE2B 464d30ea477c3706985b7aef121e6ff8cd31f9a38e52237db7e1e5a15560a5fafacdeffaecb336f5ecbe8348570d15af2ee05229b71a5d5499a9937061583994 SHA512 dfdb1d2052f723820b918638d96c12b77bc220cd3424536dd70f5aa014a060a6d7fda9733b818ff731dceb5bc02fa58ebaaf65dadbded4ec5a468b4562316e63
+EBUILD eselect-lib-bin-symlink-0.1.1-r1.ebuild 622 BLAKE2B 7da7915d390862339cc7d062107d8d21724c42bed0faafbbf74dfdad712e9091a582adb6c15bb500de85e10cfcc7f9a2cbf82dba34efdeeacc44efd5c06fdaca SHA512 e75fab1b446a9c6cf6a5728d732d84dc6c95a338103ec2990e0b493257efe1888b58cc294a70951b7cea4ed162f2f5285747ad72a9e6c07e655b5b6f6a241f3a
 EBUILD eselect-lib-bin-symlink-9999.ebuild 450 BLAKE2B a51369fdd0a01937217d50944f9258b101c1851734c8ae7cc1a69707d4a823fcb7fdb0968bcb74ecd2a92c36e7aec8e126d3852b52428a03cc91d24295943174 SHA512 8ec6585a9349f25108e643a49b7c84aacba9ced72ff1180aec55d01a0a8f7fe7925f07ef48e7ca648cf1a3f85f0c9d8f9462f8b06977514f5382bf9b791d8baf
 MISC metadata.xml 557 BLAKE2B c080bba78b696215c59e3a377525438a80a0f20c1e62c44569e9fa8eb681a47864671cb3f0604f64404d99c590fa80383c2d7b66b369266027c207bbc8ec95ed SHA512 a6dd72c1f35c5ad49131ec1517043aa9de7e66debcae4f082662b8cb2be90f8c0885c83eb44c8eb6fc0f7d24096f5cf6d22127e45748818d65c6a301a90be19c
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
index 9e5da03b358b..5006da4cfe1d 100644
--- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
+++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/eselect-lib-bin-symlink/releases/download/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-lua/Manifest b/app-eselect/eselect-lua/Manifest
index 878ccbf1e005..16e3002b8009 100644
--- a/app-eselect/eselect-lua/Manifest
+++ b/app-eselect/eselect-lua/Manifest
@@ -1,3 +1,3 @@
 AUX lua.eselect-1 3217 BLAKE2B c3f2723afd8177878443bad6fbb51d16a0b90a9f439fe0f2dd150105488db540481136e2ff5f3d2a0b71bdcc88e95f6751a63c7c0a6bea4c32445f8871aa4163 SHA512 653aa84caf8a3706206099de78d8e1b2bbd41cda40dd7dac2b022c85a1988d864a80f490389db3fc2450555d301f965189df132a964a4425ee2bab6c2b7be220
-EBUILD eselect-lua-1.ebuild 609 BLAKE2B f63958d292fdf41831d7828b6f081c3b4da413a77aa90f65cd939977b44a1716b2c0a16310cbeb7bb5afb87695eb1df975bcb31abc4910f0ad0a4d9fe514246a SHA512 a472e964a481d2cf571055ceff5d68f3ad85b6ff636de283739ded4a68a187cf9a6595d8a9eaab59ec1d0d8d209d239da12331cae550895af5bf4031175dda96
+EBUILD eselect-lua-1.ebuild 605 BLAKE2B 25d04cde1981dfd1d7779c3aef7667bab3b36aad6241748352ba46556461e20810067756dc55a6b2d131fba43c70021c2919762dabec6c9dc9508c190a49d5b6 SHA512 8ca272a71ccce716bcd11b77f759efa1f2edcf1be72bcec31fe72be9c0140f9cd827e60c45e1299338d38595be9a558643998f7e2d69ec0453e5f36d4f32f305
 MISC metadata.xml 318 BLAKE2B db169d8920d5070857d050647cf7d131f17039316e52b4032d573a7f9863af9ea6741bb31fc0a25c78d63863a27a4643131ea8aaae227bdc5bacbcbae6d41fd4 SHA512 48b3aa36f683baa2dca029f1d8ac46a951860f7d67c55d99c330acc09f1b407da2b640dfdf045ef497f254f83b493f0de36c5bca9309e39af4a8d4376af82f92
diff --git a/app-eselect/eselect-lua/eselect-lua-1.ebuild b/app-eselect/eselect-lua/eselect-lua-1.ebuild
index d1763726d147..321aa9120693 100644
--- a/app-eselect/eselect-lua/eselect-lua-1.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=app-admin/eselect-1.2.4"
diff --git a/app-eselect/eselect-mpg123/Manifest b/app-eselect/eselect-mpg123/Manifest
index e75d971e3ba7..20334ab62bed 100644
--- a/app-eselect/eselect-mpg123/Manifest
+++ b/app-eselect/eselect-mpg123/Manifest
@@ -1,3 +1,3 @@
 AUX mpg123.eselect-0.1 343 BLAKE2B 192ca6ef608cbdcab5b5c866515b25dd5e7110479fef2741fc6deed0b809dff3519ef36451cd017f03063381dca5d04023f4d885c5f9db9ee83075059640326f SHA512 b11891308231ff322c0028eca8fcbac999a74c31a26e5e0376195276fc52c210febc21a46a78b23a1ca6099abb27e5ef401d4b3f50de3c98eba3631dabee3593
-EBUILD eselect-mpg123-0.1.ebuild 589 BLAKE2B dbda7821c48389ddd1f8c78c45cf3db2d5a040ced325e5b1f6ea692636f3c7c409f3fe392dead521b2a3c41d00c72821c4fc03e418c3597ed46d962603a08385 SHA512 fe2b6e1a2c26d0df4cb5868ae309f09f5f7f05fe36c36b494ee9957599b9b74ffcb78443be2cc003d19706a0dadbd29f9e3cddfcc709d34265f46d1696e78f7a
+EBUILD eselect-mpg123-0.1.ebuild 590 BLAKE2B e4cc132562c1598f539d8a5f8c1b021bf1d545043e716881c040a3cc0a1690b502d5dc167937970a0625e6d667976ce1b1185c21add5333acbfa05183f7bf560 SHA512 cff8aab07e86df15c11e6051d45ac66d4cd27a9ae184d7c0354b10fe96c4c4fdc3e580d1a10d8241bca91c4a93c792a3f84ae1f23fe601e64ea5212fe9caaf9d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild b/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
index f179038a3997..ae8c064a7224 100644
--- a/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
+++ b/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-mpost/Manifest b/app-eselect/eselect-mpost/Manifest
index 741753628bec..e6581e1a3d12 100644
--- a/app-eselect/eselect-mpost/Manifest
+++ b/app-eselect/eselect-mpost/Manifest
@@ -1,3 +1,3 @@
 AUX mpost.eselect-0.3 3728 BLAKE2B 24404fd63aa87c430319512d2598ff37c2f342d7966606fd7a861ba8016103257859384932261f7705a26db3ef197ecf89471b2c28829921ce2e77dc2e2d92f1 SHA512 b2cd807c3ebf7933410dddc9a56129a6ecb284cb163510aac7340ca44ce4dd42e69953b24e002da3898b3961f2a661a27615fefec79b5ffed04dac5637c41b01
-EBUILD eselect-mpost-0.3.ebuild 708 BLAKE2B 1d6936e4ccd6a15968066dbc43500bd768a9c00b5ec265fc3e70892ddcf3f2eb46c84526d142fd4b33de9fd4ac064e4be6f86ceaa688a33b626162d4de2897db SHA512 8e19b9b51eb8fe6c0756fe37cae8a29402bf8c78804ca3947ac9b7830b7ff042c4692bd7d83f89db6aac19e9ba2f814775446b474bf457baf8d4acfe8fae4db4
+EBUILD eselect-mpost-0.3.ebuild 706 BLAKE2B d8073315c6dd25569b147abf6838d860e5db309245aa37d60c8a541cba62b9240e1ec8e15e2dda9dc0d8eeb0cd645b4f729e6aa2180b7a4dcb519c9cb8c8ac7c SHA512 4a1227da522989a46023e19c25745d9ffc98c9c09361c05d2f126b0405098964ca7c0f7ccf77f31aeb35ce6ad3d58f87560e1605fe7523c03eefa4cec9c5ca94
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild b/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
index cbd5236c2b25..8fa30ba755a2 100644
--- a/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
+++ b/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-eselect/eselect-notify-send/Manifest b/app-eselect/eselect-notify-send/Manifest
index 289b9ffdb4e7..9d6730b4d48d 100644
--- a/app-eselect/eselect-notify-send/Manifest
+++ b/app-eselect/eselect-notify-send/Manifest
@@ -1,3 +1,3 @@
 AUX notify-send.eselect-0.1 368 BLAKE2B 444bbdd72f8334ed024d8c4c283842fda2fc3d1ac719a69960007d454da8209edd5dd0a6e65d168c4da1c8e0ce15e2aa284b4be491f8b9a14ff498c047d8a85e SHA512 13624909369f3f0563e6aabf1d7e7fe1a7f4fa59d705dd18aa73cc87cc346d4c62ed5566c45b87802452e45b59a4342d428a32125d17ad4629b0f8292fac4757
-EBUILD eselect-notify-send-0.1.ebuild 614 BLAKE2B 6bcc01c42972b76c6619f35cb5d97f9748991dab2049c8bf7461d0b08d2602fa817808e58fd26ddb674b012bcb75343eef16e64cdfbcfc3f3bd2998d5d5844c3 SHA512 5d00b3d382ef78e5888a4dd9aeb2ec980cda156249482e44d851ef9475508ccc6db8d3a6b47aebe135f5dad34ea332be41341327f865ed98f1659cb15bb6452a
+EBUILD eselect-notify-send-0.1.ebuild 612 BLAKE2B b489dfa24b7cb6cc912be090559e78ba6e7bf27a9699779b875055d6ec60fb38f391b82ff4ef563bf2bf356da32c87853f5a91f42683d6dce028ba63a8d7e946 SHA512 f03e30c7de6b3306cf61cdc5896660ecb3f8f14573bb54b314766d8fbd94f9a99310fca28ff1b92cf397a37a9e7469a37d95f7df96c6524f8a9e9335a40b77b1
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
index beb2ab21e1c0..818b3695f49a 100644
--- a/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
+++ b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-opengl/Manifest b/app-eselect/eselect-opengl/Manifest
index 00effac1cf04..af480711f05d 100644
--- a/app-eselect/eselect-opengl/Manifest
+++ b/app-eselect/eselect-opengl/Manifest
@@ -1,3 +1,3 @@
 DIST opengl.eselect-1.3.1.xz 2588 BLAKE2B 5be8bd3efc510a3e55a666136e0f4e8a3214b347981db1413f84268e788a4d708b83eeccddc75766dd4cc29cf99b6930062b274a6ecf79c5c5f8a5817c7af32f SHA512 052a804e96d8e8afe8b588fdc8996aad21675ea05e3e668c33293df4b9523dde8be083e4a7909a22ec83260c9735694fe4e8aa7e5d8a3736a8e243f29368e532
-EBUILD eselect-opengl-1.3.1-r4.ebuild 1873 BLAKE2B 735e911c8c27a71a9225f3031c7dffe6ba44f57145a0c089b1417fda46ac9e8e8e4ea3a2113ee8a3d592222917e0401f5b188b240afc18c525b13cb62c0dd83c SHA512 6911be4ee6a85d7776621f33fe0e7461c49fc2ad7d54d63730711861b0d3292eeff612d207ce2104185ab3ec23c899142aa7f0602ca98f66bf50cb6ce1a2dd00
-MISC metadata.xml 437 BLAKE2B da333685e92af6504ddf471c1d87e13c09e7240941851196758247e7eb276d67ef798f661f2ae62f3456c3c6897d35caee4f328af8b3d7e3ae53e9b1e2c17d21 SHA512 4e1c5f16407ad8a0eb5212d6396bd708047da78f3a97a395b80f60cb21f375f308624f01a8b2bff28ad8bdfca04ac2a3f573f3d5c0f679fdad30b4c0b2751552
+EBUILD eselect-opengl-1.3.1-r4.ebuild 1814 BLAKE2B fd5acdc4af5817e94ad67546cda95e668d8b6718b2f18e8cb4b4386ce22e0a88afc4f2b47c3cc728c4478c9c738bc0d1fd6af61292d4b38e4fa9b3f86bd4bcb8 SHA512 e6df6061c06e98f8a57f46bf8ec0984c41631c58aab791d796a7ac76fcf6f9d6dfc71ec07dd0b861ceec53a169996a3840ebaa6b2fc93103b557c901b97d31b9
+MISC metadata.xml 334 BLAKE2B ec6317d508c65f722b37eabb12bf453ed08184c7e467410bf78912265ba98b4e59078daae97a76d7998ee1fa193b85767539c0f36fc65950a0829623f54ea731 SHA512 9f7908a8f398af76d0d974248f6b55e49fe6aa73280dcd10df0fdf2f8f87f5d4e13f7d56cc61ae4aed20c17f33736629d4b2239a4f232d0b472a4f6e8bb738b3
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
index 8656225a120f..8ea9f4283b12 100644
--- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils multilib
 
-DESCRIPTION="Utility to change the OpenGL interface being used"
+DESCRIPTION="Utility to switch between OpenGL implementations"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 # Source:
@@ -20,14 +20,11 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/opengl.eselect-${PV}.xz"
 
 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
-RDEPEND="
-	>=app-admin/eselect-1.2.4
-	!<media-libs/mesa-10.4
-	!<x11-base/xorg-server-1.18"
+RDEPEND=">=app-admin/eselect-1.2.4"
 
 S=${WORKDIR}
 
diff --git a/app-eselect/eselect-opengl/metadata.xml b/app-eselect/eselect-opengl/metadata.xml
index dfe0fc036771..75f39debd58a 100644
--- a/app-eselect/eselect-opengl/metadata.xml
+++ b/app-eselect/eselect-opengl/metadata.xml
@@ -9,5 +9,4 @@
 	<email>mgorny@gentoo.org</email>
 	<name>Michał Górny</name>
 </maintainer>
-<longdescription>Utility to switch opengl implementations between various providers.</longdescription>
 </pkgmetadata>
diff --git a/app-eselect/eselect-package-manager/Manifest b/app-eselect/eselect-package-manager/Manifest
index 69797fe9c8d0..da27e6630237 100644
--- a/app-eselect/eselect-package-manager/Manifest
+++ b/app-eselect/eselect-package-manager/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-package-manager-20110108.tar.bz2 1273 BLAKE2B 453e258a8de1cfc77f66bd3f07b9bca191c36d6cce47a6d0f43f5682bf60de8b898576b998acdf6b9b9e5c7307ce6199797c9649cbd5917eca18624e32717425 SHA512 3fd7d9b33c4d2e3ca4c580e9e55e0033a2bbcc6718e0a2706c9725a125c219bbc937f6347b65fedd58cbad9f00e5c757025c6efba0bf4e7ba131c16134c33962
-EBUILD eselect-package-manager-20110108-r1.ebuild 523 BLAKE2B 7c48669a12ee35d929c98d0ba1078153772a7e64a0ad92440bd392c4a6de1a0eba3e87c25ed1ffebe82fcca4b39f3bda1b84df08aa7d46539fd2526b080cbb0b SHA512 a292eafb309271618239bea116cdff9074ad7e07a405b01bfbd0524966116389f620d4f9bab8e3e9a60cd4959a2bd75b0c91149778cec24fb6056f993eece03d
+EBUILD eselect-package-manager-20110108-r1.ebuild 521 BLAKE2B 3db97cb43a9f402bc31aef519cdecff4423395796c6e0d417a8fc0e92c7ab1b3013af1f529b6a3a38f870c51027cd819dfc751739df4548e91b240adb8707d06 SHA512 8e9d78b559071ce2eb349354de86ff649c8b49632ec3f8b0bbddbb2257410e0df852da3e87b2996e32e54292f0509bef65ad710409541f5c16a4a9fd9f7c93b7
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
index 17a7ce752427..5e2e7bd58a3f 100644
--- a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
+++ b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND=">=app-admin/eselect-1.1.1"
 
diff --git a/app-eselect/eselect-pdftex/Manifest b/app-eselect/eselect-pdftex/Manifest
index 248e9c65a430..02e2fe68b230 100644
--- a/app-eselect/eselect-pdftex/Manifest
+++ b/app-eselect/eselect-pdftex/Manifest
@@ -1,3 +1,3 @@
 AUX pdftex.eselect-0.3 3756 BLAKE2B d63f515ddae49219141093f8bba3830b4d1daaa0d0bf176537b0a0156bf65d3868bd467e337b6bdfff7e04a54cd54d2d4204141d0b2324630fcfef5c6110a7b4 SHA512 6821ae3dda5fdc35f9d8a41e789870e38c525cfafba0079fa912048a74b873236382367e5752ef3e7115799a9bd22e2b2147a5d778e5a2b688d86e550d534b2d
-EBUILD eselect-pdftex-0.3.ebuild 701 BLAKE2B 49869a5fb217fe45e0eab64a942d6a46b7a505777aef42146632c55168361a885ec95f7633d88aa8c9f96d8d50654de101ead21f99f67688d7891f9d644eb651 SHA512 bb1c5e7183d44acbc4aba0724e7f266bc76630d0d33a3c74019f10e171b9c8ff1f9eebc49b90dea0ba670952b224644cb49ab39c1e105b7be128789553b830e2
+EBUILD eselect-pdftex-0.3.ebuild 699 BLAKE2B 1d55448678bd84e6571cb57fa94f04a3d5b1dbfcac2a86ba388beb9b6b56dbc3addb2e6c6f6cf525e360643a6d8683930dda4deea7d6e133111876f1d3f61ff9 SHA512 798288a83939d2a10339ea28dfbe4eebf8ce252294983c90481d2c2014db7097b63d5b32e903b80ba8412d3071e3f8470621d07083b8ba14d06afc8c9e6fdcc1
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild b/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
index 210724f4a2f5..b99e6436cf8a 100644
--- a/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
+++ b/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
 
 DEPEND=""
 # Depend on texlive-core-2008 that allows usage of this module, otherwise it
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index c2d93ade429f..60f799c30186 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -3,7 +3,9 @@ AUX php-fpm-launcher-r3 223 BLAKE2B 80c90d2388118e6dbdceacebbc87de145e94e34a6d96
 AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042ddfe7d817c1589891235d88edc91e213215b7a632fa9358795290599223097ac66f546085c1c SHA512 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
 DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e
 DIST eselect-php-0.9.5.tar.xz 49732 BLAKE2B 78c2010abcb1c9efd4d5f2f3f934365b338901a98bc8528131f2b9f564c1c3f740ab2dc2a28a0a58912e750062e61f75a7c6611c2f37019ca6525d729ffb5fd2 SHA512 55e401cb0c3ed19fed90485d62ba3deed3355503542898ff0d1b5404bd5fafb2f887df433609d4d4b28f32c0034100ea32c9e58547ef6417ea0b0f60d061d119
-EBUILD eselect-php-0.9.4-r5.ebuild 1359 BLAKE2B 509f75f6c9337f50d2270a4b8668d4ca31b5b5ce46390414ec30fa507f3fc4738c3803ea8e9022369749e89a5e4effcdfaa62c8aa82fc376d333dad92a011688 SHA512 229058f0c0f34f6cb50d8b9de2d4deb9947c7db329a62b34a86df2907ae42ec8419bf37999c021c28cbc5440165438300aa36072ce54e02265cc661dead44613
-EBUILD eselect-php-0.9.5.ebuild 1368 BLAKE2B 298de33013865feacbdd63dc85db5fa1bd09a75251757acbc35d8089577921587c4a29d0486436be015970dea7dcb2422d40b160644df9d83f757778f91dd10a SHA512 54e8823b60a2d219de453e45d6d141d21c7c1490572a20568986739f9679befb889241c9d2ed6da1df50e72fc7b4d08e14084fe184f2b936676e61c4fab1c0c0
+DIST eselect-php-0.9.6.tar.xz 53236 BLAKE2B 38478d4792f8a527e5f519abd7765211aff8c1d132ceeba5eec70ea3b8d1f254be52564334fed3840950c2461ff4a30784b92fbb8b21cc448083617797eab1d4 SHA512 d3f14288b3493cb48717c1f27430ae8b60881e9f6f48e4b7644a4596d9fc1b9823a6af8b7101a62b28a92e3bff164b1717617a2642a5bb02e8dd46de56d4f410
+EBUILD eselect-php-0.9.4-r5.ebuild 1356 BLAKE2B dc14c86dcb6323af5bed9cc11c3712800d4cff90fae5912c0bf26b74ec46aa22c4d4d9ac39b295e91798bd7505141ba81e0a35726f6225120b1ac891b611087e SHA512 b6be738c14ad455eed657e30fa9495e5cd9a26744ca3e10ff465aad60ba29b6a1fb8416eb41059e593e30bb60b476e0a80a37f4f6092b039943db978fe6fe05d
+EBUILD eselect-php-0.9.5.ebuild 1364 BLAKE2B 9053d4938b14989de8de1436bcf877845d376f1d44628e2adf93fbf6259d1c589a78ec65b539dafc401f299bcb6d7cda9671c1b315417cde29f3cda89617740d SHA512 eb08bcee2dccd2fb09f5091daa2b09de3a5adb2493ca5af025c46abdba01396de04cb34a26e54b0f2c3dd25bf54582d9ab67b16326172144a01f480cdc612c24
+EBUILD eselect-php-0.9.6.ebuild 1103 BLAKE2B 97d545fcfa214c93477cab816ae7f312434308efcb5ba067ffa254a34dbf60c341ab6e7c8767f2ce62a8c0f0269f37b2d1eee954dd3584268b852c9ef9bb17fa SHA512 975c9e633477afe859ef60a1ac422ecfa4c7e9b1e0f1e541420ecb36c06bd51beba61c347a7b65eca1065fec87fc8262fe6ca80d6a96d9e217a0b841161f8b37
 EBUILD eselect-php-9999.ebuild 1031 BLAKE2B 137e895ef07fe7c229cd111a101b17854685bdfc98772f4dae61dd391a31e8fcaf3505a1accf3d15754b0ac6d424defe2bb3ca6368623f0ac818cd078dcb5cfe SHA512 183e490a9c40858d8d48a94a8096604834fdabede72cc6b5917bccba2a377f5fa05d1512b19e22c6354c510f50b86462a1e788eb21214b5e616aa65db37ff901
 MISC metadata.xml 517 BLAKE2B b597cb77735fa8a26f686dd357f92977342fe28272aa78471fc184fcffbead1fe64c7f7b90f608a6854ce7a9e7529f6132dba83dc9f368b3cdd6ab6b5db5ff05 SHA512 23e39402a69ee17795f08716462c5ce3a5fd8e5c21a8e39737a803f34edbd2c3d38d7e96931ccedcaded612bec5d9e3fe09004a4def1ee4307a63c3bcf99b89a
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
index 680e6b6eaf88..294500392640 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
index a086b76e704a..a38c7b0c3c11 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-php/eselect-php-0.9.6.ebuild b/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
new file mode 100644
index 000000000000..d2a17e02f7af
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+	apache2? ( www-servers/apache[apache2_modules_dir] )"
+
+src_configure() {
+	# We expect localstatedir to be "var"ish, not "var/lib"ish, because
+	# that's what PHP upstream expects. See for example the FPM
+	# configuration where they put logs in @localstatedir@/log.
+	#
+	# The libdir is passed explicitly in case the /usr/lib symlink
+	# is not present (bug 624528).
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		  --localstatedir="${EPREFIX}/var" \
+		  --with-piddir="${EPREFIX}/run" \
+		  $(use_enable apache2) \
+		  $(use_enable fpm)
+}
diff --git a/app-eselect/eselect-pinentry/Manifest b/app-eselect/eselect-pinentry/Manifest
index d6033bafe997..f2c4ba8faf62 100644
--- a/app-eselect/eselect-pinentry/Manifest
+++ b/app-eselect/eselect-pinentry/Manifest
@@ -1,3 +1,3 @@
 AUX pinentry.eselect-0.7 406 BLAKE2B 99f9d0d0dabe57f863d2d814ee0b27956b0f14827a6ba0aa5d06c6580e6e55e359f7ad3fdf56e9d8ee087e79d46f2d9c8c874064b2dc6947d0f4b2f7a0c80533 SHA512 752be6cc5612799fdfaf765e9476e69d845065834a3a471838a94f1955d645473ac56db6e51b6f45b9a251b32c36ba0b149cd72145665972243abbbfe4a5941d
-EBUILD eselect-pinentry-0.7.ebuild 662 BLAKE2B eb6cf6e0912f41918b4c6cf60fe1ecfbe2e4da03b573d01b52fd065944938751110e15783d2e94cd389b94577d4ccc138db738b29722cd5fb66c8e1225aee1b6 SHA512 c6df222fb32818b4cd5e0b496276e63c8aada19abf76021408c988791492bda7e973844e596af540133ebe889d1132ee07597069aa0864b184f2c0df95539881
+EBUILD eselect-pinentry-0.7.ebuild 659 BLAKE2B fac5e75252ab1c33e899c0d7d0e2a5afd1ff053813283240cc71aab4e1635e9d4968d11605d542acc5e036bd4ff20824405e07ccbad127c666a851cb0a8e17c9 SHA512 818cbd0aa4bb66b78c87e09fa5f1917014e3daccdb175872c02c253c537bce45e8b7aa03442661dd3542bd5fe4c90a4f7a30382d126a3bc2033e720c59f2331b
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
index bf29b94e5cb9..7ce2d9228109 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
index f94a2ea02129..5e65e6512afd 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-postgresql-2.4.tbz2 4518 BLAKE2B 726c59f0511b2e27493cceb9b9a7b3c58e7d7bb0cba2fef705eef9190ef384c3116c42079566d8761192b9c288ef57c550f659a0398ba90fa069f6be335550ff SHA512 4eed12905e97a45420a299cc9232be62a1ac88257a047d9d16ef7d8c8a0e0ddbd4177415797defe352cc82cd87b7777907a51a8cadfdb28064faa78a28e0099d
-EBUILD eselect-postgresql-2.4.ebuild 1004 BLAKE2B b22b662f6bdf074b7c910202b28a39e8e67c587ac2479cdbfdefa1210e02035763562e5fb08aa2e7641de3ac56c2555f2c57bffc3118b1658f579d670a28a310 SHA512 9e09c04958232995c07ea9b3e9b0e01138d8acab8ac26e7b1388821b5d45c21eaaced734a7f44903ef7e0513b4f17cc57f17f1f166acd06cd9f13565d5b05c24
+EBUILD eselect-postgresql-2.4.ebuild 1001 BLAKE2B 1974975fb695c1dcb518d82db06cc76e54797c84a3d98425751fc4a85ff0baaeb130d7869dfb89fac18e436fe5ae09164baf6bc3ccf77c85399b3def67a35749 SHA512 4d912a653efc1d32c713599b00e5ca85340da76f42dcfa980720c9f63f7266f986f2219bc0f981ce61d437fdf6a7816b3eb4e1c730f19be90905f42b09de2064
 MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
index 7def1cbafa75..70ecbcc78b10 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 3b717dfa7bd3..50e0bacfe047 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -1,8 +1,4 @@
-DIST eselect-python-20160516.tar.bz2 46549 BLAKE2B f8703ed35d9607a940fca1bb1d9612de62a04dd1fb065fa31db7438ee08b766b5ef84a4ef10f3f58654acb7fda4bc5e32abceccd0ecec632b364e4a55834ba2d SHA512 0ac310e13bca9e3cdfdd55820cc2956cacf28ade99c1b5048edadd48c6a04c2ae1037207aaac74fcd75e809cf993f88b52e463979b68bd123fe925e491a7030a
-DIST eselect-python-20171204.tar.bz2 46655 BLAKE2B f0bc46c796a1b9e01f964994219b9c7831f99844a12e97429b40482e28a590a2d825f7b6fbca27b0ca1ce616e5cfb388272af686ea2de65fda69da0319fddeda SHA512 f89183ca992bc38f2308a3217602d5ce6ec4b3b5b614f2aec48fb5b3b7e50a2e44dd18af36a7cfbd4b45d05346f2be97605e35fd274558e9173c6974681c8fa9
 DIST eselect-python-20190417.tar.bz2 46698 BLAKE2B 6f0acad0abb21d8e4768cbeb12f7e871c316a940ebae4c02bdb1336095991cb6b6bf05661ab659115a67f29a09f2a9b57cfb0868019606ed550b5aa1863f6f71 SHA512 a461263a50a29f0493127ee4a027e49ca4d7631e9c8d16cffc8bdb98cc7e75b0796e45e70951d5559fb86f0db14141a3ea6a53bd4cf1e0cc83ed5c7f24173695
-EBUILD eselect-python-20160516.ebuild 1070 BLAKE2B 7143464543cdfa4c6e0ad53bdc89f9adc9f36e814326f8a0e0a631edbf48528b168edefe81c6659c8fa95c6213057a3a6e217484960351f6c7055115a630707e SHA512 688d0c9976634c79eb5f79da7b487750a9b054eb830c09aa898a684c1856f965ad345e581148dc705b2bd76fb496d0d9c147540b90e43449d4098dfc44bd77f6
-EBUILD eselect-python-20171204.ebuild 1078 BLAKE2B e79c08be0540831020292c3bda2fd3f990f60338e4274ce4f153c533e648057a42beed0b2ac3a22d2a4a144d91f9a6ecabbfc25a8de85b4c4fec2882b3628af2 SHA512 1c1641f5414b3fd6d4c735ee41fbc4f7c930c6d4f6f7c25fbb447285f1321928768ad2c5dd10f995b22c69f56a7b467ddf7c8427a637b80d4baf6bc6770ecf55
-EBUILD eselect-python-20190417.ebuild 1088 BLAKE2B 068b0c6ea94b550898b626569ca708708b2a03e3444a1e84598a0ab835504fe6c86c6b643f6cf5f1f2490a0fbfd3c26d0279f821a8687bb0404f8fcea92ce74f SHA512 dafd1706af58982e911abf79a986ee694b768df5f2fd9b945c3e473cd2297134a873f3df15fb77c501dc4caecc7dfa6c7bf19ba7d5e7dcf44e73e4fb9edc1850
-EBUILD eselect-python-99999999.ebuild 1098 BLAKE2B 03614b6e6ccc4c346e6431369cc8a664b2c2f689ab532d31019535e72c77d7478146b695a5c1495a3fa8e45bf425c3024780631d9fba2b1b9a4a7d1cbf22f974 SHA512 b8cf5da9b8ef5a9f976ca906593fe66927b60082bec3e30cfb10daf520f37468395fad95c7f4b0fd1dc6fbb0580482f44882c102cb81ec74426e8b448950c5bf
+EBUILD eselect-python-20190417.ebuild 1084 BLAKE2B 8ee22b070bcd50d555ef896d49e25e9590c973e3f36e433116176d085221f04f340713c613572e53f5dd7cd2857f2ece56ca543d83568a59a33f331d6928e574 SHA512 2e5ed3e5315ad862d8b43f1278dad4d56daef65e3a5b103e3f0981e28b7f0fef1df4b3a3a45a4c5db93696c7a85e081ef8452e4df8234b4920792e4af54bdc2a
+EBUILD eselect-python-99999999.ebuild 1094 BLAKE2B a07607d61e97ef3c29dcf22a5aa05c1028cfab576e88451af88d5955b21f0b281d01a0b2a8fd806786708701679b72147c509f638d95c7052b4e6ce36d688d5d SHA512 fb293c5d9c1f1beea28bfd8a2bfa696be40cbe5c7b651545ffcd17047dadb40c28c6f648da33db93f67cd5a789b64aa600dfdf114cd0f3ba9e332dcb76f4625d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/app-eselect/eselect-python/eselect-python-20160516.ebuild b/app-eselect/eselect-python/eselect-python-20160516.ebuild
deleted file mode 100644
index 48b65d42fdbd..000000000000
--- a/app-eselect/eselect-python/eselect-python-20160516.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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"
-fi
-
-DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# python-exec-2.4.2 for working -l option
-RDEPEND=">=app-admin/eselect-1.2.3
-	>=dev-lang/python-exec-2.4.2"
-
-src_prepare() {
-	[[ ${PV} == "99999999" ]] && eautoreconf
-}
-
-pkg_postinst() {
-	local py
-
-	if has_version 'dev-lang/python'; then
-		eselect python update --if-unset
-	fi
-
-	if has_version "=dev-lang/python-3*"; then
-		eselect python update "--python3" --if-unset
-	fi
-}
diff --git a/app-eselect/eselect-python/eselect-python-20171204.ebuild b/app-eselect/eselect-python/eselect-python-20171204.ebuild
deleted file mode 100644
index 7c58bdeb2d8d..000000000000
--- a/app-eselect/eselect-python/eselect-python-20171204.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
-else
-	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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"
-fi
-
-DESCRIPTION="Eselect module for management of multiple Python versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-# python-exec-2.4.2 for working -l option
-RDEPEND=">=app-admin/eselect-1.2.3
-	>=dev-lang/python-exec-2.4.2"
-
-src_prepare() {
-	default
-	[[ ${PV} == "99999999" ]] && eautoreconf
-}
-
-pkg_postinst() {
-	local py
-
-	if has_version 'dev-lang/python'; then
-		eselect python update --if-unset
-	fi
-
-	if has_version "=dev-lang/python-3*"; then
-		eselect python update "--python3" --if-unset
-	fi
-}
diff --git a/app-eselect/eselect-python/eselect-python-20190417.ebuild b/app-eselect/eselect-python/eselect-python-20190417.ebuild
index b301c2264d5d..b306150b636c 100644
--- a/app-eselect/eselect-python/eselect-python-20190417.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20190417.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 4405011868ae..8e05fb549b51 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.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
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 2079bcd9f2c5..dbb35f555ed4 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-repository-7.tar.gz 6768 BLAKE2B f648b880ab188b5beb21161dd011d8cea0bc9dd124d524d747a1867a37f334667363be9c0ad9f04275aa1534b904a519d7551c25ea547ae2acff625382c35dbd SHA512 87569158dce3acfdd81a469387fe1a7a7c268cae2e15cfdb12d8377984be5feb674c9b385f0171d27dbe8c2066ae98b2c9a74214340e85380cba173ba26d6f0f
-EBUILD eselect-repository-7.ebuild 1000 BLAKE2B 543098cc0e85e8793561fe0f8692a59c51c5922a1b9b79f67bfad6f6426cb5544f800df922489953d858ea6089ea1a019bfcdd8ba105c70471a2bb99f3105410 SHA512 d3abccbf679683dc3245ed5c607b985a69c695ae94f0e528be62c823db4372c6bb8f810d575bb6383d713ab8e7039e573d64651111e191f93cad70da02c023c9
+EBUILD eselect-repository-7.ebuild 996 BLAKE2B 9b906b5ead66be05fee296caac87a065d20c902668ada905aab953c2b8f6734a97e42482cce4cffddac7da18b57e055bcda2e83869742d837d3f619be621f299 SHA512 b78d348da631d1e64b5f0a0297d7d89cf6c03a78662c7d4f2ab10bfd3707fee390757d1eab36448141cddf995bcd5fca6b5ecefd533033b4607f1b9ae9e838e6
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-7.ebuild b/app-eselect/eselect-repository/eselect-repository-7.ebuild
index c9c552f05566..fd7d9fabf887 100644
--- a/app-eselect/eselect-repository/eselect-repository-7.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index 06e279a818c7..a4632533c1c4 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -1,7 +1,7 @@
 DIST ruby.eselect-20170723.xz 1972 BLAKE2B 338f9fbb81ebe3c0fdcab77ab12cabd6aa334ac3bf64352cd801c8088d7c3ac4c452e647addc98497d104df24f7934d8cdd8b0008e4f52fb27306a80411f793b SHA512 9c0614bc7e2ce9811466f257035d74622a96db8d44aa0908414fbac7d4142c34350257b08ace7371901e46cc0c9a38c3f2acae3caea4fb354ccc37b8c919b48f
 DIST ruby.eselect-20190121.xz 2000 BLAKE2B d04f9230e428526fb7ac7f6c274d7ac1b47af9f9bbb33cbfcec72cccdbe553db73a320e8a86190b88b4f9ee9c27fe0e5dabce1e1c5edfd4373d9a4bfcb457957 SHA512 aca2c46e39d3e0806a0ab942e8afe755992e5df98c50f4f2e012c93b8d6339e2a8400376e73187744a3d42a77725e03eed48b300f7d4d2da546a434184988f52
 DIST ruby.eselect-20191222.xz 2000 BLAKE2B ec89dca67730ff3c6acba8906f9436866b45c3b7fc4c29be6614eddf7e5fbc1f9f9ff0bfe3ddfdc7309d242a5da6f8913cae738895fd6abcc39dc336f609d066 SHA512 72c3e3fe8c82474de25dbde9f1f63739e57be3e4e61a1f86e57c9dcaf92d72fd8d17263f8a326af771f64395febc82f5eb29e86b4b2a44af029b6c1fc41e43d2
-EBUILD eselect-ruby-20170723.ebuild 684 BLAKE2B fc5ca2ab1b71cf5c4d38808f6fc4ba0c170bc277be30cffb6b4d7707a4dc89fcd4d6a15581f6c5b83b36d59fb8d40415c1e82d1b72d615d031243fa71aec61eb SHA512 beaa00ea9cc80535e2f43d084c21dbec488cdba84efa3aef573337597c5af42f8364e9e0d513d89a0e6c64cf69de69d090dddbdeb9bbb96dd6bf080c84741c9b
-EBUILD eselect-ruby-20190121.ebuild 686 BLAKE2B c2b5b511e348ec37ba144f5cdf049fd482fe8e970efbcb18f317128ba974b65457c122a7c743de740301f483362c420794f3d91a1c040b972d407b9813579f59 SHA512 3bbf7ecf285d8ceefa4c54b0ef2085ab93540dc1c24699ff7f32dedba5577050644fed721d27492c4edd7dd83b753811cd1fb3531e15b733832561375fb92051
-EBUILD eselect-ruby-20191222.ebuild 686 BLAKE2B 13a4815ca6b6fcfdbf16dfbf0b7e614ca5d1958e08c6d03f4a688f9adb2da8f41e47d50302b0dde3fe4e6b3b45e6c917badcbdd66e395508b9877a77f756396a SHA512 1bdc0cc341d1202f09f757976b86cba9a8e0aff9d1955e05e2d372f3a1b8cda1c403d959089595742913fd47f0d02962fa1a98b941e15821b6c4914465a3a9f9
+EBUILD eselect-ruby-20170723.ebuild 681 BLAKE2B 5c2b0024f4211936b261aa01d3d98419ba22d44c2fe23709164fdd0c7bdf4d2fa31d40ef6f8d284dc97112d9490522a7d8f550020d5e068024bc909689ac0f7a SHA512 61268c5c02564c147e80e13e2708518da52beca9a21d07d3ed44e93dbd96fd1666de70490e8f352c99c9997d2654155d4e4fa2a7cd4b4df026755e17c5ef03ff
+EBUILD eselect-ruby-20190121.ebuild 680 BLAKE2B 93ff99d1a61930ba8bc2d1ed2603666f4c018f53057269de4aa601f40e3e86316f80e3949d48ff8a3ba7b83f81b3a72760772cc8fee2951619f53aaabbfb0041 SHA512 f36fef715f7460bf2e28f639c620879169d053df7fc16576fe2efa58edcf711c09deddf7bffaf8118e90b8fd1ff53bc5381384da5bb01459e9b5004982400dc4
+EBUILD eselect-ruby-20191222.ebuild 682 BLAKE2B c66bb788868596b42fd4b1c0eaf4dcf8b3d78719f8d29ccbbeb79b6c06414be35a8e5609704c8b612e8c1c6049f321a30d14b3715ba323dad51f819f80cad073 SHA512 4c67f2f1e01c55326fcf83739afaab560e92a358b51d88fc8a9f959a5958b2534bbad4af5681bf979a9f4f14ac23a23961d8be52cad57d24c0a5c576b683e3da
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
index 0fadc051437f..a4d111f7d74f 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
index 0565577dca5b..a83062e45569 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
index b670fc25a0b0..4a8dab5000a0 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-sh/Manifest b/app-eselect/eselect-sh/Manifest
index 5b810edeae6f..effdebb56388 100644
--- a/app-eselect/eselect-sh/Manifest
+++ b/app-eselect/eselect-sh/Manifest
@@ -1,3 +1,3 @@
 AUX sh.eselect-0.4-r2 347 BLAKE2B a67b9287c40f2f5d96e3a849f889e092a3861423db7bbe5653fddfd5583a7475edee2eb071792b92980269ce19cae24ca774404e95c51a42b6b67f960d9a38ad SHA512 ab8ff220613e1de75e6ffc4bd0b021e55f80658d0071af9fc1036d28f81cdea35e209869803c33e89ea90fb3c980f511b91bf4e64d56f530e92af5fccff522be
-EBUILD eselect-sh-0.4-r2.ebuild 598 BLAKE2B edfb74d41d05d8c5461e394d67aa795d521054d567a75bfb86eef251506830408606e28f694b76b45e28768c4e0445778ef18c1c974bf82364a6e784a7d3cd7b SHA512 7b6d133ecc6b1c4359aa55cf47b96a2ca9edc99256ab621317ea7cda3abff598cd7cf430c88b787b47a007f1322fd0d14c123d9cf8d8211228d6eb1fead705f8
+EBUILD eselect-sh-0.4-r2.ebuild 596 BLAKE2B 8addb4b4a9d997d4a3e46241ffc9ed75ba00a8d175ec196606557f29c46a709850777f4c791a5b32275bc7fe1ea9b086877aa8354f108191f4c968de4189cdc6 SHA512 29cd9cc68ace0b699dc360ed3b4a5df2ef0a8f376be0c91008b6d05bab97c26d56d68599b8d209df861d68084648d09b632fc8e9a414f6a5eace9f61e5e122f8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild b/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
index 0f90e527adb8..14e200fd4c89 100644
--- a/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
+++ b/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-eselect/eselect-lib-bin-symlink"
diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest
index 7a02f2b920b3..3e0d9b543763 100644
--- a/app-eselect/eselect-vi/Manifest
+++ b/app-eselect/eselect-vi/Manifest
@@ -1,4 +1,4 @@
 DIST eselect-vi-1.1.9.tar.xz 6236 BLAKE2B 09853ac48d1f904de5602244306ab35cb0597d14ddfbb1865ee54adf53bf190df6574cb5d8c27e3e41b12768c79f10ed1482b7ffb66015375b0214d32d17dbe3 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f
-EBUILD eselect-vi-1.1.9-r1.ebuild 626 BLAKE2B 940ddd3e8faa0dd4b08398c312dbbf3615f6f6b58b97f185facad0c549589cf3da0500ebd76546a1ae78acbdaef8f37be66211f68544069b92c15c6df1b42b49 SHA512 40fed1aa542de6344611f707891ce47fedbaba11ad84ce8ea6b2a98e6ace3720df3207e728cd3e944bb9915e85ebd1e0e4fc04dc0ae21ffae3895e41a7ce745c
-EBUILD eselect-vi-1.1.9.ebuild 625 BLAKE2B aaf372a17253707631b5d627119addce3ca4b2313e1946496f00debba36ec8ab6a443bb9b1837354e115a2770ec4cf62890ec04bf4a73db2c3f616e7c0dfd107 SHA512 adc6bb3cb32255d0dc4548a173c3f58180c2648598eb6e05e7144b2d5d56fea01cac51c3a3c319a414eeeffc0844ba2bddcce220c4a8e75871e05c3bbdd65fe0
+EBUILD eselect-vi-1.1.9-r1.ebuild 622 BLAKE2B d945046cf6f7d627e8231a8fac1fabeb824f4c397826064b726a4bdb851aeb098fdaca0c868d84b514c02b9a135953ddcbe26e7664e58daf09025bc6b5df0f02 SHA512 f53469343836844b128baeb82e22a8f99b66a73ddd784fd5343070c4b583f86b928375b77cbfba360f766ab59cdac0d792c198353204ecc3cff05d0fdb817e24
+EBUILD eselect-vi-1.1.9.ebuild 622 BLAKE2B 5184466895f5425fc3e8e1b3fa27f3e4dd9e9b612d2268cbcd77158cce20b538511dc52285f6e4723e911990483d6b95710faf04c29f9deaf27d0e1bb548052f SHA512 5b493bbe4ba4ff59d31ebf2772ea2b81c7971a48592d538696f0794077442fb78996bcb9cca2956dc6dd045e226ea34f3426639e84e92be290d710b1e27971db
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
index 9ab8f8045fdf..babee4ae5969 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
index e21a04eb18b5..63b066d61b92 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.6"
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
index af7b71ef788d..3acc2146feab 100644
--- a/app-eselect/eselect-wxwidgets/Manifest
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-wxwidgets-20140423.tar.xz 6792 BLAKE2B ee94e98b9f2473b8e8356ecab483224c027f26a170e02fa8b4e94f18227abb2f1a8f2acd6c5b33dcbf22d4cdadb0421ae487890f9501410559510f3b28ded6c0 SHA512 0d83e0b6979803c8a02c20ac33a42c91fd8d350c095e26704a80c1913309f0e7d741cc466ab22e0a6ce4773deab21ca80756299a12a83d441ded968531003d0e
 DIST eselect-wxwidgets-20180529.tar.xz 2380 BLAKE2B 2f5d5e79b9cd85442b0aa0d1453d84651308d4c33711b919802b383bb98865b615a9afd0493b4d34232c3d986e68246e35943d96a31e25a3fb2778b6483ec764 SHA512 d91e87f23c7feb807ed75fcfd363b61fadd8c305e3aa82c5e3dfa3d9fbc2c18a8b7e6404bcac9ebd6c34269406712d453e5bd877509f26f3648cb864df36e281
 DIST eselect-wxwidgets-files.tar.bz2 9126 BLAKE2B 47ec94aec721d325fc483ece28e84b48c35b103078415447b6e79e68ab44af9356955c960b9464713396f4cbbf663522e5a4493516414641aa5b99e7cdca0ac8 SHA512 c5aba3bf4bbb891534e0c7a444da6cb90a947dab407e436a1eccd13ddb33251816ce95b5fb6826aa9a64ec2b3d9be09c9852859597b0b8ce91cbaf0f6ed6da5e
-EBUILD eselect-wxwidgets-20140423.ebuild 1492 BLAKE2B 5de8e1cb65abca24b782284d5697f74f2751ed414576dd225736050fee4af5d28bcb524a5e6a32f63e6844afbb52dce58b58ef184ea574e36dd6bf8900f3cece SHA512 d3edaafae2946b79f8e56604e815f56d59c77737122b50c73b7b0ba90284171dd3f93a65c131f22a9efe8b0b8c51ba4619b680390ec77cb7f448529d47ffdf66
-EBUILD eselect-wxwidgets-20180529.ebuild 1493 BLAKE2B 16d49a0280c397ee53bff8e7b8c9a156d656c299f64d93ed4c8d03772378375e1c1943f35013aa4fdcad11c44baadcbb8a9f4df9ebac03db767ef0966ab84214 SHA512 15a0b480b126ff9456e5b0173198758bf2d94fe0202d0b9ad3c4cc0889233bfd34371999ce025b7e9b2b08df311739eab728b5e5e133b47a0be09d86882dcce3
+EBUILD eselect-wxwidgets-20140423.ebuild 1489 BLAKE2B a36ef25e45de912dba97a23cf7fb8187346c7e4e80564ef19a7d2729df8a903fd48d39ff0754b1a919fbf014f48db3f28c051489449b984bc0ec8edf238c189b SHA512 05eecb84ec51e7d0a427f905ec5f6c80c2316ec6150a4ec39cf17abbbe25e4d822f844a98af664280ca4972493d684beedcffa491607727b5811697c8b4389ee
+EBUILD eselect-wxwidgets-20180529.ebuild 1490 BLAKE2B 5fdb7fa41ee29cf8238ee094d830518cad0dfb7a33ec4e4bcaead5334b534d59ef9582cd0d2ae94589db2a09fb99ef22477fbd8e152feeb8dac78deae64fa1c4 SHA512 64f36d4f9eeaaf9fbafcf0172f1599be048ae8a11c17183ce98e10b5cd7bf9fb72716b0fbf2bb753db02109cd432cdbb58ac23828a80a3120d641fc99061ee19
 MISC metadata.xml 261 BLAKE2B 6a1c213fc272c8d1e93e73a8aba2f3fffce3525a0b505f56a0ebc185d0000d2f472480842e2e588a59209047f3da0830cb0e59835ac738b548bd8a74dae3c176 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
index f2c5b2f83455..5c618f19037d 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~junghans/dist/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
index 2ab1368aa6aa..2422cf797f55 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.4.13"
 
diff --git a/app-eselect/eselect-xvmc/Manifest b/app-eselect/eselect-xvmc/Manifest
index 40c1e5960d82..a6c033bd8d39 100644
--- a/app-eselect/eselect-xvmc/Manifest
+++ b/app-eselect/eselect-xvmc/Manifest
@@ -1,3 +1,3 @@
 AUX eselect-xvmc-0.4.eselect 4169 BLAKE2B 88d4d93097e51c5e2f6b98adbf2e09a643a3ef37176010907035486b4d98eb38c02e0243a8ec617c89bc0204948db83431174d1bb217f6e9fc6f3fcb649338dd SHA512 d86d80b931d2aa6c085accf9a647745cffd56b496728162b1084eba2fbde981ac17d3d3758cef993427b4236330fcc21bf2fc52d2b50249764a65fc508121135
-EBUILD eselect-xvmc-0.4.ebuild 544 BLAKE2B 69e3c1413ef2931ed9a4419db70b7f04244ee6f9a915baf49df09a27e2ff9f96d5e1801c174f44f6f48d8b60f900ad37cb56075b6bf444c7c676368238a57663 SHA512 071d1e71e4a9f7647d5312bf0d4076135c5e8ac46cee3f99e161da69f2ef69b0f2964286e4ef123bc6f6b5fb558f16bd0caed060827e3972b939d9cbc1e7c8e7
+EBUILD eselect-xvmc-0.4.ebuild 542 BLAKE2B 37983ec5729a9c8f495335c7d99793ffaa55b796853a5b87b7c1674e97091cd6180903304263f47e70f97dcc80ee278dc8726310c02b400a59f5a3f67015772e SHA512 9d508cd534adea4b965d40d5191f3bedb767eb753979fefc1f6e3d19bf699f3245164e4b7fd83f19949eb42f5c2502f86441bccf85933cd420da1daa1c620fdb
 MISC metadata.xml 254 BLAKE2B ee88ffa1e088e8468e68ced9c2f45c893ba1a63b35efb4bd4093dd6b65f976a30ca90d8fb6a23dd8153d800f08ae5253aba6590ce59a79e4db1562676a39f79c SHA512 835fb05d568b08bf648a64dc26c52cd2166f5197b82615d3218e8a69049c449cad544da478cb09c68c5578f75628a86fc4c361b54ff09d8f778839c186466a47
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
index 180f7b10b7a9..6013fcaa1675 100644
--- a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
+++ b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-eselect
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)