Cleanup.

Package-Manager: portage-2.1.2_rc4-r8

7 files changed, 58 insertions, 53 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/Manifest b/www-apache/mod_proxy_html/Manifest
index b5e3024ba5b8..ba00b30c2ba3 100644
--- a/www-apache/mod_proxy_html/Manifest
+++ b/www-apache/mod_proxy_html/Manifest
@@ -2,27 +2,27 @@ AUX 27_mod_proxy_html.conf 278 RMD160 122e0a68236a6804d362ea8c4e3a0ed727b62d2b S
 MD5 b3bf46cfc6e40fe45c749f0763a92945 files/27_mod_proxy_html.conf 278
 RMD160 122e0a68236a6804d362ea8c4e3a0ed727b62d2b files/27_mod_proxy_html.conf 278
 SHA256 ae6ba7d69af43de56dbda62c74daeb0de385db3ff1b6136cf0d87d99e52177f4 files/27_mod_proxy_html.conf 278
-DIST mod_proxy_html-2.4.3.c 31180
-DIST mod_proxy_html-2.5.1.c.bz2 8608
-EBUILD mod_proxy_html-2.4.3.ebuild 767 RMD160 aa569ad87506662f91246b9745426634e69947a7 SHA1 1b689a1d75edc9adc47ad66d074fa077dd12063e SHA256 bce968b621a73c77421b4d2d9e9b2ae3902c78a75f44c0ecb7bf2f24905c8423
-MD5 43f05f445430168cbc947e60e33b28d2 mod_proxy_html-2.4.3.ebuild 767
-RMD160 aa569ad87506662f91246b9745426634e69947a7 mod_proxy_html-2.4.3.ebuild 767
-SHA256 bce968b621a73c77421b4d2d9e9b2ae3902c78a75f44c0ecb7bf2f24905c8423 mod_proxy_html-2.4.3.ebuild 767
-EBUILD mod_proxy_html-2.5.1.ebuild 811 RMD160 20f4a20140585f04006c4324ae8c3234d7eb10a0 SHA1 710fee754f7f4ca93ece0de2ae5be8a7d943d8ee SHA256 862cdf3bc9d737c84ef6d9cfb4f9aa26a82c4326486602fe7bf631c15f3eb551
-MD5 7442abea96db799144342a1881331147 mod_proxy_html-2.5.1.ebuild 811
-RMD160 20f4a20140585f04006c4324ae8c3234d7eb10a0 mod_proxy_html-2.5.1.ebuild 811
-SHA256 862cdf3bc9d737c84ef6d9cfb4f9aa26a82c4326486602fe7bf631c15f3eb551 mod_proxy_html-2.5.1.ebuild 811
-MISC ChangeLog 1361 RMD160 c8b910f1287e7c8e16587616a4ae9ebf53c3d517 SHA1 3e8dd0fffc247227df34c62bb33bcb50c9375a8b SHA256 bcb20cfc774899567904da12d63c1e599d39afec66e9faa0423663a0c57d5456
-MD5 5c0f8bbf34308e73c7074af67d5591e9 ChangeLog 1361
-RMD160 c8b910f1287e7c8e16587616a4ae9ebf53c3d517 ChangeLog 1361
-SHA256 bcb20cfc774899567904da12d63c1e599d39afec66e9faa0423663a0c57d5456 ChangeLog 1361
-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 118f52447a3a4a4c177622f197bbd33c files/digest-mod_proxy_html-2.4.3 66
-RMD160 024457722352d998e0810dcfbb57d51c1aa6d2d8 files/digest-mod_proxy_html-2.4.3 66
-SHA256 a14c209369c394aef0b2d721438e5d362e93fd400e5173d2cfbc3ce2d85477bd files/digest-mod_proxy_html-2.4.3 66
-MD5 6f53194d99929642bf12a7225212082a files/digest-mod_proxy_html-2.5.1 69
-RMD160 639093ca7f43b8fb946db8bf0093475835056162 files/digest-mod_proxy_html-2.5.1 69
-SHA256 5b2f82ae53079f94fd6bfead073a727787336c5672f1dcc325c7239d0ffff690 files/digest-mod_proxy_html-2.5.1 69
+DIST mod_proxy_html-2.4.3.c 31180 RMD160 60fa34b7e008920fdb3e538fd244612605627788 SHA1 f626fe6f938a0f6fc98bae31fe4a5f87bba619c5 SHA256 ae07830ba6b4c28faa06451bea9c3778515fdbd0a6a5cac31464d6682a5d3fe1
+DIST mod_proxy_html-2.5.1.c.bz2 8608 RMD160 471b37cc511dd34ac4c4727a5ee4924acd77d24b SHA1 cbe0949527de773a19a368e432e040d83dced931 SHA256 2681c38acb9e289f5ff4d4b7c8e7c9c970ab92b7934b42e6f3a69f4975e18a79
+EBUILD mod_proxy_html-2.4.3.ebuild 822 RMD160 9eebe9b9ab62a4623af3078312255f8ed00d3a07 SHA1 fd82ba6a7822a7393dc23dac38a96cd28661a53a SHA256 7e378455429f68156816ffd1444f39c8a271b630e6dd34242ed537e8a1f2fbdc
+MD5 694b33d720fd3a8f5c9daa5468c1a156 mod_proxy_html-2.4.3.ebuild 822
+RMD160 9eebe9b9ab62a4623af3078312255f8ed00d3a07 mod_proxy_html-2.4.3.ebuild 822
+SHA256 7e378455429f68156816ffd1444f39c8a271b630e6dd34242ed537e8a1f2fbdc mod_proxy_html-2.4.3.ebuild 822
+EBUILD mod_proxy_html-2.5.1.ebuild 863 RMD160 41414c262e8f6581c8eba9f20e787699982abec0 SHA1 3432fab81b1ab4f41d8e009383406aa3eba44a36 SHA256 432ce286068cfbd2c8e39e285fa89f398ae422caaec394a2d440ac2b5e97374a
+MD5 8595ec4d325ca0c7595b64501f07b421 mod_proxy_html-2.5.1.ebuild 863
+RMD160 41414c262e8f6581c8eba9f20e787699982abec0 mod_proxy_html-2.5.1.ebuild 863
+SHA256 432ce286068cfbd2c8e39e285fa89f398ae422caaec394a2d440ac2b5e97374a mod_proxy_html-2.5.1.ebuild 863
+MISC ChangeLog 1499 RMD160 b715397c48bd57bc383a61634499278814299462 SHA1 d88fb1f5d72377a65df666354b3be1001280eef5 SHA256 e17d7471f77496610ab9ed5b654c659f7715e21e1e16d66660bd78ebb22cec08
+MD5 33df7881ac83efd490d78fc47576b9fb ChangeLog 1499
+RMD160 b715397c48bd57bc383a61634499278814299462 ChangeLog 1499
+SHA256 e17d7471f77496610ab9ed5b654c659f7715e21e1e16d66660bd78ebb22cec08 ChangeLog 1499
+MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
+MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
+RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
+SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata.xml 229
+MD5 6dd20bd223ea556618870fcabe9e807b files/digest-mod_proxy_html-2.4.3 244
+RMD160 b1e77c7b782f48933ea9a0909bd461d6130f3ee7 files/digest-mod_proxy_html-2.4.3 244
+SHA256 4dcab14d7f5211c9b0e21479eb42aae51d87d6531d8bae72c87413633e89273a files/digest-mod_proxy_html-2.4.3 244
+MD5 9ecfb9a19743a5de6a27faa1e31de197 files/digest-mod_proxy_html-2.5.1 253
+RMD160 a9af0d1784016f7702ca2d735e50a20e58b72706 files/digest-mod_proxy_html-2.5.1 253
+SHA256 0b21960a71bdb892320be135d980e71a15c5b78fba85f2b485646cd7cf59b3bb files/digest-mod_proxy_html-2.5.1 253
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() {