6 files changed, 4 insertions, 90 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 59bd55c8bb09..d04a5b805972 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index e6db3ab4e477..1082401df1c6 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,4 @@
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
-EBUILD findutils-4.9.0-r1.ebuild 2117 BLAKE2B d70aba6309ccdbe7035f40844de967b4708590201e0bb51f212ca5cba2d3c446117c8dbf1eed5444aba82f12ec223072474de92534206fdfebd34ad79c4d9f74 SHA512 59c4da8b925afbc04a2264944bd48d7d60a1961457f764aaba965ed51d7c008c706422cb36d775bd281a2ae87c888d764fbca7bf5e57f39c709bf39b28e1dfaa
-EBUILD findutils-4.9.0-r2.ebuild 2400 BLAKE2B 103ba365c6b32b5481388435766a26b7c6620f86613beb418700126a6a09c9cb64741c892979cf85e0463200762f5965960bc253196d32515a253ad67f9f5993 SHA512 db7b6f27091ac1039ffc7ef88c5062e410054866a009c1a0ca0aed2f77132b311f2e8dcd3bffc749633447858642c8dba63ccf9dd491cc72a8ba10ab41f80049
+EBUILD findutils-4.9.0-r2.ebuild 2399 BLAKE2B 0531b24ecf353dc0e9c64c58cbcaa173373dce61e01e8e426f986779a3cd83955e9e4bc031874215c75c88a274d1c69d25490dd192d2e53f22ea5436403f233b SHA512 18a153c8082677c251d4f9f67765d3d69a714e6d2fcbfb2c008ddc23014503834202beb3a5d335e11e5be06722417c0caa1aff9777594e454d9033e3b0dc3693
 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.9.0-r1.ebuild b/sys-apps/findutils/findutils-4.9.0-r1.ebuild
deleted file mode 100644
index 520964bef11f..000000000000
--- a/sys-apps/findutils/findutils-4.9.0-r1.ebuild
+++ /dev/null
@@ -1,85 +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} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/findutils.asc
-inherit flag-o-matic python-any-r1 verify-sig
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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"
-IUSE="nls selinux static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		dev-util/dejagnu
-	)
-	verify-sig? ( sec-keys/openpgp-keys-findutils )
-"
-
-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
-
-	append-lfs-flags
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
-		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
-		append-cppflags '-D__nonnull\(X\)='
-	fi
-
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-		$(use_with selinux)
-		--libexecdir='$(libdir)'/find
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /
-	default
-}
-
-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.9.0-r2.ebuild b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
index b8b566f85ed5..fca1b49ccbb7 100644
--- a/sys-apps/findutils/findutils-4.9.0-r2.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-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"
+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"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 79c06b253ec2..83c59477b559 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,5 +5,5 @@ AUX pciutils-3.8.0-pkg-config.patch 691 BLAKE2B c12a6a6f19a62d5d161479e401f5bd9e
 DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
 DIST pciutils-3.9.0.tar.gz 908219 BLAKE2B 59d2a151b114691980b8f0a0bfdf8e48b9e1a0a9976df6dbc94962c251d8bfc61e7bd3b0f3c47a4295f52b5df67ad0e44ed6f2e6a87728e213e4ef0b8a55c028 SHA512 e17225c2adcc21c9ff4253998aec5805ae5e031888fa01841a1ff680796f7515f9dd6e5c2e0588edba854f66f1268ba8e28ae1a2f794574e715fec8a8c8def4f
 EBUILD pciutils-3.8.0-r1.ebuild 4915 BLAKE2B ddc1ba11cefb65a69392aad79260482827a62476200518f5d5aeac8209713b791f5fd389fcdd93c4acb3e40663180338584b17c04ea7148a5123a8bd274d0909 SHA512 ea895c2400ea0af258d0dc1151e81b3f972218f03054ddc20edf847fe053794d7286932fee44f008f53f641193bcdfd8cfac8b08800f4b0a620ae30e8591962a
-EBUILD pciutils-3.9.0.ebuild 4820 BLAKE2B af6ce59ebe89b0151ffc737afc9d6eb9934c0a55aafd7f363ca9a4128c5b1dea5397670429d7e2f3b1d9e565b2cb6bd39ceaacf029755d0f4fdab5d70f5baebe SHA512 561ef9ab021301967ad790348bd35a68c4b9e659fceacaede74c0d2cf3fe6d254795e8c4267a36ebce7721426f5f723d821cd137e2dd1d9b721036de0c7b86de
+EBUILD pciutils-3.9.0.ebuild 4819 BLAKE2B b4380d16a4e397d2d6cf96a2da266201efb551eabce59fd63ba8f9b92410eae6e4e0db993365bb7b19c8d97be3a874c271ca65818a0fde6f00cc6cad755e1557 SHA512 8018c96c6f55845ee8ca1a00019a1b5ea08334e23dd52b2841bcd684a5555d620f3dd93c153d5172986eb254ce4b6d7dc0854a5f32ce301725b91a48273320fa
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.9.0.ebuild b/sys-apps/pciutils/pciutils-3.9.0.ebuild
index c3bdc6c139aa..c6e7c3201bc7 100644
--- a/sys-apps/pciutils/pciutils-3.9.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 REQUIRED_USE="static-libs? ( !udev )"