Cleanup.

Package-Manager: portage-2.1.2_rc4-r8

10 files changed, 81 insertions, 51 deletions

diff --git a/www-apache/mod_cband/ChangeLog b/www-apache/mod_cband/ChangeLog
index b2d8141b54e4..c8f13b0dd8f3 100644
--- a/www-apache/mod_cband/ChangeLog
+++ b/www-apache/mod_cband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_cband
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cband/ChangeLog,v 1.7 2006/11/29 21:10:57 swegener Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cband/ChangeLog,v 1.8 2007/01/15 16:00:27 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  mod_cband-0.9.7.2.ebuild, mod_cband-0.9.7.5.ebuild:
+  Cleanup.
 
   29 Nov 2006; Sven Wegener <swegener@gentoo.org> mod_cband-0.9.7.5.ebuild:
   Add ~amd64 keyword.
diff --git a/www-apache/mod_cband/metadata.xml b/www-apache/mod_cband/metadata.xml
index 5f67b77ddf91..44e2405be44a 100644
--- a/www-apache/mod_cband/metadata.xml
+++ b/www-apache/mod_cband/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
-<maintainer>
-  <email>nelchael@gentoo.org</email>
-</maintainer>
+	<herd>apache</herd>
+	<maintainer>
+		<email>nelchael@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_cband/mod_cband-0.9.7.2.ebuild b/www-apache/mod_cband/mod_cband-0.9.7.2.ebuild
index c2b59f2bb631..907f0f5320a0 100644
--- a/www-apache/mod_cband/mod_cband-0.9.7.2.ebuild
+++ b/www-apache/mod_cband/mod_cband-0.9.7.2.ebuild
@@ -1,17 +1,20 @@
-# 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/www-apache/mod_cband/mod_cband-0.9.7.2.ebuild,v 1.4 2006/11/19 11:46:10 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cband/mod_cband-0.9.7.2.ebuild,v 1.5 2007/01/15 16:00:27 chtekk Exp $
 
 inherit apache-module
 
-DESCRIPTION="Apache 2 bandwidth quota and throttling module"
+KEYWORDS="x86"
+
+DESCRIPTION="Apache2 bandwidth quota and throttling module."
 HOMEPAGE="http://cband.linux.pl/"
-LICENSE="GPL-2"
 SRC_URI="http://cband.linux.pl/download/mod-cband-${PV}.tgz"
-
-KEYWORDS="x86"
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
 
 S="${WORKDIR}/mod-cband-${PV}"
 
@@ -19,8 +22,10 @@ DOCFILES="conf/vhosts3.conf.example \
 		conf/vhosts2.conf.example \
 		conf/vhosts.conf.example \
 		Changes AUTHORS doc/*"
+
+APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="CBAND"
-APACHE2_MOD_CONF="10_mod_cband"
-APXS2_ARGS="-DDST_CLASS=3 -c mod_cband.c"
+
+APXS2_ARGS="-DDST_CLASS=3 -c ${PN}.c"
 
 need_apache2
diff --git a/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild b/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild
index 959c7557fb77..5c2777a4c3f0 100644
--- a/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild
+++ b/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild
@@ -1,17 +1,20 @@
-# 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/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild,v 1.2 2006/11/29 21:10:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild,v 1.3 2007/01/15 16:00:27 chtekk Exp $
 
 inherit apache-module
 
-DESCRIPTION="Apache 2 bandwidth quota and throttling module"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Apache2 bandwidth quota and throttling module."
 HOMEPAGE="http://cband.linux.pl/"
-LICENSE="GPL-2"
 SRC_URI="http://cband.linux.pl/download/mod-cband-${PV}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
 
 S="${WORKDIR}/mod-cband-${PV}"
 
@@ -19,8 +22,10 @@ DOCFILES="conf/vhosts3.conf.example \
 		conf/vhosts2.conf.example \
 		conf/vhosts.conf.example \
 		Changes AUTHORS doc/*"
+
+APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="CBAND"
-APACHE2_MOD_CONF="10_mod_cband"
-APXS2_ARGS="-DDST_CLASS=3 -c mod_cband.c"
+
+APXS2_ARGS="-DDST_CLASS=3 -c ${PN}.c"
 
 need_apache2
diff --git a/www-apache/mod_chroot/ChangeLog b/www-apache/mod_chroot/ChangeLog
index 4ab5f9bd4063..8071234cfe03 100644
--- a/www-apache/mod_chroot/ChangeLog
+++ b/www-apache/mod_chroot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_chroot
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/ChangeLog,v 1.8 2006/06/05 17:12:21 hollow Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/ChangeLog,v 1.9 2007/01/15 16:04:23 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> mod_chroot-0.4.ebuild,
+  mod_chroot-0.5.ebuild:
+  Cleanup.
 
 *mod_chroot-0.5 (05 Jun 2006)
 
diff --git a/www-apache/mod_chroot/mod_chroot-0.4.ebuild b/www-apache/mod_chroot/mod_chroot-0.4.ebuild
index 6044815af24b..f8c6f3eb7177 100644
--- a/www-apache/mod_chroot/mod_chroot-0.4.ebuild
+++ b/www-apache/mod_chroot/mod_chroot-0.4.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/mod_chroot-0.4.ebuild,v 1.3 2005/11/01 19:23:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/mod_chroot-0.4.ebuild,v 1.4 2007/01/15 16:04:23 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="mod_chroot allows you to run Apache in a chroot jail with no additional files"
+KEYWORDS="ppc x86"
+
+DESCRIPTION="mod_chroot allows you to run Apache in a chroot jail with no additional files."
 HOMEPAGE="http://core.segfault.pl/~hobbit/mod_chroot/"
 SRC_URI="http://core.segfault.pl/~hobbit/mod_chroot/dist/${P}.tar.gz"
-
 LICENSE="GPL-2"
-KEYWORDS="ppc x86"
-IUSE=""
 SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
 
 APXS1_S="${S}/src/apache13"
 APACHE1_MOD_CONF="15_${PN}"
diff --git a/www-apache/mod_chroot/mod_chroot-0.5.ebuild b/www-apache/mod_chroot/mod_chroot-0.5.ebuild
index 93eb2971a8e8..ceba6a9e0a86 100644
--- a/www-apache/mod_chroot/mod_chroot-0.5.ebuild
+++ b/www-apache/mod_chroot/mod_chroot-0.5.ebuild
@@ -1,17 +1,20 @@
-# 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/www-apache/mod_chroot/mod_chroot-0.5.ebuild,v 1.1 2006/06/05 17:12:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_chroot/mod_chroot-0.5.ebuild,v 1.2 2007/01/15 16:04:23 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="mod_chroot allows you to run Apache in a chroot jail with no additional files"
+KEYWORDS="~ppc ~x86"
+
+DESCRIPTION="mod_chroot allows you to run Apache in a chroot jail with no additional files."
 HOMEPAGE="http://core.segfault.pl/~hobbit/mod_chroot/"
 SRC_URI="http://core.segfault.pl/~hobbit/mod_chroot/dist/${P}.tar.gz"
-
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-IUSE=""
 SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
 
 APXS1_S="${S}/src/apache13"
 APACHE1_MOD_CONF="15_${PN}"
diff --git a/www-apache/mod_diagnostics/ChangeLog b/www-apache/mod_diagnostics/ChangeLog
index 2a212d97f85e..03e914fef93b 100644
--- a/www-apache/mod_diagnostics/ChangeLog
+++ b/www-apache/mod_diagnostics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_diagnostics
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_diagnostics/ChangeLog,v 1.3 2006/01/16 06:29:14 chriswhite Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_diagnostics/ChangeLog,v 1.4 2007/01/15 16:08:24 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  mod_diagnostics-0.0.1.ebuild:
+  Cleanup.
 
   16 Jan 2006; Chris White <chriswhite@gentoo.org>
   mod_diagnostics-0.0.1.ebuild:
diff --git a/www-apache/mod_diagnostics/files/digest-mod_diagnostics-0.0.1 b/www-apache/mod_diagnostics/files/digest-mod_diagnostics-0.0.1
index ae8f385b40c7..2ebec2b9d57b 100644
--- a/www-apache/mod_diagnostics/files/digest-mod_diagnostics-0.0.1
+++ b/www-apache/mod_diagnostics/files/digest-mod_diagnostics-0.0.1
@@ -1 +1,3 @@
 MD5 6e31a30701925dfc54553e74b720b540 mod_diagnostics-0.0.1.c 6373
+RMD160 500edb3a862d34d8592f83165fe22836a3c305f9 mod_diagnostics-0.0.1.c 6373
+SHA256 838947b5019dfb865dc2fcaca5acaeff123bde6f83dc2dd9064fb1153cd1ea14 mod_diagnostics-0.0.1.c 6373
diff --git a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
index 1a4a2178a0b8..b9296f7353cd 100644
--- a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
+++ b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
@@ -1,19 +1,19 @@
-# 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/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild,v 1.4 2006/01/16 06:29:14 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild,v 1.5 2007/01/15 16:08:24 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="An Apache2 DSO which can do debugging of modules in the Apache2 Filter Chain"
-HOMEPAGE="http://apache.webthing.com/mod_diagnostics"
-SRC_URI="mirror://gentoo/${P}.c"
+KEYWORDS="x86"
 
+DESCRIPTION="An Apache2 module which can do debugging of modules in the Apache2 Filter Chain."
+HOMEPAGE="http://apache.webthing.com/mod_diagnostics/"
+SRC_URI="mirror://gentoo/${P}.c"
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 APACHE2_MOD_CONF="20_${PN}"
 APACHE2_MOD_DEFINE="DIAGNOSTICS"
@@ -21,5 +21,5 @@ APACHE2_MOD_DEFINE="DIAGNOSTICS"
 need_apache2
 
 src_unpack() {
-	cp ${DISTDIR}/${P}.c ${PN}.c || die
+	cp -f "${DISTDIR}/${P}.c" "${S}/" || die "source copy failed"
 }