diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-09-19 17:09:31 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-09-19 17:09:31 +0000 |
| commit | 80f5dfab42f79213d3aa169da1002270fb9c3818 (patch) | |
| tree | 18ebf89edc97af09685e8a99e095e6b1f140fce4 /mate-base | |
| parent | epatch: fix EPATCH_USER_EXCLUDE handling when EPATCH_EXCLUDE is not set #5229... (diff) | |
| download | gentoo-2-80f5dfab42f79213d3aa169da1002270fb9c3818.tar.gz gentoo-2-80f5dfab42f79213d3aa169da1002270fb9c3818.tar.bz2 gentoo-2-80f5dfab42f79213d3aa169da1002270fb9c3818.zip | |
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)
Diffstat (limited to 'mate-base')
| -rw-r--r-- | mate-base/mate-applets/ChangeLog | 6 | ||||
| -rw-r--r-- | mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild | 9 | ||||
| -rw-r--r-- | mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/mate-base/mate-applets/ChangeLog b/mate-base/mate-applets/ChangeLog index b283ca24a8cf..51363528a074 100644 --- a/mate-base/mate-applets/ChangeLog +++ b/mate-base/mate-applets/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mate-base/mate-applets # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.13 2014/07/02 09:46:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.14 2014/09/19 17:09:31 ssuominen Exp $ + + 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> + mate-applets-1.6.2-r1.ebuild: + Remove dependency of <sys-power/upower-0.99 from || ( ) construct. 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-applets-1.8.0-r1.ebuild: x86 stable, bug 513714 diff --git a/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild b/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild index 2b6232ad8620..7d4d29c77f6f 100644 --- a/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild +++ b/mate-base/mate-applets/mate-applets-1.6.2-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-applets/mate-applets-1.6.2-r1.ebuild,v 1.5 2014/06/01 09:49:13 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild,v 1.6 2014/09/19 17:09:31 ssuominen Exp $ EAPI="5" @@ -35,11 +35,8 @@ RDEPEND="${PYTHON_DEPS} >=mate-base/mate-settings-daemon-1.6:0 >=mate-extra/mate-character-map-1.6:0 >=sys-apps/dbus-1.1.2:0 - sys-power/cpupower:0 - || ( - ( >=sys-power/upower-0.9.4 <sys-power/upower-0.99 ) - sys-power/upower-pm-utils - ) + sys-power/cpupower + >=sys-power/upower-pm-utils-0.9.23 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 >=x11-libs/libmatewnck-1.6:0 diff --git a/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild b/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild index 97f9d5ed2f34..003e20b63305 100644 --- a/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild +++ b/mate-base/mate-applets/mate-applets-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-base/mate-applets/mate-applets-1.8.0-r1.ebuild,v 1.8 2014/07/02 09:46:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild,v 1.9 2014/09/19 17:09:31 ssuominen Exp $ EAPI="5" @@ -34,8 +34,8 @@ RDEPEND="${PYTHON_DEPS} >=mate-base/mate-panel-1.8:0 >=mate-base/mate-settings-daemon-1.6:0 >=sys-apps/dbus-1.1.2:0 - sys-power/cpupower:0 - || ( >=sys-power/upower-0.9.4 sys-power/upower-pm-utils ) + sys-power/cpupower + || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/libnotify-0.7:0 |