Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: metadata.xml ChangeLog imagemagick-6.6.3.0.ebuild
Date: Mon, 26 Jul 2010 15:10:13
Message-Id: 20100726151006.3E12C2CE15@corvid.gentoo.org
1 ssuominen 10/07/26 15:10:06
2
3 Modified: metadata.xml ChangeLog
4 Added: imagemagick-6.6.3.0.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.11 media-gfx/imagemagick/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/metadata.xml?rev=1.11&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/metadata.xml?rev=1.11&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/metadata.xml?r1=1.10&r2=1.11
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/metadata.xml,v
19 retrieving revision 1.10
20 retrieving revision 1.11
21 diff -u -r1.10 -r1.11
22 --- metadata.xml 27 May 2010 10:47:15 -0000 1.10
23 +++ metadata.xml 26 Jul 2010 15:10:05 -0000 1.11
24 @@ -7,6 +7,10 @@
25 use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector
26 graphics
27 </flag>
28 + <flag name='corefonts'>
29 + pull in <pkg>media-fonts/corefonts</pkg>, which is required for some
30 + commands
31 + </flag>
32 <flag name='fpx'>
33 enable <pkg>media-libs/libfpx</pkg> support
34 </flag>
35
36
37
38 1.409 media-gfx/imagemagick/ChangeLog
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.409&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.409&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.408&r2=1.409
43
44 Index: ChangeLog
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
47 retrieving revision 1.408
48 retrieving revision 1.409
49 diff -u -r1.408 -r1.409
50 --- ChangeLog 23 Jul 2010 21:28:34 -0000 1.408
51 +++ ChangeLog 26 Jul 2010 15:10:05 -0000 1.409
52 @@ -1,6 +1,13 @@
53 # ChangeLog for media-gfx/imagemagick
54 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.408 2010/07/23 21:28:34 ssuominen Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.409 2010/07/26 15:10:05 ssuominen Exp $
57 +
58 +*imagemagick-6.6.3.0 (26 Jul 2010)
59 +
60 + 26 Jul 2010; Samuli Suominen <ssuominen@g.o>
61 + +imagemagick-6.6.3.0.ebuild, metadata.xml:
62 + Version bump with reintroduced coreutils USE flag wrt #323309 by Dennis
63 + Schridde.
64
65 23 Jul 2010; Samuli Suominen <ssuominen@g.o>
66 imagemagick-6.6.2.5.ebuild:
67
68
69
70 1.1 media-gfx/imagemagick/imagemagick-6.6.3.0.ebuild
71
72 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.3.0.ebuild?rev=1.1&view=markup
73 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.3.0.ebuild?rev=1.1&content-type=text/plain
74
75 Index: imagemagick-6.6.3.0.ebuild
76 ===================================================================
77 # Copyright 1999-2010 Gentoo Foundation
78 # Distributed under the terms of the GNU General Public License v2
79 # $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.3.0.ebuild,v 1.1 2010/07/26 15:10:06 ssuominen Exp $
80
81 EAPI=3
82 inherit multilib toolchain-funcs versionator
83
84 MY_P=ImageMagick-$(replace_version_separator 3 '-')
85
86 DESCRIPTION="A collection of tools and libraries for many image formats"
87 HOMEPAGE="http://www.imagemagick.org/"
88 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
89
90 LICENSE="imagemagick"
91 SLOT="0"
92 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
93 IUSE="autotrace bzip2 +corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr openexr openmp perl png q32 q8 raw static-libs svg tiff truetype wmf X xml zlib"
94 IUSE="${IUSE} video_cards_nvidia" # opencl support
95
96 RDEPEND=">=sys-devel/libtool-2.2.6b
97 autotrace? ( >=media-gfx/autotrace-0.31.1 )
98 bzip2? ( app-arch/bzip2 )
99 djvu? ( app-text/djvu )
100 fftw? ( sci-libs/fftw )
101 fontconfig? ( media-libs/fontconfig )
102 fpx? ( media-libs/libfpx )
103 graphviz? ( >=media-gfx/graphviz-2.6 )
104 gs? ( app-text/ghostscript-gpl )
105 jbig? ( media-libs/jbigkit )
106 jpeg? ( virtual/jpeg )
107 jpeg2k? ( media-libs/jasper )
108 lcms? ( =media-libs/lcms-2* )
109 lqr? ( >=media-libs/liblqr-0.1.0 )
110 openexr? ( media-libs/openexr )
111 perl? ( >=dev-lang/perl-5.8.6-r6 )
112 png? ( >=media-libs/libpng-1.4 )
113 raw? ( media-gfx/ufraw )
114 svg? ( >=gnome-base/librsvg-2.9.0 )
115 tiff? ( >=media-libs/tiff-3.5.5 )
116 truetype? ( =media-libs/freetype-2*
117 corefonts? ( media-fonts/corefonts ) )
118 video_cards_nvidia? ( x11-drivers/nvidia-drivers )
119 wmf? ( >=media-libs/libwmf-0.2.8 )
120 X? (
121 x11-libs/libXext
122 x11-libs/libXt
123 x11-libs/libICE
124 x11-libs/libSM
125 )
126 xml? ( >=dev-libs/libxml2-2.4.10 )
127 zlib? ( sys-libs/zlib )
128 !dev-perl/perlmagick
129 !media-gfx/graphicsmagick[imagemagick]"
130 DEPEND="${RDEPEND}
131 app-arch/xz-utils
132 >=sys-apps/sed-4
133 X? ( x11-proto/xextproto )"
134
135 S=${WORKDIR}/${MY_P}
136
137 RESTRICT="perl? ( userpriv )"
138
139 src_prepare() {
140 sed -i \
141 -e "/^DOCUMENTATION_RELATIVE_PATH/s:=.*:=${PF}:" \
142 configure || die
143 }
144
145 src_configure() {
146 local depth=16
147 use q8 && depth=8
148 use q32 && depth=32
149
150 local openmp=disable
151 if use openmp && tc-has-openmp; then
152 openmp=enable
153 fi
154
155 local myconf
156 if use truetype; then
157 myconf="$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
158 else
159 myconf="--without-corefonts"
160 fi
161
162 econf \
163 --disable-dependency-tracking \
164 $(use_enable static-libs static) \
165 $(use_enable hdri) \
166 $(use_enable video_cards_nvidia opencl) \
167 --with-threads \
168 --without-included-ltdl \
169 --with-ltdl-include="${EPREFIX}/usr/include" \
170 --with-ltdl-lib="${EPREFIX}/usr/$(get_libdir)" \
171 --with-modules \
172 --with-quantum-depth=${depth} \
173 $(use_with cxx magick-plus-plus) \
174 $(use_with perl) \
175 --with-perl-options='INSTALLDIRS=vendor' \
176 --with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \
177 $(use_with bzip2 bzlib) \
178 $(use_with X x) \
179 $(use_with zlib) \
180 $(use_with autotrace) \
181 $(use_with gs dps) \
182 $(use_with djvu) \
183 --with-dejavu-font-dir="${EPREFIX}/usr/share/fonts/dejavu" \
184 $(use_with fftw) \
185 $(use_with fpx) \
186 $(use_with fontconfig) \
187 $(use_with truetype freetype) \
188 $(use_with gs gslib) \
189 $(use_with graphviz gvc) \
190 $(use_with jbig) \
191 $(use_with jpeg) \
192 $(use_with jpeg2k jp2) \
193 --without-lcms \
194 $(use_with lcms lcms2) \
195 $(use_with lqr) \
196 $(use_with openexr) \
197 $(use_with png) \
198 $(use_with svg rsvg) \
199 $(use_with tiff) \
200 ${myconf} \
201 $(use_with wmf) \
202 $(use_with xml) \
203 --${openmp}-openmp
204 }
205
206 src_test() {
207 if has_version ~${CATEGORY}/${P}; then
208 emake -j1 check || die
209 else
210 ewarn "Skipping tests because installed version doesn't match."
211 fi
212 }
213
214 src_install() {
215 emake DESTDIR="${D}" install || die
216 dodoc AUTHORS.txt ChangeLog NEWS.txt README.txt
217
218 if use perl; then
219 find "${ED}" -type f -name perllocal.pod -delete
220 find "${ED}" -depth -mindepth 1 -type d -empty -delete
221 fi
222 }