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

(Portage version: 2.1.5.4)

3 files changed, 51 insertions, 3 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/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