From: Pacho Ramos Date: Sat, 16 Jan 2016 10:42:04 +0000 (+0100) Subject: gnome-extra/cinnamon-settings-daemon: Both upower packages are supported by upstream... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=94531ada58478e128210df44a83e35bba465e54f;p=gentoo.git gnome-extra/cinnamon-settings-daemon: Both upower packages are supported by upstream (#571722 by Oleg). Package-Manager: portage-2.2.26 --- diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild similarity index 95% rename from gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild rename to gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild index c57878675678..4235b31db497 100644 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2.ebuild +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.2-r1.ebuild @@ -46,8 +46,9 @@ RDEPEND=" x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) - systemd? ( sys-apps/systemd:0= >=sys-power/upower-0.9.11:= ) - !systemd? ( sys-auth/consolekit:0= sys-power/upower-pm-utils ) + || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils ) + systemd? ( sys-apps/systemd:0= ) + !systemd? ( sys-auth/consolekit:0= ) " DEPEND="${RDEPEND} dev-libs/libxml2:2