commit: 3d3534f975274b16e088ca43d162586bf5a4b41e Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> AuthorDate: Wed Apr 22 21:18:48 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Apr 23 14:56:07 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3d3534f9
net-wireless/bluez: limits.h patch merged upstream in 2d249af, release 5.52 In-tree version builds fine: >>> Completed installing net-wireless/bluez-5.54 into >>> /var/tmp/portage/net-wireless/bluez-5.54/image Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> net-wireless/bluez/Manifest | 1 - net-wireless/bluez/bluez-5.51.ebuild | 290 --------------------- ...xd-without-systemd-in-the-user-session-r1.patch | 58 ----- .../files/0001-Include-limits.h-for-PATH_MAX.patch | 64 ----- ...-GLib-helper-function-to-manipulate-paths.patch | 38 --- net-wireless/bluez/files/69-btattach-bcm.rules | 33 --- net-wireless/bluez/files/bluetooth-init.d-r4 | 12 - .../bluez/files/bluez-5.39-systemd-quote.patch | 38 --- .../bluez/files/bluez-udevadm-path-r1.patch | 10 - net-wireless/bluez/files/btattach-bcm-service.sh | 30 --- net-wireless/bluez/files/btattach-bcm_at.service | 6 - net-wireless/bluez/metadata.xml | 26 -- 12 files changed, 606 deletions(-) diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest deleted file mode 100644 index 4f49136..0000000 --- a/net-wireless/bluez/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f diff --git a/net-wireless/bluez/bluez-5.51.ebuild b/net-wireless/bluez/bluez-5.51.ebuild deleted file mode 100644 index 8550b75..0000000 --- a/net-wireless/bluez/bluez-5.51.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org"; -SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/3" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" -IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" - -# Since this release all remaining extra-tools need readline support, but this could -# change in the future, hence, this REQUIRED_USE constraint could be dropped -# again in the future. -REQUIRED_USE=" - extra-tools? ( deprecated readline ) - test? ( ${PYTHON_REQUIRED_USE} ) - test-programs? ( ${PYTHON_REQUIRED_USE} ) -" - -TEST_DEPS="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - ') -" -BDEPEND=" - virtual/pkgconfig - test? ( ${TEST_DEPS} ) -" -DEPEND=" - >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - >=sys-apps/hwids-20121202.2 - btpclient? ( >=dev-libs/ell-0.14 ) - cups? ( net-print/cups:= ) - mesh? ( - >=dev-libs/ell-0.14 - dev-libs/json-c:= - sys-libs/readline:0= - ) - midi? ( media-libs/alsa-lib ) - obex? ( dev-libs/libical:= ) - readline? ( sys-libs/readline:0= ) - systemd? ( - >=sys-apps/dbus-1.6:=[user-session=] - sys-apps/systemd - ) - !systemd? ( >=sys-apps/dbus-1.6:= ) - udev? ( >=virtual/udev-172 ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bluetooth ) - test-programs? ( ${TEST_DEPS} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) - # http://www.spinics.net/lists/linux-bluetooth/msg58739.html - # https://bugs.gentoo.org/539844 - "${FILESDIR}"/${PN}-udevadm-path-r1.patch - - # build: Quote systemd variable names, bug #527432 - # http://article.gmane.org/gmane.linux.bluez.kernel/67230 - "${FILESDIR}"/${PN}-5.39-systemd-quote.patch - - # Fedora patches - # http://www.spinics.net/lists/linux-bluetooth/msg40136.html - "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch - - # Fix missing includes for non glibc systems - "${FILESDIR}"/0001-Include-limits.h-for-PATH_MAX.patch -) - -pkg_setup() { - if use test || use test-programs; then - python-single-r1_pkg_setup - fi - - if ! use udev; then - ewarn - ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" - ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," - ewarn "and hid2hci will not be available." - ewarn - fi -} - -src_prepare() { - default - - # http://www.spinics.net/lists/linux-bluetooth/msg38490.html - if ! use user-session || ! use systemd; then - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch - fi - - if use cups; then - sed -i \ - -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ - Makefile.{in,tools} || die - fi - - # Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621 - # https://bugs.gentoo.org/618548 - sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die - - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - # readline is automagic when client is enabled - # --enable-client always needs readline, bug #504038 - # --enable-mesh is handled in the same way - ac_cv_header_readline_readline_h=$(multilib_native_usex readline) - ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) - ) - - if ! multilib_is_native_abi; then - myconf+=( - # deps not used for the library - {DBUS,GLIB}_{CFLAGS,LIBS}=' ' - ) - fi - - econf \ - --localstatedir=/var \ - --disable-android \ - --enable-datafiles \ - --enable-optimization \ - $(use_enable debug) \ - --enable-pie \ - --enable-threads \ - --enable-library \ - --enable-tools \ - --enable-manpages \ - --enable-monitor \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(multilib_native_use_enable btpclient) \ - $(multilib_native_use_enable btpclient external-ell) \ - $(multilib_native_use_enable cups) \ - $(multilib_native_use_enable deprecated) \ - $(multilib_native_use_enable experimental) \ - $(multilib_native_use_enable mesh) \ - $(multilib_native_use_enable mesh external-ell) \ - $(multilib_native_use_enable midi) \ - $(multilib_native_use_enable obex) \ - $(multilib_native_use_enable readline client) \ - $(multilib_native_use_enable systemd) \ - $(multilib_native_use_enable test-programs test) \ - $(multilib_native_use_enable udev) \ - $(multilib_native_use_enable udev sixaxis) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - emake -f Makefile -f - libs \ - <<<'libs: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && default -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - - # Only install extra-tools when relevant USE flag is enabled - if use extra-tools; then - ewarn "Upstream doesn't support using this tools and their bugs are" - ewarn "likely to be ignored forever, also that tools can break" - ewarn "without previous announcement." - ewarn "Upstream also states all this tools are not really needed," - ewarn "then, if you still need to rely on them, you must ask them" - ewarn "to either install that tool by default or add the needed" - ewarn "functionality to the existing 'official' tools." - ewarn "Please report this issues to:" - ewarn "http://www.bluez.org/development/lists/"; - - # Upstream doesn't install this, bug #524640 - # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 - # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 - dobin tools/btmgmt - # gatttool is only built with readline, bug #530776 - # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 - # https://bugs.archlinux.org/task/37686 - dobin attrib/gatttool - # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 - dobin tools/avinfo - fi - - # Not installed by default after being built, bug #666756 - use btpclient && dobin tools/btpclient - - # Unittests are not that useful once installed, so make them optional - if use test-programs; then - # Few are needing python3, the others are python2 only. Remove - # until we see how to pull in python2 and python3 for runtime - rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die - rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die - rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || die - - python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test - - for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do - dosym "${i}" /usr/bin/bluez-"${i##*/}" - done - fi - else - emake DESTDIR="${D}" \ - install-pkgincludeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - fi -} - -multilib_src_install_all() { - # We need to ensure obexd can be spawned automatically by systemd - # when user-session is enabled: - # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 - # https://bugs.gentoo.org/show_bug.cgi?id=577842 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 - # https://bugs.archlinux.org/task/45816 - # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 - # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 - if use user-session && use systemd; then - ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service - fi - - find "${D}" -name '*.la' -type f -delete || die - - keepdir /var/lib/bluetooth - - # Upstream don't want people to play with them - # But we keep installing them due to 'historical' reasons - insinto /etc/bluetooth - local d - for d in input network; do - doins profiles/${d}/${d}.conf - done - # Setup auto enable as Fedora does for allowing to use - # keyboards/mouse as soon as possible - sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die - doins src/main.conf - - newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth - - einstalldocs - use doc && dodoc doc/*.txt - # Install .json files as examples to be used by meshctl - if use mesh; then - dodoc tools/mesh/*.json - local DOC_CONTENTS="Some example .json files were installed into - /usr/share/doc/${PF} to be used with meshctl. Feel free to - uncompress and copy them to ~/.config/meshctl to use them." - readme.gentoo_create_doc - fi - - # From Fedora: - # Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs - # as found on some Atom based x86 hardware - udev_dorules "${FILESDIR}/69-btattach-bcm.rules" - systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "[email protected]" - exeinto /usr/libexec/bluetooth - doexe "${FILESDIR}/btattach-bcm-service.sh" -} - -pkg_postinst() { - use udev && udev_reload - systemd_reenable bluetooth.service - - has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" - use mesh && readme.gentoo_print_elog -} diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch deleted file mode 100644 index dec9307..0000000 --- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna <[email protected]> -Date: Sat, 12 Oct 2013 17:45:25 +0200 -Subject: [PATCH] Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -2,12 +2,12 @@ - if SYSTEMD - systemduserunitdir = $(SYSTEMD_USERUNITDIR) - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = $(DBUS_SESSIONBUSDIR) - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - diff --git a/net-wireless/bluez/files/0001-Include-limits.h-for-PATH_MAX.patch b/net-wireless/bluez/files/0001-Include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index ccbc152..0000000 --- a/net-wireless/bluez/files/0001-Include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 20128c5c95fbae93c9fd996d5ad2584cf6ad8032 Mon Sep 17 00:00:00 2001 -From: Jory Pratt <[email protected]> -Date: Mon, 30 Sep 2019 18:35:56 -0500 -Subject: [PATCH] Include limits.h for PATH_MAX - -Signed-off-by: Jory Pratt <[email protected]> ---- - mesh/keyring.c | 1 + - mesh/mesh-config-json.c | 1 + - mesh/node.c | 1 + - mesh/util.c | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/mesh/keyring.c b/mesh/keyring.c -index 3a7f92f..9fa7d6b 100644 ---- a/mesh/keyring.c -+++ b/mesh/keyring.c -@@ -24,6 +24,7 @@ - #define _GNU_SOURCE - #include <fcntl.h> - #include <dirent.h> -+#include <limits.h> - #include <stdio.h> - #include <unistd.h> - #include <dirent.h> -diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c -index cafa2fd..74ca495 100644 ---- a/mesh/mesh-config-json.c -+++ b/mesh/mesh-config-json.c -@@ -27,6 +27,7 @@ - #include <fcntl.h> - #include <ftw.h> - #include <libgen.h> -+#include <limits.h> - #include <stdio.h> - #include <string.h> - #include <unistd.h> -diff --git a/mesh/node.c b/mesh/node.c -index b6824f5..15dcb97 100644 ---- a/mesh/node.c -+++ b/mesh/node.c -@@ -23,6 +23,7 @@ - - #define _GNU_SOURCE - #include <dirent.h> -+#include <limits.h> - #include <stdio.h> - #include <sys/time.h> - -diff --git a/mesh/util.c b/mesh/util.c -index 1455bde..986ba4b 100644 ---- a/mesh/util.c -+++ b/mesh/util.c -@@ -25,6 +25,7 @@ - #include <dirent.h> - #include <ftw.h> - #include <stdio.h> -+#include <limits.h> - #include <time.h> - #include <sys/time.h> - --- -2.23.0 - diff --git a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch deleted file mode 100644 index 004a389..0000000 --- a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <[email protected]> -Date: Sat, 9 Nov 2013 18:13:43 +0100 -Subject: [PATCH 1/5] obex: Use GLib helper function to manipulate paths - -Instead of trying to do it by hand. This also makes sure that -relative paths aren't used by the agent. ---- - obexd/src/manager.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/obexd/src/manager.c b/obexd/src/manager.c -index cec8a39..f18896e 100644 ---- a/obexd/src/manager.c -+++ b/obexd/src/manager.c -@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data) - DBUS_TYPE_STRING, &name, - DBUS_TYPE_INVALID)) { - /* Splits folder and name */ -- const char *slash = strrchr(name, '/'); -+ gboolean is_relative = !g_path_is_absolute(name); - DBG("Agent replied with %s", name); -- if (!slash) { -- agent->new_name = g_strdup(name); -+ if (is_relative) { -+ agent->new_name = g_path_get_basename(name); - agent->new_folder = NULL; - } else { -- agent->new_name = g_strdup(slash + 1); -- agent->new_folder = g_strndup(name, slash - name); -+ agent->new_name = g_path_get_basename(name); -+ agent->new_folder = g_path_get_dirname(name); - } - } - --- -1.8.4.2 - diff --git a/net-wireless/bluez/files/69-btattach-bcm.rules b/net-wireless/bluez/files/69-btattach-bcm.rules deleted file mode 100644 index dfe8d1e..0000000 --- a/net-wireless/bluez/files/69-btattach-bcm.rules +++ /dev/null @@ -1,33 +0,0 @@ -# Some devices have a bluetooth HCI connected to an uart, these needs to be -# setup by calling btattach. The systemd btattach-bcm.service takes care of -# this. These udev rules hardware-activate that service when necessary. -# -# For now this only suports ACPI enumerated Broadcom BT HCIs. -# This has been tested on Bay and Cherry Trail devices with both ACPI and -# PCI enumerated UARTs. - -# Note we check for the platform device not for the acpi device, because -# some DSDTs list multiple bluetooth adapters, but only some (or none) -# are enabled. Only enabled adapters get a platform device created. -ACTION!="add", GOTO="btattach_bcm_rules_end" -SUBSYSTEM!="platform", GOTO="btattach_bcm_rules_end" - -KERNEL=="BCM2E1A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E39:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E3A:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E3D:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E3F:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E40:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E54:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E55:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E64:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E65:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E67:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E71:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E7B:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E7C:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E7E:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E95:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" -KERNEL=="BCM2E96:00", TAG+="systemd", ENV{SYSTEMD_WANTS}="btattach-bcm@%k.service" - -LABEL="btattach_bcm_rules_end" diff --git a/net-wireless/bluez/files/bluetooth-init.d-r4 b/net-wireless/bluez/files/bluetooth-init.d-r4 deleted file mode 100644 index e69c668..0000000 --- a/net-wireless/bluez/files/bluetooth-init.d-r4 +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/run/bluetoothd.pid" -command="/usr/libexec/bluetooth/bluetoothd" -command_background=1 - -depend() { - after coldplug - need dbus localmount hostname -} diff --git a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch b/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch deleted file mode 100644 index d23c877..0000000 --- a/net-wireless/bluez/files/bluez-5.39-systemd-quote.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f554e152715a3c06a69954d9d4f15415c798e083 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Sun, 3 Apr 2016 14:30:02 -0400 -Subject: [PATCH] build: Quote systemd variable names - -If the systemd-m4 package has been installed, SYSTEMD_USERUNITDIR is -defined as a macro. Quote this name to prevent macro expansion. - -Bug: https://bugs.gentoo.org/527432 ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1679a47..4664003 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -216,7 +216,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then - fi - AC_MSG_RESULT([${path_systemunitdir}]) - fi --AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}]) -+AC_SUBST([SYSTEMD_SYSTEMUNITDIR], [${path_systemunitdir}]) - - AC_ARG_WITH([systemduserunitdir], - AC_HELP_STRING([--with-systemduserunitdir=DIR], -@@ -230,7 +230,7 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then - fi - AC_MSG_RESULT([${path_userunitdir}]) - fi --AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}]) -+AC_SUBST([SYSTEMD_USERUNITDIR], [${path_userunitdir}]) - - AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], - [do not install configuration and data files]), --- -2.8.0 - diff --git a/net-wireless/bluez/files/bluez-udevadm-path-r1.patch b/net-wireless/bluez/files/bluez-udevadm-path-r1.patch deleted file mode 100644 index ac1c94c..0000000 --- a/net-wireless/bluez/files/bluez-udevadm-path-r1.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tools/hid2hci.rules -+++ b/tools/hid2hci.rules -@@ -20,6 +20,7 @@ - # Unfortunately the only event seen is the BT device disappearing, so the mouse - # device needs to be chased down on the USB bus. - ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \ -+ ENV{REMOVE_CMD}="/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" \ - ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1" - - # CSR devices diff --git a/net-wireless/bluez/files/btattach-bcm-service.sh b/net-wireless/bluez/files/btattach-bcm-service.sh deleted file mode 100644 index c7f8b17..0000000 --- a/net-wireless/bluez/files/btattach-bcm-service.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Simple shell script to wait for the tty for an uart using BT HCI to show up -# and then invoke btattach with the right parameters, this is intended to be -# invoked from a hardware-activated systemd service -# -# For now this only suports ACPI enumerated Broadcom BT HCIs. -# This has been tested on Bay and Cherry Trail devices with both ACPI and -# PCI enumerated UARTs. -# -# Note the kernel bt developers are working on solving this entirely in the -# kernel, so it is not worth the trouble to write something better then this. - -BT_DEV="/sys/bus/platform/devices/$1" -BT_DEV="$(readlink -f $BT_DEV)" -UART_DEV="$(dirname $BT_DEV)" - -# Stupid GPD-pocket has USB BT with id 0000:0000, but still claims to have -# an uart attached bt -if [ "$1" = "BCM2E7E:00" ] && lsusb | grep -q "ID 0000:0000"; then - exit 0 -fi - -while [ ! -d "$UART_DEV/tty" ]; do - sleep .2 -done - -TTY="$(ls $UART_DEV/tty)" - -exec btattach --bredr "/dev/$TTY" -P bcm diff --git a/net-wireless/bluez/files/btattach-bcm_at.service b/net-wireless/bluez/files/btattach-bcm_at.service deleted file mode 100644 index 1e7c7db..0000000 --- a/net-wireless/bluez/files/btattach-bcm_at.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=btattach for Broadcom devices - -[Service] -Type=simple -ExecStart=/usr/libexec/bluetooth/btattach-bcm-service.sh %I diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml deleted file mode 100644 index 31e8695..0000000 --- a/net-wireless/bluez/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="person"> - <email>[email protected]</email> - <name>Pacho Ramos</name> - </maintainer> -<use> - <flag name="btpclient">Enable BTP client</flag> - <flag name="deprecated">Build deprecated plugins</flag> - <flag name="experimental">Build experimental plugins</flag> - <flag name="extra-tools">Install tools that upstream doesn't install on - purpose by default. All this tools shouldn't be used. Then, please - notify upstream about you still need them to let them know the - situation.</flag> - <flag name="mesh">Add support for Bluetooth Mesh control application and advertising bearer.</flag> - <flag name="midi">Enable MIDI support</flag> - <flag name="obex">Enable OBEX transfer support</flag> - <flag name="test-programs">Install tools for testing of various Bluetooth functions</flag> - <flag name="user-session">Allow compatibility with user-session semantics for session bus under systemd</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id> - <remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id> -</upstream> -</pkgmetadata>
