version bump; cleanup

(Portage version: 2.1.4)

7 files changed, 19 insertions, 45 deletions

diff --git a/www-apache/mod_layout/ChangeLog b/www-apache/mod_layout/ChangeLog
index c51779648367..2920532d5625 100644
--- a/www-apache/mod_layout/ChangeLog
+++ b/www-apache/mod_layout/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/mod_layout
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_layout/ChangeLog,v 1.6 2008/01/25 17:53:32 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_layout/ChangeLog,v 1.7 2008/01/27 15:51:15 hollow Exp $
+
+*mod_layout-5.1 (27 Jan 2008)
+
+  27 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/15_mod_layout.conf,
+  -mod_layout-4.0.1a-r1.ebuild, -mod_layout-4.1.ebuild,
+  +mod_layout-5.1.ebuild:
+  version bump; cleanup
 
   25 Jan 2008; Samuli Suominen <drac@gentoo.org> mod_layout-5.0.ebuild:
   amd64 stable wrt #205517
diff --git a/www-apache/mod_layout/files/15_mod_layout.conf b/www-apache/mod_layout/files/15_mod_layout.conf
index 3795ac070a30..5e652ae1cab1 100644
--- a/www-apache/mod_layout/files/15_mod_layout.conf
+++ b/www-apache/mod_layout/files/15_mod_layout.conf
@@ -1,10 +1,5 @@
 <IfDefine LAYOUT>
-  <IfModule !mod_layout.c>
-    LoadModule layout_module    modules/mod_layout.so
-  </IfModule>
-</IfDefine>
-
-<IfModule mod_layout.c>
+LoadModule layout_module modules/mod_layout.so
 
 <Directory /home/*/public_html>
 # This default configuration adds a footer to every html page in ~user
@@ -14,7 +9,7 @@
 # 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."
@@ -32,7 +27,7 @@ LayoutFooter "<p>Powered by <a href='http://www.gentoo.org'>Gentoo Linux</a></p>
 # 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
 
@@ -148,5 +143,6 @@ LayoutComment On
 # LayoutNotes
 
 </Directory>
+</IfDefine>
 
-</IfModule>
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_layout/files/digest-mod_layout-4.0.1a-r1 b/www-apache/mod_layout/files/digest-mod_layout-4.0.1a-r1
deleted file mode 100644
index 2f6d7b8c29d7..000000000000
--- a/www-apache/mod_layout/files/digest-mod_layout-4.0.1a-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 253c4a2c0f44b788648fc7564f246e87 mod_layout-4.0.1a.tar.gz 12674
-RMD160 8e9a9fe90238490290b1a5221b71e8f70253aee0 mod_layout-4.0.1a.tar.gz 12674
-SHA256 fc6c471328482fe1018167852f22d94f993ac3bead51b8905cf0a618351c9a57 mod_layout-4.0.1a.tar.gz 12674
diff --git a/www-apache/mod_layout/files/digest-mod_layout-4.1 b/www-apache/mod_layout/files/digest-mod_layout-4.1
deleted file mode 100644
index d3b5c312faab..000000000000
--- a/www-apache/mod_layout/files/digest-mod_layout-4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e4af84f22851b95c9303ccdcc0a35e31 mod_layout-4.1.tar.gz 22693
-RMD160 d473a6efd562310ae826137d7d6c47384247793c mod_layout-4.1.tar.gz 22693
-SHA256 1d3a72637731e83e22b86f77e94e0cf09d0c7ccc6b2bce934fafd3607e438ed2 mod_layout-4.1.tar.gz 22693
diff --git a/www-apache/mod_layout/files/digest-mod_layout-5.1 b/www-apache/mod_layout/files/digest-mod_layout-5.1
new file mode 100644
index 000000000000..5dbbb733342b
--- /dev/null
+++ b/www-apache/mod_layout/files/digest-mod_layout-5.1
@@ -0,0 +1,3 @@
+MD5 6b2f231773ee84c8c5aa9820f934ad78 mod_layout-5.1.tar.gz 12798
+RMD160 a9036731ba2e76c05c9e513764f004aab779b898 mod_layout-5.1.tar.gz 12798
+SHA256 d00299e3aae38704096477377d20a5c5bcc32fe7802044358a79a31248cd23c6 mod_layout-5.1.tar.gz 12798
diff --git a/www-apache/mod_layout/mod_layout-4.0.1a-r1.ebuild b/www-apache/mod_layout/mod_layout-4.0.1a-r1.ebuild
deleted file mode 100644
index 256a2ee9b126..000000000000
--- a/www-apache/mod_layout/mod_layout-4.0.1a-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_layout/mod_layout-4.0.1a-r1.ebuild,v 1.2 2007/09/08 15:00:14 hollow Exp $
-
-inherit apache-module
-
-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"
-SLOT="2"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APXS2_ARGS="-c ${PN}.c utility.c layout.c"
-
-APACHE2_MOD_CONF="15_mod_layout"
-APACHE2_MOD_DEFINE="LAYOUT"
-
-DOCFILES="README"
-
-need_apache2_0
diff --git a/www-apache/mod_layout/mod_layout-4.1.ebuild b/www-apache/mod_layout/mod_layout-5.1.ebuild
index 2031f4984ac0..d53655d2111c 100644
--- a/www-apache/mod_layout/mod_layout-4.1.ebuild
+++ b/www-apache/mod_layout/mod_layout-5.1.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_layout/mod_layout-4.1.ebuild,v 1.1 2007/09/08 15:00:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_layout/mod_layout-5.1.ebuild,v 1.1 2008/01/27 15:51:15 hollow Exp $
 
 inherit apache-module
 
@@ -23,4 +23,4 @@ APACHE2_MOD_DEFINE="LAYOUT"
 
 DOCFILES="README"
 
-need_apache2_0
+need_apache2_2