Apache herd package refresh

10 files changed, 379 insertions, 6 deletions

diff --git a/net-www/mod_layout/ChangeLog b/net-www/mod_layout/ChangeLog
index 060e38ef3dd0..23c848ef5eb3 100644
--- a/net-www/mod_layout/ChangeLog
+++ b/net-www/mod_layout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_layout
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/ChangeLog,v 1.8 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/ChangeLog,v 1.9 2005/01/07 19:06:56 vericgar Exp $
+
+*mod_layout-3.2.1-r1 (07 Jan 2005)
+
+  07 Jan 2005; Michael Stewart <vericgar@gentoo.org>
+  +mod_layout-3.2.1-r1.ebuild, +mod_layout-4.0.1a-r1.ebuild:
+  Package Refresh
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_layout-4.0.1a.ebuild:
diff --git a/net-www/mod_layout/Manifest b/net-www/mod_layout/Manifest
index a009e11d7afc..4dcdec830694 100644
--- a/net-www/mod_layout/Manifest
+++ b/net-www/mod_layout/Manifest
@@ -2,8 +2,12 @@ MD5 5112904f310a1587d6209f590de78cd5 ChangeLog 1000
 MD5 4b562dac77e8dcbc4aaea4b9bf4dbac2 metadata.xml 264
 MD5 b6a76a4c05febd1dc5de33ac64915d4b mod_layout-3.2.1.ebuild 1387
 MD5 73862716545301b65dac54bbff00ef2c mod_layout-4.0.1a.ebuild 933
+MD5 fd494c02aef93809192d28344bea333a mod_layout-3.2.1-r1.ebuild 766
+MD5 4673eda8d4cac8e495b487504d723e7a mod_layout-4.0.1a-r1.ebuild 662
 MD5 ed08f74402be537f28435ce409adb86d files/15_mod_layout.conf 4590
 MD5 77707c5cb33c82abcb18389a7499495b files/15_mod_layout321.conf 846
 MD5 e63bd20acd48f4065be8f0fc542a393b files/digest-mod_layout-3.2.1 67
 MD5 31f7af245df33de3e73bfcf60898240b files/digest-mod_layout-4.0.1a 68
 MD5 9ce33c60579d3b6a35ac6d2722b0888c files/mod_layout-4.0.1a-register.patch 585
+MD5 e63bd20acd48f4065be8f0fc542a393b files/digest-mod_layout-3.2.1-r1 67
+MD5 31f7af245df33de3e73bfcf60898240b files/digest-mod_layout-4.0.1a-r1 68
diff --git a/net-www/mod_layout/files/3.2.1-r1/15_mod_layout.conf b/net-www/mod_layout/files/3.2.1-r1/15_mod_layout.conf
new file mode 100644
index 000000000000..3795ac070a30
--- /dev/null
+++ b/net-www/mod_layout/files/3.2.1-r1/15_mod_layout.conf
@@ -0,0 +1,152 @@
+<IfDefine LAYOUT>
+  <IfModule !mod_layout.c>
+    LoadModule layout_module    modules/mod_layout.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_layout.c>
+
+<Directory /home/*/public_html>
+# This default configuration adds a footer to every html page in ~user
+# "Powered by Gentoo Linux"
+
+# Enable the filter for all text/html pages
+# use LayoutHandler for Apache1 and AddOutputFilter for Apache2
+#LayoutHandler text/html
+#AddOutputFilterByType LAYOUT text/html
+      
+# This directives makes sure that all Layout headers and footers 
+# get Cache-Control: no-cache methods in all situations. This 
+# directive either takes On or Off."
+# LayoutCacheNeeded
+
+# A URI which prints the header contents.
+# LayoutHeader
+
+# A URI which prints the footer contents.
+LayoutFooter "<p>Powered by <a href='http://www.gentoo.org'>Gentoo Linux</a></p>"
+
+# Add a layout to be inserted when a tag is found, this takes two
+# options, with a third optional parameter. The first is a pattern,
+# the second is the layout and the third is how the layout should be
+# inserts (either prepend, append, or replace). The default is to
+# replace.
+# Layout "<-- replace_me -->" "<p>Visit: <a href=http://www.gentoo.org/>Gentoo Linux</a></p>" replace
+ 
+# Enter a URI that should be ignored, regular expressions are allowed.
+# LayoutIgnoreURI
+
+# Enter a URI that should be ignored by the header, regular expressions
+# are allowed.
+# LayoutIgnoreHeaderURI
+
+# Enter a URI that should be ignored by the HTTPHeader, regular
+# expressions are allowed.
+# LayoutIgnoreHTTPHeaderURI
+
+# Enter a URI that should be ignored by the footer, regular expressions
+# are allowed.
+# LayoutIgnoreFooterURI
+
+# This can either be On or Off (default it Off). It places HTML comments
+# in the outbound text describing when and where mod_layout has been
+# inserting text.
+LayoutComment On
+
+# This can either be On or Off (default it Off). This is both
+# experimental and probably quite broke.
+# LayoutProxy
+
+# This can either be On or Off (default it On). When off the original
+# document is not displayed.
+# LayoutDisplayOriginal
+
+# Turns On (default) or Off a list of standard types to handle.
+# LayoutDefaultHandlers
+
+# This takes a SSI style timme format that can be used to change the
+# output by mod_layout's internal TIME environmental variables that
+# it introduces.
+# LayoutTimeFormat
+
+# Takes a URI to call for the HTTP Header.
+# LayoutHTTPHeader
+
+# Specify handlers that mod_layout should produce HTTP headers for.
+# LayoutHTTPOverrideHandler
+
+# Specify URI's that mod_layout should produce HTTP headers for.
+# LayoutHTTPOverrideURI
+
+# This takes no arguments. If found it will turn off the footer.
+# LayoutFooterOff
+
+# This takes no arguments. If found it will turn off the header.
+# LayoutHeaderOff
+
+# This takes no arguments. If found it will turn off the http header.
+# LayoutHTTPHeaderOff
+
+# Turns on and off asynchronous POSTs (AKA everything can see the post
+# data).
+# LayoutPostAsync
+
+# This moves the default cache from /tmp to another directory(or a
+# RAM disk).
+# LayoutCache
+
+# Turning this On or Off afffects whether or not headers and footers
+# are appended when creating subsections.
+# LayoutAppend
+
+# Turning this on and off will tell mod_layout to attempt to resolve
+# content (do a merger of the footer, body and header text
+# LayoutMerge
+
+# Use this to change the default begin tag to use during merges (the
+# default string is \<HTML>\
+# LayoutMergeBeginTag
+
+# Use this to change the default end tag to use during merges (the
+# default string is \<\\HTML>\
+# LayoutMergeEndTag
+
+# Use this to change the default end tag to use during merges (the
+# default string is \<\\HTML>\
+# LayoutHeaderAppend
+
+# Use this to change the default end tag to use during merges (the
+# default string is \<\\HTML>\
+# LayoutFooterAppend
+
+# When enabled (it takes on and off flags) mod_layout will not try
+# to wrap any errors. Merge must be enabled for this to work. The
+# default for this is off.
+# LayoutMergeErrorIgnore
+
+# If this tag is found during a merge, no footer or header will be
+# inserted into the document
+# LayoutIgnoreTag
+
+# If this tag is found during a merge, no footer will be inserted
+# into the document
+# LayoutIgnoreTagFooter
+
+# If this tag is found during a merge, no header will be inserted
+# into the document
+# LayoutIgnoreTagHeader
+
+# This turns on mod_layout's own text/html and text/plain handler
+# LayoutHTMLHandler
+
+# If this is enabled and you are doing a merge, the tags used for the
+# merge will be replaced.
+# LayoutReplaceTags
+
+# If you want applications to do notes (a set of directives to control
+# actions inside apache).
+# LayoutNotes
+
+</Directory>
+
+</IfModule>
diff --git a/net-www/mod_layout/files/4.0.1a-r1/15_mod_layout.conf b/net-www/mod_layout/files/4.0.1a-r1/15_mod_layout.conf
new file mode 100644
index 000000000000..3795ac070a30
--- /dev/null
+++ b/net-www/mod_layout/files/4.0.1a-r1/15_mod_layout.conf
@@ -0,0 +1,152 @@
+<IfDefine LAYOUT>
+  <IfModule !mod_layout.c>
+    LoadModule layout_module    modules/mod_layout.so
+  </IfModule>
+</IfDefine>
+
+<IfModule mod_layout.c>
+
+<Directory /home/*/public_html>
+# This default configuration adds a footer to every html page in ~user
+# "Powered by Gentoo Linux"
+
+# Enable the filter for all text/html pages
+# use LayoutHandler for Apache1 and AddOutputFilter for Apache2
+#LayoutHandler text/html
+#AddOutputFilterByType LAYOUT text/html
+      
+# This directives makes sure that all Layout headers and footers 
+# get Cache-Control: no-cache methods in all situations. This 
+# directive either takes On or Off."
+# LayoutCacheNeeded
+
+# A URI which prints the header contents.
+# LayoutHeader
+
+# A URI which prints the footer contents.
+LayoutFooter "<p>Powered by <a href='http://www.gentoo.org'>Gentoo Linux</a></p>"
+
+# Add a layout to be inserted when a tag is found, this takes two
+# options, with a third optional parameter. The first is a pattern,
+# the second is the layout and the third is how the layout should be
+# inserts (either prepend, append, or replace). The default is to
+# replace.
+# Layout "<-- replace_me -->" "<p>Visit: <a href=http://www.gentoo.org/>Gentoo Linux</a></p>" replace
+ 
+# Enter a URI that should be ignored, regular expressions are allowed.
+# LayoutIgnoreURI
+
+# Enter a URI that should be ignored by the header, regular expressions
+# are allowed.
+# LayoutIgnoreHeaderURI
+
+# Enter a URI that should be ignored by the HTTPHeader, regular
+# expressions are allowed.
+# LayoutIgnoreHTTPHeaderURI
+
+# Enter a URI that should be ignored by the footer, regular expressions
+# are allowed.
+# LayoutIgnoreFooterURI
+
+# This can either be On or Off (default it Off). It places HTML comments
+# in the outbound text describing when and where mod_layout has been
+# inserting text.
+LayoutComment On
+
+# This can either be On or Off (default it Off). This is both
+# experimental and probably quite broke.
+# LayoutProxy
+
+# This can either be On or Off (default it On). When off the original
+# document is not displayed.
+# LayoutDisplayOriginal
+
+# Turns On (default) or Off a list of standard types to handle.
+# LayoutDefaultHandlers
+
+# This takes a SSI style timme format that can be used to change the
+# output by mod_layout's internal TIME environmental variables that
+# it introduces.
+# LayoutTimeFormat
+
+# Takes a URI to call for the HTTP Header.
+# LayoutHTTPHeader
+
+# Specify handlers that mod_layout should produce HTTP headers for.
+# LayoutHTTPOverrideHandler
+
+# Specify URI's that mod_layout should produce HTTP headers for.
+# LayoutHTTPOverrideURI
+
+# This takes no arguments. If found it will turn off the footer.
+# LayoutFooterOff
+
+# This takes no arguments. If found it will turn off the header.
+# LayoutHeaderOff
+
+# This takes no arguments. If found it will turn off the http header.
+# LayoutHTTPHeaderOff
+
+# Turns on and off asynchronous POSTs (AKA everything can see the post
+# data).
+# LayoutPostAsync
+
+# This moves the default cache from /tmp to another directory(or a
+# RAM disk).
+# LayoutCache
+
+# Turning this On or Off afffects whether or not headers and footers
+# are appended when creating subsections.
+# LayoutAppend
+
+# Turning this on and off will tell mod_layout to attempt to resolve
+# content (do a merger of the footer, body and header text
+# LayoutMerge
+
+# Use this to change the default begin tag to use during merges (the
+# default string is \<HTML>\
+# LayoutMergeBeginTag
+
+# Use this to change the default end tag to use during merges (the
+# default string is \<\\HTML>\
+# LayoutMergeEndTag
+
+# Use this to change the default end tag to use during merges (the
+# default string is \<\\HTML>\
+# LayoutHeaderAppend
+
+# Use this to change the default end tag to use during merges (the
+# default string is \<\\HTML>\
+# LayoutFooterAppend
+
+# When enabled (it takes on and off flags) mod_layout will not try
+# to wrap any errors. Merge must be enabled for this to work. The
+# default for this is off.
+# LayoutMergeErrorIgnore
+
+# If this tag is found during a merge, no footer or header will be
+# inserted into the document
+# LayoutIgnoreTag
+
+# If this tag is found during a merge, no footer will be inserted
+# into the document
+# LayoutIgnoreTagFooter
+
+# If this tag is found during a merge, no header will be inserted
+# into the document
+# LayoutIgnoreTagHeader
+
+# This turns on mod_layout's own text/html and text/plain handler
+# LayoutHTMLHandler
+
+# If this is enabled and you are doing a merge, the tags used for the
+# merge will be replaced.
+# LayoutReplaceTags
+
+# If you want applications to do notes (a set of directives to control
+# actions inside apache).
+# LayoutNotes
+
+</Directory>
+
+</IfModule>
diff --git a/net-www/mod_layout/files/digest-mod_layout-3.2.1-r1 b/net-www/mod_layout/files/digest-mod_layout-3.2.1-r1
new file mode 100644
index 000000000000..639a29958c28
--- /dev/null
+++ b/net-www/mod_layout/files/digest-mod_layout-3.2.1-r1
@@ -0,0 +1 @@
+MD5 fdad44ac360f65b2ca75f08fe53af4ad mod_layout-3.2.1.tar.gz 33459
diff --git a/net-www/mod_layout/files/digest-mod_layout-4.0.1a-r1 b/net-www/mod_layout/files/digest-mod_layout-4.0.1a-r1
new file mode 100644
index 000000000000..63f3fb3dcbe8
--- /dev/null
+++ b/net-www/mod_layout/files/digest-mod_layout-4.0.1a-r1
@@ -0,0 +1 @@
+MD5 253c4a2c0f44b788648fc7564f246e87 mod_layout-4.0.1a.tar.gz 12674
diff --git a/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild b/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..fe96cb08a3d3
--- /dev/null
+++ b/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild,v 1.1 2005/01/07 19:06:56 vericgar Exp $
+
+inherit apache-module
+
+# test target in Makefile isn't sane
+RESTRICT="maketest"
+
+DESCRIPTION="An Apache DSO module for adding custom headers and/or footers"
+HOMEPAGE="http://software.tangent.org/"
+SRC_URI="http://download.tangent.org/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APXS1_S="${S}"
+APXS1_ARGS="-c ${PN}.c utility.c origin.c layout.c"
+APACHE1_MOD_FILE="${PN}.so"
+APACHE1_MOD_CONF="${PVR}/15_mod_layout"
+APACHE1_MOD_DEFINE="LAYOUT"
+
+DOCFILES="LICENSE README THANKS TODO faq.html"
+
+need_apache1
+
diff --git a/net-www/mod_layout/mod_layout-3.2.1.ebuild b/net-www/mod_layout/mod_layout-3.2.1.ebuild
index 176784bb9c9e..32e681a3a819 100644
--- a/net-www/mod_layout/mod_layout-3.2.1.ebuild
+++ b/net-www/mod_layout/mod_layout-3.2.1.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_layout/mod_layout-3.2.1.ebuild,v 1.3 2004/06/25 01:01:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/mod_layout-3.2.1.ebuild,v 1.4 2005/01/07 19:06:56 vericgar Exp $
 
 
 DESCRIPTION="An Apache DSO module for adding custom headers and/or footers"
diff --git a/net-www/mod_layout/mod_layout-4.0.1a-r1.ebuild b/net-www/mod_layout/mod_layout-4.0.1a-r1.ebuild
new file mode 100644
index 000000000000..7e31ab794669
--- /dev/null
+++ b/net-www/mod_layout/mod_layout-4.0.1a-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/mod_layout-4.0.1a-r1.ebuild,v 1.1 2005/01/07 19:06:56 vericgar Exp $
+
+inherit apache-module
+
+DESCRIPTION="An Apache2 DSO module for adding custom headers and/or footers"
+HOMEPAGE="http://software.tangent.org/"
+
+SRC_URI="http://download.tangent.org/${P}.tar.gz"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+SLOT="2"
+
+APXS2_S="${S}"
+APXS2_ARGS="-c ${PN}.c utility.c layout.c"
+
+APACHE2_MOD_FILE=".libs/${PN}.so"
+APACHE2_MOD_CONF="${PVR}/15_mod_layout"
+APACHE2_MOD_DEFINE="LAYOUT"
+
+DOCFILES="README"
+
+need_apache2
+
diff --git a/net-www/mod_layout/mod_layout-4.0.1a.ebuild b/net-www/mod_layout/mod_layout-4.0.1a.ebuild
index 3073e1ff451e..2aceb45b0e42 100644
--- a/net-www/mod_layout/mod_layout-4.0.1a.ebuild
+++ b/net-www/mod_layout/mod_layout-4.0.1a.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_layout/mod_layout-4.0.1a.ebuild,v 1.6 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/mod_layout-4.0.1a.ebuild,v 1.7 2005/01/07 19:06:56 vericgar Exp $
 
 inherit eutils