summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-31 22:37:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-31 22:37:15 +0000
commit4829d81bf3d1c07318f818b8cb8fa82e833acf9f (patch)
tree45efc5fa85cbfcf0ca37cf61fed3246484626519 /gnome-base
parentAllow falling back to sys-power/upower-pm-utils. (diff)
downloadgentoo-2-4829d81bf3d1c07318f818b8cb8fa82e833acf9f.tar.gz
gentoo-2-4829d81bf3d1c07318f818b8cb8fa82e833acf9f.tar.bz2
gentoo-2-4829d81bf3d1c07318f818b8cb8fa82e833acf9f.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-shell/ChangeLog6
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild4
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index dbec75a61f21..99712b1f2b8e 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-shell
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.79 2014/05/31 07:49:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.80 2014/05/31 22:37:15 ssuominen Exp $
+
+ 31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ gnome-shell-3.10.4-r1.ebuild, gnome-shell-3.10.4-r2.ebuild:
+ Allow falling back to sys-power/upower-pm-utils.
*gnome-shell-3.12.2 (31 May 2014)
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
index a4c79c888895..af91fc4a6def 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.10.4-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-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild,v 1.6 2014/05/08 01:11:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild,v 1.7 2014/05/31 22:37:15 ssuominen Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -86,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
>=app-accessibility/caribou-0.4.8
media-libs/cogl[introspection]
>=sys-apps/accountsservice-0.6.14[introspection]
- sys-power/upower[introspection]
+ || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
>=gnome-base/gnome-session-2.91.91
>=gnome-base/gnome-settings-daemon-3.8.3
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
index f3d642141dab..5665a2eaa6d0 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.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-shell/gnome-shell-3.10.4-r2.ebuild,v 1.6 2014/05/08 01:11:26 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v 1.7 2014/05/31 22:37:15 ssuominen Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -86,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
>=app-accessibility/caribou-0.4.8
media-libs/cogl[introspection]
>=sys-apps/accountsservice-0.6.14[introspection]
- sys-power/upower[introspection]
+ || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
>=gnome-base/gnome-session-2.91.91
>=gnome-base/gnome-settings-daemon-3.8.3