Fixes bug 350450

(Portage version: 2.1.9.28/cvs/Linux i686)

2 files changed, 100 insertions, 1 deletions

diff --git a/dev-php5/eaccelerator/ChangeLog b/dev-php5/eaccelerator/ChangeLog
index 934ddc31b3ac..8734d9f13a0a 100644
--- a/dev-php5/eaccelerator/ChangeLog
+++ b/dev-php5/eaccelerator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/eaccelerator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/ChangeLog,v 1.30 2011/01/04 08:47:48 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/ChangeLog,v 1.31 2011/01/04 13:42:54 olemarkus Exp $
+
+*eaccelerator-0.9.6.1-r2 (04 Jan 2011)
+
+  04 Jan 2011; Ole Markus With <olemarkus@gentoo.org>
+  +eaccelerator-0.9.6.1-r2.ebuild:
+  Fixes bug 350450
 
   04 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
   eaccelerator-0.9.6.1-r1.ebuild:
diff --git a/dev-php5/eaccelerator/eaccelerator-0.9.6.1-r2.ebuild b/dev-php5/eaccelerator/eaccelerator-0.9.6.1-r2.ebuild
new file mode 100644
index 000000000000..e408406454ca
--- /dev/null
+++ b/dev-php5/eaccelerator/eaccelerator-0.9.6.1-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/eaccelerator-0.9.6.1-r2.ebuild,v 1.1 2011/01/04 13:42:54 olemarkus Exp $
+
+PHP_EXT_NAME="eaccelerator"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+EAPI="2"
+
+[[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator-php5/"
+
+inherit php-ext-source-r2 eutils depend.apache
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A PHP Accelerator & Encoder."
+HOMEPAGE="http://www.eaccelerator.net/"
+SRC_URI="http://bart.eaccelerator.net/source/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug disassembler inode doccommentinclusion session"
+
+DEPEND="!dev-php5/pecl-apc !dev-php5/xcache"
+RDEPEND="${DEPEND}
+	>=dev-lang/php-5.1[zlib,session?]
+	virtual/httpd-php
+"
+
+# Webserver user and group, here for Apache by default
+HTTPD_USER="${HTTPD_USER:-apache}"
+HTTPD_GROUP="${HTTPD_GROUP:-apache}"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	if ! use apache2 ; then
+		if [[ ${HTTPD_USER} == "apache" ]] || [[ ${HTTPD_GROUP} == "apache" ]] ; then
+			eerror "You did not enable apache2 USE flag, so you need to define"
+			eerror "the user and group that will be used for ${PN} yourself."
+			eerror
+			eerror "This should (generally) match the user and group that your webserver uses, e.g.:"
+			eerror "HTTPD_USER=\"lighttpd\" HTTPD_GROUP=\"lighttpd\" if using www-servers/lighttpd"
+			eerror
+			die "Either enable USE=\"apache2\" or re-emerge this with HTTPD_USER and HTTPD_GROUP set"
+		else
+			enewgroup ${HTTPD_GROUP}
+			enewuser ${HTTPD_USER} -1 -1 /var/www ${HTTPD_GROUP}
+		fi
+	fi
+}
+
+src_compile() {
+	my_conf="--enable-eaccelerator=shared --with-eaccelerator-userid=`id -u ${HTTPD_USER}`"
+	use debug && my_conf="${my_conf} --with-eaccelerator-debug"
+	use disassembler && my_conf="${my_conf} --with-eaccelerator-disassembler"
+	! use inode && my_conf="${my_conf} --without-eaccelerator-use-inode"
+	use doccommentinclusion && my_conf="${my_conf} --with-eaccelerator-doc-comment-inclusion"
+	php-ext-source-r2_src_compile
+}
+
+src_install() {
+	php-ext-source-r2_src_install
+
+	keepdir "${EACCELERATOR_CACHEDIR}"
+	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${EACCELERATOR_CACHEDIR}"
+	fperms 750 "${EACCELERATOR_CACHEDIR}"
+
+	insinto "/usr/share/${PF}"
+	doins -r doc/php/
+	dodoc AUTHORS ChangeLog NEWS README
+
+	php-ext-source-r2_addtoinifiles "eaccelerator.shm_size" '"28"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.cache_dir" "\"${EACCELERATOR_CACHEDIR}\""
+	php-ext-source-r2_addtoinifiles "eaccelerator.enable" '"1"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.optimizer" '"1"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.debug" '"0"'
+	php-ext-source-r2_addtoinifiles ";eaccelerator.log_file" '"/var/log/eaccelerator_log"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.check_mtime" '"1"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.filter" '""'
+	php-ext-source-r2_addtoinifiles "eaccelerator.shm_ttl" '"0"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.shm_prune_period" '"0"'
+	php-ext-source-r2_addtoinifiles "eaccelerator.shm_only" '"0"'
+	php-ext-source-r2_addtoinifiles ";eaccelerator.allowed_admin_path" '"/path/where/admin/files/shall/be/allowed"'
+}
+
+pkg_postinst() {
+	elog "Please see the files in ${ROOT}usr/share/${PF}/ for some"
+	elog "examples and informations on how to use the functions that"
+	elog "eAccelerator adds to PHP."
+}