Fixing up some cruft that happened in recent commits. Also standardising is_kernel() across the ebuilds.

7 files changed, 42 insertions, 59 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 00adcac5737c..8707e75e932a 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.72 2004/04/30 07:54:45 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.73 2004/04/30 15:00:14 cyfred Exp $
+
+  01 May 2004; Andrew Bevitt <cyfred@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:
+  Fixing all the cruft that got messed up with some recent commits. Also
+  standardised the use of is_kernel() in all of the ebuilds.
 
 *nvidia-kernel-1.0.4363-r3 (30 Apr 2004)
 
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 319a2c822569..489219a8207e 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,8 +1,8 @@
-MD5 2860347ff24b761503ad33554c8aab77 nvidia-kernel-1.0.4499.ebuild 3997
-MD5 cf020e17ebebff2981b498604d73db71 nvidia-kernel-1.0.5332-r1.ebuild 4456
-MD5 6cb2f39d154c4f2acd2b5f54fde94b91 nvidia-kernel-1.0.5328-r1.ebuild 4355
-MD5 a18b9ae54444544747e53f76b2fd1a20 nvidia-kernel-1.0.4496-r3.ebuild 4255
-MD5 293c9cba905ed33c189a3bd08aad6a47 nvidia-kernel-1.0.4363-r3.ebuild 4124
+MD5 99a3dd3859a719b68df9b55a8fd9d985 nvidia-kernel-1.0.4499.ebuild 4020
+MD5 7bbf25c322dca36fef830228a5785edd nvidia-kernel-1.0.5332-r1.ebuild 4247
+MD5 8ac51492022c3534d0ec8e27a8985fd8 nvidia-kernel-1.0.5328-r1.ebuild 4458
+MD5 f84335dabba8a0b4e85f19ea26e341c1 nvidia-kernel-1.0.4496-r3.ebuild 4278
+MD5 1c5e1b8e01dc86377aa9191b33325358 nvidia-kernel-1.0.4363-r3.ebuild 4062
 MD5 1b454e8926c8340e7e3accafbca675d3 nvidia-kernel-1.0.5336-r2.ebuild 4657
 MD5 f4078b5360add49fb60d42c2d1952335 ChangeLog 16327
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
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 04702d96783d..aa9fba7e0072 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 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.4363-r3.ebuild,v 1.11 2004/04/30 07:54:45 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild,v 1.12 2004/04/30 15:00:15 cyfred Exp $
 
 inherit eutils
 
@@ -57,21 +57,12 @@ get_KV_info() {
 	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
 }
 
-is_2_5_kernel() {
-	get_KV_info
+is_kernel() {
+	[ -z "$1" -o -z "$2" ] && return 1
 
-	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 5 ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-is_2_6_kernel() {
 	get_KV_info
 
-	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 6 ]
+	if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ]
 	then
 		return 0
 	else
@@ -95,7 +86,7 @@ src_unpack() {
 	cd ${S}
 	einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}"
 
-	if is_2_5_kernel || is_2_6_kernel
+	if is_kernel 2 5 || is_kernel 2 6
 	then
 		EPATCH_SINGLE_MSG="Applying tasklet patch for kernel 2.[56]..." \
 		epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-2.5-20030714.diff
@@ -144,7 +135,7 @@ pkg_postinst() {
 	then
 		# Update module dependency
 		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
+		if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
 		then
 			/sbin/NVmakedevices.sh >/dev/null 2>&1
 		fi
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 d44dd3d5fd7d..a84a9410b002 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 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.4496-r3.ebuild,v 1.8 2004/04/29 12:55:53 steel300 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild,v 1.9 2004/04/30 15:00:15 cyfred Exp $
 
 inherit eutils
 
@@ -87,7 +87,7 @@ src_unpack() {
 	cd ${S}
 	einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}"
 
-	if is_kernel 2.5 || is_kernel 2.6
+	if is_kernel 2 5 || is_kernel 2 6
 	then
 		EPATCH_SINGLE_MSG="Applying tasklet patch ..." \
 		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-2.6-20030905.diff
@@ -138,7 +138,7 @@ pkg_postinst() {
 	then
 		# Update module dependency
 		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
+		if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
 		then
 			/sbin/NVmakedevices.sh >/dev/null 2>&1
 		fi
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 73d161edbb58..0adb32639aca 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 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.4499.ebuild,v 1.6 2004/04/29 12:55:53 steel300 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild,v 1.7 2004/04/30 15:00:15 cyfred Exp $
 
 inherit eutils
 
@@ -87,7 +87,7 @@ src_unpack() {
 	cd ${S}
 	einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}"
 
-	if is_kernel 2.5 || is_kernel 2.6
+	if is_kernel 2 5 || is_kernel 2 6
 	then
 		EPATCH_SINGLE_MSG="Applying 2.6.x patch ..." \
 		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-2.6-20031014.diff
@@ -109,7 +109,7 @@ src_compile() {
 src_install() {
 	# The driver goes into the standard modules location
 	insinto /lib/modules/${KV}/video
-	if is_2_5_kernel || is_2_6_kernel
+	if is_kernel 2 5 || is_kernel 2 6
 	then
 		doins nvidia.ko
 	else
@@ -133,7 +133,7 @@ pkg_postinst() {
 	then
 		# Update module dependency
 		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
+		if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
 		then
 			/sbin/NVmakedevices.sh >/dev/null 2>&1
 		fi
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 7624e4809e74..1fd3717ddeb4 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 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.5328-r1.ebuild,v 1.4 2004/04/29 12:55:53 steel300 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild,v 1.5 2004/04/30 15:00:15 cyfred Exp $
 
 inherit eutils
 
@@ -89,7 +89,7 @@ src_unpack() {
 	cd ${S}
 	einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}"
 
-	if is_kernel 2.5 || is_kernel 2.6
+	if is_kernel 2 5 || is_kernel 2 6
 	then
 		EPATCH_SINGLE_MSG="Applying tasklet patch ..." \
 		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-2.6-20040105.diff
@@ -98,7 +98,7 @@ src_unpack() {
 		ln -snf Makefile.nvidia Makefile
 	fi
 
-	if is_kernel 2.4
+	if is_kernel 2 4
 	then
 		EPATCH_SINGLE_MSG="Applying VIA chipset bugfix patch ..." \
 		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-2.4-via-chipset-fix.patch
@@ -123,7 +123,12 @@ src_compile() {
 src_install() {
 	# The driver goes into the standard modules location
 	insinto /lib/modules/${KV}/video
-	doins nvidia.o
+	if is_kernel 2 5 || is_kernel 2 6
+	then
+		newins nvidia.o nvidia.ko
+	else
+		doins nvidia.o
+	fi
 
 	# Add the aliases
 	insinto /etc/modules.d
@@ -142,7 +147,7 @@ pkg_postinst() {
 	then
 		# Update module dependency
 		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
+		if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
 		then
 			/sbin/NVmakedevices.sh >/dev/null 2>&1
 		fi
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 98b4e66726d0..717b77b3b737 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 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.5332-r1.ebuild,v 1.1 2004/04/08 00:10:51 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild,v 1.2 2004/04/30 15:00:15 cyfred Exp $
 
 inherit eutils
 
@@ -59,32 +59,12 @@ get_KV_info() {
 	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
 }
 
-is_2_4_kernel() {
-	get_KV_info
-
-	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 4 ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-is_2_5_kernel() {
-	get_KV_info
-
-	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 5 ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
+is_kernel() {
+	[ -z "$1" -o -z "$2" ] && return 1
 
-is_2_6_kernel() {
 	get_KV_info
 
-	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 6 ]
+	if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ]
 	then
 		return 0
 	else
@@ -109,7 +89,7 @@ src_unpack() {
 	cd ${S}
 	einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}"
 
-	if is_2_5_kernel || is_2_6_kernel
+	if is_kernel 2 5 || is_kernel 2 6
 	then
 		# Kbuild have issues currently (sandbox related).
 		EPATCH_SINGLE_MSG="Applying 2.6.x patch ..." \
@@ -135,7 +115,7 @@ src_compile() {
 src_install() {
 	# The driver goes into the standard modules location
 	insinto /lib/modules/${KV}/video
-	if is_2_5_kernel || is_2_6_kernel
+	if is_kernel 2 5 || is_kernel 2 6
 	then
 		doins nvidia.ko
 	else