gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /sys-apps
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
254 files changed, 2039 insertions, 359 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 43344f5e9882..44ad97755ef1 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 288b2120e4c5..4ba2c72bb2ec 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,3 +1,3 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
-EBUILD acl-2.2.53.ebuild 1230 BLAKE2B 8b90ea7d615544bed6d90de1ceb922da1f458a5cf963f8931618bbb626bef7c6093b9dc144ea7af9ea0b73a1b01a3baf9920b179249542a90b6ef710a987ca67 SHA512 e649859f150337f3631e0af4377218352e796a5b561b468971a7ab7fbf309d9e9186b6bd44253adfa6d6c53ef33ffc8e13d8362ed5e3d867a92ace9803cdf2c8
+EBUILD acl-2.2.53.ebuild 1231 BLAKE2B df03923adbf61b3045f7e39a0532d6b1737cd03536569d3159e70a9b0492472477aecdad41df6ace54c3aa7271aebb9d2928c71ee5f37c1e926c00b49efc713b SHA512 ec95273dbd152e1218e27169a6d4974ab1f347107527bf8e2c713de58394f079e3cdfa9baf47d5d265667a6c1b41a7096529f22eda65801f89ba1e39e9438343
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 0ba2b30408d6..04d9190a8f86 100644
--- a/sys-apps/acl/acl-2.2.53.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index e6cc05b5e8b2..f07a994d3eb7 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -2,6 +2,6 @@ AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552
 AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-EBUILD attr-2.4.48-r3.ebuild 2345 BLAKE2B 592df35ac9c11125147fb976df4abec28f7bbd9958b9498b200b65a11c6c0cffb92c0a794b504f5fc8f417e64d694349db4a00154cc91a6c3da2f6405cfedfd7 SHA512 963c3acd407a09fd34facd48ba6a26294c1bd913a4e0ddf79fc23b7690b236f2f8c14a9a631e52179e9a3d8bd2349f716a26a6ef84ac5ea129019f190eb5a928
+EBUILD attr-2.4.48-r3.ebuild 2346 BLAKE2B e3a8f643923c83411ec4b2cc420baff300a8a190af25770ca5e20e8e0520d53533b95ebfba06dcb9fdc369babedc4757e2090494244468e40c516f1b1af16ecf SHA512 122cff4cc15688a8650f5243007cad88393b884ec6c9c2cd763adf78075071d2c6a49ed575b05463425a60178b3383c089b306f053fdd4986b8cec0360201186
 EBUILD attr-9999.ebuild 2433 BLAKE2B 2cdb707a357043c004bb7ed38d7ada460eb713bf021163d2fd1f7c6ea37b1ced3559853a4db8cc1eaa83bd08ce00290028bc8f1d280eacad3c922e9d4da6cb75 SHA512 56be1524c72945cfd459c5e7736bd7e7e015bdcf4ece19abe0ab2445d2b5b2655535debc31ecc7e2029324c0aae213bb8b45b387d9f5e853a094082ede82a6c4
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild
index 1878b434ec2c..a6f39968dfdb 100644
--- a/sys-apps/attr/attr-2.4.48-r3.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 43be9daf26e0..4879d03c0ddc 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
-EBUILD baselayout-2.4.1-r2.ebuild 8550 BLAKE2B f96e18d47426ce743b9b1d74690039b4755ec3fbfc6d8ff2e82c67c3378daf909ff1fc3fe32cd646c2f9ade84021b01ca9c2fadd5e7551c682ba9f0fe182c6ab SHA512 f4d9363f7f6e3d39cf774929393bb037dee80763f2f48ff3f9b90bd91a383a7eae77e7bbb3631ee846214668d1ac3fb111e2e58efa9ea7df233d0287902318b5
-EBUILD baselayout-2.6-r1.ebuild 9545 BLAKE2B 018f68469c3fce5752b2f7b54616f8dfa4405c6d19f6aba7498727725076f80e98daf246263c21f83bbc73d47d7b4289ed8fa286f2dff89035e9288e0e6f77c0 SHA512 3e3dab5d84a9b3e7122a1b10dede03bab1c142b2c10ebddb14ea866a238412ef9db6c533a7e28db10c42dd9bb2eae7051cc9355d0458c5020d33cb6cf0edb64a
+EBUILD baselayout-2.4.1-r2.ebuild 8551 BLAKE2B 0672ef3559e8d401b6e62ccec3caa76f581fba0c9067244c93680ce2bcbae44b952c4fae0c053bbf633b522da84d24009411996d376829af256e7dc5189cc550 SHA512 7fde2a5bcb2940c09c1156d9070795534058c9225a9370999672cc7b30d202a626f3af74a0db897363f96227bc0cfab0ea89ebe3bfc38cdfed9dfe5eacb10d62
+EBUILD baselayout-2.6-r1.ebuild 9546 BLAKE2B fa62f6bb4ac1dda9b4eb2b321a84a146af5975dbf66012d204ee7609b6d68862177f2f1648016f2168b33ff788564c2a650f3dd93c73df8bf570c1aa8a08dd00 SHA512 d3085ff548184ecd8c5302252a8c002dda77a1e60e874ce0d518636dfed60fa57a79820d1fb2eab83bde5528f93696128d1f0769355b463ca137860eb8000245
 EBUILD baselayout-9999.ebuild 9554 BLAKE2B 7ecb4fd167c0633379b69480a33fe068ffbf096b860f65b15210c3d20a3ad642f7f99c4949c243c63c4a7b3e77fd764a61e8bb2cfe0e70e3388c0caeea30871b SHA512 68722948665e4eaf90f808c9a768611fddc8dd689d9e7e74fca587108b787f1e2ac0669cbf6b3b04fa8752ef28a151110dee0dc1ae88f627bc9bac64a6ad6309
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index d6f3e81d5ed6..fc42f2d3ae7f 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="build kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/baselayout/baselayout-2.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
index 13b67445cdf8..6398d236aca7 100644
--- a/sys-apps/baselayout/baselayout-2.6-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 9ff4dc39da7d..cd9c7f91f540 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,5 +1,4 @@
-DIST bolt-0.7.tar.gz 188158 BLAKE2B c51588ed746fd2aef15c79c278efe73e78ed8a029d2234b7a6ce717a6a3287ad0e9db82f93661c552a6a35c76a0e16a2712681f45e53f876b3b4f5bd839005b3 SHA512 6786f701501cc2680fac52cda7cdfe37971044abcf058b5c83bfa9f1d0a0381ba00e3377cfc97fcccf53760a2eafc1f8f6d0754f0e121d94201711ad8e40a135
 DIST bolt-0.8.tar.gz 219317 BLAKE2B 9d76f3630d7f690c96447a894e54095deb7a19e46f2b02d7fbd9e584376d6b1a19391007a3a80e293adc8c9de6470279b587807d08006bbc12c7179bf0501e40 SHA512 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09
-EBUILD bolt-0.7.ebuild 908 BLAKE2B fb4535d186c3aa48a7caf760bf56ef767748c054275aeaf69b3e2ef482f1de9679786395948057ae2239bb69de2ebbacd4947e2ef6f00e5d7984277b8003437e SHA512 4f32f424fb48ea8189183d668cd9bca8759b58621282251b4dd4f86808131baf6ee8b311ec4ad5da3eb50533e99b824b2c281226b608092e24dd5d765302721a
-EBUILD bolt-0.8.ebuild 871 BLAKE2B cb0ddd4398f5a8d89404bf168e43be42000edc5b80a6fb1a80a56998d0fa91cc205e4f17ce18c7eac54cbd9cdf98814fa0fdc64f8d2eb3e90d8f07dd769a0580 SHA512 d085c3490f3c91dc42a768a41990824edb7d02b80cb1f53b0035d4b06136cea7c56ffd4734ebf81c64df31b02a9045c52cbdc968f18353564bb32b02c1758c60
+DIST bolt-210.patch 694 BLAKE2B 237d314aa8e4b1ed92931b5cef3079c23a55eca0cbb15038a92acf49b6563152229ff2bca8b9e30088d24a2ffb6c206dac5f3d73b69531182f0639675af36d56 SHA512 307b7c7efc18d2a22311e15e314604bd7d9721b18dfb8a3bab0e1147c3109c65313c3f7fe788431e64e6b26796b8a1da7f1963f9c2cdd8199d0f54349c2f60ce
+EBUILD bolt-0.8-r1.ebuild 999 BLAKE2B 1c67f404f47f62bec7fc7b81b0fed9d62a880dff8963188c18a64bc75596651dd4784f93a5f1cb92eb84002c5cd5c1a7a19cc6988664d77839d382d00e910e3c SHA512 969effe6e06e69aa02b05cd327acd36255b9e2611cdad93d61831d0e85c187f7afe5cd9b9ac73930910b6d74555cec2a36080e4ae6bb0b307ea3e82140d1ebf7
 MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.7.ebuild b/sys-apps/bolt/bolt-0.7.ebuild
deleted file mode 100644
index 28823c01d33e..000000000000
--- a/sys-apps/bolt/bolt-0.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson systemd
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3."
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.50.0:2
-	dev-util/glib-utils
-	virtual/libudev
-	virtual/udev
-	dev-util/umockdev
-	sys-auth/polkit[introspection]
-	systemd? ( sys-apps/systemd:0= )
-	doc? ( app-text/asciidoc )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-Dman=$(usex doc true false)
-		--sysconfdir=/etc
-		--localstatedir=/var
-		--sharedstatedir=/var/lib
-		-Dsystemd=$(usex systemd true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	keepdir /var/lib/boltd
-}
diff --git a/sys-apps/bolt/bolt-0.8.ebuild b/sys-apps/bolt/bolt-0.8-r1.ebuild
index 7adce26d5ac7..816710f173b7 100644
--- a/sys-apps/bolt/bolt-0.8.ebuild
+++ b/sys-apps/bolt/bolt-0.8-r1.ebuild
@@ -5,9 +5,10 @@ EAPI=6
 
 inherit meson systemd
 
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3."
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
 HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz
+	https://gitlab.freedesktop.org/bolt/bolt/merge_requests/210.patch -> ${PN}-210.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -25,6 +26,10 @@ DEPEND="
 	doc? ( app-text/asciidoc )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${DISTDIR}/${PN}-210.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dman=$(usex doc true false)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index d1ff0ce4bd89..ed93ca1d04dd 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -15,7 +15,7 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.30.1.tar.bz2 7793781 BLAKE2B 429f6bd48cb6ede81f956d450cf05b799dce9dbd61593b6dd787f353c2de3734d576ddfec644fa5ab6c61895400c32e3cb28c939b06eaa33eef105c8f8f13d8f SHA512 c18b3d06356d4708b4b0e89d23500d2fe494da9f6aac09c0c19a2e5145ba2bfe8261088eae6562c900996b50c5a9c20459f908069267898c8f86fe3b0b7bd80b
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
-EBUILD busybox-1.30.1.ebuild 9429 BLAKE2B 2834009dcabca4e276462f7d0e8ddce1ef1d830e26218e7608b2506b108b88b5e5bf4ec74da93c6ac3ab97893d432bdc306ce9df809ce0d0c57c7a496f9d4bda SHA512 18c3eaac9e243af3a7ca82018ea6976136b1635b57f6d698a1d8b6303c6f68e8800638b95614abb7f73b30ae3b60214872c2395049f586ea5b9ead18e9c5bf79
+EBUILD busybox-1.30.1.ebuild 9430 BLAKE2B 9b0236c6078d0cb43f6e5e440c4f4a65fafaaeff777a638063cd854434a5586bd926eb7d70536dc6606f179caab9283acf5b5d590202d4c6c4dc30635fdd51a6 SHA512 91f9db9eb2ad6d12b10830928daa15334059fdbc8248dc360aaaccd419bee992e5a0b14a8c8b7cfe1ab60260a30d7e128b8b0ed89c8e863f7041dba499fd097d
 EBUILD busybox-1.31.1.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
 EBUILD busybox-9999.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.30.1.ebuild b/sys-apps/busybox/busybox-1.30.1.ebuild
index 85ab3f4a8240..05c5a4664615 100644
--- a/sys-apps/busybox/busybox-1.30.1.ebuild
+++ b/sys-apps/busybox/busybox-1.30.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 4f37cfbe05ab..3b0d1383dc91 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -6,11 +6,11 @@ DIST collectl-4.1.3.src.tar.gz 634862 BLAKE2B a76fe50a9c26c5e25d951a4efceceb6474
 DIST collectl-4.2.0.src.tar.gz 634317 BLAKE2B 2c6f34dbc5ddc6616c5eb2a917d5c20dba10c9a600bb08a2cfeb6fc01ed7d916423d4fd1e1fdb7447f53c76a0fddc46087296ece671ca401e60a0c6c042dc20f SHA512 a0c3fd393a3fd3e34a838be26ebe4f111d5b62016d6c319cc556af93bec42672bd700c30c1b9a877fce049b0c11a6fbaf70c4c140ecf8f854408849a6d3a7855
 DIST collectl-4.3.0.src.tar.gz 634357 BLAKE2B 1e5e500d8c7b06e9d6262a599700d2b2104eea18c0fd57e36a493eb8c6c56e3701b73bbb60a1b5c12cd14cd7bced1730db737109da5d07bab73290a9fa5e818e SHA512 bc1cf9f36748ca496599bc52b3fe786fda44459b17b7410c96588ca28fe24529f51534318f62915da276a23085c33947abbe3ece479ba76a86ba7e0317587879
 DIST collectl-4.3.1.src.tar.gz 620693 BLAKE2B bcf8c41e0f6b51daa32fa9752dfd603230321718de190a8a9d71bf71e2c5f65e3b170bc85fbdcc78d2ab131bf5a5bfdfebf49225151ecf2cc444d2ca4ef0faaf SHA512 6f2df8a3da37f7ccb9d7f34a20e63b0601e5da7126bb3a9a11af7ee4959b682d59f44a1885bfb5882410e9de0191093ea4d5d43c8f2fa0f0904fd2ca4a3c5a90
-EBUILD collectl-3.7.4.ebuild 882 BLAKE2B e63145c55030cfef3971416563849a9f161f0a47f1ac55589ec6a43d7bcc6cf21598252ab07fc2823f5b052162d51bf19c34cf86a540bf6c284351e9e4e2a74a SHA512 2b09dbe7cc358fece6f20d00bef7ed391e0ae6b94ccd6b018dce3c04b7e3c62c7058adcc5dd4fb634a65c536d5b9c26cbdf201e66edcb515328c83f767430814
+EBUILD collectl-3.7.4.ebuild 883 BLAKE2B 70df5c4d318566d59deae0a5bb7ba2681a17c38f419ed9817777c31c722247ee8b2f5b4ac2a29a4f13cdf0ddb4efef92e40a106811a1f013f5059b52822b9991 SHA512 ccc74cd18cdd57a681414384005b2937b0d380f65656c4ce022b493e2f7d9ee26ad3b59aa5abff2e9b62fcb2a67bf532312d748a30cddd55ffa8fbcb3b7adee9
 EBUILD collectl-4.0.5.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
 EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
 EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b
 EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
 EBUILD collectl-4.3.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
-EBUILD collectl-4.3.1.ebuild 836 BLAKE2B d95a4cdfce78f2b12542ae7823e27cc1d6d629e410257139204bab6596aa0cfd74709e54165880094b845765985ba80ccd769254867f721f53d5cf7e00a442da SHA512 739ab62d85b653455478e188ef7925010158049ca3ec99d7ed8a90da07178a7023f29e358ed1d89fdb205a0f22548b3ebe73a19ba2dc2df355c89b4f18165cff
+EBUILD collectl-4.3.1.ebuild 837 BLAKE2B 4704911d0272ea031ceaa98f6df495f589c7855842ace07d41e83a26e36ae15e0210cddfae0ccd7147693689d40c0eae41deaff2318fe26aaeea03a65a9a1c99 SHA512 ebeba1e9e77431b0f20360876d185f68c98138c380ee8c8de3824628cf3a9a93f5ead204df1ab316a39b58fa56e663c6de0d2fffa1489fc1791a40af653f41a1
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-3.7.4.ebuild b/sys-apps/collectl/collectl-3.7.4.ebuild
index be2c0c2b45ba..11b4890af555 100644
--- a/sys-apps/collectl/collectl-3.7.4.ebuild
+++ b/sys-apps/collectl/collectl-3.7.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 x86"
+KEYWORDS="~alpha amd64 ia64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8.8
diff --git a/sys-apps/collectl/collectl-4.3.1.ebuild b/sys-apps/collectl/collectl-4.3.1.ebuild
index c566f12e7863..9b58e8568516 100644
--- a/sys-apps/collectl/collectl-4.3.1.ebuild
+++ b/sys-apps/collectl/collectl-4.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 x86"
+KEYWORDS="~alpha amd64 ia64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8.8
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index b0d1c73b14e4..0eeb8ad56585 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,7 +1,7 @@
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
-EBUILD coreutils-8.30.ebuild 6163 BLAKE2B ce6b33773b09ed7751ed748bee42366031ad3ac50c95fd618bdadb8331dd815401f5485c2daadd8fc39dcb31d55375336290367a19a867de5e75fd6975e76532 SHA512 94fe07e1246f9babdf0d6b54e91aeee4568bc50a9a00897ebe0b54026086c3747258caa08936f28a4cc7b22b25ec14656e8dbb7ea945b64db286c67524abc7aa
+EBUILD coreutils-8.30.ebuild 6164 BLAKE2B 2489d3826cbc9735633513a265120eea113e4f591a0aa428c8bdd84648f58a0b0de1a3281144eae7983bb82e90264edc7b7516656c239c0631e19c6c782d5b68 SHA512 be61a68021956b88bf103be7b396f979e28f40eab9516e704e42946dcc4b693f72d6fa6da3c8f6445c1868cfb5d0d670195e216f1cd97be5a0736d91d5b3f9d2
 EBUILD coreutils-8.31-r1.ebuild 5712 BLAKE2B 9fa751739c527648f58efbfda15a2af81c7308e73c09ef1683561c90c6504f0c624ead9b7119f4d5e1083f3eb44a86927c04f974a41ee90a8c6555f310bfa732 SHA512 9be4ba703aa70d0a6779ace0fdf55080c689dd54528974066a97e0edf7580a304927ac47b0bf938da3c876261b2691cc8dd4922027f95cf238e1165b45a14d09
 EBUILD coreutils-8.31.ebuild 6181 BLAKE2B ab3e5469399458f81d1176841358c8d0061abaf4c15faa8a912c43701aed540352b192986cffede61d2409c1bf934e1b7ee2c3f92d20cb1e9664fe73c7799250 SHA512 49304878ecd4b9402c5316c2da4eeac7847adbe06dfe052403bd3e17195032f71ee3c3571401e6a0f40ba8da636ce93ed90c1af834eab3ddcb29721f6bb81063
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index 0f5e13380cb3..91ea2d3a06db 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index b5c215895c59..9bc5e4d12504 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,5 +1,8 @@
 AUX cpuid-20180519-add-spec-ctrl-output.patch 516 BLAKE2B f6c3a5c42afe5a97fd3712a9168b3d883614919a3e00c0bb671275b5227b9a4aebb8185fc27ccdfc3588db412a1234b0962987deb559c70a24afae580d04c49a SHA512 0e14946bf58eb009b65a8b849353b3940f8a13cb0a8ee1d53006b1e36e846785bad1bdeaab35e56b26faf08f5b8d81cf279cbc0de88fc5f13cb8471e8554c96a
 AUX cpuid-20180519-makefile.patch 1618 BLAKE2B ee25815c8f60b77b0e8866100d90767416414ef07e818892e4c552741bb0001b040c2e6ccdbb470fc7eefaa5f428f611d9d8feb03675d91ec603c6794e0262b5 SHA512 272391a70c4b6b31769f6ae4c4c39b942fd0fc7130729c93abd977a5d82f655e3e7513747fdf4abb238bd1ddebb11eb7925e8ebbed393a0704ad9bbef52b6da4
+AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
+DIST cpuid-20200203.src.tar.gz 113144 BLAKE2B fea8a51559e77bac779cda096e694992090d5b6e4f6efbee3b67f66727267028da062c317ca045155b668292c5f3f6c2d027a59f74d27f138c8ebb529f8df820 SHA512 ae80275fba522688161d08b58d4df6437bad66853a7fce9591b5ca10ecd649ce712616f46d6c9f47a36ff3a1f09c65a10dc70fb409bc58c5e30ae413cfd92aa0
 EBUILD cpuid-20180519.ebuild 640 BLAKE2B c4800406ac7f031a9206013f968a945a5625a53523b9abe577d76189dd5cb4e2dff85f77af7142594c49fdd35c51450f4c65c806c11c05578f3393dfe419458e SHA512 ac7f070dc1f1df53607a705d193897312af921b61a3d9358420996ecbc112e0ecf533d3d11ecce5bbb247b1d9090d0592dcf2bf22031e86ba624e490913a9469
+EBUILD cpuid-20200203.ebuild 594 BLAKE2B f391a3db08514209d90a19d9d6a3b54bc2928fc7241c14da550577bc6382c0cdb8c33f00f98c4f9aace9232e48cd16af108ab8c2d30a27bc1fcf631035218864 SHA512 b3ab37445b5b638abb3548d4eab3c5194650a03c73a04085f2a503e8d184728977c57eee529ca9d23c99d4575c4b325a3a833fd3c92fa8a3bef250a79f8ac9da
 MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20200203.ebuild b/sys-apps/cpuid/cpuid-20200203.ebuild
new file mode 100644
index 000000000000..60a214f3c409
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20200203.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-lang/perl"
+DEPEND="app-arch/gzip"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}
diff --git a/sys-apps/cpuid/files/cpuid-20200203-makefile.patch b/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
new file mode 100644
index 000000000000..9cfad5ef594d
--- /dev/null
+++ b/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
@@ -0,0 +1,37 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,11 @@
+-CFLAGS+=-g
++CFLAGS+=
+ CPPFLAGS?=
+ LDFLAGS?=
+ ifneq (,$(findstring arch=i386,$(CFLAGS)))
+ CISA=-m32
+ endif
+ CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -W -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wimplicit-fallthrough -Wunused-parameter -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
+-INSTALL_STRIP=-s
++INSTALL_STRIP=
+ 
+ PACKAGE=cpuid
+ VERSION=20200203
+@@ -40,7 +40,7 @@
+ 
+ BUILDROOT=
+ 
+-default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
++default: $(PROG) cpuinfo2cpuid
+ 
+ $(PROG): cpuid.c Makefile
+ 	$(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
+@@ -56,9 +56,9 @@
+ 
+ install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
+ 	install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
+-	install -D -m 444 $(PROG).man.gz       $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
++	install -D -m 444 $(PROG).man       $(BUILDROOT)/usr/share/man/man1/$(PROG).1
+ 	install -D -m 755 cpuinfo2cpuid        $(BUILDROOT)/usr/bin/cpuinfo2cpuid
+-	install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
++	install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1
+ 
+ clean:
+ 	rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index d83483dda9b5..9784f91ad3a6 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,3 +1,3 @@
 DIST cracklib-words-2.9.6.gz 5536645 BLAKE2B b0ac23e8777cb094cec565e9728ca8dd37359cd19c2e2d4cd215635f462e464fb27fc5a9e560895804df4e519c465845b381a8cd47fb4d6f9b9c62109ff661e6 SHA512 fc5bbe7699c9c9e3f39f5c82f53ec8a4ea85e08d5513188a2f6423f92779008b87d85cfcf87a9a5d13a49b04c30f73890cd4d3fa7cd4a6bdac5c1ebc18e18bc3
-EBUILD cracklib-words-2.9.6.ebuild 699 BLAKE2B d33013460d2e82f9149034a81e8f41dda140c14e78b6f07a44b0c9fbea2948a1dc79840b4400bab5372ccb8cecef97328a46a019a7b94f8a000e855bcdebb187 SHA512 1df1e1fb326654cfc966d57bd27176cbddd4b1614cfba4aafc69e3b5a55c2d94f70d9fe6b0226415f6954fdb8c5830440d720e57c3be3638d12bf6a2c32e04b3
+EBUILD cracklib-words-2.9.6.ebuild 700 BLAKE2B ecd17f6d5e67a0e8d50328bae6d188d219348c1924471ecad4c5ecba745878fbf4dbcfc56368d8b4341b205290081659a535d913228cdc440abdca12c084c469 SHA512 e848c6d5e5ea36bbbeaab9d7b8e2705f2fe91f52158938c0d38be3595bb0ba1943858b0a95c7a0398f2b5b6a657c6f7f0b594b73c06fec94608524b236c4c68c
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
index bfc1135e37e6..f77e017355cb 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/cracklib/cracklib/releases/download/${P/-words}/${P}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest
index 3df2ec52b2c0..b2d9246a4687 100644
--- a/sys-apps/daisydog/Manifest
+++ b/sys-apps/daisydog/Manifest
@@ -1,5 +1,5 @@
 AUX daisydog.conf.d 115 BLAKE2B 55fa6089b54a2f5b4b56a5957020d6bab3dea492551bc84170d1cedbb17cba7e8063de08bee7d18cfa39388097073193b824a68c2b8e9f51c5d52b12c84074f8 SHA512 81d9f238f4240d452e6316e0a94c489fc88eb3c8fe189958292a02dd0ce669bf957e614cd2864b7ccada8a174c94c6ee1cda7216e4fe96582a5cc266657710ea
 AUX daisydog.init.d 359 BLAKE2B 3509768ccd75d680f15e1b9487ec4714bf40ef1f6c19d92e78e53fccc0da1546dade7b3f8b3db4d1426433e482f85fc960f9c64cbedfa3cb32a370f220c8b563 SHA512 ecb063e6fec9a463ac03977ac1a1d4f8ddb2864c6bd3ed3f041af70a797ca7bd3134c45aab99d42c136ffca4f00ce87f55df1fd42826fa92c1da75264d4389b1
 DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5
-EBUILD daisydog-2014.05.30.ebuild 880 BLAKE2B 1de2361a4ce4b7dd5cb6638f4d98b899589640e45869017d3f9d8f3b062b745068ae458642a3555253df60266e9fe5961b19b55880c3a46b57d4d68d3e38cf54 SHA512 e80fe4a3279d88f78c00b779af7e7b361ba531e2061b7ba85d4e4f8aa0d478c068455d1f29ba120d69527305d3e39fe0507c3d8fdd7fe4a99c9f6d30307868b7
+EBUILD daisydog-2014.05.30.ebuild 881 BLAKE2B a25b632c4eb6afee0730c6e64714042f9ebd5ea4edd9145f354259890c8397d356d93644b46413426b28ae793ab4971734c847651587f3cbd1be89481d09901b SHA512 af5b8c368cdc9f88eb272aea1f66f979211eb3e8d24d96586377ed994034bd7b166faa7259f637742e2f709de54076b9745167bcb650007e2bd0e3c3460e8835
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/sys-apps/daisydog/daisydog-2014.05.30.ebuild b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
index 610bfeb4ebef..50b079a51f98 100644
--- a/sys-apps/daisydog/daisydog-2014.05.30.ebuild
+++ b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static"
 
 S=${WORKDIR}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 3faf32019d21..4844601aa2d3 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,5 +4,5 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
-EBUILD dbus-1.12.16.ebuild 7340 BLAKE2B 18cbe78a7964a37ed3c63329a2f5226a57a2dbb8038e411baf93de9498b17c1112a934b157e02b60542a9f0c3162b2afddda08fb79a53c8a2833e069091dd717 SHA512 2773dee02e1ab776821acdd071c7af597553088e7cb69e5fded93968743ecbc5f73e3d781f68bcc55b57814bfcdd85ffc7438819f7dbbb244fee8c89506dc17f
+EBUILD dbus-1.12.16.ebuild 7341 BLAKE2B 5ac2af986f670ac5cf346c5e68c3ed325a7f42445929f12f64ce3196690874bcae97ea2e9e43a8bad0440665d24d599a0bd4dd6eaacc3c37eeba0907096702ad SHA512 976de486813d080bb8a7af39347e426313f93498d1a759922ad33c6a6a9ded6f57d826c13541ed6b279d862ee272fc364e0e7fdaf6c51548f548d76246f2505d
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
index 1813c1449ba8..4ae10f92cbd0 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 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 ~x64-macos ~x86-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 72257d52060c..90cf276aace5 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,5 +1,7 @@
 DIST dcfldd-1.3.4-1.tar.gz 163141 BLAKE2B 99954c674907196020dc1eff86103122897accdf0ff20ea0e6d5582d7fb87e4bcebfd12bf774f47e402853240896bbd536500c79ae6e7b478a3611171745dcc3 SHA512 04b53adf62c6b468ff816e2cd94cf360eb5315eb980e2aa7d71afae706ec9c4683430269e82d712608be265710907fdaaa1316e4f734b7481ee9395a37926c7a
 DIST dcfldd-1.5.tar.gz 81661 BLAKE2B c1037c8948bfa78704279b438f4604c8b6383d3840947c0e8e0a3ea52ba2b96fe0958b38e700675be97ec2bcee4fb6290f94a847476e3536fdd2790891d02cc9 SHA512 4c91211bf10fec409abe930fe67ae73ebfa67b5a29263cc2b5de7bc42df51f4c7d0647261e31bdad96b591f947c2f0e951004befe296fc37957ce5b56756debd
+DIST dcfldd-1.6.tar.gz 81795 BLAKE2B e4e09fd2f3720bb4a1ecff3427bbdda832d2c82cbc1dd95ef884fa3b10a02707d6eaa6302c86518d124eaff5669ecd4d5bbe8b207bb1bb70f7fdb1c88ee8ecae SHA512 893bb4920d86749fd01e877239ddbb3e85e73f6b305c8cd6e9a38135fec1f8c14dc748f5761a3630e83299769284c55a80afc93f3c9981cd8b4e19d4506a8c08
 EBUILD dcfldd-1.3.4.1-r1.ebuild 388 BLAKE2B 25a759b95addbfee2fa6417aac011fa5359a04b9ffb1b6ff71722f1aa9019d823d9b0a8036d3f7ea3e45863c9e4f43b0acec4ad6e9eef894be434104c5138cab SHA512 28a07c933cce37cdedabefcfc14acac0d07518de54821959b065d007a1b591f69cd58484eeabc9d760812b9a8592061945b50943f0602671551a8bc5a89e36d9
 EBUILD dcfldd-1.5.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
+EBUILD dcfldd-1.6.ebuild 504 BLAKE2B 3b17a606b7555244a44125ebb674ce6f1c75fcac178253f7abc157259caaf2363da837af24dd10907131ec64b2be81f818ece7ce164849ef4f9d090c64acb2a9 SHA512 21b29554f8952d1519a1d11b154825cca8632ee9b284b7bfb02533b66a7c244e7df84b4dd2e6ca204d66f8856d72d85c6c42320234331d3804096e9bd40609fe
 MISC metadata.xml 243 BLAKE2B f8089442435627fe2c9fe0a53eb8637e58f37e443e0a12f8a62a96fff8bfabe3ce5d8744c4e54fc3dabe665ad2cadc2fe45cb6fd622cd5a5985767728651feee SHA512 8bec7ef7efabb34196784b71ed7c96e2c2e604665ab3ae6ce6f41e6b719e7b8fc4579e2ec6effce2181017d12784651019f5464623dfbc4f0c9b0437c2bae182
diff --git a/sys-apps/dcfldd/dcfldd-1.6.ebuild b/sys-apps/dcfldd/dcfldd-1.6.ebuild
new file mode 100644
index 000000000000..83b8567efac5
--- /dev/null
+++ b/sys-apps/dcfldd/dcfldd-1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="enhanced dd with features for forensics and security"
+HOMEPAGE="http://dcfldd.sourceforge.net/"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	ChangeLog
+	NEWS
+	README.md
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 30b6b488a982..70a4695885e5 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,7 +3,7 @@ DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec090
 DIST debianutils_4.8.6.3.tar.xz 156672 BLAKE2B bb87e04ca80a04c8841f04c877acedb0b953d815193069bb601d17907101bb6faf11bea99251a13a7c3b9ea6fa5d27daba264ea6924e542d9b574c87b3ffbebe SHA512 c38d1d351de69f270924f05755501d90cb7245c8a3154f91ea8e38978052ffe2ec016d4400c55e2f7d31358cfe134a40c5843a33836900d7e69cce9ee8ace98e
 DIST debianutils_4.9.1.tar.xz 157516 BLAKE2B b2c8927e37448f4e45f19b4a7d2977198d2c610a203a2c8692a0592c8c8319c5dc42050b83435cb7381e30cc653911083b76717a53ac908113cc7388a4155167 SHA512 b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1
 DIST debianutils_4.9.tar.xz 157104 BLAKE2B 885f37b17eba7d20b2d76a0fb1afc6ccc2d9d4926754b9ce15928f3675eba4a38fec2e9b718d61684122f3c0dc17eba0aa06677e41ac641870ffc87442353951 SHA512 4e8726cf5744dca144535883c473a04884714afd50e501a140197fee9a9a78bd9596fcc1763e71b2baf6367bc38a8111016ab5ed35f4d4e98ccc78be697ca963
-EBUILD debianutils-4.8.3.ebuild 913 BLAKE2B e0549e48cdb31b2b1b12b03b6462aedcc5a8f31b380528781dc9ed4b81af87444436b4af6a33e5277dcefcdde2e0a2330ce46257f7680d20f70c6d86b37efdc5 SHA512 bfbca6bfdfc573d9a7845986c9df41023b198d4a18924e393055cf261daee2097d244239b5433b4ea9002e2ccc9a581b096e42706d36a147c05c99c6c27d9fd7
+EBUILD debianutils-4.8.3.ebuild 914 BLAKE2B 5daaaba136482f0598bd12757259ead5e6d3704c8c077eed28360b42276dd7df1c70c6ffc678757618ef8b8b36401e66fef156e042c7bfb46d0837602999e6b4 SHA512 515ce2878d037121571e06aa8617c953de10fe6b802b373ce1ac707568dde5d728d6af267541b6e3c73057be70404da25a920063a61ae4cbbc10be0b66cbc8b5
 EBUILD debianutils-4.8.6.3.ebuild 910 BLAKE2B f970cfd3eb80c408487267b30546519495a55d9235a425b6515e77106c23cb993fa57846c7c255490b386e79ea64338d69cb943c1da4a3caf77517d359bac13a SHA512 8a31f8442f6bd38b0a2826c031d72d79df22e3a9b5228e71deae5495eed27895284e751ec322e5492a79db081bb487253985306a0593b86061ec5bb0297480f4
 EBUILD debianutils-4.9.1.ebuild 898 BLAKE2B 4bfa4e9ffdd8553d61774d73fe19a06c4d29e073ab3e907a92ff93eabbf8290187241eb788ddcc91c97f27c2151ba2361a4284579b70f70c6f2f1c5e89473ea0 SHA512 d5c25f98f3c07c757285d34f869a9057b487d1aa070768cde2289ede5e05dfcb54687f6b3e91552861263854ea0a2b58d5babe4265af56f71ef2ef56485bebce
 EBUILD debianutils-4.9.ebuild 910 BLAKE2B f970cfd3eb80c408487267b30546519495a55d9235a425b6515e77106c23cb993fa57846c7c255490b386e79ea64338d69cb943c1da4a3caf77517d359bac13a SHA512 8a31f8442f6bd38b0a2826c031d72d79df22e3a9b5228e71deae5495eed27895284e751ec322e5492a79db081bb487253985306a0593b86061ec5bb0297480f4
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
index daae48911a22..41bea6dd9af3 100644
--- a/sys-apps/debianutils/debianutils-4.8.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE="kernel_linux static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index e1baa68e1fcf..18141beace0f 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,5 +1,5 @@
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
-EBUILD diffutils-3.6-r1.ebuild 1220 BLAKE2B 7cecb0a7d2cea5fcaeb213a08730804504abc7da83549ae4f1c4e2b5d192f914da28e15343f1b287621d95bcdcc8fcc951afbb280a799ccb5fd42ce739be4b08 SHA512 ef2450f38df462143cdcdecf1b633bab8f21c48978d69b005141a78ca3ac2b0e666c86cfbd4322d8e1e5c764bbfc15c2e5f21a0f8c02ec20683e0a230f1c40cf
+EBUILD diffutils-3.6-r1.ebuild 1221 BLAKE2B ab222d45cc3ff33746226833f3038afe4a087f493033ba17dc8b0a495453c15e34615d61e8945345ace2adcd2b7bfb2327faaafbe5bad111a399fc7d98554bf4 SHA512 dbee2416937ceb68b5626cc92cedb975e0f9113f032b4774bbf7804c27473d01a75b0af309f070e535679a56baef15bed064f4adf9f8f83a07ef4a3eb7d6e8f8
 EBUILD diffutils-3.7.ebuild 1233 BLAKE2B 1f885c4e61677384b9261e78336883e84dfdd71c162ff87b41d863f5ba7e8a3bcaf8f0b6edef4d97e12bf3bf9c8987b093933cd520bb29a1a88a65f0524be3a9 SHA512 c19966933b4bd073004f1cdc5cd5b3476b881e76ec2362cce1b33e83e4306b00c4ec931b22e348e3af5034c7297c9e89aa20cecaf9afd2ec442649c768b8cdb3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index 709859582ce9..f658b523fa34 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index fc3fcc9f65b9..7dad621dc3be 100644
--- a/sys-apps/dmapi/Manifest
+++ b/sys-apps/dmapi/Manifest
@@ -1,4 +1,4 @@
 AUX dmapi-2.2.12-headers.patch 354 BLAKE2B 83a2e4de5882c30a1ead955768c8033099c461ee955fba2021808a288e552ab0c97f3b13198270e367cc7c2e035094a631c7bd1b1454b13c82b9d0b1737c15cd SHA512 b087227085d3e068323f2a01c1c7044e1885e47b04caa1050e8552ced50dddfab871608bdf67a027989c359f2852cbcedcffeb6708e182d6d5dc3bfc9609489e
 DIST dmapi-2.2.12.tar.gz 367318 BLAKE2B 7d74f3081f8430c43d3ea961bd4ad2743a3ab65a016b0653a68074353ed60fa0c1a01a77aa470326aa1b10e731a5058355ab887cae00d21196958563ae6c4ee8 SHA512 aa44c0c7857158fed198deb9d1e00abaab549e3c22a7ce0e24e6088146bde56ecf967405b1b61a589460981ddcfaffbb1e9a2e677088efec317e3a7cb44abe4f
-EBUILD dmapi-2.2.12-r1.ebuild 1091 BLAKE2B 6f5c07d274787bafcccc1040f2d57a7fd276c8da552c7adc47c374e4e9af26595942809b0b37ff1df08cd5b74f280b4e68be3a360edb304c967cdf1702908ad8 SHA512 390f5cee8d52cb3be8dc47f78935710961ccbe453a4427c13e7b76366b75134f6cb69bd4ac81daffdd9394764a9c4cecfc486a9e0521361e62ed964fc7043c6d
+EBUILD dmapi-2.2.12-r1.ebuild 1092 BLAKE2B bb6d9e2256d8cbb134ebb696c0a385b12a9fda57b854af85e686b4b1960359081fcc4d79b0b5717672708123373f8c5e016958d35e082951afa79c15b8a40362 SHA512 9b8beda92e29b0edc6ab8a7d4af488070aaef3c6654801d6e15f1cd554854dbe4295cb2852f5cef95ea2f3783adf838808a9d37df4559a9ebed00442c62cd286
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
index db8656744f24..3680fae9de14 100644
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="sys-fs/xfsprogs"
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 1e0eec0fcb54..dd461c51d727 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,5 @@
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
 DIST dmidecode-3.2.tar.xz 54440 BLAKE2B ff5b891b28231bc50657e6fe1fa1345171109ce9baf7fa4558ced482a0616be4206ef69dcf3909611475d543b12691cc2bfe4849d8e3d35b34d1bfffe600af21 SHA512 b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18
 EBUILD dmidecode-3.1.ebuild 1122 BLAKE2B 7deae46bbf6f486c4fd669ed863cd67eea593246ef7952aef7f4eca78451c956491cc772f6eca5d6025d7a90ab22ed780e4b888b5c9f950cd0065fe67f34baf7 SHA512 46e617bc545361696347f9716e2b5a15b741116db4264f0f8cb9b6752626b8f17cd9f7a7f57f644a63b70011ad7ed86bd03ea82507e42dc3809ff0a6c5abd247
-EBUILD dmidecode-3.2.ebuild 1133 BLAKE2B 583a967364119959b112305def471eaae548504800e197f3b12e2a2c95cadeabde5edf9e5464f8508f71fe40bf9fbad19b19deae20ef3e23b1ac86d55b3b950d SHA512 49060eeace4c38045453a73cd3fd9189f8b725ab451515e4742abf3d25f436227b03940703710760700c6eddbc9abe38fb1544bb4967e157952d63e84bb6bfd1
+EBUILD dmidecode-3.2.ebuild 1134 BLAKE2B 085606756e1d1981e91fddb905fac5e231bd4c34b081804d6e931c37538f7a87ac1fc5f157b5074ea359b049f6ea869084b2ad6848c46741c751833f3a4c81a9 SHA512 90fac383b5b8b4dc4ac35fe1a5b7051f9591be8e9ef906990fdd8da4addfba69ed025e3d876e535df2f5d7f019f03b599adb32ad26179771eec3d0e3c6680c2f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.2.ebuild b/sys-apps/dmidecode/dmidecode-3.2.ebuild
index 9272411e6a1a..15b75eefd411 100644
--- a/sys-apps/dmidecode/dmidecode-3.2.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="-* ~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest
index e337f7b043b8..98bef59202e1 100644
--- a/sys-apps/dog/Manifest
+++ b/sys-apps/dog/Manifest
@@ -3,5 +3,5 @@ AUX dog-1.7-64bit-goodness.patch 773 BLAKE2B a8fc3e4eae20f3da5d948f4c2d888c7d5fc
 AUX dog-1.7-check-ctime.diff 1355 BLAKE2B 0cb2b34eba9e28df58cb9f23daaefcd66ddb55ca6fec9bd12d364489abfd47fb85fc6d9bb0d898226d90e4ec203e28b63292d948682684640c1685fcfd6fc4bb SHA512 8892c0ad357ca53dd00e6402dadd1ce05ae52cf6c8eb9745ef1406ab95bd1357558b94d85e0b8eb3a8de7a209e8be9f9e020cc378804f88b180496b294de8b5b
 AUX dog-1.7-strfry.patch 287 BLAKE2B f4de25adeca6aa533740293f1087b43dced48302a99854878fc5a0acc0cd8b250897894e0e821a5e15f5985d0b12cf498d731f65ba5a7d42b036bb2856c42cd4 SHA512 a00051d4a190c56d08c4cfd2ebc9cf5201dc945043906b9185547b83c478220675a1f99f1fdc6903b0150ae2942868ab951a650ce0104989c702a268077a2513
 DIST dog-1.7.tar.gz 30433 BLAKE2B 0708203c2a18f21185ec3684ff477e7b03b41985ca5a9d56d4ad2b45f8d5496e3c2a7e59b7c968c762f04ec268cc23d40da60957f76358fd9084be4998d7f67e SHA512 852373ba988075a47c60c38da0ff3a344f996e6e149d23e1061d6f8fbb0999f32c975c323944375ba758e5663efa57f62c8ff88d46264f72196ea450eacfa4f5
-EBUILD dog-1.7-r6.ebuild 971 BLAKE2B a5535a002bca457f257abbe897b001e2b3640f5d84dfd8b0a903b09583a0f8e23be6e2b3537388a9ac8dad335fa86fdb1f0b1524ebad22badc4ebb45f6b1354f SHA512 37f2adc853937d5cc8befe60c2a391741ebacbe4ce414127b342cea8e054ecf33e819c8bf2a85d63f356ab764d1132bd29c785b69b83a33a2428216c3d536753
+EBUILD dog-1.7-r6.ebuild 972 BLAKE2B 01f67a0da189f89617f08942bd1b039656578034556f3d454078257878e52b25cb7e2c248ac54829b435d2efdf71fae531ce81f783604a2ac767d494807e5cfe SHA512 e428ed4b0e894f6dc8a10ea17fe03f5112ed0e1f5d73cc082e65bab947757c5de97bd033ada96ca6f6fe55b3167912f9f93143d559754d418ea43d7bd7defddf
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/sys-apps/dog/dog-1.7-r6.ebuild b/sys-apps/dog/dog-1.7-r6.ebuild
index 7b302d7d6f7b..d7c6d5d71883 100644
--- a/sys-apps/dog/dog-1.7-r6.ebuild
+++ b/sys-apps/dog/dog-1.7-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-check-ctime.diff
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index f57d4dac55d0..b996ad4bdadc 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 DIST ed-1.16-rc1.tar.xz 68492 BLAKE2B 8a47c6147203b19954064b07e733719a534f4e5cb8cf5f6b361ca926cb6d55127d70cfa9c176f65eda2988c2b9f9ca2fcf5be27e109f83ccfd38d1927830c76c SHA512 17bc689c1aab357597715e0f2a0c222296e5cd999e04084953ff943e66fa3e7e37dbaffdb706c92daeae625967541cd41b390c4d883f54985ca924691ece78b0
-EBUILD ed-1.15-r1.ebuild 942 BLAKE2B 6dec1af6c4b3b21874740f6fb52492fcf6a981bb6c5838904a886ac4fc7e584104c643ab2477f0274e13f7c4da7084dee78c7529eff2cfad3c6d5b7283af8630 SHA512 e09eb537edc7cc9635b409ce104cfa64f49e45acdfc0d8068ae071cb9314a4cb563be8852eaab04866dee878dee5225bd36b73f4bb82502a880dc1ba49eaad8e
+EBUILD ed-1.15-r1.ebuild 943 BLAKE2B 447102b1081c6843e27ffe96e2a1289754b7a9b32835a8c6c88300f55aa11867be00fc1837cce32cbc71d9323eeb9e963f8b252f206488582b3d82d5dde8d78e SHA512 78feb0daf4460d2441f5463501cafa7b1609c9104551f52048b1e5cc01a8b18a991efe2ff1341d6e8040d67a938db4b8e1df1499690672dd7c73ce330cbe3751
 EBUILD ed-1.16_rc1.ebuild 1032 BLAKE2B 36a3b62efc27129d34fa5305d84e46128f49112a3fe435d2a9142f6737d58ab58352c6f0ee22ef3759c57d0659fe4408d1a01fcb4f4809cf81d2bff1c44f7cd9 SHA512 57274e1af3db76a5065c12acd76bcac07e6b353c56ce5990d6a736a192d6f564097778efdaa9e4f791edc1f797900df21296201e9ccebe72d9f27bc3520fb7b9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.15-r1.ebuild b/sys-apps/ed/ed-1.15-r1.ebuild
index b6fd0d2170a4..c193bec954ac 100644
--- a/sys-apps/ed/ed-1.15-r1.ebuild
+++ b/sys-apps/ed/ed-1.15-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index ab04f17f60fb..17a6861c09fc 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,4 +1,6 @@
 DIST edid-decode-0_pre20191209.tar.gz 57651 BLAKE2B 2a8717547939b7ff25482edc00a158c1cb3ff162b6e450549a274a10b10678fabf20529c9e97a455f6d4bfaf6dcb1db54c38cea3908761432bcd4d15e58271d1 SHA512 8d4c6a15538da1720f0e6c8fc4f9f3f64e6ade0e217a6860016167eb14f752e60bbfe69979f25189979fbc6405b417e8f1a9bf9f2a75a299b4914ce1827b680f
+DIST edid-decode-0_pre20200203.tar.gz 80075 BLAKE2B 8450f7e702dba03a16bd8febe7bd97263d946538ad3bf9bc3d22b76729341b784f02b49d7e2f0e0c86c1d38e79635494e7e3f99d0c56c530a4bbef09408c7e72 SHA512 aad6a0bdb94531e2147c009950be6214c654e0a8dcb381c5154626cb0681b7273163b5422100ffb440b8c4d207affb854bfed33b797d0de6d112d7254a45003e
 EBUILD edid-decode-0_pre20191209.ebuild 688 BLAKE2B d31ea5d6c5a720c5bf49e497ad4c67e55ea680e8a709bcef4f50852064f6804362db50f160ff98c9586d4d6a6f60cddfc469484e7483121bc60000872e6d733c SHA512 8441172b6ff136a915d31affe79ffed15a1a14f904aa253966690d7813790d45311326f1a85b9fb8299963b88a838b8eb985287478d4f27162eee0953f517a3b
+EBUILD edid-decode-0_pre20200203.ebuild 690 BLAKE2B 065956c2377d847a6cdcf9d61878c80259a02662f513f85a70ac18b18b1348601420e5eb32a4e18a2edc6bec2a5d90f20abdeb3ef22b569d908d1ce2ae807a12 SHA512 18724b4c516ea70e32e340c777ab9f3818ece828462851e55389717d632786eb36dbced80ead1ae6f37bf12d636882c92e3b13ec5978a8a281380772e84ea2a9
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
 MISC metadata.xml 646 BLAKE2B 37a3db350195905c7a4b420d0d2d2d4741cca1b3954d42620a9a411696a734702e145bde400c4d68997aedd0de45d418faacb1d132ab385f8454f7f5c0039260 SHA512 95293d61feeeca16b0341a5c5fad464db4fca0d2dcfc9b7f51cb3d2984f3ff4530d2938d80ecdf658fc2c784368166bc5fbd220787de6564938ee2171f1816e2
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20200203.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20200203.ebuild
new file mode 100644
index 000000000000..dcd5ec78591e
--- /dev/null
+++ b/sys-apps/edid-decode/edid-decode-0_pre20200203.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="c29b9433af16d4b31453b000e39bb1ce64aac065"
+MY_P="${PN}-${EGIT_COMMIT}"
+
+DESCRIPTION="Decode EDID data in a human-readable format"
+HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	tc-export CXX
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/edid-decode/examples
+		doins data/*
+	fi
+}
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index 6c49ad8abc13..9fca02fcec1e 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD elfix-0.9.5.ebuild 1127 BLAKE2B 77304b496841a74540cb10daedef9ed538ee2814d0e781dc23962e1c3aca6e556d79aaac59f54b0a91ac22da553c808b7ccf3d4737dcf7e7dd8e0c984a6b0129 SHA512 ae6de33cb4d494b432e7c3ad424f4a3762b68a3c98f94fdd2a512713feaf71855b61fed3b14547c544fccac95c093e03bbe40c1d139d9a34b8c06b5bf4d70ed6
+EBUILD elfix-0.9.5.ebuild 1128 BLAKE2B 74ffeaefa84f98faa4debacbf657b1b7c44f9e3c41a7fa2176df35df4c2f8c9926ea178068e6823ee39ee98938daf9ed3c8042ad1fbeaa4f18e1532a375066c0 SHA512 5ba722cb2b167c7ad30e7792b8bd5994af2c6e1cf3c47762060dc421672216d430a4e3a57b473b4d0308335867b2aab89febd5058f1d90edcb654667731e0406
 EBUILD elfix-9999.ebuild 1137 BLAKE2B bdd63adab9dfcbcef879b4eb35b15168533315f85de4098dc4477c6836615261e7c6a508c987a460c16836590ec26212fec6142b6b7f16985408c335314e8847 SHA512 00f937ff54b0e32255a6e59a3979340d70665b818a363d7c953c8b6aa7d79c6d55731ba23ee8b3e0a3ccb2f32f6eee2993df0879c5c51b60bfd77d740b5439f7
 MISC metadata.xml 496 BLAKE2B a26ee20b4388a77bf12e032c2091b534653874b6f0880775298da89286487d07709511d64e52b0240206d661f8874c55d4d87ce3bdc73e60e9a1432a232cf219 SHA512 b934fa247d4d5bb1d188de8bead5980aba83abe50423dd1e56c534b762b535faa242dbab58021e91bea43951542dc4f5885aff3754cc0957f01e86832bdd2c5e
diff --git a/sys-apps/elfix/elfix-0.9.5.ebuild b/sys-apps/elfix/elfix-0.9.5.ebuild
index c5af80158a39..a0cb53e36f85 100644
--- a/sys-apps/elfix/elfix-0.9.5.ebuild
+++ b/sys-apps/elfix/elfix-0.9.5.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
diff --git a/sys-apps/elivepatch-client/Manifest b/sys-apps/elivepatch-client/Manifest
index a9119d17a032..df43eb597121 100644
--- a/sys-apps/elivepatch-client/Manifest
+++ b/sys-apps/elivepatch-client/Manifest
@@ -1,4 +1,4 @@
 DIST elivepatch-client-0.1.tar.gz 88031 BLAKE2B 6d60bc5539e9c2bd174dc77f34f061f0a351c7ae8026659dcdcab463d2b5fc8dafa35c0ca76ed2e591f6d49c1e58b66766898e7ce774297d053bd6def4378edc SHA512 c2e324f2be6d75ffe4b2f329875f6f81ba3e4657aa1c4e6514188d5269fd68f7d50b7d823281b1bb585804f84fda639931fcd349d168c169f736ee8613f9f451
-EBUILD elivepatch-client-0.1.ebuild 609 BLAKE2B 5b1520592b01e7485d9e68a03cbf8e84b3579fee479e5eb3cc8741543ffe4041e3cc4a8b7921f12fb6f8f43e042f4046a17ddb233b875446a246b98df7fb426f SHA512 254587e75b96720b63f3cf14db834f80f8950c4642a34ab7fa2d49b114e08c1f60879c9aba9b32cfb1b0e7783d900282a75f33ead274421e6e20beec29d7d64e
-EBUILD elivepatch-client-9999.ebuild 731 BLAKE2B 86a07c88b2d06ff23fcf599cd3acbdd8fe2afaad2a7a7e4261153efb13bac1e77f5daf2de6c13c2284fb99ce4ea5143214b03e7c79df61b16a72a84b51c80299 SHA512 09e67505ca166b7d55ea48019953d9d7d4982561e01638fcc3e244942c7cc4a16eb3e56b2ad914db5db49fab36ab7c42a9e2cfa1f9ca3f341bcd94fbefbb2089
+EBUILD elivepatch-client-0.1.ebuild 603 BLAKE2B cac1e7642e2f371da189cd57d26cb410cb126ed14da1612fd3947a3a95bb8718814f1e6d5dd6abeb241b2a566787c57985321405646a724dcde4cb1e6e4fb8b5 SHA512 05ec390184f77c9a8bb41fb30d902d91444cdbb6f243bc058d6920e8d0e322b4a7d53f0ef890f35eed046b8dc396aa7c9aa74b9dc98b1bb76435b9e3a8eb1842
+EBUILD elivepatch-client-9999.ebuild 725 BLAKE2B 0721c2bd3c4331515ae60b438a33c55dfeb35b3b96490fb3a826c0661e4cc961d366d7cabcc3082fb2a5eb4308a8d5b5a94441ffebbf9969c545fa4864999a80 SHA512 a7e25cb7430f48bccf0768bb06c8592bb013ba0dddc04ec727290ea9c1c8832c28ba48a853e7e2d0bd1a80dafd73973713a9f0e9402ed18c01aa5933d7cf61ea
 MISC metadata.xml 311 BLAKE2B e6ea1b04433934bf6df08628f644783f8fd80234e06fc8d1c692dd1ad1ba1c66ce1465c2871291ef7b18dd02e3803fefd31ce1615fc790c22295da47f3b42d88 SHA512 d53e458f4c2a4844c50d65b8c75f18cf637992dbe78b17dcf20a8a0f15113df8b89c197d2f11f6160fcca7db23669db009028deec039cbf32911e966e6210e98
diff --git a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
index 54da6b5385e1..b8302c17b2c9 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
index 0ed53b984fdc..ef9800d25dac 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-server/Manifest b/sys-apps/elivepatch-server/Manifest
index 6f239b03e3b5..bf327160a366 100644
--- a/sys-apps/elivepatch-server/Manifest
+++ b/sys-apps/elivepatch-server/Manifest
@@ -1,6 +1,6 @@
 DIST elivepatch-server-0.1.tar.gz 11564 BLAKE2B 0b1a9c518ba51ffa4fcdf0d5d0202b182464d13123334583e8f647be4c8ff48c9d7471fcab8a18d2ddd27172928942e4645c75a1976b25a521c7f1caecedb0b6 SHA512 d469fbc32df7a586fa899c6e587832bd53c1984c97b973e3aad4f6bf62962846142938a6e6e5729fce39d3f7d486c5ed9fd9f484425d863a40a1199f170830fb
 DIST elivepatch-server-0.2.tar.gz 14198 BLAKE2B 1e48626dff5cf0ed5e7e3fb09dec54fc0e203be58646a62419df901c8b96964281250c613ef06cca9ede32ce7f4e384094892a79033afa0d20b133c54a4cc5c6 SHA512 1af4c6656b32491d82c0c98ed53a7184bea4a2639d6bf6072c3e8ae3f0d12c09284cdb6f96129b1ce848872946e14c6b83d3bbe6eb959cd5c918575ed42a621a
-EBUILD elivepatch-server-0.1.ebuild 773 BLAKE2B 1f6dd0f706538fa9a95e2c5c4beacba23508c9e27a8173a1f84f36dc66ae8e76c8fd656f8edc6427481c9b7bb2a5b64734b58caa43c18bbca0cbbf14c6484035 SHA512 5d4d5b0ad96e6746fc935b0b4f56d0742d63cff64187e1cc0351fa8dbc22865de5c476285c7c8a546657136a25d8ab660d2178e76ee8c8313e85474cd6c091bc
-EBUILD elivepatch-server-0.2.ebuild 773 BLAKE2B 1f6dd0f706538fa9a95e2c5c4beacba23508c9e27a8173a1f84f36dc66ae8e76c8fd656f8edc6427481c9b7bb2a5b64734b58caa43c18bbca0cbbf14c6484035 SHA512 5d4d5b0ad96e6746fc935b0b4f56d0742d63cff64187e1cc0351fa8dbc22865de5c476285c7c8a546657136a25d8ab660d2178e76ee8c8313e85474cd6c091bc
-EBUILD elivepatch-server-9999.ebuild 920 BLAKE2B 173fca42e2292523f975441900a39a84eabd113df716f58955b7e2407e90863477b1c9caa5ec95e075089bb5688b9d853675da4deeec70069aecef01bcebce12 SHA512 fb3400468e6e527aa3fd03023da100132b7a7187ffae09daa4dd4d9382f8a9d800b3b6b083985ea174cce389ec545be544b1eb3e1b67e87b10271b88c1ba8213
+EBUILD elivepatch-server-0.1.ebuild 767 BLAKE2B 4c891e7a28271bc7fce0c62093c0ad7d5c3d55d7851cc9b4ee718aa11d8425f8b132e3f8262930b83bfde6a70bf87b649bbd24ee1c073135db4852600410c569 SHA512 f291a3f96335855cb65c60ca3fe9f5be87ef31c65614e4df0625964f92fc6b80bc2dd5b1396edfb0cd91591d2a39604f6b19d9321672c15283444b74ccfdbe4a
+EBUILD elivepatch-server-0.2.ebuild 767 BLAKE2B 4c891e7a28271bc7fce0c62093c0ad7d5c3d55d7851cc9b4ee718aa11d8425f8b132e3f8262930b83bfde6a70bf87b649bbd24ee1c073135db4852600410c569 SHA512 f291a3f96335855cb65c60ca3fe9f5be87ef31c65614e4df0625964f92fc6b80bc2dd5b1396edfb0cd91591d2a39604f6b19d9321672c15283444b74ccfdbe4a
+EBUILD elivepatch-server-9999.ebuild 914 BLAKE2B 7a507a6fbff50363143f38dfb48c4062902b8cbd7fb8f2e2e919442be5be02e6ebfdab9452102df42d16af2eccd223a64d1e28f5e0b8263cf9c463ac88c1bae9 SHA512 83c2bb2b59a7d5d63ea3c3529ca6a8666e39fa4d8b5e618b0d409ed5e9fad6cbff71124c86c3ab4c984db785cb68abfe9559f9ce8eb26f82e82a5dec5b84ca27
 MISC metadata.xml 311 BLAKE2B 0394811b976f9903cfb643f6b556fe834d6b6f9a9b981e710dd64ed0128dcb1a69fe532c750c24103983a24c87bd5eceb81063fc1d3e606b46cce1bdf65930b2 SHA512 5add2dd39169c27b7688232595ceabd5e23a82d03f122d33d56cb19be11b3b98136a17437b0602adaccb7b61ee338f19df25e339a75ac362db072757106ea070
diff --git a/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild b/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
index 1f2ab25b821f..e4b44317b8b6 100644
--- a/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
+++ b/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild b/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild
index 1f2ab25b821f..e4b44317b8b6 100644
--- a/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild
+++ b/sys-apps/elivepatch-server/elivepatch-server-0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
index ae22b590dff4..92f5e5febf92 100644
--- a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
+++ b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index ba27a0e3d01e..1689b7f30891 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,8 +1,12 @@
 AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
+AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c
 AUX etckeeper-1.18.6-gentoo.patch 2588 BLAKE2B 38f0b3cf6ecc2b47b59d6eee3d081f47e79cd0ebd4b3d0099a893257275fa8f7803da6b3aea7a90232632aa4106a2a8b9477bb9a78e200635958de7c8b3db93b SHA512 eb2d8f7eca7d5731518aec24c931aebe8a70f22a049d88f002d7649809762d82619b4c0bbc47a6207f2e018fc35bc497c30308adbfa7b62b4191f105cf5aeb40
+AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
+DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
 DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
+EBUILD etckeeper-1.18.14.ebuild 1706 BLAKE2B f08688e6ccfcd7f2171548e58d76eef26e330b2082a825f9d9912f1cdccbbc581496fdbb47fb3d445334d445039f60daf0d08e434b7e112f39a847ea53ba1d53 SHA512 a3989e50aa459f9b5fb6f0b846dc3c1072c5d5d07c77991b191e017817c5e24b5156101c53822bd094daf18dfb0125a206859a26719abd71352be0eb19ed9e09
 EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795
 EBUILD etckeeper-1.18.8.ebuild 1863 BLAKE2B 5d24b9337feaaba19b3b96d1999e7c6c8e763227d77db048a45add4ef750965386adb7667023eaf7427b250f7f80cb1551126abdf7be0a1a6ce47cfaa9f21828 SHA512 ca5bb103396b54d5d38124e267c22dbc0da2444b7ab85b6168be9289ce3ad08703c8bf15da3ab332c921c50a8d9262d4544973066eea8ab19999b74e72daa51b
 MISC metadata.xml 864 BLAKE2B 0c772a7199527cbbd5dad94b7ad84bda0c95c9213f2b767c3d4b7ee6a9f97f5f2abf7814730427c8792e37b93534e86401026e1bbd2e4cdd5562f038c9be1e7c SHA512 eb19c5aae26f92d59e6bfb12f823dcade3e63ff6bbc9b8d363b5c76de128fb049ff815e7bb5b10d9ffb7d24b3d165969fcd01a6b1151f041192a09be1fdf1663
diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
new file mode 100644
index 000000000000..7935c8c83a3a
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 prefix systemd tmpfiles
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+SLOT="0"
+IUSE="cron test"
+
+BDEPEND="test? (
+	dev-util/bats
+	dev-vcs/git
+)"
+
+RDEPEND="app-portage/portage-utils
+	cron? ( virtual/cron )
+	|| (
+		dev-vcs/git
+		dev-vcs/mercurial
+		dev-vcs/darcs
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.18.14-gentoo.patch )
+
+src_prepare() {
+	default
+	hprefixify *.d/* etckeeper
+	sed -i \
+		-e s'@zsh/vendor-completions@zsh/site-functions@' \
+		-e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \
+		Makefile || die
+	rm -v init.d/60darcs-deleted-symlinks || die
+}
+
+src_compile() {
+	:
+}
+
+src_install(){
+	emake DESTDIR="${ED}" install
+
+	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
+
+	newbashcomp bash_completion ${PN}
+	dodoc doc/README.mdwn
+	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
+
+	rm -rv "${ED}/var/cache" || die
+	newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+
+	if use cron ; then
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily etckeeper
+	fi
+}
+
+pkg_postinst(){
+	tmpfiles_process "${PN}.conf"
+
+	elog "${PN} supports git, mercurial and darcs"
+	elog "This ebuild just ensures at least one is installed!"
+	elog
+	elog "You may want to adjust your /etc/portage/bashrc"
+	elog "see the example file in /usr/share/doc/${PF}"
+	elog
+	elog "To initialise your etc-dir as a repository run:"
+	elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch
new file mode 100644
index 000000000000..e677af993fe7
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch
@@ -0,0 +1,84 @@
+From 46e299da6914962007fb540a401a68a17d00bca3 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 26 Jan 2020 23:24:54 -0800
+Subject: [PATCH] 1.18.14-gentoo
+
+---
+ Makefile                          |  1 -
+ etckeeper.conf                    | 14 ++++++++++++--
+ list-installed.d/50list-installed |  4 ++++
+ update-ignore.d/01update-ignore   |  4 ++++
+ 4 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 73d2411..ffcf218 100644
+--- a/Makefile
++++ b/Makefile
+@@ -68,7 +68,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
+ 	mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
+ 	$(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
+ endif
+-	-$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
+ 	echo "** installation successful"
+ 
+ clean: etckeeper.spec etckeeper.version
+diff --git a/etckeeper.conf b/etckeeper.conf
+index f13de1c..16ff71d 100644
+--- a/etckeeper.conf
++++ b/etckeeper.conf
+@@ -33,11 +33,21 @@ DARCS_COMMIT_OPTIONS="-a"
+ 
+ # The high-level package manager that's being used.
+ # (apt, pacman, pacman-g2, yum, dnf, zypper, apk etc)
+-HIGHLEVEL_PACKAGE_MANAGER=apt
++#HIGHLEVEL_PACKAGE_MANAGER=apt
++
++# Gentoo specific:
++# For portage this is emerge
++# For paludis this is cave
++HIGHLEVEL_PACKAGE_MANAGER=emerge
+ 
+ # The low-level package manager that's being used.
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc)
+-LOWLEVEL_PACKAGE_MANAGER=dpkg
++#LOWLEVEL_PACKAGE_MANAGER=dpkg
++
++# Gentoo specific:
++# For portage this is qlist
++# For paludis this is cave
++LOWLEVEL_PACKAGE_MANAGER=qlist
+ 
+ # To push each commit to a remote, put the name of the remote here.
+ # (eg, "origin" for git). Space-separated lists of multiple remotes
+diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed
+index d89b8ce..2db838d 100755
+--- a/list-installed.d/50list-installed
++++ b/list-installed.d/50list-installed
+@@ -23,5 +23,9 @@ else
+ 		pkg info -E "*"
+ 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = apk ]; then
+ 		apk info -v | sort
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
++		qlist -ICv
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
++		cave print-packages -r installed
+ 	fi
+ fi
+diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
+index 8733a85..53afbde 100755
+--- a/update-ignore.d/01update-ignore
++++ b/update-ignore.d/01update-ignore
+@@ -103,6 +103,10 @@ writefile () {
+ 		comment "new versions of conffiles, stored by apk"
+ 		ignore "*.apk-new"
+ 		nl
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
++		comment "new and old versions of conffiles, stored by emerge"
++		ignore "._cfg*"
++		nl
+ 	fi
+ 	
+ 	comment "old versions of files"
+-- 
+2.25.0
+
diff --git a/sys-apps/etckeeper/files/etckeeper.tmpfilesd b/sys-apps/etckeeper/files/etckeeper.tmpfilesd
new file mode 100644
index 000000000000..b13813d61984
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper.tmpfilesd
@@ -0,0 +1 @@
+d /var/cache/etckeeper 0770 root root -
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 2af6851b1ec2..0e28569ee695 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,7 +1,7 @@
 DIST ethtool-4.19.tar.xz 221932 BLAKE2B 5a44d30b5b426ad89f41545617d9b36133fff8aa6c6bb0d5adacc4f5fef4e81f693ab620403a5d107d6abad177492b7adc406dc4b082c343938c228562f46f67 SHA512 5b0b83e09799a04e401563e34c4c784029803ecf83d5ba4f3a9cc92bfc7c2bc9cb0d86cb76ac9a7ffbfb379f6a0fc4bc3e0cf9b7826971e46504052e40156abd
 DIST ethtool-5.3.tar.xz 237952 BLAKE2B fc8e1f1219c967d52ba19ea6c8baa0f18e1d9045a9f0b72f5991328e523dcbdcb6fa6f6c601b7637bcd268c374389d8a6ef65d7034abf68ecf83e73c2ec7149f SHA512 ad3651f74850e6773489baec27c51d077e3c080eb1d536a585ae05c618304880caf7598df5c9b1416c47ae9c4eac301032f6ea65fe47650dd9ecb7603c1857b0
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
-EBUILD ethtool-4.19.ebuild 459 BLAKE2B d0bc1b7cf0ef19c205005e29c5d35507e19ca66137e5ccdb2da963ab89aa7a28bdf9ee2c8e6854bd112c1128b1c10826c48147d3709966be785bb45f501b4307 SHA512 b7a04a62ea10b59a1a11e14204344a7d8c7ec49ccfc0e149898bb2a237cf4f86055cc794b515e1a6c7b277c0e39533050ec00e8c990fa9ae0b56bf1995e6028f
+EBUILD ethtool-4.19.ebuild 460 BLAKE2B 42a49246f7a3ec1976a6d2f85aa49e6e123c3b984c3a89519c9873a9e8e72cb63315524ad49e2097e4d987c771cf6ae348a58e31c778d25e82496c0322fc020f SHA512 31fe975f220e24bec8a5532edce149bb64d21a4538f5f01c0cd7518e5bcf9893d3b0cca2231953ae5356f8e549cdc12df060aedde1e1e62678216150f2c176b8
 EBUILD ethtool-5.3.ebuild 469 BLAKE2B 61babc043d3d2d2090d0c2fc8a84983ffc575eb1ac48e52c820df0427d738344513b5e288997282c5da3d1938ab3cb6339920a451955731053d51768aad9a736 SHA512 02084259644ff34357677a8410778db88bbd44ff82f3a514b4cde30c41593251399df7fc9e8c84b2df766b47708a24b98421273d1f6c817d019c9527015bac44
 EBUILD ethtool-5.4.ebuild 469 BLAKE2B 8ca106ff0e0d753670fce61f09d9378b239c590bb95f5f20d087b2da6a40628898f5df455eaca9765ab1459bab5234fdaa5bb79799e876dc8796c9e4e2afb686 SHA512 92f13ef570ad9f7eea9b5e01f16e207cf07aa9e38830c5b93517fb89d3b37c469860f03530fab8fcd15957e31ed10cf458d8da0485d43057ad03254b6abc0f95
 MISC metadata.xml 894 BLAKE2B f0d189f1c840c3f91e13aef4e6dff25c6ef17ab1b0f7f81f6c3ca4cf3d2fe650567689439050767f872cfdd10fbfce404a580dec5aec38676385851c5c613d6f SHA512 36ede687351bab379829a3872343eb73bb50a438465c0c951fbd172efcb8cc20e349b5b0ec8859f96effa7194b7c043424e4de56af1951a225fb393aefecd715
diff --git a/sys-apps/ethtool/ethtool-4.19.ebuild b/sys-apps/ethtool/ethtool-4.19.ebuild
index 379cbac3d483..a9470ab70eac 100644
--- a/sys-apps/ethtool/ethtool-4.19.ebuild
+++ b/sys-apps/ethtool/ethtool-4.19.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 6a85c21732a0..5114b9edde45 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -3,7 +3,7 @@ AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d7
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
 DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
 DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85fd4a05c37b543529df6880e01c64bd774037bed1230bf7d7fe0bde798364c2fd0fcfab257fff4d3e6ae9800c076a5b0 SHA512 b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487
-EBUILD fakeroot-1.22.ebuild 1065 BLAKE2B 4d813631249762a7430342f3723fd7c2c1e06d73d90fce5cab7cd04c45710f18ebca06065429308c25452a9bf4bcb958925c6f8f515bed864ca736999890efc3 SHA512 9c40debc98412e04241df518cd89ac8ac71f13be48be21e467b81cea4e9267dbffffe055c74152bf9b59c6ad541b8c1509d98a89d755486294c03bfa64d67be5
+EBUILD fakeroot-1.22.ebuild 1066 BLAKE2B 466d48ac818af06480066ad62301e866ee58faab2d99d31d05937374200a69b507f8449b11386529b6f181850904488d3a9f7d94f6cc4db50bb134defb538489 SHA512 9c33be725cd616d300129f2748a6bff9bc13fc72f11c89fab39f59d9c9c11ebf47545088684a0c79785a9c63d48931fa6b477d2ca8a3b11cd8b32afe16c8bb24
 EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904
 EBUILD fakeroot-1.24.ebuild 1074 BLAKE2B 5fed05940ea6f9b96e9c55d358339d01b5277d7e349399706d57f6c32cc431afa5395dbb6b84a415eb6bf82395615316ca5cd4d43eaaa6a9e846b0753727e764 SHA512 4cdf4722f803337aa923edbee68230ec2badde0c0cee46a5319c10c5141a3f771ecef4d5c7c089dca8cbcc55f5d2dc026325fd1ff737fe1f01036a4655e314c8
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index 2188878e4d84..a13a01431382 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index c095d93b61f4..3731e95b1ed4 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -1,5 +1,5 @@
 AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c
 AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819
 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28
-EBUILD fbset-2.1.ebuild 787 BLAKE2B 75969d5373a07089e8a63d779442d2a616db1333a2268a497510e012638f3994274c89117a199f3b3170e161731422845280ed9a611a084657367ef184b3e73e SHA512 8c00f428ebd2028cef39e138d3829b91a5ef29c3b94fbf88a36542fdcfbbd66a792fb23e6b8f405ffacf5a460bc46e385f6c210f19e289f0cb9212c958db0731
+EBUILD fbset-2.1.ebuild 788 BLAKE2B 16bf10711ad6f54a3584df14178c7e481f2d0db849fde53696f846a833fe0db3c1aef2a96bd7d753dc19f71f13d2dce274faa281690e7e8f4495af64539c8fee SHA512 23200afb52a70f5cf53ae6501d00f646879be26a13b1beba93da773571ff929a7ee0b909a3dbd1f9bb14872ee2e2dba1cfef86be4c0052bf8fe88da16bd21e01
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 387e1a904e25..2e897612016e 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="static"
 
 DEPEND="sys-devel/bison
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 2e14ecb417c0..c802e74c6093 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,8 +2,8 @@ AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f
 DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
-EBUILD file-5.36.ebuild 3133 BLAKE2B 064e1ec5045f73d11296aeea780c156554a3e619fec29ee903ef01ddb653c11341b0f1ea357dad132c26133b624f0665099d5f5b9fa3cb1c127f87c57b463616 SHA512 12785c61dee0ebe7cce21b63aaa1f37b7f5abbb0fa2c13bd5e147a15cb52f2b187299e1ab7c9a743d76026e8ea8e322c98be3822e4879d026dc3b8f8a22fdf2e
-EBUILD file-5.37-r1.ebuild 3198 BLAKE2B 243049377387cb571b07cd596b4a0aca152663f926f9810a8c7f2cded363a9a4e23b42af8f7e1b466491def2ac2f49af36619e8d3b712120aeba510781e28120 SHA512 5dd3430b1a7e7521dd6e20f5c4f9325fe1287bf22c6c0bd2f93ec1e15f2917539b7303a01f563b1a1946ffdb8a354e3635d1ea4fbb6c403a9b6d298a53e31396
+EBUILD file-5.36.ebuild 3134 BLAKE2B 26a70c49651e9c35432ae466491d502237f977aaf8919693b68c101d2650fbd082bd14e9709b7f27fbccec71b514d6203f0224addedb19d1db5063481f5fa64d SHA512 964b8ebf50b6985ca3e05ba71d965c5634894b6d21111ea4e16913fc51be7e81cbbe76d124ae88d4277477ecec65d9d833263a108c05bad8a033e2c472115353
+EBUILD file-5.37-r1.ebuild 3199 BLAKE2B 071b3e4c7d045f0cd698c442c649fb639265be6ba2dd469297efd2449646eb47c63dacd46a7cf16b9c44c1d79db3ed0dd8fb56f841e5649082b2caff673c3335 SHA512 9731ac229e2ea10cab84d30b81c9f87c2342b9666bc3a0af1b50ce5bf15d7f972c8b8561b1de38abcf6d7282e1dab59034334b1fc0fb25f6384fb34562a06360
 EBUILD file-5.38.ebuild 3181 BLAKE2B ff3210e7613373ef2c6724afadee0c719f1e0a12fc4b95627f504f829eddda0e74fe8c7468cbba651ce977158672e5b44582f897041458963cf8bcfccc6f8f36 SHA512 e6e00a2a98cc6a5a09aafe7f16d02bd3f37035c6469493074c0072abd0de0e65f11d66a5a1312493a35ba838a5d893978a8502bc3344eaa9b6638f5342ad2631
 EBUILD file-9999.ebuild 3255 BLAKE2B a122a89172ec84d405f851dc868a46fe015ecdfeb4769bdad8336df94c13d28b81ed19707380a52caa3557ce4b89ef63d211db1056a21caa20ddba10bebad059 SHA512 5b439e74d3871f7d955a5c3b162a980f0d702604e2ce94d67eb394c37e2fb0841a302eb4618169cb169f58176a047a7006add53bb22a22c141981cbd5f3274da
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.36.ebuild b/sys-apps/file/file-5.36.ebuild
index db74851118d7..bab24deaf9ca 100644
--- a/sys-apps/file/file-5.36.ebuild
+++ b/sys-apps/file/file-5.36.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index 7f28f9ddac89..9269832c6a8c 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 9078e654c398..a39e1652af9a 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,6 +3,6 @@ AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718ac
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
-EBUILD findutils-4.6.0-r1.ebuild 1962 BLAKE2B 5cc16678e7fe7022087f355ef664b022165168673c81428a77770eb345a042652a0f8e3f01ec57b35361494ebd29860ef9166a9819ee2f55d59547fa88d305b0 SHA512 3cab645199b2afd117f3903f2da21805bd3f472e82c6fa9e4beb908fb37c1864c3e6d83c4a894823f43de881758eedbe3de943a317facdf9bc7e1e2f4137b192
+EBUILD findutils-4.6.0-r1.ebuild 1963 BLAKE2B 348056361ad81207e9a7332c749a6b831e1c8f7b8c07c6a7a437d8f8bee0e1380f788c402fa11aed8d39a99c2980c4988d914812df159e1d36b02513f319522b SHA512 f55532b1d6314537a66f6bd8c8e72813ff69a0688b8bc796c2d7ed1daf2197369749c832103000c5136cb31ca4ca3e98db4998713c93aa028c6fb4b3d2a39f96
 EBUILD findutils-4.7.0.ebuild 1695 BLAKE2B 09cf65bd88bdfd092ef4c43569c875ab71493169127238b751e838ce9d3d6ab930b16819f575a99c18b44269ec549ad8d07585efe1ab691f59fda6e2a0d5524a SHA512 c4411d4c4280f1e4343acc0737a0a60c0cdb85cf0ce429e4c43e69b7cbaa7fbd5cc24d44bb3967bddfb135200e0ed47044336c8b548e51bce76755abea7af904
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index 2b7a1252637a..f9cfaf8e2372 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 15e1e94cec60..6b84b515cd53 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,8 @@
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
-DIST fwupd-1.3.5.tar.gz 2164874 BLAKE2B aa268f3d94b3c7104cad5e80de81a724ba978e3da468cd2d44833656c5b0a95b1f720f5c7a0dd9812b8afce4c58e8f777e13ea2e1f4ce0b8b582ee3c731b744a SHA512 b1944b06bed9cb10ec90219235b168a76fcf6ff7b8938dfba36259f07efed71a755d7b91fcbe8f6fda00ac971bd5d4734a49e045005e2e1c32b49fc5b86c48dd
 DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
+DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e
 EBUILD fwupd-1.2.11.ebuild 3791 BLAKE2B f3451bde6287c540e43ec0903c060caf19f27c0f60b190e7bee5c5da66663a0c461488b1f649e7c0cdaf7f1c97169cc629b20f2e383a1c05336677829a3beeb8 SHA512 cd0af110d7bd7f8941c473bbd576a4d8df7d3b51bdb76dca1dfacf63304f9649886151dfc478800ed21ce311e1a0cce16e1c4735178f6c1748ca93de34d59a36
-EBUILD fwupd-1.3.5.ebuild 3961 BLAKE2B a5cd38338045f77dc4fdb5da17adc38c9a00ed286dc4d6c6316d3a150e07369c62e06dbe4d0613bc948407ff745feb63b01bca9d22a1dab8902ee1722e2c896e SHA512 860bc62000ad160c7c61a75bedf4ebee7bf5040776f53805dfe30d95a267bdf78fcfa64faa3fc8f97ad4dcc929cec7ec27eba85945c4f9437ad1e030f3184421
 EBUILD fwupd-1.3.6.ebuild 4024 BLAKE2B 8eecd7d737f0fa364c55da844a3d85dc632a568e65dbf3c49b98ad3aaf1b9f026a26e374008ce16ede3faeefb1e137743df8b058d04fe43d4e1363a15360b103 SHA512 b924fc66266c20e4abdcfc41c159c2bc9eddb5095dc94e31b967fc309872c3ec5040b12011d21ba6320264e4f4c0e446f3364795ec461f50eb8dfd9d73ae318c
+EBUILD fwupd-1.3.7.ebuild 4046 BLAKE2B dbb75b4c53bf25c6717547e99b06e8954d35a96a11fbc0724791cce65f174183d4e6c3e2bc3a80d21443305d22a7c3fc41820fe9ba5988d2cd2b66b9acf71882 SHA512 191878ecd30802ac3b71f75575635f51a5d3ed03fe96452b8eeb8735e86121b98bd849e1102d392bd960e1c4f898f94323ccbedc6edcabfdf09f30e8eb905fe1
 MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d
diff --git a/sys-apps/fwupd/fwupd-1.3.5.ebuild b/sys-apps/fwupd/fwupd-1.3.7.ebuild
index 9b799a5b2c1c..86067acbc0c6 100644
--- a/sys-apps/fwupd/fwupd-1.3.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt uefi"
+IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind minimal systemd )
 	dell? ( uefi )
@@ -71,6 +71,7 @@ DEPEND="${PYTHON_DEPS}
 	thunderbolt? (
 		sys-apps/thunderbolt-software-user-space
 	)
+	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
 		app-crypt/tpm2-tss
 		media-libs/fontconfig
@@ -81,14 +82,14 @@ DEPEND="${PYTHON_DEPS}
 		x11-libs/cairo
 	)
 "
+# Block sci-chemistry/chemical-mime-data for bug #701900
 RDEPEND="
+	!sci-chemistry/chemical-mime-data
 	${DEPEND}
 	sys-apps/dbus
 "
 
 pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/fwupd/fwupd/issues/1530
-
 	python-single-r1_pkg_setup
 	if use nvme; then
 		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
@@ -122,6 +123,7 @@ src_configure() {
 		$(meson_use systemd)
 		$(meson_use test tests)
 		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
 		$(meson_use uefi plugin_uefi)
 		# Requires libflashrom which our sys-apps/flashrom
 		# package does not provide
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 351c2bdd7afc..13dd694f47f8 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,7 @@
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
 DIST gawk-5.0.0.tar.xz 3000432 BLAKE2B d7885442c615e2b7986d6cb617db3ac376a5e572ab2aca3c6b2bd0f43feca4374f310bbf2e2a875b617df97cfebf98cb983d169468d51db39058b83eb9771afa SHA512 9eb663bbcad53165b7ddb7d72cfb8377252b68004733a9eb8c191b2ddddaff857e48ba811280311384243eb67574fbe7ac9edf4e507f9a82d67b4b2adff8ef6e
 DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
-EBUILD gawk-4.2.1-r1.ebuild 2164 BLAKE2B b41a354c456b3a327e87e274c14042a7ad0204508fcd2d0319a852e587674dc1f1900443a774044dbbfc4e42bda8a44ed90ad5f3aad8c036529ec1d17634a097 SHA512 dda88e30ca1d3c41b9440a08080b9abf32b0b322a96ce8b615280b9da42a5a5dbef125fab5e84990e05fe8d72bd64599aba248b7c5e523d9e647960ce6db8728
+EBUILD gawk-4.2.1-r1.ebuild 2165 BLAKE2B a68c0ebf95fae1538172fce497021d18065ad1fc571808d00e17f72439692de4bcad997e5208a855a5759118b580f67b0486c80e3d74e33a5b273bd3b1626453 SHA512 e06b4b51098de3a08a2e6103f59689d753474874dec7241baef0e5672216bb6e5d80d3fa0f9e312eb0f998a0cc276dd93668a81ccf35ae45ca4364848c1a4957
 EBUILD gawk-5.0.0.ebuild 2177 BLAKE2B ba3033bf44fe5f2fdd506eb633ea5dd4d8541ea6303095e847ea003bbdf7712f25c740fab5829f4833dd2be5ab3a6dbcd56b491c793b7de3f3c14d81b4a1e329 SHA512 d542138bffa5826d736a1e0421485d9d795aad49aed29e1990f8b72d527b75fbc2a7da07ccd22579b93079097b935068be15bb4b02c82fbe84077cf0b6bb3b02
 EBUILD gawk-5.0.1.ebuild 2235 BLAKE2B df3b4d97a21028080d3be390c071e3955ffbc66e2ebda2df2a96b99def1a6dbd12b024cb8ece247786e005185716ebff4f93ffa71866e4173dd0271b23b938cc SHA512 c37f3e0f9205e7dfe3bfd70e5dea043eaa3644e4c447a1c5d6e15863fef178ed8a177c9c7efed392fdc2a129cf0888ef3cbd7fadce6d0c3b0a269e22c01d3abb
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
index a458de478a44..811ba6d753de 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 2e493e8af18f..51dcfee149c5 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
-EBUILD gentoo-functions-0.12.ebuild 817 BLAKE2B 2aa656c7166d7003313536966b36931b4fb66ab00fca4b0f4a808dae797d9fc4fa03f0ca98e36e288c734e135820dafaad4d3381bf3e1fd0c6b455f9eac1ec8b SHA512 fa4898bcfc228a0c5018fe079be18f0950d0f1541713e2a4d688f5b2306f3c5b2ffa4452b1e3f31f68d7ebc8f775e5eed359c839e4cfcb63112ed86647535a1e
-EBUILD gentoo-functions-9999.ebuild 814 BLAKE2B f499bc57b9ea9ffb48fd1da818d9c8cbcee0c2f07a1addbc287271f86808d172d62502ede3bcfcb512bbd70dada7a579d1cabe5ce445a591623e5c363795ff25 SHA512 256843a43221915744f63f1080e99d344f8fbfc06ce35c9689a2ac397c11c1d994ba16fe01859965e53b06f9a4afb4efe496159618d78a099d6e422afe15208b
+DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
+EBUILD gentoo-functions-0.12.ebuild 818 BLAKE2B 36314c207eb995b721240f68bb472810451d5d5337ff755151c314dc667f622ccd66977272a74f6c86731be91daf47b134bbca099b2ffb6786035017eef8b1a1 SHA512 4abfaf4a69424c69733a44dfd17cb33931b205ba5b305bbb5864ca9da78d2e6796f1b3807bb2618639600b52547cb7626006c7b81f1ecde6978dbfabb7f80d00
+EBUILD gentoo-functions-0.13.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
+EBUILD gentoo-functions-9999.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index 5479d058b0d4..287a61aa175b 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2014-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
new file mode 100644
index 000000000000..c06e9afa8388
--- /dev/null
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
+	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 ~x86-winnt"
+fi
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="base functions required by all Gentoo systems"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+src_configure() {
+	tc-export CC
+	append-lfs-flags
+	export ROOTPREFIX="${EPREFIX}"
+	export PREFIX="${EPREFIX}/usr"
+}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index a8780922f9d2..c06e9afa8388 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
+	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 ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="base functions required by all Gentoo systems"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-src_prepare() {
+src_configure() {
 	tc-export CC
 	append-lfs-flags
-}
-
-src_install() {
-	emake install DESTDIR="${ED}"
+	export ROOTPREFIX="${EPREFIX}"
+	export PREFIX="${EPREFIX}/usr"
 }
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 26aa6f2eeb74..6a1d4fa92498 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
 DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
-EBUILD gentoo-systemd-integration-7.ebuild 795 BLAKE2B 2c805a1b5ce121177976d0b617dca47124dff234dedfa506928eb850d5c040db89aee7b78d731535104118d074db65c634ebbe7b4e849c134e3a84307ca68671 SHA512 9c9e95d6f959f361db79972ff2eec3e3b5a07d42589d6e6756d77f937e1d5aafdd591c44fb866b361e8e67c67398acb5cdaeca37786b21d907f375d48275721e
+EBUILD gentoo-systemd-integration-7.ebuild 796 BLAKE2B 1f75b962353718450f04c0e8426d07ca45d53b770516bbb3fef37e023832044a53db64f30149f22ea84f16d448c72c8af9d08751c077d6cf98d9cd54fdabf041 SHA512 e3751aadcdf3072ba82c30295d9d61040c0a252aaf6ccb6926203bc9f112d624555d13171745de0e4b3b3177441c124cdd914bcf6a903e0908618636d9aff2c6
 EBUILD gentoo-systemd-integration-8.ebuild 735 BLAKE2B a1d3366124cc457a5537ae08cde3d0005a9d5cf47f0015743b759e9f0f5cf550f31f6380d4b6f515a3f28812acf2d8a64a3f47ebad413a2609326c58757e1130 SHA512 8045e9fe159ccbb4640c69a0986cb46094bb7358e0b0ed6b6b1d262ccd01f6a9e4be9862fd0213cb1b26fcab005aaa5ebb30df80f47424ccc76d2001e2f6939a
 EBUILD gentoo-systemd-integration-9999.ebuild 729 BLAKE2B 24adcb67d253b61a09eee0df7ee78cbcafc01c3e60f5d114351204f456cdd4c138f5c27c311e72ef80e976458424266c2b9d979aa1c8022887e7b01936975841 SHA512 bd37d55941397bf4aefda23375d58892a480d4348548a543d5a0d5139acfba677082e4c14eb839a9e9b77952fb86dd32623e0b9f255a36cc32ad9327d32ce345
 MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
index 775bca89b9b7..b95ff397b319 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 inherit systemd
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 7e57e8a6380c..20e8f561c2f1 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,5 +1,5 @@
 DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
-EBUILD gptfdisk-1.0.3.ebuild 1244 BLAKE2B 30db017ad95d995589200cdc2026ff32ec414262b4f178970f73f8a88bd2653b5690bdcde4e47cc8bb459e35933d7ed2692d196f8eaa54ef8e1a76c8f5071934 SHA512 72529d598e3c94a2886b3b54093bcaa0015ada90dd729818d0a2fc6b7befabbece64821c7a342c9ea44e3c4c2d8cddb17877afb33edfcc343fd6ee1f6fd1e690
+EBUILD gptfdisk-1.0.3.ebuild 1245 BLAKE2B c9a4ab441c2beb39308ff1fd7976bd8254495dbe0f7ea7a417243823cdeb504ef6738dc3902134b3804848844e14452d7b2f04a467f661e81c82bf4982b59ffc SHA512 39c3210dc4e630026f6f7fe7b8b070967a3b91008bfda5d8c7a1171bf44abf71c8a0f36e02e4dfc76c019f53314a11ef88afd9871302b0a12c7d7fd0ae085570
 EBUILD gptfdisk-1.0.4.ebuild 1254 BLAKE2B 254054a09a965918a1f9c08d07f671a02b47cb6d7688158bb985c0072bd1bf3e357cb7a8b0502eb11eeacd6b227ece6629371425e5140eabb4d67a7e769f92be SHA512 315f7b2547974cf27a33b30e860cb7291f57ba60006207c1bb6779b119c3d8e8feddebf613abc316913b354cde7fd99108c326aa905cf120d67b6ed9c1d92a2a
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
index 1b20d951d671..d0838c37c6b5 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 2b8e21cd7bff..48e5145796e3 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,7 @@
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
-EBUILD grep-3.1-r1.ebuild 1460 BLAKE2B b773df4ed27768f62fae2538ae0ed894d3168696bb8aec2dc139a7b6a485fceb09b380344009b6dd3d080a9c1cd967cc8cf2c91965b26af09884d951591f5682 SHA512 ce8e19a2a97dfd0eee7bda1b6ba11f272412fd8b2ab865e82000654e531a993721bfe0e293c1218c8f0df48cb9cb8fdf0c1da92159188bb2fea30dd1f567fff9
+EBUILD grep-3.1-r1.ebuild 1461 BLAKE2B fc590a67dbf675ee5606f8282c0ccfef32e62eac540e8e6232751073449fdc663dde16d97dbf57f04aa74b8f3d06f309b19deaaba94672029db06ebd8c448d92 SHA512 d64781d685a5cb47e2570ad5e784b59af41db86a24d1045d115c1dd7e25732776e0a83962f90181e59681d71c3c58205089ad9139bc74305097ee1493a50e166
 EBUILD grep-3.3-r1.ebuild 1466 BLAKE2B 3d5ec0b7bf29bfbabfc3d666dc0e22668ae9ab935afe8cd06c379b43d03eb6b1bb32456a6937665591ec52bf5dc291c3c46c43edcffefa3fab9200fed48d486d SHA512 fae062a766dac5f974d44058d309668546bfd3db9890674370cce386556620d7857f402ae64f76f47d1e2a738eea551b8228e8f836fb7c53db64930e44842fd6
 EBUILD grep-3.4.ebuild 1526 BLAKE2B 729d08acfe1da73ff627821e2ff50ddb90ccd3828506f7da7937cf3f73677f0b860a6923e731439ec9443e4641f7cfcc99b189ef8c7d8e2832f1598713daf573 SHA512 341197e89816a0a466d92dc078f233cdd2c76b5e998f84ed1b9feac500caf9e9857589c423649f2665e89a7468ab43bcaf31071f50fecaad070b89390adc7db7
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.1-r1.ebuild b/sys-apps/grep/grep-3.1-r1.ebuild
index f1e1a7ff3d20..9d035b47f42e 100644
--- a/sys-apps/grep/grep-3.1-r1.ebuild
+++ b/sys-apps/grep/grep-3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index d3798aaaaf55..7a88f286b48a 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -5,7 +5,7 @@ DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c
 DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
 DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
-EBUILD groff-1.22.2.ebuild 2795 BLAKE2B 8088d231c0f9722d3ac3a174a1b6f59a901caf923ae0b52081806d2b3df692a144f275c44fdff077c015610a485b76662de62be837f04c9a936cd76932ebd286 SHA512 756d17f366c96bb1545ec37e43993d4f32cdcb09ee9d5502b853a4cb1168ae247301ddecac5600f9a49a611751e8cc7787da1fc812d9d48668eb92bd22cdd789
-EBUILD groff-1.22.3.ebuild 2506 BLAKE2B 9cc78152f3acfa5d80e6abc6bb58f5e3d51148aba41e39cea29d3cad5acd30af4a07b455f05b9c92416ba427579a25dbaed2d47eb92adb85efa6641f33456195 SHA512 243ab3547baa164a3941ffe18db5520a55791e09ad60325eccb95c6d266daea5a4166289d3211611eb6af47c47f781c7a3a90fd93985c42016d9109fd47964dd
+EBUILD groff-1.22.2.ebuild 2796 BLAKE2B 3f4fd1a8ebb16b1fc8fa928dbe43019b6e327f074f43de5927d1a342b0fbb26e375728cca06edb5718227c53e9563a11e38ccc7fe5b6efb1ec0eca099076b28d SHA512 123c5025e9c19d0d4667bbad1174e01824b8d1b4eb81135bc93b3e5709f76b3f7c64890fd0ab6228f2f45c0eddbdf64eea79fa812779a83b185ad975ab9705f4
+EBUILD groff-1.22.3.ebuild 2507 BLAKE2B 23f2c59923f0421245f635314a1183077a94725e76d42bfcea9bfcc64e8167996932e9ccd77d674742d1b132a5ade620908e42adfb3022a6e2f04e830c01e83c SHA512 1f03843cc9e0c12935dde8173046b7010bf47e59c650d562d78bd7bd855435fc54a9878443a36d025e2e1c8a6d1c469721213731e7c19ef2664f569988bf1ff9
 EBUILD groff-1.22.4.ebuild 2571 BLAKE2B 3bdab91c27a8cd1d46bd769f31e95f2acfc798b2c2e953b1aeec165d435fb7903ccc76a5f073f6714b4c3c0fcff2a96ba9120578bf45db203906ebeb345cb08f SHA512 475e28be3a0294083cbc65fdf77dadc073ddd2f77866f5f27ccd806788a3d2c4c6bd723ca8e38c94794ed5138611d96e970e6b31ad53905aa2aec0e021f7e0e3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild
index e5759749768e..68636c72a691 100644
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ b/sys-apps/groff/groff-1.22.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X l10n_ja"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild
index 1fac0be40c7d..a794d241e425 100644
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ b/sys-apps/groff/groff-1.22.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz"
 
 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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X"
 
 RDEPEND="
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 6ebece963162..15403d86532e 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -3,6 +3,6 @@ AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
-EBUILD hdparm-9.56.ebuild 982 BLAKE2B d1afc3860c0e374a4a09dfacb40be2ce28fe3b51c6dd6898c2fbd9fea4a6ebd966f671f3e098ccf9d2a5635127bf2d1d337ee0d8190cabff0fbd33fffef44868 SHA512 8460def7a83585bfbcd8b857c59506752cb4af46b7f3676a28f02e3b37f082222867d890e118c1ede99f1d86f4ff63edacb878b536269d23c05d0895bbe00ec3
+EBUILD hdparm-9.56.ebuild 983 BLAKE2B 0bc66e9588406b893936285ce9c2818e70519425b4c9b45453e2079083aeea1f6aa78de0cb5ba1d7b2c394b9c87374c6eae933d830082f7438dd54fe17b4cdad SHA512 4c30b087d0ef1037728e0d10706029a56a098cbe95797fe55f5ccf11f4bad6c9dacb31cdda10fb6e91c651c0eef6dacd6faf11651ffdc648f5af0f81c15d613e
 EBUILD hdparm-9.58.ebuild 992 BLAKE2B 8447286f9f0b65a89e091a37d4b875c9153965c72a6727db1d330b3fbeea6269d759b69f49b3e26413011e7874e62e0eddca60f74ca4a907d042d2557a4c3bf7 SHA512 b808f3d1685042b2663e5e73cd2eba2b7a920cb2fa7eface0f48740a998ffa0a90b75b24e72e0038b51bcce5140d21b16c97cabec618586a3fe6a58a6234721c
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild b/sys-apps/hdparm/hdparm-9.56.ebuild
index 510ec4052e06..5c96fbd7cbfb 100644
--- a/sys-apps/hdparm/hdparm-9.56.ebuild
+++ b/sys-apps/hdparm/hdparm-9.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index d5d0bb11e9a7..7980e8e18cc7 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
 DIST help2man-1.47.11.tar.xz 202312 BLAKE2B 6baba7fb28f2b28aba8a05eb5df0a8596918767cf43d730052e0bae9293a4a27f207136c22cad246ca7220fb639fabce3bb135edf4e84f866f1ea9b0af26f41d SHA512 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be
 DIST help2man-1.47.12.tar.xz 202252 BLAKE2B 6a474d62999b2fe6750a0ec7662b9b33546d82ce72edd628f41008243cd3467cad783516d5ad06edb37f471a2aaefd837bd9957a7fd10b6e3c3b6dd33398b79b SHA512 fb71e48e4a7a0f4316148295ea539b667a131149f4467da0f3e283389c9d9f2a5f1e9124ca8d64d6c3250d332a713d4e8de204ca9e7088840e74f316fa5221be
-EBUILD help2man-1.47.10.ebuild 1023 BLAKE2B a6ceb661ac913b1618a330ef9374c5958d8983636b4ecd03ddbfb568560036cf2ea4992365449ad6e85ae7348c4c8d215b5f1c116f26916ce5c58d672a5ef7fa SHA512 8dddb99adc31099404308d1816a614a8531b52835e2237e516bee07b419422b54736591cc7012d03c1f1400e8c6903024900df8d1fc4635bf14e0f6cff99dbbd
+EBUILD help2man-1.47.10.ebuild 1024 BLAKE2B cb34c2b10e64a0f28890802849653a3218c0cc18e045b1c47903b6cd6f457763190553145c4e9120113c7fe71b8b118b735b4cb9d1cbab17db593d095eeda0a5 SHA512 61d332c80f8f3ac69d7a8a7fa79dd19e55a0739f8b802470aa3c849c6c02afdad0109abfb8bb4cd6fa8155cb61bed500d8f9c6ecc6cd11c5626b278d337a3f57
 EBUILD help2man-1.47.11.ebuild 1078 BLAKE2B 89dad80b2687605be2a944d77d03df3b041a1f5f01d75d6d66352a80fe83142e19e1b1474ac2ee7228d4eb7842310b1dee871c2768c4319c8a73dca3988582a5 SHA512 d5688282e2994c9eeecb6bb54f03193c85f4b7e550bc62ff1ada161c5cf4363d631459d000133a3eb517652e5d01b3d391b912da7d14b9014a1e2b3299efc047
 EBUILD help2man-1.47.12.ebuild 1078 BLAKE2B 8bf114bf8ef0f3bc986482328918d9488d9d7d7ebecdddc01c2bc51dbcfe87d1e7890b28629d1ffa31908ea96ad26b134fe73ef14d5179f6ef8ae2fcaf29d8b5 SHA512 841b57cdd2ce1de39dea017bc911fa6cacb624155c2696c20c7d983d80304fa3e68a89fa00577652e97f37923a6f124dc11b2dcbcc879ae1c7873bcdd54f2c3d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
index bf5e98c88298..78031dad5693 100644
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ b/sys-apps/help2man/help2man-1.47.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwdata-gentoo/Manifest b/sys-apps/hwdata-gentoo/Manifest
index acfe4e93abb5..bd159e4028f2 100644
--- a/sys-apps/hwdata-gentoo/Manifest
+++ b/sys-apps/hwdata-gentoo/Manifest
@@ -1,4 +1,4 @@
 AUX 0.4-openchrome.patch 781 BLAKE2B 9df96192f6c6be5502d32d35acd1853e3de0c5660a0022c0ede0f14d6a7b0847a2ade3fa3501d6cc658a03312f764a07d4f56e06b70508020ca69c4dda1e924b SHA512 0fa8effbb7a9ee05780bab67583c9da7b11b38498eaf2b447b5be3190d1b9d924476e07b27bee51b2d6298579a8a07340fc90a2634a579f177f024be0029c9a6
 DIST hwdata-gentoo-0.4.tar.bz2 149060 BLAKE2B 77534979aa9605836ce52906413b994a71d96636a3a39c65456a4899d839cb2f91ad101bfba884869c43795268c7fb13c7fa8ffab6f097f40dfd071712c4582b SHA512 dd62c51986c83ff5a9338fa20d98827cd44d86e808c9a2a52ff327dcdd941d0faed0ea4f85058485e8fc2f78e0c2fa18d3030e27fded8ed1777832ee789c189a
-EBUILD hwdata-gentoo-0.4.ebuild 851 BLAKE2B d6528b7d09d4d77ecff5665e74338d5931cb34e146124958d97bb0beaf256efbd2fa55a48eebc77b00dbbb9e66cf3ec08bc126975aa7d691bead97308c20c878 SHA512 c1c0e2f6036e0e1ecb345a843212ebdcb6bdb497a8bf98113eec0b523ec076e59a3b769677915fbb762ae06f58b5d26cf0f1d5982adbc7cd2128d7f592badc0b
+EBUILD hwdata-gentoo-0.4.ebuild 852 BLAKE2B 338d282fa83178d26b992837d045f8bdd4238787b81d6414436af7473ee49e84b71de8639a5de7fd7881475d2c837e2829463fd3ad06b16b5a5a45fe8d3441bd SHA512 eb871f51e9cbe2391db33d165ef2eddada2b882915a654cc3c9c0ec898af11b1410a25e4c3af386793ecf1cfa9a24a2b0a66dd6e7daa3c94c6617db01960755d
 MISC metadata.xml 345 BLAKE2B 2492803d43b2d0669f2a6996c75f0f2053622f8a07d4a337e9e8cb9e81b661ba01990ea7f1b8dc130213251e5ab852c4abb637166693ac10e65f3ef18035fc0a SHA512 0d8a0b6099b83e5d54e235442a361a1eceaf6606522aee190382fc03a8b672c1c2559cdd585942b278e7c48acab7c3e9f7021e7faf9e2775e92eea32ecc2c223
diff --git a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
index d3cd08175311..ddd2fd63c0d2 100644
--- a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
+++ b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 HOMEPAGE="http://wolf31o2.org"
 
 IUSE="opengl binary-drivers"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 2585adf2cdb8..0564745fe818 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,8 +1,10 @@
 DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
 DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
 DIST hwids-20191025.tar.gz 3443988 BLAKE2B 0352f1568d7ceeb2c599d789f96a3175703f3c86240188beb9a080eabb6e7659aeeadf193f15050519fb64c58ee8d8832919cf6922b5017861b32be543235a03 SHA512 6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca
-EBUILD hwids-20190316.ebuild 1752 BLAKE2B d94d883b379cabbdf03e93035fe07515d965dfb006fb0ea3a7d81655d2acb929de505bad235faf05aa28caa4428cc0dd1fe64086edcbfad8d310615c894fc142 SHA512 8351e894631c093f4b7d745c1ecce0d50b88e19445aa5b97c6e6f8ce5650b1c8dcdf85b274c4874658123ec0966c1269a161909cf78a671cebd2d860a6c273af
-EBUILD hwids-20190818.ebuild 1727 BLAKE2B 4b49f53f54d14a411c4efc949a1fea0a14cf505db9b2050e2edb06b797bcb39c2caa29edda47e1b1f84e8b557c2d835560c73e45abfd2181adb7c72c0c0e83b0 SHA512 b550b872f235848704e995d9d4dafaa2ed3ac6a4f1243222bc3847cca6678b74fa8b68192ffd18323d7aad538213520ded45dc3ec695e7934bb098603792fc26
+DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741
+EBUILD hwids-20190316.ebuild 1753 BLAKE2B c863e859f5fccbbcef0c1fb253476418aaf9440421898520bcc91f652e05b79be65bb4294b748c17782e25c84c0f6cbaa2ab18f3851dfc2100cb3ce9bb211736 SHA512 82db514433c422433afa2060d79e4ab61cd600fc31729fb245780a09b943e0dfd5df0c05cf6f536d845e663619b1b05c44420f037e24ab9c4b7459d31e6c50b9
+EBUILD hwids-20190818.ebuild 1728 BLAKE2B 2e81bf63beaf47798c2ce8476d682ed8eda1718644d67ebfa81e692f503556c3892a14e5fb6d37b4eb0be083dbe3715e88bf17c5db4b1d6dd28b58f76a5e594e SHA512 60bd4adfd2602085716bec0df51bba85a83613bab7f7bec7ea2d099316cf1bb1bda7639ec33ac56cc0d0a6b473dc35fb259a52a82030300792f9144ae65558e5
 EBUILD hwids-20191025.ebuild 1740 BLAKE2B 6924f391e6a0ca5d6492e062223076ab0557f3fc9a99ee41702e7923d871d05b1f0c81522ef5b23fe1250e5d84e498bb0df9fab14a78392b436da837e85874cc SHA512 69057af763879b85549208334b575e5df63f49d5ad7656751d0442f8d601df584afe54bdd83c5d6cd17888bc5ac8a80239521ecf1fbf3849827c35c60713da3c
+EBUILD hwids-20200204.ebuild 1740 BLAKE2B b31cb1ff565dfc6d111864102a93cdff1a38a50ec13933698a73a08c9492a57970abb5c9db3c19e742945ac6809b6eadd86ca46af4a33a8fd0032813309ca07a SHA512 5bbda909cf7b896804d1b5a80474dd0b52369da193dd68e4ba303325987330a257c8ca4aecb97bcade3ad1b8e71b8cb662e0536e984d16740692de963fc8bdea
 EBUILD hwids-99999999.ebuild 1740 BLAKE2B 6924f391e6a0ca5d6492e062223076ab0557f3fc9a99ee41702e7923d871d05b1f0c81522ef5b23fe1250e5d84e498bb0df9fab14a78392b436da837e85874cc SHA512 69057af763879b85549208334b575e5df63f49d5ad7656751d0442f8d601df584afe54bdd83c5d6cd17888bc5ac8a80239521ecf1fbf3849827c35c60713da3c
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
index 61cefea68916..e7c075818072 100644
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ b/sys-apps/hwids/hwids-20190316.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
index 0cd5e37d5255..7841497cc9a2 100644
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ b/sys-apps/hwids/hwids-20190818.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20200204.ebuild b/sys-apps/hwids/hwids-20200204.ebuild
new file mode 100644
index 000000000000..bca039bc1899
--- /dev/null
+++ b/sys-apps/hwids/hwids-20200204.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == 99999999 ]]; then
+	PYTHON_COMPAT=( python3_{6,7} )
+	inherit git-r3 python-any-r1
+	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
+else
+	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+RDEPEND="
+	udev? ( virtual/udev )
+	!<sys-apps/pciutils-3.1.9-r2
+	!<sys-apps/usbutils-005-r1
+"
+
+if [[ ${PV} == 99999999 ]]; then
+	BDEPEND="
+		net-misc/curl
+		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
+	"
+	python_check_deps() {
+		if use udev; then
+			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+		fi
+	}
+else
+	S=${WORKDIR}/hwids-${P}
+fi
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999 ]]; then
+		git-r3_src_unpack
+		cd "${S}" || die
+		emake fetch
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e '/udevadm hwdb/d' Makefile || die
+}
+
+_emake() {
+	emake \
+		NET=$(usex net) \
+		PCI=$(usex pci) \
+		UDEV=$(usex udev) \
+		USB=$(usex usb) \
+		"$@"
+}
+
+src_compile() {
+	if [[ ${PV} == 99999999 ]] && use udev; then
+		python_setup
+		_emake udev-hwdb
+	fi
+	_emake
+}
+
+src_install() {
+	_emake install \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		MISCDIR="${EPREFIX}/usr/share/misc" \
+		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
+		DESTDIR="${D}"
+}
+
+pkg_postinst() {
+	if use udev; then
+		udevadm hwdb --update --root="${ROOT}"
+	fi
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 0cefc0d756f2..af72ddb99ad0 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -5,6 +5,6 @@ DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 EBUILD hwloc-1.11.10.ebuild 2179 BLAKE2B 309e49cd136f302580d7fd6e6a5b3eafd49bab7c47405a484a24fa18edb1f6a5659cb049d3fcef3038d27da31c2a347c81b4af5d746d6fa505c7dd24fca16287 SHA512 c61678a61c8654bed4e609dd34c637c05740f570709cf9dc8f10c326998d5d36d314fcb0b64f260ecd38db9bc047faffe81fad132cdbea68932987f621921885
 EBUILD hwloc-1.11.13.ebuild 2160 BLAKE2B d20ca06e9da529dcf1ddf586c6780ab4b21d94cff5801adceaec1f3ac0c0a645867cb41750857d39b0a8d8beacda86edcdd129f410e36c2865f2ae81bd195d60 SHA512 648bb5ca62b89a5fb5afd0455a9c91b8c914d8d002bfb29f37416e753422cd0d38de4555a81c7520a00296e343fac22746ac5914ceb6030c867f8412eaeeb83c
-EBUILD hwloc-1.11.2-r1.ebuild 2147 BLAKE2B d95e6216ae3a23df22a30019e43b7e111abc494cd1fdf1c95d607382d74b7005ab4d3330a63db978195feb608ea8706f90ceb70cc0bde2c5c3c5eae29101b9d4 SHA512 86d6d5ffbf968c5ab09cc68f3d4e8831fca4cd3e131ca1045093d06e49f1fc0b0a604d627d754ea161d8942c1e7d73d48fad063f4307d6cc66e56ef42fbddb0f
+EBUILD hwloc-1.11.2-r1.ebuild 2148 BLAKE2B a2afb90bae4ee9cada778a106e5d56fe68a638abf49ff9f2c9d998a01c2041b10bc62343595a6a61890dcdd6fddd1a66f4f5772a4d8a4dd6cfe805dbf0f2e2cc SHA512 6201453ae186cf75d2b30bbc741779a058868e43bc08b0f227fe0a7f5ce7567b319ce17da75e23007f94c6fd6394879f238f45ef388c4ce023278d29627d437e
 EBUILD hwloc-2.0.4.ebuild 2031 BLAKE2B 68e7361b6a592f721dcd7ca7c7132341d19459fce95ff2dfcf9b784e5364f711ca8f09d9cadecc55b1d4e545a7e3f56f6cf910e087b02de8114478b7ad3377a7 SHA512 bf8b27c3587923bb22109680635d4bf67918a7f2a6135ddf5dc617a25f0740a3c8ebcaae5fdf2f62b1edfc4e5aebf91d08efcb870045605a74c93882bb464f69
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index aa8e811f3cf2..226964b97567 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index 898829013b20..824226133103 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -4,5 +4,5 @@ AUX 1.2-7-gentoo.patch 560 BLAKE2B fd025d5ea34118ba1be46c3038594e62b2178c1d96de6
 AUX 1.2-7-openchrome.patch 520 BLAKE2B ef6da2b6edfdb1c9abea047f08ecdeea259ea80bd68d35ab534b3b3ce665fd6f0d6b0362ed46caa1a0b9488480c5f2ec9c6771d46ab645f2edb03b87b7873eec SHA512 f8a301d7e2d6508e5a25ba0099a808b1494cd992f2f6066912504b077a26c3fe01772e689a25f80acce59c5eff8369e2e1e33c06a7ea935e9a50d79f6fbfa25d
 AUX 1.2-strip.patch 209 BLAKE2B 0ddb29fcc59a841fef9bd08eb996cb84047a282ca7107636e222021d2da355b532f839b03eac6ee8cc3fdbcebdce30056eac049166f113e510197b9e92428c0d SHA512 93033d62d6328dab7bef0f42f6f41352c60081523d86388cd5823181483cf9245dd55c163d1e78ab51e20187cdca4017c815ae86f6de14394fb6cd2724dda98b
 DIST hwsetup_1.2-7.tar.gz 10706 BLAKE2B 2d0e005629f631aa3ef22f44122cf934d23929c89ee4ca7240dcdd9c2898e622a78e494a057b9eed96045e8b1a7b54252f402311360e84d57007876cd9a5f630 SHA512 ef252c748ecf1fc17d107fa413a76df5d9daab84b10eb1ca2c5c320207e0be522c4ae6204c1c85c613403e40312c9c876bcab04eeaa1a2e1724b7bb1c6d41a1e
-EBUILD hwsetup-1.2-r3.ebuild 1729 BLAKE2B a4e736166c5752ee2ed810b8773d2c090bd5f679bfc2b9766c3b98e23320f6e19874dfb349dcf46715bb6cd5b6df9ce8d6119acb09405b4cc7285bd065fc34e7 SHA512 74ad6856a2a2de06fe6e4feae26a404f46d703f82f433c1e95b27d9bb50ae39d8f610979de7116b8c33493feabd11e661e86b4a40df0ccf4c2bfaefdccecb49a
+EBUILD hwsetup-1.2-r3.ebuild 1730 BLAKE2B c303d7187aa8a2d39950c1252f275940c06c717ba83d508cbd700be9d58d911ba80fad24433945b842328503e49e7abd42b0f25f987e1db407c611431b07d625 SHA512 57e7bb72a1e5ae9c8667b917bc9f9ba50a17d11732f3025008ffb8d4f7862cf8dfee0e398f327918666de0a6ec6dd60e7ea239f9107ff48bf29c178d66c5c88a
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
index d027099ea1cb..0ef317c5a111 100644
--- a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86"
 IUSE="zlib"
 
 COMMON_DEPEND="
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 4f1dc2bb53c0..e4a135004b5b 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,4 +1,4 @@
 AUX revert-openrc-management.patch 798 BLAKE2B 1e04e2f9c361eb0c125e5b23d0b18c58198ad968fec5965f43e6a5e8b8201d29c7ad2c05431d7107d99acc75ab397cfd90121f7f0618f9bb440a8d6687039c20 SHA512 8d8cc8886b5d731b7538425e6be10b4fa8d0c8b8eb946a64e885a0f9dc19c02d596a803716a8a6d681fb9e408650993b9c81ef23d2d0ab53485d65b15863ace7
 DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
-EBUILD init-system-helpers-1.49-r1.ebuild 873 BLAKE2B 63f0c2667c7d0b33933441306679e91ef0a73a954bdf5745aba5c2fb595b005200712dbf5ae4f839be4c510dd147a056c7be12e4393238729ccb1a9242ef2c9c SHA512 d871bd419612fadb89af12c02e7a379fcb569f1bc0e219a165090ec8bd1499adb934b6007e3d063da4440371176012aead4220a521a2b05620db479c73c8086e
+EBUILD init-system-helpers-1.49-r1.ebuild 874 BLAKE2B 5033d40fbc4ba0a3642cd428d2505064d31bc6464934f9fb5d9973d56471a754b16c4156b96214d7d17f1474f7ab2f90733bbcc6f58cb4695f4b73d023b6b967 SHA512 6aed470677dac29557ccf9be24ec3b12112f3d7b08be186c2c4ae4e5a9665e353564746cda3988b267a99f462bb65c31952e478eb4daf67fcc12726af4b5ea42
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
index 97888bcce019..beff11995830 100644
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest
index b99b5102992d..ba7c53452cb5 100644
--- a/sys-apps/input-utils/Manifest
+++ b/sys-apps/input-utils/Manifest
@@ -1,5 +1,5 @@
 DIST input-1.2.tar.gz 22809 BLAKE2B efef0701ccbdd1bf934049bf687f921194d1a4328882b94e7b2844ec55f25c5c2293eb76ff869d7ed44dbf5e8efe3b2ebd0bb5b657b2b411da5ef83b39520db4 SHA512 75a5e2d5b778ae93fb2d29ed7c8b0ec564233a385d88d0fe3a9e5ecd55259f14014bf269c318b5872ddd1379110565d354a1a043eb0a4693c724d52b6ca12173
 DIST input-1.3.tar.gz 23755 BLAKE2B 45a9d138f55677da596298d86e18af5849a81f5cff7397dab028c4939b6b385cc3116fc48bd23844edc36330d0f25456931fb903af9adcdc60aa21d8267cf725 SHA512 4f864301e6b7d40882327b26780db1d9b7e37215cb558653738f93b74ea2781f64676e41a440fbd2659f14bd30640c7af6c709315cce4dcc6a157d80ac2cb60d
 EBUILD input-utils-1.2.ebuild 803 BLAKE2B fb4ceb520a0799372d893eca5b86f2b0ab1b9fabe1fe42ce1a4bef730de5825de6be74858ac69d49f295f6ef27738242ca57be91da1dde773cc298527749761b SHA512 3a0ccbdda953cc234fa7405c5a4cd5fb590afa95cb084e17f8cec126efb191f9476db4f737fd5e3dc8dcb648836589d43e07c2591ccc7d662525acb64f3901e3
-EBUILD input-utils-1.3.ebuild 596 BLAKE2B b662551c3617d8e082bd3f62f2fab0576cf140b48967afedb494f88902b47719b8cc3a95fff809c0763af86bcb7577ee375922e202bf90af6d3ef8bb430197cc SHA512 6ee69e3c251baf57557add9cd25ad9192c5098036a09893410745a7de777d359dbe8e1a43310132df640ee0ee5b4ee70ef67f0a193af1adf2a1cdc47e16dea00
+EBUILD input-utils-1.3.ebuild 593 BLAKE2B ef39d0dcd798c5247db46a1d1659b6f7f34f31b78e3485a98e4a3f38a73c06bcdb7085afdced21bb9c48ed9e2472cc360c4647e4defcfedb9b8027b02518ce45 SHA512 8712a660dbc11dbfa9c13d61746692fb0ef1c6b59ac1fa1ea2bf4c62f2b7f64b1d21baad603b2d534e0c1a7cf2c88c34cf22a569aa05185e5f41e08b6b14abb6
 MISC metadata.xml 579 BLAKE2B d49e0ab5401b5894ed919e3f1d5ed066328ea3224c4390298eda52305900302b2ecc80cddaaeef5dd97c262e87006cdf4e3e9287e3b21f54275287739cbb0297 SHA512 91c9d5676036617c6fe240ae29c7d5ebd904bf048802b50d1a5e783dc656b85d7927f81d2955ae5638fd7e0c9789583a6feaba66bd6db8fadb64c247a26dc3af
diff --git a/sys-apps/input-utils/input-utils-1.3.ebuild b/sys-apps/input-utils/input-utils-1.3.ebuild
index ff1c3933d560..3c39e5a2ee89 100644
--- a/sys-apps/input-utils/input-utils-1.3.ebuild
+++ b/sys-apps/input-utils/input-utils-1.3.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
@@ -12,7 +12,7 @@ SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index 25f811480bd7..e52eb520d472 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,7 +1,7 @@
 DIST install-xattr-0.5.tar.bz2 16136 BLAKE2B 8973584d4819b9f500dcfb76ed0eaddce725b78e72dfa73ccff52c745e6f041926f8f930e5c5035fa888402c6b530207546098864266268dee2c897404bf7c74 SHA512 0bbde3a548fc5062041b38f90ac09c402f3cb0aebf4f0c331552fc44d39dd3d5e4d73bca0811de36c53af8afa5d22e543a7c90107d272f2a1b97c819b244eb7c
 DIST install-xattr-0.7.tar.bz2 16200 BLAKE2B bdddd4610e5fbb6f6ccfcdfb37abacff00ada5ca5fa18a6a4ad254b623ebe6dc9d0a2c8931f919f8623ed8f64e9c09584d6beabffbf3c72088f80383b198a2d7 SHA512 1cb4a4e72a9c5820081e032bd0d681ef985a228ad9bb025d5eb31c7b57678348d772f270def803376f2d9d4f8e6ebcede9629ce65eef917b3e8a06d6f40eec44
 DIST install-xattr-0.8.tar.bz2 16359 BLAKE2B 25c483211ea6d01f46d9739fd3f1327e543e8b986a252d97e8b012ff6169a9b6430dc0ab7c184bf04c6665182c242eb37f7059d2d23cecececea723bde74cb56 SHA512 3af95a724d95286854767fe28679b024de8d257ce2d21addecbd40906e10bf48cfd4263609c6c2f436c6a807e91d24118110fda041091fadbefd848c892af778
-EBUILD install-xattr-0.5.ebuild 910 BLAKE2B 99504c17e85a6c5fd9a5d17f73ffb929879ac8f55773bb48e844405371ecc1965b1816a077d57c1093e2f20f4bf8edbdd7653037f486be4648f542f58777dd80 SHA512 edcb914a669002180eac241d124805c8017cd446405f3b8c59a4341f655620385c192e60ab8f681c0c336c3b30887c8cc855472a2e5a4e638790354e9eccd5e8
+EBUILD install-xattr-0.5.ebuild 911 BLAKE2B 7f2cae2cbb487ec90dacc3e3e3cac0ec6613224f9b298b79d57e142b1456e96d77349aa5456658d1da318626b2eb7e14856ffe930e85ca4c3e0b7c5770f6f1c6 SHA512 949947b2d145494b84493a8ae2d5429ab31d14f0776c6549bda99e03ed8f31b7535c606aac9e714aa38350a82b0577bda3a1f542991f2cb88fdf69781a0b0394
 EBUILD install-xattr-0.7.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
 EBUILD install-xattr-0.8.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
 EBUILD install-xattr-9999.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
diff --git a/sys-apps/install-xattr/install-xattr-0.5.ebuild b/sys-apps/install-xattr/install-xattr-0.5.ebuild
index dd1a1669be23..8d1cc51ac3cd 100644
--- a/sys-apps/install-xattr/install-xattr-0.5.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 4cde74a6ec0a..771fe0711c39 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,6 +1,7 @@
 AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 AUX ipmiutil-3.1.4-fix_lanplus_build.patch 485 BLAKE2B b4a5c7092b6ff6ab54c05b848d6f89b161cf79e271f8dd77eecae0a1fa523db83539a258c227d7b90f7e11b9103acf1f7ab4fd354654bd2e7aff8d8bf89a02e9 SHA512 270d94131e434a0be89929815f9ce2e52e2dfe77e69758f5201a837215fe364c622c22fbc9db03042427aaf7629ce09a896b1ad532443c57bc8d0327cae3d30b
+AUX ipmiutil-3.1.5-fix-configure.patch 5817 BLAKE2B 3a953a03d495a453d99dae70ea29ed95e03ee5d4da6a1a2aab42bda289f43725fff9a5721d7a08538f9a5f35b36ae956e5da493a50301fdaf487a8aef05ca0ba SHA512 c1f2c13f1aafc4244b1a3cdf2da23d4ff9e982613063b2e8995c0003db6cb31e1facce9d590725f5e02789fcd62c3b334ce20e1b8815b99c002bc2f90d9fa065
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
 DIST ipmiutil-3.1.3.tar.gz 1698835 BLAKE2B a540a4522a22f98ad47c89e59f371e5304583cfaab348154dee366a058d78ca6d6ecd6003d8b49c08e8247d38254f7abf48ee05672ddd678566d40a66f63c912 SHA512 bd1f95b59583a07a5b6001b40e59269f25eb63b69e33f7fad6dd40136e1ea7611e647eb5ed2e2a9746944bde2dc2a3aa2def44238947693d75d9ca48697e1b99
@@ -10,5 +11,6 @@ EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4
 EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9
 EBUILD ipmiutil-3.1.3.ebuild 1431 BLAKE2B fda36080e5844588b7a89623b6f92486361580ed5eda666c821e6ef10cd00da24a3beecdc419f362c2abbbcc754d061ddcd37f66fa574d2bd3ec69c2f86d3037 SHA512 6dcc5aba9441276c1ddf851abc95dd6108d255a02355dd3eb7189c28aba30ee3076e1a388400305f723f8e80be5d5bdbe1047132262369aafbd0ea14f2b029d5
 EBUILD ipmiutil-3.1.4.ebuild 1578 BLAKE2B 662fda0d6c6a0353e72d6c55a437c15d77360d8baacd8bccb8c2c2ec015302c1b68164666a073fd710f0cd1e66f094c4c70fb67c3e931f08e1d03334f1218dd8 SHA512 d1d6294f4e521b5f01e07163d255569d1e6e2112189a451dcb727d3f7d8d6be00fd0380e6147a61b8e395f42fd6bbbd56fa700ef492cb0d7ebdb0f3650912307
+EBUILD ipmiutil-3.1.5-r1.ebuild 1574 BLAKE2B 5204ae0d621e97ee5510ed3b31d0ac02a2923a5a4143d7ef9691568630e98e37896a5f060f7d54599a39d50fec9a00b11dbb1eba375b4e032f70bdaadfccf783 SHA512 e16e0896688593a149aedc91168f79821bfeaedc16101b0373a708269c3201ce59853b2277b42559628eb1193f6e039f6496cc58e6d1193ad7af3d45908630a6
 EBUILD ipmiutil-3.1.5.ebuild 1578 BLAKE2B 662fda0d6c6a0353e72d6c55a437c15d77360d8baacd8bccb8c2c2ec015302c1b68164666a073fd710f0cd1e66f094c4c70fb67c3e931f08e1d03334f1218dd8 SHA512 d1d6294f4e521b5f01e07163d255569d1e6e2112189a451dcb727d3f7d8d6be00fd0380e6147a61b8e395f42fd6bbbd56fa700ef492cb0d7ebdb0f3650912307
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
new file mode 100644
index 000000000000..8748256be5f6
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
@@ -0,0 +1,180 @@
+--- ipmiutil-3.1.5.orig/configure.ac	2019-11-25 06:53:08.000000000 -0800
++++ ipmiutil-3.1.5/configure.ac	2020-01-25 22:55:20.577345441 -0800
+@@ -80,40 +80,46 @@
+ #  fi]
+ 
+ drv_landesk=0
++LANDESK_CFLAGS=""
++LANDESK_LDADD=""
+ dnl configure for LANDESK libipmiapi or not
+ AC_ARG_ENABLE([landesk],
+-    [  --enable-landesk       adds landesk library support [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-	    drv_landesk=1
+-            LANDESK_CFLAGS="-DLINK_LANDESK"
+-            LANDESK_LDADD="-lipmiapi -L../lib"
+-            AC_SUBST(LANDESK_CFLAGS)
+-            AC_SUBST(LANDESK_LDADD)
+-    fi]
+-    )
++	AS_HELP_STRING([--enable-landesk], [enable landesk support (default=no)]),
++	[],
++	[enable_landesk=no])
++
++AS_IF([test "x$enable_landesk" = "xyes"], [
++	drv_landesk=1
++	LANDESK_CFLAGS="-DLINK_LANDESK"
++	LANDESK_LDADD="-lipmiapi -L../lib"
++	AC_SUBST(LANDESK_CFLAGS)
++	AC_SUBST(LANDESK_LDADD)
++    ])
+ 
+ dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
+ AC_ARG_ENABLE([lanplus],
+-    [  --enable-lanplus      enable lanplus support (default=yes)],[default=yes],
+-[if test "x$enableval" = "xno"; then
+-	drv_lanplus=""
+-	LANPLUS_CFLAGS=""
+-	LANPLUS_LDADD=""
+-        LANPLUS_LIB="" 
+-	LANPLUS_CRYPTO=""
+-	LANPLUS_SAM="no"
+-	LD_SAMX=""
+-else
++	AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
++	[],
++	[enable_lanplus=yes])
++
++drv_lanplus=""
++LANPLUS_CFLAGS=""
++LANPLUS_LDADD=""
++LANPLUS_LIB="" 
++LANPLUS_CRYPTO=""
++LANPLUS_SAM="no"
++LD_SAMX=""
++AS_IF([test "x$enable_lanplus" = "xyes"], [
+ 	drv_lanplus="lanplus"
+ 	LANPLUS_CFLAGS="-DHAVE_LANPLUS"
+ 	# LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
+ 	# LANPLUS_LDADD="-L../lib -lintf_lanplus -L/usr/local/lib -lcrypto"
+ 	LANPLUS_LDADD="-L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto"
+-        LANPLUS_LIB="../lib/libipmi_lanplus.a" 
++	LANPLUS_LIB="../lib/libipmi_lanplus.a" 
+ 	LANPLUS_CRYPTO="-lcrypto"
+ 	LANPLUS_SAM="yes"
+ 	LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
+-fi ])
++])
+ 
+ dnl Configure libipmiutil.a for lanplus or not
+ dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
+@@ -128,21 +134,28 @@
+ #fi
+ 
+ # strings /lib/libssl.so* |grep EVP_sha256 
+-dnl configure for SHA256, build lanplus with SHA256 support, uses later openssl.
++dnl configure for SHA256, build lanplus with SHA256 support
++dnl requires openssl-1.0.1 which was released in 2012/03
+ AC_ARG_ENABLE([sha256],
+-    [  --enable-sha256        build with SHA256 support, requires later openssl.],
+-    [if test "x$enableval" = "xyes"; then
+-	LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
+-    fi]
+-    )
++    AS_HELP_STRING([--disable-sha256], [build with SHA256 support (default=yes)]),
++	dnl action if passed
++	[],
++	dnl action if not passed
++	[enable_sha256=yes]
++	)
++AS_IF([test "x$enable_sha256" = "xyes"], [
++  LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
++])
+ 
+ dnl configure for EKANALYZER, build with ekanalyzer function enabled
+ AC_ARG_ENABLE([ekanalyzer],
+-    [  --enable-ekanalyzer        build with ekanalyzer function enabled.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-ekanalyzer], [build with ekanalyzer function enabled.]),
++	[],
++	[enable_ekanalyzer=no]
++	)
++AS_IF([test "x$enable_ekanalyzer" = "xyes"], [
+ 	OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
+-    fi]
+-    )
++    ])
+ 
+ GPL_CFLAGS=""
+ CROSS_LFLAGS=""
+@@ -152,17 +165,20 @@
+ SYSTEMD_DIR=/usr/share/ipmiutil
+ 
+ AC_ARG_ENABLE([useflags],
+-    [  --enable-useflags    include environment CFLAGS and LDFLAGS.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-useflags], [include environment CFLAGS and LDFLAGS.]),
++	[],
++	[enable_useflags=no])
++AS_IF([test "x$enable_useflags" = "xyes"], [
+ 	   CROSS_CFLAGS="$CFLAGS"
+ 	   CROSS_LFLAGS="$LDFLAGS"
+-    fi]
+-    )
++])
+ 
+ dnl configure for standalone, with no lanplus or GPL libs 
+ AC_ARG_ENABLE([standalone],
+-    [  --enable-standalone    build standalone, with no GPL or LanPlus libs.],
+-    [if test "x$enableval" = "xyes"; then
++	AS_HELP_STRING([--enable-standalone], [build standalone, with no GPL or LanPlus libs.]),
++	[],
++	[enable_standalone=no])
++AS_IF([test "x$enable_standalone" = "xyes"], [
+         GPL_CFLAGS=""
+ 	LANPLUS_CFLAGS=""
+ 	LANPLUS_LDADD=""
+@@ -176,27 +192,30 @@
+ 	   # cross-compiling, so link with -static (e.g. Android ARM)
+ 	   CROSS_LFLAGS="-static"
+ 	   CROSS_CFLAGS="-DCROSS_COMPILE"
++	   # TODO: how can this be effective? Configure only converts Makefile.in -> Makefile
++	   # Configure does not convert Makefile.am->Makefile.in
+ 	   sed -i -e 's/^# ipmiutil:	$(METASOURCE:.c=.o)/ipmiutil:\t$(METASOURCE:.c=.o)\n\t$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o) $(LDADD)/'  util/Makefile.am
+ 	fi
+-    fi]
+-    )
++    ])
+ 
+ dnl build libipmiutil with sensor modules
+ AC_ARG_ENABLE([libsensors],
+-    [  --enable-libsensors	 build libipmiutil with sensor modules [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-        LIBSENSORS="isensor2.o ievents2.o"
+-        SAM2OBJ=""
+-    fi]
+-    )
++	AS_HELP_STRING([--enable-libsensors], [build libipmiutil with sensor modules (default=no)]),
++	[],
++	[enable_libsensors=no])
++AS_IF([test "x$enable_libsensors" = "xyes"], [
++	   LIBSENSORS="isensor2.o ievents2.o"
++	   SAM2OBJ=""
++    ])
+ 
+ dnl configure for GPL build or not (GPL files: md2.h, ipmi_ioctl.h)
+ AC_ARG_ENABLE([gpl],
+-    [  --enable-gpl           build with some GPL code [[default=no]]],
+-    [if test "x$enableval" = "xyes"; then
+-        GPL_CFLAGS="-DALLOW_GPL"
+-    fi]
+-    )
++	AS_HELP_STRING([--enable-gpl], [build with some GPL code (default=no)]),
++	[],
++	[enable_gpl=no])
++AS_IF([test "x$enable_gpl" = "xyes"], [
++	   GPL_CFLAGS="-DALLOW_GPL"
++	])
+ 
+ dnl Does this Linux have systemd enabled?  Otherwise use sysv init.
+ AC_ARG_ENABLE([systemd],
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..dd9d9ba74e65
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.5-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+	"${FILESDIR}"/${PN}-3.1.5-fix-configure.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
+
+	# Don't compress man pages
+	sed '/gzip -f/d' -i doc/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256 --enable-lanplus
+}
+
+src_compile() {
+	# Ulgy workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	pushd lib/lanplus &>/dev/null || die
+	emake
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	keepdir /var/lib/ipmiutil
+}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index d1399c0d4cfe..0f200baa211f 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,11 +7,11 @@ AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad0
 AUX iproute2-5.2.0-fix-sys-queue-h-on-musl.patch 2579 BLAKE2B 86e81152b51a2566060469d4585ab092be0f5a62bad11a24e086bf2cdea78db7494dc5c4692e3c71ed108732ad3a59e444c423eaffd356c919ca82445de75f6a SHA512 9b0875781f20c0a3773d9c0b0f051ce455fcbf3cedb92a411ce9c873f162ca6b25ea8c564fa971d7c56e6e3effa3a9cb0a3057518a16de264b100b7b73a7d64c
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
-DIST iproute2-5.3.0.tar.xz 742660 BLAKE2B e2152eb6c7d443f54bad0aec0cba23656c1defafc53f10130b63288f070e6e77c27a78a3f9bf6f6d14be3490eadd583a779f5d44ec23d16535e14abe04feb848 SHA512 c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157
 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
-EBUILD iproute2-4.19.0-r1.ebuild 4386 BLAKE2B edf0b109425c96b752459c0483ff5a3969e8bcb0cd0011d24e886084e6b4354d21f4f8575c9786136698e10347513c8a9fd1bcf2cb99a88851d1117eba19c39c SHA512 5a76cab28c2d9351c107717cadcfa1439d19f9dc6e4d9aa0498f6678f04362bd327eff16c3460caa74cb02a25e06e6654011c66bac9c27a0def2b18f7560e469
-EBUILD iproute2-5.2.0-r1.ebuild 4480 BLAKE2B f7f2bccba971e15cad8250925623c48f3b28589b0209d13ebaad645deae58abbcfda5bd92c6f77277239c3b8980f975dc0c5b3415c4012007173e9faba5937e4 SHA512 ea32ede9b3c3368b8d98a9cf7b99dada170cb37ec34732229f07253295f61c0aceca6c4903ed987295078ed11fcf44c33ab5aecb41e6e96258cf064a7ceacc85
-EBUILD iproute2-5.3.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
+DIST iproute2-5.5.0.tar.xz 747756 BLAKE2B b9cf368bd0a082c1d613b8089ed425d50525d886a56b2353439ba3fa5c7fedcb40deb090b78c23e14d61cbffebb5ad7de13c08afb2b18841000a3b8e08861b63 SHA512 a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78
+EBUILD iproute2-4.19.0-r1.ebuild 4387 BLAKE2B c286879bdc8e4910af49170daab9a6a06d9fee11324b30c8a2bf2c7a902412623554e84ac75ab0bfbadae9a99f79903bb37a594ad50f32db63ded4c491ce7de5 SHA512 1c378aab94a08065c9fff812b0745279206c25599343485185a17e70c44a96555a3877d6c0d5ce6501c7c30ee7fe0037de3abba81a2b4b0f001d9131f5014339
+EBUILD iproute2-5.2.0-r1.ebuild 4481 BLAKE2B a20b17c75ab3b6c6d2178a5f91672d34c513e5099346257769ab27726491073e6b6b13e860257f5f3b8553796ab159bdc507a42d2e4b99206f1ff31caa99d55e SHA512 2396905be8efcc6fd080d45a6ebc754acdce08e39d8dd76b4c59639bdba12f4cf21b3e450ea18ee4f714b08a52617637176a801ec0264019703967f7051df07e
 EBUILD iproute2-5.4.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
+EBUILD iproute2-5.5.0.ebuild 4436 BLAKE2B 94c362ae57a596e69c689332a249ea4afea060cbed87ce8a55cccbee21486112b150716762c462f65a025c41607c151d9123176c631dd402efdd528ed3023865 SHA512 bcf437aca85d661ad08061d533dc934e14c802bb8c498ba88700e016935c1221f379bd055c954cc2dbe1427ae86a3d638ca43fc8d8731ae0df5426689cd06e0e
 EBUILD iproute2-9999.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
index 307344b862e8..e0e3327e66ce 100644
--- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
index ef2a2624c012..6b5742980f32 100644
--- a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.3.0.ebuild b/sys-apps/iproute2/iproute2-5.5.0.ebuild
index 9d1acf39062b..e40c1b857cee 100644
--- a/sys-apps/iproute2/iproute2-5.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.5.0.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/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index c62edec26f34..432db31429dc 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -4,7 +4,7 @@ AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb6
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
 DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13
 EBUILD kbd-2.0.4-r1.ebuild 1540 BLAKE2B 9e41eef250e5ffd8889c06bcb20d8e1c70c34bb4926661a590fadbdf7ee4de88183260655d3af27e517ffaaed94f156fc1ff3567240231c976d0f0d3e95d7f30 SHA512 0944c535ff19384acb55f70f8a6ef56dca4e49438466215ac17024228708ec0f6e9dc950dfa236889dc83c2c750e40de73a011a63d2f9922dc18bb3823155955
-EBUILD kbd-2.0.4.ebuild 1374 BLAKE2B 144aa60d2ea38b74356c8df057e135d6dfdc4f7d693f0cd0a5ca301212a926f98656bc9f6b64bb57cd1630d767f14c6c3cacf775fcb31e4afee7dc88d978ac14 SHA512 b2de336c6d3a4d13a0c819b3b02295154997e47db271bff09c354319ce016d938d4ee43f62b0583b4a8975e6fcdd28c475b8e7de42ac4557af43fd3efcc5a8b9
+EBUILD kbd-2.0.4.ebuild 1375 BLAKE2B 82bbd1a5201a72d197a63bb38d9c37676a7251873d0cf38c5bdaa0c9ecbcf90c29deccf6da97d7c648e0b0661dff9ed6b1a4d84e7c9989100e60c01e44695c45 SHA512 fd71c4df0fdbd3b4a4152783a4a6c2a90bf05476ea120468baa4e6f9a9df7ba57b4cfc51cd6391e9cc0841c35c138120998140e749149dfcb826ea791f5cf905
 EBUILD kbd-2.2.0-r2.ebuild 1609 BLAKE2B c59f2bbdb279c7bea12c76e49f0ba814028a11f53810b254ec4c5984dc1109705c229ac72e3e9273d9437ddd1f99885aaf9bad66e44fa09d727db55ea48a5092 SHA512 031ef06c5c216a8300c482b168f65490e9204477a4a696f60d8909cafc796fe908bd718bb4a0d64b4f491be26cce3544f8a522d70089ae63b7e56936d1b20225
 EBUILD kbd-9999.ebuild 1524 BLAKE2B c3b992ed95e88346f0bc09fe3dcc31136e010b81d15beca23d68edd1a10a487a6189a5ca0f74a810aed7a89a208eddab5253763ac8cb797c7d6d045df7c68311 SHA512 04456ab7511de30f511e61cd491a101b17342f5f68527510cc89bdc57e55017841c8f8ddca9179b57ff940eaed9d26091f8d87a067c060400d79f165a5a04e7d
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
index 9dde0feca4ed..98ccd7585927 100644
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 inherit eutils ${SCM}
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 7ebe7f32d1a2..791d1a532f39 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -4,5 +4,5 @@ AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
-EBUILD keyutils-1.6.1.ebuild 3878 BLAKE2B 203178a35f492a10db8e001cc5e4dbff9e78181af1740770f687737577d40fa56451007944b61fe42cbbe4c6e02f034f8dedcffbf813fd5cfeaa79295693c0e4 SHA512 9d4eb304d620f94b9b148dbe6afbcc8c221b8a4d857984b0e905c65a95f1ee57edad1452e7d58fee27e127118e1734acef58dd7e3fd1f04dabffe39859f97e1e
+EBUILD keyutils-1.6.1.ebuild 3879 BLAKE2B 696bc35e0fe2dbceabef6b646a612fe875154e4430bccf6ba9822e89305c0c73a68d2f2e601cdc5fe0e62c93364fd6fae6257b5f0671c18c06d93e47cf3f2b51 SHA512 6a08c549c69d9c20aa7de8c8772a6ac7e86b8e3ec87db760b143709b79c0625f2e831708ccaad5afb8f0fe567812f4aa0f4d342818bff410df12249bfc169298
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 007040d08970..05b4fbde1d93 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 835fd7a7aa64..183d6184b0e6 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,7 +2,7 @@ AUX kmod-26-libressl.patch 4014 BLAKE2B db7a2ce3206210cd0358d136c8d0568dae077399
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
-EBUILD kmod-25.ebuild 4920 BLAKE2B ceebc0887a34d75567e4021ea9ceb2ac55efac20b1ed3aedb6a6d85e754b82c10ac5c0b7091c681ca17294c81371dd8afc9da35752bf4a0ebaf85963526ac359 SHA512 97ba9657e7f12b0cde5528d1b7103f37418ba4f8067065f7f9f7dd2492a3ec4a7401b72a63f5069b8956b762ed53863c8bb76b7ef7b8369a20f6b865716bba79
-EBUILD kmod-26-r3.ebuild 5097 BLAKE2B 66ffbd36540c7fca42d7ce3543148078fd014b50c4ae0ffdd25553528d9aec44045b3eda1995b2516fcdbc7597f227ab93a9666fbe958adc5c3509a41cf4de5d SHA512 2cf272dabc083dde5129255afb1513fafb6c2f887f75e8eccb143472058dc48614c7a3b793b192680988cc438cfc90457e1b0c24dc6835b486dabf305e80787f
+EBUILD kmod-25.ebuild 4921 BLAKE2B ffbe75f8cb466411e72d2c9620a09e5d80549f7b41e3e8594ed1bb4e920c8ca1058cae1f7a136ebba91a6e4f7f90005cc6ab5a6db6ebe2bff3f9915e5e227f02 SHA512 a697c2d66d9722467c25cd39c6a88ae13c4459d91b881e02c6d850e2922551d2868894c86db13d35768d05fbcb30035db0dfe12eef923761d4d7044bab875004
+EBUILD kmod-26-r3.ebuild 5098 BLAKE2B d13339f07af79a3c807d95f3625bca52d8f1013181fcb2957afe771f0b87916604ca42246c78e5f81e396a88ebec63fe43b727d8543098babfc1e379cb7eba1e SHA512 74aeae5ea35c11439cc96628aca0b3e1e77e3650f97f8cf7c65c236b3c0491d0cd49779cdb369bd11d109536e82e3dcf8c02c557ac42e3798d84a7ab94d79f02
 EBUILD kmod-9999.ebuild 5042 BLAKE2B 7d9fd11c684fd765d0c33723bce8e8052ceab3a29af68636e196ad387e078eaf946588ef67e774756a3dd98e0b4773ce70137f10f21d4065554cfb2040fd07c2 SHA512 2cb592efc195f14862b6582a6929e65fe62e39b83ea6a492dcec2ce309c27a1ec17530fd99bf74802df697778e9f176cdf739ccaea3bd2f0c2dde983795b36a0
 MISC metadata.xml 612 BLAKE2B 9459d066baed069ea60ef5fb72dd5a63a9980f041573aa24d67995a69539b468c31be12c96cc2dc396183c8b98064f8d30dbcc7cca346318c1f2356cb3037879 SHA512 4cce069924c603b69f08c37d83379af6889678106df5d4aa62d758138973277ab6b79ed021939bd8cfafefd27173404b7c155ba8ffa89efb9bebf458327be36f
diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild
index bb4d910f6e44..e6938000740d 100644
--- a/sys-apps/kmod/kmod-25.ebuild
+++ b/sys-apps/kmod/kmod-25.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r3.ebuild
index 05daf07d4139..068cb7979691 100644
--- a/sys-apps/kmod/kmod-26-r3.ebuild
+++ b/sys-apps/kmod/kmod-26-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 4348d0e12c05..fd889b0b33f0 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -6,8 +6,8 @@ DIST less-550.tar.gz 347026 BLAKE2B b033cb09d1bb9624c56db14084c73e5154e36cebd3f7
 DIST less-551.tar.gz 347007 BLAKE2B 033a043340f888616c8342703597b9232ae1c8e62775d3ee0187599c3d9d9824fdbc7543ca90cdc535b2077a8bcbefe322887ad29289620191d8cf6ff86ddd04 SHA512 ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585
 DIST less-554.tar.gz 334708 BLAKE2B 3d7bd6376eb21060f16f52848b3ba96cdec4d5229c390ef24871eac91e4f35634e159e58c8c6db06072b5e943456deff49a25e99264e9283643966daef687bf8 SHA512 c37c645d1fa59d64414ebcded1b7faccd339a4d67654b14ec5862b2fe795dbd052ba9b65aaafd06f83a5c276d11e9cef5be4fb49329d14955bf2533dfcffd540
 EBUILD less-530.ebuild 1359 BLAKE2B 2ae5d8ef5ebed36e66049dcbce63d6c97e49705e7f48fbf0addf164dca6d1f796e93350096a0acb03cacfb85b2ea331bdb989606c1bf325cb8a0e5fa4243f839 SHA512 3d7c390e687b4d6e053e614e21c8f4ed345014473f5c8dc2a9b0145dea7b06835b28daa46de5008e7fc4241c73c03d67c0ef970b6560ec6aa8fc47a300684b23
-EBUILD less-531.ebuild 1386 BLAKE2B ab942655a582a7ed542e826adfb40935012411a2aa45e6af4546e74495e364acc342c543c648cfe829bb3812b0fe824772f9e3a02a038158ce758593d039f760 SHA512 1741976400bb4645cac27728a958d923de4c15e8e19f38dd1e839ec9382c7a9b44a75e11afb052ec66c00e954056968551a14f2c6de0f0d5ad0d3f9159176212
+EBUILD less-531.ebuild 1387 BLAKE2B bb4210c752ae2fe3fc2e3102b2f7de6b3890ff7b83ee718927d2b38446150ca068126ce1b0a9cc67f615a94517c4313aacb1fc596c5399f5cd5e5c3dae98c0c7 SHA512 215d5f0f6e69cfc5e8ce4514978c5c45df2d78d0b1874730c3ab34dae827af058663e45bf6f094c8af72f3db7451bcb28e1a73d5bb7435b192b30fa335980488
 EBUILD less-550.ebuild 1405 BLAKE2B 68bbf34c52d0072d8f57f6cd1eb7db308fc7499d1df618757c1d0c6ecb33e7c52bd2ab2aec4720b7be8a773b7626a5fcf4a96809de7a004dfb882ae7bac5cf44 SHA512 ff4df04a75a108c25d485e337c186a28a84361aabcfa57ee74b80dbdf1bc60ee666ed747290a204840f1cdeaa8c155c6789fa8186a320718d2aea4307b1cef2e
-EBUILD less-551.ebuild 1399 BLAKE2B 3cc2ffa05b95b874eb5eb20b5808dd6bb36170973cffa235a93340f24a0666dd2a80b3f71471ad192750b879e1a274cc11935cd6e71771efdd38160d715aee88 SHA512 27b7b3aa6b5388ab73e270083951f92ac92b6611ac3f644a394a7939529116355d4a9511e67fb8fc0de6770e79a70df3fd4cf24a962b925ecf2fa64190cf62fe
+EBUILD less-551.ebuild 1397 BLAKE2B 1b62aa3cab4b9d9e053c565e72dda992119185d5fe9300de62e6e21ba5eec14dbea4510b511e5d98d9594bf151546fa47e53e4ab0c32cb5ca35ccd914ab3ed5d SHA512 437159c990d165c39341d8f21af02ebed61ca8c935e640c5d497eb669b1e9eb100ccac6b7a75b37cfa8bad3c307aca00d5d77b5201d3887d95ffff94281a5531
 EBUILD less-554.ebuild 1405 BLAKE2B 77345efbac9171945e68394d2d6cef5b1ca7bdbda8507d190cb3696791c7e09d2431ce66c68b98643d3ab99e729a6d62941ad73a68178d479c29db0736c632e6 SHA512 8bb5ec18b63b0ec4ffc0b7d2426f771ab3413952a1e75a5e3b9889ebd3e71d7590ea6a7e283d6fc8ad554cedabdc42526b4cb0511e98709b7671812d9848c4e8
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-531.ebuild b/sys-apps/less/less-531.ebuild
index 24ccdc1058a7..42debb44bfe4 100644
--- a/sys-apps/less/less-531.ebuild
+++ b/sys-apps/less/less-531.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-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 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-551.ebuild b/sys-apps/less/less-551.ebuild
index 6891584807fb..ae12c5a38159 100644
--- a/sys-apps/less/less-551.ebuild
+++ b/sys-apps/less/less-551.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 3b54685322b9..de4e4e32cbb1 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -11,7 +11,7 @@ AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc0
 DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
 DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.5.0.ebuild 6478 BLAKE2B 86a3662a799b7fc98c6f4e743bd2922067fe38105a000e0c081dc207711b1c23c72712645d7beb16f31087cd8e952a06cbefb85b1870440d1646dcf29e5dde79 SHA512 080128a13e5e32b88365eb091708d61b0cb1dc523740a3a22828ec34876977817b4f50363ef0f361d27b853a80004a8aa03566406a12eaf27c1c840de49ee735
+EBUILD lm-sensors-3.5.0.ebuild 6479 BLAKE2B fff78d53b823063e4324941a71b4f0027db1b7ce7a4fe96a1a8eb4987074f75de331c9cf063585d22659fcb4e03805a0310f1864317ccf52026b2457f8a56699 SHA512 ae7008b8dd9a0aeb20d96e160441d3f5c112ff40e4d80dee8d1501477211afd1c7aab70701a06e69a974dd2d7d1b10e8a3fdfede48674f17726e32c0d625c411
 EBUILD lm-sensors-3.5.0_p20190505.ebuild 6445 BLAKE2B 3e11c346ac68bfbec68d63ae766a5737cd59721008b4e04bb80ed6d73b32b3db64a98e2fd1ede5c5b13d487131d74b984559599299614b6c3d10856b73b1e41b SHA512 1edbf8904e2d43ae0ecd72e1b3b93f19387c42bd7d8ed7e2de737f1406dee1243bce43cf4c37ed5e6c0d5992f5f05522a34429e82a608c9f3ee3fa203ffd3c94
 EBUILD lm-sensors-3.6.0.ebuild 6445 BLAKE2B 3e11c346ac68bfbec68d63ae766a5737cd59721008b4e04bb80ed6d73b32b3db64a98e2fd1ede5c5b13d487131d74b984559599299614b6c3d10856b73b1e41b SHA512 1edbf8904e2d43ae0ecd72e1b3b93f19387c42bd7d8ed7e2de737f1406dee1243bce43cf4c37ed5e6c0d5992f5f05522a34429e82a608c9f3ee3fa203ffd3c94
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
index 5a11eb1e7cf8..06e8f04e82fe 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/5.0.0"
 
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 67da4d87afd1..cfb116243571 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -2,7 +2,7 @@ AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab47832
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c
 DIST logwatch-7.5.2.tar.gz 475277 BLAKE2B e3d841749af4776da84646444dd90bb084dc33712c1a6eeab87d46cb267656527008505f78506168b7ded40f3d0f8209c205249c2f953e6ee8af7a6cd82833d9 SHA512 157486143ba12167f6c50c778372a4295db3744878607bceba8e0813357651bffd8924ef5ef41a4fbd20811c020dcc031eb354a0f52b8eb6d9aac197087c2bc5
-EBUILD logwatch-7.5.1.ebuild 2411 BLAKE2B 61284e1c8ce9cba41cf303004cecf241c32740f929b00c9f95ddae89e19eb0ba73924bcafa3405315e8156f86dc9c7bc5adb5a8649818d14f6066ba47417ce4f SHA512 548be90692ff2532dcc36d95ce04f9c156d05939180ca67cf6bbc90ba25eb37e214325dddcd817185f8efc8707112ce57e81977858f0a18d114522f330b76528
+EBUILD logwatch-7.5.1.ebuild 2412 BLAKE2B efc44702dcdd28ba2cde71d855f94101cd07b9952dd1579a868205d4d3a6d846626952f66787d4c802ea48c5c478ccd67dedbef3b6e56f8fb4097f727df6b657 SHA512 43063af5911cb4500b9c030c2b26e96fb350a66f57d1f931589b5c2c9592fbf43d329fd0951b82941071dcbf4f1f68e6f3cfe5a34bd1db0d3866a1fdfb1be38d
 EBUILD logwatch-7.5.2.ebuild 2420 BLAKE2B ffa1af49cd9de0c37962d6d7a8f51f962a8e123081302b574f8600f399867f66dd15ba8ad2768914e5a88226cac739c1ad52ca326e9aebea5eb2a229600dcbb3 SHA512 a8dfdb266f4bc360a591da1fd4572ece32dd57a33af7bb7d2359754e6ffc004c773111a42e3ec3ed5d5d04ae61e788b78b09286fbd487b3a8ac9005149d3fbdd
 EBUILD logwatch-9999.ebuild 2420 BLAKE2B ffa1af49cd9de0c37962d6d7a8f51f962a8e123081302b574f8600f399867f66dd15ba8ad2768914e5a88226cac739c1ad52ca326e9aebea5eb2a229600dcbb3 SHA512 a8dfdb266f4bc360a591da1fd4572ece32dd57a33af7bb7d2359754e6ffc004c773111a42e3ec3ed5d5d04ae61e788b78b09286fbd487b3a8ac9005149d3fbdd
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.1.ebuild b/sys-apps/logwatch/logwatch-7.5.1.ebuild
index c555b1d77995..cc479e10fb52 100644
--- a/sys-apps/logwatch/logwatch-7.5.1.ebuild
+++ b/sys-apps/logwatch/logwatch-7.5.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index ae8563b22980..611ff26e2946 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,4 +1,4 @@
 AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
-EBUILD lsb-release-1.4-r3.ebuild 906 BLAKE2B 4df8a89ddb925949f553785ab113300cc271aedab569e1ef1569b49a7b3cbd7fe3968c2c568559fb281a03e6e6dae21d970cd40ba318d7792660637c0c6fa97f SHA512 b31d8616e8721a54ea3cb79572b35af5a9c650081760a9645fca87ef586a01296c31ebfaf61073301e498d357a9accce20203b2ea4a57cbcb10cdd53a5b2da7c
+EBUILD lsb-release-1.4-r3.ebuild 907 BLAKE2B bda6d6cfa7869669a4d6305be3c03cf952383a1720ae2033743662841c11fbef57e1bf4b84fe111c9236f4fd9f54725987f2433d12d5e50636fd3fafcf209982 SHA512 8282a2cab7f8875ea9a01a03f7fb5e5c9b1c70e47ce3e7082fb6f44fa448b3fec02457ddb7d65096c20846bfc026d145bf9d588609d169c906535efd6f98ea3f
 MISC metadata.xml 808 BLAKE2B cb931504b70813859d35bfda6408cb28f2bd56cb4f0cdca944c051b9731c2c1e7c38d87bfab70cffabf82d4f537ea68eaa88bf05e2c90e27899238315fe29ad5 SHA512 cc252166fb933fc78a5b5479c9cc2a49a0d9224371cd14635cb92e7e3c4c801bdc6f837b6680704d20f63dc0b8872b67c72b952361e9328dc12305f9351f7a87
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index 064ac2bedaa0..0aff4624fa03 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 # Perl isn't needed at runtime, it is just used to generate the man page.
 DEPEND="dev-lang/perl"
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 9c8d71b088a4..eb1864cf2e8d 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -3,5 +3,5 @@ AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895f
 AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
 EBUILD lshw-02.18b-r1.ebuild 1768 BLAKE2B e557af6f6f3874f434bb0f0da824a378d2fe1e36ac00782752f126df14d8b4ff83b2224bac4fe91df7652b0383de009fdc3c5f01b94e771c2d61109ddad343b8 SHA512 9eef7b1a0e54c2ef5d9e1af5c3caa21dbd566443d7b3d83e68cc8cb073495105452cbbd3126ce1eda78f08ea430f7a92e9cd01a83449bea86e8bc53b26c5b91a
-EBUILD lshw-02.18b.ebuild 1721 BLAKE2B 617491f96945cbca541d7448da5c5fe13cf3ff8af07c0e0f3f749daa6a2f08868af8dbf45271d89c728a1e671fe6fd16dc4613094225e3057560f4587ff728e7 SHA512 3ba585be677880c6efbb1aad340cfb8dce7b6b33709e877dcb91d25973d363d48a26b9bbc83359070fd1b42e0c0d4e72e2d19b4467f9f559a7a8f6c0b2f19781
+EBUILD lshw-02.18b.ebuild 1722 BLAKE2B a40329b449fb13618bdfa51536d6ba89f07e3239ab9720a32d70a562948d5f0ff52db7f17e64238686cf0546fda6aba8c84c57b9a2c405f795ee7dadd417921c SHA512 87a59946f6fbca581c90562d78949d320b2469833a7c21aade58e1a2574ccb187e2b84942dc906469fac086607fbf857dfb19142442e4e8f36fcda271264d290
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 7f414bac3819..a01aed2f7dbd 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"
diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest
index 5ab7a0552e53..1efbebd0281e 100644
--- a/sys-apps/makedev/Manifest
+++ b/sys-apps/makedev/Manifest
@@ -1,4 +1,4 @@
 AUX makedev-3.23.1-headers.patch 433 BLAKE2B bd8e6e4b32c69be3b5ccec72b425cdafbfa9723b0fdd1b634da6f130590a72fd251c6f21ff29224a705211274efad53f8fecff3ac3710eccff4833e1769c75dc SHA512 ffc80692b9bc317c0c14c5e7211155c4a7849967a9a3588a811f21feb6034da264c7aecdb7ce4e67786aa2a28f8d33af381ff410afd118ab44f47edddc421d0d
 DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc
-EBUILD makedev-3.23.1-r1.ebuild 1352 BLAKE2B c002cd0c58e66c15642af0d592d30735fb387054b94f15e7f29654fbab9a2e04e95c1ae8ba49cadce6dfd2b939510797707db82f3d856f0fc19912d5eaa6fed3 SHA512 08b9a66b8b42b6dadd022171180b1f8cbf9fef1095195384163ac8b1d8768cf17602c9a20545e240338068d7db3fbcabe965ecaf167fb7a47bcf521413773edd
+EBUILD makedev-3.23.1-r1.ebuild 1353 BLAKE2B e9ed549e9e1e1b6e737593bdc5a9b1c4d916a5f99eec063866ad5cf711f3fa5a09ed6c3591964463f0651d42a536c5fabc37035fd654647ca836ce4bea160d52 SHA512 de77b8d33d104abb393ce602a5ca641d8c8fca1932d8956db58af11a004eb36e8e22b62958c5997e67f64ee3bc71dff80f25a19e8d44d50064769c2977c3ae19
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
index bd5c24e75a95..2ab9f6f857db 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="build selinux"
 
 RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 987aff39e0ba..4d2e8c46267e 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -4,7 +4,7 @@ DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c
 DIST man-db-2.8.6.1.tar.xz 1829328 BLAKE2B 5dce50a4d5003a370595b3db0b1d7f01c54b53d26f011307bd91447cdeed410ea20a6720b12eae301d21c0b9674ed84b055f38f44e09d5543ce1647dff8b5bca SHA512 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5
 DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9
 DIST man-db-2.9.0.tar.xz 1857216 BLAKE2B b797c1bc48027346114d35f00624686daa7e139cf5836e207b482d645009b95577bc13cbad3f1b2498e8c7e8c2f530d43aa8dec96ebad6bb84e6cc77064319d1 SHA512 7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda
-EBUILD man-db-2.7.6.1-r2.ebuild 3166 BLAKE2B 12cc1a5704569692825c9487433a604f5752caf366fcf152d5565b58b3b26a4db0e4816afdf2974cc3570142d024d07ccbe5e0a3f8f084c463b50c895f7e2f21 SHA512 95afcd9fd93c690003a3fdeb9ba1f2b794fd8d7fdc882d1d9f0658f6caf62fb0157d4e590033852f2b6f9b4634229b7256826a4799c9f37f68f8e986f12f3335
+EBUILD man-db-2.7.6.1-r2.ebuild 3167 BLAKE2B c6cbda505f6453ddae376cab8bebb080bf628ba154dba14ec54882044ca6f6d5b545a84cd0ab950683a1669607c87f140fc8b895d22edbc33cf589f033b8fc28 SHA512 027a20f3491ae14dd7f11c79e0427663cffa2751b2e4ca51e4dd844866038113ac65ca6c8dfada94bdac65e05742c02e90b453dd1256d941b082f290ddfae40c
 EBUILD man-db-2.8.6.1.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860
 EBUILD man-db-2.8.7.ebuild 3471 BLAKE2B ecc2767847f36a0cfed4f71e82e2bb683f219b2efb236bf0b8135368154e37139c82ae293b8e7911aa128169fc9b620a5f1b83b76b8d3784a6e66b9dd97af6b5 SHA512 88b299762e788380d0e5ee3b59834345b6050fdd5b200a5e355fd41d1967019df67f18b1a6ec2fdf1da0ddf17cfd5509fe6cb71beb4dfad07c2a660cfba47531
 EBUILD man-db-2.9.0.ebuild 4019 BLAKE2B 51ebbcad346410f4030b19ca787b36b0d86e32e0c54e9fb74b4dc95384868775dc777a30b101e4dea9e4b1c265567a5c53fbb686aaa9857eec6c7e5b9fc5be9c SHA512 732da754f75d4773cb267b30aac7b6076134e4183fc1572e95f0299cfd01fa470bc775f18753e7259443ee84db81c4109e73a97de360de093db90ee4077536c7
diff --git a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
index 6c15a9ef7d8e..61881795eec5 100644
--- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index 88646cd86bc6..3e4f1c13bf50 100644
--- a/sys-apps/man-pages-posix/Manifest
+++ b/sys-apps/man-pages-posix/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-posix-2013-a.tar.xz 930736 BLAKE2B 4d496a4ea7bcf9f101a9b5c31eaa437317e872d9d266c202a1fcfd16d9b2fa71f968c3653bc9789ba18916a93802736e795c43bb3f87324397f49aed0f6d1556 SHA512 e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14
-EBUILD man-pages-posix-2013a.ebuild 770 BLAKE2B c74230150b0e53ee08be57f4ed5926ec375a5254d7d8c75a9cdf64304ef211cd75f3485648f2722a0301b81747b5421b3842b6b4df77eca370c2cc08d04df41a SHA512 4f6db39c3775041f5012f1a8bd4eaaa6a12af78397f0fce02efb16948d5100cfdf7190e1420f6bf56d6d5edcf4d6e17da3e7b2fedfea043f449fd1eef7d1cd14
+EBUILD man-pages-posix-2013a.ebuild 771 BLAKE2B 055d256d0f386e138208ba1eadf8b96e8f4fc1d5c17a5cd5064ba587c19d2ac3639c29f61b851a478f6ba6d1812c2774a637d3f1e674adc7fcdc0e457ad5ce6e SHA512 f0a97661dea78bda071b9d549794839e865c3c84aeeb7fe917af04c1c94e1e36d0cb959708ef090f1f2025ba3c004274f61103c51f5b2bc0592410e1c6ef50df
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
index 822c0fcb1ec0..fd04efc71d60 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
 
 LICENSE="man-pages-posix-2013"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index fe4df495bd5d..19096364e6ae 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-5.03.tar.xz 1677908 BLAKE2B 54ba60a0ef772259fe8facf9e8d36155b16a3c990adb7bcc63e57bdd969d1853e6eadbc3d21186c23730c65dd7cefe497819921b9b5c8622bee74f656430723a SHA512 e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be
 DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.03.ebuild 1637 BLAKE2B b5f712ca5675253a61ff09f66ba7d218c4bd3bb56dfa5b3628d534a49d701d6fcf11331f3423ed5a6e9ec8164715eaccb4d8a934eaf98f1e1f9725a34fe95a31 SHA512 d7b667878670315055fd273a1ec22d8950f94bf7c2ff02eeb914c0c523dee386f18c2e221ab5c41dbbb2ede487541e61c213ca29a3105ef0b116e196318da8a0
+EBUILD man-pages-5.03.ebuild 1638 BLAKE2B 92687049ef1f2f63f0e417ff734524bbf7ac9c219cb6813c652a6d118130786a58023bc9f518db71ca5363450e721e1a5b0063716d4ba93e9902626c20cef775 SHA512 017fcdc1516c219522a27f5a64adc1b29e767896cf67357042bac3bf1e5d1c160a057d9f9c461db2981391ae1ee6cb1b49b9fce47648ff5556259886cc580e99
 EBUILD man-pages-5.04.ebuild 1650 BLAKE2B 2334dd511c995562ff21d6ae0502fcf4e10fa9ce822543fb73a3e984aa190ce14d12ecd0dd662aea1bc766632ed423ab4e30db7de693ff25c2eb25fad5760423 SHA512 5bb978e229b2963a0eb99f5768bc5618931fb36d96aa80153776a2019238eb15026cebc762dc21e65551807a915e86739e0e895cfb29f5fd397623815420b5cb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-5.03.ebuild b/sys-apps/man-pages/man-pages-5.03.ebuild
index 98c651b497c7..6450c0bbb0a5 100644
--- a/sys-apps/man-pages/man-pages-5.03.ebuild
+++ b/sys-apps/man-pages/man-pages-5.03.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index faa66a85252c..0f40792e5fe7 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -13,5 +13,5 @@ AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695
 AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
 AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 3709 BLAKE2B 6147c64d6582b3b101f1c6b366b8259e5e6b8b702e7e00592c20bf510272c99eff51494e809da69c3077731a4dfdf3ed297808675d7f583ad25135a42d2f292f SHA512 d31ac787da3b821129f04a00be3ac10f8f85392051f6a198e9f06a151baf166b8bb3524d75c140986261a8c866f6192517a3833d293557cb1d83b6b0ae992b97
+EBUILD man-1.6g-r1.ebuild 3710 BLAKE2B 9d2807b8059e14aae8661302d290ab2993ae57f334384c48a1d08ea71f92a27830d7e8a091f4b853a125d0b40b33769175c06616c78e111b91eec27d1b76e964 SHA512 9500b086cf5d9d594da2568643c6519c78a65ecfce7e9b0a81123d61f4bf3256f247eca4243b9d83ca71f7ab766bce6628a1d184f9892a4e412191d0ae0d72ca
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index 098628c40d4b..d0b9d848063c 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 5607a5ab63c7..23f79b1dae37 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -2,5 +2,5 @@ AUX man-1.6-cross-compile.patch 1743 BLAKE2B c94335e791ee5385f747f473ee6d4293524
 AUX man-1.6f-man2html-compression-2.patch 1725 BLAKE2B 314c3f3eccb90db6419b6069679457f24e3f5dbaa4ec466513f7a553886db1e25572a07ab8e74676df5bcb3d7a991ac58aa876d3abb780d5bdb415c4c8b1bfd3 SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb
 AUX man-1.6g-compress.patch 343 BLAKE2B b91a16bd5f0a1a5e7a83cf225659c204b6b3fd8785251171bba6a229eb6e1f721c3ff8b04379d09fa39d44984757342139d053ecde821aa6ebcb9de914765af1 SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1201 BLAKE2B 5c0e7ee56f32ebff4bd16b79aedb68bb3f85c3c55802457dca94da93fd2a72c61a3901537a7bf23c8c99040c31b0c596e8bae9e1bac6a852f21324527bdfce64 SHA512 3d040fb5b8ae247aedfef07ffb9f676b9b3f38a156b60fe8e1626f5b79fbcf3a4cac7f62b601530a96ac05961fdcae34c69cc734a3b9d6703f8abe6a0b6d6819
+EBUILD man2html-1.6g.ebuild 1202 BLAKE2B be46ee2035d16c95686a9d380bc8eeb598a5648fc39b714e118406c4d03335b42db7ae0a56eb0c902573b9e19e9da4cdc6caeabeaf8344adb60e8baa7c625cc9 SHA512 2c73f13f3f13c44beffbcda8a5b38050326ebc742cc8455afe36fd28061a927bf6d98ba9c844e09862d154d51c1653abc6c8fb0bac88b3a5f1a286d0d95dfe9e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index f100e0e3cdf1..084b62b02c1f 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="!sys-apps/man"
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 17781aafa935..815542b6c1c5 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,7 +1,7 @@
 DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c931a40d59bde401d00ea7bc74b728c8149f80187e5d73923496e2eef1ec70bc097aedf0b68630f73264d45d96ebd SHA512 c5edcbff4ab1e40eb9b178a045fcd426a5f3c93a3ab5bc1ca1fa85a0977b8c9060967fcbda4e4a6e9e68628f50a2814e22939676008dced529377d2cf9bda5b2
 DIST mawk-1.3.4-20190203.tgz 466481 BLAKE2B f647c52872ff510f02ab44f13f6c51497abdecf3d6ab40faa2e419f726a15ebdb531607465bcaf2f53d032284251f9fd25e73734a72fc31c014a0a9f200613ed SHA512 64d5b1838d34d30e32966f46cb7457c865caccfe9fe1049d2645ba301b1ddb4efc18588115dbcf96234a2a0b791211a7f82264a3c81899459dc3029e65837646
 DIST mawk-1.3.4-20200106.tgz 468031 BLAKE2B b125eecf780f0658d3a1c06875fdac221ffe5999e38646d71b15159c50271a7bbfb594fb6347442239c3eab6703f9c782739bd2a5a055e1ff8cd44a0e8a6545d SHA512 f6f65f3b73965f520a6f9bb7e2b6ad2a3c532c0768461744e6cfb2e72e2c718dacd1c5eea995dfa267facfc4e0ee71d337809cd45d5c75cfbc65294b45280ff9
-EBUILD mawk-1.3.4_p20161120.ebuild 863 BLAKE2B 2c9b4e89575906b66e5abe75e9325700025f98fe399c84d318aa7c4ac1b170a8b95e83e90eb27253ed9c3c824bde01aa1ba5b029066c25743d7a66e04aa36c48 SHA512 b58813aaa987f2469d83ebaeffd4a58156d3971a01cc427715b2c1d96bdd163a7beb5eba80f9454c58a0d5c470db390c030b0b0d0aeed3bb9c952f541e69ed17
+EBUILD mawk-1.3.4_p20161120.ebuild 864 BLAKE2B 7dbda56bacea9d71a4d4353dacf31915e84996983d152597d7e8c1598f6b242cf79c9dc765bf164a1b1ca657f0ed17c21e68384b6f04e101ee790b1d60b245f8 SHA512 753c6b82a359f2bfa1575759b35abf4cc324d1dde46e972545fe51cdc4aa93b8365a160a6151c521dcc24164c2c51347db338efe690262bf2ce0805d3a1e4a65
 EBUILD mawk-1.3.4_p20190203-r1.ebuild 874 BLAKE2B dbe9ab4f5bbadf78e1b86c1f1161dd96d795d7e744b3caff1149ebbc85c2f45842fedb01df0649d9676c9488d998adb1daacbeec81a5ac609ec29f6efbb78ed3 SHA512 c0239d36b1b88c8094cf75167dfc65db56b7329a44297cea02fe579a3f07ed804dcae77517875467fe5ffc571cd347dec26b98560981d505548c68582b64101e
 EBUILD mawk-1.3.4_p20200106-r1.ebuild 882 BLAKE2B f76f8c13ce3ea63d330455091223707a24b12ee87b634c00da4c808de7b602d82b051ae0f28464b2cc6ec8be245c0e38ca39b58292fbdb9141fdbabec8b32924 SHA512 2f024e689e5198c622bfe666669285fcf9a0b68d4bb8355aedb2dc71956a963df5983211fd42cf482fe157252539550ed5765f0c17631e746c9de30621fed6fe
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
index f822fbb672ed..444a73c84dc8 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index de2cb8bd798c..7bd304aa4cad 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1821 BLAKE2B 0422d71c4a8b05b83419a70a2fb53bef75d97b27119f6dfeb2a3026cc73e4d3e50d86a355ce3bb2082bd1fbb7731adaf357ffca8aaf6d701925d84a7542c1659 SHA512 a5d048855928135199a1c4b3e5f43dae2182f7c97618c2040f87509bd594817fb3350e6125a0accdf2613943731869c923f2f98a488b25e1a24d654033362d19
+EBUILD miscfiles-1.5-r3.ebuild 1822 BLAKE2B 9bde532e7957fd3110578b3d2997526b1a93166ec0bcbc03a531e0f11cd7177cceaac1201af5653c4a7e086bc8e4f00433802387cfb8c4c43c8c7157c69bb29c SHA512 281ab0bb5ea6ec6e973ecf10d50a2d29dfd0673f2a91efe13f08707be683a2fb46a3098c1798e3c7c5281575ae54c8e02c48921144a0a35f494bbcab98fed411
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index c04759081e39..8a94a6506a5c 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-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 ~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 ~x86-solaris"
 IUSE="minimal"
 
 # Collides with older versions/revisions
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index 8d2062fc1eb6..b185706bac35 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -2,5 +2,5 @@ AUX mlocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
 AUX mlocate.cron-r3 1389 BLAKE2B 678aa37c9a092d0caccca9279f6d75aa1c23a39a36bdf2006ff0c64009a783a302eaae148d9bd88ea49af44647f64ede301e131f586e77381cac314eaa808a68 SHA512 20a25a7f83886a43cb61599a65ae78170d1b5cececc953117986d27cbfb6707cbf3613b569e0bc24ce6416ce1f2cc792dd5968f0e1bf3a7a6ae72c4e10b638c2
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
 DIST mlocate-0.26.tar.xz 359204 BLAKE2B 48ff448b0316169b35a3c421970b280632c4a056b7566d8fda7a2c3284ef46d3abaaa96e2411d9e408cc39466577a5bd3f8fde3376178e8b7bcc9e4e01997bd7 SHA512 b1207047e30a551cba39e70812439b554def567ebe9b8b81fed6f26435bb575beafe4875a21cd72876eadd85da4e7bfc942eb28b17c430b537c351690364837f
-EBUILD mlocate-0.26-r2.ebuild 1567 BLAKE2B cd1e32bf0de4ae2bd56c43132972a9845272d4d38e9d421d523d32353f994a6e9ddeae02523ead6a98304df37c31ca9b3e02a0850cae5b862985e2167b050a13 SHA512 b3626bcdfa703cfc99a698299cf309b39b696109e022e70bbc2e646ee01f1f9af3d1a9e0f0cbf0996a173b94bba3a10a762ad09036e923ced424c12a39320dfb
+EBUILD mlocate-0.26-r2.ebuild 1568 BLAKE2B 1e9b458f75faf0e8d210c666f4f7e8b63948839e327e3e71b218ca6985fb225243b25c6b391da60c9af617ed63a579ae2dca708c9f4438bf4daaae996f1f63dc SHA512 118733a0d6a7bc4685904fd32166429b1893634ad475fa0571a5f0780e10c7f22864df25acd57a7ab68905a3fb27550c9e2e83d4273cdaf07b3b4952ec934b59
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mlocate/mlocate-0.26-r2.ebuild b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
index 3758e48512b2..0ae2c4690e14 100644
--- a/sys-apps/mlocate/mlocate-0.26-r2.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://releases.pagure.org/mlocate/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="nls selinux"
 
 RDEPEND="!sys-apps/slocate
diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest
index d6df53ad83eb..0762b504d0a9 100644
--- a/sys-apps/modutils/Manifest
+++ b/sys-apps/modutils/Manifest
@@ -3,5 +3,5 @@ AUX modutils-2.4.27-flex.patch 805 BLAKE2B 0efc0b03204181dc456667bdf2a15e2765c4e
 AUX modutils-2.4.27-gcc.patch 6963 BLAKE2B 5748076f00175717b22cb27f5e580b99aa0630928afe0572bca707d2cf14949171f1d114fd2152cac01c0481d4c271e435892cc3fca1f9b48e777b9d1fc34e33 SHA512 1d2f0f2118ab40310cbd90d73da5300530c8b41bd5fc3832f8cc09914bfe9efba7161b80c1d29b216ba92bceb8b4f066eea1bf9bb2c6affdc9b35e12235a1008
 AUX modutils-2.4.27-no-nested-function.patch 1422 BLAKE2B 3f1b2e95ef05815bee49666863f767e416cc67dfc4566011f59dc1ba49064c1810a31b4a91c5dcbbad0a5f47f33431644834dc872637532919cc0e2077f830d0 SHA512 0a01f28f9d3f803b1e148af382b396ad793354363c36e690ed5a731c31482bc8b909fcf77902b62f50967e1ed782ec9e53412c906117dc3d7d12b1f21ecf075a
 DIST modutils-2.4.27.tar.bz2 234963 BLAKE2B bc5d91554906d15c258bf27f9b3f28bcc1fdc13413ebcece0f763d28d70f61cc27243fc20eb72e2f28d90cac8f19fccdfd633ea978a0f6c809d10eaea83c24d1 SHA512 5a638ea757f9d2cd7e91a8711eadfc6c723ca3b75757363620c8128772b9c00ddeb46af853711ce4c845096ad322a1dd2e8429be3d2e0a371ca93b1c81aa089d
-EBUILD modutils-2.4.27-r1.ebuild 941 BLAKE2B a426a10108339ef28b7c4442a26ce622bdc482f13343c5998d388098036431497ff71d4802da138e8b210f1204f212af77c8330c228952fa199648588a503b7f SHA512 713f4340b413d95e0a5c5d4c26bb9cc11994f451a34ad2647ad02987d436eaba538dbf7ce1233bd8a53b490bbfcf80a3d9a7c7ac1976369733a25dddd849b4d0
+EBUILD modutils-2.4.27-r1.ebuild 942 BLAKE2B 99bc68d78866e161e00b3d63ce97532376996fe867b1a9761d4af392717f28b2e37029caef6315c73dcc35879fbb3dbaccebd0e69d6a277609a803751c5b20ab SHA512 cbcafe38374572b8c7bc9fb403c8652ae03c64119c5407ff7b6df078924b43833481e000466fa9bb42a5d2264f468f70411b940f100e1e15c97d9d96ccc6849f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/modutils/modutils-2.4.27-r1.ebuild b/sys-apps/modutils/modutils-2.4.27-r1.ebuild
index 7d40d1031e18..bbab735f1422 100644
--- a/sys-apps/modutils/modutils-2.4.27-r1.ebuild
+++ b/sys-apps/modutils/modutils-2.4.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="!sys-apps/module-init-tools
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index bf8ff5e5e229..627aa591d68f 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -2,6 +2,6 @@ AUX most-5.0.0a-donot-hardcode-path.patch 969 BLAKE2B 1089149fc01a3081760f422b73
 AUX most-5.0.0a-no-explicit-termcap.patch 6172 BLAKE2B af569f2fc46a341a57823bb6afc57dbaff020547c840acd8e918550e939d9d3ddfa8b4f16d14fc19b6950997fe58273b720ebfbcfde445a6fb994a3bdac064ee SHA512 48a87d66bda3b1464a214614c5ea23a5ba5a820da0da497de4db9ca4205288d7f63f460b08713047a4a14e8911bbb0b6a92ff2521cbec1acdf4e37e86a2c1346
 DIST most-5.0.0a.tar.bz2 131130 BLAKE2B f516b7cd1b37ca274dc8472a258390cde437f44ac320a257ab94cb97e918d574f61e961457809941a3eefa761a62e8f45bd60392e5b95dc60cedc6c1d9f56baf SHA512 0c101777250a15ed9cbe0bfbaa17d0ac5ef973a7e0730d096bd931ba578dbcbd4f244305c99a50bc8fd8aa1937b621a97a6452b3821fee7d72f33a02da278e5d
 DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
-EBUILD most-5.0.0a-r1.ebuild 889 BLAKE2B 2ded7eb519cb10aa5565f43e4723353a54a01dc0a645e095d96b7e4c115330e5376007229d41462e468d31a607b9bd09d3969415f987426dc814cf7b95c7d487 SHA512 78e5a9b221335375d200b738c602dc76bd0960858b637c86c4bb3ff71e815580d34e0382c8a93ac06b8d3bca48326933edea68c756375674c54fa3ed8c2c10f1
+EBUILD most-5.0.0a-r1.ebuild 890 BLAKE2B 8ef5c7b7731115c449a22eefe71f0d6135e573e3c5b220200269b073296ec84468944cc0db32a6d8f73cea9aec0e3676d152d722fbdfb4cb562509d781d620ff SHA512 b27f58645548269d99813427f6f545e509756acc903b86c93c1603a9815ad9e8468fda5df765be52e9e951cc8dc2baccc3debbc8d1e3df17d6253d06c4a5b4f1
 EBUILD most-5.1.0.ebuild 881 BLAKE2B f1cc3d00ead0b30f1765100ead62f823a67b2a546055425af20d38aff56eed993033a5b78498c995ef75162b6baf03790cdfd417811eb96db98ceb5cb50e3ff1 SHA512 56a166e010304276ad56c68b790810f5df3eb2d8cf0a666b7d64cfbac84c876079fed216e195dd33c3abbcf4c65b97f804638aa43cc2d9ade106eecacedd8b0f
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/sys-apps/most/most-5.0.0a-r1.ebuild b/sys-apps/most/most-5.0.0a-r1.ebuild
index 7634bbdd6646..597c579e0729 100644
--- a/sys-apps/most/most-5.0.0a-r1.ebuild
+++ b/sys-apps/most/most-5.0.0a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://space.mit.edu/pub/davis/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=sys-libs/slang-2.1.3"
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 38ee910dbd26..5e134f87650a 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,7 +1,7 @@
 AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968 BLAKE2B 4104f8238ac3758e756b37dd281f1ca66f3f6d6dff9966713ffb108c539fbd19b9bffff94c929b829254c755cd0e1fc4530c74c5b8d6ef85889d7b8f9f54b5f9 SHA512 e732e809a4a17e3535c9ef009519808d5d1a6a792c1249e5cbaedc2aebc0245a16f4cdbc351c6ceaca676e942d909de548b036b8c59a62a68c277093aaa09445
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B 0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723 SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01
 DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb
-EBUILD net-tools-1.60_p20161110235919.ebuild 2547 BLAKE2B 15987228f0674bc75b090c8cc4ad659af1e7cc391ed730ca646d56819e0947228335afeb1f9e8658f0af39c35392d64c4089053d80da9360bdee764c197c881c SHA512 2942abff1478a4ec2de75dc41811beb09435828ac36b441da0ef693976f73031f3016e0992251ec5b0c2ad7a94ba1db53ff6293d6ab36b537475343e0b5718e4
-EBUILD net-tools-1.60_p20180626073013.ebuild 2476 BLAKE2B 4a7b7f1dd3d626afe0c37e35b74dd95f5e436a2d59368cc74e5de67ffc1340e50a59be62a311afa6dc819b01bb3e7be775d1fd1c90809fa642e567858e65c760 SHA512 6b26d880abba220bc2f2b9ba8ea30726ec66204f67bc91ed58f3238798389bd2ee414a8d255874dfc42e7684aaded4ac42595a59e5f429ed2a7a4d13ea230dfb
+EBUILD net-tools-1.60_p20161110235919.ebuild 2548 BLAKE2B 1a8348071501a9a2ab6514e60e48ea6ea6a45ae20f5d6534579d90bae490d19d0b2ac58bb31e4fec0b611fbd5a6a10f88a22f0473407ec65315d7bda470b9cb0 SHA512 c79cadfb5a3d48d04a53e5587223386ac327db1f59e46cfe1c6872d1a5dabf7446c2376397ad435d3afac705520b507d3399ed55d6bbd798f1370ad5db4105c9
+EBUILD net-tools-1.60_p20180626073013.ebuild 2477 BLAKE2B c4802010ed6d79378cd1bd0df2e7c63eef8f61da362c3d3000d44d3e61dac155af5aef77fb80fa114ebaa35e5125b9376bd4d9740b7801e1fd36813145c3941e SHA512 0e5f2a3f6c273298629f875781087ad6f7eb01d7a89b8337a996e81ba2964a4ce9e0589bc334fd18f74868e43e83f4bb712b3143f744b9c28facabb901201b30
 EBUILD net-tools-9999.ebuild 2489 BLAKE2B 3bb8b0d127ef850d7d72c11183059279cc88ba98285eff8aecbf6af350cc96abba15405fce12246fb9ac64b974ae761fe518d5bd547b05a3609604fc2c8270b4 SHA512 e4ce2c4a1c12424ef6e8b7564c233bb67fc2b58010822ebb0ce06913af2b0f476f209d1ce6fc130f27a5bae50f5924bf81985aac0dfb8f81ef1d831bba2ed0aa
 MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
index 8dc32b661141..32f6f1e08981 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
index 94a4040c1cc4..cb70b05f861d 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/netkit-base/Manifest b/sys-apps/netkit-base/Manifest
index bff7cd1db46a..306b66729833 100644
--- a/sys-apps/netkit-base/Manifest
+++ b/sys-apps/netkit-base/Manifest
@@ -3,5 +3,5 @@ AUX 004_all_netkit-base-0.17-misc-fixes.patch 1601 BLAKE2B 64cdad3fcb0ef6fb8bb7e
 AUX 005_all_netkit-base-0.17-no-rpc.patch 522 BLAKE2B 8935847c79c032dee03f0f99edf6fd879ba224b96a90b144305351e5cedf51e705e2c881bdcd16174ab32fa88eeaf01cc6c9bd326043b7274090b090a6373c11 SHA512 0dff7bb005c1d480444b8ff61f53626ed0a5748730c2a1ff489a277a1bbd61e08bd9c46261acc040f5030d7048a291fa5f22cb7b1a58bb468d8264d4b6272d0b
 AUX inetd.rc6 470 BLAKE2B 5f6fe30c6a3d07162194f9fb756bcd3748470200819733b291ca59612bdb9f2125bc2003b6c82ec5ed459bea43a29c5a69c20ceadcc90679f151759af2643cba SHA512 525f4f948721553f051a929d5c6b7c49208256170c423ac10ad49427cc89fdc19dbadf81e7a3d8eed07c54c5a266e73cb0ac24c8f95f60f731fab571ccbbd5d2
 DIST netkit-base-0.17.tar.gz 56473 BLAKE2B a84289eb56762c702ffe52bec634df1b36dee382dc46d2356886f0fe0039d8f7c393ac0a22f137d1d220222ff55429b25fb4da666c7e6d7f857dbb7dec54e2be SHA512 2faae6471251647ea0d499c96d13faf72bc9aa4ab408f9f7f4c9fc41b1e1e2ce0bcad626ca027135b5a20f311362e90af57c7197885d02a0839beea5b4fdb821
-EBUILD netkit-base-0.17-r9.ebuild 1010 BLAKE2B 4365114c6d6b4dc790080d80893255b3a08d268f70cabafc2d999fd1bd3388281c1b17ddb4f7a1f6f8c6cafb1340985e1bf29e11e9fbc1938822151e712f5534 SHA512 d3260e5da8605ec369ed096f826c93e374caeddb72d5a53f3a751524cdc82a3b159e9238a09392833aef2ab299e499a703a2bc1aa514005bc05a6d65c5187e4c
+EBUILD netkit-base-0.17-r9.ebuild 1011 BLAKE2B 735cae826004570b5b4e142b767f9beac8c783d3c1eb1982392cb4463658f61a91132d361f94ff4f0a7a7325029525e6a17cd93ec75252e9919360efade0576b SHA512 cfba586125cb3bdb26369d2a11b4690eca6c67361a6ef80f16549473efff7e909debf418a5f0ae903048bde0ccb3024ff0af55910406998ddff907c1ea6edfcc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
index 02a23dbfa4de..abdc73376333 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index f27f6dccde4d..581540de44c1 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,7 +2,7 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.41.2.ebuild 5249 BLAKE2B 324f3a9e2a9753a79dc547f7615478d05f8500582638646b5ca71b235fbbdec4b54adf20a1e9ffd07ec572e1880f7d5854d35503172325a4817b2b070a60c70e SHA512 296a87cf7bf0476f51b1a2410ff1e69f9275b2d3e319a268e211cc2e3d96e8e58fbfda47c203d8cb5d46cc4ac4dcdc4b2a39193dc299ef4a9478319b1d32489f
-EBUILD openrc-0.42.1.ebuild 5353 BLAKE2B db745d158268ba13aecfc2506b02fa86cbdfda9dbdd1449cef2702b6809c18ac9651622ab26eb495280840f99ce67485c7ff631da500f267c18d166cad89bf00 SHA512 d4ae76f87661cb3a8a4423c7ef9c1aed75e094936df090c9a73e029f8f92153510a68e6cf9d8bebc8d76d875d22ca452b898b114747f1236f5a933039fec3e67
-EBUILD openrc-9999.ebuild 5025 BLAKE2B 1d41d1b9f89a5d84a80728f01be9f18b7506fd008bc00e096f9c70493434796429b8360e94532ec8adc99b3f7ca6016bb63f7fdbb25ceda95cd7e6a94113dc0f SHA512 74c80635d4760fc100065e64c826650d8047133ed92f9748e2dcebe4224d8cd1947d1b22739c50fde56bd0236aeef7aaeeefb31222605c170c435edf6d3aa8f1
+EBUILD openrc-0.41.2.ebuild 5253 BLAKE2B 78c146fb9b0241e5c06a0ebac481e57589f7315219fe656314f05144909ca5def58deb8018e4cc32687b2196707dc8971e52a1d939964162f23368d7df4309f0 SHA512 f2eb2ad20218e8889e55ad82fcf9887d2e84a088d9aed2434f6efbd49571b7dfe3957d6c3b25f7ba6ab0b49911f782548feb5060d48071ce44a8263b60e47a9f
+EBUILD openrc-0.42.1.ebuild 5356 BLAKE2B f8a652ec53cc27b004784898c0086bcd6ac0ea87acd69a58cabd8e03c9f47126ff4fc95ab3e61582475c58605c632b90681fb5fecdc7bc75bfb6703b112a9198 SHA512 296a25c7aa6d05f4e759db605cb66d5046eb1b11a934951c5ed8da90ea27d454c207614242c87cf4929085ef685082422296dde9edee8badd7f015fa2f356289
+EBUILD openrc-9999.ebuild 5028 BLAKE2B 1d6a41a004e12866fe39f33558a9c84b50b17ab71a5e68159f8c6828ce5e0839c1a89a08f0a7f0adcbaa4fe841c14e0b9c4514ed23d0d37646d3a44dd508bbd0 SHA512 b42e11ea36d7f46051db5eca3148848053ec99a53b37514ee6596116ac62af6a03b681de832601ffc337e395800955d3aec677fc957f13ff876a833c95dcbeff
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index 81bb6c4a741f..8705094469d1 100644
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 fi
 
 LICENSE="BSD-2"
@@ -175,7 +175,7 @@ pkg_postinst() {
 	if ! use newnet && ! use netifrc; then
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
 		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index e62fc19041a2..3a80774a11de 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -177,7 +177,7 @@ pkg_postinst() {
 	if ! use newnet && ! use netifrc; then
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
 		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index b8f8498162b4..ccbe38b6e9e4 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -169,7 +169,7 @@ pkg_postinst() {
 	if ! use newnet && ! use netifrc; then
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
 		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest
index 05baa707ac8b..e304092825f2 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -2,10 +2,10 @@ DIST opentmpfiles-0.1.1.tar.gz 5626 BLAKE2B 2b2d21bae0c8280f31ea1ad35cd857a94b3d
 DIST opentmpfiles-0.1.2.tar.gz 5614 BLAKE2B d49485535bc3b92ba7e9a2af511969b1793d94187a2600b3196314bef8de235fe7a640bb2b7f78f51727f94c18556fc27e7996ffccef71ff94e006b9f9a63810 SHA512 d86ba71e5fe96d7a8e1999e14b0b99c78e850c42fbfefd203916edca593d0269feaf2252aa01cc35a838906fc2909015430f72cde8370e2d5b1d478a11fe456d
 DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121
 DIST opentmpfiles-0.2.tar.gz 5711 BLAKE2B e1ee7820b2d184d18e63e7e9d93227bb301eb82be8c2b6021c7a1092f55a4ca2bb5dfb7494ff00c3b6debace1963f6c89011ff557f665f0a93c907bd759a4c6f SHA512 bc384cc9156ba6c54d3308ddad4d26b1877f020aa8558e82df2ed49ffa65e0fed5a49eaa11b27193bfe2ad11a4d7368f7cdbc225b820b309af3b299327ddb07b
-EBUILD opentmpfiles-0.1.1.ebuild 1021 BLAKE2B 7268fe79b3bb68b30f642e2e438caffc940b287f64084c5d960ec4a9b6e9839d9a7e710fd6fbd8e18ce0b1867c4248519733688a4b646ed1c7a298f1fe3eb698 SHA512 77daf26e2de2f40f1f723a58e73fe1e1dbb76b2cd7299e1e6776491792df82aa003ad83d412909aae123d8d781143c5c7d6e1ca745e7f14fe473a968814df083
+EBUILD opentmpfiles-0.1.1.ebuild 1022 BLAKE2B 11468cc842019ae8907e132c1df3f545e9e572339284be751257a3a0958db4ee70993d4fbf6cee8a316724e6b49a1935d370b22a18e408f531be8b6e63e018eb SHA512 ded0d2410812fc891be60447255fe973b313032c8421a72e63a7c092e4018d4504e7f739cb28f20841ca2a214ffb224f3dde92f3bdf1bb6ce6d7b56916dcb48c
 EBUILD opentmpfiles-0.1.2.ebuild 1120 BLAKE2B f9e9dfd90ce72f1a0b7eb603b430b66a08467786562539810cf091d0b320a763742f1d9fcd70d622d03e529640b9a9b1df0e51ffa7a55f8c4059e803272269a5 SHA512 7231a5327564f6471dff75348d85c7d38bb3f8eff50ef55ef38136de21d8139791e6c32e2ef712b37d1faf82f7f08fec47ba41978a6c051cb7fbf3aa4fdfc0de
 EBUILD opentmpfiles-0.1.3-r1.ebuild 1265 BLAKE2B d859b95a49870be6ded9846f82821c394b3c288c504ef5e44da08fd87884b675fa69e0fb8f8c45dd0e62e983750d9c64f093b0b5f4cc1ad371650c13d17663c9 SHA512 98b3afad555d6f046e94319a6d10e0eb30594d0ca1492016ed4ecf73ec33fffca17f6574066fe11047628c10d1aa59838a0293fe1e53fd1457db65dbf33b4395
-EBUILD opentmpfiles-0.1.3.ebuild 1117 BLAKE2B 21a82a6071a042db45e291ebf2a5c736f7025fb3b62f194b2331d54d0aa8493384df9e25df1efc5e5507779ec3fd87c1df4e6ca7222a91fb6fde180b97336106 SHA512 b55e6d6eefc5ffa04c09131e9cb3649764f88370875947bd3ad67600125afa0b11d0c61ddcbeace5e4e747fb4bf4c7222036bc3f7ea729e644da9a2f2a36fea5
-EBUILD opentmpfiles-0.2.ebuild 1394 BLAKE2B 2ba2b29b073da66806eae3fee5a7c8ec738aa7c6a0c8bbe028f2760d5907e20321812b6aec37eeed95b526c47daf4136c75c9e06ae699feaf696bb5bbe6fab29 SHA512 893ccc8a0c289db2fb2e173944a2b3228127c0e4ee1f90c653a083796e89ed11b9f8e5a2c5e6c148f1742bbe2728b7df9047dfb0175b154146ac749009113a6a
+EBUILD opentmpfiles-0.1.3.ebuild 1118 BLAKE2B 74cb5e60031d6a713c32f89d2adc517f6acd9aa97c8bba74f6606feccc2ce2dd4935399e7c2672a952d153ac50d158fa781d62c6b014a28d2953f2e2755e61e7 SHA512 3a9e738ddffff2ccc6bb5a8ebce2586998dcad9809f3350832834b7c0af1228f64e83e04cb03e62adb122c70fc255dac5ea7057079349b2e1f62d8e09648d507
+EBUILD opentmpfiles-0.2.ebuild 1395 BLAKE2B 444f8824b6ec844946a1734de22989dba1c953017068278386f3adaf803da2be489a0a3c744c72f429825e330a371827607392e04cdb7053bbc288ca8a1e4194 SHA512 abb8d8df937d35cebd59036a4c0d1e3bf910188be4bb66511180cb2344ec8ef93cf270bfc2f57b56b0b369838b330c82bc72910ba111e00b70cbb39b08ef3c8b
 EBUILD opentmpfiles-9999.ebuild 1308 BLAKE2B 5bb3df2e3defc43b71a1156e93e026052ce94d883806f51911e2b9c3c250c5a2a05be730311eae903e1fb045f44df6d99e211580b13850804a140a4d20ba6d27 SHA512 ee9eaa829b571a34d47e7ebb0436faea3ddc6161963bec0cf77e092b412dc3d7a7ae928e80a4d510e5370a0420014a8f67e52c240385c604fc556fd80e467718
 MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
index 12148204094e..52af2f8b7fd3 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
index de1c73e88d06..d3f5d077b917 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
index eb3516c6ea59..6dba7fecc69d 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index 8f64b9a6c4fd..1238a0bed38e 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,7 +1,7 @@
 DIST paxctl-0.7.tar.bz2 7642 BLAKE2B fe9dbf6a673e677556b7667a036cdb5243c064fb9a10dda49783b408ed66d6bb072c478b529fa58cd2795b19c3128d6ae83c4aa4f11e19fd835c16a7df1aa4ad SHA512 d715d7466c5d5b402a7b6c44257b959c81234b8b72dc3bad4ad1080f66da784b348e73fadd3b2072ddec6c6b08f042a35cbf9d63cb890ef9efceb1e2e8d56d0a
 DIST paxctl-0.8.tar.gz 8027 BLAKE2B 3d2e1b22b3bbe0912c2b3ab4ae864c9eb01e949349c382b4b395983f5787ffb6b6b5681329c81aa82231e8b779badf0c46a41cb43b967eef48892488b957d736 SHA512 9357601a96a7780bf900621e8b88e8e7cd323159084f62f30cd6967319fffabe08efff3596612fd05a1daf639610bb15d998f4a954c980ab4f45c9a0cc80037c
 DIST paxctl-0.9.tar.gz 8109 BLAKE2B b26049dedfa82890e5445b5baca8379d37a184124d468d895339f1dad6142e4d2ac8fe393df42a68c6aec8a03b151cd412c2996a098ed460265f4c7fe9ca519f SHA512 4048544bd05ed6eb37866034ade8482b8d017110ed9a639f220e8d2e32bb3dfb6c913a986c8fd41829e88efa793f7552eaa2a6d6b2af533c44a5754a5ab8650f
-EBUILD paxctl-0.7-r2.ebuild 776 BLAKE2B ee58d6cf11a91e79a3b1f01dbad84de536b6b3e9faa74ce1ce3d863abf3bf4bdcf0934837d69018ce30d0f03ce77df4045e4544b2f547b747130982ea17e70bc SHA512 e8121b9fd4b875bdc743f7a6c423ee1a689f8cf8a2233b6f8ca20aa2455324be3ffa64e6d09814e2ed1ce488c9c66a95656d705236a38ebc0642e0ba702b12ed
+EBUILD paxctl-0.7-r2.ebuild 777 BLAKE2B f2dde96bcb269d53e5655095cc170eb5d94d07f27e39ea66d23d2cfd0bc625252b1a69dfa9bef2d89106156d031ab179ba9c4a1100b4c02b286680adf03ca05e SHA512 0b4024b764e2baca43fb3d198a7693be4e9d66fc198e6e02029914cd4b6ee5aa1153bce574f6ecab7f14678bf6bf8ef0b7e4d3028155b2833ad95e17ce093255
 EBUILD paxctl-0.8.ebuild 785 BLAKE2B 274c3219e7fbb01233a9b0d9c52f1fd29b3344e734b01dd8a470947c58a80028ec4a98916550af077ae066c9582d26e53aad4cfa7fbd4d80b35bc69714a0dbd9 SHA512 89e8c94e82697ee908532e8e5a176b91964bd9aa01a87a7dae23b692d4c7fcb389be9303a04bdf2fdc52ace71e3f24a5f21e8992ff4662d66710e62827b84700
-EBUILD paxctl-0.9.ebuild 781 BLAKE2B 22d5e0ec5b71eea237eb0744e285c448d394baee0842b940bebcc8fb8acae519390ca95a7d6037502adfac74aaf1226da62745de88998a70ec4ac53a26e0fa1d SHA512 db055f5132de05d76be6e07ec898d61875213646ca79fcf1aa4be031f4fe5bd07e520ef66516fddb2c5c293be0d6449d270557e2434c03f61018e16411145f79
+EBUILD paxctl-0.9.ebuild 782 BLAKE2B 6562d6d89d863144c6136f08c3630630f049e746e9aa9ad53a1b2641b4f870ff42aaec6a3760f950fbb3a07b1e09fa46fcd6d44e7e251303850277853facf6e9 SHA512 30e3b3b7b6ebc72e384f97731e9f434da532d10a8578b880a98a7ac8b8fbe9fff43292dccad73ecddbe7a85e3a2b5ce964f38ffe3d85baefd6676fbb29b2009e
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctl/paxctl-0.7-r2.ebuild b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
index 9457562da53c..90eaeb379355 100644
--- a/sys-apps/paxctl/paxctl-0.7-r2.ebuild
+++ b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64,
 HOMEPAGE="https://pax.grsecurity.net/"
 SRC_URI="https://pax.grsecurity.net/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/paxctl/paxctl-0.9.ebuild b/sys-apps/paxctl/paxctl-0.9.ebuild
index 9392795beca6..fbf6d5b8ed80 100644
--- a/sys-apps/paxctl/paxctl-0.9.ebuild
+++ b/sys-apps/paxctl/paxctl-0.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64,
 HOMEPAGE="https://pax.grsecurity.net"
 SRC_URI="https://pax.grsecurity.net/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index e7057d1b5195..9b01d839d07c 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,7 +4,9 @@ AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
 DIST pciutils-3.6.3.tar.gz 488501 BLAKE2B 77a1ad1e034dac0bfa67ae3a40c34fc394510bb61af1f929e8feb3eb12e9d44b48cfeee0ba786580531222c75c33613b423aa79e535316d2543ac1ba4224312c SHA512 0f6b272cf83e0ff857e4d38c72935709826af054620cd8d70cf8765d5f547f32bdccf5c76a47c8b24d8081b48c16882132a3b503f6a329e73a66089877d5e47b
-EBUILD pciutils-3.5.6-r1.ebuild 2870 BLAKE2B dda0660cdc472262389796e4ced29491050bade11e6bdf86ecb92088ff731aefeeaa2e95cfc37ae864eca1de5627831290423b5c92fb0436242b2cf855db9a13 SHA512 34454feabb024f8497ed9bd817f3d8c4616005f04ccfc0bb2546e998ab237f598771607b892af0696f1b521e42b8b87f80a442441b3f54a7090d283759208994
+DIST pciutils-3.6.4.tar.gz 491066 BLAKE2B bb63ac307f5a66ffb6505bbd7d030fdafcfea13e0b8f3b718c98ce693febbcb90ac7c511bf27d20688f83fd56994b2b246f94323386fd1cc16c79b1b8cab9ca3 SHA512 de36aef89a5269888b065df926fc91f24641e488492ad713f886efa4fb544a4e7f7609028d233fecf1755e15e08d4a41f2837f356f26c73d297a67b0b026e29f
+EBUILD pciutils-3.5.6-r1.ebuild 2871 BLAKE2B 70e11faf9e5ef8777b6771aa0381282ddeff30cdf447d5071747065af265b5a72894b6eabe23a1eb2d5a93085b4fb463502ea28b53c5c5daba9fab35123d8b63 SHA512 0a25dd1d3e84f0fe8a63231192017fbc454bb6a42fd5501635d5819397e1dbcb2294aac4297162c8ae77546022a1af0388e043a1a44c68661fa3943d96bf76b6
 EBUILD pciutils-3.6.2-r1.ebuild 2883 BLAKE2B 86e53599bee45f4012603ebac07b80a56ce86901bb8289936533813a738e35b6d862e04648f5faebc081bbbdd462385be10cc48facccc6680e27601c5ec7e037 SHA512 0897687dc6811f90926b145c5f848157b7b6ebc36374837d97b6f6103125034903ccc318a8c9add2f0c1cb60bfb8de6a90faec071a81b820e21c87cb1c69b6a0
 EBUILD pciutils-3.6.3.ebuild 2896 BLAKE2B d611f19f984120779025c19a04b1c7bd136ef4c874657f13e5932feb3ead61d229633fd1b978ecd66c0e43ebe0618e4c5bd1e3ee7b52f59e05b7a88d22fa5066 SHA512 a50768b9b1f3ce1a044c9f7e13a1434c06f73262958ba4f1e4faba70caa6c7195f31ec889623c966b940c243fc1b44e42adea22c98e5120556368dd93e6966eb
+EBUILD pciutils-3.6.4.ebuild 2896 BLAKE2B d611f19f984120779025c19a04b1c7bd136ef4c874657f13e5932feb3ead61d229633fd1b978ecd66c0e43ebe0618e4c5bd1e3ee7b52f59e05b7a88d22fa5066 SHA512 a50768b9b1f3ce1a044c9f7e13a1434c06f73262958ba4f1e4faba70caa6c7195f31ec889623c966b940c243fc1b44e42adea22c98e5120556368dd93e6966eb
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 972c45769c03..419256b04b84 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${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-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
new file mode 100644
index 000000000000..f3a83e518b7e
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/snapshot/${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-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208[static-libs(-),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	kmod? ( sys-apps/kmod )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwids
+"
+DEPEND="
+	${DEPEND}
+	kmod? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+	[[ $# -ne 2 ]] && return 1
+	local opt=$1 val=$2
+
+	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+	return 0
+}
+
+src_prepare() {
+	default
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-lfs-flags #471102
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DNS=$(usex dns) \
+		IDSDIR='$(SHAREDIR)/misc' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD=$(multilib_native_usex kmod) \
+		HWDB=$(usex udev) \
+		"$@"
+}
+
+multilib_src_compile() {
+	pemake OPT="${CFLAGS}" all
+	if use static-libs ; then
+		pemake \
+			-C "${BUILD_DIR}/static" \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+multilib_src_install() {
+	pemake DESTDIR="${D}" install install-lib
+	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
+		"${ED}"/usr/share/man/man8/update-pciids.8*
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
+		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
+		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
+	fi
+}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index f346037b92d0..32a1747af05f 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -5,6 +5,6 @@ AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d58398
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 DIST pcsc-lite-1.8.25.tar.bz2 757099 BLAKE2B c34727833206b4c868e4f0cd6f8bcaf6899695a92488df8e2fc815c00771ea2f248d9d5fa457c02fc437b8350cbfa37390e07f45b90d08630c8afc34b247034a SHA512 0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb
 DIST pcsc-lite-1.8.26.tar.bz2 754838 BLAKE2B 98bc1abdd66a08dde479821f8b1ef489980a6d58d2a624902de12d0862a4e11b47ed7b12eceff438ecd794bd78a91a7a376e7f4c78c1b03867555dd0e5b734d5 SHA512 23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037
-EBUILD pcsc-lite-1.8.25-r1.ebuild 3034 BLAKE2B 942d27c6d1fc62515cb0d06c3305b80b927fd7a1bbb0deba55f5ca62ac2be8a4619befad2774534d6901b1b0f46635d8dd8a6166f7b2c0e8abede2d0d8fb844a SHA512 9d010856526b1e61b14793be62e70833cab0f31ed2b266cfc43c638203016e34f5c7288f25d210ee40334042506c43bddd30a1f97473aeb3b37255e83eb3d7c5
+EBUILD pcsc-lite-1.8.25-r1.ebuild 3035 BLAKE2B 61036770e277b3c5b05c9dbde0dcfa3e77cc8c971b8e50928c89eb67e194266a86b4d6bc64ca853cae28756d1ff37a5510bb0674830fb18a59baeacf2660767d SHA512 08b2203c969d15f9401ba5761f5ef5fbf88fa8c79483a9061cc6828e6ba78463ce8c98e28651a5a58a9de2f75d6643b3bfe65a028535fbc4c5b51429e62316c0
 EBUILD pcsc-lite-1.8.26.ebuild 3137 BLAKE2B d8c9cb8de8e16aaafdf88168a8649d6b97be7ac45fd8cb53257376b89305281971deb01459e99d20120358750af8deb9e325573403ef0b9d95c6fdd22d7bd257 SHA512 2d102477741164e9258b45a44513bbca59ee6fc8a9aa4df8c5fcbd6229d10233ff51c7da4079b334f5b98e98214a8f412acae47b5ebdb6302a1ad30ad644c737
-MISC metadata.xml 1172 BLAKE2B 4812ad5a9e6f621bbb49e4411893118e05d2c2f091852c8e883a0b016df95b5949bf03a56f219d62fd88bf4a577a167bafc5c8e87e2d38d83f06949cad935f35 SHA512 4c1cc89e8a1c2547c601bce8523a0adecc24403f5348a96a8760e178bc1fe93dc36b7b55d4ddfa541cdcbf4eabf8e2ccb1ce6092b42a80d20112c514b9ad1e41
+MISC metadata.xml 1078 BLAKE2B b47112f9457ca29308517a6cbac1502a83bb8c3ac19f95db1788d0695808c07e3cd1955cbe0ea2f861e6cd9a78cab793f9fbeb699ffb0952d1fa4c3372b8ead9 SHA512 b1804b8e9ec6044221e4158a0127e1dfeb2381d264383f3ba4faa69d6a6ac8a1bd0fcf7681dec92ef7105c05463191bb6e890962bbf419f839d47d51f1d8f7d2
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index 293526049b68..37710202e74b 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -5,10 +5,6 @@
         <email>zlogene@gentoo.org</email>
         <name>Mikle Kolyada</name>
 </maintainer>
-  <longdescription>
-    PC/SC Architecture smartcard middleware library
-  </longdescription>
-
   <use>
     <flag name="embedded">limit RAM and CPU ressources by disabling features</flag>
     <flag name="libusb" restrict="&gt;=sys-apps/pcsc-lite-1.8.0">
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
index 602e0cb56e08..d4b4b46d057a 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 4ac3d574bed2..20bb11fecddf 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -3,4 +3,4 @@ DIST pcsc-tools-1.5.3.tar.bz2 267564 BLAKE2B b060e6fc923c6274d38c364325c367f793a
 DIST pcsc-tools-1.5.5.tar.bz2 287752 BLAKE2B dd0563f75c2b1cd05f21916287ff98c8b5f0c444b71ac7cda4da3a9dbf2db58f92555d54029a73feffd651b42ccae820670df1a90c8541eab188bf66b51ad114 SHA512 b34eaea663274e03790e409909ddb9819b20882795af2618068f59532e2f79973b22b4d0c468a0bb4338c74d1ceca310e8c60005fb1d15ab4f34053125ece3bf
 EBUILD pcsc-tools-1.5.3.ebuild 1332 BLAKE2B 501081f01c52942be7cb2bf59f944dce21d3a1dbdbe0ed66bfb1dd24699344e9dcbc6fe5e6d72ab76ba52a213835d4552f51731183709284d43ecc5344b39d7c SHA512 b04fac13c8113d3214b978592c89d21ada84300e626515ac8b2364218fb5cb2e38ab6c0a8f68446c44f736be09e9046e9f217b9ec406240055c9470543797fbf
 EBUILD pcsc-tools-1.5.5.ebuild 1336 BLAKE2B 575bb3247d69c2c6f6ae2e60a357c0df38b9b0d7e2ec28fd1706b0fc15483ed82cbe6094c67ad51a2c611d2a8fd7ceac01524168fb5d62076f6be11006ef2595 SHA512 69d537562db9dd93ff01ea5300422337270496f1e853ccd5e8741fcab0540286d001021c7fa2bb51cc14d226371b5b5f132313c3121d3013348cdf38f61c68c9
-MISC metadata.xml 477 BLAKE2B d1b0b543832a4df3f555e48309688d11ee9869b890b0fe097274060ece943c8039310756c71e0829fa156ac8c5a58b85ba731370be03570b6269df8c6e1a9bbe SHA512 2805d6a9ab769a0e9333a9a7c81c76e977a08ceee40a73cbfb157135f72fd155feebdeeab20b5eaae7609370f4d3244990a9df0e9bc8a775018bc3eeba84b4b6
+MISC metadata.xml 356 BLAKE2B f2a71004d252e6d78f05b74f6d6f6568cec05e7b28460ae12a73f7d4cc0a42028f21553161b64c689902a4a4366243b0b112fbb69909a7f020fa283f3943b585 SHA512 e541ab4d7c75e0ecbc34ec540ed771dbfe7c99f4068adfae5142010b28b60b18770883a47b5c9da2410482cb9beb26713b3b876a091dcf326be7132d0dbb0aa4
diff --git a/sys-apps/pcsc-tools/metadata.xml b/sys-apps/pcsc-tools/metadata.xml
index aaa5942495dc..e61f4d42482f 100644
--- a/sys-apps/pcsc-tools/metadata.xml
+++ b/sys-apps/pcsc-tools/metadata.xml
@@ -5,8 +5,6 @@
     <email>zlogene@gentoo.org</email>
     <name>Mikle Kolyada</name>
   </maintainer>
-  <longdescription>User tools for PC/SC SmartCard access (including pcsc_scan and the gscriptor GUI).</longdescription>
-
   <use>
     <flag name="network-cron">Monthly cronjob the update-smartcard_list script</flag>
   </use>
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 718866b61039..68b9ca5a2f71 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,6 @@
+DIST pkgcore-0.10.11.tar.gz 648060 BLAKE2B 20bb4666a9adfcca090758ec427054155273a5b73bd3170ce1d52c21ca300be3c8b8c0c2f6ce4f8e2c07caa0d5f741117eef4d474265afbc016cc66b0f5217cf SHA512 9c8e839b0a0027f5182aed2b56eb6bded34fa365dc0df82d759f349778756951547aa9887f53343831018cabf59cd3dbd96a866998d482ae6f85e19fe7d82baa
 DIST pkgcore-0.10.9.tar.gz 647634 BLAKE2B e05b091d9ea797fe4207eb750edabf98faa3574b9ee93799554ed525cab5513b5cf45d9f2757c1ba27a3e7add4c55cd51ee57a650d988916e2bc6d03bb78f91d SHA512 efa9e43f2a67e934b7dded190f93f09b860b770097e3715b7f03af3213fc680f5b9d5d9d14c5671d0ef2df9cf0144a009f7fd20e2f28d5c2dcdc685c65bf7232
+EBUILD pkgcore-0.10.11.ebuild 1072 BLAKE2B d666b0e891000e1b8826f2c9b08dff7b5a6d57a356f96d0b94dfe4c5f7ba36d9e112aa86f76b7edd101f97825aa647884add91243a5361ed037c48564c44fb10 SHA512 70bad49df727f2337ba6a0f2ef36655663461d3dc6ae7a1157abcfd929439b4ed0a63546c1a3d7dee0974b5a7d55887d76f5dd67cf774ba95a874430cfa07bcc
 EBUILD pkgcore-0.10.9.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
-EBUILD pkgcore-9999.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
+EBUILD pkgcore-9999.ebuild 1072 BLAKE2B d666b0e891000e1b8826f2c9b08dff7b5a6d57a356f96d0b94dfe4c5f7ba36d9e112aa86f76b7edd101f97825aa647884add91243a5361ed037c48564c44fb10 SHA512 70bad49df727f2337ba6a0f2ef36655663461d3dc6ae7a1157abcfd929439b4ed0a63546c1a3d7dee0974b5a7d55887d76f5dd67cf774ba95a874430cfa07bcc
 MISC metadata.xml 450 BLAKE2B 1ed880d1515c4c2b77b3687ee82db88e2cd719356c68747c17383ef29c28dea830c6c9f480c5f37931245c569b8254c480edf849946495014e10385da0ba4183 SHA512 b9cab67f1dfbe87e95249af65a073cdac83d5a63b717b06593943f0eb87668e13c3eaa5a4127c0da7d0561f2e7f9dcf445028188364d3309cce40660f8d22220
diff --git a/sys-apps/pkgcore/pkgcore-0.10.11.ebuild b/sys-apps/pkgcore/pkgcore-0.10.11.ebuild
new file mode 100644
index 000000000000..fb6266da9121
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.10.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
+fi
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index a4a26e422fe7..fb6266da9121 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 28a20b693e4a..b38717d1139f 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -2,5 +2,5 @@ AUX pmount-0.9.19-testsuite-missing-dir.patch 1360 BLAKE2B 3a44bfe3de89169f56668
 AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab88059e15ccde83d08ce69625c8c3387b419e46f8a6ea3c3937c17adfdbaeaa4dd5c3f9ad7aef8d67cc5dd406e79dbc250196c1b SHA512 423d52a372c7cdd73206a9001fcc717b50b834023130cc77e4e063ac2b62ae5c84698d127646e3658ae44e3a47f2c77522d007664cf0c4277dc49b47413c8563
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2014 BLAKE2B 6f03f1ff6df2592923efa868008c734225e2bfb07ce01fa2173fc9fd56886be96760e13b30d1647dc5e0ced80a46ad160facfee7a3ae0eeee5f8bc2b04f78310 SHA512 40168c4e6c9c75f9004cdd97b0dc9227be44bd426e6cc08dfc2ce4bff8decc5f4c952a8e787bd948d392731a8ec09b2fef6563a8d151ecd97fe9338e613ee09d
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2015 BLAKE2B 99952a4fc5ef7f84f48a0f1ea311fdcdedbc5859307691b18525cd43cdd58c1c846bb09cae796782c0451146f9736e2d77bda133cb1a258295908e3eba7f6408 SHA512 ccbb1bec622f307be37419f067a7d92d00b5b029dc238f8bb62517ec1c440d88b5a435916ad1a3bc444629f34b307913005594a296c187688abdde8c2dec5499
 MISC metadata.xml 321 BLAKE2B 014d83434739678d62884604e7e4e56cc52123ddd326250068ed4fd2f5db2b439a75e29c5dc3699599db3c640df414f9407cc772e302796a34eec58e21ebf1a2 SHA512 be1e96e34fcb9d2c433c6d67280840adb13b8771860e6314fff1b716814b120c4d31574333052e54fb788f76c8990d0bd1bdb4c725fde28b174bbd5a918bdc6e
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index 7df482af2a2e..5b47eedb2d28 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="crypt"
 
 RDEPEND="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ca6e4440251e..3ecbc80abe18 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,9 +5,13 @@ DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250
 DIST portage-2.3.84.tar.bz2 1043069 BLAKE2B 85ccc209011ef5206e0aaf768ec0276449f5a691f62f8dd65b812b6a285030796180acce89e9f2c8ae05fe4f59505133535f0374bf076846f819477d0a62d231 SHA512 49797ded65091ea7450f3c37e4ca1efb4205bc67e873295b5060ee6d39c1c63313fc1caa8c2f6c7afa6b352cef6d7ef04b8371c66a3ade05ac734b46f807bfd7
 DIST portage-2.3.85-bug-706186.patch 2603 BLAKE2B 6a7d236594a01514dab4fcffaec16542f1334ba8c4f14ab2e01ebed2fb1bfbdf291863132a6726cd7968bd713894970418384307aac003208dd73a50d39a67a6 SHA512 00bd251d3df04f88dc676bdda933a12534bd2d6399b588014a5bc13bf73d5b321e0635ba31083df5c47675e98644e55a1f1fec2f5a7aad86cb6c5375fc642fa7
 DIST portage-2.3.85.tar.bz2 1046025 BLAKE2B 721999b1200b69d2fd3fdd8f4690859f44e6796bdbef1636a80f09ff7625cdff437d183b4e3bdb7d4455b4da9f067adf199106c6b7bdf9b0d5d5ae7a30c7ce03 SHA512 f42f6d87df0bde5e143b7c8b901556c325b9f8250131db400543b54040eb931f9b541ad8211b35942c4bbd99fcfdea6ead93459e57b03173f5bcb37e64a85304
-EBUILD portage-2.3.69.ebuild 8116 BLAKE2B 9f3cdde8658a1a2a79a40b3761caf628d01ccb31e5ea1362f51b2d3e94e94a500b266e956346da701632b725d9de71b8723f586cacab0eb807edabbe082148d8 SHA512 2de3f919fe7986557523fe7b1c0c48674ab971804fff1815d0506bc4b98990e336ac20a252ec7738205e8ea2e75ce0302b29b249d002657e15a3fe40fa42ffeb
-EBUILD portage-2.3.79.ebuild 8705 BLAKE2B 7ac051695bf9baed4f6ddce870d09900e5951841261673250b0ffd2d60f1c4aee9864834af3ad11c392a92c92fb09d2295ed1ba5bbfd486a7d6323b75f2b52b0 SHA512 da2ce712f6dac53cba323ba4eef726a1a043ef181bfa61b26da88c33d49ea2c240728fd9ab14adec08520d6e096a536665496cda9a65da96d432ac8d20eef845
-EBUILD portage-2.3.84-r1.ebuild 8909 BLAKE2B 87abc2436663c57082703c9c084c66eccc6e11026bf89bc7345bb5395a650c1dc0c247eb5c5501da4e1c85558dd6332bcfa061c121995fd31039965babca12ac SHA512 7406effe25c95fb4e64375668fd696aaa74f87e92c4207bae70ac2f16b2a1178ab722c442a0e60b7a37e0b1cc40e88e582474b1bdb9d7104aab0b8188fb85ef0
+DIST portage-2.3.86.tar.bz2 1046806 BLAKE2B 6aadfcf17eacc8f7b82645a82fce96b7d90e93d797704c5b04fe437cbe587440dea8f8e39847c2c95eacf383e4525d4f015ee26b41694c156f907bd22d6663fb SHA512 fad0e89fd2c831ebd8cfd1fe080433c4696f408008f463a151e6fd4f3a2ab2a81249dd0db76f28c7d2cdf0e14e5163c3898c7ca22e7f0edb2e882e1ab7bda95e
+DIST portage-2.3.87.tar.bz2 1046448 BLAKE2B bbcb31a362d89bc81cdedb03be431792dab53d983d35f10853e6a68c2e2fb3da8ddd237305e78ab5946c8199f4dd7a3a41f023912a50abe9fa96bcf7ac35af75 SHA512 47a4d4901c2ecc9df8e38fa804efeb8583928a77e45a9b19dd8edd7e1323911762c357ad0bc1a182d8389225282660f4ef6e442e8addc087e404d561466c3b86
+EBUILD portage-2.3.69.ebuild 8117 BLAKE2B e0fdf8ebaa0fc3212c22727d000183d19c9ebca6c6e00d90a1100b0995f3728d5c4ca44287265109e579671acb27a787cae93f688c70849c4e4cb0b51d55edc7 SHA512 ba7b31dc7e39c0c250dcf259988af8c6b5f175fcfdc975a88bd6263863123900e83aa5363e447fddfa3973d8ebeaf7f5e256cff265b5690d6d4f7ce5f8dffa33
+EBUILD portage-2.3.79.ebuild 8706 BLAKE2B 162fc0fc36eb2f1d47208ff7a151e546f685edc674bb9292c83682e425da2fc30ff9cd1f7ff0acacb8487cfbcec69da6d91099224786f253407086d7e2e4339a SHA512 c24857fafe48639ecfcaff5fff978cfd3cf098add398fe32a74f3bf5cfad9e3f73fa6c86a1e819c8191c89761a7adf257746ce14a1216af5a704cc35ed955613
+EBUILD portage-2.3.84-r1.ebuild 8908 BLAKE2B d835618f242d762c5dc7bf620c29c7160e0b73158f78cbb3c01e8a2cfad67500696ef7743c096956e17317d295df46ce2fe2a445d95bcbb90687bb57b6b49fe7 SHA512 0b2b17622f362afea4db847122c25321ab49fd6ffdc367f1a25d63566866981fbe2eb196f4463166ef31cdcae2675db8a50ac6347e40924d5eb8ab1c2d452486
 EBUILD portage-2.3.85-r1.ebuild 9068 BLAKE2B 2bc3f22e598af5876d491d8dfe6d5c09e0b23799cc8d48a314687ee7348dca30f9a2b108e6a7c8bc0e989ba59fd96693d577625cf7b9accfb2e5efbcc45e2924 SHA512 09a1176c275a83a25677e18150142b9df46ca83d8b99f7755181f36980f259f3504dcf45833386e989835d763362b5dd027dff84b85ae897905ef8c6783df72e
-EBUILD portage-9999.ebuild 7969 BLAKE2B f3045bb8060ed1adb292c72f030f33027776a26bde78e8baca39f83720288bc592bbcf1d0fd13f49c52a55c9f92ca253108ed43d82b02d330158682b2d95c27c SHA512 d9d96777e19a8f3d35beb1f51a826bfa9f15f0c1d403f4284164e2c8a13eb6161a0320b22644569502c249a2d84bf675085cdff5567037df267915198e4f10b7
-MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
+EBUILD portage-2.3.86.ebuild 8738 BLAKE2B 661f810944f512016d98a7b7ce9005f6bdab444fc2fc10e3fd3f0d958372d38e2c5cb5cbe744674f25e6eaabd7657956e00dbf8bd1316d8b72d24cf60f7ca0f3 SHA512 eb581642860da1e01cd4e607bf24383b4d14a3a1d42ead6ced5d983c466a98b1742a777e763772849120d30227de550001104d97d65c905502883bde1c4ab137
+EBUILD portage-2.3.87.ebuild 8362 BLAKE2B bdc941b86140e015725fe23435ab438507cf464f495e867b605c9bd8fae2588c673f533803937ac73d5c148aec89361743a83e9576c3b7bff1efe40161fb439d SHA512 963d81d6c24c36b76fc2bcffaac51d4c6f714c8475d70d7ca974da9a6f1e454d28ae214518607bc52a63bda0d2dc795006e63e21fe44822b992b76b31bbafe6f
+EBUILD portage-9999.ebuild 7794 BLAKE2B 3b6487927a5a689ec37052d38fd2940d099d81b64bcffd48ac3083adfd282504d5399cc12ae8b266d49147f793c411eddc99a9d081522dde054fb6e31b3a9a0f SHA512 b5b9ce2235d2145cbe467167ca2391b996327ed52a84d139da292518ce76ecbda2df0eaa88eddd7197dece2520a49ec369a5ec123bcade99d562b6196b6cbff0
+MISC metadata.xml 1508 BLAKE2B 23da1db6792f98d7c5c6ff0f260c69f76110438c6fd97ffb24552100f6a2e5c8264d0bd787f45367900b9ffa5ce5346badbf53a9f6be7867e725451c33b4f41a SHA512 f6712987c3062b960f76b6752c80ffa6069cec2d8ff743641164e275677ac8126fe2af6ab1588e91712ba6bbb11f73c6de42d6296d67af55ccac3ca48554162c
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 5d99599f6780..bf8c5a54f96a 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -10,7 +10,8 @@
     <email>dev-portage@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="epydoc">Build html API documentation with epydoc.</flag>
+    <flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag>
+    <flag name="epydoc">Build html API documentation with epydoc (deprecated).</flag>
     <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
     <flag name="ipc">Use inter-process communication between portage and
         running ebuilds.
diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild
index 854c01cd6e53..c161ebe47ef8 100644
--- a/sys-apps/portage/portage-2.3.69.ebuild
+++ b/sys-apps/portage/portage-2.3.69.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild
index 42d64562857c..07c6782f9fe2 100644
--- a/sys-apps/portage/portage-2.3.79.ebuild
+++ b/sys-apps/portage/portage-2.3.79.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.84-r1.ebuild b/sys-apps/portage/portage-2.3.84-r1.ebuild
index ffffd5b59655..cb0201998af0 100644
--- a/sys-apps/portage/portage-2.3.84-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.84-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.86.ebuild b/sys-apps/portage/portage-2.3.86.ebuild
new file mode 100644
index 000000000000..e5d1c88a69c4
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.86.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=(
+	pypy3
+	python3_6 python3_7 python3_8
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? (
+		$(python_gen_cond_dep '
+			>=dev-python/epydoc-2.0[${PYTHON_USEDEP}]
+		' 'python2*')
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/portage/portage-2.3.87.ebuild b/sys-apps/portage/portage-2.3.87.ebuild
new file mode 100644
index 000000000000..566fecc2aa19
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.87.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=(
+	pypy3
+	python3_6 python3_7 python3_8
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index e157a1cc9fab..58aa5a833ab5 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -19,18 +19,18 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5 sys-devel/patch
 	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? (
-		$(python_gen_cond_dep '
-			>=dev-python/epydoc-2.0[${PYTHON_USEDEP}]
-		' 'python2*')
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
 	)"
+
 # Require sandbox-2.2 for bug #288863.
 # For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
 # quite slow, so it's not considered in the dependencies as an alternative to
@@ -76,8 +76,6 @@ PDEPEND="
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
 
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
 SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
 
 prefix_src_archives() {
@@ -98,10 +96,6 @@ pkg_pretend() {
 	check_extra_config
 }
 
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
@@ -183,7 +177,7 @@ python_prepare_all() {
 python_compile_all() {
 	local targets=()
 	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
+	use apidoc && targets+=( apidoc )
 
 	if [[ ${targets[@]} ]]; then
 		esetup.py "${targets[@]}"
@@ -216,8 +210,8 @@ python_install_all() {
 		install_docbook
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 	)
-	use epydoc && targets+=(
-		install_epydoc
+	use apidoc && targets+=(
+		install_apidoc
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 	)
 
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index b597bc88f1b9..342e89a72e97 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -1,4 +1,4 @@
 AUX prctl-1.6-no-implicits.patch 473 BLAKE2B dabd09b5d334dc2731af41229248e1f5dcf1e8e5da0ce2c440aeb0e5ef3b278f0ea92db3affefd0632ddb00febaa242a43550d1b49fd5cbc7d6439a69d373901 SHA512 641ccfd96886e682db4ffb31a372f81af4d514fd50ba66fb3329879971f2af5d32afa7cfd27c584452edaf11412cff81b6f61020147071374c94b674a0a41c7a
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
-EBUILD prctl-1.6.ebuild 596 BLAKE2B 4c7ee0d20b40ae1142e9fa4ab6b45fc325289b5df321f90b2deb303eff1d83e806689e82d611329039589829593f22e035bc96eeecb78720938a7d4c26118fe4 SHA512 dc9cbb8c0c3d0f75d90cdfd42c1caf3d9586e34e53a31444b84aedf84af5417b63cc5e3c6f611d8af546b54fa8f9c51496b0844471aa5cfe259f6cf1e200bb11
+EBUILD prctl-1.6.ebuild 597 BLAKE2B d7e672fea2785fbd7640ea5f72b70343617e48e6f0579559141385d1d37a73935f0ef595cab4e70d6c4316f85e07ecbfa8b54086ae8d677d61c5f0f1e41763e0 SHA512 af984e9080fc984cf04384edf6aa5edd38e42ebcebe23a722fa597d9155c9b44fcd536a3f53f52f3c48e5dce40504635d764d12ab058603e966cf4a340336e3b
 MISC metadata.xml 449 BLAKE2B da01afb0a080790cad07f77c097cc92bad6fca77c6d8da75b21e35eb9f1253153bb90bdff9aa719bb77a0c1e760dbb2c60d8152c9d2de15e37fd41fd2edcda80 SHA512 a254e2fa6263298f6f35967195a6f27ea434767c5690082df42e09f3bbb2439835643cfa4d030a09fd5a1829086ebadd6c5485cd53c49ed0ebf291e897f9290f
diff --git a/sys-apps/prctl/prctl-1.6.ebuild b/sys-apps/prctl/prctl-1.6.ebuild
index c656b7bba801..903043fdd691 100644
--- a/sys-apps/prctl/prctl-1.6.ebuild
+++ b/sys-apps/prctl/prctl-1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ia64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index c7b9598772fb..32e31f05c17c 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,5 +1,5 @@
 DIST pv-1.6.0.tar.bz2 107723 BLAKE2B 95118fc6406f73e800e99468457ba00f0b8f0345eef58f7ff7f4e10b90419cb36b37af094dbe5bd84b7832dfcc96e536dfb845a061f99a0b118192e90821fdc1 SHA512 bd405901812ca50b910adbcf1d2c540dc0b8612f03687866734a79cfa5b5b8100024c18a1d1413c6613e1f2085989cbb77907da89bec7eda37cdeaa7597129d5
 DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26
-EBUILD pv-1.6.0-r1.ebuild 1366 BLAKE2B bb9ec58cc2818b16765c845081a2b9180899666ef6e5ec8878117f773b080e16d3f8269877a37b7a439c58b2821e0da59f87794f07ea359c96e8a02db6892b84 SHA512 e80bf147207f39ee56c58458432ae1c5df9bb07e10b9e6afdaf2b15d89d9bb4867382e004acb0a308694d885f68106193012424d25bbc6b05b3390d6327ee504
+EBUILD pv-1.6.0-r1.ebuild 1367 BLAKE2B fad13cd582603fb5e2f3d634012cd5143ca610b2e3c0443159b34d78b61fee3baa83fd51f0ccb1f9370a39fe0c80a489cedefe0742b7b4f5c4d84849d7d6034b SHA512 b66ed6b97fdd14ca3ff010484c29bb77a170ae823639d750db4e7d2e219cfbb51f1aa8a2acb7a1c1f1a7098cbf6bab939cb4b01c2b3e57350ae8146a8820c834
 EBUILD pv-1.6.6.ebuild 1394 BLAKE2B 7459925a0f3b591d5d39281f59e3da7079c1b58583a5dd30287f51aaf2675731c63f2fb9220e70d1db3f070062a30dd140dd68f19645c00e254b926b3b76153d SHA512 8aeb28bf335c7e83060e59bbbd3b14885d469c01f56d2df7754fbabc348a566933a4cb19c8996538d06da6e10842f27fe50ac707a849d16808233d6770d4bf99
 MISC metadata.xml 334 BLAKE2B f38b13fd2aa1e836db200a4f9867a5cbc50caa54372977003b4dfd52f92dc2a165d121de1bcd86e7b489911c31c64bff30af3364930ac708dc8f26f7dab6fa14 SHA512 ae252c205325a4937f8ab6c60c8be5a032ff8f11087b7a1fe737ed9c4fa6325b34dbcab9bc16467096de93baa330cec51909f72686cc4152d653fd1456333fb3
diff --git a/sys-apps/pv/pv-1.6.0-r1.ebuild b/sys-apps/pv/pv-1.6.0-r1.ebuild
index 57fa1092ab21..6763f38c99b3 100644
--- a/sys-apps/pv/pv-1.6.0-r1.ebuild
+++ b/sys-apps/pv/pv-1.6.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PV_LINGUAS=( de fr pl pt )
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index dbe22d5fb772..edc578573a68 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,3 +1,3 @@
 DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
-EBUILD rescan-scsi-bus-1.57-r1.ebuild 855 BLAKE2B f9dab83869ab3ad356353b13c17ca497aa18580617201121b0bb2b6e4cad8b7a334c43f1e268195a6e69aaaf564cce85b31f4049d3cf773c7dfb742659888d18 SHA512 41cf5d0ed89043baf6f9a677a373cdcde0c40c0e16af69f69c813c8855e084b5918551f80260f86666d05446400c093d28e480ed229b4d31ca0f522cb1454c84
+EBUILD rescan-scsi-bus-1.57-r1.ebuild 856 BLAKE2B c86bb9612e57f84c06506be8b56cce2b48904bb2f8e869880c9e45ffad215880220ff8376fa3307ac8e86c69b01352a621f1199d092dbda5d5e707edebc4d243 SHA512 397920239930871cf8ffeb83bb4483101b488fb6da3437ce5ae9b47ea45cb846c5b080e53ea2ee4d1b194162d8eec08e8f778c3cf0dc5d7b03e46739e74cb6b6
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
index 060cbbd64cdd..0a13dc97f50e 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
 
 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 ~sh sparc x86"
 
 RDEPEND=">=sys-apps/sg3_utils-1.24
 	<sys-apps/sg3_utils-1.44
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index bf8934903c88..6033469e51fd 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -16,10 +16,10 @@ DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27
 DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
 DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62
 DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b
-EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339
+EBUILD rng-tools-5-r2.ebuild 1145 BLAKE2B ef0aa5e3afde494ae1d488d4ef00d23b6d9474a2013864af68d2302d1dfdc30bfc812ca3a53aceed4f3ae5c9f855a05ddd5837f8d1872069c63470f1b8eecc72 SHA512 af3d0e28c7cca9da87ed041da454375715de91895a0651c4c117070b8e2aee991c7ef4f98fca5bc66b48820477f7127107c9718618a2aff2c97a64be0bba42a3
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
-EBUILD rng-tools-6.7-r2.ebuild 2171 BLAKE2B f637ce1fc99a932b980ac2b811978cb4e943a0d71c14e567447b0372b276c086c1b30066074820cc5c1566b330108ebc39177855f06b15b5c8572ee4ffa94226 SHA512 44b9ed0930514d8b2e1a44b185b3601b955441ee23babcd5b42e149af32dc6177ed39529c729f374802c07688ce7350db74163c628168876ebdd0af7bcf853d8
+EBUILD rng-tools-6.7-r2.ebuild 2172 BLAKE2B 0b4a427915180a8aad92816d74470b1f77eb742f1130df682d5743a71eaf871c118f3a48523b05b36632ccf6766c33f8680eacda7000b443c7fc32df460d55ff SHA512 c1954f2eef54a321e7e0321835a62d63beaff4d7c734e9c929532679ff055e51bb5478252c91ca35554d5962f5badae44c390808ae19d301c4c985b6a7cfa057
 EBUILD rng-tools-6.8.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
 EBUILD rng-tools-6.9.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
index c204dd9c36db..2bdd75fbce6b 100644
--- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc x86"
 IUSE="selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
index f76d6bded44f..e496621e1c70 100644
--- a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 73b6245dd794..49ca4f155ecd 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -6,8 +6,8 @@ DIST sandbox-2.14.tar.xz 426992 BLAKE2B a30984f613b773cb5e53b2b0297ada32d1179769
 DIST sandbox-2.15.tar.xz 426948 BLAKE2B e40bb728192ef3793a9129bc88a63878516b0977a19effd5b02ded644ec6fe1627fab34786b22024957d96725fc5c53f488f7b09119be7b7ca91692dcee985dc SHA512 7249b594864267311ce8e2c04275df49c6d8e8e811dde5780f7f676cb43928728b9abed77beb8f5ee32061efcdb03753cce44d5bf1827bd519d6be8fa54912e6
 DIST sandbox-2.17.tar.xz 431700 BLAKE2B 461404f5b98ac83d9e5bc63fc7251cdfbb04a0ccedb340a7a5b8595b68ab34034a56c0a0cfa8478961c9282f6450de89ef5b512b13d427a7f63c17a4141cbcbf SHA512 b5d7a76d894471f6610b41aa05f007d257c69ae5c90f8db455d626e0d1209b9d276678c36e90d2e4214d15074512be182b4f5f905ed2b7e236ff714cbf51958f
 DIST sandbox-2.18.tar.xz 427760 BLAKE2B 26199ff8f919dcecdfdb74d508e0802e2e929a003ff1caddc54c1ea0f7887938c4f69065e585d61f7e96b29be26a34a1cdb62b397309e993511097ecaebe0620 SHA512 1775d4d6f80d414ab94eafae73966c12c4dd80857e21f0849703a3230ddb80501d8e574b14296e554932766cd71aa7b48a802fc388aaab43ba882ee7d005a60d
-EBUILD sandbox-2.12.ebuild 1922 BLAKE2B f3a63b14db2fddd2ad914481e76bdaa7116db993b00eb901aa033ebeef57042607169427cd6ccca9df5d2a4fea3fd420aaba08e28ca9eb04d17eb902fc200222 SHA512 7a7c10066eb2d05ee1090bf1d01d001d32d9fa12d01eb825d25bf5469b5eef3d0fc9779952c78e5509bdb7b347750174452880095b9649c10490e1d9c057120f
-EBUILD sandbox-2.13.ebuild 1919 BLAKE2B 3dafabc7d19ba0b4bfa327761fcf9dc51814ef3fc64b0e90f6c396673af04312b800724b29ac786b0bc7b293267c9ba375e83280a52170bcaa657043426c3827 SHA512 5bbcb60d15ddb8e179689668fd0ec1e923f5374e22caf8e4a180e2f7569babca5098993e884414299bc7032678f53b2017c1f2d1565b512b3189e77b92af0e47
+EBUILD sandbox-2.12.ebuild 1923 BLAKE2B 293340ae0f7a7b14ed654e1f7d02eef90930b7bd79a28ba2db72296ae0d0b6e5e5ed6a79009c29210cf11bf5815b94f4360231ed8a70e897a0cdd6bc80fa72bc SHA512 930b296cce0ff93a155923f5aaae28afcddb89f8e97cbd4ee24dd9c4a343dc433d18bc05b637286acf7338a3d7aaec0a6cb96d56faeb52f27723c47b724a291b
+EBUILD sandbox-2.13.ebuild 1920 BLAKE2B 9bf7b28523bd1e118956dff7995c1dff240d4f5b821211904941e2fe334d63401f2b97ce96f624deea2e9cab5ec2a5e903ee033d7d75e9ef96ee04a90c793eb0 SHA512 0f221df26bfa7e33cac3ad23fae17a787dfcda603bf67fc1641265658ecf0660e0e586bece7510c2db63be017cc98a0c88e4535f70bd827d60feb1fd32c9fa9a
 EBUILD sandbox-2.14.ebuild 1932 BLAKE2B ccf40b2fc278a09bee5445b339456ef2532a8b95862d70843a2f543dc75363e0554eb99ee6e33eb77b39763de0cde70ac59ce81fd6d31b1208ef5cfa0269aa96 SHA512 afb04d1b36ccb5c542c9f6b5aa69f19a5eb4dcb4f045126f19352cde5c14e64f5efcfb14bc17e7caa3a59cb22be1ce9830440454ac16775fc6bd94515f658f1c
 EBUILD sandbox-2.15.ebuild 1932 BLAKE2B ccf40b2fc278a09bee5445b339456ef2532a8b95862d70843a2f543dc75363e0554eb99ee6e33eb77b39763de0cde70ac59ce81fd6d31b1208ef5cfa0269aa96 SHA512 afb04d1b36ccb5c542c9f6b5aa69f19a5eb4dcb4f045126f19352cde5c14e64f5efcfb14bc17e7caa3a59cb22be1ce9830440454ac16775fc6bd94515f658f1c
 EBUILD sandbox-2.17.ebuild 1838 BLAKE2B 4c01e2be81405877a9864614afb99cd88c4ff39445e965e863b846617b0ce7f7f248d1a5c7bdbb9acc9edac0d2bb2c9526cc6978049b1e45d1354478a7de1672 SHA512 9a52dc34a47ea94d28be05e20448543ee0aeb9188a4fcc83f1aec501ad5f44990a09eee0ea1bb69b3b7cc0051efc419595a9a36952167ddc9750ebba459908bf
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index 2a256241c7b1..8bc574912d43 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index baa0226ebb26..8573673ac980 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index c10274ca20f4..507c64c929fe 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,3 +1,3 @@
 DIST sdparm-1.10.tgz 361464 BLAKE2B e2e7f09936fcdbdd50b7f397c62023592b494d5b1f8a998d32a4777134ec2edc39b11433ed00f5518ba6a8d04f7dee36e6a070221901b9c31a1a0d25da8439e5 SHA512 1cfa95ced443d190ee9e4a899c9cfc6b98367ba39a9cc201c0db2f8c92dd4e74368182be3b8bfe28e51761b1ededf914ee669ef8ff6023d1ec1f05d69889a35f
-EBUILD sdparm-1.10.ebuild 1014 BLAKE2B 14df30a306633a306f8ddf5df362df24355d77c656cfbe420fc157be4f60355a339d63493f541170be2ae4d67265a556b73c55d18ae6a883366329fff65b7c88 SHA512 2bfed44416469884e4a6c809f527443c3d8786f132fdbfd9132c487d62e1a54253e8ae2a95b3b9152b870904d5bba15cf41fee3feef96ccc876f60b9157ef978
+EBUILD sdparm-1.10.ebuild 1015 BLAKE2B 6d4e0658731559978130b18caa667525c95434f2166348757bac9cb055e978181fd0b9bbf54ba38de2759f28234e1ffc49ad15398fa2d1e27e26af4af46c1591 SHA512 12e80023f60faa4dda1341e17bcaea1b8df3f14de09e887914ed62e1cde2d368ac7fc0b9695db57d865667d07a64d65d28b78b522fa93dd1cc3a1360cde4b16d
 MISC metadata.xml 372 BLAKE2B b025115c048016a23d179218c7e3579cdf87fa3e6445b5d69029df1d96a5f3df951bf087f0c51f65ee1a5df7050163ec99c554428cf883247e1f9ff5b8812d1a SHA512 ac15ece82367c7a5a7cee2248a418b2dc5912027f29805d2851643127ea90c7b4ff3d21c90afcf0255f6946b0290551884405bab7fe62d2d9ab0dcc10de4da5d
diff --git a/sys-apps/sdparm/sdparm-1.10.ebuild b/sys-apps/sdparm/sdparm-1.10.ebuild
index e7378a56f935..91c602ff393a 100644
--- a/sys-apps/sdparm/sdparm-1.10.ebuild
+++ b/sys-apps/sdparm/sdparm-1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index d9ff7cf80fe5..9007aec8cb4c 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,7 +1,7 @@
 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
 DIST sed-4.7.tar.xz 1298316 BLAKE2B 752bc2e942b6f041710c6811518147c5fa4b143b33ae842ec1f142ec914bfaf4d7e8a94a2b1a5b345789944e5426f7946997f2ccbc43ee5034351a95ce3a677e SHA512 e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb
 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
-EBUILD sed-4.5.ebuild 1111 BLAKE2B f7564d0ec2c55ea629c0b0d38432297d047ffcab549c9738ad7cd2c7f7f96d986b307b3d9e6892a9cce18851e29a79ba983f461e1e2d69ae1f701b75c3f96dbc SHA512 f873e92e5509782096f8f7fea5cbd59c19d1233e95f1c208d93bd8703242dd5e86d419f3fe662728cc4961fc58a5ece8b69620a0a03aa70b72296f5577173751
-EBUILD sed-4.7.ebuild 1117 BLAKE2B 070d1c0889afd54936d18bed07d3335ca6d0522d1ca68f18f26df660569553f242e0de16af9ed581614bc227e5689f8ea87ef7f1d579663b72c59df82e97dc49 SHA512 2121e60780576bf0eb8d6b22fe340f5f255864ee6033a97617bf88503747891efd7c52290e43df1e6085b05b26af3f377522eaf3093c440167b323eab53d51d7
+EBUILD sed-4.5.ebuild 1112 BLAKE2B b70619cbb0db9a432ae6fe0d9da6b132e1a384dfe7fd0b8327dcb705dbf24cfc10902011f1eee24199c8b6b12bfa855517f221d179d5f13cd07a5d1aec052068 SHA512 7f367d0b5d72c085f30055cf0e8e751f61d07041177aacbb67b9fafa03cfca5feef3f73a430f40900ee885c8acecb57de9cf75f98e12a0e118d9e55cd5996c8e
+EBUILD sed-4.7.ebuild 1116 BLAKE2B 05ff7622de5c0275d859ba085602c7e2b3094a9e2d461302619bf20ea142ef7d3916f3fb4d63ee15d14e7870d3d9f0e60ced2bc3666712a45dc2e153279b23b2 SHA512 9f3c2710653aab67403b16b6722c84e443d430838057fc39ff6325d6e6b7f8435ce4a4a1bf97fb5fc225e6c15f7873805a020973f38b5085927afe7a6c7d0551
 EBUILD sed-4.8.ebuild 1124 BLAKE2B 90231eec93291dcc293916699cf92b1209f09277b674ead4ffffa58985ec946d7eb6a36f2be939f83a80fd15ad48bba22b950dad996b50ededbe4b259c268be0 SHA512 ae2955a2f9195f6fc7ae2c6f9e1af5c7bd55e9489fa7cfb5e4a942b9ac16af8a2901a3dc6788c5c7505743b748e45005c2dae485894adf3c36810491d1eb8259
 MISC metadata.xml 323 BLAKE2B 746a8514f64aa6bc67931a9a1c61ff47dd0ff984dee09d04afd44557986ef1fe87ebdbd844fb68bdbe8158ec16b6d776b6f9956f2b5611495af5aa3d56c8bff5 SHA512 ec3a11f7aafded3d4b5e12680358f39dbeb166f96af51eae8dafb21b186024ddb9b5b9ba36bde626be01b1938fd6f4bbcb58f0f8bad2208a84d44eaadc95652e
diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
index c6ede4cfc760..2e5c67c6d5f2 100644
--- a/sys-apps/sed/sed-4.5.ebuild
+++ b/sys-apps/sed/sed-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
index 94c12cd6cdcc..cab8f59e13b8 100644
--- a/sys-apps/sed/sed-4.7.ebuild
+++ b/sys-apps/sed/sed-4.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 790d3cffd664..df5361f75d13 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -6,5 +6,5 @@ AUX setserial-2.17-headers.patch 236 BLAKE2B 06ba0f4ad6ecc3788115b02fa4f5762b272
 AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2adcb7adc8e04f6d20594395cc01e821364d04aeb02608644c88e511453599af451d00dda8c8ab54bdd1710030cbdc7833c32286f SHA512 6041894014b3d139a8c2d59460003310c17aee407dab2fa3713f98ea2c29fd347906f68f3d988f052cbee45de43fa00afadc4359b562bfd34fd4931b48505cf8
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
-EBUILD setserial-2.17-r5.ebuild 952 BLAKE2B 8ab9fdd4326182037c4fc3217d5da3f8e3f46a257257722cdc24bf2b54757a286ba118743679cbb766ef0b23d9b8ecf56fa3f361284f12e6827407459734ce67 SHA512 aec0146d7ab1ae9d1665f4722d1b75a2d14d2686638002bd54ba44b634ec855d320ad6e4a3c1cc05f1c6b975589b42fa0044bac8301f2be1da67650cf75c7246
+EBUILD setserial-2.17-r5.ebuild 953 BLAKE2B 5e962abee92d88ae26f7aec7947deb56225e574c4d064cf08aa7704d6ff614c5d0a9ca149467f6ca56c83aca8b3cc7c4279b8aa28d0fa04029ee46800b3b61d2 SHA512 22c2a2a3aaeaaf9225b647a7ff6273f1d5c82ac4c948488d2a12802e6ef18071995328b1cf914e9299c87530d5a328baa8a9ba078f383c631bf15e7e025628a2
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index dddb2d6e21da..b5ab9a748f8e 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 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 sh sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 9c1d7e021765..cb65b8e41190 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -2,6 +2,6 @@ AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642
 AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89
 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
 DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
-EBUILD sg3_utils-1.42.ebuild 1030 BLAKE2B 7086604cc7f4e6ccbea214d7bbb9e66d1d07146d1cca14220dfc358ded7cfb4bd8f54b2f6fc49a082a2fbbb162ff3494b3bdb3a254448fb5e2db5b76018ca5c1 SHA512 8e8ac9d7b4293e8361e593685988fd92fb38a22e58e22b5f556216160fe494d9f2862509225ffcc75064bb18dc3eb9088a9c8595d6d6a7ed978d9189b8de2b59
+EBUILD sg3_utils-1.42.ebuild 1031 BLAKE2B 42d6d2a0e6f6490c32345d1f17a3c6994ae2e5809f2a0529997b5b245aee3259a9ec3f4f5d14666d720da397c628d53abc99550a36c36fb2d1f440e09a8f701c SHA512 a6861051b2d6042d82cda9760f035de4aca379411a69ba0a971c8b11c6d4bbed4108e51c3805f2cb28c1285a8d6e8b71894b7cf1a75b65d6579ca11fcf79c360
 EBUILD sg3_utils-1.44.ebuild 1059 BLAKE2B 3142f90ed68830e64aa4c75c1b57afa1fdf360c4bb7b0053fb0df8ebf4806d6e1000df683075f49f9615166a8aba71a856b04964383ef0935f3423527feee8aa SHA512 1ee8606d54fe680c151bd6bf8299854caee899215aad564951be3092544b196b40ac814c4a6a597b041a0d9f585b36c8c9ea039bcc98979f66574470020f9823
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
index 29a4170c556b..d2f58ec8f815 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 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 ~sh sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index d9b023d0e7d8..11791acfedf3 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -9,8 +9,8 @@ DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf79297
 DIST shadow-4.7.tar.gz 3833335 BLAKE2B 8e030d3dcc5eb76332ff76aad8e9141edb4ae660f56dd3b420968c538d3022a72ab620710b9274b9afb44f497399f5c4ceef339b7d2c52106b9b8368ff127654 SHA512 9b134dc90d8fb39bc72db69ddb78cef6263921c8a2f00abc00ac796bf468ac18393399920eec14bd2a78b814a06fc18eb6f5685ede13fe222fc66b2e411cbb01
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
 DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c93fc6dd610876263ac22e61fbc2821649d347c28055ae84f64cd5ab5c2435450c55339c80b4ae5062ccc44f SHA512 1c607aec541400fc179d6cbbac7511289c618ab2ce6ee9d7c18a8bfda00421c62d4b9e58aff52b5f82d485468e7db955c186ea0faad9a08003ffc01bdf2ccece
-EBUILD shadow-4.6.ebuild 5363 BLAKE2B 90361141986d5b78eee02f022665073d2af2970949a5406b9aee09b5a7abd7aa8397048596275daa3bba4547380764f2c5ff26d634cbf03f8c387274f016282e SHA512 95c2ab76e365f10cf57277708dca5a5b96b24f1d527cd86d1ab5209f04f51251b3eb123473c77558223ae8c08310af13d2f8fe6e7314f69055933af8a9001074
-EBUILD shadow-4.7-r2.ebuild 5794 BLAKE2B f7a8dde2cac49657be337c7e226e6341c764ee0ed9ab1aa6e9d2bba96eb1f903c9fdb63c77152f5fd1ed1a4493fdd16a87ef6a01010c493650deb0a05da9a8e3 SHA512 9965f73207d382ca980fc996978ea6db7520b343029c61ae0d192ef4cb77dafe89e42142dcf561648c224415d1d696bcc865bce0544744e77579ba62a928e80b
-EBUILD shadow-4.8-r3.ebuild 5762 BLAKE2B d75b0f31ae6652a7d1513282b1bdbda106988a1e6cd97aacf8bb94cc03d07d2d4d52d9f3cf75f4c723331051407d012bcde828bb62120d9bb3145c9ed06b9a0a SHA512 e89ec9de0bbc6edaa6b25d07690269073e59ac9ee716c95f49b52c6c3bca5a3812b068703dc5a9b78b5980ab40b0db808437ff4180f1fe20991ac83757af7091
-EBUILD shadow-4.8.1.ebuild 5719 BLAKE2B 142a1f5e88d56582cc47420b13e0f1a9291341f0bb132a2e09c473c1d72b6e7d9cea518d29362b8f3ac6ca9cee2fd248cab5e3f9d8ab2d308d97a65b256356f0 SHA512 dcb0eac0699ad96524fc5931673771a926e221d812bfa22970c1e0416c5fbaa133ef16bf9f66f016eb468133137b7185b6b5a155a2a88b3784b5f8157d154d23
+EBUILD shadow-4.6.ebuild 5364 BLAKE2B 8223d8571e15a886bd0fbf6873aad932b2aac80005764bbeaa3405a1dde2d72ebbc55489958c08835c23abfc2fa3fe6e3658caab4ba6bebf368c9d1ad56440fb SHA512 e1181cc34f6a19a0015350467c2595e7a0cac9ad29af0b09b9a1b01a7cd9554aaf375dccd1f2ce424d5c94dd4c5cf382fa7d9a0d18dcafa8835342d57ce5da9e
+EBUILD shadow-4.7-r2.ebuild 5797 BLAKE2B 50ae8f70ef78adeadb61095580bb02f9ffa10eac29a4793918d4248e2e891790364f761808d1f1ac26b1fca5dbadaf6db3f16272f349be6f7f3885a12a568c78 SHA512 0533a37fe59edeee1ea32f3fe86b3f277c7cd40964fdf2f3e17a9e8b5775748d9ffb039beb309e2586e35acea78c8d200b2359246c4bf5c1a1573d2b5ae1b9d0
+EBUILD shadow-4.8-r3.ebuild 5765 BLAKE2B e1795aac463f30754906ea5cb872585bea5ac7ecf6265a7bb536ac1aa06a5ccb8f590e899a44f7a37c088c6c9241cabe1e470910bc63c3e1ee5d4bb6f12eec6c SHA512 59be0960eb5981a63d004475380b5c723d76ac6568589f5482f7e5b7d562c9fcf321e2bbf475b7d08209cde9bfc0509069ed4aa30844ea000f2e16f309616081
+EBUILD shadow-4.8.1.ebuild 5722 BLAKE2B 3aa92cf42b73783d8ba6e765c72f3752b2381613fe8284131e83726b43c9ca37882980e1777b245a36d286ce6cfcba65a420b7a1db884ae35e49f746da13bb18 SHA512 e5c87494406a8edf48af0e70737e74ae16db11d004c70f58a3702554ca30eaef7d840a98b871780ce167a653b51cc9c6d69221c2683001aa3cfce7ad6bc53178
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index 94dcf9d2e357..a8607c08903b 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="acl audit +cracklib nls pam selinux skey split-usr xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/shadow/shadow-4.7-r2.ebuild b/sys-apps/shadow/shadow-4.7-r2.ebuild
index f3291b9c2c01..3c710558632d 100644
--- a/sys-apps/shadow/shadow-4.7-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.7-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
@@ -27,7 +27,6 @@ DEPEND="
 		>=sys-libs/libselinux-1.28:0=
 		sys-libs/libsemanage:0=
 	)
-	su? ( !sys-apps/util-linux[su] )
 	xattr? ( sys-apps/attr:0= )
 "
 BDEPEND="
@@ -37,6 +36,7 @@ BDEPEND="
 RDEPEND="
 	${DEPEND}
 	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
 "
 
 PATCHES=(
diff --git a/sys-apps/shadow/shadow-4.8-r3.ebuild b/sys-apps/shadow/shadow-4.8-r3.ebuild
index ce51a62e4d92..37376095e4ca 100644
--- a/sys-apps/shadow/shadow-4.8-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r3.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
@@ -27,7 +27,6 @@ DEPEND="
 		>=sys-libs/libselinux-1.28:0=
 		sys-libs/libsemanage:0=
 	)
-	su? ( !sys-apps/util-linux[su] )
 	xattr? ( sys-apps/attr:0= )
 "
 BDEPEND="
@@ -37,6 +36,7 @@ BDEPEND="
 RDEPEND="
 	${DEPEND}
 	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
 "
 
 PATCHES=(
diff --git a/sys-apps/shadow/shadow-4.8.1.ebuild b/sys-apps/shadow/shadow-4.8.1.ebuild
index 124f30408d10..b0c1618383b4 100644
--- a/sys-apps/shadow/shadow-4.8.1.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1.ebuild
@@ -27,7 +27,6 @@ DEPEND="
 		>=sys-libs/libselinux-1.28:0=
 		sys-libs/libsemanage:0=
 	)
-	su? ( !sys-apps/util-linux[su] )
 	xattr? ( sys-apps/attr:0= )
 "
 BDEPEND="
@@ -37,6 +36,7 @@ BDEPEND="
 RDEPEND="
 	${DEPEND}
 	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
 "
 
 PATCHES=(
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index c97a2786ef83..3ac58368847f 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -3,7 +3,7 @@ AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6c
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295
-EBUILD smartmontools-7.0-r1.ebuild 4102 BLAKE2B a2cbaf7b757278e103298093a5b1c7ca164fef6260a050528e1a6d6aafd5baa5d775c4e8fd2d02d35e643a2e3480ee24f54608cdbd412f66bc31bfed4f039944 SHA512 17d51026674e290a4b650bcd119b272f165953cf2831d63afda025e6ffb9b64ee398488192c799d813252584f451126416d252560b34d1f43ca005ff757d0d6a
+EBUILD smartmontools-7.0-r1.ebuild 4103 BLAKE2B 01ffcc89032428c2590fd847c6899b934286d48cfa73b3c4b87678d181855696c35cd6fce459ebbaa770e621e83165617d9a0c660d6ca76dae5c036f144c557e SHA512 95c6d36eb6d9e1594e5f857954b694d328a12d3aad14a76afb89177d770b16e7452d956035bbe20d97bedf0c7ddc445bfefd21979472e790fadd03babcbc7a55
 EBUILD smartmontools-7.1.ebuild 4111 BLAKE2B 3e033897b4a3598a2373ce83394f2ca00f958b814123b71438b40e74c21b6ec723116634245756d6a50218f0a73bc024efeb997ccfa902066f84d627243e2fdc SHA512 6dcf23ebda2b12d06ec58131218b9743e082767dab3cf87ece2a300eea2f7d749e8dab325ff4703861b187b5eab811157dd0bdc3d0015d188fb92b266c919b2a
 EBUILD smartmontools-9999.ebuild 4111 BLAKE2B 3e033897b4a3598a2373ce83394f2ca00f958b814123b71438b40e74c21b6ec723116634245756d6a50218f0a73bc024efeb997ccfa902066f84d627243e2fdc SHA512 6dcf23ebda2b12d06ec58131218b9743e082767dab3cf87ece2a300eea2f7d749e8dab325ff4703861b187b5eab811157dd0bdc3d0015d188fb92b266c919b2a
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
index dd0df0ff062f..b63f007b6df0 100644
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index feb77a1aa61c..2a3a5ade55c9 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,3 +1,3 @@
-DIST sum_2.3.0_Linux_x86_64_20190808.tar.gz 8783572 BLAKE2B 92abe3cd246573c107aad5ce76334d5d53d4e5067f6c74c70b8c078910047a6d5254427de89b649b9fdc75832d43fca319a16f4143a486966beb9074b90cb3fc SHA512 83d8e619cd9ad838b681dbee294d6c19741add0994678778c2e7519ed354e447799a5b12676bd9f3ba0ecd8976258b4a11fe4e2e988276ac1aa0353020201ef2
-EBUILD smc-sum-2.3.0.20190808.ebuild 938 BLAKE2B dbf6feb7af9cc2881e67389772fd80e23bcd23ac2754f7103dbe174311cf1784163198ea45e834bed2c8f7d98163442632dc1d66c80b00cb2b9709894f079e58 SHA512 1cabeed843808fab62fd9de514cbcd551b41e63f737895bf8de485d64558e4b574765f83eddb4481e56c0e9602fea37f3c3445446c1c0a270f8401fa9ff54a4c
+DIST sum_2.4.0_Linux_x86_64_20191206.tar.gz 9732263 BLAKE2B 4c0c25ab5d3a8b533487287676efe38df164ab80327016172da76539081b90bb4a1de5a043609f35800a82651335f862ea08aeaa867270a7e21b309372facc81 SHA512 7b320590391434518e74491dbe093689c4dcee2763d361203be2d468fcfb20e508fba489291d4bd08fd97d93d72309def1737c69a34a9dcfefb06cb4b45806b5
+EBUILD smc-sum-2.4.0.20191206.ebuild 938 BLAKE2B 7dfab4976702112788ff228cd6576b896684aacc6b1e1b2877fa0b4a23c666bdeda5690c0d2ce7cc4c0f72137d38487ab2800143a3cadd07c77e3bef2ee7baa4 SHA512 f7ea58623162c521a6f20c33cb1a6e513b00bc4d65c97f65bb33f1c67f083597496a190bf7e1eab61f631b2ccc1e94580924d3cc45ec85feb5e8af5165d7c504
 MISC metadata.xml 1097 BLAKE2B 2614ed1fd32c33675e1e78fc069670ec2b156efc376beecead2ebc2d7212e918f0fdf923d90f9d6db61a1c672f565701c2fff812e801a6ed955d299506653cf6 SHA512 cebd02c5e048668caf78a5bfc19114ebef9fd55ae9c25adb8c61275b847d7311ae38ab1825b029770bc191b65b334eafcddcbf1c50825c234542e1454b78e730
diff --git a/sys-apps/smc-sum/smc-sum-2.3.0.20190808.ebuild b/sys-apps/smc-sum/smc-sum-2.4.0.20191206.ebuild
index aa3d81c05b4c..07ffd44db9d6 100644
--- a/sys-apps/smc-sum/smc-sum-2.3.0.20190808.ebuild
+++ b/sys-apps/smc-sum/smc-sum-2.4.0.20191206.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/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index b3a5177ada34..fc60f16446c1 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -2,7 +2,7 @@ AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172
 AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
 DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux.tar.gz 122153416 BLAKE2B 2d4224a76588fa4da41a8080bde5833ce3a7da01a11e45fc48069084077fe2e1e48f5e92ec266b10a390b3a40cfbc66f2b674c9ef59f8b3b11d42cb20eb992bb SHA512 e655e14751906d392f0f528c6d5afe83298f398025c5808d2efed142a3cdf9b56d06964feeed63fef58f2fe793d7de06c3eeb909e4467ce774317bb7971792d1
 DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux_x64.tar.gz 119034481 BLAKE2B 032bbae5a3e608f6f51ae955df875d18a7b260fc0d49d6371af910cc1186c47b3db2b012dccd2837b598d5e405fde01390cfb44a5526297691c9bb99029c2dbd SHA512 9d721b8409510f75dbe36e8b5e3fdfb89f42f85365406f2c53890c1f5a6620f6abe00325017443b9af26bc60aeae7392065eb451d1a318de9898783562b43933
-DIST SMCIPMITool_2.22.0_build.190701_bundleJRE_Linux_x64.tar.gz 77421471 BLAKE2B fffb158364c7d8a71bd3e1c81ac6e0822cbaa00470aa2df14e34663b92d4c2641d01ab18c63b251e696624e3988ec5bcee97d72e3788b2f77e43db682e568077 SHA512 ea68816e3ab294862b5b6927305283f4204364ed9b319e3be577bc49bf47f767b89e05475e11269b426f73385148c10cf0109715708497737db393846cf10ccf
+DIST SMCIPMITool_2.23.0_build.191216_bundleJRE_Linux_x64.tar.gz 78810880 BLAKE2B fa4d0c7ed8cd7fb8b03847b30d22b4c70d74402be50ef217b237a0ba786e264a0832533476db5523cf3ce9a88c2191cbc9ff32d54911dfca54ff8835268f0efd SHA512 7770a1ec468934e1ac89612e77092f83ce91822326279afedcc5da9b5cdd84193e8077b87441c79253e366bde6f1ef3756ff35ff7fce8bc1759bb889ab8b082b
 EBUILD smcipmitool-2.21.0.181029.ebuild 2209 BLAKE2B 0cb30302e5cd7bbf9d0205dba7605d5a124ad5a54b538580b878c9111d24f61d9805011c8513a292525163ababc8f522507a484bafce3a2d26cc38a772bee1ea SHA512 a73f9d575679c44ad14092356ad53e4825690b4a3fbb32b5678cd7441e64d8bf80823d7e04939e1a9008c170f597f59483b758ebd3fcff3c3fc9a2628ff8ddc0
-EBUILD smcipmitool-2.22.0.190701.ebuild 2013 BLAKE2B 9f46e27eb0c35bfa99cbb4797cd08a542aca163ae699364a1f6a3161c4a1baff5fc6ede1e5a2ca3f5b993415670d125ca30bb8c01529426ab7acb81daf2f51bf SHA512 5b9613df9f9e3de9b536a4a3cdaae3f5013145f70fb7ef937d76a724e99d06f35f412ac9af896fc3479865062275bcbe19f7017a3330a8cdf6126a80f6614404
+EBUILD smcipmitool-2.23.0.191216.ebuild 2013 BLAKE2B a7b9c5ad65b954f16a8d5e40059bddf85796629a8090c63783ba69539cbd1e738d16b49348cc9d1906a627d299aee1ac9a4c1cd0028fb5eed33411493049d1ba SHA512 f8d284a8dd6e85a6acbfad95942bdbcf43091574fd5e3c76716192615b2f30956da4a747e7fa70f4814485045c4a3ff7e2b1aba1920fe88d3cc72c29226417e7
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/smcipmitool/smcipmitool-2.22.0.190701.ebuild b/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
index 929e66f57463..c0b818a212c6 100644
--- a/sys-apps/smcipmitool/smcipmitool-2.22.0.190701.ebuild
+++ b/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.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/sys-apps/superdiag/Manifest b/sys-apps/superdiag/Manifest
index b502b9783058..c451730ed97c 100644
--- a/sys-apps/superdiag/Manifest
+++ b/sys-apps/superdiag/Manifest
@@ -1,3 +1,3 @@
-DIST SuperDiag_1.2.0_20190711.zip 4826479 BLAKE2B c0ffaf59ab1cbbe406a907938bf028844781533516dc6b0f2c2ee8144395da48a43e5931ef65e6990c97cfb887dd086d7535260319721b534e3b66135c37c680 SHA512 24ac9224a302e4f61a56015476b5c5fb279a057acae97e12c1e8e9271a8f410337f6182d5204d531927b0004ccb76b65c784c91be2c3644d0f30db0c8eca4c6f
-EBUILD superdiag-1.2.0.20190711.ebuild 1684 BLAKE2B d570b13d31a3be75381fa3dc3facb3932a768862f0c74403d72c1ed055c9395979eea8fb66fc60b4de639848cf1dc25a497613aaffbf5ba32bceabce4b629ca7 SHA512 767e626430a3df45362efd793f35e35f473f618a077940b63e9ac448ef863864d83b758bf5e2b063e6964ff2e3b006c04da885adbf531fd1f7c64cbb3678380f
+DIST SuperDiag_1.3.0_20200109.zip 5223744 BLAKE2B fd4ce0ebc0bc3d3fcd947a54f7c2166371131f4cb1fd172967dc2488bae48df48f2e2f4937aaf20d9ebd4f2d3187e0937a45d789c6f491554096f2009f3d8288 SHA512 6cc2e24ec7a8754c0b8c31b6bc6fdea9e961d1fb8e7c96c4450072ab0f35f3e8f8eee2463ac4d446511cabcde4db07272d19d3ff0cd4739aa31e4fe93707b448
+EBUILD superdiag-1.3.0.20200109.ebuild 1522 BLAKE2B 16dfe9381efd9b7819f9794c066cfbd4de419c4a132e6091dcae151a679f032d373099e555da81ac48c7f711484b537a2a3cf4f2bad9091fb7deda4228dc5433 SHA512 73f936a9026fe0426ccc983cbd6f73ba000579f9368a7bbcc3cf4ffdd22edced838c3f3294be78d01c8b123c5b3469f5b443bca40093ed69c507d7af7616a983
 MISC metadata.xml 910 BLAKE2B 59eaa7f51cc6c2c733b62b5f5bdebac5737b3af580fb8afe91f6f5b96e5cb49e66635b182d204a6536141aad275307d0e580ca272ba8d5020635c9c96f9e106b SHA512 e066b98f13d3669a2dd97a38b454c20ec59f5e40ad95fcad43e29bb6baf6958091517f95d94380c2ea2edd41b057f284b687267422bf01da62628f07ca255e0d
diff --git a/sys-apps/superdiag/superdiag-1.2.0.20190711.ebuild b/sys-apps/superdiag/superdiag-1.3.0.20200109.ebuild
index 52739fd9846f..e383bfe1660f 100644
--- a/sys-apps/superdiag/superdiag-1.2.0.20190711.ebuild
+++ b/sys-apps/superdiag/superdiag-1.3.0.20200109.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_BUILD="7119"
 MY_DATE="$(ver_cut 4)"
-MY_DATE_ISO="0711"
 MY_PN="SuperDiag"
 MY_PV="$(ver_cut 1-3)"
-MY_PV_PDF="$(ver_cut 1) $(ver_cut 2) $(ver_cut 3)"
 
 DESCRIPTION="Provides the capability to determine the health of Supermicro servers components"
 HOMEPAGE="https://www.supermicro.com"
@@ -35,37 +32,37 @@ src_unpack() {
 	unpack ${A}
 
 	if use iso; then
-		unzip Diagnose_Remotely/ISOFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d iso || die
+		unzip Diagnose_Remotely/ISOFor${MY_PN}_${MY_PV}.zip -d iso || die
 	fi
 
 	if use usb; then
-		unzip Diagnose_Remotely/USBFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d usb || die
+		unzip Diagnose_Remotely/USBFor${MY_PN}_${MY_PV}.zip -d usb || die
 	fi
 }
 
 src_install() {
 	insinto /usr/share/superdiag
-	doins startup.nsh ${MY_PN}_v${MY_PV}.efi EFI/Boot/BootX64.efi
+	doins startup.nsh ${MY_PN}.efi EFI/Boot/BootX64.efi
 
 	local DOCS=(
 		"Supermicro Super Diagnostics Offline readme.txt"
-		"Supermicro Super Diagnostics Offline User Guide V${MY_PV_PDF}.pdf"
+		"Supermicro Super Diagnostics Offline User Guide V${MY_PV}.pdf"
 	)
 	dodoc "${DOCS[@]}"
 
 	if use iso; then
 		insinto /usr/share/superdiag/ISO
-		doins iso/${MY_PN}_v${MY_PV}_${MY_DATE_ISO}.iso
+		doins iso/${MY_PN}_${MY_PV}.iso
 
 		newdoc iso/Readme.txt Readme.ISO.txt
 	fi
 
 	if use usb; then
 		insinto /usr/share/superdiag/USB
-		doins usb/STARTUP.nsh
+		doins usb/startup.nsh
 
 		dosym ../BootX64.efi /usr/share/superdiag/USB/BootX64.efi
-		dosym ../${MY_PN}_v${MY_PV}.efi /usr/share/superdiag/USB/${MY_PN}_v${MY_PV}.efi
+		dosym ../${MY_PN}.efi /usr/share/superdiag/USB/${MY_PN}.efi
 
 		newdoc usb/Readme.txt Readme.USB.txt
 	fi
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c6a564cde192..78758830c598 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,11 +1,12 @@
 AUX 243-seccomp.patch 6293 BLAKE2B be1a78783e34d6cf8ba33f6ae6fb0e8747d414de692cf28bd9cce01ca47baf188b078171dd66c236ecf2a4a821f1dec0b7021e1298a29a3b21aacf3a9d667189 SHA512 da2cd2e11a06e0520af0ad3c6debe54c5ab046f7ee35a922c99a32924464a6b760b4620d8e511064f84d8adbf5e65db473877476a1cc36941a0420491b89cb25
+AUX 244-efi-gcc-10.patch 3032 BLAKE2B f9fd018c567384171b154809bb95b35c18fc9c3ad7d5c114f5854bb90db2bdafca9d96c3437a9d20a7ea875a3e5646750f29294025fcb657a40dcd7d4ed95282 SHA512 f9bbc9c3be417ff14775de06d3c4088913eff4c6f62e58278420345cbc7b115b706c169faaae9dc17448f895d9cf9b417ee8c04398ec4c206df89f5f3bcfb4a1
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256 SHA512 08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
-EBUILD systemd-243-r2.ebuild 14521 BLAKE2B 1733a3484ab1caff846419e0453a07c263a32d974505abab93af09dd622e1cb68224711e64231a9156447f262d062639b89e76ad5f865bb563984f5c8acb4695 SHA512 86be07a14043096b696658e17da0abcb1a2b7426d4540502f0a6e745f7a8c2a8d3542bbee9e6607bbb5223999613175db4865e7b40a75e51dccfe87f799b9dba
-EBUILD systemd-244.ebuild 14472 BLAKE2B ec0e0f0380559eebbd968dee61dd94138f8589d1c9a278b9ea94fd2962272593aec799dffdba46313106b5fd149c9b1192aa3c6754874e1b6720dee3146a80eb SHA512 c6a9220228551b483327789d36a4bd3194f9054dfd3b85d345140d715415a5d1d83dc1850e7b54705000ba7ae7f4ba9c4c24aaf8e7c631a90a2335b754f98fb0
+EBUILD systemd-243-r2.ebuild 14522 BLAKE2B 9b59d5ad65b13ac99d127ea4c09b3fad87786860c500cac17c4f1d65e86f543c0869a834ffb42e77794a85ed03c2e25a26109773442190f4ab15d09f7d79702f SHA512 5b1cdd515a574121c4d0b3d049100ffba6bb81481c95ba7c8da2de7b007b9110336d65bdf74dde15c29639b76f6e1c9ecaaae28ebf1058f09bf240141e5b10dc
+EBUILD systemd-244.ebuild 14502 BLAKE2B e1605c98deb12f8c3cacc988db985fa3e8a52bccfcb464dd8ba167cf5b8683ca2d51279d6b298185e804ff3d6de3746e252abfd46bd52b3f58b463dec7869a7c SHA512 a06eefa3b8d9043f0aa55a0a8900e8d770c14d0263086cc6718f0418ea7b877d675f3e420e415e208c98f1cd703213303834401df9153742090f39a8a33220db
 EBUILD systemd-9999.ebuild 14472 BLAKE2B ec0e0f0380559eebbd968dee61dd94138f8589d1c9a278b9ea94fd2962272593aec799dffdba46313106b5fd149c9b1192aa3c6754874e1b6720dee3146a80eb SHA512 c6a9220228551b483327789d36a4bd3194f9054dfd3b85d345140d715415a5d1d83dc1850e7b54705000ba7ae7f4ba9c4c24aaf8e7c631a90a2335b754f98fb0
 MISC metadata.xml 2019 BLAKE2B 84de0a0abc3f16fab60db2343d8e1f0dee8a3f03ac97bffd01167820815f4d41d87c118b81041046c8cafa6316fb7e5bfe9d6a5de550bf617ace56ccf69efb0d SHA512 086189b961c0f3be70beb1d86fd36508d0821407243e74cf896360f76ce04be544aac211d60685256080fa75e1ac0ae33211501cc11ee98913f3b8d322ac9f03
diff --git a/sys-apps/systemd/files/244-efi-gcc-10.patch b/sys-apps/systemd/files/244-efi-gcc-10.patch
new file mode 100644
index 000000000000..ce37ac300be5
--- /dev/null
+++ b/sys-apps/systemd/files/244-efi-gcc-10.patch
@@ -0,0 +1,40 @@
+From 2c3ab079560664926189d5135b08eccc9797ab9e Mon Sep 17 00:00:00 2001
+From: Susant Sahani <ssahani@vmware.com>
+Date: Sat, 25 Jan 2020 11:30:08 +0100
+Subject: [PATCH] efi: fix build.
+
+```
+ninja -C build
+ninja: Entering directory `build'
+[29/101] Generating systemd_boot.so with a custom command.
+FAILED: src/boot/efi/systemd_boot.so
+/usr/bin/ld -o src/boot/efi/systemd_boot.so -T /usr/lib64/gnuefi/elf_x64_efi.lds -shared -Bsymbolic -nostdlib -znocombreloc -L /usr/lib64 /usr/lib64/gnuefi/crt0-efi-x64.o src/boot/efi/disk.c.o src/boot/efi/graphics.c.o src/boot/efi/measure.c.o src/boot/efi/pe.c.o src/boot/efi/util.c.o src/boot/efi/boot.c.o src/boot/efi/console.c.o src/boot/efi/crc32.c.o src/boot/efi/random-seed.c.o src/boot/efi/sha256.c.o src/boot/efi/shim.c.o -lefi -lgnuefi /usr/lib/gcc/x86_64-redhat-linux/10/libgcc.a
+/usr/bin/ld: src/boot/efi/graphics.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
+/usr/bin/ld: src/boot/efi/pe.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
+/usr/bin/ld: src/boot/efi/util.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
+/usr/bin/ld: src/boot/efi/boot.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
+/usr/bin/ld: src/boot/efi/console.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
+/usr/bin/ld: src/boot/efi/random-seed.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
+/usr/bin/ld: src/boot/efi/shim.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
+[31/101] Generating stub.c.o with a custom command.
+ninja: build stopped: subcommand failed.
+make: *** [Makefile:2: all] Error 1
+
+```
+---
+ src/boot/efi/util.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
+index 8518dfde77e..b13f22476c6 100644
+--- a/src/boot/efi/util.h
++++ b/src/boot/efi/util.h
+@@ -55,7 +55,7 @@ static inline void FileHandleClosep(EFI_FILE_HANDLE *handle) {
+         uefi_call_wrapper((*handle)->Close, 1, *handle);
+ }
+ 
+-const EFI_GUID loader_guid;
++extern const EFI_GUID loader_guid;
+ 
+ #define UINTN_MAX (~(UINTN)0)
+ #define INTN_MAX ((INTN)(UINTN_MAX>>1))
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index 28bd768a2158..c1ea4fb27ab1 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7} )
diff --git a/sys-apps/systemd/systemd-244.ebuild b/sys-apps/systemd/systemd-244.ebuild
index daed59e210c0..847a85b35192 100644
--- a/sys-apps/systemd/systemd-244.ebuild
+++ b/sys-apps/systemd/systemd-244.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7} )
@@ -185,6 +185,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}"/244-efi-gcc-10.patch
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 5dc53b8179f6..1e41ef278f07 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -10,7 +10,7 @@ AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
 DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28
 DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d
-EBUILD sysvinit-2.93.ebuild 3575 BLAKE2B f327a05eaa2e82baa05b0473f31591da2e61cff22db7fb1e3f8a6302990cc70df166484dc138bb03f8494a32a21c5af4ee4adeaff9f37e1edfa0db702bcfd57b SHA512 159ca13a88b9868ec717fa8d786322d04cc7f67ea3e3ec32e0369060a295a43a33fe6a19d5f3be1b8d30f8dfb659d596b5c0d01f49fd1fa28cce1a150decb900
+EBUILD sysvinit-2.93.ebuild 3576 BLAKE2B e28848e8e98802762dd0aa7ffc1a39d8984d3b3ab21be4eff1cef56dfd2c51bd6f4767005af637d9a7738cbbda0017a9db9c3c29b24b9efd00e101a6171af9dd SHA512 c7baeafbbd7d444994c6250bd8c9ecbb0b203544f169ab4065994367a622bde7d6dd4c944204e9f161bfbda417ace97bb4a0dc1204550e1f06b760be6e92f985
 EBUILD sysvinit-2.95-r1.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
 EBUILD sysvinit-2.96.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index 9386bee6975e..a0377807fc01 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 68aaac8f74df..974004f6c397 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -5,6 +5,6 @@ AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2481 BLAKE2B ca2398c6189e04d8803770df14f08c5bc4f7bee3fea566a1ac3bfb7baee5940c86ac9f7a19471a08c7dd16db4bdec021619bad54d81d37bdada64fd298cfa510 SHA512 e2004fd06aec6a258a4e212b3bc03e8d57afb3116e9e5c30b788c0511bdd0386dd7f2c46c3569c9c8d2a78196454f96bf5c3cdd9829a2664889d09ad89aeb84a
+EBUILD tcp-wrappers-7.6.22-r1.ebuild 2482 BLAKE2B cf6d9d4247a72b6c1d32cbb5101831044392ba2876533004af016e32e259ffc5985ee6291616fdc320de347b8c7539e29891b4a1ff81bbbc847b1ee543d6ed47 SHA512 a6983a709ad699e3bc4cbb191d84ae1a090049734500b08868cd33c108d002d53ac1b253439bd5b11f3d282bd2ef27f8f30d1460ca5fd4e9407354bb7fb11f96
 EBUILD tcp-wrappers-7.6.28.ebuild 2433 BLAKE2B 117a9df98d313bd007607e118f3092f9d0dd2c63b42e15a1d2b0e3450b7cf149e1bae8a5476f263c9fadc7f5e8e2ed8a71b8c41ac00a6147f03bcbfdf72a36b0 SHA512 1955bf38d73d5a8122fbb33dac48f46e79ac12d72c7deb7a9fe4092a5d0a8d8feebe983409b62c487393c6dfb41becaf7f54d201891111dcbf3aed15b7fc37de
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index b3131aa342ba..4d69736fe918 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 netgroups static-libs"
 
 RDEPEND=""
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index b3c87446c927..44e22eea9db0 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,5 +1,5 @@
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
-EBUILD texinfo-6.6-r1.ebuild 1342 BLAKE2B 7531bbb5ec5a633425dc6e0f92e85c5c8f5fe0b6ab273de97c7aa467cb0519881410443ad800395d131762ff3317d8024760adc29edae7f9e5bd2d10337c1c44 SHA512 2e26da72b0c3d0ea55cd41c4792a7009615cba683dca983625bec2c140e62993e51fa29b925b9e9ac597fd7fc45066a14fc41ef692a8963fd0d32942cfda99ff
+EBUILD texinfo-6.6-r1.ebuild 1343 BLAKE2B a7f7a4dcdbe6114be20b33b02996b594e8131c26680f30ba939bfeae5114a9911245a512a41755973328bc1d75ab01fa241e22551ea74ba32b770875edb767db SHA512 2995321a6ce47c7cc348aaededcfd55fdb852230560e04b16c6a8ed36e77a6d6e0dbb71a7525d64f18e7e9094b170f45971683f772138f5a406ad3b1617cd910
 EBUILD texinfo-6.7.ebuild 1676 BLAKE2B 86c012b99896ffe9c3c1394aa6c8220f4bcc1dbb75f366811cc0b9e4adb49fc734ffcf7e1f335b3cf77798502e321662403338b0b442bf8ceb39fc9c7a1d6944 SHA512 c4cb835dc5fd04fce0e47edc9c8e23fa97ca1133d080af29f1dd56c557726f1c6e6eccfa017e9e0349ed82e26c2066cfa36cc0c2a78eb6f1b36db6fb395b2f7c
 MISC metadata.xml 462 BLAKE2B 2e3c58437bda45610f7a2ed95cc8a1ec38c64b256e980816946e02ed6edaf69f20b152a1bda59f8d58f5af6aa7afe1e6dce219a2ba1624aa3f00c36028dfbe4c SHA512 b2015a2dc9e82b7284df86fe013d12f846d19246153526a8b48d1e5124682fd823ad1fb9b6276896b8f4e991efd3daead9e5d02cc43662e6f5be0cf11dbb6260
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index c7da365cd940..76be975837c6 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index a10a9e240db2..967a9511ca83 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -3,7 +3,7 @@ DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78d
 DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b
 DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e
 DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
-EBUILD ucspi-ssl-0.94-r1.ebuild 1218 BLAKE2B f60436d8f0b4e6d25fd9d4aeb196974c01616db7b13ea60fba704e4f105308e00ab521e9dc72ace2e3a5504badc6cda24d486f19b9e976b4b777e32118a400a8 SHA512 4222d84b50567e9b40e9ea01716df7adf4f0565c0d315b617cddfb081557ff0b6370fa62211e17b0c27813ef8a3f5e37298e136e801013cb67b9d096a63aeef4
+EBUILD ucspi-ssl-0.94-r1.ebuild 1219 BLAKE2B 04fb6b66e1c8eea5421214ae863a8a1fcca7ff79211ba158ba3c1dc7d2e283d95b5f28e81105b9c598da6d500a219e12a3cdb4607a30a5771a9b55814300c2f6 SHA512 32cb6947be444a4785a533fc9c75824ac999bca6b4bad7b3c8073ded3f400fac66243a50eab6faeb60c7f951dce2258fbdcee027ffa38f3305631eca219bb5c9
 EBUILD ucspi-ssl-0.97.ebuild 1288 BLAKE2B 04547e2c33643974879c126960bc208bac7d007bcdb2d81017ad5c44e2de85d8acbcfa90d636e76636044439a9aef25522efcd49a3f42f16d1c07126c4126e6b SHA512 810f075191c27a986a7957628558be109a81fc261482b3436d3209579874b60d30ad86bcce623ae6177985f857f6349e391826ded239d6b462ce399cc690ba9a
 EBUILD ucspi-ssl-0.98b.ebuild 1258 BLAKE2B b19e32a1fd08baef65b4172f0f61f5410465990eca943c5226209969ca1535c9d55399d35b45a754ef6586ebbf93f1e6df7f295e6b9968bee9bdb657d8224086 SHA512 53060ce9afd145f825b0f1a49a97bb919dc9e8392a87247d78a4b21d8037c5d6be1d5c0dcd301c73ce4aba262c426a0802e7a7f0a47a2bb58524e3f674d95abf
 EBUILD ucspi-ssl-0.99.ebuild 1258 BLAKE2B 63beb1bad75b6df9b7da52bef64bf9ed8273b761e82c081d8d42fbd697509e7656aadf48634b00070751ef1ae8709797a98f29d5f1c9b7082ae50d6a082c9416 SHA512 2b80055256cd96865211c288e37fe7edd7f2753a00a3730c145e49454764ca9d65ef37d67b8405606ee14f290967ceef1e84a54c1b5d3fb5f714ff33ab29b495
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
index 5d5ac164b3c2..ad83c9175ad7 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86"
 IUSE="perl"
 
 DEPEND="
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index c8d46e071c7a..3060b288a2ab 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -14,5 +14,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2100 BLAKE2B 2572c0473558366e6d5145e2533935a3723eba9447dc7304ac2abae1df06d726b82de6b48cb80f75c94a6b9da2ff930a7d742a96553a651d43ef374d5152a855 SHA512 493aa9d6d74d6f9724c95a01f72da2200dbf8cbcd09b30e9658e655a9a0446deb7b483d6cb5eac074deaf5ed69594262b594b6d7395b6913ee4f26680a2d6b4c
+EBUILD ucspi-tcp-0.88-r18.ebuild 2101 BLAKE2B 0a5fc973da199298ac8839e975934c17aeabc950eadd296e5cb9ba0267ffdcd338d08b7fbfec1839ccbcc13cd2a9affe521d38c0e9ac3220fc01b9b3f19166e7 SHA512 b35b150e6eede55f353b8d68d1272ba26827c5704d53d6921d3197a58d336517f6c167aff91343821bbc295e310751bf36cb683e7fb167750cf5720e5c1279bd
 MISC metadata.xml 600 BLAKE2B eee72034e2adba51553bf32dd54e0ec2026a97fd709cc828f28e22525dc66cbff4bdc8801f7c5b4fa655fdbd682ceeb71639f22094b96150cca02f7db538554a SHA512 8cc6d3b8383d604b971b5cfd48060d5190269beacd1060ca279cb5eb0defc54e36fd1972ccecdff5f3fa912ca0a80e177433226876ba72158e93a5a6c1cadffa
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index e377d364a554..bbf768158c75 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index ad9e13121435..b391c98d9ff9 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -2,7 +2,7 @@ DIST usbredir-0.7.1.tar.bz2 329895 BLAKE2B 7017b1441c2265c9e58532bcc8718844e6f64
 DIST usbredir-0.7.1_p20170503-patches.tar.xz 8120 BLAKE2B 21c7a853b3d5329fcca45169e22135bce615c9422f314f680f1087014d64179bf26f07bdb377bcff48155f28a37dec82b0bee8bce4d868e41614b128fe61b95a SHA512 b281d7a1ee191746e5fbe655b21c0cd9b2cf9cd69d5f28d91ab41de2d62a7f3c5c2a42f3f9c40c73d61a57d89423d996f4a779ebdff8f9d088030c2a4c2a24a7
 DIST usbredir-0.7.1_p20180211-patches.tar.xz 12508 BLAKE2B 57479444752070147583a0cc2f6651a32c8a618756638ae04928dda7082214d501fb5122a0f5d02aca994be0a386a8e493628faa240f61987dbd02d2fcfa679a SHA512 993c7ad5faf66f249546e1a631a10cd842439486de029ed2fff049b70967cb0a6ad45fb773a1c97fd6811e246f4cc4c7482522393dcc74b26ba2646a83ac70c8
 DIST usbredir-0.8.0.tar.bz2 331349 BLAKE2B 0190b4ab35cd554c13b65d30756b7b018e7ce82c72e7dddbaf05b8a704bd8a25724c4ac4759e1b86dfadb64ad7ade75c05365ab9ae3152f8fa60e909bc5e183b SHA512 976274adf08f8691b0961f5238021e988a4347873d0c67576038f44cbdaf25c2bb325d8cede0a507933b719f9715b1508ccd1d8f52fccd36f13a7640553dc108
-EBUILD usbredir-0.7.1_p20170503.ebuild 996 BLAKE2B b743ec7ce7ee9e83f86ebae0ed31745444a4c701d89203390d88d03d18cb33c4ff5d6ff51b64a7dfc1927c1e4ca132f06948296ce9bc3e00c34ddb1682849041 SHA512 da61996a7b818587a554a64ed7b33e0f559aa7276c1661e9553077e2626bdf631e481513cac279e384e74c9ead57bab0fcaf11aca05d633a85f3c4562516a3b8
+EBUILD usbredir-0.7.1_p20170503.ebuild 997 BLAKE2B dd836a4275b545e865e1a0d2c2571c5e87bc0b697b32a6e367db6a08cec50982a9917483e9f58f08fcf642a870996d68b50d2a1a6570455b65afb4f8ce891934 SHA512 a33d16b07fc540d44a8e130518b4e8d80bd2670454ed6003171c5de3e98dc084bfb6f34f1af0ceac32eaef7f0bb0d3a63528c00b1d6d88224c5583fa19fde623
 EBUILD usbredir-0.7.1_p20180211.ebuild 1010 BLAKE2B 379448555106c33a62086e6bed08935761053e6341b902c4add5b10cdc56c84ce0d55b6fe2f180b39ff25e352f9397561041032e20f2a9d6672828a3c8c91e01 SHA512 ff2d5c0707db228b8a44349b2720982e7d1ac8d3150ad0cf884a3ae924286a566c796e38d6edb9004f2146a56bc188f7844506c43b32e3242f805d2a60ae9673
 EBUILD usbredir-0.8.0.ebuild 906 BLAKE2B f06d19d5a9744c41313eb4c59d93a0e42209fec90d71a1592a65cef778a9b175c01ca0b994cff9434dcc535357e9a3451e39f6c57d5d7e232267d082713672ef SHA512 e8f66fa9edb20e36c59291bbc1b98b16214400469b9359486380d1ff87ff4af01df9edfa6c81752c758b5b7660c7105cce2652996241701e224e2e8bbe95e60f
 EBUILD usbredir-9999.ebuild 847 BLAKE2B 089a31dd3b8628c701d2abbe2e06983c4a2fa493b60bb2faae379a0ec03bf2afdeca8f6787273558ce35bd97b07e3b3602817e8ff061f1b983371d5d4f2c73c2 SHA512 0bc8c6c3c8a04797975bc187c397d3395fc341527cf5e7cd5bd35ee4afcc42f0e76f1432bce8dfc9a45330847c53dd3c9adf97909005adc2a44dcd384a25f2d7
diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
index 585d59c0ca1e..60d6f53bfa20 100644
--- a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
+++ b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 15b2d80107e3..e5f85c67ac89 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -2,7 +2,7 @@ AUX usbutils-010-fix-py3-support.patch 4251 BLAKE2B 46cb941e30da1b3b9f1a346bba58
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
-EBUILD usbutils-009.ebuild 1140 BLAKE2B 0e8be2788d8f14490f08ae83ef7740738e19203eecf89dd53d2f30ed75b45e1cb7570cf283bcb32a42ded6d23eb3613bcd5d7052281b37f6ed2fc64bad5da27f SHA512 8657c8d361378bde0427ce70cad0e11e6b7a9cad008722a569b6d6078537ede5fb9d45509b647d5727738ec6796164d4fc74c1614f89c3599d03050fc49ff5cd
-EBUILD usbutils-010-r1.ebuild 1240 BLAKE2B f1529dec9f0ba9d221a16539301bdbee5d3b1a1e8a01b2279decdf84c9627e65306d1c754692c258260fd95cc0dc121f3ea6e1970dbf2b8f4b6a0d7df83f4d01 SHA512 ac732e64835f238c9e2ec04b90115b20452dcf236e78ade250146b3d70e62711691ee9ebff21305bdb6df0e05bdcd4b463b3d87bff786835ed3f78c40babd4cc
+EBUILD usbutils-009.ebuild 1141 BLAKE2B 2c87b3da7c0a476c98df24924541ff7cabc72b326303a6aefec63053a47e94bdafed4027311f424e3e5f383d26862b9bb9dff4fc30af4e84946aa9aff84ace4f SHA512 c6e9c79d058a7027f0bebfd9a66b9513135ce5420330a549b4c02da0641983663870c9fa26a8984bbdb2fe6fa4148a8fe9e576ce2a5aad60b2ea10d1549ffc9d
+EBUILD usbutils-010-r1.ebuild 1241 BLAKE2B 37603518aca357db776cde20bcb2cb413282635e1babfe0895d140b92262a184013ab08314799d2d9d68af5070b1ae6c499f04ba5828514aab2334f17e855c97 SHA512 fdc8a456417892b4d1d704f6003d08a80063522d7fa5ce8a3f7f1b642f45112b9916aa7f1fcaeaade152d83b31c2f9331df684c1c0ac61aef625263ccea8fbba
 EBUILD usbutils-012.ebuild 1209 BLAKE2B 525c92c7a2608b979c74b673c7a53d39d7cd8f38a00821bde0e97ce10a8710b829d2abe99e907f4d247f7b6d17ab4848950e06d279e6d1cfd524ea4848c5eae2 SHA512 4f98c4647320057b479d203233b9a3ec189beec1a66fa3fac0ac199e053b2707858ed81c5f47b9d0700033885024fcb65a04f9ead07a07f2cda0ad9c30632e2b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 47c84f3ce123..5f6c83958c75 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-010-r1.ebuild b/sys-apps/usbutils/usbutils-010-r1.ebuild
index d12db82c7905..911395f9fefb 100644
--- a/sys-apps/usbutils/usbutils-010-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-010-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index 4b91c27971d4..1b0ab7385686 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1,5 +1,5 @@
 AUX utempter-0.5.5.6-fix-build-system.patch 1168 BLAKE2B c513d18115a7a78e2c4d381f7ae650aa56de4d0833fa7c610948da072c4a1e85ae6832517012dd0c04ca91f4c3cb51d8b3b332c58b66b0716c63e3576917fe77 SHA512 a2febc07a01e0f9f95c8c846616d8f46e74e3db2ea66af720539f6825019dd05ab5472507210945c5caf84566584ab01824ebf0f16e51e7012f1334fc5a920b4
 AUX utempter-0.5.5.6-no_utmpx.patch 666 BLAKE2B 9ee0c3634b87ddd50d50f81811f749f615e4fad8dc27b9fc97cc1b61ffdd64eb5045910457547b2cbc245c593490ab354e3a7f5a5965a8aeebf330c6b32d4889 SHA512 4cdc7616f1b886b74fa39272f502fb9eb303047c93be57122ba32517f49a0274e4f7e02b25ead9dd9b60584610a576cb2d78c6350350b3d8364ccd903c3dafcf
 DIST utempter-0.5.5-6.src.rpm 21099 BLAKE2B a4a8c53ab31d53ec56d60a16e5c1d3a0a2ec6c73c3c3025c15dfc389da75f969545392b46976017cfcde1d9f9ca974b14786bbf39709aebdda890df13a7866ed SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655
-EBUILD utempter-0.5.5.6.ebuild 1178 BLAKE2B 180449c6cdfad5122e9a73538a5eabdc2c1d720fc66d97e926d1f3c720cb7ca2ae387123f10b1ed3acf4b9ab1b73132fcaa4e83715610355e3f387816ae28a45 SHA512 4d575c5df427cfc522934c23464154c40af12c54d1e7baed46c52e3d34ae252d1305c6408a990d40dab8bac1338865d5f243d7bce8e6ead232b8fad0aa7d0778
+EBUILD utempter-0.5.5.6.ebuild 1179 BLAKE2B 9b117c88578dd4b68dece1b7c3fae849bedbc751b963a8214bd9b005ad70f36c506da8e6400da1e98c51c517c012475038a2474e0d033dc84d1dfa8cae98bac7 SHA512 54975940b0613fbb1f8a9ac268022c4f8abc57f0a246eebca6138f8e4012e20428585cfb8974756a0c634735c9707cb7ec61e31a6cfddd6d244a2a3a408b486f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild
index 6fd2931dcb40..ece1c2c253ea 100644
--- a/sys-apps/utempter/utempter-0.5.5.6.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
 
 LICENSE="|| ( MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 0f1a973d6e1f..7e0bbb1febc7 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,9 +3,11 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
+DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
 DIST util-linux-2.35.tar.xz 5137796 BLAKE2B fbd3124284d50e1dc3fd158f77969057c628e111ee489a920896cfbd93186de4cf1ea97f41854171f824e4b3042968d860827557a8d46aeadcfe5ef976e71222 SHA512 c95d26b9037d6b877a247e6aeb58d17aa80f7e1bd6b523a4e0fde559fe07b3d924ece6d373300fefb65d1f206b3f990aeddb3a03605040e72ce6d6ee88591021
-EBUILD util-linux-2.33.2.ebuild 8561 BLAKE2B d198b040f7d3639789cc92a5895a9d24cb80cf2c573dfe3d2615ebb47634ac1c0a4fe75d7237a1bb9e726f13ac9f3a47447c68c597c149b99ff868d89f9a0ab7 SHA512 ee74ec1ee4b8cfc3f626aa48dfc412407889d19d4b767c4939f11f8a94dcadea13d24bf95ebdcd50396a7aeb092806426d1a7b09098c5c1f71a84a22e319dd03
+EBUILD util-linux-2.33.2.ebuild 8562 BLAKE2B 68d0451a9bde127b4ee459168dc5c97292e50d932549025d765cd478dfacf2c72cab93deba0a83011121506973165950c7d84155476c78bff4b79c0f21012918 SHA512 f89856de7a65990bc7aa896da894b85148e1103305c12dd685ba058e181fc7f414dd73973b8654c00b7ac253c38903ff9b09ffe9782b52d5930b6ce85a91952a
 EBUILD util-linux-2.34-r3.ebuild 8582 BLAKE2B 4e5c1b1df64d8dedbbda93e8d2623e2c63c0f0a89ebcf64a1fe0ea7d540d9687de6f7a4b2b95a28bec035d5126f1fcbde9423d157f57980d3c34903048aa896f SHA512 8b9cd0afd11cf3edf5383cdf9c231f0b34d19b0d18987f054989a30a84a65473ba5367bad2e28e30784510d73f86ba5895338d83f4c5456612f8391313ae9212
+EBUILD util-linux-2.35.1.ebuild 8655 BLAKE2B 64727bb6c47e8fdf72148d8e006743d86c63750b32d0c334508334f1235e4a457735e50a9daa04d8dbf22b2b00874624db82cff91485b90d1d2fa2a970651915 SHA512 2cfa0b470d9d8e6bf5f7dca71b2915a4fe5c3e2649a05f9704dedb9ae06d4df8367646f39bc0880917566814dbc9fa39961a6edceab649034874734352fb0d68
 EBUILD util-linux-2.35.ebuild 8649 BLAKE2B b3f08910611e152867a441558062aec9a59362ebd819d83a0e2348ee559c086848975f60d66e1dbb2c0652d2bdc90d0cfd0340b56f7a8030bb71df7d87b1e7a2 SHA512 1db2abfcf93a0247ea255cf7766164c3f1f43a4b22f6f66ceae829293d8b9f832212685d00907595ef84ae06ec79a82405d1e8ae3946b18df5101c9dabc5bfc6
-EBUILD util-linux-9999.ebuild 8656 BLAKE2B 2b8907e68321eaa60d86e2a32d08db56602e673fc2c9f028183da3e292eee88f433509056a7fd962fb275719d63c3038226353f2f50a929aab9d80c0969265c6 SHA512 bdfbfb5c6939e7d25a5edb13a14491f592f967ea89b2d2c1c0b288fe7318d9cbdf721d07afbe8d9a2e4228c53d3c4fc75a2172dc1e3f934ff6782b3378ccce4a
+EBUILD util-linux-9999.ebuild 8662 BLAKE2B 5850deb2b04b73cff388dd4ea25541aec83a6f9988cc7610ef9f6bf17e1e94cb29606ae859acab57c856fc2c6dcdf655f9a39116975219e60ce6f4ace924a87d SHA512 8f41e4f54a92d9751530b40c59cc533828046c7631f5f115f5f6de10c12d30108231d37c4eb924d1cfe9fa89e3876e05241f5d528fe812bb15f15530002aa4e2
 MISC metadata.xml 1260 BLAKE2B c68fc8a1ab1ed6a5e8e8e09571adab4f0e6c539c7ce45434730d0bf7c039cb886b1a5273f0b41d5c00cd7188143aeedba9be70cd4eaa024f4e71503dc7f88e6e SHA512 701f00691c6fde1fcd3be15e9daa2c067f3b676b80a05d5131bf39ef111d652ede31bf2c45db1dffdfd81e523983a85ea96ed9b6ae0fd645b2203ac5c3afb508
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
index 8e0e60b9c32c..47b276f2d73f 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.35.1.ebuild b/sys-apps/util-linux/util-linux-2.35.1.ebuild
new file mode 100644
index 000000000000..9d43c8d24652
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.35.1.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+DEPEND="
+	virtual/os-headers
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( sys-fs/cryptsetup )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+RDEPEND="${DEPEND}
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	!net-wireless/rfkill
+	!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-pylibmount
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call (#689190)
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 7c868feaa8f8..903792320fe4 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -23,7 +23,7 @@ fi
 DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
 
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
 IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index 09e41ff1f0f8..e3078c915acb 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,3 +1,3 @@
 DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
-EBUILD which-2.21.ebuild 666 BLAKE2B 6e4285c25ed269b809b82d1bf885616e1e9d6f98a18cd0c0a4c15fcd03b367e1ce3ca13fc323a88ac8ee1aaf51124ed551e90173b3c8f986eed46e9d46108899 SHA512 8884c93710d1cc1f286d9302e53d87fc34a9243cb112b8f6790b9a1ac83cde43960983538fbad1f8956f58fe76dfa4bb64ff9d1760bcc6a397f082828afe8d2f
+EBUILD which-2.21.ebuild 667 BLAKE2B 8997b06ff9f7d6afdf0c21897866a293e4b557238d4e12a8f341c0d08b636d2da8fc1d7c67fb97c331e8c97b2c45caea6434c5b024700081ad46d064585d900c SHA512 0c28446782ed0c935e8ce6a0aca4edd3905bb2c7ccaed32456af295790623864b89a17a9a10454d59d9567ba3c5d6bf36770dfc61a3bc69aa8a355b9913d4a0b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index 21dee4b2d6a9..459afd83464e 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index d828e916c200..5afc2d433938 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-1.4.2.tar.xz 421660 BLAKE2B 5395218fa182947c589ff51cd43b838591e47442b23c4fe0719f0970bff3602e81c4f79ad93890bde97a529ca34a733032e85a1f21f41e9aa230d5c2d40e1136 SHA512 9a19dc8f6899a24f8827ce36447316ce74f293abed469be24adfaa16d18deac0b7c5d77f744eed9b540b54cd23145281dacb6811dc52b34180b21d6dc02efc5a
 DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
 EBUILD xdg-desktop-portal-1.4.2-r1.ebuild 1000 BLAKE2B 006ae8d4a91bca6f934eafff31a33f049d6652ab64a3e76ba8c2b9c3586dbe62333c9b1e9171f5d5da67ff0406ca9a12ce3fa075182bfc7c1ee19f9e1a55a565 SHA512 234bd5de3bbbe5e6a4dc4b1514f7a1157812eca3708a31cd1f84e37d6cc92d80d1fa13a5c1524c18474fe152b74eaf823c90fed968dc10c3d7aa36e97feb9e30
-EBUILD xdg-desktop-portal-1.6.0.ebuild 1040 BLAKE2B ab01c21d3f907eaf1bb9e1f7a5d94c2f2160c186676cee10a754b0516ae7a5669a6dac44c1dd3507addd55a50561ab36d868acc2536a7bc42585eaedd67cad50 SHA512 b2895c9c6039905aaacdb27d49f81c5bc237d06b99dcd2eba86d08beac0de37b753df8dc7f31e70d1ec40227a4401816904b1d6c5db42d19950efcee1ac2e1aa
+EBUILD xdg-desktop-portal-1.6.0.ebuild 1047 BLAKE2B b4ac88ca5431882722f24fdf7f6a62a6486159747c0b7cecf30a394e7e4f77f96f76eac72a4ae99465c3d9d883fde3b345993a2236ace9c847f9a848c56f74ce SHA512 3f5ca2d0a753c1cb0ac1d10b5574f4610503a837e97b008fc23344e180e6c6744780dc95fc9df4c6cd8e5cadd29d368bb8b18d712de44c88e93a2b785f8dc79e
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild
index 83e57d114bf1..f3abf1640623 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc geolocation screencast"
 
 BDEPEND="
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index f14099ad196e..8ee51b4d628e 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -10,8 +10,8 @@ AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b2
 DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f
 DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r3.ebuild 1562 BLAKE2B 07946cd1b48641748df2ea7935d8bb3ae81815304d13a86ff2cc3f1d1ff787c89c9ae02b42655c1b824fa34aea3e413072aca4bf9fe725e2c7b148cf018e1062 SHA512 1adc51b66e02f15f530a70a3cb4eb7756e5bdad8260b84302a779ca4a861bfd9fd919fb5f44c667db2f18e8f376122e3082ab59d2c3e30db81c67ad9465383e8
+EBUILD xinetd-2.3.15-r3.ebuild 1563 BLAKE2B 56cba4e8bc4b3323a7fe2ac8addd1146700b6fd5fb8cefca6a74b2385d62b0c256ad1737e1c3bae9c4ec9e094cbed2535eacbb1dceaa018692269e33ce049edd SHA512 42768b317626dd61f5f052573494b7568eb42eb25ecb49c255d9e4588ac1f247e5c7612effb32c2f312f5d028d1cf287ec61934383015c26f34f615358d937e9
 EBUILD xinetd-2.3.15.3-r2.ebuild 1381 BLAKE2B 6c16dedba41a1f9ce0d6ee3d51f88b2d03137a8d3bc9068ac2a0db2550efa9d68174b075981391839a1abe13073ec392ef7fb5e0e91eac048f7d7831891713ec SHA512 86e8fa9e66d95313d05b6c7b3def44e26452846b889f335013be14cf051ac82eb292505e48bc1bd017f961cd0df5300345b32374ea15153a54da02d007b43a62
-EBUILD xinetd-2.3.15.3.ebuild 1066 BLAKE2B 84213fb34e4b1fc1ab9e96b54d06e9cb84b3933934b70de0c41b89b31f3dcd4b445c31f22abdd957b2c349314475a7afbcdfb09db9544f0d870a898cee71896b SHA512 2ae4466cf9541e7c7fa80763800daa95b387f48952ff131b1c0b661c0ed7e1b6e9fce9e0711ec13b62d3a98c0da18fc966008ad1beecae3ec1505da6b348776b
+EBUILD xinetd-2.3.15.3.ebuild 1067 BLAKE2B 9c471ce79e2426019aced785d3dfccf316a2f02315a854f0a2c11cfa6b7cbba3f251c585408c2638c53bd3614107d79a5414f3766f11e465f267de4110e09ce5 SHA512 7fe444d6775cbbba3fc755f20bdba3b2a94539cce31199f5904301d9ed6203f5be1e2ed7a868ccc0b335f176512487ddef1f148475cfcc363c9e28f926d2afee
 EBUILD xinetd-2.3.15.4.ebuild 1279 BLAKE2B a98a6f9bca2a0fd7b758d6d95eb65daa140037d8786012e06b21a61d781dae7dfc1c9d214d1f936b713f72f3083d444a3558312bb2301c622c0f4972d7d498b3 SHA512 72245d9fe374be1499dd20f99f0534b262d8fd22b990aacfe3217842dffe3e4f975280728e9bd0d8facfa6539855ee9e1f343af8faa4ffe7570b545bb63a474c
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
index ae1f2cf63dee..449e30ef0ec2 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index 6206114a75ab..fcc3791b6486 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="perl selinux tcpd"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /sys-apps
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)