| 1 |
commit: e9544b68a207619f352c22c54747386e2ff90625 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 7 23:13:32 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 7 23:57:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9544b68 |
| 7 |
|
| 8 |
sys-fs/zfs: sync live ebuild |
| 9 |
|
| 10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-fs/zfs/zfs-9999.ebuild | 10 ++++------ |
| 13 |
1 file changed, 4 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild |
| 16 |
index 6cf9307c40d..2349a5a20d0 100644 |
| 17 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
| 18 |
+++ b/sys-fs/zfs/zfs-9999.ebuild |
| 19 |
@@ -67,7 +67,7 @@ fi |
| 20 |
|
| 21 |
# awk is used for some scripts, completions, and the Dracut module |
| 22 |
RDEPEND="${DEPEND} |
| 23 |
- !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) |
| 24 |
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) |
| 25 |
!prefix? ( virtual/udev ) |
| 26 |
sys-fs/udev-init-scripts |
| 27 |
virtual/awk |
| 28 |
@@ -88,11 +88,9 @@ RDEPEND="${DEPEND} |
| 29 |
) |
| 30 |
" |
| 31 |
|
| 32 |
-# temporary block new coreutils |
| 33 |
-# https://github.com/openzfs/zfs/issues/11900 |
| 34 |
-RDEPEND+=" |
| 35 |
- <sys-apps/coreutils-9 |
| 36 |
-" |
| 37 |
+# PDEPEND in this form is needed to trick portage suggest |
| 38 |
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable |
| 39 |
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" |
| 40 |
|
| 41 |
REQUIRED_USE=" |
| 42 |
!minimal? ( ${PYTHON_REQUIRED_USE} ) |
Archives