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, 19 Feb 2020 09:49:10
Message-Id: 1582105719.7f14a2d9d6f14424478b4f376478cb1a78097b53.polynomial-c@gentoo
1 commit: 7f14a2d9d6f14424478b4f376478cb1a78097b53
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 19 09:48:39 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 19 09:48:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f14a2d9
7
8 sys-apps/kmod: Synced live ebuild
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/kmod/kmod-9999.ebuild | 46 ++++++++++++++++++++++++------------------
14 1 file changed, 26 insertions(+), 20 deletions(-)
15
16 diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
17 index 1ba782da271..e0a5eee807d 100644
18 --- a/sys-apps/kmod/kmod-9999.ebuild
19 +++ b/sys-apps/kmod/kmod-9999.ebuild
20 @@ -1,19 +1,19 @@
21 # Copyright 1999-2020 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=6
25 +EAPI=7
26
27 -PYTHON_COMPAT=( python3_{6,7} )
28 +PYTHON_COMPAT=( python3_{6,7,8} )
29
30 -inherit bash-completion-r1 multilib python-r1
31 +inherit autotools 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 - inherit autotools git-r3
36 + inherit git-r3
37 else
38 SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
39 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
40 - inherit libtool
41 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
42 + #inherit libtool
43 fi
44
45 DESCRIPTION="library and tools for managing linux kernel modules"
46 @@ -41,14 +41,19 @@ RDEPEND="!sys-apps/module-init-tools
47 libressl? ( dev-libs/libressl:0= )
48 )
49 zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
50 -DEPEND="${RDEPEND}
51 - doc? ( dev-util/gtk-doc )
52 +DEPEND="${RDEPEND}"
53 +BDEPEND="
54 + doc? (
55 + dev-util/gtk-doc
56 + dev-util/gtk-doc-am
57 + )
58 lzma? ( virtual/pkgconfig )
59 python? (
60 dev-python/cython[${PYTHON_USEDEP}]
61 virtual/pkgconfig
62 )
63 - zlib? ( virtual/pkgconfig )"
64 + zlib? ( virtual/pkgconfig )
65 +"
66 if [[ ${PV} == 9999* ]]; then
67 DEPEND="${DEPEND}
68 dev-libs/libxslt"
69 @@ -61,8 +66,9 @@ DOCS="NEWS README TODO"
70 src_prepare() {
71 default
72
73 - if [[ ! -e configure ]] ; then
74 + if [[ ! -e configure ]] || use doc ; then
75 if use doc; then
76 + cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
77 gtkdocize --copy --docdir libkmod/docs || die
78 else
79 touch libkmod/docs/gtk-doc.make
80 @@ -85,7 +91,7 @@ src_configure() {
81 --with-bashcompletiondir="$(get_bashcompdir)"
82 --with-rootlibdir="${EPREFIX}/$(get_libdir)"
83 $(use_enable debug)
84 - $(use_enable doc gtk-doc)
85 + $(usex doc '--enable-gtk-doc' '')
86 $(use_enable static-libs static)
87 $(use_enable tools)
88 $(use_with lzma xz)
89 @@ -143,7 +149,7 @@ src_install() {
90 python_foreach_impl python_install
91 fi
92
93 - find "${ED}" -name "*.la" -delete || die
94 + find "${ED}" -type f -name "*.la" -delete || die
95
96 if use tools; then
97 local cmd
98 @@ -169,23 +175,23 @@ src_install() {
99 }
100
101 pkg_postinst() {
102 - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
103 + if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
104 ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
105 - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
106 + rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
107 fi
108
109 # Add kmod to the runlevel automatically if this is the first install of this package.
110 if [[ -z ${REPLACING_VERSIONS} ]]; then
111 - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
112 - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
113 + if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
114 + mkdir -p "${EROOT}"/etc/runlevels/sysinit
115 fi
116 - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
117 - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
118 + if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
119 + ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
120 fi
121 fi
122
123 - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
124 - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
125 + if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
126 + if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
127 ewarn
128 ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
129 ewarn "kernel modules to have required static nodes!"