remove blocker on ZendOptimizer wrt #258736

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

5 files changed, 28 insertions, 38 deletions

diff --git a/dev-php5/ZendOptimizer/Manifest b/dev-php5/ZendOptimizer/Manifest
index 5f3069d26d67..28c48bbdf4d3 100644
--- a/dev-php5/ZendOptimizer/Manifest
+++ b/dev-php5/ZendOptimizer/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST ZendOptimizer-3.3.0a-linux-glibc21-i386.tar.gz 9751851 RMD160 32a30b8d728d747374bb4f0f94e34e1ac6dfc095 SHA1 9ae95f1a85f443c0440ccf40df7967b0adba02c6 SHA256 0e59e5a5a8dd5e960f553b93025c8a1fb95ba3c3d23943e31c28ceedea2372c0
-DIST ZendOptimizer-3.3.0a-linux-glibc23-x86_64.tar.gz 9031963 RMD160 616789347010cdc1ef7163e22689b61adffbb807 SHA1 2c0144fefc110f7deb8b439147c9b691f56b7326 SHA256 4e58bf3d32b4fb9368ade3fab58b164b23b66a4397f656c928e26f7aa95a26eb
 DIST ZendOptimizer-3.3.3-linux-glibc23-i386.tar.gz 10208541 RMD160 af08e1cda134ed4cbb3b6fd6d3932bfbe109a260 SHA1 8a1eb17122a0b5a91ed4e08ee9fc76985c4511aa SHA256 ba26dc5f38ad4a7ea2146a6e443c7c35f275298bd737d4c8f8c5892dbaa7731d
 DIST ZendOptimizer-3.3.3-linux-glibc23-x86_64.tar.gz 7356915 RMD160 d20c9e287e83a5ee146de216c7afbf0daaa98bbb SHA1 003ab6366d69ffc1d81c11c849ebb0e762631f4e SHA256 c2688659e13bdf094162f937a58a13d8faadd53e9eaab618d2a69ef902ac2ff2
-EBUILD ZendOptimizer-3.3.0a.ebuild 2446 RMD160 6feaeeed401e642d63dd3758cc5fee0c0106c8a7 SHA1 ea3cfe58887e33d5a7f917da8dc2f3036b40d85e SHA256 3ac9f8822cfdb1e68c55c6beb4b2977367a7339f2d6f1362901c29862bff8692
+DIST ZendOptimizer-3.3.9-linux-glibc23-i386.tar.gz 3127521 RMD160 c4b0afe5fe89d16b51a1619a6cc7bd002317aad9 SHA1 114072b1a62cd5f1a4d9b0cae2c1809efef6d1b0 SHA256 7519880d2dbf3b073bd455ad1c681ee072c18e13354988b28764d2f0ab2075c5
+DIST ZendOptimizer-3.3.9-linux-glibc23-x86_64.tar.gz 2839856 RMD160 8fae7af4ba4c253b0ffce9161df7d914f6e245c5 SHA1 8637357b0e77a4f3c541d2a49d01ad13f102ddf6 SHA256 2dc42dec471cf6754f8f7dbb7444a040c92cc6c99b80c8aa924bdcd4d33decb8
 EBUILD ZendOptimizer-3.3.3-r1.ebuild 2308 RMD160 545f9a74e701f47587131f6b9b5c5492a02ee43f SHA1 58500d5cea7ecf280acfbe87d82c8840c9bb6de7 SHA256 f71229e3cbd0cbd73b0f87a2d584ba697a03b3e5fc7fd849b1ab1ff970588ddf
-EBUILD ZendOptimizer-3.3.3.ebuild 2311 RMD160 5efc5e7bd5a84583cd49339fd3ca069c349b5663 SHA1 7f4336c83480bbdd4383d9f811363546214da58a SHA256 8e03130e894cd6bb8b09efd45915881649a526172cb9a19488ed245c6f2ba618
-MISC ChangeLog 1150 RMD160 7efca016a5062ea04774157cd5df17f7ffe726f4 SHA1 7205c8d9e8297b5c83f38bfbb8a0cc242098832b SHA256 9b506d8bd9fc4cc9afcccb9f6224730baa9cdefaa68153d079f709de635e51e2
+EBUILD ZendOptimizer-3.3.9.ebuild 2279 RMD160 b6ee4c01b967f925869e5bd3f58506c17ad88f78 SHA1 95fbb250861eeb654c58ee0851966e978be900fc SHA256 2ae657af1207c2ce51fee4b10aadb71d3907c048abb11bb75961037bfff5bb34
+MISC ChangeLog 1397 RMD160 ed42904f43221b2e6980e2b511711826809d990e SHA1 0743ea92da1fd5d63348ea464ba3b3eec34eb184 SHA256 1b51818028e1c3455977cd6cb3b68885e2fd863c212cbf3c80c1e1bbac58131b
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpT1+YACgkQAiZjviIA2XgqlwCeKXT8wqyxF5XG4Ht1hcEqF8pu
-d4gAn1WDlKgxPd7HimATNWvN6q44MlPd
-=yq5X
------END PGP SIGNATURE-----
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