Gentoo Archives: gentoo-commits

From: "Christoph Mende (angelos)" <angelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/midori: midori-9999.ebuild midori-0.4.8.ebuild midori-0.4.6-r1.ebuild midori-0.4.9.ebuild ChangeLog
Date: Fri, 29 Mar 2013 21:37:05
Message-Id: 20130329213700.E55D82171D@flycatcher.gentoo.org
1 angelos 13/03/29 21:37:00
2
3 Modified: midori-9999.ebuild midori-0.4.8.ebuild
4 midori-0.4.6-r1.ebuild midori-0.4.9.ebuild
5 ChangeLog
6 Log:
7 Convert to vala.eclass
8
9 (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)
10
11 Revision Changes Path
12 1.47 www-client/midori/midori-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.47&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.47&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.46&r2=1.47
17
18 Index: midori-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v
21 retrieving revision 1.46
22 retrieving revision 1.47
23 diff -u -r1.46 -r1.47
24 --- midori-9999.ebuild 12 Mar 2013 10:19:16 -0000 1.46
25 +++ midori-9999.ebuild 29 Mar 2013 21:37:00 -0000 1.47
26 @@ -1,8 +1,9 @@
27 # Copyright 1999-2013 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.46 2013/03/12 10:19:16 ssuominen Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.47 2013/03/29 21:37:00 angelos Exp $
31
32 EAPI=5
33 +VALA_MIN_API_VERSION=0.14
34
35 PYTHON_COMPAT=( python2_7 )
36
37 @@ -16,9 +17,7 @@
38 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
39 fi
40
41 -inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils ${_live_inherits}
42 -
43 -VALA_VERSION=0.18
44 +inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
45
46 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
47 HOMEPAGE="http://twotoasts.de/index.php/midori/"
48 @@ -48,7 +47,7 @@
49 zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
50 DEPEND="${RDEPEND}
51 ${PYTHON_DEPS}
52 - dev-lang/vala:${VALA_VERSION}
53 + $(vala_depend)
54 dev-util/intltool
55 gnome-base/librsvg
56 doc? ( dev-util/gtk-doc )
57 @@ -72,6 +71,8 @@
58 src_prepare() {
59 # Force disabled because we don't have this custom renamed in Portage
60 sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
61 +
62 + vala_src_prepare
63 }
64
65 src_configure() {
66 @@ -80,7 +81,6 @@
67 local myconf
68 use deprecated || myconf="$(use_enable webkit2)"
69
70 - VALAC="$(type -P valac-${VALA_VERSION})" \
71 waf-utils_src_configure \
72 --disable-docs \
73 $(use_enable doc apidocs) \
74
75
76
77 1.4 www-client/midori/midori-0.4.8.ebuild
78
79 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.8.ebuild?rev=1.4&view=markup
80 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.8.ebuild?rev=1.4&content-type=text/plain
81 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.8.ebuild?r1=1.3&r2=1.4
82
83 Index: midori-0.4.8.ebuild
84 ===================================================================
85 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.8.ebuild,v
86 retrieving revision 1.3
87 retrieving revision 1.4
88 diff -u -r1.3 -r1.4
89 --- midori-0.4.8.ebuild 6 Feb 2013 18:18:15 -0000 1.3
90 +++ midori-0.4.8.ebuild 29 Mar 2013 21:37:00 -0000 1.4
91 @@ -1,8 +1,9 @@
92 # Copyright 1999-2013 Gentoo Foundation
93 # Distributed under the terms of the GNU General Public License v2
94 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.8.ebuild,v 1.3 2013/02/06 18:18:15 ssuominen Exp $
95 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.8.ebuild,v 1.4 2013/03/29 21:37:00 angelos Exp $
96
97 EAPI=5
98 +VALA_MIN_API_VERSION=0.14
99
100 PYTHON_COMPAT=( python2_7 )
101
102 @@ -16,9 +17,7 @@
103 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
104 fi
105
106 -inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils ${_live_inherits}
107 -
108 -VALA_VERSION=0.18
109 +inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
110
111 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
112 HOMEPAGE="http://twotoasts.de/index.php/midori/"
113 @@ -48,7 +47,7 @@
114 zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
115 DEPEND="${RDEPEND}
116 ${PYTHON_DEPS}
117 - dev-lang/vala:${VALA_VERSION}
118 + $(vala_depend)
119 dev-util/intltool
120 gnome-base/librsvg
121 doc? ( dev-util/gtk-doc )
122 @@ -75,12 +74,13 @@
123
124 # FIXME: The code is not compatible with X- in the names
125 # epatch "${FILESDIR}"/${P}-desktop_file_validation.patch
126 +
127 + vala_src_prepare
128 }
129
130 src_configure() {
131 strip-linguas -i po
132
133 - VALAC="$(type -P valac-${VALA_VERSION})" \
134 waf-utils_src_configure \
135 --disable-docs \
136 $(use_enable doc apidocs) \
137
138
139
140 1.5 www-client/midori/midori-0.4.6-r1.ebuild
141
142 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild?rev=1.5&view=markup
143 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild?rev=1.5&content-type=text/plain
144 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild?r1=1.4&r2=1.5
145
146 Index: midori-0.4.6-r1.ebuild
147 ===================================================================
148 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild,v
149 retrieving revision 1.4
150 retrieving revision 1.5
151 diff -u -r1.4 -r1.5
152 --- midori-0.4.6-r1.ebuild 18 Aug 2012 13:27:25 -0000 1.4
153 +++ midori-0.4.6-r1.ebuild 29 Mar 2013 21:37:00 -0000 1.5
154 @@ -1,8 +1,9 @@
155 -# Copyright 1999-2012 Gentoo Foundation
156 +# Copyright 1999-2013 Gentoo Foundation
157 # Distributed under the terms of the GNU General Public License v2
158 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild,v 1.4 2012/08/18 13:27:25 johu Exp $
159 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild,v 1.5 2013/03/29 21:37:00 angelos Exp $
160
161 EAPI=4
162 +VALA_MIN_API_VERSION=0.14
163
164 unset _live_inherits
165
166 @@ -14,9 +15,7 @@
167 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
168 fi
169
170 -inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
171 -
172 -PV_vala_version=0.16
173 +inherit eutils fdo-mime gnome2-utils python waf-utils vala ${_live_inherits}
174
175 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
176 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
177 @@ -44,7 +43,7 @@
178 libnotify? ( >=x11-libs/libnotify-0.7 )"
179 DEPEND="${RDEPEND}
180 || ( dev-lang/python:2.7 dev-lang/python:2.6 )
181 - dev-lang/vala:${PV_vala_version}
182 + $(vala_depend)
183 dev-util/intltool
184 gnome-base/librsvg
185 doc? ( dev-util/gtk-doc )
186 @@ -68,12 +67,12 @@
187
188 src_prepare() {
189 epatch "${FILESDIR}"/${P}-dl.patch
190 + vala_src_prepare
191 }
192
193 src_configure() {
194 strip-linguas -i po
195
196 - VALAC="$(type -P valac-${PV_vala_version})" \
197 waf-utils_src_configure \
198 --disable-docs \
199 $(use_enable doc apidocs) \
200
201
202
203 1.2 www-client/midori/midori-0.4.9.ebuild
204
205 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.9.ebuild?rev=1.2&view=markup
206 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.9.ebuild?rev=1.2&content-type=text/plain
207 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.4.9.ebuild?r1=1.1&r2=1.2
208
209 Index: midori-0.4.9.ebuild
210 ===================================================================
211 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.9.ebuild,v
212 retrieving revision 1.1
213 retrieving revision 1.2
214 diff -u -r1.1 -r1.2
215 --- midori-0.4.9.ebuild 12 Mar 2013 10:19:16 -0000 1.1
216 +++ midori-0.4.9.ebuild 29 Mar 2013 21:37:00 -0000 1.2
217 @@ -1,8 +1,9 @@
218 # Copyright 1999-2013 Gentoo Foundation
219 # Distributed under the terms of the GNU General Public License v2
220 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.9.ebuild,v 1.1 2013/03/12 10:19:16 ssuominen Exp $
221 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.9.ebuild,v 1.2 2013/03/29 21:37:00 angelos Exp $
222
223 EAPI=5
224 +VALA_MIN_API_VERSION=0.14
225
226 PYTHON_COMPAT=( python2_7 )
227
228 @@ -16,9 +17,7 @@
229 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
230 fi
231
232 -inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils ${_live_inherits}
233 -
234 -VALA_VERSION=0.18
235 +inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
236
237 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
238 HOMEPAGE="http://twotoasts.de/index.php/midori/"
239 @@ -48,7 +47,7 @@
240 zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
241 DEPEND="${RDEPEND}
242 ${PYTHON_DEPS}
243 - dev-lang/vala:${VALA_VERSION}
244 + $(vala_depend)
245 dev-util/intltool
246 gnome-base/librsvg
247 doc? ( dev-util/gtk-doc )
248 @@ -72,6 +71,8 @@
249 src_prepare() {
250 # Force disabled because we don't have this custom renamed in Portage
251 sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
252 +
253 + vala_src_prepare
254 }
255
256 src_configure() {
257 @@ -80,7 +81,6 @@
258 local myconf
259 use deprecated || myconf="$(use_enable webkit2)"
260
261 - VALAC="$(type -P valac-${VALA_VERSION})" \
262 waf-utils_src_configure \
263 --disable-docs \
264 $(use_enable doc apidocs) \
265
266
267
268 1.107 www-client/midori/ChangeLog
269
270 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.107&view=markup
271 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.107&content-type=text/plain
272 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.106&r2=1.107
273
274 Index: ChangeLog
275 ===================================================================
276 RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v
277 retrieving revision 1.106
278 retrieving revision 1.107
279 diff -u -r1.106 -r1.107
280 --- ChangeLog 12 Mar 2013 10:19:16 -0000 1.106
281 +++ ChangeLog 29 Mar 2013 21:37:00 -0000 1.107
282 @@ -1,6 +1,10 @@
283 # ChangeLog for www-client/midori
284 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
285 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.106 2013/03/12 10:19:16 ssuominen Exp $
286 +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.107 2013/03/29 21:37:00 angelos Exp $
287 +
288 + 29 Mar 2013; Christoph Mende <angelos@g.o> midori-0.4.6-r1.ebuild,
289 + midori-0.4.8.ebuild, midori-0.4.9.ebuild, midori-9999.ebuild:
290 + Convert to vala.eclass
291
292 *midori-0.4.9 (12 Mar 2013)
293
294 @@ -446,4 +450,3 @@
295
296 27 Mar 2008; Markus Ullmann <jokey@g.o> +metadata.xml:
297 Add ebuild for bug #215036
298 -