From b65876cd71e2c60bbd4a39be6d7fb0a5cd4a7b56 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Sun, 7 Nov 2021 15:16:15 -0800 Subject: [PATCH] sys-fs/zfs: switch dist-kernel usedep to PDEPEND Signed-off-by: Georgy Yakovlev --- 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 ac6c6017eaaf2..b21a59267cb99 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 e12aebe76f0ad..c955a9a96516b 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+="