gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-apps
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
196 files changed, 1554 insertions, 5272 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9059f3743ae6..faa14a17389a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 9d144407a179..353187705100 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,7 +1,7 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
 DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
 DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
-EBUILD acl-2.2.53-r1.ebuild 1389 BLAKE2B 3f315dce6b0f21880ed3d9bd5c050773ee4bdfa1041980946310e274c49d7300fb8d6b8fe95f9d497bf8097c6370ac2c7913a938e122b1c9936b0fbea4d46f7e SHA512 c1bc01a8c97730bdc6c69d0c3987c52ce0070a94d4e6efdf6be427d07bbe987ba402ea6e83bb96dc1474dbb1d5202a355026d5914d03ff33026b253b8ecaf30a
-EBUILD acl-2.3.0.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
-EBUILD acl-2.3.1.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
+EBUILD acl-2.2.53-r1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922
+EBUILD acl-2.3.0.ebuild 1354 BLAKE2B 6463639b3008515864594574eefde4ab927ba559087d8f989beb1dca1f928ff73a583e46b7f0415a8e6d7a21a4930b444db811ed8cbcd39b89f79364a3a6cba5 SHA512 de765bf94d376c2ba4ece69c9750b717304676639a145362ee598e0b218cad21f1dfb151aa82df6f338d0944a26900788950220dcaf60a5c33e4225241578a8e
+EBUILD acl-2.3.1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
index 1c5fd4005593..5ab955ac8363 100644
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.53-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
 
-DESCRIPTION="access control list utilities, libraries and headers"
+DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
@@ -20,37 +20,38 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	# filter out -flto flags as they break getfacl/setfacl binaries
-	# (bug #667372)
-	filter-flags -flto*
-}
-
 src_prepare() {
 	default
-	elibtoolize #580792
+
+	# bug #580792
+	elibtoolize
 }
 
 multilib_src_configure() {
+	# Filter out -flto flags as they break getfacl/setfacl binaries
+	# bug #667372
+	filter-flags -flto*
+
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		$(use_enable static-libs static)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable nls)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
 	# Tests call native binaries with an LD_PRELOAD wrapper
-	# https://bugs.gentoo.org/772356
+	# bug #772356
 	multilib_is_native_abi && default
 }
 
 multilib_src_install() {
 	default
 
-	# move shared libs to /
+	# Move shared libs to /
 	gen_usr_ldscript -a acl
 }
 
diff --git a/sys-apps/acl/acl-2.3.0.ebuild b/sys-apps/acl/acl-2.3.0.ebuild
index b802802db8a9..7ffef6cfc235 100644
--- a/sys-apps/acl/acl-2.3.0.ebuild
+++ b/sys-apps/acl/acl-2.3.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
 
-DESCRIPTION="access control list utilities, libraries and headers"
+DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
@@ -20,37 +20,38 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	# filter out -flto flags as they break getfacl/setfacl binaries
-	# (bug #667372)
-	filter-flags -flto*
-}
-
 src_prepare() {
 	default
-	elibtoolize #580792
+
+	# bug #580792
+	elibtoolize
 }
 
 multilib_src_configure() {
+	# Filter out -flto flags as they break getfacl/setfacl binaries
+	# bug #667372
+	filter-flags -flto*
+
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		$(use_enable static-libs static)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable nls)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
 	# Tests call native binaries with an LD_PRELOAD wrapper
-	# https://bugs.gentoo.org/772356
+	# bug #772356
 	multilib_is_native_abi && default
 }
 
 multilib_src_install() {
 	default
 
-	# move shared libs to /
+	# Move shared libs to /
 	gen_usr_ldscript -a acl
 }
 
diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1.ebuild
index b802802db8a9..5ab955ac8363 100644
--- a/sys-apps/acl/acl-2.3.1.ebuild
+++ b/sys-apps/acl/acl-2.3.1.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
 
-DESCRIPTION="access control list utilities, libraries and headers"
+DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
@@ -20,37 +20,38 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	# filter out -flto flags as they break getfacl/setfacl binaries
-	# (bug #667372)
-	filter-flags -flto*
-}
-
 src_prepare() {
 	default
-	elibtoolize #580792
+
+	# bug #580792
+	elibtoolize
 }
 
 multilib_src_configure() {
+	# Filter out -flto flags as they break getfacl/setfacl binaries
+	# bug #667372
+	filter-flags -flto*
+
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		$(use_enable static-libs static)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable nls)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
 	# Tests call native binaries with an LD_PRELOAD wrapper
-	# https://bugs.gentoo.org/772356
+	# bug #772356
 	multilib_is_native_abi && default
 }
 
 multilib_src_install() {
 	default
 
-	# move shared libs to /
+	# Move shared libs to /
 	gen_usr_ldscript -a acl
 }
 
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index e0a499dc1ad8..a8f0077392cc 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -7,6 +7,6 @@ DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd
 EBUILD attr-2.4.48-r4.ebuild 2353 BLAKE2B 47e89fd3a2737de71b9a526c816b24ad0dad2c38c333333b4217fcdefd46caaa0148ddbe27ffe0baeb3be1517839a146c0e564fb1a00c67e1c01df2a441508ee SHA512 e384c8cfb28af3885e2ed1e5813d14f95af2081c457efb14757d4ed9a9f40c2ce9d007c2f28f3473d4743597bfe236c966c55f0784ccfc402ad4ae8270e1005a
 EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7
 EBUILD attr-2.5.0.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
-EBUILD attr-2.5.1.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
+EBUILD attr-2.5.1.ebuild 2468 BLAKE2B 288f532b6b14be26f9bb2a0c0dd2076c0894fd50a424a11744aa142934bb2246c614a38a29c1bcded98b52fb7cf107eb3889181cd7a2e71fef23f57fe8e5098b SHA512 0c3d996b35bdb7ca12c29c14002ff9cc3b3c2dfdef46b1198b2fd212e4fe065da7a22086c5caef790ea0d866e9fae7dce66478ae372ec19462ba2639061637b1
 EBUILD attr-9999.ebuild 2476 BLAKE2B e5531eae4407b8ea7aa21a00a8eac0c63fb2f2f3745030b8acc20780c896660c67e470ff562940f55f6074b641b812be9aa455c0c6e6a7b4353fb82bc3ff044d SHA512 9fadedfc67e6f03d1ebcbb0b8bbf64a47cfcea0f8a1d4e7c3e42c1ad4de2bccf2309775eff8d473892867339da0afea98d88d009a31ece6ce809c8b3a29a82de
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild
index 7465baca96b8..c7b952aa2a8f 100644
--- a/sys-apps/attr/attr-2.5.1.ebuild
+++ b/sys-apps/attr/attr-2.5.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index edc9de757e65..54e98e24d4cb 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -2,5 +2,5 @@ DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b6
 EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2f5f26fd794838e3cb21634f089b66cefc4e915c9e88148f0e1f2a0067a57bfb029833572614c0190d54f862ff15659 SHA512 847e2ddae301a856b7719fe9134635ea79f0059107188aad8c554fda4da428f970a2ad4daf56491050acacd822175fa8ae18f22402e19677df9d920c525ce737
 EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b
 EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71
-EBUILD baselayout-9999.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b
+EBUILD baselayout-9999.ebuild 9824 BLAKE2B 178bcbc1a2c0373d1c83b870034b879cc34a1a8f8aabcf2035d89a48824bf3d0765d4131a31496435b59aed37dd23b45810553471a6bdc9a13bfa82b2b483b6c SHA512 ceb10aabcc5fb25b27a224d126d5a7bac54fbe7cc38d98376a589ece84fc7e6daa6eb10953e54dc4b73e43cf1f7bc78b74c54e067b5be3ede63fe9ea7a1b55c9
 MISC metadata.xml 382 BLAKE2B 7c360eab19fc55da87cf2a432c1f2407918be3cf32ec581b974fea953aea00a51998cd05facd0c4b6d609e38bd1f243380a5c3a9effcb5e7bebbf22ec6d9418c SHA512 1a444b5b8fc6573fae97c6e0bf5e3dc69f9e18a42d2a7c91ac2742bca17580468be8b17ca6349451817b0087f619bad90a1050b1fd8511fc5e57b792b5006d72
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index a37d17f3b8d1..9f4a53a1c184 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -282,18 +282,6 @@ pkg_postinst() {
 		fi
 	fi
 
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
 	for x in ${REPLACING_VERSIONS}; do
 		if ver_test 2.4 -lt ${x}; then
 			ewarn "After updating ${EROOT}/etc/profile, please run"
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index d728f28f16a9..217236b4938e 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,4 +1,4 @@
 AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a02aa053a6bf5ed675329b3d18a4f261529a434d1c9dbfb637a3f96f4079a6adba586b666d7890370c8761c92dc9450f096a8368bbe SHA512 f6515a25c6b311c9b8336761c7daea2440964982f8a7a6587b6707ef9e9a5705ec380e13982b0765af205c221724ef418b44c3efd1b6e5f0c1788b143a88ef17
 DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35
-EBUILD bubblewrap-0.4.1.ebuild 1137 BLAKE2B 140817832648087cff8d03cb78e51c794a1a4973208d63bdd24659487ac24f4b93d38bd0f50008a24a202a3846c595c35da73c95e078a0784f844f7671782a6f SHA512 1591fbf074c48844711f042a2de8c29aa2c09a5b2fc33cfca8eb4e1d33eb356c55aea60eb286aeabe7ccffdec90157af3ddc4eefd6b9bb15b512387f43bcdfb2
+EBUILD bubblewrap-0.4.1.ebuild 1136 BLAKE2B 098e423f64d05e1310ecc704fd1df29d6971058ef8a70731b4fd9cc3b701c868bbf60454d0ac390a994ff092ae56916a8638f9630f7df4bcd3d8d6702af9b707 SHA512 3bbf50f0ebe5c48f5ad1df668f5c067f6cb72e60e9765ed5ab521a0ea71848a9548b28e6f4a0f993cd684701c208a72651b51d80f358feabc0a7c1edaecf8062
 MISC metadata.xml 452 BLAKE2B c11d7134d3623de9f970ddcb4782d1312f89b17955090ee7d4c56a1acb9b45f1c5ae0d08d091b57be21b696cceda0ed7d747c10aa6765c927df8dae81233d66c SHA512 3e6ec22d7109fdf7772edba88f6f76783df8ee233d9f927b6e5570d1453f611f93627c2ea3dfcbe9ae1259d1c23692b26d5403fef02558dcf296f569702c5103
diff --git a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
index 045b5a61571e..8ed4a91e0e2f 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 173035a88ebc..66e8f1a7b22b 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -4,6 +4,6 @@ AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-EBUILD coreutils-8.31-r1.ebuild 5682 BLAKE2B 206d6137b4724c31c7da1014ebad85aa6b8586feead92fda063332e48f7b4623d37591a58c3134e270fc079e1042aa0c0884c3f3f708947734e126e380855294 SHA512 0f9134804420d3b9e87f8f9e18bc755ddab5cc938308bfc3c3b528ad2bc8fd68e0510057b9d92f8ee399886f0c0a37a878396593b4107e35420119231615c581
-EBUILD coreutils-8.32-r1.ebuild 5799 BLAKE2B 0394e78d7a156530d60dbd0ca4bacf47195b671d0d88c928d1d0e2ae87e30f9f67d7111330620c01cc5cf290be7c8e13c06acdb2973dbb94d1de375dc34e77fc SHA512 e37b6c2caeaa7799c3b850047e02254af3c5b2e3cba87302f83753fc0df51ba1f496cd557fadb0de0919d67ae746d691f365eccacd86934e46b7e04f366f7440
+EBUILD coreutils-8.31-r1.ebuild 5834 BLAKE2B 5dd1a356f99e4db05ffcefaff61c0b74d8310b04c050a8ed73713514bc47ad4153ab1a9b89db901fe0ac011a6cf3036d8a11dd12a782564939537d115bbf2b41 SHA512 caaaa8e2d22b79c95facc15a3b917c8d194d76f024fb358c9de2e68356c65c18fff871c092e121507c5b2287fca16da4e642e13612c2b8296d92864210e20933
+EBUILD coreutils-8.32-r1.ebuild 5950 BLAKE2B 1bc00f9caed909d0054aaa2ae6a044758a6bdba05b2b39082ee6c7014436a1c6e4300300d87337d8c7dec9812486173da905f29aeee9f3eece1503e3705a9d8f SHA512 d8c15eb91c5b770340801f3c46bfb9d37529db128d2bce399b6d441e1d5d51cbc72894dccff73e4b0160c9adf6b9ca2f391e3432c9c2b7990fbfd36d2c39777a
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index ff8eae00d6cf..6c16ecc18fb4 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 PYTHON_COMPAT=( python3_7 )
 
-inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+inherit flag-o-matic python-any-r1 toolchain-funcs
 
 PATCH="${PN}-8.30-patches-01"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
@@ -68,15 +68,16 @@ src_prepare() {
 	# 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}
+	touch ${@/%x/1} || die
 
-	# Avoid perl dep for compiled in dircolors default #348642
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
 	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
-		touch ${@/%x/1}
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
 	fi
 }
 
@@ -85,6 +86,9 @@ src_configure() {
 		--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
@@ -95,17 +99,29 @@ src_configure() {
 		$(use_enable xattr)
 		$(use_with gmp)
 	)
+
 	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		export fu_cv_sys_stat_statfs2_bsize=yes #311569
-		export gl_cv_func_realpath_works=yes #416629
+		# 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
 
-	export gl_cv_func_mknod_works=yes #409919
-	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
-	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
-	# kill/uptime - procps
-	# groups/su   - shadow
-	# hostname    - net-tools
 	econf "${myconf[@]}"
 }
 
@@ -121,12 +137,13 @@ src_test() {
 
 	# Non-root tests will fail if the full path isn't
 	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}"
-	chmod a+rx "${WORKDIR}"
+	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 #265725
-	# make sure /dev/loop* can be mounted #269758
+	# 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
@@ -136,7 +153,7 @@ src_test() {
 				#!${EPREFIX}/bin/sh
 				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
 			EOF
-			chmod a+rx "${ww}"
+			chmod a+rx "${ww}" || die
 		done
 	}
 	mkwrap mount umount
@@ -157,25 +174,30 @@ src_install() {
 	if use split-usr ; then
 		cd "${ED%/}"/usr/bin || die
 		dodir /bin
-		# move critical binaries into /bin (required by FHS)
+
+		# 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 ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
 			mv hostname ../../bin/ || die
 		fi
-		if use kill; then
+
+		if use kill ; then
 			mv kill ../../bin/ || die
 		fi
-		# move critical binaries into /bin (common scripts)
-		# Why are these required for booting?
+
+		# 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
+		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.
+		# the files there in the first place...)
 		local x
 		for x in ${com} uname ; do
 			dosym ../../bin/${x} /usr/bin/${x}
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 9b25f987a67a..4ff6e6859fbd 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+inherit flag-o-matic python-any-r1 toolchain-funcs
 
 PATCH="${PN}-8.30-patches-01"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
@@ -79,15 +79,16 @@ src_prepare() {
 	# 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}
+	touch ${@/%x/1} || die
 
-	# Avoid perl dep for compiled in dircolors default #348642
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
 	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
-		touch ${@/%x/1}
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
 	fi
 }
 
@@ -96,6 +97,9 @@ src_configure() {
 		--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
@@ -106,17 +110,28 @@ src_configure() {
 		$(use_enable xattr)
 		$(use_with gmp)
 	)
+
 	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		export fu_cv_sys_stat_statfs2_bsize=yes #311569
-		export gl_cv_func_realpath_works=yes #416629
+		# 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
 
-	export gl_cv_func_mknod_works=yes #409919
-	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
-	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
-	# kill/uptime - procps
-	# groups/su   - shadow
-	# hostname    - net-tools
 	econf "${myconf[@]}"
 }
 
@@ -132,12 +147,13 @@ src_test() {
 
 	# Non-root tests will fail if the full path isn't
 	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}"
-	chmod a+rx "${WORKDIR}"
+	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 #265725
-	# make sure /dev/loop* can be mounted #269758
+	# 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
@@ -147,7 +163,7 @@ src_test() {
 				#!${EPREFIX}/bin/sh
 				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
 			EOF
-			chmod a+rx "${ww}"
+			chmod a+rx "${ww}" || die
 		done
 	}
 	mkwrap mount umount
@@ -168,25 +184,30 @@ src_install() {
 	if use split-usr ; then
 		cd "${ED}"/usr/bin || die
 		dodir /bin
-		# move critical binaries into /bin (required by FHS)
+
+		# 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 ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
 			mv hostname ../../bin/ || die
 		fi
-		if use kill; then
+
+		if use kill ; then
 			mv kill ../../bin/ || die
 		fi
-		# move critical binaries into /bin (common scripts)
-		# Why are these required for booting?
+
+		# 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
+		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.
+		# the files there in the first place...)
 		local x
 		for x in ${com} uname ; do
 			dosym ../../bin/${x} /usr/bin/${x}
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index a57169918c99..626ada029116 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,5 +1,5 @@
 DIST cracklib-words-2.9.6.gz 5536645 BLAKE2B b0ac23e8777cb094cec565e9728ca8dd37359cd19c2e2d4cd215635f462e464fb27fc5a9e560895804df4e519c465845b381a8cd47fb4d6f9b9c62109ff661e6 SHA512 fc5bbe7699c9c9e3f39f5c82f53ec8a4ea85e08d5513188a2f6423f92779008b87d85cfcf87a9a5d13a49b04c30f73890cd4d3fa7cd4a6bdac5c1ebc18e18bc3
 DIST cracklib-words-2.9.7.gz 5537586 BLAKE2B 242afa5e3615b159c59d27c99b87f008f245351cc7e4bd8dc975e66b4ef98456841c6a213282744d39c221c8646dc8e0c5ad99f277f37ae3e64bc949f6b57187 SHA512 1fa34b0a2e16d6906982b248f1757bf5bf8154d8d7e8bab94a4ac25080c41434d3828a2c8dd5065e9be586f36480ab70375f09e0bb64eb495d96a460619e2bae
-EBUILD cracklib-words-2.9.6.ebuild 701 BLAKE2B 83655609dfd26193f5bd663d9604ed01916481595ef2dbc089240da63a643063fa0094ae0110a054999c8b895b678af446f18123f3d5c5daa90cfa8b5060339e SHA512 c622dcc9f4e86d7e1c79dec11036910205f3eff87767e8e3c895f8a4e78096b6494b217bf865fdc428f2d813cc48fbcd5b5aa8f1aeb629d526241ab13642b527
+EBUILD cracklib-words-2.9.6.ebuild 691 BLAKE2B ebaf95c113d6f944e92ee12a2da15ffc973f6b13921d1f7f376c0e2ca997b406bc64f01f05678e5f1d79eccb7dbcef8d57cb9ab357577b562589e20b550e7134 SHA512 735dacd08e0a25955cf5a40f6056d4b65846d3f92c4a206c0336a39db49c18acb03bda6be26cc7bfef6e8b08979059ca7b92014619bdf160510588c978a1e4bc
 EBUILD cracklib-words-2.9.7.ebuild 736 BLAKE2B 1cbf6d6590b6cecdb25f0f7c37be3c387c72970b89b9a60b268f5ddd8533af770b1338ffc77fd29d8476824b3e5004e219821f901e1f834a03879b63975faf65 SHA512 b6c9e8c1d745a2fb5d9218082e268526dc056849b8deef7a71272542d3b044b804c27f2a7b77ea97183cf56ef1effcccffb6f81b4c6efb7ac7a24977a70a4c84
 MISC metadata.xml 392 BLAKE2B d1898dad58458a8c73afff00e58272708e58bb52afe9904d035b052aeaf74bd105c864cd7ee50db6b9dbbb30973fd3ab7076f567f443b14b3360b6abbce69176 SHA512 760532a2c534bb34a6fe06d46ecd6dce13c1106e98ab92255f40502fd481dd12188d53c4caf0abad3d508d97ffd6db538a970f1a13e7174fa52e46826072d2e7
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
index 6f3b6cfc1d80..4ead5b71c749 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-DESCRIPTION="large set of crack/cracklib dictionaries"
+DESCRIPTION="Large set of crack/cracklib dictionaries"
 HOMEPAGE="https://github.com/cracklib/cracklib/"
 SRC_URI="https://github.com/cracklib/cracklib/releases/download/${P/-words}/${P}.gz"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S=${WORKDIR}
 
 src_install() {
 	insinto /usr/share/dict
@@ -20,7 +18,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT}" = "/" ] && create-cracklib-dict -h >&/dev/null ; then
+	if [[ -z "${ROOT}" ]] && create-cracklib-dict -h >&/dev/null ; then
 		ebegin "Regenerating cracklib dictionary"
 		create-cracklib-dict /usr/share/dict/* >/dev/null
 		eend $?
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 6a41e8d8afef..2b7aea757b4c 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,6 +1,4 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
-DIST debianutils_4.11.1.tar.xz 157536 BLAKE2B 2093568ff6e779d25ff2960b1bc6b12bcd451eaf9ad586ee48d6a6f52bcb0d53c58cb01697eee3fe47d22bf9019fedb5e2857fc8bb358b1449f65079cab1190b SHA512 8283e42f190a9c59c54817a745e219fcc9a1f8995204d62aff84f755ace041e433fe707d3b4373060207a70c9c01d958234281061f77e6e6fb6c560c79711772
 DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
-EBUILD debianutils-4.11.1.ebuild 913 BLAKE2B 6dd33615956b6b34509f8dd34a28636736d1b724de3ea6e56ee331dd11b3e6c1c1e307873cc3a2bba1ac5cabbc16cd576c4f338ef179224c15b4f05d8473fd69 SHA512 b716cd042ce6a4e96f77cb989fdd39d43b36e75a284db233d9e05300545c6e051b47530a71f3db1d446619c41209e8ae933aa16ce51833672dd1fca497707623
 EBUILD debianutils-4.11.2.ebuild 935 BLAKE2B b02267258f6285fe997d10d55b0d66b7b57b9cf06fed5b569272cc9b43c4276867e637de35b94eb8887136182b360f5a9e87cd2e2fee40f670e7d9e102624a39 SHA512 062c35544f1c3dd8e876fba48a9afd234857e3494401cac2774f966a45d8ff61325f25d1a65ba4ee6d19cf455312c796ac8f3da1009d4d3877bcf7a41437dfdc
 MISC metadata.xml 445 BLAKE2B 82971a9985ae487b4333505a1279ed6a642f7eb18880a693c6b0470a270c90b0508d7fcab5039a219a11bcb8a2d05ee3855c7f5bd93ac1172ebe7ed8d7542973 SHA512 1382c27ab6b70c086132eee442ac149ab41fa73bc33958fc93bcf1598c34c43658138c5f476c1291428c71983dee148abdcd630aad128d9b7ccc7c2309870db6
diff --git a/sys-apps/debianutils/debianutils-4.11.1.ebuild b/sys-apps/debianutils/debianutils-4.11.1.ebuild
deleted file mode 100644
index aed53a2826c1..000000000000
--- a/sys-apps/debianutils/debianutils-4.11.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+installkernel static"
-
-PDEPEND="
-	installkernel? (
-		|| (
-			sys-kernel/installkernel-gentoo
-			sys-kernel/installkernel-systemd-boot
-		)
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
-
-src_configure() {
-	use static && append-ldflags -static
-	default
-}
-
-src_install() {
-	into /
-	dobin tempfile run-parts
-
-	into /usr
-	dobin ischroot
-	dosbin savelog
-
-	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
-	cd debian || die
-	dodoc changelog control
-}
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index 12f7c17d8a3b..d01e474379c6 100644
--- a/sys-apps/dmapi/Manifest
+++ b/sys-apps/dmapi/Manifest
@@ -1,4 +1,5 @@
 AUX dmapi-2.2.12-headers.patch 354 BLAKE2B 83a2e4de5882c30a1ead955768c8033099c461ee955fba2021808a288e552ab0c97f3b13198270e367cc7c2e035094a631c7bd1b1454b13c82b9d0b1737c15cd SHA512 b087227085d3e068323f2a01c1c7044e1885e47b04caa1050e8552ced50dddfab871608bdf67a027989c359f2852cbcedcffeb6708e182d6d5dc3bfc9609489e
+AUX dmapi-2.2.12-no-doc.patch 453 BLAKE2B 57e6a2b0bf043228564a515ac35aab09f3ebe85477f55c014292ab04bda8df4c61041f17a4d6c34e20f3dbe5e38f3c7abed49040426d0f812e23d3621bfdf393 SHA512 87dcac6577b992c22527a6c4a8c36a25c88af589f00d071815dc3c97f991512646a5be6ca898e1cecd258586f23ff175d768cf9a47db6c05b3e605d5bba4a247
 DIST dmapi-2.2.12.tar.gz 367318 BLAKE2B 7d74f3081f8430c43d3ea961bd4ad2743a3ab65a016b0653a68074353ed60fa0c1a01a77aa470326aa1b10e731a5058355ab887cae00d21196958563ae6c4ee8 SHA512 aa44c0c7857158fed198deb9d1e00abaab549e3c22a7ce0e24e6088146bde56ecf967405b1b61a589460981ddcfaffbb1e9a2e677088efec317e3a7cb44abe4f
-EBUILD dmapi-2.2.12-r1.ebuild 1097 BLAKE2B 635c50d44545b68a5534ee40cb544802083d1012e9f8b7341069ce77a60932dfc587fd59d4105052365d6aa948b52df3b2de29cb27ffe65aedbf43b8d655728e SHA512 6db14746dcca212eadef5bd89927628153b8ccc542aaf03af20d2faf915ca3d5272750b09a240036f3de25b777c2b063d2e372eb9e99d2ee5ff1e3080025e4db
+EBUILD dmapi-2.2.12-r2.ebuild 1056 BLAKE2B 4ad250ed4f1326641c42bfd505fd38641231c6aa85ccbd24d6b5f292d9ba2357400273fa9cd9751849282f56586b13e1a83f6ad1cbc23703836b4b0dc53428c1 SHA512 586d04a6e7183def00f7e334f9dc81b3c7231c46d85b41f038f31a489e9a5ea9d0f544f5affbd784ef586c9168cf703e8f9f2760d16ee757f2bd8ca5a7a75395
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r2.ebuild
index 21619fe1a122..09a877413747 100644
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.12-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit epatch toolchain-funcs ltprune multilib multilib-minimal usr-ldscript
+inherit multilib-minimal usr-ldscript
 
 DESCRIPTION="XFS data management API library"
 HOMEPAGE="https://xfs.wiki.kernel.org/"
@@ -18,13 +18,15 @@ IUSE="static-libs"
 RDEPEND="sys-fs/xfsprogs"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in \
-		|| die
-	epatch "${FILESDIR}"/${P}-headers.patch
+DOCS=( doc/{CHANGES,PORTING} README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-no-doc.patch # bug 732042
+)
 
+src_prepare() {
+	default
 	multilib_copy_sources
 }
 
@@ -43,6 +45,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/${PF}/COPYING
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch b/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch
new file mode 100644
index 000000000000..295bdb7c6572
--- /dev/null
+++ b/sys-apps/dmapi/files/dmapi-2.2.12-no-doc.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@
+ 	libtool include/builddefs
+ 
+ LIB_SUBDIRS = include libdm
+-TOOL_SUBDIRS = m4 man doc debian build
++TOOL_SUBDIRS = m4 man debian build
+ 
+ SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
+ 
+@@ -66,7 +66,7 @@
+ 	touch .census
+ 
+ install: default $(addsuffix -install,$(SUBDIRS))
+-ifneq ($(PKG_DISTRIBUTION), debian)
++ifdef false
+ 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
+ 	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
+ endif
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 44e2a0ab3651..c075c3c20694 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,3 +1,3 @@
 DIST dmidecode-3.3.tar.xz 56372 BLAKE2B 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e SHA512 dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
-EBUILD dmidecode-3.3.ebuild 1128 BLAKE2B be603a603e49f1c5fc387b0a2bcdb8eb695ace29de9c2b2fec8c806928fc23d1c2987e9fa8a7a5178fdd8dd56407c708d785722f1f43bfb56478a311b56c09f7 SHA512 0653c7174023f0d54dad6d3a933520176da90994d4d66d9634cbc7ae530256597be368ca6cbb56a9b2815262a86ceeb66501df3996f385c9fe2061892cc92b15
+EBUILD dmidecode-3.3.ebuild 1115 BLAKE2B ef29080773adfabfab26dc462dda0eb9875cb4e9c7ed94121c27c209692194d4d571f9e8ddd924032e741693991e54c5287c7a61fecb788a92015ee369aaf8cb SHA512 6cd8f5bf84954da765c303c80fbc748559f873391513d16a7fc758dec2823b665575b8e13390307ca9598f55df5b1b04fe7edd6ebd714b929a3f2640ba3b361e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.3.ebuild b/sys-apps/dmidecode/dmidecode-3.3.ebuild
index 7bee66b73744..5671b2b883e5 100644
--- a/sys-apps/dmidecode/dmidecode-3.3.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
 HOMEPAGE="https://www.nongnu.org/dmidecode/"
diff --git a/sys-apps/duc/Manifest b/sys-apps/duc/Manifest
index 4fdfda67b106..39935bad91b3 100644
--- a/sys-apps/duc/Manifest
+++ b/sys-apps/duc/Manifest
@@ -1,7 +1,5 @@
 AUX duc-1.4.1-tinfo.patch 751 BLAKE2B 2928f2a12dc8755c5b43ce8255958ceac4b85dadd716d989bf1472b31ef9ee32e799fb83f4c69b617ef80d7479c070fcf784fc9b6efcdf234547167cca4d2119 SHA512 d0bfa984cad2691106038392297ae3e9ccb0dbf83a45456f50918c88d93bbddd33f9c5359367e6348d161b639e03f6e5339a44842d7fd5edb0306e21df846b4f
-DIST duc-1.4.1.tar.gz 325689 BLAKE2B 1e23204b60d1dd67eb094c1152c5056d0abc1fc6037a3811df5be18cbc4d61ccd2077b175f8f75559f368e2633476990e0c453cf88cff03c8aa3fc1796a42440 SHA512 88aa8f51651adf019c3a91c83eca308b822ff7569d6f6d30cf91338740ec9b0bd21c4f5dd783cf46c8d67aad6b03ad908cd7ed472e5db6feaf66ee02582d9f88
 DIST duc-1.4.3.tar.gz 363507 BLAKE2B 8d4364d48c247d7a83c8c5dd900b1c36ec78c68fa7d090e178a0e3209583e433c2e459d192f65ac350038c7e0d5a57df2c5c0d649cc9f554d7af74ad960c8db5 SHA512 5eb3e862e7003838e012dd1faab507a9b58607b77bd2af70a662005b6e4008ac44d1fb2e17b99da8e42ddfadb1cede2a468144ace7a72c12d0825fc7df4d18cd
-EBUILD duc-1.4.1-r1.ebuild 1733 BLAKE2B 42b1822de5a598f676893f58bc8254e3d25a6fc94cdfe2ba072c3fb86eecacb9322212d0788764dd7b0cd7637919c7fd8b17d0f4fbca91b22b81033a8b8d0d51 SHA512 6ad269c0d0a3353f2c2dc77b7ee73dfe6f5ee2802030619af2fcb36db7250d5e2960e63964fbf50f8d9d2fe37ffd48b799c6763b24184a47cc271a9472e0ae17
 EBUILD duc-1.4.3-r1.ebuild 1786 BLAKE2B ab3ff4a605e17af8e8684c95ca6fab309f321452119e7bfc1f8409346c1cffd37161138c61f65cd1b9f90683e9009a65f68cc4d68bd417fd8a55bbb1e8ed0fdb SHA512 b16673589ac327e782b8a98abb361c8aa732ab22d4e7306a0c87789c22a543b6018900ea68fab242238c20a6f3671feb2664992ec2a9a04f3bfe576d9940c7b7
 EBUILD duc-9999.ebuild 1786 BLAKE2B ab3ff4a605e17af8e8684c95ca6fab309f321452119e7bfc1f8409346c1cffd37161138c61f65cd1b9f90683e9009a65f68cc4d68bd417fd8a55bbb1e8ed0fdb SHA512 b16673589ac327e782b8a98abb361c8aa732ab22d4e7306a0c87789c22a543b6018900ea68fab242238c20a6f3671feb2664992ec2a9a04f3bfe576d9940c7b7
 MISC metadata.xml 838 BLAKE2B 79762b1423cc5de375cc7e4f9ed16749779db5cfd33b5c7f5c9819c2a00cdb162e023def10c4272064e42a5054cb033f4fa5eda6fd2e6045ed933b022fd239d0 SHA512 4e2f7fb47b98219402540be2c812f60aa6c1309b60cbe746855932287ed8fe4256dc3d555129f21dbc285d7d5332fda3d9c7dfaeb3984c47b598f8c05b06b8fe
diff --git a/sys-apps/duc/duc-1.4.1-r1.ebuild b/sys-apps/duc/duc-1.4.1-r1.ebuild
deleted file mode 100644
index fbabb254f8d7..000000000000
--- a/sys-apps/duc/duc-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zevv/duc.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/zevv/${PN}/releases/download/${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="A library and suite of tools for inspecting disk usage"
-HOMEPAGE="https://github.com/zevv/duc"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="cairo gui -leveldb ncurses -sqlite +tokyocabinet X"
-
-REQUIRED_USE="
-	^^ ( tokyocabinet leveldb sqlite )
-	X? ( cairo gui )
-"
-
-DEPEND="
-	cairo? ( x11-libs/cairo x11-libs/pango )
-	gui? (
-		X? (
-			x11-libs/cairo[X]
-			x11-libs/libX11
-			x11-libs/pango[X]
-		)
-		!X? ( >=media-libs/glfw-3.0 )
-	)
-	leveldb? ( dev-libs/leveldb )
-	ncurses? ( sys-libs/ncurses:= )
-	sqlite? ( dev-db/sqlite:3 )
-	tokyocabinet? ( dev-db/tokyocabinet )
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	sed -i -e "/ldconfig/d" -e "/install-exec-hook/d" Makefile.am || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=( $(use_enable ncurses ui) )
-
-	if use tokyocabinet; then
-		myconf+=( --with-db-backend=tokyocabinet )
-	elif	use leveldb; then
-		myconf+=( --with-db-backend=leveldb )
-	else
-		myconf+=( --with-db-backend=sqlite3 )
-	fi
-
-	# Necessary logic for cairo
-	if use gui && use X; then
-		# X backend GUI
-		myconf+=( --enable-x11 --disable-opengl --enable-cairo )
-	elif use gui; then
-		# OpenGL backend GUI
-		myconf+=( --disable-x11 --enable-opengl $(use_enable cairo) )
-	else
-		# No GUI
-		myconf+=( $(use_enable cairo) --disable-x11 --disable-opengl )
-	fi
-
-	econf ${myconf[@]}
-}
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index 5bc1d7ceac8a..a35541fb8a78 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -1,5 +1,5 @@
 AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c
 AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819
 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28
-EBUILD fbset-2.1.ebuild 750 BLAKE2B 2b128941a28747ad558cedf3733ecc23bcc05ece13dafedcd4e1736242dfdb9bfe228fb9398cf0ccfc20eff0617afc6ca1cbe17f98a6d794f777423a3c0018d4 SHA512 95103486a99b4f45ff0a4b8e10bbef467ad40943380df1706165c3aa43666611c2ae81c39c96ac7a8f7c202ce1ef09fb9a9486790c43c36f1b9f724ca288ac71
+EBUILD fbset-2.1.ebuild 757 BLAKE2B 24209a6b0f4c9f7dbd6e1ca6dd41cd2984d6dbdd90a1654093c47c7dd7ec793db91571d697fc8cd81941eada7b8579f9b13bc3c43ca80a014aa2576c94930ea3 SHA512 775e267e53e83eccba6ec833d5fc9deea46c3469998f2b2ba1ad3985c73a2e4c3f018417083b25e4a1443b1ba9476a94942ca594235a4a39c27003fd4e7735a2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 398f486926dd..d6fac5aa37e2 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static"
 
 BDEPEND="sys-devel/bison
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index e0462229ccfd..12a2ff21b349 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,3 @@
-DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
 DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
-EBUILD findutils-4.7.0.ebuild 1648 BLAKE2B 25c2b7765f22e7f568dcc0c277189f86a1f2068a640686701990115b1b86fbebd42915be85bbdf4c6c364b788ddfd928e7b9c2622b826e51b1418ae8d7c0c1a0 SHA512 5efa3ec30e2fd0d8599debd73e649bbcdc0eb60f28de6ac2e5102a9701215f886a0552082d76e50ba2219635858e03b18dcf928e3a1272c84b85163540fa02ed
-EBUILD findutils-4.8.0.ebuild 1647 BLAKE2B 1b889b4b73d6c77bbaf87a0e6080dd750c3b99d2d06b8bf3f074451f3acd55a978e6cf49dd3b258878fd900d4d06f584df0b1d2e40a1bd4105378600d3f8448d SHA512 0c79d74aa018eba8c0d15a720d06dbbc5e082ccf1e1e227cc34ea58c6a8e53b90d62ec8d890ea4920ff4ffc19769f11fb4e3ef4e9ff5f0963c3e6456cd95c99f
+EBUILD findutils-4.8.0.ebuild 1631 BLAKE2B 13f6868c1b87322043b67dafd8db552861b474bebff4e640b45b863f85621f26d724554119a6ddb3264cb939893111fadd440b7f01274d8e2c58a1029fa4e973 SHA512 f0c157053b92999d3de34c65fbab680baa5b6b3a686088b23af3902a7fb773c23217976bfd7bb30e98463bbb6e7f71ac0acffb191bf1dc8d2597ff05d7bb921d
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
deleted file mode 100644
index 611bb9a6662a..000000000000
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit flag-o-matic toolchain-funcs python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls selinux static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't build or install locate because it conflicts with mlocate,
-	# which is a secure version of locate.  See bug 18729
-	sed \
-		-e '/^SUBDIRS/s@locate@@' \
-		-e '/^built_programs/s@ frcode locate updatedb@@' \
-		-i Makefile.in || die
-
-	default
-}
-
-src_configure() {
-	if use static; then
-		append-flags -pthread
-		append-ldflags -static
-	fi
-
-	program_prefix=$(usex userland_GNU '' g)
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		--program-prefix=${program_prefix}
-		$(use_enable nls)
-		$(use_with selinux)
-		--libexecdir='$(libdir)'/find
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# We don't build locate, but the docs want a file in there.
-	emake -C locate dblocation.texi
-	default
-}
diff --git a/sys-apps/findutils/findutils-4.8.0.ebuild b/sys-apps/findutils/findutils-4.8.0.ebuild
index 61e4004cda6e..47dbdb5d3142 100644
--- a/sys-apps/findutils/findutils-4.8.0.ebuild
+++ b/sys-apps/findutils/findutils-4.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit flag-o-matic toolchain-funcs python-any-r1
+inherit flag-o-matic python-any-r1
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="https://www.gnu.org/software/findutils/"
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index c687169760ab..b3fa7a6ab9d2 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,6 +1,7 @@
 AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f7023338b0bffe775c61be9f7c253d6d8343833ec64ff86dc3b4733e90e67435e3cc0d52e6ae11c8d368fe2f21b6a85bc59 SHA512 a0e30c2a87775342302fabfd594c91015b6ea9fba71a7d1b294c399a8336167f85b07fdcc2ff80174cc43362ef5ca28965571ca52e1a76922ef59dcb15991664
 AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d
+AUX flashrom-9999_meson-fixes.patch 6672 BLAKE2B 299d89375783134cd1465db0b49c2b024c12e18c5c8551902989dbbedd4e17abf51074e387c569505531346b36605d3877106b2f23906b3c4b76b5f874d5104b SHA512 d235f343d28dc2ef7541c6f3f996eb21f51260bfd9f87376f22631035524fb92dfe63c711692092dc9749248db5756048976ba168d7f9814f5381f9234d8c7ec
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
-EBUILD flashrom-1.2-r3.ebuild 4333 BLAKE2B 7aff14f2c2dfa58af2ab24d59908e3194adc05887e9e3faf0a617914e067409f1426c8cf1825ba1399e104fe82bcda63746498727e6351dc44b01dc0eeef8dad SHA512 39af8a0ccf443284c26766c8034b2cdf51c0eda686fef506255e5c4859e7638f0a872762e932a42c7f5134ef4dde96d2b66c94f6a6d2c9b3d2fde9c9be7e8abc
-EBUILD flashrom-9999.ebuild 4522 BLAKE2B 4f56084b6fa495cdad7df4ebe4991df07f4210d3dff115f2a42abc994ae1fab159add3e4dabad6d98d916acebb4c74ed77c04627dc1b0d7bf36644a4e120101b SHA512 1d700fbea79892e5cde4197c5e22780f9180db56c283c320ad4ca359f225231c40ed4882b394a78d02f3c4489f195c3dd3ac79e19f78ff9bde3c3f2c208f7211
+EBUILD flashrom-1.2-r3.ebuild 4341 BLAKE2B 8036e77820ba03662c09fb74fbf7471379fc5a9afba2d45e3ce2858169820cd555448bee08dcd474f0a12206758c451b72a602ad879af4ac64f81c7415a5803b SHA512 f2e7472a4aaf9dead08d7cb71b6811c3d58486b55e6ef6a453f7224c6226cf9848593b5291b1b62b1700885c4fe0563cfcc1eb115dc0dcc8d0d7f944d8931504
+EBUILD flashrom-9999.ebuild 4710 BLAKE2B da42297fbf9d8f61f8180208faf0f713cd45a56331284d2497997de184f3ebb94aa7ded0354a978e30a45863126dd482c6ca685ceb9f4c7f81dfbae0b833ffb0 SHA512 6a530c9791ef111feb44dfaef6dd75719ec7a1eef7d668540e69313e01503fabcb77c324249639c0c71b25d7865e68f834f72d16912fb91ad7d1c143c908663b
 MISC metadata.xml 5037 BLAKE2B 3027f42fb0ab5965684cb79857991888772126fbf48e2f9c314a0e01c831cf38474a20ce846964631ea95dc459629396c3796fc89d858b35f239f2a3fb343c1b SHA512 8602f9ad7419bae5f10620400f9451d16c43d12223173873ab53191c93064bf0bdb72c78ee5cde8dc9fa091ce1c6c80575cf586141080c13c971370fa0ac85f8
diff --git a/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
new file mode 100644
index 000000000000..63c2e2ef7553
--- /dev/null
+++ b/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
@@ -0,0 +1,255 @@
+--- a/meson.build
++++ b/meson.build
+@@ -2,7 +2,7 @@ project('flashromutils', 'c',
+   version : run_command('util/getversion.sh', '-v').stdout().strip(),
+   license : 'GPL-2.0',
+   meson_version : '>=0.50.0',
+-  default_options : ['warning_level=2', 'c_std=c99'],
++  default_options : ['warning_level=2', 'c_std=gnu99'],
+ )
+ 
+ # libtool versioning
+@@ -74,6 +74,10 @@ cargs = []
+ deps = []
+ srcs = []
+ 
++config_bitbang_spi = false
++need_libftdi = false
++need_libpci = false
++need_libusb = false
+ need_raw_access = false
+ need_serial = false
+ 
+@@ -88,27 +92,25 @@ if cc.check_header('sys/utsname.h')
+   add_project_arguments('-DHAVE_UTSNAME=1', language : 'c')
+ endif
+ 
+-# some programmers require libusb
+-if get_option('usb')
+-  srcs += 'usbdev.c'
+-  srcs += 'usb_device.c'
+-  deps += dependency('libusb-1.0')
+-else
++if get_option('no_libftdi_programmers')
++  message('Disabling ALL libftdi-based programmers')
++  config_ft2232_spi = false
++  config_usbblaster_spi = false
++endif
++
++if get_option('no_libusb_programmers')
++  message('Disabling ALL libusb-based programmers')
+   config_ch341a_spi = false
+   config_dediprog = false
+   config_digilent_spi = false
+   config_developerbox_spi = false
+   config_pickit2_spi = false
+   config_raiden_debug_spi = false
++  config_stlinkv3_spi = false
+ endif
+ 
+-# some programmers require libpci
+-if get_option('pciutils')
+-  srcs += 'pcidev.c'
+-  deps += dependency('libpci')
+-  need_raw_access = true
+-  cargs += '-DNEED_PCI=1'
+-else
++if get_option('no_libpci_programmers')
++  message('Disabling ALL libpci-based programmers')
+   config_atahpt = false
+   config_atapromise = false
+   config_atavia = false
+@@ -130,14 +132,17 @@ endif
+ # set defines for configured programmers
+ if config_atahpt
+   srcs += 'atahpt.c'
++  need_libpci = true
+   cargs += '-DCONFIG_ATAHPT=1'
+ endif
+ if config_atapromise
+   srcs += 'atapromise.c'
++  need_libpci = true
+   cargs += '-DCONFIG_ATAPROMISE=1'
+ endif
+ if config_atavia
+   srcs += 'atavia.c'
++  need_libpci = true
+   cargs += '-DCONFIG_ATAVIA=1'
+ endif
+ if config_buspirate_spi
+@@ -147,18 +152,22 @@ if config_buspirate_spi
+ endif
+ if config_ch341a_spi
+   srcs += 'ch341a_spi.c'
++  need_libusb = true
+   cargs += '-DCONFIG_CH341A_SPI=1'
+ endif
+ if config_dediprog
+   srcs += 'dediprog.c'
++  need_libusb = true
+   cargs += '-DCONFIG_DEDIPROG=1'
+ endif
+ if config_developerbox_spi
+   srcs += 'developerbox_spi.c'
++  need_libusb = true
+   cargs += '-DCONFIG_DEVELOPERBOX_SPI=1'
+ endif
+ if config_digilent_spi
+   srcs += 'digilent_spi.c'
++  need_libusb = true
+   cargs += '-DCONFIG_DIGILENT_SPI=1'
+ endif
+ if config_jlink_spi
+@@ -168,6 +177,7 @@ if config_jlink_spi
+ endif
+ if config_drkaiser
+   srcs += 'drkaiser.c'
++  need_libpci = true
+   cargs += '-DCONFIG_DRKAISER=1'
+ endif
+ if config_dummy
+@@ -176,16 +186,18 @@ if config_dummy
+ endif
+ if config_ft2232_spi
+   srcs += 'ft2232_spi.c'
++  need_libftdi = true
+   cargs += '-DCONFIG_FT2232_SPI=1'
+-  deps += dependency('libftdi1')
+   cargs += '-DHAVE_FT232H=1'
+ endif
+ if config_gfxnvidia
+   srcs += 'gfxnvidia.c'
++  need_libpci = true
+   cargs += '-DCONFIG_GFXNVIDIA=1'
+ endif
+ if config_raiden_debug_spi
+   srcs += 'raiden_debug_spi.c'
++  need_libusb = true
+   cargs += '-DCONFIG_RAIDEN_DEBUG_SPI=1'
+ endif
+ if config_internal
+@@ -204,6 +216,7 @@ if config_internal
+     srcs += 'sb600spi.c'
+     srcs += 'wbsio_spi.c'
+   endif
++  need_libpci = true
+   config_bitbang_spi = true
+   cargs += '-DCONFIG_INTERNAL=1'
+   if get_option('config_internal_dmi')
+@@ -217,6 +230,7 @@ if config_ene_lpc
+ endif
+ if config_it8212
+   srcs += 'it8212.c'
++  need_libpci = true
+   cargs += '-DCONFIG_IT8212=1'
+ endif
+ if config_linux_mtd
+@@ -237,36 +251,44 @@ if config_mstarddc_spi
+ endif
+ if config_nic3com
+   srcs += 'nic3com.c'
++  need_libpci = true
+   cargs += '-DCONFIG_NIC3COM=1'
+ endif
+ if config_nicintel
+   srcs += 'nicintel.c'
++  need_libpci = true
+   cargs += '-DCONFIG_NICINTEL=1'
+ endif
+ if config_nicintel_eeprom
+   srcs += 'nicintel_eeprom.c'
++  need_libpci = true
+   cargs += '-DCONFIG_NICINTEL_EEPROM=1'
+ endif
+ if config_nicintel_spi
+   srcs += 'nicintel_spi.c'
++  need_libpci = true
+   config_bitbang_spi = true
+   cargs += '-DCONFIG_NICINTEL_SPI=1'
+ endif
+ if config_nicnatsemi
+   srcs += 'nicnatsemi.c'
++  need_libpci = true
+   cargs += '-DCONFIG_NICNATSEMI=1'
+ endif
+ if config_nicrealtek
+   srcs += 'nicrealtek.c'
++  need_libpci = true
+   cargs += '-DCONFIG_NICREALTEK=1'
+ endif
+ if config_ogp_spi
+   config_bitbang_spi = true
+   srcs += 'ogp_spi.c'
++  need_libpci = true
+   cargs += '-DCONFIG_OGP_SPI=1'
+ endif
+ if config_pickit2_spi
+   srcs += 'pickit2_spi.c'
++  need_libusb = true
+   cargs += '-DCONFIG_PICKIT2_SPI=1'
+ endif
+ if config_pony_spi
+@@ -283,10 +305,12 @@ if config_rayer_spi
+ endif
+ if config_satamv
+   srcs += 'satamv.c'
++  need_libpci = true
+   cargs += '-DCONFIG_SATAMV=1'
+ endif
+ if config_satasii
+   srcs += 'satasii.c'
++  need_libpci = true
+   cargs += '-DCONFIG_SATASII=1'
+ endif
+ if config_serprog
+@@ -296,10 +320,12 @@ if config_serprog
+ endif
+ if config_usbblaster_spi
+   srcs += 'usbblaster_spi.c'
++  need_libftdi = true
+   cargs += '-DCONFIG_USBBLASTER_SPI=1'
+ endif
+ if config_stlinkv3_spi
+   srcs += 'stlinkv3_spi.c'
++  need_libusb = true
+   cargs += '-DCONFIG_STLINKV3_SPI=1'
+ endif
+ if config_lspcon_i2c_spi
+@@ -322,6 +348,26 @@ if host_machine.system() == 'linux'
+   cargs += '-DCONFIG_I2C_SUPPORT=1'
+ endif
+ 
++# some programmers require libftdi
++if need_libftdi
++  deps += dependency('libftdi1')
++endif
++
++# some programmers require libpci
++if need_libpci
++  srcs += 'pcidev.c'
++  deps += dependency('libpci')
++  need_raw_access = true
++  cargs += '-DNEED_PCI=1'
++endif
++
++# some programmers require libusb
++if need_libusb
++  srcs += 'usbdev.c'
++  srcs += 'usb_device.c'
++  deps += dependency('libusb-1.0')
++endif
++
+ # raw memory, MSR or PCI port I/O access
+ if need_raw_access
+   srcs += 'hwaccess.c'
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,5 +1,6 @@
+-option('pciutils', type : 'boolean', value : true, description : 'use pciutils')
+-option('usb', type : 'boolean', value : true, description : 'use libusb1')
++option('no_libftdi_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libftdi')
++option('no_libpci_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libpci')
++option('no_libusb_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libusb')
+ option('print_wiki', type : 'boolean', value : true,  description : 'Print Wiki')
+ 
+ option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
index 574e00f7884b..286893be3db7 100644
--- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/"
+HOMEPAGE="https://flashrom.org/Flashrom"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index fe588c7916e0..dedf1bc3ada7 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit meson
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
 	inherit git-r3
@@ -15,16 +16,15 @@ else
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/"
+HOMEPAGE="https://flashrom.org/Flashrom"
 
 LICENSE="GPL-2"
 SLOT="0"
-# The defaults match the upstream Makefile.
-# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
-# by some other spi programmers.
+
+# The defaults match the upstream meson_options.txt.
 IUSE_PROGRAMMERS="
 	atahpt
-	+atapromise
+	atapromise
 	+atavia
 	+buspirate-spi
 	+ch341a-spi
@@ -59,11 +59,10 @@ IUSE_PROGRAMMERS="
 	+satamv
 	+satasii
 	+serprog
-	stlinkv3-spi
+	+stlinkv3-spi
 	+usbblaster-spi
 "
-
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
+IUSE="${IUSE_PROGRAMMERS} +internal-dmi tools +wiki"
 
 LIB_DEPEND="
 	atahpt? ( sys-apps/pciutils[static-libs(+)] )
@@ -87,74 +86,74 @@ LIB_DEPEND="
 	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
 	ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
 	pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
+	raiden-debug-spi? ( virtual/libusb:0[static-libs(+)] )
 	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
 	satamv? ( sys-apps/pciutils[static-libs(+)] )
 	satasii? ( sys-apps/pciutils[static-libs(+)] )
 	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
 	usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 "
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}"
 DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
 	sys-apps/diffutils"
-BDEPEND="virtual/pkgconfig"
 RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
 
-_flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
-	args+=( "${c}=$(usex $1 yes no)" )
-}
-flashrom_enable() {
-	local u
-	for u ; do _flashrom_enable "${u}" ; done
-}
+DOCS=( README Documentation/ )
 
-src_compile() {
-	# Help keep things in sync.
-	local sprogs=$(echo $(
-		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
-			LC_ALL=C sort -u | \
-			sed 's:^CONFIG_::' | \
-			tr '[:upper:]_' '[:lower:]-' | \
-			grep -v ni845x-spi))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
-	if [[ ${sprogs} != "${eprogs}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "IUSE set to: ${eprogs}"
-		eerror "flashrom.c : ${sprogs}"
-		die "sync IUSE to the list of source programmers"
-	fi
-
-	# Turn USE flags into CONFIG_xxx settings.
-	local args=()
-	flashrom_enable ${eprogs}
-	_flashrom_enable wiki PRINT_WIKI
-	_flashrom_enable static STATIC
-
-	# You have to specify at least one programmer, and if you specify more than
-	# one programmer you have to include either dummy or internal in the list.
-	# We pick dummy as the default because internal requires libpci.
-	if ! use internal && ! use dummy ; then
-		if [[ ${#args[@]} -ne 1 ]] ; then
-			ewarn "You have to specify at least one programmer, and if you specify"
-			ewarn "more than one programmer, you have to enable either dummy or"
-			ewarn "internal as well.  'dummy' will be the default now."
-			args+=( CONFIG_DUMMY=yes )
-		fi
-	fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999_meson-fixes.patch
+)
 
-	tc-export AR CC PKG_CONFIG RANLIB
-	emake WARNERROR=no "${args[@]}" all libflashrom.a
+src_configure() {
+	local emesonargs=(
+		$(meson_use atahpt config_atahpt)
+		$(meson_use atapromise config_atapromise)
+		$(meson_use atavia config_atavia)
+		$(meson_use buspirate-spi config_buspirate_spi)
+		$(meson_use ch341a-spi config_ch341a_spi)
+		$(meson_use dediprog config_dediprog)
+		$(meson_use developerbox-spi config_developerbox_spi)
+		$(meson_use digilent-spi config_digilent_spi)
+		$(meson_use drkaiser config_drkaiser)
+		$(meson_use dummy config_dummy)
+		$(meson_use ene-lpc config_ene_lpc)
+		$(meson_use ft2232-spi config_ft2232_spi)
+		$(meson_use gfxnvidia config_gfxnvidia)
+		$(meson_use internal config_internal)
+		$(meson_use internal-dmi config_internal_dmi)
+		$(meson_use it8212 config_it8212)
+		$(meson_use jlink-spi config_jlink_spi)
+		$(meson_use linux-mtd config_linux_mtd)
+		$(meson_use linux-spi config_linux_spi)
+		$(meson_use lspcon-i2c-spi config_lspcon_i2c_spi)
+		$(meson_use mec1308 config_mec1308)
+		$(meson_use mstarddc-spi config_mstarddc_spi)
+		$(meson_use nic3com config_nic3com)
+		$(meson_use nicintel-eeprom config_nicintel_eeprom)
+		$(meson_use nicintel-spi config_nicintel_spi)
+		$(meson_use nicintel config_nicintel)
+		$(meson_use nicnatsemi config_nicnatsemi)
+		$(meson_use nicrealtek config_nicrealtek)
+		$(meson_use ogp-spi config_ogp_spi)
+		$(meson_use pickit2-spi config_pickit2_spi)
+		$(meson_use pony-spi config_pony_spi)
+		$(meson_use raiden-debug-spi config_raiden_debug_spi)
+		$(meson_use rayer-spi config_rayer_spi)
+		$(meson_use realtek-mst-i2c-spi config_realtek_mst_i2c_spi)
+		$(meson_use satamv config_satamv)
+		$(meson_use satasii config_satasii)
+		$(meson_use stlinkv3-spi config_stlinkv3_spi)
+		$(meson_use serprog config_serprog)
+		$(meson_use usbblaster-spi config_usbblaster_spi)
+		$(meson_use wiki print_wiki)
+	)
+	meson_src_configure
 }
 
 src_install() {
-	dosbin flashrom
-	doman flashrom.8
-	dodoc README Documentation/*.txt
-	dolib.a libflashrom.a
-	doheader libflashrom.h
+	meson_src_install
 
 	if use tools; then
-		dosbin util/ich_descriptors_tool/ich_descriptors_tool
+		dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool
 	fi
 }
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 8fe790156b38..8d65f44a2398 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,13 +1,8 @@
-AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9
-AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
-AUX fwupd-r2 315 BLAKE2B fda26d20febea2564cc670df466fdde76679e69731d1d1d621ea2c0c8a6318a93cd17885cdf154540d62eb915ce3888a6a143143e4ba2c4f30c3beb7393efc22 SHA512 68328ad9e11eaf899f186f3ce0bfba09e1a8145af4001b52298f2a6cd9e54ba8cd24c67742db52a74d1f559989a4664517c77c07c975865def767d54b247a2dd
-DIST fwupd-1.4.7.tar.gz 2370660 BLAKE2B 8f04ced69610278576e41c12c7c51e326bdfbea8e1470ae586795b0c20f6a5fd4385701583195f49e14d749016987a7e02fb0d071b5315cca635f69d99bb63d6 SHA512 9d293adf6e9eba9537c4be9b7a4ccc26cd5519843f1bf94557148fabef8076e4846f7018949d8ad83afd01ce4874833bf8984c2ee3981fc6b1309ebda8e313f9
-DIST fwupd-1.4.8.tar.gz 2375361 BLAKE2B 14951c8ec7d59ec53fed7b98bf0e277a7544f04f72f6a827971d45f9996190ebd46767e373850b269d8d718ec8c2b9df41bdd44614e5065832bd21c4071f012a SHA512 25c49f5a814aaf5cd614074936f6a222c513a0e74446a48ddc19aa51fc3d3e9e79dfa77e9b80055a4e3755bca99f13d260c2e4ddf6853ba0a583162523fe7d47
-DIST fwupd-1.5.8.tar.gz 3708769 BLAKE2B e18738d5f681fd9016a609ce9d48e452628c32e731b2a1f3635ff4897ff2a910b1ca0d7836bd12f14b27254c23eb2b6d74a2c35939ac5c8484e2050ab89a33a3 SHA512 d4fecd13a223e7f544026a5ac684bd570af2b63fb509a21e98ef72ccc4d7818f32abf730e2a40943bc762f04ecd5af03bf71201518d55090bb95fe6e9dc6969e
+AUX fwupd-1.6.0-gusb_deps.patch 2610 BLAKE2B 462e15359979cf1d4ea288161723a71f30ec6a027e4c191a78fa19446c86c6572d70d262b5475e5871f6481b2635be9fb2a2c4fe29a6132f026ac417572fcdef SHA512 9f659172b7125e7b8481e928ed7a20843f2772513e842350c57021fb8be114db0d2d7c5005ec6220eb2c8a434f3eb14cd3b8e06603366a33fc7f3a23be6191e7
+AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
-EBUILD fwupd-1.4.7.ebuild 4070 BLAKE2B ccea5065c6839de0f81cfbe441e9cb10f968aaf7da32ab3234f8708756b11a40828c3362d12fba0b761f0a89b6d8bed6cad452d6a7621c1b420ffb91749a0ff0 SHA512 d01e9b10d509915a4bb3996123d16fece081f3d1a7f32e6566999a2f680aebb035cb629ce515859c79e4cb63d2dc4bad8485d36e2b56883e7e08f84e8f490063
-EBUILD fwupd-1.4.8.ebuild 4058 BLAKE2B d79ac644532c0efc0a15c6356ceb485e179ff473f8a5125fcf7bbf4d5f808956648355fa3ea23d1b5d60e6f6fad770543f29161af1e596d3fdb7cb16a31cdbcf SHA512 ff26f4ce3f0b841b937699920de414dfd4f3389b84120bc777aa63f6e7f7cbaffb72481dbb7eac7f52f882529aaf02cadb9f8fe8b724a11d0fe8ea944a8844ad
-EBUILD fwupd-1.5.8.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b
-EBUILD fwupd-1.5.9.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b
-MISC metadata.xml 1142 BLAKE2B a7b7aa9cad916ad7c23a3f7bb405a62a4e8f2c83049412901f7b5055477465b3a0bfa7ef5617a4de704b49fdefb094190b764e7b4b4c8004225ce3d45feaf2da SHA512 6266ecd35bd0426ea76b434b053c1955a894b8d1faa389ec6b55b824507bca3dcb6f9d757ef03d09eeb1073d8d1592ed63276e1874c487a804ce88810aa5533e
+DIST fwupd-1.6.0.tar.gz 3747361 BLAKE2B 6368089db78a512048268ef3cb0333c75bb95b0f62d023e3db7c854c3362b88db1b1676cc24b9a4a5fe854e7dea6c727ec3d645476ee323a0dae16caf7028478 SHA512 0f2342fba95d635348c4b153887f2ea27e4bf49972558716143051ba79c39948487eb6cc15f938738d83aa3ea3eef5ae2854c9756a60f59f52ac859d35e2a669
+EBUILD fwupd-1.5.9.ebuild 4391 BLAKE2B 6e33ce98ddddf81cbabf6e00f694309b5b266904908a93f25717529c3955e2d65811d84f5fd532f2ebdd1056f60d3d7480b2997660ead156798a595c12067edd SHA512 3a9c03bf9fcb3772e60652b505d816a4ad3c93110f57b0c41a1dd300aa8b63d412bfe281c4186347fa91f06aff08d9d697440b44ce58895b7c30d34205e09b6f
+EBUILD fwupd-1.6.0.ebuild 4370 BLAKE2B 7741283317d2004c28e13b715314e9472713089cbe1f438e745b2d4661744adb77e8117117dbbeebb875486122981fb3da691fa96d594fa79d7f93b837c749d6 SHA512 5b9bd6714aade9bafaa251852b5b59a1837a67e7071b13c28da7c307c844730af162773feac532a34fe669ac2466a88744be50da68e1c2da3f11fb99a237a01e
+MISC metadata.xml 1140 BLAKE2B 9e901230c53b487f05f290b46c53a5ee3ebd81b3aefcab2368bfc99f28e80d85554613de8cc4481047a49cf6719f1b1a442d87456ad21aecbadd573ab0959385 SHA512 93bd5bbe8a57219d825e0cc0a8ebd85534396922efcefa224d733bbd1190f201009a8223dfdf5fb2a2403439805c2205b0eef39e8a9e25d0df3733b1654b8f61
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch b/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch
deleted file mode 100644
index 526fe7700ed0..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Enable logind plugin when -Delogind=true is set as well
-
---- fwupd-1.3.9/plugins/meson.build
-+++ fwupd-1.3.9/plugins/meson.build
-@@ -27,7 +27,7 @@
- subdir('wacom-raw')
- endif
- 
--if get_option('systemd')
-+if get_option('systemd') or get_option('elogind')
- subdir('logind')
- endif
- 
diff --git a/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch b/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch
deleted file mode 100644
index 818a69ddcd41..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.4.4-help2man_var.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 5164e713f620972b43c54e34a653a932c968e653 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@dell.com>
-Date: Thu, 18 Jun 2020 12:11:31 -0500
-Subject: [PATCH] trivial: fix issue with agent on but man off
-
-Fixes: #2192
----
- src/meson.build | 64 +++++++++++++++++++++++++------------------------
- 1 file changed, 33 insertions(+), 31 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 7a0b2976a..9a8334973 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -166,22 +166,24 @@ fwupdtool = executable(
-   install_dir : bindir
- )
- 
--if build_daemon and get_option('man')
-+if get_option('man')
-   help2man = find_program('help2man')
--  custom_target('fwupdmgr-man',
--    input : fwupdmgr,
--    output : 'fwupdmgr.1',
--    command : [
--      help2man, '@INPUT@',
--      '--no-info',
--      '--output', '@OUTPUT@',
--      '--name', 'Firmware update manager client utility',
--      '--manual', 'User Commands',
--      '--version-string', fwupd_version,
--    ],
--    install : true,
--    install_dir : join_paths(mandir, 'man1'),
--  )
-+  if build_daemon
-+    custom_target('fwupdmgr-man',
-+      input : fwupdmgr,
-+      output : 'fwupdmgr.1',
-+      command : [
-+        help2man, '@INPUT@',
-+        '--no-info',
-+        '--output', '@OUTPUT@',
-+        '--name', 'Firmware update manager client utility',
-+        '--manual', 'User Commands',
-+        '--version-string', fwupd_version,
-+      ],
-+      install : true,
-+      install_dir : join_paths(mandir, 'man1'),
-+    )
-+  endif
-   if get_option('agent')
-     custom_target('fwupdagent-man',
-       input : fwupdagent,
-@@ -198,22 +200,22 @@ if build_daemon and get_option('man')
-       install_dir : join_paths(mandir, 'man1'),
-     )
-   endif
--endif
--if get_option('man')
--  custom_target('fwupdtool-man',
--    input : fwupdtool,
--    output : 'fwupdtool.1',
--    command : [
--      help2man, '@INPUT@',
--      '--no-info',
--      '--output', '@OUTPUT@',
--      '--name', 'Standalone firmware update utility',
--      '--manual', 'User Commands',
--      '--version-string', fwupd_version,
--    ],
--    install : true,
--    install_dir : join_paths(mandir, 'man1'),
--  )
-+  if build_standalone
-+    custom_target('fwupdtool-man',
-+      input : fwupdtool,
-+      output : 'fwupdtool.1',
-+      command : [
-+        help2man, '@INPUT@',
-+        '--no-info',
-+        '--output', '@OUTPUT@',
-+        '--name', 'Standalone firmware update utility',
-+        '--manual', 'User Commands',
-+        '--version-string', fwupd_version,
-+      ],
-+      install : true,
-+      install_dir : join_paths(mandir, 'man1'),
-+    )
-+  endif
- endif
- 
- if build_daemon
diff --git a/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch
new file mode 100644
index 000000000000..92b8af9a70ee
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.0-gusb_deps.patch
@@ -0,0 +1,53 @@
+From 41f5294f1bfdfcbe96ed0d19ec79dc2f3cc24d36 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 20 May 2021 11:03:20 +0200
+Subject: [PATCH] analogix plugin requires gusb
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise the following build error happens:
+
+  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:54:10: error: ‘G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE’ undeclared (first use in this function)
+     54 |          G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE,
+        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:54:10: note: each undeclared identifier is reported only once for each function it appears in
+  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:55:10: error: ‘G_USB_DEVICE_REQUEST_TYPE_VENDOR’ undeclared (first use in this function)
+     55 |          G_USB_DEVICE_REQUEST_TYPE_VENDOR,
+        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:56:10: error: ‘G_USB_DEVICE_RECIPIENT_DEVICE’ undeclared (first use in this function)
+     56 |          G_USB_DEVICE_RECIPIENT_DEVICE,
+        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c: In function ‘fu_analogix_device_receive’:
+  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:96:10: error: ‘G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST’ undeclared (first use in this function)
+     96 |          G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST,
+        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:97:10: error: ‘G_USB_DEVICE_REQUEST_TYPE_VENDOR’ undeclared (first use in this function)
+     97 |          G_USB_DEVICE_REQUEST_TYPE_VENDOR,
+        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ../fwupd-1.6.0/plugins/analogix/fu-analogix-device.c:98:10: error: ‘G_USB_DEVICE_RECIPIENT_DEVICE’ undeclared (first use in this function)
+     98 |          G_USB_DEVICE_RECIPIENT_DEVICE,
+        |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  and more...
+---
+ plugins/analogix/meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/analogix/meson.build b/plugins/analogix/meson.build
+index 1bfbbc33..c112d72d 100644
+--- a/plugins/analogix/meson.build
++++ b/plugins/analogix/meson.build
+@@ -1,3 +1,4 @@
++if get_option('gusb')
+ cargs = ['-DG_LOG_DOMAIN="FuPluginAnalogix"']
+ 
+ install_data(['analogix.quirk'],
+@@ -28,3 +29,4 @@ shared_module('fu_plugin_analogix',
+     plugin_deps,
+   ],
+ )
++endif
+-- 
+2.32.0.rc0
+
diff --git a/sys-apps/fwupd/files/fwupd-r2 b/sys-apps/fwupd/files/fwupd-r2
index c8994ddd8413..d30bf1df08c2 100644
--- a/sys-apps/fwupd/files/fwupd-r2
+++ b/sys-apps/fwupd/files/fwupd-r2
@@ -8,6 +8,6 @@ command="/usr/libexec/fwupd/fwupd"
 command_background="true"
 
 depend() {
-	need %SEAT_MANAGER% dbus
+	need elogind dbus
 	before display-manager
 }
diff --git a/sys-apps/fwupd/fwupd-1.4.7.ebuild b/sys-apps/fwupd/fwupd-1.4.7.ebuild
deleted file mode 100644
index f2da993af1f0..000000000000
--- a/sys-apps/fwupd/fwupd-1.4.7.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		app-crypt/tpm2-tss
-		net-libs/gnutls[tools]
-		thunderbolt? ( dev-util/umockdev )
-	)
-"
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	virtual/libelf:0=
-	virtual/udev
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${CDEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use introspection)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm tpm)
-		$(meson_use uefi plugin_uefi)
-		# Although our sys-apps/flashrom package now provides
-		# libflashrom.a, meson still can't find it
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r2 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.4.8.ebuild b/sys-apps/fwupd/fwupd-1.4.8.ebuild
deleted file mode 100644
index 3ec65898041a..000000000000
--- a/sys-apps/fwupd/fwupd-1.4.8.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		net-libs/gnutls[tools]
-		thunderbolt? ( dev-util/umockdev )
-	)
-"
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	virtual/libelf:0=
-	virtual/udev
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${CDEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use introspection)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi)
-		# Although our sys-apps/flashrom package now provides
-		# libflashrom.a, meson still can't find it
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r2 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.5.9.ebuild b/sys-apps/fwupd/fwupd-1.5.9.ebuild
index 5e5f2c55a63a..c31e5bd7f8b0 100644
--- a/sys-apps/fwupd/fwupd-1.5.9.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.9.ebuild
@@ -13,12 +13,13 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
+	synaptics? ( gnutls )
 	uefi? ( gnutls )
 "
 RESTRICT="!test? ( test )"
@@ -148,10 +149,7 @@ src_install() {
 	meson_src_install
 
 	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r2 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
+		doinitd "${FILESDIR}"/${PN}-r2
 
 		if ! use systemd ; then
 			# Don't timeout when fwupd is running (#673140)
diff --git a/sys-apps/fwupd/fwupd-1.5.8.ebuild b/sys-apps/fwupd/fwupd-1.6.0.ebuild
index 5e5f2c55a63a..6d66480d42ed 100644
--- a/sys-apps/fwupd/fwupd-1.5.8.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
@@ -14,11 +14,13 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
+IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom lzma minimal introspection +man nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
 	uefi? ( gnutls )
 "
 RESTRICT="!test? ( test )"
@@ -60,17 +62,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
 	gnutls? ( net-libs/gnutls )
 	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+	lzma? ( app-arch/xz-utils )
 	policykit? ( >=sys-auth/polkit-0.103 )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
 		sys-fs/udisks
 		sys-libs/efivar
-		x11-libs/cairo
 	)
 "
 # Block sci-chemistry/chemical-mime-data for bug #701900
@@ -87,6 +87,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.5.7-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.6.0-gusb_deps.patch"
 )
 
 pkg_setup() {
@@ -107,38 +108,49 @@ src_prepare() {
 }
 
 src_configure() {
+	local plugins=(
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gusb plugin_altos)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_use uefi plugin_uefi_pk)
+
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
+	)
+	use ppc64 && plugins+=( -Dplugin_msr="false" )
+
 	local emesonargs=(
 		--localstatedir "${EPREFIX}"/var
 		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="false"
+		-Dcurl="true"
+		-Defi_binary="false"
+		-Dsupported_build="true"
 		$(meson_use agent)
-		$(meson_use amt plugin_amt)
 		$(meson_use archive libarchive)
 		$(meson_use bluetooth bluez)
-		$(meson_use dell plugin_dell)
 		$(meson_use elogind)
-		$(meson_use flashrom plugin_flashrom)
 		$(meson_use gnutls)
 		$(meson_use gtk-doc gtkdoc)
 		$(meson_use gusb)
-		$(meson_use gusb plugin_altos)
+		$(meson_use lzma)
 		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
 		$(meson_use introspection)
 		$(meson_use policykit polkit)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
 		$(meson_use systemd)
 		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_pk)
-		-Dconsolekit="false"
-		-Dcurl="true"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
+
+		${plugins[@]}
 	)
-	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
 	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
 	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
@@ -148,10 +160,7 @@ src_install() {
 	meson_src_install
 
 	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r2 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
+		doinitd "${FILESDIR}"/${PN}-r2
 
 		if ! use systemd ; then
 			# Don't timeout when fwupd is running (#673140)
@@ -160,11 +169,3 @@ src_install() {
 		fi
 	fi
 }
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 46f6584e2630..14228b123c2f 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -13,7 +13,7 @@
     <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
     <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
     <flag name="nvme">Build and install NVMe plugin</flag>
-    <flag name="redfish">Install redfish plugin</flag>
+    <flag name="spi">Install Intel-SPI plugin</flag>
     <flag name="synaptics">Install synaptics plugin</flag>
     <flag name="thunderbolt">Install Thunderbolt plugin</flag>
     <flag name="tpm">Install Trusted Platform Module plugin</flag>
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 5eac25c4b372..7df82ea3476e 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,3 @@
-DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
-DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
-EBUILD gawk-4.2.1-r1.ebuild 2134 BLAKE2B 255819f4770c9e4796b12afba955c8f630b0a172355046a1f82784cc05831bd6a100560ccf48bb613a5c72b44f03ec5e73e8d3a13274b0ddbcc439c9dcaf92c4 SHA512 c08ca0cd2b39c6363f584c1c7f282716463212c412e4da669093e4b1993f1cbdffe0295895ff05423df140f4a120c6c249320df88a3d9e27bc4ca2b6fa730e22
-EBUILD gawk-5.0.1.ebuild 2192 BLAKE2B e375f9837533cf752da243d6b57654e9ffb7fa48f9c373326ce52d0f0e3e7472d415510dfb0f55359143dd3b6a2c904b61c6477477608d3904faba634e6771ca SHA512 77592089b5a3874b9da86656d4d5e23cfdeb4915a4ced2b12e103f69544313ba85675a372002a79e418dc2a7576aa4d8080d668c138ee1749ba173b91926e0fc
-EBUILD gawk-5.1.0.ebuild 2241 BLAKE2B ada491a20edaadb144bd0e74b0e17465ee9f1279d7db8aa7f0384816dc3d2c9fbfb625143626a99e60ce616e47742180b2dc78c1d352f888bd088f6472ffca3e SHA512 79f4156c388d0ef5fcd39df99df35e17620871a30c07d9e30939b006e675a6a263cebf70e2324e7fc3090d3ce19b4a74a58201f06b4d99c1de91c73d6579c368
+EBUILD gawk-5.1.0.ebuild 2253 BLAKE2B 85d67442d466b13c314f13322c6fc95ac5f374bcdd5950aa9aa4699d17a78cf7553cc72391405c401ed8c60131c1fbe271569834935b2cd3fd74c9976b2dfcc4 SHA512 b3d7a425ab63b1d0ddf625be4dc1521518adaa4140d19403e79d87c494abc9f61745b75a2b8e39615a8a7a5f5e71a4ff3f78d36bf8941235b3e3c474d04c699b
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
deleted file mode 100644
index 0fb4a83be30e..000000000000
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mpfr nls readline"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	mpfr? ( dev-libs/mpfr:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in || die
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
-	# fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
-			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
-			extension/inplace.c || die
-	fi
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	local myeconfargs=(
-		--libexec='$(libdir)/misc'
-		$(use_with mpfr)
-		$(use_enable nls)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	rm -rf README_d # automatic dodocs barfs
-	default
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h
-	rm "${ED%/}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk; do
-			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
-		done
-		[[ ! -e ${EROOT}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}/bin/awk"
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
deleted file mode 100644
index 4d4f28b7627a..000000000000
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mpfr nls readline"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	mpfr? ( dev-libs/mpfr:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in || die
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die #413327
-	# fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
-			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
-			extension/inplace.c || die
-	fi
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	local myeconfargs=(
-		--libexec='$(libdir)/misc'
-		$(use_with mpfr)
-		$(use_enable nls)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	rm -rf README_d # automatic dodocs barfs
-	default
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h
-	rm "${ED}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do
-			if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
-				ln -s "${l##*/}" "${l/gawk/awk}" || die
-			fi
-		done
-		if ! [[ -e ${EROOT}/bin/awk ]] ; then
-			ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index 3ab54c018ff1..3c3416405784 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs multilib
+inherit toolchain-funcs
 
 DESCRIPTION="GNU awk pattern-matching language"
 HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
@@ -29,13 +29,16 @@ BDEPEND="
 src_prepare() {
 	default
 
-	# use symlinks rather than hardlinks, and disable version links
+	# Use symlinks rather than hardlinks, and disable version links
 	sed -i \
 		-e '/^LN =/s:=.*:= $(LN_S):' \
 		-e '/install-exec-hook:/s|$|\nfoo:|' \
 		Makefile.in doc/Makefile.in || die
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die #413327
-	# fix standards conflict on Solaris
+
+	# bug #413327
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die
+
+	# Fix standards conflict on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i \
 			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
@@ -46,17 +49,21 @@ src_prepare() {
 
 src_configure() {
 	export ac_cv_libsigsegv=no
+
 	local myeconfargs=(
 		--libexec='$(libdir)/misc'
 		$(use_with mpfr)
 		$(use_enable nls)
 		$(use_with readline)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	rm -rf README_d # automatic dodocs barfs
+	# Automatic dodocs barfs
+	rm -rf README_d || die
+
 	default
 
 	# Install headers
@@ -66,7 +73,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
+	# Symlink creation here as the links do not belong to gawk, but to any awk
 	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
 		eselect awk update ifunset
 	else
@@ -76,6 +83,7 @@ pkg_postinst() {
 				ln -s "${l##*/}" "${l/gawk/awk}" || die
 			fi
 		done
+
 		if ! [[ -e ${EROOT}/bin/awk ]] ; then
 			ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
 		fi
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index e7cc845eb3d3..eed28fb9da5b 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,4 @@
-DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
 DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8 SHA512 e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc
-EBUILD gentoo-functions-0.13.ebuild 856 BLAKE2B a6b02beaf3908fcce0a652d49d2168992be2a5ea96c106606b8415a80c965f347a3786b06f62b0bee0727ef894990f9673fb0184768939856abb9e4f7c50c4ca SHA512 053d4d88f29f95f54320a1663f361a8a012591d2b9e5c1872a1772c8f0fc64f86e7b54311aca3e96e77f78714507f9bde9e779cab23fb6657b85f622a5a3df4b
-EBUILD gentoo-functions-0.14.ebuild 864 BLAKE2B 7516cfa9a50f69cbcd702945da6b83fa6975727f2f03af81243f18c8da302ea31fede39cb5831507e2e77ce50c9b8f336bcaeb20ae69a854bb4c2c86cfe112e8 SHA512 1c0b8e1d97910207d2d128998631799dd39ac3af3393cd3da8c11e6bfed58046afef8473953af2bec9b2b32f1107484d3dc26c773e69e5645205b1cd028ab506
+EBUILD gentoo-functions-0.14.ebuild 856 BLAKE2B a6b02beaf3908fcce0a652d49d2168992be2a5ea96c106606b8415a80c965f347a3786b06f62b0bee0727ef894990f9673fb0184768939856abb9e4f7c50c4ca SHA512 053d4d88f29f95f54320a1663f361a8a012591d2b9e5c1872a1772c8f0fc64f86e7b54311aca3e96e77f78714507f9bde9e779cab23fb6657b85f622a5a3df4b
 EBUILD gentoo-functions-9999.ebuild 864 BLAKE2B 7516cfa9a50f69cbcd702945da6b83fa6975727f2f03af81243f18c8da302ea31fede39cb5831507e2e77ce50c9b8f336bcaeb20ae69a854bb4c2c86cfe112e8 SHA512 1c0b8e1d97910207d2d128998631799dd39ac3af3393cd3da8c11e6bfed58046afef8473953af2bec9b2b32f1107484d3dc26c773e69e5645205b1cd028ab506
 MISC metadata.xml 492 BLAKE2B cd68fc088438ae1171d801f7aeb93ac09a21dd2e628ab14c11e2f3f28fba3ad3653005d087ab5c44362b9b6fbc66b1c14256176c6f181313cbf3aa6a01c6739b SHA512 991fa3c3f302d26f4beb103c5dab1b943599aa83ca538b04a785ba608059471047061296d219b637a8b16185105c0ace8b0ff511ec2d94c840be27d96ac8e3c6
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
deleted file mode 100644
index a750147b5940..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	tc-export CC
-	append-lfs-flags
-	export ROOTPREFIX="${EPREFIX}"
-	export PREFIX="${EPREFIX}/usr"
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
index 6ab30b8f6eb4..a750147b5940 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index 01ea6aaba32d..d9ff6d722fee 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,5 +1,3 @@
-DIST gsmartcontrol-1.0.2.tar.bz2 695445 BLAKE2B cccfe2d96eab050fbcc2b99107e6a962a75c6cce492d64e40cab371f7d23cec6eaf6df7682cc0a43a8678152be3425ccd6eeb6f8743bd1a8e2edb7f4624d4238 SHA512 a9dd037fc4223afa762408bc34325fb31947822250efe32ae97b88e836c5bb68d8354d7605925b2ab7c834764ea473a14f2cd1f234577ef76730b02ad9a8b701
 DIST gsmartcontrol-1.1.3.tar.bz2 677998 BLAKE2B f444dd29602f6934b440650e57d5d981a3b9823a905ce3c178109b230e6536edd4f38ed0762872b38186774127a164feb7363bb45cbd80e9c0b34398c1a06092 SHA512 7a8bb79875a53d742923fc8ff8336d7fbbdaf2e1b1f64296840557997125d4dcfea9a93a5e8a834003d592083a180ee85ca0e29d3aecf0eb475a3d4fed460456
-EBUILD gsmartcontrol-1.0.2.ebuild 1009 BLAKE2B 68fbd4e99795031f6d1124cd756f30f271746a7546ffdafb0d9c0d765292e3415e163edec83d6d692fd21ce29aab2d3fcc2db0e38817939d561458a28e21037b SHA512 a05864d911a09af9a435d3c132e5aae57eb8a458fcb818a18d4d4040af55467b620aa35a8b8a202acc3dd32fe9722a0c1afc474b223dae5a8f934a9daa83f97c
 EBUILD gsmartcontrol-1.1.3.ebuild 1009 BLAKE2B 68fbd4e99795031f6d1124cd756f30f271746a7546ffdafb0d9c0d765292e3415e163edec83d6d692fd21ce29aab2d3fcc2db0e38817939d561458a28e21037b SHA512 a05864d911a09af9a435d3c132e5aae57eb8a458fcb818a18d4d4040af55467b620aa35a8b8a202acc3dd32fe9722a0c1afc474b223dae5a8f934a9daa83f97c
 MISC metadata.xml 340 BLAKE2B f4f46445999e4db825f8d50018a9c6a8c8ee431340653e1c78519e60eaf4316b2e8387fa67aebdea0fa814f92433f65872b78028f746d9367666a158411ee8ad SHA512 f769fe192e485692a86f1ac75f8de07be0a8f5c2ddd7d3ea0a526d271881746417e01e09e765e3160f7d8b516d9240b5bb09030dc18ea9551192fbd8df5b4cc3
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
deleted file mode 100644
index 66da4d4c59b9..000000000000
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hard disk drive health inspection tool"
-HOMEPAGE="https://gsmartcontrol.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/libpcre:3
-	sys-apps/smartmontools
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmessage
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/gtk-builder-convert )
-"
-
-DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	econf $(use test tests)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/share/doc/${PF}/LICENSE_* || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index dd44ca9c5f84..abb6da17f041 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -3,9 +3,7 @@ AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e2
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
-DIST hdparm-9.61.tar.gz 139879 BLAKE2B b67ed28dad06870fed9fc7b7f1513887e17456babacf8b37530d0b90bc5ebef022dbe169b8729b215a94862d46e23cb667c173d54b7033a8ba7c7d4988494000 SHA512 d46c7681d9000d09a8f59b0b6084bb80118c806e124fbfe8903411aafb05101bb2134b8890bd96f1c542fa1061e660ceb546c369ce008961ca0d263eebd841ce
 DIST hdparm-9.62.tar.gz 139976 BLAKE2B 83ea59e35eeec7fa2a9e2f9f4b7a9a0d44cd4366d95e529c08bf38b04f6d78862bfefdfb905d4fceadbb81453ee92a60aa55db8d4c0bd164ec67181b46f197bf SHA512 ac6c4d285d081ecd8c7b231192a5a0fc268d934eeeb59794ae9a9db01ecbdd0afa0cade6ed42a1fd26ad543c52a3b380ac4f1b679992d167becb4ed6251fd369
 EBUILD hdparm-9.58.ebuild 981 BLAKE2B 3cb2bcba7e7ab6de5188938cf8626461601e72a24c360e429fde43846da7402407354f89b382a378afa76ba0648d121d6d8b2508b9a14ee62f4ea2096e7beb86 SHA512 ba0df4eeefac220f82269c1bfb53c9524a93be8adcc19dbca499017f7b1e1565a7cf9930c7a5f94e428568531e0111ccfbf1c74a49314632a60d9efa5366766c
-EBUILD hdparm-9.61.ebuild 988 BLAKE2B fdc31e4932d872c2dfc8246a33ebcf7d517106940d237d1a664901b655fc4b520ea40d7e3ebc4f433b1bdece03063184a3663b7f629244b90251f15cd31701f0 SHA512 3fc00828d1727a695ec584002718b7fa0cef349dbf37f77c1943b5803eba91fdce3063db0a565dca079c46986aaad2afc698f4a05afbca68d55b8f992c781d3f
 EBUILD hdparm-9.62.ebuild 988 BLAKE2B fdc31e4932d872c2dfc8246a33ebcf7d517106940d237d1a664901b655fc4b520ea40d7e3ebc4f433b1bdece03063184a3663b7f629244b90251f15cd31701f0 SHA512 3fc00828d1727a695ec584002718b7fa0cef349dbf37f77c1943b5803eba91fdce3063db0a565dca079c46986aaad2afc698f4a05afbca68d55b8f992c781d3f
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.61.ebuild b/sys-apps/hdparm/hdparm-9.61.ebuild
deleted file mode 100644
index f0bb282156d7..000000000000
--- a/sys-apps/hdparm/hdparm-9.61.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.60-build.patch
-)
-
-src_prepare() {
-	default
-	use static && append-ldflags -static
-}
-
-src_configure() {
-	tc-export CC
-	export STRIP=:
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl
-
-	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
-	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
-	doman hdparm.8
-	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-	docinto wiper
-	dodoc wiper/{README.txt,wiper.sh}
-	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 64daca76679b..6c6acfe3267a 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,8 +1,4 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
-DIST help2man-1.47.17.tar.xz 211476 BLAKE2B 67b1ccd4b6b66510a2fff424663bc2051e49e93c37c7e2a2b4631f3781d3773a97fd1773f96ca5ca2ba644bcd79ae35338931eff857ce199a847cc312d778b0e SHA512 185cd04aa6db6d8a4c898b61ad6a0aded7775659c7f02244b45927310eb3f8cd932fe9dd725ccac3e793aa22c656338b5d16f291f3a0420ed121681d4a4bac25
-DIST help2man-1.48.2.tar.xz 210304 BLAKE2B ea13932ae4d181be6f08720f402e4fdedfd0b88eb9c2f3b6201a2c0893846ea5fb777423f010551c375758deb81f564128b4ebdef04f6a54eb6ba50e1311c351 SHA512 ddd3bde5b9b0e84e21cc03dec713469562b02aac7f4b465fbf18844fc9534e8975ec41f44474fcf1b06816eb9b4e0578eb974a6c9712b6f099d7be813f6d7528
 DIST help2man-1.48.3.tar.xz 211504 BLAKE2B 407cc87b1238242c202d37c0c4cd394e0efba95759b86a88026aef7c05d6a097d1946614547ebfab45f7fe0c1ddd057724234629246d32e94862c3d633b78c31 SHA512 e000e7380604c0986b14cb64b852d55eff48595884bddd389e876056dde6ce72b37aa16d92230e6f8f6e128003b819954bae4aa90933a58b51d3665d3c0ba356
-EBUILD help2man-1.47.17.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
-EBUILD help2man-1.48.2.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
-EBUILD help2man-1.48.3.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
+EBUILD help2man-1.48.3.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.17.ebuild b/sys-apps/help2man/help2man-1.47.17.ebuild
deleted file mode 100644
index 31a7f04f2fc2..000000000000
--- a/sys-apps/help2man/help2man-1.47.17.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND="${RDEPEND}"
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-	default
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	local myeconfargs=(
-		ac_cv_path_MSGFMT=$(type -P false)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/help2man/help2man-1.48.2.ebuild b/sys-apps/help2man/help2man-1.48.2.ebuild
deleted file mode 100644
index 2f5c10989e9b..000000000000
--- a/sys-apps/help2man/help2man-1.48.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
-	nls? ( dev-perl/Locale-gettext )"
-DEPEND="${RDEPEND}"
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i \
-			-e 's/-shared/-bundle/' \
-			Makefile.in || die
-	fi
-	default
-}
-
-src_configure() {
-	# Disable gettext requirement as the release includes the gmo files #555018
-	local myeconfargs=(
-		ac_cv_path_MSGFMT=$(type -P false)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/help2man/help2man-1.48.3.ebuild b/sys-apps/help2man/help2man-1.48.3.ebuild
index 2f5c10989e9b..31a7f04f2fc2 100644
--- a/sys-apps/help2man/help2man-1.48.3.ebuild
+++ b/sys-apps/help2man/help2man-1.48.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 49cb0581c9ad..bfd083c08464 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,6 +1,4 @@
-DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
 DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2
-EBUILD hwids-20200813.1.ebuild 1670 BLAKE2B 729c93b24243abfdc354a0df2c8dba699cb5055aa4364370ce5bb779051412dfd1ed64c4f79372e1851226472d113514a271b01804f087db5709234ea243173a SHA512 e3c44b55bb0b1bd0d93aab507b04d4b70f20999eefe325f814e5c14cc9bd549b4880ee43619a72b9ad2ce5f604199bb58aba091416d6b537c211fb9fbda3e747
 EBUILD hwids-20201207.ebuild 1671 BLAKE2B c7740e0c4a2b694af30d91f420052ee16c4fac29e6e632ca6d9cbfc9803b774c0c53e7ed8447d30f567e48215bf6cf5323d48cb74041465db14b0f67d603393b SHA512 c8fe09cb6e4523afca06a06fc271414062d89248fd56ae729dcdf513c34c3c9834cb64369a359d97df0b80f369b44b7fb711530b42666dfadbfeeb29147ee674
 EBUILD hwids-99999999.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20200813.1.ebuild b/sys-apps/hwids/hwids-20200813.1.ebuild
deleted file mode 100644
index 59c05f9466ef..000000000000
--- a/sys-apps/hwids/hwids-20200813.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == 99999999 ]]; then
-	PYTHON_COMPAT=( python3_{6,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-RDEPEND="
-	udev? ( virtual/udev )
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	BDEPEND="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-		fi
-	}
-else
-	S=${WORKDIR}/hwids-${P}
-fi
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	if [[ ${PV} == 99999999 ]] && use udev; then
-		python_setup
-		_emake udev-hwdb
-	fi
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT}"
-	fi
-}
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index c9e9df3d9ed5..27df90c576d4 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,7 +1,3 @@
-DIST hwinfo-21.23-1.2.src.rpm 844672 BLAKE2B 33cfd68c06081d76b33243474b9a72cc5994c749ff57b7fc4f36c88627707068fb86d4825bae66e4e08f730dc8849264f5f31f8717f28400b3d54302ac12b1eb SHA512 d25c955fa5620268a34a857916e0bdbbdb92f8e092735ac453e7bacc6476e00047c9ccef3a5275e5d50cc354bf9e3cffef57af519dc885d0afd3d161ab426629
-DIST hwinfo-21.4-1.1.src.rpm 781525 BLAKE2B 83c6d0b3d15a7b4354223eef8b976643ec6520842007ce6fb06534360a8994d4aac0975eba059275910f59391e7069b0166b69301006ea78ca4b74c6aefbde7c SHA512 bccac7749751924e1e1a8005e6fd783da7114926b6d9b9a1247b3b26dd680848eb2b85b368c312d08b444c8d7b75036d249daf33afc5b7efbbcc09bfbad4b340
 DIST hwinfo-21.72-1.3.src.rpm 926285 BLAKE2B b8a38b2f04649e268a6d6fbebabd724a0c678e81ea9c09c3453ababa26e91ba5fe55c7feccf157ab81ab676e6610ba1700ef1691bdd06fbcbc1cdd86806282d2 SHA512 4e51ee4f8e03eee82317557aa39b5018cc2370b33bfdb280ecb8716687d951f8c34fa7598a1e0eff03025991eee654af488e3343d93167e4cf16380d047c2de3
-EBUILD hwinfo-21.23.ebuild 1284 BLAKE2B e5ea1d3ec4faf5f0aa8a837a2a9763744ab2a75c259533ec0566a950ef12506281cfd807a69b36aae81c198ca14c8a4a22dc23316677108d104a8d53510d1065 SHA512 e0b9312a65f8227a2e0d87ad5c96f875f6a20ee4f1972bf0a3b3876b7efd26d9c549732737323a6431bce58f268c56e72fd8fd42d5099747ac31ea60b137e51e
-EBUILD hwinfo-21.4.ebuild 1565 BLAKE2B 3f0b88f238a63e2e05f0163d8d7168ee0f3821ddd87e5daf367c55b1a4fa150d87943f6fad285915c175dcc3d011584a69f2c33a9fcaac6deffbdc7f809d2efb SHA512 0037b450bce00f7264967ffcb8ff07fcfc9a6508ab3a981c799207f67d959680b55324708714e970c20fba865ea49f8b60fe89c413f88ae417415bbae89c0958
 EBUILD hwinfo-21.72.ebuild 1377 BLAKE2B dd5ca41d5f58ef3149c13490b6ba9f1b0a3583cf6a3ea839e5af6c80f9990cd6fbf921847ce2a9468306e176108c93131a0d60aba9378cba01e007c49cbd26c7 SHA512 973c96a71d3701e726d1c121a4ce375e84a914478ce74616d7eea666ecf6f1c33434841d831528817f4bf33fb0ba29f51e96bb9b903d52ded6a343536b662e14
 MISC metadata.xml 334 BLAKE2B 08e4d837af5734c290c474fe28c4082531eb9b07be2fddef29e16e4dda6aee904bc8674830842b1c1f9736a92a4ccf21992ffdb6f0f3b7e62be73f3d3e93c6d5 SHA512 94c2a056338c3e3e40737e45468d77e170341185017098fc8892cbac1a0993321a1ee8dd007c075430d999fce90508f1e3d4a4f71fda6bfeb6f7c15b199c2405
diff --git a/sys-apps/hwinfo/hwinfo-21.23.ebuild b/sys-apps/hwinfo/hwinfo-21.23.ebuild
deleted file mode 100644
index 97cc8c3e0a74..000000000000
--- a/sys-apps/hwinfo/hwinfo-21.23.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib rpm toolchain-funcs
-
-DESCRIPTION="Hardware detection tool used in SuSE Linux"
-HOMEPAGE="https://www.opensuse.org/"
-SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.2.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	amd64? ( dev-libs/libx86emu )
-	x86? ( dev-libs/libx86emu )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.17"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# Respect AR variable.
-	sed -i \
-		-e 's:ar r:$(AR) r:' \
-		src/{,isdn,ids,smp,hd}/Makefile || die
-
-	# Respect LDFLAGS.
-	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
-
-	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
-	sed -i \
-		-e 's:make:$(MAKE):' \
-		-e 's:-pipe -g::' \
-		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
-		Makefile{,.common} || die
-	default
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-
-	dodoc changelog README*
-	doman doc/*.{1,8}
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/example*.c
-}
diff --git a/sys-apps/hwinfo/hwinfo-21.4.ebuild b/sys-apps/hwinfo/hwinfo-21.4.ebuild
deleted file mode 100644
index a63b0e33b3f5..000000000000
--- a/sys-apps/hwinfo/hwinfo-21.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib rpm toolchain-funcs
-
-DESCRIPTION="hardware detection tool used in SuSE Linux"
-HOMEPAGE="https://www.opensuse.org/"
-SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.1.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	amd64? ( dev-libs/libx86emu )
-	x86? ( dev-libs/libx86emu )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.17"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	# Respect AR variable.
-	sed -i \
-		-e 's:ar r:$(AR) r:' \
-		src/{,isdn,ids,smp,hd}/Makefile || die
-
-	# Avoid -I directories for dbus because HAL is obsolete.
-	sed -i -e '/CFLAGS/d' src/hd/Makefile || die
-	# Respect LDFLAGS.
-	sed -i -e 's:$(CC) -shared:& $(LDFLAGS):' src/Makefile || die
-	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
-
-	# Use linux/pci.h directly. #506876
-	sed -i \
-		-e '/#include.*sys\/pci.h/s:sys/pci.h:linux/pci.h:' \
-		src/hd/*.c || die
-
-	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
-	sed -i \
-		-e 's:make:$(MAKE):' \
-		-e 's:-pipe -g::' \
-		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
-		Makefile{,.common} || die
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-
-	dodoc changelog README
-	doman doc/*.{1,8}
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/example*.c
-}
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index b9e6c946c9fd..3627a5e88354 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,8 +1,4 @@
-DIST install-xattr-0.5.tar.bz2 16136 BLAKE2B 8973584d4819b9f500dcfb76ed0eaddce725b78e72dfa73ccff52c745e6f041926f8f930e5c5035fa888402c6b530207546098864266268dee2c897404bf7c74 SHA512 0bbde3a548fc5062041b38f90ac09c402f3cb0aebf4f0c331552fc44d39dd3d5e4d73bca0811de36c53af8afa5d22e543a7c90107d272f2a1b97c819b244eb7c
-DIST install-xattr-0.7.tar.bz2 16200 BLAKE2B bdddd4610e5fbb6f6ccfcdfb37abacff00ada5ca5fa18a6a4ad254b623ebe6dc9d0a2c8931f919f8623ed8f64e9c09584d6beabffbf3c72088f80383b198a2d7 SHA512 1cb4a4e72a9c5820081e032bd0d681ef985a228ad9bb025d5eb31c7b57678348d772f270def803376f2d9d4f8e6ebcede9629ce65eef917b3e8a06d6f40eec44
 DIST install-xattr-0.8.tar.bz2 16359 BLAKE2B 25c483211ea6d01f46d9739fd3f1327e543e8b986a252d97e8b012ff6169a9b6430dc0ab7c184bf04c6665182c242eb37f7059d2d23cecececea723bde74cb56 SHA512 3af95a724d95286854767fe28679b024de8d257ce2d21addecbd40906e10bf48cfd4263609c6c2f436c6a807e91d24118110fda041091fadbefd848c892af778
-EBUILD install-xattr-0.5.ebuild 908 BLAKE2B 8f91f6213000e7d5155e418f7d39c2d85a1718696cd972c1d5044d9a9b3caaa370735a9fb194d763c70dfc80839f00436654375175274ef3566a60ac6e8fab6f SHA512 1401a1aacb7ada949577665bfba6dafb7bc17e7c4402aa586c1399088fa0dbff52784f11332322a6cc8ea789560062b99187b4bc0980b099662f847aa78c8610
-EBUILD install-xattr-0.7.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
 EBUILD install-xattr-0.8.ebuild 999 BLAKE2B ce5c7a8deb8e24069b14f9c34de53df122617610a61038e1cd0cce28dfb8e5b6b16963b710a31ec2477e4a92da724202b7ebe11cdabf635b8e400c1f27cef4eb SHA512 61719944927bebd43367d254e24480eebdc4f9a25529e4683730d23851a830319dcc11d7c53368109f1e4fe5fabb488280738e362b176b034d099be95901b1c6
 EBUILD install-xattr-9999.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
 MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
diff --git a/sys-apps/install-xattr/install-xattr-0.5.ebuild b/sys-apps/install-xattr/install-xattr-0.5.ebuild
deleted file mode 100644
index 1f82857f7016..000000000000
--- a/sys-apps/install-xattr/install-xattr-0.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
-HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-	S=${WORKDIR}/${PN}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	tc-export CC
-}
-
-src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
-		cd "${WORKDIR}/${P}/misc/${PN}" || die
-	fi
-	default
-}
-
-src_install() {
-	if [[ ${PV} == "9999" ]] ; then
-		cd "${WORKDIR}/${P}/misc/${PN}" || die
-	fi
-	default
-}
-
-# We need to fix how tests are done
-src_test() {
-	true
-}
diff --git a/sys-apps/install-xattr/install-xattr-0.7.ebuild b/sys-apps/install-xattr/install-xattr-0.7.ebuild
deleted file mode 100644
index 44b01b811bb3..000000000000
--- a/sys-apps/install-xattr/install-xattr-0.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
-HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/"
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	S=${WORKDIR}/${PN}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
-	default
-	tc-export CC
-	append-cppflags "-D_FILE_OFFSET_BITS=64"
-}
-
-src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
-		cd "${WORKDIR}/${P}/misc/${PN}" || die
-	fi
-	default
-}
-
-src_install() {
-	if [[ ${PV} == "9999" ]] ; then
-		cd "${WORKDIR}/${P}/misc/${PN}" || die
-	fi
-	DESTDIR=${ED} emake install
-}
-
-# We need to fix how tests are done
-src_test() {
-	true
-}
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 87320b9dec7c..d7db16f178a7 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -3,9 +3,11 @@ DIST inxi-3.0.34.1.tar.gz 308373 BLAKE2B 290a0887a7885b040f614140a99cbd7e0a8f8b8
 DIST inxi-3.0.36.1.tar.gz 311680 BLAKE2B 95c9ab57a9af50ace8fdacebb42a94017b1506a9215f8f70ff35f281dd207685d570fe257abc5446b57dd9b9a7ce28e568a4ebf9d664731dde437a6cfd64647f SHA512 1b242878b9a5180ed63dedcac7381ce41380a1bd95ba7f85bfb2c97b635fdc7700162373078963ef708fa5cd47084aa6f5c71b212042fe1acd87e01a85599296
 DIST inxi-3.0.38.1.tar.gz 320672 BLAKE2B 9c486ee07db4abad47c767c2f0d27d5e7c30e6640c50062c986f36201dce5217babd487a2d8f516be2d9bc41b8a06137d94ccb560fa0996d9a660a26004ef18d SHA512 44f97474a130f2b932c0ee54658673846712305bf2fb738c293514f62df1ca2c5d11688e2557a3f6eaeb933db0fed904e818e3dda28b839baa3ac89e6385d3a2
 DIST inxi-3.1.06.1.tar.gz 357819 BLAKE2B e6eb8a34807323d7f46ff029af797e3a13229813bf0cff4b8b874cd21ff1d38459e2181ddf3882b4ee0d29e8c788e2fce1c01f5c295911493292082192c56c2b SHA512 6621252048e95132cfec30e341f72f5942188f273488509614aab28e55ee9987b8f3820e1298c4d9a16b4f3464f1f270fb4c1d5e5a7bf0d2f616b4180193ab6b
+DIST inxi-3.3.04.1.tar.gz 450695 BLAKE2B 3bf2fc9296c9b1e2357e7df2edeb3df5069d48b401be793ab82bd630cfbf45fdc39d6403d851d46dfa9b8e7729da6dc07e96982941396e46493f4531bb29233c SHA512 0ffde2362c79a4269df0f4bbe439e50d24a13969a22f6e84f6caeb8cace2ee49fb075d6051211709efdc831c2f7ef37eaa38d70306bc8f1a86f8ed0dc7dea094
 EBUILD inxi-3.0.33.1.ebuild 812 BLAKE2B 45822e1ef6a20bf7680aa2b271ce51b7188bf36f30258a537cb57e31edc2e1dc93d12461c038cee37d8484d1d82d5883399c0dcd681a9b7a6b34e805fb4f3415 SHA512 2c43a3b5264058f0854603c3cdf149549749940daeed273da814422435d58fecd7227c22f2947dec52401348c4dd1a60f9b5adf144eb9a7a42c561e1364a0053
 EBUILD inxi-3.0.34.1.ebuild 940 BLAKE2B a0df1d5c79accdfa98e336565fcd56b617fdac1f3620db6eb37656641eec27994152b9c69c857b2ffd0400d11e8ad564f3605ba6c80cb8aea2f82870b0f5c11e SHA512 9db372af1f597c3ecd81d2a2c17094931ea0c634b0adaf88973ce8cee5bf272ae870219a83252eb0e8c325f562ba60900d512e94043ee7b3f71c1e79487df597
 EBUILD inxi-3.0.36.1.ebuild 940 BLAKE2B a0df1d5c79accdfa98e336565fcd56b617fdac1f3620db6eb37656641eec27994152b9c69c857b2ffd0400d11e8ad564f3605ba6c80cb8aea2f82870b0f5c11e SHA512 9db372af1f597c3ecd81d2a2c17094931ea0c634b0adaf88973ce8cee5bf272ae870219a83252eb0e8c325f562ba60900d512e94043ee7b3f71c1e79487df597
 EBUILD inxi-3.0.38.1.ebuild 940 BLAKE2B f2f06922cb8611498da30d4db171dd501ae8683eba8ab713a74c02f6f7436fa9932a38562474d3f546649bc04e81392658bd8c7ad9fe945f0c246b5aedf51454 SHA512 866ea34a2b6434afb6eed6fac2ae246c7b10d9d2d3dfac5fbcec911c57fd44ed2d5eeedc440a1a59dc488127aad0e2c89a104a7c56e0317743d3d79eb666d631
 EBUILD inxi-3.1.06.1.ebuild 807 BLAKE2B 448c656ce3d29ab6068ef103521cb60cec55d27e74294d98885230a1a3b437999187f9633af2b30e61ee8235067750152bd0a67394e4cd071adccc836ef9fa9e SHA512 6f48f6171bf6bfea9bafe1540d7f2a3ad809e3a422a9988420599620133dddccae19423e74998ff988b6e42e45317563884aa4a265b15e9137e635426c5e3004
+EBUILD inxi-3.3.04.1.ebuild 812 BLAKE2B a1889935dae2f8bb4e2b123f40092a2afe972638165475caab81518b1c07320179cd6f36d66193675f885ffaa1ca8b1bc4d1e7b66f3c62d22c51f3166a1d4b5f SHA512 44641459e267d3bf1a8ecf96cff0d54352bf8faf261e33fa751ac1d79f7a6b718ef958300b79858f17362562f2883cf7d0523dcee2d665ec55d2818aefd9dd53
 MISC metadata.xml 612 BLAKE2B e09803ea44365da79b2cec697d9800d5fcabf1e55f9ae8818fe8dad0657ac9c6e0dae7d1943d93c2a1609f84d71b8d27479a1ba72455ea5a15c3d48bb575b875 SHA512 a6b52b63caef73e7028a9d03f1bda2cc6ab24d492f41f2fe6ccc9f254dfa8e0f611ff7d08ec4f111b44dd96d6dcc8f647bda4777d53603f788c7f599ecc5dc05
diff --git a/sys-apps/inxi/inxi-3.3.04.1.ebuild b/sys-apps/inxi/inxi-3.3.04.1.ebuild
new file mode 100644
index 000000000000..c608479bb8f9
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.3.04.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_rs 3 '-')
+# 2.3.56 was the last version with no tagged release.
+# It was also the last Bash based release. Later versions are Perl based
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index e45bd3876c39..8a647749af81 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -3,5 +3,5 @@ AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b
 DIST irqbalance-1.7.0.tar.gz 54209 BLAKE2B 1213b21c7d3979c9ba7d2298c21f7f0b75217d251ecfa02660ea0602a032d62c9c9b0254bf158e07e0fdcf55b35f332f5a17f929c7393dfdb894ca952dad52b4 SHA512 2fa29c738275dda2fac38d78ca0ec4619826b72529e8eda7ad8ddcda5768bbf282e2260dddc16a8b46d4296289b25dc59684575ae1badca0c6c6ae30b1e9b5ea
 DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740
 EBUILD irqbalance-1.7.0.ebuild 1326 BLAKE2B b016fd1bd29bd101ba2f7d9fe779d7d2f89e2c6bab9ef24b9b6e8ee1cff5251d4d4bfe5e92e091beaaaf6d84a23ae3340710031a822bdb7a99639cde5a7621aa SHA512 27be7fc08b8a4f8a3d767b7caecdaded2e203bff3e427cc361ff7972e74c5e71aabfe4dbb5095506cd7f383f408dc0716d6f56c779939d682a82b5f2e4c80558
-EBUILD irqbalance-1.8.0.ebuild 1331 BLAKE2B a99bd8fefbf7839d7fdbf8e578b18e9efc3d93242d22faa1bc53fea87ba8d6d26739f6d27d07edebaeeb5b1dd6c47dd8d5e568a53b3168edcb352c543defdfa8 SHA512 f5b577811f4aa86a9fd4a4cb14b04d32b1282774537cc3708d55ff57a03225f4686f2cd81f77c80934f2e48106c07d94589d6ead2fb7dd3c8cac2b136dfcae2c
+EBUILD irqbalance-1.8.0.ebuild 1327 BLAKE2B 3fae55518878465994a20fc545f56d78caddb09c32d63c26362baad4ab87fd4eb93d5e46e6978c303f6a49ea8b104d167709f517278ec608a57965c21185f6eb SHA512 65b4994f1ac3f4fabc525b390769be1e38d4b4386ffd996be03dbb340e60ed89a4581762974669ef456822b0908740ee009fee679acca65f46ae4a5847fe5f25
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/irqbalance-1.8.0.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
index 9702732fb4b5..b69570811707 100644
--- a/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~x86"
 IUSE="caps +numa selinux tui"
 
 DEPEND="
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 199bdae869a2..d64d920d1a3c 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,10 +1,4 @@
-AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28443ba7e340ee6306dcc6a429c6e939684ed3058213681476342a428e06384739a8e51f08c549058b0c8b686 SHA512 14645a299e22afd38d2b118b9f1029280392880ce56c2b65a8e61bcfebd818d5e3b61f9a701d3b362b4f1d31bee4db2d23179b6e31e235e6e82b05b1e17d22b1
-AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed
-DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13
-DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927
 DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb
-EBUILD kbd-2.2.0-r2.ebuild 1597 BLAKE2B e56136d4d7a0bbae100e8886731a09c30b908b7d075dcb8c935726cc8a6795ee91a45d994d42457ee5435eb6f143639c678e8458e1f2dcf48b81a9092bdc1a02 SHA512 0060f49d5a29b83264f4a975774cd28dec0b4b1869400d7e2a05de23912e81e53b2aa68353c47a951d6efa83e36c19669ef4e6ca965ce866d5855d0f20968679
-EBUILD kbd-2.3.0-r1.ebuild 1914 BLAKE2B 133b815160a2d3a1b0f46a6c9f8fc92124b52c6802430f98deaf807408df0de01d0ac2bdde07b848145f82927eb81dbd0a07211a91ef8cfec680c98972bc9058 SHA512 202008234ffec81f951b5f0864e005e0bb30825e02cf3998fc0007979aa1d7304bcd35ad35976dafe76e88f2f7cbd76afddd487064d364bcaddc71f4341b6860
-EBUILD kbd-2.4.0.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c
+EBUILD kbd-2.4.0.ebuild 1865 BLAKE2B b1c9d1961a1c74522ede9368f28d603fd76fb1242628a15e73e0e1f0d0d723072abecd5f2aee1d1300d18bb0be34a2ea8312b1f6c291b670a8ac76d3e304638f SHA512 81f5955d377a44933291bc1d693a2d316bf696ec0f8cfd76f44b035e135be14578f6efa7734aff93a4dfa3ffc83d1b4f0e910b8afaa6d7f8012f8ed22903f9bf
 EBUILD kbd-9999.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/files/kbd-2.2.0-cflags.patch b/sys-apps/kbd/files/kbd-2.2.0-cflags.patch
deleted file mode 100644
index 86c0f45074ac..000000000000
--- a/sys-apps/kbd/files/kbd-2.2.0-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3b4f3ffbc9fedff83a0618f3dd3c6aafced3e72a Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 31 Jul 2019 18:07:33 +0200
-Subject: [PATCH] configure.ac: respect user CFLAGS
-
-Do not override user CFLAGS. Do not unconditionally add -g to CFLAGS.
-
-Gentoo-bug: https://bugs.gentoo.org/691142
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6bf6401..0f5ed2f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; then
- fi
- 
- case "$GCC,$ac_cv_prog_cc_g" in
--	yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;;
--	yes,)    CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;;
--	   ,yes) CFLAGS="-g" ;;
-+	yes,yes) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
-+	yes,)    CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
-+	   ,yes) CFLAGS="$CFLAGS" ;;
- esac
- 
- CC_CHECK_CFLAGS_APPEND([\
--- 
-2.22.0
-
diff --git a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch
deleted file mode 100644
index 4b545f5bc2a2..000000000000
--- a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From acf93e44f6d036303f95555069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Tue, 6 Aug 2019 13:59:34 +0200
-Subject: [PATCH] libkbdfile: Do not stop on the first error
-
-The kbdfile_find() gets a list of directories in which the filename. If
-we could not find the filename in the first directory, you do not need
-to return an error.
-
-Link: https://github.com/legionus/kbd/issues/31
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/libkbdfile/kbdfile.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c
-index 804f04a..fb8e035 100644
---- a/src/libkbdfile/kbdfile.c
-+++ b/src/libkbdfile/kbdfile.c
-@@ -433,8 +433,8 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp)
- 		rc = findfile_in_dir(fnam, dir, recdepth, suffixes, fp);
- 		free(dir);
- 
--		if (rc <= 0)
--			return rc;
-+		if (!rc)
-+			return 0;
- 	}
- 
- 	return 1;
diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
deleted file mode 100644
index b7b82aca99ef..000000000000
--- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	#EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
-	EGIT_REPO_URI="https://github.com/legionus/kbd.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls pam test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/gzip
-	pam? (
-		!app-misc/vlock
-		sys-libs/pam
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cflags.patch" #691142
-	"${FILESDIR}/${P}-kbdfile-dont_stop_on_first_error.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-
-	# Rename conflicting keymaps to have unique names, bug #293228
-	cd "${S}"/data/keymaps/i386 || die
-	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
-	mv olpc/es.map olpc/es-olpc.map || die
-	mv olpc/pt.map olpc/pt-olpc.map || die
-	mv qwerty/cz.map qwerty/cz-qwerty.map || die
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_enable pam vlock)
-		$(use_enable test tests)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	docinto html
-	dodoc docs/doc/*.html
-	use pam && pamd_mimic_system vlock auth account
-}
diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild
deleted file mode 100644
index 698828be221c..000000000000
--- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	#EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
-	EGIT_REPO_URI="https://github.com/legionus/kbd.git"
-	EGIT_BRANCH="master"
-else
-	if [[ $(ver_cut 3) -lt 90 ]] ; then
-		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	else
-		inherit autotools
-		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	fi
-fi
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls pam test"
-#RESTRICT="!test? ( test )"
-# Upstream has strange assumptions how to run tests (see bug #732868)
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/gzip
-	pam? (
-		!app-misc/vlock
-		sys-libs/pam
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-
-	# Rename conflicting keymaps to have unique names, bug #293228
-	cd "${S}"/data/keymaps/i386 || die
-	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
-	mv olpc/es.map olpc/es-olpc.map || die
-	mv olpc/pt.map olpc/pt-olpc.map || die
-	mv qwerty/cz.map qwerty/cz-qwerty.map || die
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		# USE="test" installs .a files
-		--disable-static
-		$(use_enable nls)
-		$(use_enable pam vlock)
-		$(use_enable test tests)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	docinto html
-	dodoc docs/doc/*.html
-	use pam && pamd_mimic_system vlock auth account
-
-	# USE="test" installs .la files
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild
index ef571616a3ab..bb7dfea2b036 100644
--- a/sys-apps/kbd/kbd-2.4.0.ebuild
+++ b/sys-apps/kbd/kbd-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	if [[ $(ver_cut 3) -lt 90 ]] ; then
 		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	else
 		inherit autotools
 		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 10d2c2e24d21..193dbb7f3f3c 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,18 +1,14 @@
 AUX 90_kexec 199 BLAKE2B 37bcd66beccc32a884b0c2fca9cbba14784b8e6bc7238c14397f0ded788b503df1f7d6fff01c9b9a6bc159c1a6e01821c4c78c144091a7e13bb2bbe88ab5a98c SHA512 31837eb7df9b5c9b63c5f500e55fb584e315ac20f328490ff812a265f1a01604724bf4699f142255f7c5fa78cb2d8f2d6220a91961ac90df644b5d545d47ca39
 AUX README.Gentoo 937 BLAKE2B 88a8912015e1cab0d382661d6bdc82689c91970d6d84c949e99a932b4d153b0753183380930b753d23d1c40ab7f44cae784f716e54bc3609a28741ab0b5b1348 SHA512 f082763692def43a97866b88443daf08a2bc1b0dccdc90160d12effa16e1293d8db6935c72ca9dd5502f844078241cbecdfde15b6e8f67a2cca8f3e89f14e654
 AUX kexec-r2.init 4061 BLAKE2B 40e0f89db9a1b95c8b389e093aee055402ca6ac450344c53de4e6e44127020bb51d33b41f4ec4a749303cbd67f873088aff151599c046f4fcb268da9397baa83 SHA512 9974ec312647dce2213bfaa80820ebf1571ce4d95daa8668a0626444e7d768a2dddc984f1a3b79df956b870e99e2f82ae970f11fc146baf7926fec45048a9e7c
-AUX kexec-tools-2.0.20-build-multiboot2-for-i386.patch 3095 BLAKE2B 1e8019d09f3c90f801dd5cd4d2c02b5104a663c1bb1cd7c88ce98f6a934db7e427907a7df26e285bf481dd589f19f65b69862450d3ca81fc78bf00a828b7fed7 SHA512 0d47425508307e6614c618b54953e7c6259587a9519441910236c299950fb75ddaf1829870194da32acefff680034925135306e9b8df4f082ddeb2042f0f89bf
-AUX kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch 3661 BLAKE2B 5f0f31b40475a049157a51797127a882d50ee435f1fbf3b2dea5a423f104fdec2c234324e2cd7a56b9f066148f382cb8582a3d988ee2fce40e0dc75ae6d159c7 SHA512 5ad9036ba28bdc8c319c71af5352e60b0a9ea2bd9153723e2256b6365417c0a43225dbed3c80809792318eda0eff86042ef32f5259d5ff733f0d55df4c45dd28
 AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 BLAKE2B ad62ae055cd4443ee4dcb4d9a5be1c918a9e1337545f60c683a1a47b848020d0f8fbdc38c7111e505424783191faf3e221ffa642169d2d055d5e17e6b19b9d0d SHA512 c7fe9176db7c3f9c84add1c263c5a695684bf1db55d47152534f0bbb97c084ad5d3f2090307d0bdfcf5622fa810aca3c104f81b3d24baa76f42d3f32d1d4bbad
 AUX kexec-tools-2.0.4-out-of-source.patch 816 BLAKE2B 88dc0a8f01c65a32b6ae081ea222760845fe243aad1057e3620ed4c932a32edebf943f9557b2f67751bbcea1f91778c0c065e246d419d5725eb68edcb1e58ced SHA512 4839800f99e2bdb7dfbf3aa1f3ad795feb63b4e493812a50d4baa839a27b5e96319c4e848969cbcedf627a32ed5fbfb312461c2ac89b73daaa7f8f680f35f504
 AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190febf582f3ab7e8b821091321036bff104ee5cebab21062830c774778ca17a34a2df76065cfb8 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a
 AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649aa8cce35b6a47b2abd5a208b7ae4376f0330ea2194ae63f786bf0c30682f734f1b604be131e6e63570e SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
-DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B 7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3 SHA512 3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
 DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77 SHA512 f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
 DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
-EBUILD kexec-tools-2.0.20-r3.ebuild 3381 BLAKE2B 67e203cd4ea7fea5a7c100a5acf8dfa7376f96e98fadd48a3e0a2de430e6ae4092cf29a48b6d56b0a2bac7bb437d402fc8f2b370b9141dbd3eb5d6eac7d03673 SHA512 621707548ff183ed90b5d47531528954894bcde436e1f3beeb93a70e58a5018d3f9d0353d4654b9e57be9ef6cb4ab6f2168511a46106dcc86b9c24b6981b77ba
-EBUILD kexec-tools-2.0.21.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
+EBUILD kexec-tools-2.0.21.ebuild 3263 BLAKE2B 81df746fbd75d29a45e23cc1b1509dbe7c99e2a34cae30a04625dd13b41c770451752eb7cbfc2c53bff33948aa666119fdac81ade871c086973b27e70f1f0331 SHA512 dbb7744f92104f1a174a90c30eda7a384c43d3659f36f1103987e4a6354c77d21b3c45f9c4053fae699f13b1e87550b7ae7f3b1abe6c4fe31ff9a7d97a4868d3
 EBUILD kexec-tools-2.0.22.ebuild 3265 BLAKE2B f1b79999adf8df2e0a85cdcc2cd25027e78e8305fd8ba10d530cd2db3d31f8f5a148b978131c77871f4b0a97c0b496fa342834e8b8c4fbea74417c82a36f430e SHA512 bfe4ebad0b2c3e5281309e8f7b76f9f2f5a4a6b19f46b8077b1f066d0a9e41b0dd529d19071c660021d7dad41e9d86b1e5f3af3ca4149a2ea660af89b2eafd5f
 EBUILD kexec-tools-9999.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-build-multiboot2-for-i386.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.20-build-multiboot2-for-i386.patch
deleted file mode 100644
index 8f63ddbe3ba3..000000000000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-build-multiboot2-for-i386.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Mon, 18 Nov 2019 12:52:15 +1300
-Subject: kexec: build multiboot2 for i386
-
-This addresses the following compilation issues when building for i386.
-
- kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'?
-   { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
-                       ^~~~~~~~~~~~~~~~~~~~
-                       multiboot_x86_probe
- kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'?
-   { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load,
-                                             ^~~~~~~~~~~~~~~~~~~
-                                             multiboot_x86_load
- kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'?
-     multiboot2_x86_usage },
-     ^~~~~~~~~~~~~~~~~~~~
-     multiboot_x86_usage
- make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1
- make: *** Waiting for unfinished jobs....
-
-Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Signed-off-by: Simon Horman <horms@verge.net.au>
----
- kexec/arch/i386/Makefile    | 2 +-
- kexec/arch/i386/kexec-x86.h | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
-index 105cefd..f486103 100644
---- a/kexec/arch/i386/Makefile
-+++ b/kexec/arch/i386/Makefile
-@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c
-+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c
- i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c
- i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c
-@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c
- 
- dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS)			\
- 	kexec/arch/i386/crashdump-x86.h					\
--	kexec/arch/i386/kexec-mb2-x86.c					\
- 	kexec/arch/i386/kexec-x86.h					\
- 	kexec/arch/i386/x86-linux-setup.h				\
- 	kexec/arch/i386/include/arch/options.h
-diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
-index 1b58c3b..0f941df 100644
---- a/kexec/arch/i386/kexec-x86.h
-+++ b/kexec/arch/i386/kexec-x86.h
-@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len,
- 	struct kexec_info *info);
- void multiboot_x86_usage(void);
- 
-+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len,
-+			struct kexec_info *info);
-+void multiboot2_x86_usage(void);
-+int multiboot2_x86_probe(const char *buf, off_t buf_len);
-+
- int elf_x86_probe(const char *buf, off_t len);
- int elf_x86_load(int argc, char **argv, const char *buf, off_t len,
- 	struct kexec_info *info);
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch b/sys-apps/kexec-tools/files/kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch
deleted file mode 100644
index d71e76b3d632..000000000000
--- a/sys-apps/kexec-tools/files/kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From cc087b11462af9f971a2c090d07e8d780a867b50 Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Wed, 29 Jan 2020 13:38:19 +0800
-Subject: kexec-tools: Remove duplicated variable declarations
-
-When building kexec-tools for Fedora 32, following error is observed:
-
-/usr/bin/ld: kexec/arch/x86_64/kexec-bzImage64.o:(.bss+0x0): multiple definition of `bzImage_support_efi_boot';
-kexec/arch/i386/kexec-bzImage.o:(.bss+0x0): first defined here
-
-/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm/../../fs2dt.h:33: multiple definition of `my_debug';
-kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/kexec/fs2dt.h:33: first defined here
-
-/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:68: multiple definition of `arm64_mem';
-kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:68: first defined here
-
-/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:54: multiple definition of `initrd_size';
-kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:54: first defined here
-
-/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:53: multiple definition of `initrd_base';
-kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:53: first defined here
-
-And apparently, these variables are wrongly declared multiple times. So
-remove duplicated declaration.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
-Signed-off-by: Simon Horman <horms@verge.net.au>
----
- kexec/arch/arm64/kexec-arm64.h      | 6 +++---
- kexec/arch/ppc64/kexec-elf-ppc64.c  | 2 --
- kexec/arch/x86_64/kexec-bzImage64.c | 1 -
- kexec/fs2dt.h                       | 2 +-
- 4 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/kexec/arch/arm64/kexec-arm64.h b/kexec/arch/arm64/kexec-arm64.h
-index 628de79..ed447ac 100644
---- a/kexec/arch/arm64/kexec-arm64.h
-+++ b/kexec/arch/arm64/kexec-arm64.h
-@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **argv, const char *kernel_buf,
- void zImage_arm64_usage(void);
- 
- 
--off_t initrd_base;
--off_t initrd_size;
-+extern off_t initrd_base;
-+extern off_t initrd_size;
- 
- /**
-  * struct arm64_mem - Memory layout info.
-@@ -65,7 +65,7 @@ struct arm64_mem {
- };
- 
- #define arm64_mem_ngv UINT64_MAX
--struct arm64_mem arm64_mem;
-+extern struct arm64_mem arm64_mem;
- 
- uint64_t get_phys_offset(void);
- uint64_t get_vp_offset(void);
-diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c
-index 3510b70..695b8b0 100644
---- a/kexec/arch/ppc64/kexec-elf-ppc64.c
-+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
-@@ -44,8 +44,6 @@
- uint64_t initrd_base, initrd_size;
- unsigned char reuse_initrd = 0;
- const char *ramdisk;
--/* Used for enabling printing message from purgatory code */
--int my_debug = 0;
- 
- int elf_ppc64_probe(const char *buf, off_t len)
- {
-diff --git a/kexec/arch/x86_64/kexec-bzImage64.c b/kexec/arch/x86_64/kexec-bzImage64.c
-index 8edb3e4..ba8dc48 100644
---- a/kexec/arch/x86_64/kexec-bzImage64.c
-+++ b/kexec/arch/x86_64/kexec-bzImage64.c
-@@ -42,7 +42,6 @@
- #include <arch/options.h>
- 
- static const int probe_debug = 0;
--int bzImage_support_efi_boot;
- 
- int bzImage64_probe(const char *buf, off_t len)
- {
-diff --git a/kexec/fs2dt.h b/kexec/fs2dt.h
-index 7633273..fe24931 100644
---- a/kexec/fs2dt.h
-+++ b/kexec/fs2dt.h
-@@ -30,7 +30,7 @@ extern struct bootblock bb[1];
- 
- /* Used for enabling printing message from purgatory code
-  * Only has implemented for PPC64 */
--int my_debug;
-+extern int my_debug;
- extern int dt_no_old_root;
- 
- void reserve(unsigned long long where, unsigned long long length);
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
deleted file mode 100644
index 89aebbb29179..000000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool linux-info systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/-}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
-	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-	"${FILESDIR}"/${P}-remove-duplicated-variable-declarations.patch
-	"${FILESDIR}"/${P}-build-multiboot2-for-i386.patch
-)
-
-pkg_setup() {
-	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
-	export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
-	default
-
-	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
-	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
-
-	if [[ "${PV}" == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with booke)
-		$(use_with lzma)
-		$(use_with xen)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Respect CFLAGS for purgatory.
-	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
-	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
-	# -mcmodel=large which is added by build system.
-	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
-	local flag flags=()
-	for flag in ${CFLAGS}; do
-		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
-		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
-		flags+=("${flag}")
-	done
-	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newinitd "${FILESDIR}"/kexec-r2.init kexec
-	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
-	insinto /etc
-	doins "${FILESDIR}"/kexec.conf
-
-	insinto /etc/kernel/postinst.d
-	doins "${FILESDIR}"/90_kexec
-
-	systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "For systemd support the new config file is"
-		elog "   /etc/kexec.conf"
-		elog "Please adopt it to your needs as there is no autoconfig anymore"
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	local has_rootpart_set=no
-	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
-		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
-			has_rootpart_set=yes
-		fi
-	fi
-
-	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "This was probably caused by a previous version of ${PN}."
-		ewarn "Please reboot system once *without* kexec to avoid boot problems"
-		ewarn "in case running system and initramfs do not agree on detected"
-		ewarn "root device name!"
-	fi
-}
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
index 86b8d9fc9789..897b98a24b69 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 710dd18995d1..ab086c74fbfa 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -5,6 +5,6 @@ AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
-EBUILD keyutils-1.6.1.ebuild 3879 BLAKE2B a9e264f0338bff757b45d35362c193e7ff1e9ceb8f84ac2bb595d48ea84f8594dac61ab013c69b9d22b73e469e6991d777b5a28f4fcec1c7d33b5f2ced3defbf SHA512 5570ebec1856e06fdf5627a0d0280d06950b4fcf55484df12b1585d0d33d35992e21cf352f64a16e61aebc1e62d48ee5be5d781f1f7068d6b5a98ec254a54846
-EBUILD keyutils-1.6.3.ebuild 3786 BLAKE2B 4c9ea1e6a0df38009e35bd67838edb161690b81ee552a674005da215c3cc87f86012ea5519a59e270fc88845e63d69fe64b637138d2fbb4e2e0e07aa7698d31a SHA512 b017e18f118abf50c16f100a86dd8b152c64e233c44f90b7b7a0d561af2393ded77fd400bb3118e5107ffaf29ddc48051624161d8b86bbe9944e3c42ff7a4b2c
+EBUILD keyutils-1.6.1.ebuild 3870 BLAKE2B 9c3bfe57a55d744623756154f5f599b5e66bb731ad1903e42acb3646883095006bacf338a7d8fb161be6c9a2e6e14f924105b527c191552f6e1c31d5d7742d3f SHA512 1f08385e89141147decfd3e4f125928c743eebdffeb2bdb074778186357e674c747c9681dbab14a7474cee459d8683b7bf390528a7d3cc5c574cbd7122a69c0a
+EBUILD keyutils-1.6.3.ebuild 3776 BLAKE2B 44c08ae7e7afd6dab8839fd6387d8fbb363d21e674a92d0f738ad79e63caa7fe370f611a4e1ac880ac8bc4920e1002b31c01a2f4aea05a6360bd4052e856fc51 SHA512 ccede5be4fd0653e1bd25717c2329bbbd79174821ef45f725f16a9869539b3de78019369c52464cb015676cbeb1834e6db1e518e71bf2c107472937ed36eb72f
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 35de8f2bff11..96aead1e2727 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
+inherit toolchain-funcs linux-info multilib-minimal usr-ldscript
 
 DESCRIPTION="Linux Key Management Utilities"
 HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git"
diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild b/sys-apps/keyutils/keyutils-1.6.3.ebuild
index 127ba037b76b..013beb38f8c2 100644
--- a/sys-apps/keyutils/keyutils-1.6.3.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
+inherit toolchain-funcs linux-info multilib-minimal usr-ldscript
 
 DESCRIPTION="Linux Key Management Utilities"
 HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git"
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 51acf71ec72b..d0be6e046158 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,8 +1,7 @@
-AUX kmod-27-depmod-do-not-output-.bin-to-stdout.patch 1521 BLAKE2B 3b1f0808198f065a017bccfdffddbcf76382004c9a7710ff682ed27a502660d7686f544b904a66eb10d50c094152eceb02e9156473380c430a2996720bd384b5 SHA512 344185ea38f4bb6a939b8ce29cf406776b60f193e5e0eaea7ed154fcc4a9be4237bcd2635d2bc614d74a9109fad056674e9356022b46e3bf00fc5db6c964a3de
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
-DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
-EBUILD kmod-27-r2.ebuild 5203 BLAKE2B 94962af9d143cf4ff694763351a02e493910b99efb9f4a62701fdfe6bedbf815a4e24c4db7d8c568559d5647c0e07d0916afae24576db4330c1626083f4cc512 SHA512 08b451e01ec1a05c694713ac0d67fab1e5ebbf0741e5e21231ba2e15bd08b452d5a7732f49d7723dbd13c85b48ac1216c4dca99a297e44e26baa4b1ae41afd8a
+DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
 EBUILD kmod-28.ebuild 5224 BLAKE2B a332a2e2544d737b006d0179974de3f86baabfef69ef8291d9c1dda3df94829e2b37fd44862e194eff6107395dcab0ec50ec8e6d99afa136e332212feb34a49b SHA512 9eb983c787a706e7ae56d6b73515d176257ce189a2547405062f5b71a3f6113cea949dd0f73bda634e109608c78869ff40d1bc0cf216b0fba42d780f2a937492
+EBUILD kmod-29.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c
 EBUILD kmod-9999.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c
 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
diff --git a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch b/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch
deleted file mode 100644
index dc776b515bc0..000000000000
--- a/sys-apps/kmod/files/kmod-27-depmod-do-not-output-.bin-to-stdout.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 53b30aeba2dedae9f5558f560231d9462e063dfc Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@intel.com>
-Date: Thu, 5 Mar 2020 13:33:10 -0800
-Subject: depmod: do not output .bin to stdout
-
-index_write() relies on fseek/ftell to manage the position to which we
-are write and thus needs the file stream to support it.
-
-Right now when trying to write the index to stdout we fail with:
-
-	depmod: tools/depmod.c:416: index_write: Assertion `initial_offset >= 0' failed.
-	Aborted (core dumped)
-
-We have no interest in outputting our index to stdout, so just skip it
-like is done with other indexes.
-
-While at it, add/remove some newlines to improve readability.
-
-Reported-by: Yanko Kaneti <yaneti@declera.com>
-Fix: b866b2165ae6 ("Lookup aliases in the modules.builtin.modinfo")
----
- tools/depmod.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tools/depmod.c b/tools/depmod.c
-index fbbce10..875e314 100644
---- a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -2408,8 +2408,10 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
- 	struct index_node *idx;
- 	struct kmod_list *l, *builtin = NULL;
- 
--	idx = index_create();
-+	if (out == stdout)
-+		return 0;
- 
-+	idx = index_create();
- 	if (idx == NULL) {
- 		ret = -ENOMEM;
- 		goto fail;
-@@ -2456,7 +2458,9 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
- 
- 	if (count)
- 		index_write(idx, out);
-+
- 	index_destroy(idx);
-+
- fail:
- 	if (builtin)
- 		kmod_module_unref_list(builtin);
--- 
-cgit 1.2.3-1.el7
-
diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-29.ebuild
index 1f01479f1508..b2369d923557 100644
--- a/sys-apps/kmod/kmod-27-r2.ebuild
+++ b/sys-apps/kmod/kmod-29.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools bash-completion-r1 multilib python-r1
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	#inherit libtool
 fi
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -29,6 +29,7 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib"
 # See bug #408915.
 RESTRICT="test"
 
+# >=zlib-1.2.6 required because of bug #427130
 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
@@ -37,7 +38,8 @@ RDEPEND="!sys-apps/module-init-tools
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
 	pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
-	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+	zlib? ( >=sys-libs/zlib-1.2.6 )
+	zstd? ( >=app-arch/zstd-1.4.4 )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
@@ -52,15 +54,13 @@ BDEPEND="
 	zlib? ( virtual/pkgconfig )
 "
 if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND}
+	BDEPEND="${BDEPEND}
 		dev-libs/libxslt"
 fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DOCS="NEWS README TODO"
-
-PATCHES=( "${FILESDIR}"/${P}-depmod-do-not-output-.bin-to-stdout.patch )
+DOCS=( NEWS README TODO )
 
 src_prepare() {
 	default
@@ -96,6 +96,7 @@ src_configure() {
 		$(use_with lzma xz)
 		$(use_with pkcs7 openssl)
 		$(use_with zlib)
+		$(use_with zstd)
 	)
 
 	local ECONF_SOURCE="${S}"
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index ae0ce4558c09..a608a7b05270 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -2,6 +2,8 @@ AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535
 DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92
+DIST less-586.tar.gz 351861 BLAKE2B fa3d4eadc740d751daf5303867c2ecf411663b64177e14544bdb30aa1b19c1414020b53e27a1a0666cc1922781a11c44ff1bac0adee4e784edf4ca82913596a4 SHA512 14579e1c682e0c30d614e85cdd969c007ecb613930376a46c0c5614e02c596ea0d0ab50211ed28095206ea70698fd1ccf6762888dfa149773d7b515cf3b2ca7c
 EBUILD less-563-r1.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
-EBUILD less-581.2.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
+EBUILD less-581.2.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
+EBUILD less-586.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
 MISC metadata.xml 383 BLAKE2B 5f11eeb30186e0e73c0c06f244a6eef420b756f60a15fc992cab99deebd2b0d0056d4a12628e9a5ef9494838b1a81efa11567a99182976d7bbe3db048c058d8d SHA512 cf7a569bd5f70879f8c5d8a732213295d53a49c288143523723d6970a176e90fe678e2c2bd76eca630a31deee69a386c498884ffc4b24f8622cf8a60a80848b4
diff --git a/sys-apps/less/less-581.2.ebuild b/sys-apps/less/less-581.2.ebuild
index c91345dc9f3b..10671e00e64e 100644
--- a/sys-apps/less/less-581.2.ebuild
+++ b/sys-apps/less/less-581.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-586.ebuild b/sys-apps/less/less-586.ebuild
new file mode 100644
index 000000000000..c91345dc9f3b
--- /dev/null
+++ b/sys-apps/less/less-586.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 BSD-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pcre unicode"
+
+DEPEND=">=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:0=
+	pcre? ( dev-libs/libpcre2 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
+	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
+	local myeconfargs=(
+		--with-regex=$(usex pcre pcre2 posix)
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
+		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}
diff --git a/sys-apps/lnxhc/Manifest b/sys-apps/lnxhc/Manifest
index 76bf95baca6b..bbb351cd17c3 100644
--- a/sys-apps/lnxhc/Manifest
+++ b/sys-apps/lnxhc/Manifest
@@ -1,5 +1,5 @@
-AUX lnxhc-1.2-ifconfig-path.patch 654 BLAKE2B 6872b7412c63a1ca3e4d63831269c5a77062f5be777dfb63cd9090131dc045dd0e203ffdec7c5f805788518094b5047e30909e6a61c8d237f3cdf927f42f9adb SHA512 a29bc332e918e44fe3659f520c32df34ca293edc1545534853495a41182f7e28cb049e20e746f4cbf83c30140f4ae450d034e806a4c87e4d642f4ff2cce27cc1
-AUX lnxhc-1.2-usrlocal.patch 1455 BLAKE2B 8d154c43ba460a09366e0b7d93c4fb69309682a49a1346b94c4410e4b49098718c9bfcc3a8a1c5df9ce2dcbef485f65f28d6e6bea08920904dc7ee70ce25b444 SHA512 43be5d638f46caee028802e8675621a7e6ec8499f4490ed1f9df167a8b9b82a3002bac5a28ab3116507eb0eccaad33d865cb64f6cbc4b134717541cd2424087f
+AUX lnxhc-1.2-ifconfig-path.patch 526 BLAKE2B bfec8f4a559c2de09038d351c9e2f69d52cc7a0ef8a0934fcbc74b89937699ee5b6512a761493a8c670a17ba7e7290921f52341c0947dd8bb4648aac717b49e3 SHA512 e1232ceb50866c90b58a3df9ba724efa4748e33706e90402336da24bc41580e2c677af4763800c80e51045a646c0d4cfbd6e1fd6e2080de4d10bac55f5dd5616
+AUX lnxhc-1.2-usrlocal.patch 1303 BLAKE2B 89d1e234f2f88c5da9870f2bae9fbf4175e2eb655b813822a9fbf00ba1cdbd3683d55d02fddf00ab90e94d88c505fec728a5d786c87913d5f381794cddd88be7 SHA512 bcbfd0807446c8b0e1da2926a42ddac58de8572c3eda3a11d05faaa07acf3b86c8f73a2158993a35b6d9fa8bed8ac19e49580336db6b94f4dd5d6608ea70aa3f
 DIST lnxhc-1.2.tar.gz 360869 BLAKE2B d92321f02be65ea8aaacdc55d19c480031c03d162e80207b306ef70f512917c506a27075e9326ff4be67e1ddc233096fdd44cf0ab06073a6b29ff8255f49ead8 SHA512 200ab6443c3b8f4dd99928d2f18b31e8e05c1f9c1f976052017a643430ed87fa08a399e9e8430eafb2925126bd2d90fc4f65ce1c220d6100b71c31fc0505aab0
-EBUILD lnxhc-1.2-r1.ebuild 478 BLAKE2B 8a559080a0ffcc31d44a128aa2e9bd3a460e985d022bb4a0bfec18eb261bdb4fc37c5ed7e1acf6fc27f4956f03ab0ebfacea97bc06a498824ff07d1a2ec12635 SHA512 077981873855788cbcc11f684b8faea428919bd986c8e1d7336046769a8d5b645511bde5cd4c5b879e6afbb5177162a40784de3a72470688ea47a89ae5c94581
+EBUILD lnxhc-1.2-r1.ebuild 435 BLAKE2B 194ab064471a9b72bda2bd8dbc74739990736441c459057091b95b7c197f9d0b72317d2bcc758a3b2ea7f88578e127d1c91f4ec68b8f07851e52d28014380e52 SHA512 491a03eb7a4cef7513cd1a1e06f54578e45bb6ecb344d2669653f5aebcf7b3c3c8115635b55c2464f3ab1612372355a93b1e80d8491c5796b7362fa901465374
 MISC metadata.xml 242 BLAKE2B 869d8b0b4c7fa3b941911743f4a3c17d6a2c608cdbd3ae4cc1e3a84a12282f5197c263d99d1c5836f64c3868ad986d22d40e98f9083e24a8de41da5e305c8db5 SHA512 24a593f580269cba11ab3b8b83d8199b577480e448bbfe04cd2ee49da165537423dc4d38f9f2366a44605c8c70ca43ade3140da5718cc2cad01fc549d217f9c3
diff --git a/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch b/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch
index 89e184704857..3f6e9e2fd799 100644
--- a/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch
+++ b/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch
@@ -1,5 +1,5 @@
---- lnxhc-1.2/checks/net_hsi_outbound_errors/definitions
-+++ lnxhc-1.2-patched/checks/net_hsi_outbound_errors/definitions
+--- a/checks/net_hsi_outbound_errors/definitions
++++ b/checks/net_hsi_outbound_errors/definitions
 @@ -9,7 +9,7 @@
  default = "1"
  
@@ -10,8 +10,8 @@
  [exception slow_hsi_receivers]
  severity = medium
 
---- lnxhc-1.2/checks/net_inbound_errors/definitions     2013-02-06 04:08:55.000000000 -0500
-+++ lnxhc-1.2-patched/checks/net_inbound_errors/definitions     2013-05-22 17:13:56.088787813 -0400
+--- a/checks/net_inbound_errors/definitions
++++ b/checks/net_inbound_errors/definitions
 @@ -11,7 +11,7 @@
  # The above value in percentage
  
diff --git a/sys-apps/lnxhc/files/lnxhc-1.2-usrlocal.patch b/sys-apps/lnxhc/files/lnxhc-1.2-usrlocal.patch
index fe237502785f..56599771a7aa 100644
--- a/sys-apps/lnxhc/files/lnxhc-1.2-usrlocal.patch
+++ b/sys-apps/lnxhc/files/lnxhc-1.2-usrlocal.patch
@@ -1,6 +1,5 @@
-diff -ruN lnxhc-1.2/Makefile lnxhc-1.2-patched/Makefile
---- lnxhc-1.2/Makefile	2013-02-06 04:14:17.000000000 -0500
-+++ lnxhc-1.2-patched/Makefile	2013-02-09 13:39:25.096883794 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -71,7 +71,6 @@
  pycheckdir	:= $(libdir)/python/check
  exampledir	:= $(docdir)/examples
diff --git a/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
index e45de7621e9b..f2658d42fd1c 100644
--- a/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
+++ b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch
 DESCRIPTION="Linux Health Checker"
 HOMEPAGE="http://lnxhc.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -11,12 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2-usrlocal.patch"
-	epatch "${FILESDIR}/${PN}-1.2-ifconfig-path.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2-usrlocal.patch
+	"${FILESDIR}"/${PN}-1.2-ifconfig-path.patch
+)
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 0cd58485493f..80b246be38c0 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,10 +1,6 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
-DIST logwatch-7.5.3.tar.gz 495110 BLAKE2B b28d7381d259a132de7d9fd347ac4bafb44440b187aa811f3d3f65d7b1ccbb00c6b5bb660229cd8155fa5d7bc9668e7b4dd1ebe7bbb909b48367c6a6dd6793e5 SHA512 ad404f031fe016599a8f8d8c0820b23db61a9ad102815d3713e5d13e9a810c819ca7ad9cea50891852982e073ef033dbe7595fde8846971336148e32cbbe29ca
-DIST logwatch-7.5.4.tar.gz 481766 BLAKE2B d86ae3afc33a100fc353948be3591cd13566568d47cad02fa5f390882a223ca9d4d78692214f2f0898fa8bf8687314f60ad9ce02f0987bb86dd7136150a1d2b9 SHA512 6e6a5e8b7ae977244ea97895e06cccde320fce3dfbd2b1c58c945fc8872325a9676c8afe122b1f7230cb6617b64813caf90ef37fc472a1b200eb0b24ea72fa9b
 DIST logwatch-7.5.5.tar.gz 474167 BLAKE2B 3e4183ea6dad4f415987870c555391d2a9496b4d4d894f1c06336876077b2a72e06b4e3f8d272aeb65aa5ea14f5f4d17a6f461ae54b2e50f073fef58a27a5241 SHA512 71df4d69d7e580b21dc0a0f813201822a161ada68a19c6d3f0df9c8576f22c8d43ebe90643d6184e91ee1c6628de9501896a9444ff7ad6af6fe17eba5d3573f2
-EBUILD logwatch-7.5.3.ebuild 2431 BLAKE2B 57e90b95f542f37bcc9c3353ab6992304d3ac1ed6ce7ff9652657e88d74f6f76eefdb0a064dab7dde622c866eaf589724bd6364f09d5f1c96494518780f53817 SHA512 317e2fd99284bd33e86deae1215e0d593343aaa888d0bf51c81c24d85b491d853744e0481f0795d48bbf6ba39f43ac024841dfa8c7bfe66a223f6d7e42e1c6b2
-EBUILD logwatch-7.5.4.ebuild 2431 BLAKE2B 57e90b95f542f37bcc9c3353ab6992304d3ac1ed6ce7ff9652657e88d74f6f76eefdb0a064dab7dde622c866eaf589724bd6364f09d5f1c96494518780f53817 SHA512 317e2fd99284bd33e86deae1215e0d593343aaa888d0bf51c81c24d85b491d853744e0481f0795d48bbf6ba39f43ac024841dfa8c7bfe66a223f6d7e42e1c6b2
-EBUILD logwatch-7.5.5.ebuild 2438 BLAKE2B 68c2ec79f3bde424b897dc551afcfcb1081c1264513ac753b2303183dc2ae906fd7bc77b42eeb1db0132e2fe8be56cb4cb2cab1965577c051adfe19d5e5a7a31 SHA512 945834d780b7e905055740b3b7f1eb9018d13c405a38694b157577d4947797b2b943669e6d10d50a3e27f7a5ffe404ee46cca384e2f8f6ca93d0418742445e17
+EBUILD logwatch-7.5.5.ebuild 2431 BLAKE2B ae8fff1ed90832f1ff9296ca8b3c6c3a97a16d9ba9268b988bc38b7f2426bb146b1b76c41c5f41c82a0dfa4cdfe7b227f6ca08a19870fc50d804ecbb03988f54 SHA512 d79ae36bd32a98bae350145687f23ef442aeb82a8706f41cb77e56ee5ccfddf996ea457bfcc4aae1ba11498f6d95c210859e511fd610017d270718db288215cf
 EBUILD logwatch-9999.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.3.ebuild b/sys-apps/logwatch/logwatch-7.5.3.ebuild
deleted file mode 100644
index e94e9d965df1..000000000000
--- a/sys-apps/logwatch/logwatch-7.5.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit tmpfiles
-
-PATCHES=()
-
-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"
-IUSE=""
-
-DEPEND=""
-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"
-
-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/logwatch/logwatch-7.5.4.ebuild b/sys-apps/logwatch/logwatch-7.5.4.ebuild
deleted file mode 100644
index e94e9d965df1..000000000000
--- a/sys-apps/logwatch/logwatch-7.5.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit tmpfiles
-
-PATCHES=()
-
-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"
-IUSE=""
-
-DEPEND=""
-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"
-
-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/logwatch/logwatch-7.5.5.ebuild b/sys-apps/logwatch/logwatch-7.5.5.ebuild
index 3bc98aecc866..f0df4e4b95a0 100644
--- a/sys-apps/logwatch/logwatch-7.5.5.ebuild
+++ b/sys-apps/logwatch/logwatch-7.5.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index 311782191a86..5eab0f8a5f52 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,4 +1,4 @@
 AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
-EBUILD lsb-release-1.4-r3.ebuild 905 BLAKE2B 906bf53a6780d2e5b928df28417644ebf7ae2dbdb0ef8080fa690915b3bee4c205ce59ecc58e5007f87982c45b0338e9861e5fc28fe4eb76439edb076f90fb84 SHA512 b6ba1930983fe26b6af0ec01471d753dc945fa2a1dd51afab0bccc59f90e5a2b977287065298155b4a2fc96ce2a515dd08f6ea4e085e84eb8c6e910483f243c5
+EBUILD lsb-release-1.4-r3.ebuild 922 BLAKE2B 54aae431200c08d4428bcb4bf0a00346e90cb298d29ba313231dcc15028529e760c4e57441bd6206adc7c3e8c593ffb30abb5c98e764a07eefd0093cce8e87fb SHA512 6d06f0972b3cb421067f9f9cbacf9fe1d3468174439b4e856ff7f3bd3b8229df3a1766c4d7b04895aef2af3a7d72080e417cc994140d5e924c082e2df7943060
 MISC metadata.xml 808 BLAKE2B cb931504b70813859d35bfda6408cb28f2bd56cb4f0cdca944c051b9731c2c1e7c38d87bfab70cffabf82d4f537ea68eaa88bf05e2c90e27899238315fe29ad5 SHA512 cc252166fb933fc78a5b5479c9cc2a49a0d9224371cd14635cb92e7e3c4c801bdc6f837b6680704d20f63dc0b8872b67c72b952361e9328dc12305f9351f7a87
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index cac335bca5cb..a03a05fdec6a 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch prefix
+EAPI=7
+
+inherit prefix
 
 DESCRIPTION="LSB version query program"
 HOMEPAGE="https://wiki.linuxfoundation.org/lsb/"
@@ -13,10 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 # Perl isn't needed at runtime, it is just used to generate the man page.
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-os-release.patch # bug 443116
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-os-release.patch # bug 443116
+	default
 
 	# use POSIX 'printf' instead of bash 'echo -e', bug #482370
 	sed -i \
@@ -34,7 +39,7 @@ src_install() {
 		install
 
 	dodir /etc
-	cat > "${ED}/etc/lsb-release" <<- EOF
+	cat > "${ED}/etc/lsb-release" <<- EOF || die
 		DISTRIB_ID="Gentoo"
 	EOF
 }
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index aab09158ea69..ec3e67006489 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,11 +1,5 @@
-AUX lshw-02.18b-gentoo.patch 4709 BLAKE2B 5e07b8bba96f5ddd6717bb765965962a64638d8137ad1008a760b685b8dafc5da1a79862adad35612aa7038de096337e7d8506267328da70f22d916acfadd750 SHA512 42d2b966207173ba78926610100d7567f8e115d20378b02231de962d6949bee5de2cfcec1ac1399478b144ec19cb739e37f314d2c02b9f58c7895f9e099d5988
-AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee
-AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
-DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
+DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
 DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5
-DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
-EBUILD lshw-02.18b-r1.ebuild 1786 BLAKE2B 827c53ca19545e3435c1d797000d2460b4fb170226958f523467705821bc9086f8fa145bc2090c4660369df2788faf7ed64f4572d39f92dde5ce4e56586bf1b8 SHA512 3bc735eeab8d1ba80326cc2c2fe432ed7a44915d1653f2a8bd8147e5299eeac5de63aa2aa3af210fe8d6d71ca1c066c0928d3b27d54e29b9119618f6289be8b0
-EBUILD lshw-02.18b.ebuild 1728 BLAKE2B eb1cd904c324bd1e3e4256aa882e2895d3c12daf11dc46dfe208f645915c22b04bc04196beb828bbd69edcfd1841b6df0eb6cea7d5414c6e668df0f4bb9f18cb SHA512 44adbbb8b82c816b5a36cff686e251023ba0263e0c64fa596baddd5a096018d4147e128894666738f725c0680adb2843732c89fa92bb7edc318185e5bfb2d4b3
-EBUILD lshw-02.19.2b.ebuild 2134 BLAKE2B d71b2f4cd8a0ae26bfb414bbfec683452edee62aac75a218fed8bb5ae899f00aa7bce577edf2a909b7309b1b5106bd8b5240ed401bd4e05a7cbe771a463d713c SHA512 033b096652d7732fbc256344b1de2fa4e4345a8375f090fd27ec6db1f020ab8f71b0df238ed0174c2d871913a2a2e95cccd897df266744fb17f4e7f3dcafbfd9
-EBUILD lshw-02.19.2b_p20210121.ebuild 2227 BLAKE2B ccf17dd0b2f86b8bfac33423a815cdaf0479cd05a8574b848e6c47226fc1731117c9e7c625a6d4436a10bb7c4d73908f38c353ebff0cf2987a25243a9d095db6 SHA512 4c2f06c4109ba86f7cb435b37f6242c9f80a16e7c889b0aae1d545961fd6fa759ff44463928aaf1d9cbb6af2423124f7fab99a226ad6cccab417d6379ec98ca3
+EBUILD lshw-02.19.2b.ebuild 2170 BLAKE2B 0ae10f86dde575d9014b86468c5339736d1ce8be473071157b2d0c2af0d1fba68899a089a9e1ceb63a859aeda5425bd773cd800e293d402bbde10a302cf219e3 SHA512 384a75036367cc1f23e44254af491cfaadc8968b40f52130a441fdf801e12bda1a37559280cd040f466345ce3950dbb322d8a82b4ed0b7c98987eeab0a548d74
+EBUILD lshw-02.19.2b_p20210121.ebuild 2262 BLAKE2B 9aa9d77566e0c36cf4107640bd809347e9533b5b49df27ee69e9703b4c6006ada9e1c802b6389a0ee4bbe81d91d513707c2a4323ef434de746fd6100ac2ff0ba SHA512 f6d6d2b280ffb0244c6fcdf762538deb096cd06f678b6fdd17dcf08c8cabc6e987117903b37ec78467432e1bb2061c8e05490babee21ff3c05cd1c606f146483
 MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3
diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
deleted file mode 100644
index dd42df9b5282..000000000000
--- a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -21,11 +21,11 @@
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- ifeq ($(SQLITE), 1)
- 	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- 	LDFLAGS+= -Wl,--as-needed
- endif
-@@ -39,27 +39,25 @@
- export LIBS
- export LDFLAGS
- 
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt
--
--all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
-+all: $(PACKAGENAME) $(PACKAGENAME).1
- 
- .cc.o:
- 	$(CXX) $(CXXFLAGS) -c $< -o $@
- 
- .PHONY: core
- core:
--	+make -C core all
-+	$(MAKE) -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
- 	$(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
--	+make -C po all
-+	$(MAKE) -C po all
- 
- .PHONY: gui
- gui: core
--	+make -C gui all
-+	$(MAKE) -C gui all
- 
- .PHONY: nologo
- nologo:
-@@ -70,7 +68,6 @@
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
- 	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
--	$(STRIP) $@
- 
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +90,13 @@
- manuf.txt:
- 	wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
- 
--install: all
-+install:
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
- 	$(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
- 	$(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--	$(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--	make -C po install
-+	$(MAKE) -C po install
- 
- install-gui: gui
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -112,8 +108,8 @@
- 
- clean:
- 	rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
--	make -C core clean
--	make -C gui clean
-+	$(MAKE) -C core clean
-+	$(MAKE) -C gui clean
- 
- .timestamp:
- 	date --utc +%Y%m%d%H%M%S > $@
---- a/src/core/Makefile
-+++ b/src/core/Makefile
-@@ -1,10 +1,9 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDSTATIC=
- LIBS=
- 
---- a/src/core/pci.cc
-+++ b/src/core/pci.cc
-@@ -17,7 +17,7 @@
- 
- #define PROC_BUS_PCI "/proc/bus/pci"
- #define SYS_BUS_PCI "/sys/bus/pci"
--#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
-+#define PCIID_PATH "/usr/share/misc/pci.ids"
- 
- #define PCI_CLASS_REVISION      0x08              /* High 24 bits are class, low 8 revision */
- #define PCI_VENDOR_ID           0x00    /* 16 bits */
---- a/src/core/usb.cc
-+++ b/src/core/usb.cc
-@@ -27,7 +27,7 @@
- 
- #define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
- #define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices"
--#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
-+#define USBID_PATH "/usr/share/misc/usb.ids"
- 
- #define USB_CLASS_PER_INTERFACE         0         /* for DeviceClass */
- #define USB_CLASS_AUDIO                 1
---- a/src/gui/Makefile
-+++ b/src/gui/Makefile
-@@ -1,5 +1,7 @@
- PACKAGENAME?=lshw
- 
-+SQLITE?=0
-+
- CXX?=c++
- CC?=cc
- STRIP?=strip
-@@ -8,14 +10,15 @@
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
- INCLUDES=-I../core $(GTKINCLUDES)
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- CFLAGS=$(CXXFLAGS) $(DEFINES)
- GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
--LIBS=-L../core -llshw -lresolv $(GTKLIBS)
--LDFLAGS=
--ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
--	LDFLAGS+= -Wl,--as-needed
--endif
-+LIBS=-L../core -llshw -lresolv $(GTKLIBS)
-+
-+ifeq ($(SQLITE), 1)
-+	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
-+	LIBS+= $(shell pkg-config --libs sqlite3)
-+endif
- 
- OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o
- SRCS = $(OBJS:.o=.c)
-@@ -39,7 +42,6 @@
- 	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- install: all
--	$(STRIP) gtk-$(PACKAGENAME)
- 	
- clean:
- 	rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak
diff --git a/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch b/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch
deleted file mode 100644
index 4aea6420d7c1..000000000000
--- a/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-patch sent upstream
-
-From 1fb7ebed787ec1b73218c1f12cbb71b103433375 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 14 Mar 2017 22:25:12 -0700
-Subject: [PATCH] fix array access with string translations
-
-The code forgot to rebase the num to 0 before indexing the string array.
-It also provides 5 strings, but was only allowing 4 to be accessed.
----
- src/core/dmi.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/dmi.cc b/src/core/dmi.cc
-index 250f48572d54..0db074975f2d 100644
---- a/src/core/dmi.cc
-+++ b/src/core/dmi.cc
-@@ -510,8 +510,8 @@ static const char *dmi_memory_array_location(u8 num)
-   };
-   if (num <= 0x0A)
-     return _(memory_array_location[num]);
--  if (num >= 0xA0 && num < 0xA4)
--    return _(jp_memory_array_location[num]);
-+  if (num >= 0xA0 && num <= 0xA4)
-+    return _(jp_memory_array_location[num - 0xA0]);
-   return "";
- }
- 
--- 
-2.12.0
-
diff --git a/sys-apps/lshw/files/lshw-02.18b-sgx.patch b/sys-apps/lshw/files/lshw-02.18b-sgx.patch
deleted file mode 100644
index 92bd6c23e2f3..000000000000
--- a/sys-apps/lshw/files/lshw-02.18b-sgx.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-patch from upstream:
-https://ezix.org/src/pkg/lshw/commit/5e5744732b2dcdf83845919256388b3842033183
-
-From 5e5744732b2dcdf83845919256388b3842033183 Mon Sep 17 00:00:00 2001
-From: Wenkai Du <wenkai.du@intel.com>
-Date: Fri, 22 Dec 2017 09:57:57 -0800
-Subject: [PATCH] lshw: fix segmentation fault when /dev/sgx is present
-
-When Intel SGX is enabled in kernel, /dev/sgx is created and is
-picked up by "/dev/sg*" glob matching.
-
-Signed-off-by: Wenkai Du <wenkai.du@intel.com>
----
- src/core/scsi.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/scsi.cc b/src/core/scsi.cc
-index b38dda2cd8a8..75061c0fb195 100644
---- a/src/core/scsi.cc
-+++ b/src/core/scsi.cc
-@@ -30,7 +30,7 @@
- 
- __ID("@(#) $Id$");
- 
--#define SG_X "/dev/sg*"
-+#define SG_X "/dev/sg[0-9]*"
- #define SG_MAJOR 21
- 
- #ifndef SCSI_IOCTL_GET_PCI
--- 
-2.15.1
-
diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild
deleted file mode 100644
index f3e16336e3f6..000000000000
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES='fr'
-
-inherit desktop flag-o-matic toolchain-funcs l10n
-
-MAJ_PV=${PV:0:${#PV}-1}
-MIN_PVE=${PV:0-1}
-MIN_PV=${MIN_PVE/b/B}
-
-MY_P="${PN}-${MIN_PV}.${MAJ_PV}"
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="gtk sqlite static"
-
-REQUIRED_USE="static? ( !gtk !sqlite )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	sqlite? ( virtual/pkgconfig )"
-RDEPEND="${RDEPEND}
-	sys-apps/hwids"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-02.18b-gentoo.patch
-	"${FILESDIR}"/${PN}-02.18b-gettext-array.patch
-	"${FILESDIR}"/${PN}-02.18b-sgx.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	l10n_find_plocales_changes "src/po" "" ".po" || die
-	sed -i \
-		-e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
-		src/po/Makefile || die
-	sed -i \
-		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
-		src/Makefile src/gui/Makefile || die
-}
-
-src_compile() {
-	tc-export CC CXX AR PKG_CONFIG
-	use static && append-ldflags -static
-
-	# Need two sep make statements to avoid parallel build issues. #588174
-	local sqlite=$(usex sqlite 1 0)
-	emake SQLITE=${sqlite} all
-	use gtk && emake SQLITE=${sqlite} gui
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
-	dodoc README.md docs/*
-	if use gtk ; then
-		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
-		make_desktop_entry \
-			"${EPREFIX}"/usr/sbin/gtk-lshw \
-			"${DESCRIPTION}"
-	fi
-}
diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
deleted file mode 100644
index 8243b8bc20c7..000000000000
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES='fr'
-
-inherit desktop flag-o-matic toolchain-funcs l10n
-
-MAJ_PV=${PV:0:${#PV}-1}
-MIN_PVE=${PV:0-1}
-MIN_PV=${MIN_PVE/b/B}
-
-MY_P="${PN}-${MIN_PV}.${MAJ_PV}"
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gtk sqlite static"
-
-REQUIRED_USE="static? ( !gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	sqlite? ( virtual/pkgconfig )"
-RDEPEND="${RDEPEND}
-	sys-apps/hwids"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-02.18b-gentoo.patch
-	"${FILESDIR}"/${PN}-02.18b-gettext-array.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	l10n_find_plocales_changes "src/po" "" ".po" || die
-	sed -i \
-		-e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
-		src/po/Makefile || die
-	sed -i \
-		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
-		src/Makefile src/gui/Makefile || die
-}
-
-src_compile() {
-	tc-export CC CXX AR PKG_CONFIG
-	use static && append-ldflags -static
-
-	# Need two sep make statements to avoid parallel build issues. #588174
-	local sqlite=$(usex sqlite 1 0)
-	emake SQLITE=${sqlite} all
-	use gtk && emake SQLITE=${sqlite} gui
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
-	dodoc README.md docs/*
-	if use gtk ; then
-		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
-		make_desktop_entry \
-			"${EPREFIX}"/usr/sbin/gtk-lshw \
-			"${DESCRIPTION}"
-	fi
-}
diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 9ddf5f85eb28..bb38bfa8e82d 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -7,15 +7,15 @@ PLOCALES='fr'
 
 inherit desktop flag-o-matic toolchain-funcs l10n
 
-MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)
+MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)
 
 DESCRIPTION="Hardware Lister"
 HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
+SRC_URI="https://www.ezix.org/software/files/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"
@@ -27,7 +27,7 @@ RDEPEND="sys-apps/hwids
 BDEPEND="gtk? ( virtual/pkgconfig )
 	sqlite? ( virtual/pkgconfig )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
 
@@ -65,12 +65,12 @@ src_compile() {
 
 	# Need two sep make statements to avoid parallel build issues. #588174
 	local sqlite=$(usex sqlite 1 0)
-	emake SQLITE=${sqlite} all
+	emake VERSION=${MY_PV} SQLITE=${sqlite} all
 	use gtk && emake SQLITE=${sqlite} gui
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
+	emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
 	if use gtk ; then
 		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
 		make_desktop_entry \
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index bf17c8b0223a..09ae682dbd08 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -8,11 +8,11 @@ PLOCALES='fr'
 inherit desktop flag-o-matic toolchain-funcs l10n xdg
 
 MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
-MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
+MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
 
 DESCRIPTION="Hardware Lister"
 HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -66,12 +66,12 @@ src_compile() {
 
 	# Need two sep make statements to avoid parallel build issues. #588174
 	local sqlite=$(usex sqlite 1 0)
-	emake SQLITE=${sqlite} all
+	emake VERSION=${MY_PV} SQLITE=${sqlite} all
 	use gtk && emake SQLITE=${sqlite} gui
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
+	emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
 	if use gtk ; then
 		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
 		make_desktop_entry \
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 3d0404a50d09..d5f2ac195193 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,11 +1,7 @@
-AUX man-db-2.9.3-clock_gettime64.patch 1493 BLAKE2B 5c080767d380c26ee97983cb82ad58d186157e3c976f1db492cca5135e38fbab1f854b592d517148fea0041d48e794e2108419b458727a8ff6d2f48f81ecf350 SHA512 37a1dc37452e3722bf53c23503317cf17082f7e73715f974ff7798e624ca2b711f2f604bb58741550d3fad7a970e711fd2c8b67148e217dc29963f35f93b0d38
 AUX man-db-2.9.3-darwin-libdb-intl.patch 733 BLAKE2B 864ed2ac8a3626ad5474412ce59560100e48516ad898b974a6d9d900d4b96fd3bf36a2e292b1bafd77a7196e485e6f4aaaa053a8b9c031f29d15c2608a31e224 SHA512 5c2d493dac9f895a0d9ddd24311051de3961b554ee395143159fe661ced64253e38db6a2e6c280831e30effd5cc6316e8480466e29dea81c4b61c3e603626c89
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
-DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
 DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c
-EBUILD man-db-2.9.3-r1.ebuild 4129 BLAKE2B 92a05bea3a84a6dfd3945d8aa8c5a9136c8e92a35aff356046de6e2af0ea8de784fd9112595e8a42046fe6eec8f82cf6af87db6231d8476344c73623430efb44 SHA512 4e273cb69e23f49054eb9133f7ddee58837b6cccfd6d08cc8fc70a71d6f74fe3e08d5a2aeb00792df201eef803eeb1f8125b33f50c392a64ddfdc145f7239a09
-EBUILD man-db-2.9.3-r2.ebuild 5199 BLAKE2B aafb16a1685d0cafca99ac54a55fc7a9371d6d1a1c040b09e2c16ec37598a0a679316dce9bde18aec17aefb5fe767079d64771a986a3d0bbe9acb7ef6c602d6f SHA512 eb24108aabf63f6f936dd4c635c1a8b83f6f28a72ba45ad08561ac6e6dc262170c16f05739d11eebd8b8ceb0a835e62301a587b2fbed672086e3acf320edc88c
-EBUILD man-db-2.9.4.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
+EBUILD man-db-2.9.4.ebuild 5062 BLAKE2B 00764d866d8bfeea46c028e6c6ae4594c8f7e1ab3966c28d103c232bf386d411a48772342169af569d0f3204b355474c77811378127efdd044dabba510deacc8 SHA512 e1deed08c157d5a0dad34301d89171ba8715b30f4e903b28f476216f9d26278cc882e04b370574da9b9f1716b46f50f609f92e5d1b78cd5a392bc1b3ae08d7b0
 EBUILD man-db-9999.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/files/man-db-2.9.3-clock_gettime64.patch b/sys-apps/man-db/files/man-db-2.9.3-clock_gettime64.patch
deleted file mode 100644
index 0da1b2c5b2b7..000000000000
--- a/sys-apps/man-db/files/man-db-2.9.3-clock_gettime64.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7315a9475d8fa37af49e9e7ed11e1534f23ef70b Mon Sep 17 00:00:00 2001
-From: "S. Gilles" <sgilles@umd.edu>
-Date: Wed, 12 Aug 2020 16:40:07 -0400
-Subject: Allow clock_gettime64; return ENOSYS so libcs can engage fallbacks
-
-libcs such as musl expect ENOSYS to be returned (not EPERM) in their
-fallback code, so change the seccomp filter to be more agreeable to
-them.
-
-At the same time, clock_gettime is permitted in the filter, so permit
-clock_gettime64 as well -- it will be needed by 2038 in any case.
-
-* lib/sandbox.c (make_seccomp_filter): Set default action to
-SCMP_ACT_ERRNO (ENOSYS).  Allow clock_gettime64.
-* NEWS: Document this.
----
- NEWS          | 9 +++++++++
- lib/sandbox.c | 3 ++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/lib/sandbox.c b/lib/sandbox.c
-index 21ec28aa..d934a0f9 100644
---- a/lib/sandbox.c
-+++ b/lib/sandbox.c
-@@ -232,7 +232,7 @@ static scmp_filter_ctx make_seccomp_filter (int permissive)
- 		;
- 
- 	debug ("initialising seccomp filter (permissive: %d)\n", permissive);
--	ctx = seccomp_init (SCMP_ACT_ERRNO (EPERM));
-+	ctx = seccomp_init (SCMP_ACT_ERRNO (ENOSYS));
- 	if (!ctx)
- 		error (FATAL, errno, "can't initialise seccomp filter");
- 
-@@ -271,6 +271,7 @@ static scmp_filter_ctx make_seccomp_filter (int permissive)
- 	/* systemd: SystemCallFilter=@default */
- 	SC_ALLOW ("clock_getres");
- 	SC_ALLOW ("clock_gettime");
-+	SC_ALLOW ("clock_gettime64");
- 	SC_ALLOW ("clock_nanosleep");
- 	SC_ALLOW ("execve");
- 	SC_ALLOW ("exit");
--- 
-cgit v1.2.1
-
diff --git a/sys-apps/man-db/man-db-2.9.3-r1.ebuild b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
deleted file mode 100644
index 2dc1438844d8..000000000000
--- a/sys-apps/man-db/man-db-2.9.3-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( berkdb? ( sys-libs/db:= ) )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/man
-	acct-user/man
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.3-sandbox-env-tests.patch
-	"${FILESDIR}"/man-db-2.9.3-clock_gettime64.patch
-)
-
-pkg_setup() {
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_unpack() {
-	if [[ "${PV}" == *9999 ]] ; then
-		git-r3_src_unpack
-
-		# We need to mess with gnulib :-/
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
-		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ "${PV}" == *9999 ]] ; then
-		local bootstrap_opts=(
-			--gnulib-srcdir=../gnulib
-			--no-bootstrap-sync
-			--copy
-			--no-git
-		)
-		AUTORECONF="/bin/true" \
-		LIBTOOLIZE="/bin/true" \
-		sh ./bootstrap "${bootstrap_opts[@]}" || die
-
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid #662438
-		--enable-cache-owner=man
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}/var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.9.3-r2.ebuild b/sys-apps/man-db/man-db-2.9.3-r2.ebuild
deleted file mode 100644
index fc6eaf54888c..000000000000
--- a/sys-apps/man-db/man-db-2.9.3-r2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd prefix
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( berkdb? ( sys-libs/db:= ) )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-		virtual/libiconv
-		virtual/libintl
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/man
-	acct-user/man
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.3-sandbox-env-tests.patch
-	"${FILESDIR}"/man-db-2.9.3-clock_gettime64.patch
-	"${FILESDIR}"/man-db-2.9.3-darwin-libdb-intl.patch
-)
-
-pkg_setup() {
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_unpack() {
-	if [[ "${PV}" == *9999 ]] ; then
-		git-r3_src_unpack
-
-		# We need to mess with gnulib :-/
-		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
-		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ "${PV}" == *9999 ]] ; then
-		local bootstrap_opts=(
-			--gnulib-srcdir=../gnulib
-			--no-bootstrap-sync
-			--copy
-			--no-git
-		)
-		AUTORECONF="/bin/true" \
-		LIBTOOLIZE="/bin/true" \
-		sh ./bootstrap "${bootstrap_opts[@]}" || die
-
-		eautoreconf
-	fi
-
-	hprefixify src/man_db.conf.in
-	if use prefix ; then
-		{
-			echo "#"
-			echo "# Added settings for Gentoo Prefix"
-			[[ ${CHOST} == *-darwin* ]] && \
-				echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man"
-			echo "MANDATORY_MANPATH /usr/share/man"
-		} >> src/man_db.conf.in
-	fi
-}
-
-src_configure() {
-	# set sections we want to search by default
-	local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
-	sections+=" 1x 2x 3x 4x 5x 6x 7x 8x"
-	case ${CHOST} in
-		*-solaris*)
-			# Solaris tends to use sections named after the pkgs that
-			# owns them, in particular for libc functions we want those
-			# sections
-			local s
-			for s in $(cd /usr/share/man/ && echo man*) ; do
-				s=${s#man}
-				[[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}"
-			done
-			;;
-	esac
-
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid #662438
-		--enable-cache-owner=man
-		--with-sections="${sections}"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	case ${CHOST} in
-		*-solaris*|*-darwin*)
-			myeconfargs+=(
-				$(use_with nls libiconv-prefix ${EPREFIX}/usr)
-				$(use_with nls libintl-prefix ${EPREFIX}/usr)
-			)
-			;;
-	esac
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}/var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.9.4.ebuild b/sys-apps/man-db/man-db-2.9.4.ebuild
index f5b961755735..ee7a1ac42db7 100644
--- a/sys-apps/man-db/man-db-2.9.4.ebuild
+++ b/sys-apps/man-db/man-db-2.9.4.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index fb648048eb16..58c0e11566d3 100644
--- a/sys-apps/man-pages-posix/Manifest
+++ b/sys-apps/man-pages-posix/Manifest
@@ -1,5 +1,3 @@
-DIST man-pages-posix-2013-a.tar.xz 930736 BLAKE2B 4d496a4ea7bcf9f101a9b5c31eaa437317e872d9d266c202a1fcfd16d9b2fa71f968c3653bc9789ba18916a93802736e795c43bb3f87324397f49aed0f6d1556 SHA512 e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14
 DIST man-pages-posix-2017-a.tar.xz 935196 BLAKE2B 45d732c712f8d6b18f151c7383130a367d5774ec9d814cf9e61accb01e9d91ad3e9b49bc4f1b993f28688e9c39cf1fbea91b86b00c05968b0bc0a5665211defb SHA512 dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d
-EBUILD man-pages-posix-2013a.ebuild 744 BLAKE2B df47af71fa4ea35fe848b462e30e780c84e6abd72207742d6b43196eccf6d7d3287719314c6d95b0ad92727539dabfe6b863c806bf449c25d8b53f197698d7d9 SHA512 8552a55b556d90da706955a46ad63e450820f567234fd59b06aea0f64e7913686bcc168ce70f9ae644b647c80eec0a25c01ac040d6b3a38dffb986ec63682f2a
 EBUILD man-pages-posix-2017a.ebuild 732 BLAKE2B 13fdb827ab5bc5acb33da5a421db9b398ecd660877e300e9427b2dddbc789218d3d2335bd371b73a2ce3ff997dfbdbb5b6a7a3c9f94cf2a8dcf851603032f622 SHA512 f53eb1bb86b7b474475d6f6260d0fc868578951228c69c364f8c4edb7d6c2d5bd39198459cdf048da83de5bb841790a85bbbfa03aec480092e0e6d08628bf272
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
deleted file mode 100644
index bc2c7caf828a..000000000000
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}-${PV:0:4}-${PV:0-1}"
-DESCRIPTION="POSIX man-pages (0p, 1p, 3p)"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
-
-LICENSE="man-pages-posix-2013"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-RESTRICT="binchecks"
-
-RDEPEND="virtual/man !<sys-apps/man-pages-3"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() { :; }
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install DESTDIR="${ED}"
-	dodoc man-pages-*.Announce README
-}
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 177c167d5845..9de54a84d0e6 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,8 +1,4 @@
-DIST man-pages-5.09.tar.xz 1740816 BLAKE2B 5434453dc75058a2aef5d1ca04854abe3d2e3a7ddd5167fbbc36cefc0e103bb75339279fd5638698b12e7fbe2314dafd0498b2104e01b4314e909f89db65d50e SHA512 fa5684c316326afd2056876c174e4f2c8baa18d76bfc2f63009903f09f93b4c204fb0773e0991b5247e50596b2da7e232c5087121a0c938a072af8c77848686f
-DIST man-pages-5.10.tar.xz 1747688 BLAKE2B 39da2ec75b0096db7b5af483e6096259b2439bf9ce3b651af82350b612c234375e3e34d70ff84f401c23189c0aa921f29cf77c0979e40efd3fda0f06378a7c2b SHA512 a23f90136b0bf471f5ae3917ae0e558fec0671cace8ccdd8e244f41f11fefa4ac0df84cf972cc20a1792d7b930db5e2c451881c0937edabf7d5e1ec46c4760ed
 DIST man-pages-5.11.tar.xz 1758092 BLAKE2B 45f1f8751f197f616913fd0084ead3ff7e3b3d11d0c3c70ecd43acbc621927cbb3582ffc7df5101887ec5c733e35a9c5321af9ddaf477e06da391c5af9eb6bc5 SHA512 2f57308fb331e0207ed4764d7753711caf74c0b74eef789612bc1869126be529450c7a2a7011fd6413eebea4ff0fee9a1ba0c94959652a3c747c780e83741450
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.09.ebuild 1616 BLAKE2B 98433096a314fccabec42c902adb32f25f01d7a2379c7d8fec0ef02ee4d2492ec70927e2554ad2770bdfd5171508dba1539948f8513555bb88f46886c0885c04 SHA512 9ba40e4f932c4d29977591439eb4ecbd15cd8fd8968270b17ef647eda7b14ac93925c9cef196cd6a16d7f810680b60321fa9b63cc1561f0ce778a8f2e4abf923
-EBUILD man-pages-5.10.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
-EBUILD man-pages-5.11.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
+EBUILD man-pages-5.11.ebuild 1741 BLAKE2B 10e2c786b94ec1da5380c4d6a63e23214272c01b12c72d996784151d46bf0f3f1a04859de02f9fd70983d8ccfe143f7d78e535db4a15756bffd403ac2565f3e9 SHA512 3d14586afcf8695398168b6c7fe8ff2893fae4065c71a2e6c9c2116edbd19f384f3956e003bec0552aa9612c4b020986e1ef051c8cf17523ed24ea1da8359962
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.09.ebuild b/sys-apps/man-pages/man-pages-5.09.ebuild
deleted file mode 100644
index 58d24ea28c5d..000000000000
--- a/sys-apps/man-pages/man-pages-5.09.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" de fr it ja nl pl ru zh-CN"
-IUSE="${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="
-	virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<dev-libs/libbsd-0.8.3-r1
-"
-PDEPEND="
-	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
-	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	sys-apps/man-pages-posix
-"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo || die
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-5.10.ebuild b/sys-apps/man-pages/man-pages-5.10.ebuild
deleted file mode 100644
index 2a296f092cdc..000000000000
--- a/sys-apps/man-pages/man-pages-5.10.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" de fr it ja nl pl pt-BR ro ru zh-CN"
-IUSE="${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="
-	virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<dev-libs/libbsd-0.8.3-r1
-"
-PDEPEND="
-	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
-	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
-	l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] )
-	l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	sys-apps/man-pages-posix
-"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo || die
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-5.11.ebuild b/sys-apps/man-pages/man-pages-5.11.ebuild
index 2a296f092cdc..557612b11447 100644
--- a/sys-apps/man-pages/man-pages-5.11.ebuild
+++ b/sys-apps/man-pages/man-pages-5.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 28e7c229cc22..0483a99f46eb 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -1,6 +1,6 @@
-AUX man-1.6-cross-compile.patch 1743 BLAKE2B c94335e791ee5385f747f473ee6d429352493f658a453214f73aeeaf5c631d07e932cb3314eeccf275f4b63a2c1f65ef969d852a042a96c1295182bf7f22a0bb SHA512 7052db54d42e634d637de96875f1b54803b2dc5fe990ea269a1071705664b4e431ab9531bedabade5f7de6c3fa33208c862a1ceabc3a472a134bbef37476e8c3
-AUX man-1.6f-man2html-compression-2.patch 1725 BLAKE2B 314c3f3eccb90db6419b6069679457f24e3f5dbaa4ec466513f7a553886db1e25572a07ab8e74676df5bcb3d7a991ac58aa876d3abb780d5bdb415c4c8b1bfd3 SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb
-AUX man-1.6g-compress.patch 343 BLAKE2B b91a16bd5f0a1a5e7a83cf225659c204b6b3fd8785251171bba6a229eb6e1f721c3ff8b04379d09fa39d44984757342139d053ecde821aa6ebcb9de914765af1 SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8
+AUX man-1.6-cross-compile.patch 1747 BLAKE2B 4fca1280617283151ddf037d12b97d65ac35adff109d932b9b0b7700de15be195990b56db9c90d1eb8a88a4885f733b9e3383f063ca30a7300fdd9b2274e845f SHA512 6155dc5f530c1d3bbe50291e61555b6f63515e3198388ffa66d1c3d3b359ad1f6d143d99607a27aefdc710867b668a86608eafa68151752cf9cdfb5c25ac192a
+AUX man-1.6f-man2html-compression-2.patch 1741 BLAKE2B 51baebadffcc5f58eb7b980c0eddac550ecc98a682ced9ca0ffae6318a806536e42ae5f13d1d061ddd2d41f6ef792f2eb6eac1c1a00e2a8f730de54a3b6589f5 SHA512 85dfdffaaddefff9bfb7b92ab274dcc2e88d880d11c67b0690ff4a92a2a6d3a3b65ad4d425f09bfd042b041b316ec9cb6d1ba6e0a4c13fdf71c9524c50ffe7d0
+AUX man-1.6g-compress.patch 347 BLAKE2B bae29d07f89e71fb2fbc04305f67b5c6bdb0c660a428236c7cf2019403c74c8b6603e61b09d4e9da1677cce46b6ab252651c4e71b48a44ed37116374aeca21e8 SHA512 2901e2d77509245880686ad1c2baab9648952bb0eef7bdd6b77ec20d054373464e237a100acec5ace95935708b1b226d18990c48d9a864f384cc6afe7ed6cf96
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1197 BLAKE2B 405f8ef56cb725ff48f2bda2e6f78ef46092d697dda6d0a8e1f85ac02cabe48a3801681694245793feb9955378141355fe47cb7d509c9bbec73358816e6aa640 SHA512 cb314bfc7144ddb1fc6d70dcb4e84503bd6504c1ad984be60b2489cccc0a117c9c3c0fdcee0108cee27ad998ecac6d57bfe3a58a3522b36f270089b80c3c424c
+EBUILD man2html-1.6g.ebuild 1163 BLAKE2B e461a818c1b7b0d619cbf6836ec8e53560186eaecea61130d8b5afeb0c6e71ac06f3cdf32c0befe124cbcda45184c8b3504a45a93dc696436a7380c99059d1f5 SHA512 cc829f792929cdfdc1dbd10ff733cbb457b726d02c8886a08810d6e8bc653e387051f5d248c6587a91f3c013ec1f280a1fffa0f7dedd8361a4634cee7ca600c6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man2html/files/man-1.6-cross-compile.patch b/sys-apps/man2html/files/man-1.6-cross-compile.patch
index 265265077a9c..79aa90af212d 100644
--- a/sys-apps/man2html/files/man-1.6-cross-compile.patch
+++ b/sys-apps/man2html/files/man-1.6-cross-compile.patch
@@ -1,8 +1,8 @@
 Fix up to work with cross-compiling ... most of these tests only
 need to see if the example compiled, not whether it runs ...
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -232,15 +232,13 @@
  
  echo checking for POSIX.1 header files
diff --git a/sys-apps/man2html/files/man-1.6f-man2html-compression-2.patch b/sys-apps/man2html/files/man-1.6f-man2html-compression-2.patch
index b79b3a1872f1..cc9093371bb6 100644
--- a/sys-apps/man2html/files/man-1.6f-man2html-compression-2.patch
+++ b/sys-apps/man2html/files/man-1.6f-man2html-compression-2.patch
@@ -1,7 +1,7 @@
 add support for bzip2/lzma to man2html and friends
 
---- man2html/glimpse_filters
-+++ man2html/glimpse_filters
+--- a/man2html/glimpse_filters
++++ b/man2html/glimpse_filters
 @@ -1,3 +1,6 @@
 +*.bz2	bzip2 -d -c
 +*.lzma	lzma -d -c
@@ -9,8 +9,8 @@ add support for bzip2/lzma to man2html and friends
  *.gz	gzip -d -c
  *.Z	gzip -d -c
  
---- man2html/scripts/cgi-bin/man/man2html
-+++ man2html/scripts/cgi-bin/man/man2html
+--- a/man2html/scripts/cgi-bin/man/man2html
++++ b/man2html/scripts/cgi-bin/man/man2html
 @@ -93,6 +93,12 @@
      *.bz2)
  	bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
@@ -37,8 +37,8 @@ add support for bzip2/lzma to man2html and friends
  else
  	"$MAN2HTML" -E "Strange... Cannot find (or read) $PAGE."
  fi
---- man2html/scripts/cgi-bin/man/mansearch
-+++ man2html/scripts/cgi-bin/man/mansearch
+--- a/man2html/scripts/cgi-bin/man/mansearch
++++ b/man2html/scripts/cgi-bin/man/mansearch
 @@ -153,7 +153,7 @@
        }
        print "<DT> <a href=\"" cgipath "/man2html?" fullname "\">";
@@ -48,8 +48,8 @@ add support for bzip2/lzma to man2html and friends
        sub(/\./, "(", textname);
        textname = textname ")";
        print textname;
---- man2html/scripts/cgi-bin/man/mansec
-+++ man2html/scripts/cgi-bin/man/mansec
+--- a/man2html/scripts/cgi-bin/man/mansec
++++ b/man2html/scripts/cgi-bin/man/mansec
 @@ -128,7 +128,7 @@
  				# Print out alphabetic quick index and other links
        }
diff --git a/sys-apps/man2html/files/man-1.6g-compress.patch b/sys-apps/man2html/files/man-1.6g-compress.patch
index 374d80730074..4a5e84a785b1 100644
--- a/sys-apps/man2html/files/man-1.6g-compress.patch
+++ b/sys-apps/man2html/files/man-1.6g-compress.patch
@@ -2,8 +2,8 @@ allow selection of default cache compressor
 
 http://bugs.gentoo.org/205147
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -1012,6 +1012,10 @@
        done
      done
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index 9027484ba531..b84b64315a1e 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -1,33 +1,35 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="man-${PV}"
 
 DESCRIPTION="Standard commands to read man pages"
 HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
 SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
 RDEPEND="!sys-apps/man"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
-	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
-	epatch "${FILESDIR}"/man-1.6g-compress.patch #205147
-}
+PATCHES=(
+	"${FILESDIR}"/man-1.6f-man2html-compression-2.patch
+	"${FILESDIR}"/man-1.6-cross-compile.patch
+	"${FILESDIR}"/man-1.6g-compress.patch #205147
+)
 
-echoit() { echo "$@" ; "$@" ; }
 src_configure() {
+	echoit() {
+		echo "$@"
+		"$@"
+	}
+
 	tc-export CC BUILD_CC
 
 	# Just a stub to disable configure check.  man2html doesn't use it.
@@ -48,7 +50,8 @@ src_compile() {
 
 src_install() {
 	# A little faster to run this by hand than `emake install`.
-	cd man2html
+	cd man2html || die
+
 	dobin man2html
 	doman man2html.1
 	dodoc README TODO
diff --git a/sys-apps/memtest86-bin/Manifest b/sys-apps/memtest86-bin/Manifest
index 0c14675906a1..5df7c8ff14d1 100644
--- a/sys-apps/memtest86-bin/Manifest
+++ b/sys-apps/memtest86-bin/Manifest
@@ -1,6 +1,4 @@
 AUX memtest86-bin-grub.d 467 BLAKE2B cf36f784b4032f615e5e3cd07d67125ea54c2d4fd9c7ce2f05a6a87fb4a2636491edabc77a0833039c6a8667d0cefffb20c3d4a755bc9571a363b3c6193a1831 SHA512 0f8063689c2a1dcc5d5aee2b7a7e7db4c195012ab6c641bbd66c3c495bec5252a5733664e900483580e78ee47a29a6e8e078127ef1c723ee6419e9accb4a7bc0
-DIST memtest86-bin-9.0_beta2.zip 10126202 BLAKE2B b6b7e2e5f6bba76fedc37244fd92b56be6fc3ed40efd42c55fc061c403a0e492f58f2ed719b2ff7b47596f41b3b6ccab1e13fbe885c168f59b51a783d7eb400f SHA512 f28cd912e98b2fa0a3a0f98a10b57627073e85acc24eb79a4e326ff5fe9c8401fa093a8007179365137cac2654de9a762f31373fa0b66850400c9884f925393f
 DIST memtest86-bin-9.0_p2000.zip 8545915 BLAKE2B 104373d099fa64d5b69b07e59fc4d922dd49b90e21c678bb8c39e00b6dd9ca9cadf7757f771731f1ab4780156b1c9f3550c97c4957b7198cf99280193a32d9ff SHA512 12933eac68123c40c804995d1cbb5e6773031a9c23186443a0d7d2d68bc67b64fbdd6aed2fc139c91a3a98358bfa2562b79d1a7d38489686421ac5d59fb4dd07
-EBUILD memtest86-bin-9.0_beta2.ebuild 739 BLAKE2B 79c16ad886a1aded670b250536595e1ad9bba3002211ab034be32e5eda593e5f2aa1a0b486f82937c0157390afd10f85c9824ef646c9fe12e9efa2d22dd67c26 SHA512 224902ad958d528a821415d4aebc3fca510538f5c0304f05814fc60fb31abb5c174836134577c4ddb86992302feb9fd842ab171f8fc5a8437542468e7a4fc1f2
 EBUILD memtest86-bin-9.0_p2000.ebuild 704 BLAKE2B 28f93fd07044d806183d01654af494bf8334525faacaa640f2986f0278c29d7da25852ffdbe25a944ce619d8e99a6dcb6d2e0d4028ef5fc40ff294adda674677 SHA512 4047b478351cc38843cfb111feebc182704cffdfd4823bfb01594ec184e6cb3ae1b1bdc6ca5f9f75ba1b1a381e3ecb82a443e74078b9a28ad5ac48e99247a3eb
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild b/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild
deleted file mode 100644
index c6682f17f678..000000000000
--- a/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot
-
-MY_PV=${PV/_beta/-beta-}
-
-DESCRIPTION="Stand alone memory testing software for x86 computers"
-HOMEPAGE="http://www.memtest86.com/"
-SRC_URI="https://www.memtest86.com/downloads/memtest86-usb-${MY_PV}.zip -> ${P}.zip"
-
-LICENSE="PassMark-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-BDEPEND="app-arch/unzip
-	sys-fs/fatcat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	fatcat memtest86-usb.img -O 1048576 -r /EFI/BOOT/BOOTX64.efi > ${PN}.efi || die
-}
-
-src_install() {
-	insinto /boot
-	doins ${PN}.efi
-
-	exeinto /etc/grub.d/
-	newexe "${FILESDIR}"/${PN}-grub.d 39_memtest86-bin
-
-	dodoc MemTest86_User_Guide_UEFI.pdf
-}
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index 9a021de9713d..87d1edefba4d 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,8 +1,3 @@
-AUX memtester-4.3.0-fix-gcc10-fno-common.patch 514 BLAKE2B 5b911fcd0ca63030e471f8e0e721f808ff8161d5cb14e51bec33bb61313154cab746880d162371a0a05b0c7fd4d165a90d5ad850f7d03139bdcdd7d5a24a5430 SHA512 ee0c21c40185fefe32d55c9f2b704db2b769189d6902369dc77078417fd7babdf6d2a6ba34dc4db2a8203bbe72148476d167550e8488477c4cd4a7bc221951f8
-DIST memtester-4.3.0.tar.gz 22113 BLAKE2B 564cb874ea8263e23049d99417bb75f4d9f6fe1bbc022b2f2043735548c97f0060e877079087e524738bda3f9669d0ec171fb3aa9958a2904d848ace87d1cd91 SHA512 045bcc73855706ff03e8ca65297a0d6e5b5ac02f99dae0f17cef1310b403efcb78d9a7295eca6d2de703b0a7b2f71b58a37f5a42040f01fc77a321a8d2205888
-DIST memtester-4.4.0.tar.gz 22801 BLAKE2B 36d97cce30f5f149dc666dd4a743df39ad6993ec82489f4e890bacf1d05de6405da26b2fcd08a0f0416d527ddcf586c77b30b87b19ce80885e80a65ed8b9fb76 SHA512 65b9bc7e81b020cae6cbadc8f47c0bb2837e62bdea24fda72696b22a6b3aad3752d96b00defface4b7397cef58ff6133a9f5794df0a483ec2a639a428177bf75
 DIST memtester-4.5.0.tar.gz 23286 BLAKE2B 841b68026a9b4eae69490c469dbaf062500b642d9ab11e3b1052e7c850e49af3665d0fd01c49670cf297ea5e03a4916ea01bb0219910d487de87568060115e2b SHA512 17df913509df33851fbc58751df993a77bff765a9799ac2b7976518b0a659a2322c9a93a7438e9daa314035e0c08cfcee5cbc97c6be1631917c47e221f15d363
-EBUILD memtester-4.3.0.ebuild 787 BLAKE2B 732b507aea997202701c14d12521511ad0365835ac3925b5aa9e207f25fd7b50ebb93281e1deaf64ee9fd7c2ebf62a6d2a14501ba1a83ca13017cd2929833d70 SHA512 227695b1358e01bd9c3162673f8ad017481b8271f62e231a638e33f34806cb366f3369ce5a1e66c9befd5789e7c40cc231b585a30f348633502106b8220517ec
-EBUILD memtester-4.4.0.ebuild 726 BLAKE2B 329f63deeea2f3384018daebfbb7cfa67e1d3de2641e68d541fd91ec5de7fa5f96fbc298620bca7f4495fd01a1e9eda62b601e294cc562bec7289866627cd14a SHA512 81cebfa2abebf1af62a6ee6ba0f96363d5ceb58f8e4f68a47b1ee8425a3ae3b89272650ebba5c74a637d9d1a172968eda17194f7ae2a342d930f7bbee2c2e8e5
-EBUILD memtester-4.5.0.ebuild 726 BLAKE2B 329f63deeea2f3384018daebfbb7cfa67e1d3de2641e68d541fd91ec5de7fa5f96fbc298620bca7f4495fd01a1e9eda62b601e294cc562bec7289866627cd14a SHA512 81cebfa2abebf1af62a6ee6ba0f96363d5ceb58f8e4f68a47b1ee8425a3ae3b89272650ebba5c74a637d9d1a172968eda17194f7ae2a342d930f7bbee2c2e8e5
+EBUILD memtester-4.5.0.ebuild 721 BLAKE2B 899588b6707b5cb7d7f5ecec63089e577202e3934981c2fb72785bffe0a0073c99f74a6bedcfdc34a5b84581a5f9103a9329eea2bfebfa76735a188ffe1187b7 SHA512 05557e5a04890b7fc6424e603493504793d68921c2325da5e94809b16aa431c79b34269e7119a8ad40474eaff09986302b908e4780b6ff3605b5b27cbe3ef1ee
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch
deleted file mode 100644
index 8bb58e5771c0..000000000000
--- a/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/tests.c
-+++ b/tests.c
-@@ -27,6 +27,9 @@
- #define PROGRESSOFTEN 2500
- #define ONE 0x00000001L
- 
-+union mword8_type mword8;
-+union mword16_type mword16;
-+
- /* Function definitions. */
- 
- int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
---- a/types.h
-+++ b/types.h
-@@ -25,12 +25,12 @@
-     int (*fp)();
- };
- 
--union {
-+union mword8_type {
-     unsigned char bytes[UL_LEN/8];
-     ul val;
--} mword8;
-+};
- 
--union {
-+union mword16_type {
-     unsigned short u16s[UL_LEN/16];
-     ul val;
--} mword16;
-+};
diff --git a/sys-apps/memtester/memtester-4.3.0.ebuild b/sys-apps/memtester/memtester-4.3.0.ebuild
deleted file mode 100644
index cccff64b5d43..000000000000
--- a/sys-apps/memtester/memtester-4.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="userspace utility for testing the memory subsystem for faults"
-HOMEPAGE="http://pyropus.ca/software/memtester/"
-SRC_URI="
-	http://pyropus.ca/software/memtester/${P}.tar.gz
-	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3.0-fix-gcc10-fno-common.patch )
-
-src_configure() {
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
-}
-
-src_install() {
-	dosbin memtester
-	doman memtester.8
-	dodoc BUGS CHANGELOG README README.tests
-}
diff --git a/sys-apps/memtester/memtester-4.4.0.ebuild b/sys-apps/memtester/memtester-4.4.0.ebuild
deleted file mode 100644
index 4be0e82a6fe2..000000000000
--- a/sys-apps/memtester/memtester-4.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="userspace utility for testing the memory subsystem for faults"
-HOMEPAGE="http://pyropus.ca/software/memtester/"
-SRC_URI="
-	http://pyropus.ca/software/memtester/${P}.tar.gz
-	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-src_configure() {
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
-}
-
-src_install() {
-	dosbin memtester
-	doman memtester.8
-	dodoc BUGS CHANGELOG README README.tests
-}
diff --git a/sys-apps/memtester/memtester-4.5.0.ebuild b/sys-apps/memtester/memtester-4.5.0.ebuild
index 4be0e82a6fe2..a709e5c13974 100644
--- a/sys-apps/memtester/memtester-4.5.0.ebuild
+++ b/sys-apps/memtester/memtester-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
 
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index 6ee30a702c38..96e24e7f6ba1 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -4,6 +4,5 @@ AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a0
 AUX updatedb.service 117 BLAKE2B 9e85da639464d8b9655ed86a535d19b38329118443c2cf1c0aa76a4f2d3c0dfc412a0a3a6c61ce2f31c659f2fcfba60773aa69389b6d05f66f686bbd57eb9ac2 SHA512 1d7bb023ac05f4054f35168a304e27dae53169b8e7fee325be7bb2fb99d1d71c23d251ba3cce6afce450dfa999cc4c7ab6d0d1454855ee6b6f821572bfbadc52
 AUX updatedb.timer 140 BLAKE2B e5c250a987428f3423eaeb2876d11fe82ba390082d43434cf6bf287e275f1960dbc81d818a994e0af428c0a13c98fa125f0f6cec261ce9cc2da8990da28f7dcb SHA512 5dce1b0096daf73753a3a6fb24f03a77ccab952363a1e6aee6fa1cdb067371b3ace7c909e5d0beee40a8f8ed9bb3c20d5fc47f2b8df254a69cee5db552d452ed
 DIST mlocate-0.26.tar.xz 359204 BLAKE2B 48ff448b0316169b35a3c421970b280632c4a056b7566d8fda7a2c3284ef46d3abaaa96e2411d9e408cc39466577a5bd3f8fde3376178e8b7bcc9e4e01997bd7 SHA512 b1207047e30a551cba39e70812439b554def567ebe9b8b81fed6f26435bb575beafe4875a21cd72876eadd85da4e7bfc942eb28b17c430b537c351690364837f
-EBUILD mlocate-0.26-r2.ebuild 1556 BLAKE2B 01c3dd931c47d995db74d7653b142a2a6fd00aa6679f6d4ae9e4a829d092de8d182c26b19fae5c924d732fdaa2400a7647b29e37a1210067f87e540143f3d271 SHA512 cc09d6a59368162ba5841a482c9968f221d2b82fe15aa79dee9801608796937066b08b31a1a023e3faeef31abbca553f4fbf5ec5571825123084ff272c0441c3
 EBUILD mlocate-0.26-r3.ebuild 1579 BLAKE2B 835743f0c496ca4ab74fff54fa681bda80fbdffc345bc895de1386a47f8f46f5b04df10c490f83a48494eb914078cfa51200474d37b8b596990e25d314ecea69 SHA512 1071414fa9c02e84fa6e548db94ede79f412ba0b655a53ba49680973dca4fecfba04e8228fb972e2377f924c6b8e2401323ed0e9336227f5f216aaa3759fdeb1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mlocate/mlocate-0.26-r2.ebuild b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
deleted file mode 100644
index adfc2fe43aba..000000000000
--- a/sys-apps/mlocate/mlocate-0.26-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit user toolchain-funcs
-
-DESCRIPTION="Merging locate is an utility to index and quickly search for files"
-HOMEPAGE="https://pagure.io/mlocate"
-SRC_URI="http://releases.pagure.org/mlocate/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="nls selinux"
-
-RDEPEND="!sys-apps/slocate
-	!sys-apps/rlocate
-	selinux? ( sec-policy/selinux-slocate )"
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	enewgroup locate
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_compile() {
-	emake groupname=locate AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake groupname=locate DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README NEWS
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-	doins "${FILESDIR}"/mlocate-cron.conf
-	fperms 0644 /etc/{updatedb,mlocate-cron}.conf
-
-	insinto /etc/cron.daily
-	newins "${FILESDIR}"/mlocate.cron-r3 mlocate
-	fperms 0755 /etc/cron.daily/mlocate
-
-	fowners 0:locate /usr/bin/locate
-	fperms go-r,g+s /usr/bin/locate
-
-	keepdir /var/lib/mlocate
-	chown -R 0:locate "${ED}"/var/lib/mlocate
-	fperms 0750 /var/lib/mlocate
-}
-
-pkg_postinst() {
-	elog "The database for the locate command is generated daily by a cron job,"
-	elog "if you install for the first time you can run the updatedb command manually now."
-	elog
-	elog "Note that the /etc/updatedb.conf file is generic,"
-	elog "please customize it to your system requirements."
-}
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index 075d54da2ffb..3788b2c89e35 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -1,7 +1,4 @@
-AUX nawk-20121220-parallel-build.patch 1653 BLAKE2B be278714502f7bf267f57e0e50024f85d732b5cd4785f568e7c16dfe729d6bfaa584b1161e8adf11c476194cc04b8c3adca240530edbf2d30a060324d3a7ce5d SHA512 91201e4e09646726c10fb2d54b9418e4d1d410bfd0769613c766bacc1fda830d072ef14db15eddd7d3835d6e11fe48b2aa8e797e941649c0e114ee5c89b4e060
 AUX nawk-20180827-parallel-build.patch 913 BLAKE2B bc0df39ad9d8b0b723c0f66520ddbb8318ccae67c07b5cd5a5743ea1d6154d52da20d2f50eeb00ec45a9cb4bbb52b7244715c868daff77d1e93f89dead130c4c SHA512 aab5431373d7733c9ce8088cc1474f70e4fda352494092850625d34e288682d2d0cc9223d834241c9aecc2ce4411103945c87195336ea91cd4be7fd7b21fcdce
-DIST nawk-20121220.tar.gz 88970 BLAKE2B e00b9e55bb3b9139c00b8cc0be3f6cea2acc1162ee4326103c054c7270ef4a29b97cdddc9a692cad0773a72a17c399d2da5453939681a5d2456f0b740b6bc2ee SHA512 1dd62e1aa4c8cfad7ce599b10d88e9b450ecae3217cf8327cc0f3ce77d0d0dcb731101b8f211066462d46dc4ef23e20ccd7f70d799d7d48940026abe8fa79d4f
 DIST nawk-20180827.tar.gz 1824076 BLAKE2B 4cfd000842d75d9a713fe73a85eefab33c17f9ecaca4f7f663d1157da411fd9fcf2badbf5180b4a90910445332095fe457e7acf0643621ac8a68da1a246b5e5f SHA512 cd6561149be71e6311aaa69c86b90ee4b29a057e5c2595470ccc8a41c40c653ec31b4bd46d7f58896d012f5fb5952103a76aa463a69e5128cba43d80eedf0b9b
-EBUILD nawk-20121220-r3.ebuild 1034 BLAKE2B 092f1dd5c1e4c0812da677adae7f104493af5ea331b67440dcbf3d4ecbe5a9e13d22918512afeb0d82cb56a2f015da8c469ebb09148c4ab58088bc74131dab5d SHA512 1c4b220d7677113c3081d789930674986876a08ebe7b8f01e03be2efdfa90c050bd436dab8419dd0f48e1a83593da0e01abc4362485a8165c8fa5f82d6d744ad
 EBUILD nawk-20180827.ebuild 1034 BLAKE2B 8c7e4267c1b2bcb598092cdd59c2ca4f4e3fcb7192f811343786f94e31ee01f6eeaab52ecb81a2a4cb820b6766f58e7858d126cc3d346cbfa17d67b745376517 SHA512 df7f0a9887e234e8e9ad1d12b610a1e67fb869fbd8ac296a2dadfebb320fba83c5764607ac35fa78d574d472047d00fb8c95f92d9554420ac61a8fd4b1b1431b
 MISC metadata.xml 330 BLAKE2B 0f7e580c6988620e9e3cf452696c66e7ed5f383e878c898b0f90adf96dd847e6063a09bcccf85bf957c86d329617554e72413b4b7536319e37d8993287de3c5e SHA512 621c5fa8dc89857de39705622efcee6f0487e404de19424d0aaeec5b393a01176585139f98c2587d9169564c73585a339c86af21a41c2ab5ec084adee47d1ff3
diff --git a/sys-apps/nawk/files/nawk-20121220-parallel-build.patch b/sys-apps/nawk/files/nawk-20121220-parallel-build.patch
deleted file mode 100644
index ee6421c665ad..000000000000
--- a/sys-apps/nawk/files/nawk-20121220-parallel-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/makefile	2013-02-06 10:26:36.452829647 -0700
-+++ b/makefile	2013-02-07 09:12:13.293898947 -0700
-@@ -44,7 +44,7 @@
- LISTING = awk.h proto.h awkgram.y lex.c b.c main.c maketab.c parse.c \
- 	lib.c run.c tran.c 
- 
--SHIP = README FIXES $(SOURCE) ytab[ch].bak makefile  \
-+SHIP = README FIXES $(SOURCE) makefile  \
- 	 awk.1
- 
- a.out:	ytab.o $(OFILES)
-@@ -52,11 +52,15 @@
- 
- $(OFILES):	awk.h ytab.h proto.h
- 
--ytab.o:	awk.h proto.h awkgram.y
-+#Clear dependency for parallel build: (make -j)
-+#YACC generated y.tab.c and y.tab.h at the same time
-+#this needs to be a static pattern rules otherwise multiple target
-+#are mapped onto multiple executions of yacc, which overwrite 
-+#each others outputs.
-+y%.c y%.h:	awk.h proto.h awkgram.y
- 	$(YACC) $(YFLAGS) awkgram.y
--	mv y.tab.c ytab.c
--	mv y.tab.h ytab.h
--	$(CC) $(CFLAGS) -c ytab.c
-+	mv y.$*.c y$*.c
-+	mv y.$*.h y$*.h
- 
- proctab.c:	maketab
- 	./maketab >proctab.c
-@@ -64,23 +68,23 @@
- maketab:	ytab.h maketab.c
- 	$(CC) $(CFLAGS) maketab.c -o maketab
- 
--bundle:
-+bundle: $(SHIP)
- 	@cp ytab.h ytabh.bak
- 	@cp ytab.c ytabc.bak
--	@bundle $(SHIP)
-+	@bundle $(SHIP) ytabh.bak ytabc.bak
- 
--tar:
-+tar: $(SHIP)
- 	@cp ytab.h ytabh.bak
- 	@cp ytab.c ytabc.bak
- 	@bundle $(SHIP) >awk.shar
--	@tar cf awk.tar $(SHIP)
-+	@tar cf awk.tar $(SHIP) ytabh.bak ytabc.bak
- 	gzip awk.tar
- 	ls -l awk.tar.gz
--	@zip awk.zip $(SHIP)
-+	@zip awk.zip $(SHIP) ytabh.bak ytabc.bak
- 	ls -l awk.zip
- 
- names:
- 	@echo $(LISTING)
- 
- clean:
--	rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda # proctab.c
-+	rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda ytab.c ytab.h # proctab.c
diff --git a/sys-apps/nawk/nawk-20121220-r3.ebuild b/sys-apps/nawk/nawk-20121220-r3.ebuild
deleted file mode 100644
index 975fa8613209..000000000000
--- a/sys-apps/nawk/nawk-20121220-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
-HOMEPAGE="https://www.cs.princeton.edu/~bwk/btl.mirror/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-RDEPEND="
-	app-eselect/eselect-awk"
-
-DEPEND="
-	${RDEPEND}
-	virtual/yacc"
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}/${P}"-parallel-build.patch )
-
-DOCS=( README FIXES )
-
-src_prepare() {
-	default
-	rm -v ytab.[hc] || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CPPFLAGS=-DHAS_ISBLANK \
-		ALLOC="${LDFLAGS}" \
-		YACC=$(type -p yacc) \
-		YFLAGS="-d"
-}
-
-src_install() {
-	newbin a.out "${PN}"
-	sed \
-		-e 's/awk/nawk/g' \
-		-e 's/AWK/NAWK/g' \
-		-e 's/Awk/Nawk/g' \
-		awk.1 > "${PN}".1 || die "manpage patch failed"
-	doman "${PN}.1"
-	einstalldocs
-}
-
-pkg_postinst() {
-	eselect awk update ifunset
-}
-
-pkg_postrm() {
-	eselect awk update ifunset
-}
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index d03be1d13f2e..6c5adfbb0abe 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,6 +1,4 @@
-DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb
 DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf
-EBUILD net-tools-1.60_p20180626073013.ebuild 2451 BLAKE2B e97d4e7f39cf1a9d8ea294cc560eced78beddb5d43ada2cc1f9649f8bafa0f036764fd04cf9c3da0c601466c211912ee747b03d941b433965084228723f788e8 SHA512 3cd707e4b0be080097576cf9b83ff81116e051d7a7d2c7f00fbbbc5b4c924740920e6924e4c40c2554435b4fbd37621f2cf1eccd0eddd16df5eef9ed9bda4006
-EBUILD net-tools-2.10.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e
+EBUILD net-tools-2.10.ebuild 1916 BLAKE2B f20c5eb834943b8f1d780541aede671b6c7bcfe22fc996070e11dab1222347938357138b298f070d0e2e516bf94718b1ef45c1138e0bacedf1af6ddccdff9e5b SHA512 91a93456c3232c045dec4b0e5bdbbc4df67c0039ff6177b11041bb6fea303772f8996cd96d432e2f3187afb267768deea48b9f1048ab0d9ba4ccbad06068d732
 EBUILD net-tools-9999.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e
 MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037
diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
deleted file mode 100644
index bc8fbeabb0ba..000000000000
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/net-tools/code"
-	inherit git-r3
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://net-tools.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static"
-REQUIRED_USE="nis? ( hostname )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	selinux? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" nls? ( sys-devel/gettext )"
-fi
-RDEPEND+="
-	hostname? ( !sys-apps/coreutils[hostname] )"
-
-maint_pkg_create() {
-	cd /usr/local/src/net-tools
-	#git-update
-	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
-	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
-	local p="${PN}-${pv}"
-	git archive --prefix="${p}/" master | tar xf - -C "${T}"
-	pushd "${T}" >/dev/null
-	emake -C "${p}/po" dist
-	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
-	tar --exclude-vcs cf - ${p}/ | xz > ${p}.tar.xz
-	popd >/dev/null
-
-	du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
-
-set_opt() {
-	local opt=$1 ans
-	shift
-	ans=$("$@" && echo y || echo n)
-	einfo "Setting option ${opt} to ${ans}"
-	sed -i \
-		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
-		config.in || die
-}
-
-src_configure() {
-	# Clear out env vars from the user. #599602
-	unset BASEDIR BINDIR SBINDIR
-
-	set_opt I18N use nls
-	set_opt HAVE_AFINET6 use ipv6
-	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
-	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
-	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
-	set_opt HAVE_SELINUX use selinux
-	set_opt HAVE_ARP_TOOLS use arp
-	set_opt HAVE_HOSTNAME_TOOLS use hostname
-	set_opt HAVE_HOSTNAME_SYMLINKS use nis
-	set_opt HAVE_PLIP_TOOLS use plipconfig
-	set_opt HAVE_SERIAL_TOOLS use slattach
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-	tc-export AR CC
-	yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
-	# We need to use emake by hand to pass ED. #567300
-	emake DESTDIR="${ED}" install
-	dodoc README THANKS TODO
-}
diff --git a/sys-apps/net-tools/net-tools-2.10.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild
index 96f533d8a695..5382a369843f 100644
--- a/sys-apps/net-tools/net-tools-2.10.ebuild
+++ b/sys-apps/net-tools/net-tools-2.10.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 80cc0149ac02..a500a4b68cd2 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,10 +1,6 @@
 AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a9320cdba2d410dde4f2b3198b4e07d3341b2b7fcafcfd6cafea648909bdaa4976703c764d5d4a0e312 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
-DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
-DIST pciutils-3.6.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
-EBUILD pciutils-3.5.6-r1.ebuild 2865 BLAKE2B 932cb026107ab0eb3b8961d8e2fe011aa356bc77e090102120b05ebc479f75004aeccab4079a5525d5c221cc51eb6e42006570593ff13ec46064705024ff5a82 SHA512 4e7fea78b0036cd9b7d0720e4f68eb7b2ccbbed6d240d137068500399f49455c0709dc02f36b564add780e10fc3b36a2e2b995c4dab7578891426f7a9e504a02
-EBUILD pciutils-3.6.4.ebuild 2842 BLAKE2B 0a67bbe234aa2ad79d02a151a46a76ff5a9582a1297d1180d969462d404f2532ec46e7c95191b37d1c4d6aa5c407d0c5e504af18bdf5018340b4445bd1445a09 SHA512 717ceab1a44cc5a606412aa6f70e893cf34d1edfcd1ef42f9bc85bee694854693042bf346619cf7a783eb13124230f91178060718a51ba86c9c931bf110bbcb7
 EBUILD pciutils-3.7.0.ebuild 2842 BLAKE2B 0a67bbe234aa2ad79d02a151a46a76ff5a9582a1297d1180d969462d404f2532ec46e7c95191b37d1c4d6aa5c407d0c5e504af18bdf5018340b4445bd1445a09 SHA512 717ceab1a44cc5a606412aa6f70e893cf34d1edfcd1ef42f9bc85bee694854693042bf346619cf7a783eb13124230f91178060718a51ba86c9c931bf110bbcb7
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
deleted file mode 100644
index e40e798ccb3d..000000000000
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208[static-libs(-),${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	kmod? ( sys-apps/kmod )
-	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/hwids
-"
-DEPEND="
-	${DEPEND}
-	kmod? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
-	[[ $# -ne 2 ]] && return 1
-	local opt=$1 val=$2
-
-	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
-	return 0
-}
-
-src_prepare() {
-	default
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-		mv "${S}.static" "${S}/static" || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	append-lfs-flags #471102
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DNS=$(usex dns) \
-		IDSDIR='$(SHAREDIR)/misc' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(multilib_native_usex kmod) \
-		HWDB=$(usex udev) \
-		"$@"
-}
-
-multilib_src_compile() {
-	pemake OPT="${CFLAGS}" all
-	if use static-libs ; then
-		pemake \
-			-C "${BUILD_DIR}/static" \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-multilib_src_install() {
-	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
-		"${ED}"/usr/share/man/man8/update-pciids.8*
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
-		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
-		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
-	fi
-}
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
deleted file mode 100644
index b5b0621bd7df..000000000000
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208[static-libs(-),${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	kmod? ( sys-apps/kmod )
-	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/hwids
-"
-BDEPEND="kmod? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
-	[[ $# -ne 2 ]] && return 1
-	local opt=$1 val=$2
-
-	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
-	return 0
-}
-
-src_prepare() {
-	default
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-		mv "${S}.static" "${S}/static" || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	append-lfs-flags #471102
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DNS=$(usex dns) \
-		IDSDIR='$(SHAREDIR)/misc' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(multilib_native_usex kmod) \
-		HWDB=$(usex udev) \
-		"$@"
-}
-
-multilib_src_compile() {
-	pemake OPT="${CFLAGS}" all
-	if use static-libs ; then
-		pemake \
-			-C "${BUILD_DIR}/static" \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-multilib_src_install() {
-	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
-		"${ED}"/usr/share/man/man8/update-pciids.8*
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
-		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
-		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
-	fi
-}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 6d7284272e16..f115ee0760bf 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,5 @@
 AUX pkgcore-0.10.13-metadata-xsd-2.patch 1202 BLAKE2B 8844f6819579ab54c8ea88f551de2d2671324e494b7321f5d69f7207415f481075742416add7055618b6baaea91588bb82796b764000216f6b051c988837a3bd SHA512 48adb353f4522d682f99c2cafcdd98b51c450579a313a93d3dcb00bcd4e9fc59f7cf6f0ce54377c912c3a4b6af10340a1b6690d845c489e6b77af52b295ac1ae
+AUX pkgcore-0.10.18-sighdlr-r1.patch 2832 BLAKE2B d0287d3279cacc63f2a81b0bf1e5d325de707e4d0ee2b44da27346bc8b81bfe325296ebd3e05d7af76fd9d21e0663186dfa0f5fad4f2355700f606857ca3ad94 SHA512 361449061fa9f1ad77607757dd1557abc52d5e07b682473524209094e2ce2ba3648fd0824f1775a213d10ca609914a50f51764c0ca39360c989cabb78de3a927
 AUX pkgcore-0.10.18-sighdlr.patch 1660 BLAKE2B 4e66dff8988cccfcaae4246ae47c3d9bcb6edabd822d1e1d4224da261d5d7e8e33a9ce69e0f664cc6be536415a79f355ee06be9b10b4da0f6224d614769662fc SHA512 5d87c4a741a24e5e6322bf7034ecb1bdb10cf5a010063b861e710d06bb3b3637ee1b0a1587597721ddcf7274d465239b99c0cf05c6e9b81546059e96d6409013
 DIST pkgcore-0.11.2.tar.gz 641792 BLAKE2B 295cc8302badcae333939d69329331be5f76d965549c75140ce809d693cf688fe3d3152c44a9d738aa2d90ed1c9f4aad2cf3c9a9a3a52a067e69cf7dd6c87b96 SHA512 602e7ad03699b3b3f302d6d414a9587f1c7829be83898e055e8e1a46e2a805b535cb715bbbb4d43100f77b8b119e13e8b1e374f45be879b4c9dfe02340f225d6
 DIST pkgcore-0.11.5.tar.gz 637303 BLAKE2B bd7e609039253864bf02c9a6cb084b54971a37b7d18d8c8234dcea3a7f25f25ec6652f51fc451bd991727f147d1341ee8ab7ecbcb37b727966708c1248fef428 SHA512 59a31cc9166ae2b12ec2cb349a5e29ce06999c532f7007af2392773a1e6f91ae7d6fa91c123991368dfe5ebdd7edc4ccc2a23fbf008c22b7e251562c8deb8bf8
@@ -8,5 +9,6 @@ EBUILD pkgcore-0.11.2-r2.ebuild 1111 BLAKE2B 676d166638807895799de77fcf881962d60
 EBUILD pkgcore-0.11.5-r3.ebuild 1228 BLAKE2B 76f7aa64db9f6c222c2fe3e81525d81788d941cbeb2abd28d92f3b95c475dcc7feccebc4e64d0f42fb7490f84f50cd87f17c46088a37f983e546327099a7df13 SHA512 035781e3dcd799fb44bdc8ce84688e4f3919ce49f8db8d7e0f56cce91784caf0f6a83adea07e0309e0523c32f0daa5856dcf300daf2ed95be4c6c6c09acb4aa0
 EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106
 EBUILD pkgcore-0.11.8-r1.ebuild 1146 BLAKE2B 329fc5a8f7b4a514703746a4cfc9a0ce6401aad074cd3f46f0e0bf7202155245e716927b1c919f135844b6891b141655e64b83291f7945e263a3b21818dd2264 SHA512 c934d61f4d162f71ba1b8a946a8d2b6b31dc4e6e602e4532c1172a3f110d9ff74523fdb9f26b6b4424327bcba2d87691e12ed14d13f1353b3455766f8d6f02eb
+EBUILD pkgcore-0.11.8-r3.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
 EBUILD pkgcore-9999.ebuild 1081 BLAKE2B f59f5bab0d4b3f26c2dddcdb8bebe550aa89462cbb9c4c7aadee461b17679dcd3fa39e37208a8853532592a235d959838af6c17bd6c807381db110a8c35a5205 SHA512 b6fb191a3d84a189f45f1ed6c4ebf2bc02fd729688b10ad98b7bc5767ac0dd16e07f052d015e93a84e21a0e3ed1d6c82f8328a926e24b21ee3204863a6ce1d07
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch
new file mode 100644
index 000000000000..a48bfc5873bb
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch
@@ -0,0 +1,67 @@
+From 303826ceb22985cfa1dfbf1e7a68ed327ffc741b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 15 May 2021 09:30:58 +0200
+Subject: [PATCH] pytest: Delay loading pkgcore modules until fixtures are used
+
+Delay loading pkgcore modules until the EbuildRepo-based fixtures are
+actually used.  This prevents the pkgcore signal handlers from being
+enabled on all packages using pytest while keeping the old behavior
+of setting them upon import in packages using pkgcore directly.
+---
+ src/pkgcore/pytest/plugin.py | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src/pkgcore/pytest/plugin.py b/src/pkgcore/pytest/plugin.py
+index 082538ab..bdc89e4b 100644
+--- a/src/pkgcore/pytest/plugin.py
++++ b/src/pkgcore/pytest/plugin.py
+@@ -1,3 +1,4 @@
++import importlib
+ import os
+ import subprocess
+ import textwrap
+@@ -5,8 +6,6 @@ from collections.abc import MutableSet
+ from datetime import datetime
+ 
+ import pytest
+-from pkgcore.ebuild import cpv as cpv_mod
+-from pkgcore.ebuild import repo_objs, repository
+ from snakeoil import klass
+ from snakeoil.fileutils import touch
+ from snakeoil.osutils import pjoin
+@@ -169,6 +168,12 @@ class EbuildRepo:
+     """Class for creating/manipulating ebuild repos."""
+ 
+     def __init__(self, path, repo_id='fake', eapi='5', masters=(), arches=()):
++        # load pkgcore modules late to avoid overriding signal handlers
++        # when the plugin is not actually used
++        self.cpv_mod = importlib.import_module('pkgcore.ebuild.cpv')
++        self.repo_objs = importlib.import_module('pkgcore.ebuild.repo_objs')
++        self.repository = importlib.import_module('pkgcore.ebuild.repository')
++
+         self.path = path
+         self.arches = _FileSet(pjoin(self.path, 'profiles', 'arch.list'))
+         self._today = datetime.today()
+@@ -194,8 +199,8 @@ class EbuildRepo:
+ 
+     def sync(self):
+         """Forcibly create underlying repo object avoiding cache usage."""
+-        repo_config = repo_objs.RepoConfig(location=self.path, disable_inst_caching=True)
+-        self._repo = repository.UnconfiguredTree(self.path, repo_config=repo_config)
++        repo_config = self.repo_objs.RepoConfig(location=self.path, disable_inst_caching=True)
++        self._repo = self.repository.UnconfiguredTree(self.path, repo_config=repo_config)
+ 
+     def create_profiles(self, profiles):
+         for p in profiles:
+@@ -215,7 +220,7 @@ class EbuildRepo:
+                     f.write(f'{p.eapi}\n')
+ 
+     def create_ebuild(self, cpvstr, data=None, **kwargs):
+-        cpv = cpv_mod.VersionedCPV(cpvstr)
++        cpv = self.cpv_mod.VersionedCPV(cpvstr)
+         self._repo.notify_add_package(cpv)
+         ebuild_dir = pjoin(self.path, cpv.category, cpv.package)
+         os.makedirs(ebuild_dir, exist_ok=True)
+-- 
+2.31.1
+
diff --git a/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild b/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild
new file mode 100644
index 000000000000..cb4367497c7a
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pkgcore-0.10.18-sighdlr-r1.patch"
+)
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 9394cc343c15..6e97aa95f485 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,10 +1,7 @@
 AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f
-AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8
 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d
-AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74876f8b8725f701862908448deca3768437d1cd98b138c9203106c199942910f63e7c95598d3e1b27818 SHA512 c1e3d94509d5cd3301836961598e221ef0db2e7310386f0467a4f3068eada8ad4010b063202b8a8c3d163d39799aea7d6a4dcb4d8ca569fe7b51f5c870100b6d
-AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
-DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
-EBUILD rng-tools-6.10-r1.ebuild 1801 BLAKE2B 5a4f8f9ff195d74dab6a42a00d378148b9f5054fc4e415753ad765c8d8d11305304a850541d5762ff4d4de17adb105c78eb83b0508bcd799696f50f1678708c3 SHA512 15f4b5c429b96c91249dc0350f41ae0d098110d2a999b0117ebc840147135a96ff2c7cffd65bc19e490e347e4be93e90aea683f1e3ccf90366f2c2cfa79b05f8
-EBUILD rng-tools-6.11-r1.ebuild 1799 BLAKE2B 06fa278fcf75bdab22c29ddd5c77ef20d4bc680a7df4073b95d1ab3deca1a8dcb5ae9671190140a82abc443c8a66e88be973d96d7432470691e5c7f0bf766456 SHA512 e267d1c556edb373a6c7814b1eadbbb6b64a87cda7f0c4e96a9d050e9ec6b3721eadc27004d6262615e3b8b16489135b4d9ad8a87776bc24b12b54f7e103666a
+DIST rng-tools-6.12.tar.gz 57309 BLAKE2B d7a12b50889065f885cb15cda9686d63950fcc1ac9099893ed9c9236a9a930627c9541980c410318b40104637df688f5622681ce1d80eee7d4aaaf696c6bc3c5 SHA512 56dd334b65dcec1456f8dbdbee5d83590de27cb6ee1b7715828b5316a913557fd178e264139dc92a82e09635ca15b1eb5f6169bfb4412fbe1b06ea28a5064c64
+EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47
+EBUILD rng-tools-6.12.ebuild 1780 BLAKE2B d68f962d287041b3c0d3b811479743efb47e38d187dfdb731439ee2b93a234d243a5ce0aa8a825206fcfeddb8f192d360ab1e5e26ababfa184b222be0d973fa2 SHA512 aa466ceaba148c0d322b9d8dc805083ca453a2a5322a1f46c66b30924d578500e4c6f800c19f6a94562cb9b47c44d157fd279ab29d94730f3548a2a615e70d2d
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/files/rngd-confd-6.7 b/sys-apps/rng-tools/files/rngd-confd-6.7
deleted file mode 100644
index 20aa3281d535..000000000000
--- a/sys-apps/rng-tools/files/rngd-confd-6.7
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# /etc/conf.d/rngd
-# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
-
-# Space-delimited list of entropy sources to enable
-# Note that some of the entropy sources may require certain USE flags
-# to be enabled or require hardware support to function properly
-# Entropy sources not specified here (or in the exclude list below)
-# will be enabled/disabled based on rngd default behavior
-#
-# Choose from the list:
-#         hwrng:  Hardware RNG Device
-#         tpm:    TPM RNG Device (Deprecated)
-#         rdrand: Intel RDRAND Instruction RNG
-#         darn:   Power9 DARN Instruction RNG
-#         nist:   NIST Network Entropy Beacon
-#                 (UNSAFE for cryptographic operations)
-#         jitter: JITTER Entropy Generator
-#         pkcs11: PKCS11 Entropy Generator
-#
-#INCLUDE_ENTROPY_SOURCES="hwrng tpm rdrand darn nist jitter pkcs11"
-
-
-# Space-delimited list of entropy sources to disable
-# This is useful for disabling certain entropy sources even
-# when they are supported on the system
-#
-#EXCLUDE_ENTROPY_SOURCES="nist tpm"
-
-
-# Entropy source specific options:
-#
-#
-# hwrng device used for random number input:
-#
-#HWRNG_DEVICE="/dev/hwrng"
-#
-#
-# rdrand options:
-#         use_aes:(BOOLEAN)
-#
-#RDRAND_OPTIONS="use_aes:1"
-#
-#
-# darn options:
-#         use_aes:(BOOLEAN)
-#
-#DARN_OPTIONS="use_aes:1"
-#
-#
-# jitter options:
-#         thread_count:(INTEGER)
-#         buffer_size:(INTEGER)
-#         refill_thresh:(INTEGER)
-#         retry_count:(INTEGER)
-#         retry_delay:(INTEGER)
-#         use_aes:(BOOLEAN)
-#
-#JITTER_OPTIONS="thread_count:4 buffer_size:16535 refill_thresh:16535"
-#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1 use_aes:1"
-#
-#
-# pkcs11 options:
-#         engine_path:(STRING)
-#         chunk_size:(INTEGER)
-#
-#PKCS11_OPTIONS="engine_path:/usr/lib64/opensc-pkcs11.so chunk_size:1"
-
-
-# Kernel device used for random number output
-#
-#RANDOM_DEVICE="/dev/random"
-
-
-# Random step (Number of bytes written to random-device at a time):
-#
-#STEP=64
-
-
-# Fill watermark
-# 0 <= n <= `sysctl kernel.random.poolsize`
-#
-#WATERMARK=2048
-
-
-# Any extra arguments for rngd
-#
-#EXTRA_ARGS=""
diff --git a/sys-apps/rng-tools/files/rngd-initd-6.7-r1 b/sys-apps/rng-tools/files/rngd-initd-6.7-r1
deleted file mode 100644
index 4a284b4f505f..000000000000
--- a/sys-apps/rng-tools/files/rngd-initd-6.7-r1
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	after urandom
-	provide entropy
-}
-
-command="/usr/sbin/rngd"
-description="Check and feed random data from hardware device to kernel entropy pool."
-pidfile="/run/${RC_SVCNAME}.pid"
-command_args=""
-command_args_background="--pid-file ${pidfile} --background"
-start_stop_daemon_args="--wait 1000"
-retry="SIGKILL/5000"
-
-
-# Parse rngd confd file for extra command line arguments
-start_pre() {
-    for entsrc in ${INCLUDE_ENTROPY_SOURCES}; do
-	command_args="${command_args} -n ${entsrc}"
-    done
-
-    for entsrc in ${EXCLUDE_ENTROPY_SOURCES}; do
-	command_args="${command_args} -x ${entsrc}"
-    done
-
-    if [ "x${HWRNG_DEVICE}" != "x" ]; then
-	command_args="${command_args} --rng-device=${HWRNG_DEVICE}"
-    fi
-
-    for entsrc_opt in ${RDRAND_OPTIONS}; do
-	command_args="${command_args} -O rdrand:${entsrc_opt}"
-    done
-
-    for entsrc_opt in ${DARN_OPTIONS}; do
-	command_args="${command_args} -O darn:${entsrc_opt}"
-    done
-
-    for entsrc_opt in ${JITTER_OPTIONS}; do
-	command_args="${command_args} -O jitter:${entsrc_opt}"
-    done
-
-    for entsrc_opt in ${PKCS11_OPTIONS}; do
-	command_args="${command_args} -O pkcs11:${entsrc_opt}"
-    done
-
-    if [ "x${RANDOM_DEVICE}" != "x" ]; then
-	command_args="${command_args} --random-device=${RANDOM_DEVICE}"
-    fi
-
-    if [ "x${STEP}" != "x" ]; then
-	command_args="${command_args} --random-step=${STEP}"
-    fi
-
-    if [ "x${WATERMARK}" != "x" ]; then
-	command_args="${command_args} --fill-watermark=${WATERMARK}"
-    fi
-
-    command_args="${command_args} ${EXTRA_ARGS}"
-    return 0
-}
diff --git a/sys-apps/rng-tools/files/rngd.service b/sys-apps/rng-tools/files/rngd.service
deleted file mode 100644
index 04793437e2d7..000000000000
--- a/sys-apps/rng-tools/files/rngd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Hardware RNG Entropy Gatherer Daemon
-
-[Service]
-ExecStart=/usr/sbin/rngd -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
index 8392ad2b6586..8a63aedded7b 100644
--- a/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
diff --git a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.12.ebuild
index a46c160a80f6..b2e6591164cd 100644
--- a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.12.ebuild
@@ -11,12 +11,11 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
 	dev-libs/openssl:0=
-	sys-fs/sysfsutils
 	jitterentropy? (
 		app-crypt/jitterentropy:=
 	)
@@ -62,9 +61,9 @@ src_configure() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
+	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
+	systemd_dounit "${S}"/rngd.service
 
 	if use pkcs11; then
 		local DISABLE_AUTOFORMATTING=1
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 4fcbe11b711d..1f09a7f95e46 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -5,6 +5,6 @@ DIST sandbox-2.23.tar.xz 437980 BLAKE2B fd417ea88512e7716a7f075442f684dc67b6c7d9
 DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f50163db1c3bbddbf4fd07dbd5b7d92ef2f1b2c01eb77ff6cf531c5cc6a05e60b028f585310ac56eef96240882843 SHA512 8df5414e334a15f367acfd218ba1b74ba618b93d7bdeca8a039b69cbd81ab048ec5a6cecb24df09fa9a5f4fe214d647acf5138004defd45e6396eec5ae7c93d0
 EBUILD sandbox-2.21.ebuild 1884 BLAKE2B 7fbf74c7bb4ed328c301f1f415b085f45b1e39992d730019fc598e8fe4864ca4b0ff570902b2ae970333c3e2af3e00f2d1d3258cd5372b0e3bf89a2a67f0f9ee SHA512 bb53ced577f1c449b84bf39fde7e2472a02df90d18ef1a2fef070dbc26d9cef995544c4289b2a9e0d49f876c2c0f970212a02e9e397ec22d45c4f790b939434d
 EBUILD sandbox-2.22.ebuild 1431 BLAKE2B 5776c78c88c2910d8754b7e519a18a67105482e236f24c51ef11d3322d8f2424a84d6a8465715da87be9af1ca3f63a2932f9b158891b97a473978c5dae8406b3 SHA512 d87cdc346748f0a94c26c88efeb74fc019d6b891f1c326816ab63a1ca828ac82cf13058831ae8edda3f007738a9a29057298efd5a32b5b4ca73917ac1a95cdd2
-EBUILD sandbox-2.23.ebuild 1438 BLAKE2B 28d7dabc32b6b2f63312b7c2e27fe950c2b780f28abe322d3afade5f6a12a23a48ff17df7ea33aa8b38e804d9e1fb5ba72b7faea343beb0deca2b018086dc932 SHA512 68c2e44d7e1592f6acf21b1c624d470ca843cb79cc777c50c0459137f4baa7841fa7c67bede57217820ac4b0edaca08e4a99581a50837fa7f9ca986372de96ed
+EBUILD sandbox-2.23.ebuild 1431 BLAKE2B 5776c78c88c2910d8754b7e519a18a67105482e236f24c51ef11d3322d8f2424a84d6a8465715da87be9af1ca3f63a2932f9b158891b97a473978c5dae8406b3 SHA512 d87cdc346748f0a94c26c88efeb74fc019d6b891f1c326816ab63a1ca828ac82cf13058831ae8edda3f007738a9a29057298efd5a32b5b4ca73917ac1a95cdd2
 EBUILD sandbox-2.24.ebuild 1628 BLAKE2B 7457ec630192b03edde185b4a052e542c15913cf82d71e560ef273d6f7e2d9b5130d60293f843e53119c133df86922853bf1c94c23c3787f7d564abc1d0cf42b SHA512 b83eecd3347ee532591a51de2f7974e3615311c01750bb7613d24bbcc08c46d577c75e197abb05f9f6870d486958746cac444eef41af72a25249c46cf86cdb46
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.23.ebuild b/sys-apps/sandbox/sandbox-2.23.ebuild
index 844b1e1fe4cc..3fcb495f4274 100644
--- a/sys-apps/sandbox/sandbox-2.23.ebuild
+++ b/sys-apps/sandbox/sandbox-2.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 484c016de769..16d11ba36e47 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,5 +1,3 @@
-DIST sed-4.7.tar.xz 1298316 BLAKE2B 752bc2e942b6f041710c6811518147c5fa4b143b33ae842ec1f142ec914bfaf4d7e8a94a2b1a5b345789944e5426f7946997f2ccbc43ee5034351a95ce3a677e SHA512 e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb
 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
-EBUILD sed-4.7.ebuild 1096 BLAKE2B 843c959088cf24e4eca4547ce948e843c382f340b05180a2fe7295955e9604007fa78e4f8cdc8be09865a32f08c3abd82692194e3d25c5a1382558e7e09f0258 SHA512 e4e4bff1a5c2771505c20cfa3cc11b32ff47f3d3f64fc6b2402f1a6d508a191f95f87f5f2cc6a8e2bc98bdb4722cf04ff56ecd5c0ba565bba2a583d7934a073d
 EBUILD sed-4.8.ebuild 1004 BLAKE2B b8d496063405fd7b7cdb70092477fbe0ad13a1d8ae39700eac52df1c300a4750501080e1260eb4f53c6e36bcf02aae78cd9e8032019ce11437a669e947f0df07 SHA512 1fc00a09010dec7e021071897f648e26dba688dac2135e0475b5ebc713b76c12e5a4e45cc85a64a2cfcc759b354a95937503c5ac986df79554cc9a721e14c93d
 MISC metadata.xml 373 BLAKE2B 3aab40c661d76a8005ae92bdfcf6a3b20732c052b95183a64008a88ed47fc9cc7f663cb1e778eb3b61c6561d854cf805ee17d91fe2657da7cb295fc5a2b2073c SHA512 383c7459fd3f9d0d3e14d819091d1100fd87723bc17ad7492ef6df06b9b878116a628a7cedf38f167a1ff969dbba02b834aec45e4f04e87cb5cff3484553052b
diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
deleted file mode 100644
index c319f8bf409a..000000000000
--- a/sys-apps/sed/sed-4.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="http://sed.sourceforge.net/"
-SRC_URI="mirror://gnu/sed/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl nls selinux static"
-
-RDEPEND="
-	!static? (
-		acl? ( virtual/acl )
-		nls? ( virtual/libintl )
-		selinux? ( sys-libs/libselinux )
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	static? (
-		acl? ( virtual/acl[static-libs(+)] )
-		nls? ( virtual/libintl[static-libs(+)] )
-		selinux? ( sys-libs/libselinux[static-libs(+)] )
-	)
-"
-
-src_configure() {
-	local myconf=()
-	if use userland_GNU; then
-		myconf+=( --exec-prefix="${EPREFIX}" )
-	else
-		myconf+=( --program-prefix=g )
-	fi
-
-	export ac_cv_search_setfilecon=$(usex selinux -lselinux)
-	export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
-	use static && append-ldflags -static
-	myconf+=(
-		$(use_enable acl)
-		$(use_enable nls)
-	)
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 91b8f8c51d62..eca8a40cf392 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,9 +1,7 @@
 AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642b27c3b6dd77d5d0e8e7f7c59e564cd7e78f2297847db2e0c6b4611284cf5a67973ec9bcc533deab4625381f27d04 SHA512 07f7d46d70f79508169c482bbe251dd4057be4d546ce8ac4b0928ca8708c55086ca2765c78e5f894af1828ff7383ff33b5d354d4c1af9857a9122dfd6fc916fb
 AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89
 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
-DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
 DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
 EBUILD sg3_utils-1.42.ebuild 1034 BLAKE2B 10745a9e5cb59557406583f5eba0333f75f6357cd84fc68130fd98a486938905f48c609114403bb47c918f0439169df73bf478d120d625a86e04d2c789593c27 SHA512 bad6f00df0944a54bdb692ec7e16fb213eb35c93066c9dc23123ad6b683544ec037a9703cb229bb902396b9a962f7188212207121998c1ba7a6eda9a185ca1ca
-EBUILD sg3_utils-1.45-r2.ebuild 1066 BLAKE2B 4871a822cc621c43c04838380cc6d4afc1360ecc851414106141c3e676d29fb236b0a7e386af7c629386beeeb8e2dbd15d083fda0deb8464901c0d3ba1e1325c SHA512 fc2717f60f31087fed00be923c0fa7e04a66928093f1a93524de9629a48f1292bcaa4a43599473ac8eb0da86ac6195f7ff5619643f30042a61598f61bf3deeaf
-EBUILD sg3_utils-1.46-r1.ebuild 1073 BLAKE2B c4f3e2e58768cb5782d1dcde03e988b1ecb7e62034b314bbfa20bdd3ee9d31baeae4ae0bb1071b2d8e05991e245b097e2ea319ef60c3a9186a0a71600cbd4c16 SHA512 c08a1f22c938da966500a9988c22e4b90acc2297fff526b828ec225b82dd40bd7ffbb1c644f416a09ad85417b52532c068912ffcdd6bd610a056e6984e98f384
+EBUILD sg3_utils-1.46-r1.ebuild 1066 BLAKE2B 4871a822cc621c43c04838380cc6d4afc1360ecc851414106141c3e676d29fb236b0a7e386af7c629386beeeb8e2dbd15d083fda0deb8464901c0d3ba1e1325c SHA512 fc2717f60f31087fed00be923c0fa7e04a66928093f1a93524de9629a48f1292bcaa4a43599473ac8eb0da86ac6195f7ff5619643f30042a61598f61bf3deeaf
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild b/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild
deleted file mode 100644
index 9a35e645d320..000000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="http://sg.danny.cz/sg/"
-#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND="!sys-apps/rescan-scsi-bus"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26-stdint.patch #580236
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc COVERAGE doc/README examples/*.txt
-	newdoc scripts/README README.scripts
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# Better fix for bug 231089; some packages look for sgutils2
-	local path lib
-	path="/usr/$(get_libdir)"
-	for lib in "${ED}/"${path}/libsgutils2{,-${PV}}.*; do
-		lib=${lib##*/}
-		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
-	done
-}
diff --git a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
index b2dfd0bf2217..9a35e645d320 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 96a112fd74c5..e676ab4edcd6 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -6,7 +6,5 @@ AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 AUX shadow-4.8-revert-bin-merge.patch 305 BLAKE2B 2fb6407ed60251b3367931c2c7eb9b2bdaaff565ff5338fb6ffddc9b618963e7835925c07fea0cbaeeee90a03b7e0c571f0e1b9e1844fe9397f4e74672edb080 SHA512 bd821f6af288ac4a3cf9b0de30753626db90d187ece7d53ee7e0d6b7c61dbfecda84bd9ae60958120cc8ddce48055878c9daaa668dd88392bb70b73c7ad4fb01
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
-DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c93fc6dd610876263ac22e61fbc2821649d347c28055ae84f64cd5ab5c2435450c55339c80b4ae5062ccc44f SHA512 1c607aec541400fc179d6cbbac7511289c618ab2ce6ee9d7c18a8bfda00421c62d4b9e58aff52b5f82d485468e7db955c186ea0faad9a08003ffc01bdf2ccece
-EBUILD shadow-4.8-r5.ebuild 5941 BLAKE2B c6feffe96b66027a0f3cf02653d4b5154a668d186acc3531fca2c0fd22de2cf70c58928fe5f1c374fdaaff989794bb07d297912d8a2dd4e9a7b725315251c6c4 SHA512 b54436e75d7cb8ad3d3898a3310e81ed3a320c1529ade8f946aa9f8904177b73a5753246811ab3d79fdae09cfabeee0f00a242182b3ecd600bde8917c6c04c50
-EBUILD shadow-4.8.1-r3.ebuild 5926 BLAKE2B b0dbd0eb675947391ce1e0ede2ad0557845989d4427ee69936032e19096e966406721b7559867261fb58fa787c9f22852d28d6bc267d47c88d2c413bd0ec3216 SHA512 b9f6d2361361e0764a0d0f997bdc07326a663c10738442f338342b5e03bbbde64ac5f92394eb90b8519e4e0343fcaedc68074c47bb3ec5af75c23a56ce379d65
+EBUILD shadow-4.8.1-r3.ebuild 5918 BLAKE2B 340acae099fdaec90e1de8b3905e723c450f1b6961be8ca76495cde7b62e0c5b8fa9cb17db7503d87774c4d46c7dd64ee9be42cf05e2fc931fb522326a6eeda9 SHA512 446cd1935f9250b20fde1e5996394371120a566ee9e9827cd6d2e5fde74b0364b08e4245b29ec711a1cd0bb60585b2edafeffd72743173c1fc946fd594e70d33
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/shadow-4.8-r5.ebuild b/sys-apps/shadow/shadow-4.8-r5.ebuild
deleted file mode 100644
index da23f02aa7f5..000000000000
--- a/sys-apps/shadow/shadow-4.8-r5.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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/${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	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}
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-	"${FILESDIR}/${P}-revert-bin-merge.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	#elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--enable-shared=no
-		--enable-static=yes
-		--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[@]}"
-
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			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
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	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 \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-delete
-
-	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() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/shadow/shadow-4.8.1-r3.ebuild b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
index 2bb0fd2b726e..38ebf6be89e7 100644
--- a/sys-apps/shadow/shadow-4.8.1-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 818b444bc717..d134cbcac1b0 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,6 +2,7 @@ AUX 247-cgroup-test.patch 1859 BLAKE2B e97d638c96e0f9c783736227031ac8774dfa5c204
 AUX 248-rfkill.patch 2060 BLAKE2B 498bbd4eb1a38e10583ac00f4474aa331cf7a6fb9a4b826b9c59d7e91e6b26e23eef41cc631c8534a8266b0de6e4cb15c1d92785a2f12ee9d37ed864b8d05215 SHA512 9988bc85ea0c4a49d59b4b669bb7c757cefe3cd0ed12bbc31238ad90c43f14494d6ccbf907a47d2aeeb08ae9c374dac64e5b602346aff7234b96c90f3758a83d
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
+AUX gentoo-pam-r1.patch 974 BLAKE2B 17a54f41fed72c8c319d287464c242c5a210bc5eb3f0805b8fe437fcda4146eabec210ca4721ff3695260d190f57e134997b52f82865a0dabe7977083f44af5d SHA512 caa17ccbd874d2760fbffb804ced108cc3bd15326d2b49ded034e3d2322aebf531f65f07930f58b7ae018dd3eefcfdf0643cae5cf992934dcbdb7cb577279b69
 AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b4bdcdf4a8a9dd87031abce6bec2a6ed1578520f61a014de2c0127a5f96e8feec11b120e7e91b09c89 SHA512 69e50d1cec1e2d927365a97aebffe1024f600a8e5779e214fdc6fa35499786382375edb645d4c8c7c1745b96cd1e5cf83b4b9fc4daffdc1977bf7c7a50891db0
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610dba624e3f168a7bd7a54f83eb2e208b9d596645819e4e4d977876d032c5b98d392c846736b7be3e758aa53cf7b724eeda8d02c19ce5 SHA512 043a7bba0fac81a4a5eb1217cdfdd90cbdc7b2f01327d96b6f2cc12f3e8be4976e55e40a1dfbcc94d8ec35230c7e02a10e85e593a6faa355e675e202073991b3
@@ -10,9 +11,11 @@ DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7ed
 DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
+DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
 EBUILD systemd-246-r2.ebuild 15296 BLAKE2B 91f3b46502254f87a3238c58b44e8d9b3452e785ac7c03e27aed967aa1c5722d667df46fdba74becd72a94b69dffa4c929e19e01733e17146897a611e8944cec SHA512 6942d33e12f48006c7d2b11c491d30b60f69fcf2f847fa3e02a4d58506f4b9f3e76ec80c8eabe6635bcc92df03bc3df192471ff9d74dcba9f5d35fc0a65abd20
 EBUILD systemd-246.6.ebuild 15393 BLAKE2B 9e107dc2e511b55e338faa6706e1e5959a598afd44886a51ed9ee0be001944a5541fafe02dd818fbce0b679ffa47af58d0d2444c9757eb9aa4ce835a3a649ebe SHA512 17d667ce4ea662d94206c3b04d206f0b0f14d94ae9c19d969c9b235f3f32dc63b10ba5116c3e96dc59b873c495c3a2c4039e0de3a2bc64c7375c088979e1c592
 EBUILD systemd-247.2-r4.ebuild 15762 BLAKE2B 41d0aed008171bc05738adab0028dacf4a45b43345b534043a949392611b080e572673fbda0a0d0326ded33e03f12873a675ddd0a3c687f7bbdf7f068bde8348 SHA512 e2ffeae0abb0cbc363134f4d0184bb73e96200172cb82858e4ab775fedb256f5e6ec1e848d82e6f82b90634efc9ff9d0bdcd94088951c8a6a329bd8dac561759
+EBUILD systemd-248.3.ebuild 15359 BLAKE2B 1335bde6d963c17e6f59c8ed290eea05bd568f582d443fc7d115730b1c6b2004a19b8dc142a94a490642de19895ac81b997431c4608841fa198e567eeaf0297a SHA512 29fc15694ae9686f98820116263d15b3972a7ffe591d304307284d95d5f50a4b6b603ad0c4950df80c6a5b793c19875da71638536965a966328d36d73ea741f3
 EBUILD systemd-248.ebuild 15858 BLAKE2B 53e11d0215eabdea015fb2e652d9889d247caa2dae3ebc905f9b92769002a57a95106b986ac96fdb8078ce11d62df54884a1b7fea28804794485565fb237f623 SHA512 3130c20e6ce32ba1e132fa245d4880d391ffc46b9de6d9f968621fb992802180f910043eec79185f404930ca117d1eb821bdea83dffe16ec3d79e63fb0cb6352
-EBUILD systemd-9999.ebuild 15359 BLAKE2B 1335bde6d963c17e6f59c8ed290eea05bd568f582d443fc7d115730b1c6b2004a19b8dc142a94a490642de19895ac81b997431c4608841fa198e567eeaf0297a SHA512 29fc15694ae9686f98820116263d15b3972a7ffe591d304307284d95d5f50a4b6b603ad0c4950df80c6a5b793c19875da71638536965a966328d36d73ea741f3
+EBUILD systemd-9999.ebuild 15478 BLAKE2B 92881d031f460f006651a21704d25bee301436d2f1195036be81087303285d4febf5984677dfb2e1e6a811cf171d257d72edb6ad49d001ac6de3c14633c9bcbc SHA512 4cfe9fca10e06835f596aab5c373893652fc1e3b8e1c0ba36c79d368d75bf2d51ff11d5e5648b97a8da72adc68913d659f170c1b4af2df290367caf0c7564f30
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/files/gentoo-pam-r1.patch b/sys-apps/systemd/files/gentoo-pam-r1.patch
new file mode 100644
index 000000000000..8816bae19e07
--- /dev/null
+++ b/sys-apps/systemd/files/gentoo-pam-r1.patch
@@ -0,0 +1,33 @@
+From e404e655eab9042bfc81ff5638dd54f4a5452ce0 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 19 May 2021 15:34:41 -0400
+Subject: [PATCH] pam: include system-auth for systemd --user
+
+---
+ src/login/systemd-user.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/login/systemd-user.in b/src/login/systemd-user.in
+index 343aec4a01..a18d7d43cf 100644
+--- a/src/login/systemd-user.in
++++ b/src/login/systemd-user.in
+@@ -5,7 +5,7 @@
+ {% if ENABLE_HOMED %}
+ -account sufficient pam_systemd_home.so
+ {% endif %}
+-account sufficient pam_unix.so
++account include system-auth
+ account required pam_permit.so
+ 
+ {% if HAVE_SELINUX %}
+@@ -13,6 +13,7 @@ session required pam_selinux.so close
+ session required pam_selinux.so nottys open
+ {% endif %}
+ session required pam_loginuid.so
++session include system-auth
+ session optional pam_keyinit.so force revoke
+ {% if ENABLE_HOMED %}
+ -session optional pam_systemd_home.so
+-- 
+2.31.1
+
diff --git a/sys-apps/systemd/systemd-248.3.ebuild b/sys-apps/systemd/systemd-248.3.ebuild
new file mode 100644
index 000000000000..1899e9f7640f
--- /dev/null
+++ b/sys-apps/systemd/systemd-248.3.ebuild
@@ -0,0 +1,548 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test tpm vanilla xkb +zstd"
+
+REQUIRED_USE="
+	homed? ( cryptsetup pam )
+	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	hwdb? ( >=sys-apps/hwids-20150417[udev] )
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+			"${FILESDIR}/gentoo-pam.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+sd_use() {
+	usex "$1" true false
+}
+
+sd_native() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+sd_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		-Dacl=$(sd_native_use acl)
+		-Dapparmor=$(sd_native_use apparmor)
+		-Daudit=$(sd_native_use audit)
+		-Dlibcryptsetup=$(sd_native_use cryptsetup)
+		-Dlibcurl=$(sd_native_use curl)
+		-Ddns-over-tls=$(sd_native_use dns-over-tls)
+		-Delfutils=$(sd_native_use elfutils)
+		-Dgcrypt=$(sd_use gcrypt)
+		-Dgnu-efi=$(sd_native_use gnuefi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dhomed=$(sd_native_use homed)
+		-Dhwdb=$(sd_native_use hwdb)
+		-Dmicrohttpd=$(sd_native_use http)
+		-Didn=$(sd_native_use idn)
+		-Dimportd=$(sd_native_use importd)
+		-Dbzip2=$(sd_native_use importd)
+		-Dzlib=$(sd_native_use importd)
+		-Dkmod=$(sd_native_use kmod)
+		-Dlz4=$(sd_use lz4)
+		-Dxz=$(sd_use lzma)
+		-Dzstd=$(sd_use zstd)
+		-Dlibiptc=$(sd_native_use nat)
+		-Dpam=$(sd_use pam)
+		-Dp11kit=$(sd_native_use pkcs11)
+		-Dpcre2=$(sd_native_use pcre)
+		-Dpolkit=$(sd_native_use policykit)
+		-Dpwquality=$(sd_native_use pwquality)
+		-Dqrencode=$(sd_native_use qrcode)
+		-Drepart=$(sd_native_use repart)
+		-Dseccomp=$(sd_native_use seccomp)
+		-Dselinux=$(sd_native_use selinux)
+		-Dtpm2=$(sd_native_use tpm)
+		-Ddbus=$(sd_native_use test)
+		-Dxkbcommon=$(sd_native_use xkb)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		-Dbacklight=$(sd_native)
+		-Dbinfmt=$(sd_native)
+		-Dcoredump=$(sd_native)
+		-Denvironment-d=$(sd_native)
+		-Dfirstboot=$(sd_native)
+		-Dhibernate=$(sd_native)
+		-Dhostnamed=$(sd_native)
+		-Dldconfig=$(sd_native)
+		-Dlocaled=$(sd_native)
+		-Dman=$(sd_native)
+		-Dnetworkd=$(sd_native)
+		-Dquotacheck=$(sd_native)
+		-Drandomseed=$(sd_native)
+		-Drfkill=$(sd_native)
+		-Dsysusers=$(sd_native)
+		-Dtimedated=$(sd_native)
+		-Dtimesyncd=$(sd_native)
+		-Dtmpfiles=$(sd_native)
+		-Dvconsole=$(sd_native)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	if use hwdb; then
+		keepdir /etc/udev/hwdb.d
+	fi
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	if use hwdb; then
+		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 1899e9f7640f..03cc0e7e2256 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -150,10 +150,12 @@ BDEPEND="
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
 	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
 }
 
@@ -221,7 +223,7 @@ src_prepare() {
 			"${FILESDIR}/gentoo-generator-path-r2.patch"
 			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
 			"${FILESDIR}/gentoo-journald-audit.patch"
-			"${FILESDIR}/gentoo-pam.patch"
+			"${FILESDIR}/gentoo-pam-r1.patch"
 		)
 	fi
 
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 495a8eb8d02a..0d5da968d7f4 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -11,5 +11,5 @@ DIST sysvinit-2.98.tar.xz 127028 BLAKE2B 302219cd0753dee20772d78ad073e279f430ede
 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
 EBUILD sysvinit-2.97.ebuild 3956 BLAKE2B 063ff416ecd75142e9f4700983768b1b242cc47cdb471c0fb754d0b752b1d8bb851c96f369998acfff042d9273f3cc9eda247565219db9201f937c88a3606fbe SHA512 ae8d9e453ee5fd0305e27a9ad47331044ce97d48e0ed061b811eb0db469a0e0e4b23c48d9d0177f4d804dba36068f88379af2cffe8e2de77f1e91dbf30928fe3
 EBUILD sysvinit-2.98-r1.ebuild 3964 BLAKE2B b9aba3c6723cdd18119eff7a6e4fe926070340d2f4f6d4513a549632f8d9e17513e6eabae101dfd399843f489884f4370c406836148baab931f93dd9277a5f0c SHA512 de496ac43e87209fa3a2163f7a4588cc61831a542bad9382f303048d3e3d922fd8cedaea4fb16ac37f1bc8ea83fa33ec0c79d16a3acf45af75e4aacb2c810b97
-EBUILD sysvinit-2.99.ebuild 3967 BLAKE2B 48967c9bb6525586026d78474fae39c0d2aa0f1fbb6161ff1f580f35974641b494ea3510c3c503b96876e6f30c2d7219449ab0b7ff40dc624e414f006752e626 SHA512 fc41e9ef6e2d5f19d74513a0285206acf9f477b8951b1e4da6daa78fa64cb6bc78f4d1fc084dbec986b79142f2a67e91c7b74592cdd92a5abffe711535f9611d
+EBUILD sysvinit-2.99.ebuild 3959 BLAKE2B 336dab1fcea056bb9c3dfcee0b59ba42b032aa18b4645f2bea76a64c0a45dbf314a71b0c1236f6ae941dda2f26f57ab0b18c1e1c5fd43363f32878029b37bd05 SHA512 5a4ccb62aa7dc2faee89b11acd4061a6678bda65999e516349a86d50774967d6554bb94912e83b5ca6d87eebf60036abb5deef39fac471629f9542550e553d3d
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.99.ebuild b/sys-apps/sysvinit/sysvinit-2.99.ebuild
index e2a06d6700d2..f370b1a50ee7 100644
--- a/sys-apps/sysvinit/sysvinit-2.99.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.99.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index c2cabc4fbc20..c012bf0f53fb 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -3,5 +3,5 @@ AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.28.ebuild 2457 BLAKE2B b53e506539facbd75c6ef6c3b8e3c4e1dd7b6339961fb3f0766e853e7b93f320619a09a3f135b80bc2b4d5da3324834f5cc71352d35f1a8ee3a1b4dfa82c89d2 SHA512 d8890c2cd982810ce7e00e2c20037c9cc37af072d6340c5e0db38c725601818e4604e6781835b02a75070a9ea99ca80844041f19b02c7287fcf37520e8dc5aa2
+EBUILD tcp-wrappers-7.6.28-r1.ebuild 2509 BLAKE2B 79b2fbb4710eab85626c207d78f1d0cdd4b995ff3e32b267ac9be30b6fe29602cb6ab395f617c9a9bb67a598dc16a33da48765a7fd1e796a45f6cba991c8e1d3 SHA512 b1007fc41f6c357c0f2b1e2ef62396dd1e30ed09994ac77935fe95b580947affd0674494097a38b0174b1af99310b56f87dfd022ae748b57d2684c44f9e8b4ef
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28-r1.ebuild
index 23e5f2a73fb1..cebc0be86e4b 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28-r1.ebuild
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 netgroups static-libs"
 
-RDEPEND=""
+RDEPEND="netgroups? ( net-libs/libnsl:= )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 02aea82bd84a..70d88dd1b21c 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,5 +1,3 @@
-DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
-EBUILD texinfo-6.6-r1.ebuild 1343 BLAKE2B 4174e58d56ad4020954a3af7a6366d3bb51f2d28b2a9e8c9a604dbda878bbb6f13bb9017169a8d2222a5559fcdbdc4501a22607b97fcf6b83e9966e57a2b9ea1 SHA512 824e89af5382b0cf25aa115eca341014c8d399d2715fccf75e1219bc7cb5bb12559ff1b5798aa8e603145f89a2d3e3b351a7509deb5268b97e42b33e21f98d52
 EBUILD texinfo-6.7.ebuild 1941 BLAKE2B 26caf30f52c31e1de0718ae11eee9043910d6d80b81c70797102c3a026c6e767ff68a9f6f055fb67c88019c56af8ed678fed14c5d4ac290d76c2a42fb9adfc38 SHA512 c1e18457082628d892e5b58a3f514a1058b0b53a681da0863f72da6a6120d98dee47104155e84618fbab2e794f6571cc3803c32577b9602ac670ecffe98efa69
 MISC metadata.xml 539 BLAKE2B 5445a2b07c6bbecb3c33c64e80227f57ff80b17b0b440a3d0220a88ed1bb930deb1b0274eff8db1a64fe82c64e7f34b1183c533b1a1ca7b41694668e2c5b682b SHA512 4d0b0b223f04e6ebc4e7a7546dbf6b731fc0676657c8d3c3cd38a54c327f4eebda927f1793ead3f8f255bc82d7884b5acd6df8431674db48c2ebbbd1098cb032
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
deleted file mode 100644
index efa2711dee61..000000000000
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="nls static"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:0=
-	dev-lang/perl:=
-	dev-perl/libintl-perl
-	dev-perl/Unicode-EastAsianWidth
-	dev-perl/Text-Unidecode
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.19.6 )"
-
-src_configure() {
-	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
-	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
-
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-external-libintl-perl
-		--with-external-Unicode-EastAsianWidth
-		--with-external-Text-Unidecode
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 951d85427f0d..13fbb6755835 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -3,5 +3,5 @@ AUX udevil-0.4.4-include-sysmacros.patch 398 BLAKE2B 36369bc56a5d3b66dd455f8fc48
 AUX udevil-0.4.4-no-libtool.patch 223 BLAKE2B d31cc00b2aeb4143a2ce58f36dd13f3701ed8f8e30604e73757c3c04e21fd80fb69f50d80bfa30360b83c3a8a882e72009c99767cbb7a0c90c3403b00477c92d SHA512 bc77d93ac17f8345b973df6dd81890dc3e437e7926d53db5cbbbb17a5c3f2067ad0ff027b0d870c15276a5528bbc869bed6d7ec5b090927e671865783ffc37a2
 AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
 DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
-EBUILD udevil-0.4.4-r4.ebuild 2004 BLAKE2B 1e18b59577fdcac142dbdd87471e71d53ed271af55a359eaddb0db1d6716844230237daf2f46a685bb136e0dbf9a9353925cb4f5565389dc49010066c825770a SHA512 ba747431b7ff309b36c72a26e341df81b7973749b7c720d8357fe5e3819b4b1733d207959ea1101916f3525699ee87b6c08737f36fbca5759e3f997f509bb543
+EBUILD udevil-0.4.4-r4.ebuild 1956 BLAKE2B 64a34f4fdc91f49935b5e11423a760b056f3a7a897d4b37df345a7b9a499cb75e7ffbaea0cd0512fa2b7343c8e8ff16fd72f8d4ec3ad62cf6a78c2c599eaa3a9 SHA512 1c25bc5324026201717f1fe9b9462e9a23650be0f0874f81cbf0c49eba6443aa47909aadc5301aedec9ca41515814b23874f9447b95c7cfc8161b72249d6469e
 MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/udevil-0.4.4-r4.ebuild b/sys-apps/udevil/udevil-0.4.4-r4.ebuild
index 600d73427d23..88a5cd1e2759 100644
--- a/sys-apps/udevil/udevil-0.4.4-r4.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r4.ebuild
@@ -63,7 +63,6 @@ pkg_postinst() {
 	elog "  net-fs/curlftpfs   (mounting ftp shares)"
 	elog "  net-fs/nfs-utils   (mounting nfs shares)"
 	elog "  net-fs/sshfs       (mounting sftp shares)"
-	elog "  virtual/eject      (eject via devmon)"
 	if ! has_version 'sys-fs/udisks' ; then
 		elog
 		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index ed54b954cabb..6094e140a069 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,6 +1,3 @@
-DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
-EBUILD usbutils-012.ebuild 1198 BLAKE2B abc18554c8bbc212899f754a773fdf340664e81d5b123bd39c417683bd3b0fe577f4f99f03502ac35fdb942487d1575152c3bbe66add18fa13a764ba41e53942 SHA512 cdbe4025facc03ba57503aa5538f3e08dbda84fecef938950e474fc8cfe495ccb3d3222a4462b4f0179bd546db5a126cfe266b55d35cfb5bd6ea10512472934e
-EBUILD usbutils-013-r1.ebuild 1273 BLAKE2B 9e3dca2dbd592cb04de860c9b1d27dcc6b7142687c0add196ac7c8002c6c4764f7f7883c52965350188c88e0069a2a5d2f8d40a6b7eb37c4e4c345e86a5eca89 SHA512 ac89837fee8a114eecb448bd63d698de7ce277d8a935d4326e43f2f08d2df752302a63c6db86088d334e2b2dab41b7ebd484ba8bdaa6b1ed22e1cc361ad7f549
-EBUILD usbutils-013.ebuild 1200 BLAKE2B 409776c56eb61d8eb175c05bf3bee47644ad616bd7bcc407c45c956a9da955687e05df87e9c5db53ae0df33b14307817d6616c614c405e7d997102118d452bfa SHA512 126041a5f1f37dee41d144a1010da635550ca15a9797f15fb2270774aefbfff4a58cc2e048528402de76586686ee522e54c8c76dd67b2237d2f3a0407069c686
+EBUILD usbutils-013-r1.ebuild 1266 BLAKE2B e715e4c409dee03b1ea41f1fd1ba92d66034f3ce920831b7ed637d2c1a10ec09b887ce0b5173fcc762335c15a86df9584e76625a5a490e21aad03a3870ee0f66 SHA512 e41434a389bd60fc473427eb5f58f27a4856c5037016affffd8c3d09bd5661092e4af9b3504d6ad655981976c70040cdf0b68b08faccc504965642b33cea1f8e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
deleted file mode 100644
index 31a5985fb585..000000000000
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
-	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="virtual/libusb:1=
-	virtual/libudev:="
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	use python && python_fix_shebang lsusb.py.in
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datarootdir="${EPREFIX}/usr/share"
-		--datadir="${EPREFIX}/usr/share/misc"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}
diff --git a/sys-apps/usbutils/usbutils-013-r1.ebuild b/sys-apps/usbutils/usbutils-013-r1.ebuild
index 9752da75f03d..b63d45b9d12b 100644
--- a/sys-apps/usbutils/usbutils-013-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-013-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild
deleted file mode 100644
index 4b99cf62766f..000000000000
--- a/sys-apps/usbutils/usbutils-013.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
-	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="virtual/libusb:1=
-	virtual/libudev:="
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	use python && python_fix_shebang lsusb.py.in
-}
-
-src_configure() {
-	local myeconfargs=(
-		--datarootdir="${EPREFIX}/usr/share"
-		--datadir="${EPREFIX}/usr/share/misc"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index a296d9e83f60..5f43911fd7c5 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,11 +1,6 @@
-AUX watchdog-5.15-musl-nfs.patch 736 BLAKE2B f8199f2e27103b7b7c96720678bc2310bbf9e96d651d7f5c4be089b4e783c7d4912e43a862cd148320c7cb234472e3ff3bd176358dbf8aac91e522cc12d53b98 SHA512 86c686f35c3934e652653620c84355ed35284bc1bd32fe493c766f4d7fdd4a3eeb77095b66c9cf229de642d1a1c168e6d27f527ebe58a926fe4c8f1d84421343
-AUX watchdog-5.15-musl.patch 669 BLAKE2B 1981921b9139344dc1f3aa145fd1a1569ced86259edb6da7748bd030d867e82c88f78b462bd5b08a1b1514ef8f4e495840cd43f4b5454fab3589eadc7bdfd1dc SHA512 9286e22b34116fa832fec682f72b3989a1022e3d5618b80390d869ce4ce75ed2ccaeb4d61a17bc421968c8edb13acc6e032b139996838fd8593eceb0aa469220
 AUX watchdog-conf.d 158 BLAKE2B d998b3cd1788d60d5aeec2872f39f748f75fb9bb6e3ef643464e355179cc01bed2f78f0506209e2911398b072c48d109aeb3b7be37f3aee89c382361cd2f2748 SHA512 73178a2159a8f9420db1e5a6f2b3fea01315074f3e109acd5d02140e610db81aa771a2ab96b5ca1cf1cc1639679d26c0b42e511b1ab08a89957a8f4dd66f1c62
-AUX watchdog-init.d 861 BLAKE2B 5fbda896379eb22d6beb50c7839f9c10c463cea5491b74472ce30108551c7095bbac1bfde6f5089d81426809808bcecdea03fc0e0c7dab942dd4136cc1809aeb SHA512 f1a84e90dd6f169a6e28f38b9f362e43256bba0b4266fead707578705a8f404d9f256022d94d24f1555847765a27e5a7017b5e1fa20a613fdb0a41d305638231
 AUX watchdog-init.d-r1 773 BLAKE2B 7d5bdf4e349f558f12e8250de5abf39278e3d7bfa5344225ce717cd3575573853f11feef8cdc3aa526280f717f9ae43bd42191789ddf81bb4beb32afc8f38bc5 SHA512 c07f0e3f026a86ecbcaa839c5711420fe00433a9ce84c3a7e3f4de4a1d90bc5ad6646561acaa1d1df2d1adb638dd6817497c4c538574ac894deb6c7451b2964a
 AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0a7b6925554f24b80c76adf76bee20790e0d100c8372e4e35a3b0826d6192267f5addf7155d414cf4c SHA512 5eb489e72351db8a881d84fc15730a91ca2a108641031196ad5374aec5e01fa5b859872fa27c3382b4637482a5c8dab7efa61057f4663ae6c49c4ed01e9d8abd
-DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
 DIST watchdog-5.16.tar.gz 203910 BLAKE2B 517f2f8085829e5c5ff576f1dff920a2667d0e96a71dcbcebf381ccf349e95dfb0b7b598b565eda4cc8ec31f5f34e367dd719eeaf522cdee074c3bc23589dfb2 SHA512 1c9c921570ec7ddc3e4ff88b2029f1c3865277e547fb8970575df4b61fdf1f06f443f49ad09f11c29d913ca7d6ab05c5b19ec049ac218a8bcebd20b1bf5f0bbd
-EBUILD watchdog-5.15.ebuild 969 BLAKE2B f7cd5a3efd5ba719eaad6c24e87a5255b6e657ff50d5a079f14f085fa4991fd5cb325ce0ef1daa419d1d3c82c2bc5bac88260dd75abacd23a74cd21d00668a9d SHA512 a5f8b3f6591896e29d140d63d2b05d5e50efad3920540db7937880b73dcbafa82da8b54fc32ee880d82697a07288403e7575d7797707c807a508a3a412a967ce
-EBUILD watchdog-5.16.ebuild 906 BLAKE2B 76e668ee9c03e7663f183581863067c5b17b61a675d155bc78a5f1fabbd4ec7338e3d91ffd7cf7ca4524f2c2660ce5ea1af4fdedd539413739ad6896f4d37338 SHA512 f90a9ab0e219b7d57284a1f4c5660e86e9999ece67a55855719a458d5e60639449d68cc5d0543bae1591e67d1b1dcba1e958cef2f7e1935a16cb30fc903e654d
+EBUILD watchdog-5.16.ebuild 902 BLAKE2B e7fa06bd1ff7f3fc58e5ca0ab3b5bb4f52fde8d800b7301193a05e2f31c439dad0c17a129b69c29d753c12654be140f4494417eb3df8f867d15f5f1cacc4d3c8 SHA512 1062fbf8df8d14bf9746a36fd32db6aa8503bbfa18c0da2207f43defec6dd78e65b9fc743b716126b0c5836f1cf4a0d3eca972c6134d361fa4b1ab0699f82335
 MISC metadata.xml 405 BLAKE2B 47880df93bf397e1a7d905a0ade7c385eb7f97ca4e99fd5687f15147adb093da1312f518b6179d7ab9095a355d73147091787a0d3dc90200cef3e8cf7320a8c8 SHA512 36da0e0199b41608190b0e39de2b82bea5516890208c57744b93e527904501de01b1bfd4e20fc74450bd7b9ac4d152e0d57e31a35deca0b1edddc9ce60846d0b
diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch b/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch
deleted file mode 100644
index bee4ddc8d7bc..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit f52c40680f0aad44b9ae16648803453ec00cbb2c
-Author: Paul Crawford <psc@sat.dundee.ac.uk>
-Date:   Fri Dec 30 15:55:45 2016 +0000
-
-    Compile with musl when nfs is disabled
-    
-    musl does by default not ship with rpc headers. The watchdog should
-    not require rpc headers when nfs support is disabled.
-    
-    Patch by Felix Janda <fjanda@users.sf.net>
-
-diff --git a/include/sundries.h b/include/sundries.h
-index 4379982..98c489a 100644
---- a/include/sundries.h
-+++ b/include/sundries.h
-@@ -9,9 +9,11 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <stdlib.h>
-+#if HAVE_NFS
- #if !defined(bool_t) && !defined(__GLIBC__)
- #include <rpc/types.h>
- #endif
-+#endif
- 
- extern int mount_mount_quiet;
- extern int mount_verbose;
diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl.patch b/sys-apps/watchdog/files/watchdog-5.15-musl.patch
deleted file mode 100644
index ae62c8014e5b..000000000000
--- a/sys-apps/watchdog/files/watchdog-5.15-musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit c5cb4e1a0339844ae3f55ff1dc4a716c28012f05
-Author: Paul Crawford <psc@sat.dundee.ac.uk>
-Date:   Tue Jun 28 18:08:48 2016 +0100
-
-    Include linux/param.h for EXEC_PAGESIZE definition
-    
-    Musl does not include linux/param.h whereas glibc does, so it fails
-    to build on musl. Patch supplied by Khem Raj <raj.khem@gmail.com>
-
-diff --git a/src/watchdog.c b/src/watchdog.c
-index acf6450..486384a 100644
---- a/src/watchdog.c
-+++ b/src/watchdog.c
-@@ -26,6 +26,9 @@
- #include <sys/param.h>		/* For EXEC_PAGESIZE */
- #include <linux/oom.h>
- #include <linux/watchdog.h>
-+#ifdef __linux__
-+#include <linux/param.h>
-+#endif
- #include <string.h>
- 
- #include <libgen.h>
diff --git a/sys-apps/watchdog/files/watchdog-init.d b/sys-apps/watchdog/files/watchdog-init.d
deleted file mode 100644
index 734a02cdbcbe..000000000000
--- a/sys-apps/watchdog/files/watchdog-init.d
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	use logger
-}
-
-get_config() {
-	set -- ${WATCHDOG_OPTS}
-	while [ -n "$1" ] ; do
-		if [ "$1" = "-c" -o "$1" = "--config-file" ] ; then
-			echo $2
-			return
-		fi
-		shift
-	done
-	echo /etc/watchdog.conf
-}
-
-get_delay() {
-	# man this is fugly
-	sed -n \
-		-e '1{x;s:.*:10:;x}' \
-		-e 's:#.*::' \
-		-e 's:^[[:space:]]*::' \
-		-e '/^interval/{s:.*=::;h}' \
-		-e '${g;p}' \
-		$(get_config)
-}
-
-start() {
-	ebegin "Starting watchdog"
-	start-stop-daemon --start \
-		--exec /usr/sbin/watchdog --pidfile /var/run/watchdog.pid \
-		-- ${WATCHDOG_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping watchdog"
-	start-stop-daemon --stop \
-		--exec /usr/sbin/watchdog --pidfile /var/run/watchdog.pid \
-		--retry $(get_delay)
-	eend $?
-}
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild
deleted file mode 100644
index 889279958581..000000000000
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="A software watchdog and /dev/watchdog daemon"
-HOMEPAGE="https://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="nfs"
-
-RDEPEND="nfs? ( net-libs/libtirpc )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl.patch
-	"${FILESDIR}"/${P}-musl-nfs.patch
-)
-
-src_configure() {
-	if use nfs; then
-		append-cppflags "$($(tc-getPKG_CONFIG) libtirpc --cflags)"
-		append-libs "$($(tc-getPKG_CONFIG) libtirpc --libs)"
-	fi
-	econf $(use_enable nfs)
-}
-
-src_install() {
-	default
-	dodoc -r examples
-
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/watchdog.service
-}
diff --git a/sys-apps/watchdog/watchdog-5.16.ebuild b/sys-apps/watchdog/watchdog-5.16.ebuild
index a9e42800d859..a8bd491e861d 100644
--- a/sys-apps/watchdog/watchdog-5.16.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index d7b4dc89fad9..74584c15be34 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,17 +1,5 @@
-AUX xinetd-2.3.14-DESTDIR.patch 1725 BLAKE2B e6812de025a32c6adce24093753a4e44a345096ac8d2bd43d34e7472bf2deaea4c3b70abc9f0fbc98bf933b0d90166abcdaad9c829adbebe422dc51265306c6d SHA512 31976a84faf2f890a0fb33404c3e07d399be5eeaad49b00f52a459df38f12bb3ecd743577c5a7aa4f0fd90c025a262683307e736e97d51e35591756a7c69698b
-AUX xinetd-2.3.14-install-contrib.patch 728 BLAKE2B 4624096a41c3ce819f8976b561e761a65b7308dbaa7863e6c287f99a1ac206497c5ef9dc0222a0d81ab565d280394a44573b3ba7734879b24644a53efe6e5f77 SHA512 15b8b1649b02e2d8834eb057bef7345497d230a4b10600e9b3e2a83511f9c7df115009ba1f38b1c4907417735454cafbbc41a96266fbb4370c584ecf1aa1638b
-AUX xinetd-2.3.15-config.patch 437 BLAKE2B 50cf65153ee242dd0bc7ec587ee7f50de6d7385e1f6ffa213b11e70f2f584d42ee544f7be297b38275290338afaf689cb0aed9d1435a14bb3e0f0b25b6a42ba9 SHA512 58a9880ca154441c5cfc3ed978a0224601d406a4422435a430b885985a0fbe7ef0d750f54047cb0d7fc5c6ab7bc35433776bb5c6c2c61525e2a04b49d509ad66
-AUX xinetd-2.3.15-creds.patch 367 BLAKE2B d2ffeb2d83b1c604556e240177417d79e2d4ce499c4fdb0b431a414835a4e2eaa5b24e01ab4e698211bfd2e63d2872ebd9456af81faa2fb755342bfe2cdfa2fb SHA512 5d1d883620ed6c1ae0e391687a1a10769eb4c2436cf8bae60ddbbb7b8d1250272c2aa7068c308ee1f3540a41fcdf8ae890a7687ff0213553c59f6a91718f46c1
-AUX xinetd-2.3.15.3-no-rpc.patch 1290 BLAKE2B 8330913acccd865b4dff0c6a918936af8736854e90e5661633d5a91b551478e3ec87990f6ac6562c000328bd5ed57918359b1fdf214e297bee2376abdf1f589d SHA512 eb7e463a4f65cd5c7e271de46d9924ae6b96bc20ca7075e4c94caafb81ad03544eebe8a610313a1c402da10e010d3efd3fb2f52d0d117b9c406700831067c6aa
-AUX xinetd-2.3.15.3-rpc-configure.patch 1709 BLAKE2B 7a7d90a8f10d8b8a5274a63d38e38bd6c93a7a7d1ccf5171cbfa612828a22ff4f04045d0d44e321caee2fa8e37ff209d6b1b1df715e38c43a16792a9f4374676 SHA512 52fea8f4d95882966e31761d67c3991eb4f9bd853761f0b6a9acea8a72774176f98265f8260467cff4779c69c2bec6764a6a48d7c6c620bf31bc71c50287f229
 AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbaed904d8387a4ac686f730e2f0ddf5ee90575bd0a7d73588a23b25ec4a6e9c73d48714f5770f5d SHA512 03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
-AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b23468f909eea22c411be11cf3e2c68757e8120db73ccc8ca624c808c6563859a29c095b94c10bbf9 SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0
-DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f
 DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
-DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r3.ebuild 1557 BLAKE2B e5befba5bea664705ccade9f99cf44ffd4c1efdc5ac3bc6a1fce6a8e55a8e8972ebe585b509c7a493882773087e3a278b1c6416c809b1aae875cee684047f60f SHA512 91d64d436c5c48e3fe2c0fa692211f7720ebf630d9443bddc1b9f68b74a310f5a3b4a8fd225c8bb5c3c475ba7e747a6fa3d6780914b1f92ebb8cae5f633d361b
-EBUILD xinetd-2.3.15.3-r2.ebuild 1374 BLAKE2B 3ff01d397797dbb3e3db0ccfe78eb74951c68ba9d597ed57d6175f780343e7e16ed79799a89bb8f45dda7a758ac44ad116ac45ba0b3b2b7c8513d1a9a127b1dd SHA512 97c3358a713966208b9e862216434b459c8725fd9d471b64b5de14c69e7481a26187ecfd9721333d2cab43c33286a10a0d2dbea202bdc260df14f84839701f48
-EBUILD xinetd-2.3.15.3.ebuild 1064 BLAKE2B 1fcdf000aa09791d386141985248e9ce25908eaaec4f40ca05f0ddac6c7288d462f7e49b14cbb67f1432d36982d71d076795ceefca354be15bfe8cbf189b95c8 SHA512 cb722070e1aa372ccb001934e1fccdd6bc66e3a926b1ffeb30811b222d3ec9965d0249f2dff7d89062e04e43b02b7dd2091d36dbf0eb223a5cbe7c7c364a40e1
-EBUILD xinetd-2.3.15.4.ebuild 1272 BLAKE2B 5b4dcb90820d53586246ee4cefbebd6e29a9ed6c3728fb03f6ede34751bdf7e85863068b31a3d9c0bebf6aa47b1bd198638d801d81b9916e92c6ea2c82b37405 SHA512 4af494a22e0168fda89c358f4e60e9bd2bb583812a5100f2c70a985b28d3e859517243d39798700f1cb4d65400c190ea994d02079b2c369b192c96eacb249afa
+EBUILD xinetd-2.3.15.4.ebuild 1264 BLAKE2B 7f84671131911d6b2a633ee5526207308cd2741b967324c2cb04f55b7a9ead38a86fab70752a0586c895ee69fcfde09c6db4d44be55b3f82c2763c12f388db1a SHA512 f0f810b9d44a0e95141e56211cbff4fa2a50d773546c8631f4843b396458c5677882cbadf51e21a7b18bd9a18abdd32dbb6094e342f49bb3c4cdf43ab3ed32d5
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch b/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch
deleted file mode 100644
index 2ebdf4c4f1b0..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.in.orig	2005-10-29 22:08:54.000000000 -0400
-+++ Makefile.in	2005-10-29 22:09:32.000000000 -0400
-@@ -75,15 +75,15 @@
- 
- install: build
- 	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
--	   test -d $$i || mkdir -p $$i ; done
--	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
--	$(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
--	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
--	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
-+	   test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i ; done
-+	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 755 xinetd/itox $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DESTDIR)$(DAEMONDIR)
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(DESTDIR)$(MANDIR)/man8/xinetd.log.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(DESTDIR)$(MANDIR)/man8/xinetd.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(DESTDIR)$(MANDIR)/man8/itox.8
-+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(DESTDIR)$(MANDIR)/man8/xconv.pl.8
- 	@echo "You must put your xinetd.conf in /etc/xinetd.conf"
- 	@echo "There is a sample config file in xinetd/sample.conf and you can"
- 	@echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch b/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch
deleted file mode 100644
index c1717e43902f..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- xinetd-2.3.14/Makefile.in
-+++ xinetd-2.3.14/Makefile.in
-@@ -9,6 +9,7 @@
- DESTDIR = 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-+ETCDIR = @sysconfdir@
- DAEMONDIR = @sbindir@
- MANDIR = @mandir@
- topdir = @top_srcdir@
-@@ -97,7 +98,12 @@
- 	rm -f $(MANDIR)/man8/xinetd.log.8
- 	rm -f $(MANDIR)/man8/xinetd.8
- 	rm -f $(MANDIR)/man8/itox.8
-- 
-+
-+install-contrib:
-+	test -d $(DESTDIR)$(ETCDIR)/xinetd.d || mkdir -p $(DESTDIR)$(ETCDIR)/xinetd.d
-+	$(INSTALL_CMD) -m 644 contrib/xinetd.conf $(DESTDIR)$(ETCDIR)
-+	$(INSTALL_CMD) -m 644 contrib/xinetd.d/* $(DESTDIR)$(ETCDIR)/xinetd.d
-+
- distclean: clean
- 	rm -f config.cache config.log Makefile config.status xinetd/itox
- 	rm -f config.h @srcdir@/libs/include/* @srcdir@/libs/man/*
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-config.patch b/sys-apps/xinetd/files/xinetd-2.3.15-config.patch
deleted file mode 100644
index b362a97dbe82..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-set up some secure defaults:
- - services can only be accessed from localhost
- - sanitize the runtime environment (so root's shell vars don't bleed through)
-
---- contrib/xinetd.conf
-+++ contrib/xinetd.conf
-@@ -22,5 +22,5 @@
- #
- #	no_access	=
--#	only_from	=
-+	only_from	= localhost
- #	max_load	= 0
- 	cps		= 50 10
-@@ -35,7 +35,7 @@ defaults
- 
- # setup environmental attributes
- #
--#	passenv		=
-+	passenv		=
- 	groups		= yes
- 	umask		= 002
- 
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch
deleted file mode 100644
index 39df3caf1156..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/488158
-
-taken from Fedora
-
-Patch by Thomas Swan <thomas.swan@gmail.com>
-
---- a/xinetd/builtins.c
-+++ b/xinetd/builtins.c
-@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp )
-    if( SC_IS_INTERNAL( scp ) ) {
-       SC_INTERNAL(scp, nserp);
-    } else {
--      exec_server(nserp);
-+      child_process(nserp);
-    }
- }
- 
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch b/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch
deleted file mode 100644
index 3bd995a0892d..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/openSUSE/xinetd/pull/8
-
-From 4278495b1858b5b1ce94d72bd619eb79aab8ca04 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Jun 2018 18:49:38 -0400
-Subject: [PATCH] fix no-rpc builds
-
-The code base already has support for -DNO_RPC, so fix the breakage
-introduced by commit 56520dcc88c35113877c8f4f52bd98ad95b44653.
----
- src/confparse.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/confparse.c b/src/confparse.c
-index 5b149dd03808..7965cc405f24 100644
---- a/src/confparse.c
-+++ b/src/confparse.c
-@@ -13,10 +13,12 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifndef NO_RPC
- #include <rpc/rpc.h>
- #ifdef HAVE_RPCENT_H
- #include <rpc/rpcent.h>
- #endif
-+#endif
- #include <netdb.h>
- 
- #include "str.h"
-@@ -730,7 +732,7 @@ static status_e check_entry( struct service_config *scp,
- 	   }
-    }
- 
--/* #ifndef NO_RPC */
-+#ifndef NO_RPC
-    if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
-    {
-       struct rpcent *rep = (struct rpcent *)getrpcbyname( SC_NAME(scp) ) ;
-@@ -743,6 +745,7 @@ static status_e check_entry( struct service_config *scp,
-       SC_RPCDATA( scp )->rd_program_number = rep->r_number ;
-    }
-    else
-+#endif
-    {
-        if ( !SC_IS_UNLISTED( scp ) ) 
-        { 
--- 
-2.16.1
-
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch b/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch
deleted file mode 100644
index 682dece1b2b6..000000000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 928d69309592704892d124b1f8de9111164c3793 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Jun 2018 22:11:21 -0400
-Subject: [PATCH] configure: add a --without-rpc flag
-
-The build already supports NO_RPC to disable all RPC logic.  Turn it
-into a proper configure flag so people don't have to hack it up.
----
- configure.ac | 25 ++++++++++++++++++++-----
- 1 file changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8d0b562ddaac..75ae7fb472dc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,11 +37,6 @@ AC_CHECK_LIB([m], [log10], [
- 	AC_MSG_ERROR([Unable to find working libm.so])
- ])
- AC_SUBST([LIBM_LIBS])
--PKG_CHECK_MODULES([TIRPC],[libtirpc], [
--	AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.])
--], [
--	AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>])
--])
- 
- # ======================================
- # Check for various headers and settings
-@@ -112,6 +107,26 @@ AS_IF([test x"$with_labeled_networking" != "xno"], [
-     ])
- ])
- 
-+AC_ARG_WITH([rpc],
-+    [AS_HELP_STRING([--without-rpc], [Do not include RPC support])],
-+    [with_rpc="$withval"],
-+    [with_rpc="auto"]
-+)
-+AS_IF([test x"$with_rpc" != "xno"], [
-+    PKG_CHECK_MODULES([TIRPC],[libtirpc], [
-+        AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.])
-+    ], [
-+        AS_IF([test x"$with_rpc" = "xyes"], [
-+            AC_MSG_ERROR([RPC support requested but not found])
-+        ])
-+        with_rpc="no"
-+        AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>])
-+    ])
-+])
-+AS_IF([test x"$with_rpc" = "xno"], [
-+    AC_DEFINE([NO_RPC], [1], [Omit RPC support.])
-+])
-+
- # =========
- # Hardening
- # =========
--- 
-2.16.1
-
diff --git a/sys-apps/xinetd/files/xinetd.service b/sys-apps/xinetd/files/xinetd.service
deleted file mode 100644
index c6f6271fd97b..000000000000
--- a/sys-apps/xinetd/files/xinetd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=A secure replacement for inetd
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/xinetd -dontfork
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
deleted file mode 100644
index 4dad4fcdcb20..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="http://www.xinetd.org/ https://github.com/xinetd-org/xinetd"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="perl rpc tcpd"
-
-DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-	rpc? ( net-libs/libtirpc:= )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch
-	epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch
-	epatch "${FILESDIR}"/${PN}-2.3.15-config.patch
-	epatch "${FILESDIR}"/${PN}-2.3.15-creds.patch #488158
-	find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} +
-}
-
-src_configure() {
-	tc-export AR PKG_CONFIG
-	if use rpc ; then
-		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
-	else
-		append-cppflags -DNO_RPC
-		export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
-	fi
-	LIBS=$(${PKG_CONFIG} --libs libtirpc) \
-	econf \
-		$(use_with tcpd libwrap) \
-		--with-loadavg
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install-contrib
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc AUDIT INSTALL README TODO CHANGELOG
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
deleted file mode 100644
index d5c268f31bbf..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic systemd toolchain-funcs autotools
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="https://github.com/xinetd-org/xinetd https://github.com/openSUSE/xinetd"
-SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="perl rpc selinux tcpd"
-
-DEPEND="
-	rpc? ( net-libs/libtirpc:= )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-"
-RDEPEND="
-	${DEPEND}
-	perl? ( dev-lang/perl )
-"
-DEPEND="
-	${DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-rpc.patch #651838
-	"${FILESDIR}"/${P}-rpc-configure.patch #651838
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -i \
-		-e 's:/usr/bin/kill:/bin/kill:' \
-		"contrib/${PN}.service" || die
-}
-
-src_configure() {
-	econf \
-		$(use_with tcpd libwrap) \
-		$(use_with selinux labeled-networking) \
-		$(use_with rpc) \
-		--with-loadavg
-}
-
-src_install() {
-	default
-
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "contrib/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc README.md CHANGELOG
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
deleted file mode 100644
index 7a903b612a35..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="https://github.com/openSUSE/xinetd"
-SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="perl selinux tcpd"
-
-DEPEND="
-	selinux? ( sys-libs/libselinux )
-	net-libs/libtirpc:=
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-"
-RDEPEND="
-	${DEPEND}
-	perl? ( dev-lang/perl )
-"
-DEPEND="
-	${DEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with tcpd libwrap) \
-		$(use_with selinux labeled-networking) \
-		--with-loadavg
-}
-
-src_install() {
-	default
-
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc README.md CHANGELOG
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
index 5cac335e332f..98f924c040b0 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="perl rpc selinux tcpd"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-apps
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)