gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /sys-apps
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
159 files changed, 240 insertions, 1339 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2dcc19e2c6fb..6dd621ef9858 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 19222d7ac2d2..96d0ffb2ee90 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -7,7 +7,7 @@ DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE
 DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6
 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
-EBUILD baselayout-prefix-2.2-r5.ebuild 2905 BLAKE2B 72297193cf7cce6e7f755ca08696dbcbb858525c8a0be94b6107a38337fd33351c2b1f72fa3349b0c33e45ec4ca802d6c3fec21e8a3861216cf78b377a4a81c1 SHA512 83d948d13b868d01ccbd4d0b571d81ffcd4ffac67bc15e632b7335b2987b4c2451d55de9e6264265b364b517c8bafbb55acca970935db95bb4f2f0e3a9138113
-EBUILD baselayout-prefix-2.6-r1.ebuild 11019 BLAKE2B 00f1992732b28fdb376daf5a631910085749e824d90387101c7f0ce9996cfa7ce7c3bafd85fc55ec58e50b1ab55225ef553b93c96482242034274e65fa22e085 SHA512 22e7f6d8d778687c68dc6ac01ec638d52000367278fc2187e4e1442f907e4c79d3c38694acae342bf5b49331dbf8df3198ab86dd4e7c0aa0291a21817a0c3c76
-EBUILD baselayout-prefix-2.6-r2.ebuild 11120 BLAKE2B 2ea53dfdb33d2cea1a27f03429ced328e408f9ef2aaeecfdb2a2c5f86c27946e5ca127bc629ce206166452c153be63154d3bf109bc97d75af5283b7f3d590364 SHA512 81c1cc11b6b59d261a604d067cbd72bed446c530ba3619d8419f75bf7645fa83c84f3ab183ceb20484f3606ea2dd433d39564938aa8b5a512543eb6c2971e6a7
+EBUILD baselayout-prefix-2.2-r5.ebuild 2885 BLAKE2B 36f2d752fa9d74e7f9a434056869ad6b30ca4c74790602354a7b8b38a558c9802aae2be2cbd48bb8272a9a775f31f99483b55bfface668d15fff008004866611 SHA512 c88b3fa4b469431ac76c535a2dd10d42bfb72818c60b042453d5cdc115b789d31e5222427623cd663cee95acd80f9b616508141569a6d500ab955f3042ca26ec
+EBUILD baselayout-prefix-2.6-r1.ebuild 10999 BLAKE2B 1bdab9f30d2c27d3bc09998bfc23378cdc182528f8dc5cc9e9726f4ebc03ea38d3c253586e480488090d09afef1f7acdcc56dbe2c8f16754f075ea7212e6749d SHA512 0b291ff1bb1d07f89d08f359b74bf7cf032f0b3597fca7b687b7e294e49712e3b4c5c54d21b0af759049fa792b79b66906f9e6c1334518fd3e45d010b8a2a8fa
+EBUILD baselayout-prefix-2.6-r2.ebuild 11100 BLAKE2B cb94032184d1071d6964cd5cf40e8e42bd09c91a8563797039074a2fd1b3a4ecbea1e485ee75abe449b36cdc9846e2aae322f3d4fab3c49da07f8d5caaba3c4e SHA512 929009de24f1a8bb50110588741344b104879c4c4ae81a5aa21ccf49075d73fbe592d69b809ad5b8c837f08196873178fb9983deb88960abc0b0104294babec0
 MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index e0d628e0b934..789cb0acceab 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~arm64 ~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="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="sys-apps/gentoo-functions"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index 80678e5187f5..1163e18077ca 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~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="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 32353c78d609..5ed070e67db8 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~ppc64 ~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="~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 9b8c09e29a2c..656d46d030d7 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,7 +16,7 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
-EBUILD busybox-1.31.1-r3.ebuild 9529 BLAKE2B 1d46cd6f67af9ea4152607af1779f901c7c72779e8147e5408b3702b77e4a3e67f6c4b6e8e7d5968ba7b94e44809587d33662fe5516a870e7990a9ca7f6341fb SHA512 299260cb9e3d3127aaec5c0c71bf589a0deb5812c6337a1f16a5d1ae28d4370e41b1784bcb7097dd9bf3560423a8d2390001839ca0b1e0f67e6bf9ceabfe50d2
+EBUILD busybox-1.31.1-r3.ebuild 9530 BLAKE2B 80e81e1c4c2c372171b40265549bf56afe1ff0953699de74332c396cda4b18df8e2fb880d7030352c295dd2a2530752dc234ab21308b8c92e4be94188896f00f SHA512 066b9baae3e80b8b1ae95be670f99d7900a0c501e8d95e4f750901c30674ac7951440efe727b8a2423afb7a85145e0c33190d3a15c1eac8a97ea4ef289edace4
 EBUILD busybox-1.32.0-r1.ebuild 9493 BLAKE2B aa5309a1dbb2e863bdc820207c28f07ee0ec33b433508745d5df18e04623b08605564f22b347d908cffac38c832992482d4984e598c0a919e80e851a2754c9c8 SHA512 67025c4610d71461c775107f6fc391e574e1e9efc8298c7c198a89476b32e42e5c26a59c693a14cde7a6b0e630b0b5d1de2b0f4ec5f28fe8a77163e138e70a0b
 EBUILD busybox-9999.ebuild 9438 BLAKE2B ff3b404b01449191451c5126eab5368eb97c4a3ddada5f988b5ee106e483808ea008b7106bce99f357642fae4d600097ff0977df1f28c1338ac8e4270cdf1eb1 SHA512 45f808c10761fdbdc7571714590530fe5ed2de13ce70be1351e7b871bf8d34bcdc0e72837461459cd1a3ca2acc8f2af6177f9a85bcbad0e5d218a685c4fbd54d
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.31.1-r3.ebuild b/sys-apps/busybox/busybox-1.31.1-r3.ebuild
index ad50d096b749..af324ce621a7 100644
--- a/sys-apps/busybox/busybox-1.31.1-r3.ebuild
+++ b/sys-apps/busybox/busybox-1.31.1-r3.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 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 339d87bdc48f..d3a04efd4721 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -2,10 +2,8 @@ AUX coreutils-8.31-sandbox-env-test.patch 1570 BLAKE2B 8f5625a63df985062c28fdca1
 AUX coreutils-8.32-ls-restore-8.31-behavior.patch 2824 BLAKE2B 7df44f4e330225a429678b3d5f20736d7c5c4f7d09f51f71d7e1111c3181d494aa12796c823244473063f7905aef35b74703860343c5e30f38520ee340690ede SHA512 6d55806aa16e0f654b15bfefb20f2c16193c7e9fcf7c087309b3254272d20467dea69ac53fff345b510751e165c33197c3053b7308578f79492afba0a1eeb6e5
 AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174ad6dd3157be16a28c527b37d1c58b421538a6238e93317689e6cd35b7dc5a0f480a4322c432986697a9e0af60019650eae92c0a SHA512 fd3573cf5a4b4fbba132d0fac5ad6eb4af5aa548a8c0c747653e47acfb97c01e31d7430db543df47d9a2680792d2583de70e1f1d49b2feb75887e9f8638527b7
 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
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-EBUILD coreutils-8.30.ebuild 6248 BLAKE2B 3fd8d6648cb5d7ca2dda584a81d8ca154c96453fc73fe6fa35b97a525d2f98ca21fb3a8237c1bc27aa769e1f5373044789b8e51a34782c57dcd268ac278624ad SHA512 7b525a7d2cf84b5af61e7ae00c8c75715ff346881bba15085b0ca17b4ad4b0678adbabeabc53ff1797e7716ea36a02bebf28d6aaa0eee42abb4f62196f2cd933
 EBUILD coreutils-8.31-r1.ebuild 5685 BLAKE2B 8adcf7ff796153278c7c81075e81b1748ec29ec9dd79338d7db87fa92344131220b812049cb0abb847a842ed653501dd22e5d5edd520a7033b10fe8f421a4815 SHA512 9775562def55e2b4cbdaad3ce68058bd8c9a2e8db8bd175ad74fe8446fad49b494d5a654c1ce8faf248310441b1f88ede613bb1ef21938a0c1a07491455ba37c
 EBUILD coreutils-8.32-r1.ebuild 5800 BLAKE2B 6492cc21d79a188abe9edcd7502b676f8d854edf11d04e5bdd2c5c896a79c85bbfb3abffd2e809921226353d08eb7af3e72b3dd7a9d116c0b23c23e59bcdeb6d SHA512 99579514865e0931d9ae0590171f73aa9d47a30858dce5d1dc91b72833f96025a28166cdec80450afb40849ade7e6e2bfa4dcc75c9e09b00dd3f4db5a40293de
 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
deleted file mode 100644
index fda25b3b8ba0..000000000000
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils flag-o-matic python-any-r1 toolchain-funcs
-
-PATCH_VER="01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-arch/xz-utils
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		!userland_BSD? (
-			dev-util/strace
-		)
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]')
-	)"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-python_check_deps() {
-	has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1}
-
-	# Avoid perl dep for compiled in dircolors default #348642
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
-		touch ${@/%x/1}
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp)
-	)
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		export fu_cv_sys_stat_statfs2_bsize=yes #311569
-		export gl_cv_func_realpath_works=yes #416629
-	fi
-
-	export gl_cv_func_mknod_works=yes #409919
-	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
-	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
-	use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ )
-	# kill/uptime - procps
-	# groups/su   - shadow
-	# hostname    - net-tools
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox $FEATURES ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}"
-	chmod a+rx "${WORKDIR}"
-
-	# coreutils tests like to do `mount` and such with temp dirs
-	# so make sure /etc/mtab is writable #265725
-	# make sure /dev/loop* can be mounted #269758
-	mkdir -p "${T}"/mount-wrappers
-	mkwrap() {
-		local w ww
-		for w in "$@" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
-			EOF
-			chmod a+rx "${ww}"
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		cd "${ED%/}"/usr/bin || die
-		dodir /bin
-		# move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "could not move fhs bins"
-		if use hostname; then
-			mv hostname ../../bin/ || die
-		fi
-		if use kill; then
-			mv kill ../../bin/ || die
-		fi
-		if use split-usr ; then
-			# move critical binaries into /bin (common scripts)
-			local com="basename chroot cut dir dirname du env expr head mkfifo
-			           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-			mv ${com} ../../bin/ || die "could not move common bins"
-			# create a symlink for uname in /usr/bin/ since autotools require it
-			local x
-			for x in ${com} uname ; do
-				dosym ../../bin/${x} /usr/bin/${x}
-			done
-		fi
-	else
-		# For now, drop the man pages, collides with the ones of the system.
-		rm -rf "${ED%/}"/usr/share/man
-	fi
-
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-
-	# Help out users using experimental filesystems
-	if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then
-		case $(uname -r) in
-		2.6.[12][0-9]|2.6.3[0-7]*)
-			ewarn "You are running a system with a buggy btrfs driver."
-			ewarn "Please upgrade your kernel to avoid silent corruption."
-			ewarn "See: https://bugs.gentoo.org/353907"
-			;;
-		esac
-	fi
-}
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index 19f7b4c01aa4..a07fedd561b2 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 15e9bb3dc8c7b4ab8e9dfbe3651e6c4f1888001941d24d30ac085f042b5d10c504bcc1245edd3038dcc898a99d959dcda803c28eb604d8705f98affcb0fed34d SHA512 ddc202ebd0fe807e5443f4299acd3de04aa9a3eb880f56d47deaf33cb9572a92ed756a0b43cdb10eca2287d2e6e9aad253559c13e518adc0be804ce7085f71c3
+EBUILD cracklib-words-2.9.6.ebuild 700 BLAKE2B 5cc1603ea43b4227768779c456e464d285cd2668305af2338b89f343347f2b647e019ef70025b53b4b8d4c8e78d2797ae64fd921dcb15ee1808cea3314f4ee5e SHA512 645d548e2e976f44ceebb062b394d634bce6e81a20a69b3807e7c13a68bb08ea41dbfb1a3b12ec7415ecf51f0af83f695abf674a0908b79eb2eac310cbbb293d
 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 ea7cfb38c581..1202ed1d2956 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest
index 7c1e3f15fc7f..0355e9e6243d 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 356 BLAKE2B 0b7c59435e39e17f1afe3678f84b25ff65276ebf93664d689f38a746c5c5b2945fa86e9f0d104a5b7577f7939214e4f4f15b04470af0c843468f7a732fcb082c SHA512 1ad3cdf515777e5ba8eedc40a82177ca7cfeaecb0ac82fe5d5757c81c298e43a8fcfc5f46f6d8d31c83534793d7acf798d8b16ce8d7a6bd2868820cebf898feb
 DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5
-EBUILD daisydog-2014.05.30.ebuild 877 BLAKE2B 0e422e5da82de98c38dd3a08c838baec9f1cd63ea1a9597b73d90a25de3fbff179150b4e261c877b24d97638591f094275c61639ee45f5fbeb1e26023ed6d8b5 SHA512 c6e881ac11f8dea591bbec07c3b9021df4db669736dba898900760c450bafe39ce9226ad131461b12171631954198129f75330c1500a0f3a7fc760afffd7973a
+EBUILD daisydog-2014.05.30.ebuild 878 BLAKE2B 4181a7e5374fdd43526740a9c95f2b2c9db6ab04a52f965168fa0579b8c7526895438374db4d7595a437b1fd90943e0785723ba18cd2d168e28d1453ee1b1e87 SHA512 fbf73a0a77329ca67ea2696d3c682e8800dc9a996ac51054e6af712c56ff7a2b0cc6519a84c567924812710247c8aeba164763854bf974601e08995f6a59c752
 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 bcb0ac67a0cd..d5d854b5ecb8 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static"
 
 S=${WORKDIR}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f0b384968353..8b9017bb4745 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,5 +3,5 @@ AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a03
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
-EBUILD dbus-1.12.20.ebuild 7251 BLAKE2B 666b21bfa2a9c5cd217448193f7fb71bf5b65aa8c712c5d1427ac2951e0edf92e5766d49ba0cb0164a1bf85047f40d314c0d460ebc77f60954bd4abb49e8c396 SHA512 1cc873fb4437c2066ec954280a1f67980a646fcd16237a7eefd767f57e99fb30c1ef24050d6b02209d1b7e057f563a9f30a64b70f624b3127fcfeb355b8d2fca
+EBUILD dbus-1.12.20-r1.ebuild 7321 BLAKE2B 1f02525af06075ac2ea9466da2567988d6abc609e10c5335903988933ff07e1f1614fa82da7ce34ecc7ddeb481b87a768902dbdf4b507ec4f8289ee7a1fc3ae5 SHA512 3bb91d64d52c2b1eb9699e2bc6c91e1a9b1a86063794ede6f9b188aae4c81f6cc81d37de4dc38e3d1f43a88fdc6be1d6769265d4b5d71c21be72c23cba0f6661
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.20.ebuild b/sys-apps/dbus/dbus-1.12.20-r1.ebuild
index d6d11cb45bd1..17f89e9ff272 100644
--- a/sys-apps/dbus/dbus-1.12.20.ebuild
+++ b/sys-apps/dbus/dbus-1.12.20-r1.ebuild
@@ -234,6 +234,9 @@ multilib_src_install_all() {
 	# let the init script create the /var/run/dbus directory
 	rm -rf "${ED}"/var/run
 
+	# https://bugs.gentoo.org/761763
+	rm -rf "${ED}"/usr/lib/sysusers.d
+
 	dodoc AUTHORS ChangeLog NEWS README doc/TODO
 	readme.gentoo_create_doc
 
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index d26f45187638..3c3e0c74d02e 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -2,5 +2,5 @@ AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3
 DIST debianutils_4.11.1.tar.xz 157536 BLAKE2B 2093568ff6e779d25ff2960b1bc6b12bcd451eaf9ad586ee48d6a6f52bcb0d53c58cb01697eee3fe47d22bf9019fedb5e2857fc8bb358b1449f65079cab1190b SHA512 8283e42f190a9c59c54817a745e219fcc9a1f8995204d62aff84f755ace041e433fe707d3b4373060207a70c9c01d958234281061f77e6e6fb6c560c79711772
 DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
 EBUILD debianutils-4.11.1.ebuild 912 BLAKE2B ab957374835ccb707a397e8039ca176804822429e1641a3e959df05ba9fda3afbd818a7aafda525115270b750f0c7cfb952bf7d650939f6ff3ea388f80d2be3b SHA512 8f81748727bf9a8d4e3af8165f3859a544c80e96108f83c87c97ac8b3a9a2e5771b724707d7534e2409862f3803e14133c3344c16f4bb74a90db5d91579f73ae
-EBUILD debianutils-4.11.2.ebuild 943 BLAKE2B b5a81e52dd6dcb84abea8c15d932c7543ecd3fea7c999c2f4482b5b6b4378d1d4494e9885f4773ba85d78dd33cdbba911bc5b7c573cb89f270c4a2c3538bf673 SHA512 7dc53b39049e32c8f2a4f63355c3908706a4cb3276df734f27fc2e2c4f20325ba0e3fcc6245b054fff50115b35e077fc19af1f3a304aa92fa5a4ef83f40b2a4e
+EBUILD debianutils-4.11.2.ebuild 940 BLAKE2B 21977548806665c1edcaa8427ae0a310b29540d63aa407ec4f931283c8e476d692627efbfe472d8405d14d794f00256a1108d5a0ce137439363a1099a47e3994 SHA512 322439c27a6edb9d6395c23f9243724326b89c7de2e8c4f7cc4c1cf1a0911fa8547259dcec3eb35f1330c6389b8395bfd45b1eaa389bbda751d808b0aad51098
 MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild b/sys-apps/debianutils/debianutils-4.11.2.ebuild
index b398e3f5f041..81009055a049 100644
--- a/sys-apps/debianutils/debianutils-4.11.2.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
 IUSE="+installkernel static"
 
 PDEPEND="
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index b63bc44ff679..71bb511b41fa 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,3 @@
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
-EBUILD diffutils-3.7-r1.ebuild 1202 BLAKE2B 8363da9d4ec93ed674cc8a5cf611baa6f3a5a50414a3ffeb05d1526ca61e8a2f67dccef55e879c0709cd89a0a7c7c4f2e59b1bad4f247d8ebc918b42c2784c12 SHA512 5965fa55a0d185bc3b0ba611805df72ef47b34d1f4684d7ec21b4f8e8a7632d47a3862232bff9c3c248a597b15e54b1d524659c1b4b56db15a06a61e11638312
+EBUILD diffutils-3.7-r1.ebuild 1182 BLAKE2B e37c711bb7a7acb57164a1991fee9b4abfa9c16545927cb80c13246cb368ecaa592c32ccbcf48a011fa19501cdff9a4eb251287820ce67e3830afa1f730f7358 SHA512 7f333946a56cd49c068e57c786e8ece323c526f3e3970ab6a2ec40a9eb1ee4ff1ba4a5b4b119744f76eb553ac108f1f069bfbe13654ee85b8b7aea3a88b1136c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 4a5fcb88c029..25aef108f0bb 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index 62614bf7f913..72606c4d4edf 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 1095 BLAKE2B bbd7fb176c610543a7a027f33f2db48db04121e7e9047ea3a013c6cfe004871e1b359f037d830c4044159e3e6b3349fc13d09617beeaebb965e2b40f36260e6e SHA512 a83a18f449dab9c361f43d16f31ef4a2f4af09f92c60edbb15322bfea10379af4bb1a9411dd7135273035b1f16639e2c81cfada0c9e4e5641206a2bd58a6460d
+EBUILD dmapi-2.2.12-r1.ebuild 1096 BLAKE2B 7ee703ffb2891f6e40c37b13668485682e6d4405c6cb5eec4c80ef82e8d599fa2f925a2c8e8f5cdc7ab375fce9dc9ef3f80929c2061516a8d28d4ce0b8ce3376 SHA512 9f0fc0fe08f22b15b30e8124356ba771a98cbc938d442c75d8dd436145979c6ba3a0e88a1ed9484f89400d2030e5bc143d8cc01a6b5fd6a8e2ffb8f511101bc0
 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 9150f009d58a..33e8a3bb876c 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="sys-fs/xfsprogs"
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index cdf9d5a45c53..347d4a790c2a 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -2,5 +2,5 @@ AUX dstat-0.7.4-fix-csv-output.patch 888 BLAKE2B 6aa25d7b7c2fed6986be55bf5802692
 AUX dstat-0.7.4-skip-non-sandbox-tests.patch 661 BLAKE2B 31f98e58c8f23e3b6322de86bdddb83afa22b0b8bed48164378c6c071348ac2a37350b789985634017c1e338ceb73d7f9221d99e0b8b4b4d550f10d7840bde76 SHA512 0087d7fa2ce9388440bacdac52038433c1a7f0c5fd885027a4b18895c8f450cc7cae7610e6232e26393749f1b165c4ade5ee2a0e453c7e2542450f5a3d3100ac
 AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6da523da24f9215dfd7c967dbfc2384ea16ab9b01489a7d69cd99d81ddb1222e75e6d070e40d435e1d12ad8ea2961e447721d9656bc SHA512 4164f61a1ef97f2a4962f84138305b68cdbc9fcc5c639fade7b580c9f9904d592af9e05982536cd2bea5581c30696a0308dedbe6f739f0094c319bc85d547fea
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
-EBUILD dstat-0.7.4-r2.ebuild 1301 BLAKE2B 19fadb404714fa8c5799d3aed439c37e6cd0c4acc92a6af29d578258c12e2c85bf414aebcd8fc0a26d2e61e8a66694e9eeddf32c0c228c5d6e4391c749b584c9 SHA512 bc0af1d11789d43acf3535d50eac0b3d602ee86686e75bfc53818592bd6f45c6130ee1b2786fb550d1d4e053bff2ba19ab2edea3151b24331c9d205d5a5f458e
+EBUILD dstat-0.7.4-r2.ebuild 1302 BLAKE2B 5e16df8107536354e783de8fa2ef8de192bdacba70dc01da874e101548af885a9f2bff03fbc3276fb2737bdc76ce6a9f1ef82a032b848b4dddf2825060e09d5d SHA512 5a107a7d6ae9fe223f1969801268a55377f9ca112dc42175958509b06eda61f772980064bfb5053a5a3e8283078aae60927e6d17e9c23bcd9b42cb8943a27b39
 MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
diff --git a/sys-apps/dstat/dstat-0.7.4-r2.ebuild b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
index 9ba37f135bac..6baa00de9090 100644
--- a/sys-apps/dstat/dstat-0.7.4-r2.ebuild
+++ b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="doc examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 5a6cb72872b6..231bd3206a90 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.tar.xz 68432 BLAKE2B 222ab30f72fb466372cd7ced75807e9324a916ca5962c6829d562476ae1d9ae9c01235a130e58f952bd6029b931f6362d2a695b35963ca32bb3cfa539dceab0d SHA512 45b29fb86c7e7d8569c02c8177a9c7f7e691e08e913bc07b301b34210b6dc27377858ce60dd695feb950ef436c86d7059ade90396364c95aefa3c1e7a9d3a2a4
-EBUILD ed-1.15-r1.ebuild 940 BLAKE2B fc9db3e1436b6b2029b9975b325af87e4a55361b6b359b4342e5d6f13251d21c4903e6dbbb8f45f7629f8507f4ee1f222b20b2c3f47b8919bd53484614fcba4d SHA512 4a1f7a922a10f9e3c6278f3cc633fd5ceb61409247ff39cbb6adf9aeb125ebf71c66466093be701bba4a6b1d0b478c00f22a820ccbde5753c17f935eac15c85b
-EBUILD ed-1.16.ebuild 1019 BLAKE2B 31f0dcb440022c33749a8bcf6c80dcc57076a5ea0db108325862a64f1061975355a8223b354c4f1abd10d688ebcf0f940d438420372ab222ae0663e0b55b0855 SHA512 a6225a82dad440f121939f4c0d54a7cf644ea70a5f88e395ace366e1c15c764682f3f0fc059aedcce46f1416383879878704c62fcf458ce96b49265abc90f4af
+EBUILD ed-1.15-r1.ebuild 920 BLAKE2B ffdf311b76f473ce985174455fa322f57e46153ba3823403b60e0ede90b3812d502676b2acb60255916401bde740e330e678829b881b6468e9f009324ea88e26 SHA512 3b280432c58cea963d23797dd070cf15b5f04d8e11e925c3fed7df0d054d57e4fc3a8960b112764ea26649e90c77fcfab6bd7701c232bfae5bfa9ae57311dfd4
+EBUILD ed-1.16.ebuild 999 BLAKE2B ee5e8a6d89700f401018d4f3be7ae1792e99ca190632ccc0998dcee4bd89ceef073cc1e7c0af5a88a3d705485e2529071d070e8c187283746add65c15408b25d SHA512 e05fbb977ae5cfe5f2c96dd7e116dc32b5f2c7a43a0c39aee5e5e99bc4ac5ddc52fde344173cef4f50d55c180c6fbdc3cb00792ab74c3de42ea7ea9a00021466
 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 14abe1230a48..4aab70584654 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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ed/ed-1.16.ebuild b/sys-apps/ed/ed-1.16.ebuild
index f25383ee8d41..dcc0ac9a51a9 100644
--- a/sys-apps/ed/ed-1.16.ebuild
+++ b/sys-apps/ed/ed-1.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index 1ddaec91c310..ec5d5e2e969f 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 1129 BLAKE2B 9ecd048a890bdc21d9d68bfa55254617c8314d16f738c8f2551b364a2182e6ed2784b2fc9b1f2ed662f6f369c496bf8071b8b58a06bb475049dd462cad2d8ec8 SHA512 10ac672081f2364e9449d9e45aa00d45f3148269a2aa8a4fc8ba435ce0b22e64d932c9836dad34052d8aa00f06afda61c4d37537baae704832b8cb02cc0cdf49
+EBUILD elfix-0.9.5.ebuild 1130 BLAKE2B 43486a5990d43b3bfa31f6aa72288b33a6c2d27b853978237c939219e9ab64e13363bba8c0afab86d6fc18102e20717d6c284c7a3a964be55d84619bdf76f917 SHA512 76441961ecb9aaa24b875a26d2beb65a835755d7a26ef01e1e92898fb4020029bff753d6ead8cf26d643f7f4db527892e5c7957f558e39058af094d58b9fb592
 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 519175458f3f..f55fb728d996 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/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 22a5d90489ce..fed1c05da4fa 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -5,7 +5,7 @@ DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5e
 DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e
 DIST ethtool-5.9.tar.xz 307792 BLAKE2B 0cb5b56f6367bba18c92b1d420471be0b203e05d36fec1495f18de7a2e793fb12cd57b3f2f79369327be1b76a9ec749a65b91801c90da79de9d23da62e628fcb SHA512 9166a06b823373188e754b3085cf8e8f71455d83d1bcfcaf1350433b21bdbc6ae851f62108d3d2e3bbbca33ca595382cd2c68966ce4824b55f7f59eb0996bf36
 EBUILD ethtool-5.10.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
-EBUILD ethtool-5.4.ebuild 457 BLAKE2B ce0d2ef607cc8970596e8a27c677eaa8ca24d03c41d879f107a6c0981ef33cdc75b1a6f63ca402467d0e02a39e253866995867b2242e1f4a5c205bf19011129b SHA512 28e8a1049a95e8d6ab2ea8b2728af57c57c4e271cb1648059289bd176143607b7a332d9efb455f8ed86a1882ff779f1bd6c2d03555c02feb84c24f64bde5be9d
-EBUILD ethtool-5.8-r1.ebuild 682 BLAKE2B 23b63341a624085d2733bded18283f0442119947827068a7e34eccd953fc7c0a08296ed5039223dc59db0179e96755d9f5f71a39ce832f96a5f70b4cb06b03e4 SHA512 890996f816dfd11084c0c37c1238d682f77c5d9ccc9eb8d4a1f411fe44b61f22d246574d68a13be850806cb81ca0570b0bb9938ebfde7a73e9873ad3afe4930b
+EBUILD ethtool-5.4.ebuild 458 BLAKE2B 6590591fb947e2daeca4953ab424b0c1e08f8f84db21fca88f9cbf3c86a2de47c0ab2046a71d7181849908364d9ba70c7b23d2a5cadd61f85d8ef532f63a681b SHA512 38763c6c35bb51e877f1ad4fd218f05e0609176580848a63f1b8adcabab5ed7195bf6e1166edad41ea69f930dc8c8399f7a0c2658a1899e09cf61224ea407cc9
+EBUILD ethtool-5.8-r1.ebuild 683 BLAKE2B 53dd3107b350a45b34aa891af4ffd6d5286862ae3cf38227fc64b137ff41d15beff0ab98c407150d390aaafba0c48cb1963e218064713f9add653dba109ca664 SHA512 2368d7d4a16f74d0c926eac1c37e4c39f8b002bd23970cffcc4890bfd679d616aa780e049fa6b0d4e39f449f88c4dc14bb6ed48ada9cf5a9e3b6a336e633cfdd
 EBUILD ethtool-5.9.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
 MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b
diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild
index 8b709203d4d7..25a67f41d620 100644
--- a/sys-apps/ethtool/ethtool-5.4.ebuild
+++ b/sys-apps/ethtool/ethtool-5.4.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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.8-r1.ebuild b/sys-apps/ethtool/ethtool-5.8-r1.ebuild
index f1dae680c309..74ba8d2656ba 100644
--- a/sys-apps/ethtool/ethtool-5.8-r1.ebuild
+++ b/sys-apps/ethtool/ethtool-5.8-r1.ebuild
@@ -9,7 +9,7 @@ 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+netlink"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 64675554ca53..2eefe6f6d81e 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -6,7 +6,7 @@ DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85f
 DIST fakeroot_1.25.1.orig.tar.gz 126880 BLAKE2B ea92815d005422ade80a91d1351c500614f7628b2173caf23bab2192f9395440ba4429ac773723c79a0f0205b7c750db9c1cecbefe7e9e2c442c8a92938df0cf SHA512 0e340aacfb49558ee6719aa11aa297ccda2afe2f66209da8fa10e45ec7954d5db689717db38f30cdfb9d89b75ca63ec6aed42e2cc314fd25c60262aa735eab0d
 DIST fakeroot_1.25.2.orig.tar.gz 126876 BLAKE2B 13c4457aed3d6df08fef0f3af6093eea05bcaedff280146a7d09e96a1e73d0615c2527ce32bc4999a0acc0478610241440ec9a70ee27860cd61d799f636c30d3 SHA512 3afc0d6c82bef4968f1eac293174d12f957788f173fa8b69753c422f0f3bb54e012d350eaa8e535501dd62185479c1d4cb1c6e3f605930ae5987a7f622c450c2
 DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38d25df8b8cb32b219064618c845d0308b57929108bd582b46c15b2fe4b2fc00d662ba72458a9e9ffcf7d035dce515eb55 SHA512 b54366ef82b49af414d7214d069a4bc7dd188dfa4f8e3121f6bd65fd67268b02346ff72e857087243ab0efe9fa82faaa9f9c3309cac4b5af0ea00908c2e5eb6e
-EBUILD fakeroot-1.22.ebuild 1067 BLAKE2B 12d38863a89eb5c073633b02fcf04845d48959821ad1a744b3329e98175164392dfa6cc14f006beefc3a07bb5df9b3944b016b59ad7755b8f3514e5bd7dd0d87 SHA512 5ef0839952eb6c3894faa97c9f0ca5e4676767b34c450d6375551301dc4d775188db6248d36d4abd0bf77e80176a7dc6701ecc79dd08a1ffda33d6d879d94d9d
+EBUILD fakeroot-1.22.ebuild 1068 BLAKE2B 24eb5e3273be5f6bf771c1930cf01495912a2a043ad39c80b3501abf211024b7a4bc8f09656fbb2b711368979377dfe46baa16528ee8de53890177e673082ab4 SHA512 096c63a170619f68f38b95013616e96881750c39b3f4d19d12bd5ff3cfae8c493f1b3ea5695ee8f584217d5d52d44c3ccb3041558db7f9770d53c5d8b0453a32
 EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904
 EBUILD fakeroot-1.24.ebuild 1081 BLAKE2B 83324f005105c63853a8609a59095032ba7c559c6a211257f5e834eccc331f0d6760ff46586ed64ca0847c2fcb4190160449538a201b3c480ecffac867d1d9c8 SHA512 aac064b0369eed287f53944cd7ce1be7455d8bd2eb647b2d7499b67d306def045a32dd994245d64c6ef632b7d240cbc258405563bd777e3239f154ec524ca531
 EBUILD fakeroot-1.25.1.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index 81e7e7047e5a..1f8e88f9076b 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 f152a6c52856..97611d8cbb23 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 783 BLAKE2B eb3a24253c02bd3be7aabc1672091bc537d2d675679ec67dd29bdd66af270fae63f8dc8056205e76f376a65df9bf95ec0fa6e79bee776d58b7b1e3ae4a885adc SHA512 f9648ec31f061fb2cd79eb096b81ffb3cb11ff5f196dcfde09eca97b4439d3d186d4a7ce64fdfe66c062681b6302f6d5fd7f8be396f8d788f5ef641746d6cf4d
+EBUILD fbset-2.1.ebuild 784 BLAKE2B 627b4efe6f466a3a5986747ad0d83f4f84011587e4c9a6b635e22d6b10dc72c087323d8d08584991040f6ea546806519424ccd6e799228fa470a5a1ca94ea49d SHA512 209ca70d2960b032e1a89f85031be40e906e11e73509e4ca17ef064b2a00a8fdda46e081c38fdcee70ee1ad38dbb109fd3d7a41fa883a5771b477ae64e04f2d1
 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 941cc93c11a6..d6d2979ad87a 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static"
 
 DEPEND="sys-devel/bison
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index a1359f482d99..21bdef7a185c 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -8,8 +8,8 @@ AUX file-5.39-seccomp-musl.patch 1021 BLAKE2B ffb395d7ebf1a96a7f74c8c8462e561f31
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
 DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
-EBUILD file-5.37-r1.ebuild 3186 BLAKE2B ae1dc50d4a3e863b7ad9e1732c96b75c97d780bd7b42a34b3cdf8559e21e55724df58e5cb0ec54d1ce33c33c180755803b4545fdec3026a66f364b4436610328 SHA512 58fe1683e40742719d76cb17e0d8cebbf04de75fe1c8d4c4d8873ed75c0a0f1a4f196fa74c182c170ef00a19e42e9e892ef0ce68ef7709194f55cddb0f382eb1
-EBUILD file-5.38-r1.ebuild 3397 BLAKE2B 7cd1c545d4df9e9f448a07ae492df789fe2503c81dc7ec1bf530904099a0ec25789e205e33c725feeb03671f2fab11d04052a161c895f42e7fa2994aea316002 SHA512 baef4c52a5e40e35a3cb1717f78ecb066a10513c1e75e2c69e9ac381c58fdaf1cdb935cfc51720c382ecead25ea485163d544ba6ca19ece6dc556ec7e75c32c1
-EBUILD file-5.39-r3.ebuild 3421 BLAKE2B fdc83d16ac687dd6704cb7e97b0bfae816a52464a2da83fa735e60114f8775c488f4fb4f7ed357674cb482e8c2910436971db03c0e56a35e017396e3e4ecf912 SHA512 7a9e2909287aa002e8733e1c252413e9e53072ab8a24b0574a2868be105fbb2a8c1b95fe0112757df2074239b6df9769762b03d7e97a05e03421fa168b81ef38
-EBUILD file-9999.ebuild 3327 BLAKE2B 2d1c3d2ca36a831a192f3e867dd1d027166fa3aa70b2fb3ddc250209ca1e65b38caa476560cd05e67814a5bfe3ac6e695df97f8f737f380bc64507e2052b482d SHA512 9dcc56dfd1b5e4c2143e1411aa897ced3f505a74bbe0b3e14d1d565569aead68e4afe48799a9ff32d2c7ba0ddef6a887dd90b855e5ae7a476535df8bd9508f87
+EBUILD file-5.37-r1.ebuild 3166 BLAKE2B 7b668c34c770fc050c48d2753c81604505da990b4febd8ab73f3e5899070ed36895e23b6c2e10aa54a6773ee0a2908c8701b0fffdbd601ca026be0763fb9f7d9 SHA512 641e83e9f08fd49e95ae8c2127cce496c81f922eb31402485651cc5d58d1ed7f18424780aabe228368c0761af540618540c5ac6737e36cdb4aecf189ba247d57
+EBUILD file-5.38-r1.ebuild 3377 BLAKE2B e05f6b8aa573445d033dc1a811a70d514d1ae083f7083ab0b48448affb2411cf0037c63f01a44a2d34e2ddf95e738c69e11bb1703097bc821c357d39f766cbb6 SHA512 c51d863ac63ee5f68063abd3e07df79ec8ef46edc7d79b0af7add4a24e62eec7a44b57c4fdce00d31d71b6a0fbbb36d8a1e3c358d39e22e098f3a6d620f0f6b5
+EBUILD file-5.39-r3.ebuild 3401 BLAKE2B 37c11a7d89b6ebd934526063c1d5162c2ce53757e2eac0b7ad170a0240b0f70fdf55c112b2d1c4fca6e5d386f3291e1ae0a1ad781a32fa8a81938d5d3f9be4c8 SHA512 d4ed2ea6785a3b7f9090e0e115d70a7a6fbdb634624349a85fd901313953cde7631114ceb5ee4e156ec857185ac750cdc2b308cfddef80214cc0e79c87a1f55f
+EBUILD file-9999.ebuild 3307 BLAKE2B bbec566f1f9a3291e6e03fe1220df01532cfef45b50b797711340732638cdaac41dd40fb6275bd9618cf182178c7fbc4fe3ca59394057609169e2926f4bd07e3 SHA512 fb30b25f2b312c84758461e4903c170bdd72bb62abfc0eab933f29430a305a0b62e309d894da508093fc585952d9b6106cd4ce1ca83d7388df2b9b26568ac0de
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index 72edb1d0c5c0..32d1bb6737d8 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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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.38-r1.ebuild b/sys-apps/file/file-5.38-r1.ebuild
index 7cc595691640..c64fc4a06203 100644
--- a/sys-apps/file/file-5.38-r1.ebuild
+++ b/sys-apps/file/file-5.38-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 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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.39-r3.ebuild b/sys-apps/file/file-5.39-r3.ebuild
index d9f6397209d1..6077cee935d9 100644
--- a/sys-apps/file/file-5.39-r3.ebuild
+++ b/sys-apps/file/file-5.39-r3.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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 71c29604e7d5..99b7a792e848 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.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 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 9857176e7a21..8115aecf9540 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1,3 @@
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
-EBUILD findutils-4.7.0.ebuild 1680 BLAKE2B 16cf86e12deadfe2330649598d14624b3cafe6dad9113b4174dda5bcedd5dd83689ef1ed6b8bdeddd892bf1c5d46dca17605d38a6bdb39cc12354db9fc97ce71 SHA512 02a79af5c8046552e071529a50c9f2a956db6014e8b72578d2e6fb7cc8844a107adc28d5b2a651b85c7678955d88a87014313153682db19c048639f9c7506394
+EBUILD findutils-4.7.0.ebuild 1660 BLAKE2B 2b68d8a19faaccc46fee026e6e38f685d3221577654f536f826c16685efdb0e5728b443dfff247af3c9b2e9705d861b29521f5636aefa924f6374fa9ee6e6e6c SHA512 b40d181aff1a5b764db019f6810e02ddbb051d4a316a2aa8a0e31b74ec5707747ce876a8af233652e29233594954b9d6763c7b9c3aec79ef8672075293e17e6b
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index d708ec6f23ca..df5efa18b975 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -13,7 +13,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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index b0db6dc54450..ab507fb27a46 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -5,5 +5,5 @@ DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5
 EBUILD flashrom-1.2-r1.ebuild 4520 BLAKE2B d00007833d23c42b7b59cc1503565e75037d7f4dc835f79c280299a2818bb5ff2f48868958940a237ef52721f971a1c055f0ef35c0167ef263b5ef36232266d9 SHA512 9c7a87c29bf7f57ff9878127c8b38d21d97f3019e0a350e64d7271a208253d85091addff5799e6e947182490a8494f6743e2e2029d3b4ae6d5ab9c9b14900d3f
 EBUILD flashrom-1.2-r2.ebuild 5071 BLAKE2B 44b157d811e994054620a78ea0871e034de2396e8b8affa705b24b4d22b2932c60301f4c40337c473a946e6108f0edeb6a00ffd81136bfdbffefbd646b98e27b SHA512 9429863450f128888ff84815a0ea05cbb5b7d7e26c890f08bc6275e1fdc0a27bf484523f43a47a90942220ba88c80d9aef84d0eb807aa9d5a89e9961703fbb5e
 EBUILD flashrom-1.2-r3.ebuild 4344 BLAKE2B 35c916ff5dbc60e9033f0896720fe5c3feb2bcd610c4b228f54a5a41f8908c4a52a2b06dc62aa0300026900df8b4a07dea0f485beebb9f85fc11c8002a7c6133 SHA512 5675097256ae4add72b36a315fc580648f4ebfb7c24b59b1a6a8b4d0c2eac4202c566e98262792a583d755012aff0b1fdd7a613e9396e3e3af9c254e0123a024
-EBUILD flashrom-9999.ebuild 4489 BLAKE2B d0fb29503061e75baf3edfe533297cbe657d2bf7cc69a03ac55c406cf50db0209620595d362e3a38873683e50794a9b719ef112639d6b439fc32d55880d484ee SHA512 712bb65c3b2e8a328a349c41ab102a6c774e2b1a1c96e2a85edb13ea747d4d1cc3234ec5476df8d99f49c1d10c294981cc260a87e57afd2f3824f6f418a215ee
-MISC metadata.xml 5027 BLAKE2B 3327749234a2c8fbab7b0058b082f7be52cd8108fa126973a4631bbd06da5a014a78c4e1871839ceb8cd993221059cf0235331c16d175fa4ac8f4324143865d4 SHA512 25e257b78992186e561e09cbce48872918191adb27b8cfce74644787e3d999d8cda18341a6208715ab3076ddb8cd9189bdddd1c856bbaabbad69ff017dfb7fd6
+EBUILD flashrom-9999.ebuild 4499 BLAKE2B 1253b00811d15e4ab8fe4411b133efaafe0bb3c126de9c36d47d608ce17e68dcf28927037178d27ef8e7629dfd63c72cdfcb2ad5b43df17b85b4c9caa4f3126a SHA512 80cedf318b434f2c9fca4348af7f64d7127069867b7268560a12c9f01be37b923db435b8b3e34770c443f81bdf6799576b4633d6cc5fdd5b1540601d13b2e41f
+MISC metadata.xml 5037 BLAKE2B 3027f42fb0ab5965684cb79857991888772126fbf48e2f9c314a0e01c831cf38474a20ce846964631ea95dc459629396c3796fc89d858b35f239f2a3fb343c1b SHA512 8602f9ad7419bae5f10620400f9451d16c43d12223173873ab53191c93064bf0bdb72c78ee5cde8dc9fa091ce1c6c80575cf586141080c13c971370fa0ac85f8
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 2df167b1449f..0a8400359fa9 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -53,7 +53,7 @@ IUSE_PROGRAMMERS="
 	+ogp-spi
 	+pickit2-spi
 	+pony-spi
-	+raiden
+	+raiden-debug-spi
 	+rayer-spi
 	realtek-mst-i2c-spi
 	+satamv
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index 972fea21b4bd..384db1c0481f 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -37,7 +37,7 @@
 		<flag name="ogp-spi">Enable support for OGP (Open Graphics Project) SPI flashing</flag>
 		<flag name="pickit2-spi">SUpport for SPI flash ROMs accessible via Microchip PICkit2</flag>
 		<flag name="pony-spi">Enable support for SI-Prog like hardware by Lancos</flag>
-		<flag name="raiden">Enable ChromiumOS Servo DUT debug board</flag>
+		<flag name="raiden-debug-spi">Enable ChromiumOS Servo DUT debug board</flag>
 		<flag name="rayer-spi">RayeR SPIPGM hardware support</flag>
 		<flag name="realtek-mst-i2c-spi">Enable support for Realtek MultiStream Transport (MST)</flag>
 		<flag name="satasii">Enable programmer for SiI SATA controllers</flag>
diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index 3e7f9bb57bce..2fdaa5a35e02 100644
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -1,3 +1,3 @@
 DIST fxload-2008_10_13.tar.gz 23926 BLAKE2B 61401b6ea11bfafe8bdb4128dd1658123cac83c1e2b7995a1554b5c9dfa9cf25c2f261bb76a2fc0946940c64ec69fce021e187c383201f4f7a3561a68c3f8ac8 SHA512 f8a654c51a392ac95672a24962ac3b83ea4e0cb62d51a0696f6bdfdefbc7b5cfb033aa9cd80ee676a6bb00061bd635d7eb3920769f982188d8733c862838bc32
-EBUILD fxload-20081013-r1.ebuild 735 BLAKE2B c5c7f3875e441db3555dccb78abc062e67598bcfcd9dcec759c20b6798416bd4f1ed20cdc49979d7759ca13d0c8c475836b2e27ff959fdbb848d65478d3baba4 SHA512 13e8e5b5b7c049f509a2ad804b5b9006e6945d1148d18c66dbbfa0a7b7daf204eac145ad2cd33f3e27ebaecc384abeb863f4378771838772fd0c54effc1c0a23
+EBUILD fxload-20081013-r1.ebuild 736 BLAKE2B 26896133ee9a010a45286de72e4bab5f9f2a0fcd66e1d2998d6a9b641eeb1439d49eff877bbcb64d935f3abad2388b0f96f42cf0b72c8aedc5c49a7a42fad1ac SHA512 2340ba9c1f0a996c4b359d838e7374131b230ee5719c465e04d480134eed99dc2bd94d44807b3ba703c77f2675f54e5d84ecec6219ec4b851ddf4fbf06be4fbd
 MISC metadata.xml 250 BLAKE2B 78bfa62c2b315a16f4c255dae1c32ed1c9184c0638658cb5a8a83641deb97c079b73789e020c754731d6d3153d397df00f546c59781855b7d3f8e01933b626a2 SHA512 bc48eb750cab3e4f45a71b1ccea94faabf8dc43826df2b701320cc03318700234bfea551ab12963356f775932fb62d22fb1182d5ac083c3eafd63b3feeb1b0fe
diff --git a/sys-apps/fxload/fxload-20081013-r1.ebuild b/sys-apps/fxload/fxload-20081013-r1.ebuild
index be8b180ba2c6..fb1c041f177a 100644
--- a/sys-apps/fxload/fxload-20081013-r1.ebuild
+++ b/sys-apps/fxload/fxload-20081013-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 0ec7d9b36a16..c382e2602c53 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.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
-EBUILD gawk-4.2.1-r1.ebuild 2164 BLAKE2B 09cbe472e3e9d6bcd194c27ead1d1d96f4c7eed3e5fb5ab68f0301b33cff378424c4caa92aa910c14675294d504a22cfb30067b70eb78121be681c640a4396b3 SHA512 f26f73852c3c26f7efcfb69bf11b6738e0bd4a9e03b22df753477160285675e35654c38f6777551f8607f8680b087a91948d2089e83c00e7474ef8645952cd65
-EBUILD gawk-5.0.1.ebuild 2222 BLAKE2B e219e0676f2990b4a93f319f88971b5833d4df05e568b0fda47c607dc1889f90ece07ba64e67cd92f40dbd9c3184f45a4e8da83adff6bfaab08ef76cf8be2b94 SHA512 6f05586b66b986c7e0d65362afef1cc5aafb094242df50962fdcfc01e68decaef61b2f55e73b9b5ae88164a05e30ca203c83bfaeb19e7c9364e61c66871dd330
-EBUILD gawk-5.1.0.ebuild 2271 BLAKE2B 417e446b6a46116d070345bb01a29c11e20263f7a4d3d844152edc1a0da6e4452b3404157d1db38de1b87f82f19e3a044111a20789c2a1d34da68dd29c0d5905 SHA512 a7ed4886e032b10513363baa261e34e530445a933eb0fbaef9aa497892adb08f42e49f484577c0b3728e4a3e3e2c5e478a990b58fad06e5961ed704e86317cfb
+EBUILD gawk-4.2.1-r1.ebuild 2144 BLAKE2B 6cf3baa45fef8b33574dbbb22285ff2e787778e3460bc103ffce3bcf6c1d1a78a1ef9757b132519bef514f36f0b3a0ff5b624193d089d1a149115eef141463b8 SHA512 8962fb055d618831015f7262dabd3536d1a922301cf77b0b34b0a1a41f1575032ec70ea4eef3ee5bcbd6cf668471481000fcc907320fc13509e279fa1aae4c89
+EBUILD gawk-5.0.1.ebuild 2202 BLAKE2B 29ee3a62c362643857db9dbfa5762130b5bd02665e8208cf7a18267690ace425f1253fd35ed06f29c6ff0637302a5ecee6b4339f5bce3c64d4ad42811f864861 SHA512 b698d40a0d7358aaf548877bd5e9e9b5419646bb0177eeb7983cb65ba34f02795552e62caedf0c01e1bad15bc8b6ad5a7e9a2eda9352ff8c8ecddc3783dc099c
+EBUILD gawk-5.1.0.ebuild 2251 BLAKE2B 7cd5266c8a1f0ce900f5500158a1e8073a9e67ff41ea3388c3e75ae306725f5eb54e6477d44f8d72881d79acb956ef18634b72442b5ca63715c67ce79b33da87 SHA512 36f50ced8eef7574ac293dcd612c50a29d9a60e2422ff3366709847853d4c628954d9e50050e7740fcc4b57858689de7fab2bdd68cf1a4d3d26d3f3f6e6a7e33
 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 807061875e31..718d9915b630 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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
index 8ae898e71e82..3518112e852a 100644
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ b/sys-apps/gawk/gawk-5.0.1.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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index 2890b2ba4deb..e47b0daca045 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 58ccc4023503..0a83c8c09241 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
 DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8 SHA512 e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc
-EBUILD gentoo-functions-0.13.ebuild 886 BLAKE2B 7bb2051509bc332c95b1a2d6ee7d0aebe3ddfeb487559de756474cd96d46263b5af57389a16f53df1c673daaec4dd618e5140800c79227d18337980091dd1c9d SHA512 5ba8f91873a2ad75848ef3b443c0c7a99665df73dc2c20a61a1b64ef3ac38478bda80abd0e0e059ed9ad97fcfa1eb73d6318c1e68efe4e7b79859ffce1600fff
-EBUILD gentoo-functions-0.14.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2
-EBUILD gentoo-functions-9999.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2
+EBUILD gentoo-functions-0.13.ebuild 866 BLAKE2B b3db68c2e523a0e0bb4556143dcc2b0400cead0fef36cb070a2a701b960ac82dd92c1cdac314f7bc36bd329b4cf6c41bf789542a609aade8c00a1811151cce11 SHA512 71f7920ae93c8e373c207deea7c31281a7ece76cea7ad7a6f9f5b5b2069403b3cf3e0d54fdda653eb6121d1d009695a9e4c4fbb3501d3c196766972a4199e0be
+EBUILD gentoo-functions-0.14.ebuild 875 BLAKE2B 5616d73c808cde08fe691d8ddae21cafc31b1cf029af8bf3443563521d7e1692ae76e8d0ebd1ca2d4de7b31be6b64b4e3f7fb9db79af9e965b29aad3a54e0ac6 SHA512 4c3b01c8da0db726b49f38ff14f42e548cc026c837681918432e9501c4e240417e6d29981ea83a1c526f1e07d1e0a1293771b5de53caaf12ea342393697268f6
+EBUILD gentoo-functions-9999.ebuild 875 BLAKE2B 5616d73c808cde08fe691d8ddae21cafc31b1cf029af8bf3443563521d7e1692ae76e8d0ebd1ca2d4de7b31be6b64b4e3f7fb9db79af9e965b29aad3a54e0ac6 SHA512 4c3b01c8da0db726b49f38ff14f42e548cc026c837681918432e9501c4e240417e6d29981ea83a1c526f1e07d1e0a1293771b5de53caaf12ea342393697268f6
 MISC metadata.xml 492 BLAKE2B cd68fc088438ae1171d801f7aeb93ac09a21dd2e628ab14c11e2f3f28fba3ad3653005d087ab5c44362b9b6fbc66b1c14256176c6f181313cbf3aa6a01c6739b SHA512 991fa3c3f302d26f4beb103c5dab1b943599aa83ca538b04a785ba608059471047061296d219b637a8b16185105c0ace8b0ff511ec2d94c840be27d96ac8e3c6
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
index a6af72821bb5..cdeb2f06e03e 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	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 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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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.14.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
index 04f1a329e9ec..90e792cad73b 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	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 ~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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index 04f1a329e9ec..90e792cad73b 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	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 ~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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 2fd9790ac772..7dbd49238597 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,5 +1,5 @@
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
 DIST gptfdisk-1.0.5.tar.gz 205973 BLAKE2B e026dd4b4f2b63ca660feef34a1fdfb14034d0d64e4828fddf4a0c63756cbc840b3292231838f0c016256be2358069bde8a17ef0e33dec355c48406a9a930e75 SHA512 3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703
-EBUILD gptfdisk-1.0.4.ebuild 1243 BLAKE2B 198548c9d00163469c4f9e820688cc742d4fc2ead642247551db4ce6a99a9da56b60590f99dbb9cf540aca1023a3e6c8eec94b7885d8506ae4dcc01a1c152763 SHA512 4fa284664b07d789de29bc32e8e7be90c26a81fd9f216d24aca4c76950612b665f357826f96abcd11c08bc7dae949182376edd3cb4334bd03d047bdc7adb00af
+EBUILD gptfdisk-1.0.4.ebuild 1244 BLAKE2B 5e1ed279d0996ac37fb669a8025334a7d2168cb2956604eed0212fa6031ff97654b402d4c88434b90b9718b8993ac289c4889216a8b2dddf8097a372f6684b9d SHA512 74bbf5c72a625e7b8bc2cb6c219712bbde4e58679d3c1c0e56c2dde58a556ec25e7fe9c59c87042f419094db81b33fa85647a75246fcd398a91d3ae758ff2cba
 EBUILD gptfdisk-1.0.5.ebuild 1251 BLAKE2B 47a900ddfdf051e80f28f9c0ed3cb4649e7d1c8009aa978aba5f31c38565388249b5aa192173a8409fbd868a5a568f9a8b78c577b4f726e1f353516eac232dd8 SHA512 54a7a0f1ed2ca43c78261925be662a8ed46502a6e8f457aaed42da151e2b2804a92b0ef73db1a167e83cc9f8edd199b22e9bbae93c8167ab0bc7f2b52acb59f3
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
index 9850f5dda92e..f8935b6212f9 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.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 a4b87963b894..814b232d9192 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,7 @@
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
-EBUILD grep-3.4.ebuild 1514 BLAKE2B 6dee2bb77c82ebfd5d14bfc095811e8eba798e7ed6abf65e0a186494558a0008323535264c592486ecb78cc9c350c489f69fd56fffaf8bc8ed87e70f8e01ffaf SHA512 534e2ace6d59b2289dac04ebcbba97193c17fa8522ca395051b8a82d9ce0aa71ddd2ebb73ef5c45b016ec28f3d53e432859ef5fe48a512d602d0f2a8923b4e27
-EBUILD grep-3.5.ebuild 1516 BLAKE2B 29af64e0d4b5d7dda792e8b58dc78e20b2988f200a6c087791201cbc74f54a5b790a48ea39771cee9757355fc13015119f7f376938189ab3a5ca7c41fa701e5c SHA512 97074c1b4179c64c1584a065c65434fa48b7f4f23638bb17490abc2a501f01d2dee723d75a934d3e1fc60cd28078aea62867b349d0c2e90dd77b4c67dd725d94
-EBUILD grep-3.6.ebuild 1494 BLAKE2B a6bad3481f3cec277b4ce66d073de9ef750117d6becc72a8ec8c9dfb9323d16b5a98547c749103aa8afeb24d548ee5c1ff086aaed8186affcf823d51f01a16da SHA512 332901e74127528a3b761f7b600bd635b00cad534ded7bfd6e2ea2512307157b5a5aa9539663e0621c11543a1eebd1cb1cb8009239d169ccd31bdee421957480
+EBUILD grep-3.4.ebuild 1494 BLAKE2B 0bbf5bd0e80c5d110361e2d5bf55b852ca5da8254238a1187858f1a6e93c4d487ca328285d9b4ceec0aa4a47442078f7c12fd9af6f626e7ec0874d14bf1aa436 SHA512 32e0cde4fc11437e44f95c58990974bff29c36ac91d5dbaf3b19af2a1640707cd039fb6ed13146b73a1b34f1922814df3c5b91df222f30e1daa60fcba3924aed
+EBUILD grep-3.5.ebuild 1496 BLAKE2B 1d9d711fbd5fd8eeb7f561d7a7193658f1209b4dee16840757ba466fc8e627fe5b72060e7dcf8f2bbb7e37f70b9b7657efd990715a911e2938ed60a807207fc0 SHA512 455b7d5a8f04cac4a96787017e056fdc5095aec0f5e6ca091c1bf3bbf337c1b1e2fc34203ab5719dd48d0463200d1e832a72e40cf05e6f9a3255302045021d65
+EBUILD grep-3.6.ebuild 1474 BLAKE2B 75adad63705582761db734d97e3fae4cea92a9c1ead65d20f82b33242b8803eb2e4ba46c71b81b8f09faa02cfa70ba19157da6bb909ee0f9c42910179e260e50 SHA512 454268f6e5ec93cf43fe825cab3e6bcee0a7c61e066e70defcc57c946ea837d266b5d23c74847c6755fea5c27e00023e229f38283806c8a883d3b7e0167379f7
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index 29703df8e85c..a1e1595331a2 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
index 43c8ebe75f34..eb193c0da2e6 100644
--- a/sys-apps/grep/grep-3.5.ebuild
+++ b/sys-apps/grep/grep-3.5.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 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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/grep/grep-3.6.ebuild b/sys-apps/grep/grep-3.6.ebuild
index 2c6c26102d47..4e1f76ac4e03 100644
--- a/sys-apps/grep/grep-3.6.ebuild
+++ b/sys-apps/grep/grep-3.6.ebuild
@@ -11,7 +11,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 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 fa3fd7be1ee1..fe7651fa20a9 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1,4 @@
 AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b382f2a4918fb9227208ad001f35ae041af93fda494a9be355e732697d264ec974d6e9528f9f91e0d26b2ecd82a41508222f1e439 SHA512 7d9f88c8bcc1b220c82c214f2f638601e8b44bd3933df03c74a2ef51b555773734c92044a3162bf5815932ddaae08158994a7c5106098de3e9f3bf202975de97
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
-EBUILD groff-1.22.4.ebuild 2554 BLAKE2B b23c96acb3a55f7fb564e63c9fe3a3c3cf6dff46d53801f7a030df8749f08bc71bec43e9ad99044b4384644f2cbfd7420146f6dfed9d48c363a05d1a34f03098 SHA512 de9d128515e920c41450583ecea715cf79dc358c26213adf27fc875c92cdc3d3178b619e185923073b0720c500fbe65babdab6096571f99cd06ab0b710fb484b
+EBUILD groff-1.22.4.ebuild 2534 BLAKE2B d7bd7690c078703062a829f287b245930cb16e1730c181ff9c4f875b0d1a7b82175056e28f90d839aaf1dfc39cc00efd77454a3709eaeb4017c49eb406c5a669 SHA512 04b36067ca6d0a6004bdcefec02af2c01e654aa731be679a0747fd2610a8858fccff66645b6623d3ce116c0d9714105c22b26e10ec8dd48b3782c275fdff09fe
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 78724e949eac..feb7f9ee7d84 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 f393df68f74b..6d749432d793 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -4,6 +4,6 @@ AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
 DIST hdparm-9.60.tar.gz 155220 BLAKE2B c09a2bd7a61a77d87f7bbd45881d5956392dbedf1f329be59049de68ee8491857b1958f8e5e85086ed53deaad37fc476cfb87f45bf27084719c07d25608ffdc0 SHA512 e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed
-EBUILD hdparm-9.58.ebuild 980 BLAKE2B 9810a7181ee3c0a55dd77ff5816f1c4b268692c006159a878cc9536a152dee8b5be5392376fe2e4d4ccb17064bffa9cc13c05d89c878057316777e0ce5f77371 SHA512 0456e15903ecf41f4e141e6f151cb798ecd7a58386fed4cc474608033743564f3b30cb044aaa6b90d7d0d7cbff6ca4dceeba115292b306e28ea78f2c45fbd498
+EBUILD hdparm-9.58.ebuild 981 BLAKE2B 3cb2bcba7e7ab6de5188938cf8626461601e72a24c360e429fde43846da7402407354f89b382a378afa76ba0648d121d6d8b2508b9a14ee62f4ea2096e7beb86 SHA512 ba0df4eeefac220f82269c1bfb53c9524a93be8adcc19dbca499017f7b1e1565a7cf9930c7a5f94e428568531e0111ccfbf1c74a49314632a60d9efa5366766c
 EBUILD hdparm-9.60.ebuild 988 BLAKE2B ea610b08465de0b0788d96ac5f7271a2d01fbd8b845245401ccc38168184a42ddc65c1e206f006961dcd9ecb4b395ce92ccd92bee27b0f09f53e90c806559195 SHA512 bf97a9e3a65131058c88aec29d6675666eb68fb2c9fb1aa6343364d4536706aaa39eaed4da6dca47ea23835eb910ac9104acbf55b37879d268f9117fb8d788b6
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.58.ebuild b/sys-apps/hdparm/hdparm-9.58.ebuild
index acb642f6568a..d03b4546236f 100644
--- a/sys-apps/hdparm/hdparm-9.58.ebuild
+++ b/sys-apps/hdparm/hdparm-9.58.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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 1b2bdabe21be..3c7b807ba6e7 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,4 +1,4 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
-EBUILD help2man-1.47.16.ebuild 1065 BLAKE2B 5b9e08ece924027563088cdcf9d0312f9fc200d3ee6e147cb7f5f0e279f8f1d5cf7533dc40e308a5fb146247ca1950673f5937621829216beada81061ca88f74 SHA512 fd52cabb54f98186e31eb20ef05eea28d89415bca7ae439fb36710d8047e2218841768ad9a3b6994d4ba50d6a1845977e5f554a12bc6b3c21dbbbaae374eee6d
+EBUILD help2man-1.47.16.ebuild 1045 BLAKE2B 392c258f83b735c7fb5c36f11bd8eeb9d5ef681fc69abde740b87680b4067a88c05c70b0c09e6e031a8f9717cf1bccf667245ba00ac2afda1a9419416c4aa7f2 SHA512 ecfe53a1c16d1f06117e6de45a195f0af606c6b56438b22b3e757f8b6ab9b16ea4ef5814ccbac274e138e2ba4cfdab37a339c301356769852cb7f1b139c6306d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.16.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
index 0600e090e0c0..aa6b480c0308 100644
--- a/sys-apps/help2man/help2man-1.47.16.ebuild
+++ b/sys-apps/help2man/help2man-1.47.16.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 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hexdump-esr/Manifest b/sys-apps/hexdump-esr/Manifest
index 5657632f064f..913fea7e4167 100644
--- a/sys-apps/hexdump-esr/Manifest
+++ b/sys-apps/hexdump-esr/Manifest
@@ -1,3 +1,3 @@
 DIST hexdump-1.8.tar.gz 7463 BLAKE2B 337a388e86a360a7493b8e40fee0adca64e552d41477d341bf03f346d207ac3baa3fcf1ef9fc5b7be66e9f3b6b59ceb2ccd2bcce9550f1a17212aa28acc2dbc9 SHA512 a0f0b9f0386b895b0dd07223e93ca72a7d87f4b0ad663d340cea8266ed7e801178b120c6a78b797a9e12412e7b9c76b45b8e395d1892c7ba3956a90dee45db3d
-EBUILD hexdump-esr-1.8.ebuild 747 BLAKE2B e65b7fbc0fefd25166b3d42863a18a79df91c672e546e25fe85bd1b40b5e0c20328c1696a4389f1357e946f43fb8b56e7ebe21c35a4ebcfc0eaf75db69d401e9 SHA512 2a0a310abd5ab310664e6ac459d8221559f585120a07af9c0c03f5bda32a41b900497ce3509bd78865c3b0483a63954bb7df25b3dfc92866c8d8a585a20b2280
+EBUILD hexdump-esr-1.8.ebuild 748 BLAKE2B e2215e64c0ca5af56e32700540375d3fcc9569ea2300e015f57ceefcd4e37c410626a485858b0f067c3dc3ad726442a4a6fc12a2ff1d80812d9648ac60eda6c2 SHA512 058de7a9f865100a25c6e96216f8107bdb08222990c9aef46733903fb45d3053f31481e9a2d89b8f07fdd81a11e07033790c9416cce34d7fe1de3de9cadf1cca
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/hexdump-esr/hexdump-esr-1.8.ebuild b/sys-apps/hexdump-esr/hexdump-esr-1.8.ebuild
index 309feaa76fac..6dae9efa9ce9 100644
--- a/sys-apps/hexdump-esr/hexdump-esr-1.8.ebuild
+++ b/sys-apps/hexdump-esr/hexdump-esr-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.catb.org/~esr/hexdump/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 6d808659e2be..e7b6a13ef0f7 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,6 +1,6 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
-EBUILD hwloc-1.11.13.ebuild 2164 BLAKE2B fec193bcca00e0faa20fd1657fcade820d344e22cf15135c97be96451608399b08baf5b0f3c83f11a10afca2c8482ea75686e773fcd3de16de525f472dbd1f14 SHA512 e93fa48c8c3bcb39dce5d0a900e5b340c9f571110a76a220dd6d3a59f7256ad3d81cd8fc2815ac3e1907cd3a64f12412c3f3ac95c190882ead46a6003b43eb97
+EBUILD hwloc-1.11.13.ebuild 2165 BLAKE2B e766b7fb29a3e4aa00b34459d5c816453f06e2e24bc37ad46c5200d937554c481d9a9b5cdde9551acd37d81ae2e21459e6aa1703ed673a4c3d8847779b8bf149 SHA512 178e36c137fa475c58f5748fef83794c23d4aecb1737d054f4146a5b25cc3fc732fe6166b2ac8645c916ed8addb60bef4a77f45853c54b3e6f3d3e1a8222e0bc
 EBUILD hwloc-2.3.0.ebuild 2924 BLAKE2B e3606ad4868f9efe244c7766c4a91ed373a51eebd37ceb97f4570796c38e9b5586341d9c3237030c77a1a7ac9ce31828084065bb58ff7e2c9368aa87f738a919 SHA512 78152bd3110ab168dcb067c875e8161001cdfc47825baa224fa6f3ba9dd5147d424bdc8e11dc14c3d9780577adaaff01573f2a171696330f645d626dc7becfea
 MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 8417f7fabee4..f9b7aae544d1 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-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="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/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index 3ea33fae3d36..29f7e5d12b32 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -6,5 +6,5 @@ AUX ifplugd-0.28-noip.patch 707 BLAKE2B 8c71d65b766ad163c0d32e74d5643a3ece4236df
 AUX ifplugd-0.28-strictalias.patch 1585 BLAKE2B 78d096d5ce1edb60e8f2599d2cc2443486a9f667bdb9c8cd7ea81bbfb8193fb63f546ba5fee8aa7db734f3a784442f6d355d57dd0ffb4ecc5a2c314e91354373 SHA512 c25d397b27b115741eb531ee6a990ced98e48cb9c0ea6d098104a4d1972bf1d9c2ff805c2522ea90a4af7d70d016af05b757750c1a06b010979d76d845707f29
 AUX ifplugd.action 891 BLAKE2B 47f664abda4ba6453178f81adfe4dcc9516e75a88bce02bdc03d6ac509457adb342fad71afe7f71a8c1ea5ca4b623d53248571d6ae5094bc05188611082b28dc SHA512 749f503a8e7acc3114af0b795d23e03108040b8df12bae475aa96127d0b135c30382cec6abd0a03147d1f69b545a2c5d2bd8a18c9a9ebe0613e8888ae305f949
 DIST ifplugd-0.28.tar.gz 142677 BLAKE2B 78a9d69d30c6f46f2ee2dc96298c6409f274d9b8e5d1e754051ead48c87ea88c4f68329ba1101d825f601c1ecc2ba0ce69753dea75cf006b9c26d33af38ffa04 SHA512 c606e456f81f224eba9f8912e11fb76b759c160313d1db3c9035775b8c1ca57ca10c88dfb33318ba02f5c025218a377ca78ee160fc3d9a31ac6e95b92f340d4f
-EBUILD ifplugd-0.28-r11.ebuild 1250 BLAKE2B dc192f7c55a9babca36bd4f32eed55878889ce472c5a4c5649775d307a5ac04df0631baf0dde03b150ff10656ed0a3ac9e3b575924e3c91064376d2476e808bb SHA512 0428e65d9e81f2f10e03924e852fb6f9984e18aa231a5ced542f3e2fec19e778b20fc2de805db756c00c86534ef2778cd716be89f810d0866557993507e6960a
+EBUILD ifplugd-0.28-r11.ebuild 1251 BLAKE2B 4ce5562bb519e4263c25b2902ac32876f952d444ccceccee9a1130fae81275e6ce1745e6634b242336dc92a06e697554fa836181559f4d5e68ec49e2bc6f2152 SHA512 a2fb2d03ebebf0740fd2557be9bb8f81fec8dd402c1aa0f2a7252f5ea9c9786624f34c3c3f63aad6207b59b90427c95fb55106bc3841bb5ee803327dcbd1642e
 MISC metadata.xml 605 BLAKE2B d518bdc4b1cac8fa7c2a4d9a4955f6f747d774fb09345234b0d8098b611e73f10482d8a1230b13dcb511d381f5387d86b5920044e0c054414e3e67cd6afcb735 SHA512 af9eb0cc752d76e5153690463dca9b738e1a6f11971da4881017bea5d3f7cbe9197be634e68c2e94a826d690479ade65af30bf71ead35b493a8a089ec64b0336
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
index 560ccc4ef8f4..f6963726777a 100644
--- a/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.28-r11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc x86"
 IUSE="doc selinux"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index cec6d3463acd..3d7e47b72c94 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 879 BLAKE2B 2f24bdf051c0066181d636af3968e60f66788d157b1752116dce1ea2d7aaa75d19da137bb310f9fd1f6ca41c864cf259c1d07b27324f58028f85e3c39fd9b2cb SHA512 ed86a64b4f925fba0f6fbab4bc2dc24ef9b57b936d739176f82759d1ecc4e6e80b88db2e52aa5845e6fc34c93d88308b79169bdf1554becb0e06147c0e038631
+EBUILD init-system-helpers-1.49-r1.ebuild 880 BLAKE2B c09d877d803227f4fad496a7792f572815d4e1672db33039eccdc4035c3bbc27ce793cf38b2e7f9cc5e70680842bbc55d6a7afaf714400389106eccae146f1ee SHA512 d55404655ef89bc03a2fb2a10467cbe529287969ac9ff530a563899f660fdd18c18b6eb0caaff1a529d2a003212e519be5959062567a61cabb2981b5ad56e293
 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 1e0096905cac..9ab7497a653a 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 ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index eeb0416cffa5..ecfe068fadad 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1,3 +1,3 @@
-DIST IPMICFG_1.32.0_build.200820.zip 1821515 BLAKE2B a214d45f0a52ba16e85f4287780da1d7c3b236624139f71e32e0112914864a044a5b1756ee75525bbd9e8c475b39c608e80b3fc679388c3d07b4b2823a36d57d SHA512 c800f8fc3675718a7077cd717d0a810a516f17081c0a1d3a440af4b292f1f908b66e2450a1f8f5efcd34ebcaf9db56a2dc8b4c448d6d920fd36578356f7753dc
-EBUILD ipmicfg-1.32.0.200820.ebuild 886 BLAKE2B 8199f948bc4871da882248b665ce459df0a7410ac0fb60b438572659ea9b1cc21cc25643cdaca75c148529836f7d28418eaa4cd6c917f579446d2bd992c83bcf SHA512 dafdd9010053066687ace49ea26dbe0251bd296067bb11901223177f215446177d8d6cabc42524df8edff471bed4fac8aa21d8bf6517994047fd4aad5ed7545f
+DIST IPMICFG_1.32.0_build.200910.zip 1821771 BLAKE2B 60c10cb0375792bf944d1fe888ef6d0e45cda19248b77048c10e2be13cf641554b3cfeb355a091dd720b7f6110a08dd27e915330360e88bfd64990a925b7d605 SHA512 a50cc4757674dfd6a821b928dd76913fa349b532f6185fe2b1f52d13aa7a0b4a561c460af68fa5484e2f9461bd1782b99521fee361c0c5d166de48370f3f8429
+EBUILD ipmicfg-1.32.0.200910.ebuild 886 BLAKE2B 8199f948bc4871da882248b665ce459df0a7410ac0fb60b438572659ea9b1cc21cc25643cdaca75c148529836f7d28418eaa4cd6c917f579446d2bd992c83bcf SHA512 dafdd9010053066687ace49ea26dbe0251bd296067bb11901223177f215446177d8d6cabc42524df8edff471bed4fac8aa21d8bf6517994047fd4aad5ed7545f
 MISC metadata.xml 331 BLAKE2B 5f6297bfe1e48c20819f052322f825018f8ba39434a23fbb69e5f5630e92fafa43b3bb5e991175f69673baf79d8b4bcdeb95404502593faad8819c5a2c152871 SHA512 379175cdb1d7b9f18f80349817a8a46bcc75c4fd7d7cadd938b9630c341dec359328462072c4f72661af379c054a237a95d0dfb6937d49661cb8203108de0c80
diff --git a/sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild b/sys-apps/ipmicfg/ipmicfg-1.32.0.200910.ebuild
index 642ff2b9341a..642ff2b9341a 100644
--- a/sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild
+++ b/sys-apps/ipmicfg/ipmicfg-1.32.0.200910.ebuild
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 2ec3ca104e1d..49bc0041bf9e 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -8,14 +8,9 @@ AUX ipmitool-1.8.9-ipmievd.confd 518 BLAKE2B 98d9a8e5de576242e81aa7dbfcfde7063b2
 AUX ipmitool-1.8.9-ipmievd.initd 584 BLAKE2B 6632466d88006f6623ae81722b2f2726ede5b99141f794829c1cff5808bbb2851e29858beb96b40061de019be08f8179d90f8008b74221cd058a34586b3f5680 SHA512 5d42774486a0edaf1dcece16fbad0cca531a91559ba8dd4259f05787e1964fbfec4d11c9427dbe8cb46ba0cc1a447120bfa82254aac4850d9acc632834daa669
 AUX log_bmc-1.8.18.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920fc6cefe6770231d67989d47f172e783416d12feb399e882e2fe74b26fdef162fafb85cd686ec83d414d01 SHA512 2d5b62ee5f694629e8f5c4c2d1fcdf7a3d42078f488e43cd1b34193619918ea7429da2bcb236b9216cfabaf94d8c5224b99194023a8db626884c4c766f15136a
 DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
-DIST ipmitool-1.8.18.tar.gz 995313 BLAKE2B 4aee2b1488a8a97348954dd1555baf3d576d70f22fd17f11ba6147595b07ef52059ac8ab6775afa0ad956355eefbf3e2b0300cf87bb373d2f82b585de807412d SHA512 274d424fff079f7628c0f9fe06580937cb9717c809a71b2f5ef97266c6b6c89983b662fbb1f090e2f94861f1799677c8fc6536013828a8a5e6cb239af53e45ab
 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
-DIST ipmitool_1.8.18-1.debian.tar.xz 19140 BLAKE2B 255c4da005946f3b118a127f96fc5daad02a170ea079d7a765a0c7650e1eb7e50ad49b31fca95312b49e5a524e04a8a21215cafb1a8451e5b2af2aaec22cda75 SHA512 8aede337d07987decfd032898f194d32730eced443630ac3956676533d693fb2d17a175ef14218cbcd55da44f6b17714f676a912a1d5124a15a995e01d2828ef
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
-DIST ipmitool_1.8.18-9.debian.tar.xz 18508 BLAKE2B 09e37fd2f6fad8f847bae87aa51f44293e5640b4c8ebc05e52ebd751542d7865024835fe728c14e3a44f48d54fedff9e7693653bd2288db27d21a5bae16268b6 SHA512 af2b4aa855125e1beb62ffd2931b5d4c0aa8cc4edbde27ea1b4be172e6a4351f574c32b2437b354d11b7f1c739161d850c47839d7a7d9f522b52e24f47a9ea8d
-EBUILD ipmitool-1.8.18-r1.ebuild 2624 BLAKE2B 9baa3c566fe553602f3c5e53e165d1fa6a0adc93943cbb61a292e8ca5d6993b9f4f343105faebd126b8bc2808af0c9ac76b6ed992798908b68374f7b9fc767f4 SHA512 2b6f7dc4f51ba3a523a929481f4e6e72cc444687385a7588bcd59e22f39ba63ef79b9a33e39e96d8b89f129bc91a40a55673f9346e6cbeb0724da3c7eb6ea63c
-EBUILD ipmitool-1.8.18-r2.ebuild 2804 BLAKE2B 4101357ee54285291f2b0bfaf30317bf1703c13a81ef47a1f5b6c6d3bf3f843ca096018b8e54f50fb10ac0fd20df2e12ad8dc86e3fd5176579e4f59b097dbf16 SHA512 b11087e861933f61addc4291083483b9fc234df92b1741d427798b88fb851d172f1746ce49ede3b140cf1718debb74dd6f9f4cd5cfa8d6d62b370c972e4b6ee0
-EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4494 BLAKE2B 7710f593d7c8056c69ef695d3d3714b00666a777b4379333877ee8ed82cd7c588048dd8b29155d414ca8e533c67719761014fbb72ae81b68a0b041353694a157 SHA512 20c271cbeca471a720976d3d54087383c4cd817a0a748e657449c8e2f2c1077ed122990d2a778865af60d663d61b398443f370ae9ee33b108c62f844697d724b
+EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4495 BLAKE2B fdf837eab3a1076a83e47b8df62bae3df3e89ac7721bd9acdd18220b51cb1de8da85206dd7072046b4d54ce25b827920ffe50ecf920a965fd29d8a5e8ab0f67e SHA512 17d83c2b8bbfb8970fdb3033a1d721dedf89cf276615f20d2c4ed188d7ebbc2c5d979c73ed996de399b4d837d01861948a48ec0f549ac29033be7709fb3a7d6d
 EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6220 BLAKE2B 9608fa55683cdbcb0b0afabdc0044256be88ac8492a04b845ecfd1e2da0a8267c031cafba11b12d7815dc2611e41c14da2456f3be7e0348c498e70c7a689c875 SHA512 4858ff4eef24c6bdee3b24dbb1944cd6208fd3f08d495a97be5497a1d51107a7b3ad18d4fcd9953f642cc240d4a4d139d77be2be3056b32ee41bd59207aa54b8
 EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6312 BLAKE2B cfa1b6d13f738a9f2b2227e816f784ec89667db41cd134779a227158df77fa4ca5355dbcab2c3c42504af551e9ac899d63fb2b1c03602011988921d96ab505f7 SHA512 ec03196f6f4745aa7d37d3939e7877462dae6ef20bcef3639f1008c36b416f0a085b5b70c34c86aada78090819b79e44ff169f25abd2a600df6f42ee97daaf0c
 MISC metadata.xml 633 BLAKE2B e7fd815396d39f0d1c4aac50925382df6c245fbf3499f67b8d3a7448821aed48894725e468d6c2b724ad7a706ee12b4126f0b6f7c4c32388de6e34e05333b782 SHA512 53ffd0f2970d1d128e9d12247b5ed502bac4b9550029d57b221f2c2fd84d316831bbb8ddb890a1344b171612f890170847a3de02d52857d75c75f1a593cdebb8
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
deleted file mode 100644
index 314005e456a4..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Utility for controlling IPMI enabled devices."
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="1.debian"
-DEBIAN_P="${P/-/_}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz"
-	# https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="libressl openipmi static"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86"
-LICENSE="BSD"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}
-		openipmi? ( sys-libs/openipmi )
-		virtual/os-headers"
-		#freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
-	"${FILESDIR}"/${P}-openssl-1.1.patch
-	"${FILESDIR}/ipmitool-1.8.18-fno-common.patch"
-)
-
-src_prepare() {
-	default
-	[ -d "${S}"/debian ] && mv "${S}"/debian{,.package}
-	ln -s "${WORKDIR}"/debian "${S}"
-	for p in $(grep -v "^#" debian/patches/series) ; do
-		eapply debian/patches/$p
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	# - LIPMI and BMC are the Solaris libs
-	# - OpenIPMI is unconditionally enabled in the configure as there is compat
-	# code that is used if the library itself is not available
-	# FreeIPMI does build now, but is disabled until the other arches keyword it
-	#	`use_enable freeipmi intf-free` \
-	# --enable-ipmievd is now unconditional
-	econf \
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--enable-intf-lanplus \
-		--enable-intf-open \
-		--enable-intf-serial \
-		--disable-intf-bmc \
-		--disable-intf-dummy \
-		--disable-intf-free \
-		--disable-intf-imb \
-		--disable-intf-lipmi \
-		--disable-internal-md5 \
-		--with-kerneldir=/usr --bindir=/usr/sbin
-
-	# Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
-	# include the below file to define some things.
-	echo "#include <asm/byteorder.h>" >>config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" PACKAGE="${PF}" install
-
-	into /usr
-	dosbin contrib/bmclanconf
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-
-	newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
-	newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
-	# TODO: init script for contrib/bmc-snmp-proxy
-	# TODO: contrib/exchange-bmc-os-info
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild
deleted file mode 100644
index eb3cdab7d446..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Utility for controlling IPMI enabled devices."
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="9.debian"
-DEBIAN_PV="${PV/_p*}"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-COMMIT_ID=
-if [[ -n "${COMMIT_ID}" ]]; then
-	S="${WORKDIR}/${PN}-${COMMIT_ID}"
-	SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-SRC_URI+="
-	http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz"
-	# https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="libressl openipmi static"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}
-		openipmi? ( sys-libs/openipmi )
-		virtual/os-headers"
-		#freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
-	#"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-src_prepare() {
-	default
-	[ -d "${S}"/debian ] && mv "${S}"/debian{,.package}
-	ln -s "${WORKDIR}"/debian "${S}"
-	for p in $(grep -v "^#" debian/patches/series) ; do
-		eapply debian/patches/$p
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	# - LIPMI and BMC are the Solaris libs
-	# - OpenIPMI is unconditionally enabled in the configure as there is compat
-	# code that is used if the library itself is not available
-	# FreeIPMI does build now, but is disabled until the other arches keyword it
-	#	`use_enable freeipmi intf-free` \
-	# --enable-ipmievd is now unconditional
-	econf \
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--enable-intf-lanplus \
-		--enable-intf-open \
-		--enable-intf-serial \
-		--disable-intf-bmc \
-		--disable-intf-dummy \
-		--disable-intf-free \
-		--disable-intf-imb \
-		--disable-intf-lipmi \
-		--disable-internal-md5 \
-		--with-kerneldir=/usr --bindir=/usr/sbin
-
-	# Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
-	# include the below file to define some things.
-	echo "#include <asm/byteorder.h>" >>config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" PACKAGE="${PF}" install
-
-	into /usr
-	dosbin contrib/bmclanconf
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-
-	newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
-	newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
-	# TODO: init script for contrib/bmc-snmp-proxy
-	# TODO: contrib/exchange-bmc-os-info
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
index aa2af512c5fa..2bf4240201b7 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 #IUSE="freeipmi openipmi status"
 IUSE="libressl openbmc openipmi static"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 x86"
 LICENSE="BSD"
 
 RDEPEND="
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 670d16675acf..f2c263803482 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -8,8 +8,8 @@ DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d458
 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
 DIST iproute2-5.9.0.tar.xz 786524 BLAKE2B 9d82cfb1b1353d2cc6c441269af234b05e1ccd190a58c67f890d74fb42b4266be91ce64277bd2b75a0b711977c0f9edc61d8655bf262d05aaebd8d73caecc0c7 SHA512 bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50
 EBUILD iproute2-5.10.0.ebuild 4714 BLAKE2B 396c4c256f6dfaac4cedcd152cdfc217ed9ccbb1c53ab80a306a0a4bddfa8de77eaa976b1a189e74a354de2b51afad969d4ec1c9745cb050f31535e7bd9a5591 SHA512 70eb51d70e8a3c66171a0c385618a1d39b21cd2b4cb3896da7ad9f8562967642714b25d3f38770ae2b1215823a499ca34516f5b6977904a1eb81e11b1f4e8b82
-EBUILD iproute2-5.4.0.ebuild 4423 BLAKE2B a52726d1e562962789fe3f8ebfa2d8ae7e9c65a4355e45a0d8351a31cbf46e7361daa9dc103235052a9cd9754b815d12b924f5aeee96406bea4a41c8d164a5a6 SHA512 6814b86e90dab9cb3600ff58b1dbb43197f2696051802639cc4602245ca96db28b1e4e117935504a4acf1c52d6ca9a8599162dfdebe5799b1a6930a95a0039ea
-EBUILD iproute2-5.7.0.ebuild 4486 BLAKE2B de60a586079783870193445e86e0d5d11724a29aa625389040a4abf1b05f873ac6fa0ea132c3bb10605930916aa6ba09c1967e290dfd3564cbc18412ec911fe8 SHA512 8b10ac24ac7e694af34833a9436ddbd3ca9a02beb57a90cefa1a139180aa5b88bdbcd07a4dd5daff39947244f39d615be7fc7d5e629ef40f2d9b9dbb9bc24efa
+EBUILD iproute2-5.4.0.ebuild 4424 BLAKE2B e2d894990ddf5a875c9c388e8526f2efd63b8c22337ba91675df91c855e44818011667a674b70f3dcf0d49792941922cef37e79f231b661ef976411043197607 SHA512 81f10259afec234731f29736052b6eed107dca060f45d146cb210fb3d8f4b2a75fe8fc96c8d4f5036b9f58fba4543d4986e5c9a5fe4d5609337545fd34e2a56e
+EBUILD iproute2-5.7.0.ebuild 4487 BLAKE2B 2eef7dccd0a2cb4ec5aa8a6163204457650a09800fb61a4d62f580e0ec96b93c199251544c663734e039f3736c44712156f7cfdf079cdf020be1fa7b4ed7cea9 SHA512 7eb534a873a76ae2842aa5e6041ba2c80f74b9379c473cbcddab78989b6a52c12208dc4d64167572ee1a6e9a071b462705af6b871790fd0d79fcaa391fed10d9
 EBUILD iproute2-5.9.0.ebuild 4714 BLAKE2B 396c4c256f6dfaac4cedcd152cdfc217ed9ccbb1c53ab80a306a0a4bddfa8de77eaa976b1a189e74a354de2b51afad969d4ec1c9745cb050f31535e7bd9a5591 SHA512 70eb51d70e8a3c66171a0c385618a1d39b21cd2b4cb3896da7ad9f8562967642714b25d3f38770ae2b1215823a499ca34516f5b6977904a1eb81e11b1f4e8b82
 EBUILD iproute2-9999.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-5.4.0.ebuild b/sys-apps/iproute2/iproute2-5.4.0.ebuild
index f568584fdff2..d79f9a329ba0 100644
--- a/sys-apps/iproute2/iproute2-5.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.4.0.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 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.7.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild
index 2fbe1b38277b..b3f552ae70f1 100644
--- a/sys-apps/iproute2/iproute2-5.7.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.7.0.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 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 4608ba154e36..199bdae869a2 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -4,7 +4,7 @@ DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13
 DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927
 DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb
 EBUILD kbd-2.2.0-r2.ebuild 1597 BLAKE2B e56136d4d7a0bbae100e8886731a09c30b908b7d075dcb8c935726cc8a6795ee91a45d994d42457ee5435eb6f143639c678e8458e1f2dcf48b81a9092bdc1a02 SHA512 0060f49d5a29b83264f4a975774cd28dec0b4b1869400d7e2a05de23912e81e53b2aa68353c47a951d6efa83e36c19669ef4e6ca965ce866d5855d0f20968679
-EBUILD kbd-2.3.0-r1.ebuild 1915 BLAKE2B 3305eb02934044c6a89c17d0ff0ad4ebe1f81697436f9e826b54e24bac55e95d86631facf095fdc6b9a21dcd0f5b1cb0277fa440666d027c470d3c3ffd054848 SHA512 75e08b9635a3d3729d6145a0d6d29361d048f3adf8770fb881ba83c157fe7788335afd4f63ec457811bcf3c6434826b0bf48b82aa8b684c372ce5beec1246a00
+EBUILD kbd-2.3.0-r1.ebuild 1914 BLAKE2B 133b815160a2d3a1b0f46a6c9f8fc92124b52c6802430f98deaf807408df0de01d0ac2bdde07b848145f82927eb81dbd0a07211a91ef8cfec680c98972bc9058 SHA512 202008234ffec81f951b5f0864e005e0bb30825e02cf3998fc0007979aa1d7304bcd35ad35976dafe76e88f2f7cbd76afddd487064d364bcaddc71f4341b6860
 EBUILD kbd-2.4.0.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c
 EBUILD kbd-9999.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild
index 4513917a2346..698828be221c 100644
--- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	if [[ $(ver_cut 3) -lt 90 ]] ; then
 		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 sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	else
 		inherit autotools
 		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 04e859b7c6e5..0bf3d7de7a89 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,5 +1,5 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535
-EBUILD less-563-r1.ebuild 1395 BLAKE2B 0a0cb41f1cfff3e75056fa08e693d487dea13f003ce6fd99d8bcb27846bcaebc38253347d726d712f4e5cf4504280513c55ccb165c22021d1b70a8c574565395 SHA512 f23da9f98d004f6285d8c0ebd09165d15b112a4b43223de3ffcef528429521097a7a32d1f58f1c3febd731bf71dd60ecfb6d17d887cdc8e024b5588c02871c47
+EBUILD less-563-r1.ebuild 1375 BLAKE2B d23b42e1132806a8e77099c068f069699c5039162fa0440e0a2b02c6d27060b1b7a52bb03f852d1b922db7d38be4315237c9ebd0ef6773107638be367c470af4 SHA512 0bb3d7d92a4c185a9afa1892582c6b4c4971c353f77a76b7dfe204909c3f965e045a77bf07d77da206b31afe97330de52ff5ce391df6b960ec931fab81d26f09
 MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95
diff --git a/sys-apps/less/less-563-r1.ebuild b/sys-apps/less/less-563-r1.ebuild
index 1bd6c54437a8..fc42f4c7dd62 100644
--- a/sys-apps/less/less-563-r1.ebuild
+++ b/sys-apps/less/less-563-r1.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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 46e8ca26494a..b1fcb019b1b5 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.3.tar.gz 495110 BLAKE2B b28d7381d259a132de7d9fd347ac4bafb44440b187aa811f3d3f65d7b1ccbb00c6b5bb660229cd8155fa5d7bc9668e7b4dd1ebe7bbb909b48367c6a6dd6793e5 SHA512 ad404f031fe016599a8f8d8c0820b23db61a9ad102815d3713e5d13e9a810c819ca7ad9cea50891852982e073ef033dbe7595fde8846971336148e32cbbe29ca
 DIST logwatch-7.5.4.tar.gz 481766 BLAKE2B d86ae3afc33a100fc353948be3591cd13566568d47cad02fa5f390882a223ca9d4d78692214f2f0898fa8bf8687314f60ad9ce02f0987bb86dd7136150a1d2b9 SHA512 6e6a5e8b7ae977244ea97895e06cccde320fce3dfbd2b1c58c945fc8872325a9676c8afe122b1f7230cb6617b64813caf90ef37fc472a1b200eb0b24ea72fa9b
-EBUILD logwatch-7.5.3.ebuild 2430 BLAKE2B 2c9d264ee0bb0f2f85a7a2f6d7856c25d4dbe714f38215ddc0608c1bc7596eeb0c5ea55405d002d0913d128faa0788cdb752e4cdc19d87e01a4b792bb73cd98e SHA512 e4bda7b798c5f26c9dc46d9c5211aca91e90046776a8d6b9af9d0d886e388476cf5259c446d70949a34d442a71c59e4c55232ac16116be8c69eb7a8af8f39532
+EBUILD logwatch-7.5.3.ebuild 2431 BLAKE2B 57e90b95f542f37bcc9c3353ab6992304d3ac1ed6ce7ff9652657e88d74f6f76eefdb0a064dab7dde622c866eaf589724bd6364f09d5f1c96494518780f53817 SHA512 317e2fd99284bd33e86deae1215e0d593343aaa888d0bf51c81c24d85b491d853744e0481f0795d48bbf6ba39f43ac024841dfa8c7bfe66a223f6d7e42e1c6b2
 EBUILD logwatch-7.5.4.ebuild 2431 BLAKE2B 57e90b95f542f37bcc9c3353ab6992304d3ac1ed6ce7ff9652657e88d74f6f76eefdb0a064dab7dde622c866eaf589724bd6364f09d5f1c96494518780f53817 SHA512 317e2fd99284bd33e86deae1215e0d593343aaa888d0bf51c81c24d85b491d853744e0481f0795d48bbf6ba39f43ac024841dfa8c7bfe66a223f6d7e42e1c6b2
 EBUILD logwatch-9999.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.3.ebuild b/sys-apps/logwatch/logwatch-7.5.3.ebuild
index 4118164aa813..e94e9d965df1 100644
--- a/sys-apps/logwatch/logwatch-7.5.3.ebuild
+++ b/sys-apps/logwatch/logwatch-7.5.3.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/lshw/Manifest b/sys-apps/lshw/Manifest
index 7aac28ec358c..8b4fcb2ee39c 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 1771 BLAKE2B d9311ae55206c46040936247e2d694ce82a146a723b39f91681f673d4a89cc5d4616b2c45166e5f9527b0ffc2b881f0fcf8fc425918903b1415b6775e02a0ed3 SHA512 4436b699f636d06a00a739f857905ce893222fa41d1815505c9fa2c17e9e41f992e7fa2c9c0e95893f25001cff2ec002fedc86ac1e0a1e6b825a708c10dc9371
-EBUILD lshw-02.18b.ebuild 1720 BLAKE2B 19caa4b5a9206a08da746fa4804f3bbd6235812767e93b3285144e2f5a47490c8a191f87990a49b40fdeadff6aef0ee04814c3897afb851466b649959088ff50 SHA512 cbd71c5ef62fdf99c27240e53491aa2b1c5976e06b08cd54c72bff4d32122789fcc488132871c3ddeb1de5f2d95331a33fb201940ef71d060e77172d6232f8e7
+EBUILD lshw-02.18b.ebuild 1721 BLAKE2B 51a1020346e3ac0856d1c7dbbe5827c430db0b017b35ae70876e6b8fcfcea7d134f942dc507b8158ad9010242cf9f94c92b8521b981b8d569137cd0fb0eb0273 SHA512 9065cd8709e623d6ee770f2fb499bb433bcf383795e8b280171da3b7a2d9a93e32956aaaeaa347dfbedd81d29c4bd964f8839d7ab98124c86d9fb65e7feb07cd
 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 0ed6352a9d3b..74e8e232c50e 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/man-db/Manifest b/sys-apps/man-db/Manifest
index f512524261cf..85a7337d7a4d 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -2,7 +2,7 @@ AUX man-db-2.9.3-clock_gettime64.patch 1493 BLAKE2B 5c080767d380c26ee97983cb82ad
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
-EBUILD man-db-2.9.3-r1.ebuild 4135 BLAKE2B 362fb7932b2cbc39126bc2f065cead96b69a6c8cf3149d5ced48c81ba770bc2ee263a64315a9f527ef8e9b2e5bdd99f0aff0fa7b35b96ba29b520cda644ae80a SHA512 b992f202fed69ae1c45bdf2df168734219ba9b60a3d32d1a70c68e8f726d4db2343b7296fbeab9d689e13a6fe0d8817b192a0c15e116d8de5eb9636fa3e45b66
+EBUILD man-db-2.9.3-r1.ebuild 4131 BLAKE2B 58c61c45cc644475695308ef63e927c16784afa617a8f90b4a6f2bc65d50ef10a6585b72122d0fba3607b5055570b3d69668b0862fc131ec0d433dac6cfbae1f SHA512 4a43b27d53c43fc02c71da7ef827d5780bdd74ca7e726749c04ebdaa90b820ae4e91e0d94b37cc03fab6227c1e4ab2fc1b44dd9fbaf8eabd101653aa4acd6ab4
 EBUILD man-db-2.9.3.ebuild 4077 BLAKE2B 19274e434d5fc98ce1df87ffaa49a884c633311d9d5a93c777bb54c074309d5e65c84bec754bf1381a41ee9c060aebf6fafcbad8ae2107fa7feb99f694147ae0 SHA512 a37207b489c41d6db34c31d7e5e6f7aaf269482d16bd9d3a276bdbb5efa30c62949acfd4b31cd990cd3b938b1baba57f9a5efd32f4a0f4175cbdd2bddad990c1
 EBUILD man-db-9999.ebuild 4088 BLAKE2B 87925a8bd8a382f2cdff2fe3e05b734ef8e41086ad5fe3c7619b9209eacd6ee1da37e5ec68c73ef648d1eea7c323c42e4b273e10abfe1bbcb183329f9ea11c05 SHA512 706759d5da2b2704ebdc4537405613bef5095bd750a02128a5825f38548f9ad6fa3ae1be3cc09b83b90f436e39f25810cef9d6bfdb32da6d38c5a164ff33a558
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.9.3-r1.ebuild b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
index 45f44b6b739b..b61f464d342e 100644
--- a/sys-apps/man-db/man-db-2.9.3-r1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 00b04592f36c..fb115624aca3 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 1196 BLAKE2B 04d23dad9f06f11b2a289326a9c66986861bd20c90f8b1e04400c88175a794e4b17f0a1b3b1e1f3c55dcd4198f363868316912b606f6c6d94d39c45505619fbb SHA512 48335178189d63fc10bcdbf83c58a05e2fe8a96ff0aed76b2d207195f9af795537a2c3237124e9b03003b49ccc4101f5444e0fa98bb3019f3fe10b39c7e1d5ff
+EBUILD man2html-1.6g.ebuild 1197 BLAKE2B 8c5766e2bae26d223b28b0158cece7c87f92b7e47d10b6cb5ca49f56950c9efb4f9034f6008ccfa3b5f28a3bbfc1946814af670e7096810afa85601f0b2c8b91 SHA512 113387ee660eab79b39c8429e6120222dc6c1f28571a0f98edb252e81b4b21f3d8394493f2ad6cf7f377fb49f29d4be228902a0b3eeff9857633e2a45a7cdd85
 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 6fbf711c9ca0..b793e4b0ad53 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="!sys-apps/man"
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index c41d404de0a3..480d7ea512f0 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 1715 BLAKE2B f64b7dd7f85179c24ec464a5d234270978e09f5eeb50e4ec0b2e602fe9479c854781a55d8a1a0d75c5280370bfa47619813b798901ac71600efb942c59b72761 SHA512 0528a1f1e98844f930205f9bb657c8b72c0f080ddc98a4b81c5ed61b29142c8b1eacf8be10465ddfdb9678784e4eb72980745d69a39ad4db781852090b75549e
+EBUILD miscfiles-1.5-r3.ebuild 1704 BLAKE2B 3fae7b4480663af99d9301adcd74c9f89b12fca97c51543034924729313b4384308e45051aee4d0a29a3ea860a133487424afbeb73790a20ecc491493af8f3a8 SHA512 7d34adecea95554baa154659c907d3f2f13f62621637f41ebf112c6f4ba350a52c0d81bad6ff6bb9c7297a5326c65bb3a7515872aa5b384811c88a1a8a3b994b
 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 e764a3a89bb7..10ba7363c4f8 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 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 src_prepare() {
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index 2b13987e908e..cc9356b221e8 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -4,6 +4,6 @@ AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a0
 AUX updatedb.service 117 BLAKE2B 9e85da639464d8b9655ed86a535d19b38329118443c2cf1c0aa76a4f2d3c0dfc412a0a3a6c61ce2f31c659f2fcfba60773aa69389b6d05f66f686bbd57eb9ac2 SHA512 1d7bb023ac05f4054f35168a304e27dae53169b8e7fee325be7bb2fb99d1d71c23d251ba3cce6afce450dfa999cc4c7ab6d0d1454855ee6b6f821572bfbadc52
 AUX updatedb.timer 140 BLAKE2B e5c250a987428f3423eaeb2876d11fe82ba390082d43434cf6bf287e275f1960dbc81d818a994e0af428c0a13c98fa125f0f6cec261ce9cc2da8990da28f7dcb SHA512 5dce1b0096daf73753a3a6fb24f03a77ccab952363a1e6aee6fa1cdb067371b3ace7c909e5d0beee40a8f8ed9bb3c20d5fc47f2b8df254a69cee5db552d452ed
 DIST mlocate-0.26.tar.xz 359204 BLAKE2B 48ff448b0316169b35a3c421970b280632c4a056b7566d8fda7a2c3284ef46d3abaaa96e2411d9e408cc39466577a5bd3f8fde3376178e8b7bcc9e4e01997bd7 SHA512 b1207047e30a551cba39e70812439b554def567ebe9b8b81fed6f26435bb575beafe4875a21cd72876eadd85da4e7bfc942eb28b17c430b537c351690364837f
-EBUILD mlocate-0.26-r2.ebuild 1562 BLAKE2B 6114fce54e528534a815a94ef479516759a2f61eddbedad2afc0f076720785547a9875732a36e1efb64ecfb8c723fcacaaab223c02b1c3bcec02b24e462ceae4 SHA512 2b28c5d4dba3db6ec17fe3a6fded9bdefccf2e0ba79d6f70fb0ffb61351147e5310a4fb07c158b8d252e1e82e58629ed54e552a1e8d6d2bdffee896776bb5ddc
+EBUILD mlocate-0.26-r2.ebuild 1563 BLAKE2B b6a2e63d27a404c8f617813989c38d6c971a36d129e2fe358bb65e04c56fd9a580305f31b1b5574103a70f6c0a66054f1f422cd9fb7350c8278c4fcad5d6641e SHA512 cf4815bd11127a1e12c5c77e9b160fc572f82fa77c1d63d93d18e08f544c8966d53c7b835270b3d0257565a37faf71702664e47aff1741fb6783ee34ac3dce98
 EBUILD mlocate-0.26-r3.ebuild 1593 BLAKE2B f7d6bb9e94f4abdb723152da0d473706cfe01a0090d9af930902bde4535b0ed4ac888558a85fedaa7d8019febb6f37cd8b616cf7564371431c0a7dc6392f9457 SHA512 9e94887eb8d7123f0babdd8ce7873c4cf829f6c6379b7ee1d702f842ee5d5f2f238b5f88bc1fcda22bade837f05d5d8ad286365bf7e0228739881216a51ff3d3
 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 1517b0d5716e..904accc0a057 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls selinux"
 
 RDEPEND="!sys-apps/slocate
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 0ec47895dfd1..16e0e9598d57 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,4 +1,4 @@
 AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647
 DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
-EBUILD moreutils-0.64.ebuild 1692 BLAKE2B 83d6a26ec6dd356f2a2a1613ded2c63847077b2c88e4153e725451cb25ec7f79c184736141c667112b8f46da2608535692882dff16cb269776be894131f4f0e5 SHA512 51bf783fac4952b980d89d73b239a6f098b6bc85cb8a1f97ff871e827370069d29ca42bd2ef5ba3db8ea22b257f581da0a9ab592aeb4f4d7e6e49bc860be2c7b
+EBUILD moreutils-0.64.ebuild 1693 BLAKE2B c79acfacc2ac668ac1fcb78b0769198848faa2164db1ceaac5b9a1e0d2eac3f75ebfb530e5f472af68671a0695717760f7da29ea1e284817a3dc8c4df1332594 SHA512 02f522ca1dd8e61d1bf1eb538e7464469b431c05dcf6e8db7ef6c362aac81134ddbc2affc4021de68c6a08c875d8546a4cb830da8d904507f5c98aa821ec50f5
 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/moreutils-0.64.ebuild b/sys-apps/moreutils/moreutils-0.64.ebuild
index e541ca91e98e..0842fccd4011 100644
--- a/sys-apps/moreutils/moreutils-0.64.ebuild
+++ b/sys-apps/moreutils/moreutils-0.64.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index a1b82d30d3f2..b7ce7e44183a 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 2544 BLAKE2B 67b416d6736d08eb5c617ce838c17617623f9ef87e09f7d6c22e94bf52aadb6fe123eb853e615689685708f3a6b7495396a91bfc183c649bbcadf52baab2ed7b SHA512 cf00855b45ed36d76f13ea6d5e40524e4449ae6417853cd076bf5021d7c103c4a1bda3a66461138b7d9e9493d918d193ae7611086c5808a7931ca98cbdd92345
-EBUILD net-tools-1.60_p20180626073013.ebuild 2476 BLAKE2B 67a2733440747af8bde00c7d39d174faaa376bcf94ce302c4b82621baeba2737a13a8205b1b5affce438eb1c1491788ea11d06e4ce2eb75527f0f19b329ed78c SHA512 4326d24f7f66aafcffa0b331645bef1a3cd9e1d539de28d8d6ac952e5b0d9e2c02a0c19e8a05032e71f7e27622caa062c868bc5a037f0edd69823b5e08401b31
+EBUILD net-tools-1.60_p20161110235919.ebuild 2545 BLAKE2B 14cedeec32fb214a5b27a51f99241d4f54686bf7df550ad7a9582bbe67418516058a1303eb2f3c9159e81f338acd73ebc837de690727a8a7ce117263bf521416 SHA512 c5d7e0b32edf23ae687e16be8357f8f4d48bac7b82f4c735f362e69b1550a011c7dd892b762da999ad5861091390b4d3b00de81d6741a967c58c376107f6b555
+EBUILD net-tools-1.60_p20180626073013.ebuild 2477 BLAKE2B f48bf52d678801b5632282ad44569c7eb2739e3723d01f30216ba5c0f4e6dbc8e1f084792913a3169296ede6cb7f68bdf2b8e2ca0cfe8d67f3c336242dad58ce SHA512 546baea120075e22422cb4ff6914178afc87ef2ea9e8cc7f1c7d1aafce91c2edc3f0a0699f4840d3e9e7782c9444cdb4d9897f9e54b65860eb337b3540638c8a
 EBUILD net-tools-9999.ebuild 2485 BLAKE2B c7f7c12a1d9d46d4afd4d86bd7bfc50dc7f59f0b215d123f4d3a5689425a95dea2d4791be2fcac8b3bff0ca4496c1a15ead3ac19590190ffbaa85aa693dfb4a9 SHA512 9c4b5f1ae7010f035ebc427a5ec3b33707fa913b8377e5168960eb0af2247592c92656b2fd14243e8784560f2aa46825bc3fc8961cb58435929516581ba177d8
 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 fa92c17cf324..56b1c2da8654 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 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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 dd8298258a8e..97bc2e7a04e1 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 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 6bfb8c5068dc..94cb62ec9350 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 1128 BLAKE2B 638a37da800bff835fd54349a97a90c71816fd75de82e6f7fabedbbdf45544cc7480c69b7c15fc1e469ec86058885744b63a2b6d97ec489d35ad0909fb184fd5 SHA512 f7fdc4185411fb29734a817f3f8b08e680333c5f3dd50e4266f23f8a0521f4f34bfe6ed844024110f3721501400058158b19a98a319779dd249a96bdb388cb21
+EBUILD netkit-base-0.17-r9.ebuild 1129 BLAKE2B 2c32273d1102acd400205cabde8079d4c4feb6567350f8dd667ea36e6d4c2c3bfbb87a89840719a1eb372f783f7664ec9397898c593c505a52e3f239c7506cf2 SHA512 9146f43de2834864c248264949079dbf0fe3539aca6f2361f403919620612fa938dedc9b820f4d107b2c8f5b98454155357b21005ea131d902c47706d8767888
 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 256e04387e20..4564a8f93738 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"
 
 PATCHES=(
 	"${FILESDIR}"/003_all_netkit-base-0.17-gcc4.patch
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index fd0f4d3c8f64..63a1452c9488 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,3 +1,3 @@
 DIST paxctl-0.9.tar.gz 8109 BLAKE2B b26049dedfa82890e5445b5baca8379d37a184124d468d895339f1dad6142e4d2ac8fe393df42a68c6aec8a03b151cd412c2996a098ed460265f4c7fe9ca519f SHA512 4048544bd05ed6eb37866034ade8482b8d017110ed9a639f220e8d2e32bb3dfb6c913a986c8fd41829e88efa793f7552eaa2a6d6b2af533c44a5754a5ab8650f
-EBUILD paxctl-0.9.ebuild 776 BLAKE2B cdb6fe84ef6686817c1cfab7ed52f590d2acff183420bf35568a0500bc9cd15ce34ba3ad71b0ab94bd0575257a4aeeb72d0fdc0e812adf8192063d21a8fdc3d0 SHA512 09e3beaaa717da9fdbe917f3f4ddc2a71b1e93596ea7a378cd6cfee1014d4191d01e07c9357ef87f3eaf484af1d96635a2a735ccaeb5538f1d41e9fdbb0a287a
+EBUILD paxctl-0.9.ebuild 777 BLAKE2B f8ceddc98a1837fa9877586f012b0dbdd2c80caa638a89374ea8365f9dedfb1b6f05b2aad89028bae81f6c130a5f01bca0642bf593462292400467952cdb7546 SHA512 a2139809e3dd818be863e20dba92b62d9aa31af1e129f41d3c862f444b748d020efb991bbd45d102bf6c51662f73a9689632b9ff498dd96d830e9859be997784
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctl/paxctl-0.9.ebuild b/sys-apps/paxctl/paxctl-0.9.ebuild
index 37b5eff6a1a9..ce9b3b68d648 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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 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 b4927ce83284..c016d3ba3cfa 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,7 +4,7 @@ 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.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
-EBUILD pciutils-3.5.6-r1.ebuild 2863 BLAKE2B 9712b7edece076efc56ca7c9c4ea562dc40891a53bde96c6588bd01045f6e8e68ac2eb27c53c79c45a0bc2df524da14e601fc27294b608ce86f7abc4fddf9560 SHA512 9f765ae9ffef2c09a3f58f823b1bd6dc9d035d40a2e86ec3991933e9d78d29b4c9123fcf865a468b7f3f6e65e17ac361143c5b6ede913072ab6204fea86bc93e
-EBUILD pciutils-3.6.4.ebuild 2840 BLAKE2B 658741ae8199d1f97826c611ed1ae9546bd1487b96fc7b48c5d0b2654aa00fbe9ca1e37d73579dc2d31619d441c5eaa9511a89ff75a2c781c0f9af27408fd9c8 SHA512 447bbfb900c17d6d06f3a1206e3920385380862894ce62d580b374c727840c23903aa4cb598cc49c9eca335bcc65c5f29d339249e4dad62166cfd150dd226432
+EBUILD pciutils-3.5.6-r1.ebuild 2864 BLAKE2B 5545b583e7b17384f19d11b447129ae627018e815a1b307b53a1bbec7f1d39aec915407cd0e30c0d3c478646d1eb5fcab04f0759885098e4887d51b801c7d6e8 SHA512 aed14d250ffc1c6086efa80d292f2c4e3f68e269c2fc5060d836f37abb9f95a4ecd614f880a77e3f97c45b9ff99916fef7d3b1313df85e31496c895680c26fd4
+EBUILD pciutils-3.6.4.ebuild 2841 BLAKE2B dd67c56076adab95cdd661c786732b9eae043b43ab87bcf9ec131e0c1c2e04fa5709f286a2dd5e708582342f4383c82e6c4d43b000f4f135c087f00615dfe474 SHA512 b7d42344ba26355a2698a317e61c6b02a7393abb79a6e34561e30d1cb50abd45d1aed757f55967dd1855a7052f85ecd19ab6ac738454d865500e986b5dfac5e1
 EBUILD pciutils-3.7.0.ebuild 2849 BLAKE2B 0023904d2c9df91807ec223276dfb87c73e738f631f98eef1d61a8b3474d02be8ec7cc3026b6b58a6ec035ce847e2f83e80168ab8a435c3a1165e82b533c6024 SHA512 9d96996e6cf4d83884021282f142bd0e904d7205f3e4bb246fdfd3621ca706cdac088f391b26b69a26afff642201f0371ac3460b34b4094e28689e15ced67aff
 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 490f975d9543..31bab28faa8c 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="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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
index 0669046026a1..b38747d368e7 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 8e6967b40d7f..f1a6caeff51a 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -6,7 +6,7 @@ AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19
 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
 DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
-EBUILD pcsc-lite-1.8.25-r1.ebuild 3079 BLAKE2B 5642ba00c4bc84504e086b20fb51b8fa7a41a3520cf775a9d5c9468850353c2a523be009ea1dc15f22278d76159ba4062760db12fc9fd8f8c1dced65d6e3afe8 SHA512 39f505b6d297fd7e8e66875fd09cdb1346ba4b1609e6adca5a1a2159c2b04cd9ab54e56248d37985dde6c81d1eaf31e32927a3c5be0370a44614f41de6256dce
+EBUILD pcsc-lite-1.8.25-r1.ebuild 3080 BLAKE2B 0638cf497e0f888e3618813de68cc4396bcf2d9bf94cd76c545dd847892089e018348885b2a233a484479d126e173746a5af6c60c6e2d9623c2c2ee0e02b02b5 SHA512 32af168486e570fe12bb76f214ec3ada93bf5282f0f03cb7d5bbf20fefb44aa87dbb220008f4f660e012ff477efdbd36967a6e9d934ad2f5c5b633cd91ebd9f0
 EBUILD pcsc-lite-1.8.26.ebuild 3180 BLAKE2B 3c285edc804c8588a7e5bc262fe80ddf7eaafa17cd613cc3a4907e6ef9b495687f1653d444fcda99141b3e463b3008abf632d170e77af4453f29e6e2bf9d5541 SHA512 445b7c85f01dd5f7e74f82edeb8b08e575244a450c99e09f8d6f2043ab99cc09a3f0e1c0d3adce299bd470e93ee0fcb9e172467a3d91c320ecef67ae3af50d80
 EBUILD pcsc-lite-1.9.0.ebuild 3176 BLAKE2B 8e9989505d0254c3b099773d104af4983942a0a54d7741789567ab54a75c884ddd593b815e0c48ddb2de0913128968f3b0f4591fb16cb3153a47ac46577a3023 SHA512 bab30a2b775d01142ec08abd35ba4618fc40f11bb335007f7563dfc1902774159d9ee5e3350930d20a593c5ab0d66d7e7812c98de2c88bc0c5937e2774b54327
 MISC metadata.xml 1078 BLAKE2B b47112f9457ca29308517a6cbac1502a83bb8c3ac19f95db1788d0695808c07e3cd1955cbe0ea2f861e6cd9a78cab793f9fbeb699ffb0952d1fa4c3372b8ead9 SHA512 b1804b8e9ec6044221e4158a0127e1dfeb2381d264383f3ba4faa69d6a6ac8a1bd0fcf7681dec92ef7105c05463191bb6e890962bbf419f839d47d51f1d8f7d2
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 17cdb4323e71..79dbb26ce203 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 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/pmount/Manifest b/sys-apps/pmount/Manifest
index fb7cebb1dd74..d02a137e5376 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -3,6 +3,6 @@ AUX pmount-0.9.99_alpha-exfat-support.patch 499 BLAKE2B 11045f138c9b20c03f39760d
 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 2012 BLAKE2B ed8abd0d3019487ad93411c907372fba7b7c6379d8fd51903cb5286ce5fa44a494085e07dc04da9fd83176ad7d831fb5c0c6abc2fc09676a553ebcef9b64d85d SHA512 cae67f0708ee111a1cf10df16a4cb65ebeaf4cd678508f0cf18988114088bceda11655311e7c302409cf81bbd7784e5fcbbba9d3f27612c7cdad3f7d6c3c8d18
-EBUILD pmount-0.9.99_alpha-r6.ebuild 2054 BLAKE2B fe6a7d513e2996b21d0a8ba7ee8e0c671164e372622a72b4f033bd4057102ac8c3432966dfe039ded07eb7c3b9bde71211f40f1d4a67d2d315d8ee0ac0e0aefd SHA512 ceb5ded109e96f0aff3bf20ace23b06a5c75acdb351083c6eb7d34c9ebadb1651cdaad72ee231a0f4b220d46dabd368ad67d21c545844687505f0d0464409d32
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2013 BLAKE2B 0140eee43a88f8f892ed31746acf4471610d4b39b6aece38900da524b2254e2ca4704bd3927e2554a478e07562f6b07a060cbc65b0f68c6fffb945d70c9105cb SHA512 dbf9b575961207bb62ef09e8e18667e1df831d228ed49dce8cb983e6016851887c4c45ff56ff61d390967cacd3e44d04984a72a548ad9a3d0960e79fe482cb72
+EBUILD pmount-0.9.99_alpha-r6.ebuild 2055 BLAKE2B 523e73403e5876368ea18f0de453e5a4c1747f0af11ef2f3f4454f0adc9f670680bee0f80eb86e047c4e8924762e5443b752e6ca200c7def8d7391fb7425fddb SHA512 d14261587434fa30b9c2933c1b3ecd9ac48b1856be039fedb37b03d145d2bdac4104bbb88602be7d5d876093ef3570f8eebaa7e1fb6307ca2b70ea23194e675b
 MISC metadata.xml 434 BLAKE2B 4e7b5746a0ec1a037eb91e0fe55a2fdd14e70320bf2b30ac8640e77f4c005cc533cee3a50ef2907a4e863987bcbf9aedca9e8be51210cffd2ddcf570a05a7714 SHA512 a11a466c6b52b576d55120fd5a142918ed4fc942656f13c923c210ee19dda00867cf66e9e4a6074caac4e1f7683ecdbbae5a72ebe4035300af8bcd41dc4e4f93
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 116a1e8fa212..da81d534c5dc 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="crypt"
 
 RDEPEND="
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
index b719f9260ef2..d5b7d279d3ee 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="crypt"
 
 RDEPEND="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4a47bc2edc9d..9b73e9bcd1c4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,9 +13,9 @@ DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 44cf96ac69c1b6d2f95aea8b6e87af5665bfa
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
 EBUILD portage-3.0.10-r1.ebuild 8627 BLAKE2B 305994b05147a9e3fd5c8fc8f4281c23f356371dd8bd016f7976e0411da6f55d7b37cd6bff0f3d2e6c05cf7ae3f6d6e58c1f1ee6d7256d4933992b713b3a3118 SHA512 92679a639c18d00b38f9dae80e07641e5c78801111ac1a9b8f0e99f226ecd4fa1453417a9da4c6468412ad783683edbf84c63fcef4cc63dfc3da6f3d2ad21b26
 EBUILD portage-3.0.11-r2.ebuild 8785 BLAKE2B 735df2fdb2481176693a377fe9aeda86e3122ac6c60aff3ccace8cfe7ba42cb2c66130a5bb8d7914e8e885a636a89d81d13a9f1eee3641257ab6ce0fda200308 SHA512 569f0a6f6d4d8dd2f61611c88857da2ac4fd613cb1bb487687f7e5567a9add4b2bb77b2b0df717c34c4c591d451a573fe2f93268dfb1293a194f14d4c5f91dc3
-EBUILD portage-3.0.12.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
+EBUILD portage-3.0.12.ebuild 8400 BLAKE2B f6010a2c2be45da9d6e28955ba33b96da30598a42e1b61aee5d8ae88b6fd6294db40cc66523962e4ad54271242222f98456b690627e94cfab3cde4fbf7643f5f SHA512 e13111b158d433294f3c3845b1ed0f93383fad2acafdbc36aac935a2cb8b7d4ae48481a55fb1a8ae82fec2db95c7152906d9770d514faa57eb6fc993147a2ead
 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
 EBUILD portage-3.0.8.ebuild 8379 BLAKE2B d2c21e67e7e182c79c0435033dcafdef239a28d4108a953a74839bd6cd8fc83076bdd324f35cc2d64028c13f6a9b4bbb6a725b3f797be035e1a0710f07a9e980 SHA512 b000f7461b73ea27b71e228df180f7cca078890d93a89f8c835986e49eba31d9faa1b6ade34db6aa9e35a4fb9cfed05eb104611e9952dbbd6f99cff41f75b850
 EBUILD portage-3.0.9.ebuild 8377 BLAKE2B 8c9826354e9e3ca8633f20a14ce5e861b1d2b117b0c2dd33bc097692c4193065404aaa6745029c6cd07692d2d6c0ac34415c3e4048b655dbe2240374c25a1f00 SHA512 b22a6a04a419b935fd02f34140918f93dc9c28a4d8cdc59e97d1c5e696ff877901c6054cf859b2a203a9ecb6d632230cd6583d970f4cdcb97e0e2e732c61ddaf
-EBUILD portage-9999.ebuild 7417 BLAKE2B 088bcba17cd3d8451e04fa5a2a5e71ea237cd976b9cabbe157822e14b58bf283e628227c1807d5eed2f88699476f312745540bbb5c15ab25089844d4436f9e71 SHA512 bb43ac625afdd22f52cf5d4c45be1512ee56d14cb4ded2cc0c0680d22869836290a09ac09e88967d3e54b6ffd21e0dd429c8cc7f64431617f11e6645d396a020
+EBUILD portage-9999.ebuild 7436 BLAKE2B ba3a4366b6afd933d6ffaf84cc3f8af028614a0102a3e500fd3e5c3bb1b5d0d098d2b0ec187168927a4b1aeb53fd239c1c02b680a12bc599d8e24e89a902536c SHA512 d767c20d363689c7ff906ad92f4cb13726b398ddfbff71adf5fa8897ff4c928d07cd307da7ee5f71ec33ab48fbaec56e5521470c0d2d5da1d187eea73bd267b6
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.12.ebuild
index 28cd3d04cca0..2fef246d2086 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
@@ -34,6 +34,7 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # app-portage/gemato goes without PYTHON_USEDEP since we're calling
 # the executable.
 RDEPEND="
+	acct-user/portage
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 3a8919c0bbf7..926c0a4358e4 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # For whirlpool hash, require python[ssl] (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
 RDEPEND="
+	acct-user/portage
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
diff --git a/sys-apps/progress/Manifest b/sys-apps/progress/Manifest
index 1d01cbd3ffb9..09a669aa3e5e 100644
--- a/sys-apps/progress/Manifest
+++ b/sys-apps/progress/Manifest
@@ -1,5 +1,5 @@
 DIST progress-0.13.tar.gz 57959 BLAKE2B 11d0dbcf6a4cdf96f3fa6b902d60c5ce0fa4a619c3b40db44d6ac3e05464876c054359399af8cbbfc5304849654e5decfbbecd449da2e5abfc0cf653c787151e SHA512 789e188e60137412f3ab0f47c82a969066eb1c312711982a4a77a28b1b334055a233b12d4840653a80ac6339e66f8c120e0312889369bbdc71fa10661e7c407e
 DIST progress-0.15.tar.gz 58549 BLAKE2B a75d9b4cb965419cc1677ff80d1990c2b2069031e71e982ff6e83381cbac53aee37e9cc22984e132929c0502dc89f860022def62b886e7b6122f2111aa314fc6 SHA512 8b446d04e156b8d3d905caf9a8c9eac2ff2d24ca3b118ebdf6b2aa9f9f99d0d219c026020c33bc3f2fff936f4a29d95f89fe1cbc1ab66b7b33f5e32bf18710ca
 EBUILD progress-0.13.ebuild 635 BLAKE2B d9f876b06a46b93d4485518a13e9c2670ac019dcfdbed45d4ba3476b2f7db537df7ac6e994eccf556ec441f391c04ddd34936f0c02f298386b4ec1cb3ae40176 SHA512 3ac8c447c51f0fb156229c0df7f38b717fe464aa7fa379056abcbd48745f8b9fd21b0d60b09da11438af784cf3f0daeedab18e92e1ae40df7cce7160ea4084be
-EBUILD progress-0.15.ebuild 586 BLAKE2B 04a827b1d6ef55d008cd287262124aa4f54746cd647a73c7094d9932b9c9df8a9d0503e56b3ad9ed3af649f7c155e1c379f3b569256f33e561f2003631272680 SHA512 d34b6031bac944de4724f768b36996dd641a826e972eea528b73a31dca01fffcec118cc5d4afbb8d3464ef3b3d501c7a4d05c03bb05fbe2898df1bf7b99d08be
+EBUILD progress-0.15.ebuild 585 BLAKE2B 6311532a4dfe7c0c409dba06d9151bf14bcf0def32e6b9960d8fe1fd1492fe53845c8db9689546c2affea494227227e7febc47366171f84d8eb66eb29d1f07f4 SHA512 65b106b36c82d833e10c0d7d6fcd3c515819a58a399d3cf639a0ea756a98cbea5668611a5a2f16706ca598aec7b43e1e58e357bfdb6ebf76da387c6eaebcba5e
 MISC metadata.xml 335 BLAKE2B 720a8160043a20aa7d50e4fab61b6b55044c6a62b5baa848edf83f5954b824a3a3a21908e9e0712fae3773b122858eaa7b53a2aaf4365ecc500bc6e818ae327d SHA512 903ec46393a006768a24ebf7be7fed66b5ce5eb1db5c68f29feda30e9d79812ff4ca9303b2ad00def4ffe4e4f1f31e1faa6ef4bf868059459beb026331a3232b
diff --git a/sys-apps/progress/progress-0.15.ebuild b/sys-apps/progress/progress-0.15.ebuild
index 6eb35756e6da..5b3188ccf45f 100644
--- a/sys-apps/progress/progress-0.15.ebuild
+++ b/sys-apps/progress/progress-0.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Xfennec/progress/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index b906767765d5..4a1580779a3f 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,5 +1,3 @@
-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 1367 BLAKE2B 4152a39c7a7ca730c4cdb03e114902246a48f80062fc01a91009aab84741da212ba3b7be37b71c1c6f9e2d7cef22bb009a35bc4a86fcd411ec92c626604ed8a1 SHA512 7f1943b4b4ccff9e4cbcabc6bdf7491f52726903cb0f9a3edf00a2da2260f56bbffd037c70bc4c446b7a39713f6415b739b980d8fbe8f6dcf45b41d305c154b5
-EBUILD pv-1.6.6.ebuild 1389 BLAKE2B b5d2c27af211570e641219a347778000bb9bf13644de5f68eaca0d136ae4d711d6229dec535b23f865e112ca2c80fa159070773fe403b1a918e564604caa2afb SHA512 94c11b3dc498c0710044c480e5051e724c95493c85ae1185d1d6fcedcafa67b5890b6b2d7fee9bb8d9606c0ea35b1a5c9f99066d24c0b1f5206c5253551bf479
+EBUILD pv-1.6.6.ebuild 1390 BLAKE2B 4d6dfc3ac03be3a279cc59caeb7d83c42ca07790e77978d0e828d22218192c2fbdaa7a6e67d2d2d4d02c2370256d331bc58c7044ca3566d1bcbd8df1faada544 SHA512 580640bf306e1c864487f1c9f0a2343d856017bd67662a353d15c7160f208d0146dcc43b49d79a0682fd5b107997522b0dac356342d35b2ef6b22790a14303e1
 MISC metadata.xml 431 BLAKE2B 85d1be89636b3cc4a7910ad00aa9d7837bf6a4ad155785157fa08742c46b9479a4148a432bb62ad073cd2615689c07b28a24be7f7525c173fded9d7d76337bf9 SHA512 cb9a5ceb4164154107dc4be74388fdaba757e9dbe1ac3e3b308fa81e97297464aa1b4d2cf6d163cb9a212a5423dbeb9f1303093d784c0d16b80d3cc2878e0dfd
diff --git a/sys-apps/pv/pv-1.6.0-r1.ebuild b/sys-apps/pv/pv-1.6.0-r1.ebuild
deleted file mode 100644
index 607576c83a62..000000000000
--- a/sys-apps/pv/pv-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe"
-HOMEPAGE="https://www.ivarch.com/programs/pv.shtml"
-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"
-IUSE="debug nls"
-
-PV_LINGUAS=( de fr pl pt )
-
-DOCS=( README doc/NEWS doc/TODO )
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~SYSVIPC"
-		ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i configure -e 's|CFLAGS="-g -Wall"|:|g' || die
-	# These should produce the same end result (working `pv`).
-	sed -i \
-		-e 's:$(LD) $(LDFLAGS) -o:$(AR) rc:' \
-		autoconf/make/modules.mk~ || die
-}
-
-src_configure() {
-	tc-export AR
-	local lingua
-	for lingua in ${PV_LINGUAS[@]}; do
-		if ! has ${lingua} ${LINGUAS-${lingua}}; then
-			sed -i configure -e "/ALL_LINGUAS=/s:${lingua}::g" || die
-		fi
-	done
-	econf $(use_enable debug debugging) $(use_enable nls)
-}
-
-src_test() {
-	sed -i -e 's:usleep 200000 || ::g' tests/019-remote-cksum || die
-	default
-}
diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild
index cd49f262aed1..47a857d61c38 100644
--- a/sys-apps/pv/pv-1.6.6.ebuild
+++ b/sys-apps/pv/pv-1.6.6.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 ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PV_LINGUAS=( de fr pl pt )
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index 8bed512d7edf..6062cfe88a33 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -1,7 +1,5 @@
 AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
-DIST razercfg-0.39.tar.bz2 178142 BLAKE2B cf2d92d24a0dbfdae4045c2dab30a64bc4de64d730c075a4d852790ff62bcbadd714953fac925e69b671355cbdfdec7ce9db5693fbfa8e2aab69de6247c95c1a SHA512 165fee898a01b7f0086eb6705ef9f24fd8b8836025c071f7851a493181b8d193d0db70fc1731a8586de1f1c795aab4d20bb4ee8526b612c66ba3c434c6e10137
 DIST razercfg-0.42.tar.xz 103300 BLAKE2B 83f9432edf4deda78514dd1e2a65e04981d3646c543ebf3b74060f5d6ee5f9c3ddec5b0c544c11c9968c790172ae2bd4d4503adaf1428ca31337fdcd33d8545c SHA512 3856f4133b620fb639a46a5bb02fe8e6c47ae3928a04fe9d1bbef2792a44fdd4f5dff2efa43a1e43d75312025d3c65c626e331e723092e4e0b8d6622657fb197
-EBUILD razercfg-0.39-r2.ebuild 2137 BLAKE2B deb76d7fe520261d6eeec1d702720300f4b273b1be7aa19ebfcd4a80594b643ecf8c833e5a775fe82d0e9aeb44f11239d4f9943335a183ec770da3e92fda59e3 SHA512 e2bfdfb681cacb1a6db032803125c9e24329958de2e1a50dfa769a158a5329fb12875a6d55c28c1040376ba05645079fd130932bb80b504280a1d233c2e9a3e1
 EBUILD razercfg-0.42.ebuild 2104 BLAKE2B 8df76bfa80b77d7eebb18259a276d9d3288f413968f6ffc68233fc42c28bf27618d0022522ca32786dc63b39ee94b48a7cd7c530391e606a45dc213b2afde0db SHA512 dea989d25ca21c475d5c6a27f2e200e6aa3c62768087c2a2be63c4e71a4781b91bd34f48bb28994034acf69055a2c277b2f4995319647171c917ff6ee8b0e995
-MISC metadata.xml 1090 BLAKE2B 0c79721466fc628fb2f9da2e1806c4cac06b80cb135e15131e4a28e61f5a611a93ee715c399ac5def942cd5fdf847e272e93dc9aceb3d511093d0e885966d282 SHA512 5c5f26fe807250d22a5390ecdc12fd79d1c9eb39ebc35d1a31f4034faac5b2add3321287ece338d201b6eaa2bb585e636b9b26f37ef8a4f9a21e3f56c2933489
+MISC metadata.xml 963 BLAKE2B 4de293a678fe24f692ce51f935bd9c112247d7a896725f35ed52a19560448ee085bfed868110b7a687e9fe7f85e1f41858fa368413c35dba05a0639ae5e8c431 SHA512 b94a639add6cb35bb62fa7a061e1b7acf18f26aa15088f519f1f076ba50b20c839afd38a70b0fbfa968b9167eb48d9c70985d18b38496a0da8a593ca734ebdc5
diff --git a/sys-apps/razercfg/metadata.xml b/sys-apps/razercfg/metadata.xml
index e10f5181e6fe..c8db6971140a 100644
--- a/sys-apps/razercfg/metadata.xml
+++ b/sys-apps/razercfg/metadata.xml
@@ -10,8 +10,6 @@
     <name>Proxy Maintainers</name>
   </maintainer>
   <use>
-    <flag name="pm-utils">Installs the pm-utils hooks for suspend/resume and
-    requires <pkg>sys-power/pm-utils</pkg></flag>
     <flag name="gui">Installs GUI configuration utility and status bar applet.
     Requires <pkg>dev-python/PyQt5</pkg></flag>
   </use>
diff --git a/sys-apps/razercfg/razercfg-0.39-r2.ebuild b/sys-apps/razercfg/razercfg-0.39-r2.ebuild
deleted file mode 100644
index 2d13385579e2..000000000000
--- a/sys-apps/razercfg/razercfg-0.39-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1 systemd udev
-
-DESCRIPTION="Utility for advanced configuration of Razer mice"
-HOMEPAGE="https://bues.ch/cms/hacking/razercfg.html"
-SRC_URI="https://bues.ch/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pm-utils +udev"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	virtual/libusb:1
-	pm-utils? ( sys-power/pm-utils )
-	udev? ( virtual/udev )
-"
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-	')
-	virtual/libusb:1
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-unit-variables.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i CMakeLists.txt \
-		-e '/udevadm control/{N;d}' \
-		-e '/systemctl/{N;d}' \
-		-e "s:/etc/pm/sleep.d:/usr/$(get_libdir)/pm-utils/sleep.d/:" \
-		-e 's:50-razer:80razer:' \
-		|| die
-
-	sed -i librazer/CMakeLists.txt \
-		-e '/ldconfig/{N;d}' \
-		-e "s:DESTINATION lib:DESTINATION $(get_libdir):" \
-		|| die
-
-	sed -i razercfg.desktop.template \
-		-e '/^Categories=/s/=.*$/=Qt;Settings/' \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON="${PYTHON}"
-		-DSYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)"
-		-DUDEV_DIR="$(get_udevdir)"
-	)
-	RAZERCFG_PKG_BUILD=1 cmake-utils_src_configure
-}
-
-src_install() {
-	RAZERCFG_PKG_BUILD=1 cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/razerd.init.d-r2 razerd
-	dodoc README.* HACKING.* razer.conf
-
-	rm "${D%/}"/usr/bin/qrazercfg{,-applet} || die
-	rm "${D%/}"/usr/share/icons/hicolor/scalable/apps/razercfg* || die
-	rm "${D%/}"/usr/share/applications/razercfg.desktop || die
-
-	if ! use pm-utils; then
-		rm "${D%/}/usr/$(get_libdir)/pm-utils/sleep.d/80razer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use udev ; then
-		udevadm control --reload-rules
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	if [[ -e "${ROOT%/}"/usr/bin/pyrazer.pyc ]]; then
-		eerror "A stale ${ROOT}usr/bin/pyrazer.pyc exists and will prevent"
-		eerror "the Python frontends from working until removed manually."
-	fi
-}
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index b3b224bd5a1e..87e24e9c79d7 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -2,5 +2,5 @@ AUX rename-1.3-build.patch 172 BLAKE2B 47ae1d23ce99ad6ef2099bd6484cfad23a7aa46cd
 AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789ee6a7525824d2ac0a11403a53e33a31dc843eb295b31c8119ced7bc3f0393482e60003673c9cf83d43d78b80 SHA512 5a40ab4c81b4c197af051e01682f4fbb580b3fea9287539f601b4c07c6155c3aba802e38752566f9d2a41239cf2d20d748bfd64d2f7007eff578344cd12852c9
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
-EBUILD rename-1.3-r2.ebuild 895 BLAKE2B 3b77cd101a23d2db30264523cdb534c4eb7a5467aaa34e7659b986aa05d0e25966047f036df1e1d620e3db629af1f6cd1908841833e33743aaf16d77f02a16b5 SHA512 02e554e2011f04fa28eaaa04501f45f4d9946f6d506d524388e31625bc1c9da43c476b1a6932bdf3e576beb6e367a70e1d43c91ee746ebe663c8f1cf8652e662
+EBUILD rename-1.3-r2.ebuild 896 BLAKE2B 875172214d98edfcb29d416383f4d865e237444b1be1476fafd7be530284a4cc00095056a2f1d2e4e4d979977e839367ee00f82aab9a3f076d1dd222f86b49c7 SHA512 c563adf162d8d263e07177cec40dcebd0d6b250837ff3608fcfffba68163cdd1b8f006cdb87468c1d0fafcaadba5dcd5f369039e6ffd5fe61ca0a59204e7a9b0
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3-r2.ebuild b/sys-apps/rename/rename-1.3-r2.ebuild
index f0e2609bf2c3..32c86214f471 100644
--- a/sys-apps/rename/rename-1.3-r2.ebuild
+++ b/sys-apps/rename/rename-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}/sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 MY_PATCHES=(
 	"${FILESDIR}"/${P}-rename.patch
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index 064b520bd565..4a47064410bc 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-r2.ebuild 854 BLAKE2B e4c3b2c44b7c3e272084a253415a32a9e903e9cacb378a75985622597f2120480ff4f14877bf59e568d5c719ce0030554cafaf767052a4442d72cba25c4b065a SHA512 95015a1b84cbe02824e27690a04a0e854e6dd8ee6f5c139819896e48fff3a7543fb578470a9869e6854dd1c5cf96c76164147ecded538d67dbf2e96afbf55dc6
+EBUILD rescan-scsi-bus-1.57-r2.ebuild 855 BLAKE2B c6607ca02e05d2cf847047c9643f536c42380b8ad21c9100817d5614199efe96b814de031d1a0f02e7b8e8d97557dd612d410cab9ccf6addcc913c2f263333b1 SHA512 34c6a3f33737f7cdfcbf5574fdb60f2c3ea65da33ca33a724d2192a1fdaab6c1c7cfe02687688af9a38f51c0a1637d8651437ff7daefccc4af58aa67198a95a9
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
index e3307ae4400b..13405ae87e68 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND=">=sys-apps/sg3_utils-1.24
 	<sys-apps/sg3_utils-1.44
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index 0e37b3a79ce9..cf127ef4b08a 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,5 +1,5 @@
 DIST sdparm-1.10.tgz 361464 BLAKE2B e2e7f09936fcdbdd50b7f397c62023592b494d5b1f8a998d32a4777134ec2edc39b11433ed00f5518ba6a8d04f7dee36e6a070221901b9c31a1a0d25da8439e5 SHA512 1cfa95ced443d190ee9e4a899c9cfc6b98367ba39a9cc201c0db2f8c92dd4e74368182be3b8bfe28e51761b1ededf914ee669ef8ff6023d1ec1f05d69889a35f
 DIST sdparm-1.11.tgz 473501 BLAKE2B 7c8b8a1c14b72de3c36cd701c6d870e0b671df2f17d17a63eb00cce41a80f3cbfbe9e3f2afca08f1a1a9be5a08fbb98a9ddb1ccdc117bceef508790407513754 SHA512 cb5d1dd351464fcc05005429bb8f452b05e6673b1dd8b699f762d005ab3e612b3b7d6ea400ffbd5e98e33e3e78da735d01705353b8a9b9567aac55a3f6b6d813
-EBUILD sdparm-1.10.ebuild 1009 BLAKE2B f7e351301f894a718fb12f1dff540760ca4f23236de6adc846dfadeefe3cd792b3bd105fe7bf3ca2b191704d3343d65764046cfb48a1405ddfac8ae332a818e1 SHA512 c1567b91c66294d1efe62d5eb7730de9e9e806508bfa750125d3955a651df66e0f8200f1f1b1a0cb8aba0f13868999005ce4a61e5002a1f493265fa0e385eb0b
+EBUILD sdparm-1.10.ebuild 1010 BLAKE2B 6e8d101a71b4f258390cc419dc208725f78af18f7ebd3b73df49dda9c7e4aa019fe97e39a2254736e8737a3403e26a3aa24332956c9104a31c0ad6f739bc4971 SHA512 503e7dfdc75b47e099038abceb3288edd3a42ed7e2e9475a98c73bc1944cd67f409675c5a1d32f99baffdf0ac8d276b8ff0c1477ca71c00f432a5cc722ab3b13
 EBUILD sdparm-1.11.ebuild 1016 BLAKE2B d612e67d7de185fa06ef544ea7a89bb388a7a0413a4a62c1ffd031f9f32de8995ea2c4ef6002a9e5e0ecda03c4ffada92100f16a90d70d061da423e5ab585cf9 SHA512 0ff795ab9b9a9b127d81ea0b14dc56d243c18967b82df622e936b395ef0a10d75e5bfc141d4f3036848be059a607092638caf070193f12ad9a043ea44e50b0db
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sdparm/sdparm-1.10.ebuild b/sys-apps/sdparm/sdparm-1.10.ebuild
index 7f52118a1cd3..dd271d3dc33d 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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index e406f4a6ea68..48a558270cf2 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 951 BLAKE2B ad95335e576ff19baae9bf9d98408226aa294ec9c6193027f7e64def5008507e591cf0ef2c8643619281b5b4b5d63e2c9b43d45b79cdbaa0d10348366eed0a2c SHA512 e8e5c79b2d432d37b4876214af04b75eaa21f7b7d93517851f08040abaa57a81d1fe2b8e1ef7dcdd23f6f1faa22c4e17def718a0cd6e3dc024e5f356e8268dee
+EBUILD setserial-2.17-r5.ebuild 952 BLAKE2B 86d219f7ce0a53bbad51b8e88cbf64441b8121e2549e9ea5448941b1ea1ebb985448797b169412b3a02647e1a43e8ab37a5bc4a15b4d885be2859a2a1a2c52a1 SHA512 de69148580d3868c8ae42cd2133dbc23ddbc49e50c202f1007bf071d3b139e99f88a8f577b7e60f902e1b7a2bc54b01853dc23bd5fa5ed5739e740a7da428d9a
 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 16b96736d6cf..47b3a4a2421b 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index d1cb5888ba33..582209e126e9 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -3,7 +3,7 @@ AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e8
 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
 DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
 DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
-EBUILD sg3_utils-1.42.ebuild 1033 BLAKE2B 244e7b5a07f24593fcfef020ffad820926be28547fdc5d0067b65add39cc892db96e4c8d3ef473cccf8a2a031d9e2f88a9a44b49aefa879f5c36985a2e76f6ed SHA512 e43306e506e102d42ba7d675a537667e10b90d1399671226f7ddc905c02ec571022c0a4956940a246f330a3f8d4b19b1d840071954bb775b67b8072376e8bece
-EBUILD sg3_utils-1.44.ebuild 1044 BLAKE2B f53df138561b8a6957745cdf71eb1f839402bcb5600ad9a67d538440024c6268d4859d1c70a5e1e20bfc8ad9261c853534305cc953cd9e65f9a5b3ca2fc3f803 SHA512 57fba1bea05d3c0731fd8bfebfc0db6c620f1efcb12bcd81678df7388d6c4a4ba985c10d5d5d2a888b9c7ee094398af8944d69e7e780e8afbc6ca89c62c09cd9
+EBUILD sg3_utils-1.42.ebuild 1034 BLAKE2B 4b138764ce395ecedfbb105036df6e12746399b029bc282fd6729443c68db2947617b405317a55975e98bfeaafa29884e89dfc01c5bcc17938f82582b27119ac SHA512 80c918d5922b523180f72e806b75164b697deb9995271d3f425c9501c409f2aa54b4c7bf76aa4cc9a4492bf97a86c439f7341a77597687f47ac9b28841f0137c
+EBUILD sg3_utils-1.44.ebuild 1045 BLAKE2B df0ea79d1386fba7d4b9903b61d3d6c2cf743bfe7d7786a5570ce0202488c1c0c4a23f2b5d96a98e2da43c0e589b12bb96fc7e1eebb737863ab003cabb0adcf0 SHA512 2fd1d84c219567c7f49daefd02007f9a6b55b4bc6e2e07fb7cfac628f9c324fc97f4bc0d88d5c0f8348ab68d8881144b0bbdb5729239d9e2d7e115d125e9d839
 EBUILD sg3_utils-1.45-r1.ebuild 1067 BLAKE2B 22eefc8e13dca6c86abdc10c160b833c16c53cbd423e95597becd131a05aa24897d1c1185482a3c4cf47b96f707d3ca412c10df4750647b8230f380eb3d852c5 SHA512 1c7391ab95673a97bf8c24f13dfe27de724fbecb4208cc5c9bd6121114811a35d51a19124d78dfcaab11cb30a3d485de9c6d31f85a55fe05997b2d567a39f916
 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 6895cd743d83..56b30e539729 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
index e6db1e1866e2..d718000b9959 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 431a3193c9b6..bcb84afc804d 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,11 +6,9 @@ AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610db
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
-DIST systemd-stable-247.1.tar.gz 9889494 BLAKE2B d16535242d8e80e2f698cc5cb17f9e50c971ecf883b8d68433dd952175f50d511cad90fcf98da5f8f760b10c388842128f7f62aaef57e8175a9d6f70a7283fa5 SHA512 2a737afcee4409c2be073d8cb650c3465a25c101b3c3072ea6e6a0614d06e3ed7ae55c84f9ae60555915ad1480b3a13aa72fef4b9210139afe6b0d7a7629385a
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
 EBUILD systemd-246-r2.ebuild 15224 BLAKE2B 7b1108222a77b92640c21d46c09bca1d40247cc0711913341dae37740d8b38c70741be0471360d4ba602e4823628a9cbb0f26e8535b3c223bfbb29bc494dfef7 SHA512 cb7f79c8cf8bc638c1104f141345043a7a041d3729a514debc62a1e726467c387ed11bd6160fc02e9993a56dede7958aa1b664dec0a62c603254842708f1d59b
 EBUILD systemd-246.6.ebuild 15260 BLAKE2B c4f0800e64d042ca74626e88bb34072ea4b84931a27192362ba096a3aeea73350cd4d49fe0d614a66d774a8166d1929b7664a227ae750bd5ccd15bdb4da70aaf SHA512 eff22df11fb3ff8d5707b8d122b6caeafb29b04194f3e70439028c64f57f4a5eceee6ff2aeca9643cbcdb8a42daed18bd9ce3f771d6fd18e3729b045c4263a67
-EBUILD systemd-247.1.ebuild 15274 BLAKE2B 6d09faf768eae5b11307a3ad622cc2e357299f8333f9cba9cc307e9fbce58f15d57776c9939da979da26b9cb5ccfe87cf99550dc0fca6a8d3cd467afb8db387f SHA512 728dd45503e2f865a7ad97c2483b024dbb4c3c4d7c64cab0660705892a271736089360fabf739cd70996e85bdaea33fa10e5ee721dbbb2009a244e29090e1a05
-EBUILD systemd-247.2.ebuild 15274 BLAKE2B 6d09faf768eae5b11307a3ad622cc2e357299f8333f9cba9cc307e9fbce58f15d57776c9939da979da26b9cb5ccfe87cf99550dc0fca6a8d3cd467afb8db387f SHA512 728dd45503e2f865a7ad97c2483b024dbb4c3c4d7c64cab0660705892a271736089360fabf739cd70996e85bdaea33fa10e5ee721dbbb2009a244e29090e1a05
-EBUILD systemd-9999.ebuild 15274 BLAKE2B 6d09faf768eae5b11307a3ad622cc2e357299f8333f9cba9cc307e9fbce58f15d57776c9939da979da26b9cb5ccfe87cf99550dc0fca6a8d3cd467afb8db387f SHA512 728dd45503e2f865a7ad97c2483b024dbb4c3c4d7c64cab0660705892a271736089360fabf739cd70996e85bdaea33fa10e5ee721dbbb2009a244e29090e1a05
+EBUILD systemd-247.2-r4.ebuild 15594 BLAKE2B 3a90c524674407cf4cf63561f2a035a7d0c533e6e2fccd1f85b6746f45c32ee3efcd36021dde4ef3b4b24f33b16c0e1b24a2ebbbaa10b502db2354ca65d767aa SHA512 cbd6b278c63f0d632f6be7ab36b49d67fa00eb9651a77e731888040a12bdc629143372bc8bb2553eeea87e761998a03e3a6cd340659c6dd9fa5a4ab65c811969
+EBUILD systemd-9999.ebuild 15594 BLAKE2B 3a90c524674407cf4cf63561f2a035a7d0c533e6e2fccd1f85b6746f45c32ee3efcd36021dde4ef3b4b24f33b16c0e1b24a2ebbbaa10b502db2354ca65d767aa SHA512 cbd6b278c63f0d632f6be7ab36b49d67fa00eb9651a77e731888040a12bdc629143372bc8bb2553eeea87e761998a03e3a6cd340659c6dd9fa5a4ab65c811969
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/systemd-247.1.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
index 5259542b5b43..b807b257a329 100644
--- a/sys-apps/systemd/systemd-247.1.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
@@ -84,26 +84,31 @@ DEPEND="${COMMON_DEPEND}
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
 	>=sys-apps/baselayout-2.2
 	selinux? ( sec-policy/selinux-base-policy[systemd] )
 	sysv-utils? ( !sys-apps/sysvinit )
@@ -370,6 +375,9 @@ multilib_src_install_all() {
 		rmdir "${ED}${rootprefix}"/sbin || die
 	fi
 
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
 	# Preserve empty dirs in /etc & /var, bug #437008
 	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
 	keepdir /etc/kernel/install.d
diff --git a/sys-apps/systemd/systemd-247.2.ebuild b/sys-apps/systemd/systemd-247.2.ebuild
deleted file mode 100644
index 5259542b5b43..000000000000
--- a/sys-apps/systemd/systemd-247.2.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
-
-REQUIRED_USE="
-	homed? ( cryptsetup )
-	importd? ( curl gcrypt lzma )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	homed? ( ${OPENSSL_DEP} )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	repart? ( ${OPENSSL_DEP} )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	hwdb? ( >=sys-apps/hwids-20150417[udev] )
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-			"${FILESDIR}/gentoo-pam.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dhomed=$(meson_multilib_native_use homed)
-		-Dhwdb=$(meson_multilib_native_use hwdb)
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Didn=$(meson_multilib_native_use idn)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dzstd=$(meson_use zstd)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dp11kit=$(meson_multilib_native_use pkcs11)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dpwquality=$(meson_multilib_native_use pwquality)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Drepart=$(meson_multilib_native_use repart)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-
-		# static-libs
-		-Dstatic-libsystemd=$(usex static-libs true false)
-		-Dstatic-libudev=$(usex static-libs true false)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	if use hwdb; then
-		keepdir /etc/udev/hwdb.d
-	fi
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	if use hwdb; then
-		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 5259542b5b43..b807b257a329 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -84,26 +84,31 @@ DEPEND="${COMMON_DEPEND}
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
 	>=sys-apps/baselayout-2.2
 	selinux? ( sec-policy/selinux-base-policy[systemd] )
 	sysv-utils? ( !sys-apps/sysvinit )
@@ -370,6 +375,9 @@ multilib_src_install_all() {
 		rmdir "${ED}${rootprefix}"/sbin || die
 	fi
 
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
 	# Preserve empty dirs in /etc & /var, bug #437008
 	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
 	keepdir /etc/kernel/install.d
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 5a567887eec6..35a20cf52cca 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 665c2bf8e3397da1649684e45d82462007182a008b083f658088504c08f48a527dce41379c6bf02d2a41c3fe83d963cd5269c0c656832fac9410b8208c259a3a SHA512 b31b40fcc21303a30b143ad99da020b1abc7e10afa40ec7e837198fd2523e85da469ecee57485c72f5d4a8f8ad0f120012ac591709783b0abf8bd5586c4b8055
-EBUILD texinfo-6.7.ebuild 1643 BLAKE2B d763ea7e51da9c47adc9f46a8bdbc40dd87508e02234836802c926e3547defa81aa35ee07c9d8228e872fbda4ceb02c507a2906387564b80ce55df32248611ea SHA512 98dad7f43cd0960e7fc12a38a8fc8f3f7fdf7896011ca92f50e7902b4cb4e959b7378e2e46beca9697ef9799ef75630c7987f3cf75276ed5538fe698f3c5c0ca
+EBUILD texinfo-6.7.ebuild 1951 BLAKE2B 62574142dcd269ea80807d43d8c8211a3670b080b2a51f43af80a5c606bb4b83073de40b2d36c346c4eae5b303368afd2120aee7cd35ec0b52ae38cd99311625 SHA512 9b44247e3acb3901e79f8bbd12e349d1157364f3dc7095b88f084f3d2bae692fa7e5db4515667dd03730cb3f133f0c0a2706030b0d788c20cfd127929c1cc0b6
 MISC metadata.xml 539 BLAKE2B 5445a2b07c6bbecb3c33c64e80227f57ff80b17b0b440a3d0220a88ed1bb930deb1b0274eff8db1a64fe82c64e7f34b1183c533b1a1ca7b41694668e2c5b682b SHA512 4d0b0b223f04e6ebc4e7a7546dbf6b731fc0676657c8d3c3cd38a54c327f4eebda927f1793ead3f8f255bc82d7884b5acd6df8431674db48c2ebbbd1098cb032
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild
index cee372613a77..3302ea6162b3 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild
@@ -15,10 +15,11 @@ 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 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls +standalone static"
 
 RDEPEND="
+	!=app-text/tetex-2*
 	>=sys-libs/ncurses-5.2-r2:0=
 	standalone? ( dev-lang/perl )
 	!standalone?  (
@@ -31,6 +32,15 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
 
+src_prepare() {
+	default
+
+	if use prefix ; then
+		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
+		touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
+	fi
+}
+
 src_configure() {
 	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
 	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index a808c22f33be..9e83f9c5f10b 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -3,9 +3,9 @@ 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 1216 BLAKE2B 16f75a1835b7ccb6a5726b9125f6fba24a7b50e358ebd32419b3957c1bf1aa0affc2ba31e4cffb6b071ed13129e23f2e9f5df76d61dd815eeaed6ae453676653 SHA512 3b56c09a0c844db2169ef9b286df920dc188793bb5b7686cc8ec463497e6ed93e9c29e0fca206091936770ed349ae7f1d599cbc65dc5485df24c3d9adab33984
+EBUILD ucspi-ssl-0.94-r1.ebuild 1217 BLAKE2B 29860c443f9dff6363b630da7c54d1341408652b9b542b494197c36d08a04b2b37a30f96e12eb0cb4cf8ab8d0849d539be6e0e8332de36c29da093ddacb22936 SHA512 cf6c7eee887da29cd462c15529795686ae7ed1d88f9cea3e3beb2c1e8b7a3a99aa398eff17b476925c8336c042026ee3af64ee0a852d39f206c3ffe6596632f3
 EBUILD ucspi-ssl-0.97.ebuild 1284 BLAKE2B 909f26fb66bda9f2b963d7d125496eb29d15ad6a50cc50713ff5a171c1cc8ce6a7adeb8902ab4307dae07e7eb4a42b142907a05c2fbb7400efbdb8eea6b43395 SHA512 473dbba22b26f7167e97ffb91773a85f5bceb3545dd9648d365a758543d7d1afa0e128bd3bb67a5489dc1d8cbccec18664fa39cde4afa5f264bfc6d442938d36
 EBUILD ucspi-ssl-0.98b.ebuild 1254 BLAKE2B 343c3a29a1034913840a1e73427a71bf589afd22625fe5b4f9407a0625e92c66cd189c3b1ef866c3601e943734653b91487daa5ae76ea7a74490aedd5f3bff4c SHA512 5a05bdbec11af831d8e921722425a757acbd944877b474bcb5f7f62351efa60988bc84130ab41c63a3ff707b9b0d30dd32a26b9a6da312d6e65a0f4ddb73aa3a
 EBUILD ucspi-ssl-0.99.ebuild 1254 BLAKE2B fb0dc76802a85bf458c05104f2c7550bc57fff52db5edd82862866864e8705f93f237419820a9016714118bb32bd9bc445e672b273b264ebf6b4b5064e8a8c7f SHA512 efda666c5a18c291cabc933e2e59b396775d957a30a5249472d7ca21902a06437c198fde858679722e3d5cc559aabc88756c5b1e509e05be245bc95d0098fc9d
-EBUILD ucspi-ssl-0.99e.ebuild 1556 BLAKE2B 8946a652660166d40841da036ecad9b668f26b30f7f8b04dd20f28340f80ba7668f92daddcaacab0d9d8242665cd18ec10a9dc94dbc79c63ab4e22b94329f2b7 SHA512 becfdf659f4d82252cd13739fe52911f17c56f5863934e91dc8d1f143a29dc2fefae0712b3b9a98317b7109cfa0243bde51d6ba0f2bd68c9ea3b21b9aee73d87
+EBUILD ucspi-ssl-0.99e.ebuild 1557 BLAKE2B e50a5dddb35998c26a5cc3c36081aec6a539e5053b4e3e93031b4aa15ac0295b1f53785fb6c60b33abd030d7e747948ca7449aa376baa8f75beaa5db124ec6f8 SHA512 71317023c9e9e2591da1d1ea89ed2f011f39e84b8ac844284975bf78c7de710b482d0cde792e2b342a14eff62e588a27bdad5560bb64cdf2dc1ec2cc26d4c5dd
 MISC metadata.xml 550 BLAKE2B da79281578d7c1fcb0646eb789b7b12e431ae96f645e9fbd944b1c1089a9321c65a66570a0c9a32ff6502a06794422bcb1129a3edba5016ca3d7f14821058a05 SHA512 e4f99e1cb7f634dfe7252a62fca125bcdc1f7f1e868c8b9786bd4e4d7b857fb983f2567a2022fea697bb4694911807fc0099d0641cb3025558f7bf22c235d2d6
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 1b9b4c33e185..b7f0ec1c65e0 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
 IUSE="perl"
 
 DEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 5651e04b6333..2b8ea0ee5f83 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
 IUSE="bindist perl libressl"
 
 DEPEND="libressl? ( dev-libs/libressl:0= )
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 2a42b8bde39b..023f5db9ea46 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 2098 BLAKE2B fb68904f5604a9a2494a6748fdd1d598ca89d17674b73291ec9272cf7a58aa592d4c51f7ca23608766a91b03fe5aca33c3163a6a56cfb4ce13a89da67a333e54 SHA512 fee980d242815660e66fea7a371c775c182752095152cd7dd7f168cf3516fcbedbf061b7b5e24fc5ae88875b3a2ee77b811cfa0e5b1629b1583c8aa6bc8bd884
+EBUILD ucspi-tcp-0.88-r18.ebuild 2099 BLAKE2B 9489bcb0552f2f87e12c88b58af7e0f2ef7e028ebe572b0e4ed30e5c2542ca6eda15f271faed5dad9c9a19425810ec2122b07cc3501aa27e96f962bffb364080 SHA512 d89d464d244fca5f03c75129390f475e4a82a9523d5680b91b4cbe7e27e2a8ad5085efa404472b3fb9bd5c1f6f4f629f88ac7455583f1ae9cdb62e90bc02d39d
 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 e46bb72f140a..d12f321d1d5c 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 29696d8dee7f..07bafb200e0f 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,6 +1,6 @@
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
-EBUILD usbutils-012.ebuild 1198 BLAKE2B f0952377a3e94cde2e205ad0d47c78459ec7a623230233fd6c8d49f3925e9a4c163892e798008879cb51a8b0df99957bd58e94f8ee5518715879011e419e1d27 SHA512 f55e68020504640468567e54cf41fe8c526135f73c16f6c8b6dcb214a550c8f76412035739ddd2f1d62d5bece2d8ef25cfa5ddecb20e3f3aedfb8a79cfe69dbb
+EBUILD usbutils-012.ebuild 1199 BLAKE2B 54cc15ce52914498494ebc1b0aaa19a3ea4425e289a67949f6853bf7d8debefb5fc1fe331b8f2427bc6b1db5f113b2c7bf0f426b1c927725694d36cd5739a58b SHA512 7446e22b974188e93fbd8dcf92fa3a4846adbc00e04e60dd7aafbdeed0ed804201f0fc28a9fc85a1942f310e92c09ce7a455d10cdf22dd3245d4a0d9c252ad44
 EBUILD usbutils-013-r1.ebuild 1275 BLAKE2B 37618690c256110f104d12b2c34ca47328f5ae08d70562e50bd0263b352efcaa7ec6026f8e9035b58a8fb9474489dcc80ef47e8c23b32e1fe0a611de02de5aa4 SHA512 92c46b18268b2a6d16a270859622616f244e6162e53ef60348f4855a2ba2cf1e44c2aaa746c89ef839897c548c2031316e6bc9edab25eb7eb59589f6e06ef288
-EBUILD usbutils-013.ebuild 1200 BLAKE2B 2a1de541930bdc802ca452046d51530fb784f184994415013e2bdd6aab4c70773b74805555c11a7d9c34da925b1fa45a31eb3ec5bbe91f37e69739bdc25792b3 SHA512 38aeb7bb44de8bbb137b8fbb967962e35743fc14d1133921a102465d714f00d093abff0fd124978a1d86d1b50abfd29ef32694142476a6ee2fb2ac490246654c
+EBUILD usbutils-013.ebuild 1201 BLAKE2B f2b23a7743f674c9699d1dfc0c6ee8d3a84265a0f928a0eaedf344cb76b1c2d00c954e6e8833346a78e90a930ee4f94c1c8d2cdb37d2d28169c294de1baded21 SHA512 ba35859ec63596271c93841493684f39e5a8fc403e2771ef7d55bee5397457e376be94042a5dd5598966e9826d34d3947f246919d71edcb1df1800e4876631ba
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
index d70c22154812..4e42ad12bda3 100644
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ b/sys-apps/usbutils/usbutils-012.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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild
index 958f87f8410c..0dfae6f451fb 100644
--- a/sys-apps/usbutils/usbutils-013.ebuild
+++ b/sys-apps/usbutils/usbutils-013.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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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 7189641f0caf..ad8627ee781f 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 1174 BLAKE2B b3a844c7f1b07cd0c12b537428509eedff05ced99af89d4c479e69a17db9d3eb9ba6630586457ba11a85080c64b74018ffbc25723773d9e477ede8d2ef1156ea SHA512 04e33c849eaf4324536dfef542c2480fd948c7cc9570b261b7c05d96d54148085887cad9a860f9c49d2af8c28a86649f5a4e004e1cf3b52d32821e2eb6bd6436
+EBUILD utempter-0.5.5.6.ebuild 1175 BLAKE2B fee4d1a93bb95a26176100456b66ca7925acb36abec54870cc92b75e041d1d3dfcb5f2509c24b39522494fa34f8a497685a4f01e77a9e95b4e7ecc266d890c94 SHA512 1335cfca2773596098857a26a67713e6aad2360553e383e6dd34adbced65eee680869a70c4f0680000387b523c1357b1a5ab19dac770d5016c55efeb04f45028
 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 9c46d738db2a..5017f8c69337 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index 18430d9d88a3..ecc2a1e2b769 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 4ec3a57148e3ae9c20a43b0410de5d94c319dbbe1238b988a9b3c1464ec09822d435bd20f5eb482274d0ad108dba1c9ef10dc0e93df7aba85bc220dcde0a58d5 SHA512 e67b7d825e0df8ddeeacca3c4b87e7894a5dea4dd2512ada3265db9d6e37557f3046cd51837f01d5a1b0e282f1f8b3198339fba86aaf7082b07d01ce4d8a0c2f
+EBUILD which-2.21.ebuild 646 BLAKE2B 073287ab5b5495ec7f536ed7d463a54360cc89b92d5d57ce312efce831a139822cad298885ca9e327d05e4c2aadb961fed15f53d37e1fc353ab528858efb863e SHA512 58036c8af7d7117b2cb3a5cb92cd0095e4279b20712097ba6019a0df1c5abf9fb0113eff3651db8360c5ec4c7a8d0c0e619110600c027a4958849715ac4f34a6
 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 d01775b46148..7e4ceb6d1f25 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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 22d10375529b..e94e5e2dbe00 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
 DIST xdg-desktop-portal-1.8.0.tar.xz 470692 BLAKE2B f21da5ad11dc2b1611983fdac87335b3c7e9c13222bbe3b90b276d75726a6f16d950a9ba62606aa31d52f57b8d076393ec0d48014b1623ab03dee23c524ed0ef SHA512 6d9760b41447af711d5937279b0031bcc88947e11204351accfcd9e6e19e498e9021675753185f92f7bd40336decc1895968796b1b71508c7caf5f6fc32a51a4
-EBUILD xdg-desktop-portal-1.6.0-r2.ebuild 1058 BLAKE2B cc38d747768e44535808c0b0b3305299a978eb73a62ab1864f967d80a38edd3ead4ee340a36345b955b1f1ff77a1f037c563c6ddc6c2eb5bd61eaecb065eaeec SHA512 fcabc1a7d2da0d0ddadd790156439d806608b0b8d917bb531c78e54ffdef745d20e7e7c61c61f606e1df6888ea17652c55afbc303b77cba3ec8c6ff2be849f49
 EBUILD xdg-desktop-portal-1.8.0.ebuild 1017 BLAKE2B aebe178b476eb447327553bf9514a0e51e98cdc02265162d6c5f98b34aa1ff7501b490b7b2a12a100125a02e07ba7eb0846ebc61e5ea4025703d4379ee70eb5b SHA512 b313f6c0de8618f1dad47c6fc048466a312ea9e974802357a70d6ed5a98a08d07d3867ef503f9c01291d035225b0bdfb146134a330e6cfe3eaa28d45bc9f8ed4
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
deleted file mode 100644
index 777122093897..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc geolocation screencast"
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.3
-		app-text/xmlto
-	)
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	media-libs/fontconfig
-	sys-fs/fuse:0
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( media-video/pipewire:0/0.2 )
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-
-src_configure() {
-	local myeconfargs=(
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable doc docbook-docs)
-		$(use_enable geolocation geoclue)
-		$(use_enable screencast pipewire)
-		--disable-libportal # not packaged
-	)
-	econf "${myeconfargs[@]}"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /sys-apps
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)