gentoo auto-resync : 11:04:2023 - 23:39:54

3 files changed, 77 insertions, 16 deletions

diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 0eb2aba632ef..e98304739ea6 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,5 +1,7 @@
 AUX f2fs-tools-1.15.0-lz4-1.9.4.patch 819 BLAKE2B 0bedeb4362cf2a85e172cc5bf8b4d61f0f198f50032e431164513e3f92440a66d7e868b963c5e701332285e4045d88da3098094ab7b027d95a9b6b4f561a80f1 SHA512 11bb74d95ae1f182fb6c71f690d835e2225d96d00eccf9e85e35a2ea2dd8f06fbf15785d29ad57cee9ae4d8bf05a8c64d45ce0b9824cf25416fe43f1d0aeeb85
 DIST f2fs-tools-1.15.0.tar.gz 387663 BLAKE2B 1e55f87c839cee6431d9a83e9786201e9b6b872be27c8b92854b30b0fd1c651a9b7235ce93e70c530bfa7a4e9f4dfd309c72702b3338a4aa96e365b29424fb1d SHA512 61e40f16296091b55cec2dbdc6306af6abc2d3f854f39ef03a741b7f6f47348f915498375789f017f8da27fa7d27c79c905dd047693518adde503ea7ebf89387
+DIST f2fs-tools-1.16.0.tar.gz 265507 BLAKE2B a4fb94ff879198652a2922a0101b7e34aad156c3536e5a20c1cb2e36a6a734d92d3f97b2570eb702d029ef1d6c03d6123113fc1aa5658ba979401e0691b7b447 SHA512 ea198cebf7c5bb0c42c9b53bc80484495c403b1ed1354eb7cb7b4f63ed9a5c81653a76eaf1bc35067171fa5fd99b1564178c5440c21b6b025f4e83b9def82680
 EBUILD f2fs-tools-1.15.0-r2.ebuild 1015 BLAKE2B 169d07791116015ca1bb5817ab185293b1ae7b90d018cc424362456898888f5c93efe0485ab197d39075cadab5f39881f5d893443ecec3d3576f4c51051586fe SHA512 ce32a182737e83d8970528b4d6020ef6d9b6af3179a8591eb51df80951b6032f17bb86bc5b2455c771e5f4273a645718b2b60b34654a8764cc0fb836ffa713a4
-EBUILD f2fs-tools-9999.ebuild 907 BLAKE2B 87092c535237f9708d812519460baefacd622e5b48f4db8d7c1e71bf808390ffdefe2c27707c2b7f83bea3d794ec77f59eaa8d0004db75f799b07e18343edcd0 SHA512 30f32a999f93ff12dd8ed194ab6fe69311a15d1fb633520a14a6ffdec5ccbbe530bc8219a85e48887ea04df933232235b1408a4c85bceea7b5ef3b024c178b3f
+EBUILD f2fs-tools-1.16.0.ebuild 1087 BLAKE2B 0c99aaa8bd3f97ef49676cf6dba244704a6605fcfe8998e24816e764e80e86cd42d8c1b6518fddcde670be18eb1de289b4d53e0e6fbf8152d05ef504a1aacca3 SHA512 5b9ff6f624bbac4ce7d903424ca28fbaf73de7efb3e06d7fdb24e5dbfba058e19b22874288af2a27f9e9475f0f2d11c30efd5ee2adfdccbe3557a958db1a24d2
+EBUILD f2fs-tools-9999.ebuild 1087 BLAKE2B 0c99aaa8bd3f97ef49676cf6dba244704a6605fcfe8998e24816e764e80e86cd42d8c1b6518fddcde670be18eb1de289b4d53e0e6fbf8152d05ef504a1aacca3 SHA512 5b9ff6f624bbac4ce7d903424ca28fbaf73de7efb3e06d7fdb24e5dbfba058e19b22874288af2a27f9e9475f0f2d11c30efd5ee2adfdccbe3557a958db1a24d2
 MISC metadata.xml 505 BLAKE2B 97772236b6d7113c38a9d8920ac2b0d949ee55f9971a94caa8b4ebfb1e91a6d6bffc97702b4f952867afb8cffea7972ef17f1ba8f390f4195a465aa90c2f915b SHA512 7a80d22b56aeb5f59203cb2853a63d8a3b1af955051d1c307ce5af2b3c3ae999481a37938b674532807dbffa715a725a384905995532d72d18761b3732540b76
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild
new file mode 100644
index 000000000000..3224cc7ec9ff
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 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/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git"
+	EGIT_BRANCH="dev"
+else
+	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/10"
+IUSE="selinux"
+
+RDEPEND="
+	app-arch/lz4:=
+	dev-libs/lzo:2
+	sys-apps/util-linux
+	selinux? ( sys-libs/libselinux )
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# This is required to install to /sbin, bug #481110
+		--bindir="${EPREFIX}"/sbin
+		$(use_with selinux)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -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 bcb10bcc1cb6..3224cc7ec9ff 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
@@ -1,22 +1,32 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit git-r3 autotools
+inherit autotools
 
 DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git"
-EGIT_BRANCH="dev"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git"
+	EGIT_BRANCH="dev"
+else
+	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+fi
 
 LICENSE="GPL-2"
-SLOT="0/9"
+SLOT="0/10"
 IUSE="selinux"
 
 RDEPEND="
+	app-arch/lz4:=
+	dev-libs/lzo:2
+	sys-apps/util-linux
 	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
+	elibc_musl? ( sys-libs/queue-standalone )
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -25,17 +35,16 @@ src_prepare() {
 }
 
 src_configure() {
-	# This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
+	local myconf=(
+		# This is required to install to /sbin, bug #481110
+		--bindir="${EPREFIX}"/sbin
 		$(use_with selinux)
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name "*.la" -delete || die
-	# Collides with sg3_utils
-	# https://bugs.gentoo.org/880899
-	rm "${ED}/usr/sbin/sg_write_buffer" || die
+	find "${ED}" -name "*.la" -delete || die
 }