Gentoo Archives: gentoo-commits

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