Gentoo Archives: gentoo-commits

From: "Tom Wijsman (tomwij)" <tomwij@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mate-base/mate-session-manager: mate-session-manager-1.8.1-r1.ebuild mate-session-manager-1.6.1-r1.ebuild mate-session-manager-1.8.1.ebuild ChangeLog
Date: Sat, 31 May 2014 20:38:34
Message-Id: 20140531203831.77B212004E@flycatcher.gentoo.org
1 tomwij 14/05/31 20:38:31
2
3 Modified: mate-session-manager-1.8.1-r1.ebuild
4 mate-session-manager-1.6.1-r1.ebuild
5 mate-session-manager-1.8.1.ebuild ChangeLog
6 Log:
7 Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from ssuominen.
8
9 (Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
10
11 Revision Changes Path
12 1.2 mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
13
14 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
15 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
16 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
17
18 Index: mate-session-manager-1.8.1-r1.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- mate-session-manager-1.8.1-r1.ebuild 29 May 2014 18:48:21 -0000 1.1
25 +++ mate-session-manager-1.8.1-r1.ebuild 31 May 2014 20:38:31 -0000 1.2
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2014 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $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 $
30 +# $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 $
31
32 EAPI="5"
33
34 @@ -46,7 +46,12 @@
35 elibc_FreeBSD? ( dev-libs/libexecinfo:0 )
36 gnome-keyring? ( gnome-base/gnome-keyring:0 )
37 systemd? ( sys-apps/systemd:0 )
38 - upower? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )"
39 + upower? (
40 + || (
41 + ( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 )
42 + sys-power/upower-pm-utils
43 + )
44 + )"
45
46 DEPEND="${RDEPEND}
47 >=dev-util/intltool-0.40:*
48
49
50
51 1.7 mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild
52
53 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
54 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
55 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
56
57 Index: mate-session-manager-1.6.1-r1.ebuild
58 ===================================================================
59 RCS file: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.6.1-r1.ebuild,v
60 retrieving revision 1.6
61 retrieving revision 1.7
62 diff -u -r1.6 -r1.7
63 --- mate-session-manager-1.6.1-r1.ebuild 4 May 2014 14:54:07 -0000 1.6
64 +++ mate-session-manager-1.6.1-r1.ebuild 31 May 2014 20:38:31 -0000 1.7
65 @@ -1,6 +1,6 @@
66 # Copyright 1999-2014 Gentoo Foundation
67 # Distributed under the terms of the GNU General Public License v2
68 -# $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 $
69 +# $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 $
70
71 EAPI="5"
72
73 @@ -28,7 +28,10 @@
74 >=dev-libs/glib-2.25:2
75 dev-libs/libxslt:0
76 sys-apps/dbus:0
77 - >=sys-power/upower-0.9.0:0
78 + || (
79 + ( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 )
80 + sys-power/upower-pm-utils
81 + )
82 x11-apps/xdpyinfo:0
83 x11-libs/gdk-pixbuf:2
84 >=x11-libs/gtk+-2.14:2
85
86
87
88 1.2 mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild
89
90 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
91 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
92 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
93
94 Index: mate-session-manager-1.8.1.ebuild
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild,v
97 retrieving revision 1.1
98 retrieving revision 1.2
99 diff -u -r1.1 -r1.2
100 --- mate-session-manager-1.8.1.ebuild 17 Apr 2014 15:11:08 -0000 1.1
101 +++ mate-session-manager-1.8.1.ebuild 31 May 2014 20:38:31 -0000 1.2
102 @@ -1,6 +1,6 @@
103 # Copyright 1999-2014 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 -# $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 $
106 +# $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 $
107
108 EAPI="5"
109
110 @@ -45,7 +45,12 @@
111 virtual/libintl:0
112 elibc_FreeBSD? ( dev-libs/libexecinfo:0 )
113 gnome-keyring? ( gnome-base/gnome-keyring:0 )
114 - upower? ( >=sys-power/upower-0.9.0:0 )"
115 + upower? (
116 + || (
117 + ( >=sys-power/upower-0.9.0 <sys-power/upower-0.99 )
118 + sys-power/upower-pm-utils
119 + )
120 + )"
121
122 DEPEND="${RDEPEND}
123 >=dev-util/intltool-0.40:*
124
125
126
127 1.9 mate-base/mate-session-manager/ChangeLog
128
129 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/ChangeLog?rev=1.9&view=markup
130 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/ChangeLog?rev=1.9&content-type=text/plain
131 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mate-base/mate-session-manager/ChangeLog?r1=1.8&r2=1.9
132
133 Index: ChangeLog
134 ===================================================================
135 RCS file: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v
136 retrieving revision 1.8
137 retrieving revision 1.9
138 diff -u -r1.8 -r1.9
139 --- ChangeLog 29 May 2014 18:48:21 -0000 1.8
140 +++ ChangeLog 31 May 2014 20:38:31 -0000 1.9
141 @@ -1,6 +1,12 @@
142 # ChangeLog for mate-base/mate-session-manager
143 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
144 -# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.8 2014/05/29 18:48:21 pacho Exp $
145 +# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.9 2014/05/31 20:38:31 tomwij Exp $
146 +
147 + 31 May 2014; Tom Wijsman <TomWij@g.o>
148 + mate-session-manager-1.6.1-r1.ebuild, mate-session-manager-1.8.1-r1.ebuild,
149 + mate-session-manager-1.8.1.ebuild:
150 + Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from
151 + ssuominen.
152
153 *mate-session-manager-1.8.1-r1 (29 May 2014)