From: Mike Gilbert <floppym@gentoo.org>
Date: Mon, 28 Mar 2016 21:54:53 +0000 (-0400)
Subject: sys-apps/dbus: Make user-session optional
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=268ebcded3db897d3cc8a5fe860c453503f8304c;p=gentoo.git

sys-apps/dbus: Make user-session optional

This apparently causes problems for GNOME and possibly others.

Bug: https://bugs.gentoo.org/577416

Package-Manager: portage-2.2.28_p64
---

diff --git a/sys-apps/dbus/dbus-1.10.8.ebuild b/sys-apps/dbus/dbus-1.10.8-r1.ebuild
similarity index 98%
rename from sys-apps/dbus/dbus-1.10.8.ebuild
rename to sys-apps/dbus/dbus-1.10.8-r1.ebuild
index e376c4acbbd2..ccec84197dfe 100644
--- a/sys-apps/dbus/dbus-1.10.8.ebuild
+++ b/sys-apps/dbus/dbus-1.10.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc selinux static-libs systemd test X"
+IUSE="debug doc selinux static-libs systemd test user-session X"
 
 RESTRICT="test"
 
@@ -110,7 +110,7 @@ multilib_src_configure() {
 		$(use_enable kernel_linux inotify)
 		$(use_enable kernel_FreeBSD kqueue)
 		$(use_enable systemd)
-		$(use_enable systemd user-session)
+		$(use_enable user-session)
 		--disable-embedded-tests
 		--disable-modular-tests
 		$(use_enable debug stats)
diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
index ac3d1495c9ff..169ff1a1a2b5 100644
--- a/sys-apps/dbus/metadata.xml
+++ b/sys-apps/dbus/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<use>
 		<flag name="systemd">Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
+		<flag name="user-session">Enable user-session semantics for session bus under systemd</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:freedesktop:dbus</remote-id>