5 files changed, 193 insertions, 2 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 371c437f3133..5742f9d38fde 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 0338092aee7e..894c84894302 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -4,11 +4,14 @@ DIST btrfs-progs-v6.10.tar.sign 566 BLAKE2B 493260b4854616eabce943135b4990de4a72
 DIST btrfs-progs-v6.10.tar.xz 2669760 BLAKE2B 24b66cc6f7118da817e9abca69e8de9a9496de1ec4eb6800fa8f6b13b677e37a553d90562a38618a63b68b71457ab10ff72541dd3e0c169a1fe05509fd62402c SHA512 aa5af67f3816dcd1a128b69bc6f4bd83423c6c2289e3dd3abe2a07bdccb6b7d5e49426a5a0ece643709c23cdcb0908ca52b271f058fee3a3d810cdfcb9c36639
 DIST btrfs-progs-v6.11.tar.sign 566 BLAKE2B 15db44b5db3265eff9d5195ad4842cef5d001c46e1170f219784fca8d049756dccbc1bd95f20fc343fbdf1078c610a166921c043828cdc5f64c0f465323ca0e4 SHA512 a2fdd9100ad3ddd30cb923a72a2b4f70634277e5fbbf0d2cf912c00dc876dad6cd2c24e624f41dbb83aabdda4e3c08aea9c0ae39084bb3481700491df3d47fd5
 DIST btrfs-progs-v6.11.tar.xz 2695752 BLAKE2B 6dec219394e39a821f29858eddf1d501537d3cebad2dc83f0cea6d88d0b0e94c4fe2e660a48a27942ccfb6f3ac0630d5930f44e083168de65b60af36e895b2af SHA512 fad3c7e908e2020a3983f9737a7e87367023e2ad35aea14197e2bfa71c1e0435bc3da3f7e6ef463de47c033323163f8b1b7933013042c6fcea673d0f4723ade1
+DIST btrfs-progs-v6.12.tar.sign 566 BLAKE2B 3a32b52522acd9e2fcf34cbf90d91ca2491ae1b34142320b987084a60c9f6c13100fcfb554f877c0f659b60415234550c05d980c633015cd8d083df18521187a SHA512 86396dad38f15c19eb4b641632deb99073829896001b71fbdfaa3ebd11468e8b89ed324e563ec9db837c9095501227824f97085347dca4204cbaecceed9da7d3
+DIST btrfs-progs-v6.12.tar.xz 2705336 BLAKE2B d1569ec7b2079a43ac370c3a7e9f1b37a06545675753490f16d6a7bb52281f76df39f924c96569a1c75daa8a998f251c5219e2f09a54cb94c42cba1db3cf43ca SHA512 57da37f460a33b5f5232a5c8e67eb5976fb13483a1437112bd433b179bc0e497a1aadfe24705eb4fb4e0a98d2a33fd3c46808b3ca161421475442a70b964c446
 DIST btrfs-progs-v6.9.2.tar.sign 566 BLAKE2B 4cd95496d355444c7d3e582a7e6c05fbb55683008b1585a26f38aef6cceb1afd5e80c9611518d6bd92dc1167798d4012c4bcab2f9bda752c459d94cfa6f3c477 SHA512 3fb04e1894e231abde388a39d2f0c90f43c1a1494622c2158fab9b94bb340e064404bcf96e24d913c60aaf5e06ade42fbb91a479949109b329682bb089f66bf2
 DIST btrfs-progs-v6.9.2.tar.xz 2661684 BLAKE2B 38ab189ac8271ba8d68b74e82569159c671cca1cb946f56ccab28b6b206cb6ee5b330d83afc3536b7e0d7399da3fb01e368809c1ef4a64b843ea88796ebd28bd SHA512 1df9d5456d07a035c38c17795996a4fc621eeaa244ef54383d4387205826d2a6e971910e55031d20bb1baf23193efa7439e110312ffd8471f07aaf8c0baca20a
 EBUILD btrfs-progs-6.10.1.ebuild 4296 BLAKE2B a14b133468950215981cd242f0849735f5a05a486a07921988515582be143be06c571a8b1d9c62a9ec5e3c469fb67e2a030cec331215dcf457f521b2c7b17817 SHA512 b0ba9e958221ac8a213f56c3d7b46892e9fc37a6d06bdff28e9d4c0ea3af2428185b3d51c4c8c007c9876266e100274395f248909b6b9924b5d2242a06937985
 EBUILD btrfs-progs-6.10.ebuild 4302 BLAKE2B 948f9b0c99b95867c901fdb67b32c57ebebd54309907942ffe3d5db95d73dc7854634e8adfd62541a1efe9f140965aa6b0f2f3521e9bd99d6042a86b879afac7 SHA512 8c9bd26baa38cfe824d43f91179c1ebd6ad014b6bf172c6362d2a4ca47da2a7b7fc20f894cf72b5fb2aabc7c7976010053054407d72d233e0f55b1d0af78aa9b
 EBUILD btrfs-progs-6.11.ebuild 4296 BLAKE2B a14b133468950215981cd242f0849735f5a05a486a07921988515582be143be06c571a8b1d9c62a9ec5e3c469fb67e2a030cec331215dcf457f521b2c7b17817 SHA512 b0ba9e958221ac8a213f56c3d7b46892e9fc37a6d06bdff28e9d4c0ea3af2428185b3d51c4c8c007c9876266e100274395f248909b6b9924b5d2242a06937985
+EBUILD btrfs-progs-6.12.ebuild 4302 BLAKE2B 948f9b0c99b95867c901fdb67b32c57ebebd54309907942ffe3d5db95d73dc7854634e8adfd62541a1efe9f140965aa6b0f2f3521e9bd99d6042a86b879afac7 SHA512 8c9bd26baa38cfe824d43f91179c1ebd6ad014b6bf172c6362d2a4ca47da2a7b7fc20f894cf72b5fb2aabc7c7976010053054407d72d233e0f55b1d0af78aa9b
 EBUILD btrfs-progs-6.9.2.ebuild 4296 BLAKE2B a14b133468950215981cd242f0849735f5a05a486a07921988515582be143be06c571a8b1d9c62a9ec5e3c469fb67e2a030cec331215dcf457f521b2c7b17817 SHA512 b0ba9e958221ac8a213f56c3d7b46892e9fc37a6d06bdff28e9d4c0ea3af2428185b3d51c4c8c007c9876266e100274395f248909b6b9924b5d2242a06937985
 EBUILD btrfs-progs-9999.ebuild 4302 BLAKE2B 948f9b0c99b95867c901fdb67b32c57ebebd54309907942ffe3d5db95d73dc7854634e8adfd62541a1efe9f140965aa6b0f2f3521e9bd99d6042a86b879afac7 SHA512 8c9bd26baa38cfe824d43f91179c1ebd6ad014b6bf172c6362d2a4ca47da2a7b7fc20f894cf72b5fb2aabc7c7976010053054407d72d233e0f55b1d0af78aa9b
 MISC metadata.xml 744 BLAKE2B 6c23644af7f970c93a3c3bd1fd1bf82e5290832afac427bec1da93bfd2694799f779bdce3f51742a171218d6e29460a4986452426ab2239ad8ab6627dc45b81d SHA512 06df1d728d39b92384bdd026d0339a494ce1fe3966376a413a80f8dd85bedd5e5d843db9cdd60a9ab29857b79d5a24de24de2330aab70916a0e57acfc01a2e5d
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.12.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.12.ebuild
new file mode 100644
index 000000000000..757755270ab8
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.12.ebuild
@@ -0,0 +1,188 @@
+# Copyright 2008-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-python/btrfsutil
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit bash-completion-r1 python-any-r1 udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+	WANT_LIBTOOL="none"
+	inherit autotools git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc
+	inherit verify-sig
+
+	MY_PV="v${PV/_/-}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="
+		https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
+		verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign )
+	"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
+
+LICENSE="GPL-2"
+SLOT="0/0" # libbtrfs soname
+IUSE="+convert +man experimental reiserfs static static-libs udev +zstd"
+# Could support it with just !systemd => eudev, see mdadm, but let's
+# see if someone asks for it first.
+REQUIRED_USE="static? ( !udev )"
+
+# Tries to mount repaired filesystems
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:=[static-libs(+)?]
+	sys-libs/zlib:=
+	convert? (
+		sys-fs/e2fsprogs:=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	udev? ( virtual/libudev:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-5.10
+	convert? ( sys-apps/acl )
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd[static-libs(+)] )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	man? (
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+}
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" sys-devel/gnuconfig"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
+fi
+
+pkg_setup() {
+	: # Prevent python-any-r1_python_setup
+}
+
+if [[ ${PV} != 9999 ]]; then
+	src_unpack() {
+		# Upstream sign the decompressed .tar
+		if use verify-sig; then
+			einfo "Unpacking ${MY_P}.tar.xz ..."
+			verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+				< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
+			assert "Unpack failed"
+		else
+			default
+		fi
+	}
+fi
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		local AT_M4DIR=config
+		eautoreconf
+
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+
+		--enable-lzo
+		$(use_enable experimental)
+		--disable-python
+		$(use_enable convert)
+		$(use_enable man documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable static-libs static)
+		$(use_enable udev libudev)
+		$(use_enable zstd)
+
+		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
+		--with-crypto=builtin
+		--with-convert=ext2$(usev reiserfs ',reiserfs')
+	)
+
+	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
+	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
+
+	if use man; then
+		python_setup
+	fi
+
+	# bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_test() {
+	emake V=1 -j1 -C tests test
+}
+
+src_install() {
+	local makeargs=(
+		$(usev static install-static)
+	)
+
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+	if use experimental; then
+		exeinto /sbin
+		doexe btrfs-corrupt-block
+	fi
+
+	newbashcomp btrfs-completion btrfs
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index a7bea75ddc5b..efc2f480f97e 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -9,6 +9,6 @@ AUX mac-fdisk-0.1_p18-musl.patch 1473 BLAKE2B 8864b23821de7f270e4d04d0fa256d9a15
 AUX mac-fdisk-amd64.patch 5154 BLAKE2B c8bbc117df448bc4c1181d9c172bc78dd5b1fd021184be73ecdc41568fcaf73e1daec8183d43f355b4bba876a0399f3dfd2c05173d7c9fee6d8d95068f141633 SHA512 241576f64dd334f98e8c9cb9e0b17b6366e208f2d0af47ddb4659cf2d8e25ca8f44a84d1f7fa2e5f6215f4be42668f43f034074ac981a0d87ca8483505a3623c
 DIST mac-fdisk_0.1-18.diff.gz 20267 BLAKE2B 111e5b18c1485b33cfb2f653846e901a528e65207d705f024bb4ba1e181881913fc79cc2bf94c536e0bd2f88f9169d25f2a64c0d1464844a2ebb8e24f1554a61 SHA512 5774e86e1770873cbccb80a79941c6bf917ac1df62f722805b1c4eae0a76b318b3df36ed39ac16d8b051e771603cc42a13feeaadd451343f6a21703e07e58c11
 DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120
-EBUILD mac-fdisk-0.1_p18-r1.ebuild 1471 BLAKE2B 6c8fbda36073bf0a0163996e214cafdda59e5cb7c658c815dddd87355746bdebf405aa72c0760214b9275ecbe1efe6388e7ec0ccbf52d43d97ceef1a3489d6ce SHA512 133e1c0de2749518bcba85c7b9a667343f56cab759fe01654159eeb806f55b4305d29293aae10a4c4e52768fd4de6118b67ec22ba647733433bc55e8a65eb248
+EBUILD mac-fdisk-0.1_p18-r1.ebuild 1470 BLAKE2B ab1570b2c3127466a079220da98726acefa530cd9a4c218a83c92603cf43d93a03f6768d465e190abda4397b99482a569e2b2680b3adfbbd136c652c8f6857f5 SHA512 ee60ca9967d9b1b8899967c82887b2ee031b32e7df0d58ec3eb8164a56e422637fdca84830bc7857535cc1b35b8a8d0368aa13e299f11bd780abe6c75ea76360
 EBUILD mac-fdisk-0.1_p18.ebuild 1347 BLAKE2B 9cfeda9adc29963d9074cb8254b7ade2982003a1622e6eb20bcfffddd0e31ebf8c9f7b4d16c1ec59ff920ea722e2bbc6ddba8a98cc7796bff649340188da5c34 SHA512 5e405091155182e114c56dcf7be4c8af285819814af69647cc7cfffeb9da1e89bff0bde0384dc985a20e8f9052b7eec24fc9329c2a4b30b7c8acb64fb13a516a
 MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18-r1.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18-r1.ebuild
index 6fbf35ad7e43..a479730f818b 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18-r1.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -loong ppc ppc64 -riscv ~x86"
+KEYWORDS="~amd64 -loong ppc ppc64 -riscv x86"
 
 S=${WORKDIR}/${P/_p*}.orig
 PATCHES=(