* ZTS-related fixes

(Portage version: 2.1.2.2)

6 files changed, 118 insertions, 10 deletions

diff --git a/dev-php5/onphp-module/ChangeLog b/dev-php5/onphp-module/ChangeLog
index 2f5a3711d8ac..9d2333fa1742 100644
--- a/dev-php5/onphp-module/ChangeLog
+++ b/dev-php5/onphp-module/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php5/onphp-module
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/ChangeLog,v 1.17 2007/03/18 15:11:49 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/ChangeLog,v 1.18 2007/03/19 20:22:44 voxus Exp $
+
+*onphp-module-0.8.6-r1 (19 Mar 2007)
+*onphp-module-0.6.4-r1 (19 Mar 2007)
+
+  19 Mar 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +files/onphp-module-r2861.patch, +onphp-module-0.6.4-r1.ebuild,
+  -onphp-module-0.8.6.ebuild, +onphp-module-0.8.6-r1.ebuild:
+  Building against threaded php fixed.
 
   18 Mar 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
   onphp-module-0.6.4.ebuild, onphp-module-0.8.5.ebuild,
diff --git a/dev-php5/onphp-module/files/digest-onphp-module-0.6.4-r1 b/dev-php5/onphp-module/files/digest-onphp-module-0.6.4-r1
new file mode 100644
index 000000000000..0eeb23b84df1
--- /dev/null
+++ b/dev-php5/onphp-module/files/digest-onphp-module-0.6.4-r1
@@ -0,0 +1,3 @@
+MD5 175451577650013e065dc34a33253475 onphp-0.6.4.tar.bz2 105214
+RMD160 464c9598b8274992dcf799dd909d04803756c570 onphp-0.6.4.tar.bz2 105214
+SHA256 77f7713ccb6d0ffc8ebae1d46585b7e6c799687c3f7f9a25d3f6dee28ae5980a onphp-0.6.4.tar.bz2 105214
diff --git a/dev-php5/onphp-module/files/digest-onphp-module-0.8.6 b/dev-php5/onphp-module/files/digest-onphp-module-0.8.6-r1
index de86a85abd30..de86a85abd30 100644
--- a/dev-php5/onphp-module/files/digest-onphp-module-0.8.6
+++ b/dev-php5/onphp-module/files/digest-onphp-module-0.8.6-r1
diff --git a/dev-php5/onphp-module/files/onphp-module-r2861.patch b/dev-php5/onphp-module/files/onphp-module-r2861.patch
new file mode 100644
index 000000000000..170a76fb0d5d
--- /dev/null
+++ b/dev-php5/onphp-module/files/onphp-module-r2861.patch
@@ -0,0 +1,47 @@
+--- ext/src/core/Exceptions.c	(revision 2857)
++++ ext/src/core/Exceptions.c	(working copy)
+@@ -28,7 +28,11 @@
+ PHPAPI zend_class_entry *onphp_ce_WrongArgumentException;
+ PHPAPI zend_class_entry *onphp_ce_WrongStateException;
+ 
++#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 2)
+ #define onphp_ce_Exception zend_exception_get_default()
++#else
++#define onphp_ce_Exception zend_exception_get_default(TSRMLS_C)
++#endif
+ 
+ PHP_MINIT_FUNCTION(Exceptions)
+ {
+--- ext/src/core/DB/ImaginaryDialect.c	(revision 2857)
++++ ext/src/core/DB/ImaginaryDialect.c	(working copy)
+@@ -23,6 +23,12 @@
+ #include "core/OSQL/DBValue.h"
+ #include "core/OSQL/DialectString.h"
+ 
++#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 2)
++#define onphp_implode(glue, words, copy) php_implode(glue, words, copy)
++#else
++#define onphp_implode(glue, words, copy) php_implode(glue, words, copy TSRMLS_CC)
++#endif
++
+ PHPAPI zend_class_entry *onphp_ce_ImaginaryDialect;
+ 
+ ONPHP_METHOD(ImaginaryDialect, me)
+@@ -197,7 +203,7 @@
+ 		ZVAL_STRING(glue, " | ", 1);
+ 	} 
+ 	
+-	php_implode(glue, words, copy);
++	onphp_implode(glue, words, copy);
+ 	
+ 	smart_str_appends(&out, "(\"");
+ 	
+@@ -268,7 +274,7 @@
+ 		ZVAL_STRING(glue, " | ", 1);
+ 	} 
+ 	
+-	php_implode(glue, words, copy);
++	onphp_implode(glue, words, copy);
+ 	
+ 	smart_str_appends(&out, "(RANK BY \"");
+ 	
diff --git a/dev-php5/onphp-module/onphp-module-0.8.6.ebuild b/dev-php5/onphp-module/onphp-module-0.6.4-r1.ebuild
index e351f74ed019..f3096407b9bb 100644
--- a/dev-php5/onphp-module/onphp-module-0.8.6.ebuild
+++ b/dev-php5/onphp-module/onphp-module-0.6.4-r1.ebuild
@@ -1,30 +1,40 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/onphp-module-0.8.6.ebuild,v 1.2 2007/03/18 15:11:49 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/onphp-module-0.6.4-r1.ebuild,v 1.1 2007/03/19 20:22:44 voxus Exp $
 
 PHP_EXT_NAME="onphp"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-inherit php-ext-source-r1
+inherit php-ext-pecl-r1
 
-KEYWORDS="~amd64 ~x86"
+SRC_URI="http://onphp.org/download/onphp-${PV}.tar.bz2"
 
+KEYWORDS="~amd64 ~x86"
 DESCRIPTION="onPHP's module."
 HOMEPAGE="http://onphp.org/"
-SRC_URI="http://onphp.org/download/onphp-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
-RDEPEND="~dev-php5/onphp-${PV}"
+# since need_php51 is missing
+DEPEND=">=dev-lang/php-5.1.4"
+RDEPEND="${DEPEND}
+		~dev-php5/onphp-${PV}"
 
-S="${WORKDIR}/onphp-${PV}/ext"
+PHP_VERSION="5"
+PHP_SHARED_CAT="php5"
 
-need_php_by_category
+S="${WORKDIR}/onphp-${PV}/ext"
 
 pkg_setup() {
 	has_php
-	require_php_with_use reflection spl
+
+	require_php_with_use spl reflection
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch ${FILESDIR}/${PN}-r2861.patch
 }
diff --git a/dev-php5/onphp-module/onphp-module-0.8.6-r1.ebuild b/dev-php5/onphp-module/onphp-module-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..bacc1e896b55
--- /dev/null
+++ b/dev-php5/onphp-module/onphp-module-0.8.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/onphp-module-0.8.6-r1.ebuild,v 1.1 2007/03/19 20:22:44 voxus Exp $
+
+PHP_EXT_NAME="onphp"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+inherit php-ext-pecl-r1
+
+SRC_URI="http://onphp.org/download/onphp-${PV}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="onPHP's module."
+HOMEPAGE="http://onphp.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# since need_php51 is missing
+DEPEND=">=dev-lang/php-5.1.4"
+RDEPEND="${DEPEND}
+		~dev-php5/onphp-${PV}"
+
+PHP_VERSION="5"
+PHP_SHARED_CAT="php5"
+
+S="${WORKDIR}/onphp-${PV}/ext"
+
+pkg_setup() {
+	has_php
+
+	require_php_with_use spl reflection
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch ${FILESDIR}/${PN}-r2861.patch
+}