Fix ${ROOT} issues

(Portage version: 2.1_pre6)

3 files changed, 16 insertions, 16 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index ebca5c89273a..97688121af6e 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -52,9 +52,9 @@ SHA256 b9048c96a2f8103c755b9640fb25993eddbb3cf49134ea7703cea0d2a58c4f5e apache-2
 MD5 55f89417afabbd3e95fd74c2af364c4e apache-2.2.0-r1.ebuild 14076
 RMD160 0ab52a7488ed52f48c9ddf828682f3e1cf8e252c apache-2.2.0-r1.ebuild 14076
 SHA256 f0087fa3698f2059316416fa58f2b95a46a7a34dbd569c5d9bd9822b7e170a4c apache-2.2.0-r1.ebuild 14076
-MD5 70636a71786d5daf411d050e461e21e4 apache-2.2.0-r2.ebuild 14192
-RMD160 ab1c13eb465ec99bddf03a38b3c0c44c159e90cb apache-2.2.0-r2.ebuild 14192
-SHA256 04e43da67b4606fdaefef34eafeecce02fcfcc97dab09d9781af865923e08047 apache-2.2.0-r2.ebuild 14192
+MD5 9a5b14d2ff81f61ec301b038601c00ec apache-2.2.0-r2.ebuild 14262
+RMD160 36a6dabe355a1d396655523c0b352e2acc6f7a92 apache-2.2.0-r2.ebuild 14262
+SHA256 0583bf034626ffc62a05c6286677b8c01be7cd0d4d315a0e30d15a10daef4108 apache-2.2.0-r2.ebuild 14262
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 RMD160 d2e6224ca1621f7cf29c163c3c04e06aca7b7bde files/00_apache_manual.conf 781
 SHA256 068450680c6fec43b963360e0291f1e47cc1a1c0296efb46a0a4eb75eb891f4b files/00_apache_manual.conf 781
@@ -196,9 +196,9 @@ SHA256 51ab077ab1e2adca8a62417c09f3c8870e1cd52946db2e8279396ea75813e1d1 files/di
 MD5 658a784ac412b6489bad9d6522ad214c files/digest-apache-2.2.0-r1 536
 RMD160 250f73fa520dacab1f72303a2b78297311793c9b files/digest-apache-2.2.0-r1 536
 SHA256 33e99840918bb5d10d5d4ecf2368b3246cd91a640e0c9a094256e4025ca0425b files/digest-apache-2.2.0-r1 536
-MD5 48cbdc6490c43868f9e23b4b2f02f0e3 files/digest-apache-2.2.0-r2 536
-RMD160 cb22045888ae2e75df66de168adc075cef4426c5 files/digest-apache-2.2.0-r2 536
-SHA256 156b784dcf683dc705d27d9e498f57ad7d4f9bd0d9191dc648b04552297bb393 files/digest-apache-2.2.0-r2 536
+MD5 b7db57ee172c09170afffd74a77d3dbc files/digest-apache-2.2.0-r2 536
+RMD160 0bc246f9c4f2c1707c3f393ea1fa3baa2d140287 files/digest-apache-2.2.0-r2 536
+SHA256 da35bf941e330235aa37b4fffe5d32cb6c006f12f754ac7ee7955e171f51b6e3 files/digest-apache-2.2.0-r2 536
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 RMD160 0309ce8d85fe499997a879205e4909e604599051 files/httpd-2.0.48-ipv6.patch 865
 SHA256 aba5ff0caafc53ac3cc391f1776ad3c49d44ca878ba81330e81578ab9dcaad67 files/httpd-2.0.48-ipv6.patch 865
diff --git a/net-www/apache/apache-2.2.0-r2.ebuild b/net-www/apache/apache-2.2.0-r2.ebuild
index 488173f03b48..644fdca90658 100644
--- a/net-www/apache/apache-2.2.0-r2.ebuild
+++ b/net-www/apache/apache-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.0-r2.ebuild,v 1.5 2006/04/16 21:20:52 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.0-r2.ebuild,v 1.6 2006/04/16 23:25:05 vericgar Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -394,17 +394,17 @@ pkg_postinst() {
 	# we do this here because the default webroot is a copy of the files
 	# that exist elsewhere and we don't want them managed/removed by portage
 	# when apache is upgraded.
-	if [ -e "/var/www/localhost" ]; then
+	if [ -e "${ROOT}/var/www/localhost" ]; then
 		einfo "The default webroot has not been installed into"
-		einfo "/var/www/localhost because the directory already exists"
+		einfo "${ROOT}/var/www/localhost because the directory already exists"
 		einfo "and we do not want to overwrite any files you have put there."
 		einfo
 		einfo "If you would like to install the latest webroot, please run"
 		einfo "emerge --config =${PF}"
 	else
-		einfo "Installing default webroot to /var/www/localhost"
-		cp -r /usr/share/doc/${PF}/webroot/* /var/www/localhost
-		chown -R apache: /var/www/localhost
+		einfo "Installing default webroot to ${ROOT}/var/www/localhost"
+		cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
+		chown -R apache: ${ROOT}/var/www/localhost
 	fi
 
 	# Check for dual/upgrade install
@@ -439,9 +439,9 @@ pkg_postinst() {
 
 pkg_config() {
 
-	einfo "Installing default webroot to /var/www/localhost"
-	cp -r /usr/share/doc/${PF}/webroot/* /var/www/localhost
-	chown -R apache: /var/www/localhost
+	einfo "Installing default webroot to ${ROOT}/var/www/localhost"
+	cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
+	chown -R apache: ${ROOT}/var/www/localhost
 
 }
 
diff --git a/net-www/apache/files/digest-apache-2.2.0-r2 b/net-www/apache/files/digest-apache-2.2.0-r2
index 96c0478d1f8d..da093dc9e542 100644
--- a/net-www/apache/files/digest-apache-2.2.0-r2
+++ b/net-www/apache/files/digest-apache-2.2.0-r2
@@ -1,6 +1,6 @@
+MD5 a229aa1acf6ebbe88789cf112dc5c580 gentoo-apache-2.2.0-r2-20060306.tar.bz2 48730
 RMD160 adee915809097479cd0ed03012194351b7218732 gentoo-apache-2.2.0-r2-20060306.tar.bz2 48730
 SHA256 c6e054757a04d6d81b16e32caa2e88f9e9a61a68c560aa83654624b7c2fce068 gentoo-apache-2.2.0-r2-20060306.tar.bz2 48730
-MD5 a229aa1acf6ebbe88789cf112dc5c580 gentoo-apache-2.2.0-r2-20060306.tar.bz2 48730
 MD5 402b90a2e47205f94b3b1d91e1a8c459 httpd-2.2.0.tar.bz2 4839151
 RMD160 7ee7364d24881c68f2d4643089fb996888bba9c0 httpd-2.2.0.tar.bz2 4839151
 SHA256 bbf1a452889f9d502840e3b8dda4938b6bd633b94b888ab799ee9aa5845115f7 httpd-2.2.0.tar.bz2 4839151