commit: 06037628cbb263b10d8045c6167f66d71656fa52 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Fri Jan 8 19:26:18 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Jan 8 19:27:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06037628
sys-apps/kmod: Fix xsltproc dependency and sync live ebuild with latest release Closes: https://bugs.gentoo.org/764467 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-apps/kmod/kmod-9999.ebuild | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index a7e386f475a..d608f43bcf1 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit autotools bash-completion-r1 multilib python-r1 @@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"; LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" +IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib zstd" # Upstream does not support running the test suite with custom configure flags. # I was also told that the test suite is intended for kmod developers. @@ -29,6 +29,7 @@ IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib" # See bug #408915. RESTRICT="test" +# >=zlib-1.2.6 required because of bug #427130 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils @@ -40,7 +41,8 @@ RDEPEND="!sys-apps/module-init-tools !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 + zlib? ( >=sys-libs/zlib-1.2.6 ) + zstd? ( >=app-arch/zstd-1.4.4 )" DEPEND="${RDEPEND}" BDEPEND=" doc? ( @@ -55,13 +57,13 @@ BDEPEND=" zlib? ( virtual/pkgconfig ) " if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} dev-libs/libxslt" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS="NEWS README TODO" +DOCS=( NEWS README TODO ) src_prepare() { default @@ -97,6 +99,7 @@ src_configure() { $(use_with lzma xz) $(use_with pkcs7 openssl) $(use_with zlib) + $(use_with zstd) ) local ECONF_SOURCE="${S}"
