add patch to make adodb-ext compatible with php-5.3 (patch taken from http://github.com/wojo/adodb-ext)

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 78 insertions, 2 deletions

diff --git a/dev-php5/adodb-ext/ChangeLog b/dev-php5/adodb-ext/ChangeLog
index 260b77db16a3..74b8ced82e75 100644
--- a/dev-php5/adodb-ext/ChangeLog
+++ b/dev-php5/adodb-ext/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/adodb-ext
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/adodb-ext/ChangeLog,v 1.4 2007/03/08 18:51:15 chtekk Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/adodb-ext/ChangeLog,v 1.5 2010/09/11 12:45:53 mabi Exp $
+
+*adodb-ext-504-r1 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org> +files/php53.patch,
+  +adodb-ext-504-r1.ebuild:
+  add patch to make adodb-ext compatible with php-5.3 (patch taken from
+  http://github.com/wojo/adodb-ext)
 
 *adodb-ext-504 (08 Mar 2007)
 
diff --git a/dev-php5/adodb-ext/adodb-ext-504-r1.ebuild b/dev-php5/adodb-ext/adodb-ext-504-r1.ebuild
new file mode 100644
index 000000000000..567943284c5f
--- /dev/null
+++ b/dev-php5/adodb-ext/adodb-ext-504-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/adodb-ext/adodb-ext-504-r1.ebuild,v 1.1 2010/09/11 12:45:53 mabi Exp $
+
+EAPI="2"
+
+PHP_EXT_NAME="adodb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+inherit eutils php-ext-source-r1
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension providing up to 100% speedup by replacing parts of ADOdb with C code."
+HOMEPAGE="http://adodb.sourceforge.net/"
+SRC_URI="http://phplens.com/lens/dl/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-php/adodb-4.70"
+DEPEND="${RDEPEND}
+		app-arch/unzip"
+
+S="${WORKDIR}/adodb-${PV}"
+
+need_php_by_category
+
+src_prepare() {
+	edos2unix "${S}/adodb.c"
+	epatch "${FILESDIR}/php53.patch"
+}
+
+src_install() {
+	php-ext-source-r1_src_install
+
+	dodir "${PHP_EXT_SHARED_DIR}"
+	insinto "${PHP_EXT_SHARED_DIR}"
+	doins test-adodb.php
+
+	dodoc-php CREDITS README.txt
+}
diff --git a/dev-php5/adodb-ext/files/php53.patch b/dev-php5/adodb-ext/files/php53.patch
new file mode 100644
index 000000000000..9b51e3001807
--- /dev/null
+++ b/dev-php5/adodb-ext/files/php53.patch
@@ -0,0 +1,26 @@
+diff --git a/adodb.c b/adodb.c
+index 3afc443..6e3bf95 100644
+--- a/adodb.c
++++ b/adodb.c
+@@ -159,11 +159,7 @@ static zval adodb_zvals[5];
+ 
+ static void adodb_init_zval(zval *v, char *s)
+ {
+-	v->type = IS_STRING;
+-	v->value.str.val = s;
+-	v->value.str.len = strlen(s);
+-	v->is_ref = 0;
+-	v->refcount = 1;
++	ZVAL_STRING(v, s, 0);
+ }
+ 
+ /* {{{ PHP_MINIT_FUNCTION
+@@ -277,7 +273,7 @@ zval		**fields;
+ 	fci.function_table = EG(function_table);
+ 	fci.function_name = &adodb_zvals[zval_ocifetch];
+ 	fci.symbol_table = NULL;
+-	fci.object_pp = NULL;
++	/* fci.object_pp = NULL; */
+ 	fci.retval_ptr_ptr = &retval;
+ 	fci.param_count = 2;
+ 	fci.params = &params[1];