| 1 |
commit: 3f84ebad2880689c12269c6ef4366d88203cf223 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 22 23:36:47 2021 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 22 23:36:47 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3f84ebad |
| 7 |
|
| 8 |
net-wireless/bluez: sync with ::gentoo stable |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
.../bluez/{bluez-5.61.ebuild => bluez-5.61-r1.ebuild} | 15 ++++++--------- |
| 14 |
net-wireless/bluez/metadata.xml | 1 - |
| 15 |
2 files changed, 6 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/bluez/bluez-5.61.ebuild b/net-wireless/bluez/bluez-5.61-r1.ebuild |
| 18 |
similarity index 96% |
| 19 |
rename from net-wireless/bluez/bluez-5.61.ebuild |
| 20 |
rename to net-wireless/bluez/bluez-5.61-r1.ebuild |
| 21 |
index 1d4400fa..6fa675c8 100644 |
| 22 |
--- a/net-wireless/bluez/bluez-5.61.ebuild |
| 23 |
+++ b/net-wireless/bluez/bluez-5.61-r1.ebuild |
| 24 |
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" |
| 25 |
LICENSE="GPL-2+ LGPL-2.1+" |
| 26 |
SLOT="0/3" |
| 27 |
KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
| 28 |
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" |
| 29 |
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev" |
| 30 |
|
| 31 |
# Since this release all remaining extra-tools need readline support, but this could |
| 32 |
# change in the future, hence, this REQUIRED_USE constraint could be dropped |
| 33 |
@@ -48,11 +48,8 @@ DEPEND=" |
| 34 |
midi? ( media-libs/alsa-lib ) |
| 35 |
obex? ( dev-libs/libical:= ) |
| 36 |
readline? ( sys-libs/readline:0= ) |
| 37 |
- systemd? ( |
| 38 |
- >=sys-apps/dbus-1.6:=[user-session=] |
| 39 |
- sys-apps/systemd |
| 40 |
- ) |
| 41 |
- !systemd? ( >=sys-apps/dbus-1.6:= ) |
| 42 |
+ systemd? ( sys-apps/systemd ) |
| 43 |
+ >=sys-apps/dbus-1.6:= |
| 44 |
udev? ( >=virtual/udev-172 ) |
| 45 |
" |
| 46 |
RDEPEND="${DEPEND} |
| 47 |
@@ -110,7 +107,7 @@ src_prepare() { |
| 48 |
default |
| 49 |
|
| 50 |
# http://www.spinics.net/lists/linux-bluetooth/msg38490.html |
| 51 |
- if ! use user-session || ! use systemd; then |
| 52 |
+ if ! use systemd; then |
| 53 |
eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch |
| 54 |
fi |
| 55 |
|
| 56 |
@@ -251,8 +248,8 @@ multilib_src_install_all() { |
| 57 |
# https://bugs.archlinux.org/task/45816 |
| 58 |
# https://bugzilla.redhat.com/show_bug.cgi?id=1318441 |
| 59 |
# https://bugzilla.redhat.com/show_bug.cgi?id=1389347 |
| 60 |
- if use user-session && use systemd; then |
| 61 |
- ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service |
| 62 |
+ if use systemd; then |
| 63 |
+ dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service |
| 64 |
fi |
| 65 |
|
| 66 |
find "${D}" -name '*.la' -type f -delete || die |
| 67 |
|
| 68 |
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml |
| 69 |
index 60e3ee74..410dfc0f 100644 |
| 70 |
--- a/net-wireless/bluez/metadata.xml |
| 71 |
+++ b/net-wireless/bluez/metadata.xml |
| 72 |
@@ -17,7 +17,6 @@ |
| 73 |
<flag name="midi">Enable MIDI support</flag> |
| 74 |
<flag name="obex">Enable OBEX transfer support</flag> |
| 75 |
<flag name="test-programs">Install tools for testing of various Bluetooth functions</flag> |
| 76 |
- <flag name="user-session">Allow compatibility with user-session semantics for session bus under systemd</flag> |
| 77 |
</use> |
| 78 |
<upstream> |
| 79 |
<remote-id type="cpe">cpe:/a:bluez:bluez</remote-id> |
Archives