diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-11-07 15:16:15 -0800 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-11-07 15:57:41 -0800 |
| commit | b65876cd71e2c60bbd4a39be6d7fb0a5cd4a7b56 (patch) | |
| tree | c54e690634b7a9c16d9b5962f9ddb9872c2c05e5 /sys-fs | |
| parent | sys-fs/zfs: revbump 2.1.1, add patch and dist-kernel version limit (diff) | |
| download | gentoo-b65876cd71e2c60bbd4a39be6d7fb0a5cd4a7b56.tar.gz gentoo-b65876cd71e2c60bbd4a39be6d7fb0a5cd4a7b56.tar.bz2 gentoo-b65876cd71e2c60bbd4a39be6d7fb0a5cd4a7b56.zip | |
sys-fs/zfs: switch dist-kernel usedep to PDEPEND
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/zfs/zfs-0.8.6-r1.ebuild | 6 | ||||
| -rw-r--r-- | 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 ac6c6017eaaf..b21a59267cb9 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 e12aebe76f0a..c955a9a96516 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+=" |