Fix broken glib version check that prevented conversion from .svg to .png wrt #468050 by Lars Wendler, Nikolaj Sjujskij and Andrian Nord

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

4 files changed, 187 insertions, 16 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 048f6e8b6ba9..a62fc8322854 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.510 2013/08/29 19:52:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.511 2013/08/31 19:17:05 ssuominen Exp $
+
+*imagemagick-6.8.6.8-r1 (31 Aug 2013)
+
+  31 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +files/imagemagick-6.8.6.8-broken_glib_version_check.patch.patch,
+  +imagemagick-6.8.6.8-r1.ebuild:
+  Fix broken glib version check that prevented conversion from .svg to .png wrt
+  #468050 by  Lars Wendler, Nikolaj Sjujskij and Andrian Nord
 
   29 Aug 2013; Agostino Sarubbo <ago@gentoo.org> imagemagick-6.8.6.8.ebuild:
   Stable for ia64, wrt bug #481146
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 35fba7c18a27..990e1f00da0d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX imagemagick-6.7.8.7-freetype.patch 1114 SHA256 fcdb9382eddab0ae73f115178296933b1c8705719b2c3c43ce8274441a4387e7 SHA512 86372988ab4ee7be8573d50f7dd5022f031cfdf1e3e6e478c99d155e9cbc251a0db7496c141931e2b08d3e5142169ef56b544b70449dc41cf3376ddaf99e8ec1 WHIRLPOOL 9eb6105540e49b35e13e4ae7863a8fb20bd7bd292c93bc29c4e9c6914b0fb92496b736276a5c7f926a2a1b755547b2ced6471e929d0ce95ff3a6aa81c91aba62
+AUX imagemagick-6.8.6.8-broken_glib_version_check.patch.patch 432 SHA256 e54f58f3a33625e04094c1809f51caf8263e9954a8bb1b30671fd82cfa2f8294 SHA512 9211b411879183902fea29eb225add7ec01172f90a048d26fbc7ee91d8ae18807b252fdc3c559f2c40c2c039ae7f3da1abdb5b81441e9333d0387260946d2eeb WHIRLPOOL e356777fa0585ae6d620ebe22c0e013d347ab1b9a6fca9aa400042d62af49efdbf07da899e2aca22607a5886da3e1e9cc3d5635b4d1ffc1827faf88ba1f756a9
 DIST ImageMagick-6.7.8-7.tar.xz 7830744 SHA256 593e09bec0e6def3f9d6d6b0f7970ddd37dd9420a1286ce27e3f4ba26b78f114 SHA512 76b30887a40e6c74006a0e17f848893901bf001d68b4bf4ab6f38bf3147bf8b1fffa7e0a3aca8acb46bd65c6489aee6f9c28606f43d46b00cf9be2b6a93290dc WHIRLPOOL 2b746348aa058e4c2ef1096c62254f7694d7cc32bb23ee36f8a6b9f8fbb4603a98c2d473d0656004d40923b124c9d882842fec700fbac4900eaba1a5a102164a
 DIST ImageMagick-6.8.6-1.tar.xz 7463396 SHA256 8cf52dafa7269f872b54394fa57f9b55cc2e9b4858b50b6a25999b6d4c9c4e03 SHA512 f4abcfa987eb7934c77730ea74a66ba3224e9fa2695d245166bb43b2704c6aea550c57f5e356ce6f92677e4577007c05bc41c61bd10f5a59a815240e30e4313c WHIRLPOOL b403c2247c0f0123faf17e1e8641d5a6fcd564205892e03f49e5a0ea7fac7dc5a067b9eee2c3e9d23d1513e659b5907e8f1dcfdcff5b357da97e6985b52acaf7
 DIST ImageMagick-6.8.6-8.tar.xz 7537236 SHA256 8ce81b1cbc6615bc634c9bdb539025957a299744323706c3d72c9a8bdc72ddbe SHA512 5ef4eda528afc1be24e9f157884f11def0f815b40c7a0df7917abed34e09806c63013504d8a79e6b246f9348e902f9ce0a803bb5f7009337a324befbb6bdaae1 WHIRLPOOL 2c88b5d6ca03440a1b890a32a119a3fe429e80a5021741b001188dbbfa902fcb7268c4d5369e36bbbbdad13adc835efcc0f69b3bcf65159eb20d485cfd64b136
 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 4436 SHA256 b74b4d74b86996bf833a2c9e783b013d2f239d84cb3dbd9510bb353dc637a187 SHA512 60b9bef895e4360a0a10238ad0abb35110bbc8c22dada9d599aea0c7a43d4ae9632bef174957b27d6598d418f4cdccba1c60c788c2fff3e7a2db9712f3ccdb92 WHIRLPOOL f7fac2b7831bb8d48f8670be8fbd0fcac15a6cb75bab0ee5c4b725262968696b42a564387cb2c87043900dac729477e334d0b81f5c9532db6fd17e6220c30fc7
 EBUILD imagemagick-6.8.6.8.ebuild 4350 SHA256 3ec754c9f3c8b67169efa2299bf0750702c667c3f66fc4fcb3914c949fc8308b SHA512 648bd84d331cb2f3e4a62d2ee235334ed3fd61c78276a7cc24279b9e3bf81e7e5f64216de0a691209755cc2814b88084c2a1ff20fc505ad8ae900e0c779f0b25 WHIRLPOOL f2301bee231429536b5dbf3a24d1a8efc0cfdeb66614a45dba37b1a263d661da1171265b786ad4cffbe708248d9e0755247c3e1320bb537091e72f46954ca66f
-MISC ChangeLog 75343 SHA256 cca56c6c47a7a5636d7226ddf84cd004345e6fbdaebd2b57702c25e9dfeebd1d SHA512 39ea6694992c36fe99e98f4fd4450dc36f7fd5b9bf8ca5d5412fbd64af7ef412e4009e46153cd448cbefbf26e6374d67a7692c067efb1b47d1e533c1e1d6ff59 WHIRLPOOL f26880c1e1c7f34c1fd1efdfa224e0d89609cde6640ac04af21a5bcd2dceba4abe2c59af6f8fdd356ebc6a1532dae0105cb47934767773efa2675715b627ff76
+MISC ChangeLog 75687 SHA256 2c67d2cb5f5a7c1e0365e8782cf73ac5ba180fb14afe64cc07f0273fa70628cb SHA512 a15f95981186227f12319abe1e6e9c4fde9aa19bdfca952b765da1b97a0a6e522ed422829a781a11cdb63de1733d57669e4cc6b1ca036d0f6b0ecce83802abf8 WHIRLPOOL 450850da6b5a81bbaee96ca8c525888cbe18af85996c8ed2ac515a77760318a3101195b7be7664b0f1ca1291a2dfbf6a69d7a1469c744a88f2b165afe1f859f3
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSH6WrAAoJELp701BxlEWf+AkP/RP9/yO9AijnWxarV/uu5EmQ
-JAava3rDA28exp3GsawD/lZx0aSEYq876BEIaV/FUs4OqnpZ0KPN/ll1hixYAs0O
-e9NzLoVGlGzU769dVG6hOj3v6mbV4zHnnKE0RI9j/exIfl4PscF4tFJpkPJ6yrrH
-kCJJ03cx6hBjrJ0WAKQZUt0Y5ioauJRJ1lIrmgCxlsI8MdJplcaAsCIodNHMusKN
-L8aNbgsC++yZWZjQeeoqOT+wpCDJuTHLYhh5G3I3TZIdlEkbmqil+3QT5cpPx2VU
-gAoQAJYlRJ12gCqwA6yKz3dtrKXtmMI9krWSq29Fio+QFpUutbZMlp5aaffcE/YL
-QAHPE8vvwT44kR22p34sUfo3PGy8H7Sd67mBktVtHu1xYeurb2pR3XXlIr4lJRmv
-bP0FIvpFU5TyMOTkllPB7Ehy88nZe75TKDGmsCo2wuneiVel2AXlI8BGWqWQoyes
-ABRbRWMabCHBqh/nuQLsXfcfXp1+hlzfyhcTqrzApiXMvE65miXdgyDM+2W74KxY
-JIW+e2wRcX02CGeLs7jNNYFzL/LHRW4bFd9xhLUUgc+PExH3vSxt/Jr+xkSF0aDi
-z1L4t5wI7sIWtCVi4TGhL96TKengxAYzNJPjnRZ5NeofkwxbK+wcIB30lF2VvbcW
-qLeqse+4ZX9PTG+Qw326
-=akX7
+iQEcBAEBCAAGBQJSIkEHAAoJEEdUh39IaPFNUeYH/0STztKmvC8VzNp+oe0rkM7s
+046aFo4MSqCeF4mjddwarSxWPG+pwT6+5vZo3XavOQadiBvVKJCHQIlDwfqv3/FI
+nk8dfVBP868MP4RX6XRr73gI1yikhEmXcugDRQYKDqApqpWfw+PV2/EuOmncTwBs
+p6TYWRkevjDAtGLH2V9erQCR6M3QTEnfMQ/7/wRRx2muU340Nmc68VljW393ia17
+WhCS7boNj71NkKkxFqi9Y53DmRL6pCn7222na/J//G1h9Mi560sSfLaL/j9Vx4Z2
+js3nM79ragYFc3G+i/u41Vn6HPLKInEIbwEjjYpSjVBWVMggJaETMY+ZJj+YRlc=
+=0P+d
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-6.8.6.8-broken_glib_version_check.patch.patch b/media-gfx/imagemagick/files/imagemagick-6.8.6.8-broken_glib_version_check.patch.patch
new file mode 100644
index 000000000000..0e994ddbbb07
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.8.6.8-broken_glib_version_check.patch.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/468050
+
+(Still broken at upstream ImageMagick 6.8.6-9, SVN 13087)
+
+--- coders/svg.c
++++ coders/svg.c
+@@ -3216,7 +3216,7 @@
+   (void) CopyMagickString(version,"XML " LIBXML_DOTTED_VERSION,MaxTextExtent);
+ #endif
+ #if defined(MAGICKCORE_RSVG_DELEGATE)
+-#if !GLIB_CHECK_VERSION(2,5,0)
++#if !GLIB_CHECK_VERSION(2,35,0)
+   g_type_init();
+ #endif
+   (void) FormatLocaleString(version,MaxTextExtent,"RSVG %d.%d.%d",
diff --git a/media-gfx/imagemagick/imagemagick-6.8.6.8-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.8.6.8-r1.ebuild
new file mode 100644
index 000000000000..02f4095490c9
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.8.6.8-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8-r1.ebuild,v 1.1 2013/08/31 19:17:05 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 ~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 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( media-libs/lcms:2 )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	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 )
+	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 "${FILESDIR}"/${P}-broken_glib_version_check.patch.patch #468050
+	elibtoolize # for Darwin modules
+}
+
+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 jp2) \
+		--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() {
+	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:=.*:='':" {} +
+}