From 890c3819be5628b59ad7b2610c9ab49200da8edd Mon Sep 17 00:00:00 2001
From: Ben Kohler <bkohler@gentoo.org>
Date: Tue, 30 Apr 2024 11:17:20 -0500
Subject: gkbuilds/bcache-tools: really build new bcache-tools now

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 defaults/software.sh                          |  2 +-
 gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild | 27 +++++++++++++++++
 gkbuilds/bcache-tools-1.1_p20230217.gkbuild   | 42 +++++++++++++++++++++++++++
 gkbuilds/bcache-tools.gkbuild                 | 27 -----------------
 4 files changed, 70 insertions(+), 28 deletions(-)
 create mode 100644 gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild
 create mode 100644 gkbuilds/bcache-tools-1.1_p20230217.gkbuild
 delete mode 100644 gkbuilds/bcache-tools.gkbuild

diff --git a/defaults/software.sh b/defaults/software.sh
index 01c504b2..df7deccf 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -13,7 +13,7 @@ GKPKG_BCACHE_TOOLS_PN="bcache-tools"
 GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
 GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
 GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
-GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-399021549984ad27bf4a13ae85e458833fe003d7}"
+GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
 GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BOOST_PN="boost"
diff --git a/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild b/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild
new file mode 100644
index 00000000..556e7f23
--- /dev/null
+++ b/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+src_configure() {
+	append-ldflags -static
+}
+
+src_compile() {
+	PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \
+	gkmake V=1
+}
+
+src_install() {
+	gkmake V=1 UDEVLIBDIR="$(get_udevdir)" DESTDIR="${D}" install
+
+	rm -rf \
+		"${D}"/lib \
+		"${D}"/usr/lib/initcpio \
+		"${D}"/usr/sbin \
+		"${D}"/usr/share
+
+	"${STRIP}" --strip-all "${D}"/usr/lib/udev/bcache-register \
+		|| die "Failed to strip '${D}/usr/lib/udev/bcache-register'!"
+
+	"${STRIP}" --strip-all "${D}"/usr/lib/udev/probe-bcache \
+		|| die "Failed to strip '${D}/usr/lib/udev/probe-bcache'!"
+}
diff --git a/gkbuilds/bcache-tools-1.1_p20230217.gkbuild b/gkbuilds/bcache-tools-1.1_p20230217.gkbuild
new file mode 100644
index 00000000..720da66c
--- /dev/null
+++ b/gkbuilds/bcache-tools-1.1_p20230217.gkbuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+src_prepare() {
+	default
+
+	tc-export CC
+	sed \
+		-e '/^CFLAGS/s:-O2::' \
+		-e '/^CFLAGS/s:-g::' \
+		-e '/.*INSTALL.*share\/man/d' \
+		-e '/.*INSTALL.*bcache-status/d' \
+		-i Makefile || die
+
+	append-lfs-flags
+}
+
+src_configure() {
+	append-ldflags -static
+}
+
+src_compile() {
+	PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \
+	gkmake V=1
+}
+
+src_install() {
+	mkdir -p "${D}"/usr/sbin "${D}$(get_udevdir)"/rules.d
+	gkmake V=1 UDEVLIBDIR="$(get_udevdir)" DESTDIR="${D}" install
+
+	rm -rf \
+		"${D}"/lib \
+		"${D}"/usr/lib/initcpio \
+		"${D}"/usr/sbin \
+		"${D}"/usr/share
+
+	"${STRIP}" --strip-all "${D}"/usr/lib/udev/bcache-register \
+		|| die "Failed to strip '${D}/usr/lib/udev/bcache-register'!"
+
+	"${STRIP}" --strip-all "${D}"/usr/lib/udev/probe-bcache \
+		|| die "Failed to strip '${D}/usr/lib/udev/probe-bcache'!"
+}
diff --git a/gkbuilds/bcache-tools.gkbuild b/gkbuilds/bcache-tools.gkbuild
deleted file mode 100644
index 556e7f23..00000000
--- a/gkbuilds/bcache-tools.gkbuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-src_configure() {
-	append-ldflags -static
-}
-
-src_compile() {
-	PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \
-	gkmake V=1
-}
-
-src_install() {
-	gkmake V=1 UDEVLIBDIR="$(get_udevdir)" DESTDIR="${D}" install
-
-	rm -rf \
-		"${D}"/lib \
-		"${D}"/usr/lib/initcpio \
-		"${D}"/usr/sbin \
-		"${D}"/usr/share
-
-	"${STRIP}" --strip-all "${D}"/usr/lib/udev/bcache-register \
-		|| die "Failed to strip '${D}/usr/lib/udev/bcache-register'!"
-
-	"${STRIP}" --strip-all "${D}"/usr/lib/udev/probe-bcache \
-		|| die "Failed to strip '${D}/usr/lib/udev/probe-bcache'!"
-}
-- 
cgit v1.2.3-65-gdbad