Cleanup.

(Portage version: 2.1.2_rc4-r8)

4 files changed, 31 insertions, 26 deletions

diff --git a/net-www/mod_security/ChangeLog b/net-www/mod_security/ChangeLog
index a68ddd8c9aad..e40c45dacc7e 100644
--- a/net-www/mod_security/ChangeLog
+++ b/net-www/mod_security/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_security
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/ChangeLog,v 1.19 2006/06/05 18:50:20 hollow Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/ChangeLog,v 1.20 2007/01/14 20:09:54 chtekk Exp $
+
+  14 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/1.8.6/99_mod_security.conf, files/99_mod_security.conf,
+  -files/mod_security.conf, mod_security-1.8.7.ebuild,
+  -mod_security-1.9.1.ebuild, mod_security-1.9.4.ebuild:
+  Cleanup.
 
 *mod_security-1.9.4 (05 Jun 2006)
 
diff --git a/net-www/mod_security/files/99_mod_security.conf b/net-www/mod_security/files/99_mod_security.conf
index 4b2cb1b36cc6..1269365021b4 100644
--- a/net-www/mod_security/files/99_mod_security.conf
+++ b/net-www/mod_security/files/99_mod_security.conf
@@ -1,6 +1,6 @@
 <IfDefine SECURITY>
   <IfModule !mod_security.c>
-    LoadModule security_module    extramodules/mod_security.so
+    LoadModule security_module    modules/mod_security.so
   </IfModule>
 </IfDefine>
 
diff --git a/net-www/mod_security/mod_security-1.8.7.ebuild b/net-www/mod_security/mod_security-1.8.7.ebuild
index 9ffb60973568..6d04a0a0e602 100644
--- a/net-www/mod_security/mod_security-1.8.7.ebuild
+++ b/net-www/mod_security/mod_security-1.8.7.ebuild
@@ -1,32 +1,31 @@
-# 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_security/mod_security-1.8.7.ebuild,v 1.6 2006/04/18 23:07:50 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/mod_security-1.8.7.ebuild,v 1.7 2007/01/14 20:09:54 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Intrusion Detection System for apache"
-HOMEPAGE="http://www.modsecurity.org"
-SRC_URI="http://www.modsecurity.org/download/${MY_P}.tar.gz"
+KEYWORDS="amd64 ppc sparc x86"
 
+DESCRIPTION="Intrusion Detection System for Apache."
+HOMEPAGE="http://www.modsecurity.org/"
+SRC_URI="http://www.modsecurity.org/download/${P/_/}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
 IUSE="doc"
 
+S="${WORKDIR}/${P/_/}"
+
 APXS1_ARGS="-S LIBEXECDIR=${S} -c ${S}/apache1/mod_security.c"
 APACHE1_MOD_FILE="apache1/${PN}.so"
-APACHE1_MOD_CONF="1.8.6/99_mod_security"
+APACHE1_MOD_CONF="99_mod_security"
 APACHE1_MOD_DEFINE="SECURITY"
 
 APXS2_ARGS="-S LIBEXECDIR=${S} -c ${S}/apache2/mod_security.c"
 APACHE2_MOD_FILE="apache2/.libs/${PN}.so"
-APACHE2_MOD_CONF="1.8.6/99_mod_security"
+APACHE2_MOD_CONF="99_mod_security"
 APACHE2_MOD_DEFINE="SECURITY"
 
 DOCFILES="CHANGES httpd.conf.* INSTALL LICENSE README"
-useq doc && DOCFILES="${DOCFILES} modsecurity-manual.pdf"
+use doc && DOCFILES="${DOCFILES} modsecurity-manual.pdf"
 
 need_apache
diff --git a/net-www/mod_security/mod_security-1.9.4.ebuild b/net-www/mod_security/mod_security-1.9.4.ebuild
index fc777deb0ea1..e86849e72990 100644
--- a/net-www/mod_security/mod_security-1.9.4.ebuild
+++ b/net-www/mod_security/mod_security-1.9.4.ebuild
@@ -1,31 +1,31 @@
-# 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_security/mod_security-1.9.4.ebuild,v 1.1 2006/06/05 18:50:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_security/mod_security-1.9.4.ebuild,v 1.2 2007/01/14 20:09:54 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-MY_P="${P/mod_security-/modsecurity-apache_}"
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 
 DESCRIPTION="Intrusion Detection System for Apache."
 HOMEPAGE="http://www.modsecurity.org/"
-SRC_URI="http://www.modsecurity.org/download/${MY_P}.tar.gz"
+SRC_URI="http://www.modsecurity.org/download/${P/mod_security-/modsecurity-apache_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 IUSE="doc"
 
+S="${WORKDIR}/${P/mod_security-/modsecurity-apache_}"
+
 APXS1_ARGS="-S LIBEXECDIR=${S} -c ${S}/apache1/mod_security.c"
 APACHE1_MOD_FILE="apache1/${PN}.so"
-APACHE1_MOD_CONF="1.8.6/99_mod_security"
+APACHE1_MOD_CONF="99_mod_security"
 APACHE1_MOD_DEFINE="SECURITY"
 
 APXS2_ARGS="-S LIBEXECDIR=${S} -c ${S}/apache2/mod_security.c"
 APACHE2_MOD_FILE="apache2/.libs/${PN}.so"
-APACHE2_MOD_CONF="1.8.6/99_mod_security"
+APACHE2_MOD_CONF="99_mod_security"
 APACHE2_MOD_DEFINE="SECURITY"
 
 DOCFILES="CHANGES httpd.conf.* INSTALL LICENSE README"
-useq doc && DOCFILES="${DOCFILES} doc/modsecurity-apache-manual-1.9.pdf"
+use doc && DOCFILES="${DOCFILES} doc/modsecurity-apache-manual-1.9.pdf"
 
 need_apache