bug #305965

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 20 insertions, 104 deletions

diff --git a/dev-php5/ZendOptimizer/ChangeLog b/dev-php5/ZendOptimizer/ChangeLog
index df80355ec00a..6ee31f922366 100644
--- a/dev-php5/ZendOptimizer/ChangeLog
+++ b/dev-php5/ZendOptimizer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/ZendOptimizer
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendOptimizer/ChangeLog,v 1.5 2009/12/09 08:37:26 hollow Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendOptimizer/ChangeLog,v 1.6 2010/06/22 21:26:59 mabi Exp $
+
+*ZendOptimizer-3.3.9-r1 (22 Jun 2010)
+
+  22 Jun 2010; Matti Bickel <mabi@gentoo.org>
+  -ZendOptimizer-3.3.3-r1.ebuild, -ZendOptimizer-3.3.9.ebuild,
+  +ZendOptimizer-3.3.9-r1.ebuild:
+  doesn't work with php-5.3, can't use threads, debug with PHP (bug #305965)
 
 *ZendOptimizer-3.3.9 (09 Dec 2009)
 
diff --git a/dev-php5/ZendOptimizer/Manifest b/dev-php5/ZendOptimizer/Manifest
index 28c48bbdf4d3..1d34383e3d55 100644
--- a/dev-php5/ZendOptimizer/Manifest
+++ b/dev-php5/ZendOptimizer/Manifest
@@ -1,8 +1,5 @@
-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
 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.9.ebuild 2279 RMD160 b6ee4c01b967f925869e5bd3f58506c17ad88f78 SHA1 95fbb250861eeb654c58ee0851966e978be900fc SHA256 2ae657af1207c2ce51fee4b10aadb71d3907c048abb11bb75961037bfff5bb34
-MISC ChangeLog 1397 RMD160 ed42904f43221b2e6980e2b511711826809d990e SHA1 0743ea92da1fd5d63348ea464ba3b3eec34eb184 SHA256 1b51818028e1c3455977cd6cb3b68885e2fd863c212cbf3c80c1e1bbac58131b
+EBUILD ZendOptimizer-3.3.9-r1.ebuild 2131 RMD160 8f7f4cd7a9cdeda723745bcf422df87bbebdadc3 SHA1 3abb8d3f682db482e4d2729251328df095a16a65 SHA256 23458e38f42d9217257065f5304136d578701df6547bce4124abbeba9450b4c9
+MISC ChangeLog 1655 RMD160 e00a531a080cadfaf6ace2359062e7c69e1df8e4 SHA1 0b0a71cddd1379cdd4fa6e3c84593dbbf66839f4 SHA256 503bbc2e02fcda72c7bc8e1848738c6570bed81b07c664e72d9d53c594c98937
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php5/ZendOptimizer/ZendOptimizer-3.3.3-r1.ebuild b/dev-php5/ZendOptimizer/ZendOptimizer-3.3.3-r1.ebuild
deleted file mode 100644
index 250ed49dfc8d..000000000000
--- a/dev-php5/ZendOptimizer/ZendOptimizer-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendOptimizer/ZendOptimizer-3.3.3-r1.ebuild,v 1.2 2009/07/07 23:18:57 flameeyes Exp $
-
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_NAME="ZendOptimizer"
-PHP_EXT_INI="yes"
-
-inherit php-ext-base-r1
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="amd64? ( ${PN}-${PV}-linux-glibc23-x86_64.tar.gz )
-		x86? ( ${PN}-${PV}-linux-glibc23-i386.tar.gz )"
-
-MY_ARCH=${ARCH/x86/glibc23-i386}
-MY_ARCH=${MY_ARCH/amd64/glibc23-x86_64}
-
-S="${WORKDIR}/${PN}-${PV}-linux-${MY_ARCH}"
-
-DESCRIPTION="The Zend PHP optimizer and loader for encoded scripts."
-HOMEPAGE="http://www.zend.com/products/zend_optimizer"
-LICENSE="zend-optimizer"
-SLOT="0"
-IUSE=""
-
-RESTRICT="mirror fetch strip"
-
-DEPEND=""
-RDEPEND="!dev-php5/xdebug !dev-php5/pecl-apc !dev-php5/eaccelerator"
-
-need_php_by_category
-
-pkg_nofetch() {
-	elog
-	elog "Please download ${PN}-${PV}-linux-${MY_ARCH} from:"
-	elog "${HOMEPAGE}"
-	elog "and put it into ${DISTDIR}."
-	elog "Please note that you need a valid Zend Account"
-	elog "(free) to download the Zend Optimizer!"
-	elog
-}
-
-pkg_setup() {
-	php_binary_extension
-	QA_TEXTRELS="${EXT_DIR/\//}/${PHP_EXT_NAME}.so"
-	QA_EXECSTACK="${EXT_DIR/\//}/${PHP_EXT_NAME}.so"
-}
-
-src_install() {
-	php-ext-base-r1_src_install
-
-	if has_version =dev-lang/php-5.2* ; then
-		ZENDOPT_VERSION_DIR="5_2_x_comp"
-	else
-		die "Unable to find an installed dev-lang/php-5* package."
-	fi
-
-	# Detect if we use ZTS and change the file path accordingly
-	if has_zts ; then
-		ZENDOPT_SO_FILE="data/${ZENDOPT_VERSION_DIR}/TS/${PHP_EXT_NAME}.so"
-	else
-		ZENDOPT_SO_FILE="data/${ZENDOPT_VERSION_DIR}/${PHP_EXT_NAME}.so"
-	fi
-
-	# Install the binary
-	insinto ${EXT_DIR}
-	doins ${ZENDOPT_SO_FILE}
-
-	# Add the correct settings to the extension ini files
-	php-ext-base-r1_addtoinifiles "zend_optimizer.optimization_level" "15"
-	php-ext-base-r1_addtoinifiles "zend_optimizer.enable_loader" "1"
-	php-ext-base-r1_addtoinifiles "zend_optimizer.disable_licensing" "0"
-
-	dodoc-php README-${PN} data/doc/Zend_Optimizer_User_Guide.pdf
-}
-
-pkg_postinst() {
-	has_php
-
-	# You only need to restart apache2 if you're using mod_php
-	if built_with_use =${PHP_PKG} apache2 ; then
-		elog
-		elog "You need to restart apache2 to activate the ${PN}."
-		elog
-	fi
-}
diff --git a/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9.ebuild b/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9-r1.ebuild
index 0b01348ec9ac..8ebdd81e1a8e 100644
--- a/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9.ebuild
+++ b/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9.ebuild,v 1.1 2009/12/09 08:37:26 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9-r1.ebuild,v 1.1 2010/06/22 21:26:59 mabi Exp $
+
+EAPI="2"
 
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_NAME="ZendOptimizer"
@@ -27,7 +29,9 @@ IUSE=""
 RESTRICT="mirror fetch strip"
 
 DEPEND=""
-RDEPEND="!dev-php5/xdebug !dev-php5/pecl-apc"
+RDEPEND="!dev-php5/xdebug
+		 !dev-php5/pecl-apc
+		 <dev-lang/php-5.3[-debug,-threads]"
 
 need_php_by_category
 
@@ -56,12 +60,7 @@ src_install() {
 		die "Unable to find an installed dev-lang/php-5* package."
 	fi
 
-	# Detect if we use ZTS and change the file path accordingly
-	if has_zts ; then
-		ZENDOPT_SO_FILE="data/${ZENDOPT_VERSION_DIR}/TS/${PHP_EXT_NAME}.so"
-	else
-		ZENDOPT_SO_FILE="data/${ZENDOPT_VERSION_DIR}/${PHP_EXT_NAME}.so"
-	fi
+	ZENDOPT_SO_FILE="data/${ZENDOPT_VERSION_DIR}/${PHP_EXT_NAME}.so"
 
 	# Install the binary
 	insinto ${EXT_DIR}
@@ -72,7 +71,7 @@ src_install() {
 	php-ext-base-r1_addtoinifiles "zend_optimizer.enable_loader" "1"
 	php-ext-base-r1_addtoinifiles "zend_optimizer.disable_licensing" "0"
 
-	dodoc-php README-${PN} data/doc/Zend_Optimizer_User_Guide.pdf
+	dodoc-php README-${PN}
 }
 
 pkg_postinst() {