adding patch by Martin von Gagern <Martin.vGagern@gmx.net> (bug 215671) to allow for building against <imagemagick-6.3.8 again and adjust *DEPEND accordingly

Package-Manager: portage-2.1.5.4

4 files changed, 57 insertions, 8 deletions

diff --git a/dev-php5/magickwand/ChangeLog b/dev-php5/magickwand/ChangeLog
index 9294763b08b7..32780c586ea9 100644
--- a/dev-php5/magickwand/ChangeLog
+++ b/dev-php5/magickwand/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/magickwand
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/ChangeLog,v 1.7 2008/06/08 13:31:32 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/ChangeLog,v 1.8 2008/06/09 15:33:53 hoffie Exp $
+
+  09 Jun 2008; Christian Hoffmann <hoffie@gentoo.org>
+  +files/imagemagick-pre-6.3.8-compat.patch, magickwand-1.0.7.ebuild:
+  adding patch by Martin von Gagern <Martin.vGagern@gmx.net> (bug 215671) to
+  allow for building against <imagemagick-6.3.8 again and adjust *DEPEND
+  accordingly
 
   08 Jun 2008; Christian Hoffmann <hoffie@gentoo.org>
   magickwand-1.0.7.ebuild:
diff --git a/dev-php5/magickwand/Manifest b/dev-php5/magickwand/Manifest
index 080632e848ea..cfb5662c2761 100644
--- a/dev-php5/magickwand/Manifest
+++ b/dev-php5/magickwand/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX imagemagick-pre-6.3.8-compat.patch 1497 RMD160 711c77a1f9060faee12c6495e1ed774361e5d91c SHA1 880484786cb8bb0f99439dddabd3e6c7159a5fe6 SHA256 66f2eabe7d300ae3c7f13bdbdf521954ebd19ff02adc93bb1e3801f1acd526d5
 DIST MagickWandForPHP-1.0.6.tar.bz2 61801 RMD160 766613bbaa3314b011de0018b004f01b2affa035 SHA1 eb87c6653e5115a94c4230f67be8706753902486 SHA256 b2418624749ad3db5b3088b1a9f450afffb0458c7ee41a556041eee1a674d487
 DIST MagickWandForPHP-1.0.7.tar.bz2 61920 RMD160 ae59c9995af9cce6816496e5631ecc8efaa500c6 SHA1 e06bb5e35b6eb1f55bbae51d39d4a4bd1b675195 SHA256 69de5a16afac6305e0fed3564ca58d40f53b844992341c92953ffc12b2d015c6
 EBUILD magickwand-1.0.6.ebuild 796 RMD160 a249ecfbb0961dde9aebf6afad5d261fa0dce1d9 SHA1 1dac48c36a37b79f98e0242e5a9d27612164d24b SHA256 a35e26a7105eee1431cd89b887f04bda96c89a239f1d445a7de747aa7517c134
-EBUILD magickwand-1.0.7.ebuild 795 RMD160 6305e5f18373ebce80d8da0e4ffda16fb9f83c05 SHA1 124e5ed3c7ba8b919047021aa1f44b57884daf2c SHA256 b7894150e76fd3bd1d5a4e22435e56689903579e12a00c495adfea42c9d0a861
-MISC ChangeLog 1240 RMD160 3a0fb5c236de25777e008e061460c13c08df5eb8 SHA1 82a91e4502ece77c883754025272846e55fbbae3 SHA256 f10292f36b9755a9bbc0a626c08afbd303c8cc1aa789fdb1903c286200e396a8
+EBUILD magickwand-1.0.7.ebuild 920 RMD160 4be3fa7a9968692dffb712dfed6d16372929f3b2 SHA1 5583ff1c7860877830be3d1aae9e64e9a36bb973 SHA256 547ca0501cf6b62e41c4f11062f43035a3c931f59d901e37ec478e1026aec637
+MISC ChangeLog 1529 RMD160 ce1b44f9dbc7b43d76fb06e45561d3653e647956 SHA1 40dc69004baa647713a6201ac31c0b0edaef1c4a SHA256 6f96f7ad490dd859b69971c56f2b51403011c9b3877d5ee8cca3a367a3905acd
 MISC metadata.xml 365 RMD160 2ae9840e48e2a8b8215c6cecf476c82db66b2903 SHA1 9f693345dd22aec9e60620fe1b8edd1cf5f4b512 SHA256 810ca83f34b899f038662e4566d5d5d3c2dab49b9ed9d51ab02ae2d38aec9129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhL3z0ACgkQV6E0EIywUuUzZACeKvYIRS8bVaaoS71bp/WgqYQ5
-O9MAoLRrRQEU37vcPfHbOURyOkyBwjr0
-=Zpig
+iEYEARECAAYFAkhNTWcACgkQV6E0EIywUuWRMACff9yJCs3sppbMPFBBXrFYtcp6
+RVUAnis7Gt59FlTTVduK3UMqasuQQZaV
+=tDyN
 -----END PGP SIGNATURE-----
diff --git a/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch b/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch
new file mode 100644
index 000000000000..86679b72b180
--- /dev/null
+++ b/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch
@@ -0,0 +1,35 @@
+# allow usage of <imagemagick-6.3.8, bug 215671
+# patch by Martin von Gagern <Martin.vGagern@gmx.net>
+
+--- MagickWandForPHP-1.0.7-1/config.m4	2008-04-13 19:30:55.000000000 +0200
++++ MagickWandForPHP-1.0.7/config.m4	2008-06-09 17:08:03.000000000 +0200
+@@ -34,7 +34,7 @@
+ 		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
+ 				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
+ 		else
+-				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.8 to use MagickWand for PHP.)
++				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.5 to use MagickWand for PHP.)
+ 		fi
+ 
+ 		AC_MSG_CHECKING(if PHP version is at least 4.1.3)
+@@ -63,16 +63,13 @@
+ 
+ 		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
+ 
+-		PHP_ADD_LIBRARY_WITH_PATH(MagickCore, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
+-		PHP_ADD_LIBRARY_WITH_PATH(MagickWand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
+-		PHP_ADD_INCLUDE($WAND_DIR/include/ImageMagick)
+-		AC_MSG_CHECKING(MagickWand-config --cppflags)
+-		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/MagickWand-config --cppflags`"
++		AC_MSG_CHECKING(Wand-config --cppflags)
++		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
+ 		AC_MSG_RESULT($WAND_CPPFLAGS)
+ 		PHP_EVAL_INCLINE($WAND_CPPFLAGS)
+ 
+-		AC_MSG_CHECKING(MagickWand-config --libs)
+-		WAND_LIBS="`$WAND_CONFIG_PATH/MagickWand-config --libs`"
++		AC_MSG_CHECKING(Wand-config --libs)
++		WAND_LIBS="`$WAND_CONFIG_PATH/Wand-config --libs`"
+ 		AC_MSG_RESULT($WAND_LIBS)
+ 		PHP_EVAL_LIBLINE($WAND_LIBS, MAGICKWAND_SHARED_LIBADD)
+ 
diff --git a/dev-php5/magickwand/magickwand-1.0.7.ebuild b/dev-php5/magickwand/magickwand-1.0.7.ebuild
index 99b469613c06..3f08050a78ca 100644
--- a/dev-php5/magickwand/magickwand-1.0.7.ebuild
+++ b/dev-php5/magickwand/magickwand-1.0.7.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/dev-php5/magickwand/magickwand-1.0.7.ebuild,v 1.2 2008/06/08 13:31:32 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/magickwand-1.0.7.ebuild,v 1.3 2008/06/09 15:33:53 hoffie Exp $
 
 PHP_EXT_NAME="magickwand"
 PHP_EXT_ZENDEXT="no"
@@ -18,13 +18,20 @@ LICENSE="MagickWand"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=media-gfx/imagemagick-6.3.9.7"
+DEPEND=">=media-gfx/imagemagick-6.3.5.9"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 need_php_by_category
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/imagemagick-pre-6.3.8-compat.patch
+	php-ext-source-r1_phpize
+}
+
 src_install() {
 	php-ext-source-r1_src_install