From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- media-gfx/imagemagick/Manifest | 14 +- media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild | 248 -------------------- media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild | 248 -------------------- media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild | 248 ++++++++++++++++++++ media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild | 256 --------------------- media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild | 256 --------------------- media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild | 256 +++++++++++++++++++++ media-gfx/imagemagick/imagemagick-9999.ebuild | 4 +- 8 files changed, 511 insertions(+), 1019 deletions(-) delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild (limited to 'media-gfx/imagemagick') diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index c02325618d9c..d4ad4ca4474c 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,12 +1,8 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 -DIST ImageMagick-6.9.10-60.tar.xz 8939576 BLAKE2B a4b493838da9bfa183f55d19d9643dcd83fe533884b28d579b9586357af7d3ffba16f88e73ed42658a3b41ac47de9ebf7a7ddbefc0339bd90338a1f32dbd96a7 SHA512 cd34014322bd48b02d3680564756db58292fabd5487a187bb3913ec9f5ffd0b990a112a145a9be544cfc334cb917232683cdafc815baee85638a95a9a89f4604 -DIST ImageMagick-6.9.10-64.tar.xz 9060412 BLAKE2B 1c27abab10910f4013ff65dfdf32b4bcf8541b1a15195eefa7bd32a6a375abe6cfe3e5f243716c0e6aa7b82acf498fec142efa72b1bdf1696138c727be159113 SHA512 e4be41a7a47da479e2128791fa0cafdd6a1a369c0520e68b34049ba951590635aad956df58f52c84f676b0909689aabea6c9e3d7fdcb82040e78f368d4eb76b4 -DIST ImageMagick-7.0.8-60.tar.xz 9464992 BLAKE2B 26a75c0df77459582b9025612c0f70b30bedf9fee7bdfe5b0083ca9f5a7184d19e849c8a18d3781ed39d1788a17d6b1de608424193c24ec5e11ab9b50bd64874 SHA512 4db1c24942b522cab1ff80c3eb3df7a81cfd2ec7f7f91dcd00b2d4867b2afe5026ffbeacbed83ddb9178448f1ded3dacb34002fc65892704e863794338ba6436 -DIST ImageMagick-7.0.8-64.tar.xz 9463488 BLAKE2B db44b8d0a03f15c26d6912ada5900932bf393eefa6fe8ead03c668552810b06078fca4f9cef9f78e78049b61222ecb6abf2072a5719a0326aca357ff2f49eae0 SHA512 6ddd12a6b5e7870364575f6646e38ca49dc14c2857d8a41217d24e3dccf87cf8730d2aef692dc7b62616e54eb76f320c550e9f409376e22bfcf89e472f8dd0e6 -EBUILD imagemagick-6.9.10.60.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8 -EBUILD imagemagick-6.9.10.64.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf -EBUILD imagemagick-7.0.8.60.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f -EBUILD imagemagick-7.0.8.64.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245 -EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba +DIST ImageMagick-6.9.10-67.tar.xz 9068120 BLAKE2B ce7b3b37a65acb5433459bca242e6fdd3a35d8d5f10b8f21395cd085aed0c1b588835919cf43e8abb2f2d86a035fa5e663660b652029a07a7cf83006bd052320 SHA512 d413c4b7dfb7db5c7d61977d7444774ea7445b254746266261a5a91e47aa89ae566241e84135915102ea9a09d77cd89beeaed7a2f5974f6c9b0f4b505c5bfc42 +DIST ImageMagick-7.0.8-67.tar.xz 9470768 BLAKE2B c14f5536ab80720698a6d8df37724d2b0107a6f378a23f2f8f891be585dde59378ffed4fcb601794a5db4cf1d0008db40f33697b1c04ab3b0185a6a71a331a26 SHA512 ad4325df57769f9c4edf8ac71370cb9bb19e090e588d47eb0311e3f4895abd7a7edcbd2e7a495f21acd1daca97fa224bdf1fd978577588e45c11a7799c3d67f4 +EBUILD imagemagick-6.9.10.67.ebuild 6867 BLAKE2B 1cb8781a336ef0322df8e35d5bc6e6a3f6e70c3930e95f518160c677900d1aa51bb6d2ba4d2822f83f3aea40e57cfdda39bd808c1443cd874080492a003aef11 SHA512 b39325d583ea67a2b9e7a75e76dca7d29584f53c0e458249c44fc23007628f168b923d92aab6ee1329d6c13a804491c835664f5a5329ea05474b8cc72454a744 +EBUILD imagemagick-7.0.8.67.ebuild 7134 BLAKE2B aa5e04ab76be0e47eeabfa67852bb3907907f49844996f2d5bc875d880eda49506657758753ada9f5bfe9da159cc8d6f3b012d9aa061ea6bc5ae9d64f9caf91f SHA512 d5c4939be2fc6bca2b0e96b6dc02f35bbec8d9574495b0389155febee4fcf0e94fc41666860c1792eb2fadb77a9cd846d3bccc1df0f330c146efc95237dd67c1 +EBUILD imagemagick-9999.ebuild 7144 BLAKE2B 45892ff417e8a153ffcbc958d9ee0e594bb478bab88f24e207317c788b14b32c7ad0ad8c7bfc01a74c3ae70df2775f0187aa0ede2774873427194c134e4374e8 SHA512 b415fd35ad72b70c7985a798bc868291a78ac7d22769c8b1ff9b244473d8439a15cc624e06025854abe6c41b5dffda13290ed3aee7d60475b9829147ce4cdb7e MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2 diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild deleted file mode 100644 index b6bca9ea8b20..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild +++ /dev/null @@ -1,248 +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://${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 '/^$/ { - 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-6.9.10.64.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild deleted file mode 100644 index b09291336ccb..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild +++ /dev/null @@ -1,248 +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://${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 '/^$/ { - 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-6.9.10.67.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild new file mode 100644 index 000000000000..319fce98db62 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.10.67.ebuild @@ -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://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" + +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 '/^$/ { + 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.60.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild deleted file mode 100644 index 59c2b130c53d..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild +++ /dev/null @@ -1,256 +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 - -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 '/^$/ { - 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 -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild deleted file mode 100644 index 69c412db11b7..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild +++ /dev/null @@ -1,256 +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 - -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 '/^$/ { - 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 -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild new file mode 100644 index 000000000000..1fa89f6961ba --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.0.8.67.ebuild @@ -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://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/${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 '/^$/ { + 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 +} diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 91e101eeefc0..1d5c3d2d7d7c 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -12,8 +12,8 @@ if [[ ${PV} == "9999" ]] ; then 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" + 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" -- cgit v1.2.3