gentoo resync : 25.11.2020

7 files changed, 247 insertions, 242 deletions

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 5cc774d275a4..1c4bb2e0b701 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,9 +1,9 @@
-AUX 0.8.4-initconfdir.patch 1004 BLAKE2B fd4186b5f378f562098040a8e13a12e6fd7f0f37f3b981a8d46e0e3bc943eb8dd5fa474e6c65cefd8c03fc3c45a119f6a141d42753ce4729e3a234e7f57dc4b8 SHA512 c18e9cd03d537a3ad632e1aeb354b56f5db9a8ef51c30b2e728ea527b7e9017219b1a230374238ecdd24082d9f2c62510aea68b234df84961ada5dce2ed617cc
-AUX 2.0.0_rc2-exports-d-permissions.patch 5290 BLAKE2B 40973b72df805d4e8ef4d02acbfa05e70fbdcdc0484c9f69960800a3b354998ee179e2fad3553264ecd442ffcbd1c3c9a992e48f6b81dec199501b0d0aac1207 SHA512 0a23bb1ee709c9229297388252ea657d18d368952095eb6f4598b4b17c6f693d592abd466b8be2c92f343b8f2588fcb22704c935209e1e43ea7856ed17f5fa66
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
-DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
-DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
-EBUILD zfs-0.8.4-r2.ebuild 5645 BLAKE2B 162d5f2689b7842df19fa7ffb21579faa2f0c8d5a3ab5251cb6a427667957de78ca3c4228f51874851454e3b25613c13f32d179ce308194c4af3e75d8fa07a2e SHA512 57d265e0b9128e1d2a13863f87377ba00026bd0f8ff4dc42604b0efce167224be3fb32a051735da79ce303750913b7ab2444195fcfc33b497e8842fd12b7f3b3
-EBUILD zfs-2.0.0_rc2-r1.ebuild 5911 BLAKE2B b59fd2636f280632ad6ce84da9f6336028a5ce38d60d37c6c95d93fbef860e0e24b15c7b2ecd084af5de5727adf2377c0dd8e794475da96e24fc9e19399cab71 SHA512 abdff63d208e07dea79cb1c06f587762ba770e6f30cae2780211e235ab0da5dea96077f89776092adf453cf495200596f576348a4f9e59e489b323b88d393860
-EBUILD zfs-9999.ebuild 5861 BLAKE2B 1a235667de2aeb65ceca37e11867ffd75a35852e91ae0e0e1141530b1eec73bffa42acc01c29dff84d6cd21333cd41481e5c4c11f5772b96f65b83d0759ccda1 SHA512 3f7b2cf46e2508feaa6b7aa31733a8117a8d5ac11defaf60a7d33e201b932c742d84202044dfcb399bb916003ca9b50d5fbb57134af82485a5a0b018e62b5e32
+DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
+DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
+DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65
+EBUILD zfs-0.8.5.ebuild 5695 BLAKE2B 05e6a12ea2ab6c7655b2a62d642ed97a9acaa59959f648896a20f9b2336b81af79a60a398e5ad53844b7173abe95705b18fd420362f7e82182896ef0360a637f SHA512 f879e459304b5a2a3a53c5ebb01c0d54d822c3f1f1abb4d26c7a065bc5a184b744aab2777340b7bee9227a855cae4bf44e9cb1ab61b98031b1190d3b387a9367
+EBUILD zfs-2.0.0_rc6.ebuild 5952 BLAKE2B 617854bd385ad9f86e8c031c1e96771776d4fd0fb963fe22fc2580d6befd3008e19492ec0023dfdf073a229289c19fb2227f818e9ce5631b5c66f55c2dd55d60 SHA512 e2d6f029c687c32440a35069e22d8cb38c6677999c737ad32c8d73ea43d04fc1234314f55fdc0e072e4bcc967ed73fde6c66055b9153603d10cc3b0582f51cc4
+EBUILD zfs-2.0.0_rc7.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
+EBUILD zfs-9999.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
 MISC metadata.xml 1003 BLAKE2B 640ef6d6f178ae9c3f3281a8e8539980c4a263f6cf0c5f4e1de3f0572f2acfe409865e85a12473129eb026130c9b76b946ee7698bd990b05f14e6b26c40fcb22 SHA512 965eabb5488a3cb54b360b33c847a2eb0d326a2c6761d86d581e06c2f52db9478fe7df131f68cb57bf32a2a872ecc1597e2a1a6b457d254f578d684cf73810c5
diff --git a/sys-fs/zfs/files/0.8.4-initconfdir.patch b/sys-fs/zfs/files/0.8.4-initconfdir.patch
deleted file mode 100644
index aac40896f39b..000000000000
--- a/sys-fs/zfs/files/0.8.4-initconfdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5dbe98184278878746a5f548fead1d2ef1e98dbe Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Tue, 26 May 2020 16:44:54 -0700
-Subject: [PATCH] 0.8.4 initconfdir
-
-fix for https://github.com/openzfs/zfs/issues/10375
-
----
- etc/zfs/Makefile.am | 1 +
- etc/zfs/Makefile.in | 9 +++++----
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/etc/zfs/Makefile.am b/openzfs/etc/zfs/Makefile.am
-index 81567a4..5370f41 100644
---- a/etc/zfs/Makefile.am
-+++ b/etc/zfs/Makefile.am
-@@ -1,4 +1,5 @@
- pkgsysconfdir = $(sysconfdir)/zfs
-+initconfdir = $(DEFAULT_INITCONF_DIR)
- 
- pkgsysconf_DATA = \
- 	vdev_id.conf.alias.example \
-diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in
-index fb02811..795d3b1 100644
-@@ -571,6 +571,7 @@ udevdir = @udevdir@
- udevruledir = @udevruledir@
- zfsexecdir = @zfsexecdir@
- pkgsysconfdir = $(sysconfdir)/zfs
-+initconfdir = $(DEFAULT_INITCONF_DIR)
- pkgsysconf_DATA = \
- 	vdev_id.conf.alias.example \
- 	vdev_id.conf.sas_direct.example \
--- 
-2.26.2
-
diff --git a/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch b/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch
deleted file mode 100644
index 4acaf465a7bc..000000000000
--- a/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From fe413a4d901a243d98cfef16ea330f7114a104ea Mon Sep 17 00:00:00 2001
-From: George Wilson <george.wilson@delphix.com>
-Date: Tue, 15 Sep 2020 22:57:16 -0400
-Subject: [PATCH] zpool command complains about /etc/exports.d
-
-If the /etc/exports.d directory does not exist, then we should only
-create it when we're performing an action which already requires root
-privileges.
-
-This commit moves the directory creation to the enable/disable code
-path which ensures that we have the appropriate privileges.
-
-Signed-off-by: George Wilson <gwilson@delphix.com>
-Closes #10785
----
- lib/libshare/os/freebsd/nfs.c | 36 +++++++++++-------
- lib/libshare/os/linux/nfs.c   | 71 ++++++++++++++++++++---------------
- 2 files changed, 64 insertions(+), 43 deletions(-)
-
-diff --git a/lib/libshare/os/freebsd/nfs.c b/lib/libshare/os/freebsd/nfs.c
-index 65f3b11bf9b..5951b9eafa2 100644
---- a/lib/libshare/os/freebsd/nfs.c
-+++ b/lib/libshare/os/freebsd/nfs.c
-@@ -228,21 +228,33 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 	int error = SA_OK;
- 	char *line;
- 
--	/*
--	 * If the file doesn't exist then there is nothing more
--	 * we need to do.
--	 */
- 	FILE *oldfp = fopen(ZFS_EXPORTS_FILE, "r");
--	if (oldfp == NULL)
--		return (SA_OK);
--
- 	FILE *newfp = fopen(filename, "w+");
-+	if (newfp == NULL) {
-+		fprintf(stderr, "failed to open %s file: %s", filename,
-+		    strerror(errno));
-+		fclose(oldfp);
-+		return (SA_SYSTEM_ERR);
-+	}
- 	fputs(FILE_HEADER, newfp);
--	while ((line = zgetline(oldfp, mountpoint)) != NULL)
--		fprintf(newfp, "%s\n", line);
--	if (ferror(oldfp) != 0) {
--		error = ferror(oldfp);
-+
-+	/*
-+	 * The ZFS_EXPORTS_FILE may not exist yet. If that's the
-+	 * case then just write out the new file.
-+	 */
-+	if (oldfp != NULL) {
-+		while ((line = zgetline(oldfp, mountpoint)) != NULL)
-+			fprintf(newfp, "%s\n", line);
-+		if (ferror(oldfp) != 0) {
-+			error = ferror(oldfp);
-+		}
-+		if (fclose(oldfp) != 0) {
-+			fprintf(stderr, "Unable to close file %s: %s\n",
-+			    filename, strerror(errno));
-+			error = error != 0 ? error : SA_SYSTEM_ERR;
-+		}
- 	}
-+
- 	if (error == 0 && ferror(newfp) != 0) {
- 		error = ferror(newfp);
- 	}
-@@ -252,8 +264,6 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 		    filename, strerror(errno));
- 		error = error != 0 ? error : SA_SYSTEM_ERR;
- 	}
--	fclose(oldfp);
--
- 	return (error);
- }
- 
-diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
-index a6a9b33d765..1efa321b7bc 100644
---- a/lib/libshare/os/linux/nfs.c
-+++ b/lib/libshare/os/linux/nfs.c
-@@ -393,6 +393,14 @@ static char *
- nfs_init_tmpfile(void)
- {
- 	char *tmpfile = NULL;
-+	struct stat sb;
-+
-+	if (stat(ZFS_EXPORTS_DIR, &sb) < 0 &&
-+	    mkdir(ZFS_EXPORTS_DIR, 0755) < 0) {
-+		fprintf(stderr, "failed to create %s: %s\n",
-+		    ZFS_EXPORTS_DIR, strerror(errno));
-+		return (NULL);
-+	}
- 
- 	if (asprintf(&tmpfile, "%s%s", ZFS_EXPORTS_FILE, ".XXXXXXXX") == -1) {
- 		fprintf(stderr, "Unable to allocate temporary file\n");
-@@ -481,36 +489,49 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 	size_t buflen = 0;
- 	int error = SA_OK;
- 
--	/*
--	 * If the file doesn't exist then there is nothing more
--	 * we need to do.
--	 */
- 	FILE *oldfp = fopen(ZFS_EXPORTS_FILE, "r");
--	if (oldfp == NULL)
--		return (SA_OK);
--
- 	FILE *newfp = fopen(filename, "w+");
-+	if (newfp == NULL) {
-+		fprintf(stderr, "failed to open %s file: %s", filename,
-+		    strerror(errno));
-+		fclose(oldfp);
-+		return (SA_SYSTEM_ERR);
-+	}
- 	fputs(FILE_HEADER, newfp);
--	while ((getline(&buf, &buflen, oldfp)) != -1) {
--		char *space = NULL;
- 
--		if (buf[0] == '\n' || buf[0] == '#')
--			continue;
--
--		if ((space = strchr(buf, ' ')) != NULL) {
--			int mountpoint_len = strlen(mountpoint);
-+	/*
-+	 * The ZFS_EXPORTS_FILE may not exist yet. If that's the
-+	 * case then just write out the new file.
-+	 */
-+	if (oldfp != NULL) {
-+		while (getline(&buf, &buflen, oldfp) != -1) {
-+			char *space = NULL;
- 
--			if (space - buf == mountpoint_len &&
--			    strncmp(mountpoint, buf, mountpoint_len) == 0) {
-+			if (buf[0] == '\n' || buf[0] == '#')
- 				continue;
-+
-+			if ((space = strchr(buf, ' ')) != NULL) {
-+				int mountpoint_len = strlen(mountpoint);
-+
-+				if (space - buf == mountpoint_len &&
-+				    strncmp(mountpoint, buf,
-+				    mountpoint_len) == 0) {
-+					continue;
-+				}
- 			}
-+			fputs(buf, newfp);
- 		}
--		fputs(buf, newfp);
--	}
- 
--	if (oldfp != NULL && ferror(oldfp) != 0) {
--		error = ferror(oldfp);
-+		if (ferror(oldfp) != 0) {
-+			error = ferror(oldfp);
-+		}
-+		if (fclose(oldfp) != 0) {
-+			fprintf(stderr, "Unable to close file %s: %s\n",
-+			    filename, strerror(errno));
-+			error = error != 0 ? error : SA_SYSTEM_ERR;
-+		}
- 	}
-+
- 	if (error == 0 && ferror(newfp) != 0) {
- 		error = ferror(newfp);
- 	}
-@@ -521,8 +542,6 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 		    filename, strerror(errno));
- 		error = error != 0 ? error : SA_SYSTEM_ERR;
- 	}
--	fclose(oldfp);
--
- 	return (error);
- }
- 
-@@ -701,13 +720,5 @@ static const sa_share_ops_t nfs_shareops = {
- void
- libshare_nfs_init(void)
- {
--	struct stat sb;
--
- 	nfs_fstype = register_fstype("nfs", &nfs_shareops);
--
--	if (stat(ZFS_EXPORTS_DIR, &sb) < 0 &&
--	    mkdir(ZFS_EXPORTS_DIR, 0755) < 0) {
--		fprintf(stderr, "failed to create %s: %s\n",
--		    ZFS_EXPORTS_DIR, strerror(errno));
--	}
- }
diff --git a/sys-fs/zfs/zfs-0.8.4-r2.ebuild b/sys-fs/zfs/zfs-0.8.5.ebuild
index 3bcbb4af433c..62af0741a227 100644
--- a/sys-fs/zfs/zfs-0.8.4-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.8.5.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
+SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
 IUSE="custom-cflags debug kernel-builtin libressl minimal nls python +rootfs test-suite static-libs"
 
 DEPEND="
@@ -75,7 +75,6 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/bash-completion-sudo.patch"
-	"${FILESDIR}/${PV}-initconfdir.patch"
 )
 
 pkg_setup() {
diff --git a/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild b/sys-fs/zfs/zfs-2.0.0_rc6.ebuild
index 1f9d81f16e60..e5684e2ff427 100644
--- a/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.0.0_rc6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
 
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
+SLOT="0/4" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
 IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
 
 DEPEND="
@@ -76,10 +76,7 @@ REQUIRED_USE="
 
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/bash-completion-sudo.patch"
-	"${FILESDIR}/${PV}-exports-d-permissions.patch"
-)
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
 
 pkg_setup() {
 	if use kernel_linux && use test-suite; then
diff --git a/sys-fs/zfs/zfs-2.0.0_rc7.ebuild b/sys-fs/zfs/zfs-2.0.0_rc7.ebuild
new file mode 100644
index 000000000000..83e1b87f58a5
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.0.0_rc7.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	S="${WORKDIR}/${P%_rc?}"
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+SLOT="0/4"
+IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
+
+DEPEND="
+	net-libs/libtirpc[static-libs?]
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+	virtual/libudev[static-libs(-)?]
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="virtual/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-kernel/genkernel-3.5.1.1
+	)
+	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="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	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
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-systemd
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		--with-vendor=gentoo
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		$(use_enable static-libs static)
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	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
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	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
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "root on zfs requires initramfs to boot"
+			elog "the following packages known to provide one and tested on regular basis:"
+			elog "  sys-kernel/dracut"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index d2f00419b0c7..83e1b87f58a5 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
 
@@ -22,7 +22,9 @@ else
 fi
 
 LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+SLOT="0/4"
 IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
 
 DEPEND="
@@ -165,7 +167,7 @@ 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 ; }