Fix is_2_6_kernel. Close Bug 48060

6 files changed, 12 insertions, 215 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index db1251068dd3..1630a5fb888d 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,10 @@
 # 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.68 2004/04/16 11:18:36 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.69 2004/04/28 22:19:49 steel300 Exp $
+
+  28 Apr 2004; <coxj@gentoo.org> nvidia-kernel-1.0.4363-r3.ebuild,
+  nvidia-kernel-1.0.4496-r3.ebuild, nvidia-kernel-1.0.4499.ebuild:
+  Fix is_kernel thing.
 
   16 Apr 2004; Andrew Bevitt <cyfred@gentoo.org>;
   nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild:
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 78faa1b8fb81..47db8c6124b2 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,17 +1,15 @@
-MD5 a84c6099ac721e55e50bc35cdf443837 nvidia-kernel-1.0.4499.ebuild 4080
+MD5 ad82de64a4a91fd53bc07bd1f2ee1e84 nvidia-kernel-1.0.4499.ebuild 3834
 MD5 cf020e17ebebff2981b498604d73db71 nvidia-kernel-1.0.5332-r1.ebuild 4456
 MD5 ad9be703f3ba183bf2b5d9a9765619fa nvidia-kernel-1.0.5328-r1.ebuild 4562
-MD5 114d5abe225c0b94d73f82499d732bfc nvidia-kernel-1.0.4496-r3.ebuild 4329
-MD5 3e6fe3e4609ff8110f2aa1051f4ef36e nvidia-kernel-1.0.4363-r3.ebuild 4123
+MD5 c2e612356188c17af6f059870b8f7338 nvidia-kernel-1.0.4496-r3.ebuild 4083
 MD5 1b454e8926c8340e7e3accafbca675d3 nvidia-kernel-1.0.5336-r2.ebuild 4657
-MD5 69af9f99cefafc64edd213f3612c1d36 ChangeLog 15733
+MD5 21cf1dea62bf4dedd3466f305b3a47d2 ChangeLog 15893
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
 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
 MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
 MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
-MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
 MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
 MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
 MD5 eaed145a02e1457194d0e9fdb1f4851a files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5-20030402.diff 70356
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.4363-r3 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.4363-r3
deleted file mode 100644
index b1f93afc2136..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.4363-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 29b4cfcff63f502787fd2f0ac7a105fd NVIDIA_kernel-1.0-4363.tar.gz 661447
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
deleted file mode 100644
index 576a1714104b..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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.9 2004/04/16 11:18:36 cyfred Exp $
-
-inherit eutils
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_kernel-${NV_V}"
-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"
-
-# The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
-LICENSE="NVIDIA"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-RESTRICT="nostrip"
-
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-pkg_setup() {
-	if [ ! -f /proc/mtrr ]
-	then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features -> [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-
-	check_version_h
-}
-
-check_version_h() {
-	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
-	then
-		eerror "Please verify that your /usr/src/linux symlink is pointing"
-		eerror "to your current kernel sources, and that you did run:"
-		eerror
-		eerror "  # make dep"
-		die "/usr/src/linux symlink not setup!"
-	fi
-}
-
-get_KV_info() {
-	check_version_h
-
-	# Get the kernel version of sources in /usr/src/linux ...
-	export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \
-		"${ROOT}/usr/src/linux/include/linux/version.h")"
-	export KV_major="$(echo "${KV_full}" | cut -d. -f1)"
-	export KV_minor="$(echo "${KV_full}" | cut -d. -f2)"
-	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
-}
-
-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_2_6_kernel() {
-	get_KV_info
-
-	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 6 ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Next section applies patches for linux-2.5 kernel, and/or
-	# bugfixes for linux-2.4.  All these are from:
-	#
-	#   http://www.minion.de/nvidia/
-	#
-	# Many thanks to Christian Zander <zander@minion.de> for bringing
-	# these to us, and being so helpful to select which to use.
-
-	get_KV_info
-
-	cd ${S}
-	einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}"
-
-	if is_2_5_kernel || is_2_6_kernel
-	then
-		EPATCH_SINGLE_MSG="Applying tasklet patch for kernel 2.[56]..." \
-		epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-2.5-20030714.diff
-
-		# Kbuild have issues currently (sandbox related).
-		ln -snf Makefile.nvidia Makefile
-	fi
-}
-
-src_compile() {
-	# Portage should determine the version of the kernel sources
-	check_KV
-
-	# 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.
-	make IGNORE_CC_MISMATCH="yes" KERNDIR="/usr/src/linux" \
-		clean nvidia.o || die
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	insinto /lib/modules/${KV}/video
-	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
-	newins ${FILESDIR}/nvidia-1.1 nvidia
-
-	# Docs
-	dodoc ${S}/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
-		then
-			/sbin/NVmakedevices.sh >/dev/null 2>&1
-		fi
-	fi
-
-	echo
-	einfo "If you are not using devfs, loading the module automatically at"
-	einfo "boot up, you need to add \"nvidia\" to your /etc/modules.autoload."
-	echo
-	ewarn "Please note that the driver name changed from \"NVdriver\""
-	ewarn "to \"nvidia.o\"."
-	echo
-}
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 f74dccde15cc..01da4184a61c 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.6 2004/04/16 11:18:36 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild,v 1.7 2004/04/28 22:19:49 steel300 Exp $
 
 inherit eutils
 
@@ -57,28 +57,6 @@ get_KV_info() {
 	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
 }
 
-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_2_6_kernel() {
-	get_KV_info
-
-	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 6 ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
 src_unpack() {
 	cd ${WORKDIR}
 	bash ${DISTDIR}/${NV_PACKAGE}-pkg0.run --extract-only
@@ -96,7 +74,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 ..." \
 		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-2.6-20030905.diff
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 4cda29869d81..b9e96c70ed59 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.4 2004/01/29 09:55:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild,v 1.5 2004/04/28 22:19:49 steel300 Exp $
 
 inherit eutils
 
@@ -57,28 +57,6 @@ get_KV_info() {
 	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
 }
 
-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_2_6_kernel() {
-	get_KV_info
-
-	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 6 ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
 src_unpack() {
 	cd ${WORKDIR}
 	unpack NVIDIA_kernel-1.0-4499.tar.gz
@@ -96,7 +74,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 2.6.x patch ..." \
 		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-2.6-20031014.diff