gentoo auto-resync : 28:08:2024 - 12:00:19

7 files changed, 283 insertions, 4 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5e9dae810ed8..b8853de8be32 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index 5e7a594de8fe..1f8ccf5fd98b 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -14,6 +14,7 @@ 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.11.0.tar.gz 1131076 BLAKE2B 27b506c004528f3bedb2fddd19bc1d94acacd34152d13870df3be582baaa8843ac505b48b901c829c35789c5c4a09313ddee4a858d3e32d2130e1205f2042760 SHA512 87ca789f1557a026b53469571e5a84d1f6a64e3e3378cc344485d95fae8883eb512a8e3f478d89c6265dd203419412fdce9c396ea805f898b67b9cebec0e4f19
 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
@@ -85,6 +86,7 @@ DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0
 DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e
 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST owo-colors-4.0.0.crate 30984 BLAKE2B fa64a9097745eff2b00d8587ca119a3f4163c43265dcfe75162be09ffd556b132c24aa5217b99c3b10feddb365e71b01006a62a664ad8968d4bf6a716291148f SHA512 25a606e9e6a17a4ec21b9298707478d904ba1f30862ce855f4223b3273fb3d0323540b6b628c067edc0c9291cd7c370beb298ec000cd679068624031ac9e66ce
 DIST parse-display-0.1.2.crate 3535 BLAKE2B 01554ef911b973cc8e16be5dce205693e5cc74b8e886b4d9a9a26dc6c9a6cb2e29569ebecfb73daf14047f5d0ca01ae52ff9bb1778a0c7062ed3d1819bc47ad8 SHA512 271b32c088b23f945d33e1d4d8693dc37a4bab9aa1661f63a5a373d1cd55ab62e1a8d1fd0fb27c6d1d3b0fd639fd72540cbe2a641bd42a45bf06a751a07498a0
 DIST parse-display-derive-0.1.2.crate 10820 BLAKE2B a9261c11c7768791a69e11d6f074031dc229094a686a8e314229a5dd94e22f218beba6be67089129aaaaa98606715499c089e579058094a135208effe44c5884 SHA512 a9f3099f318e44330cd3478a4cc576beaa2ea70edc6621a46ecd452e9fc28874a7d7967fa0e0b2b7a1d7145565e62979692dcdf3c3fed0f3ac8feee0eebec000
 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
@@ -160,11 +162,12 @@ DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d2789
 DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
 DIST zeroize_derive-1.4.2.crate 11141 BLAKE2B a40add656369a3a40d5b5f3397a77a1e9f803d4b8ae5b7d51c9f2ebb332a289b3c1ea528655806a26998e081a1cc9f4b07828664542de8d8d2619faf079d25c5 SHA512 d6966b024ce5e265c93e7056659ccbb97bbf6baa30f759fd96dc4391a6487426637f61f0a2713b6160019d778cf7d8ff1f25bb33d6c4f4585b990baae418b226
+EBUILD bcachefs-tools-1.11.0.ebuild 4352 BLAKE2B cc0564d173635468f15272155faff997e8328e86fb668d1891a37fcdd41814726cccce5ab6d9a8eacfe96df25ef3458453b7594ec455f4a9b5c23278f1c81823 SHA512 b457f81b6251d8a136e70ea07c4c55e658167b8e5bed7e07cc32e2a2bdbfa1b44767d30b15e9c8b14dad77b00e43040fba4a888214155b172362ffcfb594b5ef
 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 5241 BLAKE2B 1fb30d4d2ae8deabbe02c5d1db7d20adf2787da35bbcea37cbcde629b0c58610beb056986afb493948f35fab436e1e1e590413d860c7f7334a6aee4e978f6813 SHA512 3df29ecaba769f0f15f904c18b0630eb90f3e9de9813158f5753723eee54eeeb0b7978d89016ff508f4b0bf7b741da21b3224f9cffafded3c3fc2c1eb18760e9
 EBUILD bcachefs-tools-1.7.0.ebuild 5276 BLAKE2B 898d087a1a1503dab6cc088117a55514d7bb77ba0874156d930f112f07298714071d2143614777308a10c8a9901c0ba1aa353ab00b6bc291c979e297ba42a9bb SHA512 0df8db9e271820259c546442b785e06ddb7c674a406fbe9006d4ed7ef3310e8123cecf4c6dd8f6dfb01c09c430b2e9d58ed21263fae25cd55fc9c295165589ac
 EBUILD bcachefs-tools-1.9.1.ebuild 5348 BLAKE2B cdf335f63f60112cec40cc498fbc5cae96cc8afbbd2f8774565b0357fb355af556035646c147b66489ac5d186cae2118decb53f59ec00f8831d2ea3942c2929e SHA512 60a864050856d1d32c6eb9e533de74d91d5bbd93cdb246c1f8542edc0d10438dc37e95c467c19295beb59a4598e0e35c3ecc7bd974857d7aa7669c525569797a
-EBUILD bcachefs-tools-1.9.4.ebuild 5393 BLAKE2B a422469f9e73e2c3c4de02b6e468ca6e003de7ff0d18b12b8152e5397f5ef11de1599949596161c80dc520b99901fe328e4656ee880baba6dfa044fcb14ec34e SHA512 812b39660e73f2c7e3511b9f447c7dea20338f24cbec855977bd6dd8f22541b7f0e626e73068aeee9b703cd9c2fc4007d04b1df0e3c874589621405f63e7bc3d
+EBUILD bcachefs-tools-1.9.4.ebuild 5391 BLAKE2B 09b6ded11eff9aa12b42091517b36851bafa55a62f497f22dc7de6039b7547785e75cb463292c3642fc91bbfd6e5623843780704b4f3dfd6dd24d1f785ef3ac1 SHA512 76da98bd713559e706c037d9cbb2a7b6e8bd2d09c2779feb41dc4ef25d328b44da8718d11ef4e302c71cc25bc9c6b734de377177f72f245b647af0f8fdded5bd
 EBUILD bcachefs-tools-9999.ebuild 4412 BLAKE2B cbb050d6d6fa74d5c4febb700a27e3c19d5a44adfcbe7396232901cf9e206223a7fc4aa859c9667d4d9f48457c86b5d84ae132fa8a920fcd9d5ab367e1530053 SHA512 1d9d98f845f277fd115b1101a3137705e9aed9893686865c8b514e437d2c3701aeef274af6525e712720e2c7e2a448f052c097d42abc1f534eed2c4e3297c23f
 MISC metadata.xml 751 BLAKE2B 58fb2ebb3092cb1056b36a5389d486faf4fb3fc6c107f5aeb65d1002722f7f238f776df5698bfceb4e2bf6b0ee4f1aa04d3015784c95141d300f6f82654525bd SHA512 5a6a46cfb145160a0871bf7a591238470d08744552870b54b9c7c78afac860a256fbd6765972a77ca81b78239695850b26c04acc1b24d1a4b35f52d6ef9e2501
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild
new file mode 100644
index 000000000000..35b7c4d2867c
--- /dev/null
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.11.0.ebuild
@@ -0,0 +1,223 @@
+# 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.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.2
+	byteorder@1.5.0
+	cc@1.0.83
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	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
+	either@1.9.0
+	env_logger@0.10.2
+	errno-dragonfly@0.1.2
+	errno@0.2.8
+	errno@0.3.8
+	glob@0.3.1
+	heck@0.4.1
+	home@0.5.9
+	itertools@0.12.1
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	libc@0.2.153
+	libloading@0.8.1
+	libudev-sys@0.1.4
+	linux-raw-sys@0.4.13
+	log@0.4.22
+	memchr@2.7.1
+	memoffset@0.8.0
+	minimal-lexical@0.2.1
+	nom@7.1.3
+	once_cell@1.19.0
+	owo-colors@4.0.0
+	paste@1.0.14
+	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.3
+	rustc-hash@1.1.0
+	rustix@0.38.34
+	rustversion@1.0.17
+	shlex@1.3.0
+	strsim@0.10.0
+	strum@0.26.2
+	strum_macros@0.26.2
+	syn@2.0.48
+	terminal_size@0.3.0
+	udev@0.7.0
+	unicode-ident@1.0.12
+	utf8parse@0.2.1
+	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_x86_64_msvc@0.52.0
+	zeroize@1.8.1
+	zeroize_derive@1.4.2
+"
+
+LLVM_COMPAT=( {16..18} )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cargo flag-o-matic llvm-r1 python-any-r1 shell-completion toolchain-funcs unpacker
+
+DESCRIPTION="Tools for bcachefs"
+HOMEPAGE="https://bcachefs.org/"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://evilpiepirate.org/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 ~arm64"
+fi
+
+LICENSE="Apache-2.0 BSD GPL-2 MIT"
+SLOT="0"
+IUSE="fuse"
+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
+	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}]
+	')
+	$(unpacker_src_uri_depends)
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+	')
+	virtual/pkgconfig
+	virtual/rust
+"
+
+QA_FLAGS_IGNORED="/sbin/bcachefs"
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r1_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
+		cargo_src_unpack
+	fi
+}
+
+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
+	append-lfs-flags
+}
+
+src_compile() {
+	use fuse && export BCACHEFS_FUSE=1
+	export BUILD_VERBOSE=1
+	export VERSION=${PV}
+
+	default
+
+	local shell
+	for shell in bash fish zsh; do
+		./bcachefs completions ${shell} > ${shell}.completion || die
+	done
+}
+
+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
+
+	newbashcomp bash.completion bcachefs
+	newfishcomp fish.completion bcachefs.fish
+	newzshcomp zsh.completion _bcachefs
+
+	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/bcachefs-tools-1.9.4.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild
index dd482ce9dcf3..7e5aa241533f 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.9.4.ebuild
@@ -113,7 +113,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 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 BSD GPL-2 MIT"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 6d22a060e80c..4a08b9e17c17 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -3,6 +3,7 @@ AUX 0002-io-Adapt-to-64-bit-time_t.patch 1641 BLAKE2B 51a74717f974b24543e8a9151a
 AUX 0003-build-Request-64-bit-time_t-where-possible.patch 1297 BLAKE2B 2e2a379aef0fc803cfb319919f19c51917e2084fe13ad72f9c62f97cd7561a0262fd192cc7625a0ac52c9bbc4611eb31e61984edfb1b52788fa2346f236eb56b SHA512 022267f15c044d595b6a52e91e0802b98ae2f3b4b8b921b64fc79dadec498473f3053ba19c6fb44766fe4ff8bdd85df577c77030523524c8079ed47e4d06bd51
 AUX xfsprogs-5.18.0-docdir.patch 278 BLAKE2B 5277fff17f26b4da946535a430878bfe1e91f92f41c44f2eaaac80703d58176f8d15e14f0586fcf23f29ce207f193303dc662ae5cca6877d6eca9f5ae698620f SHA512 0a94f24b292bece9786bceb99100c25b6d697b9ecf1566bb52b8266683e3adaee415bf7d79c81eed7f2adf846f982f3d91122c9a6dcbb7e16231983037fe9cae
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
+AUX xfsprogs-6.10.0-c++-void.patch 1651 BLAKE2B dafb054348f0b2362976d74c55821a2440ac98a80197af532facb4b65bb8947fa77ec52795b90a58196b77778078b2bf887b7b9d05d420c26193c8e63b98fe4d SHA512 09df6b846621c0bea65628e38c286935eb1fc2d7d1a3a08877c3121cc012df9345a53dc12e4ec43785500d890767d02e5e9ba144c2bfb67d2bf5812ba2987bcf
 AUX xfsprogs-6.7.0-fix-porting-to-6.7.patch 6103 BLAKE2B 4dae3812b6c40892ed7a8605cd46f117997c4dcf0d02c2402670c5294a2e5d6a0cac11743d90b0578d7544906d1d25da7ca6da6baf2cae76a995b8acad734cd1 SHA512 36b576afe505173f71b4848c064e6b9a4031ec831df32cf3b9726544941408a03a8f64cdd3aedfb9a264213705850e72258cef6ab542c4278c087f338d8d5905
 DIST xfsprogs-6.10.0.tar.xz 1449872 BLAKE2B dc02fb14cd07e20d618070358700003a0990125ce3d8b15fa0248c6d494a89bbfb51c267583fc863edeee0d84069c7016f7992e750faa357618cd0d7f5748d2e SHA512 ec80eedfd3471c836e99eb8507c0de2895f261d36316145b02f2effbcc1bb5a52eae3ad2148d45bc49f1a30e0267aa4e3f3176a5e01ec84b2da24b3fb430ffce
 DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f
@@ -10,7 +11,7 @@ DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d
 DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74
 DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d
 DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023
-EBUILD xfsprogs-6.10.0.ebuild 2754 BLAKE2B 4274dd21aa98533b3f31ac5df008b2a525d1ef72839bd8cdf648e4f30c170a695c12c952fee68d429db2e159db13371dee30f12c5fbfc37ccc38c486d2f01024 SHA512 dadcf7d6a347ac08a50c1dd703e13382198f1063d6939ddbee772b55cb934697ace888807da18fcb5d3f487ff68f7a6912812453e9534f9f8217abc62cde2a2f
+EBUILD xfsprogs-6.10.0-r2.ebuild 2865 BLAKE2B 38543524654aa12b2167610fff0e483dd1a8107b7aeac383012b2ceead4f1f902abc303fa0ed3912cb5fbc7f06c849f10ec3a7818e5b9f21d0f762327edf5064 SHA512 71b632bdd1e017be85b557d02d6f34b395acad754fcedd08c1362ff903e40cff3174142905fa85c14a93d5c79ecede57f1dc3fb09d328c97d124f33a244b5201
 EBUILD xfsprogs-6.4.0.ebuild 2414 BLAKE2B b71c91b69eb958bda96f1eea3feed717576397a214343c7474c8530ee7f60c0ca10260d98adf9ba3bc40d46498d1fd13bd71e216a52af08790e66d6d2498d6e0 SHA512 69a5eec472d87155e9343e7a9de65a65e15de3b5d4c831fd43636aa54a6435b708342d93cc4d93b132710db08446b3aab37ae75d37497a2ee8736e12c050a83e
 EBUILD xfsprogs-6.6.0-r1.ebuild 2668 BLAKE2B 4339af42004b2078553e75cdd1861d840100c7b260218a6c422083cd6e3a4a68bd3c4e304fa5792fe8826fc5ea0067830bd22342e6d7870d1e3ffe0367ffe0c0 SHA512 ddd6f21ea3c07e2d7a8ccfd5005ce45cb69b494ad82a03b844b64556f54a72c2192658e0d3a3c814dc8e8857faf432345689cf7b98c4cefd76294894defa416b
 EBUILD xfsprogs-6.7.0-r3.ebuild 2655 BLAKE2B 631390af82f532fff724e54110881e7cad750318a2257e4f65200f47316e03a718d9c88ce5b33532dd37ec968df5060d44c4796d4fc909fbbb7eac15226d6f2e SHA512 6c72ab4b71f401805d61d0e1712ba7a59e0704857e92a0757f3a2818e3888dc42174138b1d531cc054fce02304c3c7f4a4f0358ce18d033da05aabf70df7fff9
diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch
new file mode 100644
index 000000000000..04b71ff89fc0
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/938569
+https://lore.kernel.org/linux-xfs/172480131521.2291268.17945339760767205637.stgit@frogsfrogsfrogs/
+
+From fd885ea4d54be6e98df7342bd99b77bc8cbd64d5 Mon Sep 17 00:00:00 2001
+Message-ID: <fd885ea4d54be6e98df7342bd99b77bc8cbd64d5.1724802060.git.sam@gentoo.org>
+From: "Darrick J. Wong" <djwong@kernel.org>
+Date: Tue, 27 Aug 2024 16:33:58 -0700
+Subject: [PATCH] xfs: fix C++ compilation errors in xfs_fs.h
+
+Several people reported C++ compilation errors due to things that C
+compilers allow but C++ compilers do not.  Fix both of these problems,
+and hope there aren't more of these brown paper bags in 2 months when we
+finally get these fixes through the process into a released xfsprogs.
+
+Reported-by: kernel@mattwhitlock.name
+Reported-by: sam@gentoo.org
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219203
+Fixes: 233f4e12bbb2c ("xfs: add parent pointer ioctls")
+Signed-off-by: Darrick J. Wong <djwong@kernel.org>
+---
+ libxfs/xfs_fs.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
+index 454b63ef..2b8e1f4f 100644
+--- a/libxfs/xfs_fs.h
++++ b/libxfs/xfs_fs.h
+@@ -906,13 +906,13 @@ static inline struct xfs_getparents_rec *
+ xfs_getparents_next_rec(struct xfs_getparents *gp,
+ 			struct xfs_getparents_rec *gpr)
+ {
+-	void *next = ((void *)gpr + gpr->gpr_reclen);
++	void *next = ((char *)gpr + gpr->gpr_reclen);
+ 	void *end = (void *)(uintptr_t)(gp->gp_buffer + gp->gp_bufsize);
+ 
+ 	if (next >= end)
+ 		return NULL;
+ 
+-	return next;
++	return (struct xfs_getparents_rec *)next;
+ }
+ 
+ /* Iterate through this file handle's directory parent pointers. */
+-- 
+2.46.0
+
diff --git a/sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
index 8cd182482540..16fed283d07e 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.10.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-c++-void.patch
+)
+
 src_prepare() {
 	default
 
@@ -69,7 +73,7 @@ src_configure() {
 		# Doesn't do anything beyond adding -flto (bug #930947).
 		--disable-lto
 		# The default value causes double 'lib'
-		--localstatedir=/var
+		--localstatedir="${EPREFIX}/var"
 		--with-crond-dir="${EPREFIX}/etc/cron.d"
 		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
 		--with-udev-rule-dir="$(get_udevdir)/rules.d"
@@ -97,6 +101,8 @@ src_install() {
 	if ! use static-libs; then
 		rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postrm() {