gentoo resync : 12.05.2022

3 files changed, 9 insertions, 28 deletions

diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest
index 65bdfcef0660..d7ee2464c61f 100644
--- a/app-misc/rdfind/Manifest
+++ b/app-misc/rdfind/Manifest
@@ -1,6 +1,4 @@
 AUX rdfind-1.5.0_include-limits-header.patch 509 BLAKE2B 452f26f332850bcad3dbc6aa61cfcbc0c0fbde595330e12160572dd00b9bd4be3bf7f80bcf5b6eaef58adf211b1e5ad2e44c8ed46451a7d684e6b4dcce519150 SHA512 cfae0145b4b657060d465dbd841f3b5e3260cb4a63bfe4706038810b64020f4b8067fc3d5607a9c1480527378d45f4b7aa56a67178d720af318b584968ca17e6
-DIST rdfind-1.4.1.tar.gz 53708 BLAKE2B 18778fa65f9c5fda18a59e4021b6346bc5722c19a3796f2b4a85e5c8d919c5f8beeeb8fed572fcce0016e2939568f5e3dc3d3e567178a54ad9ac4e89a1ea77ff SHA512 00d34f46e8534074577a0cd32f71dd8da0b9a7c9a175a612a4a858693ca679de3b77fca1796b543ead796c806a693e97611c0a9fdc743229d317136b32ce89dc
 DIST rdfind-1.5.0.tar.gz 55200 BLAKE2B ad031acba85b6dead8ec3cfb2dfeb13bce424ee3b70dabc2b1ecaf0bcab8ae64c33ce1df22a54b430876d95ff59a58a2c3dc86d93f551ca8dc069488d3319e6d SHA512 007e54c90a74a20913ce8af6e6ecc90414c503260d88afa5a98525d43a7b6445762210c6a957beacdc99ff3dab95adb4100a2553454d177c0cfa3cbbc937f495
-EBUILD rdfind-1.4.1.ebuild 534 BLAKE2B c960258c2a59410b3d106cd24d699976615d2263d1177400bcee8ff9eceb44da319b8ffa11dc9002aa8bddcfc1ce50be46830fefe37fc5ad5e3b9dbacccb45a5 SHA512 8dfc23566939b930ea55daaf71f05f653167d5e4f7dd9ae9e543e77e6327545ddab10b304db267375112b800f35f3e2d8aa1ff4be05ad0433914009c54b78489
-EBUILD rdfind-1.5.0.ebuild 602 BLAKE2B 536cc019811464a630b47279efdc7cb7364429e17f9d55ba50cd3523d71f65cdb7d5c448269407d7145b10615eff7125e873789118b967eff8c9a1d5f1189444 SHA512 d34d8c2c6722b0c10601e7fc9db24d51ba26e50e60814d16fe8d620c535577390d518875fabff54f5967492e8ba273b53aea692fe372b2efdab34d173b68462b
+EBUILD rdfind-1.5.0.ebuild 702 BLAKE2B a49a5d26b9ecd34a66e7fb7dd50e7999c13a684310553042755fc8c42661bd92ff0a44c075f20505ce1308e31f323cefa51b0e5d85343cd0346bbebd9de7b4e5 SHA512 51de6b38a3b72aff83b3424f59bbcbf41939847409429b6e01a7742cba765b3cc015587108ac8f8b6a40d04373711dd50996a1e15ee2b4d6aab0b9794d56aecc
 MISC metadata.xml 841 BLAKE2B 32b8bde4c5907e3c1cf8cbecf78f1c10c9fe49efc9ce5748af35815c7d5a5ab958a440c6da5d7680f52d72ab200230813f33a54503edc274cd6d588716ee153b SHA512 bd25cb0e6341ef0202ed7c9b23db2de735818c3eb31b557145a12dca62cbe7298db4e7ad13b7f3c899055b51db13264a77a9eaf378e89e5f62886237e93bd142
diff --git a/app-misc/rdfind/rdfind-1.4.1.ebuild b/app-misc/rdfind/rdfind-1.4.1.ebuild
deleted file mode 100644
index 3d1a5b6fa188..000000000000
--- a/app-misc/rdfind/rdfind-1.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Find duplicate files based on their content"
-HOMEPAGE="https://github.com/pauldreik/rdfind"
-SRC_URI="https://github.com/pauldreik/rdfind/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-releases-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/nettle"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/autoconf-archive"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-misc/rdfind/rdfind-1.5.0.ebuild b/app-misc/rdfind/rdfind-1.5.0.ebuild
index 6425d24842bd..e376f74993f8 100644
--- a/app-misc/rdfind/rdfind-1.5.0.ebuild
+++ b/app-misc/rdfind/rdfind-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,3 +24,10 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
+src_test() {
+	# Bug 840544
+	local -x SANDBOX_PREDICT="${SANDBOX_PREDICT}"
+	addpredict /
+	default
+}