Porting from project overlay

(Portage version: 2.1.3.5)

4 files changed, 39 insertions, 9 deletions

diff --git a/dev-php4/eaccelerator/ChangeLog b/dev-php4/eaccelerator/ChangeLog
index b08f89947715..26f18eb0eaab 100644
--- a/dev-php4/eaccelerator/ChangeLog
+++ b/dev-php4/eaccelerator/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-php4/eaccelerator
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/eaccelerator/ChangeLog,v 1.21 2007/05/12 14:33:50 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/eaccelerator/ChangeLog,v 1.22 2007/08/20 21:00:40 jokey Exp $
+
+*eaccelerator-0.9.5.1 (20 Aug 2007)
+
+  20 Aug 2007; Markus Ullmann <jokey@gentoo.org> -eaccelerator-0.9.5.ebuild,
+  +eaccelerator-0.9.5.1.ebuild:
+  Porting from project overlay
+
+  20 Aug 2007; Jakub Moc <jakub@gentoo.org> eaccelerator-0.9.5.1.ebuild:
+  This ebuild mistakenly assumed that apache user and group exist. Make
+  HTTPD_{USER,GROUP} configurable and fix pkg_setup accordingly.
+
+  20 Aug 2007; Jakub Moc <jakub@gentoo.org> +metadata.xml,
+  +eaccelerator-0.9.5.1.ebuild:
+  Version bump
 
   12 May 2007; Luca Longinotti <chtekk@gentoo.org>
   eaccelerator-0.9.5.ebuild:
diff --git a/dev-php4/eaccelerator/eaccelerator-0.9.5.ebuild b/dev-php4/eaccelerator/eaccelerator-0.9.5.1.ebuild
index 6e92041193cf..8452c41d696d 100644
--- a/dev-php4/eaccelerator/eaccelerator-0.9.5.ebuild
+++ b/dev-php4/eaccelerator/eaccelerator-0.9.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/eaccelerator/eaccelerator-0.9.5.ebuild,v 1.9 2007/05/12 14:33:50 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/eaccelerator/eaccelerator-0.9.5.1.ebuild,v 1.1 2007/08/20 21:00:40 jokey Exp $
 
 PHP_EXT_NAME="eaccelerator"
 PHP_EXT_INI="yes"
@@ -8,7 +8,7 @@ PHP_EXT_ZENDEXT="yes"
 
 [[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator-php4/"
 
-inherit php-ext-source-r1
+inherit php-ext-source-r1 depend.apache
 
 KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
 
@@ -22,11 +22,12 @@ IUSE="contentcache debug disassembler inode session sharedmem"
 DEPEND="!dev-php4/pecl-apc !dev-php4/xcache"
 RDEPEND="${DEPEND}"
 
-# Webserver user and group, here for Apache.
-HTTPD_USER="apache"
-HTTPD_GROUP="apache"
+# Webserver user and group, here for Apache by default
+HTTPD_USER="${HTTPD_USER:-apache}"
+HTTPD_GROUP="${HTTPD_GROUP:-apache}"
 
 need_php_by_category
+want_apache
 
 pkg_setup() {
 	has_php
@@ -38,6 +39,21 @@ pkg_setup() {
 	else
 		require_php_with_use zlib
 	fi
+
+	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() {
diff --git a/dev-php4/eaccelerator/files/digest-eaccelerator-0.9.5 b/dev-php4/eaccelerator/files/digest-eaccelerator-0.9.5
deleted file mode 100644
index 4ac966e128b1..000000000000
--- a/dev-php4/eaccelerator/files/digest-eaccelerator-0.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dad54af67488b83a2af6e30f661f613b eaccelerator-0.9.5.tar.bz2 121791
-RMD160 3c3e6acfa53113581c52c1c70420059ace9346ce eaccelerator-0.9.5.tar.bz2 121791
-SHA256 9118cda6f7a8013bb22621304f783ecb629fcc9c556f182e3caf0913dc7294cf eaccelerator-0.9.5.tar.bz2 121791
diff --git a/dev-php4/eaccelerator/files/digest-eaccelerator-0.9.5.1 b/dev-php4/eaccelerator/files/digest-eaccelerator-0.9.5.1
new file mode 100644
index 000000000000..ddcc84b27930
--- /dev/null
+++ b/dev-php4/eaccelerator/files/digest-eaccelerator-0.9.5.1
@@ -0,0 +1,3 @@
+MD5 d4759d444f55801762af963df6fca9ff eaccelerator-0.9.5.1.tar.bz2 122279
+RMD160 871ab91e2fe94bc214ed7dfe927a57289e2e3485 eaccelerator-0.9.5.1.tar.bz2 122279
+SHA256 dadef8cfe4624ea8a42aacd1b7db8eb47672a13ed7f78dd9028ce9edc33c2de2 eaccelerator-0.9.5.1.tar.bz2 122279