* ZTS-related fixes

Package-Manager: portage-2.1.2.2

diff --git a/dev-php5/onphp-module/ChangeLog b/dev-php5/onphp-module/ChangeLog
index 2f5a3711d8ac577fc1905e6536b59197f907d707..9d2333fa1742346741533b3fd8a36b4dcbdee2f0 100644 (file)
--- 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/Manifest b/dev-php5/onphp-module/Manifest
index d6fbf26204a6ea991c32d49cd89d0b7b79b6b85d..5ca11194b5e726106dd60dd40eea1150dfad3212 100644 (file)
--- a/dev-php5/onphp-module/Manifest
+++ b/dev-php5/onphp-module/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX onphp-module-r2861.patch 1327 RMD160 d26906876e7d6703b8d3759adca73d425cb63091 SHA1 45e3622b533f3f5058a74d390a3fe07afedf852f SHA256 15df5edab027eaf377aa78d7a44f2d5885697dba324af29f5ba8a18b1b22ba57
+MD5 3a925df4e71fe8fa05fb401fedb339b8 files/onphp-module-r2861.patch 1327
+RMD160 d26906876e7d6703b8d3759adca73d425cb63091 files/onphp-module-r2861.patch 1327
+SHA256 15df5edab027eaf377aa78d7a44f2d5885697dba324af29f5ba8a18b1b22ba57 files/onphp-module-r2861.patch 1327
 DIST onphp-0.6.4.tar.bz2 105214 RMD160 464c9598b8274992dcf799dd909d04803756c570 SHA1 49afb37bc0e6d4a5fc07a2a0c8ff9b885e4f5b2b SHA256 77f7713ccb6d0ffc8ebae1d46585b7e6c799687c3f7f9a25d3f6dee28ae5980a
 DIST onphp-0.8.5.tar.bz2 114560 RMD160 33695416aafb05418d7d6253aa7dad81832341a1 SHA1 041580d247ec70db910684efb7452c3e2466f4aa SHA256 1e320de3c07839c0ec64acadf9e7e4388e5769d2d81ced6f88ba5278b575314a
 DIST onphp-0.8.6.tar.bz2 114595 RMD160 8c744e99cea1e6bd5f5308afc59de3de386c7c2c SHA1 1b2040ef5e93a881ac6a32334ec22ed8763adee1 SHA256 3d76391e2a3bf9c0d1e2fd66dfe8a72bb1f6d6d8d0c36372081865ff54c365df
+EBUILD onphp-module-0.6.4-r1.ebuild 812 RMD160 1ee85caede70f1e8779922fe5fba7b50de156fd7 SHA1 3b16e37db6429cd32f4ecafd6991f58e2cbe0f4c SHA256 d158e75ff6b48ca8d20dd7f52f8c9fb2492e0e66d7b1854e09d14e57b0bbd031
+MD5 35775e7d5a62850d184d3f6c00da13dd onphp-module-0.6.4-r1.ebuild 812
+RMD160 1ee85caede70f1e8779922fe5fba7b50de156fd7 onphp-module-0.6.4-r1.ebuild 812
+SHA256 d158e75ff6b48ca8d20dd7f52f8c9fb2492e0e66d7b1854e09d14e57b0bbd031 onphp-module-0.6.4-r1.ebuild 812
 EBUILD onphp-module-0.6.4.ebuild 648 RMD160 8990f2ba27c4dc50b59e1b5bdb21ab35c95cbfe4 SHA1 9f7a35af06dfee8520bbf0cf24c4ed114a16fc08 SHA256 f39dc3c8c1cd5124d3cd9d37610dc24da94bc56e7f552e6493b2273d87a64ddb
 MD5 53f3ea6f0c3a98bd386c407f43266a3c onphp-module-0.6.4.ebuild 648
 RMD160 8990f2ba27c4dc50b59e1b5bdb21ab35c95cbfe4 onphp-module-0.6.4.ebuild 648
@@ -9,14 +20,14 @@ EBUILD onphp-module-0.8.5.ebuild 648 RMD160 958255fe41bcd0f4ecc7faaf6f5eda5bd98d
 MD5 ad381cee37b546a041039903e562356b onphp-module-0.8.5.ebuild 648
 RMD160 958255fe41bcd0f4ecc7faaf6f5eda5bd98d0f8d onphp-module-0.8.5.ebuild 648
 SHA256 8fed13c77f0465934bb096dbc1f1656718cfd2dbd24bb7ceff61acb5a02a3023 onphp-module-0.8.5.ebuild 648
-EBUILD onphp-module-0.8.6.ebuild 650 RMD160 52ab7e74b73ba9a12f75a546fc78e7c19cd48218 SHA1 81377532cfc56c4f6e53d4842ba2f45e0971ed1c SHA256 70ebe0086a89e869c4bd084e13362dad53a88c37b7803742ed915b1a3feec68a
-MD5 06b252ffd40aced2ffa4999258d228cb onphp-module-0.8.6.ebuild 650
-RMD160 52ab7e74b73ba9a12f75a546fc78e7c19cd48218 onphp-module-0.8.6.ebuild 650
-SHA256 70ebe0086a89e869c4bd084e13362dad53a88c37b7803742ed915b1a3feec68a onphp-module-0.8.6.ebuild 650
-MISC ChangeLog 2848 RMD160 a6c095b1cf7c7814d4a8019fc0394c7a94a65436 SHA1 5528c972ef6f1fe9401d63a7d845bce1093c92a6 SHA256 3636f94921db29bcf9f43438b9560cd27959a9346f9280f2c63cccf042b73baa
-MD5 0601f57f98ab8519db8ed944180754a3 ChangeLog 2848
-RMD160 a6c095b1cf7c7814d4a8019fc0394c7a94a65436 ChangeLog 2848
-SHA256 3636f94921db29bcf9f43438b9560cd27959a9346f9280f2c63cccf042b73baa ChangeLog 2848
+EBUILD onphp-module-0.8.6-r1.ebuild 812 RMD160 5b8b43d4bc11b48a7e9e754731560743e5336233 SHA1 bd2e5642b82c2455c6b73240b51c43a9abfc4529 SHA256 58f7614e66e40034c8c8ea23930d7d06f49bd87b8384798ab8cc7cd6d6656269
+MD5 e924be4340455b3c2b9140d52c76bde1 onphp-module-0.8.6-r1.ebuild 812
+RMD160 5b8b43d4bc11b48a7e9e754731560743e5336233 onphp-module-0.8.6-r1.ebuild 812
+SHA256 58f7614e66e40034c8c8ea23930d7d06f49bd87b8384798ab8cc7cd6d6656269 onphp-module-0.8.6-r1.ebuild 812
+MISC ChangeLog 3146 RMD160 9f19194ce9dd1f555986dafef2bb52e4e57af0c1 SHA1 2e22a1327c3741e2cda9dcab77d03bc7d05a6155 SHA256 587be63a2b3619ad2dd5db88f450fe62ba30fa99a9234da4f63cb475b8f70cf3
+MD5 1ec6505d4d0faf8c8118f6c33cfd0060 ChangeLog 3146
+RMD160 9f19194ce9dd1f555986dafef2bb52e4e57af0c1 ChangeLog 3146
+SHA256 587be63a2b3619ad2dd5db88f450fe62ba30fa99a9234da4f63cb475b8f70cf3 ChangeLog 3146
 MISC metadata.xml 255 RMD160 eff180b3fa93a2b2ea23da6e8b0930f6f0ddef8b SHA1 b46c1bbe5a6068f85b0dac59c51321d9e4871cc8 SHA256 5a3ed9aee11bdf7fc0c12650603ac09ba6ca68b6f6b9cb1896baa601cd6e960a
 MD5 c9583de304904692ea40a1e87c157fec metadata.xml 255
 RMD160 eff180b3fa93a2b2ea23da6e8b0930f6f0ddef8b metadata.xml 255
@@ -24,9 +35,19 @@ SHA256 5a3ed9aee11bdf7fc0c12650603ac09ba6ca68b6f6b9cb1896baa601cd6e960a metadata
 MD5 f4cca909c627f7924869d461e7d864e8 files/digest-onphp-module-0.6.4 238
 RMD160 b75b13ddc3f00b5be449c7169139950459bfe326 files/digest-onphp-module-0.6.4 238
 SHA256 a3611435ad81dc18978d739cfba88b4385791fd27b2005d0c96aa43a3864791c files/digest-onphp-module-0.6.4 238
+MD5 f4cca909c627f7924869d461e7d864e8 files/digest-onphp-module-0.6.4-r1 238
+RMD160 b75b13ddc3f00b5be449c7169139950459bfe326 files/digest-onphp-module-0.6.4-r1 238
+SHA256 a3611435ad81dc18978d739cfba88b4385791fd27b2005d0c96aa43a3864791c files/digest-onphp-module-0.6.4-r1 238
 MD5 89f5cfaf35257c2df3297c9cb9930a5f files/digest-onphp-module-0.8.5 238
 RMD160 de0388e56c3e8897616208847b93877e8be91f97 files/digest-onphp-module-0.8.5 238
 SHA256 ab972597417fc428f81e8ae118975631d3cb39f4447067b45935cf99c8b9ad51 files/digest-onphp-module-0.8.5 238
-MD5 6b7803bcec7123b181907ef1c45a35c9 files/digest-onphp-module-0.8.6 238
-RMD160 5578a8a3af5627830764dd92b27c8b5a72eb83e9 files/digest-onphp-module-0.8.6 238
-SHA256 b96d0b47b12ff3df5a0eb032a8b58aa260ba446c646120e2ff2b014da9834a34 files/digest-onphp-module-0.8.6 238
+MD5 6b7803bcec7123b181907ef1c45a35c9 files/digest-onphp-module-0.8.6-r1 238
+RMD160 5578a8a3af5627830764dd92b27c8b5a72eb83e9 files/digest-onphp-module-0.8.6-r1 238
+SHA256 b96d0b47b12ff3df5a0eb032a8b58aa260ba446c646120e2ff2b014da9834a34 files/digest-onphp-module-0.8.6-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF/vC+bwxeDFj+ScoRAqZqAJ4tLnJVCPnxZn/d+qh4lp2QuYkjYACfYHn+
+DjhX/kxAc6EzioRzWxUI5PI=
+=j1JP
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..0eeb23b
--- /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
similarity index 100%
rename from dev-php5/onphp-module/files/digest-onphp-module-0.8.6
rename to 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 (file)
index 0000000..170a76f
--- /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
similarity index 57%
rename from dev-php5/onphp-module/onphp-module-0.8.6.ebuild
rename to dev-php5/onphp-module/onphp-module-0.6.4-r1.ebuild
index e351f74ed019720a7d8121f509ff1fe90855bed8..f3096407b9bb25e02e301322901e055d5d142763 100644 (file)
--- 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 (file)
index 0000000..bacc1e8
--- /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
+}