From: Mart Raudsepp <leio@gentoo.org>
Date: Wed, 27 Feb 2019 00:10:29 +0000 (+0200)
Subject: gnome-base/gdm: require older gnome-settings-daemon for older gdm
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ee6e41722f0ced5ca96fddf51a4ff07f6a3ce787;p=gentoo.git

gnome-base/gdm: require older gnome-settings-daemon for older gdm

org.gnome.SettingsDaemon.A11yKeyboard is a required component in
<gdm-3.27.90 versions, which won't exist in gnome-settings-daemon-3.28
anymore. So for older gdm require <g-s-d-3.27.
Newer gdm is mostly fine with old gnome-settings-daemon, as it just
doesn't launch that component anymore, which means onscreen keyboard
doesn't work anymore until g-s-d is upgraded - but this is ~arch for
now and the newer gdm and g-s-d versions will be stabled together for
sure in the future (unless the timed login security fixes are deemed
too important).

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
---

diff --git a/gnome-base/gdm/gdm-3.24.3-r1.ebuild b/gnome-base/gdm/gdm-3.24.3-r1.ebuild
index b434e40bb942..7ffffd45c01a 100644
--- a/gnome-base/gdm/gdm-3.24.3-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.24.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,12 +28,14 @@ KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86"
 # nspr used by smartcard extension
 # dconf, dbus and g-s-d are needed at install time for dconf update
 # We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
+# Requires org.gnome.SettingsDaemon.A11yKeyboard component which doesn't exist in 3.28
 COMMON_DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.36:2[dbus]
 	>=x11-libs/gtk+-2.91.1:3
 	>=gnome-base/dconf-0.20
 	>=gnome-base/gnome-settings-daemon-3.1.4
+	<gnome-base/gnome-settings-daemon-3.27
 	gnome-base/gsettings-desktop-schemas
 	>=media-libs/fontconfig-2.5.0:1.0
 	>=media-libs/libcanberra-0.4[gtk3]
diff --git a/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild b/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild
index c0da4dfdaffe..5d46e8815208 100644
--- a/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,12 +28,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86"
 # nspr used by smartcard extension
 # dconf, dbus and g-s-d are needed at install time for dconf update
 # We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
+# Requires org.gnome.SettingsDaemon.A11yKeyboard component which doesn't exist in 3.28
 COMMON_DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.36:2[dbus]
 	>=x11-libs/gtk+-2.91.1:3
 	>=gnome-base/dconf-0.20
 	>=gnome-base/gnome-settings-daemon-3.1.4
+	<gnome-base/gnome-settings-daemon-3.27
 	gnome-base/gsettings-desktop-schemas
 	>=media-libs/fontconfig-2.5.0:1.0
 	>=media-libs/libcanberra-0.4[gtk3]