Cleanup.

Package-Manager: portage-2.1.2_rc4-r8

4 files changed, 27 insertions, 18 deletions

diff --git a/net-www/mod_pcgi2/ChangeLog b/net-www/mod_pcgi2/ChangeLog
index 275934b5291c..4af9cc3b2d8e 100644
--- a/net-www/mod_pcgi2/ChangeLog
+++ b/net-www/mod_pcgi2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mod_pcgi2
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/ChangeLog,v 1.15 2006/06/04 20:14:46 vericgar Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/ChangeLog,v 1.16 2007/01/14 18:24:00 chtekk Exp $
+
+  14 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/mod_pcgi2-2.0.1-macrofix.patch, -files/2.0.2/20_mod_pcgi.conf,
+  files/20_mod_pcgi.conf, mod_pcgi2-2.0.2.ebuild:
+  Cleanup.
 
   04 Jun 2006; Michael Stewart <vericgar@gentoo.org> ChangeLog:
   Remove old-style ebuilds
diff --git a/net-www/mod_pcgi2/files/20_mod_pcgi.conf b/net-www/mod_pcgi2/files/20_mod_pcgi.conf
index efccdeabe2ae..87214413c94a 100644
--- a/net-www/mod_pcgi2/files/20_mod_pcgi.conf
+++ b/net-www/mod_pcgi2/files/20_mod_pcgi.conf
@@ -1,11 +1,12 @@
 <IfDefine PCGI>
 	<IfModule !mod_pcgi2.c>
-	LoadModule mod_pcgi2	extramodules/mod_pcgi2.so
-	</IfModule>
-
-	<IfModule mod_pcgi2.c>
-    # please see /usr/share/doc/mod_pcgi-*/README
-    # for details on the required apache directives
+		LoadModule pcgi2_module	modules/mod_pcgi2.so
 	</IfModule>
 </IfDefine>
+
+<IfModule mod_pcgi2.c>
+	# please see /usr/share/doc/mod_pcgi-*/README
+	# for details on the required apache directives
+</IfModule>
+
 # vim:ft=apache:
diff --git a/net-www/mod_pcgi2/files/digest-mod_pcgi2-2.0.2 b/net-www/mod_pcgi2/files/digest-mod_pcgi2-2.0.2
index 0b538cd82bb9..c063fdb9112d 100644
--- a/net-www/mod_pcgi2/files/digest-mod_pcgi2-2.0.2
+++ b/net-www/mod_pcgi2/files/digest-mod_pcgi2-2.0.2
@@ -1 +1,3 @@
 MD5 343242bf25141f228b3d2dd0e5526732 mod_pcgi2-2.0.2-src.tar.gz 32214
+RMD160 381a6c7a58e52babcc6ffe425673784ac3ce4821 mod_pcgi2-2.0.2-src.tar.gz 32214
+SHA256 853f8a02483774d3cf9f1861d467481086fc75cbd38f5e0a00c265574587a63e mod_pcgi2-2.0.2-src.tar.gz 32214
diff --git a/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild b/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
index 3424dcbfb3bc..494ebb470452 100644
--- a/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
+++ b/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
@@ -1,31 +1,32 @@
-# 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/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild,v 1.5 2006/06/04 18:44:30 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/mod_pcgi2-2.0.2.ebuild,v 1.6 2007/01/14 18:24:00 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="An Apache module to talk to Zope Corporation's PCGI"
+KEYWORDS="~ppc ~x86"
+
+DESCRIPTION="An Apache module to talk to Zope Corporation's PCGI."
 HOMEPAGE="http://www.zope.org/Members/phd/mod_pcgi2/"
 SRC_URI="http://zope.org/Members/phd/${PN}/${PN}/${P}-src.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 DEPEND="www-apps/pcgi"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN/mod_}
+S="${WORKDIR}/${PN/mod_}"
 
 APXS1_ARGS="-Wc,-DMOD_PCGI2 -Wc,-DUNIX -I./ -o mod_pcgi2.so -c mod_pcgi2.c parseinfo.c pcgi-wrapper.c"
 APXS2_ARGS="-n pcgi2 -DUNIX -DAPACHE2 -DMOD_PCGI2 -c mod_pcgi2.c pcgi-wrapper.c parseinfo.c "
 
-APACHE1_MOD_CONF="${PVR}/20_mod_pcgi"
+APACHE1_MOD_CONF="20_mod_pcgi"
 APACHE1_MOD_DEFINE="PCGI"
 
-APACHE2_MOD_CONF="${PVR}/20_mod_pcgi"
+APACHE2_MOD_CONF="20_mod_pcgi"
 APACHE2_MOD_DEFINE="PCGI"
 
-DOCFILES="NEWS README TODO ChangeLog"
+DOCFILES="NEWS README ChangeLog"
 
 need_apache