fix bug #236643

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 i686

4 files changed, 30 insertions, 7 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 1756a8d3baa1..911086e24a15 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.301 2008/08/29 23:15:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.302 2008/09/22 16:58:13 maekke Exp $
+
+  22 Sep 2008; Markus Meier <maekke@gentoo.org>
+  +files/imagemagick-6.4.3.5-svg-dep.patch, imagemagick-6.4.3.5.ebuild:
+  fix bug #236643
 
 *imagemagick-6.4.3.5 (29 Aug 2008)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 63ced0b7be83..2bf4150f5cdd 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -10,6 +10,7 @@ AUX imagemagick-6.3.7.9-doc.patch 660 RMD160 cdd9e744d4708a2254c3949ee9fed20845c
 AUX imagemagick-6.3.8.3-hpgl.patch 1852 RMD160 b6a2b0d1ceacf58a41723e95683aaaee3c050df5 SHA1 05c916506e750811ed76a31542563ac00e3c66f2 SHA256 44321e3a899345d21144e6b4715aba024daf3ccffa96187465eccf74886b6711
 AUX imagemagick-6.3.9.8-hpgl.patch 1852 RMD160 fae8922c63f1c31786c6bbe629e80e399983c644 SHA1 5bfc687e4fc3d6c1621df9d3e292b687b21524df SHA256 18c4ccca1da491e5c496e489065c774287171ed1ee9c531610a1d770acd5543e
 AUX imagemagick-6.4.2.9-jbig.patch 877 RMD160 e7d9c5867d7ef07a1dd3811bcec873fbe2d078fb SHA1 88134e437698f4fbc21514381eb86e2bf8a14477 SHA256 bc3e8888f7418d2ad5b00f861a610eff62ed76b3b11009f4f5315b7666e1e11b
+AUX imagemagick-6.4.3.5-svg-dep.patch 827 RMD160 6bf56908c52781da623022a950858aa29fc1692f SHA1 2c968ef1f4444536d53c41a73581dcb618f1de0d SHA256 60238f1f0bef3f2a9cda7b9d1db0bc724a84264f3ec193afc74ad51863f90dad
 AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 SHA1 cb52a2281f2fa2930fe948e91619f5a012e2f8a0 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad
 DIST ImageMagick-6.3.3-8.tar.bz2 5633820 RMD160 fe9ad987909ae1364257de54463ff1f06240f8c8 SHA1 3a8593f0b5e5458647b3bc954e477eb925672f67 SHA256 e2b557f971fa5875647ad4c848025a095eb5784a4296d884ff162212eab8db4e
 DIST ImageMagick-6.3.4-4.tar.bz2 5796376 RMD160 519126459cd80e4c07f23aa21147d579fa4b7789 SHA1 117fd8552961149992c78c045d7de191f7692bb8 SHA256 bcaac2d9d416c055642b4f92b2c8057e5fed4f8d70703e423ad19b3662b096c3
@@ -26,13 +27,13 @@ EBUILD imagemagick-6.3.8.3-r1.ebuild 3941 RMD160 39c44253826f6e1ba33be5d9770360f
 EBUILD imagemagick-6.4.0.6.ebuild 3919 RMD160 6a493d4c07357433a518c78fbd853130a9d34b9d SHA1 d96f777bf2ab411ce001400163dde0fa06aa48ae SHA256 7e8c86b602c5db0cf3b5e041ef87299562c3e7d3460b67291e262338d7dee521
 EBUILD imagemagick-6.4.2.0.ebuild 4012 RMD160 d3ece0e1fc711f2db697a92404f43a9569271a10 SHA1 eeac6d941851735528d8e4d264e6b188357ccf92 SHA256 ebb34fb5553ebe0c0b430c159f1506d7e26f02fae0a645e249453fce58bf478d
 EBUILD imagemagick-6.4.2.9.ebuild 4497 RMD160 2d2c910c9ce20a90279d26f48a2666fc7c3b4142 SHA1 cd1b763bb9c0201c1e1321ccdf5da724daee16e7 SHA256 707da8d66bfa5d58c668b9eb7d6d61ea80669d2f2fe0a09a65193399e9006312
-EBUILD imagemagick-6.4.3.5.ebuild 4389 RMD160 43a44314f0041050715d7aa0a21edb5542c265cf SHA1 9e8d4c56357e38aff82d69c052c99f6264a58c31 SHA256 3a74c6cb3e617e4f3b761bd545f510f86f37cb3bdfbe024e3752e948a4c510e7
-MISC ChangeLog 45260 RMD160 1b61c2f4d6201dc823e96e663096ccf6b866cb10 SHA1 8e47ec765c359abf4f755c4bc63ca9baf5a4252f SHA256 53b6e9a929a2009a2fda211d85328c9cd51a5e88c98734656129c55b2440f4ad
+EBUILD imagemagick-6.4.3.5.ebuild 4461 RMD160 14417ca19bd27b3c2fd8e2f5219c25a11b141ea2 SHA1 c4a191214be5dfcca90e095218822d364c4f6da5 SHA256 4044d39cf555b202a02f9d46063adad1cd504e4b380db12b723ce83a3eb0d34a
+MISC ChangeLog 45399 RMD160 1f5f9f102ee652598e6d92496b77d418f24e6217 SHA1 0b641ddd82e7b956bd4afb5d368d6912526136e9 SHA256 94b3098f48554d6f89bd55ed3321829890e58c89393194462e7f173260d0c235
 MISC metadata.xml 660 RMD160 2627f5184f9f6c97783a9fa561cb82a6c5d52c3c SHA1 7e1487825756530fc7294e9e93cd297de66e1add SHA256 cd412dbd3f7b776a4d587099c805836a60ab430be941282064551e2810a7dc48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki4g2EACgkQkKaRLQcq0GJL1gCfU0wYkNP/thqnVOWTKlCoZRdR
-rKYAni3MmO27FbOb+2wsRh/qLotEyJyg
-=xwrP
+iEYEARECAAYFAkjXzvYACgkQkKaRLQcq0GIyMACdEASrGKN3AiQdUsDMclf0rpw5
+LnUAnikV1PBfBJCqth0qi1VLB8pqC/Cf
+=zjmO
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-6.4.3.5-svg-dep.patch b/media-gfx/imagemagick/files/imagemagick-6.4.3.5-svg-dep.patch
new file mode 100644
index 000000000000..2b6c401398fe
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.4.3.5-svg-dep.patch
@@ -0,0 +1,14 @@
+diff -ru ImageMagick-6.4.3.orig/Makefile.in ImageMagick-6.4.3/Makefile.in
+--- ImageMagick-6.4.3.orig/Makefile.in	2008-09-21 13:29:23.000000000 +0200
++++ ImageMagick-6.4.3/Makefile.in	2008-09-21 13:30:39.000000000 +0200
+@@ -980,8 +980,8 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(coders_sun_la_LDFLAGS) $(LDFLAGS) -o $@
+ @WITH_MODULES_TRUE@am_coders_sun_la_rpath = -rpath $(codersdir)
+-coders_svg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++coders_svg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_coders_svg_la_OBJECTS = coders/coders_svg_la-svg.lo
+ coders_svg_la_OBJECTS = $(am_coders_svg_la_OBJECTS)
diff --git a/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild b/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild
index 9acd95652818..aa3a7b280970 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild,v 1.1 2008/08/29 23:15:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.3.5.ebuild,v 1.2 2008/09/22 16:58:13 maekke Exp $
 
 inherit eutils multilib perl-app toolchain-funcs
 
@@ -73,6 +73,10 @@ src_unpack() {
 	sed -i -e \
 		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
 		"${S}"/configure || die
+
+	cd "${S}"
+	# for bug #236643
+	epatch "${FILESDIR}"/${P}-svg-dep.patch
 }
 
 src_compile() {