gentoo auto-resync : 28:10:2022 - 22:00:04

28 files changed, 4 insertions, 3108 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b69c35c333a1..2b2cc98c6015 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 623a227e9a7e..274ab6022dcd 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,9 +1,6 @@
-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 2464 BLAKE2B 716f727ffde58b81969dd0a6645ca67278bc0cddb8b11b5c78b2c3a6630143d3212ddb30c2fafefbbd1ce64590cd24971ab47762aac7f5aec313c6ac855117cc SHA512 9f9b445abf5ae9e702b8ae0fb1a043a29c4702eb97dde834923d429c8d222c9e47d4e669dfc9d7369d657fbaad2bea8249864dd535d584bc595de24c8750077e
-EBUILD attr-2.5.1.ebuild 2495 BLAKE2B 290d82c439e0096b6ac5be07258d87d3c05b56500fa81b4cf610e322505a5cb302c3e5900f59b363c7cfd3ae1bf315f19bfeed7968c95d3c9cc222b8639c5498 SHA512 201868f12414b9662b5edfdc19827c84a9cd967295b6752eeb38e4c52472ea73cc5caf04bba52c08d55b15570d71cb730e283b8f3ebebbfbc159cf0f27c20eb4
-EBUILD attr-9999.ebuild 2632 BLAKE2B 0626b192ef6a6f81dec7186ab4c1a9a4352d9c99b684f0872c2a1f6709d156316bbca932fba7355f9c5596a15b92bd065a56507ef5a041757b1a46daa4c2c96e SHA512 e76b292dcbe879d2d79987e00528c25c9fac831ff391fc9d0adbba51533402a068c5a01449750e22433c858c57bde5b4c2bda11d226f5be625f7df7b16d6f9d4
+EBUILD attr-9999.ebuild 2472 BLAKE2B 430e20284e07660e229d68511dab14c65176f25d76cca30bd1c1b617219a8880b4bc3166d27fdec6e10b2adcbe768f5abe237f9fd09b66e16c9a733030c85623 SHA512 f3076c16dd948b5e4caea3b731e03bb9e35aa36856185635901dcdb00a4bea7b86d6bf727aa4301cd934316d0755aa1012e8bdcfc1558698126647f2bddd36ea
 MISC metadata.xml 337 BLAKE2B c04cc7c99b3d9d39870605354acd4f0a4b03d47e79228f444e915ce17abd2eb075418919dc3272903fdd524f56588ef194d7cdbd43f2b040c4f6a9d5fa2eebee SHA512 e9ba5573c84dd1b2cdce5b74e53b731c1ba4b3e72bca569f3febc77e431b96982cd83a71720e021ba23e8d6fd23f9dbea43a6c8d94b2b6ce1b3d26fda038d6de
diff --git a/sys-apps/attr/attr-2.5.1-r1.ebuild b/sys-apps/attr/attr-2.5.1-r1.ebuild
deleted file mode 100644
index c8051fdd82e4..000000000000
--- a/sys-apps/attr/attr-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# autotools inherit only needed for 2.5.1-r1 patch for symvers
-# hopefully in next release
-inherit autotools 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-fix-symver.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		# bug #580792
-		#elibtoolize
-
-		# Temporarily for 2.5.1-r1 for symver patch
-		eautoreconf
-	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/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild
deleted file mode 100644
index 0d212005d512..000000000000
--- a/sys-apps/attr/attr-2.5.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool 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
-	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="
-	sys-devel/binutils
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize #580792
-	fi
-}
-
-src_configure() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-	tc-ld-force-bfd #644048
-	append-lfs-flags #760857
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(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. #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.
-	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/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index c8051fdd82e4..2046677daddd 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=8
 
-# autotools inherit only needed for 2.5.1-r1 patch for symvers
-# hopefully in next release
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+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"
@@ -27,7 +25,7 @@ IUSE="debug nls static-libs"
 BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-fix-symver.patch
+	"${FILESDIR}"/${PN}-2.5.1-r2-fix-symver.patch
 )
 
 src_prepare() {
@@ -39,10 +37,7 @@ src_prepare() {
 		eautoreconf
 	else
 		# bug #580792
-		#elibtoolize
-
-		# Temporarily for 2.5.1-r1 for symver patch
-		eautoreconf
+		elibtoolize
 	fi
 }
 
diff --git a/sys-apps/attr/files/attr-2.5.1-fix-symver.patch b/sys-apps/attr/files/attr-2.5.1-fix-symver.patch
deleted file mode 100644
index 55ef4506f7de..000000000000
--- a/sys-apps/attr/files/attr-2.5.1-fix-symver.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-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/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/coreutils/Manifest b/sys-apps/coreutils/Manifest
index d9bdb1d8bdb0..aca2f0b264f9 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,17 +1,11 @@
 AUX coreutils-8.32-ls-restore-8.31-behavior.patch 2824 BLAKE2B 7df44f4e330225a429678b3d5f20736d7c5c4f7d09f51f71d7e1111c3181d494aa12796c823244473063f7905aef35b74703860343c5e30f38520ee340690ede SHA512 6d55806aa16e0f654b15bfefb20f2c16193c7e9fcf7c087309b3254272d20467dea69ac53fff345b510751e165c33197c3053b7308578f79492afba0a1eeb6e5
 AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174ad6dd3157be16a28c527b37d1c58b421538a6238e93317689e6cd35b7dc5a0f480a4322c432986697a9e0af60019650eae92c0a SHA512 fd3573cf5a4b4fbba132d0fac5ad6eb4af5aa548a8c0c747653e47acfb97c01e31d7430db543df47d9a2680792d2583de70e1f1d49b2feb75887e9f8638527b7
-AUX coreutils-9.0-fix-chmod-symlink-exit.patch 1133 BLAKE2B 28a3adfb2c8b4e8d557a713d9e83fb61672e74dbc7dc8a8f7adf497825be0e53e1c08bff37122750a6144da70737af558dc018a06816e279879f31daf746a4d1 SHA512 392b94d55c5864e5de637567f7207e5c789a722710c29bead72c41b9f85f535f96f84f4abc64b35ee218c5ec5bc129837a65ec95cbb88113877b302823491991
-AUX coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch 4718 BLAKE2B a4a8ab721a277fd3eaac7d64c8a8cf1918c14c6d494f5ea35646d737299c7d2a84d177667984cf7ed8bb860388571f847a3f0cbb45c661eb114b378596f83259 SHA512 bb425eaae25b1035e9e4899801f3735804404fab2392d2545ff8213201c5f7dffc112cfab63e650e6b86cefccec661c8d991b5fd2310ae4a442abf9be7d27398
 AUX coreutils-9.1-fix-rename-simple-backups.patch 1343 BLAKE2B b284b2b7d33fe7650a4ac8723ca5566e819cd4f4740394cc549562a03fe7ed95d29cfb688a9e5513edcea1f9d5f7b72f1a530f9bf5093ad4dc6534a494e9f91c SHA512 900128c08b096c39302193855fdbb980c54597acf3349b9014ced500e344b7f47438722342e3a7d68f8c4588632769a11165c5c06796993d3b9aca019de8468a
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
-DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30
 DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
 DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
 EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B 37f5e49a8d45706ea17779f841523c5f876f29cd9d9d2c88dea33136b249c89853dcea87417f7e4b8c040e9a4b7d1691704301d11116baa567c0cb2b9fa0e17e SHA512 5e2b09e5e4fdb4c34aa0c75b8fbb6aadba98d93063aaf6eff01854e1a1527b9757c73ce35b8da17fe3eb480e04bff88d445305d95ad248bc9461723a9699e33c
-EBUILD coreutils-9.0-r2.ebuild 6544 BLAKE2B 75fbd687caf46c2bb97e5e6c9e81e8900a6041c4168770b1296df7095fb59e20c5a0b7c81145d14dae7c8dfe105024feb662ebf2fa7820216045cf043b3188e3 SHA512 28f0d629f7b18463217bc2d9efb4cf5d4ea74994de6ed9525a8bd22573c4d8b66cd05f52d049e02471ac0c242560b6d74214fce231841cbc16feef775404e83e
 EBUILD coreutils-9.1-r1.ebuild 7045 BLAKE2B 2511f0f6385dd1e9c4c6073a6a6fe370d4461708feca146603f203a6ec662adf92aca12ecc615dcaa4ce97b645b8f078db2117722305e9dd3a9c8cf276878c66 SHA512 49f93061af61f78fe51a078710ed1cbe745a5fd8adb52ad4a76de3b093c5d446a242acf6d0226451c5b8c655d34601b40571f09aae8c71fcd47eb7e74d6db68d
-EBUILD coreutils-9.1.ebuild 6778 BLAKE2B 0aaf6c5838efd7ecefd3644404972a58a87b26bbe453f3eba0cec31121ca4fcd937992fe7e369a78334c841c6e3e4efada538cfff24c765030f8c66c9f6831c2 SHA512 faeebc82ab7e02c92b489398622f76a86345ef24c7644f3611c0f60732537aaed850ff3c15e1b9bdfdac5df6225cbb77f944f218ee5f2723b477352afb9c1986
 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595
diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild
deleted file mode 100644
index f759f70394f0..000000000000
--- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-PATCH="${PN}-8.30-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	!vanilla? (
-		mirror://gentoo/${PATCH}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
-	)
-	verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( sys-apps/attr[static-libs] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		dev-util/strace
-		${PYTHON_DEPS}
-	)
-	verify-sig? ( sec-keys/openpgp-keys-coreutils )
-"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		# Upstream patches
-		"${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch
-	)
-
-	if ! use vanilla ; then
-		PATCHES+=( "${WORKDIR}"/patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch )
-	fi
-
-	default
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	#
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1} || die
-
-	# Avoid perl dep for compiled in dircolors default (bug #348642)
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h || die
-		touch ${@/%x/1} || die
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		# kill/uptime - procps
-		# groups/su   - shadow
-		# hostname    - net-tools
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp libgmp)
-	)
-
-	if use gmp ; then
-		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
-	fi
-
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		# bug #311569
-		export fu_cv_sys_stat_statfs2_bsize=yes
-		# bug #416629
-		export gl_cv_func_realpath_works=yes
-	fi
-
-	# bug #409919
-	export gl_cv_func_mknod_works=yes
-
-	if use static ; then
-		append-ldflags -static
-		# bug #321821
-		sed -i '/elf_sys=yes/s:yes:no:' configure || die
-	fi
-
-	if ! use selinux ; then
-		# bug #301782
-		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}" || die
-	chmod a+rx "${WORKDIR}" || die
-
-	# coreutils tests like to do `mount` and such with temp dirs,
-	# so make sure:
-	# - /etc/mtab is writable (bug #265725)
-	# - /dev/loop* can be mounted (bug #269758)
-	mkdir -p "${T}"/mount-wrappers || die
-	mkwrap() {
-		local w ww
-		for w in "${@}" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
-			EOF
-			chmod a+rx "${ww}" || die
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if use split-usr ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-
-		# Move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
-		if use hostname ; then
-			mv hostname ../../bin/ || die
-		fi
-
-		if use kill ; then
-			mv kill ../../bin/ || die
-		fi
-
-		# Move critical binaries into /bin (common scripts)
-		# (Why are these required for booting?)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "Could not move common bins!"
-
-		# Create a symlink for uname in /usr/bin/ since autotools require it.
-		# (Other than uname, we need to figure out why we are
-		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place...)
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/coreutils-9.1.ebuild b/sys-apps/coreutils/coreutils-9.1.ebuild
deleted file mode 100644
index f91b65f9f59f..000000000000
--- a/sys-apps/coreutils/coreutils-9.1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-MY_PATCH="${PN}-9.0_p20220409-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Note: could put this in devspace, but if it's gone, we don't want
-	# it in tree anyway. It's just for testing.
-	MY_SNAPSHOT="$(ver_cut 1-2).193-54bec"
-	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
-	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		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 ~x86-linux"
-fi
-
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( sys-apps/attr[static-libs] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		dev-util/strace
-		${PYTHON_DEPS}
-	)
-	verify-sig? ( sec-keys/openpgp-keys-coreutils )
-"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		# Upstream patches
-	)
-
-	if ! use vanilla ; then
-		PATCHES+=( "${WORKDIR}"/patch )
-	fi
-
-	default
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	#
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1} || die
-
-	# Avoid perl dep for compiled in dircolors default (bug #348642)
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h || die
-		touch ${@/%x/1} || die
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		# kill/uptime - procps
-		# groups/su   - shadow
-		# hostname    - net-tools
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp libgmp)
-	)
-
-	if use gmp ; then
-		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
-	fi
-
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		# bug #311569
-		export fu_cv_sys_stat_statfs2_bsize=yes
-		# bug #416629
-		export gl_cv_func_realpath_works=yes
-	fi
-
-	# bug #409919
-	export gl_cv_func_mknod_works=yes
-
-	if use static ; then
-		append-ldflags -static
-		# bug #321821
-		sed -i '/elf_sys=yes/s:yes:no:' configure || die
-	fi
-
-	if ! use selinux ; then
-		# bug #301782
-		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}" || die
-	chmod a+rx "${WORKDIR}" || die
-
-	# coreutils tests like to do `mount` and such with temp dirs,
-	# so make sure:
-	# - /etc/mtab is writable (bug #265725)
-	# - /dev/loop* can be mounted (bug #269758)
-	mkdir -p "${T}"/mount-wrappers || die
-	mkwrap() {
-		local w ww
-		for w in "${@}" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
-			EOF
-			chmod a+rx "${ww}" || die
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" emake -k check VERBOSE=yes
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if use split-usr ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-
-		# Move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
-		if use hostname ; then
-			mv hostname ../../bin/ || die
-		fi
-
-		if use kill ; then
-			mv kill ../../bin/ || die
-		fi
-
-		# Move critical binaries into /bin (common scripts)
-		# (Why are these required for booting?)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "Could not move common bins!"
-
-		# Create a symlink for uname in /usr/bin/ since autotools require it.
-		# (Other than uname, we need to figure out why we are
-		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place...)
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch b/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
deleted file mode 100644
index 25b2b72bcb80..000000000000
--- a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=e8b56ebd536e82b15542a00c888109471936bfda
-https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00031.html
-(and https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00035.html)
-
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Fri, 24 Sep 2021 20:57:41 +0100
-Subject: chmod: fix exit status when ignoring symlinks
-
-* src/chmod.c: Reorder enum so CH_NOT_APPLIED
-can be treated as a non error.
-* tests/chmod/ignore-symlink.sh: A new test.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention the bug fix.
-Fixes https://bugs.gnu.org/50784
---- a/src/chmod.c
-+++ b/src/chmod.c
-@@ -44,8 +44,8 @@ struct change_status
-   enum
-     {
-       CH_NO_STAT,
--      CH_NOT_APPLIED,
-       CH_FAILED,
-+      CH_NOT_APPLIED,
-       CH_NO_CHANGE_REQUESTED,
-       CH_SUCCEEDED
-     }
-@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
-   if ( ! recurse)
-     fts_set (fts, ent, FTS_SKIP);
- 
--  return CH_NO_CHANGE_REQUESTED <= ch.status;
-+  return CH_NOT_APPLIED <= ch.status;
- }
- 
- /* Recursively change the modes of the specified FILES (the last entry
diff --git a/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch b/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch
deleted file mode 100644
index e77766cbfe3a..000000000000
--- a/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From cbb451b63faee375415691c1abc8a6fd3e1677a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Sat, 12 Feb 2022 22:54:07 +0100
-Subject: [PATCH] dircolors: consider COLORTERM as well as TERM env vars
-
-COLORTERM is an environment used usually to expose truecolor support in
-terminal emulators.  Therefore support matches on that in addition
-to TERM.  Also set the default COLORTERM match pattern so that
-we apply colors if COLORTERM is any value.
-
-This implicitly supports a terminal like "foot"
-without a need for an explicit TERM entry.
-
-* NEWS: Mention the new feature.
-* src/dircolors.c (main): Match COLORTERM like we do for TERM.
-* src/dircolors.hin: Add default config to match any COLORTERM.
-* tests/misc/dircolors.pl: Add test cases.
----
-Backported from coreutils 75c9fc6740e93dba95f63a1e5e92bd5cf17f1743.
-See also https://lists.gnu.org/archive/html/coreutils/2022-02/msg00019.html
-
- NEWS                    |  3 +++
- src/dircolors.c         | 15 ++++++++++++++-
- src/dircolors.hin       |  7 +++++--
- tests/misc/dircolors.pl | 14 ++++++++++++++
- 4 files changed, 36 insertions(+), 3 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index f2fbcbb..646c132 100644
---- a/NEWS
-+++ b/NEWS
-@@ -64,6 +64,9 @@ GNU coreutils NEWS                                    -*- outline -*-
-   on (1024*5) buffer boundaries
-   [bug introduced in coreutils-8.31]
- 
-+  dircolors will now also match COLORTERM in addition to TERM environment
-+  variables.  The default config will apply colors with any COLORTERM set.
-+
- ** Changes in behavior
- 
-   cp and install now default to copy-on-write (COW) if available.
-diff --git a/src/dircolors.c b/src/dircolors.c
-index b765ded..64ff665 100644
---- a/src/dircolors.c
-+++ b/src/dircolors.c
-@@ -243,6 +243,7 @@ dc_parse_stream (FILE *fp, char const *filename)
-   size_t input_line_size = 0;
-   char const *line;
-   char const *term;
-+  char const *colorterm;
-   bool ok = true;
- 
-   /* State for the parser.  */
-@@ -253,6 +254,11 @@ dc_parse_stream (FILE *fp, char const *filename)
-   if (term == NULL || *term == '\0')
-     term = "none";
- 
-+  /* Also match $COLORTERM.  */
-+  colorterm = getenv ("COLORTERM");
-+  if (colorterm == NULL)
-+    colorterm = "";  /* Doesn't match default "?*"  */
-+
-   while (true)
-     {
-       char *keywd, *arg;
-@@ -299,10 +305,17 @@ dc_parse_stream (FILE *fp, char const *filename)
-           else if (state != ST_TERMSURE)
-             state = ST_TERMNO;
-         }
-+      else if (c_strcasecmp (keywd, "COLORTERM") == 0)
-+        {
-+          if (fnmatch (arg, colorterm, 0) == 0)
-+            state = ST_TERMSURE;
-+          else if (state != ST_TERMSURE)
-+            state = ST_TERMNO;
-+        }
-       else
-         {
-           if (state == ST_TERMSURE)
--            state = ST_TERMYES; /* Another TERM can cancel */
-+            state = ST_TERMYES;  /* Another {COLOR,}TERM can cancel.  */
- 
-           if (state != ST_TERMNO)
-             {
-diff --git a/src/dircolors.hin b/src/dircolors.hin
-index b5d6452..6d2d3a4 100644
---- a/src/dircolors.hin
-+++ b/src/dircolors.hin
-@@ -8,8 +8,11 @@
- # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
- # slackware version of dircolors) are recognized but ignored.
- 
--# Below are TERM entries, which can be a glob patterns, to match
--# against the TERM environment variable to determine if it is colorizable.
-+# Global config options can be specified before TERM or COLORTERM entries
-+
-+# Below are TERM or COLORTERM entries, which can be glob patterns, which
-+# restrict following config to systems with matching environment variables.
-+COLORTERM ?*
- TERM Eterm
- TERM ansi
- TERM *color*
-diff --git a/tests/misc/dircolors.pl b/tests/misc/dircolors.pl
-index 2c57104..464acfd 100755
---- a/tests/misc/dircolors.pl
-+++ b/tests/misc/dircolors.pl
-@@ -42,6 +42,20 @@ my @Tests =
-      ['term-4', '-b', {IN => "TERM N*match\nowt 40;33\n"},
-       {OUT => "LS_COLORS='';\nexport LS_COLORS\n"}],
- 
-+     ['print-clash1', '-p', '--print-ls',
-+      {ERR => "dircolors: options --print-database and --print-ls-colors " .
-+              "are mutually exclusive\n" .
-+              "Try 'dircolors --help' for more information.\n"},
-+      {EXIT => 1}],
-+     ['print-clash2', '-b', '--print-database',
-+      {ERR => "dircolors: the options to output non shell syntax,\n" .
-+              "and to select a shell syntax are mutually exclusive\n" .
-+              "Try 'dircolors --help' for more information.\n"},
-+      {EXIT => 1}],
-+
-+     ['print-ls-colors', '--print-ls-colors', {IN => "OWT 40;33\n"},
-+      {OUT => "\x1B[40;33mtw\t40;33\x1B[0m\n"}],
-+
-      # CAREFUL: always specify the -b option, unless explicitly testing
-      # for csh syntax output.
-     );
--- 
-2.34.1
-
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 87bc1c66f534..bd1043a3951e 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,13 +1,9 @@
 AUX file-5.39-portage-sandbox.patch 457 BLAKE2B ff4b67570144d5995ef62326da5f7a4ac5fe4befc3db56ff6d6a711c84bb4316da9e1a203326a6bc219066acd8e40634bf17f28f95d583bfa2f3d4698bcd57fc SHA512 20f66d918a605233f733fa6f5c038d9c56ec1175e706b76b16ecb8be81d64d79c3a932824b61092bf1edcd55c29fc2bcfa8bdf506e5717c10e849ec6110bbd3d
 AUX file-5.40-seccomp-fstatat64-musl.patch 578 BLAKE2B c2c074e4dca62253303bae3af88a7ce0bc7d3efd608bd7269d624ad69b0fe4022db38efc5bb63d8f6d1f7bf45c2a1d749c406e76cf1ce42be731e663e2874ad5 SHA512 008c2a2c18b14eaa49f62b87fa14f4bea46bfd56efda17e49541fd51d87201d4d5511d3aae50b53dfcd68cc8e9a38884711ac59458acff9bf3290e267c2891bb
-AUX file-5.42-unicode-fixes.patch 10989 BLAKE2B af85384f3d2461d30deda506e1e624ffb9d72ef3a25c7e902a747f10dbcb6ca7782d24900b1d5cc856763052975d6e3649d880d005d82bd5f64d310b014f82a8 SHA512 824f128b44a51fee1673110e90be6fdf7831a5220cc608dc94ef1367e1550de05170a8e9a4c4e90a1f372e975b9c391a2cb5ea968df1cb263734bd78ce585403
 DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
-DIST file-5.42.tar.gz 1105846 BLAKE2B c557facb066ae0599db832ddbbc3fed7db2e057faefe832cb4bed8f860b63456217bee39f0c82b17902c3b91426e522681216d2d3ed689501fa00d69a4a09832 SHA512 33c3c339a561c6cf787cc06a16444a971c62068b01827612c948207a9714107b617bed8148cd67e6280cb1c62ad4dfb1205fb8486ea9c042ce7e19b067d3bb05
-DIST file-5.42.tar.gz.asc 195 BLAKE2B 9b930bcd6b98878e60cd72d8d71b40201ebbf3ab1dda7d2b0e3228abdc0c1e21473a012b9799dcac8638ded1bdbe03865c5e41ed4086076a7df6bf6aadbfe29d SHA512 a7105c48f6c671638f5fb7f18f9b193d108456655b4c734208e00aca36fab54dd330ec2fdc3ff29fb78adbc16874af4fb0916c560e50228f82003a8cd258491a
 DIST file-5.43.tar.gz 1162786 BLAKE2B aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c SHA512 9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
 DIST file-5.43.tar.gz.asc 195 BLAKE2B d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f SHA512 c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
 EBUILD file-5.41.ebuild 3347 BLAKE2B 413305c675ac4b0af437e2ca48d4edd3ca29bbd3cfac376ebaed000142eb5a191f7d1c85449838ae204ec6c294828af68cfd7e6fe885b82c255d0570bc16b18d SHA512 396ef33817680b5bd48d7239e455f3c798f8813267ab7ea19dae7f845ad039164b88c6600887aba4254916a4ec857baaf01b949c6276510490e089d1f5b52f9b
-EBUILD file-5.42-r1.ebuild 3760 BLAKE2B 218d9cdc0b2c4387c6ba06729b56e4d886639ce8fe883a5be1593acdd2204012a88748afa76654f600ad38e88132c6cb6d73853dab5d717cdee8be1cb0a82d66 SHA512 dc21797dd4a187abf91d3f52bdc798e3c1838c6bd4930de4a209d46fdb7331268ad5710f062436b9208f21cc7618dd6c49a71e10e09a60643cfd6a288d939108
 EBUILD file-5.43.ebuild 3712 BLAKE2B 3081dc9e676be42da2cbc8fb34018b2e4f63ffb9c0854346325c574d71942608db81463fd5c80756455e1541c838e3d27f51f7d228a16549316fcc51954acfc0 SHA512 25de2f67fabd5f276a52c271ff1627a3387ffaf1f7d1b12893e5b6c6f56c2a64b54f2011787260bf7283cfe7a3e807631da8c0c2ede3e9237e39cd450cde7cd9
 EBUILD file-9999.ebuild 3870 BLAKE2B ac7f37d005c94d589cf9663a2443d7ea49df93e52da2b66c60d1e755ba787810c1885d47268e424857e19755786d69660415f137baf3f4b2325b40e94dc998a3 SHA512 d44ae484b41b20df592a0b69ce054557a963f8b63b956f9ec70564351d7c23ab26d969bc3f1d914a0440da7dad72b1ae413193c1e6cc1a1263e4052a64028309
 MISC metadata.xml 565 BLAKE2B 737512e354fedb4483608b04c594a486c0d8a0f70d23d306c59c78dedb0c8116f80ff558926444b9d9b9ef15805b3826163523b5644c88f01a330be1b8c9a76f SHA512 f240bf9e064c6e6f5b63e3265dfe3adf5b1d2c2b5b2456b79ea7451580150271ccb4097d33967de57ba767fecbdbea51fb62ccb683fcc5e1cca101be660ffd19
diff --git a/sys-apps/file/file-5.42-r1.ebuild b/sys-apps/file/file-5.42-r1.ebuild
deleted file mode 100644
index bbde9949d397..000000000000
--- a/sys-apps/file/file-5.42-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc
-	inherit verify-sig
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
-
-	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"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-BDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		${DISTUTILS_DEPS}
-	)"
-
-PATCHES=(
-	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
-	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-	"${FILESDIR}/${P}-unicode-fixes.patch" #861089
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# don't let python README kill main README, bug ##60043
-	mv python/README.md python/README.python.md || die
-	# bug #662090
-	sed 's@README.md@README.python.md@' -i python/setup.py || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-
-	econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions, bug #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	if need_build_file ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		# bug #586444
-		emake -C src magic.h
-		emake -C src libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file ; then
-		# bug #586444
-		emake -C "${WORKDIR}"/build/src magic.h
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT # README
-
-	# Required for `file -C`
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/files/file-5.42-unicode-fixes.patch b/sys-apps/file/files/file-5.42-unicode-fixes.patch
deleted file mode 100644
index cc6ee7196b49..000000000000
--- a/sys-apps/file/files/file-5.42-unicode-fixes.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-https://bugs.gentoo.org/861089
-https://github.com/file/file/commit/19bf47777d0002ee884467e45e6ace702e40a4c1
-https://github.com/file/file/commit/c80065fe6900be5e794941e29b32440e9969b1c3
-https://github.com/file/file/commit/7e59d34206d7c962e093d4239e5367a2cd8b7623
-https://github.com/file/file/commit/f042050f59bfc037677871c4d1037c33273f5213
-https://github.com/file/file/commit/d471022b2772071877895759f209f2c346757a4c
-https://github.com/file/file/commit/441ac2b15508909e82ad467960df4ac0adf9644c
-
-From 19bf47777d0002ee884467e45e6ace702e40a4c1 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 17:00:51 +0000
-Subject: [PATCH] PR/358: Fix width for -f - (jpalus)
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -506,35 +506,47 @@ unwrap(struct magic_set *ms, const char *fn)
- 	size_t llen = 0;
- 	int wid = 0, cwid;
- 	int e = 0;
-+	size_t fi = 0, fimax = 100;
-+	char **flist = malloc(sizeof(*flist) * fimax);
- 
--	if (strcmp("-", fn) == 0) {
-+	if (flist == NULL)
-+out:		file_err(EXIT_FAILURE, "Cannot allocate memory for file list");
-+
-+	if (strcmp("-", fn) == 0)
- 		f = stdin;
--		wid = 1;
--	} else {
-+	else {
- 		if ((f = fopen(fn, "r")) == NULL) {
- 			file_warn("Cannot open `%s'", fn);
- 			return 1;
- 		}
--
--		while ((len = getline(&line, &llen, f)) > 0) {
--			if (line[len - 1] == '\n')
--				line[len - 1] = '\0';
--			cwid = file_mbswidth(ms, line);
--			if (cwid > wid)
--				wid = cwid;
--		}
--
--		rewind(f);
- 	}
- 
- 	while ((len = getline(&line, &llen, f)) > 0) {
- 		if (line[len - 1] == '\n')
- 			line[len - 1] = '\0';
--		e |= process(ms, line, wid);
-+		if (fi >= fimax) {
-+			fimax += 100;
-+			char **nf = realloc(flist, fimax * sizeof(*flist));
-+			if (nf == NULL)
-+				goto out;
-+		}
-+		flist[fi++] = line;
-+		cwid = file_mbswidth(ms, line);
-+		if (cwid > wid)
-+			wid = cwid;
-+		line = NULL;
-+		llen = 0;
-+	}
-+
-+	fimax = fi;
-+	for (fi = 0; fi < fimax; fi++) {
-+		e |= process(ms, flist[fi], wid);
-+		free(flist[fi]);
- 	}
-+	free(flist);
- 
--	free(line);
--	(void)fclose(f);
-+	if (f != stdin)
-+		(void)fclose(f);
- 	return e;
- }
- 
-
-From c80065fe6900be5e794941e29b32440e9969b1c3 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 19:44:35 +0000
-Subject: [PATCH] PR/362: ro-ee: fix wide char printing
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -60,6 +60,12 @@ FILE_RCSID("@(#)$File: file.c,v 1.196 2022/07/04 17:00:51 christos Exp $")
- #ifdef HAVE_WCTYPE_H
- #include <wctype.h>
- #endif
-+#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH) && \
-+   defined(HAVE_WCTYPE_H)
-+#define FILE_WIDE_SUPPORT
-+#else
-+#include <ctype.h>
-+#endif
- 
- #if defined(HAVE_GETOPT_H) && defined(HAVE_STRUCT_OPTION)
- # include <getopt.h>
-@@ -550,6 +556,55 @@ out:		file_err(EXIT_FAILURE, "Cannot allocate memory for file list");
- 	return e;
- }
- 
-+private void
-+file_octal(unsigned char c)
-+{
-+	putc('\\', stdout);
-+	putc(((c >> 6) & 7) + '0', stdout);
-+	putc(((c >> 3) & 7) + '0', stdout);
-+	putc(((c >> 0) & 7) + '0', stdout);
-+}
-+
-+private void
-+fname_print(const char *inname)
-+{
-+	size_t n = strlen(inname);
-+#ifdef FILE_WIDE_SUPPORT
-+	mbstate_t state;
-+	wchar_t nextchar;
-+	size_t bytesconsumed;
-+
-+
-+	(void)mbrlen(NULL, 0, &state);
-+	while (n > 0) {
-+		bytesconsumed = mbrtowc(&nextchar, inname, n, &state);
-+		if (bytesconsumed == CAST(size_t, -1) ||
-+		    bytesconsumed == CAST(size_t, -2))  {
-+			nextchar = *inname;
-+			bytesconsumed = 1;
-+		}
-+		inname += bytesconsumed;
-+		n -= bytesconsumed;
-+		if (iswprint(nextchar)) {
-+			putwc(nextchar, stdout);
-+			continue;
-+		}
-+		/* XXX: What if it is > 255? */
-+		file_octal(CAST(unsigned char, nextchar));
-+	}
-+#else
-+	size_t i;
-+	for (i = 0; i < n; i++) {
-+		unsigned char c = CAST(unsigned char, inname[i]);
-+		if (isprint(c)) {
-+			putc(c);
-+			continue;
-+		}
-+		file_octal(c);
-+	}
-+#endif
-+}
-+
- /*
-  * Called for each input file on the command line (or in a list of files)
-  */
-@@ -559,15 +614,13 @@ process(struct magic_set *ms, const char *inname, int wid)
- 	const char *type, c = nulsep > 1 ? '\0' : '\n';
- 	int std_in = strcmp(inname, "-") == 0;
- 	int haderror = 0;
--	size_t plen = 4 * wid + 1;
--	char *pbuf, *pname;
--
--	if ((pbuf = CAST(char *, malloc(plen))) == NULL)
--	    file_err(EXIT_FAILURE, "Can't allocate %zu bytes", plen);
- 
- 	if (wid > 0 && !bflag) {
--		pname = file_printable(ms, pbuf, plen, inname, wid);
--		(void)printf("%s", std_in ? "/dev/stdin" : pname);
-+		const char *pname = std_in ? "/dev/stdin" : inname;
-+		if ((ms->flags & MAGIC_RAW) == 0)
-+			fname_print(pname);
-+		else
-+			(void)printf("%s", pname);
- 		if (nulsep)
- 			(void)putc('\0', stdout);
- 		if (nulsep < 2) {
-@@ -586,7 +639,6 @@ process(struct magic_set *ms, const char *inname, int wid)
- 	}
- 	if (nobuffer)
- 		haderror |= fflush(stdout) != 0;
--	free(pbuf);
- 	return haderror || type == NULL;
- }
- 
-@@ -594,35 +646,33 @@ protected size_t
- file_mbswidth(struct magic_set *ms, const char *s)
- {
- 	size_t width = 0;
--#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH) && \
--   defined(HAVE_WCTYPE_H)
--	size_t bytesconsumed, old_n, n;
-+#ifdef FILE_WIDE_SUPPORT
-+	size_t bytesconsumed, n;
- 	mbstate_t state;
- 	wchar_t nextchar;
--	(void)memset(&state, 0, sizeof(mbstate_t));
--	old_n = n = strlen(s);
-+
-+	(void)mbrlen(NULL, 0, &state);
-+	n = strlen(s);
- 
- 	while (n > 0) {
- 		bytesconsumed = mbrtowc(&nextchar, s, n, &state);
- 		if (bytesconsumed == CAST(size_t, -1) ||
- 		    bytesconsumed == CAST(size_t, -2)) {
--			/* Something went wrong, return something reasonable */
--			return old_n;
-+			nextchar = *s;
-+			bytesconsumed = 1;
- 		}
- 		width += ((ms->flags & MAGIC_RAW) != 0
- 		    || iswprint(nextchar)) ? wcwidth(nextchar) : 4;
- 
- 		s += bytesconsumed, n -= bytesconsumed;
- 	}
--	return width;
- #else
- 	while (*s) {
- 		width += (ms->flags & MAGIC_RAW) != 0
- 		    || isprint(CAST(unsigned char, *s)) ? 1 : 4;
- 	}
--
--	return strlen(s);
- #endif
-+	return width;
- }
- 
- private void
---- a/src/file.h
-+++ b/src/file.h
-@@ -575,7 +575,7 @@ protected size_t file_pstring_length_size(struct magic_set *,
-     const struct magic *);
- protected size_t file_pstring_get_length(struct magic_set *,
-     const struct magic *, const char *);
--public char * file_printable(struct magic_set *, char *, size_t,
-+protected char * file_printable(struct magic_set *, char *, size_t,
-     const char *, size_t);
- #ifdef __EMX__
- protected int file_os2_apptype(struct magic_set *, const char *, const void *,
---- a/src/funcs.c
-+++ b/src/funcs.c
-@@ -763,7 +763,7 @@ file_pop_buffer(struct magic_set *ms, file_pushbuf_t *pb)
- /*
-  * convert string to ascii printable format.
-  */
--public char *
-+protected char *
- file_printable(struct magic_set *ms, char *buf, size_t bufsiz,
-     const char *str, size_t slen)
- {
-
-From 7e59d34206d7c962e093d4239e5367a2cd8b7623 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 20:16:29 +0000
-Subject: [PATCH] Handle invalid characters as octal (idea from PR/363 by
- dimich)
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -580,8 +580,11 @@ fname_print(const char *inname)
- 		bytesconsumed = mbrtowc(&nextchar, inname, n, &state);
- 		if (bytesconsumed == CAST(size_t, -1) ||
- 		    bytesconsumed == CAST(size_t, -2))  {
--			nextchar = *inname;
--			bytesconsumed = 1;
-+			nextchar = *inname++;
-+			n--;
-+			(void)mbrlen(NULL, 0, &state);
-+			file_octal(CAST(unsigned char, nextchar));
-+			continue;
- 		}
- 		inname += bytesconsumed;
- 		n -= bytesconsumed;
-@@ -660,9 +663,12 @@ file_mbswidth(struct magic_set *ms, const char *s)
- 		    bytesconsumed == CAST(size_t, -2)) {
- 			nextchar = *s;
- 			bytesconsumed = 1;
-+			(void)mbrlen(NULL, 0, &state);
-+			width += 4;
-+		} else {
-+			width += ((ms->flags & MAGIC_RAW) != 0
-+			    || iswprint(nextchar)) ? wcwidth(nextchar) : 4;
- 		}
--		width += ((ms->flags & MAGIC_RAW) != 0
--		    || iswprint(nextchar)) ? wcwidth(nextchar) : 4;
- 
- 		s += bytesconsumed, n -= bytesconsumed;
- 	}
-
-
-From f042050f59bfc037677871c4d1037c33273f5213 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 22:30:51 +0000
-Subject: [PATCH] mbrlen(NULL, is not portable; revert to using memset to
- initialize the state.
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -575,14 +575,14 @@ fname_print(const char *inname)
- 	size_t bytesconsumed;
- 
- 
--	(void)mbrlen(NULL, 0, &state);
-+	(void)memset(&state, 0, sizeof(state));
- 	while (n > 0) {
- 		bytesconsumed = mbrtowc(&nextchar, inname, n, &state);
- 		if (bytesconsumed == CAST(size_t, -1) ||
- 		    bytesconsumed == CAST(size_t, -2))  {
- 			nextchar = *inname++;
- 			n--;
--			(void)mbrlen(NULL, 0, &state);
-+			(void)memset(&state, 0, sizeof(state));
- 			file_octal(CAST(unsigned char, nextchar));
- 			continue;
- 		}
-@@ -654,7 +654,7 @@ file_mbswidth(struct magic_set *ms, const char *s)
- 	mbstate_t state;
- 	wchar_t nextchar;
- 
--	(void)mbrlen(NULL, 0, &state);
-+	(void)memset(&state, 0, sizeof(state));
- 	n = strlen(s);
- 
- 	while (n > 0) {
-@@ -663,7 +663,7 @@ file_mbswidth(struct magic_set *ms, const char *s)
- 		    bytesconsumed == CAST(size_t, -2)) {
- 			nextchar = *s;
- 			bytesconsumed = 1;
--			(void)mbrlen(NULL, 0, &state);
-+			(void)memset(&state, 0, sizeof(state));
- 			width += 4;
- 		} else {
- 			width += ((ms->flags & MAGIC_RAW) != 0
-
-
-From d471022b2772071877895759f209f2c346757a4c Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 5 Jul 2022 19:53:42 +0000
-Subject: [PATCH] Use printf("%lc") instead of putwc(). Somehow mixing wide and
- narrow stdio does not work on Linux?
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -589,7 +589,7 @@ fname_print(const char *inname)
- 		inname += bytesconsumed;
- 		n -= bytesconsumed;
- 		if (iswprint(nextchar)) {
--			putwc(nextchar, stdout);
-+			printf("%lc", nextchar);
- 			continue;
- 		}
- 		/* XXX: What if it is > 255? */
-
-From 441ac2b15508909e82ad467960df4ac0adf9644c Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 5 Jul 2022 20:05:23 +0000
-Subject: [PATCH] wcwidth is not supposed to return -1 if the character is
- printable, but it does for 0xff... Prevent it from decreasing the width.
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -666,8 +666,9 @@ file_mbswidth(struct magic_set *ms, const char *s)
- 			(void)memset(&state, 0, sizeof(state));
- 			width += 4;
- 		} else {
-+			int w = wcwidth(nextchar);
- 			width += ((ms->flags & MAGIC_RAW) != 0
--			    || iswprint(nextchar)) ? wcwidth(nextchar) : 4;
-+			    || iswprint(nextchar)) ? (w > 0 ? w : 1) : 4;
- 		}
- 
- 		s += bytesconsumed, n -= bytesconsumed;
-
-From be1ac8c0aa6d21921012f62582f51a9e546e4972 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 26 Jul 2022 15:10:05 +0000
-Subject: [PATCH] Fix bug with large flist (Florian Weimer)
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -535,6 +535,7 @@ out:		file_err(EXIT_FAILURE, "Cannot allocate memory for file list");
- 			char **nf = realloc(flist, fimax * sizeof(*flist));
- 			if (nf == NULL)
- 				goto out;
-+			flist = nf;
- 		}
- 		flist[fi++] = line;
- 		cwid = file_mbswidth(ms, line);
-
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index 58560c8f09e3..a16212a3b3f9 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -1,7 +1,5 @@
 DIST hwdata-0.361.tar.gz 2263204 BLAKE2B 83f613dd75e677bb25e884c00e8c32aa97e1b030ac8642df2c35f895df815bf6b8c3333a150c448fb6a14a8cf6c6cec9ef351896a5762a45ea99c34c39790213 SHA512 942cf6fa17c2f6fa41d7c624aa7fd28d57d6ad7750eb7a01c8ce85a663154140af75108a8ab12d43375bae63574a594ea2117195a743c12e5c4cb2986f198454
-DIST hwdata-0.362.tar.gz 2277092 BLAKE2B fa0fb6055e65867a61ff628655c45442f175daf6c4d29b921356534a6aca686d6790fab6fd930707fb81891dac4325078a335f351af236d4eece8953703b2c27 SHA512 63ea6b56283b248a54b4a9e350da431db4f40b30e4d1e9afb29bfec3f87b11723899397817435e9142b7775690a399591afb9b701101e2cc4d78893fa791e1b7
 DIST hwdata-0.363.tar.gz 2283349 BLAKE2B dd7aa9c7d202882a31a5359cf674c9399b23b07f47d2fa706739201f60227922572619cef42f50835c4a01efab19773e24b0540a87f759b805755389f8d6f7f4 SHA512 b53ffad2bdeea1ac8c78832e693c44655dc86c401a3f6921ccedf45a88731d82b40b2f033bb90bcaa058b1b3e8361a90aa4eeba9779ee4741efc40ae8ff6282a
 EBUILD hwdata-0.361.ebuild 696 BLAKE2B 792e672c8fb3277cf445be60a5966dd3ce1afdc0466235021726b182c70e653eb930d94dfed09bca71fccb514eb0b89b5d6e1eac3cdd9e3be7e30261fe4900fe SHA512 1499d7696d4561943d6521937d2818d1000a7d6ceb939bbf670e56f301a54109b7a6eca28f2f7bdbeb3094b9236dd8bad81cf34f893f401659c3168f1c8d3af2
-EBUILD hwdata-0.362.ebuild 704 BLAKE2B e40a0fc670739174b895ddeb0fc150d0d7112caf9e01b4b7cf8a6a6e832237dd493d1d9b48c1c496ef162eaf452db10e1ffff03a7f2e41d4e189e29eacc8c4bb SHA512 6d81bf29ab974be19d3d3f1abb835373d9babbca9c949293ec5b0b3bd76648354afffbb0d074f6f59e0e62c762ae4da0adbbeb179c4b24dcf822a0725a0ec60c
 EBUILD hwdata-0.363.ebuild 697 BLAKE2B 7b2dfd3b060a7866502b4275650d936cfee8201310e87fd36e5b88a71512a5202f3fc0f7dcbb3beccf6c97ae59d74d4a04de602447d6f092a31acad37af43435 SHA512 3155c833ee8012d8f17fca390099af9a1842aa8157b6cecd5cc606d429bfe9411f39d2d2b343bd88229edaf8b92c09ff260b7b06b065f4e0bf7183ffdd4c73ef
 MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/hwdata-0.362.ebuild b/sys-apps/hwdata/hwdata-0.362.ebuild
deleted file mode 100644
index 719e257fb904..000000000000
--- a/sys-apps/hwdata/hwdata-0.362.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo
-
-DESCRIPTION="Hardware identification and configuration data"
-HOMEPAGE="https://github.com/vcrhonek/hwdata"
-SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="test"
-
-src_configure() {
-	# configure is not compatible with econf
-	local conf=(
-		./configure
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/lib"
-		--datadir="${EPREFIX}/usr/share"
-	)
-
-	edo "${conf[@]}" || die
-}
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 48737675851c..1aeafde46fc1 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,8 +1,6 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
-DIST logwatch-7.6.tar.gz 488750 BLAKE2B fd7f2a7c65151dbfbd924102b01ead00f92d74a59a417361b65be972368f7ed93810feefedf1ad9bba2de5ebbc74589c3fc0a8a484f19b5a9782c9799ffdf656 SHA512 8672dcf2b781d89ec281c4370b204467f9db219edb7c23adf02b71decf0ecab7b442d6e95e91416af3aecc27948e9442bb3b369e532e40f7ef32635628e110af
 DIST logwatch-7.7.tar.gz 498214 BLAKE2B 8978930fe844bde372f68038f295cc62ca61f1c2b10d18f545ddcc713cb72cd01520ff0ea0869f2dff96846431a6dd9a04da1bc79817ccb590b0235f96e934da SHA512 5224013c548e60248ef2de8aeabc760d046374f54035e7e5e00bba0c6e6777eb5e7fcfd05a9f029d3d34e9d3fb8a243ed99b417961b21895cc14b881f1ad3dd4
-EBUILD logwatch-7.6.ebuild 2412 BLAKE2B cbcd0212a9615556f4fd1d88dad7020bd8dd9d389efbd0cb11c8aa59c5d23e0d05ecfab4fb5fcfc750e78914c0ce6f15f68225d0921163e1edb56b5cf55c07a5 SHA512 a1a7f7e4bc55099b8aaeeef0250496850a5a3c82ae6855795668a91e2e0f2a35c0c94b9fbc431c74ff3c57d67a89645ebb04d29421214c0aeec4a6f8b8dd39a3
 EBUILD logwatch-7.7.ebuild 2405 BLAKE2B 3955dd13d7d123f453e0c426aeaeb7e0a27d982e907f598ae621b31bbf5fa5710a86d995bddb18a8932eb5e6d2f4cfaa69f964903dfef86ee58a322ea51e3b12 SHA512 5b888b1fca220786a73bd524df55997c5c05e798877fb3951287895b393c845b1503924a9ac5fd652bf9c48d6fd7919bbd4d1110a9d89d17e787f904ca61e7df
 EBUILD logwatch-9999.ebuild 2413 BLAKE2B f846a4b0f713e757baaacc811b97ad37456b58b255ab616b8debbaafbc9ed754a214f71fc1f8da0c86aff2df3b70b199e0f28322a359a2514028e4782fd31ee3 SHA512 a59f67d27700d7fc8e6910e846bbb975dacd92098f5f3752ac8c6c7e7968a0fe40dce3267f69c7e853b0e3bcbedf92105f2faf137ec6308c302a261821c4d38e
 MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a
diff --git a/sys-apps/logwatch/logwatch-7.6.ebuild b/sys-apps/logwatch/logwatch-7.6.ebuild
deleted file mode 100644
index 24fb4fa00cfe..000000000000
--- a/sys-apps/logwatch/logwatch-7.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit tmpfiles
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="https://sourceforge.net/projects/logwatch/"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="virtual/cron
-	virtual/mta
-	virtual/mailx
-	dev-lang/perl
-	dev-perl/Date-Calc
-	dev-perl/Date-Manip
-	dev-perl/Tie-IxHash
-	dev-perl/Sys-CPU
-	dev-perl/Sys-MemInfo"
-
-PATCHES=()
-
-src_install() {
-	dodir /usr/share/logwatch/lib
-	dodir /usr/share/logwatch/scripts/services
-	dodir /usr/share/logwatch/scripts/shared
-	dodir /usr/share/logwatch/default.conf/logfiles
-	dodir /usr/share/logwatch/default.conf/services
-	dodir /usr/share/logwatch/default.conf/html
-	keepdir /etc/logwatch
-
-	# logwatch.pl requires cache dir (bug #607668)
-	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
-
-	newsbin scripts/logwatch.pl logwatch.pl
-
-	exeinto /usr/share/logwatch/lib
-	doexe lib/*.pm
-
-	exeinto /usr/share/logwatch/scripts/services
-	doexe scripts/services/*
-
-	exeinto /usr/share/logwatch/scripts/shared
-	doexe scripts/shared/*
-
-	insinto /usr/share/logwatch/default.conf
-	doins conf/logwatch.conf
-
-	insinto /usr/share/logwatch/default.conf/logfiles
-	doins conf/logfiles/*
-
-	insinto /usr/share/logwatch/default.conf/services
-	doins conf/services/*
-
-	insinto /usr/share/logwatch/default.conf/html
-	doins conf/html/*
-
-	# Make sure logwatch is run before anything else #100243
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/logwatch 00-logwatch
-
-	doman logwatch.8
-	dodoc README HOWTO-Customize-LogWatch
-
-	# Do last due to insopts modification.
-	insinto /usr/share/logwatch/scripts/logfiles
-	insopts -m755
-	doins -r scripts/logfiles/*
-}
-
-pkg_postinst() {
-	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
-	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
-		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
-		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
-			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
-			|| ewarn "You have two logwatch files in /etc/cron.daily/"
-	fi
-
-	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
-	tmpfiles_process ${PN}.conf
-}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 434446cef5f8..dda4b957e02b 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -4,9 +4,7 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
-DIST shadow-4.11.1.tar.xz 1656584 BLAKE2B d459a1e0ffb342b6b455caf65e6af60b32eee72d4a9b1ab126485fb4632503a42061d3f0b960554c8155af6dc0564c585335b27aecca6538b394a0d58d927588 SHA512 12fbe4d6ac929ad3c21525ed0f1026b5b678ccec9762f2ec7e611d9c180934def506325f2835fb750dd30af035b592f827ff151cd6e4c805aaaf8e01425c279f
 DIST shadow-4.12.3.tar.xz 1747620 BLAKE2B 63b10d75a11d419156a996b8acf1bebbfab28999c2ab796e6625c028882073d4021806d8b56224190886c076a1205955e7797cb6f797ef73af3a8a33ac34bf2f SHA512 0529889258f54e7634762dc154aa680d55f8c5f1654afadd1b7431cfbb890a3b1ba27c7ff4b7c45986e4ee2289946db2e420b23ed13e4e5b15800a1fb3a013bc
 DIST shadow-4.12.3.tar.xz.asc 488 BLAKE2B b23525c3303f78df9d046c0225ed3ee1715cb000650630daae8b41fb71413daa45b5fe39a98fc640aaafa0f219fbaf9e065afa6b44f051373fb1967358ccc43d SHA512 d3f294d86c0e2174c88809810a801737c01cd01f9cadbe7b1ae382b2745d86e2e30c0718fa6489c2abb65500ed94c8ac1961d05243b5a1800c966384c69281c9
-EBUILD shadow-4.11.1.ebuild 6247 BLAKE2B 1aa58e8496f45bfa85c1d9a9893eeb31629ea6709b81451e68a42369f7bfb293c538bc1b2d458afbd30a7c9511d88c8f977c7ec4283b38553de454f5b1712ef1 SHA512 021974ec33b5cc1d512a6c1626b7e71787b30ecf331aa9aba214b1f37a2ea8ef02f53dcc186ee2ccdd304845af3f5ae8526da5073611f90e26cb45840ed2aed6
 EBUILD shadow-4.12.3.ebuild 6482 BLAKE2B bc7bc19a961369429b2850e04957c3c4b66aa6b57482897f051b4f93e9ca68c0dc1979e75b3323e498ed6da8bed01f0e56605a4fed0edb58f90e3ad8de9c42e7 SHA512 842e434b064fc30675805c360c1ff73830c9d01016d5f9a8f74ba70d0892f48de8e792e963d25b82db2d75380a51fcfd0789fc655f85e720f9c86d5bfc081192
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.11.1.ebuild b/sys-apps/shadow/shadow-4.11.1.ebuild
deleted file mode 100644
index 7a8c042c0b85..000000000000
--- a/sys-apps/shadow/shadow-4.11.1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool pam
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-# Subslot is for libsubid's SONAME.
-SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	xattr? ( sys-apps/attr:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.14
-"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-apps/man-pages-5.11-r1
-	!=sys-apps/man-pages-5.12-r0
-	!=sys-apps/man-pages-5.12-r1
-	nls? (
-		!<app-i18n/man-pages-it-5.06-r1
-		!<app-i18n/man-pages-ja-20180315-r1
-		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
-	)
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-)
-
-src_prepare() {
-	default
-
-	#eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--disable-static
-		--with-btrfs
-		--without-group-name-max-length
-		--without-tcb
-		$(use_enable nls)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with bcrypt)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
-	emake DESTDIR="${D}" -C man install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh shfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chpasswd newusers ; do
-			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f \
-		'(' -name id.1 -o -name getspnam.3 ')' \
-		-delete || die
-
-	if ! use su ; then
-		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
-	fi
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Missing entries from /etc/passwd can cause odd system blips.
-	# See bug #829872.
-	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
-		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
-	fi
-
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
-			grpconv -R "${EROOT:-/}"
-		else
-			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index b2c27913988d..27a80f776f5f 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -4,19 +4,8 @@ AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaa
 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb
 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee
 AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
-AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa45220a1bf79da86207ffa1393c311cb4c4a2ad9b8b7bf81cc4ae2ccb2acb19b66fd575935d8a0b0a2a9b3899c0088c9f SHA512 ef33da0d5673180275c8120c6904a4214cf1308827a626d8d6a2aab67d7d25b5407f9efcaf6a7a4a09a8c409899242943f6a95881cc8c8898b780224f991f2f7
 AUX sysvinit-3.05-fix-man-makefile.patch 780 BLAKE2B 0fc0396f41663a554484c06a96079497b4991ea44f077bc89c2249db86c47b5b5630713485fb6ef01a66e380cb5cb49af585e23eb2db762b38dca94d55d0a4d1 SHA512 b7fd436a224b67b41693aa1e0ccce5b94471473345ca72ef618c7a7abb8e5bf1866ffb27d42a1fc0d1326df275ec8f7e920be5d03dc8883c590551e1e87b873e
-DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
-DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf
-DIST sysvinit-3.03.tar.xz 219956 BLAKE2B e2f9d838a67341cabac4b82d90c66b29470727383c4a4d86f2767863a9b9f6d60768069fa79636552aa3bef654bd2f0944cb35eb15a4f053d1fa9aaa4e04473d SHA512 920205d70e1384d11926739ab45d4a04c5a7d7263c50bd06288c806ebc3316d641bd05a5c67497c48951fafe32fc364e88bfb1cb2cc1d6787e9eb6c5e692061b
-DIST sysvinit-3.03.tar.xz.sig 833 BLAKE2B 7d851f4cd12e5745055bb78f531b97b1e9fb9a16260a713fc7ac91000208f04ec8f1109068ebe017838449c73b9e40679f248816050979d9624742dd6023eeef SHA512 a643447ed906b5e3249808eafc85f8b336ebfa6028adf8a8e8df82469b7f08cfe98f44b8e7f6b50168f70925eabf610760a185f10d0529ec1a5ff7337de70dc4
-DIST sysvinit-3.04.tar.xz 220184 BLAKE2B 5caa94fd09e5660fb39982b8c8d68ca5546d83a7f78450f4d7fe8fcd9ac429cd8d9f1ef63e9276221ac878ca2964874c1065d61bfd9ed8b0d1505b44c775b388 SHA512 059092ee857782e88f88e47475846f859589aa1062a6e1294fe8983a11d04a13811e0dd6d277431f45abc2d9d96e5358f6b2d2df1d291402fada66cd009a5fa9
-DIST sysvinit-3.04.tar.xz.sig 833 BLAKE2B 8f04051ea7c03ab447fe309ee61cb4d35a9c02f9a88699423097f9fe4544a26e89536f2625572d0781f792103ce88276db19c2b9ed9489c6ca969d54bc45c117 SHA512 38becfc0d0796570bc75661d4212ad3b1470eea33905694a5264b8b68054d3e47d9250da58f67d52807efcd96334f170a600dff72491f76de94df58077eb4dd0
 DIST sysvinit-3.05.tar.xz 234416 BLAKE2B 56cd57976c34194b07512e05f21782247d2f79e51655de758ee789016fe45ec74d2b036c727e6897f6fd743edf2755715fe22ed4538d8d5f81220b0898c3c62b SHA512 15063d237e247f4eefd9c2e86c986384c1103eb2a84d834d92f00a557106a9c24f5f3530633412997692515a5404c194840fc71b4d3c94eb284ae6c776bb38a3
 DIST sysvinit-3.05.tar.xz.sig 833 BLAKE2B 520be5b28b02a67703eb027515d4c290532bdefdb319d6b74d14dbaa51538410eab9d336637c1b32cd8f27d45353b78f531ba7646157790e2563a38dbf396646 SHA512 ed7816281e81b7c568ee8e3b8a1b2eb3973751d5fc7f626bdfefbe28d0f0d67857862924dd000e12e6c12ed0382c27c1992d2d6326cc1fc3c94559f475402b33
-EBUILD sysvinit-2.99-r1.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
-EBUILD sysvinit-3.01.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
-EBUILD sysvinit-3.03.ebuild 4917 BLAKE2B bc080021aff5e028a6378831154a7a71dc2bdae5cf00536393262a96e9c362120a0f6668293a03e70887162bdf917b0118df6e399e2c507a2b194284c7b2a530 SHA512 5235168913411aeafd9b533a78e27e3f19041eeebe0288f409002f0c9b77ebe51b06cdf8c6b56f85887ac0e123a1b62f877b830a3377f4bb732e33568d790ac0
-EBUILD sysvinit-3.04.ebuild 4917 BLAKE2B bc080021aff5e028a6378831154a7a71dc2bdae5cf00536393262a96e9c362120a0f6668293a03e70887162bdf917b0118df6e399e2c507a2b194284c7b2a530 SHA512 5235168913411aeafd9b533a78e27e3f19041eeebe0288f409002f0c9b77ebe51b06cdf8c6b56f85887ac0e123a1b62f877b830a3377f4bb732e33568d790ac0
 EBUILD sysvinit-3.05.ebuild 5306 BLAKE2B b4e6a3e983add3f0ec16c5ad95454f8a709dc6972008b3ad5de92e3e9b0dc2976b170e4986895dab69fc1ef7014c0810d15ecdc9591c6e333490be485a4696ef SHA512 bce906a7487840595464f866f18d8e1b694e304c2b262e6406ec15b7fc898a90a520bdf4755bdcee0954f7689d7463b595965a19b5a57a11d1d41dedba27b78a
 MISC metadata.xml 449 BLAKE2B e8c38e3a241f77fb4de63d170e24bcc8d1f8a9ada912fb5870d150874412c2a60a5c3a59ef662bc81f929fb4c36db393667c49c8c75346c3212b81b129edd5d5 SHA512 d5ae5c9606c89a9b73982983d68353bf0605a9c98e7272e762c5a62188b75a071675b61bac5894761a33babcb874949acb76292cda6a6b1fb4abdf725e2e847b
diff --git a/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
deleted file mode 100644
index a4ceeda69c5f..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-other inits have moved to not requiring the -h flag when used with -H/-P.
-modify sysvinit to be the same since it really doesn't matter.
-
-https://bugs.gentoo.org/449354
-
-patch by Doug Goldstein
-
---- sysvinit-2.99/man/shutdown.8
-+++ sysvinit-2.99/man/shutdown.8
-@@ -66,22 +66,19 @@
- .\"}}}
- .\"{{{  -h
- .IP \fB\-h\fP
--Halt or power off after shutdown. Usually used with the \fI-P\fP or \fI-H\fP flags,
--depending on whether we want to poweroff or simply stop the operating system.
-+Equivalent to \fI-P\fP, unless \fI-H\fP is specified.
- .\"}}}
- .\"{{{  -P
- .IP \fB\-P\fP
--Modifier to the \fI-h\fP flag. Halt action is to turn off the power. 
--Must be used with the \fI-h\fP flag.
-+Halt action is to turn off the power.
- .\"}}}
- .\"{{{  -H
- .IP \fB\-H\fP
--Modifier to the \fI-h\fP flag.  Halt action is to halt or drop into boot
--monitor on systems that support it.  Must be used with the \fI-h\fP flag.
-+Action is to halt or drop into boot monitor on systems that support it.
- Halting is often used to run through the shutdown process and leave
- output on the screen for debugging purposes. Or when the user wants the OS to
- stop, but leave the power on. To power off at the end of the shutdown sequence
--use the \fI-P\fP modifier instead.
-+use the \fI-P\fP option instead.
- .\"}}}
- .\"{{{  -f
- .IP \fB\-f\fP
---- sysvinit-2.99/src/shutdown.c
-+++ sysvinit-2.99/src/shutdown.c
-@@ -144,9 +144,7 @@
- 	"\t\t  -r:      reboot after shutdown.\n"
- 	"\t\t  -h:      halt after shutdown.\n"
- 	"\t\t  -P:      halt action is to turn off power.\n"
--        "\t\t           can only be used along with -h flag.\n"
- 	"\t\t  -H:      halt action is to just halt.\n"
--        "\t\t           can only be used along with -h flag.\n"
- 	"\t\t  -f:      do a 'fast' reboot (skip fsck).\n"
- 	"\t\t  -F:      Force fsck on reboot.\n"
- 	"\t\t  -n:      do not go through \"init\" but go down real fast.\n"
-@@ -556,9 +554,11 @@
-   		switch(c) {
- 			case 'H':
- 				halttype = "HALT";
-+				down_level[0] = '0';
- 				break;
- 			case 'P':
- 				halttype = "POWEROFF";
-+				down_level[0] = '0';
- 				break;
- 			case 'a': /* Access control. */
- 				useacl = 1;
-@@ -574,6 +574,8 @@
-   				break;
-   			case 'h': /* Halt after shutdown */
- 				down_level[0] = '0';
-+				if (!halttype)
-+					halttype = "POWEROFF";
-   				break;
-   			case 'f': /* Don't perform fsck after next boot */
-   				fastboot = 1;
-@@ -613,12 +615,6 @@
-   		}
- 	}
- 
--	if (NULL != halttype && down_level[0] != '0') {
--		fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n");
--		usage();
--  		exit(1);
--	}
--
- 	/* Do we need to use the shutdown.allow file ? */
- 	if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
- 
diff --git a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
deleted file mode 100644
index 589bb6747c9b..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux ibm static"
-
-CDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${CDEPEND}
-	virtual/os-headers"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-shutdown )
-	!<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.99-shutdown-h.patch" #449354
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	export VERSION="${PV}"
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	# dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild
deleted file mode 100644
index 589bb6747c9b..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.01.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux ibm static"
-
-CDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${CDEPEND}
-	virtual/os-headers"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-shutdown )
-	!<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.99-shutdown-h.patch" #449354
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	export VERSION="${PV}"
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	# dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.03.ebuild b/sys-apps/sysvinit/sysvinit-3.03.ebuild
deleted file mode 100644
index 392f8ab24242..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.03.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="de es fr pl"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers"
-# Old OpenRC blocker is for bug #587424
-# Keep for longer than usual given it's cheap and avoid user inconvenience
-RDEPEND="${COMMON_DEPEND}
-	!<app-i18n/man-pages-l10n-4.12.1-r2
-	!<sys-apps/openrc-0.13
-	selinux? ( sec-policy/selinux-shutdown )"
-# po4a is for man page translations
-BDEPEND="nls? ( app-text/po4a )
-	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
-
-PATCHES=(
-	# bug #80220
-	"${FILESDIR}/${PN}-2.86-kexec.patch"
-	# bug #158615
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-
-	delete_unused_locale() {
-		local locale=${1}
-
-		einfo "Deleting non-requested man page translations for locale=${locale}"
-		rm "${S}"/man/po/${locale}.po || die
-
-		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
-	}
-
-	plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
-	tc-export CC
-
-	append-lfs-flags
-
-	# bug #381311
-	export DISTRO=
-	export VERSION="${PV}"
-
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		cd man/po || die
-		po4a po4a.cfg || die
-	fi
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		install_locale_man_pages() {
-			doman -i18n=${1} man/po/${1}/*
-		}
-
-		plocale_for_each_locale install_locale_man_pages
-	fi
-
-	# Dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.04.ebuild b/sys-apps/sysvinit/sysvinit-3.04.ebuild
deleted file mode 100644
index 392f8ab24242..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.04.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="de es fr pl"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers"
-# Old OpenRC blocker is for bug #587424
-# Keep for longer than usual given it's cheap and avoid user inconvenience
-RDEPEND="${COMMON_DEPEND}
-	!<app-i18n/man-pages-l10n-4.12.1-r2
-	!<sys-apps/openrc-0.13
-	selinux? ( sec-policy/selinux-shutdown )"
-# po4a is for man page translations
-BDEPEND="nls? ( app-text/po4a )
-	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
-
-PATCHES=(
-	# bug #80220
-	"${FILESDIR}/${PN}-2.86-kexec.patch"
-	# bug #158615
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-
-	delete_unused_locale() {
-		local locale=${1}
-
-		einfo "Deleting non-requested man page translations for locale=${locale}"
-		rm "${S}"/man/po/${locale}.po || die
-
-		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
-	}
-
-	plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
-	tc-export CC
-
-	append-lfs-flags
-
-	# bug #381311
-	export DISTRO=
-	export VERSION="${PV}"
-
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		cd man/po || die
-		po4a po4a.cfg || die
-	fi
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		install_locale_man_pages() {
-			doman -i18n=${1} man/po/${1}/*
-		}
-
-		plocale_for_each_locale install_locale_man_pages
-	fi
-
-	# Dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a9669508d9f2..cd166b02003a 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,10 +6,7 @@ AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c756098
 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7
 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
-DIST util-linux-2.38.tar.sign 833 BLAKE2B bddde8cf392155eabe1e5f3c77d4f61cc9cb235c6d668cb289bf78650775d309dbe633e8a272ca52ff208e18bc8eaa4f8664ac239e285feb1eea5e3def1b8c2f SHA512 8909576d64c74e43496d45fcf87a761d9960cd8867534923bb280f2e4abaf4df871723aed10ac4e514e14dcbce147bdc9590de3c84994b11227923264313ac2c
-DIST util-linux-2.38.tar.xz 7349140 BLAKE2B dd3b2abb3fedd91e35cc5665b49f1913aa93927cbb6eb5c9715a9f2ce06269d43c28fe96f6c67be88c210ca20e574177b06780ab4798cbbb0d7c76df07f3eeab SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c
 EBUILD util-linux-2.37.4.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a
 EBUILD util-linux-2.38.1.ebuild 10821 BLAKE2B 796146093c56e08c20a174e627ba190c6506c6ebece82c515d6c79023b091cb0dc98454694e8682fcb0ac77c0fa35defd1d722e044e3cf3c39b8cb51ae4c54ba SHA512 cc69ab74eed977731e6352555dfcf8042e2288a196d8130f86c7b0e0973dcb7948750d24b41f5a45f0c5d4c68d22014d3b91387b33af0282af68ccd08cce912c
-EBUILD util-linux-2.38.ebuild 10819 BLAKE2B 7317078c9dcb3693626cf7b46c47c001ed5a8a267ccb0e6964f011c2cb2b165c19b5346b21363e786d77691b038dae5086e354a20ce53362725f5e198ecf9b49 SHA512 422801817576d20a373f63286b8ac226c6e9e091ec1bc4c3a5df8aa90aa11274e73a86a488e2e3eaf21e6e054599b8e4a195dafebb06b3baffc8e4423f373924
 EBUILD util-linux-9999.ebuild 10821 BLAKE2B 796146093c56e08c20a174e627ba190c6506c6ebece82c515d6c79023b091cb0dc98454694e8682fcb0ac77c0fa35defd1d722e044e3cf3c39b8cb51ae4c54ba SHA512 cc69ab74eed977731e6352555dfcf8042e2288a196d8130f86c7b0e0973dcb7948750d24b41f5a45f0c5d4c68d22014d3b91387b33af0282af68ccd08cce912c
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.38.ebuild b/sys-apps/util-linux/util-linux-2.38.ebuild
deleted file mode 100644
index d125ee135b9c..000000000000
--- a/sys-apps/util-linux/util-linux-2.38.ebuild
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
-	inherit verify-sig
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	fi
-
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	rtas? ( sys-libs/librtas )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-"
-
-if [[ ${PV} == 9999 ]] ; then
-	# Required for man-page generation
-	BDEPEND+=" dev-ruby/asciidoctor"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	if use su && ! use suid ; then
-		elog "su will be installed as suid despite USE=-suid (bug #832092)"
-		elog "To use su without suid, see e.g. Portage's suidctl feature."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if use test ; then
-		# Prevent uuidd test failure due to socket path limit, bug #593304
-		sed -i \
-			-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-			tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-		# Known-failing tests
-		# TODO: investigate these
-		local known_failing_tests=(
-			# Subtest 'options-maximum-size-8192' fails
-			hardlink/options
-
-			lsfd/mkfds-symlink
-			lsfd/mkfds-rw-character-device
-		)
-
-		local known_failing_test
-		for known_failing_test in "${known_failing_tests[@]}" ; do
-			einfo "Removing known-failing test: ${known_failing_test}"
-			rm tests/ts/${known_failing_test} || die
-		done
-
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS, bug #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-
-	append-lfs-flags
-
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-		--enable-libblkid
-		--enable-libmount
-		--enable-pylibmount
-	)
-
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. bug #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-
-	# bug #485486
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
-	# bug #545042
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
-	# bug #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# Avoid automagic dependency on ppc*
-	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-
-	if multilib_is_native_abi ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-raw
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# Upstream is shipping pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-			--enable-libmount
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call, bug #689190
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# Need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if use pam ; then
-		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-
-		newpamd "${FILESDIR}/su-l.pamd" su-l
-	fi
-
-	if use su && ! use suid ; then
-		# Always force suid su, even when USE=-suid, as su is useless
-		# for the overwhelming-majority case without suid.
-		# Users who wish to truly have a no-suid su can strip it out
-		# via e.g. Portage's suidctl or some other hook.
-		# See bug #832092
-		fperms u+s /bin/su
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-
-	local ver=$(tools/git-version-gen .tarballversion)
-	local major=$(ver_cut 1 ${ver})
-	local minor=$(ver_cut 2 ${ver})
-	local release=$(ver_cut 3 ${ver})
-	export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
-}
-
-pkg_postinst() {
-	if ! use tty-helpers ; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}