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

Package-Manager: portage-2.1.4

11 files changed, 50 insertions, 34 deletions

diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index faa6050267fa..b8f073371289 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70_mod_suphp.conf 1571 RMD160 b4a850bfe6f92cc5fc5629359277d5d75d491e15 SHA1 986eddf86c4a360cad015c8f2693d0afd72eb2e6 SHA256 c529e5867cb45574b40e3362c4f07a2b67e38231e008348cf8a7365df4a30fbf
 AUX mod_suphp-0.6.2-handler.patch 1913 RMD160 8851b829261c3f932e713dc185c2df823cfa8530 SHA1 992f868fb1a5af4174b54ffdb82cd367c5bbfcd3 SHA256 cf833a5445e9608b58ea0d3430d70f5a5779e6b4536815e14539813bde560d45
 AUX suphp.conf 905 RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 SHA1 33d586b5cdb661cf7ceba6987e88dda849886374 SHA256 8a1dd8bee95dc8ab599cdcca966a583e7fbde5c41b377aa208e1f60af54b6dd7
 DIST suphp-0.6.2.tar.gz 372228 RMD160 6cafc7ef9bb261ee34bed08976a5e4a929f25a73 SHA1 3aaf232ca722a495c10caac2b573c215bfc80253 SHA256 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc
-EBUILD mod_suphp-0.6.2-r3.ebuild 2793 RMD160 d63e6780fae089f331047c961c45a0a37ed19041 SHA1 16e248c1d5ab91c616cf6fd3e4e0b7a360c6cd0a SHA256 4b801eca158af99dc5f0436f5b4084a188ed548bcc826446d3640769fbf7063d
-MISC ChangeLog 2919 RMD160 147cba6f47a609595f3ad188bcbaedb18438ef0e SHA1 78befa92b64b0d22daa5a88428b2f6ff2b423c0f SHA256 59e10e6a361b7974bf9819f4e89eb985cede8838f3ec9d87a2f5ab97c80d7466
+EBUILD mod_suphp-0.6.2-r3.ebuild 2792 RMD160 2502789cf4488cdf0cfcada0701bc4ce3ebe34d2 SHA1 af8c222d9fe29588b6986cefd2728ea15b1e5232 SHA256 f91399faf9e016af933bbf376875a7b9baf4ade2e0cca10f167399a4ab28dee8
+MISC ChangeLog 3035 RMD160 6518dd092dcd6c9a490be6e44d001851a94acd00 SHA1 d11a31fbb677197290c074eeb6f48734c72ddee0 SHA256 747a1eee8174b32d4454b2b47165ab84d28a8f22a2148b97de2aac45efbd934f
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeiH2MACgkQmPFBzbX68WFSzgCgggzF5GDT1dgBLDO0tSJrIchU
+HPsAoIk4U65sNSewiVEXHn7eOl3E9Wpk
+=ocS/
+-----END PGP SIGNATURE-----
diff --git a/www-apache/mod_transform/ChangeLog b/www-apache/mod_transform/ChangeLog
index e8bc4429fe05..3c1034fa4a79 100644
--- a/www-apache/mod_transform/ChangeLog
+++ b/www-apache/mod_transform/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_transform
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_transform/ChangeLog,v 1.5 2007/11/25 13:38:56 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_transform/ChangeLog,v 1.6 2008/01/31 19:14:10 hollow Exp $
+
+  31 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+  files/0.7/10_mod_transform.conf, files/10_mod_transform.conf,
+  metadata.xml, mod_transform-0.6.0.ebuild,
+  mod_transform-0.7.0_pre20070204.ebuild:
+  fix depend.apache usage wrt #208033; update metadata; cleanup
 
   25 Nov 2007; Benedikt Böhm <hollow@gentoo.org>
   mod_transform-0.6.0.ebuild, mod_transform-0.7.0_pre20070204.ebuild:
diff --git a/www-apache/mod_transform/files/0.7/10_mod_transform.conf b/www-apache/mod_transform/files/0.7/10_mod_transform.conf
index e4e9a81483c8..e51f679caf00 100644
--- a/www-apache/mod_transform/files/0.7/10_mod_transform.conf
+++ b/www-apache/mod_transform/files/0.7/10_mod_transform.conf
@@ -1,9 +1,9 @@
 <IfDefine TRANSFORM>
-	LoadModule transform_module modules/mod_transform.so
-	AddOutputFilter XSLT xml
+LoadModule transform_module modules/mod_transform.so
+AddOutputFilter XSLT xml
 
-	# In order to load the http plugin, uncomment the following:
-#	TransformLoadPlugin http
+# In order to load the http plugin, uncomment the following:
+#TransformLoadPlugin http
 </IfDefine>
 
-# vim:syntax=apache
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_transform/files/10_mod_transform.conf b/www-apache/mod_transform/files/10_mod_transform.conf
index 395e9fe5bb98..06879ba0bbd8 100644
--- a/www-apache/mod_transform/files/10_mod_transform.conf
+++ b/www-apache/mod_transform/files/10_mod_transform.conf
@@ -1,4 +1,6 @@
 <IfDefine TRANSFORM>
-	LoadModule transform_module modules/mod_transform.so
-	AddOutputFilter XSLT xml
+LoadModule transform_module modules/mod_transform.so
+AddOutputFilter XSLT xml
 </IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_transform/metadata.xml b/www-apache/mod_transform/metadata.xml
index ff5b6490402e..64a719ea1bfd 100644
--- a/www-apache/mod_transform/metadata.xml
+++ b/www-apache/mod_transform/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
-<maintainer>
-  <email>apache-bugs@gentoo.org</email>
-</maintainer>
+	<herd>apache</herd>
 </pkgmetadata>
diff --git a/www-apache/mod_transform/mod_transform-0.6.0.ebuild b/www-apache/mod_transform/mod_transform-0.6.0.ebuild
index 587b0b26c9b6..f0cd4f4aacc0 100644
--- a/www-apache/mod_transform/mod_transform-0.6.0.ebuild
+++ b/www-apache/mod_transform/mod_transform-0.6.0.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_transform/mod_transform-0.6.0.ebuild,v 1.2 2007/11/25 13:38:56 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_transform/mod_transform-0.6.0.ebuild,v 1.3 2008/01/31 19:14:10 hollow Exp $
 
 inherit apache-module
 
@@ -23,7 +23,7 @@ APACHE2_MOD_DEFINE="TRANSFORM"
 need_apache2
 
 src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
+	econf --with-apxs=${APXS} || die "econf failed"
 	emake || die "emake failed"
 }
 
diff --git a/www-apache/mod_transform/mod_transform-0.7.0_pre20070204.ebuild b/www-apache/mod_transform/mod_transform-0.7.0_pre20070204.ebuild
index dc495f74282f..c6d57989dacd 100644
--- a/www-apache/mod_transform/mod_transform-0.7.0_pre20070204.ebuild
+++ b/www-apache/mod_transform/mod_transform-0.7.0_pre20070204.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_transform/mod_transform-0.7.0_pre20070204.ebuild,v 1.3 2007/11/25 13:38:56 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_transform/mod_transform-0.7.0_pre20070204.ebuild,v 1.4 2008/01/31 19:14:10 hollow Exp $
 
 inherit apache-module
 
@@ -26,13 +26,13 @@ APACHE2_MOD_DEFINE="TRANSFORM"
 need_apache2
 
 src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
+	econf --with-apxs=${APXS} || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	# install header(s)
-	local AP_INCLUDEDIR=$(${APXS2} -q INCLUDEDIR)
+	local AP_INCLUDEDIR=$(${APXS} -q INCLUDEDIR)
 	insinto ${AP_INCLUDEDIR}
 	doins include/mod_transform.h || die
 
diff --git a/www-apache/mod_wsgi/ChangeLog b/www-apache/mod_wsgi/ChangeLog
index 6a186133c376..c14232ca0cc1 100644
--- a/www-apache/mod_wsgi/ChangeLog
+++ b/www-apache/mod_wsgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_wsgi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/ChangeLog,v 1.2 2007/09/10 10:11:14 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/ChangeLog,v 1.3 2008/01/31 19:16:52 hollow Exp $
+
+  31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/70_mod_wsgi.conf,
+  metadata.xml, mod_wsgi-1.0.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_wsgi/files/70_mod_wsgi.conf b/www-apache/mod_wsgi/files/70_mod_wsgi.conf
index e8abe6163ef6..3fabc5967fca 100644
--- a/www-apache/mod_wsgi/files/70_mod_wsgi.conf
+++ b/www-apache/mod_wsgi/files/70_mod_wsgi.conf
@@ -1,5 +1,5 @@
 <IfDefine WSGI>
-  <IfModule !mod_wsgi.c>
-    LoadModule wsgi_module modules/mod_wsgi.so
-  </IfModule>
+LoadModule wsgi_module modules/mod_wsgi.so
 </IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_wsgi/metadata.xml b/www-apache/mod_wsgi/metadata.xml
index a1f5ceff2352..64a719ea1bfd 100644
--- a/www-apache/mod_wsgi/metadata.xml
+++ b/www-apache/mod_wsgi/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_wsgi/mod_wsgi-1.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-1.0.ebuild
index f6d971245bbf..7f3f16592a3c 100644
--- a/www-apache/mod_wsgi/mod_wsgi-1.0.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-1.0.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_wsgi/mod_wsgi-1.0.ebuild,v 1.1 2007/09/08 17:28:09 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_wsgi/mod_wsgi-1.0.ebuild,v 1.2 2008/01/31 19:16:52 hollow Exp $
 
 inherit apache-module
 
@@ -28,6 +28,6 @@ DOCFILES="README"
 need_apache2
 
 src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
-	emake OPT="$(apxs2 -q CFLAGS) -fPIC" || die "econf failed"
+	econf --with-apxs=${APXS} || die "econf failed"
+	emake OPT="$(${APXS} -q CFLAGS) -fPIC" || die "econf failed"
 }