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

[Georgy Yakovlev]

commit:     e9544b68a207619f352c22c54747386e2ff90625
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 23:13:32 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 23:57:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9544b68

sys-fs/zfs: sync live ebuild

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-fs/zfs/zfs-9999.ebuild | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 6cf9307c40d..2349a5a20d0 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -67,7 +67,7 @@ fi
 
 # awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
-       !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
+       !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
        !prefix? ( virtual/udev )
        sys-fs/udev-init-scripts
        virtual/awk
@@ -88,11 +88,9 @@ RDEPEND="${DEPEND}
        )
 "
 
-# temporary block new coreutils
-# https://github.com/openzfs/zfs/issues/11900
-RDEPEND+="
-       <sys-apps/coreutils-9
-"
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to 
disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
 
 REQUIRED_USE="
        !minimal? ( ${PYTHON_REQUIRED_USE} )