[patch] bluez-user-session.patch

bluez-user-session.patch (text/plain), 2.27 KB, created by Andreas Sturmlechner on 2018-04-05 17:56:23 UTC

From 8faa3b9ddcd6f8b335e1f2199289c1f7fdd7a823 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[e-mail]>
Date: Thu, 5 Apr 2018 19:31:30 +0200
Subject: [PATCH] net-wireless/bluez: Drop REQUIRED_USE=user-session? ( systemd
 )

Bug: https://bugs.gentoo.org/639434
Package-Manager: Portage-2.3.28, Repoman-2.3.9
---
 net-wireless/bluez/bluez-5.49.ebuild | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/net-wireless/bluez/bluez-5.49.ebuild b/net-wireless/bluez/bluez-5.49.ebuild
index bb6fc43..a580d25 100644
--- a/net-wireless/bluez/bluez-5.49.ebuild
+++ b/net-wireless/bluez/bluez-5.49.ebuild
@@ -22,21 +22,24 @@ REQUIRED_USE="
 	extra-tools? ( deprecated readline )
 	test? ( ${PYTHON_REQUIRED_USE} )
 	test-programs? ( ${PYTHON_REQUIRED_USE} )
-	user-session? ( systemd )
 "
 
 CDEPEND="
 	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.6:=[user-session=]
 	>=sys-apps/hwids-20121202.2
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups:= )
 	mesh? (
 		dev-libs/json-c:=
-		sys-libs/readline:0= )
+		sys-libs/readline:0=
+	)
 	obex? ( dev-libs/libical:= )
 	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd )
+	systemd? (
+		>=sys-apps/dbus-1.6:=[user-session=]
+		sys-apps/systemd
+	)
+	!systemd? ( >=sys-apps/dbus-1.6:= )
 	udev? ( >=virtual/udev-172 )
 "
 TEST_DEPS="${PYTHON_DEPS}
@@ -98,7 +101,9 @@ src_prepare() {
 	default
 
 	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+	if ! use user-session || ! use systemd; then
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+	fi
 
 	if use cups; then
 		sed -i \
@@ -227,7 +232,9 @@ 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
-	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+	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' -delete || die
 
-- 
2.17.0