summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 487505e59a2e..41794ec9ef76 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.46 2014/07/23 15:39:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.47 2014/09/19 17:35:51 ssuominen Exp $
+
+ 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> mutter-3.10.4.ebuild:
+ Remove dependency of <sys-power/upower-0.99 from || ( ) construct.
23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> mutter-3.12.2.ebuild:
Stable for x86, wrt bug #512012
diff --git a/x11-wm/mutter/mutter-3.10.4.ebuild b/x11-wm/mutter/mutter-3.10.4.ebuild
index d72ef7671fce..ebdd1de6acde 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.6 2014/05/31 20:38:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.10.4.ebuild,v 1.7 2014/09/19 17:35:51 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.99 sys-power/upower-pm-utils )
+ >=sys-power/upower-pm-utils-0.9.23
x11-libs/libICE
x11-libs/libSM