Version bump with new features.

(Portage version: 2.1_pre7-r2)

5 files changed, 46 insertions, 58 deletions

diff --git a/dev-php5/eaccelerator/ChangeLog b/dev-php5/eaccelerator/ChangeLog
index f8763710b673..d1afa7f82245 100644
--- a/dev-php5/eaccelerator/ChangeLog
+++ b/dev-php5/eaccelerator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/eaccelerator
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/ChangeLog,v 1.1 2006/03/05 07:07:06 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/ChangeLog,v 1.2 2006/04/12 13:25:20 chtekk Exp $
+
+*eaccelerator-0.9.5_beta2 (12 Apr 2006)
+
+  12 Apr 2006; Luca Longinotti <chtekk@gentoo.org>
+  -eaccelerator-0.9.5_beta1.ebuild, +eaccelerator-0.9.5_beta2.ebuild:
+  Version bump, add some new USE flags for features that were changed, update
+  the ebuild accordingly.
 
 *eaccelerator-0.9.5_beta1 (05 Mar 2006)
 
diff --git a/dev-php5/eaccelerator/Manifest b/dev-php5/eaccelerator/Manifest
index 83d5bceeb4a3..24769944ab42 100644
--- a/dev-php5/eaccelerator/Manifest
+++ b/dev-php5/eaccelerator/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d3d2b2085861657fa143d570bd3e1e4a ChangeLog 386
-RMD160 7086bf1745a3c042beacad540bba9f6cd71b2921 ChangeLog 386
-SHA256 2a8f9df6d9a24af025933989507a3a6e69e7489b93e6f1435a7e9959dbe2a99e ChangeLog 386
-MD5 8aad2f17a7d753ca770ac6afe9805601 eaccelerator-0.9.5_beta1.ebuild 3635
-RMD160 dcaf306dd679b8e33d29e47e002b6132bfdd636a eaccelerator-0.9.5_beta1.ebuild 3635
-SHA256 3c8a34ce862a6f8c507f99f810d47787e8f0f9d056efb3c263ee8ed27f46d711 eaccelerator-0.9.5_beta1.ebuild 3635
-MD5 5eb57f589916cd0ff543fc7347113b16 files/digest-eaccelerator-0.9.5_beta1 277
-RMD160 36cf5b4e5aa09ed38d28a822ef3c4e5168f3024b files/digest-eaccelerator-0.9.5_beta1 277
-SHA256 dbfa157bbc8516f5a6bd6f59208bc99b6ecf8e4a9935284d942e64305417d149 files/digest-eaccelerator-0.9.5_beta1 277
+MD5 9381942d9593c4e486cd7c0125eff972 ChangeLog 653
+RMD160 5e51d65bd83a498bf6651113dae086274d615744 ChangeLog 653
+SHA256 6193691a77965c7a137e96b6bc44e2057bd8873ef062a7f8a85dbcc597e5b7c6 ChangeLog 653
+MD5 c881ea779c8e31a2302ffbaec73f34f2 eaccelerator-0.9.5_beta2.ebuild 3306
+RMD160 18a4cef6c38269236f66702ed7455c74146d8e19 eaccelerator-0.9.5_beta2.ebuild 3306
+SHA256 25a939ebe2968601bc16cce5236a8ebbfaa1a2b21f47fda27686a6717b958a41 eaccelerator-0.9.5_beta2.ebuild 3306
+MD5 b3f63920fca4671ff8aec7f409f730fd files/digest-eaccelerator-0.9.5_beta2 277
+RMD160 a3f86e68885f6b171396bce5b32d840d0190ec73 files/digest-eaccelerator-0.9.5_beta2 277
+SHA256 88378bfa5c4a4bd4d7c3b9b316d48e586e19d151ef62a5f8fadd26100b9b5913 files/digest-eaccelerator-0.9.5_beta2 277
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFECo4oaGfFFLhbXWkRApKHAJ0QLQIKNWgjCJinIuPOsKUbQtRORQCfSwQP
-as6Gbfxtdl/ir1MKbtWSORg=
-=Ydo1
------END PGP SIGNATURE-----
diff --git a/dev-php5/eaccelerator/eaccelerator-0.9.5_beta1.ebuild b/dev-php5/eaccelerator/eaccelerator-0.9.5_beta2.ebuild
index d82c66cf792a..4ca9e4305a5e 100644
--- a/dev-php5/eaccelerator/eaccelerator-0.9.5_beta1.ebuild
+++ b/dev-php5/eaccelerator/eaccelerator-0.9.5_beta2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/eaccelerator-0.9.5_beta1.ebuild,v 1.1 2006/03/05 07:07:06 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/eaccelerator-0.9.5_beta2.ebuild,v 1.1 2006/04/12 13:25:20 chtekk Exp $
 
 PHP_EXT_NAME="eaccelerator"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 
-[ -z "${EACCELERATOR_CACHEDIR}" ] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator"
+[[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator"
 
 inherit php-ext-source-r1
 
-MY_P=${P/_/-}
+MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
 KEYWORDS="~x86"
@@ -19,13 +19,12 @@ HOMEPAGE="http://www.eaccelerator.net/"
 SRC_URI="mirror://sourceforge/eaccelerator/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="inode session"
+IUSE="contentcache disassembler inode session sharedmem"
 
 DEPEND="${DEPEND}
 		!dev-php5/pecl-apc"
 
-# this is a good example of why we need all web servers installed under a
-# common 'www' user and group!
+# Webserver user and group, here for Apache.
 HTTPD_USER="apache"
 HTTPD_GROUP="apache"
 
@@ -35,13 +34,12 @@ pkg_setup() {
 	has_php
 
 	require_php_sapi_from cgi apache apache2
-	require_php_with_use zlib
-}
-
-src_unpack() {
-	unpack ${A}
 
-	cd "${S}"
+	if use session ; then
+		require_php_with_use session zlib
+	else
+		require_php_with_use zlib
+	fi
 }
 
 src_compile() {
@@ -49,13 +47,11 @@ src_compile() {
 
 	my_conf="--enable-eaccelerator=shared"
 
-	if use !session; then
-		my_conf="${my_conf} --without-eaccelerator-sessions"
-	fi
-
-	if use !inode; then
-		my_conf="${my_conf} --without-eaccelerator-use-inode"
-	fi
+	use contentcache && my_conf="${my_conf} --with-eaccelerator-content-caching"
+	use disassembler && my_conf="${my_conf} --with-eaccelerator-disassembler"
+	use session && my_conf="${my_conf} --with-eaccelerator-sessions"
+	use sharedmem && my_conf="${my_conf} --with-eaccelerator-shared-memory"
+	use !inode && my_conf="${my_conf} --without-eaccelerator-use-inode"
 
 	php-ext-source-r1_src_compile
 }
@@ -68,15 +64,15 @@ src_install() {
 	fperms 750 "${EACCELERATOR_CACHEDIR}"
 
 	insinto "/usr/share/${PN}"
-	doins encoder.php eaccelerator.php eaccelerator_password.php
+	doins doc/php/*
 	dodoc-php AUTHORS ChangeLog COPYING NEWS README README.eLoader
 
-	php-ext-base-r1_addtoinifiles "eaccelerator.shm_size" '"64"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.shm_size" '"28"'
 	php-ext-base-r1_addtoinifiles "eaccelerator.cache_dir" "\"${EACCELERATOR_CACHEDIR}\""
 	php-ext-base-r1_addtoinifiles "eaccelerator.enable" '"1"'
 	php-ext-base-r1_addtoinifiles "eaccelerator.optimizer" '"1"'
-	php-ext-base-r1_addtoinifiles "eaccelerator.debug" '"0"'
 	php-ext-base-r1_addtoinifiles "eaccelerator.check_mtime" '"1"'
+	php-ext-base-r1_addtoinifiles "eaccelerator.debug" '"0"'
 	php-ext-base-r1_addtoinifiles "eaccelerator.filter" '""'
 	php-ext-base-r1_addtoinifiles "eaccelerator.shm_max" '"0"'
 	php-ext-base-r1_addtoinifiles "eaccelerator.shm_ttl" '"0"'
@@ -87,25 +83,20 @@ src_install() {
 	php-ext-base-r1_addtoinifiles "eaccelerator.keys" '"shm_and_disk"'
 	php-ext-base-r1_addtoinifiles "eaccelerator.sessions" '"shm_and_disk"'
 	php-ext-base-r1_addtoinifiles "eaccelerator.content" '"shm_and_disk"'
-	php-ext-base-r1_addtoinifiles ";eaccelerator.admin.name" '"username"'
-	php-ext-base-r1_addtoinifiles ";eaccelerator.admin.password" '"hashed_password"'
+	php-ext-base-r1_addtoinifiles ";eaccelerator.allowed_admin_path" '"/path/where/admin/files/shall/be/allowed"'
 }
 
 pkg_postinst() {
-	# you only need to restart the webserver if you're using mod_php
+	# You only need to restart the webserver if you're using mod_php.
 	if built_with_use =${PHP_PKG} apache || built_with_use =${PHP_PKG} apache2 ; then
-		einfo "You need to restart your webserver to activate eAccelerator."
+		einfo
+		einfo "You need to restart your Apache webserver to activate eAccelerator."
 		einfo
 	fi
 
-	# this web interface needs moving into a separate, webapp-config compatible
-	# package!!
-	einfo "A web interface is available to manage the eAccelerator cache."
-	einfo "Copy /usr/share/eaccelerator/*.php to somewhere"
-	einfo "where your web server can see it. See the documentation on how"
-	einfo "to secure this web interface with authentication."
 	einfo
-	einfo "A PHP script encoder is available to encode your PHP scripts."
-	einfo "The encoder is available as /usr/share/eaccelerator/encoder.php"
-	einfo "The encoded file format is not yet considered stable."
+	einfo "A series of PHP function is available to manage eAccelerator."
+	einfo "Please see the files in /usr/share/${PN} for some examples"
+	einfo "and informations on those functions and how to use them."
+	einfo
 }
diff --git a/dev-php5/eaccelerator/files/digest-eaccelerator-0.9.5_beta1 b/dev-php5/eaccelerator/files/digest-eaccelerator-0.9.5_beta1
deleted file mode 100644
index 202c6a554430..000000000000
--- a/dev-php5/eaccelerator/files/digest-eaccelerator-0.9.5_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 29f68a5975c1a09dbd72c9e8ddd534a7 eaccelerator-0.9.5-beta1.tar.bz2 109878
-RMD160 6a92cfb5bf30cd6c7cca0d5139875e308c52ded3 eaccelerator-0.9.5-beta1.tar.bz2 109878
-SHA256 f55781080ca48ba6d907c8101cf188987844a86d776c95b4f12dff2842d3f9d2 eaccelerator-0.9.5-beta1.tar.bz2 109878
diff --git a/dev-php5/eaccelerator/files/digest-eaccelerator-0.9.5_beta2 b/dev-php5/eaccelerator/files/digest-eaccelerator-0.9.5_beta2
new file mode 100644
index 000000000000..2499d444190c
--- /dev/null
+++ b/dev-php5/eaccelerator/files/digest-eaccelerator-0.9.5_beta2
@@ -0,0 +1,3 @@
+MD5 2516b680ce372765d24e7b64003f1e64 eaccelerator-0.9.5-beta2.tar.bz2 113387
+RMD160 7f7821c732aca434f098f3994ca2d50ed62144ce eaccelerator-0.9.5-beta2.tar.bz2 113387
+SHA256 b04234714fa8ff9753ccbcafeb499718af8c064c18a5b245fa2f60e98eeae8a2 eaccelerator-0.9.5-beta2.tar.bz2 113387