gentoo resync : 07.01.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-01-07 22:48:01 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-07 22:48:01 +0000
commit: c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
tree: b6d19e96ba3c397fb8278eeb9b68170db92630ba /sys-apps
parent: 3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)
51 files changed, 712 insertions, 598 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 55dbfe04a318..c188a953446c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 5bbca41b68f1..44ca029f75d9 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -6,5 +6,5 @@ DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE
 DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6
 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
-EBUILD baselayout-prefix-2.6-r3.ebuild 11317 BLAKE2B 853762ddd1025de873e6d24160cd9e1448463b126d124e77fd6c09497abd27863274fa71b120c40cadc415bd6af2d82110069f0e82d094e7fddde712d08eb49b SHA512 1b52a0d0baf9cbc960f7477d32f5ecddeebc42ae91672503a73368471584f5cf0c3bcdef079eacbbc8946126b1f94a48d04b3ddd00991067c96d5d52ba67d475
+EBUILD baselayout-prefix-2.6-r3.ebuild 11255 BLAKE2B dcd79a6855740262d2c0480123d83155ed818715cef3a5abc871e8bcc2d390d852070c2af52b719eca99298a936a94ba7411695624977d99c648e7d15a108ef7 SHA512 b3611ea3a3faf32e5d97343c25677c184bdfa32b4e0efdf079661b0535aaed5693eabadda490024b62f9df5cd8b91e626ffb9e50be1f565741fa386450eefc17
 MISC metadata.xml 318 BLAKE2B e4e9554f93f0416e68ed66ece441c6d837122e398981f8d4565ab76d267460cc5a9e0511142bc1c7f65fc07c65e1c348c61c77938395f9ad064471de4e08380f SHA512 63c449f6d3359f4ca3dee70a5f547c9a31dd063852e4f03b3b636430a2a73ef1fb4a400c5f78afb7b1da998815a001f75792461412ec839b9f9822aa64beb873
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
index d7bbee519208..0c5f5bbe14e1 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-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
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build +split-usr"
 
 RDEPEND="!sys-apps/baselayout"  #681760
 
@@ -227,8 +227,7 @@ src_configure() {
 	# although having a prefix, RAP uses full Linux baselayout
 	OS=$(usex prefix-stack prefix-stack \
 		 $(usex prefix-guest prefix-guest \
-		   $(usex kernel_FreeBSD BSD \
-			 Linux ) ) )
+		   Linux ) )
 	# set up immutable Makefile variables once
 	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
 		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index f268103b142d..1a25a933c3dd 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,9 +1,9 @@
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
 DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a
-EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2f5f26fd794838e3cb21634f089b66cefc4e915c9e88148f0e1f2a0067a57bfb029833572614c0190d54f862ff15659 SHA512 847e2ddae301a856b7719fe9134635ea79f0059107188aad8c554fda4da428f970a2ad4daf56491050acacd822175fa8ae18f22402e19677df9d920c525ce737
-EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b
-EBUILD baselayout-2.7-r3.ebuild 11283 BLAKE2B d3385c5d78b3613708e94772e3ca8514780964889e3ae61573e6a8a2aa7c2d1d600492da5445349f75f6714958d3f5d0a801a72f037d87b958d3001c9ba28422 SHA512 6b85da4fdad76046162d4172c9d65feef93bac3e8827439b6362d7273b2e2564e51a5f40eea2fc1cb58f165194b507e048487f2ea85a6cd642636358f0e0bf80
-EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71
-EBUILD baselayout-2.8.ebuild 10904 BLAKE2B 5321408ff9d87d35030ab117881e167a623a49559fdad536244df844bc0883d75d81c3da522bf0f0bed519fc7c62ea1d967dc0e8880298fec6f0b0b8e248eb6c SHA512 640770bd69a2c521cecd97cee93340c1bae9f6c92b8bcefa08de33cdfdcfa52cbdfa0562d44d1efa6922f132d5bd3a6b7e6463da6ecc259528c8a73ca0b2db8b
-EBUILD baselayout-9999.ebuild 10904 BLAKE2B 5321408ff9d87d35030ab117881e167a623a49559fdad536244df844bc0883d75d81c3da522bf0f0bed519fc7c62ea1d967dc0e8880298fec6f0b0b8e248eb6c SHA512 640770bd69a2c521cecd97cee93340c1bae9f6c92b8bcefa08de33cdfdcfa52cbdfa0562d44d1efa6922f132d5bd3a6b7e6463da6ecc259528c8a73ca0b2db8b
+EBUILD baselayout-2.7-r1.ebuild 10142 BLAKE2B d5fcfe38f93a7b021d8f47d2ca9b486d82c2185409a3ea97383dd7db6e4e88efdbd8f07f6a3429461f0af6d12fa2dfb3c607c2f7d9c5caf1fe34373daac2cf67 SHA512 67156fe954f8331b6ad3512ecaea06b2bb53b58088b66ed477e0dfab23f17775d88c99ebbc80fc20cb49799949a34aabef383020567a6a007d94aa368638e1fe
+EBUILD baselayout-2.7-r2.ebuild 10129 BLAKE2B a0686d516c4cdb93d71fd7fe31608ed876e7151b260a67f7632fded30249480466719cdd4b6b47b7089e85b08e4397de77cbc1dfe13b495aaab89c9af2adb2c2 SHA512 c7eab722aa5b3772fff5b6b3afcfc1895401d380a91cc2dbd27a392397efa43baa1ced9bcf195bb05c2fa990ac7b1113df5f6af094189105a7ec2692ef19ade5
+EBUILD baselayout-2.7-r3.ebuild 11228 BLAKE2B 347ce18e044de38deea4d85f5409bb6987a81abea68f1cf0a4fc6374c698f4b2ffebd1fbb5becb0ac0c7c1f8572be908bde71600008246c59450e07fe5d9fe28 SHA512 768412405896189e96a4ac59303bc6e96208c04d0518e0f980714d07db25389b97c4b84c2b070623765c3be6e6e609989267a306389d32da4c420dc3d329203c
+EBUILD baselayout-2.7.ebuild 9969 BLAKE2B 36c160b617b7cc4ee7e71d193dae0af3728533c5500e02f3278946932fdbbbee7c7f613ac681fa8abb8f249f7b4b4589e531ebf550002735acc7f08a23175c78 SHA512 e9c61341751b7fd67e49e4d4dbd9317ff606b15f143be1e40ba571a36ec2fb029ef3166b50f5b5da58ed2140718f23287709a950000ee151724d4914440fc1fb
+EBUILD baselayout-2.8.ebuild 10849 BLAKE2B e9cb3a4a05c4f128886fb7a0a10fbc0e1cc8f57ee9da1473b5560f664f5ad561103c5e08ad9979e10865cfbf0c9a136dce84a4ed224831a22df86666ce8406e6 SHA512 10fcfaffff8ce37bcd0a6385d2e3efcdbd7bd476571d09c75877aab384ad0af7e8cdeffcf79096b28bc62b101b7b71199e791f765c0968ee6cf796b746b75a88
+EBUILD baselayout-9999.ebuild 10849 BLAKE2B e9cb3a4a05c4f128886fb7a0a10fbc0e1cc8f57ee9da1473b5560f664f5ad561103c5e08ad9979e10865cfbf0c9a136dce84a4ed224831a22df86666ce8406e6 SHA512 10fcfaffff8ce37bcd0a6385d2e3efcdbd7bd476571d09c75877aab384ad0af7e8cdeffcf79096b28bc62b101b7b71199e791f765c0968ee6cf796b746b75a88
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.7-r1.ebuild b/sys-apps/baselayout/baselayout-2.7-r1.ebuild
index 3d5fac97ac66..69b7db6825d2 100644
--- a/sys-apps/baselayout/baselayout-2.7-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build +split-usr"
 
 pkg_setup() {
 	multilib_layout
@@ -219,7 +219,7 @@ src_prepare() {
 
 src_install() {
 	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
+		OS=Linux \
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
diff --git a/sys-apps/baselayout/baselayout-2.7-r2.ebuild b/sys-apps/baselayout/baselayout-2.7-r2.ebuild
index a37d17f3b8d1..3e57665e1bf2 100644
--- a/sys-apps/baselayout/baselayout-2.7-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7-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
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build +split-usr"
 
 pkg_setup() {
 	multilib_layout
@@ -220,7 +220,7 @@ src_prepare() {
 
 src_install() {
 	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
+		OS=Linux \
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
diff --git a/sys-apps/baselayout/baselayout-2.7-r3.ebuild b/sys-apps/baselayout/baselayout-2.7-r3.ebuild
index a734733f48f8..3293e119b3c9 100644
--- a/sys-apps/baselayout/baselayout-2.7-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7-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
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build +split-usr"
 
 pkg_setup() {
 	multilib_layout
@@ -249,7 +249,7 @@ src_prepare() {
 
 src_install() {
 	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
+		OS=Linux \
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
index cb06c4a3e20d..b9c1e7df5282 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.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=6
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build +split-usr"
 
 pkg_setup() {
 	multilib_layout
@@ -219,7 +219,7 @@ src_prepare() {
 
 src_install() {
 	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
+		OS=Linux \
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
diff --git a/sys-apps/baselayout/baselayout-2.8.ebuild b/sys-apps/baselayout/baselayout-2.8.ebuild
index c5f4dbf7dda3..089e43e1cb8c 100644
--- a/sys-apps/baselayout/baselayout-2.8.ebuild
+++ b/sys-apps/baselayout/baselayout-2.8.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
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build +split-usr"
 
 pkg_setup() {
 	multilib_layout
@@ -245,7 +245,7 @@ src_prepare() {
 
 src_install() {
 	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
+		OS=Linux \
 		DESTDIR="${ED}" \
 		install
 
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index c5f4dbf7dda3..089e43e1cb8c 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-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
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+IUSE="build +split-usr"
 
 pkg_setup() {
 	multilib_layout
@@ -245,7 +245,7 @@ src_prepare() {
 
 src_install() {
 	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
+		OS=Linux \
 		DESTDIR="${ED}" \
 		install
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 99f5db1c5300..23f8893745b8 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,5 +3,5 @@ AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a03
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
-EBUILD dbus-1.12.20-r4.ebuild 7565 BLAKE2B f1bb612d6d5f65568f5a0410caf6f11a18652fb1ec0e7ec961f3a73287509ef5dee3a80698de06f77224c59bff14a9f2c742961cfdf6f7890ee9093b0e63d7d3 SHA512 3bc9a9f959f0ce7a226e8ca21d397b071f2bac2bcd8935cbc2402c5d1966a1961573448cde8b52a087c7378a57e36e7d407342572118e1837910868fea11e5d3
+EBUILD dbus-1.12.20-r4.ebuild 7533 BLAKE2B 19b9f34046bea0cbef61a641255f56bf98005c96aa61de9212e9e6ddca1957b02a217f8ff28b23b51fee6337b3fa7b48d4aebe707589bf0452ec4f987af8081e SHA512 0369f3de41131f9ea8fa6577a5fc992f62c16f3a995017fe1becf65bdbe6c9676f02a99d11e706ae9afc63dc2202a850543d69fd3bc2cd4d4d9545c73432375b
 MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.12.20-r4.ebuild b/sys-apps/dbus/dbus-1.12.20-r4.ebuild
index bed9be8efd71..7eef2ae2bca3 100644
--- a/sys-apps/dbus/dbus-1.12.20-r4.ebuild
+++ b/sys-apps/dbus/dbus-1.12.20-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
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc elogind kernel_linux selinux static-libs systemd test X"
+IUSE="debug doc elogind selinux static-libs systemd test X"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -124,7 +124,7 @@ multilib_src_configure() {
 		$(use_enable selinux libaudit)
 		--disable-apparmor
 		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
+		--disable-kqueue
 		$(use_enable elogind)
 		$(use_enable systemd)
 		$(use_enable systemd user-session)
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 63b102abd778..9498509c18bb 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -3,7 +3,7 @@ DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.35.crate 28928 BLAKE2B 74fec657b5c21455298198bd9feddbc5086c433f2c43de45950e33341ca9527f88f4ccb94eef248437e455394d54ec0dc13af33843deb799a0215abd1b1a874f SHA512 e93baa31f9eb04dcefc9e17fe030778337796490cec3467799f98dbfda77f55522457adde388c08b8893303e8a34292b863793f37956c4adfb7a88ba10fbd154
-DIST anyhow-1.0.48.crate 41346 BLAKE2B 9ba28706c0048f24312c1d8c753b6fb82bbcc22f24840c3d429a87813582bf05c45ed60b290c7abf54070969d4e42199a410d6a7bf02df788a119a96b4f201d0 SHA512 473b95883ae170b03e2097d924dd6e664604bce5e76a592e8abe763869ddca52de668244099f8f023c3709ae19934c3e1c4cc77610204820ae271b8b05c72d31
+DIST anyhow-1.0.52.crate 44224 BLAKE2B 79d68d3390d27e0e27f9db784ad10b5d7845dec7949fbc722f944ef3988419acd72c509b44a4544e99bea5e57407da5b1ce40a96277d307fc408c958ea915c31 SHA512 b87e0b304daff85894c34060b97379d8e3d9be03078275313035c7142c76b3e59922b25924ac98a0b1b70fc98746eb174ca4b7ef33a26e115f294c1f1200aa6a
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
@@ -16,6 +16,7 @@ DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST ctrlc-3.1.7.crate 12854 BLAKE2B 7934273fc3763b6a6b763590f2f26f2479e9dd459e42222879cc40d9ccc109d78b02e69fec88d11781528897f5c7034b16bfd1eafaba13363981e46fb6fac703 SHA512 fe8aeb4168a7870f8ebcc212d9fa221740385d1f8498557e282b7dc0569b3e6cc03de0d124281809021ec8b9ebac9ec22b5418ca02ca8cf9810fd2d029e6ce6b
@@ -25,7 +26,7 @@ DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47a
 DIST dirs-sys-next-0.1.1.crate 10490 BLAKE2B a691f9603b649f648d410c7588a84c69adaff41179aa8eac899ed47082f171d765876864f08e3d0dbf3fa3798c1342b30e3bdf530ef06ed017c235a63b15d5a9 SHA512 e89af71b6bb4e23efb8ff189b42615672c2aa305fb8798393de2f9151c78cbfd5f3e45b066f5de64dfad69a84b15e72a1cdb4377f31ee9288018143017ed5730
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST fd-8.2.1.tar.gz 83391 BLAKE2B a2dc300c0f65aba04eeb422aa46c93136f305b73ca70b1e0b9429e507652a203855070115f3d0c3bd8bcd4015a470439197749ec2020edf518a55d024dfdea71 SHA512 5e921cb3556899e086f0fbaae21842b532c486c75e91cbb8351e25f640467217ac89e8cfba044e855e2425222bfdbd01befa4f35251c8705b30b3503adf3a7bf
-DIST fd-8.3.0.tar.gz 93470 BLAKE2B 5be704a71a61fe3e90fdd451f76e2191fc512a0733aaf705b7fe86283f4761bab5eadeaed544ab4fe3bf12826c1784777c70e7db31def5e8b83ae212189a4377 SHA512 8ead7eedd8dac77f4f253cd70c788d7cbdbeb66369829d845ec2da1dc651b73753a23b44635e40a70084cbe2a2f2f4ba129738e8b4c8601c3c82836c1a338b89
+DIST fd-8.3.1.tar.gz 94617 BLAKE2B 4b896a8411ea2d43d7c47960f132135bebc01f761cb7524e3d9a1fd5d54e71e25b296e18ccdb2a0dfb42d5cf7628b0595858341286345049bbecdf17a56a30c1 SHA512 1f37ed817629f580986c7534636dc2cac6658177dda4717e86bfa29c6122aae52e562c0a026c287687053e11430087578a9ca9a166997bfe99417490530d03fb
 DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
 DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -44,7 +45,7 @@ DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f41
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.108.crate 559475 BLAKE2B eb8b0250136aa57e89d256d8401fb590d74a1447039324ab4572786185a2f4b7a955c356c8cab63b019619617313fafd5b7c44dd09cfa3cc92dbb9b7fb714580 SHA512 a29f0c5cc7e4b653c2bc33c92dc90b5d3a7132d4409d6b92b94fa9fe1391d8cf57a63d339ca0602f2efac28d3dc3beb854cf9a6d03bf027fef5e5276fc5b1487
+DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
@@ -54,12 +55,13 @@ DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb966799
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST nix-0.18.0.crate 209962 BLAKE2B 3ff822e3d49a6c477d5da3702fc88bbe270202acb4f7c449a78969ada9b8fc8855a90ee194bd2943dd27c28286b88e1b22a6003e08260e19f7c8ed6036bc2891 SHA512 b86660bfa2533fdfb945a3ef840c692b5d96108e3e73b76d6489b65039cde87ae04935d2f10878cab1ea38f039083aebf4ec9b2bb6ba66ee204be700e3e96581
-DIST nix-0.23.0.crate 185348 BLAKE2B 3b5acd0972755d7e3f724d2429b801d5952f2410d91240f9410a8fcc724421beb8c85c9df35b7b877036bf7bb83977e579293ca473efbf9a34cfaa07ad174fe6 SHA512 0aa28f348b67eb79f6f36410e0be4a888294312350b67717ef462905fddb7cba4d81fc0748515629cfd617535c2244e651b05cb0600a054fdc40ec60346a8c8c
+DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
 DIST normpath-0.3.1.crate 15317 BLAKE2B 224e5e3e7a4d980f308c807dc20f5220262cbd57249986ee85160ee4a50d568bb975c02b44090e23960762077ad19c582b62d4da49dafe9122e0549433565a9b SHA512 4475dd71e17d644c7f05ac5640ef25c41b65cfa952f1092a25d8114897ad17f7e05dbef1256da488d786bd020cfd04532ff6fa85b8022211c9247c4a2687bd6d
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
-DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
+DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
+DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
 DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
@@ -91,7 +93,7 @@ DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd
 DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
-DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
@@ -101,5 +103,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fd-8.2.1.ebuild 2166 BLAKE2B 5743a7c33f9d9897fe039748fdc15b99d6d90958eb7075a2657fbf6c29a3ed00719d343bfcf308ca01ad213ca857aec57f561e44b50754da3b28cd62c985123c SHA512 7ae387b7869a55dcf714c00f268e1d220a9fafd1de82d5bb7eee14f08a1ec6c339f82b866487e708ed293ac7a37e7519ffaad2a060f127efb587b1eb720d74d4
-EBUILD fd-8.3.0.ebuild 2425 BLAKE2B a08c468893ebb50f97393763b9ae1aeba52c66d053e20dfd7e0a05d0d6585451c2b3c9e723f5512bf141c413cc70d7223c615c1fcd22a5426524562fb47c2b8a SHA512 b2dd65d3de2f059efa2ea3b987d729d5a22dbb1a3fcfbda33fb2836e340a58588fd8ba1946dcf9b5b1b95002e45df842a5520809d63b4b4dbaeaf0e3f9149c91
+EBUILD fd-8.3.1.ebuild 2407 BLAKE2B 9f57483fb106e91109ab1d79f1f8d245de531a99fd901d9d682c52429ed711ff5c266111a12e2280c043ede6603b8204745cc2d82af1a6bd2ef643a35b4b97f0 SHA512 088401dcd30afe956632310fabca7a73f39a198b64609c8ab042db2990e7eb3a2ede527f62726c6df4c316bef921a85f4ee31973176e1d356bbdeebb12ecd2c5
 MISC metadata.xml 575 BLAKE2B 7cea4b70a5cc9f91d9d7a3bc5821b8e3ea9762928dbeb538a3cab911e0cb1ebd865edc5dd1d0ab5c597da2a2aafad60b9c247108dc46c22ff20c15e2d47e43cc SHA512 8a13cdeac4b76847fa80e75575e7b8dd52faba7d047b81c145e3f51ff05e6b38f471d2c28a78ff3b26c7666dc645d68f2374f8f24329907d01582e0c3e9be8e9
diff --git a/sys-apps/fd/fd-8.3.0.ebuild b/sys-apps/fd/fd-8.3.1.ebuild
index 1f567452eda7..3da4227d0d64 100644
--- a/sys-apps/fd/fd-8.3.0.ebuild
+++ b/sys-apps/fd/fd-8.3.1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES="
 	aho-corasick-0.7.18
-	ansi_term-0.11.0
 	ansi_term-0.12.1
-	anyhow-1.0.48
+	anyhow-1.0.52
 	atty-0.2.14
 	autocfg-1.0.1
 	bitflags-1.3.2
@@ -15,7 +14,7 @@ CRATES="
 	cc-1.0.72
 	cfg-if-1.0.0
 	chrono-0.4.19
-	clap-2.33.3
+	clap-2.34.0
 	crossbeam-utils-0.8.5
 	ctrlc-3.2.1
 	diff-0.1.12
@@ -33,17 +32,17 @@ CRATES="
 	jemalloc-sys-0.3.2
 	jemallocator-0.3.2
 	lazy_static-1.4.0
-	libc-0.2.108
+	libc-0.2.112
 	log-0.4.14
 	lscolors-0.8.1
 	memchr-2.4.1
 	memoffset-0.6.4
-	nix-0.23.0
+	nix-0.23.1
 	normpath-0.3.1
 	num-integer-0.1.44
 	num-traits-0.2.14
-	num_cpus-1.13.0
-	once_cell-1.8.0
+	num_cpus-1.13.1
+	once_cell-1.9.0
 	proc-macro2-1.0.32
 	quote-1.0.10
 	rand-0.4.6
@@ -68,7 +67,7 @@ CRATES="
 	unicode-xid-0.2.2
 	users-0.11.0
 	vec_map-0.8.2
-	version_check-0.9.3
+	version_check-0.9.4
 	walkdir-2.3.2
 	wasi-0.10.2+wasi-snapshot-preview1
 	winapi-0.3.9
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 6fbb91b1b757..a2c4d339f3d1 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,4 +1,4 @@
 DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
-EBUILD findutils-4.8.0-r1.ebuild 1925 BLAKE2B 08f262ca0c2fbd6cdb3dd6028b40fc73e328d2a5935c08acfb31b1f7f565bd86ef157dad3e7a4dcb71663b503f0dcf5ad9e9e505d8b12ee14a643f0ce3cdbae0 SHA512 01c2b588c11bcb2609721df474bf6a41ad8651609dd875a295ebefea61ef3a48197fcc14ea0492569a1833ba0af5e4e955bc985b5de02f02d38704a61dcc7352
-EBUILD findutils-4.8.0.ebuild 1863 BLAKE2B 7e463fd8ff4115740d91e97fc9a74c2dd998665c632ffe956a51ac43f52b8a0cb843513fdc4b6464809544de013f0288eaad0bf475358ef1d82bd1c153442866 SHA512 fa42b34ec7d561a5e4143f3690f0df99e53b678722c58ba83f7f286d9fea0e2bf248e7c10ecb630b907d406858c87e5292d21b34c414ca201b76fb951c97f33d
+EBUILD findutils-4.8.0-r1.ebuild 1846 BLAKE2B 78cc2bbfc0c05c13bcc4772692d15ebe2e0780cb5a5fd8b5689b10777530e9901e8af14688fac6b135ee57d69e4e9ac4f521ccda6d16c1db0d1679db852e8a75 SHA512 a71c349ea7075efc7c4149b917a84ded5b8e0e400f2373aa0b7fdce817593c7db00efd5670bd3acf82b8d01d77f11092fa54300119c2e1bc2ec0e9d6b2805709
+EBUILD findutils-4.8.0.ebuild 1784 BLAKE2B ac28cb4d32588549ae9201d665ed03b84eae7ce20f333fa3b952eb404fdf71d4dfb548c2d41a167c729031c2e051f6f69b0f9d45a87738a3b69a70a97f8c5f5a SHA512 d9d2ec21b79b742f411e8d94ad8c5b605fdb1c0113a7885fd0f10acd562d1a1afbb6fd55e9156bcec7920326593b35c4dcb751eeb90bcd95085e767fb255c9c3
 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.8.0-r1.ebuild b/sys-apps/findutils/findutils-4.8.0-r1.ebuild
index 31a03c348924..6d35f0a1ca08 100644
--- a/sys-apps/findutils/findutils-4.8.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.8.0-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"
@@ -56,12 +56,10 @@ src_configure() {
 		append-cppflags '-D__nonnull\(X\)='
 	fi
 
-	program_prefix=$(usex userland_GNU '' g)
 	local myeconfargs=(
 		--with-packager="Gentoo"
 		--with-packager-version="${PVR}"
 		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		--program-prefix=${program_prefix}
 		$(use_enable nls)
 		$(use_with selinux)
 		--libexecdir='$(libdir)'/find
diff --git a/sys-apps/findutils/findutils-4.8.0.ebuild b/sys-apps/findutils/findutils-4.8.0.ebuild
index 9e47fcc65275..b4570b8b0f65 100644
--- a/sys-apps/findutils/findutils-4.8.0.ebuild
+++ b/sys-apps/findutils/findutils-4.8.0.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
@@ -53,12 +53,10 @@ src_configure() {
 		append-cppflags '-D__nonnull\(X\)='
 	fi
 
-	program_prefix=$(usex userland_GNU '' g)
 	local myeconfargs=(
 		--with-packager="Gentoo"
 		--with-packager-version="${PVR}"
 		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		--program-prefix=${program_prefix}
 		$(use_enable nls)
 		$(use_with selinux)
 		--libexecdir='$(libdir)'/find
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 92c0f4e0a430..75427e18942c 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -3,7 +3,7 @@ AUX gptfdisk-1.0.7-remove_byteswap.patch 1836 BLAKE2B 2c16a9eb14c4aef96db2b3b4e5
 DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
 DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
 DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
-EBUILD gptfdisk-1.0.6-r2.ebuild 1303 BLAKE2B fd1dd2d7b2ee4af590df70f9d4734c87609ff39418af8983c3de960ed6806b88701d5cb633e55f124d236b80fba7a274b41bd5a00478ab4b0327292aa7290a7b SHA512 aa22ca5d44716b209e45b01da15e3e07786275730003d0b75f8dea01a60d7f71bd0fe1e902e4f4268df03a64c5a72a2d6ae465962075687f6e2d4f43618e4f8b
-EBUILD gptfdisk-1.0.7-r2.ebuild 1303 BLAKE2B cbfb61efdd77d9b14b4a36bdee6cc853f37762ee6004c99fa1f3655d109af856d748f920ea3fbfa6249d5404fd9421685d604c828e00697cf2826d22feecb9ba SHA512 453cb55f924172b4a2d547007a5bd09d5366501678e9d20c66145b48227549557890e5a3df51f06c3f61a5ed51ecf5f80587746e34258f91aa40b6fc7166ac79
-EBUILD gptfdisk-1.0.8-r1.ebuild 1245 BLAKE2B 457fe059bf20dfb10c408c355b9b1ae7a7c826fe222842499ff986c83b963268d0b4213ed345733f1bd6bcc9bf467dd104c62b7a0e614f689e6d526161bd58fc SHA512 c05491bd468a5863ad7f9ed360035f2e94d1036a1711f79681d492758e18ccf95493e17afd3adc2e94228b35496743c21a388c1d9d2d72f6c815a509fa60caea
+EBUILD gptfdisk-1.0.6-r2.ebuild 1290 BLAKE2B d6fde27a06ffcedf0b68b708c7bccff19f8f22f25bc107ac3c1714665040e4f4315b3dfcb9291567ba6232f5e07a7864af3d702ae880441b407a2ac480255fd5 SHA512 ed80ab87a3edbab7a88c5ad9a9dcf3095e0b0af584bef5a437015476805781df6ca62e9e74fb8fd99021c1b9dda45e5627b865e77f04b96b9fe73c8127ae65da
+EBUILD gptfdisk-1.0.7-r2.ebuild 1290 BLAKE2B 789fed2d6991ebbb1bc8707dd17ed86449e6c2d22db73d8ec7451fa0f9c8d13dac65752295109010ce3332c63f0aab16bbd55cd757c959a8ef57f89543645569 SHA512 0d9b32e690c1e6d477b4009cbf55dc2361f00c6c99b289b8e927b516787770351f751f6226bd6cbd68dda4edd6450d0c55e5db6b9834356830d6e4bb464c4fa3
+EBUILD gptfdisk-1.0.8-r1.ebuild 1232 BLAKE2B c276a6d7f23bf6075a3dc4493008bbb43d2dfefdb128273646e6adb732441687d9e811487e8c77c54e609c9517c90855a0a3eba4550fd9c4aaa34efd81a5dcbd SHA512 51341a4dcfc4fe7738022f821da0c29c25031c6fa39328afeba7313e0e493a934bb9656e46ae64d51a9a5872725b5baf2124517d572f87b24f0ac3275b213841
 MISC metadata.xml 340 BLAKE2B 1934da4cf8289a324846642f69ba53d6e0988eb37c4a56019bae8094935efc1ff485f7f6746d58a72efcf81b1a017baca1f48e3a47d321fd8c87fb756b2e5419 SHA512 6074f7a7c0ada7deacf252c2bd7be3b5aacc3402e88b13bfbbf085b7760956a1ec35e52c22d49663d358dd837319815e4b1d5071ea0119f9890d31eca9ef84ed
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild
index 770e93982f0a..2861972f8552 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.6-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_linux ncurses static"
+IUSE="ncurses static"
 
 # libuuid from util-linux is required.
 RDEPEND="!static? (
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild
index 06e5ca062f3a..df490f526b5e 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.7-r2.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.7-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_linux ncurses static"
+IUSE="ncurses static"
 
 # libuuid from util-linux is required.
 RDEPEND="!static? (
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
index c97d95282503..150948967cf2 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.8-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_linux ncurses static"
+IUSE="ncurses static"
 
 # libuuid from util-linux is required.
 RDEPEND="!static? (
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 4955197fb6fd..92c1102a691d 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,3 +1,5 @@
 DIST hwinfo-21.76-1.1.src.rpm 966123 BLAKE2B dbacb4d8605e3529eb94dd91b4a480c73c935024cf119ba12fd1be4850dd3f5e07df6a306b39b04b1e830284be73d0fcb476f396f27312b692b0a424190a1388 SHA512 990c63574531f74949b60e072bb68069aba99594b57b4b1f71150c96a8630c32a56437968b37bff675a837e08f172e0e18743517566460b8120630d8195f8224
+DIST hwinfo-21.80-1.1.src.rpm 968192 BLAKE2B a11a1060137ff89504963c01c4129dcac93e8eea9747ea20272763f648068e8b4fb3f1c31ae761664b1b1ffedf32971b3b27804f125473f0367cc6eed03751bf SHA512 7bf64d9ee6b2381c43ffb22dc5623c8a8ed05c26b4e154c3093a9cb255779a1d482c18cd085b272ce619249743f1c43989337bed142685b4d6c634f4551893ee
 EBUILD hwinfo-21.76.ebuild 1547 BLAKE2B 9e691103ba93913281be177fc503a73e939ad9f1c3cb01c636d7d69a10ef642e6ca91cf0c2258594103e519135eabd83170c4e1d64792175a14d8f38a8f06ce8 SHA512 27048939938710f67b98c152bd8a4aa11bd3e75fe17e0c30a2cc7c5ba7da466a3a636d4299bdfada88aa190c8dfc89f3058ae12b65e959055a16e99b3156f5a0
+EBUILD hwinfo-21.80.ebuild 1550 BLAKE2B cb6f13c6d94495fc63da3c669b1e1618ac133af16d724c33a2f614db30446f45382a77fff1c7839e671c4b8d9d3359a934fc5dd775f3340d65dfb80f6208c549 SHA512 fbf22c4e750cbffc722037df01ee9c77035860f54f74b32320aed533989ded5e1e3d9f0cc4fce25c72156085b2cb5941e97e68ec0d88cc5b871c68bab062bf4a
 MISC metadata.xml 335 BLAKE2B 038b3d0d2c3215e9c141823f3578880ecb43da74b991cce36793a6af5b3549603ad1fa95c1bbe477126c3b84f6493099400d8914d94cdbe1c557b0166c0ca43b SHA512 e24489f0c20cc1cd356f7059c4a2a8d02b2f39fcb43df0d685977ce6e1593c134420daf6d940f96f08fd0d19026618d89946e6ff0a24f449be5d5c8910b10581
diff --git a/sys-apps/hwinfo/hwinfo-21.80.ebuild b/sys-apps/hwinfo/hwinfo-21.80.ebuild
new file mode 100644
index 000000000000..8335253522ed
--- /dev/null
+++ b/sys-apps/hwinfo/hwinfo-21.80.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm toolchain-funcs
+
+DESCRIPTION="Hardware detection tool used in SuSE Linux"
+HOMEPAGE="https://github.com/openSUSE/hwinfo/"
+#Using srpms from SUSE to get pregenerated changelog, otherwise we could use GH
+#SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	amd64? ( dev-libs/libx86emu )
+	x86? ( dev-libs/libx86emu )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6.17"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	# Respect AR variable.
+	sed -i \
+		-e 's:ar r:$(AR) r:' \
+		src/{,isdn,ids,smp,hd}/Makefile || die
+
+	# Respect LDFLAGS.
+	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
+
+	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
+	sed -i \
+		-e 's:make:$(MAKE):' \
+		-e 's:-pipe -g::' \
+		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
+		Makefile{,.common} || die
+	# Workaround from Arch, if using source tarballs from github
+	# echo 'touch changelog' > git2log
+	default
+}
+
+src_compile() {
+	tc-export AR
+	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	keepdir /var/lib/hardware/udi
+
+	dodoc changelog README*
+	docinto examples
+	dodoc doc/example*.c
+	doman doc/*.{1,8}
+}
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index e7003f01a60b..1a5530b97aec 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -1,4 +1,3 @@
 DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
-EBUILD kmscon-8_p20180906-r1.ebuild 2920 BLAKE2B 9fa4f3132dbc2c7b9bc65bc023fc45439b6eb699231e0d20ad878d01a27bcd5333cda05a6911a44b7687345278034563a4fe49f7d9f15150ab58e2ee281cdd54 SHA512 ed3061a5f3da10b5b3dee25858bac37ed47ea780ea7e859c82f521c96ea91dfeef99873a1d0a32b5d2d7b03055d3c6e4e972a04a98193bf5a2ada73b6dbe2b1b
 EBUILD kmscon-8_p20180906-r2.ebuild 2929 BLAKE2B 9fa4c899c776e7bd780b6dd40d1a8adc9880ab129a308479f60eabecd00843e389b886dbd632c4d5da4b2d5d04ba655e1af2b49d3bffabd1873b0f523fcb14e2 SHA512 ac8ca2c15773715a2b79b494fd82952f89bd805223a7b36c04a44aa1d81f5378129bde32ef970b1a8c19bcf2af75a44245b880e70dcb2dcad9b9a8ecb4e2f48d
 MISC metadata.xml 665 BLAKE2B 3eda7f9e7848f5e1ee5161d8f124bd9cec1978c3bac41c3d3b90ffa1eb6300cb69a609233307731e7f71c89a30550c61f84d2690793a75f500853491bc137391 SHA512 d692f3f0cdabf80e3c5eb6c4a41efa457ab15b3e90ecadf741e829ea28a63f223e55439b4ca7f0ef15a61e8f9e77c2b9eb0952241940a939e801b97280dbda1a
diff --git a/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild b/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild
deleted file mode 100644
index 4efe46630307..000000000000
--- a/sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT="01dd0a231e2125a40ceba5f59fd945ff29bf2cdc"
-SRC_URI="https://github.com/Aetf/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-inherit autotools flag-o-matic systemd toolchain-funcs vcs-snapshot
-
-DESCRIPTION="KMS/DRM based virtual Console Emulator"
-HOMEPAGE="https://github.com/Aetf/kmscon"
-
-LICENSE="MIT LGPL-2.1 BSD-2"
-SLOT="0"
-IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode"
-
-COMMON_DEPEND="
-	>=virtual/udev-172
-	x11-libs/libxkbcommon
-	>=dev-libs/libtsm-4.0.0:=
-	media-libs/mesa[X(+)]
-	drm? ( x11-libs/libdrm
-		>=media-libs/mesa-8.0.3[egl(+),gbm(+)] )
-	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
-	systemd? ( sys-apps/systemd )
-	pango? ( x11-libs/pango dev-libs/glib:2 )
-	pixman? ( x11-libs/pixman )"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xkeyboard-config"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( dev-util/gtk-doc )"
-
-REQUIRED_USE="gles2? ( drm )"
-
-# args - names of renderers to enable
-renderers_enable() {
-	if [[ "x${RENDER}" == "x" ]]; then
-		RENDER="$1"
-		shift
-	else
-		for i in $@; do
-			RENDER+=",${i}"
-		done
-	fi
-}
-
-# args - names of font renderer backends to enable
-fonts_enable() {
-	if [[ "x${FONTS}" == "x" ]]; then
-		FONTS="$1"
-		shift
-	else
-		for i in $@; do
-			FONTS+=",${i}"
-		done
-	fi
-}
-
-# args - names of video backends to enable
-video_enable() {
-	if [[ "x${VIDEO}" == "x" ]]; then
-		VIDEO="$1"
-		shift
-	else
-		for i in $@; do
-			VIDEO+=",${i}"
-		done
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_configure() {
-	# Video backends
-
-	if use fbdev; then
-		video_enable fbdev
-	fi
-
-	if use drm; then
-		video_enable drm2d
-	fi
-
-	if use gles2; then
-		video_enable drm3d
-	fi
-
-	# Font rendering backends
-
-	if use unicode; then
-		fonts_enable unifont
-	fi
-
-	if use pango; then
-		fonts_enable pango
-	fi
-
-	# Console rendering backends
-
-	renderers_enable bbulk
-
-	if use gles2; then
-		renderers_enable gltex
-	fi
-
-	if use pixman; then
-		renderers_enable pixman
-	fi
-
-	# kmscon sets -ffast-math unconditionally
-	strip-flags
-
-	# xkbcommon not in portage
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_enable optimizations) \
-		$(use_enable systemd multi-seat) \
-		--with-video=${VIDEO} \
-		--with-fonts=${FONTS} \
-		--with-renderers=${RENDER} \
-		--with-sessions=dummy,terminal
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
-}
-
-pkg_postinst() {
-	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
-	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
-	ewarn " /etc/login.defs for proper backspace functionality at the" && \
-	ewarn " kmscon login prompt.  For details see:" && \
-	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
-}
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index f01c58c062ca..9eef2e5d07ef 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -21,7 +21,5 @@ AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 EBUILD memtest86+-5.01-r5.ebuild 2843 BLAKE2B 6094eb3d890de7f7fd72012104c0b467746a313a5ad04c3546e1932556889b108edc8b6ed44442c0443b2305c335c3bbcd4f178c80564b0da9d7a5e11fc17d6f SHA512 dcea721c0ac1abfe2f4f1ccf0972284025d841caf84d7d439ae1b4d9dd891e46418ab08cd4b0807dab93a132cc29a4ee4cae6f72da7cc5dc356e8ef6d3e40859
-EBUILD memtest86+-5.31b-r1.ebuild 2690 BLAKE2B b4370c3fcbcd83374d1382aaf5c58876e4ddfd47a1a44e4077e996b139027f84b906b81c710294209f3c91854fd2222ac457d9ee9e613d68b6aa5212aa0fab51 SHA512 56d8ab7c69d5293a61ec436cbb1931ccd21011fd40b662e22873d614563a661551b1a4123d8d8583fb1872b0e26945e31d4ec914f81828f82b53b0ef9bc3a261
-EBUILD memtest86+-5.31b-r2.ebuild 2808 BLAKE2B 862a5c57f8b43106462c3d07ff45b65e133ad86d38316970a559714404383d2e95f55c0f36b4468278131c63ba58790a94f360886a56fcf973b3d010540d401f SHA512 a8bc74f164cad97ec486dc8c4b9efb3765349b7b1e627e1115e4dd4389347c8ca838225c3b62700a097aebd4d12e37a3576281b532cb5781d2cfd413ffa1fe96
 EBUILD memtest86+-5.31b-r3.ebuild 2860 BLAKE2B 3fe57a1bcc5e7edbef0c3bdfc94db3581e8b1bcedfa8b9c1cc090ae1f2866592ab597383c1c8ddda3733089ed7b65f2bb7808563a43153b0fc84be043728de2f SHA512 50a7258e9d39ae38c54359a09e8eeb5d8a27f8121e451783a20137e6268f819f0dd523eded850040a48cb9b978dcd6966e35d5e52c4a071c550dc569d97f42f5
 MISC metadata.xml 551 BLAKE2B 8d899e354f3c3e84526674d2eab5fb81f20a2c585d599cafe7a12dec4aa9bf2b004ce6f54010474b0abd2ec0b347b00937aef25cc162794520554dedc89471ba SHA512 519fa8bbbeda2f082ce1eb5874089a61041d2ae0902c73183fd4e619e14b137c1aca2cb4d81557afad5f9620713ba8ee324d7c7674ac0618e9dab8a5d7abdc0e
diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
deleted file mode 100644
index f1d2ec759176..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.31b-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-BDEPEND="iso? ( app-cdr/cdrtools )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-473.patch"
-	"${FILESDIR}/${P}-hardcoded_cc.patch"
-	"${FILESDIR}/${P}-no-clean.patch" #557890
-	"${FILESDIR}/${P}-objcopy.patch"
-	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
-	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
-)
-
-pkg_pretend() {
-	use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-
-	if use serial ; then
-		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h || die "sed failed"
-	fi
-	default
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake OBJCOPY="$(tc-getOBJCOPY)"
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	if use boot ; then
-		insinto "${BOOTDIR}"
-		doins memtest memtest.bin
-	fi
-
-	insinto /usr/share/${PN}
-	use iso && newins mt*.iso memtest.iso
-	doins memtest memtest.bin
-
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_preinst() {
-	use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	if use boot; then
-		mount-boot_pkg_postinst
-
-		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs:"
-		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
-		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
-		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
-		elog "    > image  = ${BOOTDIR}/memtest.bin"
-		elog "    > label  = ${PN}"
-		elog ""
-		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
-	fi
-
-	if use boot && [ -e /sys/firmware/efi ]; then
-		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
-	fi
-}
-
-pkg_prerm() {
-	use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use boot && mount-boot_pkg_postrm
-}
diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
deleted file mode 100644
index 3962c3e9f986..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-BDEPEND="iso? ( app-cdr/cdrtools )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-473.patch"
-	"${FILESDIR}/${P}-hardcoded_cc.patch"
-	"${FILESDIR}/${P}-no-clean.patch" #557890
-	"${FILESDIR}/${P}-objcopy.patch"
-	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
-	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
-)
-
-pkg_pretend() {
-	use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-
-	if use serial ; then
-		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h || die "sed failed"
-	fi
-	#613196
-	use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
-	default
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake OBJCOPY="$(tc-getOBJCOPY)"
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	if use boot ; then
-		insinto "${BOOTDIR}"
-		doins memtest memtest.bin
-	fi
-
-	insinto /usr/share/${PN}
-	use iso && newins mt*.iso memtest.iso
-	doins memtest memtest.bin
-
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_preinst() {
-	use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	if use boot; then
-		mount-boot_pkg_postinst
-
-		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs:"
-		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
-		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
-		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
-		elog "    > image  = ${BOOTDIR}/memtest.bin"
-		elog "    > label  = ${PN}"
-		elog ""
-		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
-	fi
-
-	if use boot && [ -e /sys/firmware/efi ]; then
-		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
-	fi
-}
-
-pkg_prerm() {
-	use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use boot && mount-boot_pkg_postrm
-}
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 42880f4ff3eb..d88510610dbe 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -2,10 +2,10 @@ AUX plocate-1.1.10-meson-use-feature-option-for-libiouring.patch 1833 BLAKE2B 4a
 AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
-DIST plocate-1.1.10.tar.gz 72222 BLAKE2B 2d84177454380c9e806a46a6e7057aca15b65c9d83179ba35062d0b8772e7cb3ff50d594c294d73157e7705d4b2eea3f12d07e614076e6a6c7a9b532f42640f5 SHA512 eee4a8982b8fff18793cd06c35cdea501226fae6409df02e8bed3d14feb3ed4ba6c29e907f36f5efb74202e8926547def83379b03aeb6348e1a6e7b51f12fdb9
 DIST plocate-1.1.11.tar.gz 72366 BLAKE2B 2b945b3e61244670e2295e1e5abc2af65d2cdbb2393a96961cd4ae97384a735c327037771e6f41927cec0860207a6f98b7b0c2b03d08678bdb0d72a94dfa04f7 SHA512 59f88a11ebbac5f350acca6d1a5890ac1c1cb10c1de2e4e149df60fc63673eefa7f143b06f79ec4e59c65d435b3e222eba5618c48afab97983d76f56fbe8b433
 DIST plocate-1.1.13.tar.gz 72741 BLAKE2B 251c5ff570bda125c839e125eab093e15545beb24e75d29c21f13050fc088653f11ba1acbf4c4f6f6aaca4f134908b8084ad4b1e8b0cad83a1a05e1bc2973cdc SHA512 a7c761e4da169716686f438846587e4bdb6df4de039cd7b4fed455e5f52b8aa235714f0c1059787f65f1553a07929802d0ecda0b26111d4f0f811af96a48cb7d
-EBUILD plocate-1.1.10.ebuild 2076 BLAKE2B 24b739711c5dea6964cfac26f18ab4f7cff7d1a78a8d2d7d2ed1810d12a417a42bd0257ad14a36c9e65aa7c767fc9cd8a7db151f58ceac2345514964c084d0fe SHA512 0a6c96e085ed11000df8b30e2406c100a2404f0cd72b912493ab3734fca774313e86cb0f489db791fb2daa39bcba21a6452428a0ac1d539617296e72b5ef5c30
+DIST plocate-1.1.14.tar.gz 73037 BLAKE2B 032963fa268d31664a8abd38ca501aacda4cfe29c8fd1e41228a4cfd5976174736e8d8f8aa1265de8953ec63211700da73e4cdd3eef42c059a638cdd9cd59379 SHA512 c97c9e4aed785af6bd8c2a30d5d5c7190cb4c513f1d6b66bb2885c9550b4cd39f097fac4bd736c211a921955422d0c27b5f35713f03ebe136450cb724fcfe600
 EBUILD plocate-1.1.11.ebuild 2081 BLAKE2B 075034c462d4781f2ff0d9de298569e215538d5d498c5d2cd042aa680b2f2cccf3d24ece0a4b4790d6e8f8c95dfe402b79512e132c036b43c6c033deeb5af995 SHA512 726ee0a4705cd7b695db84d995f8845efc75060f863bd9fe9a0d7908a1383a12efd9c380c43d4a66d2926bd3bf4572f3ffa640ce51473d44c0064b695eb79d99
 EBUILD plocate-1.1.13.ebuild 2081 BLAKE2B 075034c462d4781f2ff0d9de298569e215538d5d498c5d2cd042aa680b2f2cccf3d24ece0a4b4790d6e8f8c95dfe402b79512e132c036b43c6c033deeb5af995 SHA512 726ee0a4705cd7b695db84d995f8845efc75060f863bd9fe9a0d7908a1383a12efd9c380c43d4a66d2926bd3bf4572f3ffa640ce51473d44c0064b695eb79d99
+EBUILD plocate-1.1.14.ebuild 2082 BLAKE2B 1b946f516eff9d7dfe9b4aeab26be44c83cb414955d64548248fb8bd45ce84d248ab0944c1f3b1f5e1ef5238846a71a03cb5d3f083393cf233fd180ee3be5d2f SHA512 a234c89bf645c147609135d630aeb0c5b3a47b0dcd84a686b74c9fa0c1d59a3c11ba5a18d90f559f37baa3d074e205ff4c9c5b09c4bd034a9126acb3cf52cbc3
 MISC metadata.xml 1393 BLAKE2B 1459e2cc800bad910a9e08a1fd0d6b6a533d3420279a4a89d5c07d91775180669684d5b454962323acb5ecc1d96de650f48623a9f63319004ad25bea7b4ded97 SHA512 16e282b1d1bc1f71631bbde3ca935c1e0747175460860ef068e6855a9efa3d843841e0b9deaa0848a2f4fbff32aa630f0b93c398b196c6619a61f59263ee8e31
diff --git a/sys-apps/plocate/plocate-1.1.10.ebuild b/sys-apps/plocate/plocate-1.1.14.ebuild
index 5b617cb2ffc9..a3e786010409 100644
--- a/sys-apps/plocate/plocate-1.1.10.ebuild
+++ b/sys-apps/plocate/plocate-1.1.14.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
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2015234a8d4a..d8eda5ed8dd9 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 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
+EBUILD portage-3.0.18.ebuild 8718 BLAKE2B 31ae0f52479b5c4704eaea954e09fd2e105bbb79b218a618eb0c7ee2f39385ee7dd289c969b724e308c34c6199e2e4539b5bbe8bdf6d67edc1aed613edb8b83a SHA512 65e40751d725a999a2aaf5c26e3c3893b86b1dbaba133eccfdac6ae0a0f299535ec77929ca486565ffc4b249dd8a76bb5f58487581ffd45c56574c8ca1b26820
+EBUILD portage-3.0.20-r6.ebuild 9837 BLAKE2B a4176c20b1e43ef301bbf595a335406130be6d157180a3cb867a71813280dccdbb5f03ec0068c0f4803b123d56da951898e49f30a60e6e5a3ed8bee56092d3d1 SHA512 e3cbfc10e9891e51c382ef1d854f3eafe3c147a8e1248316a6f78b6dd25715bab84bfa32241bc54624e5db610359d27c9162bc3753531b753fc0b9a7aba97c68
+EBUILD portage-3.0.28-r1.ebuild 8727 BLAKE2B e174e7fb7f51f1ec04d4076f6b04e9d7facc33319c3c743c0e87b503d8f00ca459fec5546f322c6b84291e5e0178b0d76b20806908bfd542983f547e900e0a0a SHA512 86c2b9b9dcdcaa6be5247db802ec230327981d4f3c4e31980e19064621a9287dc9ac9c8e81a94dbc1611857fe847c8989a7f3b7a09db3227092a9297d7f440a7
+EBUILD portage-3.0.29.ebuild 8548 BLAKE2B 32eba52517af7bde9fbafddb15203a7c9c6b72cd549b6a81f79b35b0ba96cedc7a121f3dd9496a3d4c66377ef591fe63a6eb0b57da3a1b72d0e2656aa4b11da9 SHA512 11f9394cfd8ed261d0b83a724366d9e43b2fb76fd71d1f6e1424ebf07d55a4dde78ea25157266f5eb6bd85d414f07d4499888907697d41248ceabf74ced03282
+EBUILD portage-3.0.30-r1.ebuild 8619 BLAKE2B 31cd6f2c26568ccd2a12d4c41c1684a41a503a5ac1478316198510f0d30708d5f98bf53a4fa0e15f1dda9dbbf65ee58e086f6a78916d089c5b912128d5e5403f SHA512 96a85738fae95845638881f5c2557c2cec9f55cb11c9db814f5c46a49e586d837ea85d3db779bf6b0195f2fcb04cd70e1b3bb6d97c764ee729e867bc296c4283
+EBUILD portage-9999.ebuild 7795 BLAKE2B 4fa265b0a6fa437e6ac9f9a5ff5a79924c5197fe9b6ff9c2cc396d61f6354489fd9380d405a6a34bfb3c6ac49b61c9d8cb7ee8c03207cf833085f3225831df77 SHA512 855a34cc7d07bb3db16dedc9df50bf44f0e5a750198b91aac1baf70ddc5b82b63305a44cf383c6e268abe598b4ca64d786bd2fa749b7c9f70ba1065c5db6d69a
 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 25a9e1f9f959..c1286a53a251 100644
--- a/sys-apps/portage/portage-3.0.18.ebuild
+++ b/sys-apps/portage/portage-3.0.18.ebuild
@@ -67,7 +67,8 @@ RDEPEND="
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
 	)"
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
diff --git a/sys-apps/portage/portage-3.0.20-r6.ebuild b/sys-apps/portage/portage-3.0.20-r6.ebuild
index 42042cc9bed0..be754e155cd3 100644
--- a/sys-apps/portage/portage-3.0.20-r6.ebuild
+++ b/sys-apps/portage/portage-3.0.20-r6.ebuild
@@ -67,7 +67,8 @@ RDEPEND="
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
 	)"
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
diff --git a/sys-apps/portage/portage-3.0.28-r1.ebuild b/sys-apps/portage/portage-3.0.28-r1.ebuild
index 8c0ac654bb55..a9157003e9b4 100644
--- a/sys-apps/portage/portage-3.0.28-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.28-r1.ebuild
@@ -70,7 +70,8 @@ RDEPEND="
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
 	)"
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
diff --git a/sys-apps/portage/portage-3.0.29.ebuild b/sys-apps/portage/portage-3.0.29.ebuild
index 008060e58a4d..9f12ad6b4cfa 100644
--- a/sys-apps/portage/portage-3.0.29.ebuild
+++ b/sys-apps/portage/portage-3.0.29.ebuild
@@ -67,7 +67,8 @@ RDEPEND="
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
 	)"
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
diff --git a/sys-apps/portage/portage-3.0.30-r1.ebuild b/sys-apps/portage/portage-3.0.30-r1.ebuild
index e535325e9cae..5c62697a503a 100644
--- a/sys-apps/portage/portage-3.0.30-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.30-r1.ebuild
@@ -67,7 +67,8 @@ RDEPEND="
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
 	)"
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index f45399a6016a..6db78dd658f7 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -67,7 +67,8 @@ RDEPEND="
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
 	)"
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index b7fb2ea5b44c..6f8d4ed04e79 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,3 +1,3 @@
 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
-EBUILD sed-4.8.ebuild 1004 BLAKE2B b8d496063405fd7b7cdb70092477fbe0ad13a1d8ae39700eac52df1c300a4750501080e1260eb4f53c6e36bcf02aae78cd9e8032019ce11437a669e947f0df07 SHA512 1fc00a09010dec7e021071897f648e26dba688dac2135e0475b5ebc713b76c12e5a4e45cc85a64a2cfcc759b354a95937503c5ac986df79554cc9a721e14c93d
+EBUILD sed-4.8.ebuild 910 BLAKE2B ede8f5f9e1b4722152d6c93792159e3348338d7997ecd3809ac9229dcad48148fac59cfd6dbe1c9a31ef1a79c29914827237000b1680e049afba9112c98effc6 SHA512 fd152088886af788ee5d788bcc5c7dfaa4795d56fe84461a40aadd4379343721c3d8b5396b688544a167989ca412e4c2209d8fb12ff0fed1bb5c4559449083bf
 MISC metadata.xml 374 BLAKE2B a7f25f18d1ffcd990f11d66f403f5e283af61b7a81127b8a4450506b5432610972d4d28df0c60b5e45d502d2f2e260f0390836b43d9e5efd48e4594796f751c4 SHA512 7efb14e44bc0d9d25b0e90f776f25ee5fbcb8b44b226255dcdd5e54cb1fb414f9c7dcd33ec2aa6f6bfa82159be8bba19069fc9e13576bfe2b99a87c898f2d002
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index a8aaee8972f8..69f4960ab94f 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.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
@@ -31,15 +31,10 @@ DEPEND="${RDEPEND}
 BDEPEND="nls? ( sys-devel/gettext )"
 
 src_configure() {
-	local myconf=()
-	if use userland_GNU; then
-		myconf+=( --exec-prefix="${EPREFIX}" )
-	else
-		myconf+=( --program-prefix=g )
-	fi
-
 	use static && append-ldflags -static
-	myconf+=(
+
+	local myconf=(
+		--exec-prefix="${EPREFIX}"
 		$(use_enable acl)
 		$(use_enable nls)
 		$(use_with selinux)
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 9c88513a5f59..3ab661d4046a 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -19,5 +19,5 @@ EBUILD shadow-4.10-r4.ebuild 6298 BLAKE2B 239be497a87a4ae3442c0aaf10b6f97f417d73
 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
+EBUILD shadow-4.9-r4.ebuild 6122 BLAKE2B 62ecf5fc7a4d294435087bb697454110d7ad9bd6788afe7a82f0e2604466d60b5926762307504276aa91cb290848548e35b8321409e241284224adc2f262b6d5 SHA512 5105979473441075eec2b2148e65a20e381de32a0d9a60dd9dc885726b52cdda7a7ccae878f42afb11924c1baf1a72263155c1153efd2aacc3ad35448793ddfa
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.9-r4.ebuild b/sys-apps/shadow/shadow-4.9-r4.ebuild
index b9f851ce8115..b155bff5396e 100644
--- a/sys-apps/shadow/shadow-4.9-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.9-r4.ebuild
@@ -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 )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 294c6b231aa2..808a8eed4059 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -9,8 +9,10 @@ AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab2821
 DIST systemd-250.tar.gz 11112823 BLAKE2B c75ac7f1fcf1a65c9c88b25dce78dd44a039025b52767c3a1de78fae7a89705ed8ba8986d18d674faa9bfac3380a1c847bde35292d16f90bf22d992a459ddc73 SHA512 7894ea63793dd0c6ae12f6acab04ba02e247e537c404693f69174bf4a10d85f01f51c4938912c9a43c35e526b3ae945a1774d45249b58b31a393332b6c01f4f8
 DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
 DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc
+DIST systemd-stable-250.1.tar.gz 11116731 BLAKE2B 9c0a8d02deb12a359c8665ba4d8d7e9d2ddee3f819f47b4598269e8ee8180e2e01ab774caeca7a19e98d118aebea5a38a07e916db4155efa0c19ce54a2b7e979 SHA512 a40a83dae353de8cf816f3408f91b9f72dfa1f4bae195fb48c2756c0c316bf6cb0def1be550c0322456e4940690d90ff324ca6d91126d9b13cfe9954c42e0216
 EBUILD systemd-249.6-r1.ebuild 14730 BLAKE2B c40a2c8ba95cfb613f3260fc0ad4b21408c35a5e4d804d3f80df0934fa4a86276cfe19de8354189f5e1554deb75b6e73caa701d64995f97ff0d4f57a1b418ca4 SHA512 45196efcb82b33fe295e29aa37066a0b175ca603d62cbadd0ee655b22ec4b8a91c0edd1107d38320e292b885b2f83b9ae625fed21db3a24392c253b9d90685d0
 EBUILD systemd-249.7.ebuild 14731 BLAKE2B 3aedadd028899d1a74cb841660f8fe1a59d78330cb7bd951388d87aa7197f94d2fbcec600a95a0a6d76c55d085178f7c5fdcd3374f49ee58d040e7ce66f1e73b SHA512 5b75ee51471cc21e3fbb4c77c4fd4f2580f4932964f90f787b51d72ec60785193a06ea72f0281fabc73aa514eca73b8ecefe6e7192decdcb091b449e47f302bb
 EBUILD systemd-250-r1.ebuild 15274 BLAKE2B 3d2add620e89c66e586503a78fec3f349028267e38d84dc2d07a8706f04e2a65f9f5764ef9a14358ce197095ef6a0abad2577c2062821fd76c833a09e29d27ac SHA512 a654338a354558d36f46b3ff6d5cb4fc3f068789a267dda300b9a4db14bd10dc9f9d9a13327f5c7dc20fea4f593e6ba026b83390cec4791672a4c22d9dcb4d03
+EBUILD systemd-250.1.ebuild 15236 BLAKE2B b5ec69d56db03c03887530773faa4a824cee21a493d9ccca74cc1d1a1948faaa2fcec3798932c5d50bf8e124faee2c910fa727313456807f9fde8f141efcff7f SHA512 d0b3dc2cf86aceff1a0de842fd10a48d9897006a62bc8c97f44309a5a60ca36880f75b78203fdef11c2e95ef7f50a9dbdfb7e16b9dbb6298a2fc1453a3e12c2c
 EBUILD systemd-9999.ebuild 15236 BLAKE2B 886bb6be8442cf7a137c8bad923802a79c39418bdc1940a6f5efa50f090de609921c3c009e5ad077f81f83c13c8567b0be7a4cfbeeb1819e71be1269d0acc667 SHA512 19144abfacf1484fb26bccccbed1704de52ba247af2c06a91348f4998ecbe4c788ffd141d32371420b798315561713499f79306f6cf5d4d88e1ce9579a64bd38
 MISC metadata.xml 2627 BLAKE2B b785769f4d2d029a935d8aa4da18d2366d283565a70db63b36eccbab4213edd3c0063a61fe58b313a37cd72fa4a848f4ba12dd3761f82b862a84a3b09ce06258 SHA512 ecbc947ffc3ad23afb6c07c60907d5cbb91053c4153c6661fa26f358710e3d7ca44ae4c3b0d229b428fbe5abb63f83175448e6fae8ec11c1cbe01c1a692c873b
diff --git a/sys-apps/systemd/systemd-250.1.ebuild b/sys-apps/systemd/systemd-250.1.ebuild
new file mode 100644
index 000000000000..d4624f9759b6
--- /dev/null
+++ b/sys-apps/systemd/systemd-250.1.ebuild
@@ -0,0 +1,520 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	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="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	policykit? ( !hostnamed-fallback )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+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= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	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=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	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= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	hostnamed-fallback? (
+		acct-group/systemd-hostname
+		sys-apps/dbus-broker
+	)
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if kernel_is -lt 5 10 20; then
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		else
+			CONFIG_CHECK+=" ~KCMP"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(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)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(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 seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	# workaround for https://github.com/systemd/systemd/issues/13501
+	if use hostnamed-fallback; then
+		# this file requires dbus-broker
+		insinto /usr/share/dbus-1/system.d/
+		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
+
+		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
+		doins "${FILESDIR}/00-hostnamed-network-user.conf"
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 62b372ff45f7..b06c5cb8d3e5 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -8,7 +8,7 @@ AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa
 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
 DIST sysvinit-3.00.tar.xz 127072 BLAKE2B d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 SHA512 ba834ac6c48528304373018bfb05dcdd3573d8081dd7dc95a44808804404d77ee4832fedb3f34e67d87f22f201f9526c54910a51c6ed2a42ac55b756843cd825
 DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf
-EBUILD sysvinit-2.99-r1.ebuild 4007 BLAKE2B ed9f8a5878284684e2602bd9ee794e981b05aaa440da676b46bf3ec65c55f70aedce19798cdaba2e144112e9774f3436379dcfcc248520a083ee396c57bcd6a8 SHA512 9c5b021dd1b5a21072cc69fe8fd132abbe563fb8550b8f5f712ca7c274f40b7d01e49d313990f0cb1f44fd651dbadc54210df87b69f8134c3eb38720fefa941c
-EBUILD sysvinit-3.00-r1.ebuild 4015 BLAKE2B fe3ff8ec0b7d65fc7642cf7fcef783023f214c88cf76b8d6d2812d8da2074650524f72fd3cdfa786b2d9f3eb99b081d30216ac7e0b3f102e233bbef3548be152 SHA512 b19fdc80ba95eaf15027601439a8991a0e3a4904048efeec6e3f47f7fde81d87eb80ce56b0d5ec773d1b0bba9191cc2a0da9b6505a7c1c70a55260e14efc5580
-EBUILD sysvinit-3.01.ebuild 4015 BLAKE2B fe3ff8ec0b7d65fc7642cf7fcef783023f214c88cf76b8d6d2812d8da2074650524f72fd3cdfa786b2d9f3eb99b081d30216ac7e0b3f102e233bbef3548be152 SHA512 b19fdc80ba95eaf15027601439a8991a0e3a4904048efeec6e3f47f7fde81d87eb80ce56b0d5ec773d1b0bba9191cc2a0da9b6505a7c1c70a55260e14efc5580
+EBUILD sysvinit-2.99-r1.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
+EBUILD sysvinit-3.00-r1.ebuild 3857 BLAKE2B 791e9a2c798e5194338bfa2b7339d8badfcbeaa1548fd9beffcd968cf36ba68b29d6a9087818d3fdfa90c725567d71757ff50029d460c8862e8487fbd4e0cb3c SHA512 ea6f4fd2491b49b9351b767feb14aeb696452277b80ab0244e6c2831f7ae7f29dd5164825a378e251d640ef6798f547865dd359eda032757531ce92359a352af
+EBUILD sysvinit-3.01.ebuild 3857 BLAKE2B 791e9a2c798e5194338bfa2b7339d8badfcbeaa1548fd9beffcd968cf36ba68b29d6a9087818d3fdfa90c725567d71757ff50029d460c8862e8487fbd4e0cb3c SHA512 ea6f4fd2491b49b9351b767feb14aeb696452277b80ab0244e6c2831f7ae7f29dd5164825a378e251d640ef6798f547865dd359eda032757531ce92359a352af
 MISC metadata.xml 359 BLAKE2B c5bd566a590dd04ca51751f4985840a143515fb8f7d3d21e1ad7f35b042ce578dae87e8d86a6338f7346cb50012991ccc77abfe73cbf2a4195f8d3dda04708d5 SHA512 9eec819463d81e55845eb293c5bc822748dc28bb420cfe498077d2dec6947e4762a743ddaadba34576f10275e9176347ba98711b059c429b4125258718e8290b
diff --git a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
index 9d78abebae42..589bb6747c9b 100644
--- a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.99-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
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux ibm static kernel_FreeBSD"
+IUSE="selinux ibm static"
 
 CDEPEND="
 	selinux? (
@@ -76,13 +76,6 @@ src_prepare() {
 		)
 	fi
 	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
 	if use x86 || use amd64 ; then
 		sed -i \
 			-e '/ttyS[01]/s:9600:115200:' \
diff --git a/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
index 83d6e6f7635b..2b6267d776db 100644
--- a/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.00-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
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="selinux ibm static kernel_FreeBSD"
+IUSE="selinux ibm static"
 
 CDEPEND="
 	selinux? (
@@ -76,13 +76,6 @@ src_prepare() {
 		)
 	fi
 	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
 	if use x86 || use amd64 ; then
 		sed -i \
 			-e '/ttyS[01]/s:9600:115200:' \
diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild
index 83d6e6f7635b..2b6267d776db 100644
--- a/sys-apps/sysvinit/sysvinit-3.01.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.01.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
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="selinux ibm static kernel_FreeBSD"
+IUSE="selinux ibm static"
 
 CDEPEND="
 	selinux? (
@@ -76,13 +76,6 @@ src_prepare() {
 		)
 	fi
 	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
 	if use x86 || use amd64 ; then
 		sed -i \
 			-e '/ttyS[01]/s:9600:115200:' \
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 198ce27bacbd..c82ee8f13330 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,7 +4,7 @@ AUX su-l.pamd 140 BLAKE2B 34f00c8814d454c8caa6bd5f0dd0bb89b24c12dbc0e39e852dc459
 AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efdec4bfe367c560bcc863de61e8b0e1055535d4731525613ee20eaee5efeac6f96b399df1a60865c29e554df6684e3525f71dac821c8205c SHA512 e970c7b3c6e50bffc2e57f90f3284ba55906d71d286e8d23f06fd9905f66273796712cbd8cf3fa1a12bbb2dc404c72b790caba11ec63c8ff84ed9e4e041f64ca
 AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c7560987438dad5e6ed43046233ae3400f91ff09767825b20ae2ff3886d8a7a3d7790dda11cffbf351c4047ac5397d1dbb98a548303d1caa8af SHA512 f0f0616a8729e302ef30b72437e34d7ac308e32206c0fdea2d3117da6a01d18b809016e2f46affed3b8fcaf156c64cd895a7460895aadcf39352fe724a3bfd78
 DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d
-EBUILD util-linux-2.37.2-r1.ebuild 9412 BLAKE2B f94d8887209e0a2e547c1846483bffc3f6f371fb03904317b6a7e50bffded3d8eda64d6119af2c72dba64bb75844deb717b9daad96a023033bf3c2711f880b43 SHA512 d7a74218f362e0ff1807899001006824801f7da22b580cf43c8e621b03240d8bd33a3a78c6718ac1604897744c9552315d1b24330c3e94553294de6564fd5f1f
-EBUILD util-linux-2.37.2-r3.ebuild 9573 BLAKE2B 2738dff580cab8a5b5a508a66e7adf32fa5505ff4d9b68fef57b91f61dcf9c3d6d54818d21e90104722d66f3cbe98200c72dbd25f17d72819fee9b9ca74c22fc SHA512 c7c4ecb87d10041b2121037fe8f4c7b25158cce15820778a421b5f61ac24fde73117617545b32971cdea391fe784b4e4e1dba79d29cf8b572dc665597f754247
-EBUILD util-linux-9999.ebuild 9426 BLAKE2B 9b316a2a5504239f7efbaabbe02091c306ed692bc2c50c78a7ce0c60281595e03bc710c97ba8079ef407c771859038f7311d6435da5c35ef4c0d3f275f63d862 SHA512 f4a9ccd964c4108410fda35a37c8219c1a034892460fe19e99fcd1d28507bf63b1f55591e79cf1e556d1ba3b2e5246e81d8aed02af314a3c845d22905d524f48
+EBUILD util-linux-2.37.2-r1.ebuild 8770 BLAKE2B a5662ed7720f636f06896b98662d94267ca0b6719614ddabbeb27600bc29232577c96b1af13a2574a16216a0f401635554753c42f815174e933522c7cd4aa0bb SHA512 d4834e6e9c585e150a6ace0c29063cbc895e61346d554da8c1e5606c2338ef7c4ff343d338913fbccb38886b9c1b83c9a3917a764ff368a10d3dd4f74077a343
+EBUILD util-linux-2.37.2-r3.ebuild 8931 BLAKE2B c763a44e29ac98ea3a93a534cf758907a864fcbc611e5c9b83dec875e6432a57515ad0509236f26e1adec70230baeba1e5618cb03ef0b5c9ac8a1f5c6065aac5 SHA512 52e9dbb2068e7632166a8aa727f254876be51a2078679d67038cf2a9a02b81175aeb0e7c08cf4a31ff2f5981c241655ecc915565b3b9866cedd319bc0082b5f4
+EBUILD util-linux-9999.ebuild 8784 BLAKE2B 1cb0e949416b98a3abfd296360e54cb55c5984e0789b9ea661c841ba2a85383ee64620b2b626e19ec56a0134580d6fa78ed256ce47401cb16f682ce4a152eb68 SHA512 09c2c35e8b15afe82f98fd14495cbbc3b743e95a6196f2c4d01294709b090a0fb2901d936874ffc2a692ae63e74788bb3d40a5b6eb9069dca61f038fbd20d9f1
 MISC metadata.xml 1448 BLAKE2B 5fb494f00e91500e600340c00734b34c953a9bec939bdbcf8c9946412290bfce34219057f8a7eeadca56ffc050ac4b043039efbeb9d1db2396bfd35917ccca10 SHA512 729b1e16d89447baaa37085bd8aa7a887984ac2c64810d4f81127aaac873f7d28f0299e10a1cb8ca151ff59553cbe8b734390ca26f6998044f0a889a452b907b
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
index 46c6b0ce7ed2..619414e131e1 100644
--- a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.2-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
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -97,13 +97,6 @@ src_prepare() {
 		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
 		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
 
-	if ! use userland_GNU ; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
@@ -132,14 +125,10 @@ python_configure() {
 		--disable-bash-completion
 		--without-systemdsystemunitdir
 		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
 	)
-	if use userland_GNU ; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
 	mkdir "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -188,8 +177,7 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
 			--disable-login
@@ -236,13 +224,8 @@ multilib_src_configure() {
 			--enable-libblkid
 			--enable-libsmartcols
 			--enable-libfdisk
+			--enable-libmount
 		)
-		if use userland_GNU ; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
 	fi
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
@@ -293,7 +276,7 @@ multilib_src_install() {
 	# This needs to be called AFTER python_install call (#689190)
 	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
@@ -305,12 +288,6 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if ! use userland_GNU ; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
 	if use pam ; then
 		newpamd "${FILESDIR}/runuser.pamd" runuser
 		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild
index 9532360938eb..29ca2387ed7a 100644
--- a/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.2-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
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -97,13 +97,6 @@ src_prepare() {
 		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
 		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
 
-	if ! use userland_GNU ; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
@@ -132,14 +125,10 @@ python_configure() {
 		--disable-bash-completion
 		--without-systemdsystemunitdir
 		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
 	)
-	if use userland_GNU ; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
 	mkdir "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -188,8 +177,7 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
 			--disable-login
@@ -236,13 +224,8 @@ multilib_src_configure() {
 			--enable-libblkid
 			--enable-libsmartcols
 			--enable-libfdisk
+			--enable-libmount
 		)
-		if use userland_GNU ; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
 	fi
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
@@ -293,7 +276,7 @@ multilib_src_install() {
 	# This needs to be called AFTER python_install call (#689190)
 	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
@@ -305,12 +288,6 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if ! use userland_GNU ; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
 	if use pam ; then
 		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
 		newpamd "${FILESDIR}/runuser.pamd" runuser
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 8ba7230d848f..3fdf6c85b949 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-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
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -92,13 +92,6 @@ src_prepare() {
 		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
 		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
 
-	if ! use userland_GNU ; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
@@ -127,14 +120,10 @@ python_configure() {
 		--disable-bash-completion
 		--without-systemdsystemunitdir
 		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
 	)
-	if use userland_GNU ; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
 	mkdir "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -183,8 +172,7 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
 			--disable-login
@@ -231,13 +219,8 @@ multilib_src_configure() {
 			--enable-libblkid
 			--enable-libsmartcols
 			--enable-libfdisk
+			--enable-libmount
 		)
-		if use userland_GNU ; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
 	fi
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
@@ -288,7 +271,7 @@ multilib_src_install() {
 	# This needs to be called AFTER python_install call (#689190)
 	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
@@ -300,12 +283,6 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if ! use userland_GNU ; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
 	if use pam ; then
 		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
 		newpamd "${FILESDIR}/runuser.pamd" runuser
author	V3n3RiX <venerix@koprulu.sector>	2022-01-07 22:48:01 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-07 22:48:01 +0000
commit	c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
tree	b6d19e96ba3c397fb8278eeb9b68170db92630ba /sys-apps
parent	3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)