Apache herd package refresh

10 files changed, 126 insertions, 17 deletions

diff --git a/net-www/mod_scgi/ChangeLog b/net-www/mod_scgi/ChangeLog
index 97ed99f4960b..18c28e73c8f8 100644
--- a/net-www/mod_scgi/ChangeLog
+++ b/net-www/mod_scgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_scgi
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.11 2004/08/30 23:31:35 dholm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.12 2005/01/09 00:20:51 hollow Exp $
+
+*mod_scgi-1.2 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/1.2/20_mod_scgi.conf, +mod_scgi-1.2.ebuild:
+  Apache herd package refresh
 
   31 Aug 2004; David Holm <dholm@gentoo.org> mod_scgi-1.2_alpha2.ebuild:
   Added to ~ppc.
diff --git a/net-www/mod_scgi/Manifest b/net-www/mod_scgi/Manifest
index b4696507c145..998fbf4ccc7e 100644
--- a/net-www/mod_scgi/Manifest
+++ b/net-www/mod_scgi/Manifest
@@ -1,11 +1,14 @@
-MD5 0ce76ce46abd5867ed4b1ef7ae1ef5ae ChangeLog 1733
-MD5 0c1ffc3eff281366ee07df94a66166e6 metadata.xml 160
-MD5 149e0c4c6e5748f5598fe9d2408265d0 mod_scgi-1.2_alpha1-r1.ebuild 2764
-MD5 99fe43f988af3c184358bc12d9dfa4fb mod_scgi-1.2_alpha1-r2.ebuild 3006
-MD5 2338ffcb6d546740c10352a18110b09f mod_scgi-1.2_alpha1.ebuild 1125
-MD5 1a0a26bb52517cb9f7908743e08f66f4 mod_scgi-1.2_alpha2.ebuild 3005
+MD5 44f93237ced461b957e2c42794cccbd7 ChangeLog 1910
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 99cadae04ec6ef3591a9d4b31605a90f mod_scgi-1.2_alpha1-r1.ebuild 2764
+MD5 77999ece4286fd83acf11854041e930b mod_scgi-1.2_alpha1-r2.ebuild 3006
+MD5 8a0dd30a3545621be526be5fb263ed7e mod_scgi-1.2_alpha1.ebuild 1125
+MD5 9f7e66f665d7ff1c52f256cfd24f96df mod_scgi-1.2_alpha2.ebuild 3005
+MD5 70794b8a23299ab52cd8618ddb2c13b6 mod_scgi-1.2.ebuild 1056
 MD5 98c270edf79608cb914cbc7d6ffea7b0 files/20_mod_scgi.conf 1243
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1 61
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1-r1 61
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1-r2 61
 MD5 7ec590d1ee6da7b63a722808c6758ee7 files/digest-mod_scgi-1.2_alpha2 61
+MD5 7092d8881e1387d40515b82e1c4e9afb files/digest-mod_scgi-1.2 59
+MD5 c9efe9ec123cff4add21c35d7bbcdeb9 files/1.2/20_mod_scgi.conf 1245
diff --git a/net-www/mod_scgi/files/1.2/20_mod_scgi.conf b/net-www/mod_scgi/files/1.2/20_mod_scgi.conf
new file mode 100644
index 000000000000..59958aac8fd0
--- /dev/null
+++ b/net-www/mod_scgi/files/1.2/20_mod_scgi.conf
@@ -0,0 +1,58 @@
+<IfDefine SCGI>
+	<IfModule !mod_scgi.c>
+	    LoadModule scgi_module     modules/mod_scgi.so
+	</IfModule>
+
+	<IfModule mod_scgi.c>
+	# Apache2 example
+	#<Location "/dynamic">
+	#	SetHandler scgi-handler
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<LocationMatch "^/(dynamic|login)($|/)">
+	#	SetHandler scgi-handler
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/foo">
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/bar">
+	#	SCGIServer localhost:4001
+	#	SCGIHandler On
+	#	SCGIServerTimeout 10
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/bar/images">
+	#	SCGIHander Off
+	#</Location>
+
+	# Apache1 example
+	#<Location "/dynamic">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<LocationMatch "^/(dynamic|login)($|/)">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<Location "/foo">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<Location "/bar">
+	#	 SCGIServer 127.0.0.1 4001
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	</IfModule>
+</IfDefine>
+# vim:ft=apache:
diff --git a/net-www/mod_scgi/files/digest-mod_scgi-1.2 b/net-www/mod_scgi/files/digest-mod_scgi-1.2
new file mode 100644
index 000000000000..c5387f0f3aa8
--- /dev/null
+++ b/net-www/mod_scgi/files/digest-mod_scgi-1.2
@@ -0,0 +1 @@
+MD5 577f6db7ab95e602378293756d368112 scgi-1.2.tar.gz 19098
diff --git a/net-www/mod_scgi/metadata.xml b/net-www/mod_scgi/metadata.xml
index 631fc921d87a..10510cb8be95 100644
--- a/net-www/mod_scgi/metadata.xml
+++ b/net-www/mod_scgi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-www</herd>
+<herd>apache</herd>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_scgi/mod_scgi-1.2.ebuild b/net-www/mod_scgi/mod_scgi-1.2.ebuild
new file mode 100644
index 000000000000..2f31fa896373
--- /dev/null
+++ b/net-www/mod_scgi/mod_scgi-1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 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.2.ebuild,v 1.1 2005/01/09 00:20:51 hollow Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="Apache module for a Replacement for the CGI protocol that is similar to FastCGI"
+URI_BASE="http://www.mems-exchange.org/software"
+HOMEPAGE="${URI_BASE}/scgi/"
+SRC_URI="${URI_BASE}/files/scgi/${P/mod_}.tar.gz"
+
+LICENSE="CNRI"
+KEYWORDS="~x86 ~ppc"
+DEPEND="www-apps/scgi"
+SLOT="0"
+
+S=${WORKDIR}/${P/mod_}
+
+APXS1_S="${S}/apache1"
+APXS1_ARGS="-c mod_scgi.c"
+APACHE1_MOD_FILE="${S}/apache1/${PN}.so"
+APACHE1_MOD_CONF="${PVR}/20_mod_scgi"
+APACHE1_MOD_DEFINE="SCGI"
+
+APXS2_S="${S}/apache2"
+APXS2_ARGS="-c mod_scgi.c"
+APACHE2_MOD_FILE="${S}/apache2/.libs/${PN}.so"
+APACHE2_MOD_CONF="${PVR}/20_mod_scgi"
+APACHE2_MOD_DEFINE="SCGI"
+
+need_apache
+
+DOCFILES="PKG-INFO LICENSE.txt CHANGES"
+if useq apache2; then
+	DOCFILES="${DOCFILES} apache2/README"
+else
+	DOCFILES="${DOCFILES} apache1/README"
+fi
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild
index 2becfb7f466c..411b77adc93d 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.2_alpha1-r1.ebuild,v 1.4 2004/08/16 17:36:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1-r1.ebuild,v 1.5 2005/01/09 00:20:51 hollow Exp $
 
 detectapache() {
 	local domsg=
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
index b0061e1eef63..52894deef4dd 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.2_alpha1-r2.ebuild,v 1.5 2004/08/16 17:36:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1-r2.ebuild,v 1.6 2005/01/09 00:20:51 hollow Exp $
 
 detectapache() {
 	local domsg=
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
index 826fcf43554f..12960fad13b3 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.2_alpha1.ebuild,v 1.6 2004/08/16 17:36:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild,v 1.7 2005/01/09 00:20:51 hollow Exp $
 
 apachedir='1'
 apache=''
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild
index a72fb15cecac..a23e06a860ad 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.2_alpha2.ebuild,v 1.5 2004/08/30 23:31:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha2.ebuild,v 1.6 2005/01/09 00:20:51 hollow Exp $
 
 detectapache() {
 	local domsg=