summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2021-11-07 15:13:32 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2021-11-07 15:57:44 -0800
commite9544b68a207619f352c22c54747386e2ff90625 (patch)
treead060736441151438ebf7eaa78d3c06fb3fe2bb9 /sys-fs/zfs
parentsys-fs/zfs-kmod: sync live ebuild (diff)
downloadgentoo-e9544b68a207619f352c22c54747386e2ff90625.tar.gz
gentoo-e9544b68a207619f352c22c54747386e2ff90625.tar.bz2
gentoo-e9544b68a207619f352c22c54747386e2ff90625.zip
sys-fs/zfs: sync live ebuild
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 6cf9307c40d0..2349a5a20d00 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} )