Changes to use the new linux-* eclasses.

3 files changed, 65 insertions, 116 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index d250a3f251d1..9801d15f7ad1 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # 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.98 2004/11/14 20:01:46 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.99 2004/11/25 23:14:26 cyfred Exp $
+
+  26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-kernel-1.0.6629.ebuild:
+  Changes to use the new linux-* eclasses, doing this in ~arch for now just to
+  make sure of the eclasses functionality being totally correct :).
 
   14 Nov 2004; Martin Schlemmer <azarah@gentoo.org>
   +files/1.0.6629/nv-pgprot-speedup.patch,
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index ac0ee12e62ff..1a55e6cb2f11 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,52 +1,52 @@
-MD5 629e2c50f2d8d26979decb9e58030ae2 nvidia-kernel-1.0.5328-r1.ebuild 4463
 MD5 814fea2a60608fafdeac08db1547da22 ChangeLog 24414
-MD5 ca5b83d42ef85a76927ca4372fa527f2 nvidia-kernel-1.0.5332-r1.ebuild 4254
-MD5 4a752bd1eb81a261506593b82daaa8c7 nvidia-kernel-1.0.5336-r4.ebuild 4783
+MD5 c84a79e7d9b69a204003fb8c2dbaad01 metadata.xml 297
+MD5 b5275c8797b4ec75716a04c8c9273fa7 nvidia-kernel-1.0.4499.ebuild 4026
+MD5 a7f1acc0b223108fc49328c02ad340e3 nvidia-kernel-1.0.6629.ebuild 4352
 MD5 4e1d103a4e151f53d4bd38b12de4a592 nvidia-kernel-1.0.4363-r3.ebuild 4069
-MD5 9fd1bc7f640bcab70de6aecd7a6d5105 nvidia-kernel-1.0.6111-r2.ebuild 4113
 MD5 3bf6bcd6581fce2df5e410cfc2acba3f nvidia-kernel-1.0.4496-r3.ebuild 4284
-MD5 b5275c8797b4ec75716a04c8c9273fa7 nvidia-kernel-1.0.4499.ebuild 4026
-MD5 c84a79e7d9b69a204003fb8c2dbaad01 metadata.xml 297
-MD5 12e0743c800dfd473205736e299ac204 nvidia-kernel-1.0.6629.ebuild 6459
+MD5 629e2c50f2d8d26979decb9e58030ae2 nvidia-kernel-1.0.5328-r1.ebuild 4463
+MD5 ca5b83d42ef85a76927ca4372fa527f2 nvidia-kernel-1.0.5332-r1.ebuild 4254
+MD5 4a752bd1eb81a261506593b82daaa8c7 nvidia-kernel-1.0.5336-r4.ebuild 4783
 MD5 3aaa58176d80f6684f305e8a0240ef2f nvidia-kernel-1.0.6106-r1.ebuild 3623
+MD5 9fd1bc7f640bcab70de6aecd7a6d5105 nvidia-kernel-1.0.6111-r2.ebuild 4113
 MD5 63a5b30228e33e7d1fc441ad59ca5ea3 nvidia-kernel-1.0.6111-r3.ebuild 6305
-MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
-MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629 163
-MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
 MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629 163
+MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
 MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
-MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-kernel-1.0.5332-r1 83
 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-r4 80
 MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-kernel-1.0.6106-r1 163
-MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111-r3 163
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111-r2 163
-MD5 14924b09123b075f910c73316baff848 files/1.0.6111/power-suspend-2.6.9-changes.patch 856
-MD5 29eafcaf7ab5d59dd90d3d3243bf57c3 files/1.0.6111/nv_enable_pci.patch 3640
-MD5 762e6f6e16aa6dd5b2469e99fe8decd3 files/1.0.6111/nv-pci_find_class.patch 2903
-MD5 c2b155f40d7b904f07550e8e326969c2 files/1.0.6111/nv-remap-range.patch 5715
-MD5 5177339888e44bb5f4b6124fa5830e7f files/1.0.6111/vmalloc-reserve.patch 542
-MD5 b5b7f947ffb9e6c19f7457ff7c14d0db files/1.0.6111/conftest_koutput_includes.patch 1082
-MD5 bc61be48f85d84f91d2035fa3cc92a47 files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch 6659
-MD5 c2a29e883336157e1a3e99a0bceca549 files/1.0.4499/NVIDIA_kernel-1.0-4499-2.6-20031014.diff 69389
-MD5 dbf80a2cbaf69a10521429e1b2a7e10c files/1.0.6629/conftest_koutput_includes.patch 1082
-MD5 c3d0a0f59fa6b06a5ee139fb01858287 files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch 542
-MD5 e70739410861defb6bf3d40f2706d554 files/1.0.6629/nv-pgd_offset.patch 3139
-MD5 64d76075a90dedc83f1dc971389c910e files/1.0.6629/nv-shutup-warnings.patch 712
-MD5 5aef5c6a394896bbb8392816f6795147 files/1.0.6629/nv-amd64-shutup-warnings.patch 902
-MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/nv-pgprot-speedup.patch 1518
-MD5 7c9db721d244f6ca709e2b8003ce4e0d files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch 677
+MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111-r3 163
+MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
 MD5 f7d7092e9eb9fbe926ff1b8aa9b3f50e files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff 79485
-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 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 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 6b364c4b64c6de0aea70163850fa3914 files/1.0.5336/Makefile 4410
 MD5 442f1483c003d291a90dfcc87903b045 files/1.0.5336/NVIDIA_kernel-1.0-5336-2.6-20040521.patch 18711
+MD5 7bf40e44b8f2181a1047ddfd13acd6b3 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5439
 MD5 276907ebd8946791398f5f24c27e54c4 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support-v2.patch 5666
 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 7bf40e44b8f2181a1047ddfd13acd6b3 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5439
-MD5 6b364c4b64c6de0aea70163850fa3914 files/1.0.5336/Makefile 4410
+MD5 bc61be48f85d84f91d2035fa3cc92a47 files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch 6659
+MD5 762e6f6e16aa6dd5b2469e99fe8decd3 files/1.0.6111/nv-pci_find_class.patch 2903
+MD5 c2b155f40d7b904f07550e8e326969c2 files/1.0.6111/nv-remap-range.patch 5715
+MD5 29eafcaf7ab5d59dd90d3d3243bf57c3 files/1.0.6111/nv_enable_pci.patch 3640
+MD5 5177339888e44bb5f4b6124fa5830e7f files/1.0.6111/vmalloc-reserve.patch 542
+MD5 b5b7f947ffb9e6c19f7457ff7c14d0db files/1.0.6111/conftest_koutput_includes.patch 1082
+MD5 14924b09123b075f910c73316baff848 files/1.0.6111/power-suspend-2.6.9-changes.patch 856
+MD5 e70739410861defb6bf3d40f2706d554 files/1.0.6629/nv-pgd_offset.patch 3139
+MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/nv-pgprot-speedup.patch 1518
+MD5 dbf80a2cbaf69a10521429e1b2a7e10c files/1.0.6629/conftest_koutput_includes.patch 1082
+MD5 5aef5c6a394896bbb8392816f6795147 files/1.0.6629/nv-amd64-shutup-warnings.patch 902
+MD5 c3d0a0f59fa6b06a5ee139fb01858287 files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch 542
+MD5 64d76075a90dedc83f1dc971389c910e files/1.0.6629/nv-shutup-warnings.patch 712
+MD5 7c9db721d244f6ca709e2b8003ce4e0d files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch 677
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild
index 1d0a3c223246..663698e4bd2a 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild
@@ -1,8 +1,8 @@
 # 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.6629.ebuild,v 1.5 2004/11/14 20:01:46 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6629.ebuild,v 1.6 2004/11/25 23:14:26 cyfred Exp $
 
-inherit eutils kernel-mod
+inherit eutils linux-mod
 
 X86_PKG_V="pkg1"
 AMD64_PKG_V="pkg2"
@@ -27,7 +27,7 @@ S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
 
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
-SLOT="${KV}"
+SLOT="0"
 KEYWORDS="-* ~x86 ~amd64"
 RESTRICT="nostrip"
 IUSE=""
@@ -35,10 +35,15 @@ IUSE=""
 DEPEND="virtual/linux-sources"
 export _POSIX2_VERSION="199209"
 
-KMOD_SOURCES="none"
+MODULE_NAMES="nvidia(video:${S})"
+BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR}"
 
 mtrr_check() {
-	if [ ! -f /proc/mtrr ]
+	ebegin "Checking for MTRR support"
+	getfilevar_isset CONFIG_MTRR ${KV_DIR}/.config
+	eend $?
+
+	if [ "$?" != 0 ]
 	then
 		eerror "This version needs MTRR support for most chipsets!"
 		eerror "Please enable MTRR support in your kernel config, found at:"
@@ -51,26 +56,18 @@ mtrr_check() {
 }
 
 pkg_setup() {
-	mtrr_check
+	linux-mod_pkg_setup
+	mtrr_check;
 }
 
 src_unpack() {
-	# Setup the environment
-	kernel-mod_getversion
-	if [ ${KV_MINOR} -ge 5 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
 	# 2.6.10_rc1-mm{1,2,3} all EXPORT_SYMBOL_GPL the udev functions, this breaks loading
-	CS="$(grep -c EXPORT_SYMBOL\(class_simple_create\)\; ${KERNEL_DIR}/drivers/base/class_simple.c)"
+	CS="$(grep -c EXPORT_SYMBOL\(class_simple_create\)\; ${KV_DIR}/drivers/base/class_simple.c)"
 	if [ "${CS}" == "0" ]
 	then
-		ewarn "Your current kernel uses EXPORT_SYMBOL_GPL() on some methods required by nvidia-kernel"
-		ewarn "This probably means 2.6.10_rc1-mm*, please change away from mm-sources until this is"
-		ewarn "revised and a solution released in the mm branch, development-sources will work."
+		ewarn "Your current kernel uses EXPORT_SYMBOL_GPL() on some methods required by nvidia-kernel."
+		ewarn "This probably means you are using 2.6.10_rc1-mm*. Please change away from mm-sources until this is"
+		ewarn "revised and a solution released into the mm branch, development-sources will work."
 		die "Incompatible kernel export."
 	fi
 
@@ -87,6 +84,7 @@ src_unpack() {
 
 	cd ${WORKDIR}
 	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
+	cd ${S}
 
 	# Add patches below, with a breif description.
 	cd ${S}
@@ -106,53 +104,14 @@ src_unpack() {
 	use amd64 && epatch ${FILESDIR}/${PV}/nv-amd64-shutup-warnings.patch
 
 	# if you set this then it's your own fault when stuff breaks :)
-	[ ! -z "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-}
-
-src_compile() {
-	# Right as kmod was deprecated there is little room for kbuild but lets
-	# at least have some sembalance of support for those who are forcing
-	# a non-standard build directory.
-	if [ ${KV_MINOR} -ge 6 -a ${KV_PATCH} -ge 7 ]
-	then
-		# Find the kbuild output
-		if [ -n "${KBUILD_OUTPUT_PREFIX}" ]
-		then
-			echo
-			einfo "Determining kernel output location"
-			OUTPUT="${KBUILD_OUTPUT_PREFIX}/${KV_VERSION_FULL}"
-		fi
-	fi
-	[ -z "${OUTPUT}" ] && OUTPUT=${KERNEL_DIR}
-	einfo "Using ${OUTPUT} as kernel output location"
-	echo
-	# Now its possible that we might be here without using a KBUILD kernel
-	# (ie the variable is set, but using non-kbuild kernel or different path)
-	if [ ! -d ${OUTPUT} ]
-	then
-		ewarn "Your system global KBUILD_OUTPUT is set to ${KBUILD_OUTPUT_PREFIX}"
-		ewarn "However your kernels output path ${OUTPUT} does not exist."
-		echo
-		ewarn "Using ${KERNEL_DIR} as your kernel output location."
-		echo
-		OUTPUT=${KERNEL_DIR}
-	fi
+	[ -n "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.*
 
-	# IGNORE_CC_MISMATCH disables a sanity check that's needed when gcc has been
-	# 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.
-	unset ARCH
-	make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" SYSOUT="${OUTPUT}"  \
-		clean module V=1 || die "Failed to build module"
+	# if greater than 2.6.5 use M= instead of SUBDIR=
+	convert_to_m ${S}/Makefile.kbuild
 }
 
 src_install() {
-	# The driver goes into the standard modules location
-	insinto /lib/modules/${KV}/video
-
-	# Insert the module 
-	doins nvidia.${KV_OBJ}
+	linux-mod_src_install
 
 	# Add the aliases
 	insinto /etc/modules.d
@@ -167,28 +126,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+		[ ! -e /dev/.devfsd ] && \
+		[ ! -e /dev/.udev ] && \
+		[ -x /sbin/NVmakedevices.sh ]
 	then
-		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
-		then
-			/sbin/NVmakedevices.sh >/dev/null 2>&1
-		fi
+		/sbin/NVmakedevices.sh >/dev/null 2>&1
 	fi
 
-	echo
-	einfo "If you need to load the module automatically on boot up you need"
-	einfo "to add \"nvidia\" to /etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-	echo
-	einfo "This module will now work correctly under udev, you do not need to"
-	einfo "manually create the devices anymore."
-	echo
-	ewarn "If you are using 2.6.10-rc1-(bk|mm)[0-9]*, please note that you might have"
-	ewarn "to disable the kernel agp driver, and use NVAGP instead, as there are some"
-	ewarn "unresolved issues with some kernel agp drivers ..."
-	echo
-	einfo "Checking kernel module dependencies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+	linux-mod_pkg_postinst
 }