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

[Georgy Yakovlev]

commit:     b65876cd71e2c60bbd4a39be6d7fb0a5cd4a7b56
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 23:16:15 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 23:57:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65876cd

sys-fs/zfs: switch dist-kernel usedep to PDEPEND

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

 sys-fs/zfs/zfs-0.8.6-r1.ebuild | 6 +++++-
 sys-fs/zfs/zfs-2.0.6-r1.ebuild | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys-fs/zfs/zfs-0.8.6-r1.ebuild b/sys-fs/zfs/zfs-0.8.6-r1.ebuild
index ac6c6017eaa..b21a59267cb 100644
--- a/sys-fs/zfs/zfs-0.8.6-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.8.6-r1.ebuild
@@ -46,7 +46,7 @@ BDEPEND="virtual/awk
 "
 
 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
@@ -67,6 +67,10 @@ RDEPEND="${DEPEND}
        )
 "
 
+# 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} )
        python? ( !minimal )

diff --git a/sys-fs/zfs/zfs-2.0.6-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild
index e12aebe76f0..c955a9a9651 100644
--- a/sys-fs/zfs/zfs-2.0.6-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.0.6-r1.ebuild
@@ -63,7 +63,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
@@ -84,6 +84,10 @@ RDEPEND="${DEPEND}
        )
 "
 
+# 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] )"
+
 # temporary block new coreutils
 # https://github.com/openzfs/zfs/issues/11900
 RDEPEND+="