Gentoo Archives: gentoo-commits

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