Fixing bug 59072 typo in description

5 files changed, 24 insertions, 150 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index ee198f7185ec..759b39ac2d13 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.82 2004/07/26 20:32:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.83 2004/08/02 10:53:55 cyfred Exp $
+
+  02 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6106.ebuild:
+  Fixing bug #59072 and removing 6106 from tree.
 
   26 Jul 2004; Donnie Berkholz <spyderous@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 9154872454c1..53f998be8419 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,42 +1,40 @@
-MD5 e6ad85be3f65d1809b76a5f4aeb3b4f4 ChangeLog 20232
-MD5 aadbfcb5df7c5f6f87d96d032623643d nvidia-kernel-1.0.5336-r3.ebuild 4629
-MD5 d8008e9fd34e643ba85c473c91f40539 nvidia-kernel-1.0.5336-r4.ebuild 4783
-MD5 90008c0e137ec067fba0f55da5a584c4 nvidia-kernel-1.0.6106.ebuild 3488
-MD5 b147f8936eff38e937fab7ac8d177101 nvidia-kernel-1.0.6106-r1.ebuild 3623
-MD5 d5bc3ba053815cd1b559cba6bbd36452 nvidia-kernel-1.0.4363-r3.ebuild 4071
-MD5 20f6ae4f9076cd8f5dd1d2383d0eaca7 nvidia-kernel-1.0.4496-r3.ebuild 4286
+MD5 8ce6e8510b5396c685ad67f806351d36 nvidia-kernel-1.0.6106-r1.ebuild 3622
 MD5 b4a7988f8e10107742f255ea291478c0 nvidia-kernel-1.0.4499.ebuild 4028
-MD5 2e350a0784b0810b89809d761e499bea metadata.xml 301
-MD5 3ff60fb835fc8ab36543515ff50741ef nvidia-kernel-1.0.5328-r1.ebuild 4465
 MD5 c65724336acbdb77c80842d7a9174301 nvidia-kernel-1.0.5332-r1.ebuild 4256
+MD5 aadbfcb5df7c5f6f87d96d032623643d nvidia-kernel-1.0.5336-r3.ebuild 4629
+MD5 3ff60fb835fc8ab36543515ff50741ef nvidia-kernel-1.0.5328-r1.ebuild 4465
+MD5 20f6ae4f9076cd8f5dd1d2383d0eaca7 nvidia-kernel-1.0.4496-r3.ebuild 4286
+MD5 d5bc3ba053815cd1b559cba6bbd36452 nvidia-kernel-1.0.4363-r3.ebuild 4071
 MD5 45245c720d6b0dc7c3f73a2ee95823a0 nvidia-kernel-1.0.5336-r2.ebuild 4673
-MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
-MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
+MD5 c3f975ed248391a21d3f322e2bbcffc2 ChangeLog 20397
+MD5 2e350a0784b0810b89809d761e499bea metadata.xml 301
+MD5 d8008e9fd34e643ba85c473c91f40539 nvidia-kernel-1.0.5336-r4.ebuild 4783
 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 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r3 80
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r4 80
 MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-kernel-1.0.6106-r1 163
+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 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-kernel-1.0.6106 163
 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 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 c0f21cb76a7471671ec9665968dfaafb files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20031026.diff 81900
+MD5 6d98825a3cf78f4a5ce42d4f4decab89 files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030905.diff 81553
 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 f04497fe1a0f76fcc41a93b554072c4a files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20031226.diff 77616
 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 276907ebd8946791398f5f24c27e54c4 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support-v2.patch 5666
-MD5 7bf40e44b8f2181a1047ddfd13acd6b3 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5439
 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 bc61be48f85d84f91d2035fa3cc92a47 files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch 6659
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106
deleted file mode 100644
index a343b4b8810a..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5432f919f0211ce36b854d87108d7db0 NVIDIA-Linux-x86-1.0-6106-pkg1.run 8160802
-MD5 024f21a3fa134bee8339adac64bdc77a NVIDIA-Linux-x86_64-1.0-6106-pkg2.run 7331301
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild
index 589a41c444c3..c76cac192733 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-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.6106-r1.ebuild,v 1.1 2004/07/26 13:15:27 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild,v 1.2 2004/08/02 10:53:55 cyfred Exp $
 
 inherit eutils kmod
 
@@ -10,7 +10,7 @@ NV_V="${PV/1.0./1.0-}"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 
-DESCRIPTION="Linux kernel module for then NVIDIA X11 driver"
+DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run)
 	amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild
deleted file mode 100644
index df570d0e946c..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.6106.ebuild,v 1.4 2004/07/13 16:04:23 lv Exp $
-
-inherit eutils kmod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for then NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run)
-	amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-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}"
-KEYWORDS="-* ~x86 amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-KMOD_SOURCES="none"
-
-mtrr_check() {
-	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
-}
-
-pkg_setup() {
-	mtrr_check
-}
-
-src_unpack() {
-	# Let the kmod eclass set the variables for us
-	kmod_src_unpack
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	# 1) SYSFS supported by nvidia
-	# 2) minion.de patches not released yet
-
-	cd ${S}
-
-	# Add koutput compile time support... this is hackish
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-koutput-support.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() {
-	# 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.
-	if is_kernel 2 5 || is_kernel 2 6
-	then
-		unset ARCH
-	fi
-	make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" KVOUT="${KV_OUTPUT}"  \
-		clean module V=1 || die "Failed to build module"
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	insinto /lib/modules/${KV}/video
-
-	# Insert the module 
-	doins nvidia.${KV_OBJ}
-
-	# 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 ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
-		then
-			/sbin/NVmakedevices.sh >/dev/null 2>&1
-		fi
-	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 "Please note that the driver name is \"nvidia\", not \"NVdriver\""
-	echo
-}