From bc74f68bad931feebbdde38823ee46387ce00b77 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 12 Nov 2022 20:46:55 -0500
Subject: sys-fs/f2fs-tools: remove /usr/sbin/sg_write_buffer

Closes: https://bugs.gentoo.org/880899
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild | 42 -------------------------
 sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild | 45 +++++++++++++++++++++++++++
 sys-fs/f2fs-tools/f2fs-tools-9999.ebuild      |  3 ++
 3 files changed, 48 insertions(+), 42 deletions(-)
 delete mode 100644 sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
 create mode 100644 sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild

(limited to 'sys-fs/f2fs-tools')

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
deleted file mode 100644
index f274697e2da9..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,42 +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}"
-
-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-1.15.0-r2.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild
new file mode 100644
index 000000000000..72236b8baf0b
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild
@@ -0,0 +1,45 @@
+# 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
+	# 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-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
 }
-- 
cgit v1.2.3-65-gdbad