diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2014-05-31 20:35:08 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2014-05-31 20:35:08 +0000 |
| commit | 413d9cb9640cb803e6170647a214f494eeffe62a (patch) | |
| tree | 1feb25411e0da7c196eec02c3d851fc526dbdf5d /mate-base | |
| parent | Release 0.99 to ~arch because most of the tree has been adapted. (diff) | |
| download | gentoo-2-413d9cb9640cb803e6170647a214f494eeffe62a.tar.gz gentoo-2-413d9cb9640cb803e6170647a214f494eeffe62a.tar.bz2 gentoo-2-413d9cb9640cb803e6170647a214f494eeffe62a.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-base')
| -rw-r--r-- | mate-base/mate-applets/ChangeLog | 7 | ||||
| -rw-r--r-- | mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild | 7 | ||||
| -rw-r--r-- | mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild | 7 |
3 files changed, 16 insertions, 5 deletions
diff --git a/mate-base/mate-applets/ChangeLog b/mate-base/mate-applets/ChangeLog index 379c6f167163..d4f620697364 100644 --- a/mate-base/mate-applets/ChangeLog +++ b/mate-base/mate-applets/ChangeLog @@ -1,6 +1,11 @@ # 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.7 2014/05/31 10:20:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.8 2014/05/31 20:35:08 tomwij Exp $ + + 31 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-applets-1.6.2-r1.ebuild, + mate-applets-1.8.0-r1.ebuild: + Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from + ssuominen. 31 May 2014; Pacho Ramos <pacho@gentoo.org> mate-applets-1.8.0-r1.ebuild: Needs to be rebuilt with libgtop soname bumps 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 86378b558a9d..297b5053e9bc 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.2 2014/05/18 14:06:51 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild,v 1.3 2014/05/31 20:35:08 tomwij Exp $ EAPI="5" @@ -36,7 +36,10 @@ RDEPEND="${PYTHON_DEPS} >=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:0 + || ( + ( >=sys-power/upower-0.9.4 <sys-power/upower-0.99 ) + sys-power/upower-pm-utils + ) 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 e1fed7d3acbe..cd327aa93750 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.3 2014/05/31 10:20:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild,v 1.4 2014/05/31 20:35:08 tomwij Exp $ EAPI="5" @@ -35,7 +35,10 @@ RDEPEND="${PYTHON_DEPS} >=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:0 + || ( + ( >=sys-power/upower-0.9.4 <sys-power/upower-0.99 ) + sys-power/upower-pm-utils + ) x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/libnotify-0.7:0 |