new nvidia-kernel rev, closing bug #5572

3 files changed, 22 insertions, 13 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 3ca0cebbc880..d016adb31e8d 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,7 +1,23 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.6 2002/08/16 14:59:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.7 2002/08/16 23:55:31 drobbins Exp $
 
+*nvidia-kernel-1.0.2960-r1 (16 Aug 2002)
+
+  17 Aug 2002; Gustavo Felisberto <gustavo@felisberto.net>: Changed a small
+  line in the ebuild so that the kernel module gets installed in
+  /lib/modules/${KV}/video this way a "make modules_install" in /usr/src/linux
+  will not erase the nvidia module. (added by drobbins) This closes bug #5572.
+  
+  16 Aug 2002; Daniel Robbins <drobbins@gentoo.org>: set SLOT to $KV, removed
+  module removal and modprobing from pkg_postinst(). The module stuff had to be
+  removed because NVdriver compiles for the kernel in /usr/src/linux, not
+  necessarily the currently-running kernel. It's also a violation of Gentoo
+  Linux policy to automatically mess with someone's modules. SLOT being set to
+  $KV allows multiple sets of NVdriver modules to be installed for differing
+  kernel versions. Doesn't work 100% yet because we don't yet support differing
+  SLOTs for the exact same version of a package, but will soon.
+  
   16 Aug 2002; Daniel Robbins <drobbins@gentoo.org>: Added the
   IGNORE_CC_MISMATCH make flag; in some cases, the NVIDIA build process tries
   to be too smart and intentionally aborts when it shouldn't. This is a
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2960 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2960-r1
index 609adec57b41..609adec57b41 100644
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2960
+++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2960-r1
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.2960-r1.ebuild
index f9bf460295ba..72474fcb5659 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.2960-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.2960.ebuild,v 1.6 2002/08/16 14:59:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.2960-r1.ebuild,v 1.1 2002/08/16 23:55:31 drobbins Exp $
 
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
@@ -19,7 +19,8 @@ DEPEND="virtual/linux-sources
 DEBUG="yes"
 RESTRICT="nostrip"
 
-SLOT="0"
+#The slow needs to be set to $KV to prevent unmerges of modules for other kernels.
+SLOT="$KV"
 LICENSE="NVIDIA"
 KEYWORDS="x86 -ppc -sparc -sparc64"
 
@@ -36,7 +37,7 @@ src_compile() {
 
 src_install () {
 	# The driver goes into the standard modules location
-	insinto "/lib/modules/${KV}/kernel/video"
+	insinto "/lib/modules/${KV}/video"
 	doins NVdriver
     
 	# Add the aliases
@@ -54,24 +55,16 @@ src_install () {
 pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
-		# Get any stale module unloaded
-		[ -x /sbin/rmmod ]              && /sbin/rmmod NVdriver
 		# Update module dependency
 		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		# Load the module again
-		[ -x /sbin/modprobe ]           && /sbin/modprobe NVdriver
 		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
 		then
 			/sbin/NVmakedevices.sh >/dev/null 2>&1
 		fi
 	fi
 
-	einfo
-	einfo "If you are not using devfs, you might want to create nvidia"
-	einfo "device nodes by running /sbin/NVmakedevices.sh"
-	einfo
 	einfo "If you are not using devfs, loading the module automatically at"
-	einfo "boot up, you need to add \"NVdriver\" to your /etc/modules.autoload:"
+	einfo "boot up, you need to add \"NVdriver\" to your /etc/modules.autoload."
 	einfo
 }