summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-31 22:36:12 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-31 22:36:12 +0000
commit55bd251fb93919ecc2345c9be689fb23a036f931 (patch)
tree2cfd9534701afbfdc98437d55c090be1b4feaf5d /gnome-base
parentAllow falling back to sys-power/upower-pm-utils. (diff)
downloadgentoo-2-55bd251fb93919ecc2345c9be689fb23a036f931.tar.gz
gentoo-2-55bd251fb93919ecc2345c9be689fb23a036f931.tar.bz2
gentoo-2-55bd251fb93919ecc2345c9be689fb23a036f931.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-session/ChangeLog6
-rw-r--r--gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild6
-rw-r--r--gnome-base/gnome-session/gnome-session-3.10.1.ebuild4
3 files changed, 10 insertions, 6 deletions
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 884fd60ab66d..1ec2e3ac78d6 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-session
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.335 2014/04/27 16:53:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.336 2014/05/31 22:36:12 ssuominen Exp $
+
+ 31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ gnome-session-2.32.1-r3.ebuild, gnome-session-3.10.1.ebuild:
+ Allow falling back to sys-power/upower-pm-utils.
*gnome-session-3.12.1 (27 Apr 2014)
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
index 05aadfbbfeff..3f7b188b44da 100644
--- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.11 2013/01/22 05:40:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.12 2014/05/31 22:36:12 ssuominen Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
>=dev-libs/dbus-glib-0.76
>=gnome-base/gconf-2:2[gtk(+)]
<gnome-base/gconf-3.2.6
- >=sys-power/upower-0.9.0
+ || ( >=sys-power/upower-0.9.0 sys-power/upower-pm-utils )
elibc_FreeBSD? ( dev-libs/libexecinfo )
x11-libs/libSM
diff --git a/gnome-base/gnome-session/gnome-session-3.10.1.ebuild b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
index 490664c3fe31..e1e7761771e9 100644
--- a/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.10.1.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-session/gnome-session-3.10.1.ebuild,v 1.6 2014/03/29 21:00:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v 1.7 2014/05/31 22:36:12 ssuominen Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -26,7 +26,7 @@ COMMON_DEPEND="
>=dev-libs/json-glib-0.10
>=dev-libs/dbus-glib-0.76
>=gnome-base/gnome-desktop-3.9.91:3=
- >=sys-power/upower-0.9.0
+ || ( >=sys-power/upower-0.9.0 sys-power/upower-pm-utils )
elibc_FreeBSD? ( dev-libs/libexecinfo )
virtual/opengl