gentoo auto-resync : 07:01:2025 - 06:41:06

3 files changed, 7 insertions, 55 deletions

diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 3a0bc34d8528..a103459dfc73 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1,5 +1,3 @@
-DIST erofs-utils-1.7.tar.gz 165393 BLAKE2B f22183fbc3346db0632f0fc842586251d0e17ea19e1de3be51cd807dfac4a6150a080d6b81625c3e08eeebc2ae28d7840f8209c905ca87fc70481d3d8c3913ec SHA512 0f204cd40644bde28f9bd0c5c234d93e68db3a3998bb089f43bfb3ce9a9db1e1cc2fa65919205cbd4a484fa4388cffadf5b395bc4363de3882e1a19778c2d62b
-DIST erofs-utils-1.8.1.tar.gz 184385 BLAKE2B 0ecf7ad0d42f3941751511f3ab42e7e25b85dc64849867a221272cf4596f6bfff3cb1c22877a485de79b4445f68eea8e77cb3f8c742a23ee5ad7ce0232b85091 SHA512 b7fe2441e5295680bc683e978ad97ee359785fd842d77fa86ef6bf869b5da87ad613f48782b5f59684995b6cbc5c274938c9ea9067baa537f09c029eabb4cca3
-EBUILD erofs-utils-1.7.ebuild 1006 BLAKE2B 362142e2d8da00981233599debae7463c5300571cdab96305e3b1ad7a120857aa84ab774b0807600f14b26a089477556a3e4e15e52a16e763b75aeac45dddc61 SHA512 e5e007b1a4a554b55865ef418dc14ad4eec95de1f5c1f59c8beb07ff74aa748ac9b20b732e249c7ce1e1e82d46ce06ad2e683f8776bdcd79309c76eb8c55b72d
-EBUILD erofs-utils-1.8.1.ebuild 1258 BLAKE2B f9c180bb0ae7b899db5f16a413b6a45a4951d0cf5c694c5983fd3ad9547de090ec0093bf9b4464050527634de9ba722580db850e51a314dd9ac08ccc6491b972 SHA512 8e7c7ecca451e41e83306d10a7bf2be3a031e7a775467707ede52009c5dc79efd91cd8f7f9c3adf7f72d2f49fa67d8756fcced3dba6b2ca03f36da31a32def08
+DIST erofs-utils-1.8.4.tar.gz 187276 BLAKE2B da0d80abbfd9b2d547c30bad7647165a3500f20e5de0b5db4c54efb27ec895fd069be983193b06d35728f5a8e1490e6cd255207c76135d8978d86e1512430755 SHA512 c941b0a2ab6c650a9aa4c9cadeb277ebc87007dc51354ff013c7cb763e6e8c9d44ed9e4791730ed05088faaba8c612198b924e70f5e52019382cfdf6d2e6b677
+EBUILD erofs-utils-1.8.4.ebuild 1394 BLAKE2B f228bec013902e641013c30fbb3694551fdbbfd8147a315a1bbbc68779143db0cd627e10609d2c64c30efaa473424be117b46611b3b41a1898e4bc878dd2eb04 SHA512 af46a0927f77ba64654d5fddfddeeda015ca41a425ffa050fbe0c918e72df86daf23ad03c7d1423cc455f658fd4916e5867df623acbf02a8a0b908038849f9dd
 MISC metadata.xml 561 BLAKE2B 021bc1323881f1d1e5aaf0ab2c49d393319048c31da034c297e6877a2c23f3e7bbf2392919df7bacfa75289ba11d051c2f896128e954348f3dd6c0850b847262 SHA512 2fb30129b20709a2cff8fa8b9fdb7e04aed0dd6df3c03306058109b0f85203273dbf925a16754a74a08b52f38c11dc1b1881419258e2fe1caa418c63b3c3d25f
diff --git a/sys-fs/erofs-utils/erofs-utils-1.7.ebuild b/sys-fs/erofs-utils/erofs-utils-1.7.ebuild
deleted file mode 100644
index bae6965ed9b7..000000000000
--- a/sys-fs/erofs-utils/erofs-utils-1.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-LICENSE="GPL-2+"
-
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~loong"
-
-SLOT="0"
-IUSE="fuse +lz4 +lzma selinux +uuid +zlib"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse:0 )
-	lz4? ( app-arch/lz4:0= )
-	lzma? ( >=app-arch/xz-utils-5.4.0:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	uuid? ( sys-apps/util-linux )
-	zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_enable fuse)
-		$(use_enable lz4)
-		$(use_enable lzma)
-		$(use_with selinux)
-		$(use_with uuid)
-		$(use_with zlib)
-		--without-libdeflate  # not packaged
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild b/sys-fs/erofs-utils/erofs-utils-1.8.4.ebuild
index 07c3889f14bb..56cd91d0567f 100644
--- a/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm64 ~loong"
 IUSE="fuse libdeflate +lz4 +lzma selinux static-libs +threads +uuid +zlib +zstd"
 
 RDEPEND="
+	dev-libs/xxhash:0=
 	fuse? ( sys-fs/fuse:0 )
 	lz4? ( app-arch/lz4:0= )
 	lzma? ( >=app-arch/xz-utils-5.4.0:0= )
@@ -53,6 +54,9 @@ src_configure() {
 		$(use_with zlib)
 		$(use_with zstd libzstd)
 		--without-qpl  # not packaged
+		# do not use bundled xxhash; also upstream says "expected to be
+		# faster than the internal one"
+		--with-xxhash
 	)
 
 	econf "${myeconfargs[@]}"