Improve support for openjpeg-2.1.0 with conditional patching for now as a temporary solution; will go away with next ebuild.

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

3 files changed, 27 insertions, 21 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 4859f4519ea4..7d928b398fd6 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # 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.555 2014/05/14 17:04:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.556 2014/05/14 17:13:30 ssuominen Exp $
+
+  14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  imagemagick-6.8.8.10-r1.ebuild:
+  Improve support for openjpeg-2.1.0 with conditional patching for now as a
+  temporary solution; will go away with next ebuild.
 
   14 May 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 54feb55d4a1b..65feefde6108 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -4,18 +4,18 @@ 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
-EBUILD imagemagick-6.8.8.10-r1.ebuild 5002 SHA256 39f174917c892c4c4b4de2887afa7152b6aa25d8732bde88f76c574ae64607e6 SHA512 b04d2af4e27fb4b9f26e733f4059fd1718baa276d11d933b941621d9b42d41ba326e3a28da5103d8d4d3aebc8d036fac6de72f1f6b01f0f0575285d2e30ba4d1 WHIRLPOOL 7bcd5a992b8f7ef7571cb077cda95e949248fbbfc7c1bd9701cb5a94830de1bcd6ee052ab3bbe4e36ddb19dce84939da21c93de14b84ea21a51974024f0f81d8
+EBUILD imagemagick-6.8.8.10-r1.ebuild 5064 SHA256 ec7eff91d78ec883e36d54e05b367f3eaca926db693bd782db0925d625912092 SHA512 3f8fcfb21a233efb78a0411540cf6d50bdda999a272ac02855cd1ec5d9d1d48da4dc528b94db851fe6a708daeeb32f4682d92b2d888fad368cd942f389dba3df WHIRLPOOL 7e682b7e8f9d39a7c475502227d3950008b0d895254b7a9a99871e03dd2791d37e36b6462922adc9d9d13f54cd0c92f0399787cfc9e95445798cff8fc8cc044c
 EBUILD imagemagick-6.8.8.10.ebuild 4850 SHA256 305ab6d1d3479a1c3f67b91df05057dc538715a322a650d5e654b56646677f72 SHA512 4d9b4581183135f572187226d347edf1ea093056aa569d1fed2b9765171c40225684bac5bc82ce1569ecc49dbaaae8fbfbd41b7443d3cad3ff22611969a5a9f7 WHIRLPOOL 38ea8b35def8250e784e3441c862da91c30a3eecddd0e5f9c4facd7b9448f48f129a4ce62a1b3d96b393254da08e31c8cfbd480cb8758c3997f5434ec31ebd3a
-MISC ChangeLog 81904 SHA256 d4656eb25e436a2e2e93720faa6a47c6b2b82a360fd0466b38398562ce860fbd SHA512 fab1e83bf8bef75fbaca3729fe0279038ec899c9ed014247eccf2423a89bb2abc84fe4699c55e46e50a472666ce506704bf011bf2073ce47ef6908cf446f718e WHIRLPOOL 06bdb73e7f7f5d67f030ede3ee256bdc28bfd3b544a1df045b9a9bae1ffdaec5c93849c90f36ea8ec3894df095a75e1a644b22ac01b8170502fa6bae12b11e8d
+MISC ChangeLog 82122 SHA256 fcd221a66edaefc131394384bdd2820693e3d9e1cb116855fbf873c5791bc3fd SHA512 266001e9900f8abc4405f945d0d48be7504727239a251b68d9a4de90958024d411a35b329559ea64bd63f46103b871382ed784a9b66d9e606ff7a252690fc1c6 WHIRLPOOL 1c13247a8168a32ad46b074ea576ad18097e9bb1c6e354dafcf37d9c8d7d8f3e846cb22efa0db534209b83f0dafff1d60694caf8dda098a82acaf6d787fdc74b
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTc6H2AAoJEEdUh39IaPFNI5QH/2dOx/uv27j12Eiq9EZFHHqh
-vdIzMhAyDB1r2vAtwnRCSO2kd4Imaz/vSJ9CYCR+4qnRSc/oYObT0hTFmLKEa7O0
-q4HB9eteT2Z4ynZldNIR8xxgFrBPVJfh+49iy8uY/MCfWqlWQKqdCA5KCIRBBPUW
-3m3GC6FKtrRd9fvptfPkDxd5N/NhFIn0kLuuHysAqSoNB7NICCldYmyijmZd79JL
-RHSdoHSz3ayT8+GNIwOIpR5rWOAvFMKSdKfRM43/CIZZcFkmZv2JeW1y27a7Z34i
-bVXJe8P0trMMGaroeHCC5EEQ8HAUk6bU8d+/gIRsxgeyTIKNRp/djuVK3ESh1lk=
-=2HRb
+iQEcBAEBCAAGBQJTc6P8AAoJEEdUh39IaPFNF4UH/1rg2w1tFnxPPZQJ6wCf2Fs9
+rBUj52D24Je43YMGyFWDxbp1X/IuLzNHQk9f3N6xhf8kJSHx7A1sbW7F52ZChTbt
+EerMFkbYnrnHKWx+9fWQQJw3b7qGAdTiS/SFNxJAX067YYyjvhEWWobHmmS0tifa
+14Lw/io9nf7Px4tFxRjsJM8hAUxK42xEgcV9dRC9ZccBkuE7PLud1md1FpOsTuXZ
+PnZmYMON4NF82K1gZokI+62CX/eAGdQCsHhVO/EoswHbVv+I1k3kcfHWzD2p0Qrc
+mtrI524srpG40SW0f5K0G/spZldFrz08uFSyI5/bMkUI2lRKjhvGHIsEALdRItQ=
+=90pQ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
index c6f12bcd5538..6295dc45b370 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.10-r1.ebuild,v 1.2 2014/05/14 17:04:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.3 2014/05/14 17:13:30 ssuominen Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -27,10 +27,10 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	fontconfig? ( media-libs/fontconfig )
 	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
 	graphviz? ( media-gfx/graphviz )
-	jbig? ( media-libs/jbigkit )
+	jbig? ( >=media-libs/jbigkit-2:= )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2 )
-	lcms? ( media-libs/lcms:2 )
+	jpeg2k? ( >=media-libs/openjpeg-2.0.0:2 )
+	lcms? ( media-libs/lcms:2= )
 	lqr? ( media-libs/liblqr )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
@@ -40,7 +40,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	postscript? ( app-text/ghostscript-gpl )
 	raw? ( media-gfx/ufraw )
 	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0 )
+	tiff? ( media-libs/tiff:0= )
 	truetype? (
 		media-fonts/urw-fonts
 		>=media-libs/freetype-2
@@ -53,9 +53,9 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 		x11-libs/libXext
 		x11-libs/libXt
 		)
-	xml? ( dev-libs/libxml2 )
+	xml? ( dev-libs/libxml2:= )
 	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib:= )"
 DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
 	virtual/pkgconfig
@@ -67,10 +67,11 @@ REQUIRED_USE="corefonts? ( truetype )
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	# These both have been accepted by upstream, remove once 6.9.0-0 is out:
-	epatch \
-		"${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch \
-		"${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
+	# These both have been accepted by upstream:
+	if use jpeg2k && has_version '<media-libs/openjpeg-2.1.0'; then
+		epatch "${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch
+	fi
+	epatch "${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
 
 	epatch_user