1 |
commit: 2b8df15c030224073db4b37f5e74e4c9bce8fa66 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 27 08:07:54 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 27 08:08:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8df15c |
7 |
|
8 |
sys-fs/zfs: backport minimal useflag to 0.8.4 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/701522 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
13 |
|
14 |
sys-fs/zfs/zfs-0.8.4-r2.ebuild | 16 ++++++++++------ |
15 |
1 file changed, 10 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/zfs/zfs-0.8.4-r2.ebuild b/sys-fs/zfs/zfs-0.8.4-r2.ebuild |
18 |
index 50fa48c210c..6b30ef219ee 100644 |
19 |
--- a/sys-fs/zfs/zfs-0.8.4-r2.ebuild |
20 |
+++ b/sys-fs/zfs/zfs-0.8.4-r2.ebuild |
21 |
@@ -21,10 +21,9 @@ fi |
22 |
|
23 |
LICENSE="BSD-2 CDDL MIT" |
24 |
SLOT="0" |
25 |
-IUSE="custom-cflags debug kernel-builtin libressl nls python +rootfs test-suite static-libs" |
26 |
+IUSE="custom-cflags debug kernel-builtin libressl minimal nls python +rootfs test-suite static-libs" |
27 |
|
28 |
DEPEND=" |
29 |
- ${PYTHON_DEPS} |
30 |
net-libs/libtirpc[static-libs?] |
31 |
sys-apps/util-linux[static-libs?] |
32 |
sys-libs/zlib[static-libs(+)?] |
33 |
@@ -32,6 +31,7 @@ DEPEND=" |
34 |
virtual/libudev[static-libs(-)?] |
35 |
libressl? ( dev-libs/libressl:0=[static-libs?] ) |
36 |
!libressl? ( dev-libs/openssl:0=[static-libs?] ) |
37 |
+ !minimal? ( ${PYTHON_DEPS} ) |
38 |
python? ( |
39 |
virtual/python-cffi[${PYTHON_USEDEP}] |
40 |
) |
41 |
@@ -65,7 +65,11 @@ RDEPEND="${DEPEND} |
42 |
) |
43 |
" |
44 |
|
45 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
46 |
+REQUIRED_USE=" |
47 |
+ !minimal? ( ${PYTHON_REQUIRED_USE} ) |
48 |
+ python? ( !minimal ) |
49 |
+ test-suite? ( !minimal ) |
50 |
+" |
51 |
|
52 |
RESTRICT="test" |
53 |
|
54 |
@@ -119,7 +123,7 @@ src_prepare() { |
55 |
|
56 |
src_configure() { |
57 |
use custom-cflags || strip-flags |
58 |
- python_setup |
59 |
+ use minimal || python_setup |
60 |
|
61 |
local myconf=( |
62 |
--bindir="${EPREFIX}/bin" |
63 |
@@ -133,13 +137,13 @@ src_configure() { |
64 |
--with-linux="${KV_DIR}" |
65 |
--with-linux-obj="${KV_OUT_DIR}" |
66 |
--with-udevdir="$(get_udevdir)" |
67 |
- --with-python="${EPYTHON}" |
68 |
--with-systemdunitdir="$(systemd_get_systemunitdir)" |
69 |
--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" |
70 |
$(use_enable debug) |
71 |
$(use_enable nls) |
72 |
$(use_enable python pyzfs) |
73 |
$(use_enable static-libs static) |
74 |
+ $(usex minimal --without-python --with-python="${EPYTHON}") |
75 |
) |
76 |
|
77 |
econf "${myconf[@]}" |
78 |
@@ -178,7 +182,7 @@ src_install() { |
79 |
fi |
80 |
|
81 |
# enforce best available python implementation |
82 |
- python_fix_shebang "${ED}/bin" |
83 |
+ use minimal || python_fix_shebang "${ED}/bin" |
84 |
} |
85 |
|
86 |
pkg_postinst() { |