/usr/src/linux needs ${ROOT}.

4 files changed, 22 insertions, 17 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index eaf9c8ee2037..027292b07b6d 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree-drm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.69 2004/06/24 21:57:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.70 2004/07/26 20:16:19 spyderous Exp $
+
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild, xfree-drm-4.3.0-r7.ebuild,
+  xfree-drm-4.3.0-r8.ebuild:
+  /usr/src/linux needs ${ROOT}.
 
   23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild,
   xfree-drm-4.3.0-r7.ebuild, xfree-drm-4.3.0-r8.ebuild:
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
index 06fe595e2c5a..a5c34c45fcb7 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.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/xfree-drm/xfree-drm-4.3.0-r6.ebuild,v 1.20 2004/06/24 21:57:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild,v 1.21 2004/07/26 20:16:19 spyderous Exp $
 
 # Small note:  we should prob consider using a DRM only tarball, as it will ease
 #              some of the overhead on older systems, and will enable us to
@@ -88,10 +88,10 @@ pkg_setup() {
 src_unpack() {
 	# 2.6 kernels are broken for now
 	is_kernel "2" "6" && \
-		die "Please link /usr/src/linux to 2.4 kernel sources. xfree-drm is not yet working with 2.6 kernels, use the DRM in the kernel."
+		die "Please link ${ROOT}/usr/src/linux to 2.4 kernel sources. xfree-drm is not yet working with 2.6 kernels, use the DRM in the kernel."
 
 	# Is this necessary with the fixed Makefile?
-	if [ ! -f /usr/src/linux/include/config/MARKER ] ; then
+	if [ ! -f ${ROOT}/usr/src/linux/include/config/MARKER ] ; then
 		die "Please compile kernel sources with \"make bzImage.\""
 	fi
 
@@ -119,7 +119,7 @@ src_unpack() {
 
 # Pfeifer said this patch is ok for any kernel >= 2.4 <spyderous>
 #	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 4 ] && \
-	if [ -r /usr/src/linux/mm/rmap.c ]
+	if [ -r ${ROOT}/usr/src/linux/mm/rmap.c ]
 	then
 		einfo "Detected rmap enabled kernel."
 		EPATCH_SINGLE_MSG="Applying rmap patch..." \
@@ -140,7 +140,7 @@ src_compile() {
 	ln -sf Makefile.linux Makefile
 	einfo "Building DRM..."
 	make ${VIDCARDS} \
-		TREE="/usr/src/linux/include" KV="${KV}"
+		TREE="${ROOT}/usr/src/linux/include" KV="${KV}"
 	make dristat || die
 }
 
@@ -148,7 +148,7 @@ src_install() {
 
 	einfo "installing DRM..."
 	make \
-		TREE="/usr/src/linux/include" \
+		TREE="${ROOT}/usr/src/linux/include" \
 		KV="${KV}" \
 		DESTDIR="${D}" \
 		MODS="${VIDCARDS}" \
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild
index 6d7bd55d739b..94da33d6c3f2 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r7.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/xfree-drm/xfree-drm-4.3.0-r7.ebuild,v 1.18 2004/06/24 21:57:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r7.ebuild,v 1.19 2004/07/26 20:16:19 spyderous Exp $
 
 IUSE="gatos"
 IUSE_VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis mach64"
@@ -68,10 +68,10 @@ pkg_setup() {
 
 	# 2.6 kernels are broken for now
 	is_kernel 2 6 && \
-		die "Please link /usr/src/linux to 2.4 kernel sources. xfree-drm does not yet work with 2.6 kernels, use the DRM in the kernel."
+		die "Please link ${ROOT}/usr/src/linux to 2.4 kernel sources. xfree-drm does not yet work with 2.6 kernels, use the DRM in the kernel."
 
 	# Force at least make dep (this checks for bzImage, actually) (bug #22853)
-	if [ ! -f /usr/src/linux/include/config/MARKER ]
+	if [ ! -f ${ROOT}/usr/src/linux/include/config/MARKER ]
 	then
 		die "Please compile kernel sources with \"make bzImage\"."
 	fi
@@ -114,7 +114,7 @@ src_compile() {
 	ln -sf Makefile.linux Makefile
 	einfo "Building DRM..."
 	make ${VIDCARDS} \
-		TREE="/usr/src/linux/include" KV="${KV}"
+		TREE="${ROOT}/usr/src/linux/include" KV="${KV}"
 	# Build dristat utility (bug #18799)
 	# But, don't do it if the GATOS drivers are being built, since it won't work
 	if ! use gatos
@@ -126,7 +126,7 @@ src_compile() {
 src_install() {
 	einfo "installing DRM..."
 	make \
-		TREE="/usr/src/linux/include" \
+		TREE="${ROOT}/usr/src/linux/include" \
 		KV="${KV}" \
 		DESTDIR="${D}" \
 		MODS="${VIDCARDS}" \
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild
index d1ae330fcf99..a14414faa030 100644
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r8.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/xfree-drm/xfree-drm-4.3.0-r8.ebuild,v 1.6 2004/06/24 21:57:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r8.ebuild,v 1.7 2004/07/26 20:16:19 spyderous Exp $
 
 IUSE="gatos"
 IUSE_VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis mach64"
@@ -111,13 +111,13 @@ src_compile() {
 		unset ARCH
 		make -f Makefile.linux \
 			DRM_MODULES="${VIDCARDS}" \
-			LINUXDIR=//usr/src/linux \
+			LINUXDIR=${ROOT}/usr/src/linux \
 			LINUXOUTPUT=${KV_OUTPUT} \
 			modules || die "Build failed."
 	else
 		einfo "Building DRM for kernel 2.4..."
 		make ${VIDCARDS} \
-			TREE="/usr/src/linux/include" KV="${KV}" || die "Build failed."
+			TREE="${ROOT}/usr/src/linux/include" KV="${KV}" || die "Build failed."
 	fi
 
 	# Build dristat utility (bug #18799)
@@ -139,7 +139,7 @@ src_install() {
 		fi
 		make -f Makefile.linux \
 			KV="${KV}" \
-			LINUXDIR=/usr/src/linux \
+			LINUXDIR=${ROOT}/usr/src/linux \
 			LINUXOUTPUT=${KV_OUTPUT} \
 			MODS="${VIDCARDS}" \
 			ARCH="${MYARCH}" \
@@ -147,7 +147,7 @@ src_install() {
 			install || die "Install failed."
 	else
 		make \
-			TREE="/usr/src/linux/include" \
+			TREE="${ROOT}/usr/src/linux/include" \
 			KV="${KV}" \
 			DESTDIR="${D}" \
 			MODS="${VIDCARDS}" \