Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
Date: Wed, 13 Feb 2019 23:46:37
Message-Id: 1550101585.c1e1dccdc5ac220f0eb36ac96387df7eb81fc148.polynomial-c@gentoo
1 commit: c1e1dccdc5ac220f0eb36ac96387df7eb81fc148
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 13 23:42:27 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 13 23:46:25 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e1dccd
7
8 sys-apps/kmod: Update live ebuild.
9
10 Package-Manager: Portage-2.3.60, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/kmod/kmod-9999.ebuild | 14 ++++++++------
14 1 file changed, 8 insertions(+), 6 deletions(-)
15
16 diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
17 index 29f71548f2a..7738137ba64 100644
18 --- a/sys-apps/kmod/kmod-9999.ebuild
19 +++ b/sys-apps/kmod/kmod-9999.ebuild
20 @@ -1,11 +1,11 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 +# Copyright 1999-2019 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=6
26
27 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
28 +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
29
30 -inherit bash-completion-r1 ltprune multilib python-r1
31 +inherit bash-completion-r1 multilib python-r1
32
33 if [[ ${PV} == 9999* ]]; then
34 EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
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 lzma python static-libs +tools zlib"
40 +IUSE="debug doc lzma python ssl static-libs +tools zlib"
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 @@ -36,6 +36,7 @@ RDEPEND="!sys-apps/module-init-tools
45 !<sys-apps/systemd-216-r3
46 lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
47 python? ( ${PYTHON_DEPS} )
48 + ssl? ( >=dev-libs/openssl-1.1.0:0= )
49 zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
50 DEPEND="${RDEPEND}
51 doc? ( dev-util/gtk-doc )
52 @@ -57,7 +58,7 @@ DOCS="NEWS README TODO"
53 src_prepare() {
54 default
55
56 - if [ ! -e configure ]; then
57 + if [[ ! -e configure ]] ; then
58 if use doc; then
59 gtkdocize --copy --docdir libkmod/docs || die
60 else
61 @@ -85,6 +86,7 @@ src_configure() {
62 $(use_enable static-libs static)
63 $(use_enable tools)
64 $(use_with lzma xz)
65 + $(use_with ssl openssl)
66 $(use_with zlib)
67 )
68
69 @@ -138,7 +140,7 @@ src_install() {
70 python_foreach_impl python_install
71 fi
72
73 - prune_libtool_files --modules
74 + find "${ED}" -name "*.la" -delete || die
75
76 if use tools; then
77 local bincmd sbincmd