Cleanup.

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/net-www/mod_scgi/ChangeLog b/net-www/mod_scgi/ChangeLog
index 3640a188734954abc0c76359ef705f8cd5100ba8..eea9a8090f6a6f764c068547090bf4ad43458c81 100644 (file)
--- a/net-www/mod_scgi/ChangeLog
+++ b/net-www/mod_scgi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mod_scgi
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.16 2006/06/05 17:33:25 hollow Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.17 2007/01/14 19:59:34 chtekk Exp $
+
+  14 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/1.2/20_mod_scgi.conf, files/20_mod_scgi.conf, -mod_scgi-1.2.ebuild,
+  mod_scgi-1.10.ebuild:
+  Cleanup.
 
 *mod_scgi-1.10 (05 Jun 2006)
 

diff --git a/net-www/mod_scgi/files/20_mod_scgi.conf b/net-www/mod_scgi/files/20_mod_scgi.conf
index 057e028a7c609e17cd206f1afa731e26fc4e0780..59958aac8fd0d7c4b4370b2fabd9d78735ef733c 100644 (file)
--- a/net-www/mod_scgi/files/20_mod_scgi.conf
+++ b/net-www/mod_scgi/files/20_mod_scgi.conf
@@ -1,6 +1,6 @@
 <IfDefine SCGI>
        <IfModule !mod_scgi.c>
-       LoadModule mod_scgi     extramodules/mod_scgi.so
+           LoadModule scgi_module     modules/mod_scgi.so
        </IfModule>
 
        <IfModule mod_scgi.c>

diff --git a/net-www/mod_scgi/mod_scgi-1.10.ebuild b/net-www/mod_scgi/mod_scgi-1.10.ebuild
index fd4d496659040da8b053a4d8a3eac4a93d159736..9ddb0cdc1b646fb1b076eca0992819b938ac1007 100644 (file)
--- a/net-www/mod_scgi/mod_scgi-1.10.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.10.ebuild
@@ -1,37 +1,38 @@
-# 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_scgi/mod_scgi-1.10.ebuild,v 1.1 2006/06/05 17:33:25 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.10.ebuild,v 1.2 2007/01/14 19:59:34 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="Apache module for a Replacement for the CGI protocol that is similar to FastCGI"
+KEYWORDS="~ppc ~x86"
+
+DESCRIPTION="Apache module for a replacement of the CGI protocol, similar to FastCGI."
 HOMEPAGE="http://www.mems-exchange.org/software/scgi/"
 SRC_URI="http://www.mems-exchange.org/software/files/scgi/${P/mod_}.tar.gz"
-
 LICENSE="CNRI"
-KEYWORDS="~x86 ~ppc"
-IUSE="apache2"
+SLOT="0"
+IUSE=""
+
 DEPEND="www-apps/scgi"
 RDEPEND="${DEPEND}"
-SLOT="0"
 
-S=${WORKDIR}/${P/mod_}
+S="${WORKDIR}/${P/mod_}"
 
 APXS1_S="${S}/apache1"
 APACHE1_MOD_FILE="${S}/apache1/${PN}.so"
-APACHE1_MOD_CONF="1.2/20_mod_scgi"
+APACHE1_MOD_CONF="20_mod_scgi"
 APACHE1_MOD_DEFINE="SCGI"
 
 APXS2_S="${S}/apache2"
 APACHE2_MOD_FILE="${S}/apache2/.libs/${PN}.so"
-APACHE2_MOD_CONF="1.2/20_mod_scgi"
+APACHE2_MOD_CONF="20_mod_scgi"
 APACHE2_MOD_DEFINE="SCGI"
 
 need_apache
 
 DOCFILES="PKG-INFO LICENSE.txt CHANGES"
 
-if useq apache2; then
+if use apache2 ; then
        DOCFILES="${DOCFILES} apache2/README"
 else
        DOCFILES="${DOCFILES} apache1/README"