Remove hardenedphp patch (no more hardenedphp now), cleanup.

(Portage version: 2.1.2-r13)

4 files changed, 27 insertions, 46 deletions

diff --git a/dev-php5/xcache/ChangeLog b/dev-php5/xcache/ChangeLog
index 5984b3f9e28c..d5252374c093 100644
--- a/dev-php5/xcache/ChangeLog
+++ b/dev-php5/xcache/ChangeLog
@@ -1,6 +1,10 @@
 # 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.3 2007/03/04 00:08:24 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/ChangeLog,v 1.4 2007/03/04 17:32:23 chtekk Exp $
+
+  04 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/xcache-hardening-0.4.11.patch, metadata.xml, xcache-1.2.0.ebuild:
+  Remove hardenedphp patch (no more hardenedphp now), cleanup.
 
   04 Mar 2007; Marius Mauch <genone@gentoo.org> xcache-1.2.0.ebuild:
   Replacing einfo with elog
diff --git a/dev-php5/xcache/files/xcache-hardening-0.4.11.patch b/dev-php5/xcache/files/xcache-hardening-0.4.11.patch
deleted file mode 100644
index ad85122b83f6..000000000000
--- a/dev-php5/xcache/files/xcache-hardening-0.4.11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur xcache/processor/processor.m4 xcache-hardened/processor/processor.m4
---- xcache/processor/processor.m4	2006-07-10 19:19:26.000000000 +0200
-+++ xcache-hardened/processor/processor.m4	2006-07-10 19:03:00.000000000 +0200
-@@ -70,6 +70,9 @@
- 		ZVAL_REFCOUNT(dst) = 1;
- 		DONE(value)
- 		DONE(refcount)
-+#ifdef HARDENING_PATCH 
-+		DISPATCH(zend_ushort, flags); 
-+#endif
- 		DONE(type)
- 		DONE(is_ref)
- 	} while(0);
-@@ -136,6 +139,9 @@
- 		DISPATCH(zval_data_type, type)
- 		DISPATCH(zend_uchar, is_ref)
- 		DISPATCH(zend_ushort, refcount)
-+#ifdef HARDENING_PATCH
-+	DISPATCH(zend_ushort, flags);
-+#endif
- 	')dnl IFDASM
- ')
- dnl }}}
diff --git a/dev-php5/xcache/metadata.xml b/dev-php5/xcache/metadata.xml
index 5aa7aba33081..13e5bd886464 100644
--- a/dev-php5/xcache/metadata.xml
+++ b/dev-php5/xcache/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
-<maintainer><email>jokey@gentoo.org</email><name>Markus Ullmann</name></maintainer>
-<maintainer><email>christian@hoffie.info</email><name>Christian Hoffmann</name></maintainer>
+	<herd>php</herd>
+	<maintainer>
+		<email>jokey@gentoo.org</email>
+		<name>Markus Ullmann</name>
+	</maintainer>
+	<maintainer>
+		<email>christian@hoffie.info</email>
+		<name>Christian Hoffmann</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-php5/xcache/xcache-1.2.0.ebuild b/dev-php5/xcache/xcache-1.2.0.ebuild
index cbed28762cdf..32395b3ebda2 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.3 2007/03/04 00:08:24 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xcache/xcache-1.2.0.ebuild,v 1.4 2007/03/04 17:32:23 chtekk Exp $
 
 PHP_EXT_NAME="xcache"
 PHP_EXT_INI="yes"
@@ -8,18 +8,19 @@ PHP_EXT_ZENDEXT="yes"
 
 inherit php-ext-source-r1 confutils
 
-DESCRIPTION="Another PHP opcode cache and encoder"
+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"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="${DEPEND}
-	!dev-php5/pecl-apc
-	!dev-php5/eaccelerator"
+DEPEND="!dev-php5/pecl-apc
+		!dev-php5/eaccelerator"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 
@@ -30,21 +31,15 @@ pkg_setup() {
 	require_php_sapi_from cgi apache apache2
 }
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	has_hardenedphp && epatch "${FILESDIR}"/${PN}-hardening-0.4.11.patch
-}
-
 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-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"
@@ -83,7 +78,6 @@ pkg_postinst() {
 	elog "release were installed into /usr/share/php5/xcache/."
 
 	if built_with_use =${PHP_PKG} apache || built_with_use =${PHP_PKG} apache2 ; then
-		echo
-		elog "You need to restart your Apache webserver to activate xcache."
+		elog "You need to restart your Apache webserver to enable xcache."
 	fi
 }