From b093b4499fb4145e5dc2d4d3763892ad55bbf28a Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@gentoo.org>
Date: Fri, 12 Jun 2026 10:48:01 +0200
Subject: [PATCH] sys-fs/bcachefs-tools: sync live

Closes: https://bugs.gentoo.org/976075
Closes: https://bugs.gentoo.org/976074
Signed-off-by: Florian Schmaus <flow@gentoo.org>
---
 .../bcachefs-tools/bcachefs-tools-9999.ebuild | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
index 3808f712f2614..81a3fc835fd9a 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
@@ -85,6 +85,7 @@ CRATES="
 	regex-automata@0.4.8
 	regex-syntax@0.8.5
 	regex@1.11.0
+	rustc-demangle@0.1.27
 	rustc-hash@2.1.1
 	rustix@0.38.37
 	rustversion@1.0.17
@@ -153,7 +154,7 @@ PYTHON_COMPAT=( python3_{11..14} )
 RUST_MIN_VER="1.85.0"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
 
-inherit cargo flag-o-matic linux-mod-r1 llvm-r2 multiprocessing python-any-r1
+inherit cargo flag-o-matic linux-mod-r1 llvm-r2 python-any-r1
 inherit shell-completion sysroot toolchain-funcs unpacker verify-sig
 
 DESCRIPTION="Tools for bcachefs"
@@ -174,7 +175,7 @@ LICENSE="GPL-2"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-DFS-2016"
 SLOT="0"
-IUSE="debug verify-sig"
+IUSE="debug llvm-libunwind verify-sig"
 RESTRICT="test"
 
 DEPEND="
@@ -185,7 +186,8 @@ DEPEND="
 	dev-libs/userspace-rcu:=
 	sys-apps/keyutils:=
 	sys-apps/util-linux
-	sys-libs/libunwind:=
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
 	virtual/udev
 	virtual/zlib:=
 "
@@ -275,31 +277,37 @@ src_prepare() {
 	default
 	tc-export CC
 
-	sed -i s/^VERSION=.*$/VERSION=${PV}/ Makefile || die
+	echo "${PV}" > .version || die
 	sed \
 		-e '/^CFLAGS/s:-O2::' \
 		-e '/^CFLAGS/s:-g::' \
 		-i Makefile || die
+
+	if use llvm-libunwind; then
+		sed -i s/libunwind// Makefile || die
+	fi
+
 	append-lfs-flags
 }
 
 src_configure() {
 	cargo_src_configure
-	use modules && emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms
+
+	MODULE_SRC="module/${PN%-*}-${PV}"
+	use modules && emake DESTDIR="${WORKDIR}" DKMSDIR="/${MODULE_SRC}" install_dkms
 }
 
 src_compile() {
 	export BUILD_VERBOSE=1
 	export VERSION=${PV}
 
-	local module_s="module/src/${PN%-*}-${PV}"
-	local modlist=( "bcachefs=:../${module_s}:../${module_s}/src/fs/bcachefs" )
+	local modlist=( "bcachefs=:../${MODULE_SRC}:../${MODULE_SRC}/src/fs/bcachefs" )
 	local modargs=(
 		KDIR=${KV_OUT_DIR}
 	)
 
 	# Makefile calls `cargo` directly, so make sure we set our rustflags (etc)
-	cargo_env emake -j$(get_makeopts_jobs) bcachefs || die
+	cargo_env emake bcachefs || die
 	use modules && linux-mod-r1_src_compile
 
 	local shell