Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/bluez: bluez-4.95-r3.ebuild ChangeLog bluez-4.95-r2.ebuild
Date: Thu, 28 Jul 2011 16:02:53
Message-Id: 20110728153324.AAEC52004B@flycatcher.gentoo.org
1 pva 11/07/28 15:33:24
2
3 Modified: ChangeLog
4 Added: bluez-4.95-r3.ebuild bluez-4.95-r2.ebuild
5 Log:
6 Fix high CPU usage, bug #376677.
7
8 (Portage version: 2.1.10.7/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.99 net-wireless/bluez/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/ChangeLog?rev=1.99&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/ChangeLog?rev=1.99&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/ChangeLog?r1=1.98&r2=1.99
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v
20 retrieving revision 1.98
21 retrieving revision 1.99
22 diff -u -r1.98 -r1.99
23 --- ChangeLog 17 Jul 2011 20:58:59 -0000 1.98
24 +++ ChangeLog 28 Jul 2011 15:33:24 -0000 1.99
25 @@ -1,6 +1,13 @@
26 # ChangeLog for net-wireless/bluez
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.98 2011/07/17 20:58:59 halcy0n Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.99 2011/07/28 15:33:24 pva Exp $
30 +
31 +*bluez-4.95-r3 (28 Jul 2011)
32 +*bluez-4.95-r2 (28 Jul 2011)
33 +
34 + 28 Jul 2011; Peter Volkov <pva@g.o> +bluez-4.95-r2.ebuild,
35 + +bluez-4.95-r3.ebuild, +files/bluez-4.95-high-cpu-usage.patch:
36 + Fix high CPU usage, bug #376677.
37
38 17 Jul 2011; Mark Loeser <halcy0n@g.o> bluez-4.93.ebuild:
39 Stable on ppc/ppc64; bug #370707
40
41
42
43 1.1 net-wireless/bluez/bluez-4.95-r3.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/bluez-4.95-r3.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/bluez-4.95-r3.ebuild?rev=1.1&content-type=text/plain
47
48 Index: bluez-4.95-r3.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.95-r3.ebuild,v 1.1 2011/07/28 15:33:24 pva Exp $
53
54 EAPI="4"
55
56 inherit multilib eutils systemd
57
58 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
59 HOMEPAGE="http://www.bluez.org/"
60
61 # Because of oui.txt changing from time to time without noticement, we need to supply it
62 # ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
63 # See bugs #345263 and #349473 for reference.
64 OUIDATE="20110708"
65 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
66 http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
67 LICENSE="GPL-2 LGPL-2.1"
68 SLOT="0"
69 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
70
71 IUSE="alsa caps +consolekit cups debug gstreamer maemo6 health old-daemons pcmcia pnat test-programs usb"
72
73 CDEPEND="
74 >=dev-libs/glib-2.14:2
75 sys-apps/dbus
76 >=sys-fs/udev-169
77 alsa? (
78 media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
79 media-libs/libsndfile
80 )
81 caps? ( >=sys-libs/libcap-ng-0.6.2 )
82 cups? ( net-print/cups )
83 gstreamer? (
84 >=media-libs/gstreamer-0.10:0.10
85 >=media-libs/gst-plugins-base-0.10:0.10
86 )
87 usb? ( dev-libs/libusb:1 )
88 "
89 DEPEND="${CDEPEND}
90 >=dev-util/pkgconfig-0.20
91 sys-devel/flex
92 "
93 RDEPEND="${CDEPEND}
94 !net-wireless/bluez-libs
95 !net-wireless/bluez-utils
96 consolekit? ( sys-auth/consolekit )
97 test-programs? (
98 dev-python/dbus-python
99 dev-python/pygobject:2
100 )
101 "
102
103 DOCS=( AUTHORS ChangeLog README )
104
105 pkg_setup() {
106 if ! use consolekit; then
107 enewgroup plugdev
108 fi
109 }
110
111 src_prepare() {
112 epatch "${FILESDIR}/${P}-high-cpu-usage.patch" #376677
113
114 if ! use consolekit; then
115 # No consolekit for at_console etc, so we grant plugdev the rights
116 epatch "${FILESDIR}/bluez-plugdev.patch"
117 fi
118
119 if use cups; then
120 sed -i \
121 -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
122 Makefile.tools Makefile.in || die
123 fi
124 }
125
126 src_configure() {
127 econf \
128 --enable-audio \
129 --enable-bccmd \
130 --enable-datafiles \
131 --enable-dfutool \
132 --enable-hid2hci \
133 --enable-input \
134 --enable-network \
135 --enable-serial \
136 --enable-service \
137 --enable-tools \
138 --disable-hal \
139 --localstatedir=/var \
140 --with-systemdunitdir="$(systemd_get_unitdir)" \
141 $(use_enable alsa) \
142 $(use_enable caps capng) \
143 $(use_enable cups) \
144 $(use_enable debug) \
145 $(use_enable gstreamer) \
146 $(use_enable health) \
147 $(use_enable maemo6) \
148 $(use_enable old-daemons dund) \
149 $(use_enable old-daemons hidd) \
150 $(use_enable old-daemons pand) \
151 $(use_enable pcmcia) \
152 $(use_enable pnat) \
153 $(use_enable test-programs test) \
154 $(use_enable usb)
155 }
156
157 src_install() {
158 default
159
160 if use test-programs ; then
161 cd "${S}/test"
162 dobin simple-agent simple-service monitor-bluetooth
163 newbin list-devices list-bluetooth-devices
164 rm test-textfile.{c,o} || die # bug #356529
165 for b in apitest hsmicro hsplay test-* ; do
166 newbin "${b}" "bluez-${b}"
167 done
168 insinto /usr/share/doc/${PF}/test-services
169 doins service-*
170
171 cd "${S}"
172 fi
173
174 if use old-daemons; then
175 newconfd "${FILESDIR}/conf.d-hidd" hidd
176 newinitd "${FILESDIR}/init.d-hidd" hidd
177 newconfd "${FILESDIR}/conf.d-dund" dund
178 newinitd "${FILESDIR}/init.d-dund" dund
179 fi
180
181 insinto /etc/bluetooth
182 doins \
183 input/input.conf \
184 audio/audio.conf \
185 network/network.conf \
186 serial/serial.conf
187
188 insinto /lib/udev/rules.d/
189 newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
190 exeinto /lib/udev/
191 newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh
192
193 newinitd "${FILESDIR}/bluetooth-init.d" bluetooth
194 newconfd "${FILESDIR}/bluetooth-conf.d" bluetooth
195
196 # Install oui.txt as requested in bug #283791 and approved by upstream
197 insinto /var/lib/misc
198 newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
199
200 find "${ED}" -name "*.la" -delete
201 }
202
203 pkg_postinst() {
204 udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
205
206 if ! has_version "net-dialup/ppp"; then
207 elog "To use dial up networking you must install net-dialup/ppp."
208 fi
209
210 if use old-daemons; then
211 elog "dund and hidd init scripts were installed because you have the old-daemons"
212 elog "use flag on. They are not started by default via udev so please add them"
213 elog "to the required runlevels using rc-update <runlevel> add <dund/hidd>. If"
214 elog "you need init scripts for the other daemons, please file requests"
215 elog "to https://bugs.gentoo.org."
216 fi
217
218 if use consolekit; then
219 elog "If you want to use rfcomm as a normal user, you need to add the user"
220 elog "to the uucp group."
221 else
222 elog "Since you have the consolekit use flag disabled, you will only be able to run"
223 elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
224 elog "a regular user, you need to enable the consolekit use flag for this package or"
225 elog "to add the user to the plugdev group."
226 fi
227 }
228
229
230
231 1.1 net-wireless/bluez/bluez-4.95-r2.ebuild
232
233 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/bluez-4.95-r2.ebuild?rev=1.1&view=markup
234 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/bluez-4.95-r2.ebuild?rev=1.1&content-type=text/plain
235
236 Index: bluez-4.95-r2.ebuild
237 ===================================================================
238 # Copyright 1999-2011 Gentoo Foundation
239 # Distributed under the terms of the GNU General Public License v2
240 # $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.95-r2.ebuild,v 1.1 2011/07/28 15:33:24 pva Exp $
241
242 EAPI="4"
243
244 inherit multilib eutils systemd
245
246 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
247 HOMEPAGE="http://www.bluez.org/"
248
249 # Because of oui.txt changing from time to time without noticement, we need to supply it
250 # ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
251 # See bugs #345263 and #349473 for reference.
252 OUIDATE="20110708"
253 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
254 http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
255 LICENSE="GPL-2 LGPL-2.1"
256 SLOT="0"
257 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
258
259 IUSE="alsa caps +consolekit cups debug gstreamer maemo6 health old-daemons pcmcia pnat test-programs usb"
260
261 CDEPEND="
262 >=dev-libs/glib-2.14:2
263 sys-apps/dbus
264 >=sys-fs/udev-146[extras]
265 alsa? (
266 media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
267 media-libs/libsndfile
268 )
269 caps? ( >=sys-libs/libcap-ng-0.6.2 )
270 cups? ( net-print/cups )
271 gstreamer? (
272 >=media-libs/gstreamer-0.10:0.10
273 >=media-libs/gst-plugins-base-0.10:0.10
274 )
275 usb? ( dev-libs/libusb:1 )
276 "
277 DEPEND="${CDEPEND}
278 >=dev-util/pkgconfig-0.20
279 sys-devel/flex
280 "
281 RDEPEND="${CDEPEND}
282 !net-wireless/bluez-libs
283 !net-wireless/bluez-utils
284 consolekit? ( sys-auth/consolekit )
285 test-programs? (
286 dev-python/dbus-python
287 dev-python/pygobject:2
288 )
289 "
290
291 DOCS=( AUTHORS ChangeLog README )
292
293 pkg_setup() {
294 if ! use consolekit; then
295 enewgroup plugdev
296 fi
297 }
298
299 src_prepare() {
300 epatch "${FILESDIR}/${P}-high-cpu-usage.patch" #376677
301
302 if ! use consolekit; then
303 # No consolekit for at_console etc, so we grant plugdev the rights
304 epatch "${FILESDIR}/bluez-plugdev.patch"
305 fi
306
307 if use cups; then
308 sed -i \
309 -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
310 Makefile.tools Makefile.in || die
311 fi
312 }
313
314 src_configure() {
315 econf \
316 --enable-audio \
317 --enable-bccmd \
318 --enable-datafiles \
319 --enable-dfutool \
320 --enable-input \
321 --enable-network \
322 --enable-serial \
323 --enable-service \
324 --enable-tools \
325 --disable-hal \
326 --localstatedir=/var \
327 --with-systemdunitdir="$(systemd_get_unitdir)" \
328 $(use_enable alsa) \
329 $(use_enable caps capng) \
330 $(use_enable cups) \
331 $(use_enable debug) \
332 $(use_enable gstreamer) \
333 $(use_enable health) \
334 $(use_enable maemo6) \
335 $(use_enable old-daemons dund) \
336 $(use_enable old-daemons hidd) \
337 $(use_enable old-daemons pand) \
338 $(use_enable pcmcia) \
339 $(use_enable pnat) \
340 $(use_enable test-programs test) \
341 $(use_enable usb)
342 }
343
344 src_install() {
345 default
346
347 if use test-programs ; then
348 cd "${S}/test"
349 dobin simple-agent simple-service monitor-bluetooth
350 newbin list-devices list-bluetooth-devices
351 rm test-textfile.{c,o} || die # bug #356529
352 for b in apitest hsmicro hsplay test-* ; do
353 newbin "${b}" "bluez-${b}"
354 done
355 insinto /usr/share/doc/${PF}/test-services
356 doins service-*
357
358 cd "${S}"
359 fi
360
361 if use old-daemons; then
362 newconfd "${FILESDIR}/conf.d-hidd" hidd
363 newinitd "${FILESDIR}/init.d-hidd" hidd
364 newconfd "${FILESDIR}/conf.d-dund" dund
365 newinitd "${FILESDIR}/init.d-dund" dund
366 fi
367
368 insinto /etc/bluetooth
369 doins \
370 input/input.conf \
371 audio/audio.conf \
372 network/network.conf \
373 serial/serial.conf
374
375 insinto /lib/udev/rules.d/
376 newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
377 exeinto /lib/udev/
378 newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh
379
380 newinitd "${FILESDIR}/bluetooth-init.d" bluetooth
381 newconfd "${FILESDIR}/bluetooth-conf.d" bluetooth
382
383 # Install oui.txt as requested in bug #283791 and approved by upstream
384 insinto /var/lib/misc
385 newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
386
387 find "${ED}" -name "*.la" -delete
388 }
389
390 pkg_postinst() {
391 udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
392
393 if ! has_version "net-dialup/ppp"; then
394 elog "To use dial up networking you must install net-dialup/ppp."
395 fi
396
397 if use old-daemons; then
398 elog "dund and hidd init scripts were installed because you have the old-daemons"
399 elog "use flag on. They are not started by default via udev so please add them"
400 elog "to the required runlevels using rc-update <runlevel> add <dund/hidd>. If"
401 elog "you need init scripts for the other daemons, please file requests"
402 elog "to https://bugs.gentoo.org."
403 fi
404
405 if use consolekit; then
406 elog "If you want to use rfcomm as a normal user, you need to add the user"
407 elog "to the uucp group."
408 else
409 elog "Since you have the consolekit use flag disabled, you will only be able to run"
410 elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
411 elog "a regular user, you need to enable the consolekit use flag for this package or"
412 elog "to add the user to the plugdev group."
413 fi
414 }
Report Message
Find on MARC Find on Google Groups