gentoo auto-resync : 20:04:2024 - 12:05:23

2 files changed, 77 insertions, 85 deletions

diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index e55caa3450c1..b5b3455672d2 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -14,10 +14,10 @@ DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b1
 DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST bcachefs-tools-1.3.5_p20231216.tar.gz 1059604 BLAKE2B 0f3a138b0586c04c53967b801917372486f6558e8d1c9230bc33b1de39a1f7c82ba53bea0b063e1609742ec345fed9f374328ee4990d9bdf456f96ae5219334a SHA512 52b49598ceb5308e7ff235d87fb1e628836b7b297f06a02232307ae34b63fa7cd3eeb4919022bda40aa05954e0237284db7d7cb2e1bfecad629f01cf08caaeec
 DIST bcachefs-tools-1.4.0.tar.gz 1060158 BLAKE2B c972de13e305b07910ab4acdfea05df85bfe70ed350dea5fb578a150a9e116f054dc99bf6dd185aa26dab799832939276a6248203717b918c1d7e0e9f2e0fdd9 SHA512 f374c3b2ec1836ea79ed37f188aaf9c98d6d217b2b05c050304467068a1e042e2e5ea99f2e67d546cd68f3e39be065e62bae73ff13e92ceb29a15df9fe63e4e2
 DIST bcachefs-tools-1.4.1.tar.gz 1069244 BLAKE2B 7be0a343758a221a39dad5eca1c11c74d049e208712d30ffdfd919c97ef87e561983b85b2fbefa932cb69ef50418dce761a9c01afe0114f67b8ddd55b5d62a2c SHA512 65d0f182982d942d1263d60cf435a1142393b9dcf1e7dbea53a873925a82954b47422ade04bbc5b69c955de80ef820e9eeefcfed47aaab3bcc27d3916a94ff4a
 DIST bcachefs-tools-1.6.4.tar.gz 1083811 BLAKE2B 656b1545ccf41dd35e3e6f656a9b5280fe0b5fa43a0ea86243c6693033d986b091fdd3d79ab2ff5c1c9402bce6f4ee33f49e070f6aebd5bba355df7a82d8fc21 SHA512 3e73ee15673eac771393859132146f1c23f4250f68bf8753b5214e88e854959c56efabdaeff4a8ad883287bd289abe08c5c37f6ef7220b984fa679a90c578e57
+DIST bcachefs-tools-1.7.0.tar.gz 1103425 BLAKE2B 952310999035465a4e8621e8e3ef65e5a3ba50d40a0ca76a3ca8b7265bab2f33c40981d2ca83ef3ecc70a5da9cff0d002d2f9676aa6355d1717a0dad968828af SHA512 5f7934997c0cd6b893c67a87e9cb5060cdd37857d6761356bdb1c96572b67ea3a2c03c43fcbd8beb01b0cf9c30da3297d082ef40bb312f5ca40c85faa46cdd3a
 DIST bindgen-0.69.4.crate 221092 BLAKE2B 69ed55a5827bfe850f589e39bc6e2f4445e20363002c765c5475007b75e4d81cac3d9df358505c63bd6a48300ae4988507abf78dd734bb98b33525bf9212237b SHA512 99530060708690f2ce0b87b97c9ce2998ee968df193137f3c9bf4fa66836814e2ae74c7e0b3057dcff1da7d2c4ea38157e21143c5117be35e94b878c0a427a34
 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -146,9 +146,9 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e
 DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
-EBUILD bcachefs-tools-1.3.5_p20231216.ebuild 5616 BLAKE2B f1222050a780ef05a75cc535cd505dc297d207d19ec489c9580059ed949476a2651096eb79c02ad4261fc943a4108456e1dbd70992d8d3e1a583dfc784060798 SHA512 861bd371addf89eb77a153201be0b863727ab5be0829c2e3b09517cb1d9d9bf87c86cf3b475d8d595a0b0e626cd00522a246e70d0a57b4af99e7b76b77be4b5a
 EBUILD bcachefs-tools-1.4.0.ebuild 5642 BLAKE2B e36cd889bee4e0dbc8cb2cb42e07636aa9c79de0df23995e073006e6c478efdd91bcb91786e06e49137bbb677a15a65ced5be5eeea0e9d2aca8f68e236343268 SHA512 15699d44fe9adafe68ac50b17ae2bc3ddbeb0dddf8d7aa74277da8a8c8b682e4799f7567cc276041bb712ba4c127e84f58647cdd62198f712bf96a685341365a
 EBUILD bcachefs-tools-1.4.1.ebuild 5563 BLAKE2B 4011b46e0e0f4d2fb7b5b3125c3ad258cf59c8768950a2415ed78bef96dedcbfec202df3ff0bdd9f4426f9f471bf3e7564adc0d225b3befd099321bb457a19a6 SHA512 f00a0571e93e8da12637e9f98b506f02b47f41ef2c223525e08058ee6758534362228f1ce68c2fda891ac7170e322049c07160abae1cdcc4e93e3b7e93711752
 EBUILD bcachefs-tools-1.6.4-r1.ebuild 5242 BLAKE2B fd962577af482a9c6c1c83480eab65e9bd949c21e2560fb5c03c350ff63e0e81b3fc31f48725d38faf2ec28a250e753949e058d4c3e75bf4dd57e3d4938b8c98 SHA512 8a634605a38375893a9aa65c8ce9ab79aaa4a6b77f298bd4aa67175f94b254921acccdd4f9401e61bd9ef61bc9162d86c44216f9defaeb154e46f45fb744b22b
+EBUILD bcachefs-tools-1.7.0.ebuild 5277 BLAKE2B 268a300e477bbcabe90120b22d05c6fd8e7b97e95367e612b014383aa3bf2e4074299ea2d6ef30bcd3a7cb3fd9fd9ddb6a70537258ab69a3767464f5e4f14a18 SHA512 2629e41033dd6b1983a29a7be510880de92a342efb14b6f1458c0f9d99f1f5c68c6bcca625046628073b624d0de10e3f1aeb065024b9c74001a114b849c4710d
 EBUILD bcachefs-tools-9999.ebuild 5242 BLAKE2B fd962577af482a9c6c1c83480eab65e9bd949c21e2560fb5c03c350ff63e0e81b3fc31f48725d38faf2ec28a250e753949e058d4c3e75bf4dd57e3d4938b8c98 SHA512 8a634605a38375893a9aa65c8ce9ab79aaa4a6b77f298bd4aa67175f94b254921acccdd4f9401e61bd9ef61bc9162d86c44216f9defaeb154e46f45fb744b22b
 MISC metadata.xml 751 BLAKE2B 58fb2ebb3092cb1056b36a5389d486faf4fb3fc6c107f5aeb65d1002722f7f238f776df5698bfceb4e2bf6b0ee4f1aa04d3015784c95141d300f6f82654525bd SHA512 5a6a46cfb145160a0871bf7a591238470d08744552870b54b9c7c78afac860a256fbd6765972a77ca81b78239695850b26c04acc1b24d1a4b35f52d6ef9e2501
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.3.5_p20231216.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0.ebuild
index f65a1b327df4..e71c60bba299 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.3.5_p20231216.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.7.0.ebuild
@@ -1,116 +1,101 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES="
 	aho-corasick@1.1.2
-	anstream@0.3.2
-	anstyle-parse@0.2.1
-	anstyle-query@1.0.0
-	anstyle-wincon@1.0.2
-	anstyle@1.0.2
-	anyhow@1.0.75
-	atty@0.2.14
+	anstream@0.6.11
+	anstyle-parse@0.2.3
+	anstyle-query@1.0.2
+	anstyle-wincon@3.0.2
+	anstyle@1.0.6
+	anyhow@1.0.79
 	autocfg@1.1.0
+	bindgen@0.69.4
 	bitfield@0.14.0
 	bitflags@1.3.2
-	bitflags@2.4.1
+	bitflags@2.4.2
 	byteorder@1.5.0
 	cc@1.0.83
 	cexpr@0.6.0
 	cfg-if@1.0.0
-	chrono@0.4.31
-	clang-sys@1.6.1
-	clap_builder@4.3.24
-	clap_complete@4.3.2
-	clap_derive@4.3.12
-	clap_lex@0.5.0
-	clap@4.3.24
+	clang-sys@1.7.0
+	clap@4.4.18
+	clap_builder@4.4.18
+	clap_complete@4.4.10
+	clap_derive@4.4.7
+	clap_lex@0.6.0
 	colorchoice@1.0.0
-	colored@2.0.4
+	colored@2.1.0
 	either@1.9.0
 	errno-dragonfly@0.1.2
 	errno@0.2.8
-	errno@0.3.7
-	fastrand@2.0.1
-	filedescriptor@0.8.2
-	gag@1.0.0
-	getset@0.1.2
+	errno@0.3.8
 	glob@0.3.1
 	heck@0.4.1
-	hermit-abi@0.1.19
-	hermit-abi@0.3.3
-	io-lifetimes@1.0.11
-	is-terminal@0.4.9
-	itertools@0.9.0
+	home@0.5.9
+	itertools@0.12.1
 	lazy_static@1.4.0
 	lazycell@1.3.0
-	libc@0.2.150
+	libc@0.2.153
+	libloading@0.8.1
 	libudev-sys@0.1.4
-	linux-raw-sys@0.3.8
-	linux-raw-sys@0.4.11
+	linux-raw-sys@0.4.13
 	log@0.4.20
-	memchr@2.6.4
+	memchr@2.7.1
 	memoffset@0.8.0
 	minimal-lexical@0.2.1
 	nom@7.1.3
-	num-traits@0.2.17
-	once_cell@1.18.0
-	parse-display-derive@0.1.2
-	parse-display@0.1.2
+	once_cell@1.19.0
 	paste@1.0.14
-	peeking_take_while@0.1.2
-	pkg-config@0.3.27
-	proc-macro-error-attr@1.0.4
-	proc-macro-error@1.0.4
-	proc-macro2@1.0.69
-	quote@1.0.33
-	redox_syscall@0.4.1
-	regex-automata@0.4.3
-	regex-syntax@0.6.29
+	pkg-config@0.3.29
+	prettyplease@0.2.16
+	proc-macro2@1.0.78
+	quote@1.0.35
+	regex-automata@0.4.5
 	regex-syntax@0.8.2
-	regex@1.10.2
-	rpassword@4.0.5
+	regex@1.10.3
+	rpassword@7.3.1
+	rtoolbox@0.0.2
 	rustc-hash@1.1.0
-	rustix@0.37.27
-	rustix@0.38.25
-	shlex@1.2.0
+	rustix@0.38.31
+	shlex@1.3.0
 	strsim@0.10.0
-	syn@1.0.109
-	syn@2.0.39
-	tempfile@3.8.1
-	terminal_size@0.2.6
-	thiserror-impl@1.0.50
-	thiserror@1.0.50
+	syn@2.0.48
+	terminal_size@0.3.0
 	udev@0.7.0
 	unicode-ident@1.0.12
 	utf8parse@0.2.1
-	uuid@1.6.1
-	version_check@0.9.4
+	uuid@1.7.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.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.0
 	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.0
 	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.0
 	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.0
 	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.0
 	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.0
 	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.0
 	windows_x86_64_msvc@0.48.5
-	windows-sys@0.48.0
-	windows-targets@0.48.5
+	windows_x86_64_msvc@0.52.0
 "
 
-# Upstream have a fork of bindgen and use cgit
-declare -A GIT_CRATES=(
-	[bindgen]="https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs;f773267b090bf16b9e8375fcbdcd8ba5e88806a8;rust-bindgen-bcachefs-%commit%/bindgen"
-)
-
-LLVM_MAX_SLOT=17
+LLVM_COMPAT=( {16..18} )
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cargo flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs unpacker
+inherit cargo flag-o-matic llvm-r1 multiprocessing python-any-r1 shell-completion toolchain-funcs unpacker
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"
@@ -118,11 +103,10 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"
 else
-	MY_COMMIT=d8e7f3671db406b587a420cae420ec14a189399e
-	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}"
-	S="${WORKDIR}/${PN}-${MY_COMMIT}"
-	KEYWORDS="~amd64"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="Apache-2.0 BSD GPL-2 MIT"
@@ -131,19 +115,20 @@ IUSE="fuse test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	fuse? ( >=sys-fs/fuse-3.7.0 )
 	app-arch/lz4:=
+	app-arch/zstd:=
 	dev-libs/libaio
 	dev-libs/libsodium:=
 	dev-libs/userspace-rcu:=
-	sys-apps/keyutils
+	sys-apps/keyutils:=
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/udev
+	fuse? ( >=sys-fs/fuse-3.7.0 )
 "
 
 RDEPEND="${DEPEND}"
-
+#
 # Clang is required for bindgen
 BDEPEND="
 	${PYTHON_DEPS}
@@ -155,14 +140,14 @@ BDEPEND="
 		)
 	')
 	$(unpacker_src_uri_depends)
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+	')
 	virtual/pkgconfig
 	virtual/rust
 "
 
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
+QA_FLAGS_IGNORED="/sbin/bcachefs"
 
 python_check_deps() {
 	if use test; then
@@ -174,7 +159,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	llvm_pkg_setup
+	llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
 }
 
@@ -191,15 +176,13 @@ src_unpack() {
 src_prepare() {
 	default
 	tc-export CC
+
+	# Version sed needed because the Makefile hasn't been bumped yet
+	# Check if it is no longer before bumping
 	sed \
 		-e '/^CFLAGS/s:-O2::' \
 		-e '/^CFLAGS/s:-g::' \
 		-i Makefile || die
-	# Patch our cargo-ebuild patch definition to pretend that our GIT_CRATE is upstream's URI.
-	if ! [[ ${PV} == "9999" ]]; then
-		sed -e 's https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs https://evilpiepirate.org/git/rust-bindgen.git ' \
-			-i "${WORKDIR}/cargo_home/config" || die
-	fi
 	append-lfs-flags
 }
 
@@ -211,6 +194,11 @@ src_compile() {
 	default
 
 	use test && emake tests
+
+	local shell
+	for shell in bash fish zsh; do
+		./bcachefs completions ${shell} > ${shell}.completion || die
+	done
 }
 
 src_test() {
@@ -249,6 +237,10 @@ src_install() {
 		dosym bcachefs /sbin/mount.fuse.bcachefs
 	fi
 
+	newbashcomp bash.completion bcachefs
+	newfishcomp fish.completion bcachefs.fish
+	newzshcomp zsh.completion _bcachefs
+
 	doman bcachefs.8
 }