Fix building against newer imagemagick. Bug 466118

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xC4A92BF5

4 files changed, 44 insertions, 14 deletions

diff --git a/dev-php/pecl-imagick/ChangeLog b/dev-php/pecl-imagick/ChangeLog
index 3f259b305dc5..62176b00c69e 100644
--- a/dev-php/pecl-imagick/ChangeLog
+++ b/dev-php/pecl-imagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/pecl-imagick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/ChangeLog,v 1.5 2013/03/05 11:19:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/ChangeLog,v 1.6 2013/04/17 10:51:17 olemarkus Exp $
+
+  17 Apr 2013; Ole Markus With <olemarkus@gentoo.org>
+  +files/remove-header-check.patch, pecl-imagick-3.1.0_rc2.ebuild:
+  Fix building against newer imagemagick. Bug 466118
 
   05 Mar 2013; Ole Markus With <olemarkus@gentoo.org>
   -pecl-imagick-3.0.0-r1.ebuild, -pecl-imagick-3.1.0_rc1.ebuild,
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index e88c4b9d8782..ad92059dca0c 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX remove-header-check.patch 561 SHA256 87463f938e7614cd44cd82b1fb73729a2a9670ee0f542c74f69ae54b524c67da SHA512 de8d6931a19997133ea9d4f41dbafcb472eb7bfd752e731d5e92a16a01bd7b4260689d90650613a3e9c6bd5796169a57c6e3d07c6dcc78a50a1dbd8d27a38c31 WHIRLPOOL 7d3fcd5ac5a85fc9cd36fc21df92b5dc910e5cb60961d3e2c82aea77ef692836572ef151d18730497b506fcd8e740ca0eba12fe3ca3e8b758459bf2abe2f51ca
 DIST imagick-3.0.1.tgz 93920 SHA256 1dbc69a254d89bc919b6bac3a7e47674457384963557e34256718cc522342966 SHA512 a8a9872662a8657a91dec793e8dd86ea492fa523f362cc9489f73b5f5f666872db95a929259dfde32b5370133fa4672b39007b08a7fec32be6a462873d7e6a4c WHIRLPOOL e73ec865c2c437168b05186b4a30618660b56cc96b3bbee2a4bb3bc84d9a7e34887b4dcdac378e1d7c325b612b0767249ad07e2581ce8b459d7b0137bcdf8719
 DIST imagick-3.1.0RC2.tgz 93264 SHA256 0dbb7e5df61845f8eab68505711b9efcdc98cfaff96dcb982c7f8931dd9e8a31 SHA512 68d51e521f9a3d7e2a71247d7a03e821d8e2b6f9b20fddcdbac8dc40be6d236557580bfd7fb51d8bd2a0aafd5a70c71dee9e0414ec7cd06e9649c0f8898e1e5b WHIRLPOOL 99b845dc9fc78e3469eaf57c19ddcb4bbfe04e790cd6df87859e2795748b085e4f60e21cae565c94a631ce449f9161371e81cd72610522f8f16f799de2920abe
 EBUILD pecl-imagick-3.0.1-r1.ebuild 711 SHA256 f70f4c810bcbcf702cbb8ac75c78346e1ea6834888199d0c958e76628229b213 SHA512 f9877eb86429b983988068f667b97890055347420eb5c7570eca8cbee4e50e13119e51e517b89ccfafc83c85b856a89278f8b70d743f2e15863ad11760b6e6dc WHIRLPOOL e81768d18f5ed48fd558db8c42418aba29c5131325a2d515e26df70c5665801c7d1bfd5c4a1ad88b5980b8441670b101ade87d0f5d4a282d3d630ff61d7676b8
-EBUILD pecl-imagick-3.1.0_rc2.ebuild 763 SHA256 ce8297ad8e9291117bb4747a558e8fc8a96f408c56d7b27093115f8a631dfe7a SHA512 199195f3aeae80f2b2b61e081162bee0507b5e697cf8408c01d35bf0878a87a120e44268e7c4ecb119ddcff9f5e9dd7a5716b4baeae72475153cf2457562d2d6 WHIRLPOOL 8528a5fd2fbf5905cf421fa03cb769534bfc68c755050eab7fcf46f88da6a5e44fa0629d9bbf7c0c1f6107ad4b0eab9fc87edbe2350aa73820499f76d90d5628
-MISC ChangeLog 6544 SHA256 eab53e8f9b4cff52af604a6ea18185f97be147deb03ba702494df6b7ec16c6b7 SHA512 26fe4bd7ca72f1ecacfba962e2f907195029f3b0b9fd7d73de473911db1d4f4406c49453a204b190424c5f78d8687b1ff59fbed214337c2b2bc22f882235c1ea WHIRLPOOL b9bf32c52459d9832305a6ffe11ea0d94a936669e955e9442e9350dd5c1b128c0f6dfa5f73def94622c9eb9d35f86e5b0faad294162bc71689e126172bfa82ba
+EBUILD pecl-imagick-3.1.0_rc2.ebuild 972 SHA256 86c42323146ef5d5a08e7495bc81d83ea9ba6fc2cda3277723d040f141377eb4 SHA512 48d768c7ac37ed2c8128ac9e83137b106b8c0725d3fc44325b92b74b0c90df37ef370be8d8c6a59db05461976410be08045b0b4bce254b55fa9fba63eaaa3e3c WHIRLPOOL 88be70de1ec5508e198239d505f231a04821f4cd8c8ad73e5b63e37b5acb5e9808e59f3ced19c70fb95034412168e2093164336e28ca4ce211202a74b9e204d0
+MISC ChangeLog 6719 SHA256 0c4419b7660e3abd872ee423366180a064cafa432026acc7f22c662b3894df8f SHA512 563f7562811a92b4619bf5b66730b3aea39d30ad59e9ee8563cc10221d048cdb85c6eb170d168b7e91436ab27af66f2b6b5f79369ca9699346181c3223800708 WHIRLPOOL dd5a55f7b9899c3545cde9886d6938d5cd3d2b7f4f24f3c46461732f6770733629ffe08c805944bb095fdfcb5e0f0ae65907da368669dde79b919bde7722f8c0
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRNdTLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRbn6mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1FxgH/3UwoqezwYmG/OaV18ltYfDf
-1tvG8uVT/xFbGhmBYqEpuNU/pjNSJkpe38qjhTEFbUbprL5zQNY7Q4+SoqKyl4ac
-0EKkmb8O9KQ2HROUmycUwl/81T7b05FRE7EyQ2G1HeQjX2cNIIytZgGL3Z66es6K
-2fgtgGOTgj1muKYiAoWHhu0iEZzvZ6M01BUo7bWOvTVpeMhj4oDLux3uLzUe/WyZ
-L+fpO/s+eUpc+Dgs09wIcVleXb8UOUs3B7qhSMESlN4tm6hLMRj5PExwFyJHgq89
-TabwkgzPcqle7HVLmR9kTbbQBhwLalLz6KY4209593EVrRvjVXcA4e7onecBLLs=
-=yZw/
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1MaoH/3aOqEkGirDFt6vGb+ieFf6Q
+wPVbJTRjeQ9fz46tzkbIaGaqPbCps5eTS1P8BTF3CMrPmNoeNox/UAE8InBJELdU
+DoAT14kAhvOoosOuqB3WeDn7mRpz6j/QV9O7vDoEvw63QtbDVEZcwZEEW2nDEeVC
+30APxr6UV552k/TBj1ga6TUo7oLXai7qzKkrU9Lh3f+uxKYyUIGX9P37k8jxZL57
+8PkpK1/JItws/1I7iKkMgDjj4bvkIGSBeZRMsZ5+4NVfWbz106vJ5miT6I9Imd6Y
+PABf7QzRj9XdNJUXssXxIEktp3gKBHyHTzMPfP5zfuawT4PLNUec9LvH5Iqgszk=
+=Pnnj
 -----END PGP SIGNATURE-----
diff --git a/dev-php/pecl-imagick/files/remove-header-check.patch b/dev-php/pecl-imagick/files/remove-header-check.patch
new file mode 100644
index 000000000000..94fbf472d1fb
--- /dev/null
+++ b/dev-php/pecl-imagick/files/remove-header-check.patch
@@ -0,0 +1,16 @@
+--- config.m4	2012-05-30 22:21:12.000000000 +0200
++++ config.m4	2013-04-17 11:47:27.753015522 +0200
+@@ -50,13 +50,6 @@
+   		AC_MSG_ERROR(Cannot locate header file magick-wand.h)
+     fi	
+   else	
+-    AC_MSG_CHECKING(for MagickWand.h header file)
+-
+-    if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
+-      AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h)
+-    else
+-      AC_MSG_ERROR(Cannot locate header file MagickWand.h)
+-    fi
+     AC_DEFINE(IMAGICK_USE_NEW_HEADER,1,[ ])
+     PHP_IMAGICK_USE_NEW_HEADER=1
+   fi
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild
index 700ef9a42de6..e20763000429 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild,v 1.1 2012/08/01 11:01:33 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-imagick/pecl-imagick-3.1.0_rc2.ebuild,v 1.2 2013/04/17 10:51:17 olemarkus Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ PECL_PKG_V="${PECL_PKG}-${MY_PV}"
 FILENAME="${PECL_PKG_V}.tgz"
 S="${WORKDIR}/${PECL_PKG_V}"
 
-USE_PHP="php5-3 php5-4"
+USE_PHP="php5-5 php5-3 php5-4"
 
 inherit php-ext-pecl-r2
 
@@ -32,3 +32,12 @@ RDEPEND="${DEPEND}"
 SRC_URI="http://pecl.php.net/get/${FILENAME}"
 
 my_conf="--with-imagick=/usr"
+
+src_prepare() {
+    local slot
+    for slot in $(php_get_slots) ; do
+        cd "${WORKDIR}/${slot}"
+        epatch "${FILESDIR}/remove-header-check.patch"
+    done
+    php-ext-source-r2_src_prepare
+}