From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5D6AE158094 for ; Wed, 31 Aug 2022 02:51:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65E61E0875; Wed, 31 Aug 2022 02:51:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38497E0875 for ; Wed, 31 Aug 2022 02:51:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E53F34131F for ; Wed, 31 Aug 2022 02:51:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F5AF569 for ; Wed, 31 Aug 2022 02:51:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661914292.acd4cfe8e97a26fa5534a5468bfbdc4da4593362.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/Manifest media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild media-gfx/imagemagick/imagemagick-6.9.12.58.ebuild media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: acd4cfe8e97a26fa5534a5468bfbdc4da4593362 X-VCS-Branch: master Date: Wed, 31 Aug 2022 02:51:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fdb4594e-e503-40db-a6f2-fbccf43d2bde X-Archives-Hash: eca35e812d5c18bdc0ba8ab9ef547ce1 commit: acd4cfe8e97a26fa5534a5468bfbdc4da4593362 Author: Sam James gentoo org> AuthorDate: Wed Aug 31 02:51:32 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 31 02:51:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acd4cfe8 media-gfx/imagemagick: drop 6.9.12.28, 6.9.12.58, 7.1.0.13, 7.1.0.43 Bug: https://bugs.gentoo.org/852947 Bug: https://bugs.gentoo.org/843833 Signed-off-by: Sam James gentoo.org> media-gfx/imagemagick/Manifest | 4 - media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild | 267 -------------------- media-gfx/imagemagick/imagemagick-6.9.12.58.ebuild | 269 -------------------- media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild | 274 -------------------- media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild | 278 --------------------- 5 files changed, 1092 deletions(-) diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 6d40c1c1ae8b..d37ffbca8f01 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,6 +1,2 @@ -DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25f05e2d9766031807500a6bb39cba2a800c39a93a16864ca9af3a0b33d0c1c95cb2f33264c7e00149204ca742673c3d07ff SHA512 ec96fca6b385379873ead007b011d87fb3939ed4e3631d2a9401f1467db59d1d1ced072fd4fefe1577d04302a1060dbc324631b420f41a99bf32465b540ec979 -DIST ImageMagick-6.9.12-58.tar.xz 9164316 BLAKE2B 0ef0b4fa289f945a2b787b6a3c04d9b96093c2e9ed07d5828d53b6e1518d5197473998081b22daf41e65d21bc65927b12dc66802430a68e0001116c4a446d03e SHA512 c73cd363bb7ac05b488d2960f61a9f0d87ab859da049038b21e0ed396b3a681361b0bcd4ad128c0397be26fac06e83b3f36868fba40a72645c42b3398ad6c930 DIST ImageMagick-6.9.12-59.tar.xz 9178096 BLAKE2B 3ee13cf1bc0af33b720cce1d310bbdc1d6c08e17510b4d1d166228f6d84d15be0d1388b19153b1e21dee971d65f3a061ef19bc577c02218a49d2814538ec60c8 SHA512 c9ba09852543c6a00c041c7f7e27a24eae0f34bf8f9db1077fd34ccd9eb6d5a94787301d38b1e34636474cbc50830cdc812dbcd01b613f36063107346ec60213 -DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044 -DIST ImageMagick-7.1.0-43.tar.xz 10355700 BLAKE2B 2fe6472b864b0ca25ce5e0d7b045a6b3457fbdfa67e232b125183927b20e56ea2cc0a6225d51f0a2e09b36cc2500e7ee3c3ff99f3924aa3ca56e3e08f776ea3f SHA512 4f9c9625165eabcabc2edd745ad1755309d412591e5a8d383445d05b2bfe2d41df3e711c38be3ae5c8f504c0510452b1aff51e50edc24aa279bb742fb8ddd305 DIST ImageMagick-7.1.0-44.tar.xz 10363636 BLAKE2B 547ec39391588bf609ab11e7353ec6b55773e40162ada486619c769b97989f728e7fa235fe23e6e8b0d0f8db500bcd273d6851fcb7f99a68a7177f1b67fc68a9 SHA512 e8467963b7243560901fcdd8a28b6dcca8052565f87848390852cf6deafad918d612d59e349a46ab90b159c0af8578b16cc982fae195dc8ef8ed95568e0cf05e diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild deleted file mode 100644 index 170a23afd362..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit flag-o-matic libtool perl-functions toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/6.9.11-60" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -REQUIRED_USE="corefonts? ( truetype ) - svg? ( xml ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:=[x265] ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -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 - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - $(use_enable openmp) - --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) - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "6.9.10.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.58.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.58.ebuild deleted file mode 100644 index 20654ea8d565..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.12.58.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QA_PKGCONFIG_VERSION=$(ver_cut 1-3) -inherit flag-o-matic libtool perl-functions toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/6.9.12-58" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -REQUIRED_USE="corefonts? ( truetype ) - svg? ( xml ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - !media-gfx/graphicsmagick[imagemagick] - dev-libs/libltdl - 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:=[x265] ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - 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:= ) - png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:= ) - 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} - X? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - # Apply hardening, bug #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" - - # for Darwin modules - elibtoolize - - # For testsuite, see bug #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 - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - $(use_enable openmp) - --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) - --with-gcc-arch=no-automagic - ) - - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in ${HOME} for test suite, bug #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 - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - # bug #472766 - doins "${T}"/99${PN} - 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.1.0.13.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild deleted file mode 100644 index ac18f6d0a928..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit flag-o-matic libtool perl-functions toolchain-funcs - -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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/7.1.0-0" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" - -REQUIRED_USE="corefonts? ( truetype ) - svg? ( xml ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:=[x265] ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zip? ( dev-libs/libzip:= ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -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 - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - $(use_enable openmp) - --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 zip) - $(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) - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild - else - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - fi - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild deleted file mode 100644 index 45768f836f09..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QA_PKGCONFIG_VERSION=$(ver_cut 1-3) -inherit autotools flag-o-matic perl-functions toolchain-funcs - -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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/7.1.0-43" -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 zip zlib" - -REQUIRED_USE="corefonts? ( truetype ) - svg? ( xml ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - !media-gfx/graphicsmagick[imagemagick] - dev-libs/libltdl - 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:=[x265] ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - 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:= ) - png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:= ) - 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 ) - zip? ( dev-libs/libzip:= ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-9999-nocputuning.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - #elibtoolize # for Darwin modules - eautoreconf - - # Apply hardening, bug #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" - - # 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 - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - $(use_enable openmp) - --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 zip) - $(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) - ) - - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite, bug #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 - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -}