Cleanup.

Package-Manager: portage-2.1.2.2

4 files changed, 29 insertions, 27 deletions

diff --git a/dev-php5/xcache/ChangeLog b/dev-php5/xcache/ChangeLog
index d5252374c093..ac5d8c551fc4 100644
--- a/dev-php5/xcache/ChangeLog
+++ b/dev-php5/xcache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php5/xcache
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/ChangeLog,v 1.4 2007/03/04 17:32:23 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/ChangeLog,v 1.5 2007/03/18 03:24:25 chtekk Exp $
+
+  18 Mar 2007; Luca Longinotti <chtekk@gentoo.org> xcache-1.2.0.ebuild:
+  Cleanup.
 
   04 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
   -files/xcache-hardening-0.4.11.patch, metadata.xml, xcache-1.2.0.ebuild:
diff --git a/dev-php5/xcache/xcache-1.2.0.ebuild b/dev-php5/xcache/xcache-1.2.0.ebuild
index 32395b3ebda2..17f6a97c865f 100644
--- a/dev-php5/xcache/xcache-1.2.0.ebuild
+++ b/dev-php5/xcache/xcache-1.2.0.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/xcache/xcache-1.2.0.ebuild,v 1.4 2007/03/04 17:32:23 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/xcache-1.2.0.ebuild,v 1.5 2007/03/18 03:24:25 chtekk Exp $
 
 PHP_EXT_NAME="xcache"
 PHP_EXT_INI="yes"
@@ -13,13 +13,11 @@ KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Another PHP opcode cache and encoder."
 HOMEPAGE="http://trac.lighttpd.net/xcache/"
 SRC_URI="http://210.51.190.228/pub/XCache/Releases/${P}.tar.bz2"
-
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-DEPEND="!dev-php5/pecl-apc
-		!dev-php5/eaccelerator"
+DEPEND="!dev-php5/eaccelerator !dev-php5/pecl-apc"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
@@ -34,13 +32,13 @@ pkg_setup() {
 src_compile() {
 	has_php
 
-	my_conf="--enable-xcache=shared \
-		--enable-xcache-constant    \
-		--enable-xcache-optimizer   \
-		--enable-xcache-coverager   \
-		--enable-xcache-assembler   \
-		--enable-xcache-encoder     \
-		--enable-xcache-decoder"
+	my_conf="--enable-xcache=shared   \
+			--enable-xcache-constant  \
+			--enable-xcache-optimizer \
+			--enable-xcache-coverager \
+			--enable-xcache-assembler \
+			--enable-xcache-encoder   \
+			--enable-xcache-decoder"
 
 	enable_extension_with_built_with =${PHP_PKG} apache2 apxs2 /usr/sbin/apxs2 "optimisation for apache2"
 	enable_extension_with_built_with =${PHP_PKG} apache apxs /usr/sbin/apxs "optimisation for apache1"
@@ -69,15 +67,12 @@ src_install() {
 	dodir "${PHP_EXT_SHARED_DIR}"
 	insinto "${PHP_EXT_SHARED_DIR}"
 	doins Decompiler.class.php
+	dodir "${PHP_EXT_SHARED_DIR}/admin"
 	insinto "${PHP_EXT_SHARED_DIR}/admin"
 	doins admin/*
 }
 
 pkg_postinst() {
 	elog "Decompiler.class.php and the admin/ directory shipped with this"
-	elog "release were installed into /usr/share/php5/xcache/."
-
-	if built_with_use =${PHP_PKG} apache || built_with_use =${PHP_PKG} apache2 ; then
-		elog "You need to restart your Apache webserver to enable xcache."
-	fi
+	elog "release were installed into ${ROOT}usr/share/php5/xcache/."
 }
diff --git a/dev-php5/znf/ChangeLog b/dev-php5/znf/ChangeLog
index d918d2d8eb80..30aefda8ea77 100644
--- a/dev-php5/znf/ChangeLog
+++ b/dev-php5/znf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php5/znf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/znf/ChangeLog,v 1.4 2007/02/22 00:07:20 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/znf/ChangeLog,v 1.5 2007/03/18 03:21:08 chtekk Exp $
+
+  18 Mar 2007; Luca Longinotti <chtekk@gentoo.org> znf-0.7.6.ebuild:
+  Cleanup.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-php5/znf/znf-0.7.6.ebuild b/dev-php5/znf/znf-0.7.6.ebuild
index 19750d59e8bd..571005cce80a 100644
--- a/dev-php5/znf/znf-0.7.6.ebuild
+++ b/dev-php5/znf/znf-0.7.6.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/znf/znf-0.7.6.ebuild,v 1.3 2006/04/19 01:37:53 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/znf/znf-0.7.6.ebuild,v 1.4 2007/03/18 03:21:08 chtekk Exp $
 
 inherit php-pear-lib-r1
 
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+MY_P="ZNF-${PV}"
+
 DESCRIPTION="PHP5 MVC framework for enterprise web applications."
 HOMEPAGE="http://znf.zeronotice.com/"
+SRC_URI="mirror://sourceforge/znf/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="pear-db smarty"
 
-MY_P="ZNF-${PV}"
-SRC_URI="mirror://sourceforge/znf/${MY_P}.tgz"
-S="${WORKDIR}/${MY_P}"
-
+DEPEND=""
 RDEPEND="pear-db? ( >=dev-php/PEAR-DB-1.7.6-r1 )
 		smarty? ( >=dev-php/smarty-2.6.10-r1 )"
 
+S="${WORKDIR}/${MY_P}"
+
 need_php_by_category
 
 pkg_setup() {
 	has_php
-
-	# we need XML/XSL support in PHP5 for this
 	require_php_with_use xml xsl
 }