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

Gentoo Archives: gentoo-commits

From: "Markus Meier (maekke)" <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: ChangeLog metadata.xml imagemagick-6.4.4.6.ebuild imagemagick-6.4.4.6-r1.ebuild
Date: Wed, 15 Oct 2008 18:10:03
Message-Id: E1KqAom-0007Y1-7D@stork.gentoo.org
1 maekke 08/10/15 18:09:56
2
3 Modified: ChangeLog metadata.xml
4 Added: imagemagick-6.4.4.6.ebuild
5 imagemagick-6.4.4.6-r1.ebuild
6 Log:
7 bump to 6.4.4.6 (bug #237174), add raw USE-flag (which pulls in media-gfx/ufraw, that's why some keywords are dropped) for bug #237174 and corefonts USE-flag for bug #239765. add support for the test-suite, but only run it if the same ${PV} is installed
8 (Portage version: 2.2_rc12/cvs/Linux 2.6.27 i686)
9
10 Revision Changes Path
11 1.303 media-gfx/imagemagick/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.303&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.303&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.302&r2=1.303
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
20 retrieving revision 1.302
21 retrieving revision 1.303
22 diff -u -r1.302 -r1.303
23 --- ChangeLog 22 Sep 2008 16:58:13 -0000 1.302
24 +++ ChangeLog 15 Oct 2008 18:09:56 -0000 1.303
25 @@ -1,10 +1,16 @@
26 # ChangeLog for media-gfx/imagemagick
27 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.302 2008/09/22 16:58:13 maekke Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.303 2008/10/15 18:09:56 maekke Exp $
30
31 - 22 Sep 2008; Markus Meier <maekke@g.o>
32 - +files/imagemagick-6.4.3.5-svg-dep.patch, imagemagick-6.4.3.5.ebuild:
33 - fix bug #236643
34 +*imagemagick-6.4.4.6-r1 (15 Oct 2008)
35 +*imagemagick-6.4.4.6 (15 Oct 2008)
36 +
37 + 15 Oct 2008; Markus Meier <maekke@g.o> metadata.xml,
38 + +imagemagick-6.4.4.6.ebuild, +imagemagick-6.4.4.6-r1.ebuild:
39 + bump to 6.4.4.6 (bug #237174), add raw USE-flag (which pulls in
40 + media-gfx/ufraw, that's why some keywords are dropped) for bug #237174 and
41 + corefonts USE-flag for bug #239765. add support for the test-suite, but
42 + only run it if the same ${PV} is installed
43
44 *imagemagick-6.4.3.5 (29 Aug 2008)
45
46
47
48
49 1.7 media-gfx/imagemagick/metadata.xml
50
51 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/metadata.xml?rev=1.7&view=markup
52 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/metadata.xml?rev=1.7&content-type=text/plain
53 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/metadata.xml?r1=1.6&r2=1.7
54
55 Index: metadata.xml
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/metadata.xml,v
58 retrieving revision 1.6
59 retrieving revision 1.7
60 diff -u -r1.6 -r1.7
61 --- metadata.xml 16 Aug 2008 16:50:48 -0000 1.6
62 +++ metadata.xml 15 Oct 2008 18:09:56 -0000 1.7
63 @@ -3,6 +3,10 @@
64 <pkgmetadata>
65 <herd>graphics</herd>
66 <use>
67 + <flag name='corefonts'>
68 + pull in <pkg>media-fonts/corefonts</pkg>, which is required for some
69 + commands
70 + </flag>
71 <flag name='fpx'>
72 enable <pkg>media-libs/libfpx</pkg> support
73 </flag>
74
75
76
77 1.1 media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild
78
79 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild?rev=1.1&view=markup
80 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild?rev=1.1&content-type=text/plain
81
82 Index: imagemagick-6.4.4.6.ebuild
83 ===================================================================
84 # Copyright 1999-2008 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 # $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild,v 1.1 2008/10/15 18:09:56 maekke Exp $
87
88 EAPI="1"
89
90 inherit eutils multilib perl-app toolchain-funcs
91
92 MY_PN=ImageMagick
93 MY_P=${MY_PN}-${PV%.*}
94 MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
95
96 DESCRIPTION="A collection of tools and libraries for many image formats"
97 HOMEPAGE="http://www.imagemagick.org/"
98 SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
99
100 LICENSE="imagemagick"
101 SLOT="0"
102 KEYWORDS="~amd64 ~ppc ~x86"
103 IUSE="bzip2 +corefonts djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k
104 lcms nocxx openexr openmp perl png q8 q32 raw svg tiff truetype X wmf xml zlib"
105
106 RDEPEND="bzip2? ( app-arch/bzip2 )
107 djvu? ( app-text/djvu )
108 fontconfig? ( media-libs/fontconfig )
109 fpx? ( media-libs/libfpx )
110 graphviz? ( >=media-gfx/graphviz-2.6 )
111 gs? ( virtual/ghostscript )
112 jbig? ( media-libs/jbigkit )
113 jpeg? ( >=media-libs/jpeg-6b )
114 jpeg2k? ( media-libs/jasper )
115 lcms? ( >=media-libs/lcms-1.06 )
116 openexr? ( media-libs/openexr )
117 perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
118 png? ( media-libs/libpng )
119 raw? ( media-gfx/ufraw )
120 tiff? ( >=media-libs/tiff-3.5.5 )
121 truetype? ( =media-libs/freetype-2*
122 corefonts? ( media-fonts/corefonts ) )
123 wmf? ( >=media-libs/libwmf-0.2.8 )
124 xml? ( >=dev-libs/libxml2-2.4.10 )
125 zlib? ( sys-libs/zlib )
126 X? (
127 x11-libs/libXext
128 x11-libs/libXt
129 x11-libs/libICE
130 x11-libs/libSM
131 svg? ( >=gnome-base/librsvg-2.9.0 )
132 )
133 !dev-perl/perlmagick
134 !sys-apps/compare
135 >=sys-devel/libtool-1.5.2-r6"
136
137 DEPEND="${RDEPEND}
138 >=sys-apps/sed-4
139 X? ( x11-proto/xextproto )"
140
141 S="${WORKDIR}/${MY_P}"
142
143 pkg_setup() {
144 if use djvu && ! built_with_use app-text/djvu threads; then
145 eerror "app-text/djvu has to be built with threads support."
146 die "build app-text/djvu with USE=\"threads\""
147 fi
148 # for now, only build svg support when X is enabled, as librsvg
149 # pulls in quite some X dependencies.
150 if use svg && ! use X ; then
151 elog "the svg USE-flag requires the X USE-flag set."
152 elog "disabling svg support for now."
153 fi
154
155 if use corefonts && ! use truetype ; then
156 elog "corefonts USE-flag requires the truetype USE-flag to be set."
157 elog "disabling corefonts support for now"
158 fi
159 }
160
161 src_unpack() {
162 unpack ${A}
163
164 # fix doc dir, bug 91911
165 sed -i -e \
166 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
167 "${S}"/configure || die
168 }
169
170 src_compile() {
171 local myconf
172 if use q32 ; then
173 myconf="${myconf} --with-quantum-depth=32"
174 elif use q8 ; then
175 myconf="${myconf} --with-quantum-depth=8"
176 else
177 myconf="${myconf} --with-quantum-depth=16"
178 fi
179
180 if use X && use svg ; then
181 myconf="${myconf} --with-rsvg"
182 else
183 myconf="${myconf} --without-rsvg"
184 fi
185
186 #openmp support only works with >=sys-devel/gcc-4.3
187 # see bug #223825
188 if use openmp && built_with_use --missing false sys-devel/gcc openmp; then
189 if [[ $(gcc-version) != "4.3" ]] ; then
190 ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling."
191 myconf="${myconf} --disable-openmp"
192 else
193 myconf="${myconf} --enable-openmp"
194 fi
195 else
196 elog "disabling openmp support"
197 myconf="${myconf} --disable-openmp"
198 fi
199
200 use truetype && myconf="${myconf} $(use_with truetype windows-font-dir /usr/share/fonts/corefonts)"
201
202 econf \
203 ${myconf} \
204 --without-included-ltdl \
205 --with-ltdl-include=/usr/include \
206 --with-ltdl-lib=/usr/$(get_libdir) \
207 --with-threads \
208 --with-modules \
209 $(use_with perl) \
210 --with-gs-font-dir=/usr/share/fonts/default/ghostscript \
211 $(use_enable hdri) \
212 $(use_with !nocxx magick-plus-plus) \
213 $(use_with bzip2 bzlib) \
214 $(use_with djvu) \
215 $(use_with fontconfig) \
216 $(use_with fpx) \
217 $(use_with gs dps) \
218 $(use_with gs gslib) \
219 $(use_with graphviz gvc) \
220 $(use_with jbig) \
221 $(use_with jpeg jpeg) \
222 $(use_with jpeg2k jp2) \
223 $(use_with lcms) \
224 $(use_with openexr) \
225 $(use_with png) \
226 $(use_with svg rsvg) \
227 $(use_with tiff) \
228 $(use_with truetype freetype) \
229 $(use_with wmf) \
230 $(use_with xml) \
231 $(use_with zlib) \
232 $(use_with X x) \
233 || die "econf failed"
234 emake || die "compile problem"
235 }
236
237 src_test() {
238 # make check only works after make install,
239 # --> only run if this version is already installed
240 if has_version ~${CATEGORY}/${P} ; then
241 emake -j1 check || die "make check failed"
242 fi
243 }
244
245 src_install() {
246 emake DESTDIR="${D}" install || die "Installation of files into image failed"
247
248 # dont need these files with runtime plugins
249 rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
250
251 use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
252 dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
253
254 # Fix perllocal.pod file collision
255 use perl && fixlocalpod
256 }
257
258
259
260 1.1 media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild
261
262 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild?rev=1.1&view=markup
263 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild?rev=1.1&content-type=text/plain
264
265 Index: imagemagick-6.4.4.6-r1.ebuild
266 ===================================================================
267 # Copyright 1999-2008 Gentoo Foundation
268 # Distributed under the terms of the GNU General Public License v2
269 # $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild,v 1.1 2008/10/15 18:09:56 maekke Exp $
270
271 EAPI="2"
272
273 inherit eutils multilib perl-app toolchain-funcs
274
275 MY_PN=ImageMagick
276 MY_P=${MY_PN}-${PV%.*}
277 MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
278
279 DESCRIPTION="A collection of tools and libraries for many image formats"
280 HOMEPAGE="http://www.imagemagick.org/"
281 SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
282
283 LICENSE="imagemagick"
284 SLOT="0"
285 KEYWORDS="~amd64 ~ppc ~x86"
286 IUSE="bzip2 +corefonts djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k
287 lcms nocxx openexr openmp perl png q8 q32 raw svg tiff truetype X wmf xml zlib"
288
289 RDEPEND="bzip2? ( app-arch/bzip2 )
290 djvu? ( app-text/djvu[threads] )
291 fontconfig? ( media-libs/fontconfig )
292 fpx? ( media-libs/libfpx )
293 graphviz? ( >=media-gfx/graphviz-2.6 )
294 gs? ( virtual/ghostscript )
295 jbig? ( media-libs/jbigkit )
296 jpeg? ( >=media-libs/jpeg-6b )
297 jpeg2k? ( media-libs/jasper )
298 lcms? ( >=media-libs/lcms-1.06 )
299 openexr? ( media-libs/openexr )
300 perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
301 png? ( media-libs/libpng )
302 raw? ( media-gfx/ufraw )
303 tiff? ( >=media-libs/tiff-3.5.5 )
304 truetype? ( =media-libs/freetype-2*
305 corefonts? ( media-fonts/corefonts ) )
306 wmf? ( >=media-libs/libwmf-0.2.8 )
307 xml? ( >=dev-libs/libxml2-2.4.10 )
308 zlib? ( sys-libs/zlib )
309 X? (
310 x11-libs/libXext
311 x11-libs/libXt
312 x11-libs/libICE
313 x11-libs/libSM
314 svg? ( >=gnome-base/librsvg-2.9.0 )
315 )
316 !dev-perl/perlmagick
317 !sys-apps/compare
318 >=sys-devel/libtool-1.5.2-r6"
319
320 DEPEND="${RDEPEND}
321 >=sys-apps/sed-4
322 X? ( x11-proto/xextproto )"
323
324 S="${WORKDIR}/${MY_P}"
325
326 pkg_setup() {
327 # for now, only build svg support when X is enabled, as librsvg
328 # pulls in quite some X dependencies.
329 if use svg && ! use X ; then
330 elog "the svg USE-flag requires the X USE-flag set."
331 elog "disabling svg support for now."
332 fi
333
334 if use corefonts && ! use truetype ; then
335 elog "corefonts USE-flag requires the truetype USE-flag to be set."
336 elog "disabling corefonts support for now"
337 fi
338 }
339
340 src_prepare() {
341 # fix doc dir, bug 91911
342 sed -i -e \
343 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
344 "${S}"/configure || die
345 }
346
347 src_configure() {
348 local myconf
349 if use q32 ; then
350 myconf="${myconf} --with-quantum-depth=32"
351 elif use q8 ; then
352 myconf="${myconf} --with-quantum-depth=8"
353 else
354 myconf="${myconf} --with-quantum-depth=16"
355 fi
356
357 if use X && use svg ; then
358 myconf="${myconf} --with-rsvg"
359 else
360 myconf="${myconf} --without-rsvg"
361 fi
362
363 #openmp support only works with >=sys-devel/gcc-4.3
364 # see bug #223825
365 if use openmp && built_with_use --missing false sys-devel/gcc openmp; then
366 if [[ $(gcc-version) != "4.3" ]] ; then
367 ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling."
368 myconf="${myconf} --disable-openmp"
369 else
370 myconf="${myconf} --enable-openmp"
371 fi
372 else
373 elog "disabling openmp support"
374 myconf="${myconf} --disable-openmp"
375 fi
376
377 use truetype && myconf="${myconf} $(use_with truetype windows-font-dir /usr/share/fonts/corefonts)"
378
379 econf \
380 ${myconf} \
381 --without-included-ltdl \
382 --with-ltdl-include=/usr/include \
383 --with-ltdl-lib=/usr/$(get_libdir) \
384 --with-threads \
385 --with-modules \
386 $(use_with perl) \
387 --with-gs-font-dir=/usr/share/fonts/default/ghostscript \
388 $(use_enable hdri) \
389 $(use_with !nocxx magick-plus-plus) \
390 $(use_with bzip2 bzlib) \
391 $(use_with djvu) \
392 $(use_with fontconfig) \
393 $(use_with fpx) \
394 $(use_with gs dps) \
395 $(use_with gs gslib) \
396 $(use_with graphviz gvc) \
397 $(use_with jbig) \
398 $(use_with jpeg jpeg) \
399 $(use_with jpeg2k jp2) \
400 $(use_with lcms) \
401 $(use_with openexr) \
402 $(use_with png) \
403 $(use_with svg rsvg) \
404 $(use_with tiff) \
405 $(use_with truetype freetype) \
406 $(use_with wmf) \
407 $(use_with xml) \
408 $(use_with zlib) \
409 $(use_with X x) \
410 || die "econf failed"
411 }
412
413 src_test() {
414 # make check only works after make install,
415 # --> only run if this version is already installed
416 if has_version ~${CATEGORY}/${P} ; then
417 emake -j1 check || die "make check failed"
418 fi
419 }
420
421 src_install() {
422 emake DESTDIR="${D}" install || die "Installation of files into image failed"
423
424 # dont need these files with runtime plugins
425 rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
426
427 use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
428 dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
429
430 # Fix perllocal.pod file collision
431 use perl && fixlocalpod
432 }
Report Message
Find on MARC Find on Google Groups