summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-31 20:38:14 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-31 20:38:14 +0000
commit684d3a35e309dc8d422f72c39015a3fbfe3c7e36 (patch)
treeaa12cd2d87f9dbdf940e6e6834435efaf6b3092d /x11-wm/mutter
parentbump (diff)
downloadgentoo-2-684d3a35e309dc8d422f72c39015a3fbfe3c7e36.tar.gz
gentoo-2-684d3a35e309dc8d422f72c39015a3fbfe3c7e36.tar.bz2
gentoo-2-684d3a35e309dc8d422f72c39015a3fbfe3c7e36.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 'x11-wm/mutter')
-rw-r--r--x11-wm/mutter/ChangeLog5
-rw-r--r--x11-wm/mutter/mutter-3.10.4.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index 3593197818f9..a7a173289b8c 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-wm/mutter
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.43 2014/05/31 08:14:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.44 2014/05/31 20:38:14 ssuominen Exp $
+
+ 31 May 2014; Samuli Suominen <ssuominen@gentoo.org> mutter-3.10.4.ebuild:
+ Allow falling back to sys-power/upower-pm-utils.
*mutter-3.12.2 (31 May 2014)
diff --git a/x11-wm/mutter/mutter-3.10.4.ebuild b/x11-wm/mutter/mutter-3.10.4.ebuild
index b6394f1175e6..d72ef7671fce 100644
--- a/x11-wm/mutter/mutter-3.10.4.ebuild
+++ b/x11-wm/mutter/mutter-3.10.4.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/x11-wm/mutter/mutter-3.10.4.ebuild,v 1.5 2014/03/09 12:05:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.10.4.ebuild,v 1.6 2014/05/31 20:38:14 ssuominen Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
>=x11-libs/libXcomposite-0.2
>=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?]
gnome-base/gnome-desktop:3=
- >sys-power/upower-0.9.11
+ || ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
x11-libs/libICE
x11-libs/libSM