gentoo resync : 04.01.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-01-04 01:27:12 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-04 01:27:12 +0000
commit: 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree: 44068672445b1418489aed82de58df3c470289e7 /sys-apps
parent: 0f15659d48c193027158492acb726297501202c5 (diff)
77 files changed, 497 insertions, 992 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e14eb9d097d9..55dbfe04a318 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 8b3988633f7f..9cd7beab3d33 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
 DIST baobab-40.0.tar.xz 581744 BLAKE2B 12fc2023a19512117c235a54ac36045e1a733c4d64d8ff1ea77d6be624d442ed66bca83788ffc19be36855207cb693c8f1aa4793c8750e84d60c1b84e79b869b SHA512 31ab768f7e089c12717bc363111fe936f4a15986b69ee53b8f9aab19973ff5bf4970fdfa4d936af4d46673a9f08063518a6c314453e698e6068485152e400650
 DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
 EBUILD baobab-40.0.ebuild 818 BLAKE2B 874599250b6bd9531edc0975f19502c23967056465d28324ed1f51d1749226822f849b75426d399020e2479065c793308362c213e92ce53d852034fbc7739d58 SHA512 f60ccd4685ad436dc6999d8976392153c2901ae96ae6cf37fea258de1bb1b148ba5934ad3b7499f520570ab6d649cc9b0a970832582e7f70c47cc260a42abc21
-EBUILD baobab-41.0.ebuild 850 BLAKE2B 19de95de85c26ef761be28aaa2df1dcbbe675bd8e91ddc2eaeb76c79c8c77a076bc97874d311175e82817018b10dbaf4bb4bcf3f1c4b5a7324333355d3ddfce7 SHA512 6362ba617ac78634e832889b3303ebea1c246fa5d447e9778ac07eea3c5da394808da0b79bdea0d9d7c299857e52bb294b5b5065339411fbf016b68c27f42d35
+EBUILD baobab-41.0.ebuild 857 BLAKE2B db942d19012ffd06cb2b2f0146765ead78210e60486ce81a8d489f5e1a5f61b797e0383f2c183abc3410982c8529a2c4ea6ada4f0602c50b7d8f0c8e8ea6fe18 SHA512 9364992d8edaf6bacacaad97692a29823dd2f978ad9fb4fdce1515d448edd6b8660adca27812be07e69362a2154e94317d77403d0e000d275174ee797e181115
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/baobab/baobab-41.0.ebuild b/sys-apps/baobab/baobab-41.0.ebuild
index e4343a5a4c06..788db8135003 100644
--- a/sys-apps/baobab/baobab-41.0.ebuild
+++ b/sys-apps/baobab/baobab-41.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 5f5bec6d111a..97443a9360e0 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,9 +16,9 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd
 DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
-EBUILD busybox-1.32.1-r1.ebuild 9640 BLAKE2B 1bf881647d58a197e690e068b81aa2522fdbecf69784862b1842d54ea1caedff7fa4d6bec8b69388bd8fbddfdd76d48d36b07b7147ebf7f5368df3219efb135e SHA512 c163d435a5bac776c519a539f1760134973314434e75c84dd9f427ea0a7c5fd9c41216db61444c97931b86a6cb6ae17fdc1f0d1c5f36118fc5006c89a3599b7d
-EBUILD busybox-1.33.1-r2.ebuild 9997 BLAKE2B 361c84459fba9270fc65e727da7cb679f246daf84aadda6fe1e662fefd234fa99fa50d33180311acdcf60cc86b7f081858efe695f8c278ce523afe117a16d242 SHA512 93b3177923c288aa08656a989f6db2d54df8d5208d4728f60a17ecc60122ae6d2a8c2926812f71b961de562fe2946213c80384a9990d71f48bbef2f070768eee
-EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406
-EBUILD busybox-1.34.1.ebuild 9929 BLAKE2B 44f8e556dbf7c2c63a3a5068e54d46ef3ac7215702614cd9b04583cb31412a2d5b67f8e4b0fb0e74c86b644eb73f124f6d5e02e5ff52aed3998e56fe5fbdaaea SHA512 dfaf2418c9b70a8ec82e86938469da2aa0a902fadbad99aee7670d55d4651cf363b3f043a8e0ee592085cc6f3e82b171e676edcfd9640ce2807362277633715b
-EBUILD busybox-9999.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
+EBUILD busybox-1.32.1-r1.ebuild 9458 BLAKE2B 2f23e64aed42ab56411e6b000c33aeaf9008bc0077d0039b412f3d94db41a9f3954922c7a00068f221177d254f0e2478c84f59002004403a444be70ed37291f2 SHA512 d6c2b162d3bb23f63e701108250dde39d613ecd5f62183cab64e9ba2803789533d6beb0efd1fb960c946afa9c5a0c43aab5194a164bb040c0bf309a318fd3482
+EBUILD busybox-1.33.1-r2.ebuild 9815 BLAKE2B eed0b930aeb82af04d2685a3a355b9fbef9bab402659a558dc38ac90d56159ab7eccc99c63a4aeb1a311ea8d48a4d7159791e3ed95667b2e3a6b89d5c177d495 SHA512 bacf3b935be115edb9b6bad09ad47316e7eb5821bc079cdf86f9441fecf73cc47bbd825fc0e70e9e859bea65368584671952159b7d3dd6e18818982e4dfcaa18
+EBUILD busybox-1.33.1.ebuild 9466 BLAKE2B 81dad4531ac36a23e88646ccd3f19a26d6ae199d46313f9b9b792fdd2139f4ad5710fb9bb611fc773cbd5ffd20fc76cea09785b5581c6dc95f16817c6f01e60a SHA512 b8cfc1a8d4a14cdaf3265acf8ce4e9880c391bf00cd35d9a2cf6c94a56e3d7869fe7fec49a756b81ac4fb9a2c8977fdc9e3312b625cdaa274d1b818c58f805c8
+EBUILD busybox-1.34.1.ebuild 9747 BLAKE2B 77ff2f04e7fad4645630ef1ac927b0da8c26613b090c67656782c84464d44749aa4ee1a68eaa314706da4a0ee33dae5588a5908033f81263624ef0b931d3045b SHA512 9d26e2d9e9a3b9ff54fe60e6e1e906e93e0fa491a9b0d933bf9d7b583439892e63829d4fd7cc09b2cfd72b5af924658330861608dedb8087e1dd7e06cee140c3
+EBUILD busybox-9999.ebuild 9755 BLAKE2B 033117820f02f5410f1ad401200e3cad41c923cacbcaae25f76fff135704d59afda1fd3c40718f7aca3b4bd1e09c4d5bd8eed34669461bf41b9e850d3e3f62d3 SHA512 c4356aa2c0b3b317e005c653476c19ca31215491b4604720b59183d58cbe16997c09abedc0d397b9b2e4ade220e23e4bbc969b9edb8f8e09f7ea0ef08c014108
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.32.1-r1.ebuild b/sys-apps/busybox/busybox-1.32.1-r1.ebuild
index 1c5b765c9cfb..962ff5a9bfeb 100644
--- a/sys-apps/busybox/busybox-1.32.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -141,7 +141,7 @@ src_configure() {
 		busybox_config_option n FEATURE_VI_REGEX_SEARCH
 	fi
 
-	# If these are not set and we are using a uclibc/busybox setup
+	# If these are not set and we are using a busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
 	busybox_config_option y SH_IS_ASH
@@ -165,12 +165,6 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.33.1-r2.ebuild b/sys-apps/busybox/busybox-1.33.1-r2.ebuild
index 4f79e3d15633..169995d3ca48 100644
--- a/sys-apps/busybox/busybox-1.33.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.33.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -149,7 +149,7 @@ src_configure() {
 		busybox_config_option n FEATURE_SH_STANDALONE
 	fi
 
-	# If these are not set and we are using a uclibc/busybox setup
+	# If these are not set and we are using a busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
 	busybox_config_option y SH_IS_ASH
@@ -173,12 +173,6 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.33.1.ebuild b/sys-apps/busybox/busybox-1.33.1.ebuild
index e9062e18e44c..1ba499654370 100644
--- a/sys-apps/busybox/busybox-1.33.1.ebuild
+++ b/sys-apps/busybox/busybox-1.33.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -141,7 +141,7 @@ src_configure() {
 		busybox_config_option n FEATURE_VI_REGEX_SEARCH
 	fi
 
-	# If these are not set and we are using a uclibc/busybox setup
+	# If these are not set and we are using a busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
 	busybox_config_option y SH_IS_ASH
@@ -165,12 +165,6 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild
index b1a831ef90de..693ba522154c 100644
--- a/sys-apps/busybox/busybox-1.34.1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -149,7 +149,7 @@ src_configure() {
 		busybox_config_option n FEATURE_SH_STANDALONE
 	fi
 
-	# If these are not set and we are using a uclibc/busybox setup
+	# If these are not set and we are using a busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
 	busybox_config_option y SH_IS_ASH
@@ -173,12 +173,6 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 4a2e50fc5d8a..9cca9167e60a 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -149,7 +149,7 @@ src_configure() {
 		busybox_config_option n FEATURE_SH_STANDALONE
 	fi
 
-	# If these are not set and we are using a uclibc/busybox setup
+	# If these are not set and we are using a busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
 	busybox_config_option y SH_IS_ASH
@@ -173,12 +173,6 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 8db439c39eae..90489a6b9f21 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -3,6 +3,6 @@ DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d013
 DIST checkpolicy-3.3.tar.gz 69286 BLAKE2B f22cb1b0dae5a89c0abb500c2f091beda7960493bd0dc3b9cb5bc8d2d08d507870e5db46f53ad87d0ddea5e3bbdb6c721a5c5e6824b37f554049000392af6a6d SHA512 40e7ccd804aa19f229eb76bdaeb79c87ed19004ac7b91674ecfb92d543573dc26f9d456ea25ed1e0ef8e1a69538e41c68b386a0743023f3ea83aa4350fc3ce30
 EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035
 EBUILD checkpolicy-3.2.ebuild 1017 BLAKE2B 0e0e91e52e8d29d930d79dd06315d5a541084fccf921fb0f4038a298d699584a21e394e8a02e4e557b9e2dd6292a0ddd854138e8e7bf2525c0563f2a64464a6a SHA512 d020aa3670ff300a88b881d03882fac22b8c52209c751beac90323ff729c90f48ee063476f68048f1ebd7ddf75d1a31017e89321fe615877f0ec6f61e48301f2
-EBUILD checkpolicy-3.3.ebuild 1021 BLAKE2B 6abe22c0fc3c4985f29f566335121a42227b70f7704adb1a732f2ed2591ccd35bbea6a81c3ce9b1b866dd87b9a43257153c0ce5d4e2bf34b910f6b9e3acb5bea SHA512 5c875d640ccfcde065e1ea2800a7e8759a4ca0a62f8df0d6b82aa732e80e29ba594c3dbe7b1aa0f7506f44a00b897322e6204e1b8c7d365ac75ac6935cb110a0
+EBUILD checkpolicy-3.3.ebuild 1017 BLAKE2B 0e0e91e52e8d29d930d79dd06315d5a541084fccf921fb0f4038a298d699584a21e394e8a02e4e557b9e2dd6292a0ddd854138e8e7bf2525c0563f2a64464a6a SHA512 d020aa3670ff300a88b881d03882fac22b8c52209c751beac90323ff729c90f48ee063476f68048f1ebd7ddf75d1a31017e89321fe615877f0ec6f61e48301f2
 EBUILD checkpolicy-9999.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sys-apps/checkpolicy/checkpolicy-3.3.ebuild b/sys-apps/checkpolicy/checkpolicy-3.3.ebuild
index 377994434a35..bba94c05097a 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.3.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest
index af7e91495477..71ece2aca394 100644
--- a/sys-apps/edac-utils/Manifest
+++ b/sys-apps/edac-utils/Manifest
@@ -2,5 +2,4 @@ AUX edac.init 336 BLAKE2B 7ebffaf4d4431977d607448f43beb5f17903e28a1aef3a8445e0c8
 AUX edac.service 230 BLAKE2B a38c84a994bcaf884ed1a23c406971c57c4353a226029d5c08cd71481ca888dae91c5a6c6422a20181319c3199d2e97fb1985a05415ffc9f1cdad318281f50d6 SHA512 de8838c5f2227e4c81c8b571dd117ac90aeabeb082b767e84bd208a80c24496f3bd5105fb15fab890ea3224616646a882d12dc7c37af6d0e554f95cd8d081b7d
 DIST edac-utils-0.18.tar.gz 285909 BLAKE2B 7d2662daf94c4ff796760b4863837861015397016bb79202baaa194608b61450d6749981cec621571267ac818a09af758167d2d768513e7d5bf7e763aed7ee51 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa
 EBUILD edac-utils-0.18-r1.ebuild 1198 BLAKE2B 276719d66ef2a654537f0ecae6c5915e5e14b98dbf047c1dea3771472785950a1ffb0545aca2c61c04182c0e23c9c91decd3579bcfeef5405e1413e1afb03ec0 SHA512 f64b23c7f30beb4e15d39c4b266773963da87e5db07c8381df1778a75e271b2a1a4f336d76e015656228ee0f3ee93588259aa0ca6de5fdf5c82df88ccb15ddfd
-EBUILD edac-utils-0.18.ebuild 1111 BLAKE2B ba93435dbd30940dedaafb83540e36352ae99b3449a5549a1d09404be9a5ef800e082d457f24d95b430a9f629598fa224f81ab511a34e7eb15307bde34271c17 SHA512 4b2827907f8f45d01a08026a11a8dca5762b7fab6e1a4bd4852a945325714efb1e670c751288d513007584b49256fe7b6721fae9f3457d151aec89b1166d6a7b
 MISC metadata.xml 322 BLAKE2B c1061e042359164cc6c5b8e415531fd42abda781fa2590cb3efe97e72e3d38c11af9bb5eb2594a2c4f8ef5f72115e3036caa188f6231211b5bebc401bb7baf1c SHA512 83d32053df33f00dee91b75e4e7a626871cb8e96ed002623f9df67cb2065a8f8a4c8264598d3e9e908b477d9c7878231661904f2c822a22c109aaaccc285f04d
diff --git a/sys-apps/edac-utils/edac-utils-0.18.ebuild b/sys-apps/edac-utils/edac-utils-0.18.ebuild
deleted file mode 100644
index c4aa0a9e04cf..000000000000
--- a/sys-apps/edac-utils/edac-utils-0.18.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Userspace helper for Linux kernel EDAC drivers"
-HOMEPAGE="https://github.com/grondo/edac-utils"
-SRC_URI="https://github.com/grondo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="debug"
-
-DEPEND="sys-fs/sysfsutils"
-RDEPEND="${DEPEND}
-	sys-apps/dmidecode"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||' \
-		configure || die
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	# We don't need this init.d file
-	# Modules should be loaded by adding them to /etc/conf.d/modules
-	# The rest is done via the udev-rule
-	rm -rf "${ED}/etc/init.d" || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "There must be an entry for your mainboard in ${EROOT}/etc/edac/labels.db"
-	elog "in case you want nice labels in /sys/module/*_edac/"
-	elog "Run the following command to check whether such an entry is already available:"
-	elog "    edac-ctl --print-labels"
-}
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index c4d4d5679ed9..789ef6254b7f 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -3,5 +3,5 @@ DIST ethtool-5.14.tar.xz 318536 BLAKE2B 09b5c9c8103635e33b22e55caff3b0f3751bf14d
 DIST ethtool-5.15.tar.xz 318864 BLAKE2B 855c07e388bfabf37637f20e2714c6ca27717f38d7f658be96e0e9ec9d4514e61f4ee29361fc0279510869606ad18126ccd2a47160f1097ab52b1e35216e9721 SHA512 28147468a92c179217b459907a3257ee4f2d2ed028cb87b074f1c7ca6eb91aca81c8a9f5c7fe74e81d16a516e6e7eb20137bf7a15b5479fd82a327c64954da12
 EBUILD ethtool-5.10.ebuild 583 BLAKE2B bbce36771a7b34b2b62b533a36df3d4039b913ac36e34cbd63fc5a28e7d717cb8449d65c1cc0cd80353f55ad3380eea3fa9d9f2cfacbc574b172bcff7f7e8910 SHA512 79631f2df71aa0c831e92578dac932d49f1fa9b946b9450d7f61d8fdf14dda1a218e79bb51ffc1ebe9534505c68ddaa9d547c7c8b6c2d271c1ddc34130e5fddc
 EBUILD ethtool-5.14.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
-EBUILD ethtool-5.15.ebuild 592 BLAKE2B e248f09a9dbe27e49b5e955d5f6cb98f214bac27589dfcb8af1d74d63d9edb5e2c27959cf45cfd9cd519800df9d3cf6ff5b8645613f2eeb22ea3cc0490af4867 SHA512 73891906dcdcc42dd62d780b571e766136bd10d3db1a4901fe649ce98d68ea2e0f3f9951fc2f6b1f4a229d2c46db1dec8b9ccbd415ff27cb0ceeaab6fa4d3dc7
+EBUILD ethtool-5.15.ebuild 590 BLAKE2B 8850ed177a2ac5d814239e4eec4c72a216d562496cda15c1698aee52784a60ef82d245e65fa66f712c66310e2bf33967834e741c7add499ce5f1c69b9f7c0245 SHA512 919c114df09392c26db2c1ecfdc7cedb4ded632c00c4270b6f9405b51559ccb7928d55e65ef5f4cc06d177674016774ee440ea92dad88da86fdf7e3b461d3af1
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-5.15.ebuild b/sys-apps/ethtool/ethtool-5.15.ebuild
index d5e44fb2b182..3b0186226f11 100644
--- a/sys-apps/ethtool/ethtool-5.15.ebuild
+++ b/sys-apps/ethtool/ethtool-5.15.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 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+netlink"
 
 BDEPEND="app-arch/xz-utils"
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 7ef0c70a80a0..eedb4f9a8c8d 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,3 +1,3 @@
 DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b
-EBUILD fwupd-efi-1.1.ebuild 1069 BLAKE2B d243fc64a0a1110e777842b6343b1cb3dc893883a0220a3e4b39b37b6ae41e7286b3d900ae1d797f75bf369d90cb97a823e92b6b188a9f598e07b774451d4416 SHA512 c8b2270bd1abb5f9240f15c4524ad8c1c80ee98ba2bdf6a225755c375baf2ed0014a231698292127f0cfcb186f63190a7d9334946882df9d42d78b134c92030c
+EBUILD fwupd-efi-1.1.ebuild 1067 BLAKE2B 2dd3c612da1d7fa6603aa6df5589c6d04f3d73a2256952c991114e93842bb0a9f020843416a9fecd44af2361b62a76c91a8dcec8abf97c55717bd58a26a49694 SHA512 014fb50779f0f0dced8f8a6affe6cc4b12171f1e24562f6c27539e458e9ca6396a59e9db18ac1e320cfd05d1a413674be3099b6331087e13ac2b82271ae0bc48
 MISC metadata.xml 507 BLAKE2B 247253c7682dae9c6423a8f8eb1d11eddf45f33a506bbda2cf4aae002a1bb17ece2dbe63fc1fc9a43ada46d804a9c0155889e52e7aa15427de267b1a7c94bbb7 SHA512 8ef697c8ff7316545d9aa7d00388072ed754e5add441bd05fe6cd8179b26790a3d08b9f00df14b7cc8a53a43b93714a29ce05f187f7906da86a4b320ab36e9a8
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild
index fc3aa3397b23..00464ef3dc85 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
 else
 	SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index b94d3ae7a804..30fd9c0e2b31 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -7,5 +7,5 @@ DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a3
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
 EBUILD fwupd-1.6.4-r1.ebuild 4477 BLAKE2B 899806f95e598ce0823a8e5af810b4edc5387884393e03fb51f3fe81cf37eb2f4cb96ec8461b20a4d0b016c142a9cb05113fd1fa6249a6883b0d92b780c37e02 SHA512 71e80891822d1e1a84cfa742ddde3fd7d6213ec9374fdfc7153db66d18129be99fb4eac9f137aa7b246dc9643dc6ffd50a9b728e9fc6b989a955b31b8417c019
 EBUILD fwupd-1.7.1.ebuild 4607 BLAKE2B 2a4f91e570ce3d7f0c204e46e7abd02fc78a8828392610ab94e4e721a4ade946477fda9db231f59cf929b7e0e7539d2ff6821084306aa6defc3c890fbaa6532d SHA512 969c631fa511c55473d1521d886c74de978f139a77de701f37404300ee33cf987ba44bc07a4b634a9ad3c7d8426efca21d6f10af560495a5ff96e899dbd0402f
-EBUILD fwupd-1.7.2-r1.ebuild 4537 BLAKE2B 65467912a05779dc240c443ddbcffb972920ef8dc167d39dce5c2aecbc3807f489f8552f7b03142ea9794e8c559c667d955564e29c131e79eae61f53ec55e1b6 SHA512 b255f982ef1a225cd93ccd7ccacb2e7d593f72d4a9326a62c5f73c862ffd1ee95f52bd0b87a026a98b3a96e1445953ac4182f43beb5b732f1c9ac4a0f058c3f8
+EBUILD fwupd-1.7.2-r1.ebuild 4535 BLAKE2B 898b3f41ff92047a092f791d025bfcad4aa587eb4e0dea0f9093683e901defa1a24c3db04ab8ca2fa05d6d61a6342da40d26ab876a2c066392c98c65cdeac1c5 SHA512 fc1212806ddc26ac1472be2a182263eff6f28249bb72286b93cb41fdbaf6ea6584e4c85307f9e93083477c52b7369297ff4887c5de17291768038e657bb74331
 MISC metadata.xml 1493 BLAKE2B f75354ee9b89d3be913749ffc0d1e8d0d57946f1d785d6cbdab3c6670c790e99666c1943a662d0f5f054e22d3b97e1f8e739640efc5e04659d0a6723ee35b279 SHA512 6ea568ca9c8cba4e0db1f6c06d5e57f539602e5bfa1ce9be2fb9fc7107e1e42dde715c7bd0737ad60246569b0e9fad275a4c451c427451b9692410becb3b05d3
diff --git a/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild b/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
index 020a288c2927..5aef904b6ca8 100644
--- a/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 11dc545a3bad..4f76d9d14909 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -3,5 +3,5 @@ DIST gnome-disk-utility-40.2.tar.xz 1387320 BLAKE2B fa5df2f3c18a6635e41fdbab7382
 DIST gnome-disk-utility-41.0.tar.xz 1401088 BLAKE2B 78769a714a8e5ee5596da3502562a7a136f54c7b832f44b8b70bae60de42af9dda433c4acd3b74ca31f71e53a633f2888c4e21d6ce9d9ccf2a03485903b3985f SHA512 a78dd281c078046abef5c0986777c6a87bc27d9b1bd6e798b5be058a3352b33dead8f5fea6e8f30e8c61bdd21996ee7d784838d953a33973243faabd7b713895
 EBUILD gnome-disk-utility-40.1.ebuild 1415 BLAKE2B 6ffbd4a575fb6fffc8e41e1e131bbd4b20c3266b19c70ffc07be2d1e1c7c2e38eef9b3539f22d7f511fd03743c86a4ad3a61a056bcdbab7abdef966b264a3e15 SHA512 2dd1b065e38589751bca0692fefd154d3e265b6ea30efa3a24f4f83964c737acb1ed9922bfde59dbf18688829b2bf06ce9401459fc41e1c648d88c287b052b34
 EBUILD gnome-disk-utility-40.2.ebuild 1415 BLAKE2B 6ffbd4a575fb6fffc8e41e1e131bbd4b20c3266b19c70ffc07be2d1e1c7c2e38eef9b3539f22d7f511fd03743c86a4ad3a61a056bcdbab7abdef966b264a3e15 SHA512 2dd1b065e38589751bca0692fefd154d3e265b6ea30efa3a24f4f83964c737acb1ed9922bfde59dbf18688829b2bf06ce9401459fc41e1c648d88c287b052b34
-EBUILD gnome-disk-utility-41.0.ebuild 1417 BLAKE2B 1dac5bf2964ef979ea0b72d13b17f7409bd2558c20909a028aa58cd716bd60063a018d869bd75543f65a28d4724a881b437204f0511d4456e69c4c2e01cdccd0 SHA512 c266092beed51eb7747ec2c4ce6e68b5749a8885f26ea736236b6aeb7c5ad9a436a693eb9af4b8e6c051d7a377f984ef4d13d2a445e6d5581efde84faa65e4ff
+EBUILD gnome-disk-utility-41.0.ebuild 1424 BLAKE2B bdcfdf7aaf11bd82fdd0804bda715c845743997e5723aaa1dc3e689db141dbe5fc337c6918eb81e33d2b5fa01dd4ba4970f729f295230bda1102b4534312f7eb SHA512 c0ace5b55f944b654ad0f3d7f4ce5f802f49e5b1e7ce02c97cc5fe78191cecf0eb52a6f17532394206f4c7eb020980069b7eaa7661b9058366edc66968ddaf6f
 MISC metadata.xml 598 BLAKE2B e9bd803739e63d5667cf9d84b27af2efeeac8e31591d022cfce00fa147f4ee267ea2c03624f43c2d822c00b853b1606f6663814a731182aaf557be259ab2fe45 SHA512 fa5f53e258f9db1447b28979f655b6794491af9eafd0d6f113d43fd2073d36fcedc126fef7fde4a21b99e2ad11e4442c7c333d9dfaeee92064b0de23c071c23e
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
index 3192512980a0..8a105cdcc510 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat elogind gnome systemd"
 REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=media-libs/libdvdread-4.2.0:0=
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 08761daa70cc..1150689380d1 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,10 +1,8 @@
 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
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
 EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B 0518fb6472ee433835781125b914e68c788e5d219c5a120ddf99df6d3770de279c769a0c4fdfa6638a0b747190adf9f32e090cf1f4ecfc5d678a8f09dcb22058 SHA512 cad8bbd45d68521c0e5aa1fbdbdb763eeafdcb7b406aed1fd1d61dde9285d523da2e031c907f9dc5729d921298dafff126a1b493b66b21f0c7bd00e67f50d03a
-EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
-EBUILD hwloc-2.5.0.ebuild 2927 BLAKE2B b55f392b146a4c650c6bff2efefbe486310d8b5bb89b356d4d890d5b3065f76ffd020458f104addc7dee721db55e87f92cb9e43c6b7fec8271f0d713c7a5519c SHA512 d1525f36a8e4bc523261414959ff71c48d5170fdf1d72dae8a748d5e5a4934e20c36054fae276c272234671bc0b93e83563e9f8ca5e5e1dca3a708ca611f02f9
-EBUILD hwloc-2.6.0.ebuild 2978 BLAKE2B 4c2bee72a5dc36d0f21a1bae9f30bcdb776841aec10ed1f85f310c381ac3e67e1dd2b7c9039b09350a9e3c695e8d53414269429d3ff065a0a860f06e77343f4f SHA512 e314467f21584298bd9143928e22f5a0208933ea16a7c2738d7acb0a4ddb802f7aed8395cfaa3a5592c4ab4d4b7db904b5706c513a82251b36c2987fe377a534
+EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B d31578704690fd2ff24293a7a0ce316c1e04aee68f6e86646b90af3985f0719207ceb5273074e023d078cfe7e6ab43f1b353aea369eac06cc8d7465aacb300ee SHA512 ac6f807ea342db2a296c352b98b92185dc4f8133271814984329afc2b86de88936d4c27b51fda98ddd91c0877f02225d023f6c75ded8f99bc51ac6665c0107d0
+EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B abf59e91fdbceb69f173417ebde9008a2e0db5d71a97dd722715c3a06afcef851664b4878d9e1b82e1ebe30c88eaf889b1d6b28d4768470e946ce6c76e375ffa SHA512 7be8ba3134564367ac352c0c3f17ec45f93a7d57b8a122f55310e3e0e293a7b8fbaab15a3ede77147db4cfe01aa0b2f973da25e34a092e0d8eccb23f4004a004
 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild b/sys-apps/hwloc/hwloc-2.3.0.ebuild
deleted file mode 100644
index f98a08eb4cda..000000000000
--- a/sys-apps/hwloc/hwloc-2.3.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
-
-MY_PV="v$(ver_cut 1-2)"
-
-DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
-SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
-
-# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
-# Anyone with hardware is welcome to step up and help test to get it re-added.
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
-
-	cairo?		( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
-	cuda?		( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	gl?		( x11-drivers/nvidia-drivers[static-libs,tools] )
-	netloc?		( !sys-apps/netloc )
-	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
-	pci?		(
-				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-			)
-	udev?	( virtual/libudev )
-	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-# 2.69-r5 for --runstatedir
-BDEPEND="
-	>=sys-devel/autoconf-2.69-r5
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
-DOCS=( AUTHORS NEWS README VERSION )
-
-src_prepare() {
-	default
-	eautoreconf
-
-	if use cuda ; then
-		append-cflags "-I${ESYSROOT}/opt/cuda/include"
-		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
-	fi
-}
-
-multilib_src_configure() {
-	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" #393467
-
-	if use cuda ; then
-		local -x LDFLAGS="${LDFLAGS}"
-		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
-	fi
-
-	local myconf=(
-		--disable-opencl
-		--disable-plugin-ltdl
-		--enable-plugins
-		--enable-shared
-		--runstatedir="${EPREFIX}/run"
-		$(multilib_native_use_enable cuda)
-		$(multilib_native_use_enable gl)
-		$(use_enable cairo)
-		$(use_enable cpuid)
-		$(use_enable debug)
-		$(use_enable udev libudev)
-		$(use_enable netloc)
-		$(use_enable nvml)
-		$(use_enable pci)
-		$(use_enable static-libs static)
-		$(use_enable xml libxml2)
-		$(use_with X x)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	case ${ARCH} in
-	# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
-		amd64|x86)
-			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;;
-	esac
-	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
-	bashcomp_alias hwloc-annotate \
-		hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
-	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 62f46fe05946..a62d172fdecd 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index e9b6ea7e9d16..b35442059218 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 824aba2bfc81..1fa9de4bb803 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -8,7 +8,7 @@ AUX log_bmc-1.8.18.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920
 DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
-EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4436 BLAKE2B de20f33696308e174ccd4a8b391ed630ad9f77fc2418fdd8561710b21b4f7b1095677ad102f4981c0e6117ae1619b3a932e0d83d6e73eafe7d92ba0fa5c52639 SHA512 12142187e7f9d0e755718c7f0e89775e9b4e5aec46ce55e80f7f64ecd24519c0e7bfad9ea989a079a3000861f3e193a8d4efccf782e8f1d62e0c91ec4e5100b0
-EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6164 BLAKE2B 51d6417bdaa6e5bb0ce21e6fafdae5e3a02bab2ab8445f277336cae43fd7770b0fc0429e78acb9a7df9d96042f01bf7c0a79955a17a48a7ed56c323a54778f4f SHA512 0ef3d4001062709526390afdd9247d23b2d1baabf93e57a54c40bc75b0425ab92ffa9347119158b6b5b7c71a9bc7b36293a8995d3889c848ff1a78c5f15641dd
-EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6256 BLAKE2B 43343972887efeee8278066fc5c84f4f0486b9822f56147c72780fe2a4d2d1c6735da360e844310b91201204682e4e34cdaa853b8d05b38b66f4c51c7e1d02bf SHA512 43e46bf09c84de695b4030fa699e5bebf833d6cbc597c2a29273d23ad76e01d9dbac5f8d88b294fb96c073f8d048abb64f9fcd8361afc88eff71b4a02ab0ae1e
+EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4435 BLAKE2B 77a8db74628e550e535339166858f479648094d35f649e433992fe07de2089e1e0b48b99a7b8c5a29c9fe33a78bc113d7397e0a091380581ee4c3f00a62c8129 SHA512 eb1e6f5d26fbd3958cfca2d2c7cdc4cd8f3e553d0c793aa5ea6efb56740db3c6c04dc32c36f8e356ad4a79288dd2e4725a15cf93dc870e90ea6068bc374e6f0f
+EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6163 BLAKE2B 64167cd15bf34dd321f613c4036d33f3aa122e039ad39ec5e51643e11a6be99fd318da1f9d9ced88fe27f40078cb0010241e0c3e1f36c891bed530c33314c4de SHA512 debaa9a8d1a01b1f07273cb7828a27090001721268c7292c800ad4eb04a97e0112638897287e3066263dbcc16835134e6c5f44786ac9ffe97b46cf288ca3727f
+EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6255 BLAKE2B 4b3a32c6196899a8d0e103f2e943cb656911724973f1375721324596433eeb3191a0d44dc703f3a2372cbf3ee5269ef23d8c340511ccb5738cf18a960a8f7df1 SHA512 65a49f5dfd4db37df17bf9384ba638ef5a7744e1d3ce37ae072ef63cd3494edbd650e636b2743ce6a8fe214b956e7f4c3d632e87e2b4bf5b034aba9edca5dd9a
 MISC metadata.xml 634 BLAKE2B 8f56c8e88bb4147ce99d881ccc9f3f9fba657be1bd9abdb9d646456e2f7deedd3f7ab484b5db339288021cf692e21ca9a0030cb884869676346dbd22cf60c41f SHA512 b2eb0b961fb7cedb0f293db8974e093a03d8b312123c36ce1d451b8a0b34508ad12a2c8ee0704649c30dfd6a8b1a03c7a021d55cb9da6983648747399982e801
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 93f7d10f73a5..afe6d33c7255 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit autotools
 
-DESCRIPTION="Utility for controlling IPMI enabled devices."
+DESCRIPTION="Utility for controlling IPMI enabled devices"
 HOMEPAGE="http://ipmitool.sf.net/"
 DEBIAN_PR="9.debian"
 DEBIAN_PV="${PV/_p*}"
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
index f7c83a27944c..8b34a72624bb 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools flag-o-matic systemd
 
-DESCRIPTION="Utility for controlling IPMI enabled devices."
+DESCRIPTION="Utility for controlling IPMI enabled devices"
 HOMEPAGE="http://ipmitool.sf.net/"
 DEBIAN_PR="9.debian"
 DEBIAN_PV="${PV/_p*}"
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
index 3d8308829c5f..1c0c8b005757 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit autotools flag-o-matic systemd
 
-DESCRIPTION="Utility for controlling IPMI enabled devices."
+DESCRIPTION="Utility for controlling IPMI enabled devices"
 HOMEPAGE="http://ipmitool.sf.net/"
 DEBIAN_PR="9.debian"
 DEBIAN_PV="${PV/_p*}"
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 7f0e3bb19cd2..1be7cc2e0470 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,6 +7,6 @@ DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc244114
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 EBUILD iproute2-5.13.0-r1.ebuild 4864 BLAKE2B e62ccfe102bad1106e0345e5a986090408c8737ec3b96815250c07d54ef96fc14531d21a2389de46f68d64102a97568096038dadf4c899c0f1ad7f5257381d8e SHA512 681689226fda0bdc8947e2c26420cdad6e971eecb9816a562002fa6e2ce673859ee2b648bb83c9be6bfa3f86033314063b214dc36980ffedf9627ff4f5dfe889
 EBUILD iproute2-5.14.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
-EBUILD iproute2-5.15.0.ebuild 4996 BLAKE2B ab55fdf0ff2d208c72d8be4b41bcf656d91ff6c64e0b76f4bc8b1729c551d07426349fe4c8b3940a1f2e374c2eca7b79f7caa533a7a89fdf321accc5dda62e58 SHA512 101b23e2bb54d6534c1863d0c761ca69d38e10b34fa380244e98c4d9b94a744ed0cfd0819d2cc1d49c166c53502455ba2c662526dddd68319652ac5a6d90af59
+EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
 EBUILD iproute2-9999.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
 MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a
diff --git a/sys-apps/iproute2/iproute2-5.15.0.ebuild b/sys-apps/iproute2/iproute2-5.15.0.ebuild
index 7688ba0d4564..0ba17bb9fd47 100644
--- a/sys-apps/iproute2/iproute2-5.15.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.15.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/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 413908bc7c94..545895b197a5 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -4,6 +4,6 @@ DIST mcstrans-3.2.tar.gz 44596 BLAKE2B 6738acbcb7c25ec67b8d14cd166c601c7790d2833
 DIST mcstrans-3.3.tar.gz 44621 BLAKE2B 624780c219d0b8f369def5ab334caf9d2ae847f9cfb4359ce38e240bcb72b7cfeef45d08cd6e7330cc90394f6c32bd622d2133e675036f98992145b1530ab1e2 SHA512 2157a0361bb5a2bc8e149373b2dd7d9b042f8c4c0aa845ae6967a23d9b875d2dcd6176d99d7f8f15e17eb5877fea60814e19aabfe76950d25b75c9c25df811c2
 EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78
 EBUILD mcstrans-3.2.ebuild 990 BLAKE2B 5727f7797e09a3d4fd2783fb0386389b9c5d4cb436f3d920ada8d94bc45a4f2645787d7564f95abe39128ddd31763fa67584b2d66156c8eb41525f78d082c8c0 SHA512 c4a5958839c8aab262a8424b2228fa7b503a6cd1d39986de47cad689b241a279f05c7db7551632e767090d8ab36fc065b8400d7ef6a22047d93039a59bc77abf
-EBUILD mcstrans-3.3.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
+EBUILD mcstrans-3.3.ebuild 988 BLAKE2B d4fe2829c039c8871d19cee9a9d50e26bc8b9961ebc2b8d4a77c950b30d573eec52842e9bdef80c43f9734530be2311d8d76190ffb5439bd5fa39133d0a484ed SHA512 d40639217b41c04f1e43c826b7304ad67b9c375d3ec6f3ba5019e52f36f689a5a97dd370ec73d652d82b8599f932f7cffdef76498f09451fe7e722d95aeb2d5a
 EBUILD mcstrans-9999.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/mcstrans/mcstrans-3.3.ebuild b/sys-apps/mcstrans/mcstrans-3.3.ebuild
index 631d654a0a38..67f5284fcece 100644
--- a/sys-apps/mcstrans/mcstrans-3.3.ebuild
+++ b/sys-apps/mcstrans/mcstrans-3.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DESCRIPTION="SELinux context translation to human readable names"
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 8ea5c56f41e6..262c3ef217f2 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,8 +1,6 @@
 AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647
-DIST moreutils-0.65.tar.gz 93180 BLAKE2B 2105cc281b9f4c9598bb0cdd5a4b9b8042e77eb14de323ba889c182c956b00d7b8a899c4112542e0a3d513fd961ee0ed6c82dd2dbefffe50e1d4fd326919ef4f SHA512 dcad2a3b6d9621da6d2f860f39acb04c80d42cc2123e12a6ec84524f6a1fc7f5ae4bd5d00e698fe14d4c5e7d491d790970ce4370c9abd1f63318d1c512f596b9
 DIST moreutils-0.66.tar.gz 93387 BLAKE2B 783ed558f0f77c2b384a1aa8852243242ce24e44e40b58f92e2179308df9cc3a27142820a7743c25ba4529a4b7ea7ae20c1fc02b86324638a7d13ad7536c6b21 SHA512 6c5f8b677d9912cf4e7aabf442361c89d23767f2a5df0a2c29ab72314e1ed3767a0a7a7abaa5044cf73ef877184d16e1d58e340780971e9e1299857756aca6a3
 DIST moreutils-0.67.tar.gz 93627 BLAKE2B 4b8788411f1300ccffa10a52a327ee676b2a241531dafc2106495977ffd29a5b32c91c0afb6425b5797bfea04fa98a3cfd69e034cffc2fb255f5e8505d3b3474 SHA512 3a395fa80c1c1d769ec078cbf9455952201a364d8264796c6443a397ed7fa4f08250ecd140f047cf2e9533d6fc5310b3a579a7c083a5bc4cb4672d39c35dab75
-EBUILD moreutils-0.65.ebuild 1695 BLAKE2B e7804204f2162acf5a551abbad7a622def057c100cb04cddb4abdcd8169ce1dbf658f4e578af097a7d3e22cc10cb7b62b5a35eec647be273d9c57e5b318e3905 SHA512 4bc2cfba306082fe2dac9c3e43f25eaf66e3eea69b5ec4ac88c6237d4bd624fa1aa2a162e3be91766c38cfa12cae50f8cbfc4382aef96b47f8ce9b28168d8ea6
 EBUILD moreutils-0.66.ebuild 1695 BLAKE2B e7804204f2162acf5a551abbad7a622def057c100cb04cddb4abdcd8169ce1dbf658f4e578af097a7d3e22cc10cb7b62b5a35eec647be273d9c57e5b318e3905 SHA512 4bc2cfba306082fe2dac9c3e43f25eaf66e3eea69b5ec4ac88c6237d4bd624fa1aa2a162e3be91766c38cfa12cae50f8cbfc4382aef96b47f8ce9b28168d8ea6
 EBUILD moreutils-0.67.ebuild 1715 BLAKE2B e856f1587b8df3a9242febd1a60a777acefbdbfcf027951d8fb88997ac30ab10f7ec5670c5a0b44f84a9210fe75184ee0144ba52f4507d7f4a033ff0b6ec94bd SHA512 f04c034efd4e306d34f5d89f76114276120982395dcfab6d2a9170356df05a83debb4f76876b7710d86449e79ec8afb9aa1a888bb357f43ca101e2ee59f67b91
 MISC metadata.xml 314 BLAKE2B 41e19552cdd8289a03ab33f6fd514028d689236160501e2c84644e1075e957f6faeba6eacf163fcd624e995bd6ff7016e663e65cc753e7de3621aa46922a0766 SHA512 36a70c222b6de13c1245d0a95d097389e84ee7b7f55a08c62ca5c7c44bb51808f63faa10e81fdec7eff7bb680be32ed31bb2fd5362c5f35ba8fb92bb60a7ffe3
diff --git a/sys-apps/moreutils/moreutils-0.65.ebuild b/sys-apps/moreutils/moreutils-0.65.ebuild
deleted file mode 100644
index b540ade6601f..000000000000
--- a/sys-apps/moreutils/moreutils-0.65.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A collection of tools that nobody thought to write when Unix was young"
-HOMEPAGE="https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/"
-# Not available at time of release
-#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
-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"
-IUSE="+doc +perl"
-
-RDEPEND="
-	app-admin/eselect
-	perl? (
-		dev-lang/perl
-		dev-perl/IPC-Run
-		dev-perl/Time-Duration
-		dev-perl/TimeDate
-	)
-"
-DEPEND="
-	doc? (
-		>=app-text/docbook2X-0.8.8-r2
-		app-text/docbook-xml-dtd:4.4
-		dev-lang/perl
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.64-respect-env.patch"
-)
-
-src_prepare() {
-	# don't build manpages
-	if ! use doc ; then
-		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
-	fi
-
-	# don't install perl scripts
-	if ! use perl ; then
-		sed -i -e '/PERLSCRIPTS/d' Makefile || die
-	fi
-
-	default
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOKXSL="${EPREFIX}"/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
-
-	# sys-process is more advanced than parallel from moreutils, rename it
-	if use doc; then
-		mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die
-	fi
-
-	mv "${ED}"/usr/bin/{,${PN}_}parallel || die
-}
-
-pkg_postinst() {
-	# Try to make sure $EDITOR is valid for vipe (bug #604630)
-	eselect editor update
-}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ba085b23e70e..7f5e3ad6461b 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,16 +1,9 @@
 AUX openrc-0.44.6-fix-checkpath.patch 862 BLAKE2B 35aac37270c8ee779d2e3f0291e2f2e659cbebd6ab8e9cb4a7a0295a1a99331b94c86e411ddac98f415839781d2415771c7cc81d12749a6efed5396f54933581 SHA512 187f318b652d779252371812ae2b154e79e109fc1d4eadb8e86c9c83d639c1b03a106e2e982c4365b2204321abfb561421e8a239f1fd71281ee6dbad4e775e80
-AUX openrc-0.44.8-selinux-no-pam.patch 3543 BLAKE2B 394f173197f8c2fb83c3b7313420506f522c1fc94a3363a029c4293cea672a2d40f11d341409a379ad15fe86da917258a63dfc9a6c571cba5f45793da8a89f3f SHA512 13f9ffd2a8c320c0c129f5e4eb394198816d67132a2cf80edb9c283cf3cc758715521738fdba0da1175b1bb5a8c28ed1aa6518186ae5d9ddd60bb31ecaf0ad9a
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
 DIST openrc-0.44.10.tar.gz 254298 BLAKE2B 3cfecc27b560b8bb60d2104ab3dcf176b98677b65b829fa403ad2eb0e2e8bb0d586d374c336328a07c2f35e3abcb3f897cf5df142540a60fc09883aabd0ac79d SHA512 0e41f5268c6b8c325a6773511ca58c38ba52a1987aa47165794df8a99359bd1bfcb99d30e0d129b9242a2661663234f6f85c92c55c891dbb6c5b8a11d93edea4
-DIST openrc-0.44.7.tar.gz 255444 BLAKE2B 8058e1fd8fcce46f53e73b56ec8da5eec9ba0807d657aef4ece2d49056c02a451c41155df96b167ff157863a85d77eb63796715b5191dd1c6c631c8f859d3090 SHA512 c6b3e2e30615d97a5185320a140ced881bc59ba31ea8dff5d80440396166af237826de6ffc7836ec141e305c92176cd9cc3dabff7e42ac0d80e5238513fefdb7
-DIST openrc-0.44.8.tar.gz 255668 BLAKE2B 13d023ea3346313ded9f9bff729c296a3317577ddc58cadbe57429833075776a3a3dc52dfd1c9e9721407b747df0f6471a81d12dc79216dc4b75222104208965 SHA512 ee8520b42df2f20cc770b9cc1a82eee4c7cb2e0d2e8b0788f5201e7c5ca864f414e97f679f3c25b808cb3641bc99cd74580dcd9777f4738f43adba65754ae679
-DIST openrc-0.44.9.tar.gz 254859 BLAKE2B 467f47e6bb09e0cea4c093f7516979112c2b70fb898a8030ef28ad78a20b89751256d545f21d295e948e791027c5b4b9e8b1cac244d3698161a449cc4bc1b38f SHA512 41488b2e699b1f66f334c4f90021b57a175ae1c9c77464bb747d38907a3a54cc1e48284484577d2f72cde8e4007b03e6529c549f462e8acdba8ffc796ac58239
 EBUILD openrc-0.43.5-r1.ebuild 5066 BLAKE2B b3e56275bd07558fa1b3a67e76c343d4368803ff8c806872e1fe7351667848640b722de86c5cac410d76e02d69a5adb764a942aafa180e22c4d79d7c90533e6e SHA512 8214a366eeb208c3f05302ec0f35a0bc9fb500951d102faa3010c0b8dc005d2d4a04609efd89351c76984ed18b0013e16367a0d257d809b667f69f981164dd46
 EBUILD openrc-0.44.10.ebuild 4387 BLAKE2B bc963720189c83f651237c52a55d907b2039c7447f9835b50e5f8decf4f3003aedfb5ac0bac5040bbafbe2ab739e41e267503b3d674031d7a32d8f5cd2dbba32 SHA512 1240620cbc33f7d6313278abe7aa6fda7ae99f8a74c882fccf1f7c4ca07311442952867c9f2e30e89830413daa54f606f4508fe0c494ccaf617ef4e17e20d81e
-EBUILD openrc-0.44.7.ebuild 4554 BLAKE2B 8617df340ef9cd5af23d2eae62dbdc1a91f91ffdb2428c9046d4f3b60062ee5f7873cc8c4665083241969eb8d13361c3ccda1bb0553b5c7b980a13cd564cb385 SHA512 420564d421fb8fd6cdc344a952226af1418d11da91eff05be7d175fdb8435b24b22dd8b179a137ae5851f71b300a805d591c784556e5a60ab3bb1773cb9cb6c9
-EBUILD openrc-0.44.8.ebuild 4467 BLAKE2B d02d3b2738cfbce373e272bd1ca0df976d16042bde5b24b932937fbebf7bd1263ff346ad473b6196cadde4605f8c743d87a4a819e4ecde86552c7855a36e60f6 SHA512 6098755fc5b1202c6785cd43c38763af40d75f211b1de3e640207cf84802682a34582bdbd31b9ee52c9ee9b66cb6fcfdc2dbad1dd41419f537627d7b9970637a
-EBUILD openrc-0.44.9.ebuild 4387 BLAKE2B bc963720189c83f651237c52a55d907b2039c7447f9835b50e5f8decf4f3003aedfb5ac0bac5040bbafbe2ab739e41e267503b3d674031d7a32d8f5cd2dbba32 SHA512 1240620cbc33f7d6313278abe7aa6fda7ae99f8a74c882fccf1f7c4ca07311442952867c9f2e30e89830413daa54f606f4508fe0c494ccaf617ef4e17e20d81e
 EBUILD openrc-9999.ebuild 4396 BLAKE2B 78a8697930e9ec5b4792cb8ad738a0b69426fd0979d15da3378fd0a1008a21b0df67d0ed43603fa4ad4a6fed03e8fd6aa04a629f41025582cb14f89b85e011f5 SHA512 2773b661bca4a7279cbffed1606c622c8d73561dbae40c1fe6ad67bebc71c75f0fc90e0ecdcc4136c313d12269319d825118a81f6dee2393e83dbd2d2c3c14a1
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch b/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch
deleted file mode 100644
index 28749433f69f..000000000000
--- a/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-https://github.com/OpenRC/openrc/commit/bd5cdaafadf997c0ab3c4ad362dbdfd7dc6fd987.patch
-https://github.com/OpenRC/openrc/commit/f3f0fde861b438c80f99afdd49fe175e9d0a68ca
-
-From: Sam James <sam@gentoo.org>
-Date: Sat, 20 Nov 2021 12:05:56 +0000
-Subject: [PATCH] meson: fix pam_misc_dep definition
-
-X-Gentoo-Bug: 824954
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/824954
-Fixes: https://github.com/OpenRC/openrc/issues/470
-Fixes: https://github.com/OpenRC/openrc/pull/477
---- a/meson.build
-+++ b/meson.build
-@@ -94,6 +94,7 @@ rc_sbindir = rc_libexecdir / 'sbin'
- sbindir = rootprefix / get_option('sbindir')
- 
- selinux_dep = dependency('libselinux', required : get_option('selinux'))
-+pam_misc_dep = []
- if selinux_dep.found()
-   cc_selinux_flags = '-DHAVE_SELINUX'
-   if pam_dep.found() and get_option('pam')
-@@ -107,7 +108,6 @@ if selinux_dep.found()
-   endif
- else
-   cc_selinux_flags = []
--  pam_misc_dep = []
- endif
- 
- termcap = get_option('termcap')
-
-From: Sam James <sam@gentoo.org>
-Date: Sat, 20 Nov 2021 12:06:37 +0000
-Subject: [PATCH] meson: link against libcrypt for SELinux if no PAM
-
-We use libcrypt's crypt() if we're _not_ using PAM
-in the SELinux code (rc-selinux, specifically).
-
-X-Gentoo-Bug: 824954
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/824954
-Fixes: https://github.com/openrc/openrc/pull/477
---- a/meson.build
-+++ b/meson.build
-@@ -93,6 +93,8 @@ rc_bindir = rc_libexecdir / 'bin'
- rc_sbindir = rc_libexecdir / 'sbin'
- sbindir = rootprefix / get_option('sbindir')
- 
-+crypt_dep = dependency('libcrypt', required : not get_option('pam'))
-+
- selinux_dep = dependency('libselinux', required : get_option('selinux'))
- pam_misc_dep = []
- if selinux_dep.found()
---- a/src/rc/meson.build
-+++ b/src/rc/meson.build
-@@ -50,7 +50,7 @@ executable('openrc-run',
-   rc_selinux_c, version_h],
-   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
-   link_with: [libeinfo, librc],
--  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, selinux_dep, util_dep],
-+  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, selinux_dep, util_dep, crypt_dep],
-   include_directories: [incdir, einfo_incdir, rc_incdir],
-   install: true,
-   install_dir: sbindir)
-@@ -85,7 +85,7 @@ executable('runscript',
-     rc_selinux_c, version_h],
-   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
-   link_with: [libeinfo, librc],
--  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep],
-+  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep, crypt_dep],
-   include_directories: [incdir, einfo_incdir, rc_incdir],
-   install: true,
-   install_dir: sbindir)
-@@ -95,7 +95,7 @@ executable('start-stop-daemon',
- 	rc_selinux_c, usage_c, version_h],
-   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
-   link_with: [libeinfo, librc],
--  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep],
-+  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep, crypt_dep],
-   include_directories: [incdir, einfo_incdir, rc_incdir],
-   install: true,
-   install_dir: sbindir)
-@@ -169,7 +169,7 @@ executable('checkpath',
-   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
-   include_directories: [incdir, einfo_incdir, rc_incdir],
-   link_with: [libeinfo, librc],
--  dependencies: [audit_dep, pam_dep, pam_misc_dep, selinux_dep],
-+  dependencies: [audit_dep, pam_dep, pam_misc_dep, selinux_dep, crypt_dep],
-   install: true,
-   install_dir: rc_bindir)
- 
diff --git a/sys-apps/openrc/openrc-0.44.7.ebuild b/sys-apps/openrc/openrc-0.44.7.ebuild
deleted file mode 100644
index 1fd2f3b212cc..000000000000
--- a/sys-apps/openrc/openrc-0.44.7.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic meson pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	!<sys-process/procps-3.3.9-r2
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_configure() {
-	local emesonargs=(
-	$(meson_feature audit)
-	"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		$(meson_feature selinux)
-		-Drootprefix="${EPREFIX}"
-		-Dshell=$(usex bash /bin/bash /bin/sh)
-		$(meson_use sysv-utils sysvinit)
-		-Dtermcap=$(usev ncurses)
-	)
-	# export DEBUG=$(usev debug)
-	meson_src_configure
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	meson_install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc ChangeLog *.md
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
-		fi
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.44.8.ebuild b/sys-apps/openrc/openrc-0.44.8.ebuild
deleted file mode 100644
index 619e1585c366..000000000000
--- a/sys-apps/openrc/openrc-0.44.8.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic meson pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	!<sys-process/procps-3.3.9-r2
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-PATCHES=(
-	# Backported from master
-	"${FILESDIR}"/${P}-selinux-no-pam.patch
-)
-
-src_configure() {
-	local emesonargs=(
-	$(meson_feature audit)
-	"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		$(meson_feature selinux)
-		-Drootprefix="${EPREFIX}"
-		-Dshell=$(usex bash /bin/bash /bin/sh)
-		$(meson_use sysv-utils sysvinit)
-		-Dtermcap=$(usev ncurses)
-	)
-	# export DEBUG=$(usev debug)
-	meson_src_configure
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	meson_install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc ChangeLog *.md
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.44.9.ebuild b/sys-apps/openrc/openrc-0.44.9.ebuild
deleted file mode 100644
index 8ced74993f6f..000000000000
--- a/sys-apps/openrc/openrc-0.44.9.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic meson pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	!<sys-process/procps-3.3.9-r2
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_configure() {
-	local emesonargs=(
-	$(meson_feature audit)
-	"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		$(meson_feature selinux)
-		-Drootprefix="${EPREFIX}"
-		-Dshell=$(usex bash /bin/bash /bin/sh)
-		$(meson_use sysv-utils sysvinit)
-		-Dtermcap=$(usev ncurses)
-	)
-	# export DEBUG=$(usev debug)
-	meson_src_configure
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	meson_install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc ChangeLog *.md
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index cf00a08b8ac6..0750de78c7c4 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,5 +1,6 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
+AUX pcmciautils-018_p8-musl-unsigned-type.patch 648 BLAKE2B dd82e800e032eb95dc1160424157f13f56ca8f000fe7c857cbaf40010dc2e65914e5d38ee8910607ea45859a7464d64f6aa9ff1f7b4c6a8412fc4d0ad2f10378 SHA512 7d140e327421f70007728e7330042dbf6d16988d6ecdc2372321a3d0a6e1c240549a5e9d110d9e6d5b74c1bdcb1caa13f52d3ad75a35dbf70d1602c46e50d358
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r3.ebuild 1557 BLAKE2B 90448cde1db5171cf70625a282053eae80e81a98b853a451082abedb2159acf374d27291580ec89ed6d2801799aaea3361d47ce50a45a24417de6c586d0f45d6 SHA512 504430423b2080260abe11f0010e92f54d8782ae03e230ac993647a405d8fa492fc8ca0dcc6942cc6324be7db2cba27188329ea47e5ca4fc968c247a84c6b2a1
+EBUILD pcmciautils-018_p8-r3.ebuild 1632 BLAKE2B aaae3b06f9288c32cbd42721b522c9ca4a46166d172b1e862124672b013cbc9e25c4589ad0c4497a780d8ab5a5e277508c3a2f007460385e2ae0b67220ffc644 SHA512 e2e485f5087afa06cb851ed8b421afd2084cb904997e59dd87ab2236ad192b511558929a585f03a6a9f4e47b303cf5361e4750c21cf4be6d2d0e961ff2705b17
 MISC metadata.xml 245 BLAKE2B 7c3776457ba60210a6b5e9b1a0d81ca8fa5cebad8aa6b06001104cf7bbe9dc65ca4fe70b827f3423fc6d0f6de56d8bb5484580e47331655fd4b07e58e2ced33c SHA512 e05491fb93b9ea6296bd0ebdbf9a8027b413e9d8d798a815c65c566b44cfb76b601a82b6da42a5bcea6d8b9ff31d721248d944891abd71cff844537dd4e50cc4
diff --git a/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch b/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch
new file mode 100644
index 000000000000..6039b8147096
--- /dev/null
+++ b/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch
@@ -0,0 +1,24 @@
+https://git.alpinelinux.org/aports/plain/main/pcmciautils/unsigned.patch
+https://bugs.gentoo.org/716120
+--- a/src/read-cis.c
++++ b/src/read-cis.c
+@@ -51,7 +51,7 @@
+ 		/* Get indirect link from the MFC tuple */
+ 		read_cis(tuple->Flags.link_space,
+ 			       tuple->LinkOffset, 5, link);
+-		ofs = *(u_int *)(link+1);
++		ofs = *(unsigned int *)(link+1);
+ 		tuple->Flags.space = (link[0] == CISTPL_MFC_ATTR);
+ 		/* Move to the next indirect link */
+ 		tuple->LinkOffset += 5;
+--- a/src/yacc_config.y
++++ b/src/yacc_config.y
+@@ -40,7 +40,7 @@
+ 
+ %union {
+     char *str;
+-    u_long num;
++    unsigned long num;
+     struct adjust_list_t *adjust;
+ }
+ 
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
index d27c8288425f..9d5b1a167818 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit flag-o-matic linux-info toolchain-funcs udev
 
 DEB_REV=${PV#*_p}
@@ -11,6 +12,7 @@ DESCRIPTION="PCMCIA userspace utilities for Linux"
 HOMEPAGE="https://packages.qa.debian.org/pcmciautils"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}-${DEB_REV}.debian.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,13 +24,31 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 	sys-devel/flex"
 
-S=${WORKDIR}/${PN}-${MY_PV}
+PATCHES=(
+	"${WORKDIR}"/debian/patches/no-modprobe-rules.patch
+	"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch
+	"${FILESDIR}"/${P}-flex-2.6.3-fix.patch
+	"${FILESDIR}"/${PN}-018_p8-musl-unsigned-type.patch
+)
 
 pkg_setup() {
 	CONFIG_CHECK="~PCMCIA"
 	linux-info_pkg_setup
 
 	kernel_is lt 2 6 32 && ewarn "${P} requires at least kernel 2.6.32."
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/CFLAGS/s:-fomit-frame-pointer::' \
+		-e '/dir/s:sbin:bin:g' \
+		Makefile || die
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG
 
 	mypcmciaopts=(
 		STARTUP=$(usex staticsocket false true)
@@ -44,23 +64,7 @@ pkg_setup() {
 		STRIP=true
 		RANLIB="$(tc-getRANLIB)"
 		OPTIMIZATION="${CFLAGS} ${CPPFLAGS}"
-		)
-
-	use debug && append-cppflags -DDEBUG
-}
-
-PATCHES=(
-	"${WORKDIR}"/debian/patches/no-modprobe-rules.patch
-	"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch
-	"${FILESDIR}"/${P}-flex-2.6.3-fix.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/CFLAGS/s:-fomit-frame-pointer::' \
-		-e '/dir/s:sbin:bin:g' \
-		Makefile || die
+	)
 }
 
 src_compile() {
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 77bf1c474f61..f6d90c695e40 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -8,5 +8,5 @@ DIST pcsc-lite-1.9.1.tar.bz2 763525 BLAKE2B b85364f5e2a92450b020bfc28439774c6a6f
 DIST pcsc-lite-1.9.4.tar.bz2 776581 BLAKE2B fb870fab3bfc7ae372a62c678a0321445f14c36c84c4fff8b7bf4e17f14b64575128fdcf7c8642cd03cb3586d6846845196a93d02b037090f49b88bbee896caa SHA512 d812fd4c6e906f277a73863c4170d96c30245c5fd0a8329e78923533320d71c6591b3f282695bcd69823c8cc381d8d438736bb7ab2262ab24c9d89434368659e
 EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d57950ae414b6ea3816f0d25f60406ede13d3d1e17159bf33681d7294526e9778f42a10292aaf846a70c6978c208 SHA512 baacae6682f43ce2ab5d89c5e278d11cc9cc5420d14821bbaa7b03e000884953d9aa1cda9df634d090444ba16af9fb7e2ed7e12d5b6d568ab4808960f5ee16da
 EBUILD pcsc-lite-1.9.1.ebuild 3181 BLAKE2B 5d67ccc4a2705aa85746347ff32f6d15e6613ea40ea244d7c810061a3dd5c023606f070b6d73544e4ef9f86ddfe4444e37c335177d65eb2a02ba06d4abb8ce0a SHA512 c8fee2822eada5dd7cbbe334be1ca72318a009fde315c8dc46fb9380f8f76a0965445bfc858bbadff1baae6bf80353223b59eb4990c9097970d8d891d07f9a02
-EBUILD pcsc-lite-1.9.4.ebuild 3177 BLAKE2B fd18ffc059482439a4a8e3f098687824a7b65d6905de5fa33da384459234dad3a17af1f3028f47e0f26c2017d4e510310cf6c7d0d1155880dadfe3354491d343 SHA512 3a0e0cdef7ee44ee9fc4fb80cdea1bdad870278eafa292236387c711d80d3205f6a898384ca7d58839c55bc521479fa9bbe27b331e5abd3f4e87c6cd0e298761
+EBUILD pcsc-lite-1.9.4.ebuild 3182 BLAKE2B d1f81f1ff0e2b317847aaf59e32afcb17a813fff04a7326b6d5c1cc4f91b6775de01674e15f3a773d565d986caa7c585df7e807ff3e450e6c17d62a62172e376 SHA512 0b1d4de95dfabcbbc958e38f5e07551cf0fd59674a23027c0dbeb8d237356d4dd928bcc444aea8dc7fd090d6beea6fb321b9eea9883b28d4ac658c7d3a3151b6
 MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
index 8ff5b8ae62e2..a282e00b2aa9 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python{3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
 inherit python-single-r1 systemd udev multilib-minimal
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 0dfad6e5c84a..3c85fdac193c 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,8 +3,8 @@ DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd
 DIST policycoreutils-3.2.tar.gz 2817961 BLAKE2B 747cbd7b84ffa9153067340f8f1dc5a652eaf85b037a6e10e116d3d0b31c8e7c9794bc6a46ae212848bef4887478ac167e359a387bebac49e0acd08b727808ce SHA512 d16781d2d61b8b78d6fc242f2b5c3a03f47ea524fb61655823b6b0f0327ff376c65fe7bdf7a53f5863c01e599cf4a7050f21fda0fe6a8f2c2c16f89b156a4346
 DIST policycoreutils-3.3.tar.gz 2818092 BLAKE2B 0ed9f128a774176ebadb71f448af8dee8c616a706314783b646869e7ea91892e358d5bb03e3aece3d0e6dc3203852e4e2925482727df1e5c71e075236ee43e5c SHA512 db658990355f99a8e43f53d20cc67bf9e557b0a7837d1927c80f325b7f93ad47876382278a980b818484d6e31712a9b03e279f947ebc88c4be60a9f395607f98
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
-EBUILD policycoreutils-3.1-r2.ebuild 4656 BLAKE2B 7c63c680159df4ded431b09f9ffd19e6129ad5f15d76acdfba8d552c29bd27e4d06e6d084054c1fb1563ccff95771be85768eb199aa6cb7d73e866f4d4d707ff SHA512 7aeb2bdddb040428eaac7601c68922d2587b3d22a21b869f8765ad61151b8a838ff008801528feb67e6d1aa53d807f812a64055cb91fa78fffe9f6b0c8ad1b08
-EBUILD policycoreutils-3.2.ebuild 4509 BLAKE2B f37eacb779eea777153cb518ff0df271496933cc88812fbffc34b1fcca9664ea0669d775a41d304ae8f826d1b3390b566022e88327dc87b870195175c60fb017 SHA512 6e18571a666e637c1c016665145ec072445a8f4346b4ba96c2f54803a8fca7eab87fba4c9d034452953885c3cff6b5c39bbcbfb962591fb81a982f47fe783679
-EBUILD policycoreutils-3.3.ebuild 4513 BLAKE2B 6627b0ff070b7c6890a39c145091653f3116ae56170650a5b38ccff748f85e5888fe1d74d0f19b75113a24f3ee8d44c41757fb53cd6d198ab86a4d4210c0f499 SHA512 ce0b2430400288b216ab73651bc010bd4a71af6cbb3988c502d341ba49652c37e6c45c0e3982e525db38d36ad42fbb8b5f7e9b70f6e9d9cea12c553db5a9a370
-EBUILD policycoreutils-9999.ebuild 4513 BLAKE2B 6627b0ff070b7c6890a39c145091653f3116ae56170650a5b38ccff748f85e5888fe1d74d0f19b75113a24f3ee8d44c41757fb53cd6d198ab86a4d4210c0f499 SHA512 ce0b2430400288b216ab73651bc010bd4a71af6cbb3988c502d341ba49652c37e6c45c0e3982e525db38d36ad42fbb8b5f7e9b70f6e9d9cea12c553db5a9a370
+EBUILD policycoreutils-3.1-r2.ebuild 4656 BLAKE2B 0c96b8df2ac1e741c0edc0d6974b2017b52fb0ad1fb29fa1efbcd91dafb3aa18b55bebdba7f86c99c4f50b4a48bb44352eb9c11a179d49855f0ed7604e547b87 SHA512 a2d571ac553a57370182857fb51e128335e5ff2976d0b0d11febeb0c9a03fbd08ad0caa9deef0fcd0cce48e03f322c2844a5cb80dde945f4833329962ad19c30
+EBUILD policycoreutils-3.2.ebuild 4509 BLAKE2B 082483774c49df970002fbdd2f163b604f52bbf621e5754e7e1ff7a3fb9e0fadc2be5c552e4dade95e4946955dfd052d0d10d8efb2956f458a1844d3faf25a8a SHA512 4952b2a4f9d065b60ec3c623909e1279f538bac5c7349186fcb0d9325c5f8ac5bab882986fa3b27219e2ff21d1fe81ed97d7de5cefd71b2479c5d5815c48299c
+EBUILD policycoreutils-3.3.ebuild 4509 BLAKE2B 082483774c49df970002fbdd2f163b604f52bbf621e5754e7e1ff7a3fb9e0fadc2be5c552e4dade95e4946955dfd052d0d10d8efb2956f458a1844d3faf25a8a SHA512 4952b2a4f9d065b60ec3c623909e1279f538bac5c7349186fcb0d9325c5f8ac5bab882986fa3b27219e2ff21d1fe81ed97d7de5cefd71b2479c5d5815c48299c
+EBUILD policycoreutils-9999.ebuild 4513 BLAKE2B 48147879671a41771fbe095581abd215bad539dac9e12a5ec2676c4f19e0169782d08aad86a8c9830247f18b44c2b85268ee533b82baf6340ca38ce8086b14de SHA512 b6a64e4a4a1ea7fc4ca5420b945d3509d2d2caf174ddddcb85f2fb4ca3b1ae90f6d39542d6b6b00ffb6b1c2a085b253a0a7394c63eef7afd2f49c58cd2ff34ca
 MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
index e995a286771b..eea202ba8299 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -163,6 +163,6 @@ pkg_postinst() {
 		# There have been some changes to the policy store, rebuilding now.
 		# https://marc.info/?l=selinux&m=143757277819717&w=2
 		einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
-		semodule -S "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+		semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
 	done
 }
diff --git a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
index 1c90708b2731..456189b1aac5 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -157,6 +157,6 @@ pkg_postinst() {
 		# There have been some changes to the policy store, rebuilding now.
 		# https://marc.info/?l=selinux&m=143757277819717&w=2
 		einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
-		semodule -S "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+		semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
 	done
 }
diff --git a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
index 6b00366fe883..456189b1aac5 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 	S1="${WORKDIR}/${P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
@@ -157,6 +157,6 @@ pkg_postinst() {
 		# There have been some changes to the policy store, rebuilding now.
 		# https://marc.info/?l=selinux&m=143757277819717&w=2
 		einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
-		semodule -S "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+		semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
 	done
 }
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 6b00366fe883..e6ee13c43070 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -157,6 +157,6 @@ pkg_postinst() {
 		# There have been some changes to the policy store, rebuilding now.
 		# https://marc.info/?l=selinux&m=143757277819717&w=2
 		einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
-		semodule -S "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+		semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
 	done
 }
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 792ebb2cd3fa..2015234a8d4a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -12,10 +12,10 @@ DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbeb
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
 DIST portage-3.0.29.tar.bz2 1156653 BLAKE2B 515b35ed8f3c318af63e2bec0accf4f346e5dc45cb3a38201822d550818ba64101d2d7f5c7837af6b3e7df247548c0630fde09b63916614ba3e8f8d596d156b1 SHA512 460ecda26fcfaa5d794889167853bd68ffde167d0423db1fdc3102d75ad06bad373749bd49654c5e3805eb237f1670cf91d0f180926d33a0993ba06a45786794
 DIST portage-3.0.30.tar.bz2 1157316 BLAKE2B 56939618f4915f77dca6bb85d4a7cf98e50133b524f68a0b192c0a928ca209a0cb944c174dda78f1b5a071c02c190857ea8a7ecd514301c45e897b302542f52e SHA512 accec770f63180b6d5d4cd08ef50f0cd01aa5701104156523f1a735d8ec3313a3b513629a33d8863285736515b6a3d56fc21498404da3a0f89b196655a98db7d
-EBUILD portage-3.0.18.ebuild 8755 BLAKE2B 271a0eaa8a4a89763b1354bdd53f8b2004e039d4dc276a2fddf84bba511024597aa63bbc885a8ea3c9b3586f3f71a009f76237ad41841b0eaae2b7408ee48035 SHA512 5183d9ff04b37e97eebf68d29a63648c44f48bfcc552251ec4a0593710abd75b43bb926e9a19041d62abe01006d3ad62a74c7a98ed3de1a79df58079379e1cf2
-EBUILD portage-3.0.20-r6.ebuild 9874 BLAKE2B 8f024055a3b49e75d941cbabf7d9b0c02f86f59de03650d078236adc4957ea9c16832f514d1258c1f19f194881135f3213551273c2af1c1354c5e85174f55bc7 SHA512 b5aa9d1003a580565ab0dba337e50668088c1c2e704442a319136faa3b9fb6e44d8a39caa7aea666463104ed9af465425e831f694c253ec43b6a7527cfb809aa
-EBUILD portage-3.0.28-r1.ebuild 8764 BLAKE2B 9769beae7d8d1e57454ff131456410188c0b4fb4d6db656636c6362ebff301be728833350398ff908da044243aa3f07f45889405d4bd5205e4194c0dd8dcc9d8 SHA512 747edf5bc25b6db3e94f76ddd34d24050f26ca520f7560e33530076b43d9638e2e52ea6e4a503f88e8ee6073b13e8d84d1ee2a221ac9009f79cbcf9359089d6e
-EBUILD portage-3.0.29.ebuild 8585 BLAKE2B 7daaedca0f315796f15c7d6a4aa7de52807df5c965d4d90004aef1edc696974fd9199a7748737e0a9363a6ed69de218fe1f75ab5009aaecb8233299ea19a4cda SHA512 82ddbb30a4018f23d2890c5e3a4af6a3a5dbe3fbcbd27446ec5c2a7e53edb8315ee60d33f2c072ecda6051d118b12b1a2734eaf52f367a1a7ae49383b21e03f6
-EBUILD portage-3.0.30-r1.ebuild 8656 BLAKE2B 757388221e7b74f9370c170b8289fefddbde5a4c166b7e286769abf9dab7e6f1b35319d5f741bede4c6fc8b02e51385df37cf58267463460fb280d7600b52be5 SHA512 253a28434f42b797ab7691098806f82db17a7d1d18d1e314f837460cd629537b61d18a6177ce85fe894558b524cd89ee75ac9dde16b7b96b05aadd4510a56213
-EBUILD portage-9999.ebuild 7832 BLAKE2B fcb2a09b5c5878e3f4d81f38bbffbcea3aea7d98b3faff4d1565a9a4dbb38c565fc8ea43af2d7bfa3ee9a0517d768f1a3d81e287e4cbcd32f57a4cb7ee1e3c33 SHA512 77d6e35646caad8e2f297127c60bd28d3103eaf0b7f294eaef2c7d7872e706988ccf1556858f55733370529a3b9a33e38a6891c4c27e612ab85c517bb727219c
+EBUILD portage-3.0.18.ebuild 8713 BLAKE2B 8a487f6ff381603660162b08f6f61c78dbfd77edb15a09b4c11a673bcb0f586d2a482fc3b3ba89602f6f495c36b9f0b101829426c6749ac66bf3b7a020e20b5c SHA512 d7b7220ea12887d7d0f58ee2672b2eb73c33acbe998773198df0118b34460283376b6110b6a5be60e6b9c0eab075fae93e50130013dbb2c26fcdfcbf419cad6a
+EBUILD portage-3.0.20-r6.ebuild 9832 BLAKE2B 8232c2a134c33a4b8816e19d773f8eece14899ba60e218d9b39bb8b9a74103bd7a63c5fbe1fa4f52e491872b7ff2c2e16d7e6af1f8be3b85d9dfbee85e03227b SHA512 105b192999b47b583ff80f3e6c4a39ec8e6da66fb3ca6d6f7e210156a318dc8b6924e03189083e09b5956dc2210de0a75478611353b812ac0f4389c2cb407d45
+EBUILD portage-3.0.28-r1.ebuild 8722 BLAKE2B 0be50eee6b90317a79d47d20e1f4d6ae6b149bd814dcf372da892385b816cbb7e5bf93f0a11cf28dc246ac570907fe2c22de031f939912946d89bb279d672119 SHA512 e1f9062371c0688b92a76c26e1c5f1c9d5436d3ddc9835a7f7ee68cdfef77bf8a562e80db5766233aa61d75f7d1dd85f54a5cece02d5a254d0db612b7c5dd533
+EBUILD portage-3.0.29.ebuild 8543 BLAKE2B fb4377ca0989a18cc3d3a60fe88ebe49c885b48d38e399a2822f83504f9dfbda939ae32cc99d4a6793066d76cb28dcc3ef030ee66c07e3a64d93ded40a05a825 SHA512 678f1acac8dc4426d668b6b2b8d9eec8989ca7f17b6704138e645c7f935d0c66fe832b76a9cd0961fbae9fffed75d260c7f1295f129b22b028040adc3097018c
+EBUILD portage-3.0.30-r1.ebuild 8614 BLAKE2B 6a87b64c1146118ece473c30b9f33860b13d3834b257855e733d258c61efc470c2a6917f60631b10d84dfe65705d1ca5bdb96849647b366a28c6c206b389b0e9 SHA512 9bb06c386c7fa3977d91fad57c687bbc156c3f5c950b36ed55cd18a6c9df41e64d6a308a352737f0e76ed411aacb51b84b438108087b875681e3d0cbeda6fb07
+EBUILD portage-9999.ebuild 7790 BLAKE2B ed64a9d42cb3d40e3c7f7fb4014ae677418ea1d54ebb34ebf1acc42a77aa797b115168702b8a40e729ba735e464ad58cdbf7c442c5283fc52b3350f542b6c993 SHA512 1a7aa3e3f5cd7982a7008322a13c32ce2b3797381232703ed670e1051d81e8647f1694c97ca9ca7d1451235b4a8c349d652ba17c7cd8c06a71d3ab758349eeb6
 MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402
diff --git a/sys-apps/portage/portage-3.0.18.ebuild b/sys-apps/portage/portage-3.0.18.ebuild
index 26985e330e46..25a9e1f9f959 100644
--- a/sys-apps/portage/portage-3.0.18.ebuild
+++ b/sys-apps/portage/portage-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,7 +54,6 @@ RDEPEND="
 	)
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
diff --git a/sys-apps/portage/portage-3.0.20-r6.ebuild b/sys-apps/portage/portage-3.0.20-r6.ebuild
index a65b3f8a7f2b..42042cc9bed0 100644
--- a/sys-apps/portage/portage-3.0.20-r6.ebuild
+++ b/sys-apps/portage/portage-3.0.20-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,7 +54,6 @@ RDEPEND="
 	)
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
diff --git a/sys-apps/portage/portage-3.0.28-r1.ebuild b/sys-apps/portage/portage-3.0.28-r1.ebuild
index bb26698f7b52..8c0ac654bb55 100644
--- a/sys-apps/portage/portage-3.0.28-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,7 +57,6 @@ RDEPEND="
 	)
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
diff --git a/sys-apps/portage/portage-3.0.29.ebuild b/sys-apps/portage/portage-3.0.29.ebuild
index f2a08d991631..008060e58a4d 100644
--- a/sys-apps/portage/portage-3.0.29.ebuild
+++ b/sys-apps/portage/portage-3.0.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,7 +54,6 @@ RDEPEND="
 	)
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
diff --git a/sys-apps/portage/portage-3.0.30-r1.ebuild b/sys-apps/portage/portage-3.0.30-r1.ebuild
index 0db4771550b8..e535325e9cae 100644
--- a/sys-apps/portage/portage-3.0.30-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.30-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,7 +54,6 @@ RDEPEND="
 	)
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 1cc49e433150..f45399a6016a 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,7 +54,6 @@ RDEPEND="
 	)
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 6b836fe23de4..12fe14082577 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -4,6 +4,6 @@ DIST restorecond-3.2.tar.gz 18965 BLAKE2B 6cbd32c7c33fcc9f3fff78cc1faaa354c7ee91
 DIST restorecond-3.3.tar.gz 18970 BLAKE2B 41c0eed734ab1e89cdfd40fdb0ceff47e1c4bb66354ff78d548a9747c661fbf7ed4b6b3daa1e39325de2a2ca087aca803f073f942f3ac89b71d873e27a1d6712 SHA512 ea2b97d22c1d68aa4ea31d8850f8c9632c0db0d4d666e323c648da896554c6a6fdf6dfa3c105a1df3f1ede9da8cce5ba4c1533b05520846fcb2d584935e5d7cb
 EBUILD restorecond-3.1.ebuild 1170 BLAKE2B 98e3caa2596762f7a123252aebff2b9d2fd774e070fcbbd5bfcf13445b1ee1afe9e6850fcf37491cc6da6d382c0a6af360902180dc17905384eb78840dae1055 SHA512 68d65a4b44f6d1b5cd20226a25e8813af4cee19bb2d197ad188c79fa4cf3f152307c2cfd0ef4198f9684ada8efddcb243db97ec13b9dc5843d4fb4859938c91c
 EBUILD restorecond-3.2.ebuild 1084 BLAKE2B e60456cdcffb87d4cf6fa9f3595d906ffd1b9663c29b5228e779ae1506e4cd02875c57c6452a1a21227e13cc78dde855d35d18aa89b737268b7d8e73340093ac SHA512 4481e3167024db0ad648b815ad770f8a4e47183a33c9b5139cee967f640fc575cd0da0fc0ca485441de2be7f688ed6c034e152a6293606db13ac63b8223c261a
-EBUILD restorecond-3.3.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
+EBUILD restorecond-3.3.ebuild 1082 BLAKE2B d004337893dc2363a312366a7c4250158f1396e4d54a7b361d2665a51350f0cce3a9ad76002aa5a32fa5369ddc91b015a85d99e7664fc012eacdead1644af9bc SHA512 47fb0c285c427c1ad5551d0786f90000b85420a16ca52dd1416774a1ee93afdf00e4197d6f91fa51248419a693d4cd2b528c3ad18a99cd668eed1fd0eacd1f9a
 EBUILD restorecond-9999.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/restorecond/restorecond-3.3.ebuild b/sys-apps/restorecond/restorecond-3.3.ebuild
index f3e66897e8c1..ccceea1c063d 100644
--- a/sys-apps/restorecond/restorecond-3.3.ebuild
+++ b/sys-apps/restorecond/restorecond-3.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index b5853dad6f04..1fb363484893 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -3,6 +3,6 @@ DIST secilc-3.2.tar.gz 179384 BLAKE2B 89a02ceeaeb221eb5e819f6c6f09cd7e4675971d18
 DIST secilc-3.3.tar.gz 181205 BLAKE2B ffccf2e6ea416f6e5a8270a488c6c6ed01b607af20fffed129f5d9b9957f2ab16e90a3fdbd57b597f1195987edf6a2ca1ae561cca62d176a01878fe24900f4b9 SHA512 11b2b6a56d588a71d8cc5b2e69e76579ddd3ea20e036bbfdbeefd8ed64a6dca3c8f963509a96231eb21807a195ec24e4807ef52dc2218ee0410ee0828ad77fa8
 EBUILD secilc-3.1.ebuild 877 BLAKE2B ec8b1f7e9874e234d561ac9deb26b128ded5599616bd2e501b6fb591e77c45942466c227103c7f040dd10ba49445e283e9fb410d3f18635c8f4eb9d0f0571b8e SHA512 e3d0bd0d5bcb480d10f7a7e188a13b380f6452a5f153a0c5abe3b58bd475225d271e127cb1ec6c9ea98e3405095992aa88cfceceaae7278281cc8ce0bded1904
 EBUILD secilc-3.2.ebuild 770 BLAKE2B 0a03a4c536f52d34bb1355ff9ba957170875c41edb11648484469d355ef533ecd8cb2e4083aeba5eb46ac19b5ead308a92b95772d768763801f0e19360690fe7 SHA512 b78f66005b8b7d2672446acd60bca58ea14d3246152d5befae3114be524cd32f6faca8ba03543375b9a5cee3d7fb0245b2d664d0148d0e13a7f630163a9aeae4
-EBUILD secilc-3.3.ebuild 774 BLAKE2B d709fc9df54be7141f47f78cceaadf30103a4fc6fd29e134fbf296d3750b2523f0085e539c35900636f0d4c38d86f891661113ea2907a1ac91f9a061aac37f20 SHA512 9043484e9051e31c0a5bdb6420766f67a448b66acb1e8a6b3dabc99313a3b969e9fd8eb0437333f37295ef2202a60df67d9a25abc35dbb1e8703e163509351f3
+EBUILD secilc-3.3.ebuild 770 BLAKE2B 0a03a4c536f52d34bb1355ff9ba957170875c41edb11648484469d355ef533ecd8cb2e4083aeba5eb46ac19b5ead308a92b95772d768763801f0e19360690fe7 SHA512 b78f66005b8b7d2672446acd60bca58ea14d3246152d5befae3114be524cd32f6faca8ba03543375b9a5cee3d7fb0245b2d664d0148d0e13a7f630163a9aeae4
 EBUILD secilc-9999.ebuild 767 BLAKE2B a29b9d94a0b73c83f2d3b403e85a0a8d2b279e0cb6f82af8e7efec6e4293a33dc43622aa817180eb501c67d8c42854bcd08aeee80c8f99795679f964428cc2d1 SHA512 0a179e4c5deabd685f48103c0ecc6ed190aed00122d91731a040916cd55b2853987c44cfe6315ff872119a7b53f9a1b8eea88dd7b8c24b66ba62c6cdb8e2af19
 MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81
diff --git a/sys-apps/secilc/secilc-3.3.ebuild b/sys-apps/secilc/secilc-3.3.ebuild
index 04666a2f99df..8058954b003d 100644
--- a/sys-apps/secilc/secilc-3.3.ebuild
+++ b/sys-apps/secilc/secilc-3.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 997c2878d4fe..f7b32feb832e 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -4,6 +4,6 @@ DIST selinux-python-3.2.tar.gz 2101106 BLAKE2B b4b185a7468de68eb2146011a9bc82ffb
 DIST selinux-python-3.3.tar.gz 2101584 BLAKE2B 603aafbf316b744098bd34c79bf384d55624c086fd75147675a4a0715df3d61710a99d490f30b78d59a2c2a85fcc4db91772c24644a963b31e1a0d305c4bc83e SHA512 a69948a8b139a309f18632440e4204f49832a94b8b6be50e162d3dacb16698effeb1a77c44462e8cc7dc3dd600b887b9ab2fef618c31d3e0fe0de216a6aaebe3
 EBUILD selinux-python-3.1-r2.ebuild 2548 BLAKE2B a449b67df1783f7a74859bb5fda7c6c17d4c71c21abb5e3f286872befd15c6f8b85b0a12b67232682bc4e5bcdb6701c0b926d78b4b428d56cec6f0f264072ca9 SHA512 a7ca65aab8c6c7fbcd16e1b26a0b21569f72ffc10e7784ca6cba5cbc1bf4cb57fc846095abd0056d0e4ddb4dc6065b464defef55053e4d554cf5baa086bd70f1
 EBUILD selinux-python-3.2-r1.ebuild 3149 BLAKE2B a828b900d32c908ab7c528f35deb47843746e4c71196f3d9be947df1ffb724b5e1ebb27b00410400152e2bfc293d26b1604a6b74df939fb236c4b2455ed79133 SHA512 b6eb9d5ac518de681df9f22bb3c0eac560152da2b658a662e0e44041024ab7049bb0981af2ab71f87f4e8da814ba0770e7308ce471ba3dbca4870448a96ea276
-EBUILD selinux-python-3.3.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d
+EBUILD selinux-python-3.3.ebuild 3087 BLAKE2B ad27bfc49dd0ad01c181ec159aee9bfd4018b13e4a2dd602d6f35e890a6879dd48c91901760e1ae093d28db3d5b4ead2e9ca92ff4d7f728a85a6b08f3f452af6 SHA512 761646c3a71af22ad4ef51abdb282f5733389471389bfee06c08edcdb3b1360b5087adc1f11530c04ef86bbe65bd3ed1b1a9653034550a743f6582a8a9ea9a66
 EBUILD selinux-python-9999.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d
 MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.3.ebuild b/sys-apps/selinux-python/selinux-python-3.3.ebuild
index 8e1f90984a8b..3d954e03c653 100644
--- a/sys-apps/selinux-python/selinux-python-3.3.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 6f9997175834..3923668d130e 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -3,6 +3,6 @@ DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1
 DIST semodule-utils-3.3.tar.gz 14268 BLAKE2B 5b03dd731c28e29b146e9f75fa7ce5151e58df1ea6598356b1ad9ee6846d2ebf7ceb57c740aa0ae4b94e0a7356180bd8e608d6a9543b48251e553036f2b2833e SHA512 76aa0c9322889c7de100f3c5789bdf27b7073827fe2af371bd50a4517baa8442f35e53f16a93227dce93da0ceb054bea7e5ee17a46fe05e06f3c2d9925cf59dc
 EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476
 EBUILD semodule-utils-3.2.ebuild 806 BLAKE2B cfa2dad68c85bcf6be3aedf1e2c5e6f071d98d98f72c7d48dbdc68896fb5c603701adc03cb52e105ab8063fd8431b8e2362ffb839c853127dc666f3907325f59 SHA512 699229f4a8ad869568eec8145ca1b1d014f2abbf870dde437bcef1c71149d3433383298590c0f9fdad9719b7ee284484e2ff43249a8c000e8b6b4987da1224a8
-EBUILD semodule-utils-3.3.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
+EBUILD semodule-utils-3.3.ebuild 806 BLAKE2B cfa2dad68c85bcf6be3aedf1e2c5e6f071d98d98f72c7d48dbdc68896fb5c603701adc03cb52e105ab8063fd8431b8e2362ffb839c853127dc666f3907325f59 SHA512 699229f4a8ad869568eec8145ca1b1d014f2abbf870dde437bcef1c71149d3433383298590c0f9fdad9719b7ee284484e2ff43249a8c000e8b6b4987da1224a8
 EBUILD semodule-utils-9999.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
 MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5
diff --git a/sys-apps/semodule-utils/semodule-utils-3.3.ebuild b/sys-apps/semodule-utils/semodule-utils-3.3.ebuild
index 13fc0d86279e..5a5792a677bd 100644
--- a/sys-apps/semodule-utils/semodule-utils-3.3.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-3.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DESCRIPTION="SELinux policy module utilities"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 1ec8d2d857d5..9c88513a5f59 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -12,10 +12,12 @@ AUX shadow-4.9-libcrack.patch 738 BLAKE2B 7ba0fd5e2c9c81bbefa75b2f1e29ed94ae32f3
 AUX shadow-4.9-libsubid_oot_build.patch 2933 BLAKE2B 9bc638bd1d0733c6e51b54ab1f1db132bd4499a24b33efc76c58c306267015ebd9e2e927e774c3631cfa94490bb249b4d2267a163ae85f9f6ba18b964fcc81d4 SHA512 7f42cd84cb606fde19750f26883c4650642499dc6cb0078bc733d5d61a51b39c9f1c3898000e2df8ceb84eaecadbab6ae502178bf51d205fe644bb8c58a62bfa
 AUX shadow-4.9-libsubid_pam_linking.patch 706 BLAKE2B 8d9b3f6ab2aea004275e6347568013b0092beb57d08a51e6bbca0480773525518febd0ec975dd37a9c071c5ec17d56541586b9afa12010081a392dc60cee4c13 SHA512 49a40045520358d1fb29daae30f9fef1f8aab4516596f16781d3702642ef70592959536d69f4755d57689fc6e30d029c5dfc545d95362e811a284900cb628b6b
 DIST shadow-4.10.tar.xz 1662364 BLAKE2B 80b5f0f6b8fbb3e2ca134e14e93a3f67e5baa34d793ace5b90690676634f4cc72dfb4b3d50dbd7626c1a144898c1c943f8acbc8121903f17519c981986c284ae SHA512 39ffc1863d1f84aa39a2983c08e5adb93642b09e3e5e65c1c4e8a342207a79201b199e518e3701726014c7cb736977ef275d2dc1c659b5776183ae73978357da
+DIST shadow-4.11.1.tar.xz 1656584 BLAKE2B d459a1e0ffb342b6b455caf65e6af60b32eee72d4a9b1ab126485fb4632503a42061d3f0b960554c8155af6dc0564c585335b27aecca6538b394a0d58d927588 SHA512 12fbe4d6ac929ad3c21525ed0f1026b5b678ccec9762f2ec7e611d9c180934def506325f2835fb750dd30af035b592f827ff151cd6e4c805aaaf8e01425c279f
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
 DIST shadow-4.9.tar.xz 1627008 BLAKE2B 7a9a6a489115c7a20520cfec61f008fc0f70f7f50aaf539e94dfdcb20035d2de88ab3198e76812a4e3eb944b92c76c0ca2e85e35f4342537711c2c033248a72b SHA512 254cda49bb14505a7604821e7fa898bf4bf317d648e9ddc881ab80a6860d52053dfffacad6feab87c7d16608c35ed6b6cee99e7757eac930da3a7b31cdcd4b95
-EBUILD shadow-4.10-r3.ebuild 6144 BLAKE2B e468918a5c1358f2a89534f5824f8a1d7033d48e2b39e43c3703bb4aa6afedfc7e3a013c8093bf6c51d495c3111c12e1aaaf9840cbfc8ac0856afc23cc426467 SHA512 294fbfd98972493289c6ee847acf5d5a89c29146dfaffb46d1ffe3f6ff143893c807831b9d7bf98a1a455c354bf4a61bf6c9535b85850d3e4c53d254f8b5dec8
-EBUILD shadow-4.8.1-r4.ebuild 6134 BLAKE2B a3effe54f52408bfee5ed17134a58806e005aab38391d4ff78888e3ae18c86f0d76dd946c2494bc92901e8400e7b98db0e4045f004a8880cb6c437acff28d560 SHA512 2e7375dd6c94bdc85eabfe8cb65d0c7df4bb1bc9b2aff418824046a8af80493f3a481476f63bdc91abca4aefcc61105b2aa6c551e8b260b8da1db2d0587b56fb
-EBUILD shadow-4.9-r3.ebuild 6112 BLAKE2B 09778e7c21213de9f541bd46e50c647c9a64f83bb3556c9f1845d72504e394de42a3ee4e2f832ba9e532b8eb46f542160928ef4d6e0b97ca53060b4980be7445 SHA512 82753d7c7936d72b80dd759a94746c66cf89f68528584af369e2e1978807853e5d39364feea9b169e3c7beb0bbcceb46f2a1d11bbf0e7bd08ab55c0a84df9e6c
-EBUILD shadow-4.9-r4.ebuild 6207 BLAKE2B d48c118d9d149bdc0c4002ac99ab649571bdcb410e9cd1dabcc81e9009f255e00e52bc85f2c63b3d08a74e15f51179fd09ec8261d5f9173b8cb3333d157b8d70 SHA512 8e008190604c318430141905e13321f4d287242548a9e10c5a345b1fd0d02bd6e26213f4487142fce39dcda49ca805033250d907002e6e2f4a7282670378208a
+EBUILD shadow-4.10-r4.ebuild 6298 BLAKE2B 239be497a87a4ae3442c0aaf10b6f97f417d734eb41f7ef4ea1a4afb3951a9bc44922b6b624667066ed0172b7727cccc8da1ad98cafc7530e024b7eaf3714d14 SHA512 9c118d0fc3e81bf4300787b40bc03e4107be12cbebf32e311e866e9ccafa337e109448b8e7e6e0b5021d9ae7c3da45bfe3db4b3543a190505da251f4df4b5bb3
+EBUILD shadow-4.11.1.ebuild 6248 BLAKE2B 99f8d3f06126926bc79cf3b083fc4e433ae1199af3eccf3860c3987f0c21df4d4b1551b553106c4ce9e3be932505d199ccd3ebce53ae14fe4d945d3e52b170c8 SHA512 ebe44491e263ac74d31d79a07165deeb51e8080101df6dcb646da2500aaf039bd851ec764236771218661f80710fda0a096aa8cdad816463300a77226764c102
+EBUILD shadow-4.8.1-r4.ebuild 6057 BLAKE2B 88aef5e1dcbb7e3206040b43758336a18f60b60dc29e9cd3b67da71da5aa3d213d37a7fd3475979934a3c08061701d12d8761cd17b55f0609d9d331a3ffa0b33 SHA512 b838166f8cf0a7bd128b02b2368010251a0d65d65a3ab0bc3817a73d7393d297a055482fc5b431f239383ed07fb60bc351576f2bf725f17c023d39ef541e93a1
+EBUILD shadow-4.9-r3.ebuild 6035 BLAKE2B 7ed01b79a23ab4a88db83a16bf421edd1c4842cccdcc4228ffc3e33abd21c948bfb7c6e6ef50a33b0c591d7313653fbc5c9f367fa60c30b4c5e6baa02837e89c SHA512 10949dfabf88d084adaf12339d837632c4231e7038c57dd1432df686f1e70cd82aeacbc4d500ea628181944bfe0e82790be2916ee52d3c3a62e10d423760bfc6
+EBUILD shadow-4.9-r4.ebuild 6123 BLAKE2B 1cfc38547d3c49ffacd3787c970c22f8c2f45c3c49b01dffe4b6dad11e033f5540c1034a0b8945c5de6c823c2dd36b8966ec766e771ed81347c51e0bf7c55b88 SHA512 1bd4231f511efaad0ec9e692d1da42077ce9f50f250000a6389fc06e62fff8970ef2f47c44fcc0fa3e08f352bb0f3c5bb0fa42e39f898c3ff9b6c2da24b9c4ec
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.10-r3.ebuild b/sys-apps/shadow/shadow-4.10-r4.ebuild
index 020224692897..af2ce039df60 100644
--- a/sys-apps/shadow/shadow-4.10-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,8 +86,6 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
 	if use nls ; then
 		local l langs="po" # These are the pot files.
 		for l in ${LANGS[*]} ; do
@@ -234,12 +232,18 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	# Missing entries from /etc/passwd can cause odd system blips.
+	# See bug #829872.
+	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
+		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
+	fi
+
 	# Enable shadow groups.
 	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
+		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
+			grpconv -R "${EROOT:-/}"
 		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
 			ewarn "run 'grpconv' afterwards!"
 		fi
 	fi
diff --git a/sys-apps/shadow/shadow-4.11.1.ebuild b/sys-apps/shadow/shadow-4.11.1.ebuild
new file mode 100644
index 000000000000..f9a60e2b722d
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.11.1.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+# Subslot is for libsubid's SONAME.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+REQUIRED_USE="?? ( cracklib pam )"
+
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	xattr? ( sys-apps/attr:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
+"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-apps/man-pages-5.11-r1
+	!=sys-apps/man-pages-5.12-r0
+	!=sys-apps/man-pages-5.12-r1
+	nls? (
+		!<app-i18n/man-pages-it-5.06-r1
+		!<app-i18n/man-pages-ja-20180315-r1
+		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+	)
+	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+)
+
+src_prepare() {
+	default
+
+	#eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-account-tools-setuid
+		--disable-static
+		--with-btrfs
+		--without-group-name-max-length
+		--without-tcb
+		$(use_enable nls)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+		$(use_with xattr attr)
+	)
+	econf "${myeconfargs[@]}"
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
+	emake DESTDIR="${D}" -C man install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh shfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
+		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man -type f \
+		'(' -name id.1 -o -name getspnam.3 ')' \
+		-delete || die
+
+	if ! use su ; then
+		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
+	fi
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Missing entries from /etc/passwd can cause odd system blips.
+	# See bug #829872.
+	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
+		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
+	fi
+
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
+			grpconv -R "${EROOT:-/}"
+		else
+			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/shadow/shadow-4.8.1-r4.ebuild b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
index 0f0c0c206359..8471d2236d9d 100644
--- a/sys-apps/shadow/shadow-4.8.1-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -84,8 +84,6 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
 	if use nls ; then
 		local l langs="po" # These are the pot files.
 		for l in ${LANGS[*]} ; do
diff --git a/sys-apps/shadow/shadow-4.9-r3.ebuild b/sys-apps/shadow/shadow-4.9-r3.ebuild
index 69a16bb519be..6d6e13ab4822 100644
--- a/sys-apps/shadow/shadow-4.9-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,8 +86,6 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
 	if use nls ; then
 		local l langs="po" # These are the pot files.
 		for l in ${LANGS[*]} ; do
diff --git a/sys-apps/shadow/shadow-4.9-r4.ebuild b/sys-apps/shadow/shadow-4.9-r4.ebuild
index 044718eed4c1..b9f851ce8115 100644
--- a/sys-apps/shadow/shadow-4.9-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.ta
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-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"
 IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
@@ -88,8 +88,6 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
 	if use nls ; then
 		local l langs="po" # These are the pot files.
 		for l in ${LANGS[*]} ; do
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index b0f1d4fc53c6..294c6b231aa2 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,6 +11,6 @@ DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6d
 DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc
 EBUILD systemd-249.6-r1.ebuild 14730 BLAKE2B c40a2c8ba95cfb613f3260fc0ad4b21408c35a5e4d804d3f80df0934fa4a86276cfe19de8354189f5e1554deb75b6e73caa701d64995f97ff0d4f57a1b418ca4 SHA512 45196efcb82b33fe295e29aa37066a0b175ca603d62cbadd0ee655b22ec4b8a91c0edd1107d38320e292b885b2f83b9ae625fed21db3a24392c253b9d90685d0
 EBUILD systemd-249.7.ebuild 14731 BLAKE2B 3aedadd028899d1a74cb841660f8fe1a59d78330cb7bd951388d87aa7197f94d2fbcec600a95a0a6d76c55d085178f7c5fdcd3374f49ee58d040e7ce66f1e73b SHA512 5b75ee51471cc21e3fbb4c77c4fd4f2580f4932964f90f787b51d72ec60785193a06ea72f0281fabc73aa514eca73b8ecefe6e7192decdcb091b449e47f302bb
-EBUILD systemd-250.ebuild 15252 BLAKE2B 54c0cf56290b28ab6822eb68aaca0f6002320dd405c32f47805e6bbd6265734b38607d273c286f27928fddb8583656bbdfbeb0f895d9a80ae734b96d3bf81e34 SHA512 0e191eed71e5adff0a90002f5e674ffe9d5ad71533b03042ecef9853ac8b9f36c57f778e120c51c7c286077fc74941be5cb2a768eeb04b535bdfa91731999cb5
-EBUILD systemd-9999.ebuild 15214 BLAKE2B 8ea4a8af044301a2478bccfbe7fd539d8d08df42d8f034d1bc7311b5de548096bafeb051c4f336e15a3c6d070280441edaa9a99065dbbc37fd2eeaa0794111de SHA512 572da12e857e2938e10948e6e30b4a030566f5667e1300354c409f65219f9631db5a23a00d082ace98a696f7281d1499c8b457d894aaec2cf3144ecb1be2d13e
-MISC metadata.xml 2555 BLAKE2B 3581e1550610c6595e763220767a3b803b38083f366fdc13c25f429973b347c1279b54f7db63367f40c1df375e4afa31c5d6dc70b09e8769c8bcb40e6a757762 SHA512 20d7902ea3af217b49de64d42680ad464b4aaedfc7a4225a464d607e95229f2f9e86586d090a698c53538972d03de41e2ebdf712b656a2560d257864e11d51d8
+EBUILD systemd-250-r1.ebuild 15274 BLAKE2B 3d2add620e89c66e586503a78fec3f349028267e38d84dc2d07a8706f04e2a65f9f5764ef9a14358ce197095ef6a0abad2577c2062821fd76c833a09e29d27ac SHA512 a654338a354558d36f46b3ff6d5cb4fc3f068789a267dda300b9a4db14bd10dc9f9d9a13327f5c7dc20fea4f593e6ba026b83390cec4791672a4c22d9dcb4d03
+EBUILD systemd-9999.ebuild 15236 BLAKE2B 886bb6be8442cf7a137c8bad923802a79c39418bdc1940a6f5efa50f090de609921c3c009e5ad077f81f83c13c8567b0be7a4cfbeeb1819e71be1269d0acc667 SHA512 19144abfacf1484fb26bccccbed1704de52ba247af2c06a91348f4998ecbe4c788ffd141d32371420b798315561713499f79306f6cf5d4d88e1ce9579a64bd38
+MISC metadata.xml 2627 BLAKE2B b785769f4d2d029a935d8aa4da18d2366d283565a70db63b36eccbab4213edd3c0063a61fe58b313a37cd72fa4a848f4ba12dd3761f82b862a84a3b09ce06258 SHA512 ecbc947ffc3ad23afb6c07c60907d5cbb91053c4153c6661fa26f358710e3d7ca44ae4c3b0d229b428fbe5abb63f83175448e6fae8ec11c1cbe01c1a692c873b
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 1197a68cfdd0..1e7d92356be0 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -26,6 +26,7 @@
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
 		<flag name="lz4">Enable lz4 compression for the journal</flag>
 		<flag name="nat">Enable support for network address translation in networkd</flag>
+		<flag name="openssl">Enable use of <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>
 		<flag name="pwquality">Enable password quality checking in homed</flag>
 		<flag name="repart">Enable support for growing/adding partitions</flag>
diff --git a/sys-apps/systemd/systemd-250.ebuild b/sys-apps/systemd/systemd-250-r1.ebuild
index 26dc346527a3..3b2c62053490 100644
--- a/sys-apps/systemd/systemd-250.ebuild
+++ b/sys-apps/systemd/systemd-250-r1.ebuild
@@ -30,11 +30,16 @@ 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 fido2 +gcrypt gnuefi homed hostnamed-fallback http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
-
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
+	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
 REQUIRED_USE="
-	homed? ( cryptsetup pam )
-	importd? ( curl gcrypt lzma )
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
 	policykit? ( !hostnamed-fallback )
 	pwquality? ( homed )
 "
@@ -42,9 +47,8 @@ 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}]
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl:0= )
@@ -52,15 +56,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	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= )
 	fido2? ( dev-libs/libfido2: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=
-	)
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
 	idn? ( net-dns/libidn2:= )
 	importd? (
 		app-arch/bzip2:0=
@@ -70,12 +70,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	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= )
+	openssl? ( >=dev-libs/openssl-1.1.0: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= )
 	tpm? ( app-crypt/tpm2-tss:0= )
@@ -288,6 +288,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool fido2 libfido2)
 		$(meson_use gcrypt)
 		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
 		-Defi-includedir="${ESYSROOT}/usr/include/efi"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 		$(meson_native_use_bool homed)
@@ -301,13 +302,13 @@ multilib_src_configure() {
 		$(meson_use lzma xz)
 		$(meson_use zstd)
 		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool openssl)
 		$(meson_use pam)
 		$(meson_native_use_bool pkcs11 p11kit)
 		$(meson_native_use_bool pcre pcre2)
 		$(meson_native_use_bool policykit polkit)
 		$(meson_native_use_bool pwquality)
 		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool repart)
 		$(meson_native_use_bool seccomp)
 		$(meson_native_use_bool selinux)
 		$(meson_native_use_bool tpm tpm2)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index bc4018c9efa4..418af1e6efce 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -30,11 +30,16 @@ 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 fido2 +gcrypt gnuefi homed hostnamed-fallback http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
-
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
+	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
 REQUIRED_USE="
-	homed? ( cryptsetup pam )
-	importd? ( curl gcrypt lzma )
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
 	policykit? ( !hostnamed-fallback )
 	pwquality? ( homed )
 "
@@ -42,9 +47,8 @@ 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}]
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl:0= )
@@ -52,15 +56,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	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= )
 	fido2? ( dev-libs/libfido2: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=
-	)
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
 	idn? ( net-dns/libidn2:= )
 	importd? (
 		app-arch/bzip2:0=
@@ -70,12 +70,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	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= )
+	openssl? ( >=dev-libs/openssl-1.1.0: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= )
 	tpm? ( app-crypt/tpm2-tss:0= )
@@ -287,6 +287,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool fido2 libfido2)
 		$(meson_use gcrypt)
 		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
 		-Defi-includedir="${ESYSROOT}/usr/include/efi"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 		$(meson_native_use_bool homed)
@@ -300,13 +301,13 @@ multilib_src_configure() {
 		$(meson_use lzma xz)
 		$(meson_use zstd)
 		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool openssl)
 		$(meson_use pam)
 		$(meson_native_use_bool pkcs11 p11kit)
 		$(meson_native_use_bool pcre pcre2)
 		$(meson_native_use_bool policykit polkit)
 		$(meson_native_use_bool pwquality)
 		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool repart)
 		$(meson_native_use_bool seccomp)
 		$(meson_native_use_bool selinux)
 		$(meson_native_use_bool tpm tpm2)
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index a963b8040bb7..14ff3012e322 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,6 +1,8 @@
 DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69 SHA512 507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8
 DIST toybox-0.8.5.tar.gz 2378469 BLAKE2B 9054c07fd8bd477a4995b14fcea091a1602b039216ec9acb4f60e39eb10bba88924c19084c7e28d4c0b7cd72b0e0ab46a892cd427909e073dfad3e2f7416d600 SHA512 deb3743a10278ba236e95a1f3995555c745c2909381d2692a42920615c002a5cc6f9cccffee84ec2fcf1188d8f8c0a11e2b7f6a7798f0b7f5d33a0c1c3149237
+DIST toybox-0.8.6.tar.gz 3458765 BLAKE2B 2ff0b898758660c242dd9fd11c5911840ce67122214bed6e3ba8af3dc2b3dbf3c0c467863ca69392e473db232130ddba9cac2d888c20990e2e02181be76afe25 SHA512 2d8f9cc3a6bd7ee5bd4bce77399916aa90cd8acb90448f4e1b79c605c7f854c19016f5eb3704f112855c8347e69f0f4dc42f9755dd2ec975ac7799d00bc597be
 EBUILD toybox-0.8.4-r1.ebuild 1107 BLAKE2B 358ed22338fb171dacc7188c253d2e2d420fb71a40b7e89fa2dc4d6bbe8826753ce427cf197190016027a85a8864f92cc49c9b039a927c28ee3c5914e179391b SHA512 4e01be739c890495cc1bfe74efbe6675842f56007010efbb3da2355de3b6fe9d875afb1cff93c8ac1375b116f03901777e65bb3fc4b40df797c122999d27f4c3
 EBUILD toybox-0.8.5-r1.ebuild 1114 BLAKE2B 174a11d313c342e074a47aabb35823e708953cf06170dace5e1e1cea8bf1af58e9a0ea26342bf85b4363291e606e721090c97009d7ec8e8b1c8772fe14f7c7a2 SHA512 cd8e18c9a13aa708f86a38e1ae1e687900b5b5a6737d235c452dc84cdd81ddebfe04d01d5eab7e47864b2e05c7b46d77df6fa128600b68280cb8ba889a1c2d6e
+EBUILD toybox-0.8.6.ebuild 1114 BLAKE2B f9f4948b3f1a9562c80cdd066bd9da468d90e39b3b9bedb290da9eadeac55570fc1728006d63126769c84e584a45a31f78b926a033d69ad926fc816669fad08a SHA512 ee34140a013e4d3dfa844bebbb6fcd53d3c9855c9e66e0b77ce7f6b982fb7a828000266de3b414a1c7997cb1cb66ad42b3bded0ddfd2d48df2f3b418e900e0c2
 EBUILD toybox-9999.ebuild 1107 BLAKE2B 358ed22338fb171dacc7188c253d2e2d420fb71a40b7e89fa2dc4d6bbe8826753ce427cf197190016027a85a8864f92cc49c9b039a927c28ee3c5914e179391b SHA512 4e01be739c890495cc1bfe74efbe6675842f56007010efbb3da2355de3b6fe9d875afb1cff93c8ac1375b116f03901777e65bb3fc4b40df797c122999d27f4c3
 MISC metadata.xml 254 BLAKE2B 0e6d918ec0aa523a1d7ff2da1c9081d8257c2a83396bc5c7033412341b400364ee2d9b155d9d1df05da92b11f6a940dcda2adae7c158e479d082ce4a0583971b SHA512 24b045489397ba3bcd9dc48dbbc8a26189c1220053c04f09035dd735d2a3fb2ad6a55791f943f4502fee20c633c4a30983b76093f31ce752994f424fbb3cd21b
diff --git a/sys-apps/toybox/toybox-0.8.6.ebuild b/sys-apps/toybox/toybox-0.8.6.ebuild
new file mode 100644
index 000000000000..6bd1e37d8b83
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.8.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/landley/toybox.git"
+else
+	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="https://landley.net/code/toybox/"
+
+LICENSE="0BSD"
+SLOT="0"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	restore_config .config
+}
+
+src_configure() {
+	tc-export CC STRIP
+	export HOSTCC="$(tc-getBUILD_CC)"
+	# Respect CFLAGS
+	export OPTIMIZE="${CFLAGS}"
+
+	if [[ -f .config ]]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		einfo "Could not locate user configfile, so we will save a default one"
+		emake -j1 defconfig > /dev/null
+	fi
+}
+
+src_compile() {
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	save_config .config
+	newbin generated/unstripped/toybox toybox
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-01-04 01:27:12 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-04 01:27:12 +0000
commit	3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree	44068672445b1418489aed82de58df3c470289e7 /sys-apps
parent	0f15659d48c193027158492acb726297501202c5 (diff)