Cleanup.

(Portage version: 2.1.2_rc4-r8)

6 files changed, 34 insertions, 29 deletions

diff --git a/www-apache/mod_proxy_html/ChangeLog b/www-apache/mod_proxy_html/ChangeLog
index be0780f8c96f..f5eca3c1da91 100644
--- a/www-apache/mod_proxy_html/ChangeLog
+++ b/www-apache/mod_proxy_html/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_proxy_html
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/ChangeLog,v 1.8 2006/07/10 15:16:35 blubb Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/ChangeLog,v 1.9 2007/01/15 18:37:36 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  mod_proxy_html-2.4.3.ebuild, mod_proxy_html-2.5.1.ebuild:
+  Cleanup.
 
   10 Jul 2006; Simon Stelling <blubb@gentoo.org>
   mod_proxy_html-2.5.1.ebuild:
diff --git a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.4.3 b/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.4.3
index 1b8f3518b685..02cb4e7847a3 100644
--- a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.4.3
+++ b/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.4.3
@@ -1 +1,3 @@
 MD5 e391f303572b3deb9a3c603ce99894d0 mod_proxy_html-2.4.3.c 31180
+RMD160 60fa34b7e008920fdb3e538fd244612605627788 mod_proxy_html-2.4.3.c 31180
+SHA256 ae07830ba6b4c28faa06451bea9c3778515fdbd0a6a5cac31464d6682a5d3fe1 mod_proxy_html-2.4.3.c 31180
diff --git a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.5.1 b/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.5.1
index 3bd2aa610134..169e98bb4a8d 100644
--- a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.5.1
+++ b/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.5.1
@@ -1 +1,3 @@
 MD5 909e19f51c4b158abf6b4d6be165683e mod_proxy_html-2.5.1.c.bz2 8608
+RMD160 471b37cc511dd34ac4c4727a5ee4924acd77d24b mod_proxy_html-2.5.1.c.bz2 8608
+SHA256 2681c38acb9e289f5ff4d4b7c8e7c9c970ab92b7934b42e6f3a69f4975e18a79 mod_proxy_html-2.5.1.c.bz2 8608
diff --git a/www-apache/mod_proxy_html/metadata.xml b/www-apache/mod_proxy_html/metadata.xml
index ff5b6490402e..a1f5ceff2352 100644
--- a/www-apache/mod_proxy_html/metadata.xml
+++ b/www-apache/mod_proxy_html/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_proxy_html/mod_proxy_html-2.4.3.ebuild b/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild
index 3ff68e378d91..9999aad141bf 100644
--- a/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild
+++ b/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild
@@ -1,14 +1,14 @@
-# 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_proxy_html/mod_proxy_html-2.4.3.ebuild,v 1.5 2006/06/04 19:07:22 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild,v 1.6 2007/01/15 18:37:36 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="An Apache2 DSO to rewrite links in html pages behind a reverse proxy"
+KEYWORDS="x86"
+
+DESCRIPTION="An Apache2 module to rewrite links in html pages behind a reverse proxy."
 HOMEPAGE="http://apache.webthing.com/mod_proxy_html/"
 SRC_URI="mirror://gentoo/${P}.c"
-
-KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
@@ -16,19 +16,17 @@ IUSE=""
 DEPEND="dev-libs/libxml2"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}
-
 APACHE2_MOD_CONF="27_${PN}"
 APACHE2_MOD_DEFINE="PROXY_HTML"
 
 need_apache2
 
 src_unpack() {
-	cp ${DISTDIR}/${P}.c ${PN}.c || die
+	mkdir -p "${S}" || die "mkdir S failed"
+	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
 }
 
 src_compile() {
-	APXS2_ARGS="`xml2-config --cflags` -c ${PN}.c"
+	APXS2_ARGS="$(xml2-config --cflags) -c ${PN}.c"
 	apache2_src_compile
 }
-
diff --git a/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild b/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild
index f552934f7e4b..1ad1df944ba5 100644
--- a/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild
+++ b/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild
@@ -1,23 +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_proxy_html/mod_proxy_html-2.5.1.ebuild,v 1.3 2006/07/10 15:16:35 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild,v 1.4 2007/01/15 18:37:36 chtekk Exp $
 
-inherit eutils apache-module
+inherit apache-module
 
-DESCRIPTION="An Apache2 DSO to rewrite links in html pages behind a reverse proxy"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="An Apache2 module to rewrite links in html pages behind a reverse proxy."
 HOMEPAGE="http://apache.webthing.com/mod_proxy_html/"
 SRC_URI="mirror://gentoo/${P}.c.bz2"
-
-KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="app-arch/bzip2"
-RDEPEND="${DEPEND}
-	dev-libs/libxml2"
-
-S="${WORKDIR}"
+DEPEND="app-arch/bzip2
+		dev-libs/libxml2"
+RDEPEND="${DEPEND}"
 
 APACHE2_MOD_CONF="27_${PN}"
 APACHE2_MOD_DEFINE="PROXY_HTML"
@@ -25,7 +23,8 @@ APACHE2_MOD_DEFINE="PROXY_HTML"
 need_apache2
 
 src_unpack() {
-	bzip2 -dc "${DISTDIR}/${P}.c.bz2" > "${PN}.c" || die
+	mkdir -p "${S}" || die "mkdir S failed"
+	bzip2 -dc "${DISTDIR}/${P}.c.bz2" > "${S}/${PN}.c" || die "source unpack failed"
 }
 
 src_compile() {