Revbump with 5.4+ support. Lightly tested and may be removed if it breaks since dev-db/drizzle needs help

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

5 files changed, 137 insertions, 41 deletions

diff --git a/dev-php/pecl-drizzle/ChangeLog b/dev-php/pecl-drizzle/ChangeLog
index 31a1dd006b78..c91ce23a38fb 100644
--- a/dev-php/pecl-drizzle/ChangeLog
+++ b/dev-php/pecl-drizzle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php/pecl-drizzle
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-drizzle/ChangeLog,v 1.6 2013/03/17 15:57:08 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-drizzle/ChangeLog,v 1.7 2015/02/17 01:07:11 grknight Exp $
+
+*pecl-drizzle-0.4.2-r3 (17 Feb 2015)
+
+  17 Feb 2015; Brian Evans <grknight@gentoo.org>
+  +files/pecl-drizzle-0.4.2-php54.patch, +pecl-drizzle-0.4.2-r3.ebuild,
+  -pecl-drizzle-0.4.2-r2.ebuild:
+  Revbump with 5.4+ support.  Lightly tested and may be removed if it breaks
+  since dev-db/drizzle needs help
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/dev-php/pecl-drizzle/Manifest b/dev-php/pecl-drizzle/Manifest
index 193cfead2016..2d28a06a1442 100644
--- a/dev-php/pecl-drizzle/Manifest
+++ b/dev-php/pecl-drizzle/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pecl-drizzle-0.4.2-php54.patch 2678 SHA256 2722bfa9f9e3fc2661bb5b1ccf1dc3d34adc144adac1745f564907b78e6e3e3a SHA512 7b27b4bd4b011d2fe6c9086eee0cbdaabd6c1bd50785ee8bcbb62c22c44b00254178095addefa1a9cbe8154f6d44b4f27dec44ddd28a2a5a4a733a46d55074e6 WHIRLPOOL 7fc94e7d0e1dfbe242e22c481277a8254a874b4fecdf15b6744e8019677d0c156f65b2b27e8cd2aeac2277e143b8b7d01982f84c4d2d8b171aa60afec96f3226
 DIST drizzle-0.4.2.tgz 24106 SHA256 5e9abd5200d840249003112e7d658eda06e2591e4c6bcf1c97194b4e274f0c66 SHA512 39b4d4fd7f68fba0c13e947c5b93179c3d7a4fd563b60c5ae9f7f175a095e16d2344a924cecd8c921892b33d7fe6cb4f95cfccbfbec40be14b1f46b534cba76e WHIRLPOOL 7ff5b373738a755a9ac90b5028eafa5f98a42bd47999e78fda3174c7361929d2d316b46fa28bfb4a2c5a0e370ce211895905605254b9d44999abf53881e138a0
-EBUILD pecl-drizzle-0.4.2-r2.ebuild 540 SHA256 1f21b02cb9fca390381747ab3e2af6b64e5e9ca0d5c8081d1be6b42ae7c84362 SHA512 b7de5eba9f3dcff7871dee86481091fad1a54ea67dd4758ca9db6cd318e39db365218e26ed03faa1c8c258046f4346725a031d178146b08483339ed533a0be6c WHIRLPOOL c3dd0b6a329829017714d566a650e81f396abbe267d41d1b37299ae4bada7732733095d8ae6950d1dc3c4ed30fd0fa04fdaa8e4f560e20536679d10246a16fe9
-MISC ChangeLog 1696 SHA256 db6c8d6a09dab1942afcd38d2b3a626ad0d741f6f511bd8a0a773509398215fa SHA512 dad719cb140b2c2a4e9279e18f3b0d19531d9ba1a1c0884557c4fc2010da043e45a4af91916cdabc31da12a55078a8d10f8aaa86e95f1bdba49b0270fc1d3d9f WHIRLPOOL f179cb6be014b26336082d053e1739fb1866b161f04c5849dff4928b2623b03093277acf5828e7478ab6891f8eaedb1555df85d7a65054b9ff3c4c5a96fd21ec
+EBUILD pecl-drizzle-0.4.2-r3.ebuild 833 SHA256 78ccc65ea8ac25653a479c8d35364c82779e30c0a02b1ac89d0a72b9c6d4bd1e SHA512 b56cc52260aa08f42a351f3b7b4af936376105da9b84e88c26b1520a8f0ddfe283d88d22b5edeabf011e30c5c196484da77bbc8751dd95b149791ca119cfc164 WHIRLPOOL 620ee5ae4ffd0fbd083d7636e0633fd33d1a8383fb1aaa1c1a1d4ee22fe553ce92081599485fc3290fbabd374417dd9b651aa2fd7fbe2a92e7780b87b3cedc9f
+MISC ChangeLog 2000 SHA256 e77f758256dee132002a55ebc3c6b19f3c508ac8c1aba88b81216954a44b6bd2 SHA512 812adf66c8d177ff0450160cb678c4440294cdf195a3239ae42a7df7bc84677aa969de011c4253d8a1ec30f19cbcc30d311362c397498428dc33a213908b8a74 WHIRLPOOL 8bf041112de6af6080a2a6a78b0d74706575857051987c1426c845fbe479f921e77d3dab8d1a6f73f2f9efd475fa66c5fbf7e36c88bb0d219ff268b21f19ad76
 MISC metadata.xml 393 SHA256 46c6560720d3c2505d0fe159bd082bdf654b55b05fff47af266dc9b322a5d10a SHA512 a24121fb2578871235fcdb3920446007d8f1c1a5ea2e6c48a40fd31ad2c0465fd4c3749427d3017fe7ea74bfe6aa5f784341a9bf27d5de34f610c912d33939ce WHIRLPOOL 659f4f30ac0a7ec8bd0dd8291a95539d1cd4abbb1270a6071c11d2d13d1f0e038b99955cdcf5421c876d4cae6eaa74eb232612751b610461bcd6ccfe9430d5de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJRRefVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88bx8P/iekpIGB+C1MbGtn4pAH1AlQ
-cR2aSDA/2OO4z8F5Eu8AsIZsiBPJsT2Ibi/En7w8gXsEKh8ly/xfnc9oSBLw2BBI
-a93P0t0fRyNkr9AtHT6t7dq6rPvL2ijR6zuwBSjV4vAUkkwZfAKlwm9QX/3QanVY
-AquyiZm2FyLA3FRaKV/no/UuRE4TLZpvUkAfu5SYRjuMEa3mJT9C0Fd1lEflu6gN
-bCe+aL34qKl6si73nUb+EwNQOQkxtXVHkkl1TsqnHDE86arSBD3FlSfi4+4fWfq4
-PYNmQMmZqLBKWna3GYKo6y5WpxfoXB8zTaaTPv/DGBIM8btTyvDlLhvwyT7+2Ynt
-br+s5DViMqVxev1yhfKO25SZwgtpmB20JmGk06wxHG4COwx+VPA5GFKE6y4iAGqp
-HJT6dPII7vqMO3v+zmSHaUccBGkQ4bELASv/VGBN1dgfsg125ph8X4Zn21TeOKpZ
-/0o89qbEq4v8gh1R/i42zDn/+MaHQOyJy0HOje8SG/AYemv5ERnuC51zzgnRSFKE
-NfW2hFPw1EuJdZzE8G/m3ArWxWX+OLp6MlctpJ/MuhXhgkKmvlqXZv9HFtaoJua6
-CyOvpBkIdjI3rVi+K+JFSroDGITnyckSydSRJoMdb6dDr+X+f1Q9exJieEytz5QI
-CXuS2cQ012iXj2+Lokj7
-=PQ5F
+iQJ8BAEBCABmBQJU4pRDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO21UkP/RIWTXZw6Tdqxi3fdqyJtg5m
+pf8lBuLtKjjLBqDBPggw6YEeeLYvuxsNGk+e0SXnvZmDn+O/IDNVHb7kirhzixl1
+CpIHFUl3F1RjLNmLMZnR4U7fVq/sUQDF6ybMbsOsb1Z4yRTId5b2gXoS5CzFdLyl
+hmlup0cN0KfDi//rlf49Kwhp7QCKqfVWQowaBK8s5HrhPZM5bGWuUp67wXYziuew
+QU2PpEQ7p4Tbmc8QMS+oEJjgpqwLput6OzZ7llnDR1L6vaYbHztz3cuckvgAs16z
+ib/gx7ibr6OXPcR8R92b19iO4oAcdp8W0mPhWxEIT8ZL7ZVuRm9lK/8maePbFsF7
++po7mJP2mDBL3LmluxbBVEotqvu5pcqKBsJqExdw9nGIB1fh0cYfwPlinJC1jd5t
+ibbOUwMmy7ll1U1BeHAk5CJYXGSgR4vKOdk/pjgrsJXFQxmtAJnyPoAJk1gBrI4U
+47p+ytkD0RQsmw7jFJl2bJT1ks/ibS3PXzvtr+wYBimUPyM2eM3FYxKPPtrtYLur
+vWmxT5LvEk15pF47BfQl7WGEV2k4cTuyU9CxCK5m5qhCJUl1iSYXm0ozQeRAP8oA
+O61usXVJrrSftuCK/E46dEN1ofPaAJGn1q/rwzyizJ6qlO+5MVYumP0Q4ZPst6he
+8ngx7+pw3sqFaU9Ogwz2
+=m6LB
 -----END PGP SIGNATURE-----
diff --git a/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch b/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch
new file mode 100644
index 000000000000..42c27103a67b
--- /dev/null
+++ b/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch
@@ -0,0 +1,73 @@
+diff -aurN drizzle-0.4.2.orig/php_drizzle.c drizzle-0.4.2/php_drizzle.c
+--- drizzle-0.4.2.orig/php_drizzle.c	1970-01-01 04:13:08.000000000 -0500
++++ drizzle-0.4.2/php_drizzle.c	2014-10-22 21:38:21.882838493 -0400
+@@ -1314,9 +1314,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ 	              (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
++#else
++	object_properties_init((zend_object*) &(obj->std), class_type);
++#endif
+ 
+ 	value.handle= zend_objects_store_put(obj,
+ 	                   (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -1582,9 +1586,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
++#else
++	object_properties_init((zend_object*) &(obj->std), class_type);
++#endif
+ 
+ 	obj->value.handle= zend_objects_store_put(obj,
+ 	                  (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -2505,9 +2513,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
++#else
++	object_properties_init((zend_object*) &(obj->std), class_type);
++#endif
+ 
+ 	obj->value.handle= zend_objects_store_put(obj,
+ 	               (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -3017,9 +3029,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(result->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(result->std.properties, &(class_type->default_properties),
+ 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
++#else
++	object_properties_init((zend_object*) &(result->std), class_type);
++#endif
+ 
+ 	value.handle= zend_objects_store_put(result,
+ 	              (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -3382,9 +3398,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
++#else
++	object_properties_init((zend_object*) &(obj->std), class_type);
++#endif
+ 
+ 	value.handle= zend_objects_store_put(obj,
+ 	             (zend_objects_store_dtor_t)zend_objects_destroy_object,
diff --git a/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r2.ebuild b/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r2.ebuild
deleted file mode 100644
index 524047e449c8..000000000000
--- a/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r2.ebuild,v 1.2 2012/08/23 15:59:13 olemarkus Exp $
-
-EAPI="4"
-
-PHP_EXT_NAME="drizzle"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="PHP extension using libdrizzle library to provide communcation with Drizzle and MySQL databases"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-db/drizzle"
-RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild b/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild
new file mode 100644
index 000000000000..1a3be8321f35
--- /dev/null
+++ b/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild,v 1.1 2015/02/17 01:07:11 grknight Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="drizzle"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php5-5 php5-4"
+
+inherit php-ext-pecl-r2 eutils
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="PHP extension using libdrizzle library to provide communcation with Drizzle and MySQL databases"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-db/drizzle"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local slot orig_s="${PHP_EXT_S}"
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		epatch "${FILESDIR}/${P}-php54.patch"
+		#Fix tests
+		mkdir ext || die
+		mv drizzle_*.phpt ext || die
+	done
+	php-ext-source-r2_src_prepare
+}