gentoo auto-resync : 26:12:2022 - 14:07:48

38 files changed, 288 insertions, 1288 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d04a5b805972..b4a46c45a470 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index 46ed3417876c..389fbd276a21 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,5 +1,3 @@
-DIST cracklib-words-2.9.7.gz 5537586 BLAKE2B 242afa5e3615b159c59d27c99b87f008f245351cc7e4bd8dc975e66b4ef98456841c6a213282744d39c221c8646dc8e0c5ad99f277f37ae3e64bc949f6b57187 SHA512 1fa34b0a2e16d6906982b248f1757bf5bf8154d8d7e8bab94a4ac25080c41434d3828a2c8dd5065e9be586f36480ab70375f09e0bb64eb495d96a460619e2bae
 DIST cracklib-words-2.9.8.gz 5537586 BLAKE2B ca56229852211094c17b2a612100b5b6e4e4f6aafa7cbfae8f779296370b01e5cae26d7d51dd69af6291946a1781cd19f8652bdff7f358c2e50d26c9e263c2fd SHA512 1700c56b9776b7ae4684b9ab1e784dd7707550bce2149301f662618a4f00a2eb0ba2d1a206c09aac22f7d95bc561544d412d2fdac5008fc3aabc4872e8a74afc
-EBUILD cracklib-words-2.9.7.ebuild 730 BLAKE2B bb11fba3622e072adb2a0b337ceeb58589bcbb871f256ae3c746e91307e61c964295c2bfb6ab9d22d7ba06baeb49a1d46847cb8cbcba0a3cb6feb237409da8d7 SHA512 e0a6feb971675e447e7cbf3f8f3ed8d3325fa54872103f39d810594ac47fab85ea87bca70def7d92e052c0c57cac88240be077c86e40f33a39b5e0c930b30007
 EBUILD cracklib-words-2.9.8.ebuild 728 BLAKE2B b6e97b83706fd6c937d8246b3d31b3c55327eb3fa91078c592369355bc4e5ed72e760ca350439213aa38218378eddc7dd511571a3ea780cfefe8aa7f5c78af8c SHA512 92b24a5dec549ae8641b6d8df8bc84171f7e4ccef9a215cc645887aee3666c36d3dff68109d80ed1462c412c6900f4229f273bdb8051ed4a3a2fa4da8d099b39
 MISC metadata.xml 417 BLAKE2B d57320d6e9f27d403b1fbeb93aab3a2ee1773ccbdafb0d56290a767cf0c4b0d12e20c2fd8a12e63bb132fd0ceaa06b7c7e0d6be9d3ab841e0af67164a3006d10 SHA512 e632e2c3f28aee9318c902efdcf62960d8c2420e0bd7beae9b352d51d34a1c3d92a4fceec0daa32c2d11338b38eebdc9ee7d48951abf9f0d2a82dd58dbb74bca
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.7.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.7.ebuild
deleted file mode 100644
index 8ec30d86f908..000000000000
--- a/sys-apps/cracklib-words/cracklib-words-2.9.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: ideally bump with sys-libs/cracklib
-DESCRIPTION="Large set of crack/cracklib dictionaries"
-HOMEPAGE="https://github.com/cracklib/cracklib/"
-SRC_URI="https://github.com/cracklib/cracklib/releases/download/v${PV}/${P}.gz"
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	insinto /usr/share/dict
-	newins ${P} ${PN}
-}
-
-pkg_postinst() {
-	if [[ -n "${ROOT}" ]] && create-cracklib-dict -h >&/dev/null ; then
-		ebegin "Regenerating cracklib dictionary"
-		create-cracklib-dict /usr/share/dict/* >/dev/null
-		eend $?
-	fi
-}
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 19dfedb9566c..db0b867f6b4d 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -1,7 +1,5 @@
 DIST fakeroot_1.27.orig.tar.gz 544301 BLAKE2B 5e887d43c8bedaecbe51eb7f606d6bace3a9f191a7cf4be32362e1ba97e438413f04ed644532d3a386a46f3a569bf0104c4f38272e5ff46e3705c17896fef972 SHA512 cd98b8cd1064a5a11c6f25bc1d9cb1fb1bf0787f50772fead301470d1769c08a89a1510402b099af334d9f126cea5d3bd5d73e27fb91b5afc1ceebeb9ec3f926
-DIST fakeroot_1.29.orig.tar.gz 549383 BLAKE2B ccdc5e793ce6a6adc9ffdb9346045e144dcd802ca8ffcbd188010ab759861d0e0ae81b3baa256546398c2ddab31d1f795f327130cb1f7bb1c3eee07e7282e94b SHA512 d0f02c36cfe4e24f1588894bd732ff5a6fc0e921695236311019a63280efdca8568f2e974672145eb7c4d57f64a15a77d23658fd4aeef2ca24901fc66259e4dc
 DIST fakeroot_1.30.1.orig.tar.gz 551219 BLAKE2B e8f7e69d5be0e8e87a365f59f61a848ade0a10ab926bf10262ffd32f126fa0ade92be66f377ea8aba907f6a1ece85b68544ee52b08c45287853d37ce492cc015 SHA512 a7ed2d86c7adf3e662e79b977c23247bf942fddf98a11c370389f0c43dd51e8e038c8489d0bb583ba90427c832fa36b244880034d25cb475f27ad68a5d7cde0c
 EBUILD fakeroot-1.27.ebuild 1873 BLAKE2B 403342870cec943c9293250b47cc0c830c1bb69d5b341cacd3427c81bc9c04b39a16db8aeca88dabcdc670998bf3e2a312ea7520090c738bd450663735fa3e94 SHA512 ac5db48a976bb2ef41e03dc82c8617428ee3f923e5044085b6eac1be22c852227cd4f39d18092a776f99142de1754cb203c22971a45f304c281ce9e8a0981597
-EBUILD fakeroot-1.29.ebuild 1885 BLAKE2B 964b15055609b218b8b62703e9252d55675e4658cb37706e12f47815258addc0841d42428274dcc7e6235ed1cc68b7092177c95df4a098c9f278f49455a47266 SHA512 3a495bbf7d4b6965cffcc2c43c41e2415dc51fb44149e6cef1ce2566ca9ee3b0c80704665fa6cbf65c399a030e2ce322ab72b66c62a732d6953fb310793d58d9
 EBUILD fakeroot-1.30.1.ebuild 1885 BLAKE2B 964b15055609b218b8b62703e9252d55675e4658cb37706e12f47815258addc0841d42428274dcc7e6235ed1cc68b7092177c95df4a098c9f278f49455a47266 SHA512 3a495bbf7d4b6965cffcc2c43c41e2415dc51fb44149e6cef1ce2566ca9ee3b0c80704665fa6cbf65c399a030e2ce322ab72b66c62a732d6953fb310793d58d9
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/sys-apps/fakeroot/fakeroot-1.29.ebuild b/sys-apps/fakeroot/fakeroot-1.29.ebuild
deleted file mode 100644
index 523ceccc2c7c..000000000000
--- a/sys-apps/fakeroot/fakeroot-1.29.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="de es fr nl pt sv"
-inherit autotools flag-o-matic plocale
-
-DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
-HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug nls test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/libcap
-	acl? ( sys-apps/acl )
-	test? ( app-arch/sharutils )"
-BDEPEND="nls? ( app-text/po4a )"
-
-DOCS=( AUTHORS BUGS DEBUG README doc/README.saving )
-
-src_prepare() {
-	default
-
-	disable_locale() {
-		local locale=${1}
-
-		sed -i -e "s: ${locale}::" doc/po4a/po4a.cfg doc/Makefile.am || die
-	}
-
-	plocale_find_changes doc/po4a/po '' '.po'
-	plocale_for_each_disabled_locale disable_locale
-
-	# We could make this conditional and disable the autodependency in
-	# autotools.eclass but it'd make it too easy for NLS builds to be broken
-	# and us not realise.
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_sys_acl_h=$(usex acl)
-	use acl || export ac_cv_search_acl_get_fd=no # bug 759568
-	use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING
-
-	# https://bugs.gentoo.org/834445
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270
-	filter-flags -fno-semantic-interposition
-
-	econf --disable-static
-}
-
-src_compile() {
-	local enabled_locales=$(plocale_get_locales)
-
-	if use nls && [[ -n ${enabled_locales} ]] ; then
-		# Create translated man pages
-		pushd doc >/dev/null || die
-		po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
-		popd >/dev/null || die
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 408e8837c8e5..4470132afbef 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,10 +1,8 @@
 AUX file-5.39-portage-sandbox.patch 457 BLAKE2B ff4b67570144d5995ef62326da5f7a4ac5fe4befc3db56ff6d6a711c84bb4316da9e1a203326a6bc219066acd8e40634bf17f28f95d583bfa2f3d4698bcd57fc SHA512 20f66d918a605233f733fa6f5c038d9c56ec1175e706b76b16ecb8be81d64d79c3a932824b61092bf1edcd55c29fc2bcfa8bdf506e5717c10e849ec6110bbd3d
 AUX file-5.40-seccomp-fstatat64-musl.patch 578 BLAKE2B c2c074e4dca62253303bae3af88a7ce0bc7d3efd608bd7269d624ad69b0fe4022db38efc5bb63d8f6d1f7bf45c2a1d749c406e76cf1ce42be731e663e2874ad5 SHA512 008c2a2c18b14eaa49f62b87fa14f4bea46bfd56efda17e49541fd51d87201d4d5511d3aae50b53dfcd68cc8e9a38884711ac59458acff9bf3290e267c2891bb
 AUX file-5.43-configure-clang16.patch 473 BLAKE2B 4f98016638a5afb5e7dd8c1085077d562a65811585971f5c5dd3c36b1848754900e2c41779c55b69b65c8ca07533f379623e230f7cd9cecd00318619572f1e24 SHA512 96627055e6a970fbad2f8a3c8d6ad5b326e89fceab081187e012c3a363975bb3d2368320653093121ef132fa80e4c9576278e3d58aee4b5a4afc26aa88ecd5c7
-DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
 DIST file-5.43.tar.gz 1162786 BLAKE2B aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c SHA512 9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
 DIST file-5.43.tar.gz.asc 195 BLAKE2B d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f SHA512 c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
-EBUILD file-5.41.ebuild 3347 BLAKE2B 413305c675ac4b0af437e2ca48d4edd3ca29bbd3cfac376ebaed000142eb5a191f7d1c85449838ae204ec6c294828af68cfd7e6fe885b82c255d0570bc16b18d SHA512 396ef33817680b5bd48d7239e455f3c798f8813267ab7ea19dae7f845ad039164b88c6600887aba4254916a4ec857baaf01b949c6276510490e089d1f5b52f9b
 EBUILD file-5.43-r1.ebuild 3748 BLAKE2B 5cce5b890df2d675984dd049b669d4160e9a714d948b4c7213047eda7d0fb4f68bb94059412df0ec222cf3e1b2d3b0bf249e0f13175e8a6fb266f49e3917a61a SHA512 cbed9dfc83dd46e449533c776440e551e545a4c5d215b583ad10aa20ea61917dfb2d84f62e6a858696ac1193253757c67540476e90b79f69029ed48feb393958
 EBUILD file-9999.ebuild 3870 BLAKE2B ac7f37d005c94d589cf9663a2443d7ea49df93e52da2b66c60d1e755ba787810c1885d47268e424857e19755786d69660415f137baf3f4b2325b40e94dc998a3 SHA512 d44ae484b41b20df592a0b69ce054557a963f8b63b956f9ec70564351d7c23ab26d969bc3f1d914a0440da7dad72b1ae413193c1e6cc1a1263e4052a64028309
 MISC metadata.xml 565 BLAKE2B 737512e354fedb4483608b04c594a486c0d8a0f70d23d306c59c78dedb0c8116f80ff558926444b9d9b9ef15805b3826163523b5644c88f01a330be1b8c9a76f SHA512 f240bf9e064c6e6f5b63e3265dfe3adf5b1d2c2b5b2456b79ea7451580150271ccb4097d33967de57ba767fecbdbea51fb62ccb683fcc5e1cca101be660ffd19
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
deleted file mode 100644
index 14fa1ec11ad8..000000000000
--- a/sys-apps/file/file-5.41.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
-	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README.md python/README.python.md || die
-	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-	econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	if need_build_file ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file ; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT # README
-
-	# Required for `file -C`
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 8283ea443ece..4ec5e1703e94 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -6,5 +6,4 @@ DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e6
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
 EBUILD grep-3.7.ebuild 2274 BLAKE2B b847a17bfe835e573a6406c728e99c1af5687bc2e83bdb4c1b6103790f587210c5bd3f4121c7fb83d8c96805a6a7fc636f06050df1f8f591d95e931f2cfecbc9 SHA512 dace79b242b68187cf8d756b4c91a7873eb8c1b1a3f631b67bb07192a95c4c4af521db19e6a943ae03f1d885317c0d6f497e129c7644e36d5dc97963415396ee
 EBUILD grep-3.8-r1.ebuild 2870 BLAKE2B ef19db94761e3e8fcfd6bdd03429bdd16501cf4724597f0aabff96f4f1d1712a3307ee6b87e9888e0f73de1f2d1ba31769211412aeb42687f24bd3fd8474861d SHA512 3e63dc69b45d4903241cc54ea5efbad05db1d6f7874671c803007e728932aa18472bb777be830ddba4ee5e47ef60f0f01972f2339fb89136f90960d118b39158
-EBUILD grep-3.8.ebuild 2168 BLAKE2B 0b2a09225597916015eab1a036aec94af8fbbd80e61010262cb1eff62fa10ada13e22fba7f7e1192d904b80817e34ecb61b30dede0aab4d615b2bf7d8b94fc59 SHA512 c1c3228795c6cc2d3f07f75c49d5e5834b08d8340420450ef380c99ef9275cc7ee8de4ada5fee83f11cca6abe364f5a6083531d9db6fe8da9c5977cf40e4566f
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.8.ebuild b/sys-apps/grep/grep-3.8.ebuild
deleted file mode 100644
index 7f5d56e74b26..000000000000
--- a/sys-apps/grep/grep-3.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="https://www.gnu.org/software/grep/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Subscribe to the 'platform-testers' ML to find these.
-	# Useful to test on our especially more niche arches and report issues upstream.
-	MY_COMMIT="98-c9ac"
-	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
-	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}"/${MY_P}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="nls pcre static"
-
-# We lack dev-libs/libsigsegv[static-libs] for now
-REQUIRED_USE="static? ( !sparc )"
-
-LIB_DEPEND="pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
-	sparc? ( dev-libs/libsigsegv )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	nls? ( virtual/libintl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-grep )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	default
-
-	# bug #523898
-	sed -i \
-		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
-		-e "s:@grep@:${EPREFIX}/bin/grep:" \
-		src/egrep.sh || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# We used to turn this off unconditionally (bug #673524) but we now
-	# allow it for cases where libsigsegv is better for userspace handling
-	# of stack overflows.
-	# In particular, it's necessary for sparc: bug #768135
-	export ac_cv_libsigsegv=$(usex sparc)
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable nls)
-		$(use_enable pcre perl-regexp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index b09321629d78..e2e342bcf115 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,9 +1,6 @@
 AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e23b468a4fbc0f5ac545d8a1b214168769da94271242b2119d480e34dbcaa734b636231021c03e2a57f585426cc SHA512 d3f76575074806c7981aacdf7a5a4e1e97a2afbcd09e8821cf1c064f8960b397e2ccdd534fb95b91f43f35c481f94463fb1fe485189436bd5de8178823d7c9eb
-AUX hdparm-9.64-glibc-2.36.patch 778 BLAKE2B 4d85e81e38954a0262e2fa9b5601a2fb7c049c2bd9f8ef359fe6bf2fed04c749aa6556ff154c035cda31903b2079aeaec5a29865d15454e5eb903750d54d6f94 SHA512 628052e920c14902db3013d4c7172bfd2970b3fd102f4433d964a37386d8a53ffd58884de4f71f6347f0a287fa005ac8305026650724959b54cac571e113e27a
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
-DIST hdparm-9.64.tar.gz 140307 BLAKE2B 0196f3ccec4005c542b834d8426cc6f64694783da3d4a064e898e25d17aab3aa0d9621276607169f2104c9a9804f9020554d836ded9efb16367a8ac4c9c9b146 SHA512 c561825143d8872cc2940bd6ba72162f91792bd63b6a8511058e79cc96feb6a4a9d22275581ef2eefab64a4035587b3a63175ccc58fa46f1059b4680d9d58ec4
 DIST hdparm-9.65.tar.gz 140425 BLAKE2B 79b1c16e7807f82a992ed7f22faef57045c56da4a281fbd8db3b8846b193ccc4b42329fa6abbebf8b652fbefb13aa0f18dfa726e802e8e1a45c94f414fb303b9 SHA512 4ffc8902b90cee10d68af8ddb9f3b9454d523ecd49cdaaed254b4d7a999462a8ad5ec1bb5d7684b09fefa41b5941ab533b167dad290003b51c795a633ca88913
-EBUILD hdparm-9.64.ebuild 1039 BLAKE2B 950f829073358b28274bd86291cdf5172a1705ae4df6a05837b3ea8a5d55a405020b4bca3a2b7097c3adc9eefbc66f6d2725d0dab5290c7b40279621b333279e SHA512 318ebe1daab14ee45738e2bd5c951b9b2bb652cdb6b38e1eed405b9a8385d57317d8a2015156104d344f1d13cfb4ac32c4054f3dab48e39f99d083521b9318e1
 EBUILD hdparm-9.65.ebuild 996 BLAKE2B 1c2a9a8af1caa482459c00b63ab37551e712bb576dc3003abdf282cf27d2234fac5a1eab1a974b501b126f920aaacf23d95f05a7e0c3a3bad80230d30b87dd85 SHA512 6bbd130af03a8460186f3e2be15e4a60cfb3ecfe64acc913eb0a8720591c0831029bb9255798d65c70dbb7d4f0779632074051eacf8864419da22b5b298ab3dc
 MISC metadata.xml 334 BLAKE2B 4401fa870e66675b64077c7dc271c1775a3b7148a4c720ac670222d0f61ce634507725e77e5ef2b9efb6d363ca23dc2a884645ab630ffccc8e737b7139e23d47 SHA512 a71c8c705afd12b3609542d13b18697e9c4626c0c41006ccbdacd248c1c621b0fa93a522561494120c0be181d091fc27e466a25af3be25b4f3b4cc14ec5e652a
diff --git a/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch b/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch
deleted file mode 100644
index c235b0f3941c..000000000000
--- a/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/863671
-https://sourceforge.net/p/hdparm/patches/52/
-
-From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Jul 2022 13:00:40 -0700
-Subject: [PATCH] hdparm: Remove unused linux/fs.h header
-
-this helps fixing builds with glibc 2.36 where mount.h conflits now with
-kernel mount.h which is included indirectly by linux/fs.h see [1] for
-details
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
-
-Upstream-Status: Submitted []
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/hdparm.c
-+++ b/hdparm.c
-@@ -25,7 +25,6 @@
- #include <sys/mman.h>
- #include <sys/user.h>
- #include <linux/types.h>
--#include <linux/fs.h>
- #include <linux/major.h>
- #include <endian.h>
- #include <asm/byteorder.h>
-
diff --git a/sys-apps/hdparm/hdparm-9.64.ebuild b/sys-apps/hdparm/hdparm-9.64.ebuild
deleted file mode 100644
index eccb8be2c047..000000000000
--- a/sys-apps/hdparm/hdparm-9.64.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-# GPL-2 only
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.60-build.patch
-	"${FILESDIR}"/${PN}-9.64-glibc-2.36.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 75b11eff3798..9f1496625e16 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,8 +1,6 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1
-DIST help2man-1.49.2.tar.xz 225428 BLAKE2B 62db47a5915432093991f060390a62ebf2d1e5e6e78f7142d0cd5f8a273a1fd74f55de4b3ead5c1071aaf4de084e62782981a1d888b8a8b76da9c07e0cda20ea SHA512 cb8f9f923263d7160a27a7924ae559aba93d7258167888eb9e0e3e97a2014297b8d739b2bb7869acbf586354d099bd91d85f8208b901bce5ba0c5ad4b6abd6d5
 DIST help2man-1.49.3.tar.xz 228472 BLAKE2B a5ed9ea3ff78b5287fa5bc02302da6a3657fee8fefd4fc43289e209bbe128d58da633c38aa4039c93a761c4842d3549a73cc14e77ee2859ed256613a8fba6e23 SHA512 5f19fad1e38b0572b63ed8bfd146b717fc22dff3a26641e8b5c8431df13da9574679d9a3407da62790db8a29286694ea1bfd751cba168f475302ad31cce845cf
 EBUILD help2man-1.48.5.ebuild 1091 BLAKE2B 0b0b08f043d26dada150219e5f327a8c8265a7b07fdb49da5b7ae9270ffabc99531b775c17a0d78ff64b2a21df185462cc5cad8e7f7653a758700322b87d4b8a SHA512 f4eaf60a9961c6c4b1e9bc58577bbd9a91002c2c39075389e86183890adf5ff7839d5c80281c9c188122d3c12d609b12fee934b8082e3de17641573619dd4f95
-EBUILD help2man-1.49.2.ebuild 1150 BLAKE2B 2b5eded159b1decf0e8a2716ec63f3ab1e9c4abab81898a73c23aa4da86c70a462b1cf73ad206cba42211b26a35259857e2d0da57de3ad88c8d71c5630c43669 SHA512 eda918ad332965fa0cedbb1579f2347028cc6d6f65e4ac3f39543eabcee2fc0d23f82422f1f304e1dd247c05140e7d6d9152f27ce72f683511b83e67e2820a78
 EBUILD help2man-1.49.3.ebuild 1150 BLAKE2B 2b5eded159b1decf0e8a2716ec63f3ab1e9c4abab81898a73c23aa4da86c70a462b1cf73ad206cba42211b26a35259857e2d0da57de3ad88c8d71c5630c43669 SHA512 eda918ad332965fa0cedbb1579f2347028cc6d6f65e4ac3f39543eabcee2fc0d23f82422f1f304e1dd247c05140e7d6d9152f27ce72f683511b83e67e2820a78
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/help2man/help2man-1.49.2.ebuild b/sys-apps/help2man/help2man-1.49.2.ebuild
deleted file mode 100644
index c85e5630dd6d..000000000000
--- a/sys-apps/help2man/help2man-1.49.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/ https://salsa.debian.org/bod/help2man"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-# nls/FSFAP for bindtextdomain.c
-LICENSE="GPL-3+ nls? ( FSFAP )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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}"
-
-# bug #385753
-DOCS=( debian/changelog NEWS README THANKS )
-
-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, bug #555018
-	local myeconfargs=(
-		ac_cv_path_MSGFMT=$(type -P false)
-		$(use_enable nls)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index e83b7d744f58..ffc3525a9c04 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -1,7 +1,5 @@
-DIST hwdata-0.361.tar.gz 2263204 BLAKE2B 83f613dd75e677bb25e884c00e8c32aa97e1b030ac8642df2c35f895df815bf6b8c3333a150c448fb6a14a8cf6c6cec9ef351896a5762a45ea99c34c39790213 SHA512 942cf6fa17c2f6fa41d7c624aa7fd28d57d6ad7750eb7a01c8ce85a663154140af75108a8ab12d43375bae63574a594ea2117195a743c12e5c4cb2986f198454
-DIST hwdata-0.363.tar.gz 2283349 BLAKE2B dd7aa9c7d202882a31a5359cf674c9399b23b07f47d2fa706739201f60227922572619cef42f50835c4a01efab19773e24b0540a87f759b805755389f8d6f7f4 SHA512 b53ffad2bdeea1ac8c78832e693c44655dc86c401a3f6921ccedf45a88731d82b40b2f033bb90bcaa058b1b3e8361a90aa4eeba9779ee4741efc40ae8ff6282a
 DIST hwdata-0.364.tar.gz 2290206 BLAKE2B f41fbc85fffa0561ccee55c2bbb9c32f2f67532dd2cd8c3731a2805712969a5950f31b4e5662adf3b55c6226c31cb00f0670af4a1fbff1a7c19d46ba067792fd SHA512 94cae67d9155b7abbaa7fc9047702a6f166721477b6320736d7984efd7c7c3c028b9f794269750f0ef421275a7e243fe1ae59816f63576fffc1bcd8deb49c6e9
-EBUILD hwdata-0.361.ebuild 696 BLAKE2B 792e672c8fb3277cf445be60a5966dd3ce1afdc0466235021726b182c70e653eb930d94dfed09bca71fccb514eb0b89b5d6e1eac3cdd9e3be7e30261fe4900fe SHA512 1499d7696d4561943d6521937d2818d1000a7d6ceb939bbf670e56f301a54109b7a6eca28f2f7bdbeb3094b9236dd8bad81cf34f893f401659c3168f1c8d3af2
-EBUILD hwdata-0.363.ebuild 697 BLAKE2B 7b2dfd3b060a7866502b4275650d936cfee8201310e87fd36e5b88a71512a5202f3fc0f7dcbb3beccf6c97ae59d74d4a04de602447d6f092a31acad37af43435 SHA512 3155c833ee8012d8f17fca390099af9a1842aa8157b6cecd5cc606d429bfe9411f39d2d2b343bd88229edaf8b92c09ff260b7b06b065f4e0bf7183ffdd4c73ef
+DIST hwdata-0.365.tar.gz 2298083 BLAKE2B 1c146c3ed53f00189dd2c9b8902c7300773f98bb2b6c4349a9c9fbf3ec75d742b39265b35d355de3400c367f23bae685786faa1d3faa377dbfe34e505e60abb1 SHA512 b9f8b144ab2cf8edcd585efe5d318449e8243310d0106fa830cbb621cfe53efc5aabc6b8795b8aefba62b4771e6c22ab5742099de2be5c9ca2cf132aac6e9c61
 EBUILD hwdata-0.364.ebuild 689 BLAKE2B 5741aa0d55c317fc34ffedc839cf3d56da852a053613c394b0a6a354927efb180b90a280e06e4de18aed1f3e1a07f00c01862a664b4658a56dd3ccaf2d0d26c8 SHA512 2811b15e68613b48a64a4caf9ed093ede0280bc1e2d1c32eedc98b622cf21a004fcba5075dd4e099d0041bf8ee8b57957ca2c21163b29884bcaccc86a1fe82b6
+EBUILD hwdata-0.365.ebuild 697 BLAKE2B 7b2dfd3b060a7866502b4275650d936cfee8201310e87fd36e5b88a71512a5202f3fc0f7dcbb3beccf6c97ae59d74d4a04de602447d6f092a31acad37af43435 SHA512 3155c833ee8012d8f17fca390099af9a1842aa8157b6cecd5cc606d429bfe9411f39d2d2b343bd88229edaf8b92c09ff260b7b06b065f4e0bf7183ffdd4c73ef
 MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/hwdata-0.361.ebuild b/sys-apps/hwdata/hwdata-0.361.ebuild
deleted file mode 100644
index ac13533f7a86..000000000000
--- a/sys-apps/hwdata/hwdata-0.361.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo
-
-DESCRIPTION="Hardware identification and configuration data"
-HOMEPAGE="https://github.com/vcrhonek/hwdata"
-SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="test"
-
-src_configure() {
-	# configure is not compatible with econf
-	local conf=(
-		./configure
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/lib"
-		--datadir="${EPREFIX}/usr/share"
-	)
-
-	edo "${conf[@]}" || die
-}
diff --git a/sys-apps/hwdata/hwdata-0.363.ebuild b/sys-apps/hwdata/hwdata-0.365.ebuild
index 9df06b92fe5f..9df06b92fe5f 100644
--- a/sys-apps/hwdata/hwdata-0.363.ebuild
+++ b/sys-apps/hwdata/hwdata-0.365.ebuild
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 8212119ee28d..725f6ba981e7 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,7 +1,5 @@
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
-DIST irqbalance-1.9.0.tar.gz 55779 BLAKE2B 11df51b03a473da10340c0c9ca9a28b3d9f9ed81e202e434b135a4be1cf54bc5558b33a4a922eba89bdd8cebbd6d3448527507fa72f03c4ff494ae83d513854e SHA512 878977da5eff18e53bdceeaa4aca952f73ba8b03eb028cf176816af971ffc65f0b1f1bb3a68e3a2502491895cc2b9438652dc97d5696232bb2f64860109e9a24
 DIST irqbalance-1.9.2.tar.gz 62188 BLAKE2B bc640323c3a594090f77983e63d9b7df177a05b859e4d29edb5b654f886c9e9f0d748ce22b1323bee443ea8369e014b9e0ce383bfe6f396692346649199d10a2 SHA512 d0fb157fbfc096fa9cfb4562e51fd4c3f4fa8788f72377c58b27df67c70073b787bba05e39809dcbe17532bb5b8e74b6d27c5e5b3d9af09bc9ce1a9b6aab9378
-EBUILD irqbalance-1.9.0.ebuild 1334 BLAKE2B 74900103bf0167ae4d3dc4fe0d73de353ccc818f29b9edddffe9c163f47f46d3baee119b403ceb24058598739c9c691a69bd4a896f47a591687435c22ab32124 SHA512 03363872eae5a613833a7e1b6506f5440cc40b1bdce4aafbb891e5091f1c1815848c3df8f0b578a3742b25b5f3a0dd3f22100fb1c2068882a3affb4fbfa625ad
 EBUILD irqbalance-1.9.2.ebuild 1441 BLAKE2B 5d93a47edeae40242db702f071a5b34790bd613efca45520cdf67b796b9e9b19c85e30907539d811a51572e403186ba6a7c67a073ed930109ab94da58fe29019 SHA512 dffad50bc2229f061d7dea667ebbe3279c3104fe8fa355af2aeb2d800c582aa47114630787a82838eff6fd7dfca44a1aa6a147214f151bbb923f4eb4e202d45b
 MISC metadata.xml 547 BLAKE2B 0a83f459995622fe247317aa9f045c0696f888712e9e5b56ac4eedb12862772044aaf407e25181ac84d64b9fced0e950b74c9dfcfa7a44e2451356dbab03461a SHA512 90b145e0e3fd1519eb1e6a412fc06700eed8bd27bea262e3d0bed02b0140586c0a9a01b9e301d3c0ec464c2cfbc6f80118c48eead3c830ba13dfd3b1588f6c9f
diff --git a/sys-apps/irqbalance/irqbalance-1.9.0.ebuild b/sys-apps/irqbalance/irqbalance-1.9.0.ebuild
deleted file mode 100644
index a815655e61b5..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.9.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 x86"
-IUSE="caps +numa selinux tui"
-
-DEPEND="
-	dev-libs/glib:2
-	caps? ( sys-libs/libcap-ng )
-	numa? ( sys-process/numactl )
-	tui? ( sys-libs/ncurses:=[unicode(+)] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-irqbalance )
-"
-
-pkg_setup() {
-	CONFIG_CHECK="~PCI_MSI"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# Follow systemd policies
-	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
-	sed \
-		-e 's/ $IRQBALANCE_ARGS//' \
-		-e '/EnvironmentFile/d' \
-		-i misc/irqbalance.service || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with caps libcap-ng)
-		$(use_enable numa)
-		$(use_with tui irqbalance-ui)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
-	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
-	systemd_dounit misc/irqbalance.service
-}
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index b770dc7107c4..96e1715927f3 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -4,8 +4,6 @@ AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
 AUX keyutils-1.6.3-fix-rpmspec-check.patch 1400 BLAKE2B 135c2f9caf216ea57997ea48b6fe0a2546a6f087f39261bb28521c570455d0dd6ce54cd74f007b3cb1611e5ab7e6330513823adba5006151d8fb99d7ac14774c SHA512 8bf8ff09af6f1e763ecfcaff842a9edfbcecaba3e4187805db2ce11d46c789e58133464fb73297934f078a49c2420a010541a6e9c860f3918dc46e1d909bd7d7
-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 3872 BLAKE2B 3cb6a0bf2a3551691298ec596a1f9e73056d62ee6e1baa676bab98bb0d4dc387dcbbe8aeb58feef2d5fe353c1c97dc35cdfec9c72571063c7fafa03e7256696f SHA512 9dbcd613db121598f87c151207e400c6f58d338c7f13f8ea1f75ae629e9569612cf73781832fca613083b831d4970b048603a9b46d1d989c71d3734bd8c09324
 EBUILD keyutils-1.6.3.ebuild 3829 BLAKE2B 9e84effa58eff23d8c863ec871e1e4f2053fe1a543885c4e7fca742862cbf34ce64d7e26a89bfd91fe225d0bb608ed506e8c967708c4fa05e492ce77c8b7aaae SHA512 8570f184f8bba99d6f24005907a0073dddb4c808ab5f3af848ba2d7c149e699d63b9c175113af9afdfacf9db7ad0758924aed4a876b6d4c3df915809d046cafa
 MISC metadata.xml 519 BLAKE2B c0bf6f0d10e2ba0230b8789bb20cd186ac7e01b44038eb01b3461e6bc663ddbb74af569d84477aa058e34e72a65aa12da59f922e83fa019f41ef54ca0137ff88 SHA512 e8b988a0a7b200d5d07822ca136d2532a4dd13c12f019aae27ae1958d93b75fa8f2bf5f05a2f492bb39274eea992e219a1bf0a1c821637859d4da19a50f632fc
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
deleted file mode 100644
index b99c47b63c99..000000000000
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${P}.tar.gz"
-
-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"
-IUSE="static static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6-endian-check-1.patch
-	"${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
-	"${FILESDIR}"/${PN}-1.6.1-silence-rpm-check.patch #656446
-	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
-	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
-)
-
-pkg_setup() {
-	# To prevent a failure in test phase and false positive bug reports
-	# we are enforcing the following options because testsuite expects
-	# that these options are available. I.e. testsuite only decides based
-	# on kernel version which tests will be called, no feature checking.
-	if use test ; then
-		CONFIG_CHECK="KEYS"
-		ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
-
-		if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
-			ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
-		fi
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
-		fi
-	else
-		CONFIG_CHECK="~KEYS"
-		ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
-
-		if kernel_is -ge 4 7 ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
-			ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
-		fi
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# The lsb check is useless, so avoid spurious command not found messages.
-	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
-	# All the test files are bash, but try to execute via `sh`.
-	sed -i -r \
-		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
-		tests/{Makefile*,*.sh} || die
-	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} + || die
-	# Some tests call the kernel which calls userspace, but that will
-	# run the install keyutils rather than the locally compiled one,
-	# so disable round trip tests.
-	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC
-	sed -i \
-		-e "1iRPATH = $(usex static -static '')" \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		-e '/^NO_ARLIB/d' \
-		Makefile || die
-
-	# We need the static lib in order to statically link programs.
-	if use static ; then
-		export NO_ARLIB=0
-		# Hack the progs to depend on the static lib instead.
-		sed -i \
-			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
-			Makefile || die
-	else
-		export NO_ARLIB=$(usex static-libs 0 1)
-	fi
-	emake
-}
-
-multilib_src_test() {
-	# Execute the locally compiled code rather than the
-	# older versions already installed in the system.
-	LD_LIBRARY_PATH=${BUILD_DIR} \
-	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
-}
-
-multilib_src_install() {
-	# Possibly undo the setting for USE=static (see src_compile).
-	export NO_ARLIB=$(usex static-libs 0 1)
-
-	default
-	use static || gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-	dodoc README
-}
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index c8537442640a..df6db244e57a 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,13 +1,4 @@
-AUX nvme-cli-1.16-bash-completions.patch 2223 BLAKE2B 072ce4f65ab4177a1a2f4aece0103c00a596503b7a8100cbc545750d6f7b63c12f014101f2441e0bb58a0364b6215e9fdf02bebb5191ba2e26121e896f2c2d95 SHA512 ff18cded88a78fd07f6a11f06635699a76c0efa6cfce217f7d02581a8fd60e7e2c1b248efec45fd28a962b4cff6534404d466252659a9e77e609174d07b0c2e8
-AUX nvme-cli-1.16-musl-limits.patch 1148 BLAKE2B ee1206a23ee11d6badaed70a98cd2ea405d3ad144def7d00e44a49b2f2579fc61efbaa3325856e426be097e52b02e4b18c4122ab74c1f20d58ced1c1748419c0 SHA512 e7c8c387446360eb2ed816006fe7d9a7f6a1b9c81dd6d3171f909ae760236243278a4b42be727b39381f95c9b50dce09f816400a280da929da8453b6c9851004
-AUX nvme-cli-2.0-bash-completions.patch 1803 BLAKE2B fd201e60a66b1fbc61f13c002465b002b60de94acf0c604af359064e2d4d2f3ed1c02d8f2f48b7af8812405a4990fe23b20fff39b28a69770d21174af5ff9741 SHA512 6baef0aff380fe8b0f0b21ba450e81703c6a3c88959c635d9425f010ffe0845d5b47c02e63df0b190899238dc911c108eda793f7823e4dba2a793782e2aa47d6
 AUX nvme-cli-2.2-docdir.patch 552 BLAKE2B 9edb2b884ff26a227c90f13ad9e7a110c284bca27c72fe06346587aa799d7c32c0820a49b565a3c2e77dd5b5a024ad346b2f6c71bee32d10bcdc9329abe81d79 SHA512 c865d1374ebe321b5a1c36f8d0b71965521d19e5f6ab50e0977776768f8cc4a104eb7ca5ad2a07a94865d60b2fbd6618fa1744058c66e3dc65d42bed6105e10d
-DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff
-DIST nvme-cli-2.0.tar.gz 646320 BLAKE2B 81a8161091071be4e98d4feb78b3f3edaed07262212a8950c1882e3b46f38cd82d8cd8bfec62b3971feda6e82d297338e5541c8eda33c8b6f714d3b3ce000c25 SHA512 24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417
-DIST nvme-cli-2.1.2.tar.gz 674414 BLAKE2B e71e32a371c2cebfd7f66539490baa8e8074c5bd21afa2470e73c763c752318ca5abc1fe1a4d3f346137dcdbb604889a23955269f209222384a629e8d6817d6a SHA512 2162a6967a221a4ae7e0261748c26a10ff43d5b592039e29578d8310cf176428d528c2d510c0b58419b70bd6d28f4d2c77f0cd27606d87079c64289d5d14f930
 DIST nvme-cli-2.2.1.gh.tar.gz 706199 BLAKE2B e0026fc2ee3edeffa18b0fc8365703e3de6f69cdd665878e8589fefa334ddb78f3fdf2768bd5a141dc27b0a7403d0fd7472db763e7e41b55a3cac314105faac3 SHA512 8efa94d49a4d443cdb0310386733e88117f17719b05044f11e63e2a09143fce55918171b457a467371263ebb2e36552558aad249ae4dbd27941af79fe9722e26
-EBUILD nvme-cli-1.16-r1.ebuild 1394 BLAKE2B bd2e45a72c07efd6e48b5872f43353817550ac4e7c4c31efc9b1b6f4e5736ac4298b2505c9d55537ecf701933bb470368a44df0587fa0a59d51a562f56273148 SHA512 63d4ef1730a6cb1fee4a331a8df795637935fc00d994f09a1d9d060d18726081ea7a2098c33187a23c4b81cec0742967fcb7ae9e1b9a107579f09a4d6ac765aa
-EBUILD nvme-cli-2.0-r1.ebuild 916 BLAKE2B 562795a3d62c792d35042187d614813605e900a7614fdbe67261541a0470671af215a12db322a6c80ddf062366239a7281bae2ba7080e717c7e3fe85de648911 SHA512 403efef199a73a7e7fc3b86612b8c2d1c5b2a5dfe9d1816651f0146fc1fe0322805e33e9ecda6db7f5ca9de4b608b853dd7d383f1cfa6a464925a4d9a4cec137
-EBUILD nvme-cli-2.1.2.ebuild 854 BLAKE2B 93f1b657ff20ab781248a048d8ae71aefc51c86e5ab555171d2b72082ce543d4623c5e8a64c346aedb49413a2905a741b1987703aeaf7ada6619fda0422dc71c SHA512 18d9b36f1a9e1c91ecee2cba888a7ecb62864261130ddcbe0c03a80bddd8f9294fe77f5b20316a4df821baee7971b88f166628f1f93f9a949cbc78ac0a5a3b4e
 EBUILD nvme-cli-2.2.1.ebuild 970 BLAKE2B 36064a54b8dd5a531dac77d0e251a3fb50ea877b7096b4d8514920780942f23cc5d8bb0cde95f47c482dda5eaf37bd259f4b5592e7178edf26e996a6ee8c9651 SHA512 23dd1a0a6a23e1d8f75b82ef1f88f6f03524983954f46ec29c510f7584de6fa493ee1e9c4db5ac4c0443264d56a6ae679f9e0023fd23118172c2fa1de254c779
-MISC metadata.xml 617 BLAKE2B 1d1de414ebd3b5c03b3ae800dd4ba17ac1f7139142c5ab77c8e1e5bc3d2a936f20f5c874733e697128f2adebb27cb6b6f2ad136e76e56d712fe353f909bdc672 SHA512 96ae457f166961fc274dd11ac655d39d549a26366a1d6e0e0a59d9efee1ca2fe5cd168d458fa12f3ac27e646b160f2c90154372478f387f3ace09f2ff0a61840
+MISC metadata.xml 542 BLAKE2B ec93d6395b76ed201e05ec98e5813f025e74e8afa849084b664faa6c9dc03a8f8237cdb2fec5675db7cc70575b8c07383470d4f3d36b595980bcffdac83d2708 SHA512 ba2ed3173808235a4567152d23836f9828c345e8e716781ee5b7c1aeaa0053ff36ffd85ac12686302af10b1bd02a61e061446e4e1cb2600ce00da3bb1d72b6ee
diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch
deleted file mode 100644
index 27a80eda9955..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-This fixes several issues:
-* the upstream rebase error (unclosed double quote)
-* typo "lugin_seagate_opts"
-* "readonly" with assignment is problematic on Bash 5.1.x
-
-Gentoo bug: https://bugs.gentoo.org/852764
-Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574
-Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e
-
-Author: Karlson2k (Evgeny Grin)
-Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru>
-
-diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
-index 41938d77..31afb3b3 100644
---- a/completions/bash-nvme-completion.sh
-+++ b/completions/bash-nvme-completion.sh
-@@ -3,12 +3,13 @@
- # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015
- 
- # Constant to indicate command has no options
--readonly NO_OPTS=""
-+NO_OPTS=""
-+readonly NO_OPTS
- 
- # Associative array of plugins and associated subcommands
- # Order here is same as PLUGIN_OBJS in Makefile
- typeset -A _plugin_subcmds
--readonly _plugin_subcmds=(
-+_plugin_subcmds=(
- 	[intel]="id-ctrl internal-log lat-stats \
- 		set-bucket-thresholds lat-stats-tracking \
- 		market-name smart-log-add temp-stats"
-@@ -55,10 +56,11 @@ readonly _plugin_subcmds=(
- 	[nvidia]="id-ctrl"
- 	[ymtc]="smart-log-add"
- )
-+readonly _plugin_subcmds
- 
- # Associative array mapping plugins to coresponding option completions
- typeset -A _plugin_funcs
--readonly _plugin_funcs=(
-+_plugin_funcs=(
- 	[intel]="plugin_intel_opts"
- 	[amzn]="plugin_amzn_opts"
- 	[lnvm]="plugin_lnvm_opts"
-@@ -77,6 +79,7 @@ readonly _plugin_funcs=(
- 	[nvidia]="plugin_nvidia_opts"
- 	[ymtc]="plugin_ymtc_opts"
- )
-+readonly _plugin_funcs
- 
- # Top level commands
- _cmds="list list-subsys id-ctrl id-ns \
-@@ -101,8 +104,7 @@ _cmds="list list-subsys id-ctrl id-ns \
- 	connect disconnect disconnect-all gen-hostnqn \
- 	show-hostnqn dir-receive dir-send virt-mgmt \
- 	rpmb boot-part-log fid-support-effects-log \
--	supported-log-pages lockdown"
--	supported-log-pages list-endgrp"
-+	supported-log-pages lockdown list-endgrp"
- 
- # Add plugins:
- for plugin in "${!_plugin_subcmds[@]}"; do
-@@ -983,7 +985,7 @@ plugin_micron_opts () {
- 	return 0
- }
- 
--lugin_seagate_opts () {
-+plugin_seagate_opts () {
-     local opts=""
- 	local compargs=""
- 
diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch
deleted file mode 100644
index 27c9667c827c..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/linux-nvme/nvme-cli/commit/4729b13f36d4713ce1162dc1d4425d44e1474078.patch
-https://bugs.gentoo.org/829705
-(and an additional hunk for https://bugs.gentoo.org/830744)
-
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Mon, 26 Apr 2021 00:41:20 -0600
-Subject: [PATCH] nvme-rpmb: Add limits.h due to missing PATH_MAX definition
-
-Commit 21f40f38b introduced new use of PATH_MAX, but did not add the
-limits.h header.  This resulted in nvme-cli failing to build on
-ppc64le systems using the musl C library.
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
-[dwagner: removed nvme-topology.c bits]
-Signed-off-by: Daniel Wagner <dwagner@suse.de>
---- a/nvme-rpmb.c
-+++ b/nvme-rpmb.c
-@@ -25,6 +25,7 @@
- #include <sys/socket.h>
- #include <linux/if_alg.h>
- #include <linux/socket.h>
-+#include <limits.h>
- 
- #include "nvme.h"
- #include "libnvme.h"
-diff --git a/nvme-topology.c b/nvme-topology.c
-index 0a22f6b..6d510f2 100644
---- a/nvme-topology.c
-+++ b/nvme-topology.c
-@@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/stat.h>
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch
deleted file mode 100644
index 3ddad04a5518..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-This fixes several issues:
-* typo "lugin_seagate_opts"
-* "readonly" with assignment resulting in error on Bash 5.x
-
-Gentoo bug: https://bugs.gentoo.org/852764
-Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574
-Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e
-
-Author: Karlson2k (Evgeny Grin)
-Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru>
-
-diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
-index 5e0eb23b..469ba3e2 100644
---- a/completions/bash-nvme-completion.sh
-+++ b/completions/bash-nvme-completion.sh
-@@ -3,12 +3,13 @@
- # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015
- 
- # Constant to indicate command has no options
--readonly NO_OPTS=""
-+NO_OPTS=""
-+readonly NO_OPTS
- 
- # Associative array of plugins and associated subcommands
- # Order here is same as PLUGIN_OBJS in Makefile
- typeset -A _plugin_subcmds
--readonly _plugin_subcmds=(
-+_plugin_subcmds=(
- 	[intel]="id-ctrl internal-log lat-stats \
- 		set-bucket-thresholds lat-stats-tracking \
- 		market-name smart-log-add temp-stats"
-@@ -53,10 +54,11 @@ readonly _plugin_subcmds=(
- 	[nvidia]="id-ctrl"
- 	[ymtc]="smart-log-add"
- )
-+readonly _plugin_subcmds
- 
- # Associative array mapping plugins to coresponding option completions
- typeset -A _plugin_funcs
--readonly _plugin_funcs=(
-+_plugin_funcs=(
- 	[intel]="plugin_intel_opts"
- 	[amzn]="plugin_amzn_opts"
- 	[memblaze]="plugin_memblaze_opts"
-@@ -74,6 +76,7 @@ readonly _plugin_funcs=(
- 	[nvidia]="plugin_nvidia_opts"
- 	[ymtc]="plugin_ymtc_opts"
- )
-+readonly _plugin_funcs
- 
- # Top level commands
- _cmds="list list-subsys id-ctrl id-ns \
-@@ -939,7 +942,7 @@ plugin_micron_opts () {
- 	return 0
- }
- 
--lugin_seagate_opts () {
-+plugin_seagate_opts () {
-     local opts=""
- 	local compargs=""
- 
diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index f9624e33a203..37ce8bf89548 100644
--- a/sys-apps/nvme-cli/metadata.xml
+++ b/sys-apps/nvme-cli/metadata.xml
@@ -11,6 +11,5 @@
 	<use>
 		<flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag>
 		<flag name="hugepages">Use huge pages for memory allocations via <pkg>sys-libs/libhugetlbfs</pkg></flag>
-		<flag name="uuid">UUID support via <pkg>sys-apps/util-linux</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild
deleted file mode 100644
index d1507396d8fd..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
-IUSE="hugepages +json systemd +uuid"
-
-RDEPEND="json? ( dev-libs/json-c:= )
-	hugepages? ( sys-libs/libhugetlbfs )
-	systemd? ( sys-apps/systemd:= )
-	uuid? ( sys-apps/util-linux:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-limits.patch
-	"${FILESDIR}"/${P}-bash-completions.patch # Gentoo bug #852764
-)
-
-src_prepare() {
-	default
-
-	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
-		-e 's|^LIBJSONC =|LIBJSONC ?=|' \
-		-e 's|^LIBHUGETLBFS =|LIBHUGETLBFS ?=|' \
-		-e 's|^HAVE_SYSTEMD =|HAVE_SYSTEMD ?=|' \
-		-e '/DESTDIROLD/d' \
-		-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-
-	export PREFIX="${EPREFIX}/usr"
-
-	local unitdir="$(systemd_get_systemunitdir)"
-	export SYSTEMDDIR="${unitdir%/system}"
-	export UDEVDIR="${EPREFIX}$(get_udevdir)"
-
-	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
-	MAKEOPTS+=" LIBJSONC=$(usex json 0 1)"
-	MAKEOPTS+=" LIBHUGETLBFS=$(usex hugepages 0 1)"
-	MAKEOPTS+=" HAVE_SYSTEMD=$(usex systemd 0 1)"
-	MAKEOPTS+="  V=1"
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
deleted file mode 100644
index 3bce0f7121ce..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hugepages +json +uuid"
-
-RDEPEND="
-	sys-libs/libnvme:=[json=,uuid=]
-	hugepages? ( sys-libs/libhugetlbfs:= )
-	json? ( dev-libs/json-c:= )
-	uuid? ( sys-apps/util-linux:= )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bash-completions.patch # Gentoo bug #852764
-)
-
-src_configure() {
-	local unitdir="$(systemd_get_systemunitdir)"
-	local emesonargs=(
-		-Dsystemddir=${unitdir%/system}
-		-Dudevrulesdir="${EPREFIX}"$(get_udevdir)
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild b/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild
deleted file mode 100644
index ef7cb9b54e90..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="hugepages +json +uuid"
-
-RDEPEND="
-	>=sys-libs/libnvme-1.1:=[json=,uuid=]
-	hugepages? ( sys-libs/libhugetlbfs:= )
-	json? ( dev-libs/json-c:= )
-	uuid? ( sys-apps/util-linux:= )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local unitdir="$(systemd_get_systemunitdir)"
-	local emesonargs=(
-		-Dsystemddir="${unitdir%/system}"
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 894d23ae67fb..796eb1bf2f9d 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -4,8 +4,6 @@ AUX pcsc-lite-1.9.8-systemd-user.patch 415 BLAKE2B dd29a0965167cde394e95bb751f6d
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 AUX pcscd.conf 32 BLAKE2B 2407e00c654d7e259ebf69ab420800f5605cb3ead23eb4aa07317928c38b6328eae2e566fab84c8844fb80e8a165cd32982fee753498b20c7a750f52fbb1f995 SHA512 ae27cdab8a60201639b9d9aca2d7f760146a5c5238878a0ebb562740385bf58f04bbc37a19cd1a2c8c69ee463f10beecc6531dde733cb6a6d4b06816f54b1569
-DIST pcsc-lite-1.9.7.tar.bz2 784685 BLAKE2B 74848b06ce9e497287cc4a8f307a194d766091a35af46300bd1dcdbf730c3f86f14928ff2e576ac83c07a37234b866e0b2cb3afd3d963b8570051c5c4880f4b9 SHA512 0c7f6c0efcfd6f6996e9e751dd0dd9969590b19144099aa6003c089d95d5ffdfddf3a50b82ece31e0f22e8213317dd827e5fbb4cdde614818b81a80c434788dd
 DIST pcsc-lite-1.9.9.tar.bz2 789914 BLAKE2B 4a28e71e5fb23685f8ef1e0c577157708a3130e2f0eb3cb5d93c4da307d40578a862fce6726f8e4b7c6296b86f953448eb0748412d8933cc2e58a28daf285190 SHA512 748ec3d82ff48af1a8dc5a581863e5d94adc47ab8f3158ceb838c2b521ece3a746b737c7b4bb2ba8b545be85ff18b9639443864e50b2e065cf2fbfdf79ef9700
-EBUILD pcsc-lite-1.9.7.ebuild 3189 BLAKE2B 08e57b481cd8219db76426a7a147a4394f7f51cc78a590db1bdcc163fda46f82d0af43dabfad5e013f6862f83beb5a7ec1e47d8247a36bd8bcf0f6b47b440ea7 SHA512 274c12d4a46365abe5cf8e971b5c8d5e439fbaaf622d5431491e6c4058d9fcd577928da8e30282a6ca7086e3140dd54b991344a7989bde625d3cb0d833960f41
 EBUILD pcsc-lite-1.9.9.ebuild 3335 BLAKE2B c1930d7380dafc894049303edaeebd7864469a72a46eb630a22827a64c246a990fd0a5460d7e776c031d08a0107dd37025ad9f5ab95e37b5465ab4d4c92d47c6 SHA512 2519798d7d968ce8c07ce3ada7cee8ca8b295ed42b16e23fd2eda0d8efdcf2c0948c1469921e9e4d0058f78a8ddcf88bb55b4d535820503be4611242e07335e1
 MISC metadata.xml 1079 BLAKE2B 3d9513402f4eb55c1f67f79eb44fb9b850910960dfe52ec5bc419af6e71621ada842ff4cecf526bee4670264e37bdf0f1f8515f618191deac5cd4a4bf0cb8a72 SHA512 76353b55542f8c4e9096dd5315df06ff772fde7ab4db0d2901fd933f30a3e5b873e50658aedb65c5744e408b9f6b5467d226711b496d21057b16721559bb3e90
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
deleted file mode 100644
index c23c97ef458b..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/libudev:= )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	acct-group/openct
-	acct-group/pcscd
-	acct-user/pcscd
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--disable-strict \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable doc documentation) \
-		$(multilib_native_use_enable embedded) \
-		$(multilib_native_use_enable systemd libsystemd) \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
-	if use udev; then
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
-		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog ""
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog ""
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog ""
-	if use udev; then
-		elog "Hotplug support is provided by udev rules."
-		elog "When using OpenRC you additionally need to tell it to hotplug"
-		elog "pcscd by setting this variable in /etc/rc.conf:"
-		elog ""
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-}
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index fb8e284e9dbc..d752bf0bf887 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,6 +1,4 @@
 AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e
-DIST pcsc-tools-1.5.7.tar.bz2 292637 BLAKE2B f0bfa9f680a2f2b348d2baef4b4b4567008163f47d7d7e6cec694cdc424626c5c6f18c475f0e8d4c5cd49111315b3c8a934fecf30afe90bbebc0a15f8d6f4a1d SHA512 58d70f41c5815297def7d8b64807e960db85719996771ecb43a4320d3f3fc82e2deb133d9ca97b3a4e8e76267294b3339d8883ba4770bdd0071566e1ce457501
 DIST pcsc-tools-1.6.0.tar.bz2 304960 BLAKE2B a60d280d39689d7eaa407aa5857c63af0acda3791e5d9f5c2f62048260178dc728fb179aed3c369340e192ba9b3d5db04bacbe5cc6ef1519c7cde55e10ca6b45 SHA512 951014510dcfd011fc08c92a927ed8a39751c15cd9278e9bd61693a2743a82d4b88907e01e013738f6b5afb569cb4d9e9802ee575c731b83da33e92f96eb5d50
-EBUILD pcsc-tools-1.5.7-r1.ebuild 1380 BLAKE2B 8b965aea287ba16e74f2dc1fa3a2fef992ea8f688c7eab2fac5cd0e875cad7e0627d6e3ba83dbebb9ca6b6c9fd62cbf5c30b13a5952a9ad82978d6f05ada54b7 SHA512 0632d67332bdf81fdc647bbe4dd2f5ca6fb16de9ec7d9539ca3126a211504769f2f15ca31092e447a3cade72d2d745a90d088ef0601071a6357a03a2f21ff1d8
 EBUILD pcsc-tools-1.6.0.ebuild 1390 BLAKE2B 7faab3fc2f66bcff8f46fa4a892eac268bd3dfc9acd1e5c655bd2fd242b025dde9d0af58d4798f756515279377da1a59db7ca975fb2b6d3639249bae5188b6bd SHA512 1381dae367689c8bafa9867b1eea875ad8e623a12ac4aa0bb1950d7a9cb2d118d0f92fb4988680bb1a718f07af50b19a05849eb6470b4551533bf86890bcde3c
 MISC metadata.xml 448 BLAKE2B f642f8f9a269fe6e3b082d4c17e2ab2c8aeb67ddcfd7a5bdaf66a95aedd6ffcfe0bcc936ad2c5e24904dd15814d61e609afc055ca5b6613cc854bc802cddb239 SHA512 feb5f0c59a283bd5f42b48cbd7fd148cd0716566438dd76c254732a9fea6e886c5e1d5416dff3c419a5fb77a03e240b3c399b0d7d81ee41ee09c02b590205d86
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild
deleted file mode 100644
index 6319092c2a68..000000000000
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.7-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="PC/SC Architecture smartcard tools"
-HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/ https://github.com/LudovicRousseau/pcsc-tools"
-SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="gtk network-cron"
-
-DEPEND=">=sys-apps/pcsc-lite-1.4.14"
-RDEPEND="${DEPEND}
-	dev-perl/pcsc-perl
-	gtk? ( dev-perl/Gtk3 )"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=(
-	README Changelog
-)
-
-src_compile() {
-	# explicitly only build the pcsc_scan application, or the man
-	# pages will be gzipped first, and then unpacked.
-	emake pcsc_scan CC="$(tc-getCC)"
-}
-
-src_install() {
-	einstalldocs
-
-	# install manually, makes it much easier since the Makefile
-	# requires fiddling with
-	dobin ATR_analysis scriptor pcsc_scan
-	doman pcsc_scan.1 scriptor.1p ATR_analysis.1p
-
-	if use gtk; then
-		domenu gscriptor.desktop
-		dobin gscriptor
-		doman gscriptor.1p
-	fi
-
-	if use network-cron ; then
-		exeinto /etc/cron.monthly
-		newexe "${FILESDIR}"/smartcard.cron update-smartcard_list
-	fi
-
-	insinto /usr/share/pcsc
-	doins smartcard_list.txt
-}
-
-pkg_postinst() {
-	use gtk && xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d986f7ee2dfa..1746b991834c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,7 +6,9 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
 DIST portage-3.0.41.tar.bz2 1119737 BLAKE2B 6c6d1fa11f16362505e321eb530d233cf73a7e1cc7dab2fc88ad40701c16835e08a7d16a408381e2f717ac5f48d46344e57b9b5296be4eba0a7583540c6a81aa SHA512 046621ee59b2b1b374a63091028ed3462b1212960b337e8e034c739d5c51d5ae1e7b491c88940199e710081409e38778749a5c86576cf5bb6c59b1890dc892b5
+DIST portage-3.0.42.tar.bz2 1122793 BLAKE2B 9df93e5ebeab415bd3b56e4e1771b628f5e3622d997aa8818e7ce42f77d60ffcb1807093dbc44852c5b359c632c11dcb7db6c026f2e7e224293e7ebb9e64b286 SHA512 f3d2bb5a1adc801c641ff14043b1617831c646a9432b2602e48343d8264850bb410a1666d646b97e224864d56cc7acae0aa044a7476384030063fb77e4323724
 EBUILD portage-3.0.38.1-r5.ebuild 9166 BLAKE2B 08cd16f97004d6957f74368105f0284ffb2bb563ba14c2c07ff82b52a1f219d21ceeb9ac29f0b3db22a4bbc7b32aefdb6593b9f640ef96e03cd8cf18b3233755 SHA512 3804e8b9fd0d39c1334ac7b8da6005a63fe9702d8182745b6953f64da251e5eb367797b9da8ad906d80f1b5436b00cd6da57b94d514b1cab117dc11e4df808ec
 EBUILD portage-3.0.41-r1.ebuild 9132 BLAKE2B 05ff0d35daf6660b24b665d189954246c0fcccc7be1000b981be013e06e2dd0d94385387ff39859e8321ec2cc903ac9486ca1c0f958975d0b477548d0b930ed0 SHA512 72fe7520842f125e26715e8fcac2b0a3b7e52b595e1e549fe78d6c9f029239713ce8b5e4270172daa594c9e4ed1f3d16c0d676e073b5ea6e78093a8aa1d3dfe4
+EBUILD portage-3.0.42.ebuild 9140 BLAKE2B f6228e5de275039e3aacd0c5ca8321527cb82118d1d0f0abf10ae257213e314372e35e17bd0b5af2c156cf1052e785c70f6bd5f8972c426c07a409fbc3fef24a SHA512 22eff20bca50a8fede5d780d27924b9d21b672c009b119b0a9205a18c6e81a5eb6e4ce62aae5e557c6f50ad187e564b692357fd98e9af24bb60c9d36b56371d3
 EBUILD portage-9999.ebuild 8380 BLAKE2B a5086b7a5d23fc4e3c4bd3d5c314f01c94866e956b003c9b17bb2fcd7f1e4120d9d4eb98066abba2103fcc692ebed3dc3bfc022d0cdcb29e1ba1851a97fe80c0 SHA512 64d0ba17919fdea6bc72c8c4e4a3e7c974f8c7c694b60f9befc9fc72a3fbbeca27ced69ad395647f4f8505223a2d107e7a8adcc37c373128e8fef9f21191841e
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.42.ebuild b/sys-apps/portage/portage-3.0.42.ebuild
new file mode 100644
index 000000000000..f01eddfc50ae
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.42.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		>=app-shells/bash-5.0:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=sec-keys/openpgp-keys-gentoo-release-20220101
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions && ! tc-is-cross-compiler; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [[ -f "make.conf.example.${ARCH}".diff ]] ; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	if ! use build; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 4d657e3e725d..d84bfacaa7bc 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,8 +1,5 @@
-AUX sg3_utils-1.46-musl-drand48-compat.patch 4532 BLAKE2B 454837f33c374eb3002a47b441de9d34f57944ce99c26710b44cab010c1a5fdf538e97dfbea5714cb2d4ac5c7fd508fb23a5d835f0932ca6fcec22604dd55e46 SHA512 faba667b6cb4b7b1d6e04ddd7e80073cd5e80dd4ec7b2312c599a5c1c44df4b9ba8394354881a4968625450691587ddb42adec004043ab604f923d5fb643a86b
 AUX sg3_utils-1.47-musl.patch 1238 BLAKE2B 557c29249c23afe8ee807e0cd168d3a502095e3eae0aeea006b37f8b2e8c2dd3530c37517e9dd4ec1aed2bf14707cbc2e1dc6f607f091130dbafa61ca2470b69 SHA512 5eeae68fbca737e127f43c83177adda5c4ad41d49ad6e4ebdb780d25f9eb1a516456e2f91ef20f95cb5dde63505c385b3bf514dcc56235369689f0736df0deef
-DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
 DIST sg3_utils-1.47.tar.xz 1046904 BLAKE2B 6efadd86f6d466469f5d5d3f53b2b6bf01143695db19e96b55a13a606d8a36d5571e390fed0b0990371dc4b77714f88c03f440a4468f6863544c0d21b2e3ef73 SHA512 ef072b8f0012d0944e21d2134aff7125e24ea24d1cbbb1aa79160e844f9a60236f1e244437a3bc08a22a7e99f613adad4a05ae5cc3916ded5a72d162cd3aa163
-EBUILD sg3_utils-1.46-r1.ebuild 1078 BLAKE2B e8d173b0636b17a6ef4922f3817ca7250eac4ce241f4103bc75ca39c7a4e2675b10f70672e680bd8d19dfdb8917871a6f46c116ff8585938fe357e83833c1933 SHA512 2b59e7d8e31ec2d5010e2cb822888bde3891f625a46a6951b123c38f39f9978986479688d74986beebbec27230eb27a154c77caad200323ec65733549bcc61dd
 EBUILD sg3_utils-1.47-r1.ebuild 1076 BLAKE2B 1a4d06cbe916389f4dab924f60a9958ce5d4df83a851d91dc0f98239120000aa4870f1198e058a24e1a4666f1bc71ac0be706447fc034a8bb92db6cd7d375488 SHA512 7116d389962b86005f07d5a40414d0f8afeb0969c39e1cf3523f0cbca162a6c449f3af757a4e410a112603e84b68f5c5dd557c29b082714383951c6b92e20ec0
 EBUILD sg3_utils-1.47.ebuild 1003 BLAKE2B 37ab8a8a18d80df213402fe43335bf07b1a36056a23cdaff02c8b199e8b7e72af3b094170a9b748072848054382be4efe6d504cbd66260ce1d6ea16a18fbf5a9 SHA512 9bb97a9d684a6ff8cf64b8f1db7c4eaebc2c37ab13c990e26139ce02c30b0a6be0af062d3fbeb05426bcf37b31505519788213bc0ade798110c887407eb9c86b
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch b/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch
deleted file mode 100644
index d4152c3d2651..000000000000
--- a/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Naurp sg3_utils-1.46.orig/doc/sg_dd.8 sg3_utils-1.46/doc/sg_dd.8
---- sg3_utils-1.46.orig/doc/sg_dd.8	2021-03-22 00:36:43.000000000 -0400
-+++ sg3_utils-1.46/doc/sg_dd.8	2021-08-16 14:07:16.703526168 -0400
-@@ -394,7 +394,7 @@ random
- this flag is only active with \fIiflag=\fR and when given replaces
- \fIif=IFILE\fR. If both are given an error is generated. The input will
- be a stream of pseudo random bytes. The Linux getrandom(2) system call is
--used to create a seed and thereadter mrand48_r(3) is used to generate a
-+used to create a seed and thereadter mrand48(3) is used to generate a
- pseudo random sequence, 4 bytes at a time. The quality of the randomness
- can be viewed with the ent(1) utility. This is not a high quality random
- number generator, it is built for speed, not quality. One application is
-diff -Naurp sg3_utils-1.46.orig/src/sg_dd.c sg3_utils-1.46/src/sg_dd.c
---- sg3_utils-1.46.orig/src/sg_dd.c	2021-03-27 20:58:36.000000000 -0400
-+++ sg3_utils-1.46/src/sg_dd.c	2021-08-16 12:56:26.316550042 -0400
-@@ -176,7 +176,6 @@ static uint8_t * free_zeros_buff = NULL;
- static int read_long_blk_inc = READ_LONG_DEF_BLK_INC;
- 
- static long seed;
--static struct drand48_data drand;/* opaque, used by srand48_r and mrand48_r */
- 
- static const char * proc_allow_dio = "/proc/scsi/sg/allow_dio";
- 
-@@ -2124,7 +2123,7 @@ main(int argc, char * argv[])
- #endif
-         if (verbose > 1)
-             pr2serr("seed=%ld\n", seed);
--        srand48_r(seed, &drand);
-+        srand48(seed);
-     } else if (iflag.zero) {
-        ccp = "<zero bytes>";
-        cc2p = "00";
-@@ -2401,7 +2400,7 @@ main(int argc, char * argv[])
-                 for (kk = 0; kk < blocks; ++kk, bp += blk_sz) {
-                     for (j = 0; j < blk_sz; j += jbump) {
-                        /* mrand48 takes uniformly from [-2^31, 2^31) */
--                        mrand48_r(&drand, &rn);
-+                        rn = mrand48();
-                         *((uint32_t *)(bp + j)) = (uint32_t)rn;
-                     }
-                 }
-diff -Naurp sg3_utils-1.46.orig/testing/sgh_dd.cpp sg3_utils-1.46/testing/sgh_dd.cpp
---- sg3_utils-1.46.orig/testing/sgh_dd.cpp	2021-03-28 21:27:17.000000000 -0400
-+++ sg3_utils-1.46/testing/sgh_dd.cpp	2021-08-16 14:06:37.262536902 -0400
-@@ -312,7 +312,6 @@ typedef struct request_element
-     uint32_t in_mrq_q_blks;
-     uint32_t out_mrq_q_blks;
-     long seed;
--    struct drand48_data drand;  /* opaque, used by srand48_r and mrand48_r */
-     pthread_t mrq_abort_thread_id;
-     Mrq_abort_info mai;
- } Rq_elem;
-@@ -1491,7 +1490,7 @@ read_write_thread(void * v_tip)
- #endif
-         if (vb > 1)
-             pr2serr_lk("thread=%d: seed=%ld\n", rep->id, rep->seed);
--        srand48_r(rep->seed, &rep->drand);
-+        srand48(rep->seed);
-     }
-     if (clp->in_flags.same_fds || clp->out_flags.same_fds)
-         ;
-@@ -1804,7 +1803,7 @@ normal_in_rd(Rq_elem * rep, int blocks)
-             for (k = 0, bp = rep->buffp; k < blocks; ++k, bp += clp->bs) {
-                 for (j = 0; j < clp->bs; j += jbump) {
-                     /* mrand48 takes uniformly from [-2^31, 2^31) */
--                    mrand48_r(&rep->drand, &rn);
-+                    rn = mrand48();
-                     *((uint32_t *)(bp + j)) = (uint32_t)rn;
-                 }
-             }
-diff -Naurp sg3_utils-1.46.orig/testing/sg_mrq_dd.cpp sg3_utils-1.46/testing/sg_mrq_dd.cpp
---- sg3_utils-1.46.orig/testing/sg_mrq_dd.cpp	2021-03-28 21:27:17.000000000 -0400
-+++ sg3_utils-1.46/testing/sg_mrq_dd.cpp	2021-08-16 14:06:45.842752108 -0400
-@@ -313,7 +313,6 @@ typedef struct request_element
-     int out_local_partial;
-     int in_resid_bytes;
-     long seed;
--    struct drand48_data drand; /* opaque, used by srand48_r and mrand48_r */
- } Rq_elem;
- 
- /* Additional parameters for sg_start_io() and sg_finish_io() */
-@@ -1310,7 +1309,7 @@ read_write_thread(struct global_collecti
- #endif
-         if (vb > 1)
-             pr2serr_lk("[%d] %s: seed=%ld\n", id, __func__, rep->seed);
--        srand48_r(rep->seed, &rep->drand);
-+        srand48(rep->seed);
-     }
- 
-     if (in_is_sg && clp->infp) {
-@@ -1524,7 +1523,7 @@ normal_in_rd(Rq_elem * rep, int64_t lba,
-             for (k = 0; k < blocks; ++k, bp += clp->bs) {
-                 for (j = 0; j < clp->bs; j += jbump) {
-                    /* mrand48 takes uniformly from [-2^31, 2^31) */
--                    mrand48_r(&rep->drand, &rn);
-+                    rn = mrand48();
-                     *((uint32_t *)(bp + j)) = (uint32_t)rn;
-                 }
-             }
diff --git a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
deleted file mode 100644
index 51068d8dc71a..000000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="https://sg.danny.cz/sg/"
-#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://sg.danny.cz/sg/p/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND="!sys-apps/rescan-scsi-bus"
-
-PATCHES=(
-	# Bug #808600
-	"${FILESDIR}"/${PN}-1.46-musl-drand48-compat.patch
-)
-
-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
-}