gentoo auto-resync : 01:09:2022 - 19:24:10

5 files changed, 75 insertions, 5 deletions

diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 1a23f985e2c5..6ff0be08c1e3 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,6 +1,8 @@
+AUX f2fs-tools-1.15.0-lz4-1.9.4.patch 819 BLAKE2B 0bedeb4362cf2a85e172cc5bf8b4d61f0f198f50032e431164513e3f92440a66d7e868b963c5e701332285e4045d88da3098094ab7b027d95a9b6b4f561a80f1 SHA512 11bb74d95ae1f182fb6c71f690d835e2225d96d00eccf9e85e35a2ea2dd8f06fbf15785d29ad57cee9ae4d8bf05a8c64d45ce0b9824cf25416fe43f1d0aeeb85
 DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
 DIST f2fs-tools-1.15.0.tar.gz 387663 BLAKE2B 1e55f87c839cee6431d9a83e9786201e9b6b872be27c8b92854b30b0fd1c651a9b7235ce93e70c530bfa7a4e9f4dfd309c72702b3338a4aa96e365b29424fb1d SHA512 61e40f16296091b55cec2dbdc6306af6abc2d3f854f39ef03a741b7f6f47348f915498375789f017f8da27fa7d27c79c905dd047693518adde503ea7ebf89387
 EBUILD f2fs-tools-1.14.0.ebuild 837 BLAKE2B 2ea6e841526daf9f2bb0ab59edd35e60d811b4b57af64053046c8590ce3f0dedd093c58ac88ed2db1b6d192364589385817c6f37b4d4ae5ac297d5dbb6dade21 SHA512 3eefc0bccc21238919659c197a6083097711e4c2f77dc8d0914b542782be4a54e816a7f986d2fa214b160779bc94568fd957571c3ea0cf170a7c61713714459c
+EBUILD f2fs-tools-1.15.0-r1.ebuild 916 BLAKE2B c710374048602f46296f902610e58f31b779d6acee46699e180ccd60665127d983be35e8e22451d369cc72cdbda174553af3f50c4074dd5277e4a5526863a4b8 SHA512 3533e00e488c1e3d7d1c310199cb2772710ddfcb9cf9c25ba94e9de2396703be5d3c7f166e41c2e2c8b469022c46230e5575447e45fe4dce1dcb35a5b9c75753
 EBUILD f2fs-tools-1.15.0.ebuild 852 BLAKE2B e42c5f52e4b83320e7d41428ccde29bf5845daa060500e4f39e261bf6aa536390154fe2d5f2c7e48d553dcc1c793944595a082d606ac4d4e8c2cde0625688ed9 SHA512 8f43a6fb6df23376408897fd8113acc749b2a5c0dc44eec054e88aa04bfd9a9330e0dc261eadbef92749eb12b2070848fd65468103e96633def32824af5761c2
-EBUILD f2fs-tools-9999.ebuild 801 BLAKE2B f1a69c3aa961b1c9a0cf11c4a8b94afc111cd2530260155603c60c36f8142086c21e9247765358c57dec483e9fb4fe1402d31963c857f9d8aa6bf697ae492d8b SHA512 91bc53d6892659c54805955620453af87aace5e717cbeb226ed892f1448eba71a50f9559d8861c92a47b559da8f472901127d7683369155ab20d446938df366f
-MISC metadata.xml 439 BLAKE2B c7c467cc754472343e7e4473b79e8a70ed5f2f34c94292db772c93ce8018373dd8fa2ffadb26c93febece4c5b5faa1e7eb1338dbd7f516c208f1e2e17bfea82f SHA512 8045798ff0308394ee5cdc172e13776291089d63769007d2b5c13a4d50f27fa1a1fec3eda3642cadd068d91780788d0d504faa6a17e754521d3f7e02934eb41b
+EBUILD f2fs-tools-9999.ebuild 802 BLAKE2B c88c57eced6a4405a0bf85a5025d7511fa6a714440391542a8d003443cd059cfd2725f98be580ae747215c8b40f3309e15946bd2328776be503221cebe2dcdb4 SHA512 64579db313bf22e86ca7c9df001505c0b7f63b3aa370cbde50227188ae71b39bc14ecb78009335b002f64c888f8670b63cd60f1caae2bde546d5408ee7e58460
+MISC metadata.xml 499 BLAKE2B cf24d50513eb8417e9b61fac55db48b2867a678f97408c6200607d30870ac6737ec497d3b8e864a2595db1c0c106117582b61fd4e7dce902f4b46bf109600236 SHA512 824226cd743055abbff2be7f1f67c18db293cd2c7cc0109e0a3a2f7cdc4e305da5656ff7aeb6d34d8dc723abd32152c408d97e2a1b43f8dd94a3771acb9b44a9
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
new file mode 100644
index 000000000000..654499bcdb8b
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux"
+
+RDEPEND="
+	selinux? ( sys-libs/libselinux )
+	elibc_musl? ( sys-libs/queue-standalone )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15.0-lz4-1.9.4.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# This is required to install to /sbin, bug #481110
+	econf \
+		--bindir="${EPREFIX}"/sbin \
+		--disable-static \
+		$(use_with selinux)
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
index 106339c983bf..45de5c193d7b 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 }
 
 src_configure() {
-	#This is required to install to /sbin, bug #481110
+	# This is required to install to /sbin, bug #481110
 	econf \
 		--bindir="${EPREFIX}"/sbin \
 		--disable-static \
diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch
new file mode 100644
index 000000000000..4194054271db
--- /dev/null
+++ b/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/867691
+https://github.com/jaegeuk/f2fs-tools/commit/b9e0985dc2e8f0a15faca21fa208afae57593486
+
+From: Jaegeuk Kim <jaegeuk@kernel.org>
+Date: Mon, 29 Aug 2022 11:03:35 -0700
+Subject: [PATCH] f2fs-tools: fix build error on lz4-1.9.4
+
+LZ4_STREAMSIZE_U64 is undefined in new lz4 lib.
+
+Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+--- a/fsck/compress.c
++++ b/fsck/compress.c
+@@ -32,10 +32,7 @@
+ #ifdef HAVE_LIBLZ4
+ #define LZ4_MEMORY_USAGE		14
+ #define LZ4_MAX_INPUT_SIZE		0x7E000000 /* 2 113 929 216 bytes */
+-#ifndef LZ4_STREAMSIZE
+-#define LZ4_STREAMSIZE			(LZ4_STREAMSIZE_U64 * sizeof(long long))
+-#endif
+-#define LZ4_MEM_COMPRESS		LZ4_STREAMSIZE
++#define LZ4_MEM_COMPRESS		sizeof(LZ4_stream_t)
+ #define LZ4_ACCELERATION_DEFAULT	1
+ #define LZ4_WORK_SIZE			ALIGN_UP(LZ4_MEM_COMPRESS, 8)
+ #endif
+
diff --git a/sys-fs/f2fs-tools/metadata.xml b/sys-fs/f2fs-tools/metadata.xml
index a4753dec8e9c..e71262b2c843 100644
--- a/sys-fs/f2fs-tools/metadata.xml
+++ b/sys-fs/f2fs-tools/metadata.xml
@@ -6,10 +6,11 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">f2fs-tools</remote-id>
+		<remote-id type="github">jaegeuk/f2fs-tools</remote-id>
 	</upstream>
 </pkgmetadata>