gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /sys-apps
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
94 files changed, 1727 insertions, 1742 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fda176f5c452..b9ef65b5a00a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 8b667d072e12..a54e824fae20 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,7 +1,9 @@
 AUX attr-2.5.1-fix-symver.patch 5856 BLAKE2B dbff8d7cd138d962cca02c35f1ad8679f813cedf92784d075f837f0e56989a514d105cfb2c765bb382b1413aaddcd66be4a09a2fafb58172a7b98c0eecc17f63 SHA512 0d576b867e253cb63e712ff6f2cb0491f42be8214e8307bbd71f50247917ebe9236ddafad8610c2e8de2d0f33b1d0f87ad1258c8637b9ba46ad7f2b2fa1f9a24
+AUX attr-2.5.1-r2-fix-symver.patch 6909 BLAKE2B 844f6d9e87ca3cfd9413047cd8fbebc6265545d1aed3653ec2d1d8fc18ee0eb42ebca756a62c9d8a8cc2c4c7f38720a66afcbe0d052525f58e4748ba50d267b3 SHA512 874a4e770a624ce4dd86b6b03e6dd0abef737cafccf2580f5c5e6f75a66425b2e34da6ee520991693387f55000448451fdc96883c2759c9fb4c650d667df63c8
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
 EBUILD attr-2.5.1-r1.ebuild 2632 BLAKE2B 0626b192ef6a6f81dec7186ab4c1a9a4352d9c99b684f0872c2a1f6709d156316bbca932fba7355f9c5596a15b92bd065a56507ef5a041757b1a46daa4c2c96e SHA512 e76b292dcbe879d2d79987e00528c25c9fac831ff391fc9d0adbba51533402a068c5a01449750e22433c858c57bde5b4c2bda11d226f5be625f7df7b16d6f9d4
+EBUILD attr-2.5.1-r2.ebuild 2472 BLAKE2B 430e20284e07660e229d68511dab14c65176f25d76cca30bd1c1b617219a8880b4bc3166d27fdec6e10b2adcbe768f5abe237f9fd09b66e16c9a733030c85623 SHA512 f3076c16dd948b5e4caea3b731e03bb9e35aa36856185635901dcdb00a4bea7b86d6bf727aa4301cd934316d0755aa1012e8bdcfc1558698126647f2bddd36ea
 EBUILD attr-2.5.1.ebuild 2495 BLAKE2B 290d82c439e0096b6ac5be07258d87d3c05b56500fa81b4cf610e322505a5cb302c3e5900f59b363c7cfd3ae1bf315f19bfeed7968c95d3c9cc222b8639c5498 SHA512 201868f12414b9662b5edfdc19827c84a9cd967295b6752eeb38e4c52472ea73cc5caf04bba52c08d55b15570d71cb730e283b8f3ebebbfbc159cf0f27c20eb4
 EBUILD attr-9999.ebuild 2632 BLAKE2B 0626b192ef6a6f81dec7186ab4c1a9a4352d9c99b684f0872c2a1f6709d156316bbca932fba7355f9c5596a15b92bd065a56507ef5a041757b1a46daa4c2c96e SHA512 e76b292dcbe879d2d79987e00528c25c9fac831ff391fc9d0adbba51533402a068c5a01449750e22433c858c57bde5b4c2bda11d226f5be625f7df7b16d6f9d4
 MISC metadata.xml 337 BLAKE2B c04cc7c99b3d9d39870605354acd4f0a4b03d47e79228f444e915ce17abd2eb075418919dc3272903fdd524f56588ef194d7cdbd43f2b040c4f6a9d5fa2eebee SHA512 e9ba5573c84dd1b2cdce5b74e53b731c1ba4b3e72bca569f3febc77e431b96982cd83a71720e021ba23e8d6fd23f9dbea43a6c8d94b2b6ce1b3d26fda038d6de
diff --git a/sys-apps/attr/attr-2.5.1-r2.ebuild b/sys-apps/attr/attr-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..2046677daddd
--- /dev/null
+++ b/sys-apps/attr/attr-2.5.1-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
+	inherit autotools git-r3
+else
+	inherit libtool
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug nls static-libs"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-r2-fix-symver.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles || die
+		eautopoint
+		eautoreconf
+	else
+		# bug #580792
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	# bug #760857
+	append-lfs-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable debug)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# Sanity check until we track down why this is happening. bug #644048
+	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
+	if [[ -e ${lib} ]] ; then
+		local versions=$($(tc-getREADELF) -V "${lib}")
+		local symbols=$($(tc-getREADELF) -sW "${lib}")
+		if [[ "${versions}" != *"ATTR_1.0"* || \
+		      "${versions}" != *"ATTR_1.1"* || \
+		      "${versions}" != *"ATTR_1.2"* || \
+		      "${versions}" != *"ATTR_1.3"* || \
+		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
+			echo "# readelf -V ${lib}"
+			echo "${versions}"
+			echo "# readelf -sW ${lib}"
+			echo "${symbols}"
+			die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
+		else
+			einfo "${lib} passed symbol checks"
+		fi
+	fi
+
+	if multilib_is_native_abi; then
+		# We install attr into /bin, so we need the shared lib with it
+		gen_usr_ldscript -a attr
+	fi
+
+	# Add a wrapper until people upgrade.
+	# TODO: figure out when this was added & when we can drop it!
+	insinto /usr/include/attr
+	newins "${FILESDIR}"/xattr-shim.h xattr.h
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch b/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch
new file mode 100644
index 000000000000..ee25b13166ff
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch
@@ -0,0 +1,206 @@
+https://lists.nongnu.org/archive/html/acl-devel/2022-05/msg00000.html
+Bug: https://bugs.gentoo.org/644048
+Bug: https://bugs.gentoo.org/700116
+
+From a9ca51afd2b9f68f57de3a4c3d962d1d763572ca Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Thu, 28 Nov 2019 22:17:24 +0100
+Subject: [PATCH] Better supported way to set symbol versions for legacy
+ syscalls
+
+Using a linker script to set a symbol versions is an undocumented
+hack and doesn't work reliably in many cases. It works (to some
+degree) with the bfd linker, but fails with gold or lld. And even
+with bfd it can break when using --gc-sections or LTO.
+
+The result may be a library where the code has been discarded and
+the versioned symbols are unusable, e.g.
+    23: 00000000     0 NOTYPE  GLOBAL DEFAULT  ABS getxattr@ATTR_1.0
+instead of
+    23: 000033c0     0 FUNC    GLOBAL DEFAULT   11 getxattr@ATTR_1.0
+
+Remove the linker script entirely and set symbol versions with the
+symver attribute if available (in gcc >= 10, but not in clang),
+otherwise use the traditional global asm solution with a .symver
+directive.
+Those are the documented ways to do it and well supported by (almost)
+all configurations. (The exception is old gcc with LTO; a workaround
+is included, but some versions may still need -flto-partition=none).
+
+Signed-off-by: Alexander Miller <alex.miller@gmx.de>
+
+--- a/libattr/Makemodule.am
++++ b/libattr/Makemodule.am
+@@ -8,7 +8,7 @@ LT_CURRENT = 2
+ LT_AGE = 1
+ LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-libattr_la_DEPENDENCIES = exports libattr/libattr.lds
++libattr_la_DEPENDENCIES = exports
+ libattr_la_SOURCES = \
+ 	libattr/attr_copy_action.c \
+ 	libattr/attr_copy_check.c \
+@@ -20,7 +20,4 @@ libattr_la_SOURCES = \
+ libattr_la_CFLAGS = -include libattr/libattr.h
+ libattr_la_LDFLAGS = \
+ 	-Wl,--version-script,$(top_srcdir)/exports \
+-	-Wl,$(top_srcdir)/libattr/libattr.lds \
+ 	-version-info $(LTVERSION)
+-
+-EXTRA_DIST += libattr/libattr.lds
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -647,9 +647,8 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-EXTRA_DIST = exports examples/copyattr.c examples/Makefile \
+-	libattr/libattr.lds test/README test/run \
+-	test/sort-getfattr-output $(TESTS)
++EXTRA_DIST = exports examples/copyattr.c examples/Makefile test/README \
++	test/run test/sort-getfattr-output $(TESTS)
+ SUBDIRS = po
+ AM_CPPFLAGS = \
+ 	-I$(top_builddir)/include \
+@@ -689,7 +688,7 @@ LT_CURRENT = 2
+ #LT_REVISION =
+ LT_AGE = 1
+ LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-libattr_la_DEPENDENCIES = exports libattr/libattr.lds
++libattr_la_DEPENDENCIES = exports
+ libattr_la_SOURCES = \
+ 	libattr/attr_copy_action.c \
+ 	libattr/attr_copy_check.c \
+@@ -702,7 +701,6 @@ libattr_la_SOURCES = \
+ libattr_la_CFLAGS = -include libattr/libattr.h
+ libattr_la_LDFLAGS = \
+ 	-Wl,--version-script,$(top_srcdir)/exports \
+-	-Wl,$(top_srcdir)/libattr/libattr.lds \
+ 	-version-info $(LTVERSION)
+ 
+ libmisc_la_SOURCES = \
+--- a/libattr/libattr.lds
++++ /dev/null
+@@ -1,12 +0,0 @@
+-"fgetxattr@ATTR_1.0" = libattr_fgetxattr;
+-"flistxattr@ATTR_1.0" = libattr_flistxattr;
+-"fremovexattr@ATTR_1.0" = libattr_fremovexattr;
+-"fsetxattr@ATTR_1.0" = libattr_fsetxattr;
+-"getxattr@ATTR_1.0" = libattr_getxattr;
+-"lgetxattr@ATTR_1.0" = libattr_lgetxattr;
+-"listxattr@ATTR_1.0" = libattr_listxattr;
+-"llistxattr@ATTR_1.0" = libattr_llistxattr;
+-"lremovexattr@ATTR_1.0" = libattr_lremovexattr;
+-"lsetxattr@ATTR_1.0" = libattr_lsetxattr;
+-"removexattr@ATTR_1.0" = libattr_removexattr;
+-"setxattr@ATTR_1.0" = libattr_setxattr;
+--- a/libattr/syscalls.c
++++ b/libattr/syscalls.c
+@@ -26,6 +26,27 @@
+ #include <sys/syscall.h>
+ #include <sys/xattr.h>
+ 
++/*
++ * Versioning of compat symbols:
++ * prefer symver attribute if available (since gcc 10),
++ * fall back to traditional .symver asm directive otherwise.
++ */
++#ifdef __has_attribute
++# if __has_attribute(symver)
++#  define SYMVER(cn, vn) __typeof(cn) cn __attribute__((symver(vn)))
++# elif __has_attribute(no_reorder)
++   /*
++    * Avoid wrong partitioning with older gcc and LTO. May not work reliably
++    * with all versions; use -flto-partition=none if you encounter problems.
++    */
++#  define SYMVER(cn, vn) __typeof(cn) cn __attribute__((noreorder)); \
++			 __asm__(".symver " #cn "," vn)
++# endif
++#endif
++#ifndef SYMVER
++#  define SYMVER(cn, vn) __asm__(".symver " #cn "," vn)
++#endif
++
+ #ifdef HAVE_VISIBILITY_ATTRIBUTE
+ # pragma GCC visibility push(default)
+ #endif
+@@ -35,66 +56,78 @@ int libattr_setxattr(const char *path, const char *name,
+ {
+ 	return syscall(__NR_setxattr, path, name, value, size, flags);
+ }
++SYMVER(libattr_setxattr, "setxattr@ATTR_1.0");
+ 
+ int libattr_lsetxattr(const char *path, const char *name,
+ 		      void *value, size_t size, int flags)
+ {
+ 	return syscall(__NR_lsetxattr, path, name, value, size, flags);
+ }
++SYMVER(libattr_lsetxattr, "lsetxattr@ATTR_1.0");
+ 
+ int libattr_fsetxattr(int filedes, const char *name,
+ 		      void *value, size_t size, int flags)
+ {
+ 	return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
+ }
++SYMVER(libattr_fsetxattr, "fsetxattr@ATTR_1.0");
+ 
+ ssize_t libattr_getxattr(const char *path, const char *name,
+ 			 void *value, size_t size)
+ {
+ 	return syscall(__NR_getxattr, path, name, value, size);
+ }
++SYMVER(libattr_getxattr, "getxattr@ATTR_1.0");
+ 
+ ssize_t libattr_lgetxattr(const char *path, const char *name,
+ 			  void *value, size_t size)
+ {
+ 	return syscall(__NR_lgetxattr, path, name, value, size);
+ }
++SYMVER(libattr_lgetxattr, "lgetxattr@ATTR_1.0");
+ 
+ ssize_t libattr_fgetxattr(int filedes, const char *name,
+ 			  void *value, size_t size)
+ {
+ 	return syscall(__NR_fgetxattr, filedes, name, value, size);
+ }
++SYMVER(libattr_fgetxattr, "fgetxattr@ATTR_1.0");
+ 
+ ssize_t libattr_listxattr(const char *path, char *list, size_t size)
+ {
+ 	return syscall(__NR_listxattr, path, list, size);
+ }
++SYMVER(libattr_listxattr, "listxattr@ATTR_1.0");
+ 
+ ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
+ {
+ 	return syscall(__NR_llistxattr, path, list, size);
+ }
++SYMVER(libattr_llistxattr, "llistxattr@ATTR_1.0");
+ 
+ ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
+ {
+ 	return syscall(__NR_flistxattr, filedes, list, size);
+ }
++SYMVER(libattr_flistxattr, "flistxattr@ATTR_1.0");
+ 
+ int libattr_removexattr(const char *path, const char *name)
+ {
+ 	return syscall(__NR_removexattr, path, name);
+ }
++SYMVER(libattr_removexattr, "removexattr@ATTR_1.0");
+ 
+ int libattr_lremovexattr(const char *path, const char *name)
+ {
+ 	return syscall(__NR_lremovexattr, path, name);
+ }
++SYMVER(libattr_lremovexattr, "lremovexattr@ATTR_1.0");
+ 
+ int libattr_fremovexattr(int filedes, const char *name)
+ {
+ 	return syscall(__NR_fremovexattr, filedes, name);
+ }
++SYMVER(libattr_fremovexattr, "fremovexattr@ATTR_1.0");
+ 
+ #ifdef HAVE_VISIBILITY_ATTRIBUTE
+ # pragma GCC visibility pop
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 00d8151c83e1..19923895cd4c 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -2,5 +2,6 @@ AUX bubblewrap-0.6.1-clang-printf.patch 849 BLAKE2B 6bbe5259c1e6e80ca8547dda8df9
 DIST bubblewrap-0.6.1.tar.xz 145500 BLAKE2B 8f8f69c5314843be1ac8c52d462ce2b17fc88760274b71837793a3e8dbf87623b80b7ae094131cee896644b53f4761388638d21b1575d1887eb755880bb05845 SHA512 68e07812ff5e01de2b7a0ce66e8386ca3662fd071d4e9b4c4afa611c1589c0ed116e0ebb4c03eae3f707f908d86945e157f8b26ff872c2814889dde92df9c60b
 DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
 EBUILD bubblewrap-0.6.1.ebuild 1215 BLAKE2B cf5306b6e614651fbd4e9845b4ff1dd894878e9542c09b3b9e1ddc7c857eaa799e7b83c2bb77e8a1ee6c6d1538f74890112b59f988621fa79bb2e311329c4ca7 SHA512 571ea97c9b7a97645ba364aa22c38a794a0a4ecc79b95adfe9dcfdcd646b03c0183d539246bd20210fc36d4ec1113f92f0336aaeb064de15ac39146888ecc2b8
-EBUILD bubblewrap-0.6.2.ebuild 1165 BLAKE2B 17f32d614d714566ef84a67c8dab74c32ae93ef741d7c4be9315bc906f4530e87c9f75fbde89a34cd5a6fc9f24ee2aa4dde2a9200f829a73229fc0d2eda00e27 SHA512 072b5c5ddca147b3e5e30e865d5590762e9e53f67fd8bfc73757a797685307e32c76791b4fe197d042a7f8c1e7f570c87ecf2d341d90de7e3ce9330448992775
+EBUILD bubblewrap-0.6.2-r1.ebuild 1164 BLAKE2B 72f0f4b86fd818ef412855fe87819357b795ed5e2f75afb8b1657df6dc936ef0a0746bf16654f27622a646edcdff507e0841f2bc573f0b0349ef67e1e97764fa SHA512 44195b2ba3041648bf967c2fb73e86107d09b1d0b9516e26999e9225aca7e831f0e2a5883aa78f24d1bde7c8470ce1eccaca6d39445815769075cdbd7c5d96a5
+EBUILD bubblewrap-0.6.2.ebuild 1163 BLAKE2B ef14fc49cad653951946db693fe2a0433869585a5ce26e31a261d0fcb48eb8afb038cfff4ffca288f939b07c01c4aef85ecb416dbee578736770792f478e6d85 SHA512 5743e117b383db85f9db96a0eba5b15f6c58e6a83dba7545e5f02934d03bdfc179c80703b3394b3b6e947641f7408b5798a01bde04cf1e8f70ff54e47d42a3db
 MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.2-r1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..fa95d51552b8
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson
+
+DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
+HOMEPAGE="https://github.com/containers/bubblewrap/"
+SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux suid"
+
+RDEPEND="
+	sys-libs/libseccomp
+	sys-libs/libcap
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+# tests require root privileges
+RESTRICT="test"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbash_completion=enabled
+		-Dman=enabled
+		-Dtests=false
+		-Dzsh_completion=enabled
+		$(meson_feature selinux)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use suid; then
+		chmod u+s "${ED}"/usr/bin/bwrap
+	fi
+}
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
index 1a94bd7b8c24..b3a318381e33 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 75b9dcc69925..3dc732da1ee0 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,26 +1,27 @@
 AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7efff9ecc6820e9ecd92047ffe4e94fe8f2aa864db87a3f081c2e3ff599546563fff83c78fc36a44fafc559de6 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e
+AUX busybox-1.34.1-skip-selinux-search.patch 724 BLAKE2B 068334c468bb9c2199311be836f38264df4c6fc12a410119f989e210a27ea9561190f554c17b8d29fca4b83fc2016e1211edc4b1ca7d127449381291720946f1 SHA512 bc6eb9e8cbc21e8e00f696505d88ad3c7be5a3e4f7414a2dc4c8fe98088e7602f44b1d5b58b13ae85675b635be23bee13db800b6ab639babf89b306669980b43
+AUX busybox-1.36.0-fix-wx-sections.patch 2276 BLAKE2B 79570d6165ad6b4846bb4071ea67793e9fbd6e6cd9fd53b0f473d25b2de8f7bbff64fe09d1dbc680641699bb9b679bfef9d5d73abf00a24a8d8e037dc85fc6da SHA512 f58779d113c136219a4f1a140ec29b4dd235b37178ef473cffed8a438dec84ef2ce4fa354f659d38aea64c500da185eb7ae617f3c99d94145a2bf07ca5555172
+AUX crond.confd 55 BLAKE2B 23e5530472b9ea09177b8e5ea944528a0ff9ba62a8b434a547da16b2e8721c8a1500405b69af8840be3a3b3d86d2d3b7bd1fd5a27a34de874ca44caf961d5cee SHA512 10a3c88ecf7ccf0c1e0581c78433846135ee8b1092d07082e745d5371108194871c7502b4c58ad430e065c25441fea7ba0e73268c95df13cd6f8e9146ef312d7
+AUX crond.initd 256 BLAKE2B f5dc6126bcdc9991aaaa931f8b06b68bcbec7b10115d7bb18a639e4e79aa45112688a1cffa17ef1fad14c68464ac7fcabcdc80ed7186bc68dd56164ba00e94c2 SHA512 e8b72a05e8fbe94b84c9e2e8c678fae9bc4dd1ec58763ddc3027bfc39d2ba8170e5a9c5057199df39568c7088b2c742fa18af01225c1b9ffe327ba3d912be1bf
 AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c
 AUX klogd.confd 218 BLAKE2B e4c814e673dc4fa555bca9cf2065659facbb4878b4a794a56c18366be3077944bf15b1dcf665d83e7ab53a279e23a0cdc1ea8dd01399bb6747247c9bb0d65da3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f
 AUX klogd.initd 245 BLAKE2B e8b8045cebfd39a8a088b70142e47442224ddf51d06b7ba7614721eb06bb8662184133d5464c79ece4826e5f338b54b6e2154b67f59c25dc9324fa526e82caf6 SHA512 6c28b5f2db40eeeae14f859f56a5e4f96a034b69639f38da3a437eabd1f74f61240b87eac2f7e5ca9a3377ceb9a37e939ab69b7db6a70c962062e5ae29f7e835
 AUX mdev.initd 869 BLAKE2B 1ad0ce41749e54e16aaea99cb02f1912efe3f29ab94505e692a5c588972ec947bc75791f076db2f7d7b640639ffbef9ca775923cf1e8a6ecdf6bd13e7384dfca SHA512 d7c7074384e8fcc6c8e7e55f94103bc575b101426ed8012a352546e8c741e90dd224869a9308a29e21491021d4372a4fab73c0f0d4453c6a53ea8ae537ca8e7a
-AUX mdev/dvbdev 356 BLAKE2B 1819cd2903fc9894183153ed6fca49e992a840a1546ccebbd47698a59085de376a2331f008785eb4a07173f27553e4bd07b6126877019d3dfb0a9c1c5861f526 SHA512 ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a
-AUX mdev/ide_links 440 BLAKE2B 245bec553726d745b3e665331591ec2a403b67af87e69cd93398635cd1b86057cee0ca47f9447a291b09fff9032702f73700304fa96d67334e4513a7a6a20910 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec
-AUX mdev/usbdev 1624 BLAKE2B 6b3876626a32b598ddf7aa1c53370df614918f95c9817b4e3e3f7a603af29ed9abd6dd9365a94497bed574457207b68ace8d082dbc1079c597afc11723670741 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2
-AUX mdev/usbdisk_link 984 BLAKE2B fd05e4223c800b3865adc4963446ee2c13a7df48a366a5c934969cc963db6f9b62a0fddbe82b5dba95672978684d8b90315d959f95516fc7a2729c0b4b34106d SHA512 05bc589f067cf988f97f10def3c05e139ac4f4ebe045bdb4c2f5453f5e672bf61d3dc1636974c5680c8c9cf22498bee9cfa28a8f4a264d9f5b10a72a9da0ca16
+AUX mdev/dvbdev 366 BLAKE2B 5755ec01204c0520cfc6aa07fb2df25b1c8074aa120f5fed5068a273b925ec3e20053e0c0bac79349b1ac2b024ed1f74c74c597e59c032bdeb90db41bf578acf SHA512 9c51f87e6ead2b01a581d24bf8c0dccff0d515a219ab21f5b5be7c0892305fec5b41b65fbc383a5005a2fd0a07af6e5ce8548de6e3eaec0ca95614bafe33755d
+AUX mdev/ide_links 488 BLAKE2B 9bd9e6003f8b999aa0c520667f736285224497151dcc9837f01d83afcebc480c135c92fbe17f3e3fd09e8d5e2acaf7376d359cb5503c7ee455f3706860f790bc SHA512 7b8c718a9bf9481f2545f1b97f1127e44363c2d9bbde8f01fcd60d7ec7552ae811237b5202bb37e10bbbd68817c2539231b3e0e3603b4b4ad02d6a70264cafb3
+AUX mdev/usbdev 1726 BLAKE2B 50e612e1cdc10510d60c9771b3e509fa7fbf3f70a7d88c66d9cf2e73ab6d1c0a14e462cf4b0b505734aa0933f2dbc206b03cc48d4ac7a380564a7376ad5c9016 SHA512 7c9a25d04d28fdd0f3446d8d06ce57833b9b84df140d074b576192adad693ea2c9e3b65000a0a49b645e40a66e5192b93579e0460f569016aecbc0c2e0a786f6
+AUX mdev/usbdisk_link 1066 BLAKE2B 3c9c0cfad43de607a2681126a7da13a76b8ba2642332eebb596c56a8c1abb4be030b9bf7081da982178520a334db9026523233230a4a6c68e55b826c26526b0f SHA512 f74b2f596f08179417c3dea4ee2fe3bb7ba76563e178cbe8261105ed304d7f501068d4bc834c7abd18bce5936d457c066855c04b5bbcd2f714bed4215a174b8c
 AUX ntpd.confd 186 BLAKE2B c8beac2e21c9aa7bd42e771c40065cfa9251f94d893d02db4567d53f45a3c751ebf7981cd806e3220f6d1a708fc098592b4aef6e688e3a1fe3b94259e23de76e SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8
 AUX ntpd.initd 259 BLAKE2B 3a8e41728d613b50721544eafe11f327578817c8ee49d777058508210deefbc2b0927a60489968ed63cdfe040371701f5b6588aecb2acc535c9ea5e173471c96 SHA512 bdae71e811af7165f014bd9a918824ee1b0c68df78f3457296d6be36e85c5e6d813610979f6d6b9af3c9e2fd4c95a451a63900461a948cbe88d7b6e3201cf03a
 AUX syslogd.confd 234 BLAKE2B a1601c31dab14e5c2712f49133758479914bcf37e0d9704fe71c6ac26409d7b48fd234b6584b8349cd067c6e914029a67ab4a4e141b95a21a23c7d6ee05eb760 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52
 AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e7594d60bb9adfbbb631eede30f375cf38370606c93d10e8fba05f50e88ede6709ee30b6ae6aec7a7 SHA512 856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 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
 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
 DIST busybox-1.35.0.tar.bz2 2480624 BLAKE2B c08656bc863cd3fa8f7269032e808a30832215c36414c12f8233ab00503636ed1979541b7df42df654f1dfdfdd46fc00c8fe790bf0bed629a915b4c806c643b9 SHA512 62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a
-EBUILD busybox-1.32.1-r1.ebuild 9458 BLAKE2B 2f23e64aed42ab56411e6b000c33aeaf9008bc0077d0039b412f3d94db41a9f3954922c7a00068f221177d254f0e2478c84f59002004403a444be70ed37291f2 SHA512 d6c2b162d3bb23f63e701108250dde39d613ecd5f62183cab64e9ba2803789533d6beb0efd1fb960c946afa9c5a0c43aab5194a164bb040c0bf309a318fd3482
-EBUILD busybox-1.33.1-r2.ebuild 9815 BLAKE2B eed0b930aeb82af04d2685a3a355b9fbef9bab402659a558dc38ac90d56159ab7eccc99c63a4aeb1a311ea8d48a4d7159791e3ed95667b2e3a6b89d5c177d495 SHA512 bacf3b935be115edb9b6bad09ad47316e7eb5821bc079cdf86f9441fecf73cc47bbd825fc0e70e9e859bea65368584671952159b7d3dd6e18818982e4dfcaa18
-EBUILD busybox-1.33.1.ebuild 9466 BLAKE2B 81dad4531ac36a23e88646ccd3f19a26d6ae199d46313f9b9b792fdd2139f4ad5710fb9bb611fc773cbd5ffd20fc76cea09785b5581c6dc95f16817c6f01e60a SHA512 b8cfc1a8d4a14cdaf3265acf8ce4e9880c391bf00cd35d9a2cf6c94a56e3d7869fe7fec49a756b81ac4fb9a2c8977fdc9e3312b625cdaa274d1b818c58f805c8
+EBUILD busybox-1.34.1-r1.ebuild 10435 BLAKE2B 1c39c6c6577a6964aa42e2637e17fdabe008dfd732a73dca3c4414d15c4c418d8c453e25eb01eb07c47d569271b46237756227faf3026d9c5090975c26e2fbd2 SHA512 b855d3972e524c9a8b39d7a4863eeef92d26b3484a709f1636da340545b58dfe917886975ff52fa4895088c78912bdadff491385e5017f969cc886ec8e121176
 EBUILD busybox-1.34.1.ebuild 9269 BLAKE2B 59a8175829486b5380ee5f5b28cbab39cf65042329391e8d5d3a561ef37c09b020bede8da131268f3db670d71669ab1ce6de123373f8bd597bc65e9668e6d0ca SHA512 90ce4e384662f3d526cbf168e40a9d1743704ac10ebfbccbe3ef3299c4166badd0644aa8dd85a1193caef8076eb8912f6ba257aca1decbd696a4c42535528772
+EBUILD busybox-1.35.0-r1.ebuild 10471 BLAKE2B 84447022c8ac79039ab68ca2e355cf8da1d26b61e080defc6720dbca9e4561f2f286c1ba9e4f1e3b1b1848b44ee20cacb6fafce657493a71ca5bf36cb8349da0 SHA512 349483a992b68aa6fe5084945ea8b48fc4db12460d9fced9637ac52e72af22851549db24a6dd3790ae4f47d160671d58f3b8fc81a69a1dd4a32c1e53aeb8d975
 EBUILD busybox-1.35.0.ebuild 9313 BLAKE2B 7f600ddda357dee3f5d17c0970bf7fc015771a82cfd982df754bdf4e93c3fb215a11679589caf2f717ef3fd52877d6c9806512774e04c4f209d36aa81f73c5a5 SHA512 ac656a8411d03e79283f72b72e976983fd3e3fb4d57680cf658ffb98c93ba331579936c1e7ab86d0e211e50355dc84f56b324f60cd7a6e7350f85c64c7cb1fe4
-EBUILD busybox-9999.ebuild 9277 BLAKE2B 6ec26199443a6b86edf07bfb28811308d2d14ebf857ac59f824c9a7f78af6d56d4d85da63c03718dfc76a1d07f39c806093d6f00a063f20bcf4dfbb6a9707ba1 SHA512 bce1af5586f3f3aca8762f77a898fcf72fb6ccf8e30447b3276b30a298702527f9e04f9ac2d05293cc565a4028493cec4d69d9f8b091bb3c8682e043199fef5a
+EBUILD busybox-9999.ebuild 10485 BLAKE2B e17f72ee9950458acd2541ddf5b6f8eb244e0f8f5d722bbeac5c767727c7ec3218aaf2ae4496e119e736bc17ef488d8ee1944e48d130c4d50e4f3e92e92143ce SHA512 fcecce559944aa1401105e1ba25d6599d8c6538b8c83d498b92b052993bd4429d41e4a4fd84d956678b7889382cdd33b255da8d09979b5392b9a643d2a236db2
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.33.1.ebuild b/sys-apps/busybox/busybox-1.33.1.ebuild
deleted file mode 100644
index 1ba499654370..000000000000
--- a/sys-apps/busybox/busybox-1.33.1.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=7
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
-	EGIT_REPO_URI="https://git.busybox.net/busybox"
-	inherit git-r3
-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"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-# TODO: Could make pkgconfig conditional on selinux? bug #782829
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )
-	virtual/libcrypt:="
-DEPEND="${COMMON_DEPEND}
-	static? (
-		virtual/libcrypt[static-libs]
-		selinux? ( sys-libs/libselinux[static-libs(+)] )
-	)
-	>=sys-kernel/linux-headers-2.6.39"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
-
-S="${WORKDIR}/${MY_P}"
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	local expr
-	while [[ $# -gt 0 ]] ; do
-		case ${flag} in
-		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
-		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
-		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
-		esac
-		sed -i -e "${expr}" .config || die
-		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-# patches go here!
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.2-bb.patch
-	# "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
-	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_2_4_MODULES #607548
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-	# triming the BSS size may be dangerous
-	busybox_config_option n FEATURE_USE_BSS_TAIL
-
-	# These cause trouble with musl.
-	if use elibc_musl; then
-		busybox_config_option n FEATURE_UTMP
-		busybox_config_option n EXTRA_COMPAT
-		busybox_config_option n FEATURE_VI_REGEX_SEARCH
-	fi
-
-	# If these are not set and we are using a busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option y SH_IS_ASH
-	busybox_config_option n HUSH
-	busybox_config_option n SH_IS_HUSH
-
-	busybox_config_option '"/run"' PID_FILE_PATH
-	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG_SANITIZE
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# glibc-2.26 and later does not ship RPC implientation
-	busybox_config_option n FEATURE_HAVE_RPC
-	busybox_config_option n FEATURE_INETD_RPC
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-
-	# bug #701512
-	emake V=1 doc
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs || die
-	doman busybox.1
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	docinto html
-	dodoc *.html
-
-	cd ../examples || die
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.33.1-r2.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
index 169995d3ca48..8fb10aebdff0 100644
--- a/sys-apps/busybox/busybox-1.33.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
@@ -5,18 +5,18 @@
 
 EAPI=7
 
-inherit flag-o-matic savedconfig toolchain-funcs
+inherit eapi8-dosym flag-o-matic savedconfig toolchain-funcs
 
 DESCRIPTION="Utilities for rescue and embedded systems"
 HOMEPAGE="https://www.busybox.net/"
 if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
+	MY_P="${P}"
 	EGIT_REPO_URI="https://git.busybox.net/busybox"
 	inherit git-r3
 else
-	MY_P=${PN}-${PV/_/-}
+	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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
@@ -26,18 +26,18 @@ REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
 # TODO: Could make pkgconfig conditional on selinux? bug #782829
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+RDEPEND="
+	virtual/libcrypt:=
+	!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )
-	virtual/libcrypt:="
-DEPEND="${COMMON_DEPEND}
+"
+DEPEND="${RDEPEND}
 	static? (
 		virtual/libcrypt[static-libs]
 		selinux? ( sys-libs/libselinux[static-libs(+)] )
 	)
-	>=sys-kernel/linux-headers-2.6.39"
+	sys-kernel/linux-headers"
 BDEPEND="virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -72,6 +72,7 @@ busybox_config_enabled() {
 # patches go here!
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	"${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
 	# "${FILESDIR}"/${P}-*.patch
 )
 
@@ -114,12 +115,14 @@ src_configure() {
 		ewarn "Could not locate user configfile, so we will save a default one"
 	fi
 
+	# setting SKIP_SELINUX skips searching for selinux at this stage. We don't
+	# need to search now in case we end up not needing it after all.
 	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
+	emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
 	# nommu forces a bunch of things off which we want on #387555
 	busybox_config_option n NOMMU
 	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
+	yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
 
 	# now turn off stuff we really don't want
 	busybox_config_option n DMALLOC
@@ -131,6 +134,10 @@ src_configure() {
 	busybox_config_option n MONOTONIC_SYSCALL
 	busybox_config_option n USE_PORTABLE_CODE
 	busybox_config_option n WERROR
+	# CONFIG_MODPROBE_SMALL=y disables depmod.c and uses a smaller one that
+	# does not support -b. Setting this to no creates slightly larger and
+	# slightly more useful modutils
+	busybox_config_option n MODPROBE_SMALL #472464
 	# triming the BSS size may be dangerous
 	busybox_config_option n FEATURE_USE_BSS_TAIL
 
@@ -245,7 +252,10 @@ src_install() {
 	if use mdev ; then
 		dodir /$(get_libdir)/mdev/
 		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf || die
+		if [[ ! "$(get_libdir)" == "lib" ]]; then
+			sed -i -e "s:/lib/:/$(get_libdir)/:g" "${ED}"/etc/mdev.conf || die #831251 - replace lib with lib64 where appropriate
+		fi
 
 		exeinto /$(get_libdir)/mdev/
 		doexe "${FILESDIR}"/mdev/*
@@ -258,22 +268,23 @@ src_install() {
 
 	# add busybox daemon's, bug #444718
 	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+		newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd
+		newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd
 	fi
 	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+		newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd
+		newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd
 	fi
 	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+		newconfd "${FILESDIR}"/klogd.confd busybox-klogd
+		newinitd "${FILESDIR}"/klogd.initd busybox-klogd
 	fi
 	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+		newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog
+		newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
 	fi
 	if busybox_config_enabled UDHCPC; then
+		sed -i 's:$((metric++)):$metric; metric=$((metric + 1)):' examples/udhcp/simple.script || die #801535
 		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
 		exeinto "${path%/*}"
 		newexe examples/udhcp/simple.script "${path##*/}"
@@ -282,13 +293,22 @@ src_install() {
 		insinto /etc
 		doins examples/udhcp/udhcpd.conf
 	fi
+	if busybox_config_enabled ASH && ! use make-symlinks; then
+		dosym8 -r /bin/busybox /bin/ash
+	fi
+	if busybox_config_enabled CROND; then
+		newconfd "${FILESDIR}"/crond.confd busybox-crond
+		newinitd "${FILESDIR}"/crond.initd busybox-crond
+	fi
 
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
+	rm _install/bin/busybox || die
 	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
+	mkdir -p _install/usr/bin || die
+	if [[ ! -e _install/usr/bin/env ]]; then
+		ln -s /bin/env _install/usr/bin/env || die
+	fi
 	tar cf busybox-links.tar -C _install . || : #;die
 	insinto /usr/share/${PN}
 	use make-symlinks && doins busybox-links.tar
@@ -307,17 +327,12 @@ src_install() {
 	cd ../examples || die
 	docinto examples
 	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+
+	cd ../networking || die
+	dodoc httpd_indexcgi.c httpd_post_upload.cgi
 }
 
 pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
 	if use make-symlinks ; then
 		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
 	fi
@@ -330,7 +345,7 @@ pkg_postinst() {
 		cd "${T}" || die
 		mkdir _install
 		tar xf busybox-links.tar -C _install || die
-		false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+		echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
 	fi
 
 	if use sep-usr ; then
diff --git a/sys-apps/busybox/busybox-1.32.1-r1.ebuild b/sys-apps/busybox/busybox-1.35.0-r1.ebuild
index 962ff5a9bfeb..76d06dcb9b29 100644
--- a/sys-apps/busybox/busybox-1.32.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.35.0-r1.ebuild
@@ -5,18 +5,19 @@
 
 EAPI=7
 
-inherit flag-o-matic savedconfig toolchain-funcs
+inherit eapi8-dosym flag-o-matic savedconfig toolchain-funcs
 
 DESCRIPTION="Utilities for rescue and embedded systems"
 HOMEPAGE="https://www.busybox.net/"
 if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
+	MY_P="${P}"
 	EGIT_REPO_URI="https://git.busybox.net/busybox"
 	inherit git-r3
 else
-	MY_P=${PN}-${PV/_/-}
+	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"
+	# unstable release - no keywords
+	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
@@ -26,18 +27,18 @@ REQUIRED_USE="pam? ( !static )"
 RESTRICT="test"
 
 # TODO: Could make pkgconfig conditional on selinux? bug #782829
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+RDEPEND="
+	virtual/libcrypt:=
+	!static? ( selinux? ( sys-libs/libselinux ) )
 	pam? ( sys-libs/pam )
-	virtual/libcrypt:="
-DEPEND="${COMMON_DEPEND}
+"
+DEPEND="${RDEPEND}
 	static? (
 		virtual/libcrypt[static-libs]
 		selinux? ( sys-libs/libselinux[static-libs(+)] )
 	)
-	>=sys-kernel/linux-headers-2.6.39"
+	sys-kernel/linux-headers"
 BDEPEND="virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -72,6 +73,7 @@ busybox_config_enabled() {
 # patches go here!
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	"${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
 	# "${FILESDIR}"/${P}-*.patch
 )
 
@@ -114,12 +116,14 @@ src_configure() {
 		ewarn "Could not locate user configfile, so we will save a default one"
 	fi
 
+	# setting SKIP_SELINUX skips searching for selinux at this stage. We don't
+	# need to search now in case we end up not needing it after all.
 	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
+	emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
 	# nommu forces a bunch of things off which we want on #387555
 	busybox_config_option n NOMMU
 	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
+	yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
 
 	# now turn off stuff we really don't want
 	busybox_config_option n DMALLOC
@@ -131,6 +135,10 @@ src_configure() {
 	busybox_config_option n MONOTONIC_SYSCALL
 	busybox_config_option n USE_PORTABLE_CODE
 	busybox_config_option n WERROR
+	# CONFIG_MODPROBE_SMALL=y disables depmod.c and uses a smaller one that
+	# does not support -b. Setting this to no creates slightly larger and
+	# slightly more useful modutils
+	busybox_config_option n MODPROBE_SMALL #472464
 	# triming the BSS size may be dangerous
 	busybox_config_option n FEATURE_USE_BSS_TAIL
 
@@ -141,6 +149,14 @@ src_configure() {
 		busybox_config_option n FEATURE_VI_REGEX_SEARCH
 	fi
 
+	# Disable standalone shell mode when using make-symlinks, else Busybox calls its
+	# applets by default without looking up in PATH.
+	# This also enables users to disable a builtin by deleting the corresponding symlink.
+	if use make-symlinks; then
+		busybox_config_option n FEATURE_PREFER_APPLETS
+		busybox_config_option n FEATURE_SH_STANDALONE
+	fi
+
 	# If these are not set and we are using a busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
@@ -237,7 +253,10 @@ src_install() {
 	if use mdev ; then
 		dodir /$(get_libdir)/mdev/
 		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf || die
+		if [[ ! "$(get_libdir)" == "lib" ]]; then
+			sed -i -e "s:/lib/:/$(get_libdir)/:g" "${ED}"/etc/mdev.conf || die #831251 - replace lib with lib64 where appropriate
+		fi
 
 		exeinto /$(get_libdir)/mdev/
 		doexe "${FILESDIR}"/mdev/*
@@ -250,22 +269,23 @@ src_install() {
 
 	# add busybox daemon's, bug #444718
 	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+		newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd
+		newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd
 	fi
 	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+		newconfd "${FILESDIR}"/syslogd.confd busybox-syslogd
+		newinitd "${FILESDIR}"/syslogd.initd busybox-syslogd
 	fi
 	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+		newconfd "${FILESDIR}"/klogd.confd busybox-klogd
+		newinitd "${FILESDIR}"/klogd.initd busybox-klogd
 	fi
 	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+		newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog
+		newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
 	fi
 	if busybox_config_enabled UDHCPC; then
+		sed -i 's:$((metric++)):$metric; metric=$((metric + 1)):' examples/udhcp/simple.script || die #801535
 		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
 		exeinto "${path%/*}"
 		newexe examples/udhcp/simple.script "${path##*/}"
@@ -274,13 +294,22 @@ src_install() {
 		insinto /etc
 		doins examples/udhcp/udhcpd.conf
 	fi
+	if busybox_config_enabled ASH && ! use make-symlinks; then
+		dosym8 -r /bin/busybox /bin/ash
+	fi
+	if busybox_config_enabled CROND; then
+		newconfd "${FILESDIR}"/crond.confd busybox-crond
+		newinitd "${FILESDIR}"/crond.initd busybox-crond
+	fi
 
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
+	rm _install/bin/busybox || die
 	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
+	mkdir -p _install/usr/bin || die
+	if [[ ! -e _install/usr/bin/env ]]; then
+		ln -s /bin/env _install/usr/bin/env || die
+	fi
 	tar cf busybox-links.tar -C _install . || : #;die
 	insinto /usr/share/${PN}
 	use make-symlinks && doins busybox-links.tar
@@ -299,17 +328,12 @@ src_install() {
 	cd ../examples || die
 	docinto examples
 	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+
+	cd ../networking || die
+	dodoc httpd_indexcgi.c httpd_post_upload.cgi
 }
 
 pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
 	if use make-symlinks ; then
 		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
 	fi
@@ -322,7 +346,7 @@ pkg_postinst() {
 		cd "${T}" || die
 		mkdir _install
 		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+		echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
 	fi
 
 	if use sep-usr ; then
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 490896632feb..5e059850212f 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -5,7 +5,7 @@
 
 EAPI=7
 
-inherit flag-o-matic savedconfig toolchain-funcs
+inherit eapi8-dosym flag-o-matic savedconfig toolchain-funcs
 
 DESCRIPTION="Utilities for rescue and embedded systems"
 HOMEPAGE="https://www.busybox.net/"
@@ -72,6 +72,8 @@ busybox_config_enabled() {
 # patches go here!
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	"${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
+	"${FILESDIR}"/${PN}-1.36.0-fix-wx-sections.patch
 	# "${FILESDIR}"/${P}-*.patch
 )
 
@@ -114,12 +116,14 @@ src_configure() {
 		ewarn "Could not locate user configfile, so we will save a default one"
 	fi
 
+	# setting SKIP_SELINUX skips searching for selinux at this stage. We don't
+	# need to search now in case we end up not needing it after all.
 	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
+	emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
 	# nommu forces a bunch of things off which we want on #387555
 	busybox_config_option n NOMMU
 	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
+	yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null #620918
 
 	# now turn off stuff we really don't want
 	busybox_config_option n DMALLOC
@@ -131,6 +135,10 @@ src_configure() {
 	busybox_config_option n MONOTONIC_SYSCALL
 	busybox_config_option n USE_PORTABLE_CODE
 	busybox_config_option n WERROR
+	# CONFIG_MODPROBE_SMALL=y disables depmod.c and uses a smaller one that
+	# does not support -b. Setting this to no creates slightly larger and
+	# slightly more useful modutils
+	busybox_config_option n MODPROBE_SMALL #472464
 	# triming the BSS size may be dangerous
 	busybox_config_option n FEATURE_USE_BSS_TAIL
 
@@ -245,7 +253,10 @@ src_install() {
 	if use mdev ; then
 		dodir /$(get_libdir)/mdev/
 		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf || die
+		if [[ ! "$(get_libdir)" == "lib" ]]; then
+			sed -i -e "s:/lib/:/$(get_libdir)/:g" "${ED}"/etc/mdev.conf || die #831251 - replace lib with lib64 where appropriate
+		fi
 
 		exeinto /$(get_libdir)/mdev/
 		doexe "${FILESDIR}"/mdev/*
@@ -274,6 +285,7 @@ src_install() {
 		newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
 	fi
 	if busybox_config_enabled UDHCPC; then
+		sed -i 's:$((metric++)):$metric; metric=$((metric + 1)):' examples/udhcp/simple.script || die #801535
 		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
 		exeinto "${path%/*}"
 		newexe examples/udhcp/simple.script "${path##*/}"
@@ -282,13 +294,22 @@ src_install() {
 		insinto /etc
 		doins examples/udhcp/udhcpd.conf
 	fi
+	if busybox_config_enabled ASH && ! use make-symlinks; then
+		dosym8 -r /bin/busybox /bin/ash
+	fi
+	if busybox_config_enabled CROND; then
+		newconfd "${FILESDIR}"/crond.confd busybox-crond
+		newinitd "${FILESDIR}"/crond.initd busybox-crond
+	fi
 
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install
 	rm _install/bin/busybox || die
 	# for compatibility, provide /usr/bin/env
 	mkdir -p _install/usr/bin || die
-	ln -s /bin/env _install/usr/bin/env || die
+	if [[ ! -e _install/usr/bin/env ]]; then
+		ln -s /bin/env _install/usr/bin/env || die
+	fi
 	tar cf busybox-links.tar -C _install . || : #;die
 	insinto /usr/share/${PN}
 	use make-symlinks && doins busybox-links.tar
@@ -307,6 +328,9 @@ src_install() {
 	cd ../examples || die
 	docinto examples
 	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+
+	cd ../networking || die
+	dodoc httpd_indexcgi.c httpd_post_upload.cgi
 }
 
 pkg_preinst() {
diff --git a/sys-apps/busybox/files/busybox-1.34.1-skip-selinux-search.patch b/sys-apps/busybox/files/busybox-1.34.1-skip-selinux-search.patch
new file mode 100644
index 000000000000..6fe043bf39e4
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.34.1-skip-selinux-search.patch
@@ -0,0 +1,21 @@
+Setting SKIP_SELINUX skips searching for selinux.  The current ebuild calls
+make 3 times.  The first 2 times we don't need to search for selinux packages
+because we might end up not needing them and we get useless warnings.
+
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -176,12 +176,14 @@
+ LDLIBS += pam pam_misc
+ endif
+ 
++ifneq ($(SKIP_SELINUX),y)
+ ifeq ($(CONFIG_SELINUX),y)
+ SELINUX_PC_MODULES = libselinux libsepol
+ $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
+ CPPFLAGS += $(SELINUX_CFLAGS)
+ LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ endif
++endif
+ 
+ ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
+ ifneq (,$(findstring linux,$(shell $(CC) $(CFLAGS) -dumpmachine)))
diff --git a/sys-apps/busybox/files/busybox-1.36.0-fix-wx-sections.patch b/sys-apps/busybox/files/busybox-1.36.0-fix-wx-sections.patch
new file mode 100644
index 000000000000..16118cf9b95f
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.36.0-fix-wx-sections.patch
@@ -0,0 +1,74 @@
+ * QA Notice: The following files contain writable and executable sections
+ *  Files with such sections will not work properly (or at all!) on some
+ *  architectures/operating systems.  A bug should be filed at
+ *  https://bugs.gentoo.org/ to make sure the issue is fixed.
+ *  For more information, see:
+ *
+ *    https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
+ *
+ *  Please include the following list of files in your report:
+ *  Note: Bugs should be filed for the respective maintainers
+ *  of the package in question and not hardened@gentoo.org.
+ * RWX --- --- bin/busybox
+
+$ scanelf -qeR .
+RWX --- ---  ./busybox
+RWX --- ---  ./busybox_unstripped
+!WX --- ---  ./libbb/hash_md5_sha_x86-64_shaNI.o
+!WX --- ---  ./libbb/hash_md5_sha_x86-64.o
+!WX --- ---  ./libbb/hash_md5_sha_x86-32_shaNI.o
+!WX --- ---  ./libbb/hash_md5_sha256_x86-64_shaNI.o
+!WX --- ---  ./libbb/hash_md5_sha256_x86-32_shaNI.o
+
+Try to fix this QA issue
+
+--- a/libbb/hash_md5_sha256_x86-32_shaNI.S
++++ b/libbb/hash_md5_sha256_x86-32_shaNI.S
+@@ -278,4 +278,7 @@
+ PSHUFFLE_BSWAP32_FLIP_MASK:
+ 	.octa	0x0c0d0e0f08090a0b0405060700010203
+ 
++#if defined(__linux__) && defined(__ELF__)
++	.section	.note.GNU-stack, "", %progbits
++#endif
+ #endif
+--- a/libbb/hash_md5_sha256_x86-64_shaNI.S
++++ b/libbb/hash_md5_sha256_x86-64_shaNI.S
+@@ -284,4 +284,7 @@
+ PSHUFFLE_BSWAP32_FLIP_MASK:
+ 	.octa	0x0c0d0e0f08090a0b0405060700010203
+ 
++#if defined(__linux__) && defined(__ELF__)
++	.section	.note.GNU-stack, "", %progbits
++#endif
+ #endif
+--- a/libbb/hash_md5_sha_x86-32_shaNI.S
++++ b/libbb/hash_md5_sha_x86-32_shaNI.S
+@@ -228,4 +228,7 @@
+ PSHUFFLE_BYTE_FLIP_MASK:
+ 	.octa	0x000102030405060708090a0b0c0d0e0f
+ 
++#if defined(__linux__) && defined(__ELF__)
++	.section	.note.GNU-stack, "", %progbits
++#endif
+ #endif
+--- a/libbb/hash_md5_sha_x86-64.S
++++ b/libbb/hash_md5_sha_x86-64.S
+@@ -1483,4 +1483,7 @@
+ 	.long	0x8F1BBCDC
+ 	.long	0xCA62C1D6
+ 
++#if defined(__linux__) && defined(__ELF__)
++	.section	.note.GNU-stack, "", %progbits
++#endif
+ #endif
+--- a/libbb/hash_md5_sha_x86-64_shaNI.S
++++ b/libbb/hash_md5_sha_x86-64_shaNI.S
+@@ -226,4 +226,7 @@
+ PSHUFFLE_BYTE_FLIP_MASK:
+ 	.octa	0x000102030405060708090a0b0c0d0e0f
+ 
++#if defined(__linux__) && defined(__ELF__)
++	.section	.note.GNU-stack, "", %progbits
++#endif
+ #endif
diff --git a/sys-apps/busybox/files/crond.confd b/sys-apps/busybox/files/crond.confd
new file mode 100644
index 000000000000..707366252913
--- /dev/null
+++ b/sys-apps/busybox/files/crond.confd
@@ -0,0 +1,2 @@
+# Config file for /etc/init.d/busybox-crond
+CRONDARGS=
diff --git a/sys-apps/busybox/files/crond.initd b/sys-apps/busybox/files/crond.initd
new file mode 100644
index 000000000000..e098b14714a4
--- /dev/null
+++ b/sys-apps/busybox/files/crond.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/bin/busybox crond"
+command_args="${CRONDARGS}"
+pidfile="/run/crond.pid"
+
+depend() {
+	need clock logger
+	provide cron
+}
diff --git a/sys-apps/busybox/files/mdev/dvbdev b/sys-apps/busybox/files/mdev/dvbdev
index f0186c176cd8..971b0efc9096 100644
--- a/sys-apps/busybox/files/mdev/dvbdev
+++ b/sys-apps/busybox/files/mdev/dvbdev
@@ -8,11 +8,11 @@ DVB_DEV=${MDEV#*.}
 
 case "$ACTION" in
 	add|"")
-		mkdir -p dvb/adapter${N}
-		mv ${MDEV} dvb/adapter${N}/${DVB_DEV}
+		mkdir -p "dvb/adapter${N}"
+		mv "${MDEV}" "dvb/adapter${N}/${DVB_DEV}"
 		;;
 	remove)
-		rm -f dvb/adapter${N}/${DVB_DEV}
-		rmdir dvb/adapter${N} 2>/dev/null
+		rm -f "dvb/adapter${N}/${DVB_DEV}"
+		rmdir "dvb/adapter${N}" 2>/dev/null
 		rmdir dvb/ 2>/dev/null
 esac
diff --git a/sys-apps/busybox/files/mdev/ide_links b/sys-apps/busybox/files/mdev/ide_links
index be0c95aa9c0e..dfb7c9cb46d5 100644
--- a/sys-apps/busybox/files/mdev/ide_links
+++ b/sys-apps/busybox/files/mdev/ide_links
@@ -1,23 +1,23 @@
 #!/bin/sh
 
-[ -f /proc/ide/$MDEV/media ] || exit
+[ -f /proc/ide/"${MDEV}"/media ] || exit
 
-media=`cat /proc/ide/$MDEV/media`
-for i in $media $media[0-9]* ; do
-	if [ "`readlink $i 2>/dev/null`" = $MDEV ] ; then
-		LINK=$i
+media=$(cat /proc/ide/"${MDEV}"/media)
+for i in "${media}" "${media}"[0-9]* ; do
+	if [ "$(readlink "$i" 2>/dev/null)" = "${MDEV}" ] ; then
+		LINK="$i"
 		break
 	fi
 done
 
 # link exist, remove if necessary and exit
-if [ "$LINK" ] ; then
-	[ "$ACTION" = remove ] && rm $LINK
+if [ "${LINK}" ] ; then
+	[ "${ACTION}" = remove ] && rm "${LINK}"
 	exit
 fi
 
 # create a link
-num=`ls $media[0-9]* 2>/dev/null | wc -l`
-ln -sf $MDEV "$media`echo $num`"
-[ -e "$media" ] || ln -sf $MDEV "$media"
+num=$(ls "${media}"[0-9]* 2>/dev/null | wc -l)
+ln -sf "${MDEV}" "${media}${num}"
+[ -e "${media}" ] || ln -sf "${MDEV}" "${media}"
 
diff --git a/sys-apps/busybox/files/mdev/usbdev b/sys-apps/busybox/files/mdev/usbdev
index ea5b9155736c..eda3825df287 100644
--- a/sys-apps/busybox/files/mdev/usbdev
+++ b/sys-apps/busybox/files/mdev/usbdev
@@ -5,7 +5,7 @@
 
 # add zeros to device or bus
 add_zeros () {
-	case "$(echo $1 | wc -L)" in
+	case "$(echo "$1" | wc -L)" in
 		1)	echo "00$1" ;;
 		2)	echo "0$1" ;;
 		*)	echo "$1"
@@ -15,48 +15,48 @@ add_zeros () {
 
 
 # bus and device dirs in /sys
-USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/')
-USB_PATH=$(find /sys/devices -type d -name "$USB_PATH")
-USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/')
+USB_PATH=$(echo "${MDEV}" | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/')
+USB_PATH=$(find /sys/devices -type d -name "${USB_PATH}")
+USB_DEV_DIR=$(echo "${MDEV}" | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/')
 
 # dir names in /dev
-BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/'))
-USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/'))
+BUS=$(add_zeros "$(echo "${MDEV}" | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/')")
+USB_DEV=$(add_zeros "$(echo "${MDEV}" | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/')")
 
 
 # try to load the proper driver for usb devices
-case "$ACTION" in
+case "${ACTION}" in
 	add|"")
 		# load usb bus driver
-		for i in $USB_PATH/*/modalias ; do
-			modprobe `cat $i` 2>/dev/null
+		for i in "${USB_PATH}"/*/modalias ; do
+			modprobe "$(cat "$i")" 2>/dev/null
 		done
 		# load usb device driver if existent
-		if [ -d $USB_PATH/$USB_DEV_DIR ]; then
-			for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do
-				modprobe `cat $i` 2>/dev/null
+		if [ -d "${USB_PATH}/${USB_DEV_DIR}" ]; then
+			for i in "${USB_PATH}/${USB_DEV_DIR}"/*/modalias ; do
+				modprobe "$(cat "$i")" 2>/dev/null
 			done
 		fi
 		# move usb device file
-		mkdir -p bus/usb/$BUS
-		mv $MDEV bus/usb/$BUS/$USB_DEV
+		mkdir -p "bus/usb/${BUS}"
+		mv "${MDEV}" "bus/usb/${BUS}/${USB_DEV}"
 		;;
 	remove)
 		# unload device driver, if device dir is existent
-		if [ -d $USB_PATH/$USB_DEV_DIR ]; then
-			for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do
-				modprobe -r `cat $i` 2>/dev/null
+		if [ -d "${USB_PATH}/${USB_DEV_DIR}" ]; then
+			for i in "${USB_PATH}/${USB_DEV_DIR}"/*/modalias ; do
+				modprobe -r "$(cat "$i")" 2>/dev/null
 		done
 		fi
 		# unload usb bus driver. Does this make sense?
 		# what happens, if two usb devices are plugged in
 		# and one is removed?
-		for i in $USB_PATH/*/modalias ; do
-			modprobe -r `cat $i` 2>/dev/null
+		for i in "${USB_PATH}"/*/modalias ; do
+			modprobe -r "$(cat "$i")" 2>/dev/null
 		done
 		# remove device file and possible empty dirs
-		rm -f bus/usb/$BUS/$USB_DEV
-		rmdir bus/usb/$BUS/ 2>/dev/null
+		rm -f "bus/usb/${BUS}/${USB_DEV}"
+		rmdir "bus/usb/${BUS}/" 2>/dev/null
 		rmdir bus/usb/ 2>/dev/null
 		rmdir bus/ 2>/dev/null
 esac
diff --git a/sys-apps/busybox/files/mdev/usbdisk_link b/sys-apps/busybox/files/mdev/usbdisk_link
index 6bb069243f4c..e42cc8bc9085 100644
--- a/sys-apps/busybox/files/mdev/usbdisk_link
+++ b/sys-apps/busybox/files/mdev/usbdisk_link
@@ -4,31 +4,35 @@
 
 current=$(readlink usbdisk)
 
-if [ "$current" = "$MDEV" ] && [ "$ACTION" = "remove" ]; then
+if [ "${current}" = "${MDEV}" ] && [ "${ACTION}" = "remove" ]; then
 	rm -f usbdisk usba1 
 fi
-[ -n "$current" ] && exit
+[ -n "${current}" ] && exit
 
-if [ -e /sys/block/$MDEV ]; then
-	SYSDEV=$(readlink -f /sys/block/$MDEV/device)
+if [ -e /sys/block/"${MDEV}" ]; then
+	SYSDEV=$(readlink -f /sys/block/"${MDEV}"/device)
 	# if /sys device path contains '/usb[0-9]' then we assume its usb
 	# also, if it's a usb without partitions we require FAT
-	if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
+	if [ "${SYSDEV##*/usb[0-9]}" != "${SYSDEV}" ]; then
 		# do not create link if there is not FAT
-		dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0
+		dd if=/dev/"${MDEV}" bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0
 
-		ln -sf $MDEV usbdisk
+		ln -sf "${MDEV}" usbdisk
 		# keep this for compat. people have it in fstab
-		ln -sf $MDEV usba1
+		ln -sf "${MDEV}" usba1
 	fi
 
-elif [ -e /sys/block/*/$MDEV ] ; then
-	PARENT=$(dirname /sys/block/*/$MDEV)
-	SYSDEV=$(readlink -f $PARENT/device)
-	if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
-		ln -sf $MDEV usbdisk
-		# keep this for compat. people have it in fstab
-		ln -sf $MDEV usba1
-	fi
+else
+	for i in /sys/block/*/"${MDEV}"; do
+		if [ -e "$i" ]; then
+			PARENT=$(dirname "$i")
+			SYSDEV=$(readlink -f "${PARENT}"/device)
+			if [ "${SYSDEV##*/usb[0-9]}" != "${SYSDEV}" ]; then
+				ln -sf "${MDEV}" usbdisk
+				# keep this for compat. people have it in fstab
+				ln -sf "${MDEV}" usba1
+			fi
+		fi
+	done
 fi
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index a37c34cb9336..6ae38decfef7 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,6 @@
 DIST checkpolicy-3.3.tar.gz 69286 BLAKE2B f22cb1b0dae5a89c0abb500c2f091beda7960493bd0dc3b9cb5bc8d2d08d507870e5db46f53ad87d0ddea5e3bbdb6c721a5c5e6824b37f554049000392af6a6d SHA512 40e7ccd804aa19f229eb76bdaeb79c87ed19004ac7b91674ecfb92d543573dc26f9d456ea25ed1e0ef8e1a69538e41c68b386a0743023f3ea83aa4350fc3ce30
 DIST checkpolicy-3.4.tar.gz 69870 BLAKE2B 891033b1d9d50a3738bb779d014d2f04d6cc5450c6f84ed43246c95b0c808f347d65c0e51c7254041e13b1c555a7e1de5092abb4fc12fabb109be7ddaa090829 SHA512 e7f7a4e987af473fd7cda0e47539061a8cb2e65a6b930f4736c538eb319129b260a3f03d2f50863e73a275ee3d58c441c33f95c80ea2bff6157e37226be54b92
 EBUILD checkpolicy-3.3.ebuild 1017 BLAKE2B 0e0e91e52e8d29d930d79dd06315d5a541084fccf921fb0f4038a298d699584a21e394e8a02e4e557b9e2dd6292a0ddd854138e8e7bf2525c0563f2a64464a6a SHA512 d020aa3670ff300a88b881d03882fac22b8c52209c751beac90323ff729c90f48ee063476f68048f1ebd7ddf75d1a31017e89321fe615877f0ec6f61e48301f2
-EBUILD checkpolicy-3.4.ebuild 1093 BLAKE2B d8f9c5f8d4441478ba78fcfe77661757a48a0f5f75a155a7d14a281f084afcb49065d043c185d333a49b12aeb365da118f5686a97e66c360e27e8ce47e613bac SHA512 163991ca5b78ff9a26523cbad0f16584bfd40901f8b0c1f6bc44146be23f42caf5cf5dad854ffb78d7f2534279bc8a6f85a057848a2eb5fc9924c3b641cb860b
+EBUILD checkpolicy-3.4.ebuild 1091 BLAKE2B d4cd25b54de0d6ca606fe011eb2932d01cfc0ec6be055b28646620d51bcf3e4793cf324b6298a86b34d4efa4b828992e63e6f37ad6a9f4d349104c636807f6cf SHA512 806279ef323c755e4297e6bf0e1e7692f97ab848f9e7070f38e78ebd1db0ad9e58cd43a73ef2e7b0a4703f1e4210f279383fd4a64b029b34b65e4645844f2ac1
 EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B d8f9c5f8d4441478ba78fcfe77661757a48a0f5f75a155a7d14a281f084afcb49065d043c185d333a49b12aeb365da118f5686a97e66c360e27e8ce47e613bac SHA512 163991ca5b78ff9a26523cbad0f16584bfd40901f8b0c1f6bc44146be23f42caf5cf5dad854ffb78d7f2534279bc8a6f85a057848a2eb5fc9924c3b641cb860b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sys-apps/checkpolicy/checkpolicy-3.4.ebuild b/sys-apps/checkpolicy/checkpolicy-3.4.ebuild
index b699f09c01de..c4082d71a7d4 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.4.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 50d6e522300b..1de992b86526 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,3 +1,5 @@
 DIST dmidecode-3.3.tar.xz 56372 BLAKE2B 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e SHA512 dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
+DIST dmidecode-3.4.tar.xz 61420 BLAKE2B f9f0429c5128692c2d1d560580552285ea900c1c9ef6f68f0e2133ae1ef05b85a943e882f915d3ef969b7a7e3f3f6bbc4ec391e7bd3d98092976ddbf02421c49 SHA512 62990b6159e5a7c8688d37e44957e7948391d2c6afeabaa4514ba9dad2d08b020297676e2dbbfcb6471efc6fb6f3682750422931a953f78f358bb3dd3745e95b
 EBUILD dmidecode-3.3.ebuild 1129 BLAKE2B 2250e46392331311e6470b694bcba68479efdbe0a125f95bea2a77a9dd95122046519c8c3c4d10593c89a69af984a39895ed52cdc07844421b6a3b8fbc68c099 SHA512 c91ebabbafa40f364017f37de15ec862056b62647183dcaefe2a2ff78fae8e8c649d5c715a5f5faf2ca268c98d27805a8c12c23da3cae80b7430497e704dcbce
+EBUILD dmidecode-3.4.ebuild 1241 BLAKE2B 61a6a2150608920cbabad3cb5fda62649eaf8c28fb7a165676bb4a8f7c34f059695cac0db4ca468dd70b7bd599d517504ac3306b42873ca06f7b6b2007f74c5c SHA512 7a442c214f069cc15da17ff7dc2a7308d52a4a5d5cece889fd5d7327e54517c85a54420d1c24f16298759e5d6d9e0e591f8c97fd75a0f9762fbc2807bd0423f0
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/dmidecode/dmidecode-3.4.ebuild b/sys-apps/dmidecode/dmidecode-3.4.ebuild
new file mode 100644
index 000000000000..9cff88ef840e
--- /dev/null
+++ b/sys-apps/dmidecode/dmidecode-3.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream often give "recommended patches" at https://www.nongnu.org/dmidecode/
+# Check regularly after releases!
+inherit toolchain-funcs
+
+DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
+HOMEPAGE="https://www.nongnu.org/dmidecode/"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~x86-solaris"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^docdir/s:dmidecode:${PF}:" \
+		-e '/^PROGRAMS !=/d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "dmidecode needs root privileges to read /dev/xsvc"
+		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
+		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
+		einfo "information without requiring root privileges."
+	fi
+}
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 1993eab77665..698bc4259a8f 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -4,4 +4,4 @@ DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11
 EBUILD fwupd-efi-1.1.ebuild 1067 BLAKE2B 2dd3c612da1d7fa6603aa6df5589c6d04f3d73a2256952c991114e93842bb0a9f020843416a9fecd44af2361b62a76c91a8dcec8abf97c55717bd58a26a49694 SHA512 014fb50779f0f0dced8f8a6affe6cc4b12171f1e24562f6c27539e458e9ca6396a59e9db18ac1e320cfd05d1a413674be3099b6331087e13ac2b82271ae0bc48
 EBUILD fwupd-efi-1.2.ebuild 1039 BLAKE2B bbf5723c4961a0b883b8d6f48a594c665167d959fd0515bb776d9edf8de3ff48301d1ec037e937dee472f03f36c74e4c57b9ebebd9767190ab033938bd2dbe23 SHA512 7a202e3dc391e038e8083be7ee9c80043786247c9cde956019197359fa5511ed6fe9cd0fa8ca2991dea8d146b2249a4676c0923e7257806ae40299899c114a4c
 EBUILD fwupd-efi-1.3.ebuild 1038 BLAKE2B 3109f7169d322bddd664356c95b22af57d85457ed232c5504ae1be5a3f045fc8ff084e4e2387ad838eb95b38b4a9aa64f78c483e3847dcb4aece7be7b29d68a4 SHA512 ec5da400eb41424ad363f873285b97f4e5dc9959e86e904b6041fbad20ecaf722a81bae9fe0b1ee149e34d975d27af54e1db181a87449ccaed31b3536e2fbd37
-MISC metadata.xml 311 BLAKE2B 937939dd70ed009d57242d3ae652a57c240a04a6f4f12166c1a1adc1ae314153298d78285510de9e0c2af0b6ae4d621c7a711ed4e09a7cf86a74abfb682eae80 SHA512 6b1a5f185b846742ddd389596ad0d8a471cb422c63021e71aae2c06cab257135014edc5a3a6f7e14389193a7cb2dcf5887192dd451df6abf69d0e6850a3c5ba6
+MISC metadata.xml 502 BLAKE2B 37525a0056ad72eab2b2b7b15436181a8581075053704012670e1f0434c8af74bd0780f16f31fa5cd2c8836bc2e4d8f55dfd5a77140be83ebffda5ca9e1a1382 SHA512 70ccf403ddb8e4d33ee9cc6ba438583d42ab313784c3251919b74a6596c4e3593263a6400513605c1004bc0d3ebb1677febc31449096b825f688ed1cc7052c31
diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml
index 771d90fee052..1bc45134a1ea 100644
--- a/sys-apps/fwupd-efi/metadata.xml
+++ b/sys-apps/fwupd-efi/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/fwupd/fwupd-efi/issues</bugs-to>
 		<remote-id type="github">fwupd/fwupd-efi</remote-id>
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 79062eef803f..24ce40ef54ef 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -7,4 +7,4 @@ EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9
 EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
 EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
 EBUILD fwupd-1.8.1.ebuild 4922 BLAKE2B 99f3888b9c3c2ce2f793f14ccfdf7a4ce725a6c9a026cf6cb9090aaad0e800d2524932fbfccd92b6f9c1753d06aa0de010beed72dec663fb384edc376accd831 SHA512 f333e07a813fd0e25d9b48731454f450f8467e60db6732a40855c4934e9e1354da4e6f6bbab6fb0991d3502445c694b329d40eabd4ce7104a27d5c54ab84a213
-MISC metadata.xml 1414 BLAKE2B 9e4efd8c10bafdd2428b579b7eb7c51d594c4e2b42560cc2022545703043bd8d31367a4fb6178a2d2b69e195a5a263fd3dcb3fabee58132304bfe4cb2bcf1ecb SHA512 4217eaee64415babf6a29eab759ead986a075c94318b58ee8a8a947c57430a691bbae34c10120289049a9a2caebd0754258d2b0fee286d3e011b332f5658b1ac
+MISC metadata.xml 1527 BLAKE2B 0cbeb805ede86d77bbd736349c84de642534059b2c90d938bd68c3caf0ff90257f3579d20eb38313f10a99f72780accd242601d778fd73386a727cad362a9f48 SHA512 9a541ecead0fc13a5cd78bcbcda425b9b2f4029dd921f01dc0ab1d2055ffcb0690d1fefdfbb98c68ef168c150178f75d085eeedf0699d35fd440d0b4d730a8d2
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 423c7f74be1b..748aacf79969 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 	<use>
 		<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
 		<flag name="amt">Build and install Intel AMT plugin</flag>
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 394f383ca5b2..bdd9f246e9f5 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,6 +1,4 @@
 AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f1992c4bb8618a0ed5432c7675eb653374b25417b2b21c8fc2ec0b0860303e054fb0dc71f880941712e6230ddb029358 SHA512 590b6e7c5b16762abffe68767f255414a56f7fbd691a47837a93b288bde5210a3ab4addf93725c313134c48e6d6bc69701ad3742455f48de793412616be51df3
-DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
-EBUILD gptfdisk-1.0.8-r1.ebuild 1225 BLAKE2B 2f0960a54787e83b4f4cdef9b33ea0bafac5423f80c4db6e0a6fb2bbcc898b0cb5bdb1054769a92601b7ff2ae7a1974554ce89793242096f29d8596e55d12a0d SHA512 5d24033c201ac8f3fa66c0137e2de032fa2cafdddfa3ea740c04f651b268e59541de831bdd84f191397ca2ed395338bc33ed6fcb2c91430c8f27c9b00d3831b5
-EBUILD gptfdisk-1.0.9-r1.ebuild 1294 BLAKE2B 9d2e55ba094c6ad72cbebf6dbec62362b7bb52d97fef07630431072612b81eb2f88544c5eff11381414ad5e4eebf6118f80e3f043aee8a401055c991369d613d SHA512 99325ad00459979e59c1451110b50213edbb8ead7fb0c3675a304192273c994dc3e347a78514adb02bdf368307f87946df9c38ab6bc106eb57bef9e69f416c1f
-MISC metadata.xml 251 BLAKE2B b8bc44bb2f871b081084b3fb8c2e6e21117ead330c29676827bb826d45336e245550e9cf4641bb82aecb4730dbc7aca2aeaa893d348856be1fec24e33d112564 SHA512 c06acf5ad3f44c17b239560351b5ab60a23e5d834e84ce84be90aa980e1230efe0817df5a821db9091806dcb0d774e472f5c74bf36c014826e6c387c88f485c4
+EBUILD gptfdisk-1.0.9-r1.ebuild 1287 BLAKE2B 9a46d6625eb48a72b7e4882d8ff08d5a8525f7cd9884e2b5ecaa43c13e4295a9570894d857b1b2dc5cdc3a8128de2d3439a216b0e35c1b8c08e02c297cb07713 SHA512 2083c0cf8325732699c6703545089768934f1221fc5ec93b4996e1c973a9fe6c113aef9665a2b7942d0ecefe4c907dfe3a40c04b6cec720a1ec41235c89df5d3
+MISC metadata.xml 324 BLAKE2B 71325b739cb7e216be64dfff099ebf3a3f24d8a714ce59838780b6944a65f7d9abdb9b0afb43c617364071778768a7d90da9ef8c7eb4c3bc0cd6b5dc9e04c773 SHA512 ad7457ef87228bef7db385c72bee2c9cf1f913cf261641582a57e4b72c05e7106ad39092c55e2aae1e4d92f86a0bf6f4537dd7de9fdd6e1dc64677b36df4a273
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
deleted file mode 100644
index bf0421bb8ff3..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
-		dev-libs/popt
-		ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-		kernel_linux? ( sys-apps/util-linux )
-	)"
-DEPEND="
-	${RDEPEND}
-	static? (
-		dev-libs/popt[static-libs(+)]
-		ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
-		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	tc-export CXX PKG_CONFIG
-
-	if ! use ncurses ; then
-		sed -i \
-			-e '/^all:/s: cgdisk::' \
-			Makefile || die
-	fi
-
-	sed \
-		-e '/g++/s:=:?=:g' \
-		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
-		-i Makefile || die
-
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
-	doman *.8
-	dodoc NEWS README
-}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild
index 6a445a77fe7a..de190d603dca 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/gptfdisk/metadata.xml b/sys-apps/gptfdisk/metadata.xml
index 2da27ac6ad8d..519be91819e5 100644
--- a/sys-apps/gptfdisk/metadata.xml
+++ b/sys-apps/gptfdisk/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">gptfdisk</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gptfdisk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index d46ffa3cd2ce..53f0ffc125ca 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -2,8 +2,11 @@ AUX loong-fix-build.patch 859 BLAKE2B 1c37ecbf8f7c0148e1634691b36c5e526e1111c851
 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
 DIST grep-3.7.62-9a668.tar.xz 1687820 BLAKE2B 95f5deccb3b3b223cb429f5c515674bed5209e6ca1d295b5ddfcf09614c6c10f6c6f56df9931a3dc0926b48abced15ab1099d8e84840c74846cb89270e248473 SHA512 b24a11138e683d75e75b4f04a42f4d202526a691aa70c303af4d257e2a395a4266b4bc05afff4fff7ab0efc5564af3efe0f9108cbeddf406d4dc3f171a642f25
 DIST grep-3.7.62-9a668.tar.xz.sig 833 BLAKE2B 9be6a33b1d2e29eeaea6bfbcbeade37eb4d7c8b2fdf37ec82376b1cc158f02c6916c87c21378cd099f863787ae46e2bc7dd40df77b263fe971f50b7bbe67cced SHA512 5245b7af4202bd49ef8937eda3ad91949e6bd9e16e217c0a326e8d6abc17d8f47e068197cb5df16829298912eed0d811164da4d1d7bd3ce3ff679a87a281f33b
+DIST grep-3.7.98-c9ac.tar.xz 1701736 BLAKE2B ac7fa0a45179b25b241e2f57b6731f3ccd4a1950aeab749d47ef286f1723ec6324e894b452c24877224bf61f54584447a2cb4278d6911eca7debf92a7d0b8698 SHA512 9325db663350b47493434f01639f17a383ccf5b18d45c8de2d38d529b60982d426b1a09f0d653ff4e716933fb9a429e18c69a832d667f12c37ccab9d90a07f4b
+DIST grep-3.7.98-c9ac.tar.xz.sig 833 BLAKE2B d215edbe769bdbb1afbfe3cc560509ba7e1c9ddcbc149cdd173ffd41f4d195c66b2119847b7383dbd7f9ff613e9a21a34c28a14ad4c2422846ad4e5cfb0eb369 SHA512 7a781df1c1b072f752b70bbfd843f71d8ef76cc68d908d1f2e9dd6058b706a3ee2d8013ff73300c3d9d3019a5a98e901a088f2630de666a997eb52825955cadb
 DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
 EBUILD grep-3.7.ebuild 2274 BLAKE2B b847a17bfe835e573a6406c728e99c1af5687bc2e83bdb4c1b6103790f587210c5bd3f4121c7fb83d8c96805a6a7fc636f06050df1f8f591d95e931f2cfecbc9 SHA512 dace79b242b68187cf8d756b4c91a7873eb8c1b1a3f631b67bb07192a95c4c4af521db19e6a943ae03f1d885317c0d6f497e129c7644e36d5dc97963415396ee
 EBUILD grep-3.7_p20220425.ebuild 2169 BLAKE2B 61fd2620aceeb5517493347bb2817dfa0c3ef4230b732c713f7d8e4693e0cedc92c7a78583512104022185de43f011771130900f10170790de845b0e3aa6bfb8 SHA512 822880de93aa6f7cb4eadbf24429fc79b32db36a68a87cc45dd985d63684aa0c39f3fce0927c21c6ec69535938238b9a11bd0b4a72c3124708c165d94a73235a
+EBUILD grep-3.7_p20220702.ebuild 2168 BLAKE2B 0b2a09225597916015eab1a036aec94af8fbbd80e61010262cb1eff62fa10ada13e22fba7f7e1192d904b80817e34ecb61b30dede0aab4d615b2bf7d8b94fc59 SHA512 c1c3228795c6cc2d3f07f75c49d5e5834b08d8340420450ef380c99ef9275cc7ee8de4ada5fee83f11cca6abe364f5a6083531d9db6fe8da9c5977cf40e4566f
 MISC metadata.xml 335 BLAKE2B 9348d579c8858b0764c9e6edc144183686945cac2a68eead6e5ad83d364d293292ec6ef97bf87ea5c146048757d080e157bf9edf101177a8854d77305d8a9dae SHA512 3ea8b4569cfadab59ecabcf13c25941f9ad0db6c15b0625760339224aa4c82dc99b102c59c858de20d3ab9399db38f47e23d1b360ff86cfba6ede73b548ea7ff
diff --git a/sys-apps/grep/grep-3.7_p20220702.ebuild b/sys-apps/grep/grep-3.7_p20220702.ebuild
new file mode 100644
index 000000000000..7f5d56e74b26
--- /dev/null
+++ b/sys-apps/grep/grep-3.7_p20220702.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+
+if [[ ${PV} == *_p* ]] ; then
+	# Subscribe to the 'platform-testers' ML to find these.
+	# Useful to test on our especially more niche arches and report issues upstream.
+	MY_COMMIT="98-c9ac"
+	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
+	S="${WORKDIR}"/${MY_P}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="nls pcre static"
+
+# We lack dev-libs/libsigsegv[static-libs] for now
+REQUIRED_USE="static? ( !sparc )"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
+	sparc? ( dev-libs/libsigsegv )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-grep )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	default
+
+	# bug #523898
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# We used to turn this off unconditionally (bug #673524) but we now
+	# allow it for cases where libsigsegv is better for userspace handling
+	# of stack overflows.
+	# In particular, it's necessary for sparc: bug #768135
+	export ac_cv_libsigsegv=$(usex sparc)
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 7c23f4eb1ad2..64cb9b3f715c 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -2,5 +2,7 @@ AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e2
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.63.tar.gz 140252 BLAKE2B 41ee3dda11f17ec9c125b7d680f07ca2d88c3692e2436b8d2550dbd58546b1dde8e61cdf5312c5b09d687dad81826bd848c8eabcb3e01ab09ac6cfb082699238 SHA512 1d09dc2c79c31f45fa242dd5bf259e84281d1464e49ada9fd53bb6d58cb0458046e534a93f9d6de18478ca5db50b6d36ecbe5b784c0c681a1db29f15fadd525c
+DIST hdparm-9.64.tar.gz 140307 BLAKE2B 0196f3ccec4005c542b834d8426cc6f64694783da3d4a064e898e25d17aab3aa0d9621276607169f2104c9a9804f9020554d836ded9efb16367a8ac4c9c9b146 SHA512 c561825143d8872cc2940bd6ba72162f91792bd63b6a8511058e79cc96feb6a4a9d22275581ef2eefab64a4035587b3a63175ccc58fa46f1059b4680d9d58ec4
 EBUILD hdparm-9.63.ebuild 994 BLAKE2B d018ce0b5ea5343f6cfa431973e1ed2f421fd52747b0a6415360ff18a7c951e7f2b218a271bd8631a55ed333753fcf3647fdb2491d161e648a6981a6f8c2c5dc SHA512 65cde99243246548e77d69ab2a72af7ac77070dd9c5aedbbb77de05ccc79dc681072959c21872f26c3f5e70d8414e0e64b9fc3abe70c2d54fc468d38970ef771
-MISC metadata.xml 327 BLAKE2B 9cd0640be1e5123d4bfa4c7de8fd6b9bf20cfe3a238d6e271ad979efe74540708e55b9af9b134092c2db90e68550e479f8a1cf2b5a3cee5bd7e2f0bc7f719960 SHA512 2d7160e374e48c59585903e354ae7d910cdb43916fc3285d076a0e77437a864b595f1713ad05fd9146aa43a6d0b36597a76e2a096ef27129a3727e899e27caab
+EBUILD hdparm-9.64.ebuild 1004 BLAKE2B a6853297a8289a130d8adf0e99dfea2222facb232383a4281906b4047efd48f55dde7b6a97a2a1533ccbb58cd11d3a162493d7547f4f7dae50b9f335b9509057 SHA512 c4868f36229233a161f9864da477104b79036b9de36a4dbdd1eb0db6bf3ef802b1f7582b02da4fce4ed81eac4796b0b43b3d05fd978fb98b12e6b39b1d8b59a4
+MISC metadata.xml 334 BLAKE2B 4401fa870e66675b64077c7dc271c1775a3b7148a4c720ac670222d0f61ce634507725e77e5ef2b9efb6d363ca23dc2a884645ab630ffccc8e737b7139e23d47 SHA512 a71c8c705afd12b3609542d13b18697e9c4626c0c41006ccbdacd248c1c621b0fa93a522561494120c0be181d091fc27e466a25af3be25b4f3b4cc14ec5e652a
diff --git a/sys-apps/hdparm/hdparm-9.64.ebuild b/sys-apps/hdparm/hdparm-9.64.ebuild
new file mode 100644
index 000000000000..16d39cbe5836
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.64.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+# GPL-2 only
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.60-build.patch
+)
+
+src_prepare() {
+	default
+
+	use static && append-ldflags -static
+}
+
+src_configure() {
+	tc-export CC
+	export STRIP=:
+}
+
+src_install() {
+	into /
+	dosbin hdparm contrib/idectl
+
+	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+	doman hdparm.8
+	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+
+	docinto wiper
+	dodoc wiper/{README.txt,wiper.sh}
+	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
+}
diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
index e98f5e38dcc7..8b7682960b2d 100644
--- a/sys-apps/hdparm/metadata.xml
+++ b/sys-apps/hdparm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">hdparm</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">hdparm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index bf21d179d1fa..dadb6ccfc916 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -3,8 +3,10 @@ DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
 DIST hwloc-2.7.1.tar.bz2 6810477 BLAKE2B 26706b8835954b8baa9028eaf2da0f8ae6e57d1841d68daaa04d58a7b24a67e4e171eb439b8dbfb589a70eb1b5cced51f12a99bb7132591919c902374f89025f SHA512 35de85de3f5e75de30b5ac72d2c118dcb990a2427c9812910a03772857181fd7259a27352b34a968186d02ffc811644c3411d84ee37f2d0ff9b83628951b4863
+DIST hwloc-2.8.0.tar.bz2 6896344 BLAKE2B 33f75987ee904d5ee9c62268695a2f7f59b0adc2e1601fc4407f525664b78a7fab04c75823ce9d190c8cb9ffc0ce983d7137555625d47bc1451a2d0c6f330055 SHA512 025c8ebc2945bdf696cc66fe2cfea0195694713a6098603fb4eaeac409d2f6c3386a7c2b4d7f3758d828f6b621e7f06ffb5745224cb1df2f8ff4f19b2a8a4a7b
 EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B e055e5b7624f56f54352a39649a51dba5dfe2e6cfddcdf83ef6496f9e88a8ed7b417c47d0e6a6cb5ebbd18619514b8497ceae74ca7df7fa236b86f4cb108e170 SHA512 6684246ba36711860baee3429c7976c6a719b63b2999cacbe7135450d8954082ed282485bb2f68a82c0fc67f78231c6f1c63626adc09f38a50197be8ef142e05
 EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 10a2be87fa805d97886e1e9261506af1e027314a68bac3656babfaadbe7273cb91a01ca9706ea9f284b015b8ec0b776f648a6c3461d3ce05147086a6b0fdd75c SHA512 5d0aab779a86fdd409bdaa98fff362824b301675db065859022fbff2a55f4f1a88263cadb85af9470e4915c5cc5c8a34e7e5f2d1376480fbd0b9ed46363ca7e2
 EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B 79a488a0e115c7f26a80b007088f8c14fc44d894b47637b0f2f9315082496361926165319e2e71ca21383406ea482f09c7dd6054ab4a198bc6c1e13605fbec1c SHA512 bf4432b8a655a23ae2faee3f1139d2beba90389f98df232a3999f4b86c73f01fa22c33e6350bd70817bc14e23f93115aba02cb9a9d5dae78ae1e023021b91707
 EBUILD hwloc-2.7.1-r1.ebuild 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a
+EBUILD hwloc-2.8.0.ebuild 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a
 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-2.8.0.ebuild b/sys-apps/hwloc/hwloc-2.8.0.ebuild
new file mode 100644
index 000000000000..88cb06eb1dfc
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.8.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
+
+MY_PV="v$(ver_cut 1-2)"
+DESCRIPTION="Displays the hardware topology in convenient formats"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia"
+
+# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
+#         anyone with hardware is welcome to step up and help test to get it re-added.
+# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4
+RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
+	pci? (
+		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+	)
+	udev? ( virtual/libudev:= )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? (
+		x11-drivers/nvidia-drivers[static-libs]
+		x11-libs/libXext
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}"
+# 2.69-r5 for --runstatedir
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #393467
+	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+	if use video_cards_nvidia ; then
+		addpredict /dev/nvidiactl
+	fi
+
+	if use cuda ; then
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
+
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
+	fi
+
+	local myconf=(
+		--disable-opencl
+
+		# netloc is deprecated upstream, about to be removed
+		# bug #796797
+		--disable-netloc
+
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--runstatedir="${EPREFIX}/run"
+		$(multilib_native_use_enable cuda)
+		$(multilib_native_use_enable video_cards_nvidia gl)
+		$(use_enable cairo)
+		$(use_enable cpuid)
+		$(use_enable debug)
+		$(use_enable udev libudev)
+		$(use_enable nvml)
+		$(use_enable pci)
+		$(use_enable static-libs static)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	case ${ARCH} in
+		# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
+		amd64|x86)
+			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
+		;;
+	esac
+
+	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
+	bashcomp_alias hwloc-annotate \
+		hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
+	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/kcheck/Manifest b/sys-apps/kcheck/Manifest
index 134dd95f62c9..8c63283f1d29 100644
--- a/sys-apps/kcheck/Manifest
+++ b/sys-apps/kcheck/Manifest
@@ -1,4 +1,4 @@
 DIST kcheck-0.0.2.tar.gz 8519 BLAKE2B bc1a4355e1d55118386b34d6f5aca0f11cbf519c0f7d3bb0cf143cca4682af782e6728585fa6dd36c21fc6cea73d21d0ab35571f93096b9eba4a9b461808f2b0 SHA512 98e3ad4835f8c1bacf68f98e112c05788394feb00683b7a02aa92cc2b5f8b4edeebe2b962c07a171b06bdfe7324e715d58057f6c8550004acc52cc0d9105ba9e
-EBUILD kcheck-0.0.2-r1.ebuild 777 BLAKE2B 84c4361679eba4e5a6ef9de9374fe1c511a056cf72dcd5d677c56efa93e2c19829e5f9266e26accf4914676d089ab6d0b4ba08d06b1d9253805f56f9535d3f47 SHA512 74e14a216c7a8c97eabb87fc4befc39b400c98d6257f6869d3aa7499bec0134cbbbaf18d0b311f7f424f6c6d7754b71a6d10d0e4b63be36b4c625f45c12f7e1c
-EBUILD kcheck-9999.ebuild 777 BLAKE2B 84c4361679eba4e5a6ef9de9374fe1c511a056cf72dcd5d677c56efa93e2c19829e5f9266e26accf4914676d089ab6d0b4ba08d06b1d9253805f56f9535d3f47 SHA512 74e14a216c7a8c97eabb87fc4befc39b400c98d6257f6869d3aa7499bec0134cbbbaf18d0b311f7f424f6c6d7754b71a6d10d0e4b63be36b4c625f45c12f7e1c
+EBUILD kcheck-0.0.2-r2.ebuild 746 BLAKE2B a2f0020c50251ea6075e644b738de879e19ab6e7331fdd0f45a2d2ddca2ff437583f666be056f59a26bc10519c602b0b7d833c1c58eeafc8a3c90df1797ce30c SHA512 9c191fcff29c5e8fe0c5bdcb7a8b0553d9b8747a7c37d5ff6a772bd1d96d69cfac1cb88c1d5952b5c6b51565f5daa6670c9ee462687614b2d978af7c8e21c033
+EBUILD kcheck-9999.ebuild 746 BLAKE2B a2f0020c50251ea6075e644b738de879e19ab6e7331fdd0f45a2d2ddca2ff437583f666be056f59a26bc10519c602b0b7d833c1c58eeafc8a3c90df1797ce30c SHA512 9c191fcff29c5e8fe0c5bdcb7a8b0553d9b8747a7c37d5ff6a772bd1d96d69cfac1cb88c1d5952b5c6b51565f5daa6670c9ee462687614b2d978af7c8e21c033
 MISC metadata.xml 455 BLAKE2B 82da8d0a48779a97efa4de3e329622e3d98689668d83084d9a5e1669e915158b6cf67111d0ffcb49eaf2fe489a56b6c64e300aa517c7049e975c1fe14b4ddbc5 SHA512 c71e5dc4d2953f27d1c0d6ca37f625772c4631e1aa0a2362f0ba607ccbcf9462b840a64ad246dcc6dbb9f9656c87e61bfb892e47b911bb9a7726c34b633a6eac
diff --git a/sys-apps/kcheck/kcheck-0.0.2-r1.ebuild b/sys-apps/kcheck/kcheck-0.0.2-r2.ebuild
index dd37156e47c0..364c02952611 100644
--- a/sys-apps/kcheck/kcheck-0.0.2-r1.ebuild
+++ b/sys-apps/kcheck/kcheck-0.0.2-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -22,7 +21,7 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
-	dev-python/configargparse[${PYTHON_USEDEP}]
+	dev-python/ConfigArgParse[${PYTHON_USEDEP}]
 	sys-apps/portage[${PYTHON_USEDEP}]"
 
 src_install() {
diff --git a/sys-apps/kcheck/kcheck-9999.ebuild b/sys-apps/kcheck/kcheck-9999.ebuild
index dd37156e47c0..364c02952611 100644
--- a/sys-apps/kcheck/kcheck-9999.ebuild
+++ b/sys-apps/kcheck/kcheck-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -22,7 +21,7 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
-	dev-python/configargparse[${PYTHON_USEDEP}]
+	dev-python/ConfigArgParse[${PYTHON_USEDEP}]
 	sys-apps/portage[${PYTHON_USEDEP}]"
 
 src_install() {
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 6fde1d0bce06..33e5e080f0e9 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,6 +1,8 @@
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
+DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e
 EBUILD kmod-29-r2.ebuild 5291 BLAKE2B 7528b891100e568a324649b865ff22b22d5dcd00294f70514ab62ebea527983b4a2e0a79f9fba4efeaf4a20621fa2243691eb813b70e5495e6ad33aa820580e4 SHA512 52a755c75b47c5d52a4f15ccddba16e21ecabecd7ecbe48f85bae9e5334c22b73ca5677a2ea3397aa0429b562a46b6a46b68bc15d75ec716679c0f2a61e812da
 EBUILD kmod-29.ebuild 5236 BLAKE2B 8674297d2f9ba5382792f4ca756e3fc47e6558020dd11d07c590232098d14f358130163733d5338cecf13b55b0f90086011bab2e4a753de8fc17f17cd22c7e07 SHA512 f576e67fd863468a49fa0b17a70cc654cce65675a10080911a210a07392a9b542d5706d63eba6daf5662be4670e2e254afc70780c9d50a7fa6ba7c967df94a41
-EBUILD kmod-9999.ebuild 5291 BLAKE2B 434a7a9104f0d64f8a22dc8e0dbc57b1652b15e9c6796deaebbba2c6d57116a88fc7f569f5c435820d04e41770ef3ab7b23a282a24b6c4f5da8d367ea166ff71 SHA512 b948c27eb7e144ff067f5587c2d897847290046bb0d9d207a468ce1983bc602f9fb6e03e08067857f25230e9aa2fe19d94136a5ab2c9113614c520d6dfc406ca
+EBUILD kmod-30.ebuild 5294 BLAKE2B 1f38d5a0fdfec0113ea7fb8dc62b33418bd36521c91aacb7dfad983b1dd4c77f47af94d464330f9af824a9fc8f6e3abe8552bff53887274df34b73be07825be3 SHA512 081fdd6bee6eecf7f10424a868f21db7a4b269eca9ca672038d84f315be9717e5005943739e5e92d3cf5f82dbd85ceb6b417f40e69fc0476c574b09d9edee337
+EBUILD kmod-9999.ebuild 5291 BLAKE2B 7528b891100e568a324649b865ff22b22d5dcd00294f70514ab62ebea527983b4a2e0a79f9fba4efeaf4a20621fa2243691eb813b70e5495e6ad33aa820580e4 SHA512 52a755c75b47c5d52a4f15ccddba16e21ecabecd7ecbe48f85bae9e5334c22b73ca5677a2ea3397aa0429b562a46b6a46b68bc15d75ec716679c0f2a61e812da
 MISC metadata.xml 611 BLAKE2B d356a4efdd4696d1a57b9e57a4c2c6cda612830c11dcedadb307db85f202ceb8d8f6e6aaacc0e1b69f9bf909cf226f4174fb270f5f4eded14a1b42d236e345e5 SHA512 bba19da08e022d4de0970d80646dfdcaaede388e2b0a020bb9d83ebcb0fe1e62864e944c29a9bb6692df12981e24c091803ccda6161c2d6186b0dd46c3074108
diff --git a/sys-apps/kmod/kmod-30.ebuild b/sys-apps/kmod/kmod-30.ebuild
new file mode 100644
index 000000000000..95248947d8d7
--- /dev/null
+++ b/sys-apps/kmod/kmod-30.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools libtool bash-completion-r1 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+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
+# - >=zstd-1.5.2-r1 required for bug #771078
+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:= )
+	zlib? ( >=sys-libs/zlib-1.2.6 )
+	zstd? ( >=app-arch/zstd-1.5.2-r1:= )"
+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
+	BDEPEND="${BDEPEND}
+		dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( NEWS README.md 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, bug #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
+	# bug #260139
+	doins "${T}"/usb-load-ehci-first.conf
+
+	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/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 48747e41ed50..d6f72bfcac71 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -30,7 +30,7 @@ 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
-# - >=zstd-1.5.1-r3 required for bug #771078
+# - >=zstd-1.5.2-r1 required for bug #771078
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
 	!<sys-apps/openrc-0.13.8
@@ -39,7 +39,7 @@ RDEPEND="!sys-apps/module-init-tools
 	python? ( ${PYTHON_DEPS} )
 	pkcs7? ( >=dev-libs/openssl-1.1.0:= )
 	zlib? ( >=sys-libs/zlib-1.2.6 )
-	zstd? ( >=app-arch/zstd-1.5.1-r3:= )"
+	zstd? ( >=app-arch/zstd-1.5.2-r1:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index 23984af8730f..7a8c9c92bdef 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -1,6 +1,9 @@
+AUX kmscon-9.0.0-systemd-path-fix.patch 440 BLAKE2B 45870c9ec3c7eab3d280dfe8d95513cfcbfd1f0a12297b09c0280b5b6c92724ba645e44f24a78b15ac742ef76e4cc55d3a63cf7d90d476e833e72ec37875b18b SHA512 05b7eb1301ba1379e22bf26a162c08962600e2584bb4afed31664c3bc893f74a994900c5bdf50b2842507c0388e595b158f0a974b60a422a8a4c90e584d29476
 DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
 DIST kmscon-8_p20220214.tar.gz 1158069 BLAKE2B a64b19da4bc57e4baed8d3822cbf7cca472614a30fe604a09c53f8ab3e024725abdad7286c6c183e7de3b24bd80e01c5141d6c7f10794b9101530832602dad4f SHA512 837026b3f9702fe487d63d665140ea9e37a39975161e86f78a4c989b18eabd3c3429a4a6ebc384790389042b014dbaaa8225a136290f9310b113b606e551f4c2
+DIST kmscon-9.0.0.tar.xz 736668 BLAKE2B a44a4b3739b1ed4a597713ca2ef7adb33f1ab7130322a419ee88517addfbf0edf01ef59f06c5626e95a7bc1708cf4cebe49d5853558aa3fedb3aa9c7c28a7dd7 SHA512 2d4bca093c40307e155c9cfa349eef433d7ab6d08f8e134a61fa9c5ccb9ad594575725371075aaf917c2a9dfb3cb3cd148296dce25065a02b3a211650cde9c3c
 EBUILD kmscon-8_p20180906-r2.ebuild 2929 BLAKE2B 9fa4c899c776e7bd780b6dd40d1a8adc9880ab129a308479f60eabecd00843e389b886dbd632c4d5da4b2d5d04ba655e1af2b49d3bffabd1873b0f523fcb14e2 SHA512 ac8ca2c15773715a2b79b494fd82952f89bd805223a7b36c04a44aa1d81f5378129bde32ef970b1a8c19bcf2af75a44245b880e70dcb2dcad9b9a8ecb4e2f48d
 EBUILD kmscon-8_p20220214-r1.ebuild 3015 BLAKE2B c49d2f797ff8db10fe01affcf3a75dc03cbb233e654cfb2e898b09e065b84871cffa658f5ec81f29b53671cefd40b54b9abba79a9f61a568cbf23a21f930d388 SHA512 41dd8e5fc4de97d6e413a4830c2108a1cc0ddc20f55d0bc929164149b81707c8882584262253d2dbbc3e54dbbd9ba5e151d0d80376255ae6a93bec6b7040561a
 EBUILD kmscon-8_p20220214.ebuild 2929 BLAKE2B 77b35eb82062531590fad5fba956c9e50c0818635a59f437f090282dad52d7973408a6f1f14e5ad0dda660b816adcf113afddaeee6f2314618681add1c08c019 SHA512 28a613ece6af9b05330f52cf864a036ca8fdb25b9567d993d59617cd6e7eb77bcf2aeded9caf0f8ea37b29411097ef3ee79acde6510b35368f4b8db0b8ff4681
+EBUILD kmscon-9.0.0.ebuild 2018 BLAKE2B c0940839312ab912259e9c27c7612e1d6a0e5ba6c41b67806fc7176babd652095c3e3d7b8596d21e80022fcb8530936ba46e5a4fd13426681d1ed8553a0cc968 SHA512 5d0843b5f2d0ffb5cf9f1790baf50710bc8dd881abbe8b3ff0b5e28d5701ae324980cdb3b40b15224e381f66847c48c8ef578d90daadb628ae51e5b7a9bbf9ea
 MISC metadata.xml 665 BLAKE2B 3eda7f9e7848f5e1ee5161d8f124bd9cec1978c3bac41c3d3b90ffa1eb6300cb69a609233307731e7f71c89a30550c61f84d2690793a75f500853491bc137391 SHA512 d692f3f0cdabf80e3c5eb6c4a41efa457ab15b3e90ecadf741e829ea28a63f223e55439b4ca7f0ef15a61e8f9e77c2b9eb0952241940a939e801b97280dbda1a
diff --git a/sys-apps/kmscon/files/kmscon-9.0.0-systemd-path-fix.patch b/sys-apps/kmscon/files/kmscon-9.0.0-systemd-path-fix.patch
new file mode 100644
index 000000000000..417c38b77c1f
--- /dev/null
+++ b/sys-apps/kmscon/files/kmscon-9.0.0-systemd-path-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 4544587..f2ca004 100644
+--- a/meson.build
++++ b/meson.build
+@@ -37,7 +37,7 @@ sysconfdir = get_option('sysconfdir') / meson.project_name()
+ libexecdir = get_option('libexecdir') / meson.project_name()
+ mandir = get_option('mandir')
+ moduledir = get_option('libdir') / meson.project_name()
+-systemddir = get_option('libdir') / 'systemd'
++systemddir = '/lib/systemd'
+ 
+ #
+ # Required dependencies
diff --git a/sys-apps/kmscon/kmscon-9.0.0.ebuild b/sys-apps/kmscon/kmscon-9.0.0.ebuild
new file mode 100644
index 000000000000..cadf2d7c4b3f
--- /dev/null
+++ b/sys-apps/kmscon/kmscon-9.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SRC_URI="https://github.com/Aetf/kmscon/releases/download/v${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+inherit meson flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="KMS/DRM based virtual Console Emulator"
+HOMEPAGE="https://github.com/Aetf/kmscon"
+
+LICENSE="MIT LGPL-2.1 BSD-2"
+SLOT="0"
+IUSE="debug doc +drm +fbdev +gles2 +pango pixman systemd +unicode"
+
+COMMON_DEPEND="
+	>=virtual/udev-172
+	x11-libs/libxkbcommon
+	>=dev-libs/libtsm-4.0.0:=
+	media-libs/mesa[X(+)]
+	drm? ( x11-libs/libdrm
+		>=media-libs/mesa-8.0.3[egl(+),gbm(+)] )
+	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
+	systemd? ( sys-apps/systemd )
+	pango? ( x11-libs/pango dev-libs/glib:2 )
+	pixman? ( x11-libs/pixman )"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE="gles2? ( drm )"
+
+PATCHES=( "${FILESDIR}"/kmscon-9.0.0-systemd-path-fix.patch )
+
+src_prepare() {
+	default
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+
+	# kmscon sets -ffast-math unconditionally
+	strip-flags
+
+	local emesonargs=(
+		$(meson_feature doc docs)
+		$(meson_use debug)
+		$(meson_feature systemd multi_seat)
+		$(meson_feature fbdev video_fbdev)
+		$(meson_feature drm video_drm2d)
+		$(meson_feature drm video_drm3d)
+		$(meson_feature unicode font_unifont)
+		$(meson_feature pango font_pango)
+		-Drenderer_bbulk=enabled
+		$(meson_feature gles2 renderer_gltex)
+		$(meson_feature pixman renderer_pixman)
+		-Dsession_dummy=enabled
+		-Dsession_terminal=enabled
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	grep -e "^ERASECHAR" "${EROOT}"/etc/login.defs && \
+	ewarn "It is recommended that you comment out the ERASECHAR line in" && \
+	ewarn " /etc/login.defs for proper backspace functionality at the" && \
+	ewarn " kmscon login prompt.  For details see:" && \
+	ewarn "https://github.com/dvdhrm/kmscon/issues/69#issuecomment-13827797"
+}
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index bb5eab5033e6..975324d2d8e3 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -10,4 +10,4 @@ AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c2
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
 EBUILD lm-sensors-3.6.0.ebuild 6672 BLAKE2B efecba75234ac2175f71f070cd16b3bed7dbae5e74c91ce78c3999de502155286669651dd8ff3149d83d51190bf672e90a477aba5d528b540e1fe6ef2b2aa3f2 SHA512 2f120c58c561c148ab755b85dc3d1e65c731e1fad666cc39ade50e98fff6de3c0c0ab59cdd57bbd262a47a15ef2095f7d4139c996446288d3ddc6e9d61f7cf7d
-MISC metadata.xml 748 BLAKE2B d7060e5184c987acf8978936cabd72b47794ad0462af91e664d0efcf3fefd58f9c8ba0814cd09b839104018e6c996cbaa89f4e35d034a902f7557941005a904f SHA512 c5c7a7653230cbe673af3fcf7d5b4deb6bc69863d1eb96a99e04df1348f08406f19b5c296e76d13db46697d4489a769c545caf601d736b793ba3d320264ae65f
+MISC metadata.xml 826 BLAKE2B f4bbd7a126d042dc595f2f5f980445ee576f61c589ecd61359b0f68935b92a2483890add6f4b3fbe73d7e43a5e60462cde524c25561df0036d43c95dd36bdc2f SHA512 83e3b7b23643aff17671420de8bb32095e2170d4b80abd4bf5cee4f08a7168475f8779a40a6d35d587f8820a7f6d32eb8c9a83015860bc521064ca157e23782a
diff --git a/sys-apps/lm-sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml
index b2dda5428d40..fb33e5ae278d 100644
--- a/sys-apps/lm-sensors/metadata.xml
+++ b/sys-apps/lm-sensors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<slots>
 		<subslots>Reflect ABI of libsensors.so.</subslots>
 	</slots>
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index e44ef2d04ee2..9cf9b0433b5e 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,3 +1,3 @@
 DIST mawk-1.3.4-20200120.tgz 468855 BLAKE2B dd8bb8f66cb8bd67d8415ee25ce928113cf3f33f8135bc432a16f30b83df861cd2e29da9e0fac1dfb1a6796239d0c838ed72cf51467f8ed79b96068e3e1f1e93 SHA512 14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b
-EBUILD mawk-1.3.4_p20200120.ebuild 860 BLAKE2B 0fddd17c7bac6b8260dda8daeaebe16be9d0b3eacdb1099685679a1d8b960fb0f456cc1b0e67ad0a9b6b4382f2f8645c28d2df2a25053f2e8549bb5c61839537 SHA512 a8bbb39c2bf2ed622831a0672ce1ca516d4de2a6b4ae128926292a368c6571ab09415c23e6cae0ca4caeec2550c528d95001c152dca9f20a28696d85abc5b472
+EBUILD mawk-1.3.4_p20200120.ebuild 859 BLAKE2B 7fbc7a0d28405fd7234b154c380559224095c47ffc835abea452a2cf857faa577e2191f15a933b743217f162e05f39d8f150d90949ecdb5fb33990ab1a01d318 SHA512 5706d0a0be47e12f4eb56773f7b0127b065d6d717c816b405382eae51418a826e0f51f8d1d22c717c16d5b5f9a69a29b39267213ba6ca0d02a7d35df7e48242b
 MISC metadata.xml 355 BLAKE2B 5bd1bc96d3d97b8c2ee10fabc6a7e77e6951a9be9724b9961a97ef53a4ef238548f088bc63ba7cbdd2b79be75aa912534f177008051e76b17562f7330758035f SHA512 07805a983d52dac30cc530435ff6ce27a4f1af9a9221381383ddb30ec3ea736fd32ec5da874787e2b1c1f889624bb59ec77170e3fff6d3b52d20b33087be83d8
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
index 01feeb83d1ce..94d7dc52ec1a 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index a4748b572526..4f9aca0b7271 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -2,6 +2,6 @@ AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97e
 DIST mcstrans-3.3.tar.gz 44621 BLAKE2B 624780c219d0b8f369def5ab334caf9d2ae847f9cfb4359ce38e240bcb72b7cfeef45d08cd6e7330cc90394f6c32bd622d2133e675036f98992145b1530ab1e2 SHA512 2157a0361bb5a2bc8e149373b2dd7d9b042f8c4c0aa845ae6967a23d9b875d2dcd6176d99d7f8f15e17eb5877fea60814e19aabfe76950d25b75c9c25df811c2
 DIST mcstrans-3.4.tar.gz 45125 BLAKE2B 59a403e7d4018bee2632360d5720e65f26b0581ed58a42e8caee2d352d104658e27ece850ca6c50ea513766a973c6ae98fd4115d478555dd5c130956188c0668 SHA512 bd612f1ae886c7a0300bb4aa1d52f139677787cc026475eada98e11a46910fa4a8baba9026530af6fa649a4f07978039f584e55567b87bbbb89ff06fb182518c
 EBUILD mcstrans-3.3.ebuild 988 BLAKE2B d4fe2829c039c8871d19cee9a9d50e26bc8b9961ebc2b8d4a77c950b30d573eec52842e9bdef80c43f9734530be2311d8d76190ffb5439bd5fa39133d0a484ed SHA512 d40639217b41c04f1e43c826b7304ad67b9c375d3ec6f3ba5019e52f36f689a5a97dd370ec73d652d82b8599f932f7cffdef76498f09451fe7e722d95aeb2d5a
-EBUILD mcstrans-3.4.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785
+EBUILD mcstrans-3.4.ebuild 1062 BLAKE2B 42fc963e514cc8f9d288574a4ac498d2cb7b9e4cad3a82840ee4d20e854056d2ddd6e6968ad552b2e891d624026fa0c78d6abe071d9a2ea6edf37a85eaf93938 SHA512 e89402e2f82ad0b1c5c46b39e262db06002870d696e579faf17e792df697802159135ae691b642fa5a7733803bc753b5ad013060f06c6f02e359097564a9c1b8
 EBUILD mcstrans-9999.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/mcstrans/mcstrans-3.4.ebuild b/sys-apps/mcstrans/mcstrans-3.4.ebuild
index 75563498db4f..c0129fbc3b69 100644
--- a/sys-apps/mcstrans/mcstrans-3.4.ebuild
+++ b/sys-apps/mcstrans/mcstrans-3.4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 42b487a852c5..886d5a04555d 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -12,5 +12,5 @@ AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c SHA512 78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea
 EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
-EBUILD memtest86+-6.00_beta2.ebuild 1611 BLAKE2B c0de373f6409919e2fcd15c8f2ebe0bdd17692d88016392173b9ab4a80e9f64ebfaaa5ce19bbb431e8f3635d1de838bd114db466653dfeb16a836c8c0ebca4db SHA512 2e07de7fd39f2f66c3cd337ee151e45fbf4f0b32a343290170727980232c75b212e910870f2d614abcea4ba912e4420d526e2ba90e8a3ed13fceb932fcdc37a3
+EBUILD memtest86+-6.00_beta2.ebuild 1730 BLAKE2B f3f7efb95a02123ce0af742f0a8f6a214e2e8d80d2338cdf4d59e16923fe5982ca41e13b3108d35d8bc559862655d8bf58501582813802d35c8899b715119a70 SHA512 f34ff95cba1c9ecc773511d7fb8480a1d9e4f368b49b22c5904fb90f5c095a6bd9369ea766fc72e851cb4d57761680f943d991f5793e9170278b23d0660c04d2
 MISC metadata.xml 944 BLAKE2B fd7d12b3e27ea5dfa0ebf56502faf2bf43222f9a070fc718c7e983a03afb2cde239f71d5a45947548435005dc72faeff4d8b850f38a64f57f7def5f098896ac6 SHA512 e64965365707ad5c830fb07f4ed2a2c54dcf7703b5b898d24c87ea7c082312ac30277abb77af643c9a7c021c56578de0d8b9b2f12cb01017b68ddf61885a13d4
diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
index 2107fd4d4b8f..eb5778e25fdf 100644
--- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit mount-boot
+inherit mount-boot toolchain-funcs
 
 MY_PV=${PV/_/-}
 
@@ -29,12 +29,19 @@ BDEPEND="
 S=${WORKDIR}/memtest86plus-${MY_PV}
 
 src_prepare() {
-	sed -i -e "s#/sbin/mkdosfs#mkfs.vfat#" build{32,64}/Makefile || die
-	sed -i -e "s/^AS = as/AS +=/" -e "/^CC/d" build{32,64}/Makefile || die
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
 	default
 }
 
 src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
 	pushd build32
 		use bios32 && emake memtest.bin
 		use efi32 && emake memtest.efi
@@ -44,7 +51,7 @@ src_compile() {
 	pushd build64
 		use bios64 && emake memtest.bin
 		use efi64 && emake memtest.efi
-		use iso32 && emake iso
+		use iso64 && emake iso
 	popd
 }
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 70d0bc8eb074..254fd8230b76 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,7 +2,9 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.44.10.tar.gz 254298 BLAKE2B 3cfecc27b560b8bb60d2104ab3dcf176b98677b65b829fa403ad2eb0e2e8bb0d586d374c336328a07c2f35e3abcb3f897cf5df142540a60fc09883aabd0ac79d SHA512 0e41f5268c6b8c325a6773511ca58c38ba52a1987aa47165794df8a99359bd1bfcb99d30e0d129b9242a2661663234f6f85c92c55c891dbb6c5b8a11d93edea4
 DIST openrc-0.45.1.tar.gz 246503 BLAKE2B 28ed668b1da7bc3d22de1f7b22b6d10ecd1c789eb5c017803754fa8f6197ee4a7b179728064fa31d4b9dd0d15e3332c4bb839bd56ac5abb39b5b772b53394e8a SHA512 340661c6f8fc60dd7fbbe4a84aaeb0a9a7337577e6d98698c34db3c160890780376587ca6f803563fec53e852593265a28c307fa38a5f71a3e48c62cd63611a1
+DIST openrc-0.45.2.tar.gz 246515 BLAKE2B bb7d52b183612eb8924a2d0f9ec63eea88253d8d83964d6341a4715a6cdc372b3fd99ad0f972f4f539da9d741548777dabf4ced86fd20be741a89a69ffe2ff01 SHA512 ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9
 EBUILD openrc-0.44.10.ebuild 4689 BLAKE2B ee59077c97af4c8d59a2ae262557b89e52578adaea6e041ed8e594dfbacaba8f00cf09c89c2ee0c5cd4ef1f2e682e2d888a92409ae2f1d22cfc63333eb2af0a0 SHA512 c3b0616e1c83096c80e270bea172918080ef29bd2684580146ad2a396c540b95b02f907d39ac84919cb271d72330fea86dfbb1d6f3b6a83a8bd7bb13e9dc933c
 EBUILD openrc-0.45.1.ebuild 4492 BLAKE2B b3705152b85364d430b8b2ff173b971f3d8de589c5fe8cfbedf2a9945663fb959fc4ce785c47e4996f22c17faa72bc0235102d2b98b6df1a358220ba2624f632 SHA512 e7fd352f7d166d37cb786420b0a13ecfaffd59153c633c0cc66bc5d4139f7638b7122f87f3d4b8b421dddd5e15fbf0dc478e4cc8d6e0511224299f562ef1bb07
+EBUILD openrc-0.45.2.ebuild 4492 BLAKE2B b3705152b85364d430b8b2ff173b971f3d8de589c5fe8cfbedf2a9945663fb959fc4ce785c47e4996f22c17faa72bc0235102d2b98b6df1a358220ba2624f632 SHA512 e7fd352f7d166d37cb786420b0a13ecfaffd59153c633c0cc66bc5d4139f7638b7122f87f3d4b8b421dddd5e15fbf0dc478e4cc8d6e0511224299f562ef1bb07
 EBUILD openrc-9999.ebuild 4492 BLAKE2B b3705152b85364d430b8b2ff173b971f3d8de589c5fe8cfbedf2a9945663fb959fc4ce785c47e4996f22c17faa72bc0235102d2b98b6df1a358220ba2624f632 SHA512 e7fd352f7d166d37cb786420b0a13ecfaffd59153c633c0cc66bc5d4139f7638b7122f87f3d4b8b421dddd5e15fbf0dc478e4cc8d6e0511224299f562ef1bb07
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/openrc-0.45.2.ebuild b/sys-apps/openrc/openrc-0.45.2.ebuild
new file mode 100644
index 000000000000..c76771b7efea
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.45.2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson pam
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_configure() {
+	local emesonargs=(
+	$(meson_feature audit)
+	"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Drootprefix="${EPREFIX}"
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+		-Dtermcap=$(usev ncurses)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	meson_install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc *.md
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+
+	# added for 0.45 to handle seedrng/urandom switching (2022-06-07)
+	for v in ${REPLACING_VERSIONS}; do
+		[[ -x $(type rc-update) ]] || continue
+		if ver_test $v -lt 0.45; then
+			if rc-update show boot | grep -q urandom; then
+				rc-update del urandom boot
+				rc-update add seedrng boot
+		fi
+		fi
+	done
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 8535d35811d7..38ffece865d1 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,5 @@
 DIST osinfo-db-20220214.tar.xz 127528 BLAKE2B 7e0076d3f844e52744dd6086404504831c7ed625003bc789103919a140a5a281c1a44773f7decf0825cad845274417b3cb510f3bd62e840f84b972358755dc34 SHA512 d8823b3928d2648a759c4c15b57b57cfd79a406813ec375b02bf2c382c1b22ee0177e520ef04cf334af3b08cc810867472c35a73555f1fdb8855a1b8679c183c
 DIST osinfo-db-20220516.tar.xz 129272 BLAKE2B 47f6eb2e1ae0cad277be71fb0955415c4afdb27e3b80e36c98ce5b7c8d22efcab91047e93c586045baa233ac61dc08113a5aedb626db4f24bf0472455826e481 SHA512 44c56824c774e68bd79633c415c71155e814c1f928fceba845ab649f8cb0dd325ad06b91a2d720cb25fd62e67d7ea17774cc395995b4f201527c4a6aa447a744
 EBUILD osinfo-db-20220214.ebuild 653 BLAKE2B 61a4b4b88845fb9a89d023d36849e576c105f8f211b69591aa929c4add0d43a1658b4c61129728fe90f66a8c8e464bb19da254734d5c87d39dd901102359ad59 SHA512 4d062a99286fb303d0d1f182a5c02e0aed4bf3c73ea9cd943c1039c0228a1fc7e46b585604050e41ad4a0a7ae788e48bdb08db911c6c17b0ae46be336055f666
-EBUILD osinfo-db-20220516.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
+EBUILD osinfo-db-20220516.ebuild 693 BLAKE2B 4ec45908179eabdc8e4ee53d186f6f365a820535279abded2dfb318b0d63e24e6c8f75f40eeb67d9882eed90a7eca7c2e44b361a13b349a8d3f718ed4bf6b56f SHA512 2c6396aea8c1e90c864525dde361cf40bfdc016091160680e63b1240538f2f717d843a7ddeac4d4d5a19fe67d22f5c57d09e7dc830eab4699d50e111d6a5c595
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/osinfo-db/osinfo-db-20220516.ebuild b/sys-apps/osinfo-db/osinfo-db-20220516.ebuild
index 28ae854564ac..e40530368a72 100644
--- a/sys-apps/osinfo-db/osinfo-db-20220516.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20220516.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="sys-apps/osinfo-db-tools"
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index fc8eef06660d..1d4939b1b4c7 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -3,6 +3,6 @@ AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334
 AUX pciutils-3.8.0-no-which.patch 1207 BLAKE2B 6012046e4d0831e5a20b351e43bde4c1450c076989ed42741eac76510e2bc279940c80a04d978f6947878adca3140f5fc205615540871eefc9d62a68482fd4fa SHA512 240bb7142f5af044a8fdac96fcc63af7938b1e7f5f3d1689d213df09e71c1d6da84d1d1ee421511fa4c07f212e5605485c1f5ad8ad30052d181f0020e256d387
 AUX pciutils-3.8.0-pkg-config.patch 691 BLAKE2B c12a6a6f19a62d5d161479e401f5bd9e373821fb72648c6ef0d9a49312a0ed930e790a9153eddadfaca28b8c0c330166c915c43d9439e1163a385defa08760df SHA512 d616aadc83c40cde4f8e0261ad0a99259d5b66bf32c7db3f5b47cd0981b27ec93ff5547b1927806e3b045ac61d884cd5eb96e4ff58955b1881616056a95cab4c
 DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
-EBUILD pciutils-3.8.0-r1.ebuild 4882 BLAKE2B a25f7136f8ed59963eca2c3a36e8be95fe007a5a84b1be136abaa63b1e0ef5b3c2911c825f49b91042099e8e1c45409ca6688d7721623cdc3b8d3295c17014e9 SHA512 4febe95aea85c906b361d876467f1ba68162101dce1d770c310d42516c506377bb0c20962c1d7c4ae120c9ab04a4403b516f41efa7f08c2f579ad6eecb1d0f50
+EBUILD pciutils-3.8.0-r1.ebuild 4882 BLAKE2B c0ece73df8fdb5fcac50c9cf827eb27addc4505324b458def85a282e7fcab40b6ff9b9648f98b5ecc6cd4ae907cb58e3364fe56c0bc385252bb39d49968df2d9 SHA512 ced3690005207dd7f6fd5af80922eb762602d4cff8f5e12ef8f741ffd4d6fad21a7aaf971758eef3636c5af68fb98f3d14e96e277e160c71d615b2dca25ea066
 EBUILD pciutils-3.8.0.ebuild 4709 BLAKE2B f3954f5bf30d0fc063fdd27b7e1c6824ef396a8f922d5ed0b3180a1ea5036a6d04f79acfb863919f1f00466f6070e1f42338d89fa937fbf2b9318987bea4d7bc SHA512 dfacfe7264bacac6e00c252f20b04366a72cccb47f7629bd8dd12541be9d4daea82c0359f6407bbc566bbcef0d6f875de69bbdcf147506bf19080d2a347d0b98
 MISC metadata.xml 525 BLAKE2B 5a7a502d28b6e74db1f1f008adfc5d9c398fb7832c8c82e066c9d4834726a0cd1e97b9738ca21906468f3c2444f20bfcf715339a1314e34b2b43d4f5c631a659 SHA512 5e53a4261ea0aa0d58f7a16b5c8ddbc2e6bda130e49642a9dc220f39cd6a77b8fdf22c22fd7def106d4728b880b75371feea3d552981d03294b86b8cb7fd08c0
diff --git a/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
index 1bf858cd8fbf..29d646cac79f 100644
--- a/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
@@ -85,7 +85,7 @@ check_binutils_version() {
 			eerror "2. Run: . /etc/profile"
 			eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
 			eerror "4. Complete your world upgrade if you were performing one."
-			eerror "4. Perform a depclean (emerge -acv)"
+			eerror "5. Perform a depclean (emerge -acv)"
 			eerror "\tYou MUST depclean after every world upgrade in future!"
 			die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
 		fi
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 1a609503b989..58bd4f45e900 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,6 +3,6 @@ DIST policycoreutils-3.3.tar.gz 2818092 BLAKE2B 0ed9f128a774176ebadb71f448af8dee
 DIST policycoreutils-3.4.tar.gz 771435 BLAKE2B 53654ad8f17c8e539c7821ddcc4f40dde1aa214943b5f2876efbfd8e10c90747d21c1530df3d53e51677159026a70691db6282f3bedc79739673380e053f74a2 SHA512 ded0d6fb5e3f165a893ee42411ac82616ddf37a02acaca6a8437b8f10ea12e5594bbd7bc7e3ead12df00c018078950f3fbe55604c41b0554257c4ca18f55ebb6
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-3.3.ebuild 4509 BLAKE2B 082483774c49df970002fbdd2f163b604f52bbf621e5754e7e1ff7a3fb9e0fadc2be5c552e4dade95e4946955dfd052d0d10d8efb2956f458a1844d3faf25a8a SHA512 4952b2a4f9d065b60ec3c623909e1279f538bac5c7349186fcb0d9325c5f8ac5bab882986fa3b27219e2ff21d1fe81ed97d7de5cefd71b2479c5d5815c48299c
-EBUILD policycoreutils-3.4.ebuild 4566 BLAKE2B 50bb4f9d7a953954612758b59225a6b08812eef9e6aafb27c18194b02530f5c68efa75e1c3daf9d9d52cf741e7b61ea7d6ba0c89430599200bf5fd2ec0ce863f SHA512 60871d3a75b14641e15e7e61e39a1b641b42b5a08e663101930f4ae0140764c61bca3a866dfe692f5546a8146830f043fa4082c5e1fdca10660a6edaa7b3954e
+EBUILD policycoreutils-3.4.ebuild 4564 BLAKE2B 4ba5a5353fd8d436c2174282060e19d41143ac11b3c89c2bba792536bde685854817db7ffc99e66499f4257a7456d7b48c2bcac0f2de2f610682e4f786d08e0e SHA512 e88b256265292193fcbe3174141ad75d4ae6bb7f57d096e5d36375b9fe5a6a7a1b30065dedbfcf50683024a7948505f875055779085b0b9a8f622e71886bdeb0
 EBUILD policycoreutils-9999.ebuild 4566 BLAKE2B 50bb4f9d7a953954612758b59225a6b08812eef9e6aafb27c18194b02530f5c68efa75e1c3daf9d9d52cf741e7b61ea7d6ba0c89430599200bf5fd2ec0ce863f SHA512 60871d3a75b14641e15e7e61e39a1b641b42b5a08e663101930f4ae0140764c61bca3a866dfe692f5546a8146830f043fa4082c5e1fdca10660a6edaa7b3954e
 MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de
diff --git a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild
index 1ac0b78acdaf..a4a2fe831d8b 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 9926cdd58ddf..5d0077681e5f 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,4 +1,6 @@
 AUX qdirstat-1.8-musl.patch 3034 BLAKE2B d2e2d5c6a5c56f3d06153dd5076b32f4c1ef322c98fbc6cc24894bf2dd7e1a0c7a87051f1c4aee506e3076f0c446a247f1b677d41a8e10c625aa36d6e3d643e2 SHA512 668ca90e441284dcca1f1fa3f1841806e0a2b23cfeb04ccd1b1d3a43c5feacb582d70b021d40d3506d998b38886df71ea39ce7d780836adce7db9007fe0f71e1
+DIST qdirstat-1.8.1.tar.gz 8726725 BLAKE2B 5592f6c551cd218faa6bc82433707c6eff531b142d2c5b11f85eb7212a57a4e0c9e8dcc58f76237dee45357628c7076da07849d134805d255dd10b27c5f330a0 SHA512 af7043d52154cfb148d7365eb24d3d728ad7ac03f9e0bd9e33bcd03d040793624f7eba0061c72ba53d4828c5a9f2e717663dc84e01d33ee4d471b7a6a1d7f7e1
 DIST qdirstat-1.8.tar.gz 8720791 BLAKE2B fd1da935e82c7cdb2880e3a1e2902627c7f3e2972d08ae83a7ca49c4f641c07184c791471fb7a62211660f6e9bfb6fd0dc309c26c0fcffa1cad98de029e2b384 SHA512 fb7b757cf08c6b6ec0c14be9b08b8b6784a36e100c3ac89dbaef176ef908e43c47c2788fc4002a5e5f7308c990518cb3a104166e12cec605ff1a586bd7a4af10
+EBUILD qdirstat-1.8.1.ebuild 993 BLAKE2B 9c271d233bbcf8d3fd1d0790ec0ac1fc81126c21e6de6f04cf0bf247fd2a421144d6d1b950f85d979b917605806d5cb9995ca3afa84a343301d8d5eb77e67084 SHA512 c186e7a573de949f2505d170d51fe522780ba7912193437b4a2b804d78d5f767d9d352f0b2386bcbde1effc506980a6da80159cdef0ec3bcc09588f2409b092b
 EBUILD qdirstat-1.8.ebuild 1039 BLAKE2B 0e0dea4df65d195532203ff52ce96a5e670d4aa64a00e1a45bed6c1e285cb2c90a08677f77acd8a5d382a2f315fe805a1aaa818d4b2200c6a326c24279a7ba2f SHA512 7d185f56aa24aff8b0cca6a12e9a66610c8039c6039191ef30a8d31fbabb996e586d74d38ee289d793d4641f17ffb364939335a6094188dd21cdd3b7e5600e25
 MISC metadata.xml 883 BLAKE2B b5a3c4f300c991de6174a8e46c9dfe672e9293713d5174b182d9cce2354840c9afa63aea8d5335e1bae365c12440ac93290a3abe46f7cff5264179835ba0a719 SHA512 5b23f2d2bd68dc0562df3cd78a066980cccedb5f7f3dca98b200b7b0ccf739a4a01a2fe84accd6fa96b2ceed5b35087db915b3cdd0d9af2cd080d4a590f4ce08
diff --git a/sys-apps/qdirstat/qdirstat-1.8.1.ebuild b/sys-apps/qdirstat/qdirstat-1.8.1.ebuild
new file mode 100644
index 000000000000..4345c7d760bb
--- /dev/null
+++ b/sys-apps/qdirstat/qdirstat-1.8.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Qt-based directory statistics"
+HOMEPAGE="https://github.com/shundhammer/qdirstat"
+SRC_URI="https://github.com/shundhammer/qdirstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	dev-perl/URI
+"
+
+src_prepare() {
+	default
+
+	# Fix QA warning about incorrect use of doc path
+	sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
+
+	# Don't install compressed man pages
+	sed -e '/gzip/d' -e 's/.gz//g' -i man/man.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 2e3e5f356ec6..badcf6965f7c 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -2,6 +2,6 @@ AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f08
 DIST restorecond-3.3.tar.gz 18970 BLAKE2B 41c0eed734ab1e89cdfd40fdb0ceff47e1c4bb66354ff78d548a9747c661fbf7ed4b6b3daa1e39325de2a2ca087aca803f073f942f3ac89b71d873e27a1d6712 SHA512 ea2b97d22c1d68aa4ea31d8850f8c9632c0db0d4d666e323c648da896554c6a6fdf6dfa3c105a1df3f1ede9da8cce5ba4c1533b05520846fcb2d584935e5d7cb
 DIST restorecond-3.4.tar.gz 18965 BLAKE2B a77de19d9f00d6e8f384a7ac411257b059ba3ecfefba893eda0e563600002eca705347af364d51037f8b3308bac1c5248bb9326c692175c6c1dc561b18c84bff SHA512 9c6803444445af1592a74177ba2e7cefa1b0e8e3c73d34ef932948598adb38c648dcae8495c951b1badfc587b2d67843b83598c904d924db349b6118560f115c
 EBUILD restorecond-3.3.ebuild 1082 BLAKE2B d004337893dc2363a312366a7c4250158f1396e4d54a7b361d2665a51350f0cce3a9ad76002aa5a32fa5369ddc91b015a85d99e7664fc012eacdead1644af9bc SHA512 47fb0c285c427c1ad5551d0786f90000b85420a16ca52dd1416774a1ee93afdf00e4197d6f91fa51248419a693d4cd2b528c3ad18a99cd668eed1fd0eacd1f9a
-EBUILD restorecond-3.4.ebuild 1161 BLAKE2B 3793aa9799c94c6c92d7b078b57756ede4968821aab7e1227c36555255fd79566a03becd5f1dfafb3943ca8957227181a7727ff835887da625c012dfeeec5e81 SHA512 518d1858f9b89ffd2ee639d49f1736d0ed386ecb44626f05facfad3d5c891378c2b66e6db39e8d669c84b95338c7ca4a369062a903fb60c28aa8f69a4e0dc97a
+EBUILD restorecond-3.4.ebuild 1159 BLAKE2B 1c1ab9295b718f547e9bd16d2cc63c989e0e0bd6747cc4c70ab3710b26f05a7f22e63decdbe247fc0bbf4e533b61e91274154018525a78c4114fec4e5ea8f590 SHA512 6ec7183e2d6796262499685affe118bc854ebfc146ecfa7a301e09f87b2940ad66cbb17c5ef5b5a5585887ee81d528896b3f4646b6f2dfefe209a2142ee769bf
 EBUILD restorecond-9999.ebuild 1161 BLAKE2B 3793aa9799c94c6c92d7b078b57756ede4968821aab7e1227c36555255fd79566a03becd5f1dfafb3943ca8957227181a7727ff835887da625c012dfeeec5e81 SHA512 518d1858f9b89ffd2ee639d49f1736d0ed386ecb44626f05facfad3d5c891378c2b66e6db39e8d669c84b95338c7ca4a369062a903fb60c28aa8f69a4e0dc97a
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/restorecond/restorecond-3.4.ebuild b/sys-apps/restorecond/restorecond-3.4.ebuild
index 92cd1c69200e..92d10b5de119 100644
--- a/sys-apps/restorecond/restorecond-3.4.ebuild
+++ b/sys-apps/restorecond/restorecond-3.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index c39bdf5ecbb2..b8ff4d8affba 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,7 +1,5 @@
-DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1 SHA512 0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
 DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63 SHA512 1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
-EBUILD s6-rc-0.5.3.0-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
 EBUILD s6-rc-0.5.3.1-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
 EBUILD s6-rc-0.5.3.2.ebuild 1115 BLAKE2B 00fed9fbe5865de7315607d24ec115c7f250dbf2002eb665294acee5432014ffa36229f0bcd21bb5b5fbf3cc2add539bc1ac8877f139022a8207f499617fbc13 SHA512 ac171864566939e4314d9043de2e106b49478ce903295fbbd9a730ad5c453960f466921374a5038b89d5d44edc9fa7c66f3bc663985f2739e21805e7deb6c637
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 9638d470a2dc..5b1d25bf1fae 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,5 +1,7 @@
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
 DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752
+DIST s6-2.11.1.2.tar.gz 229092 BLAKE2B 672321d1b9b1b66e7c920a9c587d2ad3a3ca66be7bac0e3f9b4d8290c9d716a3e90ccaac709dbe7ac6525b972ef95429c776805fce3e36fc5b197e9cc826d258 SHA512 31feb2b1704d9561aff9fccdcb284e13f4ceb0f530214db8a393bdc10267801fbe1fc30b4271ad9bdf189dc52e2844f3db40f8f3e9cd438ac12415a51661f17d
 EBUILD s6-2.11.1.0-r1.ebuild 1309 BLAKE2B 21e324158a89d92f9ff05d6188375435d3b254a722ab222f615224a12fa614dbdb0e5f2e7f40c410b6f104710094f6855fda0c8d50e4df505096cafdf22f3e20 SHA512 0e9b27a30c07af081e0fcb189ba7a9aa4eea03c685434a5c7bbe6a228eeca0bf6ff145215114eec7d760b7eb56bac457070396f7a53e0766473fd31813e30291
 EBUILD s6-2.11.1.1.ebuild 1121 BLAKE2B 3f1d0f3d60e2e7dc19380198c82431fa2362efe082980f62baa11b6c506cb004d28a15f6bb34299c107c03e6ebf13f7f671f895b1f2169a4253fb2569fc1eb16 SHA512 9e5335e94e50136c01df285867204dffb20819eab9bfbca8db92a0c8c8889f3cd166dab85f2bf954f92e79cb8986b42e7ce555f3c97f2ef33aa4fa072f4e4994
+EBUILD s6-2.11.1.2.ebuild 1121 BLAKE2B 3f1d0f3d60e2e7dc19380198c82431fa2362efe082980f62baa11b6c506cb004d28a15f6bb34299c107c03e6ebf13f7f671f895b1f2169a4253fb2569fc1eb16 SHA512 9e5335e94e50136c01df285867204dffb20819eab9bfbca8db92a0c8c8889f3cd166dab85f2bf954f92e79cb8986b42e7ce555f3c97f2ef33aa4fa072f4e4994
 MISC metadata.xml 883 BLAKE2B 501518e15b1abd7badfd84007057b30f5ce972d7da8997ebbc218db6aa4001e06500f3b42f88ff259324bd3ba732231275cd33f27baa1588e28b9b80098befa9 SHA512 98b763747501225ebb0a5a1b8fb8a49757bb64c792c572f01c84dbdfe62ae83f03f72cb4ccfb905f58f9d24f06ded96a158602528ee26c1979c017477a4be183
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild b/sys-apps/s6/s6-2.11.1.2.ebuild
index 4c6c8d4c1bca..dcdeeef35af5 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
+++ b/sys-apps/s6/s6-2.11.1.2.ebuild
@@ -5,20 +5,17 @@ EAPI=8
 
 inherit toolchain-funcs
 
-DESCRIPTION="Service manager for the s6 supervision suite"
-HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
 SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static static-libs"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+execline"
 
-REQUIRED_USE="static? ( static-libs )"
-
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?]
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?]
-	>=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
+RDEPEND="dev-libs/skalibs:=
+	execline? ( dev-lang/execline:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -42,20 +39,13 @@ src_configure() {
 		--libdir=/usr/$(get_libdir)/${PN}
 		--with-dynlib=/usr/$(get_libdir)
 		--with-lib=/usr/$(get_libdir)/execline
-		--with-lib=/usr/$(get_libdir)/s6
 		--with-lib=/usr/$(get_libdir)/skalibs
 		--with-sysdeps=/usr/$(get_libdir)/skalibs
 		--enable-shared
-		$(use_enable static allstatic)
-		$(use_enable static static-libc)
-		$(use_enable static-libs static)
+		--disable-allstatic
+		--disable-static-libc
+		$(use_enable execline)
 	)
 
 	econf "${myconf[@]}"
 }
-
-pkg_postinst() {
-	ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
-	ewarn "See the upgrade notes at ${EROOT}/usr/share/doc/${PF}/html/upgrade.html"
-	ewarn "and the documentation for the s6-rc-format-upgrade utility."
-}
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 138c71449ff7..c3a03c2afd41 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,6 @@
 DIST secilc-3.3.tar.gz 181205 BLAKE2B ffccf2e6ea416f6e5a8270a488c6c6ed01b607af20fffed129f5d9b9957f2ab16e90a3fdbd57b597f1195987edf6a2ca1ae561cca62d176a01878fe24900f4b9 SHA512 11b2b6a56d588a71d8cc5b2e69e76579ddd3ea20e036bbfdbeefd8ed64a6dca3c8f963509a96231eb21807a195ec24e4807ef52dc2218ee0410ee0828ad77fa8
 DIST secilc-3.4.tar.gz 181312 BLAKE2B cee26f3b6dc3d7a48df3bd3c9e0edf15f92f55b399afe02d7f4efe10cfd1d8ec140aa5ed588003c6ffca95e1abc82a6163f86edc58ea140703f47ca4bf2d5179 SHA512 f29ff42dd60050cdd4367af38b334876817f8e33ed40a9be89304beea840a210bd9a58d658d0b09f98bad54b12b185a0262ca05094b63e7f96c0142729699c3b
 EBUILD secilc-3.3.ebuild 770 BLAKE2B 0a03a4c536f52d34bb1355ff9ba957170875c41edb11648484469d355ef533ecd8cb2e4083aeba5eb46ac19b5ead308a92b95772d768763801f0e19360690fe7 SHA512 b78f66005b8b7d2672446acd60bca58ea14d3246152d5befae3114be524cd32f6faca8ba03543375b9a5cee3d7fb0245b2d664d0148d0e13a7f630163a9aeae4
-EBUILD secilc-3.4.ebuild 846 BLAKE2B e531168df9007f4095558a294b329af64def434354b6572e04762e4f1804c340b8917c87cd23c4d6d488c253fa445eee83a2f20076116d2ef90f5088c9520b18 SHA512 3da24a91a87b20e26bce7139941fc0870e0f6c88d9382cf31496065c3c604e5c58487cc0a484b7500d7e945bf268bbda49d76b97d8e118db8b1763927e335e97
+EBUILD secilc-3.4.ebuild 844 BLAKE2B fbcd7307cc980fc23dc25a6ec5ba5b62e2016f029d9a35e925d274012a98629739bb608dcea19b49829c6b53826fbd4517bd42e20e2c50fec23dbac55ce80974 SHA512 86a610cc3d1995083945bbb9d732dc39e390cc523fdf4f4f30e529a3006cbb85d1d48e4ca1dcd103d4ae0ac6a98ed5099daaa16d8461c0e0fa143ab48e2e8898
 EBUILD secilc-9999.ebuild 846 BLAKE2B e531168df9007f4095558a294b329af64def434354b6572e04762e4f1804c340b8917c87cd23c4d6d488c253fa445eee83a2f20076116d2ef90f5088c9520b18 SHA512 3da24a91a87b20e26bce7139941fc0870e0f6c88d9382cf31496065c3c604e5c58487cc0a484b7500d7e945bf268bbda49d76b97d8e118db8b1763927e335e97
 MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81
diff --git a/sys-apps/secilc/secilc-3.4.ebuild b/sys-apps/secilc/secilc-3.4.ebuild
index 13b261011af0..f92b22c25b6a 100644
--- a/sys-apps/secilc/secilc-3.4.ebuild
+++ b/sys-apps/secilc/secilc-3.4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index b3754707ea18..d9f79935a946 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
 DIST selinux-python-3.3.tar.gz 2101584 BLAKE2B 603aafbf316b744098bd34c79bf384d55624c086fd75147675a4a0715df3d61710a99d490f30b78d59a2c2a85fcc4db91772c24644a963b31e1a0d305c4bc83e SHA512 a69948a8b139a309f18632440e4204f49832a94b8b6be50e162d3dacb16698effeb1a77c44462e8cc7dc3dd600b887b9ab2fef618c31d3e0fe0de216a6aaebe3
 DIST selinux-python-3.4.tar.gz 3596450 BLAKE2B b98f6ba63814a4281c5ea624b2b0f68c6ae92e4447dd6078a0d70bce34534b0a457f0a9533e1db1fbf665b8a0b379adf78fd8ba8f3ae19973b74a3332157842b SHA512 d601ce2628c4876dc4f2dfccd6db8ff45f68c5eb1b14cec3328644b71959107546469b27dfd90488fc669019b341d0cba708a1797f427ac7f86a0f05e86c0948
 EBUILD selinux-python-3.3.ebuild 3087 BLAKE2B ad27bfc49dd0ad01c181ec159aee9bfd4018b13e4a2dd602d6f35e890a6879dd48c91901760e1ae093d28db3d5b4ead2e9ca92ff4d7f728a85a6b08f3f452af6 SHA512 761646c3a71af22ad4ef51abdb282f5733389471389bfee06c08edcdb3b1360b5087adc1f11530c04ef86bbe65bd3ed1b1a9653034550a743f6582a8a9ea9a66
-EBUILD selinux-python-3.4.ebuild 3166 BLAKE2B 3d433b54b46cb0fbfadd567c3cff7e84a2b9e7b156331f4d4d221cb367f75566909fc91a751347caaafff222a38d8b05a274fcf6164fe518f243afd3772cfb5b SHA512 affe54cc07584e4e5752b74727d419c9715f286067fda42d58589caeb636824dd74302fc6f2510fb828edd8c1a7bc03039d7e6bc67cefd3c5b9c868c43da14cd
+EBUILD selinux-python-3.4.ebuild 3164 BLAKE2B 6dd3199b1a033590815bd23d5a7880555042331791cc63d6bd84242dbeef212ab49fd907f7be8141466f789cf67235a69b8f97c15f17f2f4a13a6a2f00e84399 SHA512 2ad4ed0adc9a72614730e18cbe4ec99554567745151f6df711c203927979b82fd950a326d856d60d74d2a507e7b2801d0d19f241c01f8eaf18a879b9b84cc71d
 EBUILD selinux-python-9999.ebuild 3166 BLAKE2B 3d433b54b46cb0fbfadd567c3cff7e84a2b9e7b156331f4d4d221cb367f75566909fc91a751347caaafff222a38d8b05a274fcf6164fe518f243afd3772cfb5b SHA512 affe54cc07584e4e5752b74727d419c9715f286067fda42d58589caeb636824dd74302fc6f2510fb828edd8c1a7bc03039d7e6bc67cefd3c5b9c868c43da14cd
 MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.4.ebuild b/sys-apps/selinux-python/selinux-python-3.4.ebuild
index edd4c0e29e22..0d89c8211375 100644
--- a/sys-apps/selinux-python/selinux-python-3.4.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index b29b0d6345d7..67be5d0d5045 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,6 @@
 DIST semodule-utils-3.3.tar.gz 14268 BLAKE2B 5b03dd731c28e29b146e9f75fa7ce5151e58df1ea6598356b1ad9ee6846d2ebf7ceb57c740aa0ae4b94e0a7356180bd8e608d6a9543b48251e553036f2b2833e SHA512 76aa0c9322889c7de100f3c5789bdf27b7073827fe2af371bd50a4517baa8442f35e53f16a93227dce93da0ceb054bea7e5ee17a46fe05e06f3c2d9925cf59dc
 DIST semodule-utils-3.4.tar.gz 14267 BLAKE2B 292c9550a5f1bc8b901c7c95fe2dde07068513bf7d358decab65afc2db185996ec905b582691265a63aba7bc47f4e1d6da4c867eb9a9df5b22fc623a716e927b SHA512 3a102eb83e1feff9796c4da572500be1e3a8a8bc8a7eed762ef4144761280f0513050c714aa287b1e4e67d2938f9f9a0ee5036762472d732eae0288b437cb7a9
 EBUILD semodule-utils-3.3.ebuild 806 BLAKE2B cfa2dad68c85bcf6be3aedf1e2c5e6f071d98d98f72c7d48dbdc68896fb5c603701adc03cb52e105ab8063fd8431b8e2362ffb839c853127dc666f3907325f59 SHA512 699229f4a8ad869568eec8145ca1b1d014f2abbf870dde437bcef1c71149d3433383298590c0f9fdad9719b7ee284484e2ff43249a8c000e8b6b4987da1224a8
-EBUILD semodule-utils-3.4.ebuild 880 BLAKE2B 3122abbba2f5fb48d2e756f92380aa362bdcac2794bd566012bfb54c8d74a702d131d1d66b61504f2502758ddd36a9e0e1ef111c6961b1f580a50b87a52db1d7 SHA512 a6583f9fb2527091c65c90fcb10bb93f9635f0e4c9edac977aac3c2964d3460b0baaa39376147f3ca4b39fc4d3528ba244cb7892c5596cc7228c7604599ba33e
+EBUILD semodule-utils-3.4.ebuild 878 BLAKE2B b37f44ec9c265d6a1ffa609671d345520ef9951f66e441a207e2678ec4eb5ea4724718b60253836e213650a6763e4f77f6230037a9390b088115e44559a4cdc7 SHA512 d3d957eb60c170a35a0199fcfd95bfbecc0b102f5f98b1ba22e4c8a6356ccb24ad04a6d9e9af4df5adc0d953940019ba91c9be4364e7bc3f3f12e8780699efbb
 EBUILD semodule-utils-9999.ebuild 880 BLAKE2B 3122abbba2f5fb48d2e756f92380aa362bdcac2794bd566012bfb54c8d74a702d131d1d66b61504f2502758ddd36a9e0e1ef111c6961b1f580a50b87a52db1d7 SHA512 a6583f9fb2527091c65c90fcb10bb93f9635f0e4c9edac977aac3c2964d3460b0baaa39376147f3ca4b39fc4d3528ba244cb7892c5596cc7228c7604599ba33e
 MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5
diff --git a/sys-apps/semodule-utils/semodule-utils-3.4.ebuild b/sys-apps/semodule-utils/semodule-utils-3.4.ebuild
index ce9f168c9c89..bcd7d8f5222a 100644
--- a/sys-apps/semodule-utils/semodule-utils-3.4.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-3.4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index bf13622f748a..2d720da3bbd3 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,8 +3,9 @@ AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
 DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
-DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
+DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
 DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
-EBUILD systemd-utils-250.6.ebuild 11342 BLAKE2B cbef57c68e15fe5fc76e2ba656fa6636d872781b2849c8558a61085e7ef8411b352469acb9b94b45be48fd5e6d29a5ff37fcff9ab2036870b23a811e3cb7af9a SHA512 3b3970ebd790cdcef1511879a1949e788ddfe0ff03866b3e9d5e932341f3e01be48618978559e4179118fdd025e74703bc5bccefce140740a656ea4751c06fdb
+DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
 EBUILD systemd-utils-250.7.ebuild 11342 BLAKE2B 67a094e130be3b21a647a3db3a66ea0b35b6f4292fa98c3e81d6a2ecd09b291ef08efdbb048e73c5b141b1cf815a4d7a340c6b43c65aa6a3f5b31fa962b60f89 SHA512 2d88c146cebdc0ae5344c80cf807507e343e77ca37af9b0c28cd131ce2f532418e13773ae00a712d54302b8196e4b5696c1a213dbb2472931d79e1f8485b4537
+EBUILD systemd-utils-251.2-r1.ebuild 11492 BLAKE2B d32e0222842f5981ee2aab1a3a67b1679e409b195503ad9f7ef185150e5fa2b98504c774f4bbcf5260523309d431582dc75fcf3d67818a981dbaffe40add999a SHA512 b2c1c51130c7ac90a98ae8af25167d2dc47dee6ec92342bd83159898f1a2170b4599c984d00430294cd4ac7895996e7b8682d111ff82148d574e613719b00588
 MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
index dc655fae7a8c..357c32eb616c 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
@@ -21,17 +21,18 @@ else
 	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 fi
 
-MUSL_PATCHSET="systemd-musl-patches-250.4"
+MUSL_PATCHSET="systemd-musl-patches-251.2"
 SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
 REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
 	selinux? ( sys-libs/libselinux:0= )
 	tmpfiles? (
 		acl? ( sys-apps/acl:0= )
@@ -50,10 +51,8 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	boot? (
-		>=sys-boot/gnu-efi-3.0.2
-	)
 	>=sys-kernel/linux-headers-3.11
+	boot? ( >=sys-boot/gnu-efi-3.0.2 )
 "
 RDEPEND="${COMMON_DEPEND}
 	boot? ( !<sys-boot/systemd-boot-250 )
@@ -106,7 +105,6 @@ QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
 	)
 	if use elibc_musl; then
 		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
@@ -141,9 +139,11 @@ multilib_src_configure() {
 
 	local emesonargs=(
 		-Drootprefix="${EPREFIX:-/}"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dsysvinit-path=
 		$(meson_native_use_bool boot efi)
 		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool boot kernel-install)
 		$(meson_native_use_bool selinux)
 		$(meson_native_use_bool sysusers)
 		$(meson_use test tests)
@@ -182,7 +182,6 @@ multilib_src_configure() {
 		-Dima=false
 		-Dinitrd=false
 		-Dfirstboot=false
-		-Dkernel-install=false
 		-Dldconfig=false
 		-Dlibcryptsetup=false
 		-Dlibcurl=false
@@ -268,6 +267,7 @@ multilib_src_compile() {
 		if use boot; then
 			targets+=(
 				bootctl
+				kernel-install
 				man/bootctl.1
 				man/kernel-install.8
 				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
@@ -400,7 +400,7 @@ multilib_src_install() {
 	if multilib_is_native_abi; then
 		if use boot; then
 			into /usr
-			dobin bootctl
+			dobin bootctl kernel-install
 			doman man/{bootctl.1,kernel-install.8}
 			insinto usr/lib/systemd/boot/efi
 			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
@@ -419,22 +419,25 @@ multilib_src_install() {
 			into /
 			dobin udevadm systemd-hwdb
 			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
 			exeinto /lib/udev
 			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
 			insinto /lib/udev/rules.d
 			doins rules.d/*.rules
+
 			insinto /lib/udev/hwdb.d
 			doins hwdb.d/*.hwdb
+
 			insinto /usr/share/pkgconfig
 			doins src/udev/udev.pc
+
 			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
 			newman man/systemd-udevd.service.8 systemd-udevd.8
-
 		fi
 	fi
 	if use udev; then
-		into /usr
-		dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+		meson_install --no-rebuild --tags libudev
 		gen_usr_ldscript -a udev
 		insinto "/usr/$(get_libdir)/pkgconfig"
 		doins src/libudev/libudev.pc
@@ -445,7 +448,6 @@ multilib_src_install_all() {
 	einstalldocs
 	if use boot; then
 		into /usr
-		dobin src/kernel-install/kernel-install
 		exeinto usr/lib/kernel/install.d
 		doexe src/kernel-install/*.install
 		dobashcomp shell-completion/bash/bootctl
@@ -460,17 +462,26 @@ multilib_src_install_all() {
 	fi
 	if use udev; then
 		doheader src/libudev/libudev.h
+
 		insinto /etc/udev
 		doins src/udev/udev.conf
 		keepdir /etc/udev/{hwdb.d,rules.d}
+
 		insinto /lib/systemd/network
 		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
 		insinto /lib/udev/rules.d
 		doins rules.d/*.rules
 		doins "${FILESDIR}"/40-gentoo.rules
+
 		insinto /lib/udev/hwdb.d
 		doins hwdb.d/*.hwdb
+
 		dobashcomp shell-completion/bash/udevadm
+
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/_udevadm
 	fi
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 9266b919e596..887b818a2a68 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,13 +8,9 @@ AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed8
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a31f0f762eb1b9e0272024419bfffd1d8c4dbe9955541df5c1e5a14e1663db3c0194e95a8984e5ec0c8a65eb74d279f021c3ef3d348 SHA512 af38bfed2230a75e03de6831a5202e21af6c01e13670df1a5b1b454203bd9db47428a61aa9cf0a21841a11e7caa889e3f6147342ba5411649e00f334a8e03639
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
-DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
 DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
 DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
-EBUILD systemd-250.4-r2.ebuild 15755 BLAKE2B 5934a91181220d8b80e0302e6b7b2e34efb44739c20cd907bda7d390a1f0aa442b87c270c8907f8bf9ca8337cb2ba9307f9496383fc551dadd837072bf73d9bc SHA512 33881d3746d7bff5e14e55115f883b692cf873cdd23650144b2b356e2635e0fdef6216e5883078f48576ecc80cef02c0bb5f696f9b3f4cc9bbfae5bd14efb7e0
-EBUILD systemd-250.6.ebuild 16332 BLAKE2B 02a861c7d18856a1153b84caba100bfa57c064ab2c62fc804d3acc188f0c2d95365d48123f380216505e3ec94a7537b8c88b54ab5e1204e4be7c51d53ca1273d SHA512 76e38f8e889dc0b5dae9951dcbe8b113c9482b1c5b1f133c1be358fe6177597bc69f80f819da5b20cecd08335d346a9c541ec32f2f29f6969a5234d4fd1aab37
-EBUILD systemd-250.7.ebuild 16367 BLAKE2B 503095e43681f2a91fcd6960618e8797fd7cef70d1ac8c4073425b2e5d5f0fbcc58c13c4fa758cbef43d8a835c70654e6cdfffa73511f800a8cc18fcc7ba320e SHA512 ac6d5964b0a5b812dead1b1d119473e27d80f12a11329c058303caba5cfb6726be3442e80ecad2dd895f81c9bf35e71e96d64698e572bf2e92d3ea4d32e83cf5
-EBUILD systemd-251.2.ebuild 15623 BLAKE2B 003543cc788018617ca266f2e9aa445676b81eb94e5e30aa4440037fd8b12ab16f340aca2da4f49be4846c607631cd96566a8f673281512f6f4c7ebd836a3a27 SHA512 e48e06ebfbcb334397907c3e3bdd5edbb0cf82df4cd983c568e5fc151f7f39489b63431f34477cd443218b200678165d3e7f9c0c9d0554825d35375d715a8a0e
-EBUILD systemd-9999.ebuild 15447 BLAKE2B a29df698c2ed2f54fe0d694360086b865b1578bc0e2792ceb69be38e8d52a57f080794254612c67ad6d2a3018139fd76a98e9e92d826f586e238387512422f28 SHA512 50a8be318610b0a01734bd746823820f259ad17a5cdf5a40919dda49e4c7fa5e0abab77dcdc7e15924fd3cbb78f50bc525aaae4061e7a6b916d3b54326abb970
-MISC metadata.xml 2594 BLAKE2B 9ef88b77dba5d66b6902cbc1a4f104e783fa530f7148f48692992dbe2edf8a88a3d96993f6ecc34708ff49f7e7b4d9bbcf001fad6ca5a8d097030bc83b9b3b57 SHA512 22bfbaaaa68142286b36005b685d6955c68b71df064e412f0edbd858c9610c6ad76b5d970292d30b06eb536a9a140af307a3b4fee897b7f281cee00083472430
+EBUILD systemd-250.7.ebuild 16382 BLAKE2B 465a4e903c31401e7f0d8804dde61cca9df52176719f71f3f7b6997620ce01e6720bcf9a6505cd3cfe0cf399f6f215c4851a39683e04b1e47f6e4f500fe85018 SHA512 601674acd39e5b6135bf7c0a3495978e54254f590cefc1882f978830829e29d2ed848a3c9749477a7331e3c68eb59beb74e61dd1cbb89ada91b072bbb366325d
+EBUILD systemd-251.2.ebuild 15632 BLAKE2B 727b7d1d29c06a47fd7d5ff9f9b8c52d81420e8aaa1f3e9bbbe4f25a56aa97e3124196b64b847ebe46b38cc1de573aa6fd5ef6cc059b294a5266c9c4dc36b48a SHA512 b9115f1a979fc23e6ee693ba060e630a7c9e1de44d971222f15018c5dd7875602bbff1318973469867a24399f806845737c8e6d52010e786d557ac7e5f8f9a20
+EBUILD systemd-9999.ebuild 15462 BLAKE2B 1208bd9c96e23d479a545385db048e9f9aac405a5b011fe8de6af40e190ad4e855d69136bab6874d0e152baf5e22b2e03cd6ceb31a0d654c6cc1b7690a625d05 SHA512 1360af2b5fb12c687a773a572fa8a31f03efa7dc949ffae1ceb0f24c10b9e9f7792816f5e2362e9d82b315a6280c5bcddfff2514e33fbc0ffcfff1e0547fee22
+MISC metadata.xml 2693 BLAKE2B 20bad229300b6a8df613533c9a66f75364cfc1eccf046999c8fa5646737afeb9b1c048b9954f0f81597b78d51db3a5f5de3416ec46bb997eaced90efb6c3388f SHA512 de6869537d64417c78a41650137cb16e7bc39585fe464befdbc6efca57edfb72bb597d30fd5df1af611390d21114ef80b2c9cafa80fe85da1c563133f1fb8d68
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 0d8cc3d2f286..b6426bde80a1 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -23,9 +23,9 @@
 		<flag name="hostnamed-fallback">Enable setting hostname with networkd/hostnamed without polkit (requires running <pkg>sys-apps/dbus-broker</pkg>)</flag>
 		<flag name="http">Enable embedded HTTP server in journald</flag>
 		<flag name="importd">Enable import daemon</flag>
+		<flag name="iptables">Use libiptc from <pkg>net-firewall/iptables</pkg> for NAT support in systemd-networkd; this is used only if the running kernel does not support nftables</flag>
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
 		<flag name="lz4">Enable lz4 compression for the journal</flag>
-		<flag name="nat">Enable support for network address translation in networkd</flag>
 		<flag name="openssl">Enable use of <pkg>dev-libs/openssl</pkg> for various features</flag>
 		<flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>
 		<flag name="pwquality">Enable password quality checking in homed</flag>
diff --git a/sys-apps/systemd/systemd-250.4-r2.ebuild b/sys-apps/systemd/systemd-250.4-r2.ebuild
deleted file mode 100644
index 2c6f143758cf..000000000000
--- a/sys-apps/systemd/systemd-250.4-r2.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="
-	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
-	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
-	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
-REQUIRED_USE="
-	dns-over-tls? ( || ( gnutls openssl ) )
-	homed? ( cryptsetup pam openssl )
-	importd? ( curl lzma || ( gcrypt openssl ) )
-	policykit? ( !hostnamed-fallback )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
-	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	openssl? ( >=dev-libs/openssl-1.1.0:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	hostnamed-fallback? (
-		acct-group/systemd-hostname
-		sys-apps/dbus-broker
-	)
-	selinux? (
-		sec-policy/selinux-base-policy[systemd]
-		sec-policy/selinux-ntp
-	)
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
-			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if kernel_is -ge 5 10 20; then
-			CONFIG_CHECK+=" ~KCMP"
-		else
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		fi
-
-		if kernel_is -ge 4 18; then
-			CONFIG_CHECK+=" ~AUTOFS_FS"
-		else
-			CONFIG_CHECK+=" ~AUTOFS4_FS"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}/250.4-random-seed-hash.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		$(meson_use split-usr)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		$(meson_native_use_bool gnutls)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
-		$(meson_native_use_bool openssl)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	# workaround for https://github.com/systemd/systemd/issues/13501
-	if use hostnamed-fallback; then
-		# this file requires dbus-broker
-		insinto /usr/share/dbus-1/system.d/
-		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
-
-		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
-		doins "${FILESDIR}/00-hostnamed-network-user.conf"
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-
-	if use hostnamed-fallback; then
-		if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then
-			ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run."
-			ewarn "To enable dbus-broker.service run the next command as root:"
-			ewarn "systemctl enable dbus-broker.service"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-250.6.ebuild b/sys-apps/systemd/systemd-250.6.ebuild
deleted file mode 100644
index 56fa2b1cb927..000000000000
--- a/sys-apps/systemd/systemd-250.6.ebuild
+++ /dev/null
@@ -1,554 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://systemd.io/"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="
-	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
-	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
-	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
-REQUIRED_USE="
-	dns-over-tls? ( || ( gnutls openssl ) )
-	homed? ( cryptsetup pam openssl )
-	importd? ( curl lzma || ( gcrypt openssl ) )
-	policykit? ( !hostnamed-fallback )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
-	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	openssl? ( >=dev-libs/openssl-1.1.0:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	hostnamed-fallback? (
-		acct-group/systemd-hostname
-		sys-apps/dbus-broker
-	)
-	selinux? (
-		sec-policy/selinux-base-policy[systemd]
-		sec-policy/selinux-ntp
-	)
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
-			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if kernel_is -ge 5 10 20; then
-			CONFIG_CHECK+=" ~KCMP"
-		else
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		fi
-
-		if kernel_is -ge 4 18; then
-			CONFIG_CHECK+=" ~AUTOFS_FS"
-		else
-			CONFIG_CHECK+=" ~AUTOFS4_FS"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
-	# wasn't backported to 250.x, but it turns out to break Clang
-	# anyway:  bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		$(meson_use split-usr)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		$(meson_native_use_bool gnutls)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
-		$(meson_native_use_bool openssl)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	# workaround for https://github.com/systemd/systemd/issues/13501
-	if use hostnamed-fallback; then
-		# this file requires dbus-broker
-		insinto /usr/share/dbus-1/system.d/
-		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
-
-		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
-		doins "${FILESDIR}/00-hostnamed-network-user.conf"
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-
-	if use hostnamed-fallback; then
-		if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then
-			ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run."
-			ewarn "To enable dbus-broker.service run the next command as root:"
-			ewarn "systemctl enable dbus-broker.service"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-250.7.ebuild b/sys-apps/systemd/systemd-250.7.ebuild
index 92bbec7305b4..6c099f218fd6 100644
--- a/sys-apps/systemd/systemd-250.7.ebuild
+++ b/sys-apps/systemd/systemd-250.7.ebuild
@@ -35,8 +35,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
 	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
-	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd iptables +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
 	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
 "
 REQUIRED_USE="
@@ -72,7 +72,7 @@ COMMON_DEPEND="
 	kmod? ( >=sys-apps/kmod-15:0= )
 	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
+	iptables? ( net-firewall/iptables:0= )
 	openssl? ( >=dev-libs/openssl-1.1.0:0= )
 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
 	pkcs11? ( app-crypt/p11-kit:0= )
@@ -328,7 +328,7 @@ multilib_src_configure() {
 		$(meson_use lz4)
 		$(meson_use lzma xz)
 		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool iptables libiptc)
 		$(meson_native_use_bool openssl)
 		$(meson_use pam)
 		$(meson_native_use_bool pkcs11 p11kit)
diff --git a/sys-apps/systemd/systemd-251.2.ebuild b/sys-apps/systemd/systemd-251.2.ebuild
index 04abbae40454..9d3fba7f4bd7 100644
--- a/sys-apps/systemd/systemd-251.2.ebuild
+++ b/sys-apps/systemd/systemd-251.2.ebuild
@@ -23,7 +23,7 @@ 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
@@ -35,8 +35,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
 	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod
-	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
 	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
 "
 REQUIRED_USE="
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 	kmod? ( >=sys-apps/kmod-15:0= )
 	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
+	iptables? ( net-firewall/iptables:0= )
 	openssl? ( >=dev-libs/openssl-1.1.0:0= )
 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
 	pkcs11? ( app-crypt/p11-kit:0= )
@@ -326,7 +326,7 @@ multilib_src_configure() {
 		$(meson_use lz4)
 		$(meson_use lzma xz)
 		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool iptables libiptc)
 		$(meson_native_use_bool openssl)
 		$(meson_use pam)
 		$(meson_native_use_bool pkcs11 p11kit)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 0b4f28e4c6b5..b3bc091078ab 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -35,8 +35,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
 	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod
-	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
 	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
 "
 REQUIRED_USE="
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 	kmod? ( >=sys-apps/kmod-15:0= )
 	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
+	iptables? ( net-firewall/iptables:0= )
 	openssl? ( >=dev-libs/openssl-1.1.0:0= )
 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
 	pkcs11? ( app-crypt/p11-kit:0= )
@@ -322,7 +322,7 @@ multilib_src_configure() {
 		$(meson_use lz4)
 		$(meson_use lzma xz)
 		$(meson_use zstd)
-		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool iptables libiptc)
 		$(meson_native_use_bool openssl)
 		$(meson_use pam)
 		$(meson_native_use_bool pkcs11 p11kit)
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 14ff3012e322..adc2c2049cb5 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,8 +1,10 @@
 DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69 SHA512 507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8
 DIST toybox-0.8.5.tar.gz 2378469 BLAKE2B 9054c07fd8bd477a4995b14fcea091a1602b039216ec9acb4f60e39eb10bba88924c19084c7e28d4c0b7cd72b0e0ab46a892cd427909e073dfad3e2f7416d600 SHA512 deb3743a10278ba236e95a1f3995555c745c2909381d2692a42920615c002a5cc6f9cccffee84ec2fcf1188d8f8c0a11e2b7f6a7798f0b7f5d33a0c1c3149237
 DIST toybox-0.8.6.tar.gz 3458765 BLAKE2B 2ff0b898758660c242dd9fd11c5911840ce67122214bed6e3ba8af3dc2b3dbf3c0c467863ca69392e473db232130ddba9cac2d888c20990e2e02181be76afe25 SHA512 2d8f9cc3a6bd7ee5bd4bce77399916aa90cd8acb90448f4e1b79c605c7f854c19016f5eb3704f112855c8347e69f0f4dc42f9755dd2ec975ac7799d00bc597be
+DIST toybox-0.8.7.tar.gz 3479081 BLAKE2B 5ccf1fe67cfb1cdc4a86656ca7a6161dfe13e55881b65c2f753d87446d4fd323558384e1dc6e7c8742630e2fcb479aec2c939870e5ab5cd8f8352de920673968 SHA512 a32a764c393edad55fe2e17120daf5b098e42886659a9dc15186db2795e980024be24c6276b4c5936733d3769a90bbf3918251c515450ec3eafb7a50ca8cc59f
 EBUILD toybox-0.8.4-r1.ebuild 1107 BLAKE2B 358ed22338fb171dacc7188c253d2e2d420fb71a40b7e89fa2dc4d6bbe8826753ce427cf197190016027a85a8864f92cc49c9b039a927c28ee3c5914e179391b SHA512 4e01be739c890495cc1bfe74efbe6675842f56007010efbb3da2355de3b6fe9d875afb1cff93c8ac1375b116f03901777e65bb3fc4b40df797c122999d27f4c3
 EBUILD toybox-0.8.5-r1.ebuild 1114 BLAKE2B 174a11d313c342e074a47aabb35823e708953cf06170dace5e1e1cea8bf1af58e9a0ea26342bf85b4363291e606e721090c97009d7ec8e8b1c8772fe14f7c7a2 SHA512 cd8e18c9a13aa708f86a38e1ae1e687900b5b5a6737d235c452dc84cdd81ddebfe04d01d5eab7e47864b2e05c7b46d77df6fa128600b68280cb8ba889a1c2d6e
 EBUILD toybox-0.8.6.ebuild 1114 BLAKE2B f9f4948b3f1a9562c80cdd066bd9da468d90e39b3b9bedb290da9eadeac55570fc1728006d63126769c84e584a45a31f78b926a033d69ad926fc816669fad08a SHA512 ee34140a013e4d3dfa844bebbb6fcd53d3c9855c9e66e0b77ce7f6b982fb7a828000266de3b414a1c7997cb1cb66ad42b3bded0ddfd2d48df2f3b418e900e0c2
+EBUILD toybox-0.8.7.ebuild 1114 BLAKE2B f9f4948b3f1a9562c80cdd066bd9da468d90e39b3b9bedb290da9eadeac55570fc1728006d63126769c84e584a45a31f78b926a033d69ad926fc816669fad08a SHA512 ee34140a013e4d3dfa844bebbb6fcd53d3c9855c9e66e0b77ce7f6b982fb7a828000266de3b414a1c7997cb1cb66ad42b3bded0ddfd2d48df2f3b418e900e0c2
 EBUILD toybox-9999.ebuild 1107 BLAKE2B 358ed22338fb171dacc7188c253d2e2d420fb71a40b7e89fa2dc4d6bbe8826753ce427cf197190016027a85a8864f92cc49c9b039a927c28ee3c5914e179391b SHA512 4e01be739c890495cc1bfe74efbe6675842f56007010efbb3da2355de3b6fe9d875afb1cff93c8ac1375b116f03901777e65bb3fc4b40df797c122999d27f4c3
 MISC metadata.xml 254 BLAKE2B 0e6d918ec0aa523a1d7ff2da1c9081d8257c2a83396bc5c7033412341b400364ee2d9b155d9d1df05da92b11f6a940dcda2adae7c158e479d082ce4a0583971b SHA512 24b045489397ba3bcd9dc48dbbc8a26189c1220053c04f09035dd735d2a3fb2ad6a55791f943f4502fee20c633c4a30983b76093f31ce752994f424fbb3cd21b
diff --git a/sys-apps/toybox/toybox-0.8.7.ebuild b/sys-apps/toybox/toybox-0.8.7.ebuild
new file mode 100644
index 000000000000..6bd1e37d8b83
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.8.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/landley/toybox.git"
+else
+	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="https://landley.net/code/toybox/"
+
+LICENSE="0BSD"
+SLOT="0"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	restore_config .config
+}
+
+src_configure() {
+	tc-export CC STRIP
+	export HOSTCC="$(tc-getBUILD_CC)"
+	# Respect CFLAGS
+	export OPTIMIZE="${CFLAGS}"
+
+	if [[ -f .config ]]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		einfo "Could not locate user configfile, so we will save a default one"
+		emake -j1 defconfig > /dev/null
+	fi
+}
+
+src_compile() {
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	save_config .config
+	newbin generated/unstripped/toybox toybox
+}
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index c9b005612a1d..65b5fb1234c6 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-dbus-proxy-0.1.3.tar.xz 119896 BLAKE2B c789ad697c1cda84a4cde2c84b90370869bdaeb76736c2891270a58834296e3acbf83b311ba153a0d1e9f3266de0cc1eda63866e2808dcbb4aeac451f90da7f6 SHA512 bb730366efca9d0d199983063dd5cd7b8a8aac8d9efd8e3d6b6090166e5e09a74ef241a07388cfbb2f108e66b3a29114671a6d955324626aebefa1d6c2423632
 DIST xdg-dbus-proxy-0.1.4.tar.xz 122112 BLAKE2B c7d2898b703c51d6b53838996a0ae74e7a4e163b9611e28dfded54ab1a44c0473fa25daa13e94977c918544e0741bf0dd4747dfcae858468bc4abd288613cb8b SHA512 d50fa916d07f23e080ab53cf290b5d6db73cfd8262253a48b9f012ce6c182e201d0a67efaeb7f28a844d3ef146aa48936dfbe4279a59b909a6dc4419d5f15b04
 EBUILD xdg-dbus-proxy-0.1.3.ebuild 621 BLAKE2B f972dcbee8a8acfead30601ddc92388f26cc7d4b5a20ed3e3690d1f38cc66daf1eff676279d6dac6a7bff11de95af2f211bab3895d1d49f93a9f3f15b9c9da72 SHA512 95cecbb2dca547bc3b7822ce00fbf9e03e295d1a55c383bc4605db481dfe6332c126c8b548aca8c428f0b9f8744a1ef3600d43967064eb6818010a9e42cf36fe
-EBUILD xdg-dbus-proxy-0.1.4.ebuild 708 BLAKE2B bca9efa9b55c47828cbb291650d5b47e9ff20b8e06412d24c5c36d61d44e331b8fc1ca34e05b40658c622f3531b9c93debe2ff29ba1e946449c5bccf01dcb686 SHA512 b69d192cc74ec0f4ab97c4903705d7f1a805ff0649923f1b707218d7d9479766091f8cfb20e4bdf2c5ccd90273dc19b01fc7d3c93b79c344f0a88f807cf29049
+EBUILD xdg-dbus-proxy-0.1.4.ebuild 706 BLAKE2B 45903bbf3ffc56573a761245ad6de482f2a89654db7fe8f2488303f5d5fc0c413004b0d6e0c1c0443e7f2c8e7b584f403e167816379c6823b26b248040d73d1a SHA512 73dd51767ce9fb5b1c146b96f1568831678478e228e6ea913dc1aeb31275d0b0dc2b4f62653784342885deb74e0b44d612c28f7674e760411f038998fc4dbef8
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild
index 23744c014949..fa969cdd616f 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/xdg-desktop-portal-gnome/Manifest b/sys-apps/xdg-desktop-portal-gnome/Manifest
index 532bb19608a9..c3f9300105ff 100644
--- a/sys-apps/xdg-desktop-portal-gnome/Manifest
+++ b/sys-apps/xdg-desktop-portal-gnome/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-desktop-portal-gnome-42.1.tar.xz 117932 BLAKE2B c0c6dc7e4efbfda8996d63c191228ebf867e3fe11a0ae031b5bfd4298a33ab3b9cb9d9cecc36c1b41eeb33c54bd3bca17149e641c1131f0be7dcb2dbdf42eda8 SHA512 6843fd10e7e70f3d09c2a9b1397288f553fb44bcae30e7992790fddbc92d6c5cc966c27b7f294e2de1a139d3893c009f1480855d66c873a13861f3fe4abecee7
+DIST xdg-desktop-portal-gnome-42.3.tar.xz 119228 BLAKE2B 1cafeda9e9ad5431eb52520db19350e9ee4c9f65e0923f6f320561893a29e32fc5033f3da540dd492c3341a8cb6bf29687cbf04b027e68ee388d102ac7023cac SHA512 0704eb29af5464fa0598cb4a05451866c8bacc20ad0638f7e799e7abdb4bbd86c41efbad963c493767190ae55f9d9c5d28360ee5fbbe1c42881969d03c7e84f5
 EBUILD xdg-desktop-portal-gnome-42.1.ebuild 828 BLAKE2B dec0a3265b8df2219e7a5a94ee4760bf83664f0295c55e3c209d4388eee9f5c83e1cdf02d90b02ab4d48c5c47ba8a8ac603e66c9bbd8ac6dc70570d6b851a028 SHA512 bb2626878286461bf2827aeb8468dd881bb5acff33a491a72e1125c637617fc234268b1591878c8b4a88a30147411727214bc9294f958b057df939c709de346c
+EBUILD xdg-desktop-portal-gnome-42.3.ebuild 826 BLAKE2B a7ef86a5c27fefdf0e4c9a362dd3272911718f2769d808f1a652ba5acca1289a6d4ce1d88a438b1df47736a4934874a1ffdc33592e228066af0f6d73a0759f30 SHA512 7484f0ca70a6410dd4243538b909d7913d1af000b010a8e2e9e962ffab7278bde5ebfdd09f68c365b62b872b34a4cc682afed5759176a8285d8874b1c7ba409d
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild
new file mode 100644
index 000000000000..13493ee5f082
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson systemd xdg
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal using GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-desktop:4=
+	gui-libs/libadwaita:1
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.7
+	>=sys-apps/xdg-desktop-portal-gtk-1.14.0
+	gui-libs/gtk:4[wayland?,X?]
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+
+	meson_src_configure
+}
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index e9f709f63936..a76bd6af7b41 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-gtk-1.14.0.tar.xz 381316 BLAKE2B 73a1e1d9944c4776ef2ebff33b26559767aad10784e9518690d31575a6216014bd0c518bde9a3b4e92d6a7edbf1aaa3510d669a025b7574c4df978f7c24b83ac SHA512 b0ba54e1ddbdfbd22b8b31bf4ece261dc0beba303e642f10afc72659dd5477438a30688c9d018e3d1ed2adbc053ddf4e3a2d70de8cac03d9519355772862fafc
 DIST xdg-desktop-portal-gtk-1.8.0.tar.xz 370196 BLAKE2B d15a054e8fbc74718db7ad2d0f7b53c86b392e729fb4d5b8bdd87b16c0ebbf4feb11b29bc27da12990b351f520faa23bde694721819589513b6cfd1e4ea2f092 SHA512 832b3c4cb9ea738f2ab7641fbd7e14beaa5f6a1ae88f012cd44b12f4bc51588f61868b5982301e3dfd67965d6a69fd8669a9832b6ec7017168d611c87d76689b
-EBUILD xdg-desktop-portal-gtk-1.14.0.ebuild 1345 BLAKE2B fa3f5458397dd25dcf4e0ee0e1ffc000d46355371d142c2a4e523e10cd107c301ec8d8c61e7209b5144b74a51e5132572f0be774340e9e3de15cfea1e7f834b0 SHA512 97073a0538e7fb9b54c12ff5a8422e66774cb7ca2db8e5ea3c3865c88dc49d3cabffe609cecfac4ea1a8790ce738543f296c9e99d1a275d8972b7870bc2e1bb7
+EBUILD xdg-desktop-portal-gtk-1.14.0.ebuild 1343 BLAKE2B 27019a6bf5d1449163bcec4b58368bfce5f2a688be12bbcd65c1d9adbd78bd5fe11025ef5c863defbdbd0a6d838cf50b20e99370ff1ba406141592a32bf354de SHA512 99b165ed594533b3c53069ed0d1a476dfd0f9bec3495b9491822fe1c3e5aae403429198916ff19410811734e25b722b9addff6acdc9c01db4b31e3666eb58354
 EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 983 BLAKE2B a08a593be0d458d342b1a4b00abd38f6a20e09812b5219d75fe268c02908e9f2abd26727e220c8da1808341144e17ea000f9fb7136b45ba13418eb76effd24a4 SHA512 666f331b55f8c55475e559576c5321bdd998f413cc6e1ac9b4ba5e6fadbd993cc4f69878af5663ddd41331e98e87606e02899499ff22a1ee75500a3252ddcf33
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
index 011da45afd39..5fde4a3f7c46 100644
--- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="wayland X"
 
 BDEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /sys-apps
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)