From 0da5b9becd29b105d549396b6a6148606e15653e Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Mon, 15 Aug 2022 21:24:58 -0400 Subject: media-gfx/imagemagick: drop --- media-gfx/imagemagick/Manifest | 1 - .../files/imagemagick-9999-nocputuning.patch | 14 -- .../imagemagick/files/policy-hardening.snippet | 9 - media-gfx/imagemagick/files/policy.test.xml | 17 -- media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild | 279 --------------------- media-gfx/imagemagick/metadata.xml | 19 -- 6 files changed, 339 deletions(-) delete mode 100644 media-gfx/imagemagick/Manifest delete mode 100644 media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch delete mode 100644 media-gfx/imagemagick/files/policy-hardening.snippet delete mode 100644 media-gfx/imagemagick/files/policy.test.xml delete mode 100644 media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild delete mode 100644 media-gfx/imagemagick/metadata.xml diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest deleted file mode 100644 index 3a8c4d3..0000000 --- a/media-gfx/imagemagick/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ImageMagick-7.1.0-43.tar.xz 10355700 BLAKE2B 2fe6472b864b0ca25ce5e0d7b045a6b3457fbdfa67e232b125183927b20e56ea2cc0a6225d51f0a2e09b36cc2500e7ee3c3ff99f3924aa3ca56e3e08f776ea3f SHA512 4f9c9625165eabcabc2edd745ad1755309d412591e5a8d383445d05b2bfe2d41df3e711c38be3ae5c8f504c0510452b1aff51e50edc24aa279bb742fb8ddd305 diff --git a/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch b/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch deleted file mode 100644 index 4a946da..0000000 --- a/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch +++ /dev/null @@ -1,14 +0,0 @@ -See https://bugs.gentoo.org/678454 - -diff --git a/configure.ac b/configure.ac -index 5e7fb5875..b288327c8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -285,7 +285,6 @@ AC_PROG_AWK - AC_PROG_MKDIR_P - AM_WITH_DMALLOC - AX_C___ATTRIBUTE__ --AX_GCC_ARCHFLAG([yes]) - PKG_PROG_PKG_CONFIG([0.20]) - AC_CANONICAL_BUILD - AC_CANONICAL_HOST diff --git a/media-gfx/imagemagick/files/policy-hardening.snippet b/media-gfx/imagemagick/files/policy-hardening.snippet deleted file mode 100644 index c1a91b0..0000000 --- a/media-gfx/imagemagick/files/policy-hardening.snippet +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/media-gfx/imagemagick/files/policy.test.xml b/media-gfx/imagemagick/files/policy.test.xml deleted file mode 100644 index 6db44b7..0000000 --- a/media-gfx/imagemagick/files/policy.test.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - -]> - - - - - - 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 562a2ea..0000000 --- a/media-gfx/imagemagick/imagemagick-7.1.0.43.ebuild +++ /dev/null @@ -1,279 +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 jpegxl 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 ) - jpegxl? ( media-libs/libjxl:= ) - 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) - $(use_with jpegxl 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 -} diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml deleted file mode 100644 index 229c87b..0000000 --- a/media-gfx/imagemagick/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Use media-fonts/corefonts which is required by some commands - Enable media-libs/libfpx support - Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using media-libs/libheif - Enable High Dynamic Range Images formats - Enable experimental liquid rescale support using media-libs/liblqr - Enable JPEG XL support - Enable OpenCL support - Enable Pango support using x11-libs/pango - Set quantum depth value to 32 - Set quantum depth value to 8 - - - cpe:/a:imagemagick:imagemagick - - -- cgit v1.2.3-70-g09d2