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