Add ${ROOT} to absolute path references that need it.

4 files changed, 23 insertions, 19 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 56df4d47e22a..2f7a0ce26e8b 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.82 2004/07/24 17:31:36 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.83 2004/07/26 20:23:33 spyderous Exp $
+
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
+  Add ${ROOT} to absolute path references that need it.
 
   24 Jul 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0-r1.ebuild,
   xorg-x11-6.7.0-r2.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 3580e2bbdd9a..6db3416e4574 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,6 +1,6 @@
-MD5 1a9a47ad62ca796030e3bb66be490d64 xorg-x11-6.7.0-r2.ebuild 37123
-MD5 bea81a743d532116a1c6f8b7a96f17d3 xorg-x11-6.7.0-r1.ebuild 40889
-MD5 b8d9779c8db8336ca43c6a61755a584e ChangeLog 20103
 MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 c557d93f0e90a66a8b781b5ad898a3c9 files/digest-xorg-x11-6.7.0-r1 906
+MD5 75e381bb607e169e72c5820e0e8c4dd9 xorg-x11-6.7.0-r1.ebuild 40934
+MD5 d6daeafbf70630bddfe1dc287ce79618 xorg-x11-6.7.0-r2.ebuild 37168
+MD5 efa12aa2a940a1957d2e7c89aa7aeb1d ChangeLog 20272
 MD5 6fe9eecb800d285af44b5098a37bd97b files/digest-xorg-x11-6.7.0-r2 904
+MD5 c557d93f0e90a66a8b781b5ad898a3c9 files/digest-xorg-x11-6.7.0-r1 906
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
index d52504b5c8b1..7b66762d54f9 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.28 2004/07/24 17:31:36 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.29 2004/07/26 20:23:33 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -241,7 +241,7 @@ host_def_setup() {
 		echo "#define HaveLib64 NO" >> config/cf/host.def
 
 		# Set location of DRM source to be installed
-		echo "#define InstSrcDir /usr/src/${PF}" >> config/cf/host.def
+		echo "#define InstSrcDir ${ROOT}/usr/src/${PF}" >> config/cf/host.def
 
 		# Bug #12775 .. fails with -Os.
 		replace-flags "-Os" "-O2"
@@ -272,7 +272,7 @@ host_def_setup() {
 			fi
 		fi
 
-		if ( [ -e "/usr/src/linux" ] && \
+		if ( [ -e "${ROOT}/usr/src/linux" ] && \
 			[ ! `is_kernel "2" "2"` ] ) || \
 			[ "`uname -r | cut -d. -f1,2`" != "2.2" ]
 		then
@@ -858,9 +858,9 @@ strip_execs() {
 
 setup_config_files() {
 	# Fix default config files after installing fonts to /usr/share/fonts
-	sed -i "s:/usr/X116/lib/X11/fonts:/usr/share/fonts:g" \
+	sed -i "s:/usr/X116/lib/X11/fonts:${ROOT}/usr/share/fonts:g" \
 		${D}/etc/X11/xorg.conf.example
-	sed -i "s:/usr/X116/lib/X11/fonts:/usr/share/fonts:g" \
+	sed -i "s:/usr/X116/lib/X11/fonts:${ROOT}/usr/share/fonts:g" \
 		${D}/etc/X11/fs/config
 
 	# Work around upgrade problem where people have
@@ -1357,8 +1357,8 @@ pkg_postinst() {
 		mv nv_drv.so nv_drv.so.orig
 
 		ld -shared -o ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so.orig ${ROOT}/usr/X11R6/lib/modules/linux/libfbdevhw.so ${ROOT}/usr/X11R6/lib/modules/libshadow.so ${ROOT}/usr/X11R6/lib/modules/libshadowfb.so ${ROOT}/usr/X11R6/lib/modules/libfb.so
-		ld -rpath /usr/X11R6/lib/modules/drivers -shared -o ati_drv.so ati_drv.so.orig radeon_drv.so atimisc_drv.so fbdev_drv.so r128_drv.so vga_drv.so
-		ld -rpath /usr/X11R6/lib/modules/drivers -shared -o nv_drv.so nv_drv.so.orig fbdev_drv.so vga_drv.so
+		ld -rpath ${ROOT}/usr/X11R6/lib/modules/drivers -shared -o ati_drv.so ati_drv.so.orig radeon_drv.so atimisc_drv.so fbdev_drv.so r128_drv.so vga_drv.so
+		ld -rpath ${ROOT}/usr/X11R6/lib/modules/drivers -shared -o nv_drv.so nv_drv.so.orig fbdev_drv.so vga_drv.so
 
 		#The problem about DRI module and GLX module is fixed.
 		cd ${ROOT}/usr/X11R6/lib/modules/extensions
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index b60f41f1581f..5b3ac0345f06 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.8 2004/07/24 17:31:36 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.9 2004/07/26 20:23:33 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -221,7 +221,7 @@ host_def_setup() {
 		echo "#define HaveLib64 NO" >> config/cf/host.def
 
 		# Set location of DRM source to be installed
-		echo "#define InstSrcDir /usr/src/${PF}" >> config/cf/host.def
+		echo "#define InstSrcDir ${ROOT}/usr/src/${PF}" >> config/cf/host.def
 
 		# Bug #12775 .. fails with -Os.
 		replace-flags "-Os" "-O2"
@@ -252,7 +252,7 @@ host_def_setup() {
 			fi
 		fi
 
-		if ( [ -e "/usr/src/linux" ] && \
+		if ( [ -e "${ROOT}/usr/src/linux" ] && \
 			[ ! `is_kernel "2" "2"` ] ) || \
 			[ "`uname -r | cut -d. -f1,2`" != "2.2" ]
 		then
@@ -750,9 +750,9 @@ strip_execs() {
 
 setup_config_files() {
 	# Fix default config files after installing fonts to /usr/share/fonts
-	sed -i "s:/usr/X116/lib/X11/fonts:/usr/share/fonts:g" \
+	sed -i "s:/usr/X116/lib/X11/fonts:${ROOT}/usr/share/fonts:g" \
 		${D}/etc/X11/xorg.conf.example
-	sed -i "s:/usr/X116/lib/X11/fonts:/usr/share/fonts:g" \
+	sed -i "s:/usr/X116/lib/X11/fonts:${ROOT}/usr/share/fonts:g" \
 		${D}/etc/X11/fs/config
 
 	# Work around upgrade problem where people have
@@ -1236,8 +1236,8 @@ pkg_postinst() {
 		mv nv_drv.so nv_drv.so.orig
 
 		ld -shared -o ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so.orig ${ROOT}/usr/X11R6/lib/modules/linux/libfbdevhw.so ${ROOT}/usr/X11R6/lib/modules/libshadow.so ${ROOT}/usr/X11R6/lib/modules/libshadowfb.so ${ROOT}/usr/X11R6/lib/modules/libfb.so
-		ld -rpath /usr/X11R6/lib/modules/drivers -shared -o ati_drv.so ati_drv.so.orig radeon_drv.so atimisc_drv.so fbdev_drv.so r128_drv.so vga_drv.so
-		ld -rpath /usr/X11R6/lib/modules/drivers -shared -o nv_drv.so nv_drv.so.orig fbdev_drv.so vga_drv.so
+		ld -rpath ${ROOT}/usr/X11R6/lib/modules/drivers -shared -o ati_drv.so ati_drv.so.orig radeon_drv.so atimisc_drv.so fbdev_drv.so r128_drv.so vga_drv.so
+		ld -rpath ${ROOT}/usr/X11R6/lib/modules/drivers -shared -o nv_drv.so nv_drv.so.orig fbdev_drv.so vga_drv.so
 
 		#The problem about DRI module and GLX module is fixed.
 		cd ${ROOT}/usr/X11R6/lib/modules/extensions