gentoo auto-resync : 23:02:2025 - 19:24:09

4 files changed, 3 insertions, 82 deletions

diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index 08ff355516ae..ae765d327c90 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,6 +1,3 @@
-AUX duperemove-0.14.1-32bit.patch 1296 BLAKE2B 6064f8bd3e192acc6391f04a452572f0adb37ca1a7dd93253c3b394fa4214defe1e2ebdfd53bc4e854540e6fe3099a193f3ba351e117fcf8fa3c00847deb016f SHA512 533f817c0e605a3aa33d75e308f318100c5945f4958d78ef73f4bda0d219a45d81f8f65e2af19445b1aad31306a2228179f98064538345e8c5bcc6a8ff166625
-DIST duperemove-0.14.1.gh.new.tar.gz 167968 BLAKE2B 74d5ed6c452a24103d9ca0050ee1d1fdbb4eb4df5c2e86f84e6a1c70abf54d2caf27597d2088a5130d696bebaf07f93dd5f47e9c414af9ce3d19f096b872a02a SHA512 16af9fb002d6e51ce469869507d5d4b8f9576620746337252ad733e6f74ae275c1e83da6af1c203543b9d19890180952d87f9fad4a02d4c4e0a25577ce569191
 DIST duperemove-0.15.gh.tar.gz 119848 BLAKE2B 4b0455b34e3e5c1d002a39ade1b8abcd8a04b50ae7178b575218735e5529c0639f852dd433db1863c31fe14089e01bbc69fb202687d8a691c5a1f4de6f6b499a SHA512 e6d6e658c0175e74d706f9d4cbbeaa7bcad1b554eb60805415a948af63c78b6982cea6be6d48c15ddf14595a5b061d7794014eb1e8b71fab2041fc57e676c881
-EBUILD duperemove-0.14.1-r1.ebuild 818 BLAKE2B 0d517c674b8d949f2df9cd79fc01613835cbfd618abe5de1444a2656da4ff3c653123e3a7d67631e5276bf6138b952fc70c4c01f9d7ed35efd5c5303da2219ef SHA512 949ac6f98e59da10b5399c28755b0781ae8796b6c1ccb2825ddbf4a824961fec4dbd237251bfc36cf2b44218242bf38286cf9d83f1c55b9bf46251963bdffcaf
-EBUILD duperemove-0.15.ebuild 826 BLAKE2B a925837a057ab9ba3165dc6ec58622abdf01de090693c88ea0ff4e01db89fbf8fda5bac3e72ca2c95be4fa3da6ead319fafe8c0a9dc1338bb7d23883f1561d69 SHA512 39b7221e838f11c9d7ed20e7c0bc214aaab7b16d630c8a1a6eb7470a9dc45b2ae21419e063c56adb5ec2a4dcea33cf5239f1449aa1bd23567804ffaa28da5af0
+EBUILD duperemove-0.15.ebuild 841 BLAKE2B 172b971eae9d66b0596198febf48227e2b9b5e6c140df2b4530e99c9b2182cec6349428cba089f5b5718c493623253b80a9c0613cbe19699e2263c4c50998441 SHA512 c2cf7432327dcade50c0371596089291ed648e3e31478d397ce1e14f6e339177bce9597decedb62a7da4cd279fc7e1745e410101d98512e329b6f412d7826800
 MISC metadata.xml 334 BLAKE2B 375ee51b86214e9cc0d3b68727d83314d2694fa25f36758f7af1e691bcbc620896576c4f957809429d527ab0d9e6c6464af4850d13991b7174f8118901fd9985 SHA512 6ff5e136e085723546f070d388e9da22a902461629c799985fb2563c3eb3ca7b05794b4bcc96bedee97dd5a65551b2c74aeadbb3e2880a3ffa6426a9fea05bac
diff --git a/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild b/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
deleted file mode 100644
index 30aacbdaf841..000000000000
--- a/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs and xfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove/"
-# XXX: drop .new on bump after 0.14, added for respin
-SRC_URI="
-	https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz
-		-> ${P/_/.}.gh.new.tar.gz
-"
-S=${WORKDIR}/${P/_/.}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	# https://github.com/markfasheh/duperemove/issues/344
-	"${FILESDIR}/${P}-32bit.patch"
-)
-
-src_compile() {
-	emake VERSION="${PV}" IS_RELEASE=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.15.ebuild b/sys-fs/duperemove/duperemove-0.15.ebuild
index 0858fbf474bb..11471d39a0ca 100644
--- a/sys-fs/duperemove/duperemove-0.15.ebuild
+++ b/sys-fs/duperemove/duperemove-0.15.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/.}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -25,6 +25,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-libs/libbsd
+	dev-libs/xxhash
 "
 
 mymake() {
diff --git a/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch b/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch
deleted file mode 100644
index 6e2ebf79f063..000000000000
--- a/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9e97c827707e9d709180a12ddfa16527e36fc676 Mon Sep 17 00:00:00 2001
-From: Alexandre Bruyelles <git@jack.fr.eu.org>
-Date: Sun, 12 May 2024 19:45:52 +0200
-Subject: [PATCH] fiemap: fiemap_count_shared: use coherent parameter size
-
-Fixes https://github.com/markfasheh/duperemove/issues/344
-
-Signed-off-by: Alexandre Bruyelles <git@jack.fr.eu.org>
----
- fiemap.c | 2 +-
- fiemap.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fiemap.c b/fiemap.c
-index aa61114431bd..655797dc4d91 100644
---- a/fiemap.c
-+++ b/fiemap.c
-@@ -98,7 +98,7 @@ struct fiemap *do_fiemap(int fd)
- 	return fiemap;
- }
- 
--int fiemap_count_shared(int fd, size_t start_off, size_t end_off, size_t *shared)
-+int fiemap_count_shared(int fd, size_t start_off, size_t end_off, uint64_t *shared)
- {
- 	_cleanup_(freep) struct fiemap *fiemap = NULL;
- 	struct fiemap_extent *extent;
-diff --git a/fiemap.h b/fiemap.h
-index f9eb17b9aa4a..1918c6e96322 100644
---- a/fiemap.h
-+++ b/fiemap.h
-@@ -26,5 +26,5 @@ struct fiemap *do_fiemap(int fd);
- /*
-  * Count how much of the area between start_off and end_off is shared.
-  */
--int fiemap_count_shared(int fd, size_t start_off, size_t end_off, size_t *shared);
-+int fiemap_count_shared(int fd, size_t start_off, size_t end_off, uint64_t *shared);
- #endif	/* __FIEMAP_H__ */