summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-31 22:35:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-31 22:35:34 +0000
commitf33e6be6a5d5b81cac04290efe4c0e65fa8ca66f (patch)
treed4af9b2277c251e3619c53b1d6ad1f3c948d1db3 /gnome-base
parentAllow falling back to sys-power/upower-pm-utils. (diff)
downloadgentoo-2-f33e6be6a5d5b81cac04290efe4c0e65fa8ca66f.tar.gz
gentoo-2-f33e6be6a5d5b81cac04290efe4c0e65fa8ca66f.tar.bz2
gentoo-2-f33e6be6a5d5b81cac04290efe4c0e65fa8ca66f.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-base')
-rw-r--r--gnome-base/gnome-control-center/ChangeLog6
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index e71f9a4d3509..e1c6b9bb9622 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-control-center
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.152 2014/05/31 10:21:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.153 2014/05/31 22:35:34 ssuominen Exp $
+
+ 31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ gnome-control-center-3.10.3.ebuild:
+ Allow falling back to sys-power/upower-pm-utils.
31 May 2014; Pacho Ramos <pacho@gentoo.org>
gnome-control-center-3.12.1.ebuild:
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild
index ae415b795813..d4159cdb9832 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.10.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-base/gnome-control-center/gnome-control-center-3.10.3.ebuild,v 1.5 2014/05/01 02:40:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild,v 1.6 2014/05/31 22:35:34 ssuominen Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -44,7 +44,7 @@ COMMON_DEPEND="
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
>=sys-auth/polkit-0.97
- >=sys-power/upower-0.9.1
+ || ( >=sys-power/upower-0.9.1 sys-power/upower-pm-utils )
>=x11-libs/libnotify-0.7.3:0=
>=gnome-extra/nm-applet-0.9.7.995