8 files changed, 20 insertions, 571 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 6cfa25f57167..208368717274 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 4ace25e0494d..30aa0f537598 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,19 +1,11 @@
-AUX btrfs-progs-5.18.1-glibc-2.36.patch 984 BLAKE2B d7aefe6434a4719d1b98ce1842e340f8eb322b95adb4037cac10a7824fa94ad7c8a86e01967d99e1e9ede9cda4f6e55b53c440e9d37b94018e31388b7214c5d4 SHA512 cad4314966c634f44252173ff23f09822d2448ac9346d1e9d5c0a193ada1606ed6c7515a3283b2560d68ffb7a004c4c25549f1cd5c87330a1aa49e1a3d722719
-AUX btrfs-progs-6.1.1-ioctl-fix.patch 3232 BLAKE2B 3c026b66b6289b03c8839a00232b1caa530fc88a165130e04a6fab0d0188927c0061712ff5b37deaf723201f1c5472bc96d09f11c1d85d693c337ad86ae9a6e4 SHA512 58cb8d2f03320d732ae2d2341eccefa1ddac856793ce9fbb138fc9a5f20fcb3016d1ad2a5fffb07caf41b7e190f49a1f64874ec464604f8caea302c4c116aabb
 AUX btrfs-progs-6.2.1-blake2-simd.patch 1056 BLAKE2B 3a5d967cb5a362cdd5abe993b3f1006b68898b14f0915c567bceb0de6ebf37d76f9fd323461ba9bbf4e61158b8bc1d176b2cf204c31958d420b9e94812b50936 SHA512 257035a4282138a5b32d99f07b50017983052a77c661ef5519b833652362c4c015aff8043062f09f87ebc71f09b616c851b66b905a3aa8c490e1dd5080bf496c
-DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
-DIST btrfs-progs-v6.0.2.tar.xz 2321220 BLAKE2B 391bd9dcc7ae2d40c339eb9b7fb466624c3f122149af640bc0ca73abfc85ca7bd076976d47ce2d4eab64fb3b9b1309e3446acdd78ba77e5cb583b939710f8b6c SHA512 8e01fa6e3373d95a8e8577003ceb94722e4dfdf24110bfea79191a9862daf5e6580d72e898fdea134b5e86beeda32948eed572072f7906226189c6f1ac8615e3
-DIST btrfs-progs-v6.1.1.tar.xz 2329864 BLAKE2B f3f15829af88f83cdabca30b61dd0e53fc0913615028eac9501204adec5a5beb8654b037617a73bac96c901835a83e8c08d478b8b496518512fea3714e604cfc SHA512 996045bebc441eba269eb5159d6d13c7b1471ba88039389ef221f57d03c535647a5716e23e7a17a20efb4012003f58b4b768f66af633abbdc1fe481192ca1ace
-DIST btrfs-progs-v6.1.2.tar.xz 2329940 BLAKE2B d2c86b0077e0269353ac70d948b948dd2984beec0e4225529adb0099a9cfe5d778a893bedc822168141ce29679f66500e32bdf3af8973bef5696657685ebf712 SHA512 0b02502f9f0902b7db04817fcfbaa4f6155035d47dd908c4c1faa86e4677e302d069756bb0935db7c88f0859c0f9ef87975b2777be7ad7f4d2389d2e95c1ff82
 DIST btrfs-progs-v6.1.3.tar.xz 2333984 BLAKE2B 71543f5be282a289fbc92f78b89b25e4162c3cbd2d3cf2e8564791f86c6f933f61c03ba93aeca029689be6284988ff35a47f25a6523f15be47f3e7ce9b5c0c4b SHA512 7c40d8bc3fcef0b2a7bf4be7d52923015b5b11c3f14bfc550ffa95a47d673f640b7deb840fee22fb7cc2743b6098fb12b5caea586fbf0972a1bc9a7606f3f375
 DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 8ea7d9815e34c569dd82e53dc1f982c820265521708c7c41dc587646362b300edf938e940b52508e301874269ea5ebb96605f4a1046d096678257463ced53b03 SHA512 2a485d8c8b3091af27e91751cabe61306388526de3c1c51543708888ddee1bb26ebfe70c3b4cd6686b173d313c98c30168fee18723dadc7b4c00e10c502da169
 DIST btrfs-progs-v6.2.2.tar.xz 2437300 BLAKE2B b3d0de668baf771ff08c59d20407525be841b06747b771efc013b0c2d1d24ed03caf472b7c9b03499f60140f6f84e2edbcb690cba503a7eb8037af038de79d52 SHA512 967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db
-EBUILD btrfs-progs-5.15.1.ebuild 3167 BLAKE2B a879f998fffa1ba80c42f8423416ff05cc23a7cf2bc797d450d2379bb61360ce2333c41d7035dad1219365194b3dd33aa1988b06de845c9d7bef1334a4618d32 SHA512 ef12dacb70e2986e3d974ad150f9d9b2b450f1fffaddb303967195c7a0f95199225fecd74f729b98adca19cffc51ed261c88dbc88ed0bfdfafe4e8b0597078b9
-EBUILD btrfs-progs-6.0.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59
-EBUILD btrfs-progs-6.1.1-r1.ebuild 3371 BLAKE2B 6d1dec5724837eed26ba50d9a4c0bf7f97d4783a07fd6f2ad51e8d83790acd4fce210daa846336d52bf459dfc7485ec90feff9e7005e9f46235c2faebcfcf8bd SHA512 455bc0717e4720ae7b99add5bbdf961258b8d0bd43585f8c68003bad8ee6fbcb9df666a999194c530a3c3d40abe33c39c449449874b32adaf85c69f562c00a30
-EBUILD btrfs-progs-6.1.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59
+DIST btrfs-progs-v6.3.tar.xz 2463228 BLAKE2B ba4fad5d912e71a4ceab4cef2846b340d56a3c9bd0d90c1e81c1d8bc6ed3ce6016d4e97a194c4501c3ba535c9ef1b77fa351b9716998278c47cf6fb3973a1f01 SHA512 826d9788f8e186146570c08eb9e032b4195afed16b1913385b7f06d7ef738ba1ae7c4d089ad77594fc9a34bd3385581f03b7c18be6eae4ced605c43e425f5406
 EBUILD btrfs-progs-6.1.3.ebuild 3522 BLAKE2B d25e101e6401ecd165ce200a58c84b8aed6071253a8af07856b657d48d05f63e3b5014d7e3ab75605679dacc2d88b60c8bc8fddcfda544ed86dde959dae25aaa SHA512 b6088fc730d875b53ea1e594bd7ed9931569ab71a1465856833455a1fdbf63073acb7eadcbb3952ed0a5329c8cf7ad5259988d6e674bc83d45a667caa9295cac
 EBUILD btrfs-progs-6.2.1.ebuild 3580 BLAKE2B e66421da8398d9b6856958d4c13ac3fd8271e9773987e13540dfbe1bc69a99780b2654d0b95842770bf1195792592afc19c949ab07786d4748d9ef06fb5e9d86 SHA512 174ab73eabf5af68987a3fd2f13a09d913d947150407cce8a4c6f9af4e2437bb5fe287acaf074cb19e7ecc8477aafa229b13195ba8a9d6674f1a7858b7d759fb
 EBUILD btrfs-progs-6.2.2.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
+EBUILD btrfs-progs-6.3.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
 EBUILD btrfs-progs-9999.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
deleted file mode 100644
index c0b46407d1c2..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 python-single-r1 udev
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT="test" # tries to mount repaired filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-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:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/btrfs-progs-5.18.1-glibc-2.36.patch"
-	)
-	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 "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild
deleted file mode 100644
index 3e995e27b35a..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-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.wiki.kernel.org 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 )"
-
-# 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
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex 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.1.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
deleted file mode 100644
index 3e995e27b35a..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2008-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-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.wiki.kernel.org 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 )"
-
-# 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
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex 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.1.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.3.ebuild
index 214f572bea44..c1f11dd5dd51 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.1.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit bash-completion-r1 python-single-r1 udev
 
@@ -52,7 +52,8 @@ RDEPEND="
 	udev? ( virtual/libudev:= )
 	zstd? ( app-arch/zstd:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=sys-kernel/linux-headers-5.10
 	convert? ( sys-apps/acl )
 	python? (
@@ -73,8 +74,10 @@ DEPEND="${RDEPEND}
 		zstd? ( app-arch/zstd[static-libs(+)] )
 	)
 "
-BDEPEND="virtual/pkgconfig
-	man? ( dev-python/sphinx )"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( dev-python/sphinx )
+"
 
 if [[ ${PV} == 9999 ]]; then
 	BDEPEND+=" sys-devel/gnuconfig"
@@ -82,10 +85,6 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-ioctl-fix.patch
-)
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -132,6 +131,17 @@ 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
+	fi
+}
+
 src_install() {
 	local makeargs=(
 		$(usex python install_python '')
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
deleted file mode 100644
index 52671ea6c357..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/kdave/btrfs-progs/commit/46eb32a019834b0a49ae9744db1a921aaa6a3d63
-
-From 46eb32a019834b0a49ae9744db1a921aaa6a3d63 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jul 2022 11:58:35 -0700
-Subject: [PATCH] btrfs-progs: use linux mount.h instead of sys/mount.h
-
-This file includes linux/fs.h which includes linux/mount.h and with
-glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1]
-therefore try to avoid including both headers
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- common/device-utils.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/common/device-utils.c b/common/device-utils.c
-index 617b67462..25a4fb8c4 100644
---- a/common/device-utils.c
-+++ b/common/device-utils.c
-@@ -15,7 +15,6 @@
-  */
- 
- #include <sys/ioctl.h>
--#include <sys/mount.h>
- #include <sys/statfs.h>
- #include <sys/types.h>
- #include <stdio.h>
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch
deleted file mode 100644
index d8149b6220ef..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-6.1.1-ioctl-fix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://bugs.gentoo.org/888579
-https://bugs.gentoo.org/889694
-https://github.com/kdave/btrfs-progs/issues/566
-https://github.com/kdave/btrfs-progs/commit/27bb4f6819df6ad7771e089e1fd3f1bd1163e437
-
-From 27bb4f6819df6ad7771e089e1fd3f1bd1163e437 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Wed, 4 Jan 2023 16:34:51 +0100
-Subject: [PATCH] btrfs-progs: libbtrfs: revert to v6.0.2 ioctl.h
-
-The file ioctl.h has been copied to libbtrfs in 5fc1d0cd64ee
-("btrfs-progs: copy ioctl.h into libbtrfs") but that was after changes
-to the btrfs_qgroup_limit in 03451430de7c ("btrfs-progs: rename qgroup
-items to match the kernel naming scheme"). This caused build breakage
-but hasn't been fixed in v6.1.1.
-
-Revert the contents of libbtrfs/ioctl.h to be completely just v6.0.2
-though the other changes may not be needed, it's the version we know
-works.
-
-Issue: #566
-Signed-off-by: David Sterba <dsterba@suse.com>
---- a/libbtrfs/ioctl.h
-+++ b/libbtrfs/ioctl.h
-@@ -71,10 +71,10 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);
- 
- struct btrfs_qgroup_limit {
- 	__u64	flags;
--	__u64	max_rfer;
--	__u64	max_excl;
--	__u64	rsv_rfer;
--	__u64	rsv_excl;
-+	__u64	max_referenced;
-+	__u64	max_exclusive;
-+	__u64	rsv_referenced;
-+	__u64	rsv_exclusive;
- };
- BUILD_ASSERT(sizeof(struct btrfs_qgroup_limit) == 40);
- 
-@@ -192,6 +192,7 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_dev_replace_status_params) == 48);
- #define BTRFS_IOCTL_DEV_REPLACE_CMD_START			0
- #define BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS			1
- #define BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL			2
-+#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT		-1
- #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR			0
- #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED		1
- #define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED		2
-@@ -934,6 +935,38 @@ enum btrfs_err_code {
- 	BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET,
- };
- 
-+/* An error code to error string mapping for the kernel
-+*  error codes
-+*/
-+static inline char *btrfs_err_str(enum btrfs_err_code err_code)
-+{
-+	switch (err_code) {
-+		case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
-+			return "unable to go below two devices on raid1";
-+		case BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET:
-+			return "unable to go below three devices on raid1c3";
-+		case BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET:
-+			return "unable to go below four devices on raid1c4";
-+		case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
-+			return "unable to go below four/two devices on raid10";
-+		case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:
-+			return "unable to go below two devices on raid5";
-+		case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET:
-+			return "unable to go below three devices on raid6";
-+		case BTRFS_ERROR_DEV_TGT_REPLACE:
-+			return "unable to remove the dev_replace target dev";
-+		case BTRFS_ERROR_DEV_MISSING_NOT_FOUND:
-+			return "no missing devices found to remove";
-+		case BTRFS_ERROR_DEV_ONLY_WRITABLE:
-+			return "unable to remove the only writeable device";
-+		case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS:
-+			return "add/delete/balance/replace/resize operation "
-+				"in progress";
-+		default:
-+			return NULL;
-+	}
-+}
-+
- #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
- 				   struct btrfs_ioctl_vol_args)
- #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
-