sys-fs/zfs : version bump

3 files changed, 33 insertions, 25 deletions

diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest
index f9de9cf7..e1fd8326 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
+DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94
diff --git a/sys-fs/zfs-utils/zfs-utils-0.8.4.ebuild b/sys-fs/zfs-utils/zfs-utils-2.0.1.ebuild
index b57e84e6..205c4a30 100644
--- a/sys-fs/zfs-utils/zfs-utils-0.8.4.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-2.0.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs udev
+inherit bash-completion-r1 distutils-r1 flag-o-matic pam toolchain-funcs udev
 
 MY_PN="zfs"
 MY_P="${MY_PN}-${PV}"
@@ -14,42 +14,45 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://zfsonlinux.org/"
 
-SRC_URI="https://github.com/zfsonlinux/${MY_PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
 KEYWORDS="~amd64"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
-IUSE="debug python test-suite static-libs"
+IUSE="debug pam python test-suite static-libs"
 
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	net-libs/libtirpc
+DEPEND="
+	net-libs/libtirpc[static-libs?]
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
 	virtual/awk
+	virtual/libudev[static-libs(-)?]
+	dev-libs/openssl:0=[static-libs?]
+	pam? ( sys-libs/pam )
 	python? (
 		virtual/python-cffi[${PYTHON_USEDEP}]
 	)
 "
 
-BDEPEND="${COMMON_DEPEND}
+BDEPEND="virtual/awk
 	virtual/pkgconfig
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 "
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!prefix? ( 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
-		virtual/modutils
 	)
 "
 
@@ -57,19 +60,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/bash-completion-sudo.patch"
-)
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
 
 src_prepare() {
 	default
-	# Update paths
-	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in || die
 
 	if use python; then
 		pushd contrib/pyzfs >/dev/null || die
@@ -79,12 +73,13 @@ src_prepare() {
 
 	# 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
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
 }
 
 src_configure() {
 	local myconf=(
 		--bindir="${EPREFIX}/bin"
+		--enable-shared
 		--disable-systemd
 		--enable-sysvinit
 		--localstatedir="${EPREFIX}/var"
@@ -92,7 +87,11 @@ src_configure() {
 		--with-config=user
 		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
 		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-vendor=gentoo
 		$(use_enable debug)
+		$(use_enable pam)
 		$(use_enable python pyzfs)
 	)
 
@@ -111,13 +110,22 @@ src_compile() {
 src_install() {
 	default
 
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
 
-	use test-suite || rm -rf "${ED}/usr/share/zfs"
+	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
+
+	if ! use static-libs; then
+		find "${ED}/" -name '*.la' -delete || die
+	fi
 
 	dobashcomp contrib/bash_completion.d/zfs
 	bashcomp_alias zfs zpool
 
+	# 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
diff --git a/sys-fs/zfs/zfs-0.8.4.ebuild b/sys-fs/zfs/zfs-2.0.1.ebuild
index c91d103c..c91d103c 100644
--- a/sys-fs/zfs/zfs-0.8.4.ebuild
+++ b/sys-fs/zfs/zfs-2.0.1.ebuild