Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/eudev: eudev-9999.ebuild eudev-1.7.ebuild ChangeLog
Date: Sun, 01 Jun 2014 18:29:29
Message-Id: 20140601182922.E80222004E@flycatcher.gentoo.org
1 blueness 14/06/01 18:29:22
2
3 Modified: eudev-9999.ebuild ChangeLog
4 Added: eudev-1.7.ebuild
5 Log:
6 Version bump to 1.7 = 213
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
9
10 Revision Changes Path
11 1.52 sys-fs/eudev/eudev-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?rev=1.52&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?rev=1.52&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?r1=1.51&r2=1.52
16
17 Index: eudev-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v
20 retrieving revision 1.51
21 retrieving revision 1.52
22 diff -u -r1.51 -r1.52
23 --- eudev-9999.ebuild 8 May 2014 11:47:16 -0000 1.51
24 +++ eudev-9999.ebuild 1 Jun 2014 18:29:22 -0000 1.52
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.51 2014/05/08 11:47:16 blueness Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.52 2014/06/01 18:29:22 blueness Exp $
30
31 EAPI="5"
32
33 @@ -37,11 +37,10 @@
34 )"
35 DEPEND="${COMMON_DEPEND}
36 keymap? ( dev-util/gperf )
37 - >=dev-util/intltool-0.40.0
38 virtual/os-headers
39 virtual/pkgconfig
40 - !<sys-devel/make-3.82-r4
41 - !<sys-kernel/linux-headers-${KV_min}
42 + >=sys-devel/make-3.82-r4
43 + >=sys-kernel/linux-headers-${KV_min}
44 doc? ( >=dev-util/gtk-doc-1.18 )
45 app-text/docbook-xml-dtd:4.2
46 app-text/docbook-xml-dtd:4.5
47 @@ -54,12 +53,11 @@
48 !<sys-fs/lvm2-2.02.103
49 !<sec-policy/selinux-base-2.20120725-r10
50 !sys-fs/udev
51 - !sys-apps/systemd
52 - !<sys-fs/udev-init-scripts-26"
53 + !sys-apps/systemd"
54
55 PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
56 keymap? ( >=sys-apps/hwids-20140304[udev] )
57 - openrc? ( >=sys-fs/udev-init-scripts-18 )"
58 + openrc? ( >=sys-fs/udev-init-scripts-26 )"
59
60 REQUIRED_USE="keymap? ( hwdb )"
61
62
63
64
65 1.112 sys-fs/eudev/ChangeLog
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?rev=1.112&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?rev=1.112&content-type=text/plain
69 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?r1=1.111&r2=1.112
70
71 Index: ChangeLog
72 ===================================================================
73 RCS file: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v
74 retrieving revision 1.111
75 retrieving revision 1.112
76 diff -u -r1.111 -r1.112
77 --- ChangeLog 26 May 2014 22:00:43 -0000 1.111
78 +++ ChangeLog 1 Jun 2014 18:29:22 -0000 1.112
79 @@ -1,6 +1,12 @@
80 # ChangeLog for sys-fs/eudev
81 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
82 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.111 2014/05/26 22:00:43 blueness Exp $
83 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.112 2014/06/01 18:29:22 blueness Exp $
84 +
85 +*eudev-1.7 (01 Jun 2014)
86 +
87 + 01 Jun 2014; Anthony G. Basile <blueness@g.o> +eudev-1.7.ebuild,
88 + eudev-9999.ebuild:
89 + Version bump to 1.7 = 213
90
91 26 May 2014; Anthony G. Basile <blueness@g.o> eudev-1.5.3-r1.ebuild:
92 Stable on ppc64, bug #506078
93
94
95
96 1.1 sys-fs/eudev/eudev-1.7.ebuild
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-1.7.ebuild?rev=1.1&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-1.7.ebuild?rev=1.1&content-type=text/plain
100
101 Index: eudev-1.7.ebuild
102 ===================================================================
103 # Copyright 1999-2014 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 # $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.7.ebuild,v 1.1 2014/06/01 18:29:22 blueness Exp $
106
107 EAPI="5"
108
109 KV_min=2.6.39
110
111 inherit autotools eutils multilib linux-info multilib-minimal
112
113 if [[ ${PV} = 9999* ]]; then
114 EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
115 inherit git-2
116 else
117 SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
118 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
119 fi
120
121 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
122 HOMEPAGE="https://github.com/gentoo/eudev"
123
124 LICENSE="LGPL-2.1 MIT GPL-2"
125 SLOT="0"
126 IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
127
128 COMMON_DEPEND=">=sys-apps/util-linux-2.20
129 gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
130 introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
131 kmod? ( >=sys-apps/kmod-16 )
132 selinux? ( >=sys-libs/libselinux-2.1.9 )
133 !<sys-libs/glibc-2.11
134 !sys-apps/gentoo-systemd-integration
135 !sys-apps/systemd
136 abi_x86_32? (
137 !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
138 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
139 )"
140 DEPEND="${COMMON_DEPEND}
141 keymap? ( dev-util/gperf )
142 virtual/os-headers
143 virtual/pkgconfig
144 >=sys-devel/make-3.82-r4
145 >=sys-kernel/linux-headers-${KV_min}
146 doc? ( >=dev-util/gtk-doc-1.18 )
147 app-text/docbook-xml-dtd:4.2
148 app-text/docbook-xml-dtd:4.5
149 app-text/docbook-xsl-stylesheets
150 dev-libs/libxslt
151 >=dev-util/intltool-0.50
152 test? ( app-text/tree dev-lang/perl )"
153
154 RDEPEND="${COMMON_DEPEND}
155 !<sys-fs/lvm2-2.02.103
156 !<sec-policy/selinux-base-2.20120725-r10
157 !sys-fs/udev
158 !sys-apps/systemd"
159
160 PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
161 keymap? ( >=sys-apps/hwids-20140304[udev] )
162 openrc? ( >=sys-fs/udev-init-scripts-26 )"
163
164 REQUIRED_USE="keymap? ( hwdb )"
165
166 # The multilib-build.eclass doesn't handle situation where the installed headers
167 # are different in ABIs. In this case, we install libgudev headers in native
168 # ABI but not for non-native ABI.
169 multilib_check_headers() { :; }
170
171 pkg_pretend() {
172 if ! use rule-generator; then
173 ewarn
174 ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
175 ewarn "as described in the URL below:"
176 ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
177 ewarn
178 ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
179 ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
180 ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
181 ewarn "exists:"
182 ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
183 ewarn
184 ewarn "We are working on a better solution for the next beta release."
185 ewarn
186 fi
187 }
188
189 pkg_setup() {
190 CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
191 linux-info_pkg_setup
192 get_running_version
193
194 # These are required kernel options, but we don't error out on them
195 # because you can build under one kernel and run under another.
196 if kernel_is lt ${KV_min//./ }; then
197 ewarn
198 ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
199 ewarn "Make sure to run udev under kernel version ${KV_min} or above."
200 ewarn
201 fi
202 }
203
204 src_prepare() {
205 # change rules back to group uucp instead of dialout for now
206 sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
207 || die "failed to change group dialout to uucp"
208
209 epatch_user
210
211 if [[ ! -e configure ]]; then
212 if use doc; then
213 gtkdocize --docdir docs || die "gtkdocize failed"
214 else
215 echo 'EXTRA_DIST =' > docs/gtk-doc.make
216 fi
217 eautoreconf
218 else
219 elibtoolize
220 fi
221 }
222
223 multilib_src_configure() {
224 tc-export CC #463846
225 export cc_cv_CFLAGS__flto=no #502950
226
227 # Keep sorted by ./configure --help and only pass --disable flags
228 # when *required* to avoid external deps or unnecessary compile
229 local econf_args
230 econf_args=(
231 ac_cv_search_cap_init=
232 ac_cv_header_sys_capability_h=yes
233 DBUS_CFLAGS=' '
234 DBUS_LIBS=' '
235 --with-rootprefix=
236 --docdir=/usr/share/doc/${PF}
237 --libdir=/usr/$(get_libdir)
238 --with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
239 --with-html-dir="/usr/share/doc/${PF}/html"
240 --enable-split-usr
241 --exec-prefix=/
242
243 $(use_enable gudev)
244 )
245
246 # Only build libudev for non-native_abi, and only install it to libdir,
247 # that means all options only apply to native_abi
248 if multilib_is_native_abi; then
249 econf_args+=(
250 --with-rootlibdir=/$(get_libdir)
251 $(use_enable doc gtk-doc)
252 $(use_enable introspection)
253 $(use_enable keymap)
254 $(use_enable kmod libkmod)
255 $(usex kmod --enable-modules $(use_enable modutils modules))
256 $(use_enable static-libs static)
257 $(use_enable selinux)
258 $(use_enable rule-generator)
259 )
260 else econf_args+=(
261 $(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
262 )
263 fi
264 ECONF_SOURCE="${S}" econf "${econf_args[@]}"
265 }
266
267 multilib_src_compile() {
268 if multilib_is_native_abi; then
269 emake
270 else
271 emake -C src/libudev
272 use gudev && emake -C src/gudev
273 fi
274 }
275
276 multilib_src_install() {
277 if multilib_is_native_abi; then
278 emake DESTDIR="${D}" install
279 else
280 emake -C src/libudev DESTDIR="${D}" install
281 use gudev && emake -C src/gudev DESTDIR="${D}" install
282 fi
283 }
284
285 multilib_src_test() {
286 # make sandbox get out of the way
287 # these are safe because there is a fake root filesystem put in place,
288 # but sandbox seems to evaluate the paths of the test i/o instead of the
289 # paths of the actual i/o that results.
290 # also only test for native abi
291 if multilib_is_native_abi; then
292 addread /sys
293 addwrite /dev
294 addwrite /run
295 default_src_test
296 fi
297 }
298
299 multilib_src_install_all() {
300 prune_libtool_files --all
301 rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
302
303 use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
304
305 # drop distributed hwdb files, they override sys-apps/hwids
306 rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
307
308 insinto /lib/udev/rules.d
309 doins "${FILESDIR}"/40-gentoo.rules
310 }
311
312 pkg_preinst() {
313 local htmldir
314 for htmldir in gudev libudev; do
315 if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
316 rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
317 fi
318 if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
319 dosym ../../doc/${PF}/html/${htmldir} \
320 /usr/share/gtk-doc/html/${htmldir}
321 fi
322 done
323 }
324
325 pkg_postinst() {
326 mkdir -p "${EROOT}"run
327
328 # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
329 # So try to remove it here (will only work if empty).
330 rmdir "${EROOT}"dev/loop 2>/dev/null
331 if [[ -d ${EROOT}dev/loop ]]; then
332 ewarn "Please make sure your remove /dev/loop,"
333 ewarn "else losetup may be confused when looking for unused devices."
334 fi
335
336 if use hwdb && has_version 'sys-apps/hwids[udev]'; then
337 udevadm hwdb --update --root="${ROOT%/}"
338
339 # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
340 # reload database after it has be rebuilt, but only if we are not upgrading
341 # also pass if we are -9999 since who knows what hwdb related changes there might be
342 if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
343 [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
344 udevadm control --reload
345 fi
346 fi
347
348 ewarn
349 ewarn "You need to restart eudev as soon as possible to make the"
350 ewarn "upgrade go into effect:"
351 ewarn "\t/etc/init.d/udev --nodeps restart"
352
353 if use rule-generator && use openrc && \
354 [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
355 ewarn
356 ewarn "Please add the udev-postmount init script to your default runlevel"
357 ewarn "to ensure the legacy rule-generator functionality works as reliably"
358 ewarn "as possible."
359 ewarn "\trc-update add udev-postmount default"
360 fi
361
362 elog
363 elog "For more information on eudev on Gentoo, writing udev rules, and"
364 elog "fixing known issues visit:"
365 elog " http://www.gentoo.org/doc/en/udev-guide.xml"
366 elog
367 }