From 27c00b1376b040e8e9cd149eb9084bbf5b9d799f Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Thu, 27 Aug 2015 03:31:15 -0400 Subject: [PATCH] media-gfx/imagemagick: remove old --- media-gfx/imagemagick/Manifest | 2 - .../files/imagemagick-6.9.1.7-cflags.patch | 68 ------- .../imagemagick/imagemagick-6.9.1.4.ebuild | 180 ----------------- .../imagemagick/imagemagick-6.9.1.7.ebuild | 181 ------------------ 4 files changed, 431 deletions(-) delete mode 100644 media-gfx/imagemagick/files/imagemagick-6.9.1.7-cflags.patch delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.1.4.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index ec6fffbf3677..7b4578630dc2 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,5 +1,3 @@ DIST ImageMagick-6.9.0-3.tar.xz 7898568 SHA256 f00452ba2c05c2df9624c62d7adb49ecf17140edd6e5f355cceca051dab1fb38 SHA512 0ff1ac91fa4330544cf6ba9ac8bfd48fce5a0a702b4578e1dcd23989c52c2287e1d6291c231591457a87652a59d908bade148e4e94676a887293671dfec99a4c WHIRLPOOL 0ca86ecb04a18aee95aa2990b73f0f87a7c800b028c45c6af5a906bc0b2f9a380b2ac52bf825cfda8396b4c8dc9b1768be7b46000b9bee9b6f4aaa1bf7d7dea8 -DIST ImageMagick-6.9.1-4.tar.xz 7978216 SHA256 74973478058069ce44040ff76b61df713d70adcadfd207836cc0622cadf1e4bf SHA512 b3c8cc0882d3941053dd7052048f6839c268a2969637ba39067422dca9a2b0f442303d5ec647c6f1372723da5b59c30ee014902ad338d2157b75b8741526c698 WHIRLPOOL 0b3473bcfa43ae4fca0c084ea5bdff8c533e138f58ba782d79dd22d46e55a82b4cd8565fe0be5928a148eb969507e7d4b05764a8db08d8f5e862f00952772792 -DIST ImageMagick-6.9.1-7.tar.xz 8284892 SHA256 b610e5261c01664e19c91e513e21b3c2d76d583b497ee3c7cf2f20876d742328 SHA512 6eeef09b0e0297347e95c25c94305439e32e3e95a6f1c2e476a84911e8ca036c52634693a63cd28832c5dd0df14ca0c3ff41bad577f07bfe86c4085576350434 WHIRLPOOL 1751ac644916389292c306998df1c1d635d8acbaac23666a18b216b1b9867be39e7c1300a0f5d465ea3f3990af2dfac77efd8f23efca3f6f18e0beca439ceee5 DIST ImageMagick-6.9.1-8.tar.xz 8286604 SHA256 987b353058482b5ba15d42746eebc51c15eb05241ce94f22381b8aae0b841617 SHA512 feace56b4a409fa91b2827a3eae1a870541528a3f327e5d06a96ff4f97e8d94418c8f92e731b7276c41aef321584a75a4621fa2f361e9b20309a546d9a1f9fea WHIRLPOOL d2e3aa949a216829c5f2bea1149c31b0cd5ef83d0855863e6b0682afc0ee9fcc1f516893b9b0f612c5e64cb746225c3f9c2ab1c3f29332a6904ca53cb9117e7b DIST ImageMagick-6.9.2-0.tar.xz 8241360 SHA256 07a2de28f7f9ab888ef47c02eb7e10cc3e0dd0e9797c5d71d6e71d19f842399e SHA512 fc8c0f26447dc8225a30fd0c6e373cbc10161abffb9f511f137b1a78c2ab764782b3a2ce984177f99e0d5057a674465ebb27ff1260cef59ef3f8a73c82a8b617 WHIRLPOOL d53b963c15c79ff7de0077af2c2af740eb78c29a988a088b50ba8b79c2179def6e62806de6d30fced165df24eccf1019c42a1a130bef63066e824fadea4f3c0b diff --git a/media-gfx/imagemagick/files/imagemagick-6.9.1.7-cflags.patch b/media-gfx/imagemagick/files/imagemagick-6.9.1.7-cflags.patch deleted file mode 100644 index 53609c0a61d8..000000000000 --- a/media-gfx/imagemagick/files/imagemagick-6.9.1.7-cflags.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://github.com/ImageMagick/ImageMagick/issues/15 - ---- ImageMagick-6.9.1-7/configure -+++ ImageMagick-6.9.1-7/configure -@@ -35563,30 +35563,6 @@ - fi - - --# --# Sanitize output variables (asthetic). --# --for variable in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS PCFLAGS X_CFLAGS; do -- sanitize='' -- eval value=$`echo $variable` -- for component in $value -- do -- unique=yes -- for test_component in $sanitize -- do -- if test $component = $test_component; then -- unique=no -- break -- fi -- done -- if test $unique = yes; then -- sanitize="$sanitize $component" -- fi -- done -- sanitize=`echo $sanitize | sed -e 's/^ *//g'` -- eval ${variable}=\${sanitize} --done -- - # Pass only user-provided LIBS as "global" libraries - LIBS=$USER_LIBS - ---- ImageMagick-6.9.1-7/configure.ac -+++ ImageMagick-6.9.1-7/configure.ac -@@ -3706,30 +3706,6 @@ - fi - AC_SUBST(MAGICK_DEP_LIBS) - --# --# Sanitize output variables (asthetic). --# --for variable in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS PCFLAGS X_CFLAGS; do -- sanitize='' -- eval value=$`echo $variable` -- for component in $value -- do -- unique=yes -- for test_component in $sanitize -- do -- if test $component = $test_component; then -- unique=no -- break -- fi -- done -- if test $unique = yes; then -- sanitize="$sanitize $component" -- fi -- done -- sanitize=`echo $sanitize | sed -e 's/^ *//g'` -- eval ${variable}=\${sanitize} --done -- - # Pass only user-provided LIBS as "global" libraries - LIBS=$USER_LIBS - diff --git a/media-gfx/imagemagick/imagemagick-6.9.1.4.ebuild b/media-gfx/imagemagick/imagemagick-6.9.1.4.ebuild deleted file mode 100644 index e577a722ce14..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.1.4.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator - -MY_P=ImageMagick-$(replace_version_separator 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="http://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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -# Drop the libtool dep once libltdl goes stable. -RDEPEND=" - || ( dev-libs/libltdl:0 =media-gfx/autotrace-0.31.1 ) - 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 ) - 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-gfx/ufraw ) - 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-proto/xextproto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch_user - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - use q64 && depth=64 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - CONFIG_SHELL=$(type -P bash) \ - econf \ - $(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) \ - $(use_with 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 jbig) \ - $(use_with jpeg) \ - $(use_with jpeg2k openjp2) \ - --without-lcms \ - $(use_with lcms lcms2) \ - $(use_with lqr) \ - $(use_with lzma) \ - $(use_with openexr) \ - $(use_with pango) \ - $(use_with png) \ - $(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 -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake -j1 check -} - -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/ati/card:/dev/dri/card" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild deleted file mode 100644 index d0b31b7f8777..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator - -MY_P=ImageMagick-$(replace_version_separator 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="http://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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -# Drop the libtool dep once libltdl goes stable. -RDEPEND=" - || ( dev-libs/libltdl:0 =media-gfx/autotrace-0.31.1 ) - 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 ) - 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-gfx/ufraw ) - 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-proto/xextproto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-6.9.1.7-cflags.patch - - epatch_user - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - use q64 && depth=64 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - CONFIG_SHELL=$(type -P bash) \ - econf \ - $(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) \ - $(use_with 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 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 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 -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake -j1 check -} - -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/ati/card:/dev/dri/card" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} -- 2.26.2