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: Sat, 02 Mar 2019 17:35:15
Message-Id: 1551548105.e09747431e17f0b6457f01f54e9d7f73149d907b.polynomial-c@gentoo
1 commit: e09747431e17f0b6457f01f54e9d7f73149d907b
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 2 17:35:05 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 2 17:35:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0974743
7
8 sys-apps/kmod: Removed old.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/kmod/Manifest | 1 -
14 sys-apps/kmod/kmod-24.ebuild | 189 -------------------------------------------
15 2 files changed, 190 deletions(-)
16
17 diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
18 index 73f60c13354..b0cb0a1e990 100644
19 --- a/sys-apps/kmod/Manifest
20 +++ b/sys-apps/kmod/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
23 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
24 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
25
26 diff --git a/sys-apps/kmod/kmod-24.ebuild b/sys-apps/kmod/kmod-24.ebuild
27 deleted file mode 100644
28 index 0b52031780b..00000000000
29 --- a/sys-apps/kmod/kmod-24.ebuild
30 +++ /dev/null
31 @@ -1,189 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=5
36 -
37 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
38 -
39 -inherit bash-completion-r1 eutils multilib python-r1
40 -
41 -if [[ ${PV} == 9999* ]]; then
42 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
43 - inherit autotools git-r3
44 -else
45 - SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
46 - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
47 - inherit libtool
48 -fi
49 -
50 -DESCRIPTION="library and tools for managing linux kernel modules"
51 -HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
52 -
53 -LICENSE="LGPL-2"
54 -SLOT="0"
55 -IUSE="debug doc lzma python static-libs +tools zlib"
56 -
57 -# Upstream does not support running the test suite with custom configure flags.
58 -# I was also told that the test suite is intended for kmod developers.
59 -# So we have to restrict it.
60 -# See bug #408915.
61 -RESTRICT="test"
62 -
63 -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
64 -RDEPEND="!sys-apps/module-init-tools
65 - !sys-apps/modutils
66 - !<sys-apps/openrc-0.13.8
67 - !<sys-apps/systemd-216-r3
68 - lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
69 - python? ( ${PYTHON_DEPS} )
70 - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
71 -DEPEND="${RDEPEND}
72 - doc? ( dev-util/gtk-doc )
73 - lzma? ( virtual/pkgconfig )
74 - python? (
75 - dev-python/cython[${PYTHON_USEDEP}]
76 - virtual/pkgconfig
77 - )
78 - zlib? ( virtual/pkgconfig )"
79 -if [[ ${PV} == 9999* ]]; then
80 - DEPEND="${DEPEND}
81 - dev-libs/libxslt"
82 -fi
83 -
84 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
85 -
86 -DOCS="NEWS README TODO"
87 -
88 -src_prepare() {
89 - if [ ! -e configure ]; then
90 - if use doc; then
91 - gtkdocize --copy --docdir libkmod/docs || die
92 - else
93 - touch libkmod/docs/gtk-doc.make
94 - fi
95 - eautoreconf
96 - else
97 - elibtoolize
98 - fi
99 -
100 - # Restore possibility of running --enable-static wrt #472608
101 - sed -i \
102 - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
103 - configure || die
104 -}
105 -
106 -src_configure() {
107 - local myeconfargs=(
108 - --bindir="${EPREFIX}/bin"
109 - --with-rootlibdir="${EPREFIX}/$(get_libdir)"
110 - --enable-shared
111 - $(use_enable static-libs static)
112 - $(use_enable tools)
113 - $(use_enable debug)
114 - $(use_enable doc gtk-doc)
115 - $(use_with lzma xz)
116 - $(use_with zlib)
117 - --with-bashcompletiondir="$(get_bashcompdir)"
118 - )
119 -
120 - local ECONF_SOURCE="${S}"
121 -
122 - kmod_configure() {
123 - mkdir -p "${BUILD_DIR}" || die
124 - run_in_build_dir econf "${myeconfargs[@]}" "$@"
125 - }
126 -
127 - BUILD_DIR="${WORKDIR}/build"
128 - kmod_configure --disable-python
129 -
130 - if use python; then
131 - python_foreach_impl kmod_configure --enable-python
132 - fi
133 -}
134 -
135 -src_compile() {
136 - emake -C "${BUILD_DIR}"
137 -
138 - if use python; then
139 - local native_builddir=${BUILD_DIR}
140 -
141 - python_compile() {
142 - emake -C "${BUILD_DIR}" -f Makefile -f - python \
143 - VPATH="${native_builddir}:${S}" \
144 - native_builddir="${native_builddir}" \
145 - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
146 - <<< 'python: $(pkgpyexec_LTLIBRARIES)'
147 - }
148 -
149 - python_foreach_impl python_compile
150 - fi
151 -}
152 -
153 -src_install() {
154 - emake -C "${BUILD_DIR}" DESTDIR="${D}" install
155 - einstalldocs
156 -
157 - if use python; then
158 - local native_builddir=${BUILD_DIR}
159 -
160 - python_install() {
161 - emake -C "${BUILD_DIR}" DESTDIR="${D}" \
162 - VPATH="${native_builddir}:${S}" \
163 - install-pkgpyexecLTLIBRARIES \
164 - install-dist_pkgpyexecPYTHON
165 - }
166 -
167 - python_foreach_impl python_install
168 - fi
169 -
170 - prune_libtool_files --modules
171 -
172 - if use tools; then
173 - local bincmd sbincmd
174 - for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
175 - dosym ../bin/kmod /sbin/${sbincmd}
176 - done
177 -
178 - # These are also usable as normal user
179 - for bincmd in lsmod modinfo; do
180 - dosym kmod /bin/${bincmd}
181 - done
182 - fi
183 -
184 - cat <<-EOF > "${T}"/usb-load-ehci-first.conf
185 - softdep uhci_hcd pre: ehci_hcd
186 - softdep ohci_hcd pre: ehci_hcd
187 - EOF
188 -
189 - insinto /lib/modprobe.d
190 - doins "${T}"/usb-load-ehci-first.conf #260139
191 -
192 - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
193 -}
194 -
195 -pkg_postinst() {
196 - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
197 - ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
198 - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
199 - fi
200 -
201 - # Add kmod to the runlevel automatically if this is the first install of this package.
202 - if [[ -z ${REPLACING_VERSIONS} ]]; then
203 - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
204 - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
205 - fi
206 - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
207 - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
208 - fi
209 - fi
210 -
211 - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
212 - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
213 - ewarn
214 - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
215 - ewarn "kernel modules to have required static nodes!"
216 - ewarn "Run this command:"
217 - ewarn "\trc-update add kmod-static-nodes sysinit"
218 - fi
219 - fi
220 -}