gentoo resync : 10.09.2021

67 files changed, 822 insertions, 1023 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index afc647888562..f841486599d8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 5b0c3c2dccb6..b3319e6b22fd 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,7 +1,4 @@
 AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 BLAKE2B f6196cc7136581ede5437aad909a5c2baa6cda36a27d7e4ceebd0aee2b40a66ef83324b3dde92a77ca0dfca96a47ac342f4a580f38ad6e3a042384dd9e742282 SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931
-AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740424844d62e0e559ad458651965e3ae00853ab4e226dfb0f035daeada6adaa568ac9d9eee517413770d73501d8d712a9f51385f653c3 SHA512 303c933389be6c19e01e43eb074a5e5f72f80cf3f4ef88d8ba52d07c3b6500b6d81a0a209d4abf15a46c617f57486654a74e9f17ba8b39aa438495ccbfa19186
-DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
 DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
-EBUILD accountsservice-0.6.50-r1.ebuild 1555 BLAKE2B 1e15144179c307d9bf5c416d61530b7ac52fba53dcb0382d791aff4b2c9f3771aef62fb24bb62cca41563ffa8480c6b6e6e91faf50c4075ea79f0a9377ee8272 SHA512 fe72073aa66755b56fd167310f1b47da4d8381b6db2ee7f5deeec26915dc82ded0707d6018c32eba2604f1816794c742318b3104ecce59698342dc1aeba6a379
 EBUILD accountsservice-0.6.55-r1.ebuild 1738 BLAKE2B bf31c4ffd3aa68978ebc92786e25e09b3b6acc264bb36cc68d120de68b0d73a847b711861bdd61736bc95f784188acab11bbb76467cb38446304f9dd0c270660 SHA512 3953008aa4ab7ea5f7bf2e9bf772ea41cdfe4cc3b5336a266da4fa0afdb3ae99f596442f3e10eabc9b27fb4ef821aea42f95f9c4761324750efec1c1809e461f
 MISC metadata.xml 434 BLAKE2B 46541f7aaa7da92604569da647a34de043cb792782e618369705b62ddb1054ad6f4a68259e729cff9a56eaa983ec564bdfda88bbc1e0ff8a5e0105111b56cc16 SHA512 7c299dbf564c82b4f10e665bd5d7238e7869fd2e499e9824a27594ece220419bff6c167a47f5d1ed0955707f7d0f6309301220e43939a6fcdcff3cc3d17181a9
diff --git a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
deleted file mode 100644
index 11a90ec3611e..000000000000
--- a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-IUSE="doc elogind +introspection selinux systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-CDEPEND="
-	>=dev-libs/glib-2.44:2
-	sys-auth/polkit
-	elogind? ( >=sys-auth/elogind-229.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	systemd? ( >=sys-apps/systemd-186:0= )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-accountsd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.35-gentoo-system-users.patch
-
-	# lib: don't set loaded state until seat is fetched (from 'master')
-	"${FILESDIR}"/${P}-loaded-state.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-more-warnings \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-admin-group="wheel" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable doc docbook-docs) \
-		$(use_enable elogind) \
-		$(use_enable introspection) \
-		$(use_enable systemd)
-}
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch b/sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch
deleted file mode 100644
index 901704bc601f..000000000000
--- a/sys-apps/accountsservice/files/accountsservice-0.6.50-loaded-state.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c7fa612023a163e8b2352e1170c6df3fceb19b27 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 19 Jul 2018 13:14:09 -0400
-Subject: lib: don't set loaded state until seat is fetched
-
-At the moment we set is-loaded on the user-manager
-object as soon as we start fetching the seat, but
-we should waiting until the seat is fetched, so
-that can_switch() will return the correct value
-if the caller waited until the loaded signal
-to use it.
-
-This commit changes the >= to > which I believe
-was the original intention anyway.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=107298
----
- src/libaccountsservice/act-user-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
-index 325421b..e7e26b1 100644
---- a/src/libaccountsservice/act-user-manager.c
-+++ b/src/libaccountsservice/act-user-manager.c
-@@ -2382,7 +2382,7 @@ maybe_set_is_loaded (ActUserManager *manager)
-         /* Don't set is_loaded yet unless the seat is already loaded enough
-          * or failed to load.
-          */
--        if (manager->priv->seat.state >= ACT_USER_MANAGER_SEAT_STATE_GET_ID) {
-+        if (manager->priv->seat.state > ACT_USER_MANAGER_SEAT_STATE_GET_ID) {
-                 g_debug ("ActUserManager: Seat loaded, so now setting loaded property");
-         } else if (manager->priv->seat.state == ACT_USER_MANAGER_SEAT_STATE_UNLOADED) {
-                 g_debug ("ActUserManager: Seat wouldn't load, so giving up on it and setting loaded property");
--- 
-cgit v1.1
-
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a5dde8866e5e..683f6eddc3ab 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -15,7 +15,7 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd
 DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
-EBUILD busybox-1.32.1-r1.ebuild 9641 BLAKE2B 95830049ca9fd1ba62152d401bfab07c1f85221b2df691055d31c8eebda7ebe7441c51704b00dbc80529929e8e34a24ffbdbeb57ed46eb5d11cde24bec912f1d SHA512 7b1a7849cb2ca44237156533c48ca942663cdaa9794876ae3f5ac8d5052ce41695de561d32779ebb79c53ef07453b22bb1cdbb581b9f6a6999909f0c4f7b667e
+EBUILD busybox-1.32.1-r1.ebuild 9640 BLAKE2B 1bf881647d58a197e690e068b81aa2522fdbecf69784862b1842d54ea1caedff7fa4d6bec8b69388bd8fbddfdd76d48d36b07b7147ebf7f5368df3219efb135e SHA512 c163d435a5bac776c519a539f1760134973314434e75c84dd9f427ea0a7c5fd9c41216db61444c97931b86a6cb6ae17fdc1f0d1c5f36118fc5006c89a3599b7d
 EBUILD busybox-1.33.1-r2.ebuild 10005 BLAKE2B bf17f1295130d647c44763e379034ec4adbbdba2af58f058d0e9f451b9acc0a95b309e2cb93ea18387a68df039c5e41c32c3ea59ed035fc64fb0ced5918e9b9d SHA512 163b156852b7afdacbd96f7f38967e746c64056d11c31a0139cb62263839d2302cd3dd21665fc11afb74916c8a079756e44900d6f0d24487232dfa9e2d7590d3
 EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406
 EBUILD busybox-9999.ebuild 10005 BLAKE2B bf17f1295130d647c44763e379034ec4adbbdba2af58f058d0e9f451b9acc0a95b309e2cb93ea18387a68df039c5e41c32c3ea59ed035fc64fb0ced5918e9b9d SHA512 163b156852b7afdacbd96f7f38967e746c64056d11c31a0139cb62263839d2302cd3dd21665fc11afb74916c8a079756e44900d6f0d24487232dfa9e2d7590d3
diff --git a/sys-apps/busybox/busybox-1.32.1-r1.ebuild b/sys-apps/busybox/busybox-1.32.1-r1.ebuild
index 7deed6114019..1c5b765c9cfb 100644
--- a/sys-apps/busybox/busybox-1.32.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index 8133f763f680..08683cff13c2 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,3 +1,5 @@
 DIST colorized-logs-2.5.tar.gz 12331 BLAKE2B 79ee9d5a7d2e683ebba044a8b75666fe5824a087be3b41e9e1c4bb3b52d1d2a57b6dd5f3cc64a48fa6705b9074daa6cfaec61a730223bc3deb21835033fc3adb SHA512 a4849db1124bbf65a54285a121aa723a44b7270498858d0ac5f50892d3d8eb38c8109c3bb457cdf6ffe336e77703ba454217047ed819a0d61f415c5b8882cc28
+DIST colorized-logs-2.6.tar.gz 12837 BLAKE2B 8f2203ce11c4702c62d2e5069099470c23b6cff608bae41a944ac9d016232190643bd1bd6025e90a63a08137809d6b4c4cc3eb564bf05f29ef3e37b72313e276 SHA512 9251054331d4e008da68067409a3c526daef75a88befc2e0d349eb341c71f553ce907677a50450b3546b025e2b1a5ffb490671aa3031c560a9b61f2559a016bb
 EBUILD colorized-logs-2.5.ebuild 665 BLAKE2B 73f383328f1922d117670ad9c28acb604697d9267bcc4a43e8e4cf00eb8d44536c623ff58b3f57d1a26b99431f2928376f61dc73ae51f9f3b96b5f24be27fb1c SHA512 d1e80c867abd49622d660f055043ea083150eac03c95e152cce57cb1d814149bbdd837d841c1633330a6e74d14a167eae3e4f994b4f36937af3a18c5cdb8720e
+EBUILD colorized-logs-2.6.ebuild 655 BLAKE2B e4066ddeadd8f632994b0ff42d5f8eaa766d11f1db766c17ff8f1327d75ddd07fc7e02f8815f895262ff52a22b52c97ebf4d4f742bbd4b18c78505a46a9968d2 SHA512 28b3d6587348dfa84624fe14871953855bca4e2a74c757be1965f0c83daf857b9f789c38f99c08bac35ff5d07a5debb76bc587fced2876caf8d5a0dcf297c791
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.6.ebuild b/sys-apps/colorized-logs/colorized-logs-2.6.ebuild
new file mode 100644
index 000000000000..1418d2bd3623
--- /dev/null
+++ b/sys-apps/colorized-logs/colorized-logs-2.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Tools for logs with ANSI color"
+HOMEPAGE="https://github.com/kilobyte/colorized-logs/"
+SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake_src_install
+	# Rename to not collide with dev-python/ansi2html
+	mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die
+	mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die
+}
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 2da7097c9fa8..1c433ec9b3fc 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,6 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
-DIST debianutils_5.2.orig.tar.xz 103364 BLAKE2B 1284eb30da0c26cf9247336fbd8f4633ffe5dcab7d72ee71695b5ebc67fe02da10ea4d5a2096c5800a80670c9259de8d682b65fde197bedbc805e0d97d6b9863 SHA512 d7e4e22768b7ee6adf07a5e580eb6ae4f8fba1d7471fda4713f7e0add627133689d4184880d42c748bf270b2b55f60044b8b956941434b5bb0890732c6fc031f
 DIST debianutils_5.4.orig.tar.xz 103640 BLAKE2B ac59ffcf7ef9523a67127e5565cb87eb694a0297eb81acba53a5ca00a2f16d024e21ba1ef6eff5079194c2cc751712fe9ad5814603deeeaa05d28343ff79a409 SHA512 a5501bdc46e203bd0cf357e5c83bb556ea7294ee603498399427dd49536848e006b21967f6239c3d808c8b9653d65f28536cf388dd18b749e54a235cc9326850
 EBUILD debianutils-4.11.2.ebuild 935 BLAKE2B b02267258f6285fe997d10d55b0d66b7b57b9cf06fed5b569272cc9b43c4276867e637de35b94eb8887136182b360f5a9e87cd2e2fee40f670e7d9e102624a39 SHA512 062c35544f1c3dd8e876fba48a9afd234857e3494401cac2774f966a45d8ff61325f25d1a65ba4ee6d19cf455312c796ac8f3da1009d4d3877bcf7a41437dfdc
-EBUILD debianutils-5.2.ebuild 904 BLAKE2B 9b413759ceb25b6a3bf136e40016ab6dd42170b39649fe651ea514a7f4d1178d4bad352f6c63d467df168a040e878d9762b06e60d32415602f84966f12557a0b SHA512 3e2f9c50297b1741497ae0dfb98d22d4cbbff9171ccc5966088887193e4b7ef6a83a64e4a4797066e8e552616e7192b8abe35d0fa52746b5f63e06048443bda9
 EBUILD debianutils-5.4.ebuild 904 BLAKE2B 9b413759ceb25b6a3bf136e40016ab6dd42170b39649fe651ea514a7f4d1178d4bad352f6c63d467df168a040e878d9762b06e60d32415602f84966f12557a0b SHA512 3e2f9c50297b1741497ae0dfb98d22d4cbbff9171ccc5966088887193e4b7ef6a83a64e4a4797066e8e552616e7192b8abe35d0fa52746b5f63e06048443bda9
 MISC metadata.xml 445 BLAKE2B 82971a9985ae487b4333505a1279ed6a642f7eb18880a693c6b0470a270c90b0508d7fcab5039a219a11bcb8a2d05ee3855c7f5bd93ac1172ebe7ed8d7542973 SHA512 1382c27ab6b70c086132eee442ac149ab41fa73bc33958fc93bcf1598c34c43658138c5f476c1291428c71983dee148abdcd630aad128d9b7ccc7c2309870db6
diff --git a/sys-apps/debianutils/debianutils-5.2.ebuild b/sys-apps/debianutils/debianutils-5.2.ebuild
deleted file mode 100644
index 0df682debe5a..000000000000
--- a/sys-apps/debianutils/debianutils-5.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="+installkernel static"
-
-PDEPEND="
-	installkernel? (
-		|| (
-			sys-kernel/installkernel-gentoo
-			sys-kernel/installkernel-systemd-boot
-		)
-	)"
-
-#S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
-
-src_configure() {
-	use static && append-ldflags -static
-	default
-}
-
-src_install() {
-	into /
-	dobin run-parts
-
-	into /usr
-	dobin ischroot
-	dosbin savelog
-
-	doman ischroot.1 run-parts.8 savelog.8
-
-	dodoc CHANGELOG
-}
diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest
index 1b3c095eadfa..f945f6a57e59 100644
--- a/sys-apps/edac-utils/Manifest
+++ b/sys-apps/edac-utils/Manifest
@@ -1,6 +1,6 @@
 AUX edac.init 336 BLAKE2B 7ebffaf4d4431977d607448f43beb5f17903e28a1aef3a8445e0c83a267a221e7fdaa6f0aa1860123da44dfbef00c1861f8eaf93d9968bbfc0896ad9de39ea5e SHA512 51936a92d46f324964d8149d69c9e9260428030e3bf23e4a46aabc716d04ddb06acf05c55a63747436e0a3b3a2775f3725a8adae594af2b1a6ae234143338f85
 AUX edac.service 230 BLAKE2B a38c84a994bcaf884ed1a23c406971c57c4353a226029d5c08cd71481ca888dae91c5a6c6422a20181319c3199d2e97fb1985a05415ffc9f1cdad318281f50d6 SHA512 de8838c5f2227e4c81c8b571dd117ac90aeabeb082b767e84bd208a80c24496f3bd5105fb15fab890ea3224616646a882d12dc7c37af6d0e554f95cd8d081b7d
 DIST edac-utils-0.18.tar.gz 285909 BLAKE2B 7d2662daf94c4ff796760b4863837861015397016bb79202baaa194608b61450d6749981cec621571267ac818a09af758167d2d768513e7d5bf7e763aed7ee51 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa
-EBUILD edac-utils-0.18-r1.ebuild 1199 BLAKE2B 75a6ac217e0af96d69834966fc445d0610d57dbba72bc1a1120339e289236d81fd175869198b7070eb2afe182303b4806ee738782d974365db9b671202926393 SHA512 e50ab6190c9c5ba746eea38f259f9859f0eb8aad2035ce99a2f79b7fd2d7a0dac90da070ce334ffa1757244af0fd7f385b73c76d6ea945614b38ea793d677283
+EBUILD edac-utils-0.18-r1.ebuild 1198 BLAKE2B 276719d66ef2a654537f0ecae6c5915e5e14b98dbf047c1dea3771472785950a1ffb0545aca2c61c04182c0e23c9c91decd3579bcfeef5405e1413e1afb03ec0 SHA512 f64b23c7f30beb4e15d39c4b266773963da87e5db07c8381df1778a75e271b2a1a4f336d76e015656228ee0f3ee93588259aa0ca6de5fdf5c82df88ccb15ddfd
 EBUILD edac-utils-0.18.ebuild 1111 BLAKE2B ba93435dbd30940dedaafb83540e36352ae99b3449a5549a1d09404be9a5ef800e082d457f24d95b430a9f629598fa224f81ab511a34e7eb15307bde34271c17 SHA512 4b2827907f8f45d01a08026a11a8dca5762b7fab6e1a4bd4852a945325714efb1e670c751288d513007584b49256fe7b6721fae9f3457d151aec89b1166d6a7b
 MISC metadata.xml 321 BLAKE2B 2828640a5bcb4f053424e252971d3232a31884ff9ee357dd302a47667da146f4eea8f72f1b0765bec79d34f9b9bbd97ef58874a4f107bcf7329725205010bf42 SHA512 4493bc3bd8f1b3ac3b8b9defe38d1368b9fcd7f54a0556e1d786c92bf30ff485875ac2e1bba65ebd96d9c85dc961b0db682bcd448717bd58853143b9b105b1dd
diff --git a/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild b/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild
index b48d523eff5d..a8f2910a9cbd 100644
--- a/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild
+++ b/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/grondo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="debug"
 
 DEPEND="sys-fs/sysfsutils"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index b5937777375b..c146b4ae06ae 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -6,6 +6,6 @@ AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c805
 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
 EBUILD file-5.40-r2.ebuild 3419 BLAKE2B 2d48c15c53d7e1fcf49d0a4fba5345ffdb60f70541cc7432461507974ede6846cb8608a81dd61865e895b4818a727a5b025fe12f31c45a256c1f5086b41b4102 SHA512 57d2bb5db419fe4708f502d3a33c13c934b148e47ccc6cee69c24229d02fd6200aeaefb1a8278f30f48eeb69bbd4cf831b5439a4585fa641d068aa0c05f95d65
-EBUILD file-5.40-r3.ebuild 3557 BLAKE2B 926b945285250c7083fd2dc2cb74158b67d97178c1072348edb6d6ffb09bf065af63c3cdd9f1df4a17aa5aa8156d5946c48b6d963f33cacd1cbc28e17a497e54 SHA512 862677ae177a9fc8a6d5c1f3c0c76dc0baa4369302495e5f51ceac1429be53323053522b7663050e89b47c71c1a2f52dcab9535cb6acc1c9bf36392431852d61
+EBUILD file-5.40-r3.ebuild 3556 BLAKE2B 52835f37e7c4c78cc5239e86a2b096da50200e2cee7d07d904242f7c42eaa8369d1e4ed5b9239d53708e4bc7bfd54a55e7856c0850e8247a471bf68f529a8d71 SHA512 03fe26852e181ecd4ffd456482abb31717eaa3d3190a33a116cb9b3abac66532b7802d1dfe3bfaeac8a30c45d9a683ee0529e5d200a6e83c41ca7c3cfa16b14b
 EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.40-r3.ebuild b/sys-apps/file/file-5.40-r3.ebuild
index 7cb5ba7a5cd9..bb2ef20e0af9 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index b7b04f70d6cc..983c0f8dcff1 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,8 +1,6 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.48.3.tar.xz 211504 BLAKE2B 407cc87b1238242c202d37c0c4cd394e0efba95759b86a88026aef7c05d6a097d1946614547ebfab45f7fe0c1ddd057724234629246d32e94862c3d633b78c31 SHA512 e000e7380604c0986b14cb64b852d55eff48595884bddd389e876056dde6ce72b37aa16d92230e6f8f6e128003b819954bae4aa90933a58b51d3665d3c0ba356
-DIST help2man-1.48.4.tar.xz 204592 BLAKE2B 0625af5a0a65daeb459a7445ef6e5a8c9ddbac4ebad5c31134bfbbd5abdc1d05cd5e682d2d1f0d4df36de4fdbbbe22ac7bbbb2c1c5fca4d53ee0c6bfefd63dfb SHA512 fa3f3eabc6010a4a34dc108bfa3b9456b9ea66b343ff2913c32cd6da52ddcf3aa8cb9c05a8b14585f314198aa4ef6f1eebbb185b90a2fb923ab3b2ee7b5e57a9
 DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1
 EBUILD help2man-1.48.3.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
-EBUILD help2man-1.48.4.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
 EBUILD help2man-1.48.5.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.48.4.ebuild b/sys-apps/help2man/help2man-1.48.4.ebuild
deleted file mode 100644
index 2f5c10989e9b..000000000000
--- a/sys-apps/help2man/help2man-1.48.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND="${RDEPEND}"
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-	default
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	local myeconfargs=(
-		ac_cv_path_MSGFMT=$(type -P false)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 21b814df8c28..85188241924a 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,7 +4,7 @@ AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb79790188
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d
 DIST iproute2-5.14.0.tar.xz 853572 BLAKE2B 52544021798f2cb716a57998d98dadc2441142b02d38c7e274bc17a6e5f994bdb5bd3ebf0b896bfd7e327a44f00f92c2af8e67367cdc0aac70769d563082f543 SHA512 e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c
-EBUILD iproute2-5.13.0-r1.ebuild 4865 BLAKE2B 5e0cd7493e406c13747fa968f4cc2c46547fe2ed4fd2b36412e5f5facb1cffa076d6b4a0de05a8dbe68e3b9a0f4f505da40d53c3ebf90051369fb99b8f10ec7f SHA512 70ee339153ac4010d153084559b17302bdea9921825c6089f5eb54b8bb0fbcdcc5ac30e91496d44cdca5849dbd722a8b1f06231a5bda391e03c6b6f21a77f111
+EBUILD iproute2-5.13.0-r1.ebuild 4864 BLAKE2B e62ccfe102bad1106e0345e5a986090408c8737ec3b96815250c07d54ef96fc14531d21a2389de46f68d64102a97568096038dadf4c899c0f1ad7f5257381d8e SHA512 681689226fda0bdc8947e2c26420cdad6e971eecb9816a562002fa6e2ce673859ee2b648bb83c9be6bfa3f86033314063b214dc36980ffedf9627ff4f5dfe889
 EBUILD iproute2-5.14.0.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
 EBUILD iproute2-9999.ebuild 5002 BLAKE2B 16e104c4b842b0ac1b0492c3d6f332e8d786f40fa258459b49dba84eb3f8fe278850f56b21deae22a81e5229be13353de8df9c824d15fc5adb635b91320f0049 SHA512 eac1d23f28cbfccdaae9e68a2b003bb62463895e4fa9d0dfa3833a0ed88eecad9433929c36e1e30de0de12dbe2a71ea8b86e585d94c6861939bf46aa015bed01
 MISC metadata.xml 813 BLAKE2B a34634416583a3d6a75a0d02e5e2c89b8e3dd0766a33e13555ee66515dda7bd10c711226701e00adb1b92fc6443d7793adc25e6b446a8ecb901afe268c7e978f SHA512 8fd774dd6bdde1265ace7e9b3f96f19a8afa782bbdbb5633b0e4024663e2877fd4db8e0aae48870c81fa470467ccaedad52c95b0fa9cd2b64829aa1a07e6f061
diff --git a/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild
index 87577d20ec62..81249282d973 100644
--- a/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.13.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 66fd0e684d96..f913c7ce444b 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -6,9 +6,7 @@ AUX kexec-tools-2.0.4-out-of-source.patch 816 BLAKE2B 88dc0a8f01c65a32b6ae081ea2
 AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190febf582f3ab7e8b821091321036bff104ee5cebab21062830c774778ca17a34a2df76065cfb8 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a
 AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649aa8cce35b6a47b2abd5a208b7ae4376f0330ea2194ae63f786bf0c30682f734f1b604be131e6e63570e SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
-DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77 SHA512 f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
 DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
-EBUILD kexec-tools-2.0.21.ebuild 3263 BLAKE2B 81df746fbd75d29a45e23cc1b1509dbe7c99e2a34cae30a04625dd13b41c770451752eb7cbfc2c53bff33948aa666119fdac81ade871c086973b27e70f1f0331 SHA512 dbb7744f92104f1a174a90c30eda7a384c43d3659f36f1103987e4a6354c77d21b3c45f9c4053fae699f13b1e87550b7ae7f3b1abe6c4fe31ff9a7d97a4868d3
 EBUILD kexec-tools-2.0.22.ebuild 3263 BLAKE2B 81df746fbd75d29a45e23cc1b1509dbe7c99e2a34cae30a04625dd13b41c770451752eb7cbfc2c53bff33948aa666119fdac81ade871c086973b27e70f1f0331 SHA512 dbb7744f92104f1a174a90c30eda7a384c43d3659f36f1103987e4a6354c77d21b3c45f9c4053fae699f13b1e87550b7ae7f3b1abe6c4fe31ff9a7d97a4868d3
 EBUILD kexec-tools-9999.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
deleted file mode 100644
index 897b98a24b69..000000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool linux-info systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/-}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
-	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
-	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
-	export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
-	default
-
-	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
-	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
-
-	if [[ "${PV}" == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with booke)
-		$(use_with lzma)
-		$(use_with xen)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Respect CFLAGS for purgatory.
-	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
-	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
-	# -mcmodel=large which is added by build system.
-	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
-	local flag flags=()
-	for flag in ${CFLAGS}; do
-		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
-		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
-		flags+=("${flag}")
-	done
-	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newinitd "${FILESDIR}"/kexec-r2.init kexec
-	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
-	insinto /etc
-	doins "${FILESDIR}"/kexec.conf
-
-	insinto /etc/kernel/postinst.d
-	doins "${FILESDIR}"/90_kexec
-
-	systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "For systemd support the new config file is"
-		elog "   /etc/kexec.conf"
-		elog "Please adopt it to your needs as there is no autoconfig anymore"
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	local has_rootpart_set=no
-	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
-		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
-			has_rootpart_set=yes
-		fi
-	fi
-
-	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "This was probably caused by a previous version of ${PN}."
-		ewarn "Please reboot system once *without* kexec to avoid boot problems"
-		ewarn "in case running system and initramfs do not agree on detected"
-		ewarn "root device name!"
-	fi
-}
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index ab086c74fbfa..096664f12c07 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -6,5 +6,5 @@ AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
 EBUILD keyutils-1.6.1.ebuild 3870 BLAKE2B 9c3bfe57a55d744623756154f5f599b5e66bb731ad1903e42acb3646883095006bacf338a7d8fb161be6c9a2e6e14f924105b527c191552f6e1c31d5d7742d3f SHA512 1f08385e89141147decfd3e4f125928c743eebdffeb2bdb074778186357e674c747c9681dbab14a7474cee459d8683b7bf390528a7d3cc5c574cbd7122a69c0a
-EBUILD keyutils-1.6.3.ebuild 3776 BLAKE2B 44c08ae7e7afd6dab8839fd6387d8fbb363d21e674a92d0f738ad79e63caa7fe370f611a4e1ac880ac8bc4920e1002b31c01a2f4aea05a6360bd4052e856fc51 SHA512 ccede5be4fd0653e1bd25717c2329bbbd79174821ef45f725f16a9869539b3de78019369c52464cb015676cbeb1834e6db1e518e71bf2c107472937ed36eb72f
+EBUILD keyutils-1.6.3.ebuild 3775 BLAKE2B a307381bcf40e901ce8e7936eea97e78909363db1464c15cc0f0f8652e8647b6e09b3037cd3aa0514fa6a71c35f20135811316c28cf983ccb91313800586a7ab SHA512 2fc21bf6d1d7f83daf0d30db791fe0931417fac256cb686fcccac56b619291f0a86d28284e9570d47f99ef8858d467b3476b7bb28ea061fa8a4e388da31aa506
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 013beb38f8c2..d32b3b91f411 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 072cafdbc9e7..fcc227bc6329 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,7 +1,5 @@
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
-DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
-EBUILD kmod-28.ebuild 5224 BLAKE2B a332a2e2544d737b006d0179974de3f86baabfef69ef8291d9c1dda3df94829e2b37fd44862e194eff6107395dcab0ec50ec8e6d99afa136e332212feb34a49b SHA512 9eb983c787a706e7ae56d6b73515d176257ce189a2547405062f5b71a3f6113cea949dd0f73bda634e109608c78869ff40d1bc0cf216b0fba42d780f2a937492
 EBUILD kmod-29.ebuild 5228 BLAKE2B dbd7f670dbd2db25e7d5c3ebf9eeb8851040b938d633ea3c3ef2a86cdba5cf20d824e2257003a4cefdce859eed43d3b11614142d4e876de4d9b724e683720194 SHA512 b4c139fc87bce1066178b16d25d3e9806de5c9ab85fee5d9971f3252e80d098a4f20420e3c2b7cf16a60a2b0d8cf9851f6163fa6392c04f1d87bdfa2efe855ff
 EBUILD kmod-9999.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c
 MISC metadata.xml 610 BLAKE2B 5542dbcd20e0cdafdb03ed48b19c34c52fce92564c77cedbe2d254e139f6d7976f28ad3a385cb445d4e043d2aaae4349cbc44c8181aaa8f7a177425c0646dc3b SHA512 8aa83c2b3d40025544c23423359d59a9ae1a9595a7745afe4b719427099729ebcaf8feb7d707376e2af737aae6a6f08a2208856ec317de18c0e80d9ab2c49dc5
diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild
deleted file mode 100644
index e7a05bd18356..000000000000
--- a/sys-apps/kmod/kmod-28.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools bash-completion-r1 multilib python-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	#inherit libtool
-fi
-
-DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
-
-# Upstream does not support running the test suite with custom configure flags.
-# I was also told that the test suite is intended for kmod developers.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
-# >=zlib-1.2.6 required because of bug #427130
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
-RDEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	!<sys-apps/openrc-0.13.8
-	!<sys-apps/systemd-216-r3
-	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
-	python? ( ${PYTHON_DEPS} )
-	pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
-	zlib? ( >=sys-libs/zlib-1.2.6 )
-	zstd? ( >=app-arch/zstd-1.4.4 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-util/gtk-doc
-		dev-util/gtk-doc-am
-	)
-	lzma? ( virtual/pkgconfig )
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		virtual/pkgconfig
-		)
-	zlib? ( virtual/pkgconfig )
-"
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND}
-		dev-libs/libxslt"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS="NEWS README TODO"
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] || use doc ; then
-		if use doc; then
-			cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
-			gtkdocize --copy --docdir libkmod/docs || die
-		else
-			touch libkmod/docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# Restore possibility of running --enable-static wrt #472608
-	sed -i \
-		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
-		$(use_enable debug)
-		$(usex doc '--enable-gtk-doc' '')
-		$(use_enable static-libs static)
-		$(use_enable tools)
-		$(use_with lzma xz)
-		$(use_with pkcs7 openssl)
-		$(use_with zlib)
-		$(use_with zstd)
-	)
-
-	local ECONF_SOURCE="${S}"
-
-	kmod_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir econf "${myeconfargs[@]}" "$@"
-	}
-
-	BUILD_DIR="${WORKDIR}/build"
-	kmod_configure --disable-python
-
-	if use python; then
-		python_foreach_impl kmod_configure --enable-python
-	fi
-}
-
-src_compile() {
-	emake -C "${BUILD_DIR}"
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}" -f Makefile -f - python \
-				VPATH="${native_builddir}:${S}" \
-				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
-				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-src_install() {
-	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	einstalldocs
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-				VPATH="${native_builddir}:${S}" \
-				install-pkgpyexecLTLIBRARIES \
-				install-dist_pkgpyexecPYTHON
-			python_optimize
-		}
-
-		python_foreach_impl python_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	if use tools; then
-		local cmd
-		for cmd in depmod insmod modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${cmd}
-		done
-
-		# These are also usable as normal user
-		for cmd in lsmod modinfo; do
-			dosym kmod /bin/${cmd}
-		done
-	fi
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	softdep uhci_hcd pre: ehci_hcd
-	softdep ohci_hcd pre: ehci_hcd
-	EOF
-
-	insinto /lib/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf #260139
-
-	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
-}
-
-pkg_postinst() {
-	if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
-		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
-	fi
-
-	# Add kmod to the runlevel automatically if this is the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
-		fi
-	fi
-
-	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
-		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
-			ewarn
-			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
-			ewarn "kernel modules to have required static nodes!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add kmod-static-nodes sysinit"
-		fi
-	fi
-}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 5c3efdfbf107..85d1d55f5ee3 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -5,5 +5,5 @@ DIST less-589.tar.gz 352390 BLAKE2B d91eaf0e4a3c14bb8a1c1b820965922c9e795cc8c648
 DIST less-590.tar.gz 352574 BLAKE2B 0f640f1b6b4d4925c4904ee77460e8becd2dae168fe5c1483bf6a9cfabe9eb0abdc4d4811507ba88a2b4cff6c238158bd8b4463b63d3d7863b44ce8538d32adb SHA512 426fa5840fd43c17bd5a452ad35ad24f2d6684623c6914403fd0059af62266bf2138e6828c7d73a1cef26a736c0d2b8ed4ab180eea8297281dae79a4228eb903
 EBUILD less-581.2.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
 EBUILD less-589.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
-EBUILD less-590.ebuild 1367 BLAKE2B 978ede975af301b92d5a580e119666898b8bf2efc7309b1f3f992ac593a8b64fcfff5510394a995c2d85572e16165b2523e65111b746b1ce6fbecbae60eb31a0 SHA512 474d9d58b9876d0b283988e033979a1b181e2a3cb126503558e933ba6ef9012b989d473c3a8044600b402383358c585c77f56bd4d4442f11c63aafc446d95765
+EBUILD less-590.ebuild 1366 BLAKE2B 067f444f481eba44c0abb01ec71767fa0a1219972612de2c7a1e57f4755ff6de2891c66a635ba868a6fea3ac3d837c2c5b7ae0339771898cab53e27c780231ab SHA512 8d12fd5c8c64d11bcd33741a0a8ea6997d75c9a19a6dc949bbec29245e9760b7e3d02c4e6ebbe49290ac9bf5369f4ca1775e415b68809a5a386226ea9f42e6a2
 MISC metadata.xml 383 BLAKE2B 5f11eeb30186e0e73c0c06f244a6eef420b756f60a15fc992cab99deebd2b0d0056d4a12628e9a5ef9494838b1a81efa11567a99182976d7bbe3db048c058d8d SHA512 cf7a569bd5f70879f8c5d8a732213295d53a49c288143523723d6970a176e90fe678e2c2bd76eca630a31deee69a386c498884ffc4b24f8622cf8a60a80848b4
diff --git a/sys-apps/less/less-590.ebuild b/sys-apps/less/less-590.ebuild
index 9536014b3671..a8c2f621cc46 100644
--- a/sys-apps/less/less-590.ebuild
+++ b/sys-apps/less/less-590.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index cc8cb50d422c..70bbea1f490a 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,5 +1,3 @@
-DIST memtester-4.5.0.tar.gz 23286 BLAKE2B 841b68026a9b4eae69490c469dbaf062500b642d9ab11e3b1052e7c850e49af3665d0fd01c49670cf297ea5e03a4916ea01bb0219910d487de87568060115e2b SHA512 17df913509df33851fbc58751df993a77bff765a9799ac2b7976518b0a659a2322c9a93a7438e9daa314035e0c08cfcee5cbc97c6be1631917c47e221f15d363
 DIST memtester-4.5.1.tar.gz 23655 BLAKE2B bb7214a41f7cfa39dff6ab4f1efcd1788f5e6bd4cc1defba8c77ae030321703c1da7b6c1c6f1a67ea59e2cb9fc960772b710050b7c6d14b0799db4d9d99e9c31 SHA512 cf5744f11a931338a94158aee3047ad2dab18b0cb27b8998184a98f33aaebc678beec74841a2bcbbd7154cc2e46a20f746d9cae01a9274714bcedb93f29f8c80
-EBUILD memtester-4.5.0.ebuild 721 BLAKE2B 899588b6707b5cb7d7f5ecec63089e577202e3934981c2fb72785bffe0a0073c99f74a6bedcfdc34a5b84581a5f9103a9329eea2bfebfa76735a188ffe1187b7 SHA512 05557e5a04890b7fc6424e603493504793d68921c2325da5e94809b16aa431c79b34269e7119a8ad40474eaff09986302b908e4780b6ff3605b5b27cbe3ef1ee
 EBUILD memtester-4.5.1.ebuild 728 BLAKE2B 9d1c8bbc95d6b1c6807916be75a244cf34228d1a35073b92eb4bce54b9c6da8ea9b50b8a65005db67b0ae8d3350aadb67fe8829b8604e2713fa3a7eef5286472 SHA512 2ca0d5f496f430cac3e55f3588fd599ca1eda0600ce3bf94cd291e1357ab0896078f38a730da3eed8ea494e0597005d7171076ea4f791f8dd3e42277264baa6b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/memtester-4.5.0.ebuild b/sys-apps/memtester/memtester-4.5.0.ebuild
deleted file mode 100644
index a709e5c13974..000000000000
--- a/sys-apps/memtester/memtester-4.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="userspace utility for testing the memory subsystem for faults"
-HOMEPAGE="http://pyropus.ca/software/memtester/"
-SRC_URI="
-	http://pyropus.ca/software/memtester/${P}.tar.gz
-	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
-
-src_configure() {
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
-}
-
-src_install() {
-	dosbin memtester
-	doman memtester.8
-	dodoc BUGS CHANGELOG README README.tests
-}
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 6c5adfbb0abe..382bc1f03735 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,4 +1,4 @@
 DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf
-EBUILD net-tools-2.10.ebuild 1916 BLAKE2B f20c5eb834943b8f1d780541aede671b6c7bcfe22fc996070e11dab1222347938357138b298f070d0e2e516bf94718b1ef45c1138e0bacedf1af6ddccdff9e5b SHA512 91a93456c3232c045dec4b0e5bdbbc4df67c0039ff6177b11041bb6fea303772f8996cd96d432e2f3187afb267768deea48b9f1048ab0d9ba4ccbad06068d732
+EBUILD net-tools-2.10.ebuild 1915 BLAKE2B e9a9491e765e18f079f02fd0120abbbc2cc503c662ddd738778bf2865f82ce2706e2fac519cb841067c914934b3aa78cc6a77639202b3e901cd14e385fdb2d17 SHA512 8cd9b2bf5a9c3e60a1ae2b6a24a9b64068df2ea161d5fe7b068e5103d84875d21b9b29f951d716562df386b10c6d0e6e9d341ff96e0e52380bf4e3fdabb5ec53
 EBUILD net-tools-9999.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e
 MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037
diff --git a/sys-apps/net-tools/net-tools-2.10.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild
index 5382a369843f..988859d733fc 100644
--- a/sys-apps/net-tools/net-tools-2.10.ebuild
+++ b/sys-apps/net-tools/net-tools-2.10.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 16be3bf329f8..09b5355c7e85 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,9 +1,8 @@
-AUX openrc-0.42.1-gcc-10.patch 1679 BLAKE2B 464fa390a6626538dad9d68d9e1c81195ee5918cc503d1fe750b29fe5a87bfa7b99d2246069173c1fe23a4dbd9c13507bddd2e5d2951a38edb5c4d746830ecff SHA512 24c665098475c8a1dca75677b48864dc554930f8039900785d8f73c4ebab857255607297fdcbce6249f18f2b97bd7804a35a782721d4658a1c7a7b7b985418ff
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
-DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
-EBUILD openrc-0.42.1-r1.ebuild 5471 BLAKE2B a3749af382add50151e08b679ac8548f4a229784de8ca796c1c5d113ea190c42980e18ad8bd5598fee43a049538e4d806398aabe7bdfa27a79361529bfdd5445 SHA512 638ff01c5c1de288e462790dbc9c5801b326768051933a96a9338278b36208a39934be4e7b9605ca286e30baa9e83dab58075e50ee9de112ce4e117cc0767b97
+DIST openrc-0.44.3.tar.gz 252469 BLAKE2B 6e1a952c4459ace4d67b5c07a44618324c1fd226d55b083e9701999559e2726d49654bf00a7f45f867f96b7550d782bf565cd687b3ac964d61217ed221445041 SHA512 b066feb89d3b58383d5dc20e731f016f0ecdaa72b95af750e49ba31d80d88b83f3df4d9a7d57c8b106c29cc5b0a004b9eee78192cf776b4cfacdcdcb1d7beeb8
 EBUILD openrc-0.43.5.ebuild 5005 BLAKE2B a3725838bfd17681923474879383e3ec0b08cea121ea1e0c7ec62c83f726ac5deb35d82143217f7a2ffca3190ee058accfe770b89c1a3294be65a394c7c3b5e3 SHA512 f0fe7ceaf9a2066abe235fc6bd857045c354a4e33c2e9e41c2a65f02e03364ff6fc331a1b6f41627da9edcddf4b9f72bc2af1f31c711a9dafe3d6c3b4c8ae277
-EBUILD openrc-9999.ebuild 5013 BLAKE2B eba47aae6e1d07c2ccd925f2e380268a6ab96aec37e245b3ccf0474d30fc19811a5f45c610a6fd68760a4695f48040733aa524f41c86a9149bcdbb97195ba4a0 SHA512 24970d1219d2fc2c93ecd6ddc22200af0a3e70decb506f06ffd2f3be15a7b3a37398e150f26d6c2477b59f3ece72babf61056ddd3c6e86233b7576f081460cd3
+EBUILD openrc-0.44.3.ebuild 4536 BLAKE2B 056666f9cf9bfaf9724bb249ccef09f2e39e7844b4e41c4ee3edb15524bbc4c93f0543bacfb8b795a3a72c45bc31bd7da0cdea0376d1cae2b090ee9ca05c2196 SHA512 c1cb4a6b5b328d48174252652642188d3023cdda5ce89fb738bad3978ca44dd7816c7a8727d02bb2176b88ec3ec31b570f6147c112218f3066d3ee029a7e88f6
+EBUILD openrc-9999.ebuild 4535 BLAKE2B 7320f6dc00ac1df21449846c389bc6cba8797da82bebb2b2055eb83e79351e593a0a9137222dca1f02de05ca6e1fe86f05531c51793aff2f0ee3376bc35ef91d SHA512 e59d13f838fbf466855c6049f8d743c952aa22cb97f1c617aff167db36069fc1e5c6aac283aa4920c33ca95ec2f0ec3598b1501c5aaf06cb8bbec69d8129031f
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch b/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch
deleted file mode 100644
index ce2fd102d247..000000000000
--- a/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/705868
-
-From 375ef42393f3dc6edbaa2cb70c79b2366072db38 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 19 Jan 2020 15:24:20 +0000
-Subject: [PATCH] src/rc/rc-logger.h: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-cc  -L../librc -L../libeinfo -O2 -g -std=c99 -Wall -Wextra -Wimplicit -Wshadow \
-  -Wformat=2 -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn \
-  -Wmissing-format-attribute -Wnested-externs -Winline -Wwrite-strings \
-  -Wcast-align -Wcast-qual -Wpointer-arith -Wdeclaration-after-statement \
-  -Wsequence-point -Werror=implicit-function-declaration    \
-  -Wl,-rpath=/lib   -o openrc rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o -lutil -lrc -leinfo -Wl,-Bdynamic -ldl
-ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:16:
-  multiple definition of `rc_logger_pid'; rc.o:openrc/src/rc/rc-logger.h:16: first defined here
-ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:17:
-  multiple definition of `rc_logger_tty'; rc.o:openrc/src/rc/rc-logger.h:17: first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-This fixes #348.
----
- src/rc/rc-logger.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/rc/rc-logger.h
-+++ b/src/rc/rc-logger.h
-@@ -13,8 +13,8 @@
- #ifndef RC_LOGGER_H
- #define RC_LOGGER_H
- 
--pid_t rc_logger_pid;
--int rc_logger_tty;
-+extern pid_t rc_logger_pid;
-+extern int rc_logger_tty;
- extern bool rc_in_logger;
- 
- void rc_logger_open(const char *runlevel);
--- 
-2.25.2
-
diff --git a/sys-apps/openrc/openrc-0.42.1-r1.ebuild b/sys-apps/openrc/openrc-0.44.3.ebuild
index 24ee8a894fc5..c53c141b2d97 100644
--- a/sys-apps/openrc/openrc-0.42.1-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.44.3.ebuild
@@ -3,30 +3,26 @@
 
 EAPI=7
 
-inherit flag-o-matic pam toolchain-funcs usr-ldscript
+inherit flag-o-matic meson pam toolchain-funcs
 
 DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
 HOMEPAGE="https://github.com/openrc/openrc/"
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} =~ ^9{4,}$ ]]; then
 	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
-	sysv-utils unicode"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
 
 COMMON_DEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		sys-libs/pam
-	)
+	pam? ( sys-libs/pam )
 	audit? ( sys-process/audit )
 	sys-process/psmisc
 	!<sys-process/procps-3.3.9-r2
@@ -59,42 +55,20 @@ RDEPEND="${COMMON_DEPEND}
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
-PATCHES=("${FILESDIR}"/${PN}-0.42.1-gcc-10.patch)
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKSYSVINIT=$(usex sysv-utils)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes
-		SH=$(usex bash /bin/bash /bin/sh)"
-
-	local brand="Unknown"
-	MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-	brand="Linux"
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
+src_configure() {
+	local emesonargs=(
+	$(meson_feature audit)
+	"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+		-Dtermcap=$(usev ncurses)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
 }
 
 # set_config <file> <option name> <yes value> <no value> test
@@ -111,15 +85,7 @@ set_config_yes_no() {
 }
 
 src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
+	meson_install
 
 	keepdir /lib/rc/tmp
 
@@ -146,9 +112,6 @@ src_install() {
 
 	# install documentation
 	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
 }
 
 pkg_preinst() {
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 1b2b297f3023..2c2da59b7499 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=7
 
-inherit flag-o-matic pam toolchain-funcs
+inherit flag-o-matic meson pam toolchain-funcs
 
 DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
 HOMEPAGE="https://github.com/openrc/openrc/"
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} =~ ^9{4,}$ ]]; then
 	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
 
 COMMON_DEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
@@ -55,37 +55,20 @@ RDEPEND="${COMMON_DEPEND}
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBDIR=${EPREFIX}/$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKSYSVINIT=$(usex sysv-utils)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=no
-		MKZSHCOMP=yes
-		OS=Linux
-		SH=$(usex bash /bin/bash /bin/sh)"
-
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-export BRANDING="Gentoo Linux"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
+src_configure() {
+	local emesonargs=(
+	$(meson_feature audit)
+	"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+		-Dtermcap=$(usev ncurses)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
 }
 
 # set_config <file> <option name> <yes value> <no value> test
@@ -102,7 +85,7 @@ set_config_yes_no() {
 }
 
 src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	meson_install
 
 	keepdir /lib/rc/tmp
 
@@ -129,9 +112,6 @@ src_install() {
 
 	# install documentation
 	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
 }
 
 pkg_preinst() {
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index fe334113d92d..a6e2b45ebe10 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -2,5 +2,5 @@ AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a932
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
-EBUILD pciutils-3.7.0.ebuild 2849 BLAKE2B e819d2460128200c41dd1a1a9f5b517858e956520999c8dd246f9c22acd83a5a97b57ffce0289f1a90360b55a1f600ccff3703c684bda034fb0d42780bb73c54 SHA512 28f87a4af2a91313349b31d1963c7341afa2c79594bb618254f9f29d4f95d9949827217f74179be1816c90bc563e5e19b331fe07a0b359fd4cd7ef7fc0a72d1b
+EBUILD pciutils-3.7.0-r1.ebuild 2872 BLAKE2B b682133f893b689351a9bc2345e306821817f752f88838df4d20226b61d0c751ae23c310a5bb2258c444043f9451a7f73cfcced9db0e8ea2bfa4c3580ce20fad SHA512 96935175cdf7dafb65d8e20b605b1aa15ee8bd7b422addc6c94f7c06b2e94fd5784629753d3225f7940fdefb45613ae33e47ec8beb26851c11f6b9f48d8a1217
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild b/sys-apps/pciutils/pciutils-3.7.0-r1.ebuild
index b36f536b973e..972c471fece6 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0-r1.ebuild
@@ -13,15 +13,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
+REQUIRED_USE="static-libs? ( !udev )"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
 # our libpci.a depends on libz.a/etc... at runtime.
 LIB_DEPEND="
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208[static-libs(-),${MULTILIB_USEDEP}] )
 "
 DEPEND="
 	kmod? ( sys-apps/kmod )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
 	static-libs? ( ${LIB_DEPEND} )
 	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
 "
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index ac596464475b..22d01e7c80d1 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,8 @@
 DIST pkgcore-0.12.4.tar.gz 622553 BLAKE2B fc9df4f9499ad20cec439275880e469e1ffd8204b894c0a523ed27a3e55748e58634fca2af693fcc453e8aec068733a944331f7cea52e983e50981374239d534 SHA512 bc9eccd8d903e987df97354de008826dd52a7db0d9def064c56bb9425d1aa69e8fdf15dcfd0f86057c98a3c0adefee633a3c1cc9b689a334c126730cbdeafd0c
 DIST pkgcore-0.12.6.tar.gz 624740 BLAKE2B fb03cffd274d8c31f6eff33a0f9133dc0ef84a7e671d6f29cda938fca3e353d498173ae3e5ce7c5b7433e5e668096ae63ed7c4cc7108ad6edc7db3c247ce85df SHA512 18d01f7a52a7aeae0fcfd8ce81e27f98a204c3743e211a2dd182cabd6521c9d528663affbd98521a41ada17cbece860fce61d9e6a2dff2ca525da26741807c95
+DIST pkgcore-0.12.7.tar.gz 624992 BLAKE2B 93058dcf8eae891a7462b3125d648c218c034388daa8be86b4cbea34b82cbe7c484f354f4bf94bb3e4f25858783402d172231f773aded15b4dd902e52f9a3620 SHA512 2d25c3262a3fa806514d64a2f15664b8f0fe3ab2946ae681dd0ba7cebd8c9c9490500f809907f40eb5072763134d4e68cd75d17b2b7321a33fb55ebdad0768a7
 EBUILD pkgcore-0.12.4.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10
 EBUILD pkgcore-0.12.6.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
+EBUILD pkgcore-0.12.7.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.12.7.ebuild b/sys-apps/pkgcore/pkgcore-0.12.7.ebuild
new file mode 100644
index 000000000000..5c7eeb03645d
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index a0c4cb0e414d..05135c8bb0e8 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -4,7 +4,9 @@ AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
 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.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6
 EBUILD plocate-1.1.10.ebuild 2077 BLAKE2B 91d876de6fedc8a7ddca2fdc69c15c2621b3bf68f9cd0b99ed5cde99f79d34e60c1455aeed18d41abc6fe3f7ba0c3192e1c79066ccd06504218076fd5d7cade6 SHA512 b3df2ccd26728d8b186ffe9ac29f876f3c3fa1df2ee2aaa8437e7808140ed21884cb4401af22556d20bf5d5d9d6548f17533fa59c8da534bd7ef64e14886d425
+EBUILD plocate-1.1.11.ebuild 2077 BLAKE2B 91d876de6fedc8a7ddca2fdc69c15c2621b3bf68f9cd0b99ed5cde99f79d34e60c1455aeed18d41abc6fe3f7ba0c3192e1c79066ccd06504218076fd5d7cade6 SHA512 b3df2ccd26728d8b186ffe9ac29f876f3c3fa1df2ee2aaa8437e7808140ed21884cb4401af22556d20bf5d5d9d6548f17533fa59c8da534bd7ef64e14886d425
 EBUILD plocate-1.1.8.ebuild 2063 BLAKE2B 35011f66c0957b50861f4a8e4c658ac6457e1d64bc3171713dd7627fcb358a6dd55d9d270966cfaf928bd007d5897e1c0fffa639d00065d2de06450a57dce0b4 SHA512 24b7f3f25aceba3661c38b60a76d6e4229d8bc57c1ce45e00461bd4f264d43bab8432a592ca9abb0b662bad77e0c8072c6243164f0f395a07abda602b8de3d1d
 MISC metadata.xml 1392 BLAKE2B b0e97157995ec77af0df5fe42d8bfe2949163b3f1ac9631e5b79942786491a3f9c2e29d004901abe994735373cef5cbe4f31646847e9cde1d26620b229396e81 SHA512 35cfb62bc7d28abb528835566018b03a724a1c4fa0a68661478007f924a685f42c5b43a2661e7a0b27548d3feae1f64223ac0f9be1c6d3ff600a57aadde69dcf
diff --git a/sys-apps/plocate/plocate-1.1.11.ebuild b/sys-apps/plocate/plocate-1.1.11.ebuild
new file mode 100644
index 000000000000..d198d630c595
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.11.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Posting locate is a much faster locate"
+HOMEPAGE="https://plocate.sesse.net/"
+SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
+
+# GPL-2 for updatedb
+# GPL-2+ for plocate itself
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+io-uring"
+
+RDEPEND="
+	acct-group/locate
+	app-arch/zstd:=
+	io-uring? ( sys-libs/liburing:= )
+	!sys-apps/mlocate
+"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~IO_URING"
+ERROR_IO_URING="required for USE=io-uring"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.10-meson-use-feature-option-for-libiouring.patch
+)
+
+src_prepare() {
+	# We'll install the manpage ourself to locate.1
+	sed -i "/install_man('plocate.1')/d" meson.build || die
+
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlocategroup=locate
+		-Dinstall_systemd=true
+		-Dinstall_cron=false
+		-Dsystemunitdir="$(systemd_get_systemunitdir)"
+		"$(meson_feature io-uring use_libiouring)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc README NEWS
+	newman "${S}"/${PN}.1 locate.1
+	dosym plocate /usr/bin/locate
+
+	insinto /etc
+	doins "${FILESDIR}"/updatedb.conf
+	doins "${FILESDIR}"/plocate-cron.conf
+	fperms 0644 /etc/{updatedb,plocate-cron}.conf
+
+	insinto /etc/cron.daily
+	# Ensure that the cron file has the same name as the
+	# systemd-timer, to avoid plocate being run twice daily on systems
+	# with a systemd compatiblity layer. See also bug #780351.
+	newins "${FILESDIR}"/plocate.cron plocate-updatedb
+	fperms 0755 /etc/cron.daily/plocate-updatedb
+
+	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "The database for the locate command is generated daily by a cron job,"
+		elog "if you install for the first time you can run the updatedb command manually now."
+		elog
+		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
+		elog "please customize it to your system requirements."
+	fi
+}
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index d75266b98981..b3f9dc66d070 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,3 +1,6 @@
+AUX pv-1.6.19-stddef-include.patch 374 BLAKE2B b2b57f9043ba5dc87e361a85ef6a1080286ab34b4d386363bbeed656bfc1dd593decd5467b103902045ab03c944e57964bd518b8a3a64e26fd72a1baa4305387 SHA512 823f11971fcbb229ba18d6275d131733f05b93749635d1188f998d48390ded14a99a0a6be26e9e360d921af9d27614e96bf7628bfaf028a0136e7a660184ecfb
+DIST pv-1.6.19.tar.bz2 115130 BLAKE2B 5f8e41bb964ad8fc35c4f046b19e49a416eec4b3641d9ff77a3b9f1d04484b950629bd528c02f38eb7fd9fc1af404805a73c535fa62de4634801fb57c2e0bef8 SHA512 2ae857a8778baf853d4ad704f35afe14b37d615850f5ad52bce53ed7046dffdde720dab9b35f016739d377a062d7178cccdd0a3ccf53cf89918e3623060c9cc8
 DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26
+EBUILD pv-1.6.19-r1.ebuild 1541 BLAKE2B f8a88c7916a5f579089d417afc02e22d2ec3d7abe6b51a49fcfb83fe7a200484944666e10900f9faab8f2ff7dc191d1068314696af6eeaa4543d17379f4741b8 SHA512 bf44badbe400ac2758123758ca290978408c57dc177f1a14dbff33a18964c77fd4e4c9aad6cb1863f5a3b82e60217f337321216fabca45c99e04f71e3f329486
 EBUILD pv-1.6.6.ebuild 1379 BLAKE2B 0f3f018c0325aaef297dce38a6ae1917f9b53eb2499f38a020666d5d3da567c18f23ba173af6d805977450a6bf4c01bc25dd340728ad435ed46fb040508621c6 SHA512 f0cf93a3f5ee11c5327e640b3965da60b66115fe293016e7b35f57ea704a65b7dbe4844a2ec4d75176e4aa2901a2d342b1e2ef9485dcc52a6696ac0a730b345a
-MISC metadata.xml 431 BLAKE2B 85d1be89636b3cc4a7910ad00aa9d7837bf6a4ad155785157fa08742c46b9479a4148a432bb62ad073cd2615689c07b28a24be7f7525c173fded9d7d76337bf9 SHA512 cb9a5ceb4164154107dc4be74388fdaba757e9dbe1ac3e3b308fa81e97297464aa1b4d2cf6d163cb9a212a5423dbeb9f1303093d784c0d16b80d3cc2878e0dfd
+MISC metadata.xml 482 BLAKE2B 696bf4ce253cfc551c14330ec0f8b439b2348348483c6fbf0434a83c62f3ccd89b5cbfbd7eb7795f9ec39096e69535c0a5ef81b5834112bf4bdd5b9028b22509 SHA512 575b81ce5d2ca2d5e73af74a9544268956d67fc7636b833cf70dffdac5ff7452d90837b57c5bd8eed756518d82b35f49d7fd81a7e5e057bf5eec69bc5afca0f3
diff --git a/sys-apps/pv/files/pv-1.6.19-stddef-include.patch b/sys-apps/pv/files/pv-1.6.19-stddef-include.patch
new file mode 100644
index 000000000000..b28a1c8d063b
--- /dev/null
+++ b/sys-apps/pv/files/pv-1.6.19-stddef-include.patch
@@ -0,0 +1,17 @@
+https://github.com/a-j-wood/pv/pull/1
+
+From: Sam James <sam@gentoo.org>
+Date: Wed, 8 Sep 2021 01:03:29 +0100
+Subject: [PATCH] src/pv/number.c: add missing <stddef.h> include for NULL
+
+--- a/src/pv/number.c
++++ b/src/pv/number.c
+@@ -2,6 +2,8 @@
+  * Functions for converting strings to numbers.
+  */
+ 
++#include <stddef.h>
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
diff --git a/sys-apps/pv/metadata.xml b/sys-apps/pv/metadata.xml
index b4f3c77ea7aa..e00b44f1dc97 100644
--- a/sys-apps/pv/metadata.xml
+++ b/sys-apps/pv/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pipeviewer</remote-id>
+		<remote-id type="github">a-j-wood/pv</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/pv/pv-1.6.19-r1.ebuild b/sys-apps/pv/pv-1.6.19-r1.ebuild
new file mode 100644
index 000000000000..371943e4161b
--- /dev/null
+++ b/sys-apps/pv/pv-1.6.19-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info toolchain-funcs plocale
+
+DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe"
+HOMEPAGE="https://www.ivarch.com/programs/pv.shtml"
+SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris"
+IUSE="debug nls"
+
+PLOCALES="de fr pl pt"
+PLOCALE_BACKUP="en"
+
+DOCS=( README doc/NEWS doc/TODO )
+
+# Doesn't build a library.
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-stddef-include.patch
+)
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="~SYSVIPC"
+		ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i configure -e 's|CFLAGS="-g -Wall"|:|g' || die
+
+	# These should produce the same end result (working `pv`).
+	sed -i \
+		-e 's:$(LD) $(LDFLAGS) -o:$(AR) rc:' \
+		autoconf/make/modules.mk~ || die
+
+	sed -i -e 's:usleep 200000 || ::g' tests/019-remote-cksum || die
+
+	disable_locale() {
+		local locale=${1}
+		sed -i configure -e "/ALL_LINGUAS=/s:${locale}::g" || die
+	}
+
+	plocale_find_changes src/nls '' '.po'
+	plocale_for_each_disabled_locale disable_locale
+}
+
+src_configure() {
+	tc-export AR
+
+	econf \
+		$(use_enable debug debugging) \
+		$(use_enable nls)
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6c00df0bc56f..9dbceade2943 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,11 +1,8 @@
 AUX rng-tools-6.13-various-autotools-fixups.patch 3845 BLAKE2B 83087f451411a57c1426d5510241a9cc3fe887d9b38b341e60b9e9c00cc063f9bc96ffc18c48ebf067a8428464c7e7503adcbc54d98bb01ebcbdfdb338a4b908 SHA512 c7f43976f64955bf15922389201ba3c2c10c1eabb63b6eb613d3ac49f2910f0ed6c3996ba0001126255728be6d792c3515bc9578109979d62d166f0fb575b67c
 AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f
 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d
-DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
 DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
 DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7
-EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47
 EBUILD rng-tools-6.13-r1.ebuild 1704 BLAKE2B 3005edac0db4da6d2222973f4a837d025742bb6c6e67fcdba9e4fde45b00ada12b1d3a9ee9e4f42fb4eb4b5d3a7575ee7252eaaa97c3879f85bea56df3dfec2b SHA512 8b7167cc590171dc2ab071b7fb63f245b2647cf086599b76fc5d58c33977af3672c3e6cc842b246bb072bc9b3d66b98856ead1369a009039b58a5a1e7194fd84
 EBUILD rng-tools-6.14-r1.ebuild 1634 BLAKE2B becfc06d595f9147d39aaf0f8c9bbf2c160609c427786dbadfb43300828e6b344b28ef5eb09285b5d92f043113eaef8df721610fbd13f7f9f22fa224e42ca2ed SHA512 02dc012a75a558154691d85a3fe80f04cd2505344ac3034eeb810cbcf8e259df9591a8b10e448755d18dfa27e610f6c2c1d91c2fa4cba86bba2db397ef3ea395
-EBUILD rng-tools-6.14.ebuild 1618 BLAKE2B 587d54c5031f754add10bb2a82806dddd6bebf56d5aece7f6440092fadd6e419da6d20baf67672fbe2aa0547103116a20888f737515d841364356f3c499a6870 SHA512 a089429c0d3173d27015bf74fbd5e4baa75bf9efb9710547b054480bf97e507550d56e4314bc3e54d4fe23d72283581d3ea44d8a00dde1a8b8e984c46cb2253f
 MISC metadata.xml 825 BLAKE2B 7c1d44bdb730a55bfecad70bb6dcf943bdd7c607a7af6c321cc47a376ab453eea4e296f1b705122213782f47aebf0b6c266c56da2f04f649bb8e2786d76f5468 SHA512 163e70a3c74fb0889a38d9bd3dc80ac1a0422b7caf82388e6a292e52b37e0e07fdb2f9c46b2bdfb5c587b0644e466d274a5a326a2c0e0f7e381b9762f0253476
diff --git a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
deleted file mode 100644
index 8a63aedded7b..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="
-	dev-libs/openssl:0=
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		dev-libs/jansson
-		dev-libs/libxml2:2=
-		net-misc/curl[ssl]
-	)
-	pkcs11? (
-		dev-libs/libp11:=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-
-	default
-
-	mv README.md README || die
-
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-		--without-rtlsdr # no librtlsdr in the tree
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
-	systemd_dounit "${S}"/rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EPREFIX}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.14.ebuild b/sys-apps/rng-tools/rng-tools-6.14.ebuild
deleted file mode 100644
index 44ac0e4d61c9..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.14.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="
-	dev-libs/openssl:0=
-	jitterentropy? ( app-crypt/jitterentropy:= )
-	nistbeacon? (
-		dev-libs/jansson
-		dev-libs/libxml2:2=
-		net-misc/curl[ssl]
-	)
-	pkcs11? ( dev-libs/libp11:= )
-	elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-		--without-rtlsdr # no librtlsdr in the tree
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
-	systemd_dounit rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EPREFIX}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 3fb58f81791b..708f589fc861 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,4 +1,6 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
 DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f50163db1c3bbddbf4fd07dbd5b7d92ef2f1b2c01eb77ff6cf531c5cc6a05e60b028f585310ac56eef96240882843 SHA512 8df5414e334a15f367acfd218ba1b74ba618b93d7bdeca8a039b69cbd81ab048ec5a6cecb24df09fa9a5f4fe214d647acf5138004defd45e6396eec5ae7c93d0
+DIST sandbox-2.25.tar.xz 436004 BLAKE2B c9c7d351cdefbb2b1a585904c38742a5a3bde50d3d690c57cff9cdc71ffb822e78a2b56c47afd03fbc70834de5dda13c5a300d9d6b35e09ec400a050d4f8e82c SHA512 4e998c4d9ba6eb69369cc49849060a2e90535eae91fbb64c4d46371fe0ed5182413b14674f10c773fd997b6895bc870ccb23586351f5bb06b69dc11a0cddbe1d
 EBUILD sandbox-2.24.ebuild 1620 BLAKE2B 14aae3cf980c2285e1dbf7c735e95801ae646cea389f585aa560bd016f860fd8936bc33ab2428168389910a06e76c20b0a20fe51071df62bd861be41a12c9f27 SHA512 443f9f99cc2e5e303c5c48686bd8f4c1647a39aca7515bc5f847f2cec4ca97cd2b240b221a07742dec94d7cb164075201c4cfbbcd711ade30f7a0a60c2666f16
+EBUILD sandbox-2.25.ebuild 1623 BLAKE2B 89f1946e8c8984c422bd4837eae4e20e0878496fc2b9dda84e5a53fd3db1d199f449967ed0af3156e26b8d8dedbc38c99db92e57eb2cf928b63da7fff2827e27 SHA512 40ddf4bf456b789e8d45997659057a0247dca25a6f7874860ca63e839cd915c819c2d0faae7e5facd7361dfe76e5e49c391b9f96d8b32967358c5d11f25aa9b5
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.25.ebuild b/sys-apps/sandbox/sandbox-2.25.ebuild
new file mode 100644
index 000000000000..d35f5327d29f
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.25.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	append-flags -fno-lto
+	append-ldflags -fno-lto
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	# -j1 to prevent test faiures caused by file descriptor
+	# injection GNU make does.
+	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_postinst() {
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 79e18a52f036..72009a37e857 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -9,5 +9,5 @@ DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046ad
 DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
 EBUILD systemd-tmpfiles-246.ebuild 4822 BLAKE2B 26d1a3b13c66b8cada48736564bc834c403f94c7a76cd9806eff5f0013d727315f8e5aadd3d05468ac0c24124275065cb8b43af1002910adaf21e32c2d921df7 SHA512 0f10d4604791bd20fed0816ae6560db3d04ed2a447f2735606934d479c979389b199c9609d9401a517974e78e7d8b2d8591d547e0b9a8708636e7156dc3e6f16
-EBUILD systemd-tmpfiles-249.2.ebuild 5930 BLAKE2B 8d105ae5915ae2ec3c7575e7ed050b92f36105a7a2d4fb4e35dbae37645954588065b322b3083adccd2800721fb94df4b5bd6b66b2c76ee1a985e2ab93e26628 SHA512 4c347bd4a29e567c6c559e417756a26f1e7456f07690f33e08984016c820047a905862d95a7d893e8960f2ab2f179682068afd4ec28996f6cd758edc4001c59e
+EBUILD systemd-tmpfiles-249.2.ebuild 6076 BLAKE2B 516cfd6f067568e826f93cc778fafff0bd191d3925561f59ce5a9aedcf7df05ed76d023e23af8c9e1f07ad8be384eacd89a075bbd09d1046acd5fc5a92d5a3e9 SHA512 e76f9321934b73e74ee9229d89db9471c8f06f78847f9ca55f7c6c2704aa9875b390518174bfdcb1b0199aab9e7f9263f2901faac8fd33bab32989bb66a7ddd5
 MISC metadata.xml 360 BLAKE2B 88025ee1295db8e637c6cbffcaee94574e8573a884b109bdb1793c1ab8ccb7da0f6ef654c4f1ac045071c1f4af04e6b2a0f5dab096b6ea97ce1d93a230eb89e7 SHA512 e3a37b3af90a3ba1ab0ce4efaf41dec616c50f6905da76e9e5919243134057494da6674cf56a8b1811d71ada2a619113167154086f4aaeaeeab94185e4de8ab0
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
index ea4df9552285..e95e12b89394 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-$
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 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="selinux test"
 RESTRICT="!test? ( test )"
 
@@ -68,6 +68,12 @@ python_check_deps() {
 	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+	if [[ -n ${EPREFIX} ]]; then
+		ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
+	fi
+}
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
@@ -187,6 +193,7 @@ src_configure() {
 	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
 
 	local emesonargs=(
+		-Drootprefix="${EPREFIX:-/}"
 		-Dacl=true
 		-Dtmpfiles=true
 		-Dstandalone-binaries=true # this and below option does the magic
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 474a0d182d1b..5ed8ac581587 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,12 +1,14 @@
+AUX 249-fido2.patch 2323 BLAKE2B 5977ec0bed24f25ef3c152aab8e8b40cc91c115256cad912c22d93d4ec533921124448e0bd2d994a48ea58e0d1e38cdc7a8b0281730e68b90b58fd6f7a319d69 SHA512 a385fd7889fe3e679c70d7dd62fe468da83385eb000bd3af4b2df36e836a42d1549ba90e09e57b611e5550a6e3f95d7e8cde8e749e9a85c6dff58ce88ea611f1
+AUX 249-home-secret-assert.patch 5057 BLAKE2B 59fada3228e726110ed865e80f85c62d2faca852b3c3fdc47135123da622697e448a8c2d8826c140240210513b7474d27e71383f6d41b561790135d67d9324c1 SHA512 2ad4e15a900a27c55ca32b065ff91ea51344eeb0b5508ab6310efe2537a66e5eaa80c4acd287fb57b2d531c79528577c6fd0599e29e862c05cf81dc439a6a7f6
 AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-stable-248.6.tar.gz 10388927 BLAKE2B a102d0fd37a3422f673ced2bbd5bb88b6589195e1f436f43231fd91d79aaf9f548154a3ab2a62a9b409527b3f2e7a9ea735925364ece15c2e151d06c0e4f303f SHA512 35a9d4a9ae04423959c71ad0175d04a1792b9ab39897a497776b93cea166de58b8fb111207c104c0e747d3ffbd85480d8b0cab38e3dc0defbbf09b15211954ce
 DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
-EBUILD systemd-248.6.ebuild 15225 BLAKE2B e6f52236abedad5db4c80f01aeff4f5df3c9542f733945e33128e45da4ae758c2182d00583c690f359131e0bdb88968122b39360f97adf4f5b8d2ff8347c74c4 SHA512 3c03bbbb6d50b7cfb78b9f0932f988241efea10785b3f83accfe3edd9b98dd39da9572aeab5ac3779db8c72645bb1e436155b8a71800f30f12e4b1a4755428d3
-EBUILD systemd-249.2.ebuild 14928 BLAKE2B 6d2ebe202bba0e40c2ae249e1ef696370bf25383c7fedb8d025ce1f53847995f005c509bfe2a23ade70548c6852666cf8a1779166dd1a0c8292382fb36bcfbb3 SHA512 c5f8ea8a470134a38e467187dcf7bcb0144d58a7237527459fd1fc4673e5cacd383b66dc02295c5b8e6c38aa28358a26426ede6e4dc1d45800a038a0d376d29e
-EBUILD systemd-9999.ebuild 14894 BLAKE2B 76c6f116a2b7a5caada2198ded3930ece45f394d77e3a5b1f148d8f274da11fbe196cd02bb36c47f31c9776214510e8600cd1eddd3ab5a441eecd43330fb9973 SHA512 781cc16951b0fdc9ffa12595a59df304bf3beb3670ee0a83e2059b9ca515a103ac84548eab2b4d387549f3cfa46b9b44ae820d20431f1636f262711fe2c696ce
-MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
+DIST systemd-stable-249.4.tar.gz 10593723 BLAKE2B 466b3cb27c4bc6c85c9ba50f6614175b2c31a4c177d452542faa1395e99511440029b1a093dc80a5a1a0135eed09d8b1849572f36dba4e18a1396230bfc31adb SHA512 5b9ec28102538bc3dcb632ee16389ff20dccf4b723186f6ae2da119a1809d84db0d8bcecf9b75c5e2da8427f5543e1da281bbed1a154e529d8a82ea5128c465c
+EBUILD systemd-249.2-r1.ebuild 14898 BLAKE2B 1ae761fca577ae1b19bc36348fb949464db1b178edafe53090669e2a743fd7c94a8127361612258518cbf7224dde539bfb91515218171713c722dc9c074bbcc4 SHA512 9e1819287c349534f323a7b516d7ca62522d26be8bcc82088590ffd1980be6cd6cc0ec5c04f2ed0ca61050e99a8b7030df58d9c70404966c024c6d69dab82365
+EBUILD systemd-249.4-r3.ebuild 15063 BLAKE2B 8459ba5014bfc6fc03dedb0c38a4ad481ec63086f6ade98dde04e9468097122992302899b47c78ac056c9ef953bf0bf1a51545ad47b3189c91f336d24a78799e SHA512 ad49b476361e39d0a833d5832ac5bddfdeaf929b083cdc388321d2b1d33dd79f65c80464070ec6de5d66a6e67fa2ea408c7d1ed79014cae7fe582a3d1d35092e
+EBUILD systemd-9999.ebuild 14945 BLAKE2B 20e31c4fea7aaa902f07a4bec51e864fa0597850d8a346c8391e622f57dcd9dd5ce46ac280ff34b5be685411fb373f62f81b6887257fe7bdf49ce5d209562217 SHA512 a3edc4527515791d7e508124f71ed85416f70d2ca94ccf997af5e81a93aba0d2e19de76819e78803c284aef3cf2c2a6270f2aa5d7012c0bbd02cdf98502354c2
+MISC metadata.xml 2467 BLAKE2B f4fea1d3af4d785ced74e32d5d31fd5e7d361ef1c661735e443d00828099ffb80cfde7951931b9bf0f900d06cef78923c5b198ff50678190b4ebc4befd66e6de SHA512 0abe12983b3569e58e8691a05165993d7653a1370c2c4465b926f1ec3d17d2a01897d77556fc0abe80d52b7610a52216c39a2426e8fe1db39a337c21d98a1590
diff --git a/sys-apps/systemd/files/249-fido2.patch b/sys-apps/systemd/files/249-fido2.patch
new file mode 100644
index 000000000000..bbfa4afb540e
--- /dev/null
+++ b/sys-apps/systemd/files/249-fido2.patch
@@ -0,0 +1,58 @@
+From b6aa89b0a399992c8ea762e6ec4f30cff90618f2 Mon Sep 17 00:00:00 2001
+From: pedro martelletto <pedro@yubico.com>
+Date: Wed, 8 Sep 2021 10:42:56 +0200
+Subject: [PATCH] explicitly close FIDO2 devices
+
+FIDO2 device access is serialised by libfido2 using flock().
+Therefore, make sure to close a FIDO2 device once we are done
+with it, or we risk opening it again at a later point and
+deadlocking. Fixes #20664.
+---
+ src/shared/libfido2-util.c | 2 ++
+ src/shared/libfido2-util.h | 5 ++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/shared/libfido2-util.c b/src/shared/libfido2-util.c
+index 12c644dcfcce..6d18178b68c9 100644
+--- a/src/shared/libfido2-util.c
++++ b/src/shared/libfido2-util.c
+@@ -58,6 +58,7 @@ bool (*sym_fido_dev_is_fido2)(const fido_dev_t *) = NULL;
+ int (*sym_fido_dev_make_cred)(fido_dev_t *, fido_cred_t *, const char *) = NULL;
+ fido_dev_t* (*sym_fido_dev_new)(void) = NULL;
+ int (*sym_fido_dev_open)(fido_dev_t *, const char *) = NULL;
++int (*sym_fido_dev_close)(fido_dev_t *) = NULL;
+ const char* (*sym_fido_strerr)(int) = NULL;
+ 
+ int dlopen_libfido2(void) {
+@@ -106,6 +107,7 @@ int dlopen_libfido2(void) {
+                         DLSYM_ARG(fido_dev_make_cred),
+                         DLSYM_ARG(fido_dev_new),
+                         DLSYM_ARG(fido_dev_open),
++                        DLSYM_ARG(fido_dev_close),
+                         DLSYM_ARG(fido_strerr));
+ }
+ 
+diff --git a/src/shared/libfido2-util.h b/src/shared/libfido2-util.h
+index 5640cca5e39b..4ebf8ab77509 100644
+--- a/src/shared/libfido2-util.h
++++ b/src/shared/libfido2-util.h
+@@ -60,6 +60,7 @@ extern bool (*sym_fido_dev_is_fido2)(const fido_dev_t *);
+ extern int (*sym_fido_dev_make_cred)(fido_dev_t *, fido_cred_t *, const char *);
+ extern fido_dev_t* (*sym_fido_dev_new)(void);
+ extern int (*sym_fido_dev_open)(fido_dev_t *, const char *);
++extern int (*sym_fido_dev_close)(fido_dev_t *);
+ extern const char* (*sym_fido_strerr)(int);
+ 
+ int dlopen_libfido2(void);
+@@ -75,8 +76,10 @@ static inline void fido_assert_free_wrapper(fido_assert_t **p) {
+ }
+ 
+ static inline void fido_dev_free_wrapper(fido_dev_t **p) {
+-        if (*p)
++        if (*p) {
++                sym_fido_dev_close(*p);
+                 sym_fido_dev_free(p);
++        }
+ }
+ 
+ static inline void fido_cred_free_wrapper(fido_cred_t **p) {
diff --git a/sys-apps/systemd/files/249-home-secret-assert.patch b/sys-apps/systemd/files/249-home-secret-assert.patch
new file mode 100644
index 000000000000..e6e2a8e7cc78
--- /dev/null
+++ b/sys-apps/systemd/files/249-home-secret-assert.patch
@@ -0,0 +1,106 @@
+From 6a09dbb89507449d158af6c7097d2c51ce83205f Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 5 Sep 2021 11:16:26 +0900
+Subject: [PATCH] home: 'secret' argument of handle_generic_user_record_error
+ may be null
+
+When RefHome() bus method is called in acquire_home(), secret is NULL.
+
+Fixes #20639.
+---
+ src/home/pam_systemd_home.c | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/home/pam_systemd_home.c b/src/home/pam_systemd_home.c
+index 836ed0d5e96d..a04d50208a8e 100644
+--- a/src/home/pam_systemd_home.c
++++ b/src/home/pam_systemd_home.c
+@@ -281,7 +281,6 @@ static int handle_generic_user_record_error(
+                 const sd_bus_error *error) {
+ 
+         assert(user_name);
+-        assert(secret);
+         assert(error);
+ 
+         int r;
+@@ -301,6 +300,8 @@ static int handle_generic_user_record_error(
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_BAD_PASSWORD)) {
+                 _cleanup_(erase_and_freep) char *newp = NULL;
+ 
++                assert(secret);
++
+                 /* This didn't work? Ask for an (additional?) password */
+ 
+                 if (strv_isempty(secret->password))
+@@ -326,6 +327,8 @@ static int handle_generic_user_record_error(
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_BAD_PASSWORD_AND_NO_TOKEN)) {
+                 _cleanup_(erase_and_freep) char *newp = NULL;
+ 
++                assert(secret);
++
+                 if (strv_isempty(secret->password)) {
+                         (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Security token of user %s not inserted.", user_name);
+                         r = pam_prompt(handle, PAM_PROMPT_ECHO_OFF, &newp, "Try again with password: ");
+@@ -350,6 +353,8 @@ static int handle_generic_user_record_error(
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_TOKEN_PIN_NEEDED)) {
+                 _cleanup_(erase_and_freep) char *newp = NULL;
+ 
++                assert(secret);
++
+                 r = pam_prompt(handle, PAM_PROMPT_ECHO_OFF, &newp, "Security token PIN: ");
+                 if (r != PAM_SUCCESS)
+                         return PAM_CONV_ERR; /* no logging here */
+@@ -367,6 +372,8 @@ static int handle_generic_user_record_error(
+ 
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_TOKEN_PROTECTED_AUTHENTICATION_PATH_NEEDED)) {
+ 
++                assert(secret);
++
+                 (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Please authenticate physically on security token of user %s.", user_name);
+ 
+                 r = user_record_set_pkcs11_protected_authentication_path_permitted(secret, true);
+@@ -377,6 +384,8 @@ static int handle_generic_user_record_error(
+ 
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_TOKEN_USER_PRESENCE_NEEDED)) {
+ 
++                assert(secret);
++
+                 (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Please confirm presence on security token of user %s.", user_name);
+ 
+                 r = user_record_set_fido2_user_presence_permitted(secret, true);
+@@ -387,6 +396,8 @@ static int handle_generic_user_record_error(
+ 
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_TOKEN_USER_VERIFICATION_NEEDED)) {
+ 
++                assert(secret);
++
+                 (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Please verify user on security token of user %s.", user_name);
+ 
+                 r = user_record_set_fido2_user_verification_permitted(secret, true);
+@@ -403,6 +414,8 @@ static int handle_generic_user_record_error(
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_TOKEN_BAD_PIN)) {
+                 _cleanup_(erase_and_freep) char *newp = NULL;
+ 
++                assert(secret);
++
+                 (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Security token PIN incorrect for user %s.", user_name);
+                 r = pam_prompt(handle, PAM_PROMPT_ECHO_OFF, &newp, "Sorry, retry security token PIN: ");
+                 if (r != PAM_SUCCESS)
+@@ -422,6 +435,8 @@ static int handle_generic_user_record_error(
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_TOKEN_BAD_PIN_FEW_TRIES_LEFT)) {
+                 _cleanup_(erase_and_freep) char *newp = NULL;
+ 
++                assert(secret);
++
+                 (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Security token PIN of user %s incorrect (only a few tries left!)", user_name);
+                 r = pam_prompt(handle, PAM_PROMPT_ECHO_OFF, &newp, "Sorry, retry security token PIN: ");
+                 if (r != PAM_SUCCESS)
+@@ -441,6 +456,8 @@ static int handle_generic_user_record_error(
+         } else if (sd_bus_error_has_name(error, BUS_ERROR_TOKEN_BAD_PIN_ONE_TRY_LEFT)) {
+                 _cleanup_(erase_and_freep) char *newp = NULL;
+ 
++                assert(secret);
++
+                 (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Security token PIN of user %s incorrect (only one try left!)", user_name);
+                 r = pam_prompt(handle, PAM_PROMPT_ECHO_OFF, &newp, "Sorry, retry security token PIN: ");
+                 if (r != PAM_SUCCESS)
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index cb86e5b1d243..c458d3f1e3b6 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="dns-over-tls">Enable DNS-over-TLS support</flag>
 		<flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
 		<flag name="elfutils">Enable coredump stacktraces in the journal</flag>
+		<flag name="fido2">Enable FIDO2 support</flag>
 		<flag name="gcrypt">Enable sealing of journal files using gcrypt</flag>
 		<flag name="homed">Enable portable home directories</flag>
 		<flag name="http">Enable embedded HTTP server in journald</flag>
diff --git a/sys-apps/systemd/systemd-249.2.ebuild b/sys-apps/systemd/systemd-249.2-r1.ebuild
index f55c30b02d8a..1f0dd24720fb 100644
--- a/sys-apps/systemd/systemd-249.2.ebuild
+++ b/sys-apps/systemd/systemd-249.2-r1.ebuild
@@ -4,6 +4,9 @@
 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
@@ -27,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
@@ -324,9 +327,6 @@ multilib_src_configure() {
 		$(meson_native_true timesyncd)
 		$(meson_native_true tmpfiles)
 		$(meson_native_true vconsole)
-
-		# static-libs
-		$(meson_use static-libs static-libudev)
 	)
 
 	meson_src_configure "${myconf[@]}"
diff --git a/sys-apps/systemd/systemd-248.6.ebuild b/sys-apps/systemd/systemd-249.4-r3.ebuild
index 469ea95ee5be..f7381f4632b7 100644
--- a/sys-apps/systemd/systemd-248.6.ebuild
+++ b/sys-apps/systemd/systemd-249.4-r3.ebuild
@@ -2,6 +2,10 @@
 # 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"
@@ -16,11 +20,9 @@ else
 	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{7..9} )
-
 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"
@@ -28,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
@@ -51,6 +53,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	curl? ( net-misc/curl:0= )
 	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
 	homed? ( ${OPENSSL_DEP} )
 	http? (
@@ -133,7 +136,7 @@ RDEPEND="${COMMON_DEPEND}
 
 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
 PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	hwdb? ( >=sys-apps/hwids-20150417[udev] )
+	hwdb? ( sys-apps/hwids[systemd(+),udev] )
 	>=sys-fs/udev-init-scripts-34
 	policykit? ( sys-auth/polkit )
 	!vanilla? ( sys-apps/gentoo-systemd-integration )"
@@ -144,7 +147,6 @@ BDEPEND="
 	>=dev-util/meson-0.46
 	>=sys-apps/coreutils-8.16
 	sys-devel/gettext
-	sys-devel/m4
 	virtual/pkgconfig
 	test? (
 		app-text/tree
@@ -155,13 +157,18 @@ BDEPEND="
 	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
@@ -219,6 +226,9 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}/249-libudev-static.patch"
+		"${FILESDIR}/249-home-secret-assert.patch"
+		"${FILESDIR}/249-fido2.patch"
 	)
 
 	if ! use vanilla; then
@@ -266,6 +276,7 @@ multilib_src_configure() {
 		$(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)
 		-Defi-includedir="${ESYSROOT}/usr/include/efi"
@@ -320,9 +331,6 @@ multilib_src_configure() {
 		$(meson_native_true timesyncd)
 		$(meson_native_true tmpfiles)
 		$(meson_native_true vconsole)
-
-		# static-libs
-		$(meson_use static-libs static-libudev)
 	)
 
 	meson_src_configure "${myconf[@]}"
@@ -442,19 +450,7 @@ migrate_locale() {
 	fi
 }
 
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
 pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-
 	if ! use split-usr; then
 		local dir
 		for dir in bin sbin lib; do
@@ -476,23 +472,17 @@ pkg_postinst() {
 	systemd_update_catalog
 
 	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
+	# when required.
+	if use hwdb; then
+		systemd-hwdb --root="${ROOT}" update
 	fi
 
 	udev_reload || FAIL=1
 
-	# Bug 465468, make sure locales are respect, and ensure consistency
+	# Bug 465468, make sure locales are respected, and ensure consistency
 	# between OpenRC & systemd
 	migrate_locale
 
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		if type systemctl &>/dev/null; then
 			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 3683686fc0d1..ee6cfbea7dad 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -4,6 +4,9 @@
 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
@@ -27,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
@@ -50,6 +53,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	curl? ( net-misc/curl:0= )
 	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
 	homed? ( ${OPENSSL_DEP} )
 	http? (
@@ -269,6 +273,7 @@ multilib_src_configure() {
 		$(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)
 		-Defi-includedir="${ESYSROOT}/usr/include/efi"
@@ -323,9 +328,6 @@ multilib_src_configure() {
 		$(meson_native_true timesyncd)
 		$(meson_native_true tmpfiles)
 		$(meson_native_true vconsole)
-
-		# static-libs
-		$(meson_use static-libs static-libudev)
 	)
 
 	meson_src_configure "${myconf[@]}"
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 38c6321ed24d..9f311c319ed2 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,9 +1,7 @@
 AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9bfec378ceedf6b6479998f81bd40237bdb5ad09239f7221cdc076077c964a111f6eb651ce258496d1010f SHA512 63587dd4552b688dc5ed0adde3932e43e5287129315211498063f09e37c1f8beee0de60d7d4f69df7149bd500546a2fd59a6094d71f9c0be221426eae3cb869b
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
-DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp-wrappers_7.6.q-31.debian.tar.xz 36256 BLAKE2B 3ffd8b014c120f54b9231f375d3ec77a1894db8c48e56a57b52c5d796be42b78a1ddc35a45c816a05a1cbc603b88e3fe6131b4a562fb9d2169685031ecbf44d5 SHA512 de2bd7b081fca0f182def93795014332baf7b5edf339eaf81dff82772aea1dc866ccddccd5273e7dc49cf760953e164a66f1e5945cb54f2b8dab090c11712c33
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.28-r1.ebuild 2509 BLAKE2B 79b2fbb4710eab85626c207d78f1d0cdd4b995ff3e32b267ac9be30b6fe29602cb6ab395f617c9a9bb67a598dc16a33da48765a7fd1e796a45f6cba991c8e1d3 SHA512 b1007fc41f6c357c0f2b1e2ef62396dd1e30ed09994ac77935fe95b580947affd0674494097a38b0174b1af99310b56f87dfd022ae748b57d2684c44f9e8b4ef
 EBUILD tcp-wrappers-7.6.31.ebuild 2564 BLAKE2B 3ae25f25c15634af4d7fccc518895d229192c35d733c797b0029016c18b1e648cd27004d2774b977324a5a4a85689f926f1d70e5214c34311b025d46b48e924d SHA512 3e59384dcc0e7b242ced107ce0dbee326eee37af1411a4b40b5c721d1c5d5e5e5ec2ee614a27e0d0b7718cc68a1bd7fb10a1cf447966a182756760c70319cba7
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28-r1.ebuild
deleted file mode 100644
index cebc0be86e4b..000000000000
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs multilib-minimal usr-ldscript
-
-MY_PV=$(ver_cut 1-2)
-DEB_PV=$(ver_cut 3)
-MY_P="${PN//-/_}_${MY_PV}"
-DESCRIPTION="TCP Wrappers"
-HOMEPAGE="http://ftp.porcupine.org/pub/security"
-SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.xz"
-
-LICENSE="tcp_wrappers_license"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 netgroups static-libs"
-
-RDEPEND="netgroups? ( net-libs/libnsl:= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series)
-	eapply "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch
-	eapply "${FILESDIR}"/${PN}-7.6.28-no-external-malloc.patch
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-temake() {
-	local mycppflags="-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED"
-	use ipv6 && mycppflags+=" -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
-	emake \
-		REAL_DAEMON_DIR="${EPREFIX}/usr/sbin" \
-		TLI= VSYSLOG= PARANOID= BUGS= \
-		AUTH="-DALWAYS_RFC931" \
-		AUX_OBJ="weak_symbols.o" \
-		DOT="-DAPPEND_DOT" \
-		HOSTNAME="-DALWAYS_HOSTNAME" \
-		NETGROUP=$(usex netgroups -DNETGROUPS "") \
-		STYLE="-DPROCESS_OPTIONS" \
-		LIBS=$(usex netgroups -lnsl "") \
-		LIB=$(usex static-libs libwrap.a "") \
-		AR="$(tc-getAR)" ARFLAGS=rc \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
-		LDFLAGS="${LDFLAGS}" \
-		"$@"
-}
-
-multilib_src_configure() {
-	tc-export AR RANLIB
-	temake config-check
-}
-
-multilib_src_compile() {
-	# https://bugs.gentoo.org/728348
-	unset STRINGS
-	temake all
-}
-
-multilib_src_install() {
-	into /usr
-	use static-libs && dolib.a libwrap.a
-	dolib.so shared/libwrap.so*
-
-	insinto /usr/include
-	doins tcpd.h
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a wrap
-		dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
-	fi
-}
-
-multilib_src_install_all() {
-	doman *.[358]
-	dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
-	dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
-
-	insinto /etc
-	newins "${FILESDIR}"/hosts.allow.example hosts.allow
-
-	dodoc BLURB CHANGES DISCLAIMER README*
-}
-
-pkg_preinst() {
-	# don't clobber people with our default example config
-	[[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow
-}
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 98871dcdeda4..92df4f1fca95 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,5 +1,6 @@
+AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
 DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
 DIST texinfo-6.8.tar.gz 10119420 BLAKE2B df9dc1698e7bb4f7c97ba4d44b08631502e3f997b91169ae64161b69701fbb0f85c82295ef6867e716a0addfd7c5677e14079645b167bd74933a0153fee92200 SHA512 f46dfb1c0f324a9c54959a8f256f0dcb8aaa59caccb0f027a5ee39a173b6e51a31a488f9d787707e7aa8401a439b2a01a1f3022dbae24ef377a1c021c1ebeb37
 EBUILD texinfo-6.7.ebuild 1941 BLAKE2B 26caf30f52c31e1de0718ae11eee9043910d6d80b81c70797102c3a026c6e767ff68a9f6f055fb67c88019c56af8ed678fed14c5d4ac290d76c2a42fb9adfc38 SHA512 c1e18457082628d892e5b58a3f514a1058b0b53a681da0863f72da6a6120d98dee47104155e84618fbab2e794f6571cc3803c32577b9602ac670ecffe98efa69
-EBUILD texinfo-6.8.ebuild 1933 BLAKE2B 11ffd7f86c56a8b9f96e5251ab159762624cf2c7eeaa69905621fae108ad2a34ca033b1ea38471904f42c90e40f8212160e7f1b55bc0cc33aced9a1d5134f068 SHA512 d998953fb2e2f16074e5a570b7379e376058fc15b4dce565e1c26c7223fd7d60b3d8effb1310ace1ab2c4a7946d4180e2e201dcfb709be2182a04f958d07a6d3
+EBUILD texinfo-6.8.ebuild 1991 BLAKE2B 61944eaf02a6909224a3cb9f1ac68182d0959a7457084f1bd9a4b57a4358615ab14581a0795c5a4030874cd01ada08da54223b9d98e2f6bb7ae09be6b94ef2f4 SHA512 7699d6dab9de05506a16a1fa194982a3f00c176ff0aedf9805cba7e22166c7f76e82939bf88ede82adb27abe08d593cdb91cda2f97cc4aef89074a902e3093b0
 MISC metadata.xml 539 BLAKE2B 5445a2b07c6bbecb3c33c64e80227f57ff80b17b0b440a3d0220a88ed1bb930deb1b0274eff8db1a64fe82c64e7f34b1183c533b1a1ca7b41694668e2c5b682b SHA512 4d0b0b223f04e6ebc4e7a7546dbf6b731fc0676657c8d3c3cd38a54c327f4eebda927f1793ead3f8f255bc82d7884b5acd6df8431674db48c2ebbbd1098cb032
diff --git a/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch b/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch
new file mode 100644
index 000000000000..60f2e63b7ce0
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-6.8-undo-gnulib-nonnul.patch
@@ -0,0 +1,186 @@
+
+Patch by Vitezslav Crhonek <vcrhonek@redhat.com>
+Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide
+
+diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h
+--- texinfo-6.8/gnulib/lib/cdefs.h.orig	2021-03-11 19:57:53.000000000 +0100
++++ texinfo-6.8/gnulib/lib/cdefs.h	2021-07-19 12:26:46.985176475 +0200
+@@ -321,15 +321,15 @@
+ 
+ /* The nonnull function attribute marks pointer parameters that
+    must not be NULL.  */
+-#ifndef __attribute_nonnull__
++#ifndef __nonnull
+ # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__)
+-#  define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params))
++#  define __nonnull(params) __attribute__ ((__nonnull__ params))
+ # else
+-#  define __attribute_nonnull__(params)
++#  define __nonnull(params)
+ # endif
+-#endif
+-#ifndef __nonnull
+-# define __nonnull(params) __attribute_nonnull__ (params)
++#elif !defined __GLIBC__
++# undef __nonnull
++# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
+ #endif
+ 
+ /* If fortification mode, we warn about unused results of certain
+diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h
+--- texinfo-6.8/gnulib/lib/libc-config.h.orig	2021-03-11 19:57:54.000000000 +0100
++++ texinfo-6.8/gnulib/lib/libc-config.h	2021-07-19 12:27:58.810590975 +0200
+@@ -33,9 +33,9 @@
+ #include <config.h>
+ 
+ /* On glibc this includes <features.h> and <sys/cdefs.h> and #defines
+-   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 and
+-   DragonFlyBSD 5.9 it includes <sys/cdefs.h> which defines __nonnull.
+-   Elsewhere it is harmless.  */
++   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 it
++   includes <sys/cdefs.h> which defines __nonnull.  Elsewhere it
++   is harmless.  */
+ #include <errno.h>
+ 
+ /* From glibc <errno.h>.  */
+diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c
+--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig	2021-03-11 19:57:54.000000000 +0100
++++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c	2021-07-19 12:24:46.878419397 +0200
+@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY
+ 
+ /* Initialize a dynamic array object.  This must be called before any
+    use of the object.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static void
+ DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST
+ }
+ 
+ /* Deallocate the dynamic array and its elements.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_FREE (struct DYNARRAY_STRUCT *list)
+ {
+@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l
+ }
+ 
+ /* Return true if the dynamic array is in an error state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline bool
+ DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list)
+ {
+@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct
+ 
+ /* Mark the dynamic array as failed.  All elements are deallocated as
+    a side effect.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static void
+ DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA
+ 
+ /* Return the number of elements which have been added to the dynamic
+    array.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline size_t
+ DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list)
+ {
+@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR
+ 
+ /* Return a pointer to the array element at INDEX.  Terminate the
+    process if INDEX is out of bounds.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index)
+ {
+@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU
+ /* Return a pointer to the first array element, if any.  For a
+    zero-length array, the pointer can be NULL even though the dynamic
+    array has not entered the failure state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S
+ /* Return a pointer one element past the last array element.  For a
+    zero-length array, the pointer can be NULL even though the dynamic
+    array has not entered the failure state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S
+ /* Add ITEM at the end of the array, enlarging it by one element.
+    Mark *LIST as failed if the dynamic array allocation size cannot be
+    increased.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline void
+ DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item)
+ {
+@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR
+ /* Allocate a place for a new element in *LIST and return a pointer to
+    it.  The pointer can be NULL if the dynamic array cannot be
+    enlarged due to a memory allocation failure.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
+ static
+ /* Avoid inlining with the larger initialization code.  */
+ #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE))
+@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY
+    existing size, new elements are added (which can be initialized).
+    Otherwise, the list is truncated, and elements are freed.  Return
+    false on memory allocation failure (and mark *LIST as failed).  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static bool
+ DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size)
+ {
+@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_
+ }
+ 
+ /* Remove the last element of LIST if it is present.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA
+ 
+ /* Remove all elements from the list.  The elements are freed, but the
+    list itself is not.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S
+    stored in *RESULT if LIST refers to an empty list.  On success, the
+    pointer in *RESULT is heap-allocated and must be deallocated using
+    free.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1, 2))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2))
+ static bool
+ DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list,
+                           DYNARRAY_FINAL_TYPE *result)
+@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA
+    have a sentinel at the end).  If LENGTHP is not NULL, the array
+    length is written to *LENGTHP.  *LIST is re-initialized and can be
+    reused.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
+ static DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp)
+ {
diff --git a/sys-apps/texinfo/texinfo-6.8.ebuild b/sys-apps/texinfo/texinfo-6.8.ebuild
index 3f25e5592134..b11292240a94 100644
--- a/sys-apps/texinfo/texinfo-6.8.ebuild
+++ b/sys-apps/texinfo/texinfo-6.8.ebuild
@@ -32,6 +32,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-undo-gnulib-nonnul.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 48b8a980a3ac..c024d1caadbd 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,11 +4,12 @@ AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efde
 AUX util-linux-2.37.1-ipcutils_calloc_check.patch 845 BLAKE2B 44e92d33ccf3bd56c86f5d9d0e4acc9e31fdc7c5e7f9e19c76eace88dbe1488140d57eb73a00e7e15f0b11bcdc676032f5b58597a5a369c4a24b9975a0b1a993 SHA512 d2f9ca3180867d23eeddf2dea89bcf7ec1294b24fec8a5116208ba187b816bc29f3456f6daef3f5a55560e1a06da4f6f08113214d8040ea824a79c00480ac4f7
 AUX util-linux-2.37.1-libmount_setgroups_fix.patch 1039 BLAKE2B a04ece245e5f27b48d585795c2bda419a710382801e518cfdbd9c304eb9329d5e6c41deae6c23f13885f20ec60e8dad403c1b5f51e04961b279d363b8bc3055b SHA512 cfa5b399509740109e034401984d75245ec6f84ea57ac01945fe3580f317967a462cced4f002ad34639c37c37dbe22471043ccee8814587cf36e02532a428027
 AUX util-linux-2.37.1-lscpu_NULL_dereference_fix.patch 1796 BLAKE2B 58034cae22d589640010bbeccc5d13dfb1d5ed6f51bbc17c6977732ddefb346a0bf46ea472e5dfddfd7f21b62dbc8b92212f18ca4e976ab67f9c6da1b21aa07d SHA512 da7114d008c52f27662aecb9aecfea05f54c5d8ce4a5948a43ce6fac3b12a61c86f8f943848f05f04d65eeff6595a0fab65e0df36436aabd25a8aff9baa8e80f
+AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c7560987438dad5e6ed43046233ae3400f91ff09767825b20ae2ff3886d8a7a3d7790dda11cffbf351c4047ac5397d1dbb98a548303d1caa8af SHA512 f0f0616a8729e302ef30b72437e34d7ac308e32206c0fdea2d3117da6a01d18b809016e2f46affed3b8fcaf156c64cd895a7460895aadcf39352fe724a3bfd78
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
 DIST util-linux-2.37.1.tar.xz 5628360 BLAKE2B 309ea7202f32c0ec750cb01486cf32c3e9dd457d83e5beab8d6b97a5e7f312332ecfcd1ddbb88ae5ec9ee483bb15452b8d58bce1f931f9dfa35be3ce042da3da SHA512 ec300c830869e10a0d7f8c0b99e9bb46e0b88fc51f3c6c6a4d9752a89f035e8d69d81f25fd103ef8d7d253e81440695ef3f5d72dccc94815ec8d5f6f949f7555
 DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d
 EBUILD util-linux-2.36.2-r1.ebuild 8943 BLAKE2B 02deedf4a71d2acc2cd15fce983471237f84bf131debc2f161ec9afa7102b70dcdbd0aa70062ca4208d0e2fa444f5a9effe4650d07e4d9ec027fa7c1004b0e85 SHA512 4ac8f481c02d804078a16c3d92ffaf9320028630ca4bd9233ca5461a1ed373cb8c5aaee7a08be49b38ed103698f089cb5db0e87f119911423154b4754e39d23f
 EBUILD util-linux-2.37.1-r1.ebuild 9513 BLAKE2B c297090276e37a9970b02a4b4d7a4adeb3a843a0012198e1691b0540eef3a1311bdd82ee883230453ec3c1711b29f2567342bf2b76ee3d5183c58dd6420e8870 SHA512 e37280f4c9f73b397bf720d4a7fe8ea8520245bdea416bfd96bc07719a4a8b3b85bfa1b711cbe696ea0c91097e45e347497391a7e885ae4f86c78042a456d21a
-EBUILD util-linux-2.37.2.ebuild 9311 BLAKE2B 64b98c89edc67f0ceaab9e488015bbe1ecf79fd71b024a263112e4db0258e97221c31bcda662aa0e2ec3322c0c4e9545a3fe009502cc2b749e3dbcc334b18c2e SHA512 7e0d6fe40276e5340fbd20bad22ef81979fe79751c403733ec1726b69dae9e940422d4deac2411b2c96d3bdd69c13a875300b85c87d455655d3c3fc51974f5f3
-EBUILD util-linux-9999.ebuild 9239 BLAKE2B c337555349c3421489745b1bab6a6d930e8142263ee54b262e5949eefe65a06054ad3f0be017fc47b98fa4bbf983a9448327c361cf493bfb08d029b167c36fca SHA512 c80fa7d4a0312070cea8cfd3b1cb5df08cddc7958ec5003446e371edaf45a5151c3c14ee8f4d73a71584d90ade88cb67a54666b7cc58350a519f1a954199bbe3
+EBUILD util-linux-2.37.2-r1.ebuild 9381 BLAKE2B 40578a9bb102529186ce30bd37e69abd8c0f86e53781758621c8e622b7813c445da03b106e511ae537e9e907358ec198f8e30f29a5dd314a16c21450a6dd155a SHA512 d0de0e8b59beadfd0a1c12811ee827c949c3ad52917d4e0d592516f05a741f415fddbfc7bc87b4ece9b16e3ce80db8676aa7a229309779263055a9d7a87927a4
+EBUILD util-linux-9999.ebuild 9241 BLAKE2B a3662ed7de69cfa760000558f37cf38dbd1dfc7d8650c090002025c487ff77ff4b5af00794326798a9a29c29d5aa7844c5a208d4cc624d723fb038a1da322c72 SHA512 d7000d8d0c2da9a81a74ed4f643fa5a9ceaf3795589fc72c765c6355bfaf04a9305fb9e2a75b03b8a50c09b017e06409e7b0a1c9213b48efbf0c29363ce48711
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.37.2-ioctl_ns-test-hang.patch b/sys-apps/util-linux/files/util-linux-2.37.2-ioctl_ns-test-hang.patch
new file mode 100644
index 000000000000..73dc0b40a049
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37.2-ioctl_ns-test-hang.patch
@@ -0,0 +1,37 @@
+https://github.com/karelzak/util-linux/commit/597ccb7bf564f65bb059bfe420224cab0fba46ac.patch
+
+From 597ccb7bf564f65bb059bfe420224cab0fba46ac Mon Sep 17 00:00:00 2001
+From: Chris Hofstaedtler <zeha@debian.org>
+Date: Fri, 20 Aug 2021 10:30:50 +0000
+Subject: [PATCH] tests: Skip lsns/ioctl_ns test if unshare fails
+
+Some parts of the Debian build infrastructure uses unshare to run the
+package build, and that appears to cause a "nested" unshare in the
+lsns/ioctl_ns test to fail. Unfortunately the tests then hang at this
+point.
+
+Try running unshare before the actual test, and skip the test if unshare
+already fails.
+
+[kzak@redhat.com: - add --fork to the test
+                  - don't write to stdout/err]
+
+Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ tests/ts/lsns/ioctl_ns | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/ts/lsns/ioctl_ns b/tests/ts/lsns/ioctl_ns
+index ef6360607..fa626bfda 100755
+--- a/tests/ts/lsns/ioctl_ns
++++ b/tests/ts/lsns/ioctl_ns
+@@ -34,6 +34,8 @@ ts_check_prog "mkfifo"
+ ts_check_prog "touch"
+ ts_check_prog "uniq"
+ 
++$TS_CMD_UNSHARE --user --pid --mount-proc --fork true &> /dev/null || ts_skip "no namespace support"
++
+ ts_cd "$TS_OUTDIR"
+ 
+ # The parent process receives namespaces ids via FIFO_DATA from bash
diff --git a/sys-apps/util-linux/util-linux-2.37.2.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
index 7d33348c15d8..9c414db3dfb0 100644
--- a/sys-apps/util-linux/util-linux-2.37.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
@@ -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 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 selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -88,6 +88,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972
+	"${FILESDIR}"/${P}-ioctl_ns-test-hang.patch # upstream test hang patch
 )
 
 src_prepare() {
@@ -194,12 +195,12 @@ multilib_src_configure() {
 			--disable-newgrp
 			--disable-nologin
 			--disable-pylibmount
+			--disable-raw
 			--disable-vipw
 			--enable-agetty
 			--enable-bash-completion
 			--enable-line
 			--enable-partx
-			--enable-raw
 			--enable-rename
 			--enable-rfkill
 			--enable-schedutils
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index d6191386e831..e79f37069b6d 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -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 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 selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -190,12 +190,12 @@ multilib_src_configure() {
 			--disable-newgrp
 			--disable-nologin
 			--disable-pylibmount
+			--disable-raw
 			--disable-vipw
 			--enable-agetty
 			--enable-bash-completion
 			--enable-line
 			--enable-partx
-			--enable-raw
 			--enable-rename
 			--enable-rfkill
 			--enable-schedutils