summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2014-05-31 20:40:24 +0000
committerTom Wijsman <tomwij@gentoo.org>2014-05-31 20:40:24 +0000
commit79fb4921f4de924b432bca5c36b5b746ec7286c5 (patch)
treef8d505420a16bd8591a14f030028f678058c1ee9 /mate-extra
parentAllow falling back to sys-power/upower-pm-utils. (diff)
downloadgentoo-2-79fb4921f4de924b432bca5c36b5b746ec7286c5.tar.gz
gentoo-2-79fb4921f4de924b432bca5c36b5b746ec7286c5.tar.bz2
gentoo-2-79fb4921f4de924b432bca5c36b5b746ec7286c5.zip
Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from ssuominen.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'mate-extra')
-rw-r--r--mate-extra/mate-power-manager/ChangeLog7
-rw-r--r--mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild7
-rw-r--r--mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild7
-rw-r--r--mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild7
4 files changed, 21 insertions, 7 deletions
diff --git a/mate-extra/mate-power-manager/ChangeLog b/mate-extra/mate-power-manager/ChangeLog
index dfde9eba74b6..1cef4cb6aa32 100644
--- a/mate-extra/mate-power-manager/ChangeLog
+++ b/mate-extra/mate-power-manager/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for mate-extra/mate-power-manager
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.7 2014/05/06 17:44:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.8 2014/05/31 20:40:24 tomwij Exp $
+
+ 31 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-power-manager-1.6.3.ebuild,
+ mate-power-manager-1.8.0-r1.ebuild, mate-power-manager-1.8.0.ebuild:
+ Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from
+ ssuominen.
*mate-power-manager-1.8.0-r1 (06 May 2014)
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild
index a182e345d82e..e53668a7738a 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.6.3.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-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild,v 1.4 2014/05/04 14:54:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.6.3.ebuild,v 1.5 2014/05/31 20:40:24 tomwij Exp $
EAPI="5"
@@ -28,7 +28,10 @@ COMMON_DEPEND="app-text/rarian:0
>=dev-libs/glib-2.13:2
>=media-libs/libcanberra-0.10:0[gtk]
>=sys-apps/dbus-1:0
- >=sys-power/upower-0.9.1:0
+ || (
+ ( >=sys-power/upower-0.9.1 <sys-power/upower-0.99 )
+ sys-power/upower-pm-utils
+ )
>=x11-apps/xrandr-1.2:0
>=x11-libs/cairo-1:0
>=x11-libs/gdk-pixbuf-2.11:2
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
index 7b887a377ceb..a3e44b36f19c 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-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-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild,v 1.1 2014/05/06 17:44:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild,v 1.2 2014/05/31 20:40:24 tomwij Exp $
EAPI="5"
@@ -28,7 +28,10 @@ COMMON_DEPEND="app-text/rarian:0
>=dev-libs/glib-2.13:2
>=media-libs/libcanberra-0.10:0[gtk]
>=sys-apps/dbus-1:0
- >=sys-power/upower-0.9.1:0
+ || (
+ ( >=sys-power/upower-0.9.1 <sys-power/upower-0.99 )
+ sys-power/upower-pm-utils
+ )
>=x11-apps/xrandr-1.2:0
>=x11-libs/cairo-1:0
>=x11-libs/gdk-pixbuf-2.11:2
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild
index 8c6bf96032ea..b12b6d8353ef 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.0.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-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild,v 1.2 2014/04/23 12:26:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild,v 1.3 2014/05/31 20:40:24 tomwij Exp $
EAPI="5"
@@ -28,7 +28,10 @@ COMMON_DEPEND="app-text/rarian:0
>=dev-libs/glib-2.13:2
>=media-libs/libcanberra-0.10:0[gtk]
>=sys-apps/dbus-1:0
- >=sys-power/upower-0.9.1:0
+ || (
+ ( >=sys-power/upower-0.9.1 <sys-power/upower-0.99 )
+ sys-power/upower-pm-utils
+ )
>=x11-apps/xrandr-1.2:0
>=x11-libs/cairo-1:0
>=x11-libs/gdk-pixbuf-2.11:2