summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-31 22:27:58 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-31 22:27:58 +0000
commit20e25ab2cb94fccaab9bd528fe330c25ef39c93a (patch)
tree82c27b7bd79d700d61eb58eeb9e293d1950dcc99 /gnome-extra/cinnamon-settings-daemon
parentAllow falling back to sys-power/upower-pm-utils. (diff)
downloadgentoo-2-20e25ab2cb94fccaab9bd528fe330c25ef39c93a.tar.gz
gentoo-2-20e25ab2cb94fccaab9bd528fe330c25ef39c93a.tar.bz2
gentoo-2-20e25ab2cb94fccaab9bd528fe330c25ef39c93a.zip
Allow falling back to sys-power/upower-pm-utils.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'gnome-extra/cinnamon-settings-daemon')
-rw-r--r--gnome-extra/cinnamon-settings-daemon/ChangeLog8
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild4
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild4
3 files changed, 10 insertions, 6 deletions
diff --git a/gnome-extra/cinnamon-settings-daemon/ChangeLog b/gnome-extra/cinnamon-settings-daemon/ChangeLog
index bd5d05dd51f3..c4e91dff2e90 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.3 2014/05/16 02:01:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.4 2014/05/31 22:27:58 ssuominen Exp $
+
+ 31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ cinnamon-settings-daemon-2.2.2-r1.ebuild,
+ cinnamon-settings-daemon-2.2.3.ebuild:
+ Allow falling back to sys-power/upower-pm-utils.
*cinnamon-settings-daemon-2.2.3 (16 May 2014)
@@ -22,4 +27,3 @@
+cinnamon-settings-daemon-2.2.2.ebuild,
+files/cinnamon-settings-daemon-2.2.2-optional.patch, +metadata.xml:
New package, used by cinnamon-2.x
-
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild
index ee674418e7af..f3529f9260c5 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.2.2-r1.ebuild,v 1.1 2014/05/13 14:49:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.2-r1.ebuild,v 1.2 2014/05/31 22:27:58 ssuominen Exp $
EAPI="5"
GNOME2_LA_PUNT="yes"
@@ -28,7 +28,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.7.8:3
>=x11-libs/libnotify-0.7.3:0=
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild
index 792f99235673..461a3a4a8f92 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.2.3.ebuild,v 1.1 2014/05/16 02:01:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild,v 1.2 2014/05/31 22:27:58 ssuominen Exp $
EAPI="5"
GNOME2_LA_PUNT="yes"
@@ -28,7 +28,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.7.8:3
>=x11-libs/libnotify-0.7.3:0=