Fix config files.

(Portage version: 2.1.2_rc4-r8)
 (Unsigned Manifest commit)

2 files changed, 8 insertions, 164 deletions

diff --git a/net-www/mod_layout/Manifest b/net-www/mod_layout/Manifest
index eee6a980adcd..c52c9365c27e 100644
--- a/net-www/mod_layout/Manifest
+++ b/net-www/mod_layout/Manifest
@@ -2,24 +2,20 @@ AUX 15_mod_layout.conf 4654 RMD160 b3d7256ac785582d19f8205c61e3922ec35f7845 SHA1
 MD5 233872afb84493400986f25e36dd396f files/15_mod_layout.conf 4654
 RMD160 b3d7256ac785582d19f8205c61e3922ec35f7845 files/15_mod_layout.conf 4654
 SHA256 0db21a10af6c7cbcf7cafd72ec925d9b4f9ea32e3ea802dc5b7d8a8bcfcb641f files/15_mod_layout.conf 4654
-AUX 15_mod_layout_ap1.conf 4654 RMD160 b3d7256ac785582d19f8205c61e3922ec35f7845 SHA1 d3c53685b2c096b9878e1a62922ce511e6bc063e SHA256 0db21a10af6c7cbcf7cafd72ec925d9b4f9ea32e3ea802dc5b7d8a8bcfcb641f
-MD5 233872afb84493400986f25e36dd396f files/15_mod_layout_ap1.conf 4654
-RMD160 b3d7256ac785582d19f8205c61e3922ec35f7845 files/15_mod_layout_ap1.conf 4654
-SHA256 0db21a10af6c7cbcf7cafd72ec925d9b4f9ea32e3ea802dc5b7d8a8bcfcb641f files/15_mod_layout_ap1.conf 4654
 DIST mod_layout-3.2.1.tar.gz 33459 RMD160 6bbce3c9b769bd824952f5f18d3d8df0674b83e8 SHA1 62220449d996e9cfeb964e7553608e6d61fe4352 SHA256 9a788027ecd0e55541e524905fe61a6d8c25d81f0ffaf589b8590603e4bcfde3
 DIST mod_layout-4.0.1a.tar.gz 12674 RMD160 8e9a9fe90238490290b1a5221b71e8f70253aee0 SHA1 d3df5ddd067195fd5ba06fac90b6b68bf2b4db05 SHA256 fc6c471328482fe1018167852f22d94f993ac3bead51b8905cf0a618351c9a57
-EBUILD mod_layout-3.2.1-r1.ebuild 699 RMD160 29df4e2e803a2820e42df656c9e5e5346c303e44 SHA1 d00a978da0ed9f91ea0f861b39109f947e99ee8e SHA256 188327822fb1ead1f971287867e47d4a5eee482d0267ded3fa9344cc4e72db82
-MD5 b5799bf6818882f9bcb8099f173b2079 mod_layout-3.2.1-r1.ebuild 699
-RMD160 29df4e2e803a2820e42df656c9e5e5346c303e44 mod_layout-3.2.1-r1.ebuild 699
-SHA256 188327822fb1ead1f971287867e47d4a5eee482d0267ded3fa9344cc4e72db82 mod_layout-3.2.1-r1.ebuild 699
+EBUILD mod_layout-3.2.1-r1.ebuild 695 RMD160 17c418cab9b04584d5fab35ef777ecd145a63f68 SHA1 c61ee3192d55ccd0de1c09e273889bb50a06e680 SHA256 5a2b18a4f05c111fc4079bf0043fea3b9cbcaaed855e8bf072010ede7cde04fe
+MD5 7b5758ac635d43303b32260c086434ed mod_layout-3.2.1-r1.ebuild 695
+RMD160 17c418cab9b04584d5fab35ef777ecd145a63f68 mod_layout-3.2.1-r1.ebuild 695
+SHA256 5a2b18a4f05c111fc4079bf0043fea3b9cbcaaed855e8bf072010ede7cde04fe mod_layout-3.2.1-r1.ebuild 695
 EBUILD mod_layout-4.0.1a-r1.ebuild 637 RMD160 af271f398b8362900e8ce16986011d28b6e8dfb0 SHA1 d6de5d5355d6a7b4f70e4b27d1ce9baa153d57a3 SHA256 72f6bd448c14c36c4ea52c579f51af14141669c0cd7f7c56c009f3ed774a6add
 MD5 38aeabd8f92ca15a2629d53b04c99569 mod_layout-4.0.1a-r1.ebuild 637
 RMD160 af271f398b8362900e8ce16986011d28b6e8dfb0 mod_layout-4.0.1a-r1.ebuild 637
 SHA256 72f6bd448c14c36c4ea52c579f51af14141669c0cd7f7c56c009f3ed774a6add mod_layout-4.0.1a-r1.ebuild 637
-MISC ChangeLog 2181 RMD160 a07fad3349586d3f47d1dc39952c9ff0d4d91a98 SHA1 8ef4003986b21561b57ea54f5c189a8e5d64f088 SHA256 2e97b3cf2e8f5ae3f7cf9c4df9b4430a6ae765440d636313737675ed64b1c947
-MD5 38171eab6656f713cdc8745ab64b38b4 ChangeLog 2181
-RMD160 a07fad3349586d3f47d1dc39952c9ff0d4d91a98 ChangeLog 2181
-SHA256 2e97b3cf2e8f5ae3f7cf9c4df9b4430a6ae765440d636313737675ed64b1c947 ChangeLog 2181
+MISC ChangeLog 2323 RMD160 017272b2b14f684edc66e9d79a4637f11cec2918 SHA1 0ef3010769fe985af22b0463f96a3ce40c345a5f SHA256 072197810923857c8e9700d030d789d53ab456690f3e5b644316c1a11adc510b
+MD5 97416ff4c220d4c5553ee5ccd9d69a48 ChangeLog 2323
+RMD160 017272b2b14f684edc66e9d79a4637f11cec2918 ChangeLog 2323
+SHA256 072197810923857c8e9700d030d789d53ab456690f3e5b644316c1a11adc510b ChangeLog 2323
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
diff --git a/net-www/mod_layout/files/15_mod_layout_ap1.conf b/net-www/mod_layout/files/15_mod_layout_ap1.conf
deleted file mode 100644
index 3795ac070a30..000000000000
--- a/net-www/mod_layout/files/15_mod_layout_ap1.conf
+++ /dev/null
@@ -1,152 +0,0 @@
-<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>