commit: 3f84ebad2880689c12269c6ef4366d88203cf223
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 23:36:47 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 23:36:47 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3f84ebad
net-wireless/bluez: sync with ::gentoo stable
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
.../bluez/{bluez-5.61.ebuild => bluez-5.61-r1.ebuild} | 15 ++++++---------
net-wireless/bluez/metadata.xml | 1 -
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/net-wireless/bluez/bluez-5.61.ebuild
b/net-wireless/bluez/bluez-5.61-r1.ebuild
similarity index 96%
rename from net-wireless/bluez/bluez-5.61.ebuild
rename to net-wireless/bluez/bluez-5.61-r1.ebuild
index 1d4400fa..6fa675c8 100644
--- a/net-wireless/bluez/bluez-5.61.ebuild
+++ b/net-wireless/bluez/bluez-5.61-r1.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://www.kernel.org/pub/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"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi
+obex +readline selinux systemd test test-programs +udev"
# 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
@@ -48,11 +48,8 @@ DEPEND="
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:= )
+ systemd? ( sys-apps/systemd )
+ >=sys-apps/dbus-1.6:=
udev? ( >=virtual/udev-172 )
"
RDEPEND="${DEPEND}
@@ -110,7 +107,7 @@ src_prepare() {
default
# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
- if ! use user-session || ! use systemd; then
+ if ! use systemd; then
eapply
"${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
fi
@@ -251,8 +248,8 @@ multilib_src_install_all() {
# 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
+ if use systemd; then
+ dosym obex.service
/usr/lib/systemd/user/dbus-org.bluez.obex.service
fi
find "${D}" -name '*.la' -type f -delete || die
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index 60e3ee74..410dfc0f 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -17,7 +17,6 @@
<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>
