[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     4d98c3db8124ddc002b4707c2998c9da646affd6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 19:45:19 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 19:46:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d98c3db

sys-fs/btrfs-progs: drop python support

This is not used by anything in the gentoo repo.
If somebody wants this, please implement it as a separate package.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 ...ogs-9999.ebuild => btrfs-progs-6.8.1-r1.ebuild} | 40 +++++++++-------------
 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild         | 40 +++++++++-------------
 2 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild
similarity index 84%
copy from sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
copy to sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild
index 6c9dc404782a..a4d6a850f26e 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 python-single-r1 udev
+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"
@@ -33,10 +33,10 @@ HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
 SLOT="0/0" # libbtrfs soname
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+IUSE="+convert +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} )"
+REQUIRED_USE="static? ( !udev )"
 
 # Tries to mount repaired filesystems
 RESTRICT="test"
@@ -51,7 +51,6 @@ RDEPEND="
 			>=sys-fs/reiserfsprogs-3.6.27
 		)
 	)
-	python? ( ${PYTHON_DEPS} )
 	udev? ( virtual/libudev:= )
 	zstd? ( app-arch/zstd:= )
 "
@@ -59,11 +58,6 @@ 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(+)]
@@ -80,11 +74,16 @@ DEPEND="
 BDEPEND="
 	virtual/pkgconfig
 	man? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
+		$(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
@@ -92,7 +91,7 @@ else
 fi
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	: # Prevent python-any-r1_python_setup
 }
 
 src_unpack() {
@@ -144,7 +143,6 @@ src_configure() {
 		$(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)
@@ -157,6 +155,10 @@ src_configure() {
 	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[@]}"
 }
@@ -167,26 +169,16 @@ src_compile() {
 
 src_test() {
 	emake V=1 -j1 -C tests 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() {

diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 6c9dc404782a..a4d6a850f26e 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 python-single-r1 udev
+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"
@@ -33,10 +33,10 @@ HOMEPAGE="https://btrfs.readthedocs.io/en/latest/"
 
 LICENSE="GPL-2"
 SLOT="0/0" # libbtrfs soname
-IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+IUSE="+convert +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} )"
+REQUIRED_USE="static? ( !udev )"
 
 # Tries to mount repaired filesystems
 RESTRICT="test"
@@ -51,7 +51,6 @@ RDEPEND="
 			>=sys-fs/reiserfsprogs-3.6.27
 		)
 	)
-	python? ( ${PYTHON_DEPS} )
 	udev? ( virtual/libudev:= )
 	zstd? ( app-arch/zstd:= )
 "
@@ -59,11 +58,6 @@ 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(+)]
@@ -80,11 +74,16 @@ DEPEND="
 BDEPEND="
 	virtual/pkgconfig
 	man? (
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
+		$(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
@@ -92,7 +91,7 @@ else
 fi
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	: # Prevent python-any-r1_python_setup
 }
 
 src_unpack() {
@@ -144,7 +143,6 @@ src_configure() {
 		$(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)
@@ -157,6 +155,10 @@ src_configure() {
 	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[@]}"
 }
@@ -167,26 +169,16 @@ src_compile() {
 
 src_test() {
 	emake V=1 -j1 -C tests 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() {