Version bump because of "2014-09-16 6.8.9-8 Cristy <quetzlzacatenango@image...> JPEG library version >= 80 is thread safe, ref. http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25495

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

3 files changed, 185 insertions, 12 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 64706c7ff0df..4d8a3dfa062c 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,14 @@
 # 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.563 2014/09/27 07:00:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.564 2014/10/04 11:29:20 ssuominen Exp $
+
+*imagemagick-6.8.9.8 (04 Oct 2014)
+
+  04 Oct 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.8.9.8.ebuild:
+  Version bump because of "2014-09-16 6.8.9-8 Cristy
+  <quetzlzacatenango@image...> JPEG library version >= 80 is thread safe, ref.
+  http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25495
 
   27 Sep 2014; Fabian Groffen <grobian@gentoo.org> imagemagick-6.8.9.7.ebuild:
   force configure to use bash due to bashisms (x=${x/foo/})
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 04ff211a886d..ab42ae5dff65 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
+DIST ImageMagick-6.8.9-8.tar.xz 7889188 SHA256 27360449c6f3d4cca548d1780ecd5f8313a57a0a83d6d953a5088cc81714e9b0 SHA512 e200dee8a11b2d7077eae7645f0f21e5deb628aa11ade0b75ebd3865867ca544c89ca1a745b4b78d5496c86d359a63e290a53f25d090872286704c8ecb6176c6 WHIRLPOOL 10fed3f3faa1b9359f2dd19cf57b1f9019ccbb759136fb73a2234fd796043025519e27bfa7d05b23b6e3f7ca0685e21e93685ed868547ff14ddeaead1aa6bdf1
 EBUILD imagemagick-6.8.8.10-r1.ebuild 5079 SHA256 dc0ffff7b1bb1a538e18fa10276ced4ccf821bafde5615f1d02e9309ec1cf159 SHA512 68c43da7ec82bfdc04b4fab0983b34caec2087b9d7fa5c077e59d7dc9a16a6bb66949197de8e71574d9203c80f15d20caf470916e04696c2498804eeeebb28a0 WHIRLPOOL 6c40ecb45a320d75bd968eb78729a9ed451bb20526189ee12b3a0ddf2e9a19d33b99dc6fc06086cecb632abe5f8b227d3bdb41cae3135dfb9ef3e44d57b8f635
 EBUILD imagemagick-6.8.9.7.ebuild 4995 SHA256 f722685b7efadecd4eede239f46d26b4d518161b82b9356b18f8180254bd48dd SHA512 c827daa7be2069b3e578e7ed12017f4b388145a84db45d92ba700b6e21ad7f18c19f09fb01969117ec6074d5dd6bc3a10d1e29d2bef14e830c9924e2e88749cb WHIRLPOOL f4cdc4357a0206e710c3c47732aadcefdeacd0c6f6ad41eb76e200e9eaf0a9b3193ed6e338fee814c0f3ccde38523c606695450bd617d33ca77f7bc391230a96
-MISC ChangeLog 83210 SHA256 9a36c278ecd6a59315444bacb52be8552cfaf585dba6fa3a7567c9b59eb1ca62 SHA512 d4a56ca70a5d606dfc02d3964e5f9a50d40aed8e9c2fe90335e0016bea16af64d16c0506a699e91e003d28a6bb31214eafadc73f9d40ca7f81be3f8c9362986d WHIRLPOOL e3223e2677346888c8bf8f1887214bb9bec2d670c2531ab2f271147617bf46cfea7608503eb770a48962c417dfc5170d909fabed0193cc27b66588e47b585a4c
+EBUILD imagemagick-6.8.9.8.ebuild 4997 SHA256 06a207e7ea57407ac4c1acd3399309ede62796b6ed199c9bb24c0628cefd881a SHA512 fad18802437163a292a93992760574fe344c5256a29db3086e06065074f54ff7adbea3503b7c7ad50da640ad428966155385d92c629b8f8c4776ebcf5a912f56 WHIRLPOOL 9b1b202d34fb949a406823b744c9efe660c91f09812776cc4572c13eb1ed32c3ee02cd356389d8517310fed0c918080bbda6d2a6fbc8e790529b5472230576ca
+MISC ChangeLog 83538 SHA256 e79614ea76ffd3e273d99e79546467c5811f2fef1da689e55f1c2bae9c6cd9d6 SHA512 a9e69c823b1f3ea3c67107b21aa65819ecbd4ffb6e69cf4d6e3d4a8d5e39cdaf9e7f0ce02f2b640b5b7b355d79296fc8d849bb7f7b6f88b36934eb439df6d34d WHIRLPOOL e1fe10558b43fde6a963586d33abe4c396a64ea0ce15c089c9654ce1743f9bc116b958c6584ac2d541da6ac8c8afc9d0f459500d3b2fd790930a57134ce960cf
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlQmYIcACgkQX3X2B8XHTokYGwCfaBAtDZTB4UOaINcz7hIZxRAf
-DbYAn237Vg1JAEBaBJnHORLalo+pQj58
-=Zjqo
------END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
new file mode 100644
index 000000000000..46dacfb779ca
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
@@ -0,0 +1,173 @@
+# 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.8.ebuild,v 1.1 2014/10/04 11:29:20 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
+	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
+}