Play nice with $ROOT.

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 29 insertions, 28 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 5ea393ae23a8..0336c8589aab 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.576 2006/10/14 00:48:22 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.577 2006/11/02 05:15:05 dberkholz Exp $
+
+  02 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-7.1.ebuild:
+  Play nice with $ROOT.
 
   14 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-x11-7.1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index b751b45ba09c..3afe45b9c23e 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -36,14 +36,14 @@ EBUILD xorg-x11-7.0-r1.ebuild 9786 RMD160 1d4c377c55d0bf7bc4269fd3bcd5f12e2cb81b
 MD5 9ef0dc42a09bc64eca955471b6a03fee xorg-x11-7.0-r1.ebuild 9786
 RMD160 1d4c377c55d0bf7bc4269fd3bcd5f12e2cb81b5b xorg-x11-7.0-r1.ebuild 9786
 SHA256 9b41f22c24642f3a2d0b7c72aa92fd1520456252a6a68abd698fa9e52db38acf xorg-x11-7.0-r1.ebuild 9786
-EBUILD xorg-x11-7.1.ebuild 3777 RMD160 ee6666e9966262326e9eac37629b36a9e1dc1780 SHA1 fd28e47fdda2aafaf7a0844d2b57e8b7687f013b SHA256 0b0cfb79497c8469e56227b07ec0947755e3e7b973cdb6588c8f84a8c0c346c0
-MD5 55b928672b9eba1c7b88859aec8803d1 xorg-x11-7.1.ebuild 3777
-RMD160 ee6666e9966262326e9eac37629b36a9e1dc1780 xorg-x11-7.1.ebuild 3777
-SHA256 0b0cfb79497c8469e56227b07ec0947755e3e7b973cdb6588c8f84a8c0c346c0 xorg-x11-7.1.ebuild 3777
-MISC ChangeLog 124781 RMD160 2dd96e8fe4eb4e099518690a1c226028b69ba33d SHA1 43f19147701fe6f13b1569a9a519b364ea5a0f60 SHA256 3b597c6678d440095f08c242c3cd8065b2c6281efdf42bae57c7f5784b641298
-MD5 c02b8e90324f574d24b027c412742dc6 ChangeLog 124781
-RMD160 2dd96e8fe4eb4e099518690a1c226028b69ba33d ChangeLog 124781
-SHA256 3b597c6678d440095f08c242c3cd8065b2c6281efdf42bae57c7f5784b641298 ChangeLog 124781
+EBUILD xorg-x11-7.1.ebuild 3839 RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a SHA1 20431a4e72a070633dd3fc5bc39a1a7f215166ec SHA256 fbaa02356fe8b86455a91dee98c98f3b8a9838c3d421a8a16d9bbc6dc4b5e0e7
+MD5 403830badf415ead887a0933ad19fedd xorg-x11-7.1.ebuild 3839
+RMD160 10fad8db34ec5dd3b05cd3674ebec6cd54be662a xorg-x11-7.1.ebuild 3839
+SHA256 fbaa02356fe8b86455a91dee98c98f3b8a9838c3d421a8a16d9bbc6dc4b5e0e7 xorg-x11-7.1.ebuild 3839
+MISC ChangeLog 124878 RMD160 0a605c5b1816272db1d3f3f5e17a25510ca621f9 SHA1 6eeac0c8e3db3ada44deba1bd2f6413e0f89d3f2 SHA256 6a6850ffb952363f89888b428c9d1745c3e4d13adbab70801569141fea30aca6
+MD5 d1a01d5798e6e80f7bab011d70a63cfe ChangeLog 124878
+RMD160 0a605c5b1816272db1d3f3f5e17a25510ca621f9 ChangeLog 124878
+SHA256 6a6850ffb952363f89888b428c9d1745c3e4d13adbab70801569141fea30aca6 ChangeLog 124878
 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
@@ -54,9 +54,9 @@ SHA256 36f92eea9fd6b4345001fc67164120bcd885267f5ad1dbe81547ffe7230f2f28 files/di
 MD5 c3e8a36e06412232a60c8ea285357ece files/digest-xorg-x11-6.9.0-r3 1831
 RMD160 ab84a1d96a2f006310190681c711f8951c46db3c files/digest-xorg-x11-6.9.0-r3 1831
 SHA256 96bcf76fba399a75d943495aabed45e2c7ac7b5ccf511b5a1b4b7897e9928711 files/digest-xorg-x11-6.9.0-r3 1831
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xorg-x11-7.0-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xorg-x11-7.0-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xorg-x11-7.0-r1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xorg-x11-7.1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xorg-x11-7.1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xorg-x11-7.1 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.0-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.0-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.1 0
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1
index 8b137891791f..e69de29bb2d1 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1
@@ -1 +0,0 @@
-
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.1 b/x11-base/xorg-x11/files/digest-xorg-x11-7.1
index 8b137891791f..e69de29bb2d1 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.1
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-7.1
@@ -1 +0,0 @@
-
diff --git a/x11-base/xorg-x11/xorg-x11-7.1.ebuild b/x11-base/xorg-x11/xorg-x11-7.1.ebuild
index 47432ae10c99..eaeb5ff69966 100644
--- a/x11-base/xorg-x11/xorg-x11-7.1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.1.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/x11-base/xorg-x11/xorg-x11-7.1.ebuild,v 1.8 2006/10/14 00:48:22 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.1.ebuild,v 1.9 2006/11/02 05:15:05 dberkholz Exp $
 
 inherit eutils
 
@@ -62,13 +62,13 @@ src_install() {
 
 pkg_preinst() {
 	# Check for /usr/X11R6 -> /usr symlink
-	if [[ -e "/usr/X11R6" ]] &&
-		[[ $(readlink "/usr/X11R6") != "../usr" ]]; then
-			eerror "/usr/X11R6 isn't a symlink to ../usr. Please delete it."
+	if [[ -e "${ROOT}usr/X11R6" ]] &&
+		[[ $(readlink "${ROOT}usr/X11R6") != "../usr" ]]; then
+			eerror "${ROOT}usr/X11R6 isn't a symlink to ../usr. Please delete it."
 			ewarn "First, save a list of all the packages installing there:"
-			ewarn "		equery belongs /usr/X11R6 > usr-x11r6-packages"
+			ewarn "		equery belongs ${ROOT}usr/X11R6 > usr-x11r6-packages"
 			ewarn "This requires gentoolkit to be installed."
-			die "/usr/X11R6 is not a symlink to ../usr."
+			die "${ROOT}usr/X11R6 is not a symlink to ../usr."
 	fi
 
 	# Filter out ModulePath line since it often holds a now-invalid path
@@ -87,16 +87,16 @@ pkg_postinst() {
 	# x-modular_pkg_postinst
 
 	echo
-	einfo "Please note that the xcursors are in /usr/share/cursors/${PN}."
+	einfo "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}."
 	einfo "Any custom cursor sets should be placed in that directory."
 	echo
 	einfo "If you wish to set system-wide default cursors, please create"
-	einfo "/usr/local/share/cursors/${PN}/default/index.theme"
+	einfo "${ROOT}usr/local/share/cursors/${PN}/default/index.theme"
 	einfo "with content: \"Inherits=theme_name\" so that future"
 	einfo "emerges will not overwrite those settings."
 	echo
 	einfo "Listening on TCP is disabled by default with startx."
-	einfo "To enable it, edit /usr/bin/startx."
+	einfo "To enable it, edit ${ROOT}usr/bin/startx."
 	echo
 
 	ewarn "Please read the modular X migration guide at"
@@ -104,11 +104,11 @@ pkg_postinst() {
 	echo
 	einfo "If you encounter any non-configuration issues, please file a bug at"
 	einfo "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux"
-	einfo "and attach /etc/X11/xorg.conf, /var/log/Xorg.0.log and emerge info"
+	einfo "and attach ${ROOT}etc/X11/xorg.conf, ${ROOT}var/log/Xorg.0.log and emerge info"
 	echo
 	einfo "You can now choose which drivers are installed with the VIDEO_CARDS"
 	einfo "and INPUT_DEVICES settings. Set these like any other Portage"
-	einfo "variable in /etc/make.conf or on the command line."
+	einfo "variable in ${ROOT}etc/make.conf or on the command line."
 	echo
 
 	# (#76985)