sys-fs/zfs-utils : revision bump, drop pyzfs

4 files changed, 21 insertions, 58 deletions

diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r1 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r1
deleted file mode 100644
index 97e45f2b..00000000
--- a/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://zfsonlinux.org/
-INHERIT=bash-completion-r1 distutils-r1 flag-o-matic pam toolchain-funcs udev
-IUSE=debug nls pam python test-suite python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/udev sys-fs/udev-init-scripts test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=dca48675693587d950666d1dd83d1401
diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2 b/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2
new file mode 100644
index 00000000..df536ed1
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-utils-2.1.7-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=7
+HOMEPAGE=https://zfsonlinux.org/
+INHERIT=bash-completion-r1 flag-o-matic pam toolchain-funcs udev
+IUSE=debug nls pam test-suite
+KEYWORDS=~amd64
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) virtual/udev sys-fs/udev-init-scripts test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b566442d77ff0069ed9be3b4b8f67304
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 2ef955e1..7da59613 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -58,7 +58,7 @@ sys-fs/cryptsetup 2.3.4-r10: Tool to setup encrypted devices with dm-crypt
 sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go
 sys-fs/vhba 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
 sys-fs/zfs 2.1.7: ZFS meta-package (Gentoo compatibility ebuild)
-sys-fs/zfs-utils 2.1.7-r1: Userland utilities for ZFS Linux kernel module
+sys-fs/zfs-utils 2.1.7-r2: Userland utilities for ZFS Linux kernel module
 sys-kernel/bcmwl-dkms 6.30.223.271-r2: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
 sys-kernel/dkms 2.3-r2: Dynamic Kernel Module Support
 sys-kernel/dracut 056-r10: Generic initramfs generation tool
diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild b/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild
index bda272ce..c9038d0f 100644
--- a/sys-fs/zfs-utils/zfs-utils-2.1.7-r1.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-2.1.7-r2.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit bash-completion-r1 distutils-r1 flag-o-matic pam toolchain-funcs udev
+inherit bash-completion-r1 flag-o-matic pam toolchain-funcs udev
 
 MY_PN="zfs"
 MY_P="${MY_PN}-${PV}"
@@ -20,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
-IUSE="debug nls pam python test-suite"
+IUSE="debug nls pam test-suite"
 
 DEPEND="
 	net-libs/libtirpc:=
@@ -29,17 +26,11 @@ DEPEND="
 	virtual/libudev:=
 	dev-libs/openssl:0=
 	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
 "
 
 BDEPEND="app-alternatives/awk
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
 "
 
 RDEPEND="${DEPEND}
@@ -56,8 +47,6 @@ RDEPEND="${DEPEND}
 	)
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 RESTRICT="test"
 
 PATCHES=(
@@ -72,12 +61,6 @@ PATCHES=(
 src_prepare() {
 	default
 
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
 	# prevent errors showing up on zfs-mount stop, #647688
 	# openrc will unmount all filesystems anyway.
 	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
@@ -96,26 +79,17 @@ src_configure() {
 		--with-udevdir="$(get_udevdir)"
 		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
 		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-vendor=gentoo
+		--with-vendor=redcore
 		$(use_enable debug)
 		$(use_enable nls)
 		$(use_enable pam)
-		$(use_enable python pyzfs)
+		--disable-pyzfs
 		--disable-static
 	)
 
 	econf "${myconf[@]}"
 }
 
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
 src_install() {
 	default
 
@@ -130,14 +104,4 @@ src_install() {
 
 	# strip executable bit from conf.d file
 	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	python_setup
-	python_fix_shebang "${ED}/bin"
 }