| 1 |
commit: 06037628cbb263b10d8045c6167f66d71656fa52 |
| 2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jan 8 19:26:18 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 8 19:27:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06037628 |
| 7 |
|
| 8 |
sys-apps/kmod: Fix xsltproc dependency |
| 9 |
|
| 10 |
and sync live ebuild with latest release |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/764467 |
| 13 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-apps/kmod/kmod-9999.ebuild | 15 +++++++++------ |
| 17 |
1 file changed, 9 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild |
| 20 |
index a7e386f475a..d608f43bcf1 100644 |
| 21 |
--- a/sys-apps/kmod/kmod-9999.ebuild |
| 22 |
+++ b/sys-apps/kmod/kmod-9999.ebuild |
| 23 |
@@ -1,9 +1,9 @@ |
| 24 |
-# Copyright 1999-2020 Gentoo Authors |
| 25 |
+# Copyright 1999-2021 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
|
| 30 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
| 31 |
+PYTHON_COMPAT=( python3_{6..9} ) |
| 32 |
|
| 33 |
inherit autotools bash-completion-r1 multilib python-r1 |
| 34 |
|
| 35 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" |
| 36 |
|
| 37 |
LICENSE="LGPL-2" |
| 38 |
SLOT="0" |
| 39 |
-IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" |
| 40 |
+IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib zstd" |
| 41 |
|
| 42 |
# Upstream does not support running the test suite with custom configure flags. |
| 43 |
# I was also told that the test suite is intended for kmod developers. |
| 44 |
@@ -29,6 +29,7 @@ IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" |
| 45 |
# See bug #408915. |
| 46 |
RESTRICT="test" |
| 47 |
|
| 48 |
+# >=zlib-1.2.6 required because of bug #427130 |
| 49 |
# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch |
| 50 |
RDEPEND="!sys-apps/module-init-tools |
| 51 |
!sys-apps/modutils |
| 52 |
@@ -40,7 +41,8 @@ RDEPEND="!sys-apps/module-init-tools |
| 53 |
!libressl? ( >=dev-libs/openssl-1.1.0:0= ) |
| 54 |
libressl? ( dev-libs/libressl:0= ) |
| 55 |
) |
| 56 |
- zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 |
| 57 |
+ zlib? ( >=sys-libs/zlib-1.2.6 ) |
| 58 |
+ zstd? ( >=app-arch/zstd-1.4.4 )" |
| 59 |
DEPEND="${RDEPEND}" |
| 60 |
BDEPEND=" |
| 61 |
doc? ( |
| 62 |
@@ -55,13 +57,13 @@ BDEPEND=" |
| 63 |
zlib? ( virtual/pkgconfig ) |
| 64 |
" |
| 65 |
if [[ ${PV} == 9999* ]]; then |
| 66 |
- DEPEND="${DEPEND} |
| 67 |
+ BDEPEND="${BDEPEND} |
| 68 |
dev-libs/libxslt" |
| 69 |
fi |
| 70 |
|
| 71 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 72 |
|
| 73 |
-DOCS="NEWS README TODO" |
| 74 |
+DOCS=( NEWS README TODO ) |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
default |
| 78 |
@@ -97,6 +99,7 @@ src_configure() { |
| 79 |
$(use_with lzma xz) |
| 80 |
$(use_with pkcs7 openssl) |
| 81 |
$(use_with zlib) |
| 82 |
+ $(use_with zstd) |
| 83 |
) |
| 84 |
|
| 85 |
local ECONF_SOURCE="${S}" |
Archives