Version bump wrt security #500988 by Agostino Sarubbo

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 179 insertions, 5 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index b2c927ef2ecc..1476faf55259 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.525 2014/01/29 14:47:05 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.526 2014/02/11 14:51:28 ssuominen Exp $
+
+*imagemagick-6.8.8.5 (11 Feb 2014)
+
+  11 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.8.8.5.ebuild:
+  Version bump wrt security #500988 by Agostino Sarubbo
 
   29 Jan 2014; Akinori Hattori <hattya@gentoo.org> imagemagick-6.8.7.5.ebuild,
   imagemagick-6.8.8.1.ebuild, imagemagick-6.8.8.2.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 187fb0db6cdb..bd0b7db39577 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -9,6 +9,7 @@ DIST ImageMagick-6.8.6-8.tar.xz 7537236 SHA256 8ce81b1cbc6615bc634c9bdb539025957
 DIST ImageMagick-6.8.7-5.tar.xz 7505296 SHA256 266601bfc6896785df1e4bb5b83ef3d54a5c2dcc11530c403ed968a6cf9bc1b2 SHA512 daba8a73a0be82c6f4577c58d8fd64f03bec18cc7642b7c0df52a25b8de558aab182f7a1443c741db808ecff533c7ef4481a628d07cff643b50989259c45b7d2 WHIRLPOOL 6a253087aff0814463deeb3423bc8b2150eb51b669d921035a937562b2e6260dc9657a584fbde9573370f1373c387c5795016c74595e920404e4fc6f1a17acc0
 DIST ImageMagick-6.8.8-1.tar.xz 7527812 SHA256 1ce766720e07c61a9993c3c226425d8b1b7a18fd8ffb1841c2380a7d622c107b SHA512 f6eb9789fce84d6b982ed7397410179b5acb7dfdfe75afa485b89cd483d01d5cd8f74e2f589c2eca13a358f46915fcbd9445784bb5e721232bbbafb6a77b135b WHIRLPOOL b4e6ec9b5d89be3d5185786889fa57c5d7782c5608a9b32f68da33097c56234e9f49b81df0e4e16a412cdad704fa8f346a7884cb715a8d411edeae488e8bc300
 DIST ImageMagick-6.8.8-2.tar.xz 7439160 SHA256 26f939b9663e21f28028a1cac912231d2930481aec1779c55b9b71617032430e SHA512 6f6335c6878ffad57f81fe6ed6b1595c0c94a8413ba0c62d97116d20a4ec9cffe423e00a8492c3b1e9c8dfcd2d284aa5fcaea8b70d784fda6e9680715f6941ee WHIRLPOOL 7653697cd4268c1c80d610cfdfa496c21939497482dec5462c0b55cc582851cbc54d55dc2403ebe59963a37ec0f2d8a88223576dd040048299f4e10fc8cc1c59
+DIST ImageMagick-6.8.8-5.tar.xz 7446036 SHA256 8c30ef963e376a2b57528feda8fcea2ed76613a9825cf63f03a5a2c9e3093cd5 SHA512 99ac98c43efe9ed27a677fee4c39a83583f387aa0ce282480b210453b4a3eba576e1b4fe7ee055ba4d040d0e0a9d8d2c35ffc3acd910064877ffcbba7a0c2bd7 WHIRLPOOL 7da68835242f18235d2a7c09edeaa88d972f2eb337580ea48a0c1d40b9c08a80f7c4e68c2a4eccacf6bbaa1091bbe24663181fcc87abe4d1f36c164504e66997
 EBUILD imagemagick-6.7.8.7.ebuild 4262 SHA256 4999aaa5ca86a056bad155e48656256225c9dd4d918ecf17d41fdc563f6b8786 SHA512 635eeff5cc3ebf2277b30bd318630969ba017b5bbe9c50707473f1cd0de04ea6213b39d6b30f74654920c5ad637c4e8f33c8602a712d4edbce5d9d10f22fdba6 WHIRLPOOL 8ac9a2691c239605087eda39ed6b2d2c2a0ee08a477beec4eac7883ba4e6c92511026eba449d7e8db5d95bb626c1785ab33c13460a9f570e79ebd0df477652db
 EBUILD imagemagick-6.8.6.1.ebuild 4284 SHA256 48159b8d51d9245dd50015dc622b3c355115e6d54ea9f30f939f3a3ee2924124 SHA512 15153776de1706442b369cdec7dc7d181d3d7b8899769256fcff03b8936723f1e75653c44f82bf60518db474be677b9ae757e87595dddf1b3a57478ff0468c5c WHIRLPOOL c1150bdb4f1850021b239d8f6fd2e3ee313fb298e517f1458bdeebe99d8ed4fbb6f734f3679d2bc6f2c66b5e0e478eb665a1aa22d45912c1fd1685305f0426e4
 EBUILD imagemagick-6.8.6.8-r1.ebuild 4614 SHA256 3dddfef8648a8ca870ea2452950687645b7c4f793390e700dd22cf022dd2d408 SHA512 a06851ca35f86445e51ee6bd682054f2897d119df479b9bc9f2d0e30d4ea7575ba7c1a2b1d76dd055837501afadca46286775cf975e215a5aa49e51d2421b67f WHIRLPOOL 77a87160573cc51727cc13e5ff7480ffc76e5c0771b181bfd4e5efcc5ff0d95cbf0d4b126350310602e7a4722636673cad18cfd99577e86d7ad87870c5cd47ff
@@ -16,12 +17,17 @@ EBUILD imagemagick-6.8.6.8.ebuild 4346 SHA256 5741890d4a1f48280481b5db16d87badfd
 EBUILD imagemagick-6.8.7.5.ebuild 4681 SHA256 0ef3f7955ca40a7f56cd5ca5f767eee3cc58cfda9be9991488591070ace8cf48 SHA512 0e2101f7877d4aa94a5886078aca92a071a70a861dcddf314de23d7e1719d01b5c5ca9847a10fcf37d174a4f2d080574ef1b006b5652bb66cbda12acb71cafa9 WHIRLPOOL e14eb6c028b64e27185f510ba9be3747fe6d9a826364cd1085d4ea55bc251862af9784b45b18e25b34d9d3e216d3fd90b7e7745520e0b751dbf33ed6f99d4a7d
 EBUILD imagemagick-6.8.8.1.ebuild 4688 SHA256 ba263c0b3ccc2a7b9813c035dda5700358270f5b9ff380b534b701950aedffbc SHA512 1a24f39b8ab8891a86e132f273a65d070510e86af752f9aa09a5eba7070c075076bf23190194945c598fa538eba20ccca51c9e39b024ddf4ffe29e49edb68e74 WHIRLPOOL cfed12327aefc19c217cffe25df42ff9025bd04681a3123a603fcaa720cfd51c893ea64b6e3f89240121fdeb7eabaaaee4e8fcc3106d43d645d6179f28c326f9
 EBUILD imagemagick-6.8.8.2.ebuild 4696 SHA256 80659cb598ed4f52f92ee82c7e3a3726787080e9ded9e7511950ad5f70b5c61a SHA512 77c181ebdaeec74900997727220edae18b77ff02fd20b2394b8c5fc04911617238bb1294524e441809f4180ec2154c2874860ffc54f7ac4f729ab06805dc2622 WHIRLPOOL 223cbc55a46ee56a47f9ca9f60b790154dadb812a2546205f67ee70e3e8932d04a27917cdf255a05e5182ec3fae7df62273c2ead393e840e5b756ab0a7762e10
-MISC ChangeLog 77318 SHA256 211727c90c2f3c454eb89af56d81868d2ead63eed91d6f484c971fb196dc2518 SHA512 6429012a341e9ee6125cb0a90692e99e330a8de92cb315bf303a8bda1f334130d288e182b9ffb5092c34aff0150247a3b3be73bd5451927e292d9aad7621be00 WHIRLPOOL e5f0bbf7cd49de7f08a5d673ef88b44b77ddf0db8caed25335d856214886530b3c5680681ab8b6504644b9a617ac277ca46a406f278c9dcccf4bcfcb595bfc07
+EBUILD imagemagick-6.8.8.5.ebuild 4699 SHA256 b5bd85de257f67daf8c347cd8746317eefdb510e77691d8bfaf1d0250401bf17 SHA512 b29956c69f2ddb31c94bca2474be8f4d0b572207cbb4f150a104033fb3f23c4a3ae15aa32f36ba6ebe88b6bc03146178568aa39e885db893815983113bb06102 WHIRLPOOL ff5515acd31677ad768f2082a9a44f166daeb7ea43a630845f166a1083b0d62fd79936fcce04d95b00c2d3a3747aebb656b897bea439a478889f90749ee95e1b
+MISC ChangeLog 77499 SHA256 14af19e2207847c2c41a75e42b3272954d5a8546e1807ee2ced2d93fed99f14b SHA512 6e5ea9db72137dd0da89980919f4f8a42c446cfcfe44b1f01ba5741f4dcfd249618b4e2bfd772304ff94afe142b0e6bfa1c274768e261f5a9c19e5027541d269 WHIRLPOOL d6f3715dd8a8c0b07c2623c5792af6240ed936f1229177280382e79f31dacbbb73a76606c3b4896dd230bfe426ff0f91d6a36b82df7e6125a193fcfd042f4775
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEUEAREIAAYFAlLpFHEACgkQL46suuyRem3B1QCfbM7TgNHPkPwYIgYm8FIny+Qy
-ANkAlRTeB7d3yhzMUvQXnfWjkbXr37k=
-=XhPv
+iQEcBAEBCAAGBQJS+jikAAoJEEdUh39IaPFNLEUH/1DL3R27GjsLib7VE9xUP5su
+yu1zk8My/FUPdiX/XvQjS2DWn/maFhEyczgx+jtMLgn3xyhKj6jtr+5w8cokcpNb
+HA7C2ufajI9HVKhSa3UddiEIR2lmqOP0iZabuhARJpHUMX6Hrjm7jreRNgfkZfwN
+wsgC66JSBRUT1Q6M4ePMdcWEwWOwsbxjTpKdTtTAvRbgHq1wDS0K+TTWqpLtHxto
+OHoQU9tDL/AHOCx6Shbz8JtkQhYjpFh2hY7KWaTD9L2cqEbRGQPztkbfNNogLg6B
+rpvCdAQ6envyhu+l98SMIwGZ4+1gK5ZrQ9aPBdfDdHnaxNVjlIBdF/uC0t2qb9Y=
+=LpQd
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.5.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.5.ebuild
new file mode 100644
index 000000000000..4c0a719adb3e
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.5.ebuild
@@ -0,0 +1,162 @@
+# 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.8.5.ebuild,v 1.1 2014/02/11 14:51:28 ssuominen Exp $
+
+EAPI=5
+inherit multilib toolchain-funcs versionator libtool flag-o-matic eutils
+
+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 ~ia64 ~ppc64 ~sparc ~amd64-fbsd" dropped because of missing KEYWORDS in app-text/mupdf wrt #491876
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~x86 ~ppc-aix ~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 pdf perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	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 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2 )
+	lcms? ( media-libs/lcms:2 )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	pdf? ( app-text/mupdf:0= )
+	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() {
+	elibtoolize # for Darwin modules
+
+	# http://bugs.gentoo.org/472766
+	shopt -s nullglob
+	cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${cards}"; then
+		addpredict "${cards}"
+	fi
+	shopt -u nullglob
+}
+
+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
+
+	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 pdf mupdf) \
+		$(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() {
+	if has_version ~${CATEGORY}/${P}; then
+		emake -j1 check
+	else
+		ewarn "Skipping testsuite because installed version doesn't match."
+	fi
+}
+
+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:=.*:='':" {} +
+}