From: Luca Longinotti Date: Sun, 14 Jan 2007 17:02:50 +0000 (+0000) Subject: Cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65e7c9f4ebddd2df6ceb6b2b3bf82f341142b0de;p=gentoo.git Cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- diff --git a/net-www/mod_layout/ChangeLog b/net-www/mod_layout/ChangeLog index 8529982ebe34..068f4f5fa5b9 100644 --- a/net-www/mod_layout/ChangeLog +++ b/net-www/mod_layout/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-www/mod_layout -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/ChangeLog,v 1.15 2006/11/25 08:27:08 blubb Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/ChangeLog,v 1.16 2007/01/14 17:02:49 chtekk Exp $ + + 14 Jan 2007; Luca Longinotti files/15_mod_layout.conf, + +files/15_mod_layout_ap1.conf, -files/15_mod_layout321.conf, + -files/3.2.1-r1/15_mod_layout.conf, + -files/mod_layout-4.0.1a-register.patch, + -files/4.0.1a-r1/15_mod_layout.conf, mod_layout-3.2.1-r1.ebuild, + mod_layout-4.0.1a-r1.ebuild: + Cleanup. 25 Nov 2006; mod_layout-3.2.1-r1.ebuild: added ~amd64 diff --git a/net-www/mod_layout/files/15_mod_layout.conf b/net-www/mod_layout/files/15_mod_layout.conf index 68691e5c7213..3795ac070a30 100644 --- a/net-www/mod_layout/files/15_mod_layout.conf +++ b/net-www/mod_layout/files/15_mod_layout.conf @@ -1,13 +1,19 @@ - LoadModule layout_module extramodules/mod_layout.so + LoadModule layout_module modules/mod_layout.so - -AddOutputFilter LAYOUT 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 @@ -15,22 +21,18 @@ AddOutputFilter LAYOUT html # LayoutCacheNeeded # A URI which prints the header contents. -LayoutHeader "

This is the LayoutHeader (included from the config file)

" +# LayoutHeader # A URI which prints the footer contents. -LayoutFooter "

This is the LayoutFooter (included from the config file)

" +LayoutFooter "

Powered by Gentoo Linux

" # 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 -->" "

Visit: Gentoo Linux

" replace +# Layout "<-- replace_me -->" "

Visit: Gentoo Linux

" replace -# Enter either a mime type or a handler type. This type will then be -# handled by mod_layout. -# LayoutHandler - # Enter a URI that should be ignored, regular expressions are allowed. # LayoutIgnoreURI @@ -145,6 +147,6 @@ LayoutComment On # actions inside apache). # LayoutNotes - + diff --git a/net-www/mod_layout/files/15_mod_layout_ap1.conf b/net-www/mod_layout/files/15_mod_layout_ap1.conf new file mode 100644 index 000000000000..3795ac070a30 --- /dev/null +++ b/net-www/mod_layout/files/15_mod_layout_ap1.conf @@ -0,0 +1,152 @@ + + + LoadModule layout_module modules/mod_layout.so + + + + + + +# 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 "

Powered by Gentoo Linux

" + +# 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 -->" "

Visit: Gentoo Linux

" 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 \\ +# 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 + + + + 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 index b6bd3a9b44e0..0dc9d5a0af5f 100644 --- a/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild +++ b/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild @@ -1,29 +1,29 @@ -# 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_layout/mod_layout-3.2.1-r1.ebuild,v 1.5 2006/11/25 08:27:08 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/mod_layout-3.2.1-r1.ebuild,v 1.6 2007/01/14 17:02:49 chtekk Exp $ inherit apache-module -# test target in Makefile isn't sane -RESTRICT="test" +KEYWORDS="~amd64 x86" -DESCRIPTION="An Apache DSO module for adding custom headers and/or footers" +DESCRIPTION="An Apache1 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="~amd64 x86" IUSE="" DEPEND="" RDEPEND="" +# Test target in Makefile isn't sane +RESTRICT="test" + APXS1_ARGS="-c ${PN}.c utility.c origin.c layout.c" -APACHE1_MOD_CONF="${PVR}/15_mod_layout" +APACHE1_MOD_CONF="15_mod_layout_ap1" APACHE1_MOD_DEFINE="LAYOUT" -DOCFILES="LICENSE README THANKS TODO faq.html" +DOCFILES="README" need_apache1 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 index 3b123de6280f..bf1240525448 100644 --- a/net-www/mod_layout/mod_layout-4.0.1a-r1.ebuild +++ b/net-www/mod_layout/mod_layout-4.0.1a-r1.ebuild @@ -1,21 +1,24 @@ -# 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_layout/mod_layout-4.0.1a-r1.ebuild,v 1.6 2006/11/24 22:05:43 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_layout/mod_layout-4.0.1a-r1.ebuild,v 1.7 2007/01/14 17:02:49 chtekk Exp $ inherit apache-module -DESCRIPTION="An Apache2 DSO module for adding custom headers and/or footers" -HOMEPAGE="http://software.tangent.org/" +KEYWORDS="~amd64 ppc x86" +DESCRIPTION="An Apache2 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="~amd64 ppc x86" -IUSE="" SLOT="2" +IUSE="" + +DEPEND="" +RDEPEND="" APXS2_ARGS="-c ${PN}.c utility.c layout.c" -APACHE2_MOD_CONF="${PVR}/15_mod_layout" +APACHE2_MOD_CONF="15_mod_layout" APACHE2_MOD_DEFINE="LAYOUT" DOCFILES="README"