[gentoo-commits] repo/gentoo:master commit in: app-misc/rdfind/files/, app-misc/rdfind/

[gentoo-commits] repo/gentoo:master commit in: app-misc/rdfind/files/, app-misc/rdfind/

[Joonas Niilola]

commit:     dcede737cc58c399f6d479863d58cb8dcefaf2de
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Fri Aug 13 21:16:17 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 18:23:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcede737

app-misc/rdfind: Version bump 1.5.0.

Patch suggested upstream: <https://github.com/pauldreik/rdfind/pull/84>.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/21983
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-misc/rdfind/Manifest                           |  1 +
 .../files/rdfind-1.5.0_include-limits-header.patch | 25 ++++++++++++++++++++
 app-misc/rdfind/rdfind-1.5.0.ebuild                | 27 ++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest
index 6b722569fab..7351f40829f 100644
--- a/app-misc/rdfind/Manifest
+++ b/app-misc/rdfind/Manifest
@@ -1 +1,2 @@
 DIST rdfind-1.4.1.tar.gz 53708 BLAKE2B 18778fa65f9c5fda18a59e4021b6346bc5722c19a3796f2b4a85e5c8d919c5f8beeeb8fed572fcce0016e2939568f5e3dc3d3e567178a54ad9ac4e89a1ea77ff SHA512 00d34f46e8534074577a0cd32f71dd8da0b9a7c9a175a612a4a858693ca679de3b77fca1796b543ead796c806a693e97611c0a9fdc743229d317136b32ce89dc
+DIST rdfind-1.5.0.tar.gz 55200 BLAKE2B ad031acba85b6dead8ec3cfb2dfeb13bce424ee3b70dabc2b1ecaf0bcab8ae64c33ce1df22a54b430876d95ff59a58a2c3dc86d93f551ca8dc069488d3319e6d SHA512 007e54c90a74a20913ce8af6e6ecc90414c503260d88afa5a98525d43a7b6445762210c6a957beacdc99ff3dab95adb4100a2553454d177c0cfa3cbbc937f495

diff --git a/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch b/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch
new file mode 100644
index 00000000000..98eaa482d7d
--- /dev/null
+++ b/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch
@@ -0,0 +1,25 @@
+From 054eda51711cb2623bad022db613381fa8c183d0 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Sun, 15 Aug 2021 16:50:44 +0200
+Subject: [PATCH] Include limits header.
+
+Needed for std::numeric_limits.
+---
+ rdfind.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rdfind.cc b/rdfind.cc
+index fbd6cb8..64dd8f6 100644
+--- a/rdfind.cc
++++ b/rdfind.cc
+@@ -9,6 +9,7 @@
+ // std
+ #include <algorithm>
+ #include <iostream>
++#include <limits>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.31.1
+

diff --git a/app-misc/rdfind/rdfind-1.5.0.ebuild b/app-misc/rdfind/rdfind-1.5.0.ebuild
new file mode 100644
index 00000000000..c2159399232
--- /dev/null
+++ b/app-misc/rdfind/rdfind-1.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE=1.15
+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"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.0_include-limits-header.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/rdfind/files/, app-misc/rdfind/

[Petr Vaněk]

commit:     fafb6f0541ef7d43b7bf3bd019b591a033b2a320
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 11:12:06 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 11:12:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fafb6f05

app-misc/rdfind: drop 1.5.0-r1

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 app-misc/rdfind/Manifest                           |  1 -
 .../files/rdfind-1.5.0-configure-nettle.patch      | 23 --------------
 app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch    | 35 --------------------
 .../files/rdfind-1.5.0_include-limits-header.patch | 25 ---------------
 app-misc/rdfind/rdfind-1.5.0-r1.ebuild             | 37 ----------------------
 5 files changed, 121 deletions(-)

diff --git a/app-misc/rdfind/Manifest b/app-misc/rdfind/Manifest
index 8b6daf02e6ac..9df385e6605e 100644
--- a/app-misc/rdfind/Manifest
+++ b/app-misc/rdfind/Manifest
@@ -1,2 +1 @@
-DIST rdfind-1.5.0.tar.gz 55200 BLAKE2B ad031acba85b6dead8ec3cfb2dfeb13bce424ee3b70dabc2b1ecaf0bcab8ae64c33ce1df22a54b430876d95ff59a58a2c3dc86d93f551ca8dc069488d3319e6d SHA512 007e54c90a74a20913ce8af6e6ecc90414c503260d88afa5a98525d43a7b6445762210c6a957beacdc99ff3dab95adb4100a2553454d177c0cfa3cbbc937f495
 DIST rdfind-1.6.0.tar.gz 133937 BLAKE2B 88691864a4822198ca9b14bd61f6eb5371336463f165aad229d753fc925465019fa8c76d799b3889bda5405575cfe8ace404f1e3a4aec2e22edf9db62f89d164 SHA512 21d135551bd2d71a71dfe1e4faece6e980db3df18f34433b7b0a5da9e21ccc9067337892025afa9b4b1fd6069732a144b5b7b8e0441cbc9821a71a8b934cced1

diff --git a/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch b/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch
deleted file mode 100644
index d95fde911a00..000000000000
--- a/app-misc/rdfind/files/rdfind-1.5.0-configure-nettle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/pauldreik/rdfind/pull/115
-
-From 823a4deb61f6f9b91b0cfc4a7e7b20922c635777 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 1 Sep 2022 13:13:50 -0700
-Subject: [PATCH] configure: Fix check for AC_CHECK_LIB
-
-Check for nettle_pbkdf2_hmac_sha256 from libnettle instead of main()
-which is not in nettle library
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ERROR([
-  On Debian-ish systems, use "apt-get install nettle-dev" to get a system
-  wide nettle install.
- ])]) 
--AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([
-+AC_CHECK_LIB(nettle,nettle_pbkdf2_hmac_sha256,,[AC_MSG_ERROR([
-  Could not link to libnettle. Please install nettle
-  first. If you have already done so; please run ldconfig
-  as root or check whether the path libnettle was installed
-

diff --git a/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch b/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch
deleted file mode 100644
index 1597b89d7119..000000000000
--- a/app-misc/rdfind/files/rdfind-1.5.0-gcc-13.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/pauldreik/rdfind/pull/129
-
-(drop limits bit as we already had a patch for that)
-
-From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 25 Jan 2023 21:12:47 -0800
-Subject: [PATCH] include standard headers <limits> and <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint> is no longer
-transitively included [1]. Explicitly include it for uint64_t.
-
-Fixes errors like below
-
-../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std'
-  225 |     o.maximumfilesize = std::numeric_limits<decltype(o.maximumfilesize)>::max();
-      |                              ^~~~~~~~~~~~~~
-
-...
-
-| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/Fileinfo.hh
-+++ b/Fileinfo.hh
-@@ -8,6 +8,7 @@
- #define Fileinfo_hh
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- // os specific headers

diff --git a/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch b/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch
deleted file mode 100644
index 98eaa482d7df..000000000000
--- a/app-misc/rdfind/files/rdfind-1.5.0_include-limits-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 054eda51711cb2623bad022db613381fa8c183d0 Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Sun, 15 Aug 2021 16:50:44 +0200
-Subject: [PATCH] Include limits header.
-
-Needed for std::numeric_limits.
----
- rdfind.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/rdfind.cc b/rdfind.cc
-index fbd6cb8..64dd8f6 100644
---- a/rdfind.cc
-+++ b/rdfind.cc
-@@ -9,6 +9,7 @@
- // std
- #include <algorithm>
- #include <iostream>
-+#include <limits>
- #include <string>
- #include <vector>
- 
--- 
-2.31.1
-

diff --git a/app-misc/rdfind/rdfind-1.5.0-r1.ebuild b/app-misc/rdfind/rdfind-1.5.0-r1.ebuild
deleted file mode 100644
index 17e1449c369e..000000000000
--- a/app-misc/rdfind/rdfind-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 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="dev-build/autoconf-archive"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0_include-limits-header.patch"
-	"${FILESDIR}/${PN}-1.5.0-configure-nettle.patch"
-	"${FILESDIR}/${PN}-1.5.0-gcc-13.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_test() {
-	# Bug 840544
-	local -x SANDBOX_PREDICT="${SANDBOX_PREDICT}"
-	addpredict /
-	default
-}