net-wireless/bluez: drop user-session USE flag

Bug: https://bugs.gentoo.org/823647
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

3 files changed, 12 insertions, 19 deletions

diff --git a/net-wireless/bluez/bluez-5.61.ebuild b/net-wireless/bluez/bluez-5.61-r1.ebuild
index 95941e34b204..1d41d1ef3a8c 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 ~hppa ~mips ppc ppc64 ~riscv 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}
@@ -107,7 +104,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
 
@@ -248,8 +245,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/bluez-5.62.ebuild b/net-wireless/bluez/bluez-5.62-r1.ebuild
index 1cf0b131ea8d..053d2f6209bb 100644
--- a/net-wireless/bluez/bluez-5.62.ebuild
+++ b/net-wireless/bluez/bluez-5.62-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 ~hppa ~mips ~ppc ~ppc64 ~riscv ~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}
@@ -104,7 +101,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
 
@@ -245,8 +242,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 60e3ee745e9e..410dfc0f6323 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>