Cleanup. Fix bug #156414.

Package-Manager: portage-2.1.2.1

3 files changed, 20 insertions, 35 deletions

diff --git a/dev-php5/eaccelerator/ChangeLog b/dev-php5/eaccelerator/ChangeLog
index d43ffdf0ba78..e25d1baf2d6b 100644
--- a/dev-php5/eaccelerator/ChangeLog
+++ b/dev-php5/eaccelerator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/eaccelerator
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/ChangeLog,v 1.14 2007/01/28 06:29:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/ChangeLog,v 1.15 2007/03/06 15:21:38 chtekk Exp $
+
+  06 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  eaccelerator-0.9.5.ebuild:
+  Cleanup. Fix bug #156414.
 
   28 Jan 2007; Marius Mauch <genone@gentoo.org> eaccelerator-0.9.5.ebuild:
   Replacing einfo with elog
diff --git a/dev-php5/eaccelerator/Manifest b/dev-php5/eaccelerator/Manifest
index c47d95c45102..6bfbc2b8f317 100644
--- a/dev-php5/eaccelerator/Manifest
+++ b/dev-php5/eaccelerator/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST eaccelerator-0.9.5.tar.bz2 121791 RMD160 3c3e6acfa53113581c52c1c70420059ace9346ce SHA1 12f3319614e5b672f37095f03478e7f3ed904a43 SHA256 9118cda6f7a8013bb22621304f783ecb629fcc9c556f182e3caf0913dc7294cf
-EBUILD eaccelerator-0.9.5.ebuild 3506 RMD160 9306d533bc023c4074a10e6238b87f636462a6f7 SHA1 2b98e44fb242700b964c88bea53cce61f35e9f18 SHA256 bb4dbc74b2f8774364571210e7489b37066249d7bd31db2c0bf10ea072bc5b06
-MD5 f3ce942b643a31fa9f5f6b9fcb97f716 eaccelerator-0.9.5.ebuild 3506
-RMD160 9306d533bc023c4074a10e6238b87f636462a6f7 eaccelerator-0.9.5.ebuild 3506
-SHA256 bb4dbc74b2f8774364571210e7489b37066249d7bd31db2c0bf10ea072bc5b06 eaccelerator-0.9.5.ebuild 3506
-MISC ChangeLog 1991 RMD160 36e4d08da2b7f752f210460bc200b33da778193a SHA1 81f70972a686f17b44e40bd52e515706a6898d9a SHA256 35698b67e18f4a648e1c1ab23a771802d78d37ef78e6023e0b9de78b232356f5
-MD5 b3dcbaa2727974a9fda3aa182d0b7a12 ChangeLog 1991
-RMD160 36e4d08da2b7f752f210460bc200b33da778193a ChangeLog 1991
-SHA256 35698b67e18f4a648e1c1ab23a771802d78d37ef78e6023e0b9de78b232356f5 ChangeLog 1991
+EBUILD eaccelerator-0.9.5.ebuild 3332 RMD160 2e81034af6be3a577930883b0fa47f3ac164c468 SHA1 848e0944ca80e9a29a44e4ebefcb2a8f7023e759 SHA256 4cda6cb2f247bf941fb3a536f483101268b81762d5677e475841ac40cf2bac3d
+MD5 53751b3dd6571ff85c9aacba13acfbee eaccelerator-0.9.5.ebuild 3332
+RMD160 2e81034af6be3a577930883b0fa47f3ac164c468 eaccelerator-0.9.5.ebuild 3332
+SHA256 4cda6cb2f247bf941fb3a536f483101268b81762d5677e475841ac40cf2bac3d eaccelerator-0.9.5.ebuild 3332
+MISC ChangeLog 2100 RMD160 ac73ced91bf1d7e90d258dcd2f29fc47b8f1b254 SHA1 83ed872e57325f202f890b19777ef525af1d15b7 SHA256 472b378c50471bd29f0d251bafd3565b0fec2f9eda9752c724a26cce0e3f4d0c
+MD5 d21fdf1d306f087889655b8027d8f03b ChangeLog 2100
+RMD160 ac73ced91bf1d7e90d258dcd2f29fc47b8f1b254 ChangeLog 2100
+SHA256 472b378c50471bd29f0d251bafd3565b0fec2f9eda9752c724a26cce0e3f4d0c ChangeLog 2100
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -17,10 +14,3 @@ SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFvEV96J2i8a8J4okRAn9xAJ90LrTCJVEaex7qm+DCUZA9/nGFvgCePkra
-YNln3Ef8cwqZkX4fiRV50M8=
-=xY+n
------END PGP SIGNATURE-----
diff --git a/dev-php5/eaccelerator/eaccelerator-0.9.5.ebuild b/dev-php5/eaccelerator/eaccelerator-0.9.5.ebuild
index 8d367290065b..b8048dd45ea3 100644
--- a/dev-php5/eaccelerator/eaccelerator-0.9.5.ebuild
+++ b/dev-php5/eaccelerator/eaccelerator-0.9.5.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-php5/eaccelerator/eaccelerator-0.9.5.ebuild,v 1.8 2007/01/28 06:29:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/eaccelerator/eaccelerator-0.9.5.ebuild,v 1.9 2007/03/06 15:21:38 chtekk Exp $
 
 PHP_EXT_NAME="eaccelerator"
 PHP_EXT_INI="yes"
@@ -11,14 +11,15 @@ PHP_EXT_ZENDEXT="yes"
 inherit php-ext-source-r1
 
 KEYWORDS="~amd64 ~sparc ~x86"
+
 DESCRIPTION="A PHP Accelerator & Encoder."
 HOMEPAGE="http://www.eaccelerator.net/"
 SRC_URI="mirror://sourceforge/eaccelerator/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="contentcache debug disassembler session sharedmem"
+IUSE="contentcache debug disassembler inode session sharedmem"
 
-DEPEND="!dev-php5/pecl-apc"
+DEPEND="!dev-php5/pecl-apc !dev-php5/xcache"
 RDEPEND="${DEPEND}"
 
 # Webserver user and group, here for Apache.
@@ -47,6 +48,7 @@ src_compile() {
 	use contentcache && my_conf="${my_conf} --with-eaccelerator-content-caching"
 	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 session && my_conf="${my_conf} --with-eaccelerator-sessions"
 	use sharedmem && my_conf="${my_conf} --with-eaccelerator-shared-memory"
 
@@ -85,18 +87,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	has_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
-		elog
-		elog "You need to restart your Apache webserver to activate eAccelerator."
-		elog
-	fi
-
-	elog
-	elog "Please see the files in ${ROOT}/usr/share/${PN}-php5/ for some examples"
-	elog "and information on how to use the functions that"
+	elog "Please see the files in ${ROOT}usr/share/${PN}-php5/ for some"
+	elog "examples and informations on how to use the functions that"
 	elog "eAccelerator adds to PHP."
-	elog
 }