gentoo auto-resync : 16:01:2023 - 11:57:19

4 files changed, 16 insertions, 18 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index fa7e88a16d18..08e3a2613889 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 0d9a03b6f980..d50541d971c0 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1,8 +1,7 @@
 AUX 1.4-dump-fix-de-nid-issues.patch 4849 BLAKE2B 48e29859955f5e7b13af7657a2411bad139de6cc373f17392bcd0b6cde55a83993795ff3f298f87fdfd950a0222c0f70714de161e02e9b2ad32b2afc513d8e4d SHA512 50d734ebbb7a7bd1c16bd90bae59e639213e607b2017cb16e65e1e3c653f604761136309564f77e80573196d7693e6ed90c30f9e35b9d3dafdb8365c38e1b0c3
 AUX 1.4-fsck-add-missing-include.patch 878 BLAKE2B e7d32eced8199a6c282d7398cea068cf560d9715caf035c67127f25fdf7055492fe25c56703e166a683f40cbb7d6ed6723c5d97467bec22f67418bb9b3bcfc5b SHA512 4cffb6faf7e1bb8150347ba8e47e0b05ad1b7d5dd4eb265330a33d6054dc6157e780a38b80a17cb61d3ab1fb2b41f36fcf65c39846f30003bc6013d23028c1fa
 AUX 1.4-werror.patch 2523 BLAKE2B e794e82eb2bbc2bdc76cefb054e37a8e07a3ce1abb3d94dcbcbf115189e719677fbe18b965f1d84353853b0963ab188638634f6ebc5c32d4790ebbf0850a94a1 SHA512 3856b297ba273389e5db9ce859291ee1bbdacbeda4cdf560250f1721af81fa2037a9e3b06d955ed4caab795fec15428397cc6b03d81e79269ae963dbd0e7d51a
-DIST erofs-utils-1.4.tar.gz 93979 BLAKE2B aef1dca8cb95e6104d73a84590319d3c55aba1a4ef5dbdbf470662cb86ee1b66a5707dc1c453470115ec6f2bf1246ee4b6b28aa1cb83b4cb9c8eed45e88668d4 SHA512 ab95d6a7b2d278ee443d1e378c62354db66ce7ab5ce03b3a8d9004cf498c4e43e3e8ced6524444d2ea4871c4db0195489f033180c8a2082c2cba69c46c09692f
 DIST erofs-utils-1.5.tar.gz 106559 BLAKE2B 69a2b93c0ba8c50fb3f75a53cc224490ab31f55e24055932091e85032a637c2be6d937ab42f068a2937e5b9d8b6054fd756e89b9333f47a6b6b35c20a421ed49 SHA512 0a9d593a9fef3c5976dc63e2927f47d070121ed07e6dda727b0a715b72cfe560c83bdf26ce41fe07b8cb5b66b0660105848e3f7c5a84f222296eb422d1cd5cba
-EBUILD erofs-utils-1.4.ebuild 1112 BLAKE2B b6309a68000ef76ce396cc4b73d9731d39005618cffd8ffedd2b54e300e0149d861e568cf7eae6d0cc890be0343635721429ef26b8c27dbed6279268999336df SHA512 71103201d5483b3cebf6f90f4eaeb80b19a4a0204ad24f0d2fe48936debcbdceb99c76f60329b9f63a5e23a1067fe75feb7fd14bdeb05e8a75f770ac0865d1a1
-EBUILD erofs-utils-1.5.ebuild 997 BLAKE2B 84c7ad925869c512f6a51045c443dc887c62e2daa3b06b910e3f441d719266ea7698d4bfb29beaf5b78a6e98f1796829fee90109a0d692e96914af049327bf17 SHA512 6f799afc9f6caf456ce9188ff55d61f1d4e6d464799de7971aa1824bb4dfcbdcdd95c734215a21a55dc7d9da768f29769da4e74d2b553c61f0b121498a470c70
+EBUILD erofs-utils-1.5-r1.ebuild 907 BLAKE2B dac0f19a9b237f5a4c0f4e581ad56f92d148936197249b8115d5f8abf4e46d4fc6e6b97e76fa1955b72107958b6c21e448efdb7b3176ac2aa0b3599e1e13ca41 SHA512 1d7f8f52d38b515180c8e735cd339d09d54bf5d0a01c178aedc3742b624dde4fd156d42e28f502be94738379731f4841b7c3d9f56d7f25161832ef0be026ed82
+EBUILD erofs-utils-1.5.ebuild 996 BLAKE2B 74f4069fa1416348a30f472b6c10000d60143f254c1d37b5bafa1e484ba8b301a58b8272d7b17f85e64045c2dede82a074024515a82991494fe97c01f814650c SHA512 92dddf7ff7e9d25f5c21f8ac2d47aa441f49d927ff790f08da3447837aafa36803d261cb5d711f502130f51ba539704944c043f7955de9c202d39e0887b7fa33
 MISC metadata.xml 422 BLAKE2B 9c580f677db0b02904c12e023efd2c1abf0dca9d5dd84776ea55551e3997a968bf23c092b9bfa98e941f7d16009c6e56cdd0120a075872c8e3f84a77899ba556 SHA512 bb5def8dcfe0ecfdc8ce9e6fec61b7c707114abef8e79f2c0f27736341e9c3cca48c053b613d85db762c1632194e76d3ab33386bf0be7ba669a6aaee652b64c1
diff --git a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild b/sys-fs/erofs-utils/erofs-utils-1.5-r1.ebuild
index b12a9a233e0d..bae100e2e3a3 100644
--- a/sys-fs/erofs-utils/erofs-utils-1.4.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,11 +13,12 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapsho
 KEYWORDS="~amd64 ~loong"
 
 SLOT="0"
-IUSE="fuse +lz4 selinux +uuid"
+IUSE="fuse +lz4 +lzma selinux +uuid"
 
 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 )
 "
@@ -25,9 +26,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PV}-dump-fix-de-nid-issues.patch"
-	"${FILESDIR}/${PV}-fsck-add-missing-include.patch"
-	"${FILESDIR}/${PV}-werror.patch"
 )
 
 src_prepare() {
@@ -36,13 +34,14 @@ src_prepare() {
 }
 
 src_configure() {
-	# This package asks for MicroLZMA support, which is not included in any
-	# released version of xz-utils at the moment, so disable lzma until a new
-	# xz-utils is packaged.
-	econf \
-		$(use_enable fuse) \
-		$(use_enable lz4) \
-		--disable-lzma \
-		$(use_with selinux) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_enable fuse)
+		$(use_enable lz4)
+		$(use_enable lzma)
+		$(use_with selinux)
 		$(use_with uuid)
+	)
+
+	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/erofs-utils/erofs-utils-1.5.ebuild b/sys-fs/erofs-utils/erofs-utils-1.5.ebuild
index 6ad7945f7521..95792c4fbb4b 100644
--- a/sys-fs/erofs-utils/erofs-utils-1.5.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ 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 ~loong"
+KEYWORDS="amd64 ~loong"
 
 SLOT="0"
 IUSE="fuse +lz4 selinux +uuid"