gentoo resync : 12.05.2022

4 files changed, 16 insertions, 76 deletions

diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index c2a9463adb47..1011a482a696 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,7 +1,6 @@
 DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
 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.8.0-r1.ebuild 1846 BLAKE2B 78cc2bbfc0c05c13bcc4772692d15ebe2e0780cb5a5fd8b5689b10777530e9901e8af14688fac6b135ee57d69e4e9ac4f521ccda6d16c1db0d1679db852e8a75 SHA512 a71c349ea7075efc7c4149b917a84ded5b8e0e400f2373aa0b7fdce817593c7db00efd5670bd3acf82b8d01d77f11092fa54300119c2e1bc2ec0e9d6b2805709
-EBUILD findutils-4.8.0.ebuild 1784 BLAKE2B ac28cb4d32588549ae9201d665ed03b84eae7ce20f333fa3b952eb404fdf71d4dfb548c2d41a167c729031c2e051f6f69b0f9d45a87738a3b69a70a97f8c5f5a SHA512 d9d2ec21b79b742f411e8d94ad8c5b605fdb1c0113a7885fd0f10acd562d1a1afbb6fd55e9156bcec7920326593b35c4dcb751eeb90bcd95085e767fb255c9c3
-EBUILD findutils-4.9.0.ebuild 1986 BLAKE2B cb01cfd914e660be19e729f34bad8539905b7c6712c251fb428663b144d27495eaa34232e60080fa29243d13d8fb3dfd7fa3fda561d0de1a638c17f9ff94a2dc SHA512 a4fae26e2962a813b9b906d9a75a50cd73793c2e2ebb0e05956610cd236e80902736d13662a9a74da27e89d1d7899b84e5ad382dc6514c6e83d5771be0cfb627
+EBUILD findutils-4.8.0-r1.ebuild 1930 BLAKE2B 603aa026102ebfbd9857c7b6a53750d501a021bd537ae30ecf3d6494fbc628738326bffb78a26a65efb108ee48940965890ad6bfa5e6cd6ddd4a497876eb3722 SHA512 e9aafbee0cce1b9ef2bc032126c53adafcfcbc4fe0e9e81cdfff7c964354ce7c5ef6386088eb97b8120dcb027aaddaf819d643329f735594515daa18899bf4f2
+EBUILD findutils-4.9.0.ebuild 2078 BLAKE2B ce250e20b0168e6c5c204aa5c588fa6628b438aec4c838a0a80daa2248d98180d5e3c2692613149368f09e84fce2601ec02a0d34ac498e83a8414c1347e878c2 SHA512 6f57b27ae12a49f31f7d754919621392f16499130e3c89365fe59cd42c4520a28a84e802f25bb622502f0d7fa48114ed4dc396a17e8f0e1eb0e6dde52c81cdb4
 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.8.0-r1.ebuild b/sys-apps/findutils/findutils-4.8.0-r1.ebuild
index 6d35f0a1ca08..0edfed04e0ee 100644
--- a/sys-apps/findutils/findutils-4.8.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.8.0-r1.ebuild
@@ -67,6 +67,12 @@ src_configure() {
 	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
diff --git a/sys-apps/findutils/findutils-4.8.0.ebuild b/sys-apps/findutils/findutils-4.8.0.ebuild
deleted file mode 100644
index b4570b8b0f65..000000000000
--- a/sys-apps/findutils/findutils-4.8.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls selinux static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't build or install locate because it conflicts with mlocate,
-	# which is a secure version of locate.  See bug 18729
-	sed \
-		-e '/^SUBDIRS/s@locate@@' \
-		-e '/^built_programs/s@ frcode locate updatedb@@' \
-		-i Makefile.in || die
-
-	default
-}
-
-src_configure() {
-	if use static; then
-		append-flags -pthread
-		append-ldflags -static
-	fi
-
-	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_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.ebuild b/sys-apps/findutils/findutils-4.9.0.ebuild
index d973a4fbd790..8cfe270bc20e 100644
--- a/sys-apps/findutils/findutils-4.9.0.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/findutils.asc
 inherit flag-o-matic python-any-r1 verify-sig
 
@@ -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 ~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 )"
 
@@ -63,6 +63,12 @@ src_configure() {
 	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