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: Tue, 09 Jan 2018 08:47:40
Message-Id: 1515487429.30f0bdf1d1c8422d31d8a5c68ee6d40568289d63.polynomial-c@gentoo
1 commit: 30f0bdf1d1c8422d31d8a5c68ee6d40568289d63
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 9 08:43:49 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 9 08:43:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f0bdf1
7
8 sys-apps/kmod: Synced live ebuild.
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-apps/kmod/kmod-9999.ebuild | 18 ++++++++++--------
13 1 file changed, 10 insertions(+), 8 deletions(-)
14
15 diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
16 index 3a82094b051..1ffba7ee85c 100644
17 --- a/sys-apps/kmod/kmod-9999.ebuild
18 +++ b/sys-apps/kmod/kmod-9999.ebuild
19 @@ -1,15 +1,15 @@
20 -# Copyright 1999-2017 Gentoo Foundation
21 +# Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=5
25 +EAPI=6
26
27 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
28
29 -inherit bash-completion-r1 eutils multilib python-r1
30 +inherit bash-completion-r1 ltprune multilib python-r1
31
32 if [[ ${PV} == 9999* ]]; then
33 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
34 - inherit autotools git-2
35 + inherit autotools git-r3
36 else
37 SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
38 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
39 @@ -55,6 +55,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
40 DOCS="NEWS README TODO"
41
42 src_prepare() {
43 + default
44 +
45 if [ ! -e configure ]; then
46 if use doc; then
47 gtkdocize --copy --docdir libkmod/docs || die
48 @@ -75,15 +77,15 @@ src_prepare() {
49 src_configure() {
50 local myeconfargs=(
51 --bindir="${EPREFIX}/bin"
52 - --with-rootlibdir="${EPREFIX}/$(get_libdir)"
53 --enable-shared
54 - $(use_enable static-libs static)
55 - $(use_enable tools)
56 + --with-bashcompletiondir="$(get_bashcompdir)"
57 + --with-rootlibdir="${EPREFIX}/$(get_libdir)"
58 $(use_enable debug)
59 $(use_enable doc gtk-doc)
60 + $(use_enable static-libs static)
61 + $(use_enable tools)
62 $(use_with lzma xz)
63 $(use_with zlib)
64 - --with-bashcompletiondir="$(get_bashcompdir)"
65 )
66
67 local ECONF_SOURCE="${S}"