diff options
4 files changed, 26 insertions, 7 deletions
diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog index 4b8b16e2ceb1..c2f4d820b416 100644 --- a/mate-base/mate-session-manager/ChangeLog +++ b/mate-base/mate-session-manager/ChangeLog @@ -1,6 +1,12 @@ # 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.8 2014/05/29 18:48:21 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.9 2014/05/31 20:38:31 tomwij Exp $ + + 31 May 2014; Tom Wijsman <TomWij@gentoo.org> + mate-session-manager-1.6.1-r1.ebuild, mate-session-manager-1.8.1-r1.ebuild, + mate-session-manager-1.8.1.ebuild: + Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from + ssuominen. *mate-session-manager-1.8.1-r1 (29 May 2014) 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 d3b687526e81..e4da52a8256c 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.6 2014/05/04 14:54:07 ago Exp $ +# $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 $ EAPI="5" @@ -28,7 +28,10 @@ RDEPEND=">=dev-libs/dbus-glib-0.76:0 >=dev-libs/glib-2.25:2 dev-libs/libxslt:0 sys-apps/dbus:0 - >=sys-power/upower-0.9.0:0 + || ( + ( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 ) + sys-power/upower-pm-utils + ) x11-apps/xdpyinfo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild index 6ef101228adb..9c3ecec97ba0 100644 --- a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild +++ b/mate-base/mate-session-manager/mate-session-manager-1.8.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.8.1-r1.ebuild,v 1.1 2014/05/29 18:48:21 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild,v 1.2 2014/05/31 20:38:31 tomwij Exp $ EAPI="5" @@ -46,7 +46,12 @@ RDEPEND=">=dev-libs/dbus-glib-0.76:0 elibc_FreeBSD? ( dev-libs/libexecinfo:0 ) gnome-keyring? ( gnome-base/gnome-keyring:0 ) systemd? ( sys-apps/systemd:0 ) - upower? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )" + upower? ( + || ( + ( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 ) + sys-power/upower-pm-utils + ) + )" DEPEND="${RDEPEND} >=dev-util/intltool-0.40:* diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild index fa4255820eb8..c5f5235ae9a6 100644 --- a/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild +++ b/mate-base/mate-session-manager/mate-session-manager-1.8.1.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.8.1.ebuild,v 1.1 2014/04/17 15:11:08 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild,v 1.2 2014/05/31 20:38:31 tomwij Exp $ EAPI="5" @@ -45,7 +45,12 @@ RDEPEND=">=dev-libs/dbus-glib-0.76:0 virtual/libintl:0 elibc_FreeBSD? ( dev-libs/libexecinfo:0 ) gnome-keyring? ( gnome-base/gnome-keyring:0 ) - upower? ( >=sys-power/upower-0.9.0:0 )" + upower? ( + || ( + ( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 ) + sys-power/upower-pm-utils + ) + )" DEPEND="${RDEPEND} >=dev-util/intltool-0.40:* |