media-gfx/imagemagick: bump to v6.9.10-56 & v7.0.8-56
authorThomas Deutschmann <whissi@gentoo.org>
Mon, 22 Jul 2019 16:56:23 +0000 (18:56 +0200)
committerThomas Deutschmann <whissi@gentoo.org>
Mon, 22 Jul 2019 16:58:41 +0000 (18:58 +0200)
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
media-gfx/imagemagick/Manifest
media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild [new file with mode: 0644]
media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild [moved from media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild with 100% similarity]

index ed424661b8ad97f80b12f04f2611c6281ce0cb42..27020cf934ed5446908be88ded856c91bf088f4f 100644 (file)
@@ -1,3 +1,4 @@
 DIST ImageMagick-6.9.10-50.tar.xz 8941584 BLAKE2B dcbbe4b0c25c281168088dd5b62a9d882088b9b57fc4127c6d233b049011ae3ede43e2629734fbd1ae2b21cd13f64690e6f6a3ea81a1e08736fbc1a29a5bccf9 SHA512 f288eb8ce40aafb3d099ae5ec10403902934d02440256ed2012f0b13456b237c3a903f92764b02378c27005fd65ad1251ff1663fce825890721fa93b18ad515d
+DIST ImageMagick-6.9.10-56.tar.xz 8950748 BLAKE2B 5d1b4ad20ec3aa6f89aedf08ac91266be218464cd998ca950623c1a23954968f84b21bfc140c1a1dfdcd68c8420ddcd39f76cd31d3872d43bf631b5782980665 SHA512 e5d1dd4da8b361858ff2d7a4c7956280bd55053022c7b0ad27fac4a70e9d2cafb75299e7970e1b2091b83b3bedd2355d5752e9bff6999f9272619a92a8892c0f
 DIST ImageMagick-7.0.8-50.tar.xz 9453076 BLAKE2B a137fb353d32ce6914b5033ea4c02bc81cb1eb82c1dbb6d449f20e19b23ec1eeef628e27c497cb9eb5e7a23f9d4f9f2152e3c6e64dfb5c6f793358c174286e27 SHA512 78cee7463610b256b899cc9474924cefe2dc36ab238025c54688563c3e1aa4b86ebc739f22fb349ab8914b7ac0dc6c5073cca168b9cfc371fb4bbd7e3f51cfbc
-DIST ImageMagick-7.0.8-51.tar.xz 9460120 BLAKE2B 4d1e3cc750c8d336a8af3949b0e8f725529d20fafe27f9786be872c7f98e50ef4a8701e1aa2aa84811ea9669e7b9fb7d09d2d86de90ad807f740049698d5f625 SHA512 a60171e9841667ceb82187fae9b4044f77d01fbd67eca7cc27d80dc9d1388a53718c52b25f0b339236d744ba4c23736778b56f5ec0d4b06982fb95bf7977d9ae
+DIST ImageMagick-7.0.8-56.tar.xz 9465124 BLAKE2B c31c66ae84e9bb91fc744673c07d12300a5e5a07729eaee9654e988efc46cc9d5321e6906325fe9fcfbeb81785a74a52e6059d2983c280b86d0ad305c0818b9d SHA512 22651b0f5b0b0821b7ae74a10671590d8ecfddcc95b60bf056ef7a7cbeab37beedaf49d0bcf97cb0ac2f1ec564192c15c7820c9593db965b4b192338abdaf5dc
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild
new file mode 100644 (file)
index 0000000..b092913
--- /dev/null
@@ -0,0 +1,248 @@
+# 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://${PN}/${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-fbsd ~x86-fbsd ~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"
+
+RESTRICT="perl? ( userpriv )"
+
+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 )"
+
+REQUIRED_USE="corefonts? ( truetype )
+       test? ( corefonts )"
+
+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
+}