From 98561d5351f4a49d229ad9b1a3ad44fa85c0ed3b Mon Sep 17 00:00:00 2001 From: Alexander Miroshnichenko Date: Sat, 13 Dec 2025 10:38:15 +0300 Subject: [PATCH] sys-fs/bcachefs-tools: drop 1.33.0, add 1.33.1 Signed-off-by: Alexander Miroshnichenko --- sys-fs/bcachefs-tools/Manifest | 4 +- ....0.ebuild => bcachefs-tools-1.33.1.ebuild} | 0 .../bcachefs-tools/bcachefs-tools-9999.ebuild | 311 ------------------ 3 files changed, 2 insertions(+), 313 deletions(-) rename sys-fs/bcachefs-tools/{bcachefs-tools-1.33.0.ebuild => bcachefs-tools-1.33.1.ebuild} (100%) delete mode 100644 sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest index 3c07181..e88c1a5 100644 --- a/sys-fs/bcachefs-tools/Manifest +++ b/sys-fs/bcachefs-tools/Manifest @@ -5,8 +5,8 @@ DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9 DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6 DIST anyhow-1.0.89.crate 47078 BLAKE2B fc824e72891bff0cc7aa3b538adfb9af7dc843ab6ed12b8b04eb70e62d32aae1decb9090621d3245dbe89841e73080d2d86973b4aee50873e798956da9b3faa6 SHA512 3c09317089ed78601a56c626700d12c0b49396e25fed9a9f05a2dbfbd6f91ad426c430633006a4043decd1f70a85c161c4f8dd7de0e4c00b82a169b89dda8da0 -DIST bcachefs-tools-1.33.0.tar.sign 833 BLAKE2B 53ca1ec852a713c495c2bc987ee00b86a2bfae3b385486c2c11976ace89ecf354243c3103bf55435a49fbdb8d4aefbe27f91ea7213a762404b769bfa9b5a548d SHA512 fdcbcbedfe0feedc890ab5ddf4e5f47dba5cbc18efc422e69ebdd20c20c28f453325b8e661b6b9fecf026dcf71af4d34664576ca0d3cafd4d7ffd723343517ba -DIST bcachefs-tools-1.33.0.tar.zst 1378106 BLAKE2B 91f97f9200f17523508f1f65c6f77c4b5f34508a03ec91912e518290869c59d0c55ee6c198f3be1e398e68f438437721679d2296be51cb39d856836ab29e91e4 SHA512 19023911d5a534ae744668604b56d3807e94ff27e051d924e3b9cb11be677ae88276412a5857e06a87be39cfaf8456977ce92d0b187db798f2b799a1577da602 +DIST bcachefs-tools-1.33.1.tar.sign 833 BLAKE2B 92b750b51d79589305ff7b104cf1753291dd323e0e2cd00bdab5970d8ea0b0f908cecd5845d9e41b69ead1f01ba9dab8ab9c87caf3823b27b300259e6116bbe6 SHA512 b00e9e2ea16bba3207401bff7cbd67410b739d16ebbf2cd67622bde02c0e2346cfd3942cac6a5bb5b60d2ba42d55b803a80aaa910bc5e7a8298fb3d647f57754 +DIST bcachefs-tools-1.33.1.tar.zst 1381357 BLAKE2B db3ae1115903720f3e66dfc78d44101a5d38d481cf7cbe3575c0d72dc9f72af09911e2a3abdf16a00680b02c4d5c8ecbe0c8fbb4e21e151eb4cdbede1768eb3f SHA512 62135d0bd5758520887a7499e8ef8fae7663d63ce7a5df76950e682400b7d56f0bd2c951cc495f79175adff78e60bed23aefa3633b3658a0a2b3aa1b8c08dc2a DIST bindgen-0.69.5.crate 221128 BLAKE2B b89edbf883e1bc11a074c2f37f84bb966749823a6408b9765d6a61ee1179451d67dadde41d27838e8ddc6172dee9c342429f42fbe6959ff9fd7dcbc73d7506ea SHA512 b232b906af7535f8b87198f0a4037a0f09af367e0c913575f3d16453a2c272e7d76033cb3fd12d4223ebda4a0f8130629e67c5883e026a2422db3e0659ed3c3f DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.33.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.33.1.ebuild similarity index 100% rename from sys-fs/bcachefs-tools/bcachefs-tools-1.33.0.ebuild rename to sys-fs/bcachefs-tools/bcachefs-tools-1.33.1.ebuild diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild deleted file mode 100644 index 10e7395..0000000 --- a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" - aho-corasick@1.1.3 - anstream@0.6.15 - anstyle-parse@0.2.5 - anstyle-query@1.1.1 - anstyle-wincon@3.0.4 - anstyle@1.0.8 - anyhow@1.0.89 - 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 - clang-sys@1.8.1 - clap@4.5.20 - clap_builder@4.5.20 - clap_complete@4.5.33 - clap_derive@4.5.18 - clap_lex@0.7.2 - colorchoice@1.0.2 - 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 - is_terminal_polyfill@1.70.1 - itertools@0.12.1 - lazy_static@1.5.0 - lazycell@1.3.0 - libc@0.2.159 - libloading@0.8.5 - libudev-sys@0.1.4 - linux-raw-sys@0.4.14 - log@0.4.22 - memchr@2.7.4 - minimal-lexical@0.2.1 - nom@7.1.3 - once_cell@1.20.2 - owo-colors@4.1.0 - paste@1.0.15 - pkg-config@0.3.31 - prettyplease@0.2.22 - proc-macro2@1.0.87 - quote@1.0.37 - 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 - shlex@1.3.0 - strsim@0.11.1 - strum@0.26.3 - strum_macros@0.26.4 - syn@2.0.79 - terminal_size@0.4.0 - udev@0.7.0 - unicode-ident@1.0.13 - utf8parse@0.2.2 - uuid@1.10.0 - 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-sys@0.52.0 - windows-sys@0.59.0 - windows-targets@0.52.6 - windows_aarch64_gnullvm@0.52.6 - windows_aarch64_msvc@0.52.6 - windows_i686_gnu@0.52.6 - windows_i686_gnullvm@0.52.6 - windows_i686_msvc@0.52.6 - windows_x86_64_gnu@0.52.6 - windows_x86_64_gnullvm@0.52.6 - windows_x86_64_msvc@0.52.6 - zeroize@1.8.1 - zeroize_derive@1.4.2 -" - -MODULES_KERNEL_MIN=6.16 -MODULES_INITRAMFS_IUSE=+initramfs -MODULES_OPTIONAL_IUSE="modules" -MODULE_S="module/src/${PN%-*}-${PV}" -LLVM_COMPAT=( {17..21} ) -PYTHON_COMPAT=( python3_{11..14} ) -RUST_MIN_VER="1.77.0" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kentoverstreet.asc -#EGIT_COMMIT=b0a6966 - -inherit cargo flag-o-matic linux-mod-r1 llvm-r1 python-any-r1 shell-completion toolchain-funcs udev unpacker verify-sig - -DESCRIPTION="Tools for bcachefs" -HOMEPAGE="https://bcachefs.org/" -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git" - KEYWORDS="~amd64" -else - SRC_URI="https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.zst - ${CARGO_CRATE_URIS} - " - SRC_URI+=" verify-sig? ( https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-${PV}.tar.sign )" - S="${WORKDIR}/${P}" - KEYWORDS="~amd64 ~arm64" -fi - -LICENSE="GPL-2" -# Dependent crate licenses -LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-DFS-2016" -SLOT="0" -IUSE="fuse verify-sig" -RESTRICT="test" - -DEPEND=" - app-arch/lz4:= - app-arch/zstd:= - dev-libs/libaio - dev-libs/libsodium:= - dev-libs/userspace-rcu:= - sys-apps/keyutils:= - sys-apps/util-linux - virtual/zlib - virtual/udev - fuse? ( >=sys-fs/fuse-3.7.0 ) -" - -RDEPEND="${DEPEND} - modules? ( !sys-fs/bcachefs-kmod )" - -# Clang is required for bindgen -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/docutils[${PYTHON_USEDEP}] - ') - $(unpacker_src_uri_depends) - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - ') - elibc_musl? ( >=sys-libs/musl-1.2.5 ) - virtual/pkgconfig - verify-sig? ( >=sec-keys/openpgp-keys-kentoverstreet-20241012 ) -" - -QA_FLAGS_IGNORED="/sbin/bcachefs" - -python_check_deps() { - python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" -} - -pkg_setup() { - rust_pkg_setup - llvm-r1_pkg_setup - python-any-r1_pkg_setup - - if use modules ; then - local CONFIG_CHECK=" - BLOCK - CRC_OPTIMIZATIONS - EXPORTFS - CLOSURES - CRC32 - CRC64 - FS_POSIX_ACL - LZ4_COMPRESS - LZ4_DECOMPRESS - LZ4HC_COMPRESS - ZLIB_DEFLATE - ZLIB_INFLATE - ZSTD_COMPRESS - ZSTD_DECOMPRESS - CRYPTO_LIB_SHA256 - CRYPTO_LIB_CHACHA - CRYPTO_LIB_POLY1305 - KEYS - RAID6_PQ - XOR_BLOCKS - XXHASH - SYMBOLIC_ERRNAME - MIN_HEAP - XARRAY_MULTI - " - use amd64 && CONFIG_CHECK+=" - CRYPTO_CHACHA20_X86_64 - CRYPTO_POLY1305_X86_64 - " - use debug && CONFIG_CHECK+=" - DEBUG_INFO - FRAME_POINTER - !DEBUG_INFO_REDUCED - " - linux-mod-r1_pkg_setup - fi -} - -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 - else - 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::' \ - -i Makefile || die - append-lfs-flags - - if use modules ; then - emake DESTDIR="${WORKDIR}" PREFIX="/module" install_dkms - fi -} - -src_compile() { - use fuse && export BCACHEFS_FUSE=1 - export BUILD_VERBOSE=1 - export VERSION=${PV} - - default - - # This version mangles the symbolic link, - # please check if this can be removed before bumping - rm "${S}"/bcachefs - ln -s "${S}"/target/release/bcachefs bcachefs - - local shell - for shell in bash fish zsh; do - ./bcachefs completions ${shell} > ${shell}.completion || die - done - - if use modules ; then - local modlist=( "bcachefs=:../${MODULE_S}:../${MODULE_S}/src/fs/bcachefs" ) - local modargs=( - KDIR=${KV_OUT_DIR} - ) - - linux-mod-r1_src_compile - fi -} - -src_install() { - into / - dosbin bcachefs - - dosym bcachefs /sbin/fsck.bcachefs - dosym bcachefs /sbin/mkfs.bcachefs - dosym bcachefs /sbin/mount.bcachefs - - udev_dorules "udev/64-bcachefs.rules" - - if use fuse; then - dosym bcachefs /sbin/fsck.fuse.bcachefs - dosym bcachefs /sbin/mkfs.fuse.bcachefs - dosym bcachefs /sbin/mount.fuse.bcachefs - fi - - if use modules ; then - linux-mod-r1_src_install - fi - - newbashcomp bash.completion bcachefs - newfishcomp fish.completion bcachefs.fish - newzshcomp zsh.completion _bcachefs - - doman bcachefs.8 -} - -pkg_postinst() { - udev_reload - - if use modules ; then - linux-mod-r1_pkg_postinst - fi - - if use fuse; then - ewarn "FUSE support is experimental." - ewarn "Please only use it for development purposes at the risk of losing your data." - ewarn "You have been warned." - fi -} - -pkg_postrm() { - udev_reload -}