Porting from project overlay

Package-Manager: portage-2.1.3.5

5 files changed, 61 insertions, 21 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/Manifest b/dev-php4/eaccelerator/Manifest
index 0db772d49324..b66a079cda06 100644
--- a/dev-php4/eaccelerator/Manifest
+++ b/dev-php4/eaccelerator/Manifest
@@ -1,16 +1,26 @@
-DIST eaccelerator-0.9.5.tar.bz2 121791 RMD160 3c3e6acfa53113581c52c1c70420059ace9346ce SHA1 12f3319614e5b672f37095f03478e7f3ed904a43 SHA256 9118cda6f7a8013bb22621304f783ecb629fcc9c556f182e3caf0913dc7294cf
-EBUILD eaccelerator-0.9.5.ebuild 3332 RMD160 23ddc7bf82c9ad0ee9f88a77b444497d0848dfe2 SHA1 81be6ebc8d7ae067b7707e376ce26d83ce618c37 SHA256 7bea4098416baffb5cb2490fd3ad1461b6d06042865054d3393db56d2bdfe5b4
-MD5 9bd8f35ca628298191a3f57f2fc3137a eaccelerator-0.9.5.ebuild 3332
-RMD160 23ddc7bf82c9ad0ee9f88a77b444497d0848dfe2 eaccelerator-0.9.5.ebuild 3332
-SHA256 7bea4098416baffb5cb2490fd3ad1461b6d06042865054d3393db56d2bdfe5b4 eaccelerator-0.9.5.ebuild 3332
-MISC ChangeLog 2756 RMD160 0f74a0bdb598aa355dece037671c485a26e214e3 SHA1 8bffde221e0436312fe8345ef428b2dd284283f0 SHA256 79aee40f44bc12987f23da5e737bab4815b4209a916bbd4294ace07987a60f7e
-MD5 f577b178318a2a932c3a96e0995408bf ChangeLog 2756
-RMD160 0f74a0bdb598aa355dece037671c485a26e214e3 ChangeLog 2756
-SHA256 79aee40f44bc12987f23da5e737bab4815b4209a916bbd4294ace07987a60f7e ChangeLog 2756
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST eaccelerator-0.9.5.1.tar.bz2 122279 RMD160 871ab91e2fe94bc214ed7dfe927a57289e2e3485 SHA1 2789f56d713549a360871accd9869a6bb4a0b514 SHA256 dadef8cfe4624ea8a42aacd1b7db8eb47672a13ed7f78dd9028ce9edc33c2de2
+EBUILD eaccelerator-0.9.5.1.ebuild 4043 RMD160 37b2a65463c09cbbce273b8200c6e889eae72375 SHA1 05d60b0a5c695534f8c5dfdad0a3c3a45dff7c43 SHA256 d591c79076ce1f6599cc1c5d4ca503f2de8579a9937353cf1ea43429170a9981
+MD5 8984c8823704a4860036afbe6bb02e7e eaccelerator-0.9.5.1.ebuild 4043
+RMD160 37b2a65463c09cbbce273b8200c6e889eae72375 eaccelerator-0.9.5.1.ebuild 4043
+SHA256 d591c79076ce1f6599cc1c5d4ca503f2de8579a9937353cf1ea43429170a9981 eaccelerator-0.9.5.1.ebuild 4043
+MISC ChangeLog 3251 RMD160 b779c9854b6320df5dbfea82fd52c796a931c2a2 SHA1 68e124c86635aef3a89901a92e9c73f2cd4e0fb8 SHA256 d93436791f2fc93062ebe2c51150521ed1e01f6560e70a150869662b31138158
+MD5 423b0799407262a8e315d864c34b142e ChangeLog 3251
+RMD160 b779c9854b6320df5dbfea82fd52c796a931c2a2 ChangeLog 3251
+SHA256 d93436791f2fc93062ebe2c51150521ed1e01f6560e70a150869662b31138158 ChangeLog 3251
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
-MD5 64d33eeb9ffd69fb3308809686bd22a6 files/digest-eaccelerator-0.9.5 259
-RMD160 059394e5781b99952e203e71250c7cdb4de1df76 files/digest-eaccelerator-0.9.5 259
-SHA256 7842729c6d7bf733b9c0d33625a459a2c53ab851c761fbfb6a51f65c147d8b8b files/digest-eaccelerator-0.9.5 259
+MD5 869cf9a7bc5378b7d7921f26d2004cfb files/digest-eaccelerator-0.9.5.1 265
+RMD160 872fd6918edff8aaff9e802736b60a6ae631af37 files/digest-eaccelerator-0.9.5.1 265
+SHA256 227dad023455675a26f04f70f3d0a2ebaad18c065d97a7df9675531ef18eb52b files/digest-eaccelerator-0.9.5.1 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGygECz974XjDVpbkRAoX0AKDeuxa0W62LzqEcFB8Dd77vxXP/qgCeLK8q
+SIUcoQjW3Yz3NQFP/6QCmV8=
+=Vfaf
+-----END PGP SIGNATURE-----
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