gentoo auto-resync : 13:11:2022 - 12:48:53

5 files changed, 8 insertions, 81 deletions

diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index b388427a622f..c157fa42d503 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,8 +1,5 @@
 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 910 BLAKE2B 901c90c42a6b4e5abc83a86cdc59e4ef23bcac0f8fb5cd073a823e1884d50db2e2489ed2d932c0b05b18e3ddd696e9d4c1330c7e7e5ddfe7c4d4b11261937771 SHA512 64121218225b1769a0cbfdd639181a5e3a5c1e29e1e99a18197cf3ab61ba21e7b9cd53aaec1207f41fe8c7617025bc79e11577ced6874494002980ae8ac8ed53
-EBUILD f2fs-tools-1.15.0.ebuild 852 BLAKE2B e42c5f52e4b83320e7d41428ccde29bf5845daa060500e4f39e261bf6aa536390154fe2d5f2c7e48d553dcc1c793944595a082d606ac4d4e8c2cde0625688ed9 SHA512 8f43a6fb6df23376408897fd8113acc749b2a5c0dc44eec054e88aa04bfd9a9330e0dc261eadbef92749eb12b2070848fd65468103e96633def32824af5761c2
-EBUILD f2fs-tools-9999.ebuild 802 BLAKE2B c88c57eced6a4405a0bf85a5025d7511fa6a714440391542a8d003443cd059cfd2725f98be580ae747215c8b40f3309e15946bd2328776be503221cebe2dcdb4 SHA512 64579db313bf22e86ca7c9df001505c0b7f63b3aa370cbde50227188ae71b39bc14ecb78009335b002f64c888f8670b63cd60f1caae2bde546d5408ee7e58460
+EBUILD f2fs-tools-1.15.0-r2.ebuild 1015 BLAKE2B 169d07791116015ca1bb5817ab185293b1ae7b90d018cc424362456898888f5c93efe0485ab197d39075cadab5f39881f5d893443ecec3d3576f4c51051586fe SHA512 ce32a182737e83d8970528b4d6020ef6d9b6af3179a8591eb51df80951b6032f17bb86bc5b2455c771e5f4273a645718b2b60b34654a8764cc0fb836ffa713a4
+EBUILD f2fs-tools-9999.ebuild 907 BLAKE2B 87092c535237f9708d812519460baefacd622e5b48f4db8d7c1e71bf808390ffdefe2c27707c2b7f83bea3d794ec77f59eaa8d0004db75f799b07e18343edcd0 SHA512 30f32a999f93ff12dd8ed194ab6fe69311a15d1fb633520a14a6ffdec5ccbbe530bc8219a85e48887ea04df933232235b1408a4c85bceea7b5ef3b024c178b3f
 MISC metadata.xml 499 BLAKE2B cf24d50513eb8417e9b61fac55db48b2867a678f97408c6200607d30870ac6737ec497d3b8e864a2595db1c0c106117582b61fd4e7dce902f4b46bf109600236 SHA512 824226cd743055abbff2be7f1f67c18db293cd2c7cc0109e0a3a2f7cdc4e305da5656ff7aeb6d34d8dc723abd32152c408d97e2a1b43f8dd94a3771acb9b44a9
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
deleted file mode 100644
index 6f0482e3a871..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8"
-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}"
-
-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-1.15.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild
index f274697e2da9..72236b8baf0b 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild
@@ -39,4 +39,7 @@ src_configure() {
 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
 }
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild
deleted file mode 100644
index 73df073760f4..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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}"
-
-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 45de5c193d7b..bcb10bcc1cb6 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-9999.ebuild
@@ -35,4 +35,7 @@ src_configure() {
 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
 }