media-gfx/imagemagick: bump to v6.9.10-78 & 7.0.9-8
authorThomas Deutschmann <whissi@gentoo.org>
Sat, 14 Dec 2019 22:56:19 +0000 (23:56 +0100)
committerThomas Deutschmann <whissi@gentoo.org>
Sat, 14 Dec 2019 23:20:10 +0000 (00:20 +0100)
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
media-gfx/imagemagick/Manifest
media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild [deleted file]
media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild [moved from media-gfx/imagemagick/imagemagick-6.9.10.74.ebuild with 97% similarity]
media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild [deleted file]
media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild [moved from media-gfx/imagemagick/imagemagick-7.0.9.5.ebuild with 98% similarity]

index 1a2f40bfaa0456a014ca3ec0c3de7a62f18e43b0..cf6f8d76168ee8009adb2edb11e7ead428d964d5 100644 (file)
@@ -1,4 +1,2 @@
-DIST ImageMagick-6.9.10-74.tar.xz 9063472 BLAKE2B 11a57ab7f030dbea3d4875b079b131825180e25d4b7b796ae901b1f44edc66b2d6e3feb0271b3afcad67ae1f29fa70d993c8586b12612b53334754e0ccb2582f SHA512 eea3c0d95af431e1949faea95a15fd7a43db72eda8106a9af7994b9760a0f040301ba7e7cb365994fa31bbd3bb40d4624f4d3007366d2fee160eeb7242ed48f9
-DIST ImageMagick-6.9.10-77.tar.xz 9068384 BLAKE2B aafbb1debe10f6526a4cdf191381eb171cb9d887b20077313f40f2755e8bedc21c1c27fcd147a521d3c23a7ebf7494701ef20eefc1b1b7b2b861a870bff2bcf1 SHA512 4b6af2a0e28af33314c13f01b1a2b269cd04c5ba873fa8fda5a211dc942d28ad8f4a5e0f88b332e71d2d449d546df60886ebae15fe70e9162c5bf2881710f0d6
-DIST ImageMagick-7.0.9-5.tar.xz 9468724 BLAKE2B 951a02f119941b8f0ef323aa748947535575e49935e22ff0ace9f716eb5c1ee60a0989877161a7fd97b4d893445f30e3d046317eb83ef4ed8105e1baa02aac83 SHA512 dffb67deaf38e7d4d532eed629a3e4c11be76e6ee32abbca80cf2bdd26e9a916c218ea30f99aebbc9fdcab595cd954757d56e723c1b7d22de3e4fb11c8a7975d
-DIST ImageMagick-7.0.9-7.tar.xz 9481272 BLAKE2B 15af7ec85a43ae16712d079652e052286703f4b89d34d95194258f0cde239d6f6393fe1d567d5dbad6b9cf4349688f7c77bc42d8d28f49b266c9315b433bee1f SHA512 f14cf492e6fec62511f93f1bdd1fc97912c7f3acc581782948e69cf5ccc42132a4f0d250345ac0a47d9954ee0bd3d286ab77cc0f28ca1db76c06ceb197639014
+DIST imagemagick-6.9.10.78.tar.gz 13522518 BLAKE2B 1eab0f7bc6bbecc44b3f25a752ae2b6ad8f026fe700c78d0b914aa23e5737485c8c41785859035002e1dbd16e7d19af823ea71425cb56f732fbee08419212d7d SHA512 8ab6c91afcf2b8c1bd0a4f130d35abae914599ddf7e0c85d6bf57ace8822cdf1cc57929e047350b06532546827856420a484fc9754ae403684db9df04d0f66a9
+DIST imagemagick-7.0.9.8.tar.gz 13678831 BLAKE2B 3e5189fa244577fdc7d9e674ef0b2385a67dbfc4a0c80fac66a7224b31805925c97fe1955b8386e6d622dd64ffed1cc888657ba5f885d66fb0e8df32703b4ce8 SHA512 3797978e6da49bd6129a437110d9b2b15e1963178c5c62fd228e68295645b469f5cf7d3bb0974ce74a320094973137adfb7409f47248383fe63abc4a49a90ddf
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.77.ebuild
deleted file mode 100644 (file)
index 9f32b46..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-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 )
-       test? ( corefonts )"
-
-RESTRICT="perl? ( userpriv )
-       !test? ( test )"
-
-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 )
-       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]
-       virtual/pkgconfig
-       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 mesa_cards ati_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:=.*:='':" {} +
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/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
-}
similarity index 97%
rename from media-gfx/imagemagick/imagemagick-6.9.10.74.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild
index 104ec59adc776bb7afad37d6b402d7fcbe48b4b6..99cd54e5c91ea0376afb6093a55396ae37c9a96b 100644 (file)
@@ -10,7 +10,8 @@ MY_P="ImageMagick-${MY_PV}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+#SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+SRC_URI="https://github.com/ImageMagick/ImageMagick6/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
@@ -67,7 +68,8 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        X? ( x11-base/xorg-proto )"
 
-S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/ImageMagick6-${MY_PV}"
 
 src_prepare() {
        default
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.7.ebuild
deleted file mode 100644 (file)
index 8d8ee8a..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2019 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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.9"
-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"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
-       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 )
-       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:=.*:='':" {} +
-
-       if use opencl; then
-               cat <<-EOF > "${T}"/99${PN}
-               SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/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
-}
similarity index 98%
rename from media-gfx/imagemagick/imagemagick-7.0.9.5.ebuild
rename to media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild
index 8287ed2ffd500e42f6ef358d8664f9f376dd32d9..568a44c6e22087212c279e34423f47eabec8fd6f 100644 (file)
@@ -12,7 +12,8 @@ if [[ ${PV} == "9999" ]] ; then
 else
        MY_PV="$(ver_rs 3 '-')"
        MY_P="ImageMagick-${MY_PV}"
-       SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+       #SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+       SRC_URI="https://github.com/ImageMagick/ImageMagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
        KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi