Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
Date: Thu, 05 Mar 2020 16:00:27
Message-Id: 1583424000.7293bf944137112097f78ac0866ff11f71325f79.floppym@gentoo
1 commit: 7293bf944137112097f78ac0866ff11f71325f79
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 5 15:59:44 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 5 16:00:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7293bf94
7
8 sys-apps/kmod: remove old
9
10 Package-Manager: Portage-2.3.91_p5, Repoman-2.3.20_p113
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 sys-apps/kmod/Manifest | 1 -
14 sys-apps/kmod/kmod-25.ebuild | 191 -------------------------------------------
15 2 files changed, 192 deletions(-)
16
17 diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
18 index c32d51e4790..d62d2b683b0 100644
19 --- a/sys-apps/kmod/Manifest
20 +++ b/sys-apps/kmod/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
23 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
24 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
25
26 diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild
27 deleted file mode 100644
28 index ca101dc3423..00000000000
29 --- a/sys-apps/kmod/kmod-25.ebuild
30 +++ /dev/null
31 @@ -1,191 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -PYTHON_COMPAT=( python3_6 )
38 -
39 -inherit bash-completion-r1 ltprune 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="https://www.kernel.org/pub/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 - default
90 -
91 - if [ ! -e configure ]; then
92 - if use doc; then
93 - gtkdocize --copy --docdir libkmod/docs || die
94 - else
95 - touch libkmod/docs/gtk-doc.make
96 - fi
97 - eautoreconf
98 - else
99 - elibtoolize
100 - fi
101 -
102 - # Restore possibility of running --enable-static wrt #472608
103 - sed -i \
104 - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
105 - configure || die
106 -}
107 -
108 -src_configure() {
109 - local myeconfargs=(
110 - --bindir="${EPREFIX}/bin"
111 - --enable-shared
112 - --with-bashcompletiondir="$(get_bashcompdir)"
113 - --with-rootlibdir="${EPREFIX}/$(get_libdir)"
114 - $(use_enable debug)
115 - $(use_enable doc gtk-doc)
116 - $(use_enable static-libs static)
117 - $(use_enable tools)
118 - $(use_with lzma xz)
119 - $(use_with zlib)
120 - )
121 -
122 - local ECONF_SOURCE="${S}"
123 -
124 - kmod_configure() {
125 - mkdir -p "${BUILD_DIR}" || die
126 - run_in_build_dir econf "${myeconfargs[@]}" "$@"
127 - }
128 -
129 - BUILD_DIR="${WORKDIR}/build"
130 - kmod_configure --disable-python
131 -
132 - if use python; then
133 - python_foreach_impl kmod_configure --enable-python
134 - fi
135 -}
136 -
137 -src_compile() {
138 - emake -C "${BUILD_DIR}"
139 -
140 - if use python; then
141 - local native_builddir=${BUILD_DIR}
142 -
143 - python_compile() {
144 - emake -C "${BUILD_DIR}" -f Makefile -f - python \
145 - VPATH="${native_builddir}:${S}" \
146 - native_builddir="${native_builddir}" \
147 - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
148 - <<< 'python: $(pkgpyexec_LTLIBRARIES)'
149 - }
150 -
151 - python_foreach_impl python_compile
152 - fi
153 -}
154 -
155 -src_install() {
156 - emake -C "${BUILD_DIR}" DESTDIR="${D}" install
157 - einstalldocs
158 -
159 - if use python; then
160 - local native_builddir=${BUILD_DIR}
161 -
162 - python_install() {
163 - emake -C "${BUILD_DIR}" DESTDIR="${D}" \
164 - VPATH="${native_builddir}:${S}" \
165 - install-pkgpyexecLTLIBRARIES \
166 - install-dist_pkgpyexecPYTHON
167 - }
168 -
169 - python_foreach_impl python_install
170 - fi
171 -
172 - prune_libtool_files --modules
173 -
174 - if use tools; then
175 - local bincmd sbincmd
176 - for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
177 - dosym ../bin/kmod /sbin/${sbincmd}
178 - done
179 -
180 - # These are also usable as normal user
181 - for bincmd in lsmod modinfo; do
182 - dosym kmod /bin/${bincmd}
183 - done
184 - fi
185 -
186 - cat <<-EOF > "${T}"/usb-load-ehci-first.conf
187 - softdep uhci_hcd pre: ehci_hcd
188 - softdep ohci_hcd pre: ehci_hcd
189 - EOF
190 -
191 - insinto /lib/modprobe.d
192 - doins "${T}"/usb-load-ehci-first.conf #260139
193 -
194 - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
195 -}
196 -
197 -pkg_postinst() {
198 - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
199 - ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
200 - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
201 - fi
202 -
203 - # Add kmod to the runlevel automatically if this is the first install of this package.
204 - if [[ -z ${REPLACING_VERSIONS} ]]; then
205 - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
206 - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
207 - fi
208 - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
209 - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
210 - fi
211 - fi
212 -
213 - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
214 - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
215 - ewarn
216 - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
217 - ewarn "kernel modules to have required static nodes!"
218 - ewarn "Run this command:"
219 - ewarn "\trc-update add kmod-static-nodes sysinit"
220 - fi
221 - fi
222 -}