version bump wrt security bug #271502

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 169 insertions, 5 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 4ddd2d416ea8..b8a969bf47d2 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.347 2009/05/24 18:06:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.348 2009/05/29 05:34:49 maekke Exp $
+
+*imagemagick-6.5.2.9 (29 May 2009)
+
+  29 May 2009; Markus Meier <maekke@gentoo.org> +imagemagick-6.5.2.9.ebuild:
+  version bump wrt security bug #271502
 
 *imagemagick-6.5.2.7 (24 May 2009)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index cdb20fba39e5..6c0e0b928941 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 DIST ImageMagick-6.5.1-0.tar.bz2 8795149 RMD160 e8f2f5eed7d9131c143d61d94a3738e2ffd58681 SHA1 d712a89dd45fc7e3bb55c66df5c03d2cc0d691d9 SHA256 c19677e8b4cd2322555436392fcf2a60cffac559c4d2aafcf60e6a59bd7fc466
 DIST ImageMagick-6.5.2-7.tar.bz2 8805044 RMD160 98e5df115b285438720fd92fdbaa17a5ee1c95c4 SHA1 289084e4091ffcc2bb687a3e193580a585810c19 SHA256 b9f21f2b04df6166dd34cad49335a5d9f83c088feb103f039ea94949b8dc25af
+DIST ImageMagick-6.5.2-9.tar.bz2 8819668 RMD160 01aa6604339eaee031b06aae27a4074ac36a88e1 SHA1 1eb8cb876742dba833917c30b10bfef215d4f261 SHA256 5bc9958ce4db8d36c6bd92f8e7c95aafc63aeb03694cdf1fdd4b3f3ae953ef4c
 EBUILD imagemagick-6.5.1.0.ebuild 4697 RMD160 7d96da6ac9844a33b1e86f017e2aafe0875af2c5 SHA1 485b6fcbe660c574a004ba67e963287d489b711f SHA256 2b28d61047693d19877b145502e4abc3a1bc78032fe88df688c06642515919b0
 EBUILD imagemagick-6.5.2.7.ebuild 4391 RMD160 c8d5b0b299fa544289f667fb1f013b0d31584ee0 SHA1 a6385e24ad144f38ca6f86f1e4483d737ea7fc0f SHA256 d04c6ad2367064ad6a6a0a972e232c76af59f443629aa68fa68708a6839c4ec0
-MISC ChangeLog 52380 RMD160 2f28b044fda05a04ed106eaaf6f704372210e263 SHA1 eed8bc6f03719f13f89bc64d2cdd51020cf66e48 SHA256 609be571eef68b75a0e6bef26e6d23d5a655736899a82eb89640e56dcde6ce90
+EBUILD imagemagick-6.5.2.9.ebuild 4391 RMD160 72674e4c902e0da4719d50c767f9bbc52fc10ac8 SHA1 708f89a2ee01d52b90bbab33892e9cb7eb900f94 SHA256 b2c357df702dd94a093c033e075b54b15e49bbf491814c78ecda9c15627a02b2
+MISC ChangeLog 52534 RMD160 e0171fa8c3653db2746fa9f2584b79f37df42e70 SHA1 005c34fb8a5be579863b6835f14f7762cbf881a9 SHA256 e61d8e301bd68df8b480f685c93c29a62c7b0457dfaa61dbf4803fc3935c981b
 MISC metadata.xml 620 RMD160 facd588ff7e13cf1a573927c5f3e653f384bb4b2 SHA1 e989aa7d14e2a1c7382b5fdf1c395ed7dcf7d6cb SHA256 86955c079d63a4faacc4be59e01a4ce47934fc35f5b89f6accfdb755cd4ff2df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoZjQUACgkQkKaRLQcq0GJHSgCgpVh/u/ibsY6vfQG7vd7KYdlJ
-20wAoLauy5vfbPnKMFfhkxcmITgiGNIl
-=hyZe
+iEYEARECAAYFAkofdFMACgkQkKaRLQcq0GJ46QCfe/UmWReAEH5xmR8wV0oCP4di
+RjcAn3CzDk6QWzKH7Sm1Vj87n4XCx3Kg
+=PiiV
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild b/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild
new file mode 100644
index 000000000000..619a53927844
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild,v 1.1 2009/05/29 05:34:49 maekke Exp $
+
+EAPI="2"
+
+inherit eutils multilib perl-app toolchain-funcs
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
+
+# perl tests fail with userpriv
+RESTRICT="perl? ( userpriv )"
+LICENSE="imagemagick"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 +corefonts djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k
+	lcms nocxx openexr openmp perl png q8 q32 raw svg tiff truetype X wmf xml zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	djvu? ( app-text/djvu )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( media-libs/libfpx )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( virtual/ghostscript )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( >=media-libs/lcms-1.06 )
+	openexr? ( media-libs/openexr )
+	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+	png? ( media-libs/libpng )
+	raw? ( media-gfx/ufraw )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	truetype? ( =media-libs/freetype-2*
+		corefonts? ( media-fonts/corefonts ) )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+	)
+	!dev-perl/perlmagick
+	!sys-apps/compare
+	>=sys-devel/libtool-1.5.2-r6"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	openmp? ( >=sys-devel/gcc-4.3.0[openmp] )
+	X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${MY_P2}"
+
+pkg_setup() {
+	# for now, only build svg support when X is enabled, as librsvg
+	# pulls in quite some X dependencies.
+	if use svg && ! use X ; then
+		elog "the svg USE-flag requires the X USE-flag set."
+		elog "disabling svg support for now."
+	fi
+
+	if use corefonts && ! use truetype ; then
+		elog "corefonts USE-flag requires the truetype USE-flag to be set."
+		elog "disabling corefonts support for now"
+	fi
+}
+
+src_prepare() {
+	# fix doc dir, bug 91911
+	sed -i -e \
+		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
+		"${S}"/configure || die
+}
+
+src_configure() {
+	local myconf
+	if use q32 ; then
+		myconf="${myconf} --with-quantum-depth=32"
+	elif use q8 ; then
+		myconf="${myconf} --with-quantum-depth=8"
+	else
+		myconf="${myconf} --with-quantum-depth=16"
+	fi
+
+	if use X && use svg ; then
+		myconf="${myconf} --with-rsvg"
+	else
+		myconf="${myconf} --without-rsvg"
+	fi
+
+	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
+
+	econf \
+		${myconf} \
+		--without-included-ltdl \
+		--with-ltdl-include=/usr/include \
+		--with-ltdl-lib=/usr/$(get_libdir) \
+		--with-threads \
+		--with-modules \
+		$(use_with perl) \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		$(use_enable hdri) \
+		$(use_with !nocxx magick-plus-plus) \
+		$(use_with bzip2 bzlib) \
+		$(use_with djvu) \
+		$(use_with fontconfig) \
+		$(use_with fpx) \
+		$(use_with gs dps) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg jpeg) \
+		$(use_with jpeg2k jp2) \
+		$(use_with lcms) \
+		$(use_with openexr) \
+		$(use_enable openmp) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with truetype freetype) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		$(use_with zlib) \
+		$(use_with X x)
+}
+
+src_test() {
+	einfo "please note that the tests will only be run when the installed"
+	einfo "version and current emerging version are the same"
+
+	if has_version ~${CATEGORY}/${P} ; then
+		emake -j1 check || die "make check failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation of files into image failed"
+
+	# dont need these files with runtime plugins
+	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
+
+	use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
+	dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+}