gentoo resync : 22.05.2021

3 files changed, 2 insertions, 71 deletions

diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index e0462229ccfd..12a2ff21b349 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,3 @@
-DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
 DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
-EBUILD findutils-4.7.0.ebuild 1648 BLAKE2B 25c2b7765f22e7f568dcc0c277189f86a1f2068a640686701990115b1b86fbebd42915be85bbdf4c6c364b788ddfd928e7b9c2622b826e51b1418ae8d7c0c1a0 SHA512 5efa3ec30e2fd0d8599debd73e649bbcdc0eb60f28de6ac2e5102a9701215f886a0552082d76e50ba2219635858e03b18dcf928e3a1272c84b85163540fa02ed
-EBUILD findutils-4.8.0.ebuild 1647 BLAKE2B 1b889b4b73d6c77bbaf87a0e6080dd750c3b99d2d06b8bf3f074451f3acd55a978e6cf49dd3b258878fd900d4d06f584df0b1d2e40a1bd4105378600d3f8448d SHA512 0c79d74aa018eba8c0d15a720d06dbbc5e082ccf1e1e227cc34ea58c6a8e53b90d62ec8d890ea4920ff4ffc19769f11fb4e3ef4e9ff5f0963c3e6456cd95c99f
+EBUILD findutils-4.8.0.ebuild 1631 BLAKE2B 13f6868c1b87322043b67dafd8db552861b474bebff4e640b45b863f85621f26d724554119a6ddb3264cb939893111fadd440b7f01274d8e2c58a1029fa4e973 SHA512 f0c157053b92999d3de34c65fbab680baa5b6b3a686088b23af3902a7fb773c23217976bfd7bb30e98463bbb6e7f71ac0acffb191bf1dc8d2597ff05d7bb921d
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
deleted file mode 100644
index 611bb9a6662a..000000000000
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit flag-o-matic toolchain-funcs python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls selinux static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't build or install locate because it conflicts with mlocate,
-	# which is a secure version of locate.  See bug 18729
-	sed \
-		-e '/^SUBDIRS/s@locate@@' \
-		-e '/^built_programs/s@ frcode locate updatedb@@' \
-		-i Makefile.in || die
-
-	default
-}
-
-src_configure() {
-	if use static; then
-		append-flags -pthread
-		append-ldflags -static
-	fi
-
-	program_prefix=$(usex userland_GNU '' g)
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		--program-prefix=${program_prefix}
-		$(use_enable nls)
-		$(use_with selinux)
-		--libexecdir='$(libdir)'/find
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# We don't build locate, but the docs want a file in there.
-	emake -C locate dblocation.texi
-	default
-}
diff --git a/sys-apps/findutils/findutils-4.8.0.ebuild b/sys-apps/findutils/findutils-4.8.0.ebuild
index 61e4004cda6e..47dbdb5d3142 100644
--- a/sys-apps/findutils/findutils-4.8.0.ebuild
+++ b/sys-apps/findutils/findutils-4.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit flag-o-matic toolchain-funcs python-any-r1
+inherit flag-o-matic python-any-r1
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="https://www.gnu.org/software/findutils/"