Gentoo Archives: gentoo-commits

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