1 |
commit: f66ab1b3d4ec80a8fdaed2b5cc91f5d870448d12 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 29 12:21:08 2019 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 29 12:21:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66ab1b3 |
7 |
|
8 |
net-wireless/bluez: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
|
13 |
net-wireless/bluez/Manifest | 1 - |
14 |
net-wireless/bluez/bluez-5.49-r1.ebuild | 263 -------------------- |
15 |
net-wireless/bluez/bluez-5.50-r1.ebuild | 265 --------------------- |
16 |
.../bluez/files/bluez-5.49-crash-non-LE.patch | 51 ---- |
17 |
4 files changed, 580 deletions(-) |
18 |
|
19 |
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest |
20 |
index 4bc18c8a6b1..0574b3c3473 100644 |
21 |
--- a/net-wireless/bluez/Manifest |
22 |
+++ b/net-wireless/bluez/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d |
25 |
DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45 |
26 |
|
27 |
diff --git a/net-wireless/bluez/bluez-5.49-r1.ebuild b/net-wireless/bluez/bluez-5.49-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 26cea7716cd..00000000000 |
30 |
--- a/net-wireless/bluez/bluez-5.49-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,263 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
-PYTHON_COMPAT=( python2_7 ) |
38 |
- |
39 |
-inherit autotools multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal |
40 |
- |
41 |
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux" |
42 |
-HOMEPAGE="http://www.bluez.org" |
43 |
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz" |
44 |
- |
45 |
-LICENSE="GPL-2+ LGPL-2.1+" |
46 |
-SLOT="0/3" |
47 |
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86" |
48 |
-IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session" |
49 |
- |
50 |
-# Since this release all remaining extra-tools need readline support, but this could |
51 |
-# change in the future, hence, this REQUIRED_USE constraint could be dropped |
52 |
-# again in the future. |
53 |
-REQUIRED_USE=" |
54 |
- extra-tools? ( deprecated readline ) |
55 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
56 |
- test-programs? ( ${PYTHON_REQUIRED_USE} ) |
57 |
- user-session? ( systemd ) |
58 |
-" |
59 |
- |
60 |
-CDEPEND=" |
61 |
- >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] |
62 |
- >=sys-apps/dbus-1.6:=[user-session=] |
63 |
- >=sys-apps/hwids-20121202.2 |
64 |
- alsa? ( media-libs/alsa-lib ) |
65 |
- cups? ( net-print/cups:= ) |
66 |
- mesh? ( |
67 |
- dev-libs/json-c:= |
68 |
- sys-libs/readline:0= ) |
69 |
- obex? ( dev-libs/libical:= ) |
70 |
- readline? ( sys-libs/readline:0= ) |
71 |
- systemd? ( sys-apps/systemd ) |
72 |
- udev? ( >=virtual/udev-172 ) |
73 |
-" |
74 |
-TEST_DEPS="${PYTHON_DEPS} |
75 |
- >=dev-python/dbus-python-1[${PYTHON_USEDEP}] |
76 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
77 |
-" |
78 |
- |
79 |
-DEPEND="${CDEPEND} |
80 |
- virtual/pkgconfig |
81 |
- test? ( ${TEST_DEPS} ) |
82 |
-" |
83 |
-RDEPEND="${CDEPEND} |
84 |
- selinux? ( sec-policy/selinux-bluetooth ) |
85 |
- test-programs? ( ${TEST_DEPS} ) |
86 |
-" |
87 |
-DOC_CONTENTS=" |
88 |
- If you want to control your bluetooth devices as a non-root user, |
89 |
- please remember to add you to plugdev group. |
90 |
-" |
91 |
- |
92 |
-PATCHES=( |
93 |
- # Use static group "plugdev" to not force people to become root for |
94 |
- # controlling the devices. |
95 |
- "${FILESDIR}"/${PN}-plugdev.patch |
96 |
- |
97 |
- # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) |
98 |
- # http://www.spinics.net/lists/linux-bluetooth/msg58739.html |
99 |
- "${FILESDIR}"/${PN}-udevadm-path.patch |
100 |
- |
101 |
- # build: Quote systemd variable names, bug #527432 |
102 |
- # http://article.gmane.org/gmane.linux.bluez.kernel/67230 |
103 |
- "${FILESDIR}"/${PN}-5.39-systemd-quote.patch |
104 |
- |
105 |
- # Fedora patches |
106 |
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html |
107 |
- "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch |
108 |
- |
109 |
- # ??? |
110 |
- "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch |
111 |
- |
112 |
- # https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=2c3bba7b38be03834162e34069156f1fd49f0528 |
113 |
- # Fixed in next version |
114 |
- "${FILESDIR}"/${P}-crash-non-LE.patch |
115 |
-) |
116 |
- |
117 |
-pkg_setup() { |
118 |
- enewgroup plugdev |
119 |
- |
120 |
- if use test || use test-programs; then |
121 |
- python-single-r1_pkg_setup |
122 |
- fi |
123 |
- |
124 |
- if ! use udev; then |
125 |
- ewarn |
126 |
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" |
127 |
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," |
128 |
- ewarn "and hid2hci will not be available." |
129 |
- ewarn |
130 |
- fi |
131 |
-} |
132 |
- |
133 |
-src_prepare() { |
134 |
- default |
135 |
- |
136 |
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html |
137 |
- ! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch |
138 |
- |
139 |
- if use cups; then |
140 |
- sed -i \ |
141 |
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ |
142 |
- Makefile.{in,tools} || die |
143 |
- fi |
144 |
- |
145 |
- # Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621 |
146 |
- sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die |
147 |
- |
148 |
- eautoreconf |
149 |
- |
150 |
- multilib_copy_sources |
151 |
-} |
152 |
- |
153 |
-multilib_src_configure() { |
154 |
- local myconf=( |
155 |
- # readline is automagic when client is enabled |
156 |
- # --enable-client always needs readline, bug #504038 |
157 |
- # --enable-mesh is handled in the same way |
158 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline) |
159 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) |
160 |
- ) |
161 |
- |
162 |
- if ! multilib_is_native_abi; then |
163 |
- myconf+=( |
164 |
- # deps not used for the library |
165 |
- {DBUS,GLIB}_{CFLAGS,LIBS}=' ' |
166 |
- ) |
167 |
- fi |
168 |
- |
169 |
- # btpclient disabled because we don't have ell library in the tree |
170 |
- econf \ |
171 |
- --localstatedir=/var \ |
172 |
- --disable-android \ |
173 |
- --disable-btpclient \ |
174 |
- --enable-datafiles \ |
175 |
- --enable-experimental \ |
176 |
- --enable-optimization \ |
177 |
- $(use_enable debug) \ |
178 |
- --enable-pie \ |
179 |
- --enable-threads \ |
180 |
- --enable-library \ |
181 |
- --enable-tools \ |
182 |
- --enable-manpages \ |
183 |
- --enable-monitor \ |
184 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
185 |
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \ |
186 |
- $(multilib_native_use_enable alsa midi) \ |
187 |
- $(multilib_native_use_enable cups) \ |
188 |
- $(multilib_native_use_enable deprecated) \ |
189 |
- $(multilib_native_use_enable experimental) \ |
190 |
- $(multilib_native_use_enable mesh) \ |
191 |
- $(multilib_native_use_enable obex) \ |
192 |
- $(multilib_native_use_enable readline client) \ |
193 |
- $(multilib_native_use_enable systemd) \ |
194 |
- $(multilib_native_use_enable test-programs test) \ |
195 |
- $(multilib_native_use_enable udev) \ |
196 |
- $(multilib_native_use_enable udev sixaxis) |
197 |
-} |
198 |
- |
199 |
-multilib_src_compile() { |
200 |
- if multilib_is_native_abi; then |
201 |
- default |
202 |
- else |
203 |
- emake -f Makefile -f - libs \ |
204 |
- <<<'libs: $(lib_LTLIBRARIES)' |
205 |
- fi |
206 |
-} |
207 |
- |
208 |
-multilib_src_test() { |
209 |
- multilib_is_native_abi && default |
210 |
-} |
211 |
- |
212 |
-multilib_src_install() { |
213 |
- if multilib_is_native_abi; then |
214 |
- emake DESTDIR="${D}" install |
215 |
- |
216 |
- # Only install extra-tools when relevant USE flag is enabled |
217 |
- if use extra-tools; then |
218 |
- ewarn "Upstream doesn't support using this tools and their bugs are" |
219 |
- ewarn "likely to be ignored forever, also that tools can break" |
220 |
- ewarn "without previous announcement." |
221 |
- ewarn "Upstream also states all this tools are not really needed," |
222 |
- ewarn "then, if you still need to rely on them, you must ask them" |
223 |
- ewarn "to either install that tool by default or add the needed" |
224 |
- ewarn "functionality to the existing 'official' tools." |
225 |
- ewarn "Please report this issues to:" |
226 |
- ewarn "http://www.bluez.org/development/lists/" |
227 |
- |
228 |
- # Upstream doesn't install this, bug #524640 |
229 |
- # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 |
230 |
- # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 |
231 |
- # gatttool is only built with readline, bug #530776 |
232 |
- dobin attrib/gatttool |
233 |
- dobin tools/btmgmt |
234 |
- fi |
235 |
- |
236 |
- # Unittests are not that useful once installed, so make them optional |
237 |
- if use test-programs; then |
238 |
- # example-gatt-client is the only one needing |
239 |
- # python3, the others are python2 only. Remove |
240 |
- # until we see how to pull in python2 and python3 |
241 |
- # for runtime |
242 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die |
243 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die |
244 |
- python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test |
245 |
- for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do |
246 |
- dosym "${i}" /usr/bin/bluez-"${i##*/}" |
247 |
- done |
248 |
- fi |
249 |
- else |
250 |
- emake DESTDIR="${D}" \ |
251 |
- install-includeHEADERS \ |
252 |
- install-libLTLIBRARIES \ |
253 |
- install-pkgconfigDATA |
254 |
- fi |
255 |
-} |
256 |
- |
257 |
-multilib_src_install_all() { |
258 |
- # We need to ensure obexd can be spawned automatically by systemd |
259 |
- # when user-session is enabled: |
260 |
- # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 |
261 |
- # https://bugs.gentoo.org/show_bug.cgi?id=577842 |
262 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 |
263 |
- # https://bugs.archlinux.org/task/45816 |
264 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 |
265 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 |
266 |
- use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service |
267 |
- |
268 |
- find "${D}" -name '*.la' -delete || die |
269 |
- |
270 |
- keepdir /var/lib/bluetooth |
271 |
- |
272 |
- # Upstream don't want people to play with them |
273 |
- # But we keep installing them due to 'historical' reasons |
274 |
- insinto /etc/bluetooth |
275 |
- local d |
276 |
- for d in input network; do |
277 |
- doins profiles/${d}/${d}.conf |
278 |
- done |
279 |
- doins src/main.conf |
280 |
- |
281 |
- newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth |
282 |
- |
283 |
- einstalldocs |
284 |
- use doc && dodoc doc/*.txt |
285 |
- ! use systemd && readme.gentoo_create_doc |
286 |
-} |
287 |
- |
288 |
-pkg_postinst() { |
289 |
- ! use systemd && readme.gentoo_print_elog |
290 |
- |
291 |
- use udev && udev_reload |
292 |
- systemd_reenable bluetooth.service |
293 |
- |
294 |
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp." |
295 |
-} |
296 |
|
297 |
diff --git a/net-wireless/bluez/bluez-5.50-r1.ebuild b/net-wireless/bluez/bluez-5.50-r1.ebuild |
298 |
deleted file mode 100644 |
299 |
index 58a9288c74d..00000000000 |
300 |
--- a/net-wireless/bluez/bluez-5.50-r1.ebuild |
301 |
+++ /dev/null |
302 |
@@ -1,265 +0,0 @@ |
303 |
-# Copyright 1999-2019 Gentoo Authors |
304 |
-# Distributed under the terms of the GNU General Public License v2 |
305 |
- |
306 |
-EAPI=6 |
307 |
-PYTHON_COMPAT=( python2_7 ) |
308 |
- |
309 |
-inherit autotools multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal |
310 |
- |
311 |
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux" |
312 |
-HOMEPAGE="http://www.bluez.org" |
313 |
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz" |
314 |
- |
315 |
-LICENSE="GPL-2+ LGPL-2.1+" |
316 |
-SLOT="0/3" |
317 |
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86" |
318 |
-IUSE="alsa btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session" |
319 |
- |
320 |
-# Since this release all remaining extra-tools need readline support, but this could |
321 |
-# change in the future, hence, this REQUIRED_USE constraint could be dropped |
322 |
-# again in the future. |
323 |
-REQUIRED_USE=" |
324 |
- extra-tools? ( deprecated readline ) |
325 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
326 |
- test-programs? ( ${PYTHON_REQUIRED_USE} ) |
327 |
- user-session? ( systemd ) |
328 |
-" |
329 |
- |
330 |
-CDEPEND=" |
331 |
- >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] |
332 |
- >=sys-apps/dbus-1.6:=[user-session=] |
333 |
- >=sys-apps/hwids-20121202.2 |
334 |
- alsa? ( media-libs/alsa-lib ) |
335 |
- btpclient? ( >=dev-libs/ell-0.3 ) |
336 |
- cups? ( net-print/cups:= ) |
337 |
- mesh? ( |
338 |
- >=dev-libs/ell-0.3 |
339 |
- dev-libs/json-c:= |
340 |
- sys-libs/readline:0= ) |
341 |
- obex? ( dev-libs/libical:= ) |
342 |
- readline? ( sys-libs/readline:0= ) |
343 |
- systemd? ( sys-apps/systemd ) |
344 |
- udev? ( >=virtual/udev-172 ) |
345 |
-" |
346 |
-TEST_DEPS="${PYTHON_DEPS} |
347 |
- >=dev-python/dbus-python-1[${PYTHON_USEDEP}] |
348 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
349 |
-" |
350 |
- |
351 |
-DEPEND="${CDEPEND} |
352 |
- virtual/pkgconfig |
353 |
- test? ( ${TEST_DEPS} ) |
354 |
-" |
355 |
-RDEPEND="${CDEPEND} |
356 |
- selinux? ( sec-policy/selinux-bluetooth ) |
357 |
- test-programs? ( ${TEST_DEPS} ) |
358 |
-" |
359 |
-DOC_CONTENTS=" |
360 |
- If you want to control your bluetooth devices as a non-root user, |
361 |
- please remember to add you to plugdev group. |
362 |
-" |
363 |
- |
364 |
-PATCHES=( |
365 |
- # Fix missing header (fixed in 'master') |
366 |
- "${FILESDIR}"/${P}-btpclient-header.patch |
367 |
- |
368 |
- # Use static group "plugdev" to not force people to become root for |
369 |
- # controlling the devices. |
370 |
- "${FILESDIR}"/${PN}-plugdev.patch |
371 |
- |
372 |
- # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) |
373 |
- # http://www.spinics.net/lists/linux-bluetooth/msg58739.html |
374 |
- "${FILESDIR}"/${PN}-udevadm-path.patch |
375 |
- |
376 |
- # build: Quote systemd variable names, bug #527432 |
377 |
- # http://article.gmane.org/gmane.linux.bluez.kernel/67230 |
378 |
- "${FILESDIR}"/${PN}-5.39-systemd-quote.patch |
379 |
- |
380 |
- # Fedora patches |
381 |
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html |
382 |
- "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch |
383 |
- |
384 |
- # ??? |
385 |
- "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch |
386 |
-) |
387 |
- |
388 |
-pkg_setup() { |
389 |
- enewgroup plugdev |
390 |
- |
391 |
- if use test || use test-programs; then |
392 |
- python-single-r1_pkg_setup |
393 |
- fi |
394 |
- |
395 |
- if ! use udev; then |
396 |
- ewarn |
397 |
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" |
398 |
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," |
399 |
- ewarn "and hid2hci will not be available." |
400 |
- ewarn |
401 |
- fi |
402 |
-} |
403 |
- |
404 |
-src_prepare() { |
405 |
- default |
406 |
- |
407 |
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html |
408 |
- ! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch |
409 |
- |
410 |
- if use cups; then |
411 |
- sed -i \ |
412 |
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ |
413 |
- Makefile.{in,tools} || die |
414 |
- fi |
415 |
- |
416 |
- # Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621 |
417 |
- sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die |
418 |
- |
419 |
- eautoreconf |
420 |
- |
421 |
- multilib_copy_sources |
422 |
-} |
423 |
- |
424 |
-multilib_src_configure() { |
425 |
- local myconf=( |
426 |
- # readline is automagic when client is enabled |
427 |
- # --enable-client always needs readline, bug #504038 |
428 |
- # --enable-mesh is handled in the same way |
429 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline) |
430 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) |
431 |
- ) |
432 |
- |
433 |
- if ! multilib_is_native_abi; then |
434 |
- myconf+=( |
435 |
- # deps not used for the library |
436 |
- {DBUS,GLIB}_{CFLAGS,LIBS}=' ' |
437 |
- ) |
438 |
- fi |
439 |
- |
440 |
- econf \ |
441 |
- --localstatedir=/var \ |
442 |
- --disable-android \ |
443 |
- --enable-datafiles \ |
444 |
- --enable-optimization \ |
445 |
- $(use_enable debug) \ |
446 |
- --enable-pie \ |
447 |
- --enable-threads \ |
448 |
- --enable-library \ |
449 |
- --enable-tools \ |
450 |
- --enable-manpages \ |
451 |
- --enable-monitor \ |
452 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
453 |
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \ |
454 |
- $(multilib_native_use_enable alsa midi) \ |
455 |
- $(multilib_native_use_enable btpclient) \ |
456 |
- $(multilib_native_use_enable cups) \ |
457 |
- $(multilib_native_use_enable deprecated) \ |
458 |
- $(multilib_native_use_enable experimental) \ |
459 |
- $(multilib_native_use_enable mesh) \ |
460 |
- $(multilib_native_use_enable obex) \ |
461 |
- $(multilib_native_use_enable readline client) \ |
462 |
- $(multilib_native_use_enable systemd) \ |
463 |
- $(multilib_native_use_enable test-programs test) \ |
464 |
- $(multilib_native_use_enable udev) \ |
465 |
- $(multilib_native_use_enable udev sixaxis) |
466 |
-} |
467 |
- |
468 |
-multilib_src_compile() { |
469 |
- if multilib_is_native_abi; then |
470 |
- default |
471 |
- else |
472 |
- emake -f Makefile -f - libs \ |
473 |
- <<<'libs: $(lib_LTLIBRARIES)' |
474 |
- fi |
475 |
-} |
476 |
- |
477 |
-multilib_src_test() { |
478 |
- multilib_is_native_abi && default |
479 |
-} |
480 |
- |
481 |
-multilib_src_install() { |
482 |
- if multilib_is_native_abi; then |
483 |
- emake DESTDIR="${D}" install |
484 |
- |
485 |
- # Only install extra-tools when relevant USE flag is enabled |
486 |
- if use extra-tools; then |
487 |
- ewarn "Upstream doesn't support using this tools and their bugs are" |
488 |
- ewarn "likely to be ignored forever, also that tools can break" |
489 |
- ewarn "without previous announcement." |
490 |
- ewarn "Upstream also states all this tools are not really needed," |
491 |
- ewarn "then, if you still need to rely on them, you must ask them" |
492 |
- ewarn "to either install that tool by default or add the needed" |
493 |
- ewarn "functionality to the existing 'official' tools." |
494 |
- ewarn "Please report this issues to:" |
495 |
- ewarn "http://www.bluez.org/development/lists/" |
496 |
- |
497 |
- # Upstream doesn't install this, bug #524640 |
498 |
- # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 |
499 |
- # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 |
500 |
- # gatttool is only built with readline, bug #530776 |
501 |
- dobin attrib/gatttool |
502 |
- dobin tools/btmgmt |
503 |
- fi |
504 |
- |
505 |
- # Not installed by default after being built, bug #666756 |
506 |
- use btpclient && dobin tools/btpclient |
507 |
- |
508 |
- # Unittests are not that useful once installed, so make them optional |
509 |
- if use test-programs; then |
510 |
- # example-gatt-client is the only one needing |
511 |
- # python3, the others are python2 only. Remove |
512 |
- # until we see how to pull in python2 and python3 |
513 |
- # for runtime |
514 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die |
515 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die |
516 |
- python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test |
517 |
- for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do |
518 |
- dosym "${i}" /usr/bin/bluez-"${i##*/}" |
519 |
- done |
520 |
- fi |
521 |
- else |
522 |
- emake DESTDIR="${D}" \ |
523 |
- install-includeHEADERS \ |
524 |
- install-libLTLIBRARIES \ |
525 |
- install-pkgconfigDATA |
526 |
- fi |
527 |
-} |
528 |
- |
529 |
-multilib_src_install_all() { |
530 |
- # We need to ensure obexd can be spawned automatically by systemd |
531 |
- # when user-session is enabled: |
532 |
- # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 |
533 |
- # https://bugs.gentoo.org/show_bug.cgi?id=577842 |
534 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 |
535 |
- # https://bugs.archlinux.org/task/45816 |
536 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 |
537 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 |
538 |
- use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service |
539 |
- |
540 |
- find "${D}" -name '*.la' -delete || die |
541 |
- |
542 |
- keepdir /var/lib/bluetooth |
543 |
- |
544 |
- # Upstream don't want people to play with them |
545 |
- # But we keep installing them due to 'historical' reasons |
546 |
- insinto /etc/bluetooth |
547 |
- local d |
548 |
- for d in input network; do |
549 |
- doins profiles/${d}/${d}.conf |
550 |
- done |
551 |
- doins src/main.conf |
552 |
- |
553 |
- newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth |
554 |
- |
555 |
- einstalldocs |
556 |
- use doc && dodoc doc/*.txt |
557 |
- ! use systemd && readme.gentoo_create_doc |
558 |
-} |
559 |
- |
560 |
-pkg_postinst() { |
561 |
- ! use systemd && readme.gentoo_print_elog |
562 |
- |
563 |
- use udev && udev_reload |
564 |
- systemd_reenable bluetooth.service |
565 |
- |
566 |
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp." |
567 |
-} |
568 |
|
569 |
diff --git a/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch b/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch |
570 |
deleted file mode 100644 |
571 |
index b66868e7140..00000000000 |
572 |
--- a/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch |
573 |
+++ /dev/null |
574 |
@@ -1,51 +0,0 @@ |
575 |
-From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001 |
576 |
-From: "antoine.belvire@×××××××.net" <antoine.belvire@×××××××.net> |
577 |
-Date: Tue, 27 Mar 2018 20:30:26 +0200 |
578 |
-Subject: adapter: Don't refresh adv_manager for non-LE devices |
579 |
- |
580 |
-btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change |
581 |
-but as only LE adapters have an adv_manager, this leads to segmentation fault |
582 |
-for non-LE devices: |
583 |
- |
584 |
-0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176 |
585 |
-1 0x0000556fe45fcb02 in settings_changed (settings=<optimized out>, |
586 |
- adapter=0x556fe53f7c70) at src/adapter.c:543 |
587 |
-2 new_settings_callback (index=<optimized out>, length=<optimized out>, |
588 |
- param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573 |
589 |
-3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0, |
590 |
- status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0, |
591 |
- length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261 |
592 |
-4 0x0000556fe462cd9d in can_read_data (io=<optimized out>, |
593 |
- user_data=0x556fe53f20c0) at src/shared/mgmt.c:353 |
594 |
-5 0x0000556fe46396e3 in watch_callback (channel=<optimized out>, |
595 |
- cond=<optimized out>, user_data=<optimized out>) |
596 |
- at src/shared/io-glib.c:170 |
597 |
-6 0x00007fe351c980e5 in g_main_context_dispatch () |
598 |
- from /usr/lib64/libglib-2.0.so.0 |
599 |
-7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0 |
600 |
-8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0 |
601 |
-9 0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>) |
602 |
- at src/main.c:770 |
603 |
- |
604 |
-This commit prevents the call to btd_adv_manager_refresh for non-LE devices. |
605 |
---- |
606 |
- src/adapter.c | 3 ++- |
607 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
608 |
- |
609 |
-diff --git a/src/adapter.c b/src/adapter.c |
610 |
-index 6b9222b..daccfdc 100644 |
611 |
---- a/src/adapter.c |
612 |
-+++ b/src/adapter.c |
613 |
-@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings) |
614 |
- g_dbus_emit_property_changed(dbus_conn, adapter->path, |
615 |
- ADAPTER_INTERFACE, "Discoverable"); |
616 |
- store_adapter_info(adapter); |
617 |
-- btd_adv_manager_refresh(adapter->adv_manager); |
618 |
-+ if (adapter->supported_settings & MGMT_SETTING_LE) |
619 |
-+ btd_adv_manager_refresh(adapter->adv_manager); |
620 |
- } |
621 |
- |
622 |
- if (changed_mask & MGMT_SETTING_BONDABLE) { |
623 |
--- |
624 |
-cgit v1.1 |
625 |
- |