gentoo auto-resync : 15:12:2023 - 08:46:53

10 files changed, 116 insertions, 367 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index eccb981a244b..98edf810cb80 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 8a9508594b6e..f33ce1cadc74 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,14 +1,11 @@
 DIST btrfs-progs-v6.3.3.tar.xz 3163112 BLAKE2B 76714da94e1cd733df4198b736c31b32d4cfb6779985036610651a267fcf92299c140f99f2372278cafcb02f651413c069314195b7bd44d56ddf60eb60e5532d SHA512 e72791fd91cc9a93aaab72bf8c36f9d7e2608315ccb3b0474ca0c1e1893465b2c7145ce523216accb0d02c4dd0fd13597702ce6a8b9c2ac137cd9bce3c5a4347
-DIST btrfs-progs-v6.5.1.tar.xz 3179504 BLAKE2B 95d424342dfa238ed4dd525f72618b449e91db198fa6a12bcbb6bb48246d7b5b84a8fd5dc3b943246732fa40c3b575855c966f8ca135b32aa926e0709549cb99 SHA512 87cc81ecad0cb22de3086fef0fd825be101344d44dc954ac05e25d394421ca5fe3dbcb27c79a3a8fb67a2d3237b7bd84329ccef2c070b1b07d1156dc08716dfb
 DIST btrfs-progs-v6.5.2.tar.xz 3190068 BLAKE2B 74010ed51e211d28ce161db9f6e005bb1c73d8726c9a74446520a46bfa8d6f25d267f747e392f82a8ebeb0b9dd25b3681e9617048e33b9244047089a36fc34c6 SHA512 40b5a2f4d4dcf1810eeb0808e6cb72081ef5743a5072b75e2535420b6acb3a3ead61b01da3217c2bc3fb6ec700f141d4646389cc7a6476ce8af51a424a732672
-DIST btrfs-progs-v6.5.3.tar.xz 2542416 BLAKE2B 83a39e1a991ad253a8733235c01fed32c23bde033b7ddc647347dba54a9ba5755d8508e6df817a627d59cefbed6a5696ec485093509ab007374d27c739dabfb1 SHA512 6bec6c0da0b61eb4dce6dc3128fe34fdc68b18cbbb7917c3cd13a558cee9464e6b4c1fcda2cab342d1b506767fab4eee5d03d2fb284a5c7249eec5a75407034a
-DIST btrfs-progs-v6.6.1.tar.xz 2548648 BLAKE2B 9584f6e234bfc0fb65d970e6f079ff684064a8a90ac17867279f5694e094247fa53ceacf5f73811a9c559ba4d5c289ac1f44c9be69ec4bea9419387a9057aa45 SHA512 49bef0758526074c1b76b3bb7f12ba7b8b35ac08445ff36a77212449da605f4e47abd8784a3e3631a1431d949d31f8d0aae074b01fac2f617b65c069bf4fcec5
 DIST btrfs-progs-v6.6.2.tar.xz 2550624 BLAKE2B c4901b14c1555a62ec5fdc9c744b48678427c52250d368d2f3e9b82e300bd0f2c1bcbae12169ab0376fdf0aff5ccf41139ae83d8851555ce4b2d671e82d116a3 SHA512 23878cdd6f16a7ddba55321169bf7dd565719dd5d16a5a47fb7879aa0e04bd9008dc436cdbb712cee286b3a9b97ac3a4f6ea22213286a5025b5371d7975a2fa8
+DIST btrfs-progs-v6.6.3.tar.sign 566 BLAKE2B 9f8a14405f78c8eb5a92d59f9ca776cd15bfd43bc323a0f5a98cc2d9a6f782e999a792ddb266fef4dfe189e1cb8eebbd021a12b615e22bdd4097a74bf3b277a9 SHA512 07f062cf66c0e5f0bd833f0a1c9901ec06ac4eb258acec8e96ffbb0b85007a67bdc992492b25f6039fcf603352131fca8c57162fa61007e8ccf1f4edf71dab97
+DIST btrfs-progs-v6.6.3.tar.xz 2557216 BLAKE2B 274fad52bcab45bd0f6496c1bc10e1736e7b766f53b712790996a8a38f74eedcc570783599bed62cd4f84e5629f2216340a66941d9fbe0c7890f1c56ed66df8a SHA512 93e1defacf0f280fc02e10a20fd2bc3775c52956a0339e30b829cc3bef85629d565cf3f6a9af126e38bbb73e8e9b9a0069abbe0e57957a56ca1a8826f5de624a
 EBUILD btrfs-progs-6.3.3.ebuild 3526 BLAKE2B 757ed0078acbe35c3d43a426062d01c620a4880ba34303a838469a81ae8dec25b4aef7e1c9230d96b14cc47620d50963a935799391bd8f86604cd9aa694fd47c SHA512 90a9c015ba76b8c7675aa6dc2b3ecdf853a99844e89abed0da7dc74a5622687f64ae6d2a732ac1911ec349e90d4979034dad27820447a25e27d362162053b046
-EBUILD btrfs-progs-6.5.1.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02
 EBUILD btrfs-progs-6.5.2.ebuild 3526 BLAKE2B 757ed0078acbe35c3d43a426062d01c620a4880ba34303a838469a81ae8dec25b4aef7e1c9230d96b14cc47620d50963a935799391bd8f86604cd9aa694fd47c SHA512 90a9c015ba76b8c7675aa6dc2b3ecdf853a99844e89abed0da7dc74a5622687f64ae6d2a732ac1911ec349e90d4979034dad27820447a25e27d362162053b046
-EBUILD btrfs-progs-6.5.3.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02
-EBUILD btrfs-progs-6.6.1.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02
 EBUILD btrfs-progs-6.6.2.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02
-EBUILD btrfs-progs-9999.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02
+EBUILD btrfs-progs-6.6.3.ebuild 4587 BLAKE2B 431c79eefc64ff2882783f5f47f906301bca81ab21a7235e9955bd72eab494a4e7139f556aa8e5e35e1df951f6877f354a0a5bb75689c82d2347a23a51e62024 SHA512 480938f69d5f31be23f07e5a422aa71137290fdc8d758749f7ae2753089b976a5142a8cb18ca131fcd47b91c6586264ffc636e693a0c63c2c47f59dd05de70d0
+EBUILD btrfs-progs-9999.ebuild 4587 BLAKE2B 431c79eefc64ff2882783f5f47f906301bca81ab21a7235e9955bd72eab494a4e7139f556aa8e5e35e1df951f6877f354a0a5bb75689c82d2347a23a51e62024 SHA512 480938f69d5f31be23f07e5a422aa71137290fdc8d758749f7ae2753089b976a5142a8cb18ca131fcd47b91c6586264ffc636e693a0c63c2c47f59dd05de70d0
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.5.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.5.3.ebuild
deleted file mode 100644
index 479ade82c97a..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.5.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man 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 ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	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? ( dev-python/sphinx )
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		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
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake -j1 -C tests V=1 test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usev python install_python)
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.6.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6.1.ebuild
deleted file mode 100644
index 479ade82c97a..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.6.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python +man 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 ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	udev? ( virtual/libudev:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	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? ( dev-python/sphinx )
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR="m4" eautoreconf
-
-		mkdir config || die
-		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
-		--disable-experimental
-		$(use_enable convert)
-		$(use_enable man documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable udev libudev)
-		$(use_enable zstd)
-
-		# Could support libgcrypt, libsodium, libkcapi
-		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_test() {
-	emake -j1 -C tests V=1 test
-
-	if use python ; then
-		cd libbtrfsutil/python || die
-
-		local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}"
-		${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-src_install() {
-	local makeargs=(
-		$(usev python install_python)
-		$(usev static install-static)
-	)
-
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-
-	newbashcomp btrfs-completion btrfs
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.5.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild
index 479ade82c97a..3bf885a87641 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.5.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild
@@ -3,32 +3,36 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 python-single-r1 udev
 
-libbtrfs_soname=0
+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
 
-if [[ ${PV} != 9999 ]]; then
 	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="
+		https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
+		verify-sig? ( https://www.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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
 HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
+SLOT="0/0" # libbtrfs soname
 IUSE="+convert python +man 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.
@@ -75,17 +79,46 @@ DEPEND="
 "
 BDEPEND="
 	virtual/pkgconfig
-	man? ( dev-python/sphinx )
+	man? (
+		dev-python/sphinx
+		dev-python/sphinx-rtd-theme
+	)
 "
 
 if [[ ${PV} == 9999 ]]; then
 	BDEPEND+=" sys-devel/gnuconfig"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
 fi
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
+
+	if in_iuse verify-sig && use verify-sig ; then
+		mkdir "${T}"/verify-sig || die
+		pushd "${T}"/verify-sig &>/dev/null || die
+
+		# Upstream sign the decompressed .tar
+		# Let's do it separately in ${T} then cleanup to avoid external
+		# effects on normal unpack.
+		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
+		xz -d ${MY_P}.tar.xz || die
+		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+		popd &>/dev/null || die
+		rm -r "${T}"/verify-sig || die
+	fi
+
+	default
+}
+
 src_prepare() {
 	default
 
@@ -116,12 +149,16 @@ src_configure() {
 		$(use_enable udev libudev)
 		$(use_enable zstd)
 
-		# Could support libgcrypt, libsodium, libkcapi
+		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
 		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+		--with-convert=ext2$(usev reiserfs ',reiserfs')
 	)
 
-	econf "${myeconfargs[@]}"
+	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
+	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
+
+	# bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -129,7 +166,7 @@ src_compile() {
 }
 
 src_test() {
-	emake -j1 -C tests V=1 test
+	emake V=1 -j1 -C tests test
 
 	if use python ; then
 		cd libbtrfsutil/python || die
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 479ade82c97a..3bf885a87641 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -3,32 +3,36 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit bash-completion-r1 python-single-r1 udev
 
-libbtrfs_soname=0
+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
 
-if [[ ${PV} != 9999 ]]; then
 	MY_PV="v${PV/_/-}"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="
+		https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
+		verify-sig? ( https://www.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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
-
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-	WANT_LIBTOOL="none"
-	inherit autotools git-r3
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
 HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
+SLOT="0/0" # libbtrfs soname
 IUSE="+convert python +man 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.
@@ -75,17 +79,46 @@ DEPEND="
 "
 BDEPEND="
 	virtual/pkgconfig
-	man? ( dev-python/sphinx )
+	man? (
+		dev-python/sphinx
+		dev-python/sphinx-rtd-theme
+	)
 "
 
 if [[ ${PV} == 9999 ]]; then
 	BDEPEND+=" sys-devel/gnuconfig"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )"
 fi
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
+
+	if in_iuse verify-sig && use verify-sig ; then
+		mkdir "${T}"/verify-sig || die
+		pushd "${T}"/verify-sig &>/dev/null || die
+
+		# Upstream sign the decompressed .tar
+		# Let's do it separately in ${T} then cleanup to avoid external
+		# effects on normal unpack.
+		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
+		xz -d ${MY_P}.tar.xz || die
+		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+		popd &>/dev/null || die
+		rm -r "${T}"/verify-sig || die
+	fi
+
+	default
+}
+
 src_prepare() {
 	default
 
@@ -116,12 +149,16 @@ src_configure() {
 		$(use_enable udev libudev)
 		$(use_enable zstd)
 
-		# Could support libgcrypt, libsodium, libkcapi
+		# Could support libgcrypt, libsodium, libkcapi, openssl, botan
 		--with-crypto=builtin
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+		--with-convert=ext2$(usev reiserfs ',reiserfs')
 	)
 
-	econf "${myeconfargs[@]}"
+	export EXTRA_PYTHON_CFLAGS="${CFLAGS}"
+	export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}"
+
+	# bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -129,7 +166,7 @@ src_compile() {
 }
 
 src_test() {
-	emake -j1 -C tests V=1 test
+	emake V=1 -j1 -C tests test
 
 	if use python ; then
 		cd libbtrfsutil/python || die
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index beb1fe94222a..3403c465fffc 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -11,5 +11,5 @@ EBUILD fuse-2.9.9-r2.ebuild 2141 BLAKE2B 92bedf477999e4b306f48194f211769747f1c09
 EBUILD fuse-3.15.0.ebuild 1717 BLAKE2B d184785d62157336bdbacb8c25d420ae79aa50e685d920cc005699311ab0786a4aa011baf49ff4c7ec49c75d0a6388f704aac84a42dddf88f075cab6ac123746 SHA512 0f6bfb95ad2d25c30e446a3da8d44db9ec6132a70703b56dbce5e0888af6cd2a5b9f7d97247e3851da3dc6f5a31196126c0113326ea9a60a020dc02a2962dea0
 EBUILD fuse-3.15.1.ebuild 1717 BLAKE2B 8e5de2cbf3ef256146a94145aad793816cb206cb14692b479381a6a1596d3a2a090d39f933deffe65d4427326ed720ed083d3877cd158c66fb02afa018eb15d7 SHA512 e0f1c9316c5bf27cd5a1a4c1eefd14e4a6704864e6b877ec633cbbc951700c3038252ffef96342484533a1afcbaa9151bb61500480fc41aa462e3719a1a2abcf
 EBUILD fuse-3.16.1.ebuild 1718 BLAKE2B 64f3384935342e69becf0f116db8d9a29bab25b89d3934a1890309e83a3b6186973ed4bff7d45cd562005edec408d85b2aae234dd2c793840553f01ee3e24aa6 SHA512 a82c2cddfc5786ef461ff81a87e896465d6bc6b204a17032f7dc17bc9d84e33765bb367821b1a6bf78de2f7c468a502491185f0c170e21dcb8936d9147b8afb4
-EBUILD fuse-3.16.2.ebuild 1725 BLAKE2B 8439f3ffc31721449180dadde7f4efb4bbdc33148d28f258d452b3fcc63b1ab486969dcbd220f1df59685ebe2cad8e55e422f2d34cfc5775197e8233b1fb2679 SHA512 3208f2e0cdcfa55fc99c76139f7294fd6975ee9dde9bae67df0e0c88e1f9d6c2c762aca68567e551a0b6dc3e7fadc4a087a0540828ec7137853dfd8d2f045e2a
+EBUILD fuse-3.16.2.ebuild 1722 BLAKE2B 7bb9c09d21adc0031086cc7abfd92c3ad7975e0154a7012f7115e81a93fe2c3bc3cb7399af26859406b0232d459dbca07cf0b174b817118a27e35b36f0ffdd57 SHA512 53d633f7a3070794623d5e2705a9000bee626c0ddb2e944221956aac356188ce25fcb989d0730120ae88c63dd5fec362d558d4216d277895f1dd17e323930b94
 MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e
diff --git a/sys-fs/fuse/fuse-3.16.2.ebuild b/sys-fs/fuse/fuse-3.16.2.ebuild
index d70683145e06..8f64f9c75cd5 100644
--- a/sys-fs/fuse/fuse-3.16.2.ebuild
+++ b/sys-fs/fuse/fuse-3.16.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test ) test? ( userpriv )"
 
diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest
index c8517abda212..fb27d238f2a5 100644
--- a/sys-fs/static-dev/Manifest
+++ b/sys-fs/static-dev/Manifest
@@ -1,3 +1,3 @@
 EBUILD static-dev-0.1-r2.ebuild 1105 BLAKE2B 9e650825bfb3cbf7758ece6ab9422c7c3bad3755bc19500499ac07ae65f604185b2c18e54ced1dba36e4c795eb6dede328e1db7735d2b229aa37463eb1ec8a32 SHA512 a023956ddfdd4fd9d90f9e8d6ffd17dd7f58be8d575e71f7ba6a530aa4e7402c0c4d6af0bb04936b7b5e651202c3ff838ce417ff76f6f01fb73118806b747282
-EBUILD static-dev-0.1-r3.ebuild 1111 BLAKE2B 062b6509fe115b3fa448b22d1edb4656bc61813aa26c5dec379a411f48ee90ac688080526cf1efc2d8da1c84ae18712867acef567e8a87b755bc6653261679de SHA512 1fa6e21d3b38b3fcf900c33da92ff4075c1d9b6bcdb8bd87821abc138081cf0d22c4eb9115572e063e97d6b0069f69a3d3d9a01c339485048096e04dc5e88036
+EBUILD static-dev-0.1-r3.ebuild 1107 BLAKE2B 567ca0dad73191c104d52d7b76beb88b790637618a2223448e016477fd2b9c08565a7391d60f849af0186e32510cebc825bb7351c584f8801a9e6208ff24849a SHA512 24b7c9ebb52f1d9a6be34fc29d8bb4dfb3f3673e95f033bfd81de0864cf4235169f59b58aaa7ea9e57343793e6abc04bef7c2fc4ebcf62092b94b8bd285f2f7e
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-fs/static-dev/static-dev-0.1-r3.ebuild b/sys-fs/static-dev/static-dev-0.1-r3.ebuild
index 0be25176d6fc..80a7f164bd4a 100644
--- a/sys-fs/static-dev/static-dev-0.1-r3.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1-r3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://bugs.gentoo.org/107875"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc ~x86"
 
 IDEPEND="sys-apps/makedev"