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: Tue, 03 Jul 2018 10:20:35
Message-Id: 1530612252.3ee53438272b1e57ebc57795f30a9bbc6968b42c.polynomial-c@gentoo
1 commit: 3ee53438272b1e57ebc57795f30a9bbc6968b42c
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 3 10:04:12 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 3 10:04:12 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee53438
7
8 media-gfx/imagemagick: Removed old.
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 media-gfx/imagemagick/Manifest | 2 -
13 media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild | 185 ----------------------
14 media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild | 185 ----------------------
15 3 files changed, 372 deletions(-)
16
17 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
18 index 4d1bc713b6c..96395572c9f 100644
19 --- a/media-gfx/imagemagick/Manifest
20 +++ b/media-gfx/imagemagick/Manifest
21 @@ -1,10 +1,8 @@
22 DIST ImageMagick-6.9.10-1.tar.xz 8918684 BLAKE2B 62e77bed14b2a82f2fd2e429142c4200d7b243caa3ed8ff11be672d1c0a9094b7916dcbac11f0876cf46e6aa4753044e0cbe0c25dacafe5966f49d3f586bb747 SHA512 570edd18299982769a471ae37b7458401b13aa7802fd9f6ae8a72a2ece34cbf9b30e42a9f06abe62a6b01cc3573fc16d4c43a732260e0dedc8da54fef82f74a4
23 DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
24 DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
25 -DIST ImageMagick-6.9.9-43.tar.xz 8912476 BLAKE2B e6106b321c68c05f048eeaa0beaaa87fe724556d9b16842bd0643d806f3a2cfae3016bc835dd9fe1f9842e8fd61ee52c6ddceea6ce44d9c265387cfd35b57d89 SHA512 ff5b7daf521b6e0ae8cc123a56eca72e2abafd08101f0134866745ddafe21c9a08a1f6c73218bc3d95d8afc79dd0f66926d514b2c6083468391efead5afac6e7
26 DIST ImageMagick-6.9.9-47.tar.xz 8918196 BLAKE2B f28948d5728cbd2b011091ded2c12b507d1939ae5f2e0872c098ea488a3668d5f15782de023a6775a60790feeabcbab3ae62917f5f160bbc5ec59b65527775d5 SHA512 7bf7ae7fc276c2857f546370851ef7aaf1704c1b5bbad1a739d964e8e48a4ece9d9274e154a5aaa18c24f31e60e03d2df661cca922a3fff780cbcddd86524cb5
27 DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
28 DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
29 -DIST ImageMagick-7.0.7-31.tar.xz 8613064 BLAKE2B 6d4f731002cf099b5fc007e645fbfec32fb87b5f9b77f1c8a15897fed44c5fe55f8d356775675c709cf3ea600a2cbf67b8b9c7d7a0cec5c55647714d5d0ade27 SHA512 6575c009b021eb759e2129908e8deafcfa766758aae0b8f51d8b0c555444440c404bf20df63671259315b7e33476322217e3239aa2ba1c8b938996d54e988ee5
30 DIST ImageMagick-7.0.7-35.tar.xz 8614296 BLAKE2B 7c3c65d3fa630040febd40370fe93d3ba946b3d71cfef4daa340154a111f58af8e5028813fd35d1db99796d691f4d13999c3030b8ab7dc82494d0d89e2853359 SHA512 65aac1f1b4546212608acc1bf8b7b0a6fc7e45c9273183725dcfaf04e16948112fd4cfb295d88e5860dff66f04c54cc504af067e32c46cf8662f4ff72c64688a
31 DIST ImageMagick-7.0.8-1.tar.xz 8606196 BLAKE2B fd7bd794793cd9bb063023f2f7f36272efb99a1b75082dd3f71a244b7cb0e28971ff091af5b8a575084f42bd5a4639641b44831dae0cc52ea03d6624a650f01e SHA512 e7f2acb9a7912bb68dced74b7a0381d4909b13aa4fa36e4f3c56479b7b24f8f91ff21c171e542bec63e2873a94adea4673c5351ce1d641f72e8279886eb4b224
32
33 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild
34 deleted file mode 100644
35 index 52e77059cb1..00000000000
36 --- a/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild
37 +++ /dev/null
38 @@ -1,185 +0,0 @@
39 -# Copyright 1999-2018 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="https://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-base/xorg-proto )"
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.31.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild
226 deleted file mode 100644
227 index 1db0353011d..00000000000
228 --- a/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild
229 +++ /dev/null
230 @@ -1,185 +0,0 @@
231 -# Copyright 1999-2018 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="https://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-base/xorg-proto )"
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 -}