media-gfx/imagemagick: bump to v6.9.10-45 & v7.0.8-45
authorThomas Deutschmann <whissi@gentoo.org>
Tue, 14 May 2019 00:13:32 +0000 (02:13 +0200)
committerThomas Deutschmann <whissi@gentoo.org>
Tue, 14 May 2019 00:13:48 +0000 (02:13 +0200)
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
media-gfx/imagemagick/Manifest
media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild [new file with mode: 0644]
media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild [new file with mode: 0644]

index 313433030b3bc201ecb53b8131d405065f133ef7..4c25787012b969cf6c135febcf95f2f1f286e3b5 100644 (file)
@@ -1,2 +1,4 @@
 DIST ImageMagick-6.9.10-42.tar.xz 8944092 BLAKE2B c616030d5624cc67879f698c52a906dede56db5f594cd1efef67ae7a7ce555f385b60b442e87904e3cb9f95840448e2a58d5121bd8e408812a3099864be880f0 SHA512 49ca335a7f0f83fb925995fa4249790cbb93142a0a30387f4d6c6ee9278599801da8b8644f3828afff8be841f55b64e31fda3bb4c6eea2c540bb94be4c926cb6
+DIST ImageMagick-6.9.10-45.tar.xz 8936232 BLAKE2B 7fb58bb55765efb0d0789334d91b11d95f62b49bef9810e5188291d20bb6fdce0c4e9d9bb9857a76ed3c23ec2c9747d366d1ace696687a7d95fd1ee838f6defb SHA512 a45f9d9d1080b7771b4ccecd4e36dce042e82d3bf18fe0b0d1d4dd82f25ce0a175f0ec6ec31a26f516c6517f2b76aac68a1b4a5471fa4af3d58e1c5f1193031a
 DIST ImageMagick-7.0.8-42.tar.xz 9455976 BLAKE2B c3cc7353da73fea92c51febad8816c333970b91069ee54756acf7f1b9f57481fceec066dcb21845b2ebf1a9a97b17b9f8b6859d1becdbfc9553bfa148b5c0433 SHA512 88f57b69ece3b93b0af41e85bacb0b232cf07e7d0aab34e1479ce6c5fe29b1cfcdcd8bc6b2b87773c2109122614a0f64847629029470d945409b08b19032d936
+DIST ImageMagick-7.0.8-45.tar.xz 9450936 BLAKE2B 6fa1260d98249ebf370bba0cd8352a6acb3b9e27df779881a77ca9701b804e513f6f6e4f8d008c2b86e3b9823d86d1de06c85cbed99c06f20aa50b261745458b SHA512 a54068d68b97adb4ffc3920f93a44166e1ce8c6a79304c60c20f020852e31502810d2f8cede4043ec3870febc3b7aebf2c06c06401813ce054a6b67cc343f1d2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.45.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.45.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
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.45.ebuild
new file mode 100644 (file)
index 0000000..69c412d
--- /dev/null
@@ -0,0 +1,256 @@
+# 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
+
+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://${PN}/${MY_P}.tar.xz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+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"
+
+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 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=()
+       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
+}