fix depend.apache usage wrt #208033; update metadata; cleanup

Package-Manager: portage-2.1.4

5 files changed, 29 insertions, 18 deletions

diff --git a/www-apache/mod_dnsbl_lookup/ChangeLog b/www-apache/mod_dnsbl_lookup/ChangeLog
index 3c83143534cb..42c744184c34 100644
--- a/www-apache/mod_dnsbl_lookup/ChangeLog
+++ b/www-apache/mod_dnsbl_lookup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_dnsbl_lookup
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnsbl_lookup/ChangeLog,v 1.2 2007/09/10 10:06:19 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnsbl_lookup/ChangeLog,v 1.3 2008/01/31 16:41:13 hollow Exp $
+
+  31 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+  files/09_mod_dnsbl_lookup.conf, metadata.xml,
+  mod_dnsbl_lookup-0.91.ebuild:
+  fix depend.apache usage wrt #208033; update metadata; cleanup
 
   10 Sep 2007; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
   fix metadata
diff --git a/www-apache/mod_dnsbl_lookup/Manifest b/www-apache/mod_dnsbl_lookup/Manifest
index 4fb32469495a..ab173453b4a9 100644
--- a/www-apache/mod_dnsbl_lookup/Manifest
+++ b/www-apache/mod_dnsbl_lookup/Manifest
@@ -1,5 +1,15 @@
-AUX 09_mod_dnsbl_lookup.conf 217 RMD160 c877773c03989c76166e3e33a761d36655927f9c SHA1 c4f2dedbf6561067d7f39b5fda96b4e7b382c08c SHA256 792fd726bbc9506fd2061b8b702a5adceaccff00b9692e7fad0963708e419f62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 09_mod_dnsbl_lookup.conf 195 RMD160 367e37776d0a296c9936768d92cefae21c2eb242 SHA1 0a9617b01aa31f2307837509dc9803ae44415526 SHA256 a34c506c717a14633dd856e57de428ed28297747ee147453691eec2aac7576d2
 DIST mod_dnsbl_lookup-0.91.tar.gz 7344 RMD160 ad9cb142f23aa96d631a2695ca6d07678d19cfa9 SHA1 d991dfec9d9ace8431b5edffde0f8cd4b60af1b5 SHA256 62a2c881c96453bdbf79aa6e3033044074a99ddf749fea734c955e73b26b3d69
-EBUILD mod_dnsbl_lookup-0.91.ebuild 681 RMD160 77356e9f227e921536e8bc6ae3678fa74b396caa SHA1 1b7a02fb71a1098dbe8d67aee45a35efd8afaea1 SHA256 42bc63caadc345e1104c5154bb456b784145375bda97dea867cfc17b690f64a0
-MISC ChangeLog 497 RMD160 b7dbd91fb7876d56977c0261112d6e7ff9bb830f SHA1 ef0af47d360e9ba4d004e9031a592b90c39a70e3 SHA256 504cc828eecf1fd64bbdc62b2cba9f6da8137bf17026d44aa0d8ace43b63d3b0
-MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
+EBUILD mod_dnsbl_lookup-0.91.ebuild 680 RMD160 971d621264b7f24d9255806793cf93d92b73954b SHA1 b8c76551ed68ca7e2eaddd5dc05cc06b282bc15d SHA256 437a67fb16782c0f0b6417c652d94a12c3eb1d26a7614c718efc5065bcff12ad
+MISC ChangeLog 692 RMD160 e364fa347319759b1dc26c42fee200ed3cafd0a1 SHA1 72c8ea69e225f2a242e835935927514f433b449e SHA256 3f418d831b8bce433a9072a284b4f3521cf7e407bf833978a0e4c647db776f48
+MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeh+i8ACgkQmPFBzbX68WHbZgCgjS32Fw4FhNBLcI4dvutwpzq0
+lmUAni3CjG4prxrXVn/Il6LtfQvHVNz0
+=Jwmj
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_dnsbl_lookup/files/09_mod_dnsbl_lookup.conf b/www-apache/mod_dnsbl_lookup/files/09_mod_dnsbl_lookup.conf
index 55a0f2e3b87d..ae944d34c1a4 100644
--- a/www-apache/mod_dnsbl_lookup/files/09_mod_dnsbl_lookup.conf
+++ b/www-apache/mod_dnsbl_lookup/files/09_mod_dnsbl_lookup.conf
@@ -1,8 +1,7 @@
 <IfDefine DNSBL>
-	<IfModule !mod_dnsbl_lookup.c>
-		LoadModule dnsbl_lookup_module  modules/mod_dnsbl_lookup.so
-	</IfModule>
-
-	DNSBLZone spammers dnsbl.ahbl.org any
-	DNSBLZone spammers sbl.spamhaus.org any
+LoadModule dnsbl_lookup_module modules/mod_dnsbl_lookup.so
+DNSBLZone spammers dnsbl.ahbl.org any
+DNSBLZone spammers sbl.spamhaus.org any
 </IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_dnsbl_lookup/metadata.xml b/www-apache/mod_dnsbl_lookup/metadata.xml
index a1f5ceff2352..64a719ea1bfd 100644
--- a/www-apache/mod_dnsbl_lookup/metadata.xml
+++ b/www-apache/mod_dnsbl_lookup/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>apache</herd>
-	<maintainer>
-		<email>apache-bugs@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild b/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild
index 89a93bfa2198..e783e7fd4949 100644
--- a/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild
+++ b/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild,v 1.1 2007/09/10 10:03:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild,v 1.2 2008/01/31 16:41:13 hollow Exp $
 
 inherit apache-module eutils
 
@@ -24,6 +24,6 @@ need_apache2
 
 src_install() {
 	apache-module_src_install
-	insinto $(${APXS2} -q INCLUDEDIR)
+	insinto $(${APXS} -q INCLUDEDIR)
 	doins dnsbl_lookup.h
 }