version bump; cleanup

Package-Manager: portage-2.1.4

8 files changed, 45 insertions, 69 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/Manifest b/www-apache/mod_layout/Manifest
index 856446cd7ffb..0f19d358f46d 100644
--- a/www-apache/mod_layout/Manifest
+++ b/www-apache/mod_layout/Manifest
@@ -1,36 +1,38 @@
-AUX 15_mod_layout.conf 4654 RMD160 b3d7256ac785582d19f8205c61e3922ec35f7845 SHA1 d3c53685b2c096b9878e1a62922ce511e6bc063e SHA256 0db21a10af6c7cbcf7cafd72ec925d9b4f9ea32e3ea802dc5b7d8a8bcfcb641f
-MD5 233872afb84493400986f25e36dd396f files/15_mod_layout.conf 4654
-RMD160 b3d7256ac785582d19f8205c61e3922ec35f7845 files/15_mod_layout.conf 4654
-SHA256 0db21a10af6c7cbcf7cafd72ec925d9b4f9ea32e3ea802dc5b7d8a8bcfcb641f files/15_mod_layout.conf 4654
-DIST mod_layout-4.0.1a.tar.gz 12674 RMD160 8e9a9fe90238490290b1a5221b71e8f70253aee0 SHA1 d3df5ddd067195fd5ba06fac90b6b68bf2b4db05 SHA256 fc6c471328482fe1018167852f22d94f993ac3bead51b8905cf0a618351c9a57
-DIST mod_layout-4.1.tar.gz 22693 RMD160 d473a6efd562310ae826137d7d6c47384247793c SHA1 89b55a0a2d4d70d78b2bb9a602a7035a4a613beb SHA256 1d3a72637731e83e22b86f77e94e0cf09d0c7ccc6b2bce934fafd3607e438ed2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 15_mod_layout.conf 4590 RMD160 475227526962dfde0359b91754044419e17b61f8 SHA1 26862c068ee9385d6f6a6287c0740c217e0ee59f SHA256 2858a6a53d96fc3354b5de6078b3f26d319fd60d0ac456ba80b34f048e85dcc6
+MD5 b2d8cbfa75e34b3a40d307ca37666e8e files/15_mod_layout.conf 4590
+RMD160 475227526962dfde0359b91754044419e17b61f8 files/15_mod_layout.conf 4590
+SHA256 2858a6a53d96fc3354b5de6078b3f26d319fd60d0ac456ba80b34f048e85dcc6 files/15_mod_layout.conf 4590
 DIST mod_layout-5.0.tar.gz 22760 RMD160 0e8859384e253d3022857eed8f617d6951a3816d SHA1 4412ed74a2fe9afe97b1f3f4b8ef56a430d09aef SHA256 c22ce299dda919e6f260401aeb1d204514b0d0382076eed29b1020711b8438a9
-EBUILD mod_layout-4.0.1a-r1.ebuild 642 RMD160 eae77086ad4f2729ddbb6234ed36d975ec607c4b SHA1 b78182b8e6e40908b3712ac5513f48c4f60c100f SHA256 21bb5b11ff83f1e6cbff4de0f5edf7a3fd0166395684f946dda6898512a4c2ea
-MD5 c368a6be304675883c1e51dce2268819 mod_layout-4.0.1a-r1.ebuild 642
-RMD160 eae77086ad4f2729ddbb6234ed36d975ec607c4b mod_layout-4.0.1a-r1.ebuild 642
-SHA256 21bb5b11ff83f1e6cbff4de0f5edf7a3fd0166395684f946dda6898512a4c2ea mod_layout-4.0.1a-r1.ebuild 642
-EBUILD mod_layout-4.1.ebuild 638 RMD160 58595f005df2405427beac207b12b5a76cdafc7a SHA1 c11960c857d61ebe52a52813428bef9074698829 SHA256 f53073993d120cadf67a57c15934c8185e53508de8a42f0b47c14adc728584dc
-MD5 c9acc5d29e3faca0ce5e29cd686da15d mod_layout-4.1.ebuild 638
-RMD160 58595f005df2405427beac207b12b5a76cdafc7a mod_layout-4.1.ebuild 638
-SHA256 f53073993d120cadf67a57c15934c8185e53508de8a42f0b47c14adc728584dc mod_layout-4.1.ebuild 638
+DIST mod_layout-5.1.tar.gz 12798 RMD160 a9036731ba2e76c05c9e513764f004aab779b898 SHA1 8b9e433a7bc610e530ee8e69a0d1a6253cc8f9b3 SHA256 d00299e3aae38704096477377d20a5c5bcc32fe7802044358a79a31248cd23c6
 EBUILD mod_layout-5.0.ebuild 633 RMD160 67e264a1189a3b7c34a6f5dd3a74c5407a3b3210 SHA1 5c1ea1d9c8193c70c4d10c84cd3eb6f1f17ab360 SHA256 368c821f7673a1f17354d4c0cd4e53c61d40925f2453224cc97872a146712be2
 MD5 795568c6d5dc952cb670994a596b29b9 mod_layout-5.0.ebuild 633
 RMD160 67e264a1189a3b7c34a6f5dd3a74c5407a3b3210 mod_layout-5.0.ebuild 633
 SHA256 368c821f7673a1f17354d4c0cd4e53c61d40925f2453224cc97872a146712be2 mod_layout-5.0.ebuild 633
-MISC ChangeLog 3162 RMD160 e1125c2d67aeb1fab4e03f41b844e601c5c910b3 SHA1 d9966fdc0a209354d572f8c19735c896f8e6eaf0 SHA256 c2f99304ce4c75e5bc53ca7743f1a494193135bbdf085a36d9064c2438323faf
-MD5 3234909e7b7e8ad0a54c01594135ce8d ChangeLog 3162
-RMD160 e1125c2d67aeb1fab4e03f41b844e601c5c910b3 ChangeLog 3162
-SHA256 c2f99304ce4c75e5bc53ca7743f1a494193135bbdf085a36d9064c2438323faf ChangeLog 3162
+EBUILD mod_layout-5.1.ebuild 638 RMD160 fea409c13f41ea259d3222e90c86b56c668cf995 SHA1 dec5710eeee45bed0a7129b6352083a14e0f9abf SHA256 73e26e88e0c48e9d18cf521904b6988fb587f1fba53d06749a1ad7eaee3bbc67
+MD5 e50f4f7e369924faf765b5f72da4dc3b mod_layout-5.1.ebuild 638
+RMD160 fea409c13f41ea259d3222e90c86b56c668cf995 mod_layout-5.1.ebuild 638
+SHA256 73e26e88e0c48e9d18cf521904b6988fb587f1fba53d06749a1ad7eaee3bbc67 mod_layout-5.1.ebuild 638
+MISC ChangeLog 3378 RMD160 b34635184549acc731c1e505e0a10fdec2bf2eb3 SHA1 4f8841167f5fc1a3bc159eef4cefb950de588c43 SHA256 7c39c7674008481d733ed41122083b7cea137c94cd5bb3e5752f3de710479f1f
+MD5 8419ae93398b69aeae3db78c19d01fe3 ChangeLog 3378
+RMD160 b34635184549acc731c1e505e0a10fdec2bf2eb3 ChangeLog 3378
+SHA256 7c39c7674008481d733ed41122083b7cea137c94cd5bb3e5752f3de710479f1f ChangeLog 3378
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
 SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
-MD5 cf4bae4321e9b72b79048d0e25602bac files/digest-mod_layout-4.0.1a-r1 250
-RMD160 e30e65e830ac9dd7bea5178f9c8a8b37aecf46ab files/digest-mod_layout-4.0.1a-r1 250
-SHA256 e8abad963056120c212b08e4abfd2bf95d860dd85b60686fcef50af71f845c9d files/digest-mod_layout-4.0.1a-r1 250
-MD5 ab8b4df36e3f242f69ac72b22a2d91da files/digest-mod_layout-4.1 241
-RMD160 6de6a3a9572b4b97fb160d03a6af8d2534463ae5 files/digest-mod_layout-4.1 241
-SHA256 6e761906e3b516d5fd78615449adf0fac0f98a94b4d363c73656db84f16ea09e files/digest-mod_layout-4.1 241
 MD5 d440e409479ddf2027e3562bb0610546 files/digest-mod_layout-5.0 241
 RMD160 2d0e5a0c62544821a0466150ee1f5a3f1dcf54ca files/digest-mod_layout-5.0 241
 SHA256 54a0e64ee92686e24bb50dcb28d1f758e8c1bb5433fd2bce7a5c6aea85bf2b83 files/digest-mod_layout-5.0 241
+MD5 fd76973932fc22efd34c238fab668222 files/digest-mod_layout-5.1 241
+RMD160 bbdc1afd90720d9ce3484292007982ffeea91990 files/digest-mod_layout-5.1 241
+SHA256 3828ae96fc1ae6df260f484f4d1685e75717a13927188b24c20aafbf2d0ee616 files/digest-mod_layout-5.1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkecqHwACgkQmPFBzbX68WHJOQCeNgYEWxPmlnYsneVD/WKAL+JI
+VNwAnj+4Y1DAFZOueDr0mDZ9Y4zZwPY+
+=f3GR
+-----END PGP SIGNATURE-----
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