remove blocker on ZendOptimizer wrt #258736

Package-Manager: portage-2.2_rc55/cvs/Linux i686

4 files changed, 24 insertions, 23 deletions

diff --git a/dev-php5/xcache/ChangeLog b/dev-php5/xcache/ChangeLog
index 867d1375cb46..7027cc79b25f 100644
--- a/dev-php5/xcache/ChangeLog
+++ b/dev-php5/xcache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/xcache
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/ChangeLog,v 1.17 2009/08/30 06:45:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/ChangeLog,v 1.18 2009/12/09 08:34:51 hollow Exp $
+
+  09 Dec 2009; Benedikt Böhm <hollow@gentoo.org> xcache-1.2.2.ebuild,
+  xcache-1.3.0.ebuild:
+  remove blocker on ZendOptimizer wrt #258736
 
 *xcache-1.3.0 (30 Aug 2009)
 
diff --git a/dev-php5/xcache/Manifest b/dev-php5/xcache/Manifest
index 8cf81e2dea67..9cbd06fc54d8 100644
--- a/dev-php5/xcache/Manifest
+++ b/dev-php5/xcache/Manifest
@@ -1,6 +1,6 @@
 DIST xcache-1.2.2.tar.bz2 210835 RMD160 60a4f06f1fbac6ae33412fe9a1b317a05afbf095 SHA1 b92a71f5e8173d72d4fb7f2c84cf48e329084851 SHA256 2c37ad89627379a79e5f26e204ca4a61c2d13cd097161d78aa67a6881448786b
 DIST xcache-1.3.0.tar.bz2 88722 RMD160 ab05fe01effd99c6536351bca9bb5f16b6db7061 SHA1 e7f6ad7a8ce2b2b116a9dc4120bf49adb33184e0 SHA256 f070a018b69f3a6d5220a155aac76d949b0bb07518c662bfc8dfd2a15f0d56ca
-EBUILD xcache-1.2.2.ebuild 2329 RMD160 24237f51001168182a1986cf38e86d7737064d31 SHA1 5b04ea2757923d9c774b32b79d4a5dd453fc3805 SHA256 c081abc54577ef5b66ecd7cfb4ae7b1f47e36d92e4be717e60e24150adc7b46d
-EBUILD xcache-1.3.0.ebuild 3069 RMD160 47791cdb481c9ead434e6aec6b79b7db734f23e2 SHA1 6dfdda25c310a44eee9c0df875c06d08932ac11b SHA256 8c2d0f9c6b7c85f28baf52b523e1a7503e4d7588748218fb0cf1441d1d658a78
-MISC ChangeLog 2507 RMD160 b0be326defcff029404b5939c45f03a1673b2430 SHA1 4d29fee138093ea7173c00991ae28c2dce11d698 SHA256 87c1d2dff07d20f49de1fa43bbb693d910438fe42a2b19cb43497691a7703907
+EBUILD xcache-1.2.2.ebuild 2308 RMD160 47641038a7b8142883156ab2d3fdad4f54cfd8e0 SHA1 d4c7af238d8855b8b02e9297da59ad8e324aee1e SHA256 8ba1c13058c31636ef78f5c3d4345875a8bfd8124044f8ee8df7cbc620e54c4c
+EBUILD xcache-1.3.0.ebuild 2702 RMD160 954cdff667f95c0ea3d543596f0e06f61aa5b276 SHA1 0c0a2660734c6543e2952c2558b2bf351cc76e54 SHA256 1dc2b08b15943da89d2f4905c6694cdd6d35c8d6868877cd27571d4c5425cc45
+MISC ChangeLog 2648 RMD160 9e28ddad4008972d89a1b647685530c5588d5802 SHA1 21cba2aa68aca762c6ca71c54053677d8b7f891b SHA256 43c71b30842ee0d9d6d7f3c4abd3f8e46fa8ddb35aa69220a990ad5cc9e72f1c
 MISC metadata.xml 255 RMD160 0f2e44aa6d4609584739da35c3685f7f3851d215 SHA1 e2066d6ca6f72bba244cadd56c060212a0de4d6f SHA256 22d92185dbc6582f31e5cdb5dd290db61e711c4d34566b1606b5d229dbaf9ebe
diff --git a/dev-php5/xcache/xcache-1.2.2.ebuild b/dev-php5/xcache/xcache-1.2.2.ebuild
index 26b6aee96782..7e845c94155f 100644
--- a/dev-php5/xcache/xcache-1.2.2.ebuild
+++ b/dev-php5/xcache/xcache-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/xcache-1.2.2.ebuild,v 1.3 2008/03/08 19:42:07 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/xcache-1.2.2.ebuild,v 1.4 2009/12/09 08:34:51 hollow Exp $
 
 PHP_EXT_NAME="xcache"
 PHP_EXT_INI="yes"
@@ -21,7 +21,7 @@ IUSE=""
 # make test would just run php's test and as such need the full php source
 RESTRICT="test"
 
-DEPEND="!dev-php5/eaccelerator !dev-php5/pecl-apc !dev-php5/ZendOptimizer"
+DEPEND="!dev-php5/eaccelerator !dev-php5/pecl-apc"
 RDEPEND="${DEPEND}"
 
 need_php_by_category
diff --git a/dev-php5/xcache/xcache-1.3.0.ebuild b/dev-php5/xcache/xcache-1.3.0.ebuild
index 783ca7022cbe..491e4f2406c5 100644
--- a/dev-php5/xcache/xcache-1.3.0.ebuild
+++ b/dev-php5/xcache/xcache-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/xcache-1.3.0.ebuild,v 1.1 2009/08/30 06:45:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/xcache-1.3.0.ebuild,v 1.2 2009/12/09 08:34:51 hollow Exp $
 
 PHP_EXT_NAME="xcache"
 PHP_EXT_INI="yes"
@@ -9,19 +9,19 @@ PHPSAPILIST="apache2 cgi"
 
 inherit php-ext-source-r1 confutils
 
-KEYWORDS="~amd64 ~x86"
-
 DESCRIPTION="A fast and stable PHP opcode cacher"
 HOMEPAGE="http://xcache.lighttpd.net/"
 SRC_URI="http://xcache.lighttpd.net/pub/Releases/${PV}/${P}.tar.bz2"
+
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # make test would just run php's test and as such need the full php source
 RESTRICT="test"
 
-DEPEND="!dev-php5/eaccelerator !dev-php5/pecl-apc !dev-php5/ZendOptimizer"
+DEPEND="!dev-php5/eaccelerator !dev-php5/pecl-apc"
 RDEPEND="${DEPEND}"
 
 need_php_by_category
@@ -49,8 +49,12 @@ src_install() {
 	php-ext-source-r1_src_install
 	dodoc-php AUTHORS ChangeLog NEWS README THANKS
 
-	php-ext-base-r1_addtoinifiles "auto_globals_jit" '"0"'
-	php-ext-base-r1_addtoinifiles "xcache.size" '"32M"'
+	php-ext-base-r1_addtoinifiles "xcache.admin.enable_auth" '"On"'
+	php-ext-base-r1_addtoinifiles "xcache.admin.user" '"admin"'
+	php-ext-base-r1_addtoinifiles "xcache.admin.pass" '""'
+
+	php-ext-base-r1_addtoinifiles "xcache.cacher" '"On"'
+	php-ext-base-r1_addtoinifiles "xcache.size" '"64M"'
 	php-ext-base-r1_addtoinifiles "xcache.count" '"2"'
 	php-ext-base-r1_addtoinifiles "xcache.slots" '"8k"'
 	php-ext-base-r1_addtoinifiles "xcache.ttl" '"0"'
@@ -61,20 +65,13 @@ src_install() {
 	php-ext-base-r1_addtoinifiles "xcache.var_ttl" '"0"'
 	php-ext-base-r1_addtoinifiles "xcache.var_maxttl" '"0"'
 	php-ext-base-r1_addtoinifiles "xcache.var_gc_interval" '"600"'
-	php-ext-base-r1_addtoinifiles "xcache.readonly_protection" '"0"'
-	php-ext-base-r1_addtoinifiles "xcache.shm_schema" '"mmap"'
+	php-ext-base-r1_addtoinifiles "xcache.readonly_protection" '"Off"'
 	php-ext-base-r1_addtoinifiles "xcache.mmap_path" '"/dev/zero"'
-	php-ext-base-r1_addtoinifiles "xcache.readyonly_protection" '"Off"'
-	php-ext-base-r1_addtoinifiles "xcache.cacher" '"On"'
-	php-ext-base-r1_addtoinifiles "xcache.stat" '"On"'
+
 	php-ext-base-r1_addtoinifiles "xcache.coverager" '"Off"'
 	php-ext-base-r1_addtoinifiles "xcache.coveragedump_directory" '""'
+
 	php-ext-base-r1_addtoinifiles "xcache.optimizer" '"Off"'
-	php-ext-base-r1_addtoinifiles "xcache.admin.enable_auth" '"1"'
-	php-ext-base-r1_addtoinifiles "xcache.admin.user" '"m0o"'
-	php-ext-base-r1_addtoinifiles "xcache.admin.pass" '""'
-	php-ext-base-r1_addtoinifiles "xcache.test" '"Off"'
-	php-ext-base-r1_addtoinifiles "xcache.experimental" '"Off"'
 
 	insinto "${PHP_EXT_SHARED_DIR}"
 	doins Decompiler.class.php