tomwij 14/05/31 20:38:31 Modified: mate-session-manager-1.8.1-r1.ebuild mate-session-manager-1.6.1-r1.ebuild mate-session-manager-1.8.1.ebuild ChangeLog Log: 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)
Revision Changes Path 1.2 mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild?r1=1.1&r2=1.2 Index: mate-session-manager-1.8.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mate-session-manager-1.8.1-r1.ebuild 29 May 2014 18:48:21 -0000 1.1 +++ mate-session-manager-1.8.1-r1.ebuild 31 May 2014 20:38:31 -0000 1.2 @@ -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 @@ 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:* 1.7 mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild?r1=1.6&r2=1.7 Index: mate-session-manager-1.6.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mate-session-manager-1.6.1-r1.ebuild 4 May 2014 14:54:07 -0000 1.6 +++ mate-session-manager-1.6.1-r1.ebuild 31 May 2014 20:38:31 -0000 1.7 @@ -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 @@ >=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 1.2 mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild?r1=1.1&r2=1.2 Index: mate-session-manager-1.8.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mate-session-manager-1.8.1.ebuild 17 Apr 2014 15:11:08 -0000 1.1 +++ mate-session-manager-1.8.1.ebuild 31 May 2014 20:38:31 -0000 1.2 @@ -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 @@ 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:* 1.9 mate-base/mate-session-manager/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/ChangeLog?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/ChangeLog?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/ChangeLog?r1=1.8&r2=1.9 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ChangeLog 29 May 2014 18:48:21 -0000 1.8 +++ ChangeLog 31 May 2014 20:38:31 -0000 1.9 @@ -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 <tom...@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)