[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/

[Mart Raudsepp]

commit:     ed4fd0b4504855b0ce66bfcc80cf7d61c56a1be2
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 20:27:10 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 20:27:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ed4fd0b4

gnome-base/gnome-settings-daemon: (blindly) support elogind

Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../gnome-settings-daemon-3.26.2-r1.ebuild         | 28 +++++-----------------
 gnome-base/gnome-settings-daemon/metadata.xml      |  9 +++----
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
index f4bef258..cced7d8b 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 #PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
 PYTHON_COMPAT=( python2_7 )
 
-inherit gnome2 python-any-r1 systemd udev virtualx
+inherit gnome2 python-any-r1 udev virtualx
 
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
@@ -15,8 +15,9 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
+IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit smartcard systemd test +udev wayland"
 REQUIRED_USE="
+	^^ ( elogind systemd )
 	input_devices_wacom? ( udev )
 	smartcard? ( udev )
 	wayland? ( udev )
@@ -66,11 +67,12 @@ COMMON_DEPEND="
 	udev? ( virtual/libgudev:= )
 	wayland? ( dev-libs/wayland )
 "
-# systemd needed for power and session management, bug #464944
+# logind needed for power and session management, bug #464944
 # gnome-session-3.25.4 adapts to Orientation and XRANDR components removal (moved to mutter)
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
 	!<gnome-base/gnome-session-3.25.4
 "
 DEPEND="${COMMON_DEPEND}
@@ -127,21 +129,3 @@ src_configure() {
 src_test() {
 	virtx emake check
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index 7ddc604e..5e2d0958 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -6,11 +6,8 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="colord">Support color management using
-			<pkg>x11-misc/colord</pkg></flag>
-		<flag name="openrc-force">Skip systemd dependency (#480336),
-			enabling this flag will become your setup to be fully
-			unsupported by upstream and downstream Gnome team. Do not
-			try to enable it unless completely needed</flag>
+		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
+		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
+		<flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag>
 	</use>
 </pkgmetadata>