summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-01-16 08:21:09 +0000
committerJustin Lecher <jlec@gentoo.org>2015-01-16 08:21:09 +0000
commit2bea1280abaa066011b38eb9b04b479453f5c3ee (patch)
tree2bc8dce091d00cd50a17d91325931e174a378950 /media-gfx
parentStable for x86, wrt bug #533366 (diff)
downloadgentoo-2-2bea1280abaa066011b38eb9b04b479453f5c3ee.tar.gz
gentoo-2-2bea1280abaa066011b38eb9b04b479453f5c3ee.tar.bz2
gentoo-2-2bea1280abaa066011b38eb9b04b479453f5c3ee.zip
media-gfx/imagemagick: Cleaning vulnerable versions #534106
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/imagemagick/ChangeLog5
-rw-r--r--media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild174
2 files changed, 4 insertions, 175 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index d8553ae45b13..862b2327d2f5 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.588 2015/01/16 08:08:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.589 2015/01/16 08:21:09 jlec Exp $
+
+ 16 Jan 2015; Justin Lecher <jlec@gentoo.org> -imagemagick-6.8.9.9.ebuild:
+ Cleaning vulnerable versions #534106
16 Jan 2015; Agostino Sarubbo <ago@gentoo.org> imagemagick-6.9.0.3.ebuild:
Stable for ia64, wrt bug #534106
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
deleted file mode 100644
index 84f76090574f..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild,v 1.12 2014/11/10 13:51:54 ago Exp $
-
-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 <sys-devel/libtool-2.4.3-r2:2 )
- autotrace? ( >=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 http://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
-}
-
-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
-}