gentoo auto-resync : 24:01:2024 - 10:45:40

5 files changed, 292 insertions, 3 deletions

diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index 67573416967b..fcc27298595b 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -1,3 +1,4 @@
+AUX bcachefs-tools-1.4.0-fix-clang-musl.patch 755 BLAKE2B 546364ad0729910aab6a27ae6b7db1e242f5630c69653140a23dfd55c11a49743b45b7b57f9a8af71bd5f11f2ac23e1f5786194eb1647dd3795beb1ca52b1ea0 SHA512 f38bd27a87b38f7d47bcb61e25341a7a36717ba90879cf1431643e24378d39b42c9b077ff267dc6de69a58d6fe659fee6f6516150ae58959a088d99e8be68bc2
 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
 DIST anstream-0.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8
 DIST anstyle-1.0.2.crate 13983 BLAKE2B 4274b101d1cab2b62f9bb7637dab35f4b16e8c08a080355a2ea53e2b7b353ff230aa77fb3a244e0d6ff0dcd27abe5895eb306c630aa0822d0c608f041d4abfea SHA512 09220abfc844192ca698589897845752e02666b4ecd6529af4cde9f260ef36694e6e631c7503fc0e438ac72c88c419043b78399385cb248e789e86404503935a
@@ -9,6 +10,7 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856
 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 bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b
@@ -98,6 +100,7 @@ DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 EBUILD bcachefs-tools-1.3.5_p20231216.ebuild 5616 BLAKE2B f1222050a780ef05a75cc535cd505dc297d207d19ec489c9580059ed949476a2651096eb79c02ad4261fc943a4108456e1dbd70992d8d3e1a583dfc784060798 SHA512 861bd371addf89eb77a153201be0b863727ab5be0829c2e3b09517cb1d9d9bf87c86cf3b475d8d595a0b0e626cd00522a246e70d0a57b4af99e7b76b77be4b5a
-EBUILD bcachefs-tools-1.4.0.ebuild 5574 BLAKE2B e5e62386c476a3651e41bcfef93902c1667c1b4bb1dc5421fec10c760beace8703d22b4e752200e6734dd9c06480b9bee34fbc2048c332c8593ed2e845058d4e SHA512 48805f1f61465ac27dc9dce886775ec9dca65c3141a588e77cbe22a592383e25c6f859d454d935da985f7d2f1fb0124f5b6f2d4cb2052f5ad0aadc558e30d351
+EBUILD bcachefs-tools-1.4.0.ebuild 5642 BLAKE2B e36cd889bee4e0dbc8cb2cb42e07636aa9c79de0df23995e073006e6c478efdd91bcb91786e06e49137bbb677a15a65ced5be5eeea0e9d2aca8f68e236343268 SHA512 15699d44fe9adafe68ac50b17ae2bc3ddbeb0dddf8d7aa74277da8a8c8b682e4799f7567cc276041bb712ba4c127e84f58647cdd62198f712bf96a685341365a
+EBUILD bcachefs-tools-1.4.1.ebuild 5450 BLAKE2B 2e9134e9ebad85ebdb807c9b8fed97a05cd2576621da7a360228922e283fe65f6e35e7471ed87f37c1614ffe19fc71d5bb12762b396487cf688b5ca40b74ebbb SHA512 69dd3fa1f175574c19db4d31edb2fef566b4773714c8c88fb90fe350a66349ebfb65b631bc9b23a76e44bfff5878af81ccee33161de970f44550d01a977d9b91
 EBUILD bcachefs-tools-9999.ebuild 3837 BLAKE2B c7899c840e575d5d122cd6d44f19759438563b3925cd2c2deb7e329c7c4bb3e02f7299be0f94843962afc6b87dbaf4eeae3fa714228fcffb8c3c360ea22a3452 SHA512 a618fe0df029793f0dd2f582f178757046dc1ff172a57abe8321387c71ea0953147207af921d61817332c74d38eb0e70e8a184366b0a128d14296650b4b33388
-MISC metadata.xml 577 BLAKE2B dc7bd0022ed95397f18fd638d4417e848687fc6714a784c702a2889cc6b976ac046a5c688b68f3efbe54cbc7cfd78117778049c8519aa7db556b8b459a50be27 SHA512 e9c1566e2490665350e24689b2d9dfb9a653752e45a8018cbc982fa25842b3d6ae9af4046adf5caefc1d6389bee187e37cd3dcddb9c89d4b65620d1ee80e910e
+MISC metadata.xml 649 BLAKE2B 179264af55ed3d2bf73207a532f0b04f67f78d0236a2a082481450e3d8a5c425c78a6d252c92a97183f8a38ef3543f4e2ad60e6ecec83a718b0914291a610fc9 SHA512 a2518ea62fb47dd68fad773cfd7f60524a755dcc0f5c133e1e8911c0571a3360780fae8d77206e3d1963943fdb1ca3fc3d77dd7ec922d3112a71090a26a5cdc2
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild
index 7bf445e1140b..a2e67f190904 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild
@@ -121,7 +121,7 @@ else
 	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="Apache-2.0 BSD GPL-2 MIT"
@@ -160,6 +160,10 @@ BDEPEND="
 	virtual/rust
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-fix-clang-musl.patch
+)
+
 llvm_check_deps() {
 	has_version -b "sys-devel/clang:${LLVM_SLOT}"
 }
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.1.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.1.ebuild
new file mode 100644
index 000000000000..e7396e664d7a
--- /dev/null
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.1.ebuild
@@ -0,0 +1,257 @@
+# 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
+	autocfg@1.1.0
+	bitfield@0.14.0
+	bitflags@1.3.2
+	bitflags@2.4.1
+	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
+	colorchoice@1.0.0
+	colored@2.0.4
+	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
+	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
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.150
+	libudev-sys@0.1.4
+	linux-raw-sys@0.3.8
+	linux-raw-sys@0.4.11
+	log@0.4.20
+	memchr@2.6.4
+	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
+	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
+	regex-syntax@0.8.2
+	regex@1.10.2
+	rpassword@4.0.5
+	rustc-hash@1.1.0
+	rustix@0.37.27
+	rustix@0.38.25
+	shlex@1.2.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
+	udev@0.7.0
+	unicode-ident@1.0.12
+	utf8parse@0.2.1
+	uuid@1.6.1
+	version_check@0.9.4
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+	windows-sys@0.48.0
+	windows-targets@0.48.5
+"
+
+# 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
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cargo flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs unpacker
+
+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"
+else
+	SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		${CARGO_CRATE_URIS}"
+	S="${WORKDIR}/${P}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 BSD GPL-2 MIT"
+SLOT="0"
+IUSE="fuse test"
+RESTRICT="!test? ( 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
+	sys-libs/zlib
+	virtual/udev
+	fuse? ( >=sys-fs/fuse-3.7.0 )
+"
+
+RDEPEND="${DEPEND}"
+#
+# Clang is required for bindgen
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/docutils[${PYTHON_USEDEP}]
+		test? (
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		)
+	')
+	$(unpacker_src_uri_depends)
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	virtual/pkgconfig
+	virtual/rust
+"
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+python_check_deps() {
+	if use test; then
+		python_has_version \
+			"dev-python/pytest[${PYTHON_USEDEP}]" \
+			"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
+	fi
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		S="${S}/rust-src" cargo_live_src_unpack
+	else
+		unpack ${P}.tar.gz
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	tc-export CC
+	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
+}
+
+src_compile() {
+	use fuse && export BCACHEFS_FUSE=1
+	export BUILD_VERBOSE=1
+	export VERSION=${PV}
+
+	default
+
+	use test && emake tests
+}
+
+src_test() {
+	if ! use fuse; then
+		EPYTEST_IGNORE=( tests/test_fuse.py )
+	fi
+	EPYTEST_DESELECT=(
+		# Valgrind
+		'tests/test_fixture.py::test_read_after_free'
+		'tests/test_fixture.py::test_undefined'
+		'tests/test_fixture.py::test_write_after_free'
+		'tests/test_fixture.py::test_undefined_branch'
+		'tests/test_fixture.py::test_leak'
+		'tests/test_fixture.py::test_check'
+		# Fails in portage because of usersandbox; ensure that these pass before bumping!
+		'tests/test_basic.py::test_list_inodes'
+		'tests/test_basic.py::test_list_dirent'
+	)
+	epytest -v -n "$(makeopts_jobs)"
+}
+
+src_install() {
+	into /
+	dosbin bcachefs
+
+	dosym bcachefs /sbin/fsck.bcachefs
+	dosym bcachefs /sbin/mkfs.bcachefs
+	dosym bcachefs /sbin/mount.bcachefs
+
+	if use fuse; then
+		dosym bcachefs /sbin/fsck.fuse.bcachefs
+		dosym bcachefs /sbin/mkfs.fuse.bcachefs
+		dosym bcachefs /sbin/mount.fuse.bcachefs
+	fi
+
+	doman bcachefs.8
+}
+
+pkg_postinst() {
+	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
+}
diff --git a/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch b/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch
new file mode 100644
index 000000000000..b011ca1de422
--- /dev/null
+++ b/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch
@@ -0,0 +1,24 @@
+Bug: https://bugs.gentoo.org/921564
+From https://github.com/koverstreet/bcachefs-tools/commit/8e56da27fd23c169395b3b266b15a1c093aba849
+
+diff --git a/libbcachefs.c b/libbcachefs.c
+index 68b750a..ec6b272 100644
+--- a/libbcachefs.c
++++ b/libbcachefs.c
+@@ -445,6 +445,7 @@ struct bchfs_handle bcache_fs_open(const char *path)
+  */
+ struct bchfs_handle bchu_fs_open_by_dev(const char *path, int *idx)
+ {
++	struct bch_opts opts = bch2_opts_empty();
+ 	char buf[1024], *uuid_str;
+
+ 	struct stat stat = xstat(path);
+@@ -469,8 +470,6 @@ struct bchfs_handle bchu_fs_open_by_dev(const char *path, int *idx)
+ 		uuid_str = p + 1;
+ 	} else {
+ read_super:
+-		struct bch_opts opts = bch2_opts_empty();
+-
+ 		opt_set(opts, noexcl,	true);
+ 		opt_set(opts, nochanges, true);
+
diff --git a/sys-fs/bcachefs-tools/metadata.xml b/sys-fs/bcachefs-tools/metadata.xml
index 2bc62d23a4f2..f86ecd3e8764 100644
--- a/sys-fs/bcachefs-tools/metadata.xml
+++ b/sys-fs/bcachefs-tools/metadata.xml
@@ -14,5 +14,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">koverstreet/bcachefs-tools</remote-id>
+		<remote-id type="gitlab">Matt.Jolly/rust-bindgen-bcachefs</remote-id>
 	</upstream>
 </pkgmetadata>