3 files changed, 20 insertions, 103 deletions
diff --git a/dev-php5/ZendOptimizer/ChangeLog b/dev-php5/ZendOptimizer/ChangeLog
index bf25a8aa3127..df80355ec00a 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.4 2009/07/07 23:18:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendOptimizer/ChangeLog,v 1.5 2009/12/09 08:37:26 hollow Exp $
+
+*ZendOptimizer-3.3.9 (09 Dec 2009)
+
+  09 Dec 2009; Benedikt Böhm <hollow@gentoo.org>
+  -ZendOptimizer-3.3.0a.ebuild, -ZendOptimizer-3.3.3.ebuild,
+  +ZendOptimizer-3.3.9.ebuild:
+  version bump wrt #292474, remove blocker on eAccelerator wrt #258736
 
   07 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   ZendOptimizer-3.3.3-r1.ebuild:
diff --git a/dev-php5/ZendOptimizer/ZendOptimizer-3.3.0a.ebuild b/dev-php5/ZendOptimizer/ZendOptimizer-3.3.0a.ebuild
deleted file mode 100644
index e2bb5aa32288..000000000000
--- a/dev-php5/ZendOptimizer/ZendOptimizer-3.3.0a.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendOptimizer/ZendOptimizer-3.3.0a.ebuild,v 1.1 2007/08/30 12:58:10 jokey 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-glibc21-i386.tar.gz )"
-
-MY_ARCH=${ARCH/x86/glibc21-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() {
-	einfo
-	einfo "Please download ${PN}-${PV}-linux-${MY_ARCH} from:"
-	einfo "${HOMEPAGE}"
-	einfo "and put it into /usr/portage/distfiles/."
-	einfo "Please note that you need a valid Zend Account"
-	einfo "(free) to download the Zend Optimizer!"
-	einfo
-}
-
-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
-
-	# Detect which PHP5 version is installed
-	if has_version =dev-lang/php-5.1* ; then
-		ZENDOPT_VERSION_DIR="5_1_x_comp"
-	elif 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" "0"
-	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.3.ebuild b/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9.ebuild
index f3f196a651c7..0b01348ec9ac 100644
--- a/dev-php5/ZendOptimizer/ZendOptimizer-3.3.3.ebuild
+++ b/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9.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/ZendOptimizer/ZendOptimizer-3.3.3.ebuild,v 1.1 2008/03/03 17:01:27 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendOptimizer/ZendOptimizer-3.3.9.ebuild,v 1.1 2009/12/09 08:37:26 hollow Exp $
 
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_NAME="ZendOptimizer"
@@ -11,7 +11,7 @@ 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 )"
+		x86? ( ${PN}-${PV}-linux-glibc23-i386.tar.gz )"
 
 MY_ARCH=${ARCH/x86/glibc23-i386}
 MY_ARCH=${MY_ARCH/amd64/glibc23-x86_64}
@@ -27,18 +27,18 @@ IUSE=""
 RESTRICT="mirror fetch strip"
 
 DEPEND=""
-RDEPEND="!dev-php5/xdebug !dev-php5/pecl-apc !dev-php5/eaccelerator"
+RDEPEND="!dev-php5/xdebug !dev-php5/pecl-apc"
 
 need_php_by_category
 
 pkg_nofetch() {
-	einfo
-	einfo "Please download ${PN}-${PV}-linux-${MY_ARCH} from:"
-	einfo "${HOMEPAGE}"
-	einfo "and put it into ${DISTDIR}."
-	einfo "Please note that you need a valid Zend Account"
-	einfo "(free) to download the Zend Optimizer!"
-	einfo
+	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() {
@@ -69,7 +69,7 @@ src_install() {
 
 	# 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" "0"
+	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