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