From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1048803-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3FC09138334
for <garchives@archives.gentoo.org>; Tue, 25 Sep 2018 20:27:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 28645E0A80;
Tue, 25 Sep 2018 20:27:28 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E824CE0A80
for <gentoo-commits@lists.gentoo.org>; Tue, 25 Sep 2018 20:27:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 91F09335C95
for <gentoo-commits@lists.gentoo.org>; Tue, 25 Sep 2018 20:27:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E5DE53F6
for <gentoo-commits@lists.gentoo.org>; Tue, 25 Sep 2018 20:27:24 +0000 (UTC)
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" <leio@gentoo.org>
Message-ID: <1537907230.ed4fd0b4504855b0ce66bfcc80cf7d61c56a1be2.leio@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild gnome-base/gnome-settings-daemon/metadata.xml
X-VCS-Directories: gnome-base/gnome-settings-daemon/
X-VCS-Committer: leio
X-VCS-Committer-Name: Mart Raudsepp
X-VCS-Revision: ed4fd0b4504855b0ce66bfcc80cf7d61c56a1be2
X-VCS-Branch: master
Date: Tue, 25 Sep 2018 20:27:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 41e374af-8cc7-4b76-928b-dda731cdc50b
X-Archives-Hash: 9fa0efbca58c8fbc2121446e9a9d90fc
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>