Cleanup.

Package-Manager: portage-2.1.2_rc4-r8

11 files changed, 71 insertions, 44 deletions

diff --git a/www-apache/mod_lisp/ChangeLog b/www-apache/mod_lisp/ChangeLog
index 484789c05cf3..1c4daca5b50c 100644
--- a/www-apache/mod_lisp/ChangeLog
+++ b/www-apache/mod_lisp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_lisp
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_lisp/ChangeLog,v 1.14 2006/06/05 19:35:39 chtekk Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_lisp/ChangeLog,v 1.15 2007/01/15 17:06:04 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> mod_lisp-2.42.ebuild,
+  mod_lisp-2.43.ebuild:
+  Cleanup.
 
   05 Jun 2006; Luca Longinotti <chtekk@gentoo.org> files/10_mod_lisp.conf,
   -files/README.Gentoo, -files/apache.conf, metadata.xml,
diff --git a/www-apache/mod_lisp/mod_lisp-2.42.ebuild b/www-apache/mod_lisp/mod_lisp-2.42.ebuild
index 056e32893784..471030fddff8 100644
--- a/www-apache/mod_lisp/mod_lisp-2.42.ebuild
+++ b/www-apache/mod_lisp/mod_lisp-2.42.ebuild
@@ -1,18 +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_lisp/mod_lisp-2.42.ebuild,v 1.6 2006/06/05 19:35:39 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_lisp/mod_lisp-2.42.ebuild,v 1.7 2007/01/15 17:06:04 chtekk Exp $
 
 inherit apache-module
 
-DESCRIPTION="mod_lisp is an Apache module to easily write web applications in Common Lisp."
+KEYWORDS="amd64 ppc ~sparc x86"
+
+DESCRIPTION="mod_lisp is an Apache1 module to easily write web applications in Common Lisp."
 HOMEPAGE="http://www.fractalconcept.com/asp/sdataQIceRsMvtN9fDM==/sdataQuvY9x3g$ecX"
 SRC_URI="mirror://gentoo/${P}.c"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
+RDEPEND=""
 
 APACHE1_MOD_CONF="10_${PN}"
 APACHE1_MOD_DEFINE="LISP"
@@ -20,6 +22,6 @@ APACHE1_MOD_DEFINE="LISP"
 need_apache1
 
 src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}/${P}.c" "${S}/${PN}.c"
+	mkdir -p "${S}" || die "mkdir S failed"
+	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
 }
diff --git a/www-apache/mod_lisp/mod_lisp-2.43.ebuild b/www-apache/mod_lisp/mod_lisp-2.43.ebuild
index 8ecbe917a427..b5c07f5624fe 100644
--- a/www-apache/mod_lisp/mod_lisp-2.43.ebuild
+++ b/www-apache/mod_lisp/mod_lisp-2.43.ebuild
@@ -1,18 +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_lisp/mod_lisp-2.43.ebuild,v 1.2 2006/06/05 19:35:39 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_lisp/mod_lisp-2.43.ebuild,v 1.3 2007/01/15 17:06:04 chtekk Exp $
 
 inherit apache-module
 
-DESCRIPTION="mod_lisp is an Apache module to easily write web applications in Common Lisp."
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DESCRIPTION="mod_lisp is an Apache1 module to easily write web applications in Common Lisp."
 HOMEPAGE="http://www.fractalconcept.com/asp/sdataQIceRsMvtN9fDM==/sdataQuvY9x3g$ecX"
 SRC_URI="mirror://gentoo/${P}.c"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
+RDEPEND=""
 
 APACHE1_MOD_CONF="10_${PN}"
 APACHE1_MOD_DEFINE="LISP"
@@ -20,6 +22,6 @@ APACHE1_MOD_DEFINE="LISP"
 need_apache1
 
 src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}/${P}.c" "${S}/${PN}.c"
+	mkdir -p "${S}" || die "mkdir S failed"
+	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
 }
diff --git a/www-apache/mod_lisp2/ChangeLog b/www-apache/mod_lisp2/ChangeLog
index b611cab6d76b..908d8f710317 100644
--- a/www-apache/mod_lisp2/ChangeLog
+++ b/www-apache/mod_lisp2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apache/mod_lisp2
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_lisp2/ChangeLog,v 1.2 2006/06/05 19:57:54 chtekk Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_lisp2/ChangeLog,v 1.3 2007/01/15 17:10:11 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> mod_lisp2-1.2.ebuild:
+  Cleanup.
 
   05 Jun 2006; Luca Longinotti <chtekk@gentoo.org> files/10_mod_lisp2.conf,
   -files/README.Gentoo, -files/apache.conf, metadata.xml,
diff --git a/www-apache/mod_lisp2/mod_lisp2-1.2.ebuild b/www-apache/mod_lisp2/mod_lisp2-1.2.ebuild
index 68337c52b377..3a7c638c0944 100644
--- a/www-apache/mod_lisp2/mod_lisp2-1.2.ebuild
+++ b/www-apache/mod_lisp2/mod_lisp2-1.2.ebuild
@@ -1,19 +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_lisp2/mod_lisp2-1.2.ebuild,v 1.2 2006/06/05 19:57:54 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_lisp2/mod_lisp2-1.2.ebuild,v 1.3 2007/01/15 17:10:11 chtekk Exp $
 
 inherit apache-module eutils
 
-DESCRIPTION="mod_lisp is an Apache module to easily write web applications in Common Lisp."
+KEYWORDS="~x86"
+
+DESCRIPTION="mod_lisp2 is an Apache2 module to easily write web applications in Common Lisp."
 HOMEPAGE="http://www.fractalconcept.com/asp/sdataQIceRsMvtN9fDM==/sdataQuvY9x3g$ecX"
 SRC_URI="mirror://gentoo/${P}.c"
-
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=""
+RDEPEND=""
 
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="LISP"
@@ -21,8 +22,9 @@ APACHE2_MOD_DEFINE="LISP"
 need_apache2
 
 src_unpack() {
-	mkdir "${S}"
+	mkdir -p "${S}" || die "mkdir S failed"
+	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
+
 	cd "${S}"
-	cp "${DISTDIR}/${P}.c" "${PN}.c"
-	epatch "${FILESDIR}/${PV}-content-length.patch" || die # http://common-lisp.net/pipermail/mod-lisp-devel/2005-December/000082.html
+	epatch "${FILESDIR}/${PV}-content-length.patch"
 }
diff --git a/www-apache/mod_macro/ChangeLog b/www-apache/mod_macro/ChangeLog
index 7fe9f7d55bba..0e85477d095d 100644
--- a/www-apache/mod_macro/ChangeLog
+++ b/www-apache/mod_macro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_macro
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/ChangeLog,v 1.8 2006/11/29 21:03:22 swegener Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/ChangeLog,v 1.9 2007/01/15 17:14:35 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  mod_macro-1.1.2.ebuild, mod_macro-1.1.6.ebuild:
+  Cleanup.
 
   29 Nov 2006; Sven Wegener <swegener@gentoo.org> mod_macro-1.1.2.ebuild,
   mod_macro-1.1.6.ebuild:
diff --git a/www-apache/mod_macro/files/digest-mod_macro-1.1.2 b/www-apache/mod_macro/files/digest-mod_macro-1.1.2
index 8b049667a0af..62b117cc88ab 100644
--- a/www-apache/mod_macro/files/digest-mod_macro-1.1.2
+++ b/www-apache/mod_macro/files/digest-mod_macro-1.1.2
@@ -1 +1,3 @@
 MD5 dc1e6785f07ee6760af3eda564969850 mod_macro-1.1.2.tar.bz2 12983
+RMD160 9d995223db83c08e2c3ce7ebeaf020f073681c48 mod_macro-1.1.2.tar.bz2 12983
+SHA256 741864ae2973dd0cdcd48ebfe3547d2d2ed883cc56b9c640e85ba12c20645f1c mod_macro-1.1.2.tar.bz2 12983
diff --git a/www-apache/mod_macro/files/digest-mod_macro-1.1.6 b/www-apache/mod_macro/files/digest-mod_macro-1.1.6
index 7e699c0622ca..7d0b37399faf 100644
--- a/www-apache/mod_macro/files/digest-mod_macro-1.1.6
+++ b/www-apache/mod_macro/files/digest-mod_macro-1.1.6
@@ -1 +1,3 @@
 MD5 c79c299f650b35292d3b71da19e42e45 mod_macro-1.1.6.tar.bz2 13002
+RMD160 a6ca451c1d704a066e0192b0e504e8458bd065b3 mod_macro-1.1.6.tar.bz2 13002
+SHA256 ab67bd4e2c4d240c7814e4b4b1074e342a7385917a4b986623cb8698610ef466 mod_macro-1.1.6.tar.bz2 13002
diff --git a/www-apache/mod_macro/metadata.xml b/www-apache/mod_macro/metadata.xml
index ff5b6490402e..a1f5ceff2352 100644
--- a/www-apache/mod_macro/metadata.xml
+++ b/www-apache/mod_macro/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>apache-bugs@gentoo.org</email>
-</maintainer>
+	<herd>apache</herd>
+	<maintainer>
+		<email>apache-bugs@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_macro/mod_macro-1.1.2.ebuild b/www-apache/mod_macro/mod_macro-1.1.2.ebuild
index dfa93caddcad..9ef43318a459 100644
--- a/www-apache/mod_macro/mod_macro-1.1.2.ebuild
+++ b/www-apache/mod_macro/mod_macro-1.1.2.ebuild
@@ -1,18 +1,21 @@
-# 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_macro/mod_macro-1.1.2.ebuild,v 1.2 2006/11/29 21:03:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/mod_macro-1.1.2.ebuild,v 1.3 2007/01/15 17:14:35 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="An Apache DSO providing macros for the apache config file"
-HOMEPAGE="http://www.coelho.net/mod_macro/"
-SRC_URI="http://www.coelho.net/mod_macro/${P}.tar.bz2"
+KEYWORDS="~x86"
 
+DESCRIPTION="An Apache1 module providing macros for the Apache config file."
+HOMEPAGE="http://www.coelho.net/mod_macro/"
+SRC_URI="http://www.coelho.net/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
-KEYWORDS="~x86"
 SLOT="0"
 IUSE=""
 
+DEPEND=""
+RDEPEND=""
+
 APACHE1_MOD_CONF="27_${PN}"
 APACHE1_MOD_DEFINE="MACRO"
 
diff --git a/www-apache/mod_macro/mod_macro-1.1.6.ebuild b/www-apache/mod_macro/mod_macro-1.1.6.ebuild
index 01990744518d..737cba5af5f6 100644
--- a/www-apache/mod_macro/mod_macro-1.1.6.ebuild
+++ b/www-apache/mod_macro/mod_macro-1.1.6.ebuild
@@ -1,18 +1,21 @@
-# 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_macro/mod_macro-1.1.6.ebuild,v 1.6 2006/11/29 21:03:22 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_macro/mod_macro-1.1.6.ebuild,v 1.7 2007/01/15 17:14:35 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="An Apache2 DSO providing macros for the apache config file"
-HOMEPAGE="http://www.coelho.net/mod_macro/"
-SRC_URI="http://www.coelho.net/mod_macro/${P}.tar.bz2"
+KEYWORDS="~amd64 x86"
 
+DESCRIPTION="An Apache2 module providing macros for the Apache config file."
+HOMEPAGE="http://www.coelho.net/mod_macro/"
+SRC_URI="http://www.coelho.net/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
-KEYWORDS="~amd64 x86"
 SLOT="0"
 IUSE=""
 
+DEPEND=""
+RDEPEND=""
+
 APACHE2_MOD_CONF="27_${PN}"
 APACHE2_MOD_DEFINE="MACRO"