gentoo auto-resync : 09:04:2024 - 18:31:35

5 files changed, 21 insertions, 62 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5da54fecaf7e..0c459026edb8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 1d1d86154087..65af86a2102d 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,6 +1,5 @@
 AUX f2fs-tools-1.16.0-musl-1.2.4-lfs.patch 11468 BLAKE2B e7149c9c895c108cd90b729e5201fd41aa2a12ff3d4fcc13709015fdc8529f8af5e1d4380966096e4f7a425341d7b1056348b4cc3e35dd113875b882b70a3179 SHA512 05619636cdbb1c602953eee5073c06295adcbe52cca0f57449937ff7b1d96e3c61e3f436858a70399cf4d615b7e8ead21ee71d1a031d481d705e045dd8820dfc
 DIST f2fs-tools-1.16.0.tar.gz 265507 BLAKE2B a4fb94ff879198652a2922a0101b7e34aad156c3536e5a20c1cb2e36a6a734d92d3f97b2570eb702d029ef1d6c03d6123113fc1aa5658ba979401e0691b7b447 SHA512 ea198cebf7c5bb0c42c9b53bc80484495c403b1ed1354eb7cb7b4f63ed9a5c81653a76eaf1bc35067171fa5fd99b1564178c5440c21b6b025f4e83b9def82680
-EBUILD f2fs-tools-1.16.0-r1.ebuild 1202 BLAKE2B 4c54ffb89262e9e6c79060414749a27876a0ec17b22ce61966592219be5da679f9d4875620aeb4d9138f7613ca12efabf5178d85739ab1754613713e875da4fb SHA512 fe7c2d948a2c3e6fade2e34b55f0fa89eca41c1e0aec0a31f3da753a34ebb3d9b755d3cfa11d07ea8758238d8bda337e070b5f35024bbda959d3a2305d008081
-EBUILD f2fs-tools-1.16.0.ebuild 1148 BLAKE2B 89db0546409f639f727197ca0ff518bbe401cd45a49062c73586f9fe1eca0ddaddca83b8e68540e15ed0832a78bca638aae9cb747f9232b23eb643a3778c2332 SHA512 6d32619a2a8bdb8ef630c04e24eceb6353e4bec7cca53b47cf8a79a68ed69c2f31f47c3f764e2b91b4f9efe6ae89f8679be04c16a6aa1da647786ab588f5f805
-EBUILD f2fs-tools-9999.ebuild 1087 BLAKE2B 0c99aaa8bd3f97ef49676cf6dba244704a6605fcfe8998e24816e764e80e86cd42d8c1b6518fddcde670be18eb1de289b4d53e0e6fbf8152d05ef504a1aacca3 SHA512 5b9ff6f624bbac4ce7d903424ca28fbaf73de7efb3e06d7fdb24e5dbfba058e19b22874288af2a27f9e9475f0f2d11c30efd5ee2adfdccbe3557a958db1a24d2
+EBUILD f2fs-tools-1.16.0-r1.ebuild 1364 BLAKE2B 2f87c56f4b11fc5d80d51d2bcd774cc5f89f0006b5211755e2b2d2a9d7ef54d6429de46384d9454440181edf9e9c39714b8a86d96dc9e3be709edf9aa0c0115b SHA512 6d9f23fc4a8772cacd87d78cc2b7ef9721fb7295d83b0cdda4d71052b5fafadc521a0afa7057ef2c37cf08713c8c58118bbd3ac2e21df2abfea14722c0a805cc
+EBUILD f2fs-tools-9999.ebuild 1316 BLAKE2B 4358f01069ef77b3f41e139ae8cc5ad98507ed4302837f797b5856a1a96e1e873092e7f102fd98bfdff67d8caa67885c73a906e61619855bfa0a8968a87b0f55 SHA512 49ec6a4cc420d13d6c3a3aa8101a2381df02a6a3abde4f7b1b1399381f419c078575f25e6fa6ea8dadfa3efa8dd490bc04d03dc82d6eb91336991af0c4836068
 MISC metadata.xml 578 BLAKE2B 3469a97d49d3ec8755c1fb237d022b67678d43bcf8c3b0276de6c0157c880838c0fc8427a5648f7c415f41b1105f915d443debdd92397f8e557c993eeb52be57 SHA512 5414e9f3cfc90e16de569f267802721f6bb8bc324c4174cac4b81bee7fc298876f221360a264a4f0d83ed1ef9f6a336af73fc75eaf0b5203a219d4abea5a23dd
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.16.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.16.0-r1.ebuild
index 8860568e1a21..a99653220be6 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.16.0-r1.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.16.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
 HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
@@ -39,6 +39,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/863896
+	# Sent an email to linux-f2fs-devel@ but it hasn't been accepted yet...
+	filter-lto
+
 	local myconf=(
 		# This is required to install to /sbin, bug #481110
 		--bindir="${EPREFIX}"/sbin
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild
deleted file mode 100644
index 58e819258d21..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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="lz4 lzo selinux"
-
-RDEPEND="
-	lz4? ( app-arch/lz4:= )
-	lzo? ( 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 lz4)
-		$(use_with lzo lzo2)
-		$(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 3224cc7ec9ff..7657d65cf872 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
 HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
@@ -18,11 +18,11 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/10"
-IUSE="selinux"
+IUSE="lz4 lzo selinux"
 
 RDEPEND="
-	app-arch/lz4:=
-	dev-libs/lzo:2
+	lz4? ( app-arch/lz4:= )
+	lzo? ( dev-libs/lzo:2 )
 	sys-apps/util-linux
 	selinux? ( sys-libs/libselinux )
 	elibc_musl? ( sys-libs/queue-standalone )
@@ -35,9 +35,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/863896
+	# Sent an email to linux-f2fs-devel@ but it hasn't been accepted yet...
+	filter-lto
+
 	local myconf=(
 		# This is required to install to /sbin, bug #481110
 		--bindir="${EPREFIX}"/sbin
+		$(use_with lz4)
+		$(use_with lzo lzo2)
 		$(use_with selinux)
 	)