commit:     d93aa6d994310edd135da8c338d7736199eda90f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 00:18:01 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu May 13 00:18:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93aa6d9

media-gfx/imagemagick: security cleanup

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-gfx/imagemagick/Manifest                     |   8 -
 media-gfx/imagemagick/imagemagick-6.9.12.10.ebuild | 262 --------------------
 media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild  | 262 --------------------
 media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild  | 262 --------------------
 media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild  | 262 --------------------
 media-gfx/imagemagick/imagemagick-7.0.11.10.ebuild | 267 ---------------------
 media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild  | 267 ---------------------
 media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild  | 267 ---------------------
 media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild  | 267 ---------------------
 9 files changed, 2124 deletions(-)

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ffc7dc9db41..e76b4dbdf0d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,10 +1,2 @@
-DIST ImageMagick-6.9.12-10.tar.xz 9154060 BLAKE2B 
23f9ba449970190a8fee14b161ff893199188f93d9a29e188325448b97a68b61ba70a92289c096371e2988db3d599b52d0d8df06105d06f5dcc4f7d3c6ef4ea5
 SHA512 
75f3450cfbf779af22efc02733f99ac62ed92ad869ae28a279805ffe38adb515507592e7111ba881ac5b781972841942f7f8e5ecc8ab6f773aef8de454a80b35
 DIST ImageMagick-6.9.12-12.tar.xz 9141288 BLAKE2B 
95ec30e77fc3f963bb0cae5280ad8e72ba9b6e0c8419fdf41f1899371ecbf5f64bbb70cc6193e751da0c3365551bdb2442e9f4746284ecff92ca351fc906fa4c
 SHA512 
7e680809954326d32439c922cbcb65c9076823c50bd56ba2a230ec4a6d46f00a03a032d2ff153fe9b7651a9f6bac9625fe2aea7acccba56e15b6dce96e477c8d
-DIST ImageMagick-6.9.12-7.tar.xz 9156816 BLAKE2B 
56a13ff744b15fb987232b70d9ea2a14b10de709011375da2b970e408d91079be38ccc5a301308734293c18c81d78a2e68ecee56b7d8478c6222cd7745b847ab
 SHA512 
cfb261c60c07bc52cd491173a17040b33b0fa95f396d933fe9e14767cb5d009a8ebe7194949c2387c723d3a0492bc7b7a078ed89ce8a0024dd8ed73b40748d4c
-DIST ImageMagick-6.9.12-8.tar.xz 9159788 BLAKE2B 
ceb383d93cd70a2d5755a982a47a7f996b4e9cd4eaa7cfcb14d01fdc84904ccac9d897337616116f0fbf1bed7640ba93bcf5426552a83b45d2de455cbf0bda42
 SHA512 
e248aab0490eaf382a7be36679c23c0a84386302d5a1cd0d054af79fa95d8f6f03a5ad0f628cd818d453284f9b353168491ed58047338ec8eec15983d3007fed
-DIST ImageMagick-6.9.12-9.tar.xz 9161440 BLAKE2B 
05c7e3290060fe83aaf1f88761fa2afe63b720fe397ab2f22264d1c4b28cc92c33a2f94782994dce33f8f4528df7cc60503460b23183f815cc43e169cf38c73c
 SHA512 
90848fa3381c69c6526fe6473b9b847cfa81e500aa7ad2be32c4030de1fb84432d83c1dee75a90914e6a18d6aa747aa58696adec43ff61e797f92d0dbcfde01a
-DIST ImageMagick-7.0.11-10.tar.xz 10280304 BLAKE2B 
9db1c26eb80dfb929bfced2ac0d6adc29e4e68c759611723812edfb4bf8132d1e39e053506c43179d468ac4027ddea8a85bd5f34d0d738778b7b92546bbbeef8
 SHA512 
a92a8a65ab7503edada45da9c34488deb79c00d005afcc85a17365fd76c83a174a7213bea4bd072f1125f2342722cb067ffa1513f6530db9608cb6dcff4f68d1
 DIST ImageMagick-7.0.11-12.tar.xz 10284100 BLAKE2B 
2b664106152f764948f34fe766552cb48e7ff2a5c83f3f8b7e0a83861ed218bbda278f487678704d42aee900f1ef4be4252d94ccafda2192f39d9a3701115520
 SHA512 
f5faf124a1923d8b3d362ae59c594dff4d92cf097b42995f6631812bbb320830cee71ca10a15b3894cecf1a286b4fa10e874d213c7438356d194d3ebff778cbe
-DIST ImageMagick-7.0.11-7.tar.xz 10280524 BLAKE2B 
a4d0cb3e157bff25245d6c3bf3eba55d6f3693ba66d8c5efbc757b31077b1bac0753dca095f853455793355e92e8376a8e41acf3809115c6dbae47977190c42d
 SHA512 
5c36aa566892f0e473ccec0058d7113779704cdf8f4d747132434216c9c0f304de5aafbbbcacc4b21d7e6224e3b9c9439fe6b446e28e821f614c2d1026a280e7
-DIST ImageMagick-7.0.11-8.tar.xz 10280632 BLAKE2B 
99c41f09b740f4222b17efa41c8b54445ccb3cfd23aa16d6ae16433952e6c94a02c8db0ffaa3b51e432a2bddb39060b1789b4778f1d9f756b0b992d706a3884d
 SHA512 
e4aa87b30bb75fba815cd4f617a7c0dba29523c03ad6670c7514842587678553d0b45100ccd6e041d59628cf30fe047243d440af78b39d0f82cd405ff0ea0f96
-DIST ImageMagick-7.0.11-9.tar.xz 10266692 BLAKE2B 
18e2b7d5e8f93af68cd7a7379968279a1119d25a06bc131465c9ebb500f923664b4332c02828d0837fd1f15395de99b1bdacaf016f1a4a021d71dbe7d0878f46
 SHA512 
73ecb116fd8885f2ec88a12ae8b36c51b37de3e7e2aa2f9fbbd24a90bc0d78d7603663ec8003abea8af0f200a6176fb26998963a9bb90ce80ebc7feb2dd8921a

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.10.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.10.ebuild
deleted file mode 100644
index d17773f5081..00000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.10.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-       inherit git-r3
-       MY_P="imagemagick-9999"
-else
-       MY_PV="$(ver_rs 3 '-')"
-       MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-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"
-
-REQUIRED_USE="corefonts? ( truetype )
-       svg? ( xml )
-       test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-       dev-libs/libltdl:0
-       bzip2? ( app-arch/bzip2 )
-       corefonts? ( media-fonts/corefonts )
-       djvu? ( app-text/djvu )
-       fftw? ( sci-libs/fftw:3.0 )
-       fontconfig? ( media-libs/fontconfig )
-       fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-       graphviz? ( media-gfx/graphviz )
-       heif? ( media-libs/libheif:= )
-       jbig? ( >=media-libs/jbigkit-2:= )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-       lcms? ( media-libs/lcms:2= )
-       lqr? ( media-libs/liblqr )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       pango? ( x11-libs/pango )
-       perl? ( >=dev-lang/perl-5.8.8:0= )
-       png? ( media-libs/libpng:0= )
-       postscript? ( app-text/ghostscript-gpl )
-       raw? ( media-libs/libraw:= )
-       svg? (
-               gnome-base/librsvg
-               media-gfx/potrace
-               )
-       tiff? ( media-libs/tiff:0= )
-       truetype? (
-               media-fonts/urw-fonts
-               >=media-libs/freetype-2
-               )
-       webp? ( media-libs/libwebp:0= )
-       wmf? ( media-libs/libwmf )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXext
-               x11-libs/libXt
-               )
-       xml? ( dev-libs/libxml2:= )
-       lzma? ( app-arch/xz-utils )
-       zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-       !media-gfx/graphicsmagick[imagemagick]
-       X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Apply hardening #664236
-       cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-       sed -i -e '/^<policymap>$/ {
-                       r policy-hardening.snippet
-                       d
-               }' \
-               config/policy.xml || \
-               die "Failed to apply hardening of policy.xml"
-       einfo "policy.xml hardened"
-
-       elibtoolize # for Darwin modules
-
-       # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-       local ati_cards mesa_cards nvidia_cards render_cards
-       shopt -s nullglob
-       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-       if test -n "${ati_cards}"; then
-               addpredict "${ati_cards}"
-       fi
-       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-       if test -n "${mesa_cards}"; then
-               addpredict "${mesa_cards}"
-       fi
-       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-       if test -n "${nvidia_cards}"; then
-               addpredict "${nvidia_cards}"
-       fi
-       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-       if test -n "${render_cards}"; then
-               addpredict "${render_cards}"
-       fi
-       shopt -u nullglob
-       addpredict /dev/nvidiactl
-}
-
-src_configure() {
-       local depth=16
-       use q8 && depth=8
-       use q32 && depth=32
-
-       local openmp=disable
-       use openmp && { tc-has-openmp && openmp=enable; }
-
-       use perl && perl_check_env
-
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-       local myeconfargs=(
-               $(use_enable static-libs static)
-               $(use_enable hdri)
-               $(use_enable opencl)
-               --with-threads
-               --with-modules
-               --with-quantum-depth=${depth}
-               $(use_with cxx magick-plus-plus)
-               $(use_with perl)
-               --with-perl-options='INSTALLDIRS=vendor'
-               --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-               $(use_with bzip2 bzlib)
-               $(use_with X x)
-               $(use_with zlib)
-               --without-autotrace
-               $(use_with postscript dps)
-               $(use_with djvu)
-               --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-               $(use_with fftw)
-               $(use_with fpx)
-               $(use_with fontconfig)
-               $(use_with truetype freetype)
-               $(use_with postscript gslib)
-               $(use_with graphviz gvc)
-               $(use_with heif heic)
-               $(use_with jbig)
-               $(use_with jpeg)
-               $(use_with jpeg2k openjp2)
-               $(use_with lcms)
-               $(use_with lqr)
-               $(use_with lzma)
-               $(use_with openexr)
-               $(use_with pango)
-               $(use_with png)
-               $(use_with raw)
-               $(use_with svg rsvg)
-               $(use_with tiff)
-               $(use_with webp)
-               $(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
-               $(use_with wmf)
-               $(use_with xml)
-               --${openmp}-openmp
-               --with-gcc-arch=no-automagic
-       )
-       CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in 
'${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" 
|| \
-               die "Failed to install default blank policy.xml in 
'${_im_local_config_home}'"
-
-       local im_command= IM_COMMANDS=()
-       IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify 
that we are using version we just built
-       IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is 
used
-       IM_COMMANDS+=( "emake check" ) # Run tests
-
-       for im_command in "${IM_COMMANDS[@]}"; do
-               eval "${S}"/magick.sh \
-                       ${im_command} || \
-                       die "Failed to run \"${im_command}\""
-       done
-}
-
-src_install() {
-       # Ensure documentation installation files and paths with each release!
-       emake \
-               DESTDIR="${D}" \
-               DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-               install
-
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-       dodoc {AUTHORS,README}.txt ChangeLog
-
-       if use perl; then
-               find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-               find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-       fi
-
-       find "${ED}" -name '*.la' -exec sed -i -e 
"/^dependency_libs/s:=.*:='':" {} +
-       # .la files in parent are not needed, keep plugin .la files
-       find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-               EOF
-
-               insinto /etc/sandbox.d
-               doins "${T}"/99${PN} #472766
-       fi
-
-       insinto /usr/share/${PN}
-       doins config/*icm
-}
-
-pkg_postinst() {
-       local _show_policy_xml_notice=
-
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               # This is a new installation
-               _show_policy_xml_notice=yes
-       else
-               local v
-               for v in ${REPLACING_VERSIONS}; do
-                       if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-                               # This is an upgrade
-                               _show_policy_xml_notice=yes
-
-                               # Show this elog only once
-                               break
-                       fi
-               done
-       fi
-
-       if [[ -n "${_show_policy_xml_notice}" ]]; then
-               elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-6"
-               elog "which will prevent the usage of the following coders by 
default:"
-               elog ""
-               elog "  - PS"
-               elog "  - PS2"
-               elog "  - PS3"
-               elog "  - EPS"
-               elog "  - PDF"
-               elog "  - XPS"
-       fi
-}

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
deleted file mode 100644
index 69de151f32b..00000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-       inherit git-r3
-       MY_P="imagemagick-9999"
-else
-       MY_PV="$(ver_rs 3 '-')"
-       MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-       KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-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"
-
-REQUIRED_USE="corefonts? ( truetype )
-       svg? ( xml )
-       test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-       dev-libs/libltdl:0
-       bzip2? ( app-arch/bzip2 )
-       corefonts? ( media-fonts/corefonts )
-       djvu? ( app-text/djvu )
-       fftw? ( sci-libs/fftw:3.0 )
-       fontconfig? ( media-libs/fontconfig )
-       fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-       graphviz? ( media-gfx/graphviz )
-       heif? ( media-libs/libheif:= )
-       jbig? ( >=media-libs/jbigkit-2:= )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-       lcms? ( media-libs/lcms:2= )
-       lqr? ( media-libs/liblqr )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       pango? ( x11-libs/pango )
-       perl? ( >=dev-lang/perl-5.8.8:0= )
-       png? ( media-libs/libpng:0= )
-       postscript? ( app-text/ghostscript-gpl )
-       raw? ( media-libs/libraw:= )
-       svg? (
-               gnome-base/librsvg
-               media-gfx/potrace
-               )
-       tiff? ( media-libs/tiff:0= )
-       truetype? (
-               media-fonts/urw-fonts
-               >=media-libs/freetype-2
-               )
-       webp? ( media-libs/libwebp:0= )
-       wmf? ( media-libs/libwmf )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXext
-               x11-libs/libXt
-               )
-       xml? ( dev-libs/libxml2:= )
-       lzma? ( app-arch/xz-utils )
-       zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-       !media-gfx/graphicsmagick[imagemagick]
-       X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Apply hardening #664236
-       cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-       sed -i -e '/^<policymap>$/ {
-                       r policy-hardening.snippet
-                       d
-               }' \
-               config/policy.xml || \
-               die "Failed to apply hardening of policy.xml"
-       einfo "policy.xml hardened"
-
-       elibtoolize # for Darwin modules
-
-       # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-       local ati_cards mesa_cards nvidia_cards render_cards
-       shopt -s nullglob
-       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-       if test -n "${ati_cards}"; then
-               addpredict "${ati_cards}"
-       fi
-       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-       if test -n "${mesa_cards}"; then
-               addpredict "${mesa_cards}"
-       fi
-       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-       if test -n "${nvidia_cards}"; then
-               addpredict "${nvidia_cards}"
-       fi
-       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-       if test -n "${render_cards}"; then
-               addpredict "${render_cards}"
-       fi
-       shopt -u nullglob
-       addpredict /dev/nvidiactl
-}
-
-src_configure() {
-       local depth=16
-       use q8 && depth=8
-       use q32 && depth=32
-
-       local openmp=disable
-       use openmp && { tc-has-openmp && openmp=enable; }
-
-       use perl && perl_check_env
-
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-       local myeconfargs=(
-               $(use_enable static-libs static)
-               $(use_enable hdri)
-               $(use_enable opencl)
-               --with-threads
-               --with-modules
-               --with-quantum-depth=${depth}
-               $(use_with cxx magick-plus-plus)
-               $(use_with perl)
-               --with-perl-options='INSTALLDIRS=vendor'
-               --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-               $(use_with bzip2 bzlib)
-               $(use_with X x)
-               $(use_with zlib)
-               --without-autotrace
-               $(use_with postscript dps)
-               $(use_with djvu)
-               --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-               $(use_with fftw)
-               $(use_with fpx)
-               $(use_with fontconfig)
-               $(use_with truetype freetype)
-               $(use_with postscript gslib)
-               $(use_with graphviz gvc)
-               $(use_with heif heic)
-               $(use_with jbig)
-               $(use_with jpeg)
-               $(use_with jpeg2k openjp2)
-               $(use_with lcms)
-               $(use_with lqr)
-               $(use_with lzma)
-               $(use_with openexr)
-               $(use_with pango)
-               $(use_with png)
-               $(use_with raw)
-               $(use_with svg rsvg)
-               $(use_with tiff)
-               $(use_with webp)
-               $(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
-               $(use_with wmf)
-               $(use_with xml)
-               --${openmp}-openmp
-               --with-gcc-arch=no-automagic
-       )
-       CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in 
'${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" 
|| \
-               die "Failed to install default blank policy.xml in 
'${_im_local_config_home}'"
-
-       local im_command= IM_COMMANDS=()
-       IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify 
that we are using version we just built
-       IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is 
used
-       IM_COMMANDS+=( "emake check" ) # Run tests
-
-       for im_command in "${IM_COMMANDS[@]}"; do
-               eval "${S}"/magick.sh \
-                       ${im_command} || \
-                       die "Failed to run \"${im_command}\""
-       done
-}
-
-src_install() {
-       # Ensure documentation installation files and paths with each release!
-       emake \
-               DESTDIR="${D}" \
-               DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-               install
-
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-       dodoc {AUTHORS,README}.txt ChangeLog
-
-       if use perl; then
-               find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-               find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-       fi
-
-       find "${ED}" -name '*.la' -exec sed -i -e 
"/^dependency_libs/s:=.*:='':" {} +
-       # .la files in parent are not needed, keep plugin .la files
-       find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-               EOF
-
-               insinto /etc/sandbox.d
-               doins "${T}"/99${PN} #472766
-       fi
-
-       insinto /usr/share/${PN}
-       doins config/*icm
-}
-
-pkg_postinst() {
-       local _show_policy_xml_notice=
-
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               # This is a new installation
-               _show_policy_xml_notice=yes
-       else
-               local v
-               for v in ${REPLACING_VERSIONS}; do
-                       if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-                               # This is an upgrade
-                               _show_policy_xml_notice=yes
-
-                               # Show this elog only once
-                               break
-                       fi
-               done
-       fi
-
-       if [[ -n "${_show_policy_xml_notice}" ]]; then
-               elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-6"
-               elog "which will prevent the usage of the following coders by 
default:"
-               elog ""
-               elog "  - PS"
-               elog "  - PS2"
-               elog "  - PS3"
-               elog "  - EPS"
-               elog "  - PDF"
-               elog "  - XPS"
-       fi
-}

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild
deleted file mode 100644
index d17773f5081..00000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-       inherit git-r3
-       MY_P="imagemagick-9999"
-else
-       MY_PV="$(ver_rs 3 '-')"
-       MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-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"
-
-REQUIRED_USE="corefonts? ( truetype )
-       svg? ( xml )
-       test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-       dev-libs/libltdl:0
-       bzip2? ( app-arch/bzip2 )
-       corefonts? ( media-fonts/corefonts )
-       djvu? ( app-text/djvu )
-       fftw? ( sci-libs/fftw:3.0 )
-       fontconfig? ( media-libs/fontconfig )
-       fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-       graphviz? ( media-gfx/graphviz )
-       heif? ( media-libs/libheif:= )
-       jbig? ( >=media-libs/jbigkit-2:= )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-       lcms? ( media-libs/lcms:2= )
-       lqr? ( media-libs/liblqr )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       pango? ( x11-libs/pango )
-       perl? ( >=dev-lang/perl-5.8.8:0= )
-       png? ( media-libs/libpng:0= )
-       postscript? ( app-text/ghostscript-gpl )
-       raw? ( media-libs/libraw:= )
-       svg? (
-               gnome-base/librsvg
-               media-gfx/potrace
-               )
-       tiff? ( media-libs/tiff:0= )
-       truetype? (
-               media-fonts/urw-fonts
-               >=media-libs/freetype-2
-               )
-       webp? ( media-libs/libwebp:0= )
-       wmf? ( media-libs/libwmf )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXext
-               x11-libs/libXt
-               )
-       xml? ( dev-libs/libxml2:= )
-       lzma? ( app-arch/xz-utils )
-       zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-       !media-gfx/graphicsmagick[imagemagick]
-       X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Apply hardening #664236
-       cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-       sed -i -e '/^<policymap>$/ {
-                       r policy-hardening.snippet
-                       d
-               }' \
-               config/policy.xml || \
-               die "Failed to apply hardening of policy.xml"
-       einfo "policy.xml hardened"
-
-       elibtoolize # for Darwin modules
-
-       # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-       local ati_cards mesa_cards nvidia_cards render_cards
-       shopt -s nullglob
-       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-       if test -n "${ati_cards}"; then
-               addpredict "${ati_cards}"
-       fi
-       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-       if test -n "${mesa_cards}"; then
-               addpredict "${mesa_cards}"
-       fi
-       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-       if test -n "${nvidia_cards}"; then
-               addpredict "${nvidia_cards}"
-       fi
-       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-       if test -n "${render_cards}"; then
-               addpredict "${render_cards}"
-       fi
-       shopt -u nullglob
-       addpredict /dev/nvidiactl
-}
-
-src_configure() {
-       local depth=16
-       use q8 && depth=8
-       use q32 && depth=32
-
-       local openmp=disable
-       use openmp && { tc-has-openmp && openmp=enable; }
-
-       use perl && perl_check_env
-
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-       local myeconfargs=(
-               $(use_enable static-libs static)
-               $(use_enable hdri)
-               $(use_enable opencl)
-               --with-threads
-               --with-modules
-               --with-quantum-depth=${depth}
-               $(use_with cxx magick-plus-plus)
-               $(use_with perl)
-               --with-perl-options='INSTALLDIRS=vendor'
-               --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-               $(use_with bzip2 bzlib)
-               $(use_with X x)
-               $(use_with zlib)
-               --without-autotrace
-               $(use_with postscript dps)
-               $(use_with djvu)
-               --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-               $(use_with fftw)
-               $(use_with fpx)
-               $(use_with fontconfig)
-               $(use_with truetype freetype)
-               $(use_with postscript gslib)
-               $(use_with graphviz gvc)
-               $(use_with heif heic)
-               $(use_with jbig)
-               $(use_with jpeg)
-               $(use_with jpeg2k openjp2)
-               $(use_with lcms)
-               $(use_with lqr)
-               $(use_with lzma)
-               $(use_with openexr)
-               $(use_with pango)
-               $(use_with png)
-               $(use_with raw)
-               $(use_with svg rsvg)
-               $(use_with tiff)
-               $(use_with webp)
-               $(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
-               $(use_with wmf)
-               $(use_with xml)
-               --${openmp}-openmp
-               --with-gcc-arch=no-automagic
-       )
-       CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in 
'${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" 
|| \
-               die "Failed to install default blank policy.xml in 
'${_im_local_config_home}'"
-
-       local im_command= IM_COMMANDS=()
-       IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify 
that we are using version we just built
-       IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is 
used
-       IM_COMMANDS+=( "emake check" ) # Run tests
-
-       for im_command in "${IM_COMMANDS[@]}"; do
-               eval "${S}"/magick.sh \
-                       ${im_command} || \
-                       die "Failed to run \"${im_command}\""
-       done
-}
-
-src_install() {
-       # Ensure documentation installation files and paths with each release!
-       emake \
-               DESTDIR="${D}" \
-               DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-               install
-
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-       dodoc {AUTHORS,README}.txt ChangeLog
-
-       if use perl; then
-               find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-               find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-       fi
-
-       find "${ED}" -name '*.la' -exec sed -i -e 
"/^dependency_libs/s:=.*:='':" {} +
-       # .la files in parent are not needed, keep plugin .la files
-       find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-               EOF
-
-               insinto /etc/sandbox.d
-               doins "${T}"/99${PN} #472766
-       fi
-
-       insinto /usr/share/${PN}
-       doins config/*icm
-}
-
-pkg_postinst() {
-       local _show_policy_xml_notice=
-
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               # This is a new installation
-               _show_policy_xml_notice=yes
-       else
-               local v
-               for v in ${REPLACING_VERSIONS}; do
-                       if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-                               # This is an upgrade
-                               _show_policy_xml_notice=yes
-
-                               # Show this elog only once
-                               break
-                       fi
-               done
-       fi
-
-       if [[ -n "${_show_policy_xml_notice}" ]]; then
-               elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-6"
-               elog "which will prevent the usage of the following coders by 
default:"
-               elog ""
-               elog "  - PS"
-               elog "  - PS2"
-               elog "  - PS3"
-               elog "  - EPS"
-               elog "  - PDF"
-               elog "  - XPS"
-       fi
-}

diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild 
b/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild
deleted file mode 100644
index d17773f5081..00000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git";
-       inherit git-r3
-       MY_P="imagemagick-9999"
-else
-       MY_PV="$(ver_rs 3 '-')"
-       MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-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"
-
-REQUIRED_USE="corefonts? ( truetype )
-       svg? ( xml )
-       test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-       dev-libs/libltdl:0
-       bzip2? ( app-arch/bzip2 )
-       corefonts? ( media-fonts/corefonts )
-       djvu? ( app-text/djvu )
-       fftw? ( sci-libs/fftw:3.0 )
-       fontconfig? ( media-libs/fontconfig )
-       fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-       graphviz? ( media-gfx/graphviz )
-       heif? ( media-libs/libheif:= )
-       jbig? ( >=media-libs/jbigkit-2:= )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-       lcms? ( media-libs/lcms:2= )
-       lqr? ( media-libs/liblqr )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       pango? ( x11-libs/pango )
-       perl? ( >=dev-lang/perl-5.8.8:0= )
-       png? ( media-libs/libpng:0= )
-       postscript? ( app-text/ghostscript-gpl )
-       raw? ( media-libs/libraw:= )
-       svg? (
-               gnome-base/librsvg
-               media-gfx/potrace
-               )
-       tiff? ( media-libs/tiff:0= )
-       truetype? (
-               media-fonts/urw-fonts
-               >=media-libs/freetype-2
-               )
-       webp? ( media-libs/libwebp:0= )
-       wmf? ( media-libs/libwmf )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXext
-               x11-libs/libXt
-               )
-       xml? ( dev-libs/libxml2:= )
-       lzma? ( app-arch/xz-utils )
-       zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-       !media-gfx/graphicsmagick[imagemagick]
-       X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Apply hardening #664236
-       cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-       sed -i -e '/^<policymap>$/ {
-                       r policy-hardening.snippet
-                       d
-               }' \
-               config/policy.xml || \
-               die "Failed to apply hardening of policy.xml"
-       einfo "policy.xml hardened"
-
-       elibtoolize # for Darwin modules
-
-       # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-       local ati_cards mesa_cards nvidia_cards render_cards
-       shopt -s nullglob
-       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-       if test -n "${ati_cards}"; then
-               addpredict "${ati_cards}"
-       fi
-       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-       if test -n "${mesa_cards}"; then
-               addpredict "${mesa_cards}"
-       fi
-       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-       if test -n "${nvidia_cards}"; then
-               addpredict "${nvidia_cards}"
-       fi
-       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-       if test -n "${render_cards}"; then
-               addpredict "${render_cards}"
-       fi
-       shopt -u nullglob
-       addpredict /dev/nvidiactl
-}
-
-src_configure() {
-       local depth=16
-       use q8 && depth=8
-       use q32 && depth=32
-
-       local openmp=disable
-       use openmp && { tc-has-openmp && openmp=enable; }
-
-       use perl && perl_check_env
-
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-       local myeconfargs=(
-               $(use_enable static-libs static)
-               $(use_enable hdri)
-               $(use_enable opencl)
-               --with-threads
-               --with-modules
-               --with-quantum-depth=${depth}
-               $(use_with cxx magick-plus-plus)
-               $(use_with perl)
-               --with-perl-options='INSTALLDIRS=vendor'
-               --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-               $(use_with bzip2 bzlib)
-               $(use_with X x)
-               $(use_with zlib)
-               --without-autotrace
-               $(use_with postscript dps)
-               $(use_with djvu)
-               --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-               $(use_with fftw)
-               $(use_with fpx)
-               $(use_with fontconfig)
-               $(use_with truetype freetype)
-               $(use_with postscript gslib)
-               $(use_with graphviz gvc)
-               $(use_with heif heic)
-               $(use_with jbig)
-               $(use_with jpeg)
-               $(use_with jpeg2k openjp2)
-               $(use_with lcms)
-               $(use_with lqr)
-               $(use_with lzma)
-               $(use_with openexr)
-               $(use_with pango)
-               $(use_with png)
-               $(use_with raw)
-               $(use_with svg rsvg)
-               $(use_with tiff)
-               $(use_with webp)
-               $(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
-               $(use_with wmf)
-               $(use_with xml)
-               --${openmp}-openmp
-               --with-gcc-arch=no-automagic
-       )
-       CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in 
'${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" 
|| \
-               die "Failed to install default blank policy.xml in 
'${_im_local_config_home}'"
-
-       local im_command= IM_COMMANDS=()
-       IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify 
that we are using version we just built
-       IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is 
used
-       IM_COMMANDS+=( "emake check" ) # Run tests
-
-       for im_command in "${IM_COMMANDS[@]}"; do
-               eval "${S}"/magick.sh \
-                       ${im_command} || \
-                       die "Failed to run \"${im_command}\""
-       done
-}
-
-src_install() {
-       # Ensure documentation installation files and paths with each release!
-       emake \
-               DESTDIR="${D}" \
-               DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-               install
-
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-       dodoc {AUTHORS,README}.txt ChangeLog
-
-       if use perl; then
-               find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-               find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-       fi
-
-       find "${ED}" -name '*.la' -exec sed -i -e 
"/^dependency_libs/s:=.*:='':" {} +
-       # .la files in parent are not needed, keep plugin .la files
-       find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-               EOF
-
-               insinto /etc/sandbox.d
-               doins "${T}"/99${PN} #472766
-       fi
-
-       insinto /usr/share/${PN}
-       doins config/*icm
-}
-
-pkg_postinst() {
-       local _show_policy_xml_notice=
-
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               # This is a new installation
-               _show_policy_xml_notice=yes
-       else
-               local v
-               for v in ${REPLACING_VERSIONS}; do
-                       if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-                               # This is an upgrade
-                               _show_policy_xml_notice=yes
-
-                               # Show this elog only once
-                               break
-                       fi
-               done
-       fi
-
-       if [[ -n "${_show_policy_xml_notice}" ]]; then
-               elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-6"
-               elog "which will prevent the usage of the following coders by 
default:"
-               elog ""
-               elog "  - PS"
-               elog "  - PS2"
-               elog "  - PS3"
-               elog "  - EPS"
-               elog "  - PDF"
-               elog "  - XPS"
-       fi
-}

diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.10.ebuild 
b/media-gfx/imagemagick/imagemagick-7.0.11.10.ebuild
deleted file mode 100644
index 769cb4c0e00..00000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.10.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
-       inherit git-r3
-       MY_P="imagemagick-9999"
-else
-       MY_PV="$(ver_rs 3 '-')"
-       MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-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"
-
-REQUIRED_USE="corefonts? ( truetype )
-       svg? ( xml )
-       test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-       dev-libs/libltdl:0
-       bzip2? ( app-arch/bzip2 )
-       corefonts? ( media-fonts/corefonts )
-       djvu? ( app-text/djvu )
-       fftw? ( sci-libs/fftw:3.0 )
-       fontconfig? ( media-libs/fontconfig )
-       fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-       graphviz? ( media-gfx/graphviz )
-       heif? ( media-libs/libheif:= )
-       jbig? ( >=media-libs/jbigkit-2:= )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-       lcms? ( media-libs/lcms:2= )
-       lqr? ( media-libs/liblqr )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       pango? ( x11-libs/pango )
-       perl? ( >=dev-lang/perl-5.8.8:0= )
-       png? ( media-libs/libpng:0= )
-       postscript? ( app-text/ghostscript-gpl )
-       raw? ( media-libs/libraw:= )
-       svg? (
-               gnome-base/librsvg
-               media-gfx/potrace
-               )
-       tiff? ( media-libs/tiff:0= )
-       truetype? (
-               media-fonts/urw-fonts
-               >=media-libs/freetype-2
-               )
-       webp? ( media-libs/libwebp:0= )
-       wmf? ( media-libs/libwmf )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXext
-               x11-libs/libXt
-               )
-       xml? ( dev-libs/libxml2:= )
-       lzma? ( app-arch/xz-utils )
-       zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-       !media-gfx/graphicsmagick[imagemagick]
-       X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Apply hardening #664236
-       cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-       sed -i -e '/^<policymap>$/ {
-                       r policy-hardening.snippet
-                       d
-               }' \
-               config/policy.xml || \
-               die "Failed to apply hardening of policy.xml"
-       einfo "policy.xml hardened"
-
-       elibtoolize # for Darwin modules
-
-       # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-       local ati_cards mesa_cards nvidia_cards render_cards
-       shopt -s nullglob
-       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-       if test -n "${ati_cards}"; then
-               addpredict "${ati_cards}"
-       fi
-       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-       if test -n "${mesa_cards}"; then
-               addpredict "${mesa_cards}"
-       fi
-       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-       if test -n "${nvidia_cards}"; then
-               addpredict "${nvidia_cards}"
-       fi
-       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-       if test -n "${render_cards}"; then
-               addpredict "${render_cards}"
-       fi
-       shopt -u nullglob
-       addpredict /dev/nvidiactl
-}
-
-src_configure() {
-       local depth=16
-       use q8 && depth=8
-       use q32 && depth=32
-
-       local openmp=disable
-       use openmp && { tc-has-openmp && openmp=enable; }
-
-       use perl && perl_check_env
-
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-       local myeconfargs=(
-               $(use_enable static-libs static)
-               $(use_enable hdri)
-               $(use_enable opencl)
-               --with-threads
-               --with-modules
-               --with-quantum-depth=${depth}
-               $(use_with cxx magick-plus-plus)
-               $(use_with perl)
-               --with-perl-options='INSTALLDIRS=vendor'
-               --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-               $(use_with bzip2 bzlib)
-               $(use_with X x)
-               $(use_with zlib)
-               --without-autotrace
-               $(use_with postscript dps)
-               $(use_with djvu)
-               --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-               $(use_with fftw)
-               $(use_with fpx)
-               $(use_with fontconfig)
-               $(use_with truetype freetype)
-               $(use_with postscript gslib)
-               $(use_with graphviz gvc)
-               $(use_with heif heic)
-               $(use_with jbig)
-               $(use_with jpeg)
-               $(use_with jpeg2k openjp2)
-               --without-jxl
-               $(use_with lcms)
-               $(use_with lqr)
-               $(use_with lzma)
-               $(use_with openexr)
-               $(use_with pango)
-               $(use_with png)
-               $(use_with raw)
-               $(use_with svg rsvg)
-               $(use_with tiff)
-               $(use_with webp)
-               $(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
-               $(use_with wmf)
-               $(use_with xml)
-               --${openmp}-openmp
-               --with-gcc-arch=no-automagic
-       )
-       CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in 
'${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" 
|| \
-               die "Failed to install default blank policy.xml in 
'${_im_local_config_home}'"
-
-       local im_command= IM_COMMANDS=()
-       if [[ ${PV} == "9999" ]] ; then
-               IM_COMMANDS+=( "magick -version" ) # Show version we are using 
-- cannot verify because of live ebuild
-       else
-               IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # 
Verify that we are using version we just built
-       fi
-       IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-       IM_COMMANDS+=( "emake check" ) # Run tests
-
-       for im_command in "${IM_COMMANDS[@]}"; do
-               eval "${S}"/magick.sh \
-                       ${im_command} || \
-                       die "Failed to run \"${im_command}\""
-       done
-}
-
-src_install() {
-       # Ensure documentation installation files and paths with each release!
-       emake \
-               DESTDIR="${D}" \
-               DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-               install
-
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-       dodoc {AUTHORS,README}.txt ChangeLog
-
-       if use perl; then
-               find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-               find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-       fi
-
-       find "${ED}" -name '*.la' -exec sed -i -e 
"/^dependency_libs/s:=.*:='':" {} +
-       # .la files in parent are not needed, keep plugin .la files
-       find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-               EOF
-
-               insinto /etc/sandbox.d
-               doins "${T}"/99${PN} #472766
-       fi
-
-       insinto /usr/share/${PN}
-       doins config/*icm
-}
-
-pkg_postinst() {
-       local _show_policy_xml_notice=
-
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               # This is a new installation
-               _show_policy_xml_notice=yes
-       else
-               local v
-               for v in ${REPLACING_VERSIONS}; do
-                       if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-                               # This is an upgrade
-                               _show_policy_xml_notice=yes
-
-                               # Show this elog only once
-                               break
-                       fi
-               done
-       fi
-
-       if [[ -n "${_show_policy_xml_notice}" ]]; then
-               elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-7"
-               elog "which will prevent the usage of the following coders by 
default:"
-               elog ""
-               elog "  - PS"
-               elog "  - PS2"
-               elog "  - PS3"
-               elog "  - EPS"
-               elog "  - PDF"
-               elog "  - XPS"
-       fi
-}

diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild 
b/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
deleted file mode 100644
index 53b6fa068e7..00000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
-       inherit git-r3
-       MY_P="imagemagick-9999"
-else
-       MY_PV="$(ver_rs 3 '-')"
-       MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-       KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-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"
-
-REQUIRED_USE="corefonts? ( truetype )
-       svg? ( xml )
-       test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-       dev-libs/libltdl:0
-       bzip2? ( app-arch/bzip2 )
-       corefonts? ( media-fonts/corefonts )
-       djvu? ( app-text/djvu )
-       fftw? ( sci-libs/fftw:3.0 )
-       fontconfig? ( media-libs/fontconfig )
-       fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-       graphviz? ( media-gfx/graphviz )
-       heif? ( media-libs/libheif:= )
-       jbig? ( >=media-libs/jbigkit-2:= )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-       lcms? ( media-libs/lcms:2= )
-       lqr? ( media-libs/liblqr )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       pango? ( x11-libs/pango )
-       perl? ( >=dev-lang/perl-5.8.8:0= )
-       png? ( media-libs/libpng:0= )
-       postscript? ( app-text/ghostscript-gpl )
-       raw? ( media-libs/libraw:= )
-       svg? (
-               gnome-base/librsvg
-               media-gfx/potrace
-               )
-       tiff? ( media-libs/tiff:0= )
-       truetype? (
-               media-fonts/urw-fonts
-               >=media-libs/freetype-2
-               )
-       webp? ( media-libs/libwebp:0= )
-       wmf? ( media-libs/libwmf )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXext
-               x11-libs/libXt
-               )
-       xml? ( dev-libs/libxml2:= )
-       lzma? ( app-arch/xz-utils )
-       zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-       !media-gfx/graphicsmagick[imagemagick]
-       X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Apply hardening #664236
-       cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-       sed -i -e '/^<policymap>$/ {
-                       r policy-hardening.snippet
-                       d
-               }' \
-               config/policy.xml || \
-               die "Failed to apply hardening of policy.xml"
-       einfo "policy.xml hardened"
-
-       elibtoolize # for Darwin modules
-
-       # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-       local ati_cards mesa_cards nvidia_cards render_cards
-       shopt -s nullglob
-       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-       if test -n "${ati_cards}"; then
-               addpredict "${ati_cards}"
-       fi
-       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-       if test -n "${mesa_cards}"; then
-               addpredict "${mesa_cards}"
-       fi
-       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-       if test -n "${nvidia_cards}"; then
-               addpredict "${nvidia_cards}"
-       fi
-       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-       if test -n "${render_cards}"; then
-               addpredict "${render_cards}"
-       fi
-       shopt -u nullglob
-       addpredict /dev/nvidiactl
-}
-
-src_configure() {
-       local depth=16
-       use q8 && depth=8
-       use q32 && depth=32
-
-       local openmp=disable
-       use openmp && { tc-has-openmp && openmp=enable; }
-
-       use perl && perl_check_env
-
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-       local myeconfargs=(
-               $(use_enable static-libs static)
-               $(use_enable hdri)
-               $(use_enable opencl)
-               --with-threads
-               --with-modules
-               --with-quantum-depth=${depth}
-               $(use_with cxx magick-plus-plus)
-               $(use_with perl)
-               --with-perl-options='INSTALLDIRS=vendor'
-               --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-               $(use_with bzip2 bzlib)
-               $(use_with X x)
-               $(use_with zlib)
-               --without-autotrace
-               $(use_with postscript dps)
-               $(use_with djvu)
-               --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-               $(use_with fftw)
-               $(use_with fpx)
-               $(use_with fontconfig)
-               $(use_with truetype freetype)
-               $(use_with postscript gslib)
-               $(use_with graphviz gvc)
-               $(use_with heif heic)
-               $(use_with jbig)
-               $(use_with jpeg)
-               $(use_with jpeg2k openjp2)
-               --without-jxl
-               $(use_with lcms)
-               $(use_with lqr)
-               $(use_with lzma)
-               $(use_with openexr)
-               $(use_with pango)
-               $(use_with png)
-               $(use_with raw)
-               $(use_with svg rsvg)
-               $(use_with tiff)
-               $(use_with webp)
-               $(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
-               $(use_with wmf)
-               $(use_with xml)
-               --${openmp}-openmp
-               --with-gcc-arch=no-automagic
-       )
-       CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in 
'${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" 
|| \
-               die "Failed to install default blank policy.xml in 
'${_im_local_config_home}'"
-
-       local im_command= IM_COMMANDS=()
-       if [[ ${PV} == "9999" ]] ; then
-               IM_COMMANDS+=( "magick -version" ) # Show version we are using 
-- cannot verify because of live ebuild
-       else
-               IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # 
Verify that we are using version we just built
-       fi
-       IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-       IM_COMMANDS+=( "emake check" ) # Run tests
-
-       for im_command in "${IM_COMMANDS[@]}"; do
-               eval "${S}"/magick.sh \
-                       ${im_command} || \
-                       die "Failed to run \"${im_command}\""
-       done
-}
-
-src_install() {
-       # Ensure documentation installation files and paths with each release!
-       emake \
-               DESTDIR="${D}" \
-               DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-               install
-
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-       dodoc {AUTHORS,README}.txt ChangeLog
-
-       if use perl; then
-               find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-               find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-       fi
-
-       find "${ED}" -name '*.la' -exec sed -i -e 
"/^dependency_libs/s:=.*:='':" {} +
-       # .la files in parent are not needed, keep plugin .la files
-       find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-               EOF
-
-               insinto /etc/sandbox.d
-               doins "${T}"/99${PN} #472766
-       fi
-
-       insinto /usr/share/${PN}
-       doins config/*icm
-}
-
-pkg_postinst() {
-       local _show_policy_xml_notice=
-
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               # This is a new installation
-               _show_policy_xml_notice=yes
-       else
-               local v
-               for v in ${REPLACING_VERSIONS}; do
-                       if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-                               # This is an upgrade
-                               _show_policy_xml_notice=yes
-
-                               # Show this elog only once
-                               break
-                       fi
-               done
-       fi
-
-       if [[ -n "${_show_policy_xml_notice}" ]]; then
-               elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-7"
-               elog "which will prevent the usage of the following coders by 
default:"
-               elog ""
-               elog "  - PS"
-               elog "  - PS2"
-               elog "  - PS3"
-               elog "  - EPS"
-               elog "  - PDF"
-               elog "  - XPS"
-       fi
-}

diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild 
b/media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild
deleted file mode 100644
index 769cb4c0e00..00000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
-       inherit git-r3
-       MY_P="imagemagick-9999"
-else
-       MY_PV="$(ver_rs 3 '-')"
-       MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-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"
-
-REQUIRED_USE="corefonts? ( truetype )
-       svg? ( xml )
-       test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-       dev-libs/libltdl:0
-       bzip2? ( app-arch/bzip2 )
-       corefonts? ( media-fonts/corefonts )
-       djvu? ( app-text/djvu )
-       fftw? ( sci-libs/fftw:3.0 )
-       fontconfig? ( media-libs/fontconfig )
-       fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-       graphviz? ( media-gfx/graphviz )
-       heif? ( media-libs/libheif:= )
-       jbig? ( >=media-libs/jbigkit-2:= )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-       lcms? ( media-libs/lcms:2= )
-       lqr? ( media-libs/liblqr )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       pango? ( x11-libs/pango )
-       perl? ( >=dev-lang/perl-5.8.8:0= )
-       png? ( media-libs/libpng:0= )
-       postscript? ( app-text/ghostscript-gpl )
-       raw? ( media-libs/libraw:= )
-       svg? (
-               gnome-base/librsvg
-               media-gfx/potrace
-               )
-       tiff? ( media-libs/tiff:0= )
-       truetype? (
-               media-fonts/urw-fonts
-               >=media-libs/freetype-2
-               )
-       webp? ( media-libs/libwebp:0= )
-       wmf? ( media-libs/libwmf )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXext
-               x11-libs/libXt
-               )
-       xml? ( dev-libs/libxml2:= )
-       lzma? ( app-arch/xz-utils )
-       zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-       !media-gfx/graphicsmagick[imagemagick]
-       X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Apply hardening #664236
-       cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-       sed -i -e '/^<policymap>$/ {
-                       r policy-hardening.snippet
-                       d
-               }' \
-               config/policy.xml || \
-               die "Failed to apply hardening of policy.xml"
-       einfo "policy.xml hardened"
-
-       elibtoolize # for Darwin modules
-
-       # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-       local ati_cards mesa_cards nvidia_cards render_cards
-       shopt -s nullglob
-       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-       if test -n "${ati_cards}"; then
-               addpredict "${ati_cards}"
-       fi
-       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-       if test -n "${mesa_cards}"; then
-               addpredict "${mesa_cards}"
-       fi
-       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-       if test -n "${nvidia_cards}"; then
-               addpredict "${nvidia_cards}"
-       fi
-       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-       if test -n "${render_cards}"; then
-               addpredict "${render_cards}"
-       fi
-       shopt -u nullglob
-       addpredict /dev/nvidiactl
-}
-
-src_configure() {
-       local depth=16
-       use q8 && depth=8
-       use q32 && depth=32
-
-       local openmp=disable
-       use openmp && { tc-has-openmp && openmp=enable; }
-
-       use perl && perl_check_env
-
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-       local myeconfargs=(
-               $(use_enable static-libs static)
-               $(use_enable hdri)
-               $(use_enable opencl)
-               --with-threads
-               --with-modules
-               --with-quantum-depth=${depth}
-               $(use_with cxx magick-plus-plus)
-               $(use_with perl)
-               --with-perl-options='INSTALLDIRS=vendor'
-               --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-               $(use_with bzip2 bzlib)
-               $(use_with X x)
-               $(use_with zlib)
-               --without-autotrace
-               $(use_with postscript dps)
-               $(use_with djvu)
-               --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-               $(use_with fftw)
-               $(use_with fpx)
-               $(use_with fontconfig)
-               $(use_with truetype freetype)
-               $(use_with postscript gslib)
-               $(use_with graphviz gvc)
-               $(use_with heif heic)
-               $(use_with jbig)
-               $(use_with jpeg)
-               $(use_with jpeg2k openjp2)
-               --without-jxl
-               $(use_with lcms)
-               $(use_with lqr)
-               $(use_with lzma)
-               $(use_with openexr)
-               $(use_with pango)
-               $(use_with png)
-               $(use_with raw)
-               $(use_with svg rsvg)
-               $(use_with tiff)
-               $(use_with webp)
-               $(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
-               $(use_with wmf)
-               $(use_with xml)
-               --${openmp}-openmp
-               --with-gcc-arch=no-automagic
-       )
-       CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in 
'${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" 
|| \
-               die "Failed to install default blank policy.xml in 
'${_im_local_config_home}'"
-
-       local im_command= IM_COMMANDS=()
-       if [[ ${PV} == "9999" ]] ; then
-               IM_COMMANDS+=( "magick -version" ) # Show version we are using 
-- cannot verify because of live ebuild
-       else
-               IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # 
Verify that we are using version we just built
-       fi
-       IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-       IM_COMMANDS+=( "emake check" ) # Run tests
-
-       for im_command in "${IM_COMMANDS[@]}"; do
-               eval "${S}"/magick.sh \
-                       ${im_command} || \
-                       die "Failed to run \"${im_command}\""
-       done
-}
-
-src_install() {
-       # Ensure documentation installation files and paths with each release!
-       emake \
-               DESTDIR="${D}" \
-               DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-               install
-
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-       dodoc {AUTHORS,README}.txt ChangeLog
-
-       if use perl; then
-               find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-               find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-       fi
-
-       find "${ED}" -name '*.la' -exec sed -i -e 
"/^dependency_libs/s:=.*:='':" {} +
-       # .la files in parent are not needed, keep plugin .la files
-       find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-               EOF
-
-               insinto /etc/sandbox.d
-               doins "${T}"/99${PN} #472766
-       fi
-
-       insinto /usr/share/${PN}
-       doins config/*icm
-}
-
-pkg_postinst() {
-       local _show_policy_xml_notice=
-
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               # This is a new installation
-               _show_policy_xml_notice=yes
-       else
-               local v
-               for v in ${REPLACING_VERSIONS}; do
-                       if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-                               # This is an upgrade
-                               _show_policy_xml_notice=yes
-
-                               # Show this elog only once
-                               break
-                       fi
-               done
-       fi
-
-       if [[ -n "${_show_policy_xml_notice}" ]]; then
-               elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-7"
-               elog "which will prevent the usage of the following coders by 
default:"
-               elog ""
-               elog "  - PS"
-               elog "  - PS2"
-               elog "  - PS3"
-               elog "  - EPS"
-               elog "  - PDF"
-               elog "  - XPS"
-       fi
-}

diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild 
b/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild
deleted file mode 100644
index 769cb4c0e00..00000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git";
-       inherit git-r3
-       MY_P="imagemagick-9999"
-else
-       MY_PV="$(ver_rs 3 '-')"
-       MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/";
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-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"
-
-REQUIRED_USE="corefonts? ( truetype )
-       svg? ( xml )
-       test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-       dev-libs/libltdl:0
-       bzip2? ( app-arch/bzip2 )
-       corefonts? ( media-fonts/corefonts )
-       djvu? ( app-text/djvu )
-       fftw? ( sci-libs/fftw:3.0 )
-       fontconfig? ( media-libs/fontconfig )
-       fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-       graphviz? ( media-gfx/graphviz )
-       heif? ( media-libs/libheif:= )
-       jbig? ( >=media-libs/jbigkit-2:= )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-       lcms? ( media-libs/lcms:2= )
-       lqr? ( media-libs/liblqr )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       pango? ( x11-libs/pango )
-       perl? ( >=dev-lang/perl-5.8.8:0= )
-       png? ( media-libs/libpng:0= )
-       postscript? ( app-text/ghostscript-gpl )
-       raw? ( media-libs/libraw:= )
-       svg? (
-               gnome-base/librsvg
-               media-gfx/potrace
-               )
-       tiff? ( media-libs/tiff:0= )
-       truetype? (
-               media-fonts/urw-fonts
-               >=media-libs/freetype-2
-               )
-       webp? ( media-libs/libwebp:0= )
-       wmf? ( media-libs/libwmf )
-       X? (
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXext
-               x11-libs/libXt
-               )
-       xml? ( dev-libs/libxml2:= )
-       lzma? ( app-arch/xz-utils )
-       zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-       !media-gfx/graphicsmagick[imagemagick]
-       X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Apply hardening #664236
-       cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-       sed -i -e '/^<policymap>$/ {
-                       r policy-hardening.snippet
-                       d
-               }' \
-               config/policy.xml || \
-               die "Failed to apply hardening of policy.xml"
-       einfo "policy.xml hardened"
-
-       elibtoolize # for Darwin modules
-
-       # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-       local ati_cards mesa_cards nvidia_cards render_cards
-       shopt -s nullglob
-       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-       if test -n "${ati_cards}"; then
-               addpredict "${ati_cards}"
-       fi
-       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-       if test -n "${mesa_cards}"; then
-               addpredict "${mesa_cards}"
-       fi
-       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-       if test -n "${nvidia_cards}"; then
-               addpredict "${nvidia_cards}"
-       fi
-       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-       if test -n "${render_cards}"; then
-               addpredict "${render_cards}"
-       fi
-       shopt -u nullglob
-       addpredict /dev/nvidiactl
-}
-
-src_configure() {
-       local depth=16
-       use q8 && depth=8
-       use q32 && depth=32
-
-       local openmp=disable
-       use openmp && { tc-has-openmp && openmp=enable; }
-
-       use perl && perl_check_env
-
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-       local myeconfargs=(
-               $(use_enable static-libs static)
-               $(use_enable hdri)
-               $(use_enable opencl)
-               --with-threads
-               --with-modules
-               --with-quantum-depth=${depth}
-               $(use_with cxx magick-plus-plus)
-               $(use_with perl)
-               --with-perl-options='INSTALLDIRS=vendor'
-               --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-               $(use_with bzip2 bzlib)
-               $(use_with X x)
-               $(use_with zlib)
-               --without-autotrace
-               $(use_with postscript dps)
-               $(use_with djvu)
-               --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-               $(use_with fftw)
-               $(use_with fpx)
-               $(use_with fontconfig)
-               $(use_with truetype freetype)
-               $(use_with postscript gslib)
-               $(use_with graphviz gvc)
-               $(use_with heif heic)
-               $(use_with jbig)
-               $(use_with jpeg)
-               $(use_with jpeg2k openjp2)
-               --without-jxl
-               $(use_with lcms)
-               $(use_with lqr)
-               $(use_with lzma)
-               $(use_with openexr)
-               $(use_with pango)
-               $(use_with png)
-               $(use_with raw)
-               $(use_with svg rsvg)
-               $(use_with tiff)
-               $(use_with webp)
-               $(use_with corefonts windows-font-dir 
"${EPREFIX}"/usr/share/fonts/corefonts)
-               $(use_with wmf)
-               $(use_with xml)
-               --${openmp}-openmp
-               --with-gcc-arch=no-automagic
-       )
-       CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-       # Install default (unrestricted) policy in $HOME for test suite #664238
-       local _im_local_config_home="${HOME}/.config/ImageMagick"
-       mkdir -p "${_im_local_config_home}" || \
-               die "Failed to create IM config dir in 
'${_im_local_config_home}'"
-       cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" 
|| \
-               die "Failed to install default blank policy.xml in 
'${_im_local_config_home}'"
-
-       local im_command= IM_COMMANDS=()
-       if [[ ${PV} == "9999" ]] ; then
-               IM_COMMANDS+=( "magick -version" ) # Show version we are using 
-- cannot verify because of live ebuild
-       else
-               IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # 
Verify that we are using version we just built
-       fi
-       IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-       IM_COMMANDS+=( "emake check" ) # Run tests
-
-       for im_command in "${IM_COMMANDS[@]}"; do
-               eval "${S}"/magick.sh \
-                       ${im_command} || \
-                       die "Failed to run \"${im_command}\""
-       done
-}
-
-src_install() {
-       # Ensure documentation installation files and paths with each release!
-       emake \
-               DESTDIR="${D}" \
-               DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-               install
-
-       rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-       dodoc {AUTHORS,README}.txt ChangeLog
-
-       if use perl; then
-               find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-               find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-       fi
-
-       find "${ED}" -name '*.la' -exec sed -i -e 
"/^dependency_libs/s:=.*:='':" {} +
-       # .la files in parent are not needed, keep plugin .la files
-       find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               
SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-               EOF
-
-               insinto /etc/sandbox.d
-               doins "${T}"/99${PN} #472766
-       fi
-
-       insinto /usr/share/${PN}
-       doins config/*icm
-}
-
-pkg_postinst() {
-       local _show_policy_xml_notice=
-
-       if [[ -z "${REPLACING_VERSIONS}" ]]; then
-               # This is a new installation
-               _show_policy_xml_notice=yes
-       else
-               local v
-               for v in ${REPLACING_VERSIONS}; do
-                       if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-                               # This is an upgrade
-                               _show_policy_xml_notice=yes
-
-                               # Show this elog only once
-                               break
-                       fi
-               done
-       fi
-
-       if [[ -n "${_show_policy_xml_notice}" ]]; then
-               elog "For security reasons, a policy.xml file was installed in 
/etc/ImageMagick-7"
-               elog "which will prevent the usage of the following coders by 
default:"
-               elog ""
-               elog "  - PS"
-               elog "  - PS2"
-               elog "  - PS3"
-               elog "  - EPS"
-               elog "  - PDF"
-               elog "  - XPS"
-       fi
-}

Reply via email to