summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/cinnamon-settings-daemon/ChangeLog7
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/gnome-extra/cinnamon-settings-daemon/ChangeLog b/gnome-extra/cinnamon-settings-daemon/ChangeLog
index c6817de9a6b7..2981542dc908 100644
--- a/gnome-extra/cinnamon-settings-daemon/ChangeLog
+++ b/gnome-extra/cinnamon-settings-daemon/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/cinnamon-settings-daemon
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.15 2015/06/14 01:57:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.16 2015/06/14 04:02:35 tetromino Exp $
+
+ 14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+ cinnamon-settings-daemon-2.6.2.ebuild:
+ Re-add accidentally dropped upower-pm-utils compatibility (bug #552050,
+ thanks to salikov.alexey).
*cinnamon-settings-daemon-2.6.2 (13 Jun 2015)
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
index ec3022d25cc2..982fe7845866 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild,v 1.1 2015/06/14 01:57:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild,v 1.2 2015/06/14 04:02:35 tetromino Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -29,7 +29,7 @@ RDEPEND="
>=media-sound/pulseaudio-0.9.16:0=
sys-apps/dbus
>=sys-auth/polkit-0.97
- >=sys-power/upower-0.9.11:=
+ || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.9.10:3
>=x11-libs/libnotify-0.7.3:0=