Version bump wrt #517896 by Tomáš Chaloupka

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

3 files changed, 185 insertions, 10 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 3a57ac49a291..1d700597351d 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.559 2014/06/03 06:43:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.560 2014/08/24 15:37:23 ssuominen Exp $
+
+*imagemagick-6.8.9.7 (24 Aug 2014)
+
+  24 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.8.9.7.ebuild:
+  Version bump wrt #517896 by Tomáš Chaloupka
 
   03 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
   imagemagick-6.8.8.10-r1.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 8614447e3b51..b4726e99b6f1 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -4,17 +4,19 @@ Hash: SHA256
 AUX imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch 727 SHA256 02eaec5b5815d253d4acd126a0dfe46859bbbd7fa7c39bfdb4a59f6ef0c30e5a SHA512 6dfcc14e6026a37b05071158f5da973c8be5877cb068bd9c85bdb2f94690d531c04a2298e59ac860cfb1df7cfeda4c91e890b5f3fce56ff39ebcc892029701e5 WHIRLPOOL ea1a019c144d8b9111ae693ef2b2d2ef2bea238c53d65239be121c16b99f6b10abd4b76e688ff13301ef85ba69af5e96176555c6fdcf087515425acd5e88a034
 AUX imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch 2317 SHA256 7e50934e70666b14956d90f2054f246eba36479d6def83ae4b378f8fefb0082a SHA512 83404ba9c240a8d911567beb894ebfc42887a06f06e91f0346adab6e8c1b1a50114819c0dd902452a1cad3c92dbbde50a1888fdc15e79367bb8f8a32fa477cd9 WHIRLPOOL 420bd8a9825220875cae3f692590d37935ddf44dafac48ab951b779add88b0ed1fdf0ad79b444f14a38ead4e8797c4929bede5fa0699bc02a052752b64b19865
 DIST ImageMagick-6.8.8-10.tar.xz 7530504 SHA256 f31c7771ed0b8050837289f0c7b55303172e31acc005b0ee0d120727e2572d33 SHA512 2f4a9c5297b025ac78332843b8cfa81ef498c038edff6f91cc80a1e762492a933892ab38c81671ba7f57453213d37addf98e875253c5c328162983c1d89c5825 WHIRLPOOL e2572ba553f6fcf0de9adcbbaa82ccdd5b6d748cac9f9d8c07e5eb940083fd9aba9ac8cba3a2efa11aa4db53705905019931d45b13b8587451f97eed01415ee0
+DIST ImageMagick-6.8.9-7.tar.xz 7552828 SHA256 45670f37ebd3354d64e45df5462b929b5b843dee2b038b0ad524491492bffbf9 SHA512 e9be966b430d4aca1fe64435b68a5586c458ba8e238ba47d5d7046e90c2e807e6f7b476ede00c22ffb2dbdf9bb21762e121bba6e48062ebee2800612caf81eed WHIRLPOOL 7170e6dbfb9e6c990fc828f8f157ebd4f7cd25854dcd45834d9959fca63ee8add1775e072b534237580a5df49619cbbd0546e055692cdaf01dbf1c5e5965c62a
 EBUILD imagemagick-6.8.8.10-r1.ebuild 5080 SHA256 b945d23397b614a2d0a322fa13c9fff2ac535f9e5e491cdd726ed25606993c55 SHA512 d56578944e421c7831c3a5ceb4c0d2f1ffcd9a0c612dac3c08035d417a8c491eef79f8a60a425007043ec85466b61e97878665ab1178ce0103cef58723fee0e1 WHIRLPOOL f43ecf58eb757452240e0173fdfaf7c404cbb3044e6cfe4a55c9c0031dbea34ff9ed229fbc5ef13c6865a1dca1a875d7320f408ed27633fb77e714736f858756
-MISC ChangeLog 82571 SHA256 304106544d51a686abad4e856f93da990efbb75e7ff84d915ebf80433fc5847c SHA512 9afbd17f1ed1926841e10da83017e968ddc9d423f840427e9d7a197c17baed89c18069b3eb6fb73bd0253d662dce264d39d64d98318c904598ef06af8411b5c3 WHIRLPOOL f5fbf78a4f50972155bba47ad23de0d72171e467987a61db7bad3f313b89a798d8b5a41d8f93f73c35170dbc94a3dba6503a27f5c808d8a599f1fcb7e530dd78
+EBUILD imagemagick-6.8.9.7.ebuild 4790 SHA256 b2bccd8ff0d5b5156338ee1a59e3d93e9ebe7a5d5c1cc5633059d920ed8c0bdc SHA512 540013cf23994ca472d9c1ecb4fd5f314daefcb62d58cb8cd39691cdd832fe95b0766bac2eb478cf46fd729f1519acd75841c32776fa68e54244c1a4147f8fcd WHIRLPOOL 5881d213650a3277877957dc3e05597a475c15cca11d87ec53132b3fe2e7098e9e0318a9eb6322824d89032cabc50c060495bbc51694122ec7f2a951bff81cf6
+MISC ChangeLog 82741 SHA256 a158f4541d5bd6bdec29c131340d7dc56ebacbf4cdc1535b9df8fa7671f94e07 SHA512 5059622a5baa1f45ac052284951c74c3ded5987c2b48187c3ede913ec90f242364d403a9fdaffd5a856e6ec2aa1a5a573ec9f6afbc2d08fcf6b6e1f9c440dec9 WHIRLPOOL ae168e7ab31dd60a1cc66750b581839ff92aa3615fa6c54a3e6994b77cd4110a768c6196b712098d4f0cf89c83493ff5f1037f109081b3b3e1b9f8a51f383f58
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTjW31AAoJEEdUh39IaPFNomUH/A87qDuEcGUvEHhhtAF7/R8e
-seLQQdfr0nEayQqITiMkSV5p05ilgVY7dE2+3YtxfFG7IEIyx4XNZnCt5bhYXszp
-nAmol6Jona11FPVLasY1UhPcRZsteM+Q2ofr8M71kD3IBqFN/bWhg059Trbkc0M5
-HrW4am5zZNvzs3WwCquiY5jgCCIcYx7iQIJLB7G4yxra//UXTjmBQgyoui2Njd7q
-pT4zTUu2Mf4s//L6znbkNU7zIEfkfoWxSqvBbF9S9tpvdOuifw1bqbf9p06gbm/n
-3EoPuRggHABJUFxNV4VmP3sRo/C4Llrdf76OQiX2/iouW8FG2vyWp+IohFIz/I8=
-=DTOZ
+iQEcBAEBCAAGBQJT+gY2AAoJEEdUh39IaPFN41cH/Rs5jVRzcQdznsjIZmUfzFxO
+H5NkBSQbLiztHr5Bd128UenKqhSxEQ7i0X7n/jylzhBjZo6DO7wcBgJ97LDvWcE+
+FLuGFlBeS2cuRwIcIOEs9lPzsMGebJu3u4lpXTRc2bSd9JBoBcSR9VhuWaSZ4vyV
+Jzc/zAx3qdo/3BxD9ilXaCXJRxW9ec8W5/fpxTZegs6fZoia9co3sN/TPJkdIaTG
+3pNVFT67Enn5VdwAGmI0wkgIwNAzgMEDSzBruKT2bcLlU3dQwNftIYm4lYeU5KM/
+GCNNfRbu27rBlnk2SU4kAhsbDHVjYSkpsD7oDrYMYWmRVdWI/ThXbJsQ39Ok4uQ=
+=zmTX
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
new file mode 100644
index 000000000000..8f112b8abcca
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
@@ -0,0 +1,167 @@
+# 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.7.ebuild,v 1.1 2014/08/24 15:37:23 ssuominen 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 )"
+
+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-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
+	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 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/ati/card:/dev/dri/card"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+}