updated patch by Martin von Gagern <Martin.vGagern@gmx.net> (bug 215671), previous version missed some MagickWand-config calls. magickwand-1.0.7 should now really build with <imagemagick-6.3.8

Package-Manager: portage-2.1.5.4

3 files changed, 50 insertions, 7 deletions

diff --git a/dev-php5/magickwand/ChangeLog b/dev-php5/magickwand/ChangeLog
index 32780c586ea9..91cbc22adbfd 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.8 2008/06/09 15:33:53 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/magickwand/ChangeLog,v 1.9 2008/06/12 17:39:18 hoffie Exp $
+
+  12 Jun 2008; Christian Hoffmann <hoffie@gentoo.org>
+  files/imagemagick-pre-6.3.8-compat.patch:
+  updated patch by Martin von Gagern <Martin.vGagern@gmx.net> (bug 215671),
+  previous version missed some MagickWand-config calls. magickwand-1.0.7
+  should now really build with <imagemagick-6.3.8
 
   09 Jun 2008; Christian Hoffmann <hoffie@gentoo.org>
   +files/imagemagick-pre-6.3.8-compat.patch, magickwand-1.0.7.ebuild:
diff --git a/dev-php5/magickwand/Manifest b/dev-php5/magickwand/Manifest
index cfb5662c2761..b425e7a7fb3f 100644
--- a/dev-php5/magickwand/Manifest
+++ b/dev-php5/magickwand/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX imagemagick-pre-6.3.8-compat.patch 1497 RMD160 711c77a1f9060faee12c6495e1ed774361e5d91c SHA1 880484786cb8bb0f99439dddabd3e6c7159a5fe6 SHA256 66f2eabe7d300ae3c7f13bdbdf521954ebd19ff02adc93bb1e3801f1acd526d5
+AUX imagemagick-pre-6.3.8-compat.patch 2942 RMD160 dc8f6d7e8f89c3382b91ae99afde9536e8cd3209 SHA1 608e63ba6c623d69c4c11c176d5e655a833390b6 SHA256 4bb774a7a736872e75d3c18270542d9cc99976cef6a9fc352a22ed3bdce04bd3
 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 920 RMD160 4be3fa7a9968692dffb712dfed6d16372929f3b2 SHA1 5583ff1c7860877830be3d1aae9e64e9a36bb973 SHA256 547ca0501cf6b62e41c4f11062f43035a3c931f59d901e37ec478e1026aec637
-MISC ChangeLog 1529 RMD160 ce1b44f9dbc7b43d76fb06e45561d3653e647956 SHA1 40dc69004baa647713a6201ac31c0b0edaef1c4a SHA256 6f96f7ad490dd859b69971c56f2b51403011c9b3877d5ee8cca3a367a3905acd
+MISC ChangeLog 1827 RMD160 dd5db9b7e627444cb433b3d12bae80a113cc1a1b SHA1 dfb6b1b4099ec9c4ea6b97f9147bf2e6c6f45a40 SHA256 3aa9b70bfbf71a014de060a68844489297ba1b8ca2e9e8c9f15d5ef888bab68d
 MISC metadata.xml 365 RMD160 2ae9840e48e2a8b8215c6cecf476c82db66b2903 SHA1 9f693345dd22aec9e60620fe1b8edd1cf5f4b512 SHA256 810ca83f34b899f038662e4566d5d5d3c2dab49b9ed9d51ab02ae2d38aec9129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhNTWcACgkQV6E0EIywUuWRMACff9yJCs3sppbMPFBBXrFYtcp6
-RVUAnis7Gt59FlTTVduK3UMqasuQQZaV
-=tDyN
+iEYEARECAAYFAkhRX08ACgkQV6E0EIywUuU41QCff6fpsnrpud+RIHzbAw3PCorm
+oIYAoMeoVyUZZTT3xDOj65EzubBT3RyY
+=yBRq
 -----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
index 86679b72b180..b8634304ed15 100644
--- a/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch
+++ b/dev-php5/magickwand/files/imagemagick-pre-6.3.8-compat.patch
@@ -2,7 +2,44 @@
 # 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
++++ MagickWandForPHP-1.0.7/config.m4	2008-06-10 11:34:24.000000000 +0200
+@@ -3,30 +3,30 @@
+ 
+ if test $PHP_MAGICKWAND != "no"; then
+ 
+-    if test -r $PHP_MAGICKWAND/bin/MagickWand-config; then
++    if test -r $PHP_MAGICKWAND/bin/Wand-config; then
+         WAND_CONFIG_PATH=$PHP_MAGICKWAND/bin
+     else
+-        AC_MSG_CHECKING(MagickWand-config in default path)
++        AC_MSG_CHECKING(Wand-config in default path)
+ 
+         for i in /usr/local /usr;
+         do
+-            test -r $i/bin/MagickWand-config && WAND_CONFIG_PATH=$i/bin && break
++            test -r $i/bin/Wand-config && WAND_CONFIG_PATH=$i/bin && break
+         done
+ 
+         if test -z "$WAND_CONFIG_PATH"; then
+             for i in $PHP_MAGICKWAND /usr/local /usr;
+             do
+-                test -r $i/MagickWand-config && WAND_CONFIG_PATH=$i && break
++                test -r $i/Wand-config && WAND_CONFIG_PATH=$i && break
+             done
+         fi
+         if test -z "$WAND_CONFIG_PATH"; then
+-            AC_MSG_ERROR(Cannot locate configuration program MagickWand-config)
++            AC_MSG_ERROR(Cannot locate configuration program Wand-config)
+         else
+             AC_MSG_RESULT(found in $WAND_CONFIG_PATH)
+         fi
+     fi
+ 
+-		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
++		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`
+ 		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+ 
+ 
 @@ -34,7 +34,7 @@
  		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
  				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)