Fix class_simple patch to actually not compile in sysfs support if

class_simple support is missing, bug #40107. Add sed to fix version of module
build. Fix Makefile to actually honour KERNDIR.

5 files changed, 58 insertions, 49 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 72209e236274..09a4c222dc3e 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.62 2004/02/01 17:16:29 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.63 2004/02/06 19:27:52 azarah Exp $
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.5336-r1.ebuild, files/1.0.5336/Makefile,
+  files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch:
+  Fix class_simple patch to actually not compile in sysfs support if
+  class_simple support is missing, bug #40107. Add sed to fix version of module
+  build. Fix Makefile to actually honour KERNDIR.
 
   01 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
   nvidia-kernel-1.0.5336-r1.ebuild:
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 4b1486fb4ba9..8be21fae4012 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,55 +1,55 @@
-MD5 d356e74a4bb4aea5542201aeeb3de468 ChangeLog 13715
-MD5 76bd72f89f94d77d6bf86d8e122f5100 nvidia-kernel-1.0.2880-r1.ebuild 1966
-MD5 d07c7e8805ac45db9ec99be3e86dee70 nvidia-kernel-1.0.2960-r1.ebuild 1987
+MD5 ad9be703f3ba183bf2b5d9a9765619fa nvidia-kernel-1.0.5328-r1.ebuild 4562
 MD5 d12e78297c403467ea2e4144729ece91 nvidia-kernel-1.0.3123-r2.ebuild 3118
-MD5 6c62870aa5220d0967df5827dca75563 nvidia-kernel-1.0.4180.ebuild 3714
-MD5 fadfc42ac1a37efefe5e9b19e54ce03b nvidia-kernel-1.0.4191-r2.ebuild 3715
 MD5 a2954410aed3b91f7f5324169e43ab3f nvidia-kernel-1.0.4349-r2.ebuild 3543
+MD5 ca0e848e813d3fc1fce83e51f35e34f7 nvidia-kernel-1.0.5332.ebuild 4431
+MD5 04368157b6fc7854f447acbb45af836a nvidia-kernel-1.0.5336-r1.ebuild 4497
+MD5 a74f3a8667af61268f95dfca543ba41f ChangeLog 14092
+MD5 6a0f2239670a3c0d900f6c410d54073a nvidia-kernel-1.0.5336.ebuild 4379
+MD5 d07c7e8805ac45db9ec99be3e86dee70 nvidia-kernel-1.0.2960-r1.ebuild 1987
+MD5 6c62870aa5220d0967df5827dca75563 nvidia-kernel-1.0.4180.ebuild 3714
+MD5 6ce6540461b32a4439a8e13c6ad8f80f nvidia-kernel-1.0.4496-r4.ebuild 4272
 MD5 4b4feee053e7d6b736fc1e7d5071f3e5 nvidia-kernel-1.0.4363-r3.ebuild 4043
+MD5 fadfc42ac1a37efefe5e9b19e54ce03b nvidia-kernel-1.0.4191-r2.ebuild 3715
+MD5 b8610631a36058cb13964ae2b6dc0bee nvidia-kernel-1.0.5328.ebuild 4269
 MD5 4a974d08882d93cd47de68935cd97d96 nvidia-kernel-1.0.4496-r3.ebuild 4249
 MD5 a84c6099ac721e55e50bc35cdf443837 nvidia-kernel-1.0.4499.ebuild 4080
-MD5 6ce6540461b32a4439a8e13c6ad8f80f nvidia-kernel-1.0.4496-r4.ebuild 4272
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
-MD5 ad9be703f3ba183bf2b5d9a9765619fa nvidia-kernel-1.0.5328-r1.ebuild 4562
-MD5 b8610631a36058cb13964ae2b6dc0bee nvidia-kernel-1.0.5328.ebuild 4269
-MD5 ca0e848e813d3fc1fce83e51f35e34f7 nvidia-kernel-1.0.5332.ebuild 4431
-MD5 a518f21e10581072387ea04bc522d863 nvidia-kernel-1.0.5336-r1.ebuild 4467
-MD5 6a0f2239670a3c0d900f6c410d54073a nvidia-kernel-1.0.5336.ebuild 4379
-MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569
-MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858
-MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614
-MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858
+MD5 76bd72f89f94d77d6bf86d8e122f5100 nvidia-kernel-1.0.2880-r1.ebuild 1966
+MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
 MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825
-MD5 7f987ae6384103d87f323d834bba87a1 files/NVIDIA_kernel-1.0-4191-2.5-tl.diff 39065
+MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74
 MD5 57f69061f52fd98e20c7d62882af2757 files/NVIDIA_kernel-1.0-4191-2.5.54.diff 1228
-MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814
-MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74
+MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336 80
 MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122
-MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74
-MD5 259cdc102f465d8a3dbb4169ac1ba194 files/digest-nvidia-kernel-1.0.4180 74
+MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-kernel-1.0.5328 80
+MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858
+MD5 7f987ae6384103d87f323d834bba87a1 files/NVIDIA_kernel-1.0-4191-2.5-tl.diff 39065
 MD5 854b5c292ec300d7105dbd54385840f6 files/digest-nvidia-kernel-1.0.4191-r2 74
-MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74
-MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
-MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
 MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
 MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
+MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
+MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r1 80
 MD5 a31ceab3377afe2286673e74ddf89468 files/digest-nvidia-kernel-1.0.4496-r4 80
-MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-kernel-1.0.5328 80
+MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569
 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-kernel-1.0.5328-r1 80
+MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858
+MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614
+MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74
+MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74
+MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-kernel-1.0.5332 83
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336 80
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r1 80
+MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
+MD5 259cdc102f465d8a3dbb4169ac1ba194 files/digest-nvidia-kernel-1.0.4180 74
+MD5 c2a29e883336157e1a3e99a0bceca549 files/1.0.4499/NVIDIA_kernel-1.0-4499-2.6-20031014.diff 69389
 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 6d98825a3cf78f4a5ce42d4f4decab89 files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030905.diff 81553
-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 c2a29e883336157e1a3e99a0bceca549 files/1.0.4499/NVIDIA_kernel-1.0-4499-2.6-20031014.diff 69389
+MD5 0d4e20c2320c685caad56e357cff0b0c files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20040105.diff 95197
 MD5 e6571e952e13f13d9910b7ad29eaeb4a files/1.0.5328/NVIDIA_kernel-1.0-5328-2.4-via-chipset-fix.patch 970
 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 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 4c7749ca72483547e15031a2af560415 files/1.0.5332/NVIDIA-Linux-x86_64-1.0-5332-2.6.diff 7216
-MD5 2f5bab1a9c9fb0d7f29ed9c677ccbdcb files/1.0.5336/Makefile 4267
-MD5 47c9fa6dcf3b912e4d4864dbd9b36f18 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5700
+MD5 7bf40e44b8f2181a1047ddfd13acd6b3 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5439
+MD5 6b364c4b64c6de0aea70163850fa3914 files/1.0.5336/Makefile 4410
diff --git a/media-video/nvidia-kernel/files/1.0.5336/Makefile b/media-video/nvidia-kernel/files/1.0.5336/Makefile
index e120c77ff2cd..8d37a89022f0 100644
--- a/media-video/nvidia-kernel/files/1.0.5336/Makefile
+++ b/media-video/nvidia-kernel/files/1.0.5336/Makefile
@@ -2,7 +2,7 @@
 #   Generated on 'builder3.nvidia.com' on Thu Jun 19 04:05:35 PDT 2003
 
 LINUX_MODULE=nv-linux.o
-DEFINES=-D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DKBUILD_MODNAME="nvidia" -DNTRM -D_GNU_SOURCE -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE  -DNV_MAJOR_VERSION=1 -DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=5328     -DNV_UNIX   -DNV_LINUX   -DNV_INT64_OK   -DNVCPU_X86
+DEFINES=-D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DKBUILD_MODNAME="nvidia" -DNTRM -D_GNU_SOURCE -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE  -DNV_MAJOR_VERSION=1 -DNV_MINOR_VERSION=0 -DNV_PATCHLEVEL=5328  -DNV_UNIX   -DNV_LINUX   -DNV_INT64_OK   -DNVCPU_X86
 INCLUDES=-I.
 
 OBJECTS=nv.o os-agp.o os-interface.o os-registry.o 
@@ -12,7 +12,9 @@ CFLAGS=-Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wpare
 
 RESMAN_KERNEL_MODULE=nv-kernel.o
 
+ifeq ($(KERNDIR),)
 KERNDIR=/lib/modules/$(shell uname -r)
+endif
 
 # check for newer paths. if found, use them, otherwise use old paths
 # these wouldn't work with the gnu make included with rh6.2
@@ -23,7 +25,11 @@ KERNDIR=/lib/modules/$(shell uname -r)
 ifeq ($(shell if test -d $(KERNDIR)/build; then echo yes; fi),yes)
 KERNINC=$(KERNDIR)/build/include
 else
-KERNINC=/usr/src/linux/include
+  ifeq ($(shell if test -d $(KERNDIR)/include; then echo yes; fi),yes)
+    KERNINC=$(KERNDIR)/include
+  else
+    KERNINC=/usr/src/linux/include
+  endif
 endif
 
 ifeq ($(shell if test -d $(KERNDIR)/kernel; then echo yes; fi),yes)
diff --git a/media-video/nvidia-kernel/files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch b/media-video/nvidia-kernel/files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch
index a10db7f43c14..bf90073adb56 100644
--- a/media-video/nvidia-kernel/files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch
+++ b/media-video/nvidia-kernel/files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch
@@ -12,11 +12,6 @@ diff -urpN NVIDIA-Linux-x86-1.0-5336/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86
  #
  # NVIDIA binary object file includes .common section.
  #
-diff -urpN NVIDIA-Linux-x86-1.0-5336/usr/src/nv/built-in.o NVIDIA-Linux-x86-1.0-5336.sysfs/usr/src/nv/built-in.o
---- NVIDIA-Linux-x86-1.0-5336/usr/src/nv/built-in.o	1970-01-01 02:00:00.000000000 +0200
-+++ NVIDIA-Linux-x86-1.0-5336.sysfs/usr/src/nv/built-in.o	2004-02-01 16:11:27.428340072 +0200
-@@ -0,0 +1 @@
-+!<arch>
 diff -urpN NVIDIA-Linux-x86-1.0-5336/usr/src/nv/conftest.sh NVIDIA-Linux-x86-1.0-5336.sysfs/usr/src/nv/conftest.sh
 --- NVIDIA-Linux-x86-1.0-5336/usr/src/nv/conftest.sh	2004-01-15 05:29:11.000000000 +0200
 +++ NVIDIA-Linux-x86-1.0-5336.sysfs/usr/src/nv/conftest.sh	2004-02-01 16:19:19.079638176 +0200
@@ -31,20 +26,20 @@ diff -urpN NVIDIA-Linux-x86-1.0-5336/usr/src/nv/conftest.sh NVIDIA-Linux-x86-1.0
 +        # support in 2.6
 +        #
 +        echo "#include <linux/device.h>
-+        struct class_simple *test_class;
-+        int add_test_class() {
++        void add_test_class(void) {
++           struct class_simple *test_class;
 +           test_class = class_simple_create(THIS_MODULE, \"test\");
 +        }" > conftest.c
 +
-+        gcc -c conftest.c -o conftest.o $* -D__KERNEL__ > /dev/null 2>&1
++        gcc -Wall -c conftest.c -o conftest.o $* -D__KERNEL__  > output.log 2>&1
 +
-+        if test -f conftest.o; then
++        if test -f conftest.o && test -z "`cat output.log`"; then
 +          echo "yes"
 +        else
 +          echo "no"
 +        fi
 +
-+        rm -f conftest.{c,o}
++        rm -f conftest.{c,o} output.log
 +    ;;
 +
      cc_sanity_check)
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild
index 23e0cde97e81..5eb350fbd7ae 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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-r1.ebuild,v 1.2 2004/02/01 17:16:29 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r1.ebuild,v 1.3 2004/02/06 19:27:52 azarah Exp $
 
 inherit eutils
 
@@ -96,7 +96,8 @@ src_unpack() {
 
 		# Kbuild have issues currently (sandbox related).
 #		ln -snf Makefile.nvidia Makefile
-		cp -f ${FILESDIR}/${PV}/Makefile ${S}/makefile
+		sed -e "s:5328:${NV_V/1.0-/}:g" \
+			${FILESDIR}/${PV}/Makefile > ${S}/makefile
 	fi
 
 	# if you set this then it's your own fault when stuff breaks :)