[gentoo-commits] repo/gentoo:master commit in: sys-fs/bcachefs-tools/

[Florian Schmaus]

commit:     87615717f5d23b552f0ddea5f04502cd8cc592e2
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 12:28:36 2026 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 12:37:25 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87615717

sys-fs/bcachefs-tools: sync live

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild | 57 ++++++++++++++++++------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild 
b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
index 560c195a1917..ff5019e33d16 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,13 +11,14 @@ CRATES="
        anstyle-wincon@3.0.4
        anstyle@1.0.8
        anyhow@1.0.89
+       ascii@1.1.0
        bindgen@0.69.5
        bitfield@0.14.0
        bitflags@1.3.2
        bitflags@2.6.0
-       cc@1.1.28
        cexpr@0.6.0
        cfg-if@1.0.0
+       chunked_transfer@1.5.0
        clang-sys@1.8.1
        clap@4.5.20
        clap_builder@4.5.20
@@ -25,55 +26,71 @@ CRATES="
        clap_derive@4.5.18
        clap_lex@0.7.2
        colorchoice@1.0.2
+       crossterm@0.28.1
        either@1.13.0
        env_logger@0.10.2
-       errno-dragonfly@0.1.2
-       errno@0.2.8
        errno@0.3.9
        glob@0.3.1
        heck@0.5.0
        home@0.5.9
+       httpdate@1.0.3
        is_terminal_polyfill@1.70.1
        itertools@0.12.1
+       itoa@1.0.17
        lazy_static@1.5.0
        lazycell@1.3.0
-       libc@0.2.159
+       libc@0.2.180
        libloading@0.8.5
        libudev-sys@0.1.4
        linux-raw-sys@0.4.14
+       lock_api@0.4.14
        log@0.4.22
        memchr@2.7.4
        minimal-lexical@0.2.1
+       mio@1.1.1
        nom@7.1.3
        once_cell@1.20.2
        owo-colors@4.1.0
+       parking_lot@0.12.5
+       parking_lot_core@0.9.12
        paste@1.0.15
        pkg-config@0.3.31
        prettyplease@0.2.22
        proc-macro2@1.0.87
        quote@1.0.37
+       redox_syscall@0.5.18
        regex-automata@0.4.8
        regex-syntax@0.8.5
        regex@1.11.0
        rustc-hash@1.1.0
        rustix@0.38.37
        rustversion@1.0.17
+       ryu@1.0.22
+       scopeguard@1.2.0
+       serde@1.0.210
+       serde_derive@1.0.210
+       serde_json@1.0.143
        shlex@1.3.0
+       signal-hook-mio@0.2.5
+       signal-hook-registry@1.4.8
+       signal-hook@0.3.18
+       smallvec@1.15.1
        strsim@0.11.1
        strum@0.26.3
        strum_macros@0.26.4
        syn@2.0.79
        terminal_size@0.4.0
+       tiny_http@0.12.0
        udev@0.7.0
        unicode-ident@1.0.13
        utf8parse@0.2.2
        uuid@1.10.0
+       wasi@0.11.1+wasi-snapshot-preview1
        which@4.4.2
-       winapi-i686-pc-windows-gnu@0.4.0
-       winapi-x86_64-pc-windows-gnu@0.4.0
-       winapi@0.3.9
+       windows-link@0.2.1
        windows-sys@0.52.0
        windows-sys@0.59.0
+       windows-sys@0.61.2
        windows-targets@0.52.6
        windows_aarch64_gnullvm@0.52.6
        windows_aarch64_msvc@0.52.6
@@ -87,11 +104,12 @@ CRATES="
        zeroize_derive@1.4.2
 "
 
-LLVM_COMPAT=( {17..20} )
+LLVM_COMPAT=( {17..21} )
 PYTHON_COMPAT=( python3_{11..14} )
-RUST_MIN_VER="1.77.0"
+RUST_MIN_VER="1.82"
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc
-inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion 
toolchain-funcs unpacker verify-sig
+
+inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion sysroot 
toolchain-funcs unpacker verify-sig
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/";
@@ -100,7 +118,8 @@ if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git";
 else
        
SRC_URI="https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.zst
-               ${CARGO_CRATE_URIS}"
+               ${CARGO_CRATE_URIS}
+       "
        SRC_URI+=" verify-sig? ( 
https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.sign )"
        S="${WORKDIR}/${P}"
        KEYWORDS="~amd64 ~arm64"
@@ -123,7 +142,7 @@ DEPEND="
        sys-apps/util-linux
        virtual/zlib:=
        virtual/udev
-       fuse? ( >=sys-fs/fuse-3.7.0 )
+       fuse? ( >=sys-fs/fuse-3.7.0:3= )
 "
 
 RDEPEND="${DEPEND}"
@@ -156,6 +175,14 @@ pkg_setup() {
 }
 
 src_unpack() {
+       # Upstream signs the uncompressed tarball
+       if use verify-sig; then
+               einfo "Unpacking ${P}.tar.zst ..."
+               verify-sig_verify_detached - "${DISTDIR}"/${P}.tar.sign \
+                       < <(zstd -fdc "${DISTDIR}"/${P}.tar.zst | tee >(tar -xf 
-))
+               assert "Unpack failed"
+       fi
+
        if [[ ${PV} == "9999" ]]; then
                git-r3_src_unpack
                S="${S}/rust-src" cargo_live_src_unpack
@@ -163,12 +190,14 @@ src_unpack() {
                unpacker ${P}.tar.zst
                cargo_src_unpack
        fi
+
 }
 
 src_prepare() {
        default
        tc-export CC
 
+       sed -i s/^VERSION=.*$/VERSION=${PV}/ Makefile || die
        sed \
                -e '/^CFLAGS/s:-O2::' \
                -e '/^CFLAGS/s:-g::' \
@@ -185,7 +214,7 @@ src_compile() {
 
        local shell
        for shell in bash fish zsh; do
-               ./bcachefs completions ${shell} > ${shell}.completion || die
+               sysroot_try_run_prefixed ./bcachefs completions ${shell} > 
${shell}.completion || die
        done
 }