Remove dependency of <sys-power/upower-0.99 from || ( ) construct.

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

2 files changed, 29 insertions, 28 deletions

diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog
index eb0658d252cd..053fa04743cb 100644
--- a/mate-base/mate-session-manager/ChangeLog
+++ b/mate-base/mate-session-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mate-base/mate-session-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.13 2014/07/24 11:29:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.14 2014/09/19 17:20:07 ssuominen Exp $
+
+  19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  mate-session-manager-1.6.1-r1.ebuild:
+  Remove dependency of <sys-power/upower-0.99 from || ( ) construct.
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Punt description for USE="upower" which is a global USE flag now.
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild
index e4da52a8256c..3c791cd2d70a 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.6.1-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/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild,v 1.7 2014/05/31 20:38:31 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild,v 1.8 2014/09/19 17:20:07 ssuominen Exp $
 
 EAPI="5"
 
@@ -24,40 +24,37 @@ IUSE="ipv6 elibc_FreeBSD gnome-keyring systemd"
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
 # xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
 
-RDEPEND=">=dev-libs/dbus-glib-0.76:0
+RDEPEND=">=dev-libs/dbus-glib-0.76
 	>=dev-libs/glib-2.25:2
-	dev-libs/libxslt:0
-	sys-apps/dbus:0
-	|| (
-		( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 )
-		sys-power/upower-pm-utils
-	)
-	x11-apps/xdpyinfo:0
+	dev-libs/libxslt
+	sys-apps/dbus
+	>=sys-power/upower-pm-utils-0.9.23
+	x11-apps/xdpyinfo
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.14:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXau:0
-	x11-libs/libXext:0
-	x11-libs/libXrender:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0
-	x11-libs/xtrans:0
-	x11-misc/xdg-user-dirs:0
-	x11-misc/xdg-user-dirs-gtk:0
-	virtual/libintl:0
-	elibc_FreeBSD? ( dev-libs/libexecinfo:0 )
-	gnome-keyring? ( gnome-base/gnome-keyring:0 )"
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xtrans
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	virtual/libintl
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	gnome-keyring? ( gnome-base/gnome-keyring )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5:0
-	>=mate-base/mate-common-1.6:0
+	>=dev-lang/perl-5
+	>=mate-base/mate-common-1.6
 	>=sys-devel/gettext-0.10.40:*
 	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4:0
-	systemd? ( sys-apps/systemd:0 )"
+	!<gnome-base/gdm-2.20.4
+	systemd? ( sys-apps/systemd )"
 
 src_prepare() {
 	# Add "session saving" button back,