Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/abiword-plugins: abiword-plugins-2.6.4.ebuild ChangeLog abiword-plugins-2.4.6.ebuild abiword-plugins-2.6.5.ebuild abiword-plugins-2.6.8.ebuild abiword-plugins-2.6.6.ebuild
Date: Mon, 30 Mar 2009 15:01:06
Message-Id: E1LoIz1-00036S-DY@stork.gentoo.org
1 loki_val 09/03/30 15:01:03
2
3 Modified: abiword-plugins-2.6.4.ebuild ChangeLog
4 abiword-plugins-2.4.6.ebuild
5 abiword-plugins-2.6.5.ebuild
6 abiword-plugins-2.6.8.ebuild
7 abiword-plugins-2.6.6.ebuild
8 Log:
9 Update dependencies w.r.t. bug 264230, fully-split-out poppler transition. Go EAPI=2 so abiword-plugins can depend on poppler-utils[abiword]. Also convert built_with_use checks for x11-libs/goffice[gnome] to USE deps.
10 (Portage version: 2.2_rc28/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.9 app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild?rev=1.9&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild?rev=1.9&content-type=text/plain
17 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild?r1=1.8&r2=1.9
18
19 Index: abiword-plugins-2.6.4.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild,v
22 retrieving revision 1.8
23 retrieving revision 1.9
24 diff -u -r1.8 -r1.9
25 --- abiword-plugins-2.6.4.ebuild 4 Jan 2009 22:54:26 -0000 1.8
26 +++ abiword-plugins-2.6.4.ebuild 30 Mar 2009 15:01:03 -0000 1.9
27 @@ -1,8 +1,8 @@
28 # Copyright 1999-2009 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild,v 1.8 2009/01/04 22:54:26 ulm Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.4.ebuild,v 1.9 2009/03/30 15:01:03 loki_val Exp $
32
33 -EAPI="1"
34 +EAPI=2
35
36 inherit eutils
37
38 @@ -28,7 +28,7 @@
39 >=gnome-base/libglade-2
40 >=gnome-extra/libgsf-1.14.4
41 cxx? ( >=dev-libs/boost-1.33.1 )
42 - gnome? ( >=x11-libs/goffice-0.4:0.4 )
43 + gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] )
44 grammar? ( >=dev-libs/link-grammar-4.2.2 )
45 !alpha? ( !ia64? ( jabber? (
46 >=dev-libs/libxml2-2.4
47 @@ -39,7 +39,7 @@
48 =gnome-extra/libgnomedb-1* )
49 math? ( >=x11-libs/gtkmathview-0.7.5 )
50 !ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
51 - pdf? ( >=app-text/poppler-0.5.0-r1 )
52 + pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
53 readline? ( sys-libs/readline )
54 thesaurus? ( >=app-text/aiksaurus-1.2 )
55 wordperfect? ( >=app-text/libwpd-0.8 )
56 @@ -50,19 +50,13 @@
57 >=dev-util/pkgconfig-0.9"
58
59 pkg_setup() {
60 - if use gnome && ! built_with_use x11-libs/goffice gnome; then
61 - eerror "abiword-plugin requires x11-libs/goffice to be compiled"
62 - eerror "with USE=\"gnome\""
63 - die "gnome support missing in x11-libs/goffice"
64 - fi
65 -
66 if use jabber && ! use cxx; then
67 eerror "AbiCollab needs dev-libs/boost to be build"
68 die "Add USE=\"cxx\" to build AbiCollab plugin"
69 fi
70 }
71
72 -src_compile() {
73 +src_configure() {
74 local myconf="--enable-all \
75 --with-abiword="${WORKDIR}/abiword-${PV}" \
76 $(use_with cxx boost) \
77 @@ -85,7 +79,9 @@
78 --without-psion"
79
80 econf $myconf || die "./configure failed"
81 +}
82
83 +src_compile() {
84 emake || die "Compilation failed"
85 }
86
87
88
89
90 1.63 app-office/abiword-plugins/ChangeLog
91
92 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/ChangeLog?rev=1.63&view=markup
93 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/ChangeLog?rev=1.63&content-type=text/plain
94 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/ChangeLog?r1=1.62&r2=1.63
95
96 Index: ChangeLog
97 ===================================================================
98 RCS file: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v
99 retrieving revision 1.62
100 retrieving revision 1.63
101 diff -u -r1.62 -r1.63
102 --- ChangeLog 15 Mar 2009 01:00:44 -0000 1.62
103 +++ ChangeLog 30 Mar 2009 15:01:03 -0000 1.63
104 @@ -1,6 +1,14 @@
105 # ChangeLog for app-office/abiword-plugins
106 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
107 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.62 2009/03/15 01:00:44 eva Exp $
108 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.63 2009/03/30 15:01:03 loki_val Exp $
109 +
110 + 30 Mar 2009; Peter Alfredsen <loki_val@g.o>
111 + abiword-plugins-2.4.6.ebuild, abiword-plugins-2.6.4.ebuild,
112 + abiword-plugins-2.6.5.ebuild, abiword-plugins-2.6.6.ebuild,
113 + abiword-plugins-2.6.8.ebuild:
114 + Update dependencies w.r.t. bug 264230, fully-split-out poppler transition.
115 + Go EAPI=2 so abiword-plugins can depend on poppler-utils[abiword]. Also
116 + convert built_with_use checks for x11-libs/goffice[gnome] to USE deps.
117
118 *abiword-plugins-2.6.8 (15 Mar 2009)
119
120
121
122
123 1.16 app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
124
125 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild?rev=1.16&view=markup
126 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild?rev=1.16&content-type=text/plain
127 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild?r1=1.15&r2=1.16
128
129 Index: abiword-plugins-2.4.6.ebuild
130 ===================================================================
131 RCS file: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v
132 retrieving revision 1.15
133 retrieving revision 1.16
134 diff -u -r1.15 -r1.16
135 --- abiword-plugins-2.4.6.ebuild 4 Jan 2009 22:54:26 -0000 1.15
136 +++ abiword-plugins-2.4.6.ebuild 30 Mar 2009 15:01:03 -0000 1.16
137 @@ -1,6 +1,8 @@
138 # Copyright 1999-2009 Gentoo Foundation
139 # Distributed under the terms of the GNU General Public License v2
140 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.15 2009/01/04 22:54:26 ulm Exp $
141 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.16 2009/03/30 15:01:03 loki_val Exp $
142 +
143 +EAPI=2
144
145 inherit eutils
146
147 @@ -31,7 +33,7 @@
148 =gnome-extra/libgnomedb-1* )
149 math? ( >=x11-libs/gtkmathview-0.7.5 )
150 !ia64? ( !ppc64? ( !sparc? ( ots? ( =app-text/ots-0.4* ) ) ) )
151 - pdf? ( >=app-text/poppler-0.5.0-r1 )
152 + pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
153 readline? ( sys-libs/readline )
154 thesaurus? ( >=app-text/aiksaurus-1.2 )
155 wordperfect? ( >=app-text/libwpd-0.8 )
156 @@ -43,18 +45,12 @@
157
158 S="${WORKDIR}/abiword-${PV}/${PN}"
159
160 -src_unpack() {
161 - unpack ${A}
162 - cd "${S}"
163 +src_prepare() {
164 epatch "${FILESDIR}/poppler_abi_change.patch"
165 -
166 - # Fix use of poppler API
167 - if has_version '>=app-text/poppler-0.6'; then
168 - epatch "${FILESDIR}"/${P}-poppler-0.6-api.patch
169 - fi
170 + epatch "${FILESDIR}"/${P}-poppler-0.6-api.patch
171 }
172
173 -src_compile() {
174 +src_configure() {
175 local myconf="--enable-all \
176 --with-abiword="${WORKDIR}/abiword-${PV}/abi" \
177 $(use_enable debug) \
178 @@ -74,7 +70,9 @@
179 --without-psion"
180
181 econf $myconf || die "./configure failed"
182 +}
183
184 +src_compile() {
185 emake || die "Compilation failed"
186 }
187
188
189
190
191 1.3 app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild
192
193 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild?rev=1.3&view=markup
194 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild?rev=1.3&content-type=text/plain
195 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild?r1=1.2&r2=1.3
196
197 Index: abiword-plugins-2.6.5.ebuild
198 ===================================================================
199 RCS file: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild,v
200 retrieving revision 1.2
201 retrieving revision 1.3
202 diff -u -r1.2 -r1.3
203 --- abiword-plugins-2.6.5.ebuild 4 Jan 2009 22:54:26 -0000 1.2
204 +++ abiword-plugins-2.6.5.ebuild 30 Mar 2009 15:01:03 -0000 1.3
205 @@ -1,8 +1,8 @@
206 # Copyright 1999-2009 Gentoo Foundation
207 # Distributed under the terms of the GNU General Public License v2
208 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild,v 1.2 2009/01/04 22:54:26 ulm Exp $
209 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.5.ebuild,v 1.3 2009/03/30 15:01:03 loki_val Exp $
210
211 -EAPI="1"
212 +EAPI=2
213
214 inherit eutils
215
216 @@ -28,7 +28,7 @@
217 >=gnome-base/libglade-2
218 >=gnome-extra/libgsf-1.14.4
219 cxx? ( >=dev-libs/boost-1.33.1 )
220 - gnome? ( >=x11-libs/goffice-0.4:0.4 )
221 + gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] )
222 grammar? ( >=dev-libs/link-grammar-4.2.2 )
223 !alpha? ( !ia64? ( jabber? (
224 >=dev-libs/libxml2-2.4
225 @@ -39,7 +39,7 @@
226 =gnome-extra/libgnomedb-1* )
227 math? ( >=x11-libs/gtkmathview-0.7.5 )
228 !ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
229 - pdf? ( >=app-text/poppler-0.5.0-r1 )
230 + pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
231 readline? ( sys-libs/readline )
232 thesaurus? ( >=app-text/aiksaurus-1.2 )
233 wordperfect? ( >=app-text/libwpd-0.8 )
234 @@ -50,19 +50,13 @@
235 >=dev-util/pkgconfig-0.9"
236
237 pkg_setup() {
238 - if use gnome && ! built_with_use x11-libs/goffice gnome; then
239 - eerror "abiword-plugin requires x11-libs/goffice to be compiled"
240 - eerror "with USE=\"gnome\""
241 - die "gnome support missing in x11-libs/goffice"
242 - fi
243 -
244 if use jabber && ! use cxx; then
245 eerror "AbiCollab needs dev-libs/boost to be build"
246 die "Add USE=\"cxx\" to build AbiCollab plugin"
247 fi
248 }
249
250 -src_compile() {
251 +src_configure() {
252 local myconf="--enable-all \
253 --with-abiword="${WORKDIR}/abiword-${PV}" \
254 $(use_with cxx boost) \
255 @@ -85,7 +79,9 @@
256 --without-psion"
257
258 econf ${myconf}
259 +}
260
261 +src_compile() {
262 emake || die "Compilation failed"
263 }
264
265
266
267
268 1.2 app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild
269
270 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild?rev=1.2&view=markup
271 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild?rev=1.2&content-type=text/plain
272 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild?r1=1.1&r2=1.2
273
274 Index: abiword-plugins-2.6.8.ebuild
275 ===================================================================
276 RCS file: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v
277 retrieving revision 1.1
278 retrieving revision 1.2
279 diff -u -r1.1 -r1.2
280 --- abiword-plugins-2.6.8.ebuild 15 Mar 2009 01:00:44 -0000 1.1
281 +++ abiword-plugins-2.6.8.ebuild 30 Mar 2009 15:01:03 -0000 1.2
282 @@ -1,8 +1,8 @@
283 # Copyright 1999-2009 Gentoo Foundation
284 # Distributed under the terms of the GNU General Public License v2
285 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.1 2009/03/15 01:00:44 eva Exp $
286 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.2 2009/03/30 15:01:03 loki_val Exp $
287
288 -EAPI="1"
289 +EAPI=2
290
291 inherit eutils
292
293 @@ -28,7 +28,7 @@
294 >=gnome-base/libglade-2
295 >=gnome-extra/libgsf-1.14.4
296 cxx? ( >=dev-libs/boost-1.33.1 )
297 - gnome? ( >=x11-libs/goffice-0.4:0.4 )
298 + gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] )
299 grammar? ( >=dev-libs/link-grammar-4.2.2 )
300 !alpha? ( !ia64? ( jabber? (
301 >=dev-libs/libxml2-2.4
302 @@ -39,7 +39,7 @@
303 =gnome-extra/libgnomedb-1* )
304 math? ( >=x11-libs/gtkmathview-0.7.5 )
305 !ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
306 - pdf? ( >=app-text/poppler-0.5.0-r1 )
307 + pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
308 readline? ( sys-libs/readline )
309 thesaurus? ( >=app-text/aiksaurus-1.2 )
310 wordperfect? ( >=app-text/libwpd-0.8 )
311 @@ -50,19 +50,13 @@
312 >=dev-util/pkgconfig-0.9"
313
314 pkg_setup() {
315 - if use gnome && ! built_with_use x11-libs/goffice gnome; then
316 - eerror "abiword-plugin requires x11-libs/goffice to be compiled"
317 - eerror "with USE=\"gnome\""
318 - die "gnome support missing in x11-libs/goffice"
319 - fi
320 -
321 if use jabber && ! use cxx; then
322 eerror "AbiCollab needs dev-libs/boost to be build"
323 die "Add USE=\"cxx\" to build AbiCollab plugin"
324 fi
325 }
326
327 -src_compile() {
328 +src_configure(){
329 local myconf="--enable-all \
330 --with-abiword="${WORKDIR}/abiword-${PV}" \
331 $(use_with cxx boost) \
332 @@ -85,7 +79,9 @@
333 --without-psion"
334
335 econf ${myconf}
336 +}
337
338 +src_compile() {
339 emake || die "Compilation failed"
340 }
341
342
343
344
345 1.2 app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild
346
347 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild?rev=1.2&view=markup
348 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild?rev=1.2&content-type=text/plain
349 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild?r1=1.1&r2=1.2
350
351 Index: abiword-plugins-2.6.6.ebuild
352 ===================================================================
353 RCS file: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild,v
354 retrieving revision 1.1
355 retrieving revision 1.2
356 diff -u -r1.1 -r1.2
357 --- abiword-plugins-2.6.6.ebuild 20 Feb 2009 00:20:24 -0000 1.1
358 +++ abiword-plugins-2.6.6.ebuild 30 Mar 2009 15:01:03 -0000 1.2
359 @@ -1,8 +1,8 @@
360 # Copyright 1999-2009 Gentoo Foundation
361 # Distributed under the terms of the GNU General Public License v2
362 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild,v 1.1 2009/02/20 00:20:24 eva Exp $
363 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.6.ebuild,v 1.2 2009/03/30 15:01:03 loki_val Exp $
364
365 -EAPI="1"
366 +EAPI=2
367
368 inherit eutils
369
370 @@ -28,7 +28,7 @@
371 >=gnome-base/libglade-2
372 >=gnome-extra/libgsf-1.14.4
373 cxx? ( >=dev-libs/boost-1.33.1 )
374 - gnome? ( >=x11-libs/goffice-0.4:0.4 )
375 + gnome? ( >=x11-libs/goffice-0.4:0.4[gnome] )
376 grammar? ( >=dev-libs/link-grammar-4.2.2 )
377 !alpha? ( !ia64? ( jabber? (
378 >=dev-libs/libxml2-2.4
379 @@ -39,7 +39,7 @@
380 =gnome-extra/libgnomedb-1* )
381 math? ( >=x11-libs/gtkmathview-0.7.5 )
382 !ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
383 - pdf? ( >=app-text/poppler-0.5.0-r1 )
384 + pdf? ( >=virtual/poppler-utils-0.5.0-r1[abiword] )
385 readline? ( sys-libs/readline )
386 thesaurus? ( >=app-text/aiksaurus-1.2 )
387 wordperfect? ( >=app-text/libwpd-0.8 )
388 @@ -50,19 +50,13 @@
389 >=dev-util/pkgconfig-0.9"
390
391 pkg_setup() {
392 - if use gnome && ! built_with_use x11-libs/goffice gnome; then
393 - eerror "abiword-plugin requires x11-libs/goffice to be compiled"
394 - eerror "with USE=\"gnome\""
395 - die "gnome support missing in x11-libs/goffice"
396 - fi
397 -
398 if use jabber && ! use cxx; then
399 eerror "AbiCollab needs dev-libs/boost to be build"
400 die "Add USE=\"cxx\" to build AbiCollab plugin"
401 fi
402 }
403
404 -src_compile() {
405 +src_configure() {
406 local myconf="--enable-all \
407 --with-abiword="${WORKDIR}/abiword-${PV}" \
408 $(use_with cxx boost) \
409 @@ -85,7 +79,9 @@
410 --without-psion"
411
412 econf ${myconf}
413 +}
414
415 +src_compile() {
416 emake || die "Compilation failed"
417 }
Report Message
Find on MARC Find on Google Groups