gnome-base/gnome-control-center: guarantee a working Night Light functionality

Night Light isn't behind USE=colord (not optional), but requires
gnome-settings-daemon[colord], so unconditionally depend on that.

Raise cups dep to 1.7 while here, as it uses an enum constant introduced there
and we don't backport the fix for that from gnome-3-24 branch. No practical
difference, as there is no such old version in-tree anymore.

Closes: https://bugs.gentoo.org/619298
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
index b7fe8aa31c0be8071a513572b833c416fa8cf7c4..4f53c91e0924afc6a6c1a7bdc7713862ea135120 100644 (file)
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ QA_CONFIGURE_OPTIONS=".*"
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # udev could be made optional, only conditions gsd-device-panel
 # (mouse, keyboards, touchscreen, etc)
-# display panel requires colord
+# display panel requires colord and gnome-settings-daemon[colord]
 # printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
 COMMON_DEPEND="
        >=dev-libs/glib-2.44.0:2[dbus]
@@ -32,7 +32,7 @@ COMMON_DEPEND="
        >=x11-libs/gtk+-3.22.0:3[X,wayland?]
        >=gnome-base/gsettings-desktop-schemas-3.21.4
        >=gnome-base/gnome-desktop-3.21.2:3=
-       >=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit]
+       >=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit]
        >=x11-misc/colord-0.1.34:0=
 
        >=dev-libs/libpwquality-1.2.2
@@ -59,7 +59,7 @@ COMMON_DEPEND="
                >=x11-misc/colord-0.1.34:0=
                >=x11-libs/colord-gtk-0.1.24 )
        cups? (
-               >=net-print/cups-1.4[dbus]
+               >=net-print/cups-1.7[dbus]
                >=net-fs/samba-4.0.0[client]
        )
        gnome-online-accounts? (