Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/udev: udev-209.ebuild udev-9999.ebuild ChangeLog
Date: Mon, 24 Feb 2014 06:58:28
Message-Id: 20140224065818.F3AF32004C@flycatcher.gentoo.org
1 ssuominen 14/02/24 06:58:18
2
3 Modified: udev-209.ebuild udev-9999.ebuild ChangeLog
4 Log:
5 Stop installing udevd.8 since we don't install the legacy /sbin/udevd anymore and instead of creating a .so manpage link from systemd-udevd.service.8 to systemd-udevd.8, rename the file directly to systemd-udevd.8 since we don't install the systemd-udevd.service from sys-fs/udev.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
8
9 Revision Changes Path
10 1.4 sys-fs/udev/udev-209.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-209.ebuild?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-209.ebuild?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-209.ebuild?r1=1.3&r2=1.4
15
16 Index: udev-209.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-209.ebuild,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- udev-209.ebuild 21 Feb 2014 13:53:38 -0000 1.3
23 +++ udev-209.ebuild 24 Feb 2014 06:58:18 -0000 1.4
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-209.ebuild,v 1.3 2014/02/21 13:53:38 ssuominen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-209.ebuild,v 1.4 2014/02/24 06:58:18 ssuominen Exp $
29
30 EAPI=5
31
32 @@ -125,14 +125,6 @@
33 SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
34 EOF
35
36 - # Create link to systemd-udevd.8 here to avoid parallel build problem and
37 - # while at it, create convinience link to `man 8 udevd` even if upstream
38 - # doesn't do that anymore
39 - local man
40 - for man in udevd systemd-udevd; do
41 - echo '.so systemd-udevd.service.8' > "${T}"/${man}.8
42 - done
43 -
44 # Remove requirements for gettext and intltool wrt bug #443028
45 if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
46 sed -i \
47 @@ -381,10 +373,13 @@
48 "${D}"/lib/udev/rules.d/99-systemd.rules \
49 "${D}"/usr/share/doc/${PF}/{LICENSE.*,sd-shutdown.h}
50
51 - # see src_prepare() for content of these files
52 + # see src_prepare() for content of 40-gentoo.rules
53 insinto /lib/udev/rules.d
54 doins "${T}"/40-gentoo.rules
55 - doman "${T}"/{systemd-,}udevd.8
56 +
57 + # maintainer note: by not letting the upstream build-sys create the .so
58 + # link, you also avoid a parallel make problem
59 + mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
60 }
61
62 pkg_preinst() {
63
64
65
66 1.268 sys-fs/udev/udev-9999.ebuild
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.268&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.268&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.267&r2=1.268
71
72 Index: udev-9999.ebuild
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
75 retrieving revision 1.267
76 retrieving revision 1.268
77 diff -u -r1.267 -r1.268
78 --- udev-9999.ebuild 24 Feb 2014 05:58:09 -0000 1.267
79 +++ udev-9999.ebuild 24 Feb 2014 06:58:18 -0000 1.268
80 @@ -1,6 +1,6 @@
81 # Copyright 1999-2014 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.267 2014/02/24 05:58:09 ssuominen Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.268 2014/02/24 06:58:18 ssuominen Exp $
85
86 EAPI=5
87
88 @@ -124,14 +124,6 @@
89 SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
90 EOF
91
92 - # Create link to systemd-udevd.8 here to avoid parallel build problem and
93 - # while at it, create convinience link to `man 8 udevd` even if upstream
94 - # doesn't do that anymore
95 - local man
96 - for man in udevd systemd-udevd; do
97 - echo '.so systemd-udevd.service.8' > "${T}"/${man}.8
98 - done
99 -
100 # Remove requirements for gettext and intltool wrt bug #443028
101 if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
102 sed -i \
103 @@ -379,10 +371,13 @@
104 "${D}"/lib/udev/rules.d/99-systemd.rules \
105 "${D}"/usr/share/doc/${PF}/{LICENSE.*,sd-shutdown.h}
106
107 - # see src_prepare() for content of these files
108 + # see src_prepare() for content of 40-gentoo.rules
109 insinto /lib/udev/rules.d
110 doins "${T}"/40-gentoo.rules
111 - doman "${T}"/{systemd-,}udevd.8
112 +
113 + # maintainer note: by not letting the upstream build-sys create the .so
114 + # link, you also avoid a parallel make problem
115 + mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
116 }
117
118 pkg_preinst() {
119
120
121
122 1.992 sys-fs/udev/ChangeLog
123
124 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.992&view=markup
125 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.992&content-type=text/plain
126 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.991&r2=1.992
127
128 Index: ChangeLog
129 ===================================================================
130 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
131 retrieving revision 1.991
132 retrieving revision 1.992
133 diff -u -r1.991 -r1.992
134 --- ChangeLog 24 Feb 2014 05:58:09 -0000 1.991
135 +++ ChangeLog 24 Feb 2014 06:58:18 -0000 1.992
136 @@ -1,6 +1,13 @@
137 # ChangeLog for sys-fs/udev
138 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
139 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.991 2014/02/24 05:58:09 ssuominen Exp $
140 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.992 2014/02/24 06:58:18 ssuominen Exp $
141 +
142 + 24 Feb 2014; Samuli Suominen <ssuominen@g.o> udev-209.ebuild,
143 + udev-9999.ebuild:
144 + Stop installing udevd.8 since we don't install the legacy /sbin/udevd anymore
145 + and instead of creating a .so manpage link from systemd-udevd.service.8 to
146 + systemd-udevd.8, rename the file directly to systemd-udevd.8 since we don't
147 + install the systemd-udevd.service from sys-fs/udev.
148
149 24 Feb 2014; Samuli Suominen <ssuominen@g.o> udev-9999.ebuild:
150 Upstream uses --rootprefix= now for networkdir= so stop overriding it.