Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/
Date: Sun, 07 Jan 2018 17:54:21
Message-Id: 1515347654.7b1402688af03d3a8443e0085eec5474e7dc71ce.polynomial-c@gentoo
1 commit: 7b1402688af03d3a8443e0085eec5474e7dc71ce
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 7 17:53:58 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 7 17:54:14 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b140268
7
8 media-gfx/imagemagick: Removed old.
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 media-gfx/imagemagick/Manifest | 7 -
13 media-gfx/imagemagick/imagemagick-6.9.9.0.ebuild | 184 ---------------------
14 media-gfx/imagemagick/imagemagick-6.9.9.18.ebuild | 185 ----------------------
15 media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild | 185 ----------------------
16 media-gfx/imagemagick/imagemagick-6.9.9.9.ebuild | 185 ----------------------
17 media-gfx/imagemagick/imagemagick-7.0.6.9.ebuild | 185 ----------------------
18 media-gfx/imagemagick/imagemagick-7.0.7.6.ebuild | 185 ----------------------
19 media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild | 185 ----------------------
20 8 files changed, 1301 deletions(-)
21
22 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
23 index 89f447df4fc..1f39915dd01 100644
24 --- a/media-gfx/imagemagick/Manifest
25 +++ b/media-gfx/imagemagick/Manifest
26 @@ -1,15 +1,8 @@
27 -DIST ImageMagick-6.9.9-0.tar.xz 8780640 BLAKE2B eaab6af1ed0471b148736d23ad53d334a49deabade72ae32e5729548d2a8d6e799bfab7a8273855ec2a5cc14a1b10fe60ae2db49d7f0b2cc949ed64f65494459 SHA512 ddd2042e5d9fd2ee9ba91f65c7be3f0cf1a8ce340be9cefaaca2517073d2319b43b7190c5302c92e845f8e250d87681e375aec7238ca93401b42dd248776e338
28 -DIST ImageMagick-6.9.9-18.tar.xz 8797460 BLAKE2B dc5fc072a5419cbf9b4f3ff9bc7093208f03a9625c4439be58edac668d09edc4e89fc3f133b4619b297b9642fbae9dd44d89b80df14a3fe39a5b8021cb7e8d75 SHA512 b18733e01c3f41a221a691ceb992bb2e7ecabbdd1b4765c5dd46f00c2047db8534acee9659aed55786baa00062946353bd02ac60b0609caf21f87fb34a40d290
29 -DIST ImageMagick-6.9.9-20.tar.xz 8994128 BLAKE2B fb52396956b6e34320e82f34f83273550af3a55f0d23af87a791b3a8ae4002d27d3726e1caae1822bfe2f697de6ec76a975156a305eef5233cdb60006e32314f SHA512 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849
30 DIST ImageMagick-6.9.9-23.tar.xz 8795632 BLAKE2B c3a2ece7897961b191b1090384c0872422af80903d0447a0b67f06d45062d60f12903a30a00d28bedc33a6c0b74f38bfe043a113613f0bfb5b1608b972ce8e2a SHA512 9160e0f6606c6ea011e9e47a11f092735456be60d6d039b9cf73c055c046ce89f05d096bdc3d37f87e2d6e36cd8dc9adf233b42bb9ad7d14aa03f13c7a1b6c03
31 DIST ImageMagick-6.9.9-26.tar.xz 8799740 BLAKE2B 6d781ef8b0285390cfef0544b26c8b4779a7bfdfb18ba9064eaa1b47edc19e98080e53ea073fe95f11dde52b910ecdff7c3a27efe6163a4b4855cc8db358a66c SHA512 e132deae4d14ccc179300841681c1ec83f90fe9ac8e2ce1f07af5642497be44ce017ec1e007964d307c32ecb733081bd2172e4f3113e5acea31c5783b1126e89
32 DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
33 DIST ImageMagick-6.9.9-33.tar.xz 8833416 BLAKE2B 06d0d30a8a20a0f5f3aa938f1d54326acbbfbdec95b6de5b311996f9a3c9698054cd3b60a224ac47b68f35d4541c8a4ddbe96ba87c91b2ee7255e7660a806f1e SHA512 5edbb508d18f9f80be2630bc4f7682b325a189cffa3b8ced337ce932f5f39f4517307afb190df8ebf588e7338d4779fc23a660eb0294e2411aaa90b59327dd80
34 -DIST ImageMagick-6.9.9-9.tar.xz 8797832 BLAKE2B 453102e0db6bf51c10e43b54d6fc35acaac4de193cdb0cc1f8448f70708739628e9e97ef310e9deb8d3967318d17f29344c1b9c6dc1c7437e39b4f42f23b5dd3 SHA512 d024f753e1bf234e38736935f38a9bf82969ca77130059383f9d1871a39f68d7678a546d2786d57d602744e2008909df3f2ab08e1207b4c97c0952e7b03876d8
35 -DIST ImageMagick-7.0.6-9.tar.xz 8550004 BLAKE2B 2ca6cb995bdbdb16188c8cfa1fe328cccfe604341331413dc35950bc115f8a76af21f2f07cc3384da460a03d3de97484e1293507d30fea4571ee8f064f536757 SHA512 5756d2605cbfbd876765372e954aeefdcdf60f1ee364ce40c3302f8958c510e6f0ecf47a3ee3c264eaaade1504bdae068118eb2cb96d418237f7f53da94a6c11
36 DIST ImageMagick-7.0.7-11.tar.xz 8626180 BLAKE2B cb43c167227632dbcb96575d2f4845cb80a40f4490be240aa8020993033e23f42ba9f600ba37751cce66dc51237b209be965115fbed20329f046a8ca014accdf SHA512 089c8516ca66845c6b8e6b365815ef1806fc97c785f75c06ed62241d7b6255387ee8f9004b1bcc0a6d03b7aa397d8e25131ca2aadc9255cc1e2368d73f774551
37 DIST ImageMagick-7.0.7-14.tar.xz 8617500 BLAKE2B 72d6a1319ec299e9717b68cef29c08817999dd9f2fffa5ee80aded6cb03c87c17859dc6d74cc48a63205c28f27ae5781cf55589a07bdda3b54528b489141f05f SHA512 c4b15ffe64bddb8da8e1ab04e6c41c46c9120d224a09225e76f5624250b31aea84bff37c712ad5cdea3faa8f2242054bfa3f33456468d68e14e7f4d85a88de6f
38 DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
39 DIST ImageMagick-7.0.7-21.tar.xz 8539076 BLAKE2B 93333c4608dfa027a25bd68a7c4ced5c5144fe5981529503d444e166eeb6f02a7c73f18e0667a0d6ed2346cbcd10c67d1ded2af4cd22c2515a1e17ee57fec433 SHA512 1bbdeb1a67f2057f2c17cee4d0cdd5d9d5304f961b4a5e45c05ac797e941cda9eb73795c273c9b2fd4f3ec6a84e84570c6c91f667a8ae0fbd6c3e1e2b6bb54ce
40 -DIST ImageMagick-7.0.7-6.tar.xz 8556160 BLAKE2B 3450c4c7e3804b0dcf7659a7ca0f11f6d1225c577b33216e10f6feeaa817412839ce613fdcae2175beace4cf844f880379899c1ad4914ff6df25fe2817fd0572 SHA512 9dff09a29b94f0de8ede82473820860f812edf3fc8edb0d1f8daa21c127d3e7831047f33ab22c407f2803a03561b690a52525672da837bbab1a1255156b4e6ff
41 -DIST ImageMagick-7.0.7-8.tar.xz 8797060 BLAKE2B a1a4278c375047fed7e59fdb9fa2a9526e2fc14136a669a0d148f78e5b308244de0ddd5c4b79e8e2214e4c91d39ae25531581868a2832ad91189a34460b5b5ad SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2
42
43 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.0.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.0.ebuild
44 deleted file mode 100644
45 index ff4e49a50ce..00000000000
46 --- a/media-gfx/imagemagick/imagemagick-6.9.9.0.ebuild
47 +++ /dev/null
48 @@ -1,184 +0,0 @@
49 -# Copyright 1999-2017 Gentoo Foundation
50 -# Distributed under the terms of the GNU General Public License v2
51 -
52 -EAPI=6
53 -
54 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
55 -
56 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
57 -
58 -DESCRIPTION="A collection of tools and libraries for many image formats"
59 -HOMEPAGE="http://www.imagemagick.org/"
60 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
61 -
62 -LICENSE="imagemagick"
63 -SLOT="0/${PV}"
64 -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"
65 -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"
66 -
67 -RESTRICT="perl? ( userpriv )"
68 -
69 -RDEPEND="
70 - dev-libs/libltdl:0
71 - bzip2? ( app-arch/bzip2 )
72 - corefonts? ( media-fonts/corefonts )
73 - djvu? ( app-text/djvu )
74 - fftw? ( sci-libs/fftw:3.0 )
75 - fontconfig? ( media-libs/fontconfig )
76 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
77 - graphviz? ( media-gfx/graphviz )
78 - jbig? ( >=media-libs/jbigkit-2:= )
79 - jpeg? ( virtual/jpeg:0 )
80 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
81 - lcms? ( media-libs/lcms:2= )
82 - lqr? ( media-libs/liblqr )
83 - opencl? ( virtual/opencl )
84 - openexr? ( media-libs/openexr:0= )
85 - pango? ( x11-libs/pango )
86 - perl? ( >=dev-lang/perl-5.8.8:0= )
87 - png? ( media-libs/libpng:0= )
88 - postscript? ( app-text/ghostscript-gpl )
89 - raw? ( media-gfx/ufraw )
90 - svg? ( gnome-base/librsvg )
91 - tiff? ( media-libs/tiff:0= )
92 - truetype? (
93 - media-fonts/urw-fonts
94 - >=media-libs/freetype-2
95 - )
96 - webp? ( media-libs/libwebp:0= )
97 - wmf? ( media-libs/libwmf )
98 - X? (
99 - x11-libs/libICE
100 - x11-libs/libSM
101 - x11-libs/libXext
102 - x11-libs/libXt
103 - )
104 - xml? ( dev-libs/libxml2:= )
105 - lzma? ( app-arch/xz-utils )
106 - zlib? ( sys-libs/zlib:= )"
107 -DEPEND="${RDEPEND}
108 - !media-gfx/graphicsmagick[imagemagick]
109 - virtual/pkgconfig
110 - X? ( x11-proto/xextproto )"
111 -
112 -REQUIRED_USE="corefonts? ( truetype )
113 - test? ( corefonts )"
114 -
115 -S=${WORKDIR}/${MY_P}
116 -
117 -src_prepare() {
118 - local mesa_cards ati_cards nvidia_cards render_cards
119 - default
120 -
121 - elibtoolize # for Darwin modules
122 -
123 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
124 - shopt -s nullglob
125 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
126 - if test -n "${ati_cards}"; then
127 - addpredict "${ati_cards}"
128 - fi
129 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
130 - if test -n "${mesa_cards}"; then
131 - addpredict "${mesa_cards}"
132 - fi
133 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
134 - if test -n "${nvidia_cards}"; then
135 - addpredict "${nvidia_cards}"
136 - fi
137 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
138 - if test -n "${render_cards}"; then
139 - addpredict "${render_cards}"
140 - fi
141 - shopt -u nullglob
142 - addpredict /dev/nvidiactl
143 -}
144 -
145 -src_configure() {
146 - local depth=16
147 - use q8 && depth=8
148 - use q32 && depth=32
149 -
150 - local openmp=disable
151 - use openmp && { tc-has-openmp && openmp=enable; }
152 -
153 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
154 -
155 - CONFIG_SHELL=$(type -P bash) \
156 - econf \
157 - $(use_enable static-libs static) \
158 - $(use_enable hdri) \
159 - $(use_enable opencl) \
160 - --with-threads \
161 - --with-modules \
162 - --with-quantum-depth=${depth} \
163 - $(use_with cxx magick-plus-plus) \
164 - $(use_with perl) \
165 - --with-perl-options='INSTALLDIRS=vendor' \
166 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
167 - $(use_with bzip2 bzlib) \
168 - $(use_with X x) \
169 - $(use_with zlib) \
170 - --without-autotrace \
171 - $(use_with postscript dps) \
172 - $(use_with djvu) \
173 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu \
174 - $(use_with fftw) \
175 - $(use_with fpx) \
176 - $(use_with fontconfig) \
177 - $(use_with truetype freetype) \
178 - $(use_with postscript gslib) \
179 - $(use_with graphviz gvc) \
180 - $(use_with jbig) \
181 - $(use_with jpeg) \
182 - $(use_with jpeg2k openjp2) \
183 - $(use_with lcms) \
184 - $(use_with lqr) \
185 - $(use_with lzma) \
186 - $(use_with openexr) \
187 - $(use_with pango) \
188 - $(use_with png) \
189 - $(use_with svg rsvg) \
190 - $(use_with tiff) \
191 - $(use_with webp) \
192 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
193 - $(use_with wmf) \
194 - $(use_with xml) \
195 - --${openmp}-openmp \
196 - --with-gcc-arch=no-automagic
197 -}
198 -
199 -src_test() {
200 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
201 - emake check
202 -}
203 -
204 -src_install() {
205 - # Ensure documentation installation files and paths with each release!
206 - emake \
207 - DESTDIR="${D}" \
208 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
209 - install
210 -
211 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
212 - dodoc {AUTHORS,README}.txt ChangeLog
213 -
214 - if use perl; then
215 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
216 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
217 - fi
218 -
219 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
220 -
221 - if use opencl; then
222 - cat <<-EOF > "${T}"/99${PN}
223 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
224 - EOF
225 -
226 - insinto /etc/sandbox.d
227 - doins "${T}"/99${PN} #472766
228 - fi
229 -
230 - insinto /usr/share/${PN}
231 - doins config/*icm
232 -}
233
234 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.18.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.18.ebuild
235 deleted file mode 100644
236 index d91b5ff35ee..00000000000
237 --- a/media-gfx/imagemagick/imagemagick-6.9.9.18.ebuild
238 +++ /dev/null
239 @@ -1,185 +0,0 @@
240 -# Copyright 1999-2017 Gentoo Foundation
241 -# Distributed under the terms of the GNU General Public License v2
242 -
243 -EAPI=6
244 -
245 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
246 -
247 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
248 -
249 -DESCRIPTION="A collection of tools and libraries for many image formats"
250 -HOMEPAGE="http://www.imagemagick.org/"
251 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
252 -
253 -LICENSE="imagemagick"
254 -SLOT="0/${PV}"
255 -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"
256 -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"
257 -
258 -RESTRICT="perl? ( userpriv )"
259 -
260 -RDEPEND="
261 - dev-libs/libltdl:0
262 - bzip2? ( app-arch/bzip2 )
263 - corefonts? ( media-fonts/corefonts )
264 - djvu? ( app-text/djvu )
265 - fftw? ( sci-libs/fftw:3.0 )
266 - fontconfig? ( media-libs/fontconfig )
267 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
268 - graphviz? ( media-gfx/graphviz )
269 - jbig? ( >=media-libs/jbigkit-2:= )
270 - jpeg? ( virtual/jpeg:0 )
271 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
272 - lcms? ( media-libs/lcms:2= )
273 - lqr? ( media-libs/liblqr )
274 - opencl? ( virtual/opencl )
275 - openexr? ( media-libs/openexr:0= )
276 - pango? ( x11-libs/pango )
277 - perl? ( >=dev-lang/perl-5.8.8:0= )
278 - png? ( media-libs/libpng:0= )
279 - postscript? ( app-text/ghostscript-gpl )
280 - raw? ( media-gfx/ufraw )
281 - svg? ( gnome-base/librsvg )
282 - tiff? ( media-libs/tiff:0= )
283 - truetype? (
284 - media-fonts/urw-fonts
285 - >=media-libs/freetype-2
286 - )
287 - webp? ( media-libs/libwebp:0= )
288 - wmf? ( media-libs/libwmf )
289 - X? (
290 - x11-libs/libICE
291 - x11-libs/libSM
292 - x11-libs/libXext
293 - x11-libs/libXt
294 - )
295 - xml? ( dev-libs/libxml2:= )
296 - lzma? ( app-arch/xz-utils )
297 - zlib? ( sys-libs/zlib:= )"
298 -DEPEND="${RDEPEND}
299 - !media-gfx/graphicsmagick[imagemagick]
300 - virtual/pkgconfig
301 - X? ( x11-proto/xextproto )"
302 -
303 -REQUIRED_USE="corefonts? ( truetype )
304 - test? ( corefonts )"
305 -
306 -S=${WORKDIR}/${MY_P}
307 -
308 -src_prepare() {
309 - local mesa_cards ati_cards nvidia_cards render_cards
310 - default
311 -
312 - elibtoolize # for Darwin modules
313 -
314 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
315 - shopt -s nullglob
316 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
317 - if test -n "${ati_cards}"; then
318 - addpredict "${ati_cards}"
319 - fi
320 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
321 - if test -n "${mesa_cards}"; then
322 - addpredict "${mesa_cards}"
323 - fi
324 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
325 - if test -n "${nvidia_cards}"; then
326 - addpredict "${nvidia_cards}"
327 - fi
328 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
329 - if test -n "${render_cards}"; then
330 - addpredict "${render_cards}"
331 - fi
332 - shopt -u nullglob
333 - addpredict /dev/nvidiactl
334 -}
335 -
336 -src_configure() {
337 - local depth=16
338 - use q8 && depth=8
339 - use q32 && depth=32
340 -
341 - local openmp=disable
342 - use openmp && { tc-has-openmp && openmp=enable; }
343 -
344 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
345 -
346 - local myeconfargs=(
347 - $(use_enable static-libs static)
348 - $(use_enable hdri)
349 - $(use_enable opencl)
350 - --with-threads
351 - --with-modules
352 - --with-quantum-depth=${depth}
353 - $(use_with cxx magick-plus-plus)
354 - $(use_with perl)
355 - --with-perl-options='INSTALLDIRS=vendor'
356 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
357 - $(use_with bzip2 bzlib)
358 - $(use_with X x)
359 - $(use_with zlib)
360 - --without-autotrace
361 - $(use_with postscript dps)
362 - $(use_with djvu)
363 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
364 - $(use_with fftw)
365 - $(use_with fpx)
366 - $(use_with fontconfig)
367 - $(use_with truetype freetype)
368 - $(use_with postscript gslib)
369 - $(use_with graphviz gvc)
370 - $(use_with jbig)
371 - $(use_with jpeg)
372 - $(use_with jpeg2k openjp2)
373 - $(use_with lcms)
374 - $(use_with lqr)
375 - $(use_with lzma)
376 - $(use_with openexr)
377 - $(use_with pango)
378 - $(use_with png)
379 - $(use_with svg rsvg)
380 - $(use_with tiff)
381 - $(use_with webp)
382 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
383 - $(use_with wmf)
384 - $(use_with xml)
385 - --${openmp}-openmp
386 - --with-gcc-arch=no-automagic
387 - )
388 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
389 -}
390 -
391 -src_test() {
392 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
393 - emake check
394 -}
395 -
396 -src_install() {
397 - # Ensure documentation installation files and paths with each release!
398 - emake \
399 - DESTDIR="${D}" \
400 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
401 - install
402 -
403 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
404 - dodoc {AUTHORS,README}.txt ChangeLog
405 -
406 - if use perl; then
407 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
408 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
409 - fi
410 -
411 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
412 -
413 - if use opencl; then
414 - cat <<-EOF > "${T}"/99${PN}
415 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
416 - EOF
417 -
418 - insinto /etc/sandbox.d
419 - doins "${T}"/99${PN} #472766
420 - fi
421 -
422 - insinto /usr/share/${PN}
423 - doins config/*icm
424 -}
425
426 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
427 deleted file mode 100644
428 index acace20a087..00000000000
429 --- a/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
430 +++ /dev/null
431 @@ -1,185 +0,0 @@
432 -# Copyright 1999-2017 Gentoo Foundation
433 -# Distributed under the terms of the GNU General Public License v2
434 -
435 -EAPI=6
436 -
437 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
438 -
439 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
440 -
441 -DESCRIPTION="A collection of tools and libraries for many image formats"
442 -HOMEPAGE="http://www.imagemagick.org/"
443 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
444 -
445 -LICENSE="imagemagick"
446 -SLOT="0/${PV}"
447 -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"
448 -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"
449 -
450 -RESTRICT="perl? ( userpriv )"
451 -
452 -RDEPEND="
453 - dev-libs/libltdl:0
454 - bzip2? ( app-arch/bzip2 )
455 - corefonts? ( media-fonts/corefonts )
456 - djvu? ( app-text/djvu )
457 - fftw? ( sci-libs/fftw:3.0 )
458 - fontconfig? ( media-libs/fontconfig )
459 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
460 - graphviz? ( media-gfx/graphviz )
461 - jbig? ( >=media-libs/jbigkit-2:= )
462 - jpeg? ( virtual/jpeg:0 )
463 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
464 - lcms? ( media-libs/lcms:2= )
465 - lqr? ( media-libs/liblqr )
466 - opencl? ( virtual/opencl )
467 - openexr? ( media-libs/openexr:0= )
468 - pango? ( x11-libs/pango )
469 - perl? ( >=dev-lang/perl-5.8.8:0= )
470 - png? ( media-libs/libpng:0= )
471 - postscript? ( app-text/ghostscript-gpl )
472 - raw? ( media-gfx/ufraw )
473 - svg? ( gnome-base/librsvg )
474 - tiff? ( media-libs/tiff:0= )
475 - truetype? (
476 - media-fonts/urw-fonts
477 - >=media-libs/freetype-2
478 - )
479 - webp? ( media-libs/libwebp:0= )
480 - wmf? ( media-libs/libwmf )
481 - X? (
482 - x11-libs/libICE
483 - x11-libs/libSM
484 - x11-libs/libXext
485 - x11-libs/libXt
486 - )
487 - xml? ( dev-libs/libxml2:= )
488 - lzma? ( app-arch/xz-utils )
489 - zlib? ( sys-libs/zlib:= )"
490 -DEPEND="${RDEPEND}
491 - !media-gfx/graphicsmagick[imagemagick]
492 - virtual/pkgconfig
493 - X? ( x11-proto/xextproto )"
494 -
495 -REQUIRED_USE="corefonts? ( truetype )
496 - test? ( corefonts )"
497 -
498 -S=${WORKDIR}/${MY_P}
499 -
500 -src_prepare() {
501 - local mesa_cards ati_cards nvidia_cards render_cards
502 - default
503 -
504 - elibtoolize # for Darwin modules
505 -
506 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
507 - shopt -s nullglob
508 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
509 - if test -n "${ati_cards}"; then
510 - addpredict "${ati_cards}"
511 - fi
512 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
513 - if test -n "${mesa_cards}"; then
514 - addpredict "${mesa_cards}"
515 - fi
516 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
517 - if test -n "${nvidia_cards}"; then
518 - addpredict "${nvidia_cards}"
519 - fi
520 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
521 - if test -n "${render_cards}"; then
522 - addpredict "${render_cards}"
523 - fi
524 - shopt -u nullglob
525 - addpredict /dev/nvidiactl
526 -}
527 -
528 -src_configure() {
529 - local depth=16
530 - use q8 && depth=8
531 - use q32 && depth=32
532 -
533 - local openmp=disable
534 - use openmp && { tc-has-openmp && openmp=enable; }
535 -
536 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
537 -
538 - local myeconfargs=(
539 - $(use_enable static-libs static)
540 - $(use_enable hdri)
541 - $(use_enable opencl)
542 - --with-threads
543 - --with-modules
544 - --with-quantum-depth=${depth}
545 - $(use_with cxx magick-plus-plus)
546 - $(use_with perl)
547 - --with-perl-options='INSTALLDIRS=vendor'
548 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
549 - $(use_with bzip2 bzlib)
550 - $(use_with X x)
551 - $(use_with zlib)
552 - --without-autotrace
553 - $(use_with postscript dps)
554 - $(use_with djvu)
555 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
556 - $(use_with fftw)
557 - $(use_with fpx)
558 - $(use_with fontconfig)
559 - $(use_with truetype freetype)
560 - $(use_with postscript gslib)
561 - $(use_with graphviz gvc)
562 - $(use_with jbig)
563 - $(use_with jpeg)
564 - $(use_with jpeg2k openjp2)
565 - $(use_with lcms)
566 - $(use_with lqr)
567 - $(use_with lzma)
568 - $(use_with openexr)
569 - $(use_with pango)
570 - $(use_with png)
571 - $(use_with svg rsvg)
572 - $(use_with tiff)
573 - $(use_with webp)
574 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
575 - $(use_with wmf)
576 - $(use_with xml)
577 - --${openmp}-openmp
578 - --with-gcc-arch=no-automagic
579 - )
580 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
581 -}
582 -
583 -src_test() {
584 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
585 - emake check
586 -}
587 -
588 -src_install() {
589 - # Ensure documentation installation files and paths with each release!
590 - emake \
591 - DESTDIR="${D}" \
592 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
593 - install
594 -
595 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
596 - dodoc {AUTHORS,README}.txt ChangeLog
597 -
598 - if use perl; then
599 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
600 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
601 - fi
602 -
603 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
604 -
605 - if use opencl; then
606 - cat <<-EOF > "${T}"/99${PN}
607 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
608 - EOF
609 -
610 - insinto /etc/sandbox.d
611 - doins "${T}"/99${PN} #472766
612 - fi
613 -
614 - insinto /usr/share/${PN}
615 - doins config/*icm
616 -}
617
618 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.9.ebuild
619 deleted file mode 100644
620 index d91b5ff35ee..00000000000
621 --- a/media-gfx/imagemagick/imagemagick-6.9.9.9.ebuild
622 +++ /dev/null
623 @@ -1,185 +0,0 @@
624 -# Copyright 1999-2017 Gentoo Foundation
625 -# Distributed under the terms of the GNU General Public License v2
626 -
627 -EAPI=6
628 -
629 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
630 -
631 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
632 -
633 -DESCRIPTION="A collection of tools and libraries for many image formats"
634 -HOMEPAGE="http://www.imagemagick.org/"
635 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
636 -
637 -LICENSE="imagemagick"
638 -SLOT="0/${PV}"
639 -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"
640 -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"
641 -
642 -RESTRICT="perl? ( userpriv )"
643 -
644 -RDEPEND="
645 - dev-libs/libltdl:0
646 - bzip2? ( app-arch/bzip2 )
647 - corefonts? ( media-fonts/corefonts )
648 - djvu? ( app-text/djvu )
649 - fftw? ( sci-libs/fftw:3.0 )
650 - fontconfig? ( media-libs/fontconfig )
651 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
652 - graphviz? ( media-gfx/graphviz )
653 - jbig? ( >=media-libs/jbigkit-2:= )
654 - jpeg? ( virtual/jpeg:0 )
655 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
656 - lcms? ( media-libs/lcms:2= )
657 - lqr? ( media-libs/liblqr )
658 - opencl? ( virtual/opencl )
659 - openexr? ( media-libs/openexr:0= )
660 - pango? ( x11-libs/pango )
661 - perl? ( >=dev-lang/perl-5.8.8:0= )
662 - png? ( media-libs/libpng:0= )
663 - postscript? ( app-text/ghostscript-gpl )
664 - raw? ( media-gfx/ufraw )
665 - svg? ( gnome-base/librsvg )
666 - tiff? ( media-libs/tiff:0= )
667 - truetype? (
668 - media-fonts/urw-fonts
669 - >=media-libs/freetype-2
670 - )
671 - webp? ( media-libs/libwebp:0= )
672 - wmf? ( media-libs/libwmf )
673 - X? (
674 - x11-libs/libICE
675 - x11-libs/libSM
676 - x11-libs/libXext
677 - x11-libs/libXt
678 - )
679 - xml? ( dev-libs/libxml2:= )
680 - lzma? ( app-arch/xz-utils )
681 - zlib? ( sys-libs/zlib:= )"
682 -DEPEND="${RDEPEND}
683 - !media-gfx/graphicsmagick[imagemagick]
684 - virtual/pkgconfig
685 - X? ( x11-proto/xextproto )"
686 -
687 -REQUIRED_USE="corefonts? ( truetype )
688 - test? ( corefonts )"
689 -
690 -S=${WORKDIR}/${MY_P}
691 -
692 -src_prepare() {
693 - local mesa_cards ati_cards nvidia_cards render_cards
694 - default
695 -
696 - elibtoolize # for Darwin modules
697 -
698 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
699 - shopt -s nullglob
700 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
701 - if test -n "${ati_cards}"; then
702 - addpredict "${ati_cards}"
703 - fi
704 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
705 - if test -n "${mesa_cards}"; then
706 - addpredict "${mesa_cards}"
707 - fi
708 - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
709 - if test -n "${nvidia_cards}"; then
710 - addpredict "${nvidia_cards}"
711 - fi
712 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
713 - if test -n "${render_cards}"; then
714 - addpredict "${render_cards}"
715 - fi
716 - shopt -u nullglob
717 - addpredict /dev/nvidiactl
718 -}
719 -
720 -src_configure() {
721 - local depth=16
722 - use q8 && depth=8
723 - use q32 && depth=32
724 -
725 - local openmp=disable
726 - use openmp && { tc-has-openmp && openmp=enable; }
727 -
728 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
729 -
730 - local myeconfargs=(
731 - $(use_enable static-libs static)
732 - $(use_enable hdri)
733 - $(use_enable opencl)
734 - --with-threads
735 - --with-modules
736 - --with-quantum-depth=${depth}
737 - $(use_with cxx magick-plus-plus)
738 - $(use_with perl)
739 - --with-perl-options='INSTALLDIRS=vendor'
740 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
741 - $(use_with bzip2 bzlib)
742 - $(use_with X x)
743 - $(use_with zlib)
744 - --without-autotrace
745 - $(use_with postscript dps)
746 - $(use_with djvu)
747 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
748 - $(use_with fftw)
749 - $(use_with fpx)
750 - $(use_with fontconfig)
751 - $(use_with truetype freetype)
752 - $(use_with postscript gslib)
753 - $(use_with graphviz gvc)
754 - $(use_with jbig)
755 - $(use_with jpeg)
756 - $(use_with jpeg2k openjp2)
757 - $(use_with lcms)
758 - $(use_with lqr)
759 - $(use_with lzma)
760 - $(use_with openexr)
761 - $(use_with pango)
762 - $(use_with png)
763 - $(use_with svg rsvg)
764 - $(use_with tiff)
765 - $(use_with webp)
766 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
767 - $(use_with wmf)
768 - $(use_with xml)
769 - --${openmp}-openmp
770 - --with-gcc-arch=no-automagic
771 - )
772 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
773 -}
774 -
775 -src_test() {
776 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
777 - emake check
778 -}
779 -
780 -src_install() {
781 - # Ensure documentation installation files and paths with each release!
782 - emake \
783 - DESTDIR="${D}" \
784 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
785 - install
786 -
787 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
788 - dodoc {AUTHORS,README}.txt ChangeLog
789 -
790 - if use perl; then
791 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
792 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
793 - fi
794 -
795 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
796 -
797 - if use opencl; then
798 - cat <<-EOF > "${T}"/99${PN}
799 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
800 - EOF
801 -
802 - insinto /etc/sandbox.d
803 - doins "${T}"/99${PN} #472766
804 - fi
805 -
806 - insinto /usr/share/${PN}
807 - doins config/*icm
808 -}
809
810 diff --git a/media-gfx/imagemagick/imagemagick-7.0.6.9.ebuild b/media-gfx/imagemagick/imagemagick-7.0.6.9.ebuild
811 deleted file mode 100644
812 index fc7b7060e36..00000000000
813 --- a/media-gfx/imagemagick/imagemagick-7.0.6.9.ebuild
814 +++ /dev/null
815 @@ -1,185 +0,0 @@
816 -# Copyright 1999-2017 Gentoo Foundation
817 -# Distributed under the terms of the GNU General Public License v2
818 -
819 -EAPI=6
820 -
821 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
822 -
823 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
824 -
825 -DESCRIPTION="A collection of tools and libraries for many image formats"
826 -HOMEPAGE="http://www.imagemagick.org/"
827 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
828 -
829 -LICENSE="imagemagick"
830 -SLOT="0/${PV}"
831 -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"
832 -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"
833 -
834 -RESTRICT="perl? ( userpriv )"
835 -
836 -RDEPEND="
837 - dev-libs/libltdl:0
838 - bzip2? ( app-arch/bzip2 )
839 - corefonts? ( media-fonts/corefonts )
840 - djvu? ( app-text/djvu )
841 - fftw? ( sci-libs/fftw:3.0 )
842 - fontconfig? ( media-libs/fontconfig )
843 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
844 - graphviz? ( media-gfx/graphviz )
845 - jbig? ( >=media-libs/jbigkit-2:= )
846 - jpeg? ( virtual/jpeg:0 )
847 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
848 - lcms? ( media-libs/lcms:2= )
849 - lqr? ( media-libs/liblqr )
850 - opencl? ( virtual/opencl )
851 - openexr? ( media-libs/openexr:0= )
852 - pango? ( x11-libs/pango )
853 - perl? ( >=dev-lang/perl-5.8.8:0= )
854 - png? ( media-libs/libpng:0= )
855 - postscript? ( app-text/ghostscript-gpl )
856 - raw? ( media-gfx/ufraw )
857 - svg? ( gnome-base/librsvg )
858 - tiff? ( media-libs/tiff:0= )
859 - truetype? (
860 - media-fonts/urw-fonts
861 - >=media-libs/freetype-2
862 - )
863 - webp? ( media-libs/libwebp:0= )
864 - wmf? ( media-libs/libwmf )
865 - X? (
866 - x11-libs/libICE
867 - x11-libs/libSM
868 - x11-libs/libXext
869 - x11-libs/libXt
870 - )
871 - xml? ( dev-libs/libxml2:= )
872 - lzma? ( app-arch/xz-utils )
873 - zlib? ( sys-libs/zlib:= )"
874 -DEPEND="${RDEPEND}
875 - !media-gfx/graphicsmagick[imagemagick]
876 - virtual/pkgconfig
877 - X? ( x11-proto/xextproto )"
878 -
879 -REQUIRED_USE="corefonts? ( truetype )
880 - test? ( corefonts )"
881 -
882 -S=${WORKDIR}/${MY_P}
883 -
884 -src_prepare() {
885 - local ati_cards mesa_cards nvidia_cards render_cards
886 - default
887 -
888 - elibtoolize # for Darwin modules
889 -
890 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
891 - shopt -s nullglob
892 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
893 - if test -n "${ati_cards}"; then
894 - addpredict "${ati_cards}"
895 - fi
896 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
897 - if test -n "${mesa_cards}"; then
898 - addpredict "${mesa_cards}"
899 - fi
900 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
901 - if test -n "${nvidia_cards}"; then
902 - addpredict "${nvidia_cards}"
903 - fi
904 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
905 - if test -n "${render_cards}"; then
906 - addpredict "${render_cards}"
907 - fi
908 - shopt -u nullglob
909 - addpredict /dev/nvidiactl
910 -}
911 -
912 -src_configure() {
913 - local depth=16
914 - use q8 && depth=8
915 - use q32 && depth=32
916 -
917 - local openmp=disable
918 - use openmp && { tc-has-openmp && openmp=enable; }
919 -
920 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
921 -
922 - local myeconfargs=(
923 - $(use_enable static-libs static)
924 - $(use_enable hdri)
925 - $(use_enable opencl)
926 - --with-threads
927 - --with-modules
928 - --with-quantum-depth=${depth}
929 - $(use_with cxx magick-plus-plus)
930 - $(use_with perl)
931 - --with-perl-options='INSTALLDIRS=vendor'
932 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
933 - $(use_with bzip2 bzlib)
934 - $(use_with X x)
935 - $(use_with zlib)
936 - --without-autotrace
937 - $(use_with postscript dps)
938 - $(use_with djvu)
939 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
940 - $(use_with fftw)
941 - $(use_with fpx)
942 - $(use_with fontconfig)
943 - $(use_with truetype freetype)
944 - $(use_with postscript gslib)
945 - $(use_with graphviz gvc)
946 - $(use_with jbig)
947 - $(use_with jpeg)
948 - $(use_with jpeg2k openjp2)
949 - $(use_with lcms)
950 - $(use_with lqr)
951 - $(use_with lzma)
952 - $(use_with openexr)
953 - $(use_with pango)
954 - $(use_with png)
955 - $(use_with svg rsvg)
956 - $(use_with tiff)
957 - $(use_with webp)
958 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
959 - $(use_with wmf)
960 - $(use_with xml)
961 - --${openmp}-openmp
962 - --with-gcc-arch=no-automagic
963 - )
964 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
965 -}
966 -
967 -src_test() {
968 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
969 - emake check
970 -}
971 -
972 -src_install() {
973 - # Ensure documentation installation files and paths with each release!
974 - emake \
975 - DESTDIR="${D}" \
976 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
977 - install
978 -
979 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
980 - dodoc {AUTHORS,README}.txt ChangeLog
981 -
982 - if use perl; then
983 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
984 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
985 - fi
986 -
987 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
988 -
989 - if use opencl; then
990 - cat <<-EOF > "${T}"/99${PN}
991 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
992 - EOF
993 -
994 - insinto /etc/sandbox.d
995 - doins "${T}"/99${PN} #472766
996 - fi
997 -
998 - insinto /usr/share/${PN}
999 - doins config/*icm
1000 -}
1001
1002 diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.6.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.6.ebuild
1003 deleted file mode 100644
1004 index fc7b7060e36..00000000000
1005 --- a/media-gfx/imagemagick/imagemagick-7.0.7.6.ebuild
1006 +++ /dev/null
1007 @@ -1,185 +0,0 @@
1008 -# Copyright 1999-2017 Gentoo Foundation
1009 -# Distributed under the terms of the GNU General Public License v2
1010 -
1011 -EAPI=6
1012 -
1013 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
1014 -
1015 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
1016 -
1017 -DESCRIPTION="A collection of tools and libraries for many image formats"
1018 -HOMEPAGE="http://www.imagemagick.org/"
1019 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
1020 -
1021 -LICENSE="imagemagick"
1022 -SLOT="0/${PV}"
1023 -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"
1024 -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"
1025 -
1026 -RESTRICT="perl? ( userpriv )"
1027 -
1028 -RDEPEND="
1029 - dev-libs/libltdl:0
1030 - bzip2? ( app-arch/bzip2 )
1031 - corefonts? ( media-fonts/corefonts )
1032 - djvu? ( app-text/djvu )
1033 - fftw? ( sci-libs/fftw:3.0 )
1034 - fontconfig? ( media-libs/fontconfig )
1035 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
1036 - graphviz? ( media-gfx/graphviz )
1037 - jbig? ( >=media-libs/jbigkit-2:= )
1038 - jpeg? ( virtual/jpeg:0 )
1039 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
1040 - lcms? ( media-libs/lcms:2= )
1041 - lqr? ( media-libs/liblqr )
1042 - opencl? ( virtual/opencl )
1043 - openexr? ( media-libs/openexr:0= )
1044 - pango? ( x11-libs/pango )
1045 - perl? ( >=dev-lang/perl-5.8.8:0= )
1046 - png? ( media-libs/libpng:0= )
1047 - postscript? ( app-text/ghostscript-gpl )
1048 - raw? ( media-gfx/ufraw )
1049 - svg? ( gnome-base/librsvg )
1050 - tiff? ( media-libs/tiff:0= )
1051 - truetype? (
1052 - media-fonts/urw-fonts
1053 - >=media-libs/freetype-2
1054 - )
1055 - webp? ( media-libs/libwebp:0= )
1056 - wmf? ( media-libs/libwmf )
1057 - X? (
1058 - x11-libs/libICE
1059 - x11-libs/libSM
1060 - x11-libs/libXext
1061 - x11-libs/libXt
1062 - )
1063 - xml? ( dev-libs/libxml2:= )
1064 - lzma? ( app-arch/xz-utils )
1065 - zlib? ( sys-libs/zlib:= )"
1066 -DEPEND="${RDEPEND}
1067 - !media-gfx/graphicsmagick[imagemagick]
1068 - virtual/pkgconfig
1069 - X? ( x11-proto/xextproto )"
1070 -
1071 -REQUIRED_USE="corefonts? ( truetype )
1072 - test? ( corefonts )"
1073 -
1074 -S=${WORKDIR}/${MY_P}
1075 -
1076 -src_prepare() {
1077 - local ati_cards mesa_cards nvidia_cards render_cards
1078 - default
1079 -
1080 - elibtoolize # for Darwin modules
1081 -
1082 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
1083 - shopt -s nullglob
1084 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
1085 - if test -n "${ati_cards}"; then
1086 - addpredict "${ati_cards}"
1087 - fi
1088 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
1089 - if test -n "${mesa_cards}"; then
1090 - addpredict "${mesa_cards}"
1091 - fi
1092 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
1093 - if test -n "${nvidia_cards}"; then
1094 - addpredict "${nvidia_cards}"
1095 - fi
1096 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
1097 - if test -n "${render_cards}"; then
1098 - addpredict "${render_cards}"
1099 - fi
1100 - shopt -u nullglob
1101 - addpredict /dev/nvidiactl
1102 -}
1103 -
1104 -src_configure() {
1105 - local depth=16
1106 - use q8 && depth=8
1107 - use q32 && depth=32
1108 -
1109 - local openmp=disable
1110 - use openmp && { tc-has-openmp && openmp=enable; }
1111 -
1112 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
1113 -
1114 - local myeconfargs=(
1115 - $(use_enable static-libs static)
1116 - $(use_enable hdri)
1117 - $(use_enable opencl)
1118 - --with-threads
1119 - --with-modules
1120 - --with-quantum-depth=${depth}
1121 - $(use_with cxx magick-plus-plus)
1122 - $(use_with perl)
1123 - --with-perl-options='INSTALLDIRS=vendor'
1124 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
1125 - $(use_with bzip2 bzlib)
1126 - $(use_with X x)
1127 - $(use_with zlib)
1128 - --without-autotrace
1129 - $(use_with postscript dps)
1130 - $(use_with djvu)
1131 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
1132 - $(use_with fftw)
1133 - $(use_with fpx)
1134 - $(use_with fontconfig)
1135 - $(use_with truetype freetype)
1136 - $(use_with postscript gslib)
1137 - $(use_with graphviz gvc)
1138 - $(use_with jbig)
1139 - $(use_with jpeg)
1140 - $(use_with jpeg2k openjp2)
1141 - $(use_with lcms)
1142 - $(use_with lqr)
1143 - $(use_with lzma)
1144 - $(use_with openexr)
1145 - $(use_with pango)
1146 - $(use_with png)
1147 - $(use_with svg rsvg)
1148 - $(use_with tiff)
1149 - $(use_with webp)
1150 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
1151 - $(use_with wmf)
1152 - $(use_with xml)
1153 - --${openmp}-openmp
1154 - --with-gcc-arch=no-automagic
1155 - )
1156 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
1157 -}
1158 -
1159 -src_test() {
1160 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
1161 - emake check
1162 -}
1163 -
1164 -src_install() {
1165 - # Ensure documentation installation files and paths with each release!
1166 - emake \
1167 - DESTDIR="${D}" \
1168 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
1169 - install
1170 -
1171 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
1172 - dodoc {AUTHORS,README}.txt ChangeLog
1173 -
1174 - if use perl; then
1175 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
1176 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
1177 - fi
1178 -
1179 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
1180 -
1181 - if use opencl; then
1182 - cat <<-EOF > "${T}"/99${PN}
1183 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
1184 - EOF
1185 -
1186 - insinto /etc/sandbox.d
1187 - doins "${T}"/99${PN} #472766
1188 - fi
1189 -
1190 - insinto /usr/share/${PN}
1191 - doins config/*icm
1192 -}
1193
1194 diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild
1195 deleted file mode 100644
1196 index fc7b7060e36..00000000000
1197 --- a/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild
1198 +++ /dev/null
1199 @@ -1,185 +0,0 @@
1200 -# Copyright 1999-2017 Gentoo Foundation
1201 -# Distributed under the terms of the GNU General Public License v2
1202 -
1203 -EAPI=6
1204 -
1205 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
1206 -
1207 -MY_P=ImageMagick-$(replace_version_separator 3 '-')
1208 -
1209 -DESCRIPTION="A collection of tools and libraries for many image formats"
1210 -HOMEPAGE="http://www.imagemagick.org/"
1211 -SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
1212 -
1213 -LICENSE="imagemagick"
1214 -SLOT="0/${PV}"
1215 -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"
1216 -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"
1217 -
1218 -RESTRICT="perl? ( userpriv )"
1219 -
1220 -RDEPEND="
1221 - dev-libs/libltdl:0
1222 - bzip2? ( app-arch/bzip2 )
1223 - corefonts? ( media-fonts/corefonts )
1224 - djvu? ( app-text/djvu )
1225 - fftw? ( sci-libs/fftw:3.0 )
1226 - fontconfig? ( media-libs/fontconfig )
1227 - fpx? ( >=media-libs/libfpx-1.3.0-r1 )
1228 - graphviz? ( media-gfx/graphviz )
1229 - jbig? ( >=media-libs/jbigkit-2:= )
1230 - jpeg? ( virtual/jpeg:0 )
1231 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
1232 - lcms? ( media-libs/lcms:2= )
1233 - lqr? ( media-libs/liblqr )
1234 - opencl? ( virtual/opencl )
1235 - openexr? ( media-libs/openexr:0= )
1236 - pango? ( x11-libs/pango )
1237 - perl? ( >=dev-lang/perl-5.8.8:0= )
1238 - png? ( media-libs/libpng:0= )
1239 - postscript? ( app-text/ghostscript-gpl )
1240 - raw? ( media-gfx/ufraw )
1241 - svg? ( gnome-base/librsvg )
1242 - tiff? ( media-libs/tiff:0= )
1243 - truetype? (
1244 - media-fonts/urw-fonts
1245 - >=media-libs/freetype-2
1246 - )
1247 - webp? ( media-libs/libwebp:0= )
1248 - wmf? ( media-libs/libwmf )
1249 - X? (
1250 - x11-libs/libICE
1251 - x11-libs/libSM
1252 - x11-libs/libXext
1253 - x11-libs/libXt
1254 - )
1255 - xml? ( dev-libs/libxml2:= )
1256 - lzma? ( app-arch/xz-utils )
1257 - zlib? ( sys-libs/zlib:= )"
1258 -DEPEND="${RDEPEND}
1259 - !media-gfx/graphicsmagick[imagemagick]
1260 - virtual/pkgconfig
1261 - X? ( x11-proto/xextproto )"
1262 -
1263 -REQUIRED_USE="corefonts? ( truetype )
1264 - test? ( corefonts )"
1265 -
1266 -S=${WORKDIR}/${MY_P}
1267 -
1268 -src_prepare() {
1269 - local ati_cards mesa_cards nvidia_cards render_cards
1270 - default
1271 -
1272 - elibtoolize # for Darwin modules
1273 -
1274 - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
1275 - shopt -s nullglob
1276 - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
1277 - if test -n "${ati_cards}"; then
1278 - addpredict "${ati_cards}"
1279 - fi
1280 - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
1281 - if test -n "${mesa_cards}"; then
1282 - addpredict "${mesa_cards}"
1283 - fi
1284 - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
1285 - if test -n "${nvidia_cards}"; then
1286 - addpredict "${nvidia_cards}"
1287 - fi
1288 - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
1289 - if test -n "${render_cards}"; then
1290 - addpredict "${render_cards}"
1291 - fi
1292 - shopt -u nullglob
1293 - addpredict /dev/nvidiactl
1294 -}
1295 -
1296 -src_configure() {
1297 - local depth=16
1298 - use q8 && depth=8
1299 - use q32 && depth=32
1300 -
1301 - local openmp=disable
1302 - use openmp && { tc-has-openmp && openmp=enable; }
1303 -
1304 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
1305 -
1306 - local myeconfargs=(
1307 - $(use_enable static-libs static)
1308 - $(use_enable hdri)
1309 - $(use_enable opencl)
1310 - --with-threads
1311 - --with-modules
1312 - --with-quantum-depth=${depth}
1313 - $(use_with cxx magick-plus-plus)
1314 - $(use_with perl)
1315 - --with-perl-options='INSTALLDIRS=vendor'
1316 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
1317 - $(use_with bzip2 bzlib)
1318 - $(use_with X x)
1319 - $(use_with zlib)
1320 - --without-autotrace
1321 - $(use_with postscript dps)
1322 - $(use_with djvu)
1323 - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
1324 - $(use_with fftw)
1325 - $(use_with fpx)
1326 - $(use_with fontconfig)
1327 - $(use_with truetype freetype)
1328 - $(use_with postscript gslib)
1329 - $(use_with graphviz gvc)
1330 - $(use_with jbig)
1331 - $(use_with jpeg)
1332 - $(use_with jpeg2k openjp2)
1333 - $(use_with lcms)
1334 - $(use_with lqr)
1335 - $(use_with lzma)
1336 - $(use_with openexr)
1337 - $(use_with pango)
1338 - $(use_with png)
1339 - $(use_with svg rsvg)
1340 - $(use_with tiff)
1341 - $(use_with webp)
1342 - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
1343 - $(use_with wmf)
1344 - $(use_with xml)
1345 - --${openmp}-openmp
1346 - --with-gcc-arch=no-automagic
1347 - )
1348 - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
1349 -}
1350 -
1351 -src_test() {
1352 - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
1353 - emake check
1354 -}
1355 -
1356 -src_install() {
1357 - # Ensure documentation installation files and paths with each release!
1358 - emake \
1359 - DESTDIR="${D}" \
1360 - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
1361 - install
1362 -
1363 - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
1364 - dodoc {AUTHORS,README}.txt ChangeLog
1365 -
1366 - if use perl; then
1367 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
1368 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
1369 - fi
1370 -
1371 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
1372 -
1373 - if use opencl; then
1374 - cat <<-EOF > "${T}"/99${PN}
1375 - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
1376 - EOF
1377 -
1378 - insinto /etc/sandbox.d
1379 - doins "${T}"/99${PN} #472766
1380 - fi
1381 -
1382 - insinto /usr/share/${PN}
1383 - doins config/*icm
1384 -}