Adding IUSE to ebuilds; Introducing NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch for 5336-r4, which allows koutput based kernels to work properly with nVidias' Makefile.kbuild

11 files changed, 91 insertions, 18 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index c05fcfd672ed..f35f56260a50 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,16 @@
 # 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.77 2004/06/25 00:47:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.78 2004/06/30 07:58:17 cyfred Exp $
+
+  30 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch,
+  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, nvidia-kernel-1.0.5336-r4.ebuild:
+  Adding IUSE to ebuilds; Introducing
+  NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch for 5336-r4, which allows
+  koutput based kernels to work properly with nVidias' Makefile.kbuild
 
 *nvidia-kernel-1.0.5336-r4 (15 Jun 2004)
 
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index d021b374903a..f6a209d4ec20 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,13 +1,13 @@
-MD5 c3aace0af9bd88b5941e8b010dd7bafd nvidia-kernel-1.0.4499.ebuild 4011
-MD5 80af395a709af2342501616b87b867ee nvidia-kernel-1.0.5332-r1.ebuild 4240
-MD5 38f7c5c32b04da0eb5e73d2a1ec968bb nvidia-kernel-1.0.5336-r3.ebuild 4613
-MD5 bffdab24863047241a58f11918f538de nvidia-kernel-1.0.5328-r1.ebuild 4449
-MD5 02ef16e863e2e6847e2af40ada1b2f32 nvidia-kernel-1.0.4496-r3.ebuild 4270
-MD5 45df989d1d6373746646dece021c9500 nvidia-kernel-1.0.4363-r3.ebuild 4055
-MD5 c1ad0c932a2d360be32e858b259b29d1 nvidia-kernel-1.0.5336-r2.ebuild 4650
+MD5 3c85a28972c777a234a47ca7b34eaab7 nvidia-kernel-1.0.4499.ebuild 4019
+MD5 550ebd5386636dc31cfa41a8481b0a5e nvidia-kernel-1.0.5332-r1.ebuild 4248
+MD5 72edd847705b7324b6ab334f4259233a nvidia-kernel-1.0.5336-r3.ebuild 4621
+MD5 f69f5a016814dec1ddaa9568bf03a688 nvidia-kernel-1.0.5328-r1.ebuild 4457
+MD5 bb49404dd4dfeaacaec092c5c7aa3ea9 nvidia-kernel-1.0.4496-r3.ebuild 4278
+MD5 03604b1fecf15806708e80711bafe3f5 nvidia-kernel-1.0.4363-r3.ebuild 4063
+MD5 ed9d740ffdd6ed471c01f7ebac7cca46 nvidia-kernel-1.0.5336-r2.ebuild 4658
 MD5 c2ceb21469d30ceab90802f64384b63c ChangeLog 18175
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
-MD5 f5ccaf01df9d9ca39ce82061c01c8e39 nvidia-kernel-1.0.5336-r4.ebuild 4616
+MD5 35b63ae09aaf80966113210ce54eef11 nvidia-kernel-1.0.5336-r4.ebuild 4785
 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
@@ -31,6 +31,7 @@ MD5 f04497fe1a0f76fcc41a93b554072c4a files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-2
 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 7bf40e44b8f2181a1047ddfd13acd6b3 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5439
diff --git a/media-video/nvidia-kernel/files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch b/media-video/nvidia-kernel/files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch
new file mode 100644
index 000000000000..0e1566d898c0
--- /dev/null
+++ b/media-video/nvidia-kernel/files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch
@@ -0,0 +1,52 @@
+--- usr/src/nv/conftest.sh.old	2004-06-30 16:08:25.863017584 +1000
++++ usr/src/nv/conftest.sh	2004-06-30 17:19:33.415251032 +1000
+@@ -195,8 +195,10 @@
+         # 2.6 and newer kernels, and the old Makefile for kernels older
+         # than 2.6.
+         #
+-        if [ "$SYSSRC" ]; then
+-            KERNEL_INCLUDE=$SYSSRC/include
++        if [ "$KV_OUT" ]; then
++            KERNEL_INCLUDE=$KV_OUT/include
++	elif [ "$SYSSRC" ]; then
++	    KERNEL_INCLUDE=$SYSSRC/include
+         elif [ "$SYSINCLUDE" ]; then
+             KERNEL_INCLUDE=$SYSINCLUDE
+         else
+--- usr/src/nv/Makefile.kbuild.orig	2004-06-30 16:16:47.991682424 +1000
++++ usr/src/nv/Makefile.kbuild	2004-06-30 17:23:24.047189648 +1000
+@@ -93,6 +93,11 @@
+ ifdef SYSSRC
+   KERNEL_SOURCES := $(SYSSRC)
+   KERNEL_HEADERS := -I$(KERNEL_SOURCES)/include
++  ifdef KV_OUT
++    ifneq ($(SYSSRC),$(KV_OUT))
++      KERNEL_HEADERS += -I$(KV_OUT)/include
++    endif
++  endif
+   MODULE_ROOT    := /lib/modules/$(shell sh $(src)/conftest.sh get_uname)/kernel/drivers
+ else
+   KERNEL_SOURCES := /lib/modules/$(shell uname -r)/build
+@@ -119,7 +124,12 @@
+   MODULE_OBJECT := $(MODULE_NAME).ko
+ 
+   # We need this for the conftest.sh tests to work
+-  KERNEL_HEADERS += -I$(KERNEL_SOURCES)/include/asm/mach-generic
++  ifneq ($(SYSSRC),$(KV_OUT))
++    KERNEL_HEADERS += -I$(KV_OUT)/include2/asm/mach-generic
++    KERNEL_HEADERS += -I$(KV_OUT)/include2
++  else
++    KERNEL_HEADERS += -I$(KERNEL_SOURCES)/include/asm/mach-generic
++  endif
+ endif
+ 
+ #
+@@ -191,7 +201,7 @@
+ # KBUILD build parameters.
+ #
+ 
+-KBUILD_PARAMS := -C $(KERNEL_SOURCES) SUBDIRS=$(PWD)
++KBUILD_PARAMS := -C $(KERNEL_SOURCES) M=$(PWD)
+ 
+ #
+ # NVIDIA sanity checks.
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 c46678e0555d..0733c7d4096c 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.13 2004/06/25 00:47:15 agriffis Exp $
+# $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 $
 
 inherit eutils
 
@@ -10,6 +10,7 @@ S="${WORKDIR}/${NV_PACKAGE}"
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}.tar.gz"
+IUSE=""
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
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 ae5a0366dc01..46295a28626e 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.10 2004/06/25 00:47:15 agriffis Exp $
+# $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 $
 
 inherit eutils
 
@@ -10,6 +10,7 @@ S="${WORKDIR}/${NV_PACKAGE}-pkg0/usr/src/nv"
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-pkg0.run"
+IUSE=""
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
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 29098f1c1e40..2d16a181a7b8 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.8 2004/06/25 00:47:15 agriffis Exp $
+# $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 $
 
 inherit eutils
 
@@ -10,6 +10,7 @@ S="${WORKDIR}/NVIDIA_kernel-1.0-4499"
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="http://download.nvidia.com/XFree86/Linux-x86-64/1.0-4499/NVIDIA_kernel-1.0-4499.tar.gz"
+IUSE=""
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
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 7b5a53ec1b88..87fc1b81fcd2 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.6 2004/06/25 00:47:15 agriffis Exp $
+# $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 $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
+IUSE=""
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
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 551e8316acf8..6bdc3dbd38a1 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.3 2004/06/25 00:47:15 agriffis Exp $
+# $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 $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
+IUSE=""
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
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 aa3f2ad023ac..f365b564103d 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.3 2004/06/25 00:47:15 agriffis Exp $
+# $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 $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
+IUSE=""
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
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 01d3dea0012e..26070df3cc94 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.3 2004/06/25 00:47:15 agriffis Exp $
+# $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 $
 
 inherit eutils kmod
 
@@ -11,6 +11,7 @@ S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
+IUSE=""
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.ebuild
index 4665dae36f8d..5b64035a2086 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.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-r4.ebuild,v 1.2 2004/06/25 00:47:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.ebuild,v 1.3 2004/06/30 07:58:17 cyfred Exp $
 
 inherit eutils kmod
 
@@ -11,6 +11,7 @@ S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
 DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
+IUSE=""
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
@@ -92,6 +93,8 @@ src_unpack() {
 	then
 		# Add sysfs support
 		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-basic-sysfs-support-v2.patch
+		# Add koutput support to kbuild (this is the BIGGEST hack)
+		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-kbuild-koutput-support.patch
 	fi
 
 	# if you set this then it's your own fault when stuff breaks :)
@@ -114,7 +117,7 @@ src_compile() {
 
 		unset ARCH
 	fi
-	make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" \
+	make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" KV_OUT="${KV_OUTPUT}" \
 		clean module V=1 || die "Failed to build module"
 }