commit: 94531ada58478e128210df44a83e35bba465e54f Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Jan 16 10:42:04 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Jan 16 10:47:54 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94531ada
gnome-extra/cinnamon-settings-daemon: Both upower packages are supported by upstream (#571722 by Oleg). Package-Manager: portage-2.2.26 ...-daemon-2.8.2.ebuild => cinnamon-settings-daemon-2.8.2-r1.ebuild} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 c578786..4235b31 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