Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/
Date: Fri, 04 Aug 2017 07:53:25
Message-Id: 1501833194.e1658f8bb1511ac66fe7dc2a1d00cfae4be4f43a.polynomial-c@gentoo
1 commit: e1658f8bb1511ac66fe7dc2a1d00cfae4be4f43a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 4 07:52:16 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 4 07:53:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1658f8b
7
8 media-gfx/imagemagick: Bump to versions 6.9.9.5 and 7.0.6.5
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 media-gfx/imagemagick/Manifest | 2 +
13 media-gfx/imagemagick/imagemagick-6.9.9.5.ebuild | 185 +++++++++++++++++++++++
14 media-gfx/imagemagick/imagemagick-7.0.6.5.ebuild | 185 +++++++++++++++++++++++
15 3 files changed, 372 insertions(+)
16
17 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
18 index 85e94649fb9..a1b2e467080 100644
19 --- a/media-gfx/imagemagick/Manifest
20 +++ b/media-gfx/imagemagick/Manifest
21 @@ -1,5 +1,7 @@
22 DIST ImageMagick-6.9.7-4.tar.xz 8797776 SHA256 68842c55ed9c958b84aae17974961cefff4212bf7146f09fd15c09dbdc2d9629 SHA512 9ee9cf01c486575183a67e418bdbdcf4ac2b7ea2f9ff033db6a74f8271af0567da00f020dd8c18e042221d20444bed21d5d5256944ddeaf9916b62bf1844acf6 WHIRLPOOL 7c75006dafd28bb0fe02e130b4fcbae5fe54c6fbfdb29ba6b49796a14354e7aeb56b80c498eb57a4a8c7b383af025406dfeba66735ba89fd35d61125b51e7d41
23 DIST ImageMagick-6.9.8-6.tar.xz 8772452 SHA256 dc587a30457d1b42fa980fe7d94bfad906407ad811335e60f5eb673b3a17afeb SHA512 9bd05db02f0565063d6513620567e54b66521dc49b9dd26a83e68d1aab3ca599b9b34ba0661df2e3a88042b88806db156f6a1e9598c34d76307c0fb4ad0c4271 WHIRLPOOL de126414da7b8bfc99102ad7ff3e3d181bc584561344b29c927f66531ecf797ef5e95100279af7a20372a13be67829565d47c612676089419d413ddfa84fa632
24 DIST ImageMagick-6.9.9-0.tar.xz 8780640 SHA256 0a8a091dc4f57ec486e03285a1c30dc3f062d58133f848b6274dfc6ae5dbb60b SHA512 ddd2042e5d9fd2ee9ba91f65c7be3f0cf1a8ce340be9cefaaca2517073d2319b43b7190c5302c92e845f8e250d87681e375aec7238ca93401b42dd248776e338 WHIRLPOOL 603965b07098c3963ab5c089ee4a3fa4b1d36eb8fa52d1e5c22d2dd9bdd6b5ffa165713274fb524991faffe447ce7df14df40c8848f1436e7b86c25d901eda45
25 +DIST ImageMagick-6.9.9-5.tar.xz 8778956 SHA256 aa6444ece8d29b87fb4f25e997cd0b4fb48774206cea9490c6028babdee7d056 SHA512 d8d5bab4110157b80c6cec2fa5529a145a27814596e850cd42700aab5351f204c154cfc584badd5dcbdb754acaa2f97e419952661570847648c0b558a0ae9e23 WHIRLPOOL 5920af3e3c66f8cdf141c2a801193d2b06eb8d1b1287f48732e82cf42b7ba14667798838fbc5cbe6e4ee188e3620f865448293c27752194add4212cf3d0c9f84
26 DIST ImageMagick-7.0.5-7.tar.xz 8261496 SHA256 f72d089074d6c968bab38d1c18b22bd92c876e7ae23f7261db0b7c3552186586 SHA512 b634d4bba00fb3a344af350c29d8ecb397901c05cafece1de136a1d8f95e65a1324b4f035b5ed021d505980e8b373ddd4995805b73ed48a257039aa829e58855 WHIRLPOOL 1ac5e950fdf57e2000fae3c1817725e2ea86f41e6e51661a4cb93a47b83cba9864874d3d3662831fbd66308e2816744d9a7532ebeea1c615e3bad9a879a5f0a9
27 DIST ImageMagick-7.0.6-1.tar.xz 8546292 SHA256 7a273e0428a817a240fa0b37d209e41285676189cb9969abdb8b1d7d01d36fc4 SHA512 09c6cf0fa3f7f04dc806ad49e5324e8f051e79032f6d9ef83235c130764c931942ee90d643476c92f36fd49a53d3fd195553b658f2f937b82b4950e57724bcfb WHIRLPOOL 107a11ff2a8671a570ab45768645e3f3af900d35b850cd8b858906515061adfe97d1cb4b7ce570d123de46e0585403b97364ec9f99c0aa16ac5d78568f0892af
28 +DIST ImageMagick-7.0.6-5.tar.xz 8560400 SHA256 5dbcd45b67514fe1981703759d008f9aa2c6b6201917679dfd35776c904e51b2 SHA512 58caab37aba176ead238d7784ec8a584f93f3ff63e6f298d1b56173b9d25510fabb8c772bf8408c9441b1c8528d71db82c3d813f061e5a2219bf3df2cada09e4 WHIRLPOOL 25dfd31a73b83597e3c4f90d24149486374e7b3c80997014ebd65b09cc48b3fc8e965485f77bfb24f65ff4f59312a975254c05b7d20665d133715a6975affc0e
29
30 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.5.ebuild
31 new file mode 100644
32 index 00000000000..d91b5ff35ee
33 --- /dev/null
34 +++ b/media-gfx/imagemagick/imagemagick-6.9.9.5.ebuild
35 @@ -0,0 +1,185 @@
36 +# Copyright 1999-2017 Gentoo Foundation
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=6
40 +
41 +inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
42 +
43 +MY_P=ImageMagick-$(replace_version_separator 3 '-')
44 +
45 +DESCRIPTION="A collection of tools and libraries for many image formats"
46 +HOMEPAGE="http://www.imagemagick.org/"
47 +SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
48 +
49 +LICENSE="imagemagick"
50 +SLOT="0/${PV}"
51 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
52 +IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
53 +
54 +RESTRICT="perl? ( userpriv )"
55 +
56 +RDEPEND="
57 + dev-libs/libltdl:0
58 + bzip2? ( app-arch/bzip2 )
59 + corefonts? ( media-fonts/corefonts )
60 + djvu? ( app-text/djvu )
61 + fftw? ( sci-libs/fftw:3.0 )
62 + fontconfig? ( media-libs/fontconfig )
63 + fpx? ( >=media-libs/libfpx-1.3.0-r1 )
64 + graphviz? ( media-gfx/graphviz )
65 + jbig? ( >=media-libs/jbigkit-2:= )
66 + jpeg? ( virtual/jpeg:0 )
67 + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
68 + lcms? ( media-libs/lcms:2= )
69 + lqr? ( media-libs/liblqr )
70 + opencl? ( virtual/opencl )
71 + openexr? ( media-libs/openexr:0= )
72 + pango? ( x11-libs/pango )
73 + perl? ( >=dev-lang/perl-5.8.8:0= )
74 + png? ( media-libs/libpng:0= )
75 + postscript? ( app-text/ghostscript-gpl )
76 + raw? ( media-gfx/ufraw )
77 + svg? ( gnome-base/librsvg )
78 + tiff? ( media-libs/tiff:0= )
79 + truetype? (
80 + media-fonts/urw-fonts
81 + >=media-libs/freetype-2
82 + )
83 + webp? ( media-libs/libwebp:0= )
84 + wmf? ( media-libs/libwmf )
85 + X? (
86 + x11-libs/libICE
87 + x11-libs/libSM
88 + x11-libs/libXext
89 + x11-libs/libXt
90 + )
91 + xml? ( dev-libs/libxml2:= )
92 + lzma? ( app-arch/xz-utils )
93 + zlib? ( sys-libs/zlib:= )"
94 +DEPEND="${RDEPEND}
95 + !media-gfx/graphicsmagick[imagemagick]
96 + virtual/pkgconfig
97 + X? ( x11-proto/xextproto )"
98 +
99 +REQUIRED_USE="corefonts? ( truetype )
100 + test? ( corefonts )"
101 +
102 +S=${WORKDIR}/${MY_P}
103 +
104 +src_prepare() {
105 + local mesa_cards ati_cards nvidia_cards render_cards
106 + default
107 +
108 + elibtoolize # for Darwin modules
109 +
110 + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
111 + shopt -s nullglob
112 + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
113 + if test -n "${ati_cards}"; then
114 + addpredict "${ati_cards}"
115 + fi
116 + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
117 + if test -n "${mesa_cards}"; then
118 + addpredict "${mesa_cards}"
119 + fi
120 + nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
121 + if test -n "${nvidia_cards}"; then
122 + addpredict "${nvidia_cards}"
123 + fi
124 + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
125 + if test -n "${render_cards}"; then
126 + addpredict "${render_cards}"
127 + fi
128 + shopt -u nullglob
129 + addpredict /dev/nvidiactl
130 +}
131 +
132 +src_configure() {
133 + local depth=16
134 + use q8 && depth=8
135 + use q32 && depth=32
136 +
137 + local openmp=disable
138 + use openmp && { tc-has-openmp && openmp=enable; }
139 +
140 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
141 +
142 + local myeconfargs=(
143 + $(use_enable static-libs static)
144 + $(use_enable hdri)
145 + $(use_enable opencl)
146 + --with-threads
147 + --with-modules
148 + --with-quantum-depth=${depth}
149 + $(use_with cxx magick-plus-plus)
150 + $(use_with perl)
151 + --with-perl-options='INSTALLDIRS=vendor'
152 + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
153 + $(use_with bzip2 bzlib)
154 + $(use_with X x)
155 + $(use_with zlib)
156 + --without-autotrace
157 + $(use_with postscript dps)
158 + $(use_with djvu)
159 + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
160 + $(use_with fftw)
161 + $(use_with fpx)
162 + $(use_with fontconfig)
163 + $(use_with truetype freetype)
164 + $(use_with postscript gslib)
165 + $(use_with graphviz gvc)
166 + $(use_with jbig)
167 + $(use_with jpeg)
168 + $(use_with jpeg2k openjp2)
169 + $(use_with lcms)
170 + $(use_with lqr)
171 + $(use_with lzma)
172 + $(use_with openexr)
173 + $(use_with pango)
174 + $(use_with png)
175 + $(use_with svg rsvg)
176 + $(use_with tiff)
177 + $(use_with webp)
178 + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
179 + $(use_with wmf)
180 + $(use_with xml)
181 + --${openmp}-openmp
182 + --with-gcc-arch=no-automagic
183 + )
184 + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
185 +}
186 +
187 +src_test() {
188 + LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
189 + emake check
190 +}
191 +
192 +src_install() {
193 + # Ensure documentation installation files and paths with each release!
194 + emake \
195 + DESTDIR="${D}" \
196 + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
197 + install
198 +
199 + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
200 + dodoc {AUTHORS,README}.txt ChangeLog
201 +
202 + if use perl; then
203 + find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
204 + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
205 + fi
206 +
207 + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
208 +
209 + if use opencl; then
210 + cat <<-EOF > "${T}"/99${PN}
211 + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
212 + EOF
213 +
214 + insinto /etc/sandbox.d
215 + doins "${T}"/99${PN} #472766
216 + fi
217 +
218 + insinto /usr/share/${PN}
219 + doins config/*icm
220 +}
221
222 diff --git a/media-gfx/imagemagick/imagemagick-7.0.6.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.6.5.ebuild
223 new file mode 100644
224 index 00000000000..fc7b7060e36
225 --- /dev/null
226 +++ b/media-gfx/imagemagick/imagemagick-7.0.6.5.ebuild
227 @@ -0,0 +1,185 @@
228 +# Copyright 1999-2017 Gentoo Foundation
229 +# Distributed under the terms of the GNU General Public License v2
230 +
231 +EAPI=6
232 +
233 +inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
234 +
235 +MY_P=ImageMagick-$(replace_version_separator 3 '-')
236 +
237 +DESCRIPTION="A collection of tools and libraries for many image formats"
238 +HOMEPAGE="http://www.imagemagick.org/"
239 +SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
240 +
241 +LICENSE="imagemagick"
242 +SLOT="0/${PV}"
243 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
244 +IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
245 +
246 +RESTRICT="perl? ( userpriv )"
247 +
248 +RDEPEND="
249 + dev-libs/libltdl:0
250 + bzip2? ( app-arch/bzip2 )
251 + corefonts? ( media-fonts/corefonts )
252 + djvu? ( app-text/djvu )
253 + fftw? ( sci-libs/fftw:3.0 )
254 + fontconfig? ( media-libs/fontconfig )
255 + fpx? ( >=media-libs/libfpx-1.3.0-r1 )
256 + graphviz? ( media-gfx/graphviz )
257 + jbig? ( >=media-libs/jbigkit-2:= )
258 + jpeg? ( virtual/jpeg:0 )
259 + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
260 + lcms? ( media-libs/lcms:2= )
261 + lqr? ( media-libs/liblqr )
262 + opencl? ( virtual/opencl )
263 + openexr? ( media-libs/openexr:0= )
264 + pango? ( x11-libs/pango )
265 + perl? ( >=dev-lang/perl-5.8.8:0= )
266 + png? ( media-libs/libpng:0= )
267 + postscript? ( app-text/ghostscript-gpl )
268 + raw? ( media-gfx/ufraw )
269 + svg? ( gnome-base/librsvg )
270 + tiff? ( media-libs/tiff:0= )
271 + truetype? (
272 + media-fonts/urw-fonts
273 + >=media-libs/freetype-2
274 + )
275 + webp? ( media-libs/libwebp:0= )
276 + wmf? ( media-libs/libwmf )
277 + X? (
278 + x11-libs/libICE
279 + x11-libs/libSM
280 + x11-libs/libXext
281 + x11-libs/libXt
282 + )
283 + xml? ( dev-libs/libxml2:= )
284 + lzma? ( app-arch/xz-utils )
285 + zlib? ( sys-libs/zlib:= )"
286 +DEPEND="${RDEPEND}
287 + !media-gfx/graphicsmagick[imagemagick]
288 + virtual/pkgconfig
289 + X? ( x11-proto/xextproto )"
290 +
291 +REQUIRED_USE="corefonts? ( truetype )
292 + test? ( corefonts )"
293 +
294 +S=${WORKDIR}/${MY_P}
295 +
296 +src_prepare() {
297 + local ati_cards mesa_cards nvidia_cards render_cards
298 + default
299 +
300 + elibtoolize # for Darwin modules
301 +
302 + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
303 + shopt -s nullglob
304 + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
305 + if test -n "${ati_cards}"; then
306 + addpredict "${ati_cards}"
307 + fi
308 + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
309 + if test -n "${mesa_cards}"; then
310 + addpredict "${mesa_cards}"
311 + fi
312 + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
313 + if test -n "${nvidia_cards}"; then
314 + addpredict "${nvidia_cards}"
315 + fi
316 + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
317 + if test -n "${render_cards}"; then
318 + addpredict "${render_cards}"
319 + fi
320 + shopt -u nullglob
321 + addpredict /dev/nvidiactl
322 +}
323 +
324 +src_configure() {
325 + local depth=16
326 + use q8 && depth=8
327 + use q32 && depth=32
328 +
329 + local openmp=disable
330 + use openmp && { tc-has-openmp && openmp=enable; }
331 +
332 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
333 +
334 + local myeconfargs=(
335 + $(use_enable static-libs static)
336 + $(use_enable hdri)
337 + $(use_enable opencl)
338 + --with-threads
339 + --with-modules
340 + --with-quantum-depth=${depth}
341 + $(use_with cxx magick-plus-plus)
342 + $(use_with perl)
343 + --with-perl-options='INSTALLDIRS=vendor'
344 + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
345 + $(use_with bzip2 bzlib)
346 + $(use_with X x)
347 + $(use_with zlib)
348 + --without-autotrace
349 + $(use_with postscript dps)
350 + $(use_with djvu)
351 + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
352 + $(use_with fftw)
353 + $(use_with fpx)
354 + $(use_with fontconfig)
355 + $(use_with truetype freetype)
356 + $(use_with postscript gslib)
357 + $(use_with graphviz gvc)
358 + $(use_with jbig)
359 + $(use_with jpeg)
360 + $(use_with jpeg2k openjp2)
361 + $(use_with lcms)
362 + $(use_with lqr)
363 + $(use_with lzma)
364 + $(use_with openexr)
365 + $(use_with pango)
366 + $(use_with png)
367 + $(use_with svg rsvg)
368 + $(use_with tiff)
369 + $(use_with webp)
370 + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
371 + $(use_with wmf)
372 + $(use_with xml)
373 + --${openmp}-openmp
374 + --with-gcc-arch=no-automagic
375 + )
376 + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
377 +}
378 +
379 +src_test() {
380 + LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
381 + emake check
382 +}
383 +
384 +src_install() {
385 + # Ensure documentation installation files and paths with each release!
386 + emake \
387 + DESTDIR="${D}" \
388 + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
389 + install
390 +
391 + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
392 + dodoc {AUTHORS,README}.txt ChangeLog
393 +
394 + if use perl; then
395 + find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
396 + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
397 + fi
398 +
399 + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
400 +
401 + if use opencl; then
402 + cat <<-EOF > "${T}"/99${PN}
403 + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
404 + EOF
405 +
406 + insinto /etc/sandbox.d
407 + doins "${T}"/99${PN} #472766
408 + fi
409 +
410 + insinto /usr/share/${PN}
411 + doins config/*icm
412 +}