| 1 |
commit: b65876cd71e2c60bbd4a39be6d7fb0a5cd4a7b56 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 7 23:16:15 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 7 23:57:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65876cd |
| 7 |
|
| 8 |
sys-fs/zfs: switch dist-kernel usedep to PDEPEND |
| 9 |
|
| 10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-fs/zfs/zfs-0.8.6-r1.ebuild | 6 +++++- |
| 13 |
sys-fs/zfs/zfs-2.0.6-r1.ebuild | 6 +++++- |
| 14 |
2 files changed, 10 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/zfs/zfs-0.8.6-r1.ebuild b/sys-fs/zfs/zfs-0.8.6-r1.ebuild |
| 17 |
index ac6c6017eaa..b21a59267cb 100644 |
| 18 |
--- a/sys-fs/zfs/zfs-0.8.6-r1.ebuild |
| 19 |
+++ b/sys-fs/zfs/zfs-0.8.6-r1.ebuild |
| 20 |
@@ -46,7 +46,7 @@ BDEPEND="virtual/awk |
| 21 |
" |
| 22 |
|
| 23 |
RDEPEND="${DEPEND} |
| 24 |
- !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) |
| 25 |
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) |
| 26 |
!prefix? ( virtual/udev ) |
| 27 |
sys-fs/udev-init-scripts |
| 28 |
virtual/awk |
| 29 |
@@ -67,6 +67,10 @@ RDEPEND="${DEPEND} |
| 30 |
) |
| 31 |
" |
| 32 |
|
| 33 |
+# PDEPEND in this form is needed to trick portage suggest |
| 34 |
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable |
| 35 |
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" |
| 36 |
+ |
| 37 |
REQUIRED_USE=" |
| 38 |
!minimal? ( ${PYTHON_REQUIRED_USE} ) |
| 39 |
python? ( !minimal ) |
| 40 |
|
| 41 |
diff --git a/sys-fs/zfs/zfs-2.0.6-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild |
| 42 |
index e12aebe76f0..c955a9a9651 100644 |
| 43 |
--- a/sys-fs/zfs/zfs-2.0.6-r1.ebuild |
| 44 |
+++ b/sys-fs/zfs/zfs-2.0.6-r1.ebuild |
| 45 |
@@ -63,7 +63,7 @@ fi |
| 46 |
|
| 47 |
# awk is used for some scripts, completions, and the Dracut module |
| 48 |
RDEPEND="${DEPEND} |
| 49 |
- !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) |
| 50 |
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) |
| 51 |
!prefix? ( virtual/udev ) |
| 52 |
sys-fs/udev-init-scripts |
| 53 |
virtual/awk |
| 54 |
@@ -84,6 +84,10 @@ RDEPEND="${DEPEND} |
| 55 |
) |
| 56 |
" |
| 57 |
|
| 58 |
+# PDEPEND in this form is needed to trick portage suggest |
| 59 |
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable |
| 60 |
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" |
| 61 |
+ |
| 62 |
# temporary block new coreutils |
| 63 |
# https://github.com/openzfs/zfs/issues/11900 |
| 64 |
RDEPEND+=" |
Archives