From: Luca Longinotti <chtekk@gentoo.org>
Date: Thu, 8 Mar 2007 23:18:40 +0000 (+0000)
Subject: Fix compilation on threaded PHP4.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25a8555716537921f5351e254be21a8ebe94f8b3;p=gentoo.git

Fix compilation on threaded PHP4.
Package-Manager: portage-2.1.2.2
---

diff --git a/dev-php4/pecl-apc/ChangeLog b/dev-php4/pecl-apc/ChangeLog
index 6be1893d9dc5..978bfedd25e7 100644
--- a/dev-php4/pecl-apc/ChangeLog
+++ b/dev-php4/pecl-apc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php4/pecl-apc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-apc/ChangeLog,v 1.21 2007/03/06 17:19:46 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-apc/ChangeLog,v 1.22 2007/03/08 23:18:40 chtekk Exp $
+
+  08 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  +files/pecl-apc-3.0.13-tsrm.patch, pecl-apc-3.0.13.ebuild:
+  Fix compile on threaded PHP4.
 
 *pecl-apc-3.0.13 (06 Mar 2007)
 
diff --git a/dev-php4/pecl-apc/Manifest b/dev-php4/pecl-apc/Manifest
index 8a9e033b4366..d9fc1b20f0d2 100644
--- a/dev-php4/pecl-apc/Manifest
+++ b/dev-php4/pecl-apc/Manifest
@@ -1,17 +1,21 @@
+AUX pecl-apc-3.0.13-tsrm.patch 343 RMD160 4cb707e5df42855c5a2c252bc61001d9a1a76fe3 SHA1 3ea5ba5294431f586a46616efaa51dd6daf5b716 SHA256 d048b42b6cde67b7a5a7c037b55ecfc403cecf8d68cf044dccdbe03cf92595ac
+MD5 6d79aafb8e9e0f4c5dadcfb9ed7b7964 files/pecl-apc-3.0.13-tsrm.patch 343
+RMD160 4cb707e5df42855c5a2c252bc61001d9a1a76fe3 files/pecl-apc-3.0.13-tsrm.patch 343
+SHA256 d048b42b6cde67b7a5a7c037b55ecfc403cecf8d68cf044dccdbe03cf92595ac files/pecl-apc-3.0.13-tsrm.patch 343
 DIST APC-3.0.12p2.tgz 94809 RMD160 d88c75a348a51b0f0e379704dee5e1edc9fbf8ae SHA1 79476e6071ff5eead2d1e7cc92ed614ef2fd7f67 SHA256 a663f65a8207c930efbd8a1dda9e90bf4cd76166d8534771824f80e98081b297
 DIST APC-3.0.13.tgz 105042 RMD160 b11aec06842d28d9870f8359338e623ded60bdd1 SHA1 89d5f141d80c25cf61c2eefacd3e851fa2d789ee SHA256 f71538b262780790bf012335d92f7dec4869454a56d3a9f9691a55e9b6071e1a
 EBUILD pecl-apc-3.0.12_p2.ebuild 2492 RMD160 5dbe46dcc17e6397874e59ce2d079c942b9603b8 SHA1 dd5a218dd17f54e8ee88b7bc5def8cd06af4f38e SHA256 536061ccc514617cdd06919ee23f3d2bce57ffba7e98e091f4899b85f1350e60
 MD5 bff23897b794e0a6514a50074a9549ec pecl-apc-3.0.12_p2.ebuild 2492
 RMD160 5dbe46dcc17e6397874e59ce2d079c942b9603b8 pecl-apc-3.0.12_p2.ebuild 2492
 SHA256 536061ccc514617cdd06919ee23f3d2bce57ffba7e98e091f4899b85f1350e60 pecl-apc-3.0.12_p2.ebuild 2492
-EBUILD pecl-apc-3.0.13.ebuild 2157 RMD160 6556912d9745781d7b93396a239f8b7089d870ce SHA1 4b6624b51446e81b1eaa9cefe8447199a9f5807f SHA256 60e34db28215de267a3ec11ad739ec5a463a302a0a3eec9edee71faba40534d5
-MD5 6dbe7594197a8faf3896686055175c53 pecl-apc-3.0.13.ebuild 2157
-RMD160 6556912d9745781d7b93396a239f8b7089d870ce pecl-apc-3.0.13.ebuild 2157
-SHA256 60e34db28215de267a3ec11ad739ec5a463a302a0a3eec9edee71faba40534d5 pecl-apc-3.0.13.ebuild 2157
-MISC ChangeLog 2771 RMD160 fbff074c91ffee91daa88b2cde11b43eb6688e69 SHA1 2f42e136ba9df48dd3d2955ac610a41e6ab3ae05 SHA256 baa2b597e124b4472bafac4045baea01bdb2609cecea37f780041e9d5c55be61
-MD5 bf12db07cc0bc3b22f8a3630508c4786 ChangeLog 2771
-RMD160 fbff074c91ffee91daa88b2cde11b43eb6688e69 ChangeLog 2771
-SHA256 baa2b597e124b4472bafac4045baea01bdb2609cecea37f780041e9d5c55be61 ChangeLog 2771
+EBUILD pecl-apc-3.0.13.ebuild 2237 RMD160 6c8e3022cfba4c5704b3f25b516aaf64e1d22a3b SHA1 746aee2c6e6726a63d19165fd94c0ed3d98b77ef SHA256 d6a92e6c049128a3c4a9ebd88f3a127f228953b8c7472c3a07d8480f8680f23d
+MD5 ea57d1ce7aaeb936279b7f0f4890a1cb pecl-apc-3.0.13.ebuild 2237
+RMD160 6c8e3022cfba4c5704b3f25b516aaf64e1d22a3b pecl-apc-3.0.13.ebuild 2237
+SHA256 d6a92e6c049128a3c4a9ebd88f3a127f228953b8c7472c3a07d8480f8680f23d pecl-apc-3.0.13.ebuild 2237
+MISC ChangeLog 2916 RMD160 dcbd7610e98c66e07507b192673d194b6ca207d1 SHA1 0714c91f2e13cfd02f251b9ea29cfdc3f89ae0d5 SHA256 7a447852512e82daa361624a9dcaa134d7ab75755623aabb8b4ab71fc9c5a5bb
+MD5 369d34c36f232867250d985bcb25ee81 ChangeLog 2916
+RMD160 dcbd7610e98c66e07507b192673d194b6ca207d1 ChangeLog 2916
+SHA256 7a447852512e82daa361624a9dcaa134d7ab75755623aabb8b4ab71fc9c5a5bb ChangeLog 2916
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
diff --git a/dev-php4/pecl-apc/files/pecl-apc-3.0.13-tsrm.patch b/dev-php4/pecl-apc/files/pecl-apc-3.0.13-tsrm.patch
new file mode 100644
index 000000000000..11c3639b7221
--- /dev/null
+++ b/dev-php4/pecl-apc/files/pecl-apc-3.0.13-tsrm.patch
@@ -0,0 +1,14 @@
+--- php_apc.c	2007/02/28 01:15:18	3.137
++++ php_apc.c	2007/03/08 22:35:45	3.138
+@@ -877,7 +877,11 @@
+ 
+     /* Free up everything */
+     zend_destroy_file_handle(&file_handle TSRMLS_CC);
++#ifdef ZEND_ENGINE_2
+     destroy_op_array(op_array TSRMLS_CC);
++#else
++    destroy_op_array(op_array);
++#endif
+     efree(op_array);
+ 
+     RETURN_TRUE;
diff --git a/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild b/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild
index 64263aae13b3..ac0686292226 100644
--- a/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild
+++ b/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild,v 1.1 2007/03/06 17:19:46 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-apc/pecl-apc-3.0.13.ebuild,v 1.2 2007/03/08 23:18:40 chtekk Exp $
 
 PHP_EXT_NAME="apc"
 PHP_EXT_PECL_PKG="APC"
@@ -26,6 +26,12 @@ pkg_setup() {
 	require_php_sapi_from cgi apache apache2
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-tsrm.patch"
+}
+
 src_compile() {
 	has_php