/usr/src/linux needs ${ROOT}. Also bring back digest-nvidia-kernel-1.0.6106, as the ebuild's still in the tree.

11 files changed, 78 insertions, 67 deletions

diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index de0aefe2d7d6..c0f5da5175fd 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,44 +1,44 @@
-MD5 2125a0403bcdc804698dd3d0ac8d8fcc ati-drivers-3.9.0.ebuild 4117
-MD5 384790b05e3fd58ce35a335b9d216ec1 ati-drivers-3.2.8.ebuild 4553
-MD5 f3378924ef1e19913503371f8c80637c ati-drivers-3.7.6.ebuild 3654
-MD5 9e2ff7317e329574722e3f11613d037c ati-drivers-3.2.5.ebuild 4547
-MD5 77f25b3e593ba260bc3d725c3d349eb3 ati-drivers-3.2.0.ebuild 4486
+MD5 ccc662569ca41fabc211594b6f476b88 ChangeLog 8300
+MD5 f99248507f1c16729893906827ccc545 ati-drivers-3.7.6-r1.ebuild 4128
 MD5 79a710a6e52148ad84f5a74e5f0e4428 ati-drivers-2.9.12.ebuild 3601
-MD5 36346f4d59e1630c0c5815276a30876f ati-drivers-3.2.8-r2.ebuild 4126
-MD5 551e11c9fd821b88d90c441482135e8b ati-drivers-3.7.6-r1.ebuild 4120
-MD5 7fbcb5dd9393f22147aa186fba14f7bb ati-drivers-3.2.5-r1.ebuild 4572
-MD5 ed96ce70ee577b482c00eb821f0a5eb6 ati-drivers-3.7.0.ebuild 5416
-MD5 0d88080c557d615e81b6d0194fe83b43 ati-drivers-3.9.0-r1.ebuild 4505
-MD5 a65223b2a9458001106caae8686c888a ati-drivers-3.2.4.ebuild 4677
-MD5 e176d069f6e534621ea17194c2e87ea7 ati-drivers-3.2.8-r1.ebuild 3654
-MD5 60b55745322f8c6bfdc30b69fa5d82d7 ChangeLog 7840
-MD5 8b26103ec58c9fc85a3a4319f26d3901 ati-drivers-2.9.13-r1.ebuild 4238
-MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
+MD5 7427ff67a7d53009779660017e6a35b6 ati-drivers-2.9.13-r1.ebuild 4246
 MD5 8eb6d0fd20fa26cd240efd44a74d7e41 ati-drivers-2.9.13.ebuild 3602
+MD5 55084b4637f59dbc056f3c3ea6ac9ef7 ati-drivers-3.2.0.ebuild 4494
+MD5 6b5ab1abb7122e2335aeef6de0db7aca ati-drivers-3.2.4.ebuild 4685
+MD5 616152ceacf4338e4dfc14b378413e47 ati-drivers-3.2.5.ebuild 4555
+MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
+MD5 9d6164f9cb443fb2fceadee69ec62d0e ati-drivers-3.2.5-r1.ebuild 4580
+MD5 a2e898dd45c93552faf9522eb9ee6f85 ati-drivers-3.2.8.ebuild 4561
+MD5 c097444035f82c48673393e171163f90 ati-drivers-3.7.0.ebuild 5424
+MD5 145669c711afe44523917df1fc33bcdf ati-drivers-3.2.8-r1.ebuild 3662
+MD5 9dd2c8e40a7f834a2df7d7d4d9963e7f ati-drivers-3.7.6.ebuild 3662
+MD5 d404832f9f2ff434a19c278fdec0bb2e ati-drivers-3.2.8-r2.ebuild 4134
+MD5 22470cac4821c26539336042f88281f3 ati-drivers-3.9.0-r1.ebuild 4513
+MD5 1ec180441a38b1d56f59394a1cb4842a ati-drivers-3.9.0.ebuild 4125
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
-MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r1 78
-MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r2 78
 MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-3.7.6-r1 72
-MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0-r1 72
+MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0 72
+MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
+MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
+MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
 MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
 MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
 MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
+MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
+MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
+MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
+MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
+MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
+MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
 MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
+MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561
 MD5 a2a4f4788a7de4a9c7c0295a2804752f files/digest-ati-drivers-3.7.0 78
+MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
+MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r1 78
 MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-3.7.6 72
-MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0 72
-MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
+MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r2 78
+MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0-r1 72
+MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
 MD5 8dfc593069132b05be220d12a24697b4 files/fglrx-3.9.0-allocation.patch 946
-MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
-MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
-MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 2f9201d062ecb4b2a980f5be12cf0b34 files/fglrx-3.9.0-regparm.patch 58125
-MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
-MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
-MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
-MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
-MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
-MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561
-MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
-MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 25e5a0e5178f..ee198f7185ec 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.81 2004/07/26 13:15:27 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.82 2004/07/26 20:32:24 spyderous Exp $
+
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
+  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
+  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r2.ebuild,
+  nvidia-kernel-1.0.5336-r3.ebuild:
+  /usr/src/linux needs ${ROOT}. Also bring back digest-nvidia-kernel-1.0.6106,
+  as the ebuild's still in the tree.
 
 *nvidia-kernel-1.0.6106-r1 (26 Jul 2004)
 
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index fc9164d3971a..9154872454c1 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,41 +1,42 @@
+MD5 e6ad85be3f65d1809b76a5f4aeb3b4f4 ChangeLog 20232
+MD5 aadbfcb5df7c5f6f87d96d032623643d nvidia-kernel-1.0.5336-r3.ebuild 4629
+MD5 d8008e9fd34e643ba85c473c91f40539 nvidia-kernel-1.0.5336-r4.ebuild 4783
+MD5 90008c0e137ec067fba0f55da5a584c4 nvidia-kernel-1.0.6106.ebuild 3488
 MD5 b147f8936eff38e937fab7ac8d177101 nvidia-kernel-1.0.6106-r1.ebuild 3623
-MD5 3053f15b348d5db0a3b6629236e6c8b8 nvidia-kernel-1.0.4499.ebuild 4017
-MD5 b12c2d1e31ef49711cba646493176aad nvidia-kernel-1.0.5332-r1.ebuild 4246
-MD5 e60bb759e8c782e296caf4c5f9ec29a6 nvidia-kernel-1.0.5336-r3.ebuild 4619
-MD5 510b63d87ead7c18ba3e69e97a46ca11 nvidia-kernel-1.0.5328-r1.ebuild 4455
-MD5 498cce7943971f5f2dcafe34d97ffc9c nvidia-kernel-1.0.4496-r3.ebuild 4276
-MD5 ecdc3ce7ea1a04cf4740da7af4244223 nvidia-kernel-1.0.4363-r3.ebuild 4061
-MD5 9d1c149259777e6a289b58ce4752c584 nvidia-kernel-1.0.5336-r2.ebuild 4656
-MD5 83e5a34ed3c8e17d691640e22682642d ChangeLog 19814
+MD5 d5bc3ba053815cd1b559cba6bbd36452 nvidia-kernel-1.0.4363-r3.ebuild 4071
+MD5 20f6ae4f9076cd8f5dd1d2383d0eaca7 nvidia-kernel-1.0.4496-r3.ebuild 4286
+MD5 b4a7988f8e10107742f255ea291478c0 nvidia-kernel-1.0.4499.ebuild 4028
 MD5 2e350a0784b0810b89809d761e499bea metadata.xml 301
-MD5 90008c0e137ec067fba0f55da5a584c4 nvidia-kernel-1.0.6106.ebuild 3488
-MD5 d8008e9fd34e643ba85c473c91f40539 nvidia-kernel-1.0.5336-r4.ebuild 4783
+MD5 3ff60fb835fc8ab36543515ff50741ef nvidia-kernel-1.0.5328-r1.ebuild 4465
+MD5 c65724336acbdb77c80842d7a9174301 nvidia-kernel-1.0.5332-r1.ebuild 4256
+MD5 45245c720d6b0dc7c3f73a2ee95823a0 nvidia-kernel-1.0.5336-r2.ebuild 4673
+MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
+MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
+MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-kernel-1.0.5328-r1 80
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-kernel-1.0.5332-r1 83
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r2 80
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r3 80
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r4 80
 MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-kernel-1.0.6106-r1 163
-MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
 MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
-MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
 MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
+MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-kernel-1.0.6106 163
 MD5 eaed145a02e1457194d0e9fdb1f4851a files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5-20030402.diff 70356
 MD5 439563bcf7fa96c91361226fae454e0e files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5.68.diff 1467
 MD5 f7d7092e9eb9fbe926ff1b8aa9b3f50e files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff 79485
-MD5 183b64f528e98221291072f12db5859d files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-pci_name-20030905.diff 608
-MD5 c0f21cb76a7471671ec9665968dfaafb files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20031026.diff 81900
 MD5 6d98825a3cf78f4a5ce42d4f4decab89 files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030905.diff 81553
+MD5 c0f21cb76a7471671ec9665968dfaafb files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20031026.diff 81900
+MD5 183b64f528e98221291072f12db5859d files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-pci_name-20030905.diff 608
 MD5 c2a29e883336157e1a3e99a0bceca549 files/1.0.4499/NVIDIA_kernel-1.0-4499-2.6-20031014.diff 69389
 MD5 e6571e952e13f13d9910b7ad29eaeb4a files/1.0.5328/NVIDIA_kernel-1.0-5328-2.4-via-chipset-fix.patch 970
-MD5 0d4e20c2320c685caad56e357cff0b0c files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20040105.diff 95197
 MD5 f04497fe1a0f76fcc41a93b554072c4a files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20031226.diff 77616
+MD5 0d4e20c2320c685caad56e357cff0b0c files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20040105.diff 95197
 MD5 4c7749ca72483547e15031a2af560415 files/1.0.5332/NVIDIA-Linux-x86_64-1.0-5332-2.6.diff 7216
-MD5 276907ebd8946791398f5f24c27e54c4 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support-v2.patch 5666
 MD5 6b364c4b64c6de0aea70163850fa3914 files/1.0.5336/Makefile 4410
-MD5 d48d291f79542df558588d1d3575d51c files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch 1681
 MD5 442f1483c003d291a90dfcc87903b045 files/1.0.5336/NVIDIA_kernel-1.0-5336-2.6-20040521.patch 18711
-MD5 5dc4b9a2463cb459721ae3e642f6239f files/1.0.5336/NVIDIA_kernel-1.0-5336-fix-makefile-for-2.6.patch 886
+MD5 276907ebd8946791398f5f24c27e54c4 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support-v2.patch 5666
 MD5 7bf40e44b8f2181a1047ddfd13acd6b3 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5439
+MD5 5dc4b9a2463cb459721ae3e642f6239f files/1.0.5336/NVIDIA_kernel-1.0-5336-fix-makefile-for-2.6.patch 886
+MD5 d48d291f79542df558588d1d3575d51c files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch 1681
 MD5 bc61be48f85d84f91d2035fa3cc92a47 files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch 6659
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106
new file mode 100644
index 000000000000..a343b4b8810a
--- /dev/null
+++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106
@@ -0,0 +1,2 @@
+MD5 5432f919f0211ce36b854d87108d7db0 NVIDIA-Linux-x86-1.0-6106-pkg1.run 8160802
+MD5 024f21a3fa134bee8339adac64bdc77a NVIDIA-Linux-x86_64-1.0-6106-pkg2.run 7331301
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild
index 0733c7d4096c..6e7626a283f4 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.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/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild,v 1.14 2004/06/30 07:58:17 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild,v 1.15 2004/07/26 20:32:24 spyderous Exp $
 
 inherit eutils
 
@@ -105,7 +105,7 @@ src_compile() {
 	# updated but the running kernel is still compiled with an older gcc.  This is
 	# needed for chrooted building, where the sanity check detects the gcc of the
 	# kernel outside the chroot rather than within.
-	make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+	make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
 		clean nvidia.o || die
 }
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild
index 46295a28626e..820397c2b03e 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.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/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild,v 1.11 2004/06/30 07:58:17 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild,v 1.12 2004/07/26 20:32:24 spyderous Exp $
 
 inherit eutils
 
@@ -108,7 +108,7 @@ src_compile() {
 	# updated but the running kernel is still compiled with an older gcc.  This is
 	# needed for chrooted building, where the sanity check detects the gcc of the
 	# kernel outside the chroot rather than within.
-	make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+	make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
 		clean nvidia.o || die
 }
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild
index 2d16a181a7b8..931e102c41c7 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.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/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild,v 1.9 2004/06/30 07:58:17 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild,v 1.10 2004/07/26 20:32:24 spyderous Exp $
 
 inherit eutils
 
@@ -103,7 +103,7 @@ src_compile() {
 	# updated but the running kernel is still compiled with an older gcc.  This is
 	# needed for chrooted building, where the sanity check detects the gcc of the
 	# kernel outside the chroot rather than within.
-	make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+	make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
 		clean nvidia.o || die
 }
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild
index 87fc1b81fcd2..e70829d09cda 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-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/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild,v 1.7 2004/06/30 07:58:17 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild,v 1.8 2004/07/26 20:32:24 spyderous Exp $
 
 inherit eutils
 
@@ -117,7 +117,7 @@ src_compile() {
 	# updated but the running kernel is still compiled with an older gcc.  This is
 	# needed for chrooted building, where the sanity check detects the gcc of the
 	# kernel outside the chroot rather than within.
-	make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+	make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
 		clean nvidia.o || die
 }
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild
index 6bdc3dbd38a1..8c2c5f55a33b 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-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/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild,v 1.4 2004/06/30 07:58:17 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild,v 1.5 2004/07/26 20:32:24 spyderous Exp $
 
 inherit eutils
 
@@ -109,7 +109,7 @@ src_compile() {
 	# updated but the running kernel is still compiled with an older gcc.  This is
 	# needed for chrooted building, where the sanity check detects the gcc of the
 	# kernel outside the chroot rather than within.
-	make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+	make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
 		clean nvidia.o || die
 }
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild
index f365b564103d..823efe145a5f 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-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/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild,v 1.4 2004/06/30 07:58:17 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild,v 1.5 2004/07/26 20:32:24 spyderous Exp $
 
 inherit eutils
 
@@ -118,10 +118,10 @@ src_compile() {
 	# kernel outside the chroot rather than within.
 	if is_kernel 2 5 || is_kernel 2 6
 	then
-		make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+		make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
 			clean nvidia.o || die
 	else
-		make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+		make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
 			clean module || die
 	fi
 }
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild
index 26070df3cc94..8674a0890a09 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.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/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild,v 1.4 2004/06/30 07:58:17 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild,v 1.5 2004/07/26 20:32:24 spyderous Exp $
 
 inherit eutils kmod
 
@@ -117,7 +117,7 @@ src_compile() {
 		make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" \
 			M="${S}" clean module || die "Failed to build module"
 	else
-		make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
+		make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
 			clean module || die
 	fi
 }