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/, media-gfx/imagemagick/files/
Date: Sat, 04 Aug 2018 23:26:25
Message-Id: 1533425161.3ff42ccd51d4f7ce5aeef730d7dbd296a98390cd.whissi@gentoo
1 commit: 3ff42ccd51d4f7ce5aeef730d7dbd296a98390cd
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 4 23:24:54 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 4 23:26:01 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff42ccd
7
8 media-gfx/imagemagick: security cleanup (bug #660826)
9
10 Package-Manager: Portage-2.3.44, Repoman-2.3.10
11
12 media-gfx/imagemagick/Manifest | 14 --
13 .../files/imagemagick-7.0.26-FTBFS-on-i386.patch | 36 ----
14 media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild | 186 --------------------
15 media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild | 188 ---------------------
16 media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild | 188 ---------------------
17 media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild | 186 --------------------
18 media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild | 185 --------------------
19 media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild | 185 --------------------
20 media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild | 185 --------------------
21 media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild | 185 --------------------
22 media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild | 185 --------------------
23 media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild | 185 --------------------
24 media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild | 186 --------------------
25 media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild | 188 ---------------------
26 media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild | 188 ---------------------
27 media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild | 186 --------------------
28 16 files changed, 2656 deletions(-)
29
30 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
31 index 5274c774776..6d9222c3352 100644
32 --- a/media-gfx/imagemagick/Manifest
33 +++ b/media-gfx/imagemagick/Manifest
34 @@ -1,16 +1,2 @@
35 -DIST ImageMagick-6.9.10-3.tar.xz 8922536 BLAKE2B 36936b28aac025bd948d9925707877b6f6b5a9eb50f1afc2f318a0596c9096b7853f4db44c42994fe32b7ba0fe42eafb9d705ead0faf6f75eb9e7e07bc1c97e4 SHA512 760e8b003415fcf6c83e542346800f1f2d8834cd47ba343eead1f0fa228f2f44af7ca9b4379de52498a3da76aa35f25d0ec939cefa71718400702bc6801fffbe
36 -DIST ImageMagick-6.9.10-5.tar.xz 8921204 BLAKE2B b11c6dded5b42b797585e8253441fa6265de9f06241206b9ce29781df6c8896e9dd0ec967191ff28fcae445130d38e7e781728cbc27752b33b3422d971459952 SHA512 b6c068918a2c23bc86d84a1fd81bd8c0aea83fee0c33b5c686c7c6180231be2b27c1c43be111555017d2065fa97ba36c084e1479ff771846b73d500d67c7f85b
37 -DIST ImageMagick-6.9.10-6.tar.xz 8913200 BLAKE2B 7009454e8d1d3bb27ef143dd3d0810df1548ff66d36cb48d0a91aee11246e2c2c4908947b95058b8cd2a83a4d69318564e4881a45636dca666fdec95e418c26a SHA512 984acc4610c205ead3b32ae4c059470dc4361e48cee6d9314bd3f8beed6b88b4adc824d59f059ead840293afae5595bdc3161e57ac9b2d4d49b90d32df46e49a
38 -DIST ImageMagick-6.9.10-7.tar.xz 8916444 BLAKE2B 59211b1fe876226f53999706b7d992306f67687ab6170e3a1846e66806ef92b4eb2808eea8bcc69ffe7ad40bef36fcd4417124b784534d474647b413747dbb1e SHA512 3bda2478b79d9a35dd7b3dd1206d23e2b8ddb71a881e1d8f036fa3488d10245c11587ef7f8624febc758af65ce0d28d642d485deffc033e144f791977aac7beb
39 DIST ImageMagick-6.9.10-8.tar.xz 8909952 BLAKE2B 0868759a5c6982c29d315bda69c1dec3b190fbea3757cf8e368b42976c9f35c4cd53610643e05e8872b0669768206559b2b726b494494f305b71dc2140d7d09c SHA512 63f131d4aa455e3f3a4a891359601d932aa6d43ff22fb9c6bed1a98a1a758da610db90cf951c131aaceabdbc8af0418d1a8e3752cabb39f95735ef18cd6745f2
40 -DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
41 -DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
42 -DIST ImageMagick-6.9.9-47.tar.xz 8918196 BLAKE2B f28948d5728cbd2b011091ded2c12b507d1939ae5f2e0872c098ea488a3668d5f15782de023a6775a60790feeabcbab3ae62917f5f160bbc5ec59b65527775d5 SHA512 7bf7ae7fc276c2857f546370851ef7aaf1704c1b5bbad1a739d964e8e48a4ece9d9274e154a5aaa18c24f31e60e03d2df661cca922a3fff780cbcddd86524cb5
43 -DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
44 -DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
45 -DIST ImageMagick-7.0.7-35.tar.xz 8614296 BLAKE2B 7c3c65d3fa630040febd40370fe93d3ba946b3d71cfef4daa340154a111f58af8e5028813fd35d1db99796d691f4d13999c3030b8ab7dc82494d0d89e2853359 SHA512 65aac1f1b4546212608acc1bf8b7b0a6fc7e45c9273183725dcfaf04e16948112fd4cfb295d88e5860dff66f04c54cc504af067e32c46cf8662f4ff72c64688a
46 -DIST ImageMagick-7.0.8-3.tar.xz 8613672 BLAKE2B c3ad7bb2d0917d2551b7c8ae0d80a8ab95e31d40cf18c26d7df363c3df209d7923a62a7fb90aec581fc4101139bc369a82289a96f51965f533b1956a9cfa4eed SHA512 0594de337c9eb1d116b15eeac0f1bceefeb86f13a41bc6721b120fa2e58f0ca5e2e1454b4e2b670c93545f13406f8bdbf54e5b3470e34841b5e9ac9d26821b70
47 -DIST ImageMagick-7.0.8-5.tar.xz 8611448 BLAKE2B 7a4f38ec458d010644d88cda605355d5871952b055ba9e088fe164448e2a0332e44e1545fc5929df455298ee56be65b66846faae4738912314177be050c683b0 SHA512 d760e630fd82b7636a031728e1f078efb8bb962e60cdc912cdfad29d3e6f74c1b5047941e711db89aa847d2e7c8c6ed44f451fa8ccff431c20d92ef49ef1915d
48 -DIST ImageMagick-7.0.8-6.tar.xz 8636756 BLAKE2B de30cbf334e47232c4f2addc789342a96da72f13f1f88d0db08462cf8ad80487d78dfae51f23a63c83100f78a60beb79781c44cff1b25f084badbb009fedf965 SHA512 4d498d2b7e9345b71e08a541aeaa1ee0ee62c781e92638cdd38a9a830b8fa291afece032b731ee79e1142d26cf94817356f0492cef257039beac33f865e9f588
49 -DIST ImageMagick-7.0.8-7.tar.xz 8634788 BLAKE2B dbb5103f314d83b4318b2cfd6dcb5931e4c20c7a2c8b8f57c52b85ea8a46ca27733a4828203723f337acbc5fb4dc2ae446b789a6d2ca46ad8e2e0d0f7973fc29 SHA512 b1db005899b7c55c1794be1edfb0596989d8e4b4e521a1dadf28b837ba16b337587ac0a0a17c1c441a0085df56cfc3386d9f750fa83fd5ea8e3eb2d1398e58cd
50 DIST ImageMagick-7.0.8-8.tar.xz 8639896 BLAKE2B 5971dbbee9726fab15e19e531bdbb50af710c67be84759030768958a33688b5492bb20758917c976dd9c08307031d041d5de7ae9a2326fecff6ba3a7dc226e84 SHA512 8cc18deb4c14feb71de2624637e1df708ddbcaebd543c03e177a1cfe6c2f63e09af7e787c730f11d3d0332659d2642e5076f6a83f3580f5c0afc8bdb9537733a
51
52 diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
53 deleted file mode 100644
54 index c568ed345ec..00000000000
55 --- a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch
56 +++ /dev/null
57 @@ -1,36 +0,0 @@
58 -Gentoo-Bug: https://bugs.gentoo.org/653752
59 -Upstream issue: https://github.com/ImageMagick/ImageMagick/issues/1019
60 -
61 -
62 -From 0c26fea274e615ff6b179bdd30e970a55f6c3f52 Mon Sep 17 00:00:00 2001
63 -From: Svante Signell <svante.signell@×××××.com>
64 -Date: Mon, 25 Jun 2018 16:06:19 +0200
65 -Subject: Fix FTBFS on i386 any
66 -
67 -bug-debian: https://bugs.debian.org/898914
68 ----
69 - Magick++/tests/attributes.cpp | 4 ++--
70 - 1 file changed, 2 insertions(+), 2 deletions(-)
71 -
72 -diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
73 -index 9ebc67f2d..e969def27 100644
74 ---- a/Magick++/tests/attributes.cpp
75 -+++ b/Magick++/tests/attributes.cpp
76 -@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv)
77 - //
78 -
79 - // Test default value.
80 -- if ( image.backgroundColor() != ColorRGB("white") )
81 -+ if ( image.backgroundColor() != string(ColorRGB("white")) )
82 - {
83 - ++failures;
84 - cout << "Line: " << __LINE__ << ", backgroundColor default ("
85 -@@ -1068,7 +1068,7 @@ int main( int /*argc*/, char ** argv)
86 - // pixelColor
87 - //
88 - // Test default
89 -- if ( image.pixelColor(40,60) != canvasColor )
90 -+ if ( image.pixelColor(40,60) != string(canvasColor) )
91 - {
92 - ++failures;
93 - cout << "Line: " << __LINE__ << ", pixelColor default ("
94
95 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
96 deleted file mode 100644
97 index 1d46b538e85..00000000000
98 --- a/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild
99 +++ /dev/null
100 @@ -1,186 +0,0 @@
101 -# Copyright 1999-2018 Gentoo Foundation
102 -# Distributed under the terms of the GNU General Public License v2
103 -
104 -EAPI=6
105 -
106 -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
107 -
108 -MY_P=ImageMagick-$(ver_rs 3 '-')
109 -
110 -DESCRIPTION="A collection of tools and libraries for many image formats"
111 -HOMEPAGE="https://www.imagemagick.org/"
112 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
113 -
114 -LICENSE="imagemagick"
115 -SLOT="0/${PV}"
116 -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"
117 -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"
118 -
119 -RESTRICT="perl? ( userpriv )"
120 -
121 -RDEPEND="
122 - dev-libs/libltdl:0
123 - bzip2? ( app-arch/bzip2 )
124 - corefonts? ( media-fonts/corefonts )
125 - djvu? ( app-text/djvu )
126 - fftw? ( sci-libs/fftw:3.0 )
127 - fontconfig? ( media-libs/fontconfig )
128 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
129 - graphviz? ( media-gfx/graphviz )
130 - jbig? ( >=media-libs/jbigkit-2:= )
131 - jpeg? ( virtual/jpeg:0 )
132 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
133 - lcms? ( media-libs/lcms:2= )
134 - lqr? ( media-libs/liblqr )
135 - opencl? ( virtual/opencl )
136 - openexr? ( media-libs/openexr:0= )
137 - pango? ( x11-libs/pango )
138 - perl? ( >=dev-lang/perl-5.8.8:0= )
139 - png? ( media-libs/libpng:0= )
140 - postscript? ( app-text/ghostscript-gpl )
141 - raw? ( media-libs/libraw:= )
142 - svg? ( gnome-base/librsvg )
143 - tiff? ( media-libs/tiff:0= )
144 - truetype? (
145 - media-fonts/urw-fonts
146 - >=media-libs/freetype-2
147 - )
148 - webp? ( media-libs/libwebp:0= )
149 - wmf? ( media-libs/libwmf )
150 - X? (
151 - x11-libs/libICE
152 - x11-libs/libSM
153 - x11-libs/libXext
154 - x11-libs/libXt
155 - )
156 - xml? ( dev-libs/libxml2:= )
157 - lzma? ( app-arch/xz-utils )
158 - zlib? ( sys-libs/zlib:= )"
159 -DEPEND="${RDEPEND}
160 - !media-gfx/graphicsmagick[imagemagick]
161 - virtual/pkgconfig
162 - X? ( x11-base/xorg-proto )"
163 -
164 -REQUIRED_USE="corefonts? ( truetype )
165 - test? ( corefonts )"
166 -
167 -S="${WORKDIR}/${MY_P}"
168 -
169 -src_prepare() {
170 - local mesa_cards ati_cards nvidia_cards render_cards
171 - default
172 -
173 - elibtoolize # for Darwin modules
174 -
175 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
176 - shopt -s nullglob
177 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
178 - if test -n "${ati_cards}"; then
179 - addpredict "${ati_cards}"
180 - fi
181 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
182 - if test -n "${mesa_cards}"; then
183 - addpredict "${mesa_cards}"
184 - fi
185 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
186 - if test -n "${nvidia_cards}"; then
187 - addpredict "${nvidia_cards}"
188 - fi
189 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
190 - if test -n "${render_cards}"; then
191 - addpredict "${render_cards}"
192 - fi
193 - shopt -u nullglob
194 - addpredict /dev/nvidiactl
195 -}
196 -
197 -src_configure() {
198 - local depth=16
199 - use q8 && depth=8
200 - use q32 && depth=32
201 -
202 - local openmp=disable
203 - use openmp && { tc-has-openmp && openmp=enable; }
204 -
205 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
206 -
207 - local myeconfargs=(
208 - $(use_enable static-libs static)
209 - $(use_enable hdri)
210 - $(use_enable opencl)
211 - --with-threads
212 - --with-modules
213 - --with-quantum-depth=${depth}
214 - $(use_with cxx magick-plus-plus)
215 - $(use_with perl)
216 - --with-perl-options='INSTALLDIRS=vendor'
217 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
218 - $(use_with bzip2 bzlib)
219 - $(use_with X x)
220 - $(use_with zlib)
221 - --without-autotrace
222 - $(use_with postscript dps)
223 - $(use_with djvu)
224 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
225 - $(use_with fftw)
226 - $(use_with fpx)
227 - $(use_with fontconfig)
228 - $(use_with truetype freetype)
229 - $(use_with postscript gslib)
230 - $(use_with graphviz gvc)
231 - $(use_with jbig)
232 - $(use_with jpeg)
233 - $(use_with jpeg2k openjp2)
234 - $(use_with lcms)
235 - $(use_with lqr)
236 - $(use_with lzma)
237 - $(use_with openexr)
238 - $(use_with pango)
239 - $(use_with png)
240 - $(use_with raw)
241 - $(use_with svg rsvg)
242 - $(use_with tiff)
243 - $(use_with webp)
244 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
245 - $(use_with wmf)
246 - $(use_with xml)
247 - --${openmp}-openmp
248 - --with-gcc-arch=no-automagic
249 - )
250 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
251 -}
252 -
253 -src_test() {
254 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
255 - emake check
256 -}
257 -
258 -src_install() {
259 - # Ensure documentation installation files and paths with each release!
260 - emake \
261 - DESTDIR="${D}" \
262 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
263 - install
264 -
265 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
266 - dodoc {AUTHORS,README}.txt ChangeLog
267 -
268 - if use perl; then
269 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
270 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
271 - fi
272 -
273 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
274 -
275 - if use opencl; then
276 - cat <<-EOF > "${T}"/99${PN}
277 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
278 - EOF
279 -
280 - insinto /etc/sandbox.d
281 - doins "${T}"/99${PN} #472766
282 - fi
283 -
284 - insinto /usr/share/${PN}
285 - doins config/*icm
286 -}
287
288 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
289 deleted file mode 100644
290 index 768f4c5cbe1..00000000000
291 --- a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild
292 +++ /dev/null
293 @@ -1,188 +0,0 @@
294 -# Copyright 1999-2018 Gentoo Foundation
295 -# Distributed under the terms of the GNU General Public License v2
296 -
297 -EAPI=6
298 -
299 -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
300 -
301 -MY_P=ImageMagick-$(ver_rs 3 '-')
302 -
303 -DESCRIPTION="A collection of tools and libraries for many image formats"
304 -HOMEPAGE="https://www.imagemagick.org/"
305 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
306 -
307 -LICENSE="imagemagick"
308 -SLOT="0/${PV}"
309 -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"
310 -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"
311 -
312 -RESTRICT="perl? ( userpriv )"
313 -
314 -RDEPEND="
315 - dev-libs/libltdl:0
316 - bzip2? ( app-arch/bzip2 )
317 - corefonts? ( media-fonts/corefonts )
318 - djvu? ( app-text/djvu )
319 - fftw? ( sci-libs/fftw:3.0 )
320 - fontconfig? ( media-libs/fontconfig )
321 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
322 - graphviz? ( media-gfx/graphviz )
323 - jbig? ( >=media-libs/jbigkit-2:= )
324 - jpeg? ( virtual/jpeg:0 )
325 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
326 - lcms? ( media-libs/lcms:2= )
327 - lqr? ( media-libs/liblqr )
328 - opencl? ( virtual/opencl )
329 - openexr? ( media-libs/openexr:0= )
330 - pango? ( x11-libs/pango )
331 - perl? ( >=dev-lang/perl-5.8.8:0= )
332 - png? ( media-libs/libpng:0= )
333 - postscript? ( app-text/ghostscript-gpl )
334 - raw? ( media-libs/libraw:= )
335 - svg? ( gnome-base/librsvg )
336 - tiff? ( media-libs/tiff:0= )
337 - truetype? (
338 - media-fonts/urw-fonts
339 - >=media-libs/freetype-2
340 - )
341 - webp? ( media-libs/libwebp:0= )
342 - wmf? ( media-libs/libwmf )
343 - X? (
344 - x11-libs/libICE
345 - x11-libs/libSM
346 - x11-libs/libXext
347 - x11-libs/libXt
348 - )
349 - xml? ( dev-libs/libxml2:= )
350 - lzma? ( app-arch/xz-utils )
351 - zlib? ( sys-libs/zlib:= )"
352 -DEPEND="${RDEPEND}
353 - !media-gfx/graphicsmagick[imagemagick]
354 - virtual/pkgconfig
355 - X? ( x11-base/xorg-proto )"
356 -
357 -REQUIRED_USE="corefonts? ( truetype )
358 - test? ( corefonts )"
359 -
360 -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
361 -
362 -S="${WORKDIR}/${MY_P}"
363 -
364 -src_prepare() {
365 - local mesa_cards ati_cards nvidia_cards render_cards
366 - default
367 -
368 - elibtoolize # for Darwin modules
369 -
370 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
371 - shopt -s nullglob
372 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
373 - if test -n "${ati_cards}"; then
374 - addpredict "${ati_cards}"
375 - fi
376 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
377 - if test -n "${mesa_cards}"; then
378 - addpredict "${mesa_cards}"
379 - fi
380 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
381 - if test -n "${nvidia_cards}"; then
382 - addpredict "${nvidia_cards}"
383 - fi
384 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
385 - if test -n "${render_cards}"; then
386 - addpredict "${render_cards}"
387 - fi
388 - shopt -u nullglob
389 - addpredict /dev/nvidiactl
390 -}
391 -
392 -src_configure() {
393 - local depth=16
394 - use q8 && depth=8
395 - use q32 && depth=32
396 -
397 - local openmp=disable
398 - use openmp && { tc-has-openmp && openmp=enable; }
399 -
400 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
401 -
402 - local myeconfargs=(
403 - $(use_enable static-libs static)
404 - $(use_enable hdri)
405 - $(use_enable opencl)
406 - --with-threads
407 - --with-modules
408 - --with-quantum-depth=${depth}
409 - $(use_with cxx magick-plus-plus)
410 - $(use_with perl)
411 - --with-perl-options='INSTALLDIRS=vendor'
412 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
413 - $(use_with bzip2 bzlib)
414 - $(use_with X x)
415 - $(use_with zlib)
416 - --without-autotrace
417 - $(use_with postscript dps)
418 - $(use_with djvu)
419 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
420 - $(use_with fftw)
421 - $(use_with fpx)
422 - $(use_with fontconfig)
423 - $(use_with truetype freetype)
424 - $(use_with postscript gslib)
425 - $(use_with graphviz gvc)
426 - $(use_with jbig)
427 - $(use_with jpeg)
428 - $(use_with jpeg2k openjp2)
429 - $(use_with lcms)
430 - $(use_with lqr)
431 - $(use_with lzma)
432 - $(use_with openexr)
433 - $(use_with pango)
434 - $(use_with png)
435 - $(use_with raw)
436 - $(use_with svg rsvg)
437 - $(use_with tiff)
438 - $(use_with webp)
439 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
440 - $(use_with wmf)
441 - $(use_with xml)
442 - --${openmp}-openmp
443 - --with-gcc-arch=no-automagic
444 - )
445 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
446 -}
447 -
448 -src_test() {
449 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
450 - emake check
451 -}
452 -
453 -src_install() {
454 - # Ensure documentation installation files and paths with each release!
455 - emake \
456 - DESTDIR="${D}" \
457 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
458 - install
459 -
460 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
461 - dodoc {AUTHORS,README}.txt ChangeLog
462 -
463 - if use perl; then
464 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
465 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
466 - fi
467 -
468 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
469 -
470 - if use opencl; then
471 - cat <<-EOF > "${T}"/99${PN}
472 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
473 - EOF
474 -
475 - insinto /etc/sandbox.d
476 - doins "${T}"/99${PN} #472766
477 - fi
478 -
479 - insinto /usr/share/${PN}
480 - doins config/*icm
481 -}
482
483 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild
484 deleted file mode 100644
485 index 07ebb1e3f53..00000000000
486 --- a/media-gfx/imagemagick/imagemagick-6.9.10.6.ebuild
487 +++ /dev/null
488 @@ -1,188 +0,0 @@
489 -# Copyright 1999-2018 Gentoo Foundation
490 -# Distributed under the terms of the GNU General Public License v2
491 -
492 -EAPI=6
493 -
494 -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
495 -
496 -MY_P=ImageMagick-$(ver_rs 3 '-')
497 -
498 -DESCRIPTION="A collection of tools and libraries for many image formats"
499 -HOMEPAGE="https://www.imagemagick.org/"
500 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
501 -
502 -LICENSE="imagemagick"
503 -SLOT="0/${PV}"
504 -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"
505 -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"
506 -
507 -RESTRICT="perl? ( userpriv )"
508 -
509 -RDEPEND="
510 - dev-libs/libltdl:0
511 - bzip2? ( app-arch/bzip2 )
512 - corefonts? ( media-fonts/corefonts )
513 - djvu? ( app-text/djvu )
514 - fftw? ( sci-libs/fftw:3.0 )
515 - fontconfig? ( media-libs/fontconfig )
516 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
517 - graphviz? ( media-gfx/graphviz )
518 - jbig? ( >=media-libs/jbigkit-2:= )
519 - jpeg? ( virtual/jpeg:0 )
520 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
521 - lcms? ( media-libs/lcms:2= )
522 - lqr? ( media-libs/liblqr )
523 - opencl? ( virtual/opencl )
524 - openexr? ( media-libs/openexr:0= )
525 - pango? ( x11-libs/pango )
526 - perl? ( >=dev-lang/perl-5.8.8:0= )
527 - png? ( media-libs/libpng:0= )
528 - postscript? ( app-text/ghostscript-gpl )
529 - raw? ( media-libs/libraw:= )
530 - svg? ( gnome-base/librsvg )
531 - tiff? ( media-libs/tiff:0= )
532 - truetype? (
533 - media-fonts/urw-fonts
534 - >=media-libs/freetype-2
535 - )
536 - webp? ( media-libs/libwebp:0= )
537 - wmf? ( media-libs/libwmf )
538 - X? (
539 - x11-libs/libICE
540 - x11-libs/libSM
541 - x11-libs/libXext
542 - x11-libs/libXt
543 - )
544 - xml? ( dev-libs/libxml2:= )
545 - lzma? ( app-arch/xz-utils )
546 - zlib? ( sys-libs/zlib:= )"
547 -DEPEND="${RDEPEND}
548 - !media-gfx/graphicsmagick[imagemagick]
549 - virtual/pkgconfig
550 - X? ( x11-base/xorg-proto )"
551 -
552 -REQUIRED_USE="corefonts? ( truetype )
553 - test? ( corefonts )"
554 -
555 -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
556 -
557 -S="${WORKDIR}/${MY_P}"
558 -
559 -src_prepare() {
560 - local mesa_cards ati_cards nvidia_cards render_cards
561 - default
562 -
563 - elibtoolize # for Darwin modules
564 -
565 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
566 - shopt -s nullglob
567 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
568 - if test -n "${ati_cards}"; then
569 - addpredict "${ati_cards}"
570 - fi
571 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
572 - if test -n "${mesa_cards}"; then
573 - addpredict "${mesa_cards}"
574 - fi
575 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
576 - if test -n "${nvidia_cards}"; then
577 - addpredict "${nvidia_cards}"
578 - fi
579 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
580 - if test -n "${render_cards}"; then
581 - addpredict "${render_cards}"
582 - fi
583 - shopt -u nullglob
584 - addpredict /dev/nvidiactl
585 -}
586 -
587 -src_configure() {
588 - local depth=16
589 - use q8 && depth=8
590 - use q32 && depth=32
591 -
592 - local openmp=disable
593 - use openmp && { tc-has-openmp && openmp=enable; }
594 -
595 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
596 -
597 - local myeconfargs=(
598 - $(use_enable static-libs static)
599 - $(use_enable hdri)
600 - $(use_enable opencl)
601 - --with-threads
602 - --with-modules
603 - --with-quantum-depth=${depth}
604 - $(use_with cxx magick-plus-plus)
605 - $(use_with perl)
606 - --with-perl-options='INSTALLDIRS=vendor'
607 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
608 - $(use_with bzip2 bzlib)
609 - $(use_with X x)
610 - $(use_with zlib)
611 - --without-autotrace
612 - $(use_with postscript dps)
613 - $(use_with djvu)
614 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
615 - $(use_with fftw)
616 - $(use_with fpx)
617 - $(use_with fontconfig)
618 - $(use_with truetype freetype)
619 - $(use_with postscript gslib)
620 - $(use_with graphviz gvc)
621 - $(use_with jbig)
622 - $(use_with jpeg)
623 - $(use_with jpeg2k openjp2)
624 - $(use_with lcms)
625 - $(use_with lqr)
626 - $(use_with lzma)
627 - $(use_with openexr)
628 - $(use_with pango)
629 - $(use_with png)
630 - $(use_with raw)
631 - $(use_with svg rsvg)
632 - $(use_with tiff)
633 - $(use_with webp)
634 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
635 - $(use_with wmf)
636 - $(use_with xml)
637 - --${openmp}-openmp
638 - --with-gcc-arch=no-automagic
639 - )
640 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
641 -}
642 -
643 -src_test() {
644 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
645 - emake check
646 -}
647 -
648 -src_install() {
649 - # Ensure documentation installation files and paths with each release!
650 - emake \
651 - DESTDIR="${D}" \
652 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
653 - install
654 -
655 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
656 - dodoc {AUTHORS,README}.txt ChangeLog
657 -
658 - if use perl; then
659 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
660 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
661 - fi
662 -
663 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
664 -
665 - if use opencl; then
666 - cat <<-EOF > "${T}"/99${PN}
667 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
668 - EOF
669 -
670 - insinto /etc/sandbox.d
671 - doins "${T}"/99${PN} #472766
672 - fi
673 -
674 - insinto /usr/share/${PN}
675 - doins config/*icm
676 -}
677
678 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild
679 deleted file mode 100644
680 index 1d46b538e85..00000000000
681 --- a/media-gfx/imagemagick/imagemagick-6.9.10.7.ebuild
682 +++ /dev/null
683 @@ -1,186 +0,0 @@
684 -# Copyright 1999-2018 Gentoo Foundation
685 -# Distributed under the terms of the GNU General Public License v2
686 -
687 -EAPI=6
688 -
689 -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
690 -
691 -MY_P=ImageMagick-$(ver_rs 3 '-')
692 -
693 -DESCRIPTION="A collection of tools and libraries for many image formats"
694 -HOMEPAGE="https://www.imagemagick.org/"
695 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
696 -
697 -LICENSE="imagemagick"
698 -SLOT="0/${PV}"
699 -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"
700 -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"
701 -
702 -RESTRICT="perl? ( userpriv )"
703 -
704 -RDEPEND="
705 - dev-libs/libltdl:0
706 - bzip2? ( app-arch/bzip2 )
707 - corefonts? ( media-fonts/corefonts )
708 - djvu? ( app-text/djvu )
709 - fftw? ( sci-libs/fftw:3.0 )
710 - fontconfig? ( media-libs/fontconfig )
711 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
712 - graphviz? ( media-gfx/graphviz )
713 - jbig? ( >=media-libs/jbigkit-2:= )
714 - jpeg? ( virtual/jpeg:0 )
715 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
716 - lcms? ( media-libs/lcms:2= )
717 - lqr? ( media-libs/liblqr )
718 - opencl? ( virtual/opencl )
719 - openexr? ( media-libs/openexr:0= )
720 - pango? ( x11-libs/pango )
721 - perl? ( >=dev-lang/perl-5.8.8:0= )
722 - png? ( media-libs/libpng:0= )
723 - postscript? ( app-text/ghostscript-gpl )
724 - raw? ( media-libs/libraw:= )
725 - svg? ( gnome-base/librsvg )
726 - tiff? ( media-libs/tiff:0= )
727 - truetype? (
728 - media-fonts/urw-fonts
729 - >=media-libs/freetype-2
730 - )
731 - webp? ( media-libs/libwebp:0= )
732 - wmf? ( media-libs/libwmf )
733 - X? (
734 - x11-libs/libICE
735 - x11-libs/libSM
736 - x11-libs/libXext
737 - x11-libs/libXt
738 - )
739 - xml? ( dev-libs/libxml2:= )
740 - lzma? ( app-arch/xz-utils )
741 - zlib? ( sys-libs/zlib:= )"
742 -DEPEND="${RDEPEND}
743 - !media-gfx/graphicsmagick[imagemagick]
744 - virtual/pkgconfig
745 - X? ( x11-base/xorg-proto )"
746 -
747 -REQUIRED_USE="corefonts? ( truetype )
748 - test? ( corefonts )"
749 -
750 -S="${WORKDIR}/${MY_P}"
751 -
752 -src_prepare() {
753 - local mesa_cards ati_cards nvidia_cards render_cards
754 - default
755 -
756 - elibtoolize # for Darwin modules
757 -
758 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
759 - shopt -s nullglob
760 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
761 - if test -n "${ati_cards}"; then
762 - addpredict "${ati_cards}"
763 - fi
764 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
765 - if test -n "${mesa_cards}"; then
766 - addpredict "${mesa_cards}"
767 - fi
768 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
769 - if test -n "${nvidia_cards}"; then
770 - addpredict "${nvidia_cards}"
771 - fi
772 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
773 - if test -n "${render_cards}"; then
774 - addpredict "${render_cards}"
775 - fi
776 - shopt -u nullglob
777 - addpredict /dev/nvidiactl
778 -}
779 -
780 -src_configure() {
781 - local depth=16
782 - use q8 && depth=8
783 - use q32 && depth=32
784 -
785 - local openmp=disable
786 - use openmp && { tc-has-openmp && openmp=enable; }
787 -
788 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
789 -
790 - local myeconfargs=(
791 - $(use_enable static-libs static)
792 - $(use_enable hdri)
793 - $(use_enable opencl)
794 - --with-threads
795 - --with-modules
796 - --with-quantum-depth=${depth}
797 - $(use_with cxx magick-plus-plus)
798 - $(use_with perl)
799 - --with-perl-options='INSTALLDIRS=vendor'
800 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
801 - $(use_with bzip2 bzlib)
802 - $(use_with X x)
803 - $(use_with zlib)
804 - --without-autotrace
805 - $(use_with postscript dps)
806 - $(use_with djvu)
807 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
808 - $(use_with fftw)
809 - $(use_with fpx)
810 - $(use_with fontconfig)
811 - $(use_with truetype freetype)
812 - $(use_with postscript gslib)
813 - $(use_with graphviz gvc)
814 - $(use_with jbig)
815 - $(use_with jpeg)
816 - $(use_with jpeg2k openjp2)
817 - $(use_with lcms)
818 - $(use_with lqr)
819 - $(use_with lzma)
820 - $(use_with openexr)
821 - $(use_with pango)
822 - $(use_with png)
823 - $(use_with raw)
824 - $(use_with svg rsvg)
825 - $(use_with tiff)
826 - $(use_with webp)
827 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
828 - $(use_with wmf)
829 - $(use_with xml)
830 - --${openmp}-openmp
831 - --with-gcc-arch=no-automagic
832 - )
833 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
834 -}
835 -
836 -src_test() {
837 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
838 - emake check
839 -}
840 -
841 -src_install() {
842 - # Ensure documentation installation files and paths with each release!
843 - emake \
844 - DESTDIR="${D}" \
845 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
846 - install
847 -
848 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
849 - dodoc {AUTHORS,README}.txt ChangeLog
850 -
851 - if use perl; then
852 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
853 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
854 - fi
855 -
856 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
857 -
858 - if use opencl; then
859 - cat <<-EOF > "${T}"/99${PN}
860 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
861 - EOF
862 -
863 - insinto /etc/sandbox.d
864 - doins "${T}"/99${PN} #472766
865 - fi
866 -
867 - insinto /usr/share/${PN}
868 - doins config/*icm
869 -}
870
871 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
872 deleted file mode 100644
873 index f92a349caf3..00000000000
874 --- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
875 +++ /dev/null
876 @@ -1,185 +0,0 @@
877 -# Copyright 1999-2018 Gentoo Foundation
878 -# Distributed under the terms of the GNU General Public License v2
879 -
880 -EAPI=6
881 -
882 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
883 -
884 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
885 -
886 -DESCRIPTION="A collection of tools and libraries for many image formats"
887 -HOMEPAGE="https://www.imagemagick.org/"
888 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
889 -
890 -LICENSE="imagemagick"
891 -SLOT="0/${PV}"
892 -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"
893 -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"
894 -
895 -RESTRICT="perl? ( userpriv )"
896 -
897 -RDEPEND="
898 - dev-libs/libltdl:0
899 - bzip2? ( app-arch/bzip2 )
900 - corefonts? ( media-fonts/corefonts )
901 - djvu? ( app-text/djvu )
902 - fftw? ( sci-libs/fftw:3.0 )
903 - fontconfig? ( media-libs/fontconfig )
904 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
905 - graphviz? ( media-gfx/graphviz )
906 - jbig? ( >=media-libs/jbigkit-2:= )
907 - jpeg? ( virtual/jpeg:0 )
908 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
909 - lcms? ( media-libs/lcms:2= )
910 - lqr? ( media-libs/liblqr )
911 - opencl? ( virtual/opencl )
912 - openexr? ( media-libs/openexr:0= )
913 - pango? ( x11-libs/pango )
914 - perl? ( >=dev-lang/perl-5.8.8:0= )
915 - png? ( media-libs/libpng:0= )
916 - postscript? ( app-text/ghostscript-gpl )
917 - raw? ( media-gfx/ufraw )
918 - svg? ( gnome-base/librsvg )
919 - tiff? ( media-libs/tiff:0= )
920 - truetype? (
921 - media-fonts/urw-fonts
922 - >=media-libs/freetype-2
923 - )
924 - webp? ( media-libs/libwebp:0= )
925 - wmf? ( media-libs/libwmf )
926 - X? (
927 - x11-libs/libICE
928 - x11-libs/libSM
929 - x11-libs/libXext
930 - x11-libs/libXt
931 - )
932 - xml? ( dev-libs/libxml2:= )
933 - lzma? ( app-arch/xz-utils )
934 - zlib? ( sys-libs/zlib:= )"
935 -DEPEND="${RDEPEND}
936 - !media-gfx/graphicsmagick[imagemagick]
937 - virtual/pkgconfig
938 - X? ( x11-base/xorg-proto )"
939 -
940 -REQUIRED_USE="corefonts? ( truetype )
941 - test? ( corefonts )"
942 -
943 -S=${WORKDIR}/${MY_P}
944 -
945 -src_prepare() {
946 - local mesa_cards ati_cards nvidia_cards render_cards
947 - default
948 -
949 - elibtoolize # for Darwin modules
950 -
951 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
952 - shopt -s nullglob
953 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
954 - if test -n "${ati_cards}"; then
955 - addpredict "${ati_cards}"
956 - fi
957 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
958 - if test -n "${mesa_cards}"; then
959 - addpredict "${mesa_cards}"
960 - fi
961 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
962 - if test -n "${nvidia_cards}"; then
963 - addpredict "${nvidia_cards}"
964 - fi
965 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
966 - if test -n "${render_cards}"; then
967 - addpredict "${render_cards}"
968 - fi
969 - shopt -u nullglob
970 - addpredict /dev/nvidiactl
971 -}
972 -
973 -src_configure() {
974 - local depth=16
975 - use q8 && depth=8
976 - use q32 && depth=32
977 -
978 - local openmp=disable
979 - use openmp && { tc-has-openmp && openmp=enable; }
980 -
981 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
982 -
983 - local myeconfargs=(
984 - $(use_enable static-libs static)
985 - $(use_enable hdri)
986 - $(use_enable opencl)
987 - --with-threads
988 - --with-modules
989 - --with-quantum-depth=${depth}
990 - $(use_with cxx magick-plus-plus)
991 - $(use_with perl)
992 - --with-perl-options='INSTALLDIRS=vendor'
993 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
994 - $(use_with bzip2 bzlib)
995 - $(use_with X x)
996 - $(use_with zlib)
997 - --without-autotrace
998 - $(use_with postscript dps)
999 - $(use_with djvu)
1000 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
1001 - $(use_with fftw)
1002 - $(use_with fpx)
1003 - $(use_with fontconfig)
1004 - $(use_with truetype freetype)
1005 - $(use_with postscript gslib)
1006 - $(use_with graphviz gvc)
1007 - $(use_with jbig)
1008 - $(use_with jpeg)
1009 - $(use_with jpeg2k openjp2)
1010 - $(use_with lcms)
1011 - $(use_with lqr)
1012 - $(use_with lzma)
1013 - $(use_with openexr)
1014 - $(use_with pango)
1015 - $(use_with png)
1016 - $(use_with svg rsvg)
1017 - $(use_with tiff)
1018 - $(use_with webp)
1019 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
1020 - $(use_with wmf)
1021 - $(use_with xml)
1022 - --${openmp}-openmp
1023 - --with-gcc-arch=no-automagic
1024 - )
1025 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
1026 -}
1027 -
1028 -src_test() {
1029 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
1030 - emake check
1031 -}
1032 -
1033 -src_install() {
1034 - # Ensure documentation installation files and paths with each release!
1035 - emake \
1036 - DESTDIR="${D}" \
1037 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
1038 - install
1039 -
1040 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
1041 - dodoc {AUTHORS,README}.txt ChangeLog
1042 -
1043 - if use perl; then
1044 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
1045 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
1046 - fi
1047 -
1048 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
1049 -
1050 - if use opencl; then
1051 - cat <<-EOF > "${T}"/99${PN}
1052 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
1053 - EOF
1054 -
1055 - insinto /etc/sandbox.d
1056 - doins "${T}"/99${PN} #472766
1057 - fi
1058 -
1059 - insinto /usr/share/${PN}
1060 - doins config/*icm
1061 -}
1062
1063 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
1064 deleted file mode 100644
1065 index 7805c757cc9..00000000000
1066 --- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
1067 +++ /dev/null
1068 @@ -1,185 +0,0 @@
1069 -# Copyright 1999-2018 Gentoo Foundation
1070 -# Distributed under the terms of the GNU General Public License v2
1071 -
1072 -EAPI=6
1073 -
1074 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
1075 -
1076 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
1077 -
1078 -DESCRIPTION="A collection of tools and libraries for many image formats"
1079 -HOMEPAGE="https://www.imagemagick.org/"
1080 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
1081 -
1082 -LICENSE="imagemagick"
1083 -SLOT="0/${PV}"
1084 -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"
1085 -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"
1086 -
1087 -RESTRICT="perl? ( userpriv )"
1088 -
1089 -RDEPEND="
1090 - dev-libs/libltdl:0
1091 - bzip2? ( app-arch/bzip2 )
1092 - corefonts? ( media-fonts/corefonts )
1093 - djvu? ( app-text/djvu )
1094 - fftw? ( sci-libs/fftw:3.0 )
1095 - fontconfig? ( media-libs/fontconfig )
1096 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
1097 - graphviz? ( media-gfx/graphviz )
1098 - jbig? ( >=media-libs/jbigkit-2:= )
1099 - jpeg? ( virtual/jpeg:0 )
1100 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
1101 - lcms? ( media-libs/lcms:2= )
1102 - lqr? ( media-libs/liblqr )
1103 - opencl? ( virtual/opencl )
1104 - openexr? ( media-libs/openexr:0= )
1105 - pango? ( x11-libs/pango )
1106 - perl? ( >=dev-lang/perl-5.8.8:0= )
1107 - png? ( media-libs/libpng:0= )
1108 - postscript? ( app-text/ghostscript-gpl )
1109 - raw? ( media-gfx/ufraw )
1110 - svg? ( gnome-base/librsvg )
1111 - tiff? ( media-libs/tiff:0= )
1112 - truetype? (
1113 - media-fonts/urw-fonts
1114 - >=media-libs/freetype-2
1115 - )
1116 - webp? ( media-libs/libwebp:0= )
1117 - wmf? ( media-libs/libwmf )
1118 - X? (
1119 - x11-libs/libICE
1120 - x11-libs/libSM
1121 - x11-libs/libXext
1122 - x11-libs/libXt
1123 - )
1124 - xml? ( dev-libs/libxml2:= )
1125 - lzma? ( app-arch/xz-utils )
1126 - zlib? ( sys-libs/zlib:= )"
1127 -DEPEND="${RDEPEND}
1128 - !media-gfx/graphicsmagick[imagemagick]
1129 - virtual/pkgconfig
1130 - X? ( x11-base/xorg-proto )"
1131 -
1132 -REQUIRED_USE="corefonts? ( truetype )
1133 - test? ( corefonts )"
1134 -
1135 -S=${WORKDIR}/${MY_P}
1136 -
1137 -src_prepare() {
1138 - local mesa_cards ati_cards nvidia_cards render_cards
1139 - default
1140 -
1141 - elibtoolize # for Darwin modules
1142 -
1143 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
1144 - shopt -s nullglob
1145 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
1146 - if test -n "${ati_cards}"; then
1147 - addpredict "${ati_cards}"
1148 - fi
1149 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
1150 - if test -n "${mesa_cards}"; then
1151 - addpredict "${mesa_cards}"
1152 - fi
1153 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
1154 - if test -n "${nvidia_cards}"; then
1155 - addpredict "${nvidia_cards}"
1156 - fi
1157 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
1158 - if test -n "${render_cards}"; then
1159 - addpredict "${render_cards}"
1160 - fi
1161 - shopt -u nullglob
1162 - addpredict /dev/nvidiactl
1163 -}
1164 -
1165 -src_configure() {
1166 - local depth=16
1167 - use q8 && depth=8
1168 - use q32 && depth=32
1169 -
1170 - local openmp=disable
1171 - use openmp && { tc-has-openmp && openmp=enable; }
1172 -
1173 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
1174 -
1175 - local myeconfargs=(
1176 - $(use_enable static-libs static)
1177 - $(use_enable hdri)
1178 - $(use_enable opencl)
1179 - --with-threads
1180 - --with-modules
1181 - --with-quantum-depth=${depth}
1182 - $(use_with cxx magick-plus-plus)
1183 - $(use_with perl)
1184 - --with-perl-options='INSTALLDIRS=vendor'
1185 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
1186 - $(use_with bzip2 bzlib)
1187 - $(use_with X x)
1188 - $(use_with zlib)
1189 - --without-autotrace
1190 - $(use_with postscript dps)
1191 - $(use_with djvu)
1192 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
1193 - $(use_with fftw)
1194 - $(use_with fpx)
1195 - $(use_with fontconfig)
1196 - $(use_with truetype freetype)
1197 - $(use_with postscript gslib)
1198 - $(use_with graphviz gvc)
1199 - $(use_with jbig)
1200 - $(use_with jpeg)
1201 - $(use_with jpeg2k openjp2)
1202 - $(use_with lcms)
1203 - $(use_with lqr)
1204 - $(use_with lzma)
1205 - $(use_with openexr)
1206 - $(use_with pango)
1207 - $(use_with png)
1208 - $(use_with svg rsvg)
1209 - $(use_with tiff)
1210 - $(use_with webp)
1211 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
1212 - $(use_with wmf)
1213 - $(use_with xml)
1214 - --${openmp}-openmp
1215 - --with-gcc-arch=no-automagic
1216 - )
1217 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
1218 -}
1219 -
1220 -src_test() {
1221 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
1222 - emake check
1223 -}
1224 -
1225 -src_install() {
1226 - # Ensure documentation installation files and paths with each release!
1227 - emake \
1228 - DESTDIR="${D}" \
1229 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
1230 - install
1231 -
1232 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
1233 - dodoc {AUTHORS,README}.txt ChangeLog
1234 -
1235 - if use perl; then
1236 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
1237 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
1238 - fi
1239 -
1240 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
1241 -
1242 - if use opencl; then
1243 - cat <<-EOF > "${T}"/99${PN}
1244 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
1245 - EOF
1246 -
1247 - insinto /etc/sandbox.d
1248 - doins "${T}"/99${PN} #472766
1249 - fi
1250 -
1251 - insinto /usr/share/${PN}
1252 - doins config/*icm
1253 -}
1254
1255 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild
1256 deleted file mode 100644
1257 index 52e77059cb1..00000000000
1258 --- a/media-gfx/imagemagick/imagemagick-6.9.9.47.ebuild
1259 +++ /dev/null
1260 @@ -1,185 +0,0 @@
1261 -# Copyright 1999-2018 Gentoo Foundation
1262 -# Distributed under the terms of the GNU General Public License v2
1263 -
1264 -EAPI=6
1265 -
1266 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
1267 -
1268 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
1269 -
1270 -DESCRIPTION="A collection of tools and libraries for many image formats"
1271 -HOMEPAGE="https://www.imagemagick.org/"
1272 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
1273 -
1274 -LICENSE="imagemagick"
1275 -SLOT="0/${PV}"
1276 -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"
1277 -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"
1278 -
1279 -RESTRICT="perl? ( userpriv )"
1280 -
1281 -RDEPEND="
1282 - dev-libs/libltdl:0
1283 - bzip2? ( app-arch/bzip2 )
1284 - corefonts? ( media-fonts/corefonts )
1285 - djvu? ( app-text/djvu )
1286 - fftw? ( sci-libs/fftw:3.0 )
1287 - fontconfig? ( media-libs/fontconfig )
1288 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
1289 - graphviz? ( media-gfx/graphviz )
1290 - jbig? ( >=media-libs/jbigkit-2:= )
1291 - jpeg? ( virtual/jpeg:0 )
1292 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
1293 - lcms? ( media-libs/lcms:2= )
1294 - lqr? ( media-libs/liblqr )
1295 - opencl? ( virtual/opencl )
1296 - openexr? ( media-libs/openexr:0= )
1297 - pango? ( x11-libs/pango )
1298 - perl? ( >=dev-lang/perl-5.8.8:0= )
1299 - png? ( media-libs/libpng:0= )
1300 - postscript? ( app-text/ghostscript-gpl )
1301 - raw? ( media-gfx/ufraw )
1302 - svg? ( gnome-base/librsvg )
1303 - tiff? ( media-libs/tiff:0= )
1304 - truetype? (
1305 - media-fonts/urw-fonts
1306 - >=media-libs/freetype-2
1307 - )
1308 - webp? ( media-libs/libwebp:0= )
1309 - wmf? ( media-libs/libwmf )
1310 - X? (
1311 - x11-libs/libICE
1312 - x11-libs/libSM
1313 - x11-libs/libXext
1314 - x11-libs/libXt
1315 - )
1316 - xml? ( dev-libs/libxml2:= )
1317 - lzma? ( app-arch/xz-utils )
1318 - zlib? ( sys-libs/zlib:= )"
1319 -DEPEND="${RDEPEND}
1320 - !media-gfx/graphicsmagick[imagemagick]
1321 - virtual/pkgconfig
1322 - X? ( x11-base/xorg-proto )"
1323 -
1324 -REQUIRED_USE="corefonts? ( truetype )
1325 - test? ( corefonts )"
1326 -
1327 -S=${WORKDIR}/${MY_P}
1328 -
1329 -src_prepare() {
1330 - local mesa_cards ati_cards nvidia_cards render_cards
1331 - default
1332 -
1333 - elibtoolize # for Darwin modules
1334 -
1335 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
1336 - shopt -s nullglob
1337 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
1338 - if test -n "${ati_cards}"; then
1339 - addpredict "${ati_cards}"
1340 - fi
1341 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
1342 - if test -n "${mesa_cards}"; then
1343 - addpredict "${mesa_cards}"
1344 - fi
1345 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
1346 - if test -n "${nvidia_cards}"; then
1347 - addpredict "${nvidia_cards}"
1348 - fi
1349 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
1350 - if test -n "${render_cards}"; then
1351 - addpredict "${render_cards}"
1352 - fi
1353 - shopt -u nullglob
1354 - addpredict /dev/nvidiactl
1355 -}
1356 -
1357 -src_configure() {
1358 - local depth=16
1359 - use q8 && depth=8
1360 - use q32 && depth=32
1361 -
1362 - local openmp=disable
1363 - use openmp && { tc-has-openmp && openmp=enable; }
1364 -
1365 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
1366 -
1367 - local myeconfargs=(
1368 - $(use_enable static-libs static)
1369 - $(use_enable hdri)
1370 - $(use_enable opencl)
1371 - --with-threads
1372 - --with-modules
1373 - --with-quantum-depth=${depth}
1374 - $(use_with cxx magick-plus-plus)
1375 - $(use_with perl)
1376 - --with-perl-options='INSTALLDIRS=vendor'
1377 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
1378 - $(use_with bzip2 bzlib)
1379 - $(use_with X x)
1380 - $(use_with zlib)
1381 - --without-autotrace
1382 - $(use_with postscript dps)
1383 - $(use_with djvu)
1384 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
1385 - $(use_with fftw)
1386 - $(use_with fpx)
1387 - $(use_with fontconfig)
1388 - $(use_with truetype freetype)
1389 - $(use_with postscript gslib)
1390 - $(use_with graphviz gvc)
1391 - $(use_with jbig)
1392 - $(use_with jpeg)
1393 - $(use_with jpeg2k openjp2)
1394 - $(use_with lcms)
1395 - $(use_with lqr)
1396 - $(use_with lzma)
1397 - $(use_with openexr)
1398 - $(use_with pango)
1399 - $(use_with png)
1400 - $(use_with svg rsvg)
1401 - $(use_with tiff)
1402 - $(use_with webp)
1403 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
1404 - $(use_with wmf)
1405 - $(use_with xml)
1406 - --${openmp}-openmp
1407 - --with-gcc-arch=no-automagic
1408 - )
1409 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
1410 -}
1411 -
1412 -src_test() {
1413 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
1414 - emake check
1415 -}
1416 -
1417 -src_install() {
1418 - # Ensure documentation installation files and paths with each release!
1419 - emake \
1420 - DESTDIR="${D}" \
1421 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
1422 - install
1423 -
1424 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
1425 - dodoc {AUTHORS,README}.txt ChangeLog
1426 -
1427 - if use perl; then
1428 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
1429 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
1430 - fi
1431 -
1432 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
1433 -
1434 - if use opencl; then
1435 - cat <<-EOF > "${T}"/99${PN}
1436 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
1437 - EOF
1438 -
1439 - insinto /etc/sandbox.d
1440 - doins "${T}"/99${PN} #472766
1441 - fi
1442 -
1443 - insinto /usr/share/${PN}
1444 - doins config/*icm
1445 -}
1446
1447 diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
1448 deleted file mode 100644
1449 index 0c38238d52c..00000000000
1450 --- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
1451 +++ /dev/null
1452 @@ -1,185 +0,0 @@
1453 -# Copyright 1999-2018 Gentoo Foundation
1454 -# Distributed under the terms of the GNU General Public License v2
1455 -
1456 -EAPI=6
1457 -
1458 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
1459 -
1460 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
1461 -
1462 -DESCRIPTION="A collection of tools and libraries for many image formats"
1463 -HOMEPAGE="https://www.imagemagick.org/"
1464 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
1465 -
1466 -LICENSE="imagemagick"
1467 -SLOT="0/${PV}"
1468 -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"
1469 -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"
1470 -
1471 -RESTRICT="perl? ( userpriv )"
1472 -
1473 -RDEPEND="
1474 - dev-libs/libltdl:0
1475 - bzip2? ( app-arch/bzip2 )
1476 - corefonts? ( media-fonts/corefonts )
1477 - djvu? ( app-text/djvu )
1478 - fftw? ( sci-libs/fftw:3.0 )
1479 - fontconfig? ( media-libs/fontconfig )
1480 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
1481 - graphviz? ( media-gfx/graphviz )
1482 - jbig? ( >=media-libs/jbigkit-2:= )
1483 - jpeg? ( virtual/jpeg:0 )
1484 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
1485 - lcms? ( media-libs/lcms:2= )
1486 - lqr? ( media-libs/liblqr )
1487 - opencl? ( virtual/opencl )
1488 - openexr? ( media-libs/openexr:0= )
1489 - pango? ( x11-libs/pango )
1490 - perl? ( >=dev-lang/perl-5.8.8:0= )
1491 - png? ( media-libs/libpng:0= )
1492 - postscript? ( app-text/ghostscript-gpl )
1493 - raw? ( media-gfx/ufraw )
1494 - svg? ( gnome-base/librsvg )
1495 - tiff? ( media-libs/tiff:0= )
1496 - truetype? (
1497 - media-fonts/urw-fonts
1498 - >=media-libs/freetype-2
1499 - )
1500 - webp? ( media-libs/libwebp:0= )
1501 - wmf? ( media-libs/libwmf )
1502 - X? (
1503 - x11-libs/libICE
1504 - x11-libs/libSM
1505 - x11-libs/libXext
1506 - x11-libs/libXt
1507 - )
1508 - xml? ( dev-libs/libxml2:= )
1509 - lzma? ( app-arch/xz-utils )
1510 - zlib? ( sys-libs/zlib:= )"
1511 -DEPEND="${RDEPEND}
1512 - !media-gfx/graphicsmagick[imagemagick]
1513 - virtual/pkgconfig
1514 - X? ( x11-base/xorg-proto )"
1515 -
1516 -REQUIRED_USE="corefonts? ( truetype )
1517 - test? ( corefonts )"
1518 -
1519 -S=${WORKDIR}/${MY_P}
1520 -
1521 -src_prepare() {
1522 - local ati_cards mesa_cards nvidia_cards render_cards
1523 - default
1524 -
1525 - elibtoolize # for Darwin modules
1526 -
1527 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
1528 - shopt -s nullglob
1529 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
1530 - if test -n "${ati_cards}"; then
1531 - addpredict "${ati_cards}"
1532 - fi
1533 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
1534 - if test -n "${mesa_cards}"; then
1535 - addpredict "${mesa_cards}"
1536 - fi
1537 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
1538 - if test -n "${nvidia_cards}"; then
1539 - addpredict "${nvidia_cards}"
1540 - fi
1541 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
1542 - if test -n "${render_cards}"; then
1543 - addpredict "${render_cards}"
1544 - fi
1545 - shopt -u nullglob
1546 - addpredict /dev/nvidiactl
1547 -}
1548 -
1549 -src_configure() {
1550 - local depth=16
1551 - use q8 && depth=8
1552 - use q32 && depth=32
1553 -
1554 - local openmp=disable
1555 - use openmp && { tc-has-openmp && openmp=enable; }
1556 -
1557 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
1558 -
1559 - local myeconfargs=(
1560 - $(use_enable static-libs static)
1561 - $(use_enable hdri)
1562 - $(use_enable opencl)
1563 - --with-threads
1564 - --with-modules
1565 - --with-quantum-depth=${depth}
1566 - $(use_with cxx magick-plus-plus)
1567 - $(use_with perl)
1568 - --with-perl-options='INSTALLDIRS=vendor'
1569 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
1570 - $(use_with bzip2 bzlib)
1571 - $(use_with X x)
1572 - $(use_with zlib)
1573 - --without-autotrace
1574 - $(use_with postscript dps)
1575 - $(use_with djvu)
1576 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
1577 - $(use_with fftw)
1578 - $(use_with fpx)
1579 - $(use_with fontconfig)
1580 - $(use_with truetype freetype)
1581 - $(use_with postscript gslib)
1582 - $(use_with graphviz gvc)
1583 - $(use_with jbig)
1584 - $(use_with jpeg)
1585 - $(use_with jpeg2k openjp2)
1586 - $(use_with lcms)
1587 - $(use_with lqr)
1588 - $(use_with lzma)
1589 - $(use_with openexr)
1590 - $(use_with pango)
1591 - $(use_with png)
1592 - $(use_with svg rsvg)
1593 - $(use_with tiff)
1594 - $(use_with webp)
1595 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
1596 - $(use_with wmf)
1597 - $(use_with xml)
1598 - --${openmp}-openmp
1599 - --with-gcc-arch=no-automagic
1600 - )
1601 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
1602 -}
1603 -
1604 -src_test() {
1605 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
1606 - emake check
1607 -}
1608 -
1609 -src_install() {
1610 - # Ensure documentation installation files and paths with each release!
1611 - emake \
1612 - DESTDIR="${D}" \
1613 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
1614 - install
1615 -
1616 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
1617 - dodoc {AUTHORS,README}.txt ChangeLog
1618 -
1619 - if use perl; then
1620 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
1621 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
1622 - fi
1623 -
1624 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
1625 -
1626 - if use opencl; then
1627 - cat <<-EOF > "${T}"/99${PN}
1628 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
1629 - EOF
1630 -
1631 - insinto /etc/sandbox.d
1632 - doins "${T}"/99${PN} #472766
1633 - fi
1634 -
1635 - insinto /usr/share/${PN}
1636 - doins config/*icm
1637 -}
1638
1639 diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
1640 deleted file mode 100644
1641 index ba362cfde7f..00000000000
1642 --- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
1643 +++ /dev/null
1644 @@ -1,185 +0,0 @@
1645 -# Copyright 1999-2018 Gentoo Foundation
1646 -# Distributed under the terms of the GNU General Public License v2
1647 -
1648 -EAPI=6
1649 -
1650 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
1651 -
1652 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
1653 -
1654 -DESCRIPTION="A collection of tools and libraries for many image formats"
1655 -HOMEPAGE="https://www.imagemagick.org/"
1656 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
1657 -
1658 -LICENSE="imagemagick"
1659 -SLOT="0/${PV}"
1660 -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"
1661 -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"
1662 -
1663 -RESTRICT="perl? ( userpriv )"
1664 -
1665 -RDEPEND="
1666 - dev-libs/libltdl:0
1667 - bzip2? ( app-arch/bzip2 )
1668 - corefonts? ( media-fonts/corefonts )
1669 - djvu? ( app-text/djvu )
1670 - fftw? ( sci-libs/fftw:3.0 )
1671 - fontconfig? ( media-libs/fontconfig )
1672 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
1673 - graphviz? ( media-gfx/graphviz )
1674 - jbig? ( >=media-libs/jbigkit-2:= )
1675 - jpeg? ( virtual/jpeg:0 )
1676 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
1677 - lcms? ( media-libs/lcms:2= )
1678 - lqr? ( media-libs/liblqr )
1679 - opencl? ( virtual/opencl )
1680 - openexr? ( media-libs/openexr:0= )
1681 - pango? ( x11-libs/pango )
1682 - perl? ( >=dev-lang/perl-5.8.8:0= )
1683 - png? ( media-libs/libpng:0= )
1684 - postscript? ( app-text/ghostscript-gpl )
1685 - raw? ( media-gfx/ufraw )
1686 - svg? ( gnome-base/librsvg )
1687 - tiff? ( media-libs/tiff:0= )
1688 - truetype? (
1689 - media-fonts/urw-fonts
1690 - >=media-libs/freetype-2
1691 - )
1692 - webp? ( media-libs/libwebp:0= )
1693 - wmf? ( media-libs/libwmf )
1694 - X? (
1695 - x11-libs/libICE
1696 - x11-libs/libSM
1697 - x11-libs/libXext
1698 - x11-libs/libXt
1699 - )
1700 - xml? ( dev-libs/libxml2:= )
1701 - lzma? ( app-arch/xz-utils )
1702 - zlib? ( sys-libs/zlib:= )"
1703 -DEPEND="${RDEPEND}
1704 - !media-gfx/graphicsmagick[imagemagick]
1705 - virtual/pkgconfig
1706 - X? ( x11-base/xorg-proto )"
1707 -
1708 -REQUIRED_USE="corefonts? ( truetype )
1709 - test? ( corefonts )"
1710 -
1711 -S=${WORKDIR}/${MY_P}
1712 -
1713 -src_prepare() {
1714 - local ati_cards mesa_cards nvidia_cards render_cards
1715 - default
1716 -
1717 - elibtoolize # for Darwin modules
1718 -
1719 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
1720 - shopt -s nullglob
1721 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
1722 - if test -n "${ati_cards}"; then
1723 - addpredict "${ati_cards}"
1724 - fi
1725 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
1726 - if test -n "${mesa_cards}"; then
1727 - addpredict "${mesa_cards}"
1728 - fi
1729 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
1730 - if test -n "${nvidia_cards}"; then
1731 - addpredict "${nvidia_cards}"
1732 - fi
1733 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
1734 - if test -n "${render_cards}"; then
1735 - addpredict "${render_cards}"
1736 - fi
1737 - shopt -u nullglob
1738 - addpredict /dev/nvidiactl
1739 -}
1740 -
1741 -src_configure() {
1742 - local depth=16
1743 - use q8 && depth=8
1744 - use q32 && depth=32
1745 -
1746 - local openmp=disable
1747 - use openmp && { tc-has-openmp && openmp=enable; }
1748 -
1749 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
1750 -
1751 - local myeconfargs=(
1752 - $(use_enable static-libs static)
1753 - $(use_enable hdri)
1754 - $(use_enable opencl)
1755 - --with-threads
1756 - --with-modules
1757 - --with-quantum-depth=${depth}
1758 - $(use_with cxx magick-plus-plus)
1759 - $(use_with perl)
1760 - --with-perl-options='INSTALLDIRS=vendor'
1761 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
1762 - $(use_with bzip2 bzlib)
1763 - $(use_with X x)
1764 - $(use_with zlib)
1765 - --without-autotrace
1766 - $(use_with postscript dps)
1767 - $(use_with djvu)
1768 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
1769 - $(use_with fftw)
1770 - $(use_with fpx)
1771 - $(use_with fontconfig)
1772 - $(use_with truetype freetype)
1773 - $(use_with postscript gslib)
1774 - $(use_with graphviz gvc)
1775 - $(use_with jbig)
1776 - $(use_with jpeg)
1777 - $(use_with jpeg2k openjp2)
1778 - $(use_with lcms)
1779 - $(use_with lqr)
1780 - $(use_with lzma)
1781 - $(use_with openexr)
1782 - $(use_with pango)
1783 - $(use_with png)
1784 - $(use_with svg rsvg)
1785 - $(use_with tiff)
1786 - $(use_with webp)
1787 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
1788 - $(use_with wmf)
1789 - $(use_with xml)
1790 - --${openmp}-openmp
1791 - --with-gcc-arch=no-automagic
1792 - )
1793 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
1794 -}
1795 -
1796 -src_test() {
1797 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
1798 - emake check
1799 -}
1800 -
1801 -src_install() {
1802 - # Ensure documentation installation files and paths with each release!
1803 - emake \
1804 - DESTDIR="${D}" \
1805 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
1806 - install
1807 -
1808 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
1809 - dodoc {AUTHORS,README}.txt ChangeLog
1810 -
1811 - if use perl; then
1812 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
1813 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
1814 - fi
1815 -
1816 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
1817 -
1818 - if use opencl; then
1819 - cat <<-EOF > "${T}"/99${PN}
1820 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
1821 - EOF
1822 -
1823 - insinto /etc/sandbox.d
1824 - doins "${T}"/99${PN} #472766
1825 - fi
1826 -
1827 - insinto /usr/share/${PN}
1828 - doins config/*icm
1829 -}
1830
1831 diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild
1832 deleted file mode 100644
1833 index 1db0353011d..00000000000
1834 --- a/media-gfx/imagemagick/imagemagick-7.0.7.35.ebuild
1835 +++ /dev/null
1836 @@ -1,185 +0,0 @@
1837 -# Copyright 1999-2018 Gentoo Foundation
1838 -# Distributed under the terms of the GNU General Public License v2
1839 -
1840 -EAPI=6
1841 -
1842 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
1843 -
1844 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
1845 -
1846 -DESCRIPTION="A collection of tools and libraries for many image formats"
1847 -HOMEPAGE="https://www.imagemagick.org/"
1848 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
1849 -
1850 -LICENSE="imagemagick"
1851 -SLOT="0/${PV}"
1852 -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"
1853 -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"
1854 -
1855 -RESTRICT="perl? ( userpriv )"
1856 -
1857 -RDEPEND="
1858 - dev-libs/libltdl:0
1859 - bzip2? ( app-arch/bzip2 )
1860 - corefonts? ( media-fonts/corefonts )
1861 - djvu? ( app-text/djvu )
1862 - fftw? ( sci-libs/fftw:3.0 )
1863 - fontconfig? ( media-libs/fontconfig )
1864 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
1865 - graphviz? ( media-gfx/graphviz )
1866 - jbig? ( >=media-libs/jbigkit-2:= )
1867 - jpeg? ( virtual/jpeg:0 )
1868 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
1869 - lcms? ( media-libs/lcms:2= )
1870 - lqr? ( media-libs/liblqr )
1871 - opencl? ( virtual/opencl )
1872 - openexr? ( media-libs/openexr:0= )
1873 - pango? ( x11-libs/pango )
1874 - perl? ( >=dev-lang/perl-5.8.8:0= )
1875 - png? ( media-libs/libpng:0= )
1876 - postscript? ( app-text/ghostscript-gpl )
1877 - raw? ( media-gfx/ufraw )
1878 - svg? ( gnome-base/librsvg )
1879 - tiff? ( media-libs/tiff:0= )
1880 - truetype? (
1881 - media-fonts/urw-fonts
1882 - >=media-libs/freetype-2
1883 - )
1884 - webp? ( media-libs/libwebp:0= )
1885 - wmf? ( media-libs/libwmf )
1886 - X? (
1887 - x11-libs/libICE
1888 - x11-libs/libSM
1889 - x11-libs/libXext
1890 - x11-libs/libXt
1891 - )
1892 - xml? ( dev-libs/libxml2:= )
1893 - lzma? ( app-arch/xz-utils )
1894 - zlib? ( sys-libs/zlib:= )"
1895 -DEPEND="${RDEPEND}
1896 - !media-gfx/graphicsmagick[imagemagick]
1897 - virtual/pkgconfig
1898 - X? ( x11-base/xorg-proto )"
1899 -
1900 -REQUIRED_USE="corefonts? ( truetype )
1901 - test? ( corefonts )"
1902 -
1903 -S=${WORKDIR}/${MY_P}
1904 -
1905 -src_prepare() {
1906 - local ati_cards mesa_cards nvidia_cards render_cards
1907 - default
1908 -
1909 - elibtoolize # for Darwin modules
1910 -
1911 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
1912 - shopt -s nullglob
1913 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
1914 - if test -n "${ati_cards}"; then
1915 - addpredict "${ati_cards}"
1916 - fi
1917 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
1918 - if test -n "${mesa_cards}"; then
1919 - addpredict "${mesa_cards}"
1920 - fi
1921 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
1922 - if test -n "${nvidia_cards}"; then
1923 - addpredict "${nvidia_cards}"
1924 - fi
1925 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
1926 - if test -n "${render_cards}"; then
1927 - addpredict "${render_cards}"
1928 - fi
1929 - shopt -u nullglob
1930 - addpredict /dev/nvidiactl
1931 -}
1932 -
1933 -src_configure() {
1934 - local depth=16
1935 - use q8 && depth=8
1936 - use q32 && depth=32
1937 -
1938 - local openmp=disable
1939 - use openmp && { tc-has-openmp && openmp=enable; }
1940 -
1941 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
1942 -
1943 - local myeconfargs=(
1944 - $(use_enable static-libs static)
1945 - $(use_enable hdri)
1946 - $(use_enable opencl)
1947 - --with-threads
1948 - --with-modules
1949 - --with-quantum-depth=${depth}
1950 - $(use_with cxx magick-plus-plus)
1951 - $(use_with perl)
1952 - --with-perl-options='INSTALLDIRS=vendor'
1953 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
1954 - $(use_with bzip2 bzlib)
1955 - $(use_with X x)
1956 - $(use_with zlib)
1957 - --without-autotrace
1958 - $(use_with postscript dps)
1959 - $(use_with djvu)
1960 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
1961 - $(use_with fftw)
1962 - $(use_with fpx)
1963 - $(use_with fontconfig)
1964 - $(use_with truetype freetype)
1965 - $(use_with postscript gslib)
1966 - $(use_with graphviz gvc)
1967 - $(use_with jbig)
1968 - $(use_with jpeg)
1969 - $(use_with jpeg2k openjp2)
1970 - $(use_with lcms)
1971 - $(use_with lqr)
1972 - $(use_with lzma)
1973 - $(use_with openexr)
1974 - $(use_with pango)
1975 - $(use_with png)
1976 - $(use_with svg rsvg)
1977 - $(use_with tiff)
1978 - $(use_with webp)
1979 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
1980 - $(use_with wmf)
1981 - $(use_with xml)
1982 - --${openmp}-openmp
1983 - --with-gcc-arch=no-automagic
1984 - )
1985 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
1986 -}
1987 -
1988 -src_test() {
1989 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
1990 - emake check
1991 -}
1992 -
1993 -src_install() {
1994 - # Ensure documentation installation files and paths with each release!
1995 - emake \
1996 - DESTDIR="${D}" \
1997 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
1998 - install
1999 -
2000 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
2001 - dodoc {AUTHORS,README}.txt ChangeLog
2002 -
2003 - if use perl; then
2004 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
2005 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
2006 - fi
2007 -
2008 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
2009 -
2010 - if use opencl; then
2011 - cat <<-EOF > "${T}"/99${PN}
2012 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
2013 - EOF
2014 -
2015 - insinto /etc/sandbox.d
2016 - doins "${T}"/99${PN} #472766
2017 - fi
2018 -
2019 - insinto /usr/share/${PN}
2020 - doins config/*icm
2021 -}
2022
2023 diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
2024 deleted file mode 100644
2025 index 49b5b2b7bbd..00000000000
2026 --- a/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild
2027 +++ /dev/null
2028 @@ -1,186 +0,0 @@
2029 -# Copyright 1999-2018 Gentoo Foundation
2030 -# Distributed under the terms of the GNU General Public License v2
2031 -
2032 -EAPI=6
2033 -
2034 -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
2035 -
2036 -MY_P=ImageMagick-$(ver_rs 3 '-')
2037 -
2038 -DESCRIPTION="A collection of tools and libraries for many image formats"
2039 -HOMEPAGE="https://www.imagemagick.org/"
2040 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
2041 -
2042 -LICENSE="imagemagick"
2043 -SLOT="0/${PV}"
2044 -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"
2045 -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"
2046 -
2047 -RESTRICT="perl? ( userpriv )"
2048 -
2049 -RDEPEND="
2050 - dev-libs/libltdl:0
2051 - bzip2? ( app-arch/bzip2 )
2052 - corefonts? ( media-fonts/corefonts )
2053 - djvu? ( app-text/djvu )
2054 - fftw? ( sci-libs/fftw:3.0 )
2055 - fontconfig? ( media-libs/fontconfig )
2056 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
2057 - graphviz? ( media-gfx/graphviz )
2058 - jbig? ( >=media-libs/jbigkit-2:= )
2059 - jpeg? ( virtual/jpeg:0 )
2060 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
2061 - lcms? ( media-libs/lcms:2= )
2062 - lqr? ( media-libs/liblqr )
2063 - opencl? ( virtual/opencl )
2064 - openexr? ( media-libs/openexr:0= )
2065 - pango? ( x11-libs/pango )
2066 - perl? ( >=dev-lang/perl-5.8.8:0= )
2067 - png? ( media-libs/libpng:0= )
2068 - postscript? ( app-text/ghostscript-gpl )
2069 - raw? ( media-libs/libraw:= )
2070 - svg? ( gnome-base/librsvg )
2071 - tiff? ( media-libs/tiff:0= )
2072 - truetype? (
2073 - media-fonts/urw-fonts
2074 - >=media-libs/freetype-2
2075 - )
2076 - webp? ( media-libs/libwebp:0= )
2077 - wmf? ( media-libs/libwmf )
2078 - X? (
2079 - x11-libs/libICE
2080 - x11-libs/libSM
2081 - x11-libs/libXext
2082 - x11-libs/libXt
2083 - )
2084 - xml? ( dev-libs/libxml2:= )
2085 - lzma? ( app-arch/xz-utils )
2086 - zlib? ( sys-libs/zlib:= )"
2087 -DEPEND="${RDEPEND}
2088 - !media-gfx/graphicsmagick[imagemagick]
2089 - virtual/pkgconfig
2090 - X? ( x11-base/xorg-proto )"
2091 -
2092 -REQUIRED_USE="corefonts? ( truetype )
2093 - test? ( corefonts )"
2094 -
2095 -S="${WORKDIR}/${MY_P}"
2096 -
2097 -src_prepare() {
2098 - local ati_cards mesa_cards nvidia_cards render_cards
2099 - default
2100 -
2101 - elibtoolize # for Darwin modules
2102 -
2103 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
2104 - shopt -s nullglob
2105 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
2106 - if test -n "${ati_cards}"; then
2107 - addpredict "${ati_cards}"
2108 - fi
2109 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
2110 - if test -n "${mesa_cards}"; then
2111 - addpredict "${mesa_cards}"
2112 - fi
2113 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
2114 - if test -n "${nvidia_cards}"; then
2115 - addpredict "${nvidia_cards}"
2116 - fi
2117 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
2118 - if test -n "${render_cards}"; then
2119 - addpredict "${render_cards}"
2120 - fi
2121 - shopt -u nullglob
2122 - addpredict /dev/nvidiactl
2123 -}
2124 -
2125 -src_configure() {
2126 - local depth=16
2127 - use q8 && depth=8
2128 - use q32 && depth=32
2129 -
2130 - local openmp=disable
2131 - use openmp && { tc-has-openmp && openmp=enable; }
2132 -
2133 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
2134 -
2135 - local myeconfargs=(
2136 - $(use_enable static-libs static)
2137 - $(use_enable hdri)
2138 - $(use_enable opencl)
2139 - --with-threads
2140 - --with-modules
2141 - --with-quantum-depth=${depth}
2142 - $(use_with cxx magick-plus-plus)
2143 - $(use_with perl)
2144 - --with-perl-options='INSTALLDIRS=vendor'
2145 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
2146 - $(use_with bzip2 bzlib)
2147 - $(use_with X x)
2148 - $(use_with zlib)
2149 - --without-autotrace
2150 - $(use_with postscript dps)
2151 - $(use_with djvu)
2152 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
2153 - $(use_with fftw)
2154 - $(use_with fpx)
2155 - $(use_with fontconfig)
2156 - $(use_with truetype freetype)
2157 - $(use_with postscript gslib)
2158 - $(use_with graphviz gvc)
2159 - $(use_with jbig)
2160 - $(use_with jpeg)
2161 - $(use_with jpeg2k openjp2)
2162 - $(use_with lcms)
2163 - $(use_with lqr)
2164 - $(use_with lzma)
2165 - $(use_with openexr)
2166 - $(use_with pango)
2167 - $(use_with png)
2168 - $(use_with raw)
2169 - $(use_with svg rsvg)
2170 - $(use_with tiff)
2171 - $(use_with webp)
2172 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
2173 - $(use_with wmf)
2174 - $(use_with xml)
2175 - --${openmp}-openmp
2176 - --with-gcc-arch=no-automagic
2177 - )
2178 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
2179 -}
2180 -
2181 -src_test() {
2182 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
2183 - emake check
2184 -}
2185 -
2186 -src_install() {
2187 - # Ensure documentation installation files and paths with each release!
2188 - emake \
2189 - DESTDIR="${D}" \
2190 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
2191 - install
2192 -
2193 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
2194 - dodoc {AUTHORS,README}.txt ChangeLog
2195 -
2196 - if use perl; then
2197 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
2198 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
2199 - fi
2200 -
2201 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
2202 -
2203 - if use opencl; then
2204 - cat <<-EOF > "${T}"/99${PN}
2205 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
2206 - EOF
2207 -
2208 - insinto /etc/sandbox.d
2209 - doins "${T}"/99${PN} #472766
2210 - fi
2211 -
2212 - insinto /usr/share/${PN}
2213 - doins config/*icm
2214 -}
2215
2216 diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
2217 deleted file mode 100644
2218 index 95dea12510f..00000000000
2219 --- a/media-gfx/imagemagick/imagemagick-7.0.8.5.ebuild
2220 +++ /dev/null
2221 @@ -1,188 +0,0 @@
2222 -# Copyright 1999-2018 Gentoo Foundation
2223 -# Distributed under the terms of the GNU General Public License v2
2224 -
2225 -EAPI=6
2226 -
2227 -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
2228 -
2229 -MY_P=ImageMagick-$(ver_rs 3 '-')
2230 -
2231 -DESCRIPTION="A collection of tools and libraries for many image formats"
2232 -HOMEPAGE="https://www.imagemagick.org/"
2233 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
2234 -
2235 -LICENSE="imagemagick"
2236 -SLOT="0/${PV}"
2237 -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"
2238 -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"
2239 -
2240 -RESTRICT="perl? ( userpriv )"
2241 -
2242 -RDEPEND="
2243 - dev-libs/libltdl:0
2244 - bzip2? ( app-arch/bzip2 )
2245 - corefonts? ( media-fonts/corefonts )
2246 - djvu? ( app-text/djvu )
2247 - fftw? ( sci-libs/fftw:3.0 )
2248 - fontconfig? ( media-libs/fontconfig )
2249 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
2250 - graphviz? ( media-gfx/graphviz )
2251 - jbig? ( >=media-libs/jbigkit-2:= )
2252 - jpeg? ( virtual/jpeg:0 )
2253 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
2254 - lcms? ( media-libs/lcms:2= )
2255 - lqr? ( media-libs/liblqr )
2256 - opencl? ( virtual/opencl )
2257 - openexr? ( media-libs/openexr:0= )
2258 - pango? ( x11-libs/pango )
2259 - perl? ( >=dev-lang/perl-5.8.8:0= )
2260 - png? ( media-libs/libpng:0= )
2261 - postscript? ( app-text/ghostscript-gpl )
2262 - raw? ( media-libs/libraw:= )
2263 - svg? ( gnome-base/librsvg )
2264 - tiff? ( media-libs/tiff:0= )
2265 - truetype? (
2266 - media-fonts/urw-fonts
2267 - >=media-libs/freetype-2
2268 - )
2269 - webp? ( media-libs/libwebp:0= )
2270 - wmf? ( media-libs/libwmf )
2271 - X? (
2272 - x11-libs/libICE
2273 - x11-libs/libSM
2274 - x11-libs/libXext
2275 - x11-libs/libXt
2276 - )
2277 - xml? ( dev-libs/libxml2:= )
2278 - lzma? ( app-arch/xz-utils )
2279 - zlib? ( sys-libs/zlib:= )"
2280 -DEPEND="${RDEPEND}
2281 - !media-gfx/graphicsmagick[imagemagick]
2282 - virtual/pkgconfig
2283 - X? ( x11-base/xorg-proto )"
2284 -
2285 -REQUIRED_USE="corefonts? ( truetype )
2286 - test? ( corefonts )"
2287 -
2288 -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
2289 -
2290 -S="${WORKDIR}/${MY_P}"
2291 -
2292 -src_prepare() {
2293 - local ati_cards mesa_cards nvidia_cards render_cards
2294 - default
2295 -
2296 - elibtoolize # for Darwin modules
2297 -
2298 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
2299 - shopt -s nullglob
2300 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
2301 - if test -n "${ati_cards}"; then
2302 - addpredict "${ati_cards}"
2303 - fi
2304 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
2305 - if test -n "${mesa_cards}"; then
2306 - addpredict "${mesa_cards}"
2307 - fi
2308 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
2309 - if test -n "${nvidia_cards}"; then
2310 - addpredict "${nvidia_cards}"
2311 - fi
2312 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
2313 - if test -n "${render_cards}"; then
2314 - addpredict "${render_cards}"
2315 - fi
2316 - shopt -u nullglob
2317 - addpredict /dev/nvidiactl
2318 -}
2319 -
2320 -src_configure() {
2321 - local depth=16
2322 - use q8 && depth=8
2323 - use q32 && depth=32
2324 -
2325 - local openmp=disable
2326 - use openmp && { tc-has-openmp && openmp=enable; }
2327 -
2328 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
2329 -
2330 - local myeconfargs=(
2331 - $(use_enable static-libs static)
2332 - $(use_enable hdri)
2333 - $(use_enable opencl)
2334 - --with-threads
2335 - --with-modules
2336 - --with-quantum-depth=${depth}
2337 - $(use_with cxx magick-plus-plus)
2338 - $(use_with perl)
2339 - --with-perl-options='INSTALLDIRS=vendor'
2340 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
2341 - $(use_with bzip2 bzlib)
2342 - $(use_with X x)
2343 - $(use_with zlib)
2344 - --without-autotrace
2345 - $(use_with postscript dps)
2346 - $(use_with djvu)
2347 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
2348 - $(use_with fftw)
2349 - $(use_with fpx)
2350 - $(use_with fontconfig)
2351 - $(use_with truetype freetype)
2352 - $(use_with postscript gslib)
2353 - $(use_with graphviz gvc)
2354 - $(use_with jbig)
2355 - $(use_with jpeg)
2356 - $(use_with jpeg2k openjp2)
2357 - $(use_with lcms)
2358 - $(use_with lqr)
2359 - $(use_with lzma)
2360 - $(use_with openexr)
2361 - $(use_with pango)
2362 - $(use_with png)
2363 - $(use_with raw)
2364 - $(use_with svg rsvg)
2365 - $(use_with tiff)
2366 - $(use_with webp)
2367 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
2368 - $(use_with wmf)
2369 - $(use_with xml)
2370 - --${openmp}-openmp
2371 - --with-gcc-arch=no-automagic
2372 - )
2373 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
2374 -}
2375 -
2376 -src_test() {
2377 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
2378 - emake check
2379 -}
2380 -
2381 -src_install() {
2382 - # Ensure documentation installation files and paths with each release!
2383 - emake \
2384 - DESTDIR="${D}" \
2385 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
2386 - install
2387 -
2388 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
2389 - dodoc {AUTHORS,README}.txt ChangeLog
2390 -
2391 - if use perl; then
2392 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
2393 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
2394 - fi
2395 -
2396 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
2397 -
2398 - if use opencl; then
2399 - cat <<-EOF > "${T}"/99${PN}
2400 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
2401 - EOF
2402 -
2403 - insinto /etc/sandbox.d
2404 - doins "${T}"/99${PN} #472766
2405 - fi
2406 -
2407 - insinto /usr/share/${PN}
2408 - doins config/*icm
2409 -}
2410
2411 diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild
2412 deleted file mode 100644
2413 index 15b1ca966bf..00000000000
2414 --- a/media-gfx/imagemagick/imagemagick-7.0.8.6.ebuild
2415 +++ /dev/null
2416 @@ -1,188 +0,0 @@
2417 -# Copyright 1999-2018 Gentoo Foundation
2418 -# Distributed under the terms of the GNU General Public License v2
2419 -
2420 -EAPI=6
2421 -
2422 -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
2423 -
2424 -MY_P=ImageMagick-$(ver_rs 3 '-')
2425 -
2426 -DESCRIPTION="A collection of tools and libraries for many image formats"
2427 -HOMEPAGE="https://www.imagemagick.org/"
2428 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
2429 -
2430 -LICENSE="imagemagick"
2431 -SLOT="0/${PV}"
2432 -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"
2433 -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"
2434 -
2435 -RESTRICT="perl? ( userpriv )"
2436 -
2437 -RDEPEND="
2438 - dev-libs/libltdl:0
2439 - bzip2? ( app-arch/bzip2 )
2440 - corefonts? ( media-fonts/corefonts )
2441 - djvu? ( app-text/djvu )
2442 - fftw? ( sci-libs/fftw:3.0 )
2443 - fontconfig? ( media-libs/fontconfig )
2444 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
2445 - graphviz? ( media-gfx/graphviz )
2446 - jbig? ( >=media-libs/jbigkit-2:= )
2447 - jpeg? ( virtual/jpeg:0 )
2448 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
2449 - lcms? ( media-libs/lcms:2= )
2450 - lqr? ( media-libs/liblqr )
2451 - opencl? ( virtual/opencl )
2452 - openexr? ( media-libs/openexr:0= )
2453 - pango? ( x11-libs/pango )
2454 - perl? ( >=dev-lang/perl-5.8.8:0= )
2455 - png? ( media-libs/libpng:0= )
2456 - postscript? ( app-text/ghostscript-gpl )
2457 - raw? ( media-libs/libraw:= )
2458 - svg? ( gnome-base/librsvg )
2459 - tiff? ( media-libs/tiff:0= )
2460 - truetype? (
2461 - media-fonts/urw-fonts
2462 - >=media-libs/freetype-2
2463 - )
2464 - webp? ( media-libs/libwebp:0= )
2465 - wmf? ( media-libs/libwmf )
2466 - X? (
2467 - x11-libs/libICE
2468 - x11-libs/libSM
2469 - x11-libs/libXext
2470 - x11-libs/libXt
2471 - )
2472 - xml? ( dev-libs/libxml2:= )
2473 - lzma? ( app-arch/xz-utils )
2474 - zlib? ( sys-libs/zlib:= )"
2475 -DEPEND="${RDEPEND}
2476 - !media-gfx/graphicsmagick[imagemagick]
2477 - virtual/pkgconfig
2478 - X? ( x11-base/xorg-proto )"
2479 -
2480 -REQUIRED_USE="corefonts? ( truetype )
2481 - test? ( corefonts )"
2482 -
2483 -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch )
2484 -
2485 -S="${WORKDIR}/${MY_P}"
2486 -
2487 -src_prepare() {
2488 - local ati_cards mesa_cards nvidia_cards render_cards
2489 - default
2490 -
2491 - elibtoolize # for Darwin modules
2492 -
2493 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
2494 - shopt -s nullglob
2495 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
2496 - if test -n "${ati_cards}"; then
2497 - addpredict "${ati_cards}"
2498 - fi
2499 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
2500 - if test -n "${mesa_cards}"; then
2501 - addpredict "${mesa_cards}"
2502 - fi
2503 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
2504 - if test -n "${nvidia_cards}"; then
2505 - addpredict "${nvidia_cards}"
2506 - fi
2507 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
2508 - if test -n "${render_cards}"; then
2509 - addpredict "${render_cards}"
2510 - fi
2511 - shopt -u nullglob
2512 - addpredict /dev/nvidiactl
2513 -}
2514 -
2515 -src_configure() {
2516 - local depth=16
2517 - use q8 && depth=8
2518 - use q32 && depth=32
2519 -
2520 - local openmp=disable
2521 - use openmp && { tc-has-openmp && openmp=enable; }
2522 -
2523 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
2524 -
2525 - local myeconfargs=(
2526 - $(use_enable static-libs static)
2527 - $(use_enable hdri)
2528 - $(use_enable opencl)
2529 - --with-threads
2530 - --with-modules
2531 - --with-quantum-depth=${depth}
2532 - $(use_with cxx magick-plus-plus)
2533 - $(use_with perl)
2534 - --with-perl-options='INSTALLDIRS=vendor'
2535 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
2536 - $(use_with bzip2 bzlib)
2537 - $(use_with X x)
2538 - $(use_with zlib)
2539 - --without-autotrace
2540 - $(use_with postscript dps)
2541 - $(use_with djvu)
2542 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
2543 - $(use_with fftw)
2544 - $(use_with fpx)
2545 - $(use_with fontconfig)
2546 - $(use_with truetype freetype)
2547 - $(use_with postscript gslib)
2548 - $(use_with graphviz gvc)
2549 - $(use_with jbig)
2550 - $(use_with jpeg)
2551 - $(use_with jpeg2k openjp2)
2552 - $(use_with lcms)
2553 - $(use_with lqr)
2554 - $(use_with lzma)
2555 - $(use_with openexr)
2556 - $(use_with pango)
2557 - $(use_with png)
2558 - $(use_with raw)
2559 - $(use_with svg rsvg)
2560 - $(use_with tiff)
2561 - $(use_with webp)
2562 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
2563 - $(use_with wmf)
2564 - $(use_with xml)
2565 - --${openmp}-openmp
2566 - --with-gcc-arch=no-automagic
2567 - )
2568 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
2569 -}
2570 -
2571 -src_test() {
2572 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
2573 - emake check
2574 -}
2575 -
2576 -src_install() {
2577 - # Ensure documentation installation files and paths with each release!
2578 - emake \
2579 - DESTDIR="${D}" \
2580 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
2581 - install
2582 -
2583 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
2584 - dodoc {AUTHORS,README}.txt ChangeLog
2585 -
2586 - if use perl; then
2587 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
2588 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
2589 - fi
2590 -
2591 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
2592 -
2593 - if use opencl; then
2594 - cat <<-EOF > "${T}"/99${PN}
2595 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
2596 - EOF
2597 -
2598 - insinto /etc/sandbox.d
2599 - doins "${T}"/99${PN} #472766
2600 - fi
2601 -
2602 - insinto /usr/share/${PN}
2603 - doins config/*icm
2604 -}
2605
2606 diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild
2607 deleted file mode 100644
2608 index 49b5b2b7bbd..00000000000
2609 --- a/media-gfx/imagemagick/imagemagick-7.0.8.7.ebuild
2610 +++ /dev/null
2611 @@ -1,186 +0,0 @@
2612 -# Copyright 1999-2018 Gentoo Foundation
2613 -# Distributed under the terms of the GNU General Public License v2
2614 -
2615 -EAPI=6
2616 -
2617 -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver
2618 -
2619 -MY_P=ImageMagick-$(ver_rs 3 '-')
2620 -
2621 -DESCRIPTION="A collection of tools and libraries for many image formats"
2622 -HOMEPAGE="https://www.imagemagick.org/"
2623 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
2624 -
2625 -LICENSE="imagemagick"
2626 -SLOT="0/${PV}"
2627 -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"
2628 -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"
2629 -
2630 -RESTRICT="perl? ( userpriv )"
2631 -
2632 -RDEPEND="
2633 - dev-libs/libltdl:0
2634 - bzip2? ( app-arch/bzip2 )
2635 - corefonts? ( media-fonts/corefonts )
2636 - djvu? ( app-text/djvu )
2637 - fftw? ( sci-libs/fftw:3.0 )
2638 - fontconfig? ( media-libs/fontconfig )
2639 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
2640 - graphviz? ( media-gfx/graphviz )
2641 - jbig? ( >=media-libs/jbigkit-2:= )
2642 - jpeg? ( virtual/jpeg:0 )
2643 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
2644 - lcms? ( media-libs/lcms:2= )
2645 - lqr? ( media-libs/liblqr )
2646 - opencl? ( virtual/opencl )
2647 - openexr? ( media-libs/openexr:0= )
2648 - pango? ( x11-libs/pango )
2649 - perl? ( >=dev-lang/perl-5.8.8:0= )
2650 - png? ( media-libs/libpng:0= )
2651 - postscript? ( app-text/ghostscript-gpl )
2652 - raw? ( media-libs/libraw:= )
2653 - svg? ( gnome-base/librsvg )
2654 - tiff? ( media-libs/tiff:0= )
2655 - truetype? (
2656 - media-fonts/urw-fonts
2657 - >=media-libs/freetype-2
2658 - )
2659 - webp? ( media-libs/libwebp:0= )
2660 - wmf? ( media-libs/libwmf )
2661 - X? (
2662 - x11-libs/libICE
2663 - x11-libs/libSM
2664 - x11-libs/libXext
2665 - x11-libs/libXt
2666 - )
2667 - xml? ( dev-libs/libxml2:= )
2668 - lzma? ( app-arch/xz-utils )
2669 - zlib? ( sys-libs/zlib:= )"
2670 -DEPEND="${RDEPEND}
2671 - !media-gfx/graphicsmagick[imagemagick]
2672 - virtual/pkgconfig
2673 - X? ( x11-base/xorg-proto )"
2674 -
2675 -REQUIRED_USE="corefonts? ( truetype )
2676 - test? ( corefonts )"
2677 -
2678 -S="${WORKDIR}/${MY_P}"
2679 -
2680 -src_prepare() {
2681 - local ati_cards mesa_cards nvidia_cards render_cards
2682 - default
2683 -
2684 - elibtoolize # for Darwin modules
2685 -
2686 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
2687 - shopt -s nullglob
2688 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
2689 - if test -n "${ati_cards}"; then
2690 - addpredict "${ati_cards}"
2691 - fi
2692 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
2693 - if test -n "${mesa_cards}"; then
2694 - addpredict "${mesa_cards}"
2695 - fi
2696 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
2697 - if test -n "${nvidia_cards}"; then
2698 - addpredict "${nvidia_cards}"
2699 - fi
2700 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
2701 - if test -n "${render_cards}"; then
2702 - addpredict "${render_cards}"
2703 - fi
2704 - shopt -u nullglob
2705 - addpredict /dev/nvidiactl
2706 -}
2707 -
2708 -src_configure() {
2709 - local depth=16
2710 - use q8 && depth=8
2711 - use q32 && depth=32
2712 -
2713 - local openmp=disable
2714 - use openmp && { tc-has-openmp && openmp=enable; }
2715 -
2716 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
2717 -
2718 - local myeconfargs=(
2719 - $(use_enable static-libs static)
2720 - $(use_enable hdri)
2721 - $(use_enable opencl)
2722 - --with-threads
2723 - --with-modules
2724 - --with-quantum-depth=${depth}
2725 - $(use_with cxx magick-plus-plus)
2726 - $(use_with perl)
2727 - --with-perl-options='INSTALLDIRS=vendor'
2728 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
2729 - $(use_with bzip2 bzlib)
2730 - $(use_with X x)
2731 - $(use_with zlib)
2732 - --without-autotrace
2733 - $(use_with postscript dps)
2734 - $(use_with djvu)
2735 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
2736 - $(use_with fftw)
2737 - $(use_with fpx)
2738 - $(use_with fontconfig)
2739 - $(use_with truetype freetype)
2740 - $(use_with postscript gslib)
2741 - $(use_with graphviz gvc)
2742 - $(use_with jbig)
2743 - $(use_with jpeg)
2744 - $(use_with jpeg2k openjp2)
2745 - $(use_with lcms)
2746 - $(use_with lqr)
2747 - $(use_with lzma)
2748 - $(use_with openexr)
2749 - $(use_with pango)
2750 - $(use_with png)
2751 - $(use_with raw)
2752 - $(use_with svg rsvg)
2753 - $(use_with tiff)
2754 - $(use_with webp)
2755 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
2756 - $(use_with wmf)
2757 - $(use_with xml)
2758 - --${openmp}-openmp
2759 - --with-gcc-arch=no-automagic
2760 - )
2761 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
2762 -}
2763 -
2764 -src_test() {
2765 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
2766 - emake check
2767 -}
2768 -
2769 -src_install() {
2770 - # Ensure documentation installation files and paths with each release!
2771 - emake \
2772 - DESTDIR="${D}" \
2773 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
2774 - install
2775 -
2776 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
2777 - dodoc {AUTHORS,README}.txt ChangeLog
2778 -
2779 - if use perl; then
2780 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
2781 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
2782 - fi
2783 -
2784 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
2785 -
2786 - if use opencl; then
2787 - cat <<-EOF > "${T}"/99${PN}
2788 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
2789 - EOF
2790 -
2791 - insinto /etc/sandbox.d
2792 - doins "${T}"/99${PN} #472766
2793 - fi
2794 -
2795 - insinto /usr/share/${PN}
2796 - doins config/*icm
2797 -}