Fix php 5.4 support. Bug 409963

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 101 insertions, 3 deletions

diff --git a/dev-php/pecl-syck/ChangeLog b/dev-php/pecl-syck/ChangeLog
index 8cbf5012bb7c..7a75abeb2309 100644
--- a/dev-php/pecl-syck/ChangeLog
+++ b/dev-php/pecl-syck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-syck
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-syck/ChangeLog,v 1.1 2011/12/14 22:48:04 mabi Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-syck/ChangeLog,v 1.2 2012/08/02 11:47:14 olemarkus Exp $
+
+*pecl-syck-0.9.3-r2 (02 Aug 2012)
+
+  02 Aug 2012; Ole Markus With <olemarkus@gentoo.org>
+  +files/fix-php-5-4-support.patch, +pecl-syck-0.9.3-r2.ebuild:
+  Fix php 5.4 support. Bug 409963
 
   01 May 2011; Mark Loeser <halcy0n@gentoo.org> pecl-syck-0.9.3-r1.ebuild:
   Stable on ppc64
diff --git a/dev-php/pecl-syck/Manifest b/dev-php/pecl-syck/Manifest
index b616dd7fa2a8..f092ae644e18 100644
--- a/dev-php/pecl-syck/Manifest
+++ b/dev-php/pecl-syck/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fix-php-5-4-support.patch 2038 SHA256 8a221ac2dfbaf01a920c3f7c089cd0725d0a61fb4e8c9c8d3bdc55a8f83f6e01 SHA512 8c4bd02bd33f1d9a04b3a950203b3514bf257296806ba8ae3994103d6f5d9fa913437f34e8a49b5894760079417f3cf7303f2be7b454b2caf3bb9b2b34a04382 WHIRLPOOL 221dcfaa9615828aafa5e2d434b229a389a649be3b26505daf013046aa8ea156b10f08e7e5a13f1473fe2a6f512dfdd5f25385cba9edf9b55f2a4174fb82c5a1
 DIST syck-0.9.3.tgz 12407 SHA256 2ce1c34856cc8826d9e75f4b885636b109e06e9739146997354db4086a35cc43 SHA512 a19371f888184d154174be71fef020119938c193e6f880ed39ecae9bdb68b7f89b6d55a9a60cce0c586a6f71a4a6efe59ac0892e4d6be6bd94deb544d6bab5d6 WHIRLPOOL b4210be0a49ba1bb709b1999cf1d57a93a21220e0872fd8f8158ee2582de96d846917e4a5157fdc4527e598e7cc57585792dc75adb4a70048b41d8b794bf87fe
 EBUILD pecl-syck-0.9.3-r1.ebuild 593 SHA256 4e278bb03387ff84968790398b6a48284fb1939bf14818d036e3d77f727d0dc2 SHA512 adf203a535f4289e97ae9b16fb7393c1330af5f54bab8abf53bb68776ea56691e46be22df4f749b81ad82345a2ddbc157d73184aa756fe59b4cba70277e0d05a WHIRLPOOL b372877e2e6dfd7474c174f672159f3c0f909219bed09330b0bfb5762b8a7a3573fe47f118016887880ba046a488c0edb9648b3dc7650c29ba623283189fe13f
-MISC ChangeLog 4152 SHA256 884e35d0e42c86a4c01bb618b3d01b628c6117da9747bf7828e088abe7d7c2aa SHA512 8ae03d251ac77a6812cb2331809efb8ab163437ff132d20db6050f2fc97cab320b22df1c00b4743f32cf3ab84aec24a6382dcda7c7f2744f14c31661169e1469 WHIRLPOOL 2a08b80d5d6d4004b7f35d62c1b7c0188fa03c190d4b28245d0adb1379fcd18938bf4032bb459dbd8fbf2abcf0f4f6676c80364c1b99d32d0e69cf7e3b94ccbf
+EBUILD pecl-syck-0.9.3-r2.ebuild 805 SHA256 5d3d603f7d6776fefa3f511fbbfdaad1d8ddefa6969099e95a5b655b7ed0f726 SHA512 86a9442776039c43e1ec61e50f5123a73d728e1bf569f9cc247b5571927c771e48df3e5cbc90b04f981ecb605dc7b326520eefa2f100b89d484628ac68665680 WHIRLPOOL 4fd26c4eeafee785c7209e8fbbc576904bbfc97f11361d049de48eae821bce33a52937c84fa698d71aa0b55eaa89e64de153fce03c8ffb8f6da88eddafb4e75e
+MISC ChangeLog 4345 SHA256 23392eb0d4b23c674f5fe588f429bee98a642cbffc8fcc08832eef766ac1093b SHA512 b954601bd3f6bff2c526aa44607ebd59848bf24d8f0582678fb647b9a132dd67284357c3d791b338f60f5f41291388e100a3935fa7fd2b4ac35bebe41e73e0c4 WHIRLPOOL e8e285c165ed497d9bdfa778de1fc8ec170b55c2b676f6837df925368c49f676e9dba6512a5514679ec8a894f75e4cc511f8ed26e1d008b08f001b8f3e38eb0d
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQGmjKAAoJEGurSuXEqSv1aoQH/2T4+JnykJ2O/0VU+RY+AKTs
+NdUzsfX6QM1foDm2Q855RXfsql0eYKAyeDvG0vAEBc8Lk0ZI/M+9lbKcJ+Al33xq
+JqpqUdGYZv189MDjxbzaewrwMf/4zetvDCPmpNSPWCpczJzqgMKqAEXu9IDock5g
+kJZnc/ZYsaBOXDe9TqC+9w814/mTAykDsnN2ujD/UyMjOBG3otdLirbWpkLqtnsY
+8NIHoc68x9ZjjKd++oEGP+lIK5Jg/MUiLkPadiIkbQRp5dMqlb9l31SaZWEJ4ebB
+TgISJfln0CgdCU4cXacg1iGaiJ2pFoeLBwyCkfPpiPVcx2O7UtiT3aq1Dk352wk=
+=gLlB
+-----END PGP SIGNATURE-----
diff --git a/dev-php/pecl-syck/files/fix-php-5-4-support.patch b/dev-php/pecl-syck/files/fix-php-5-4-support.patch
new file mode 100644
index 000000000000..c88fe34ff59a
--- /dev/null
+++ b/dev-php/pecl-syck/files/fix-php-5-4-support.patch
@@ -0,0 +1,43 @@
+Gentooo bug 409963
+
+
+diff --git a/ext/php/phpext.c b/ext/php/phpext.c
+index a7d7500..c0b5646 100644
+--- a/ext/php/phpext.c
++++ b/ext/php/phpext.c
+@@ -198,7 +198,7 @@ static int psex_determine_array_type(HashTable *myht TSRMLS_DC) /* {{{ */
+ 
+ 
+ 
+-function_entry syck_functions[] = {
++zend_function_entry syck_functions[] = {
+ 	PHP_FE(syck_load, arginfo_syck_load)
+ 	PHP_FE(syck_dump, arginfo_syck_dump)
+ 	{NULL, NULL, NULL}	/* Must be the last line in syck_functions[] */
+@@ -403,7 +403,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
+ 
+ 				strncpy(classname, n->type_id + 12, classname_len + 1);
+ 
+-				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
++				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
+ 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
+ 					efree(classname);
+ 					break;
+@@ -439,7 +439,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
+ 
+ 				strncpy(classname, n->type_id + 11, classname_len + 1);
+ 
+-				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
++				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
+ 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
+ 					efree(classname);
+ 					break;
+@@ -511,7 +511,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n)
+ 
+ 				strncpy(classname, n->type_id + 10, classname_len + 1);
+ 
+-				if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {
++				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
+ 					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
+ 					efree(classname);
+ 					break;
diff --git a/dev-php/pecl-syck/pecl-syck-0.9.3-r2.ebuild b/dev-php/pecl-syck/pecl-syck-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..dd039acb10e3
--- /dev/null
+++ b/dev-php/pecl-syck/pecl-syck-0.9.3-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-syck/pecl-syck-0.9.3-r2.ebuild,v 1.1 2012/08/02 11:47:14 olemarkus Exp $
+
+EAPI="4"
+
+PHP_EXT_NAME="syck"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="CHANGELOG TODO"
+
+USE_PHP="php5-4 php5-3"
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP bindings for Syck - reads and writes YAML with it."
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/syck
+		|| ( <dev-lang/php-5.3.1[hash,spl] >=dev-lang/php-5.3.1[hash] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		epatch "${FILESDIR}"/fix-php-5-4-support.patch
+	done
+	php-ext-source-r2_src_prepare
+}