Add PKG_V to make sure updating the package used will not break things again.

3 files changed, 30 insertions, 25 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index affd89001615..7ea05db3e34c 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.52 2003/11/02 14:12:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.53 2003/11/02 15:48:02 azarah Exp $
+
+  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4496-r4.ebuild:
+  Add PKG_V to make sure updating the package used will not break things again.
 
   02 Nov 2003; Martin Holzer <mholzer@gentoo.org>
   nvidia-kernel-1.0.4496-r4.ebuild:
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 80b73fcc85c9..f4c9afea65dc 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,37 +1,37 @@
-MD5 ecd2951817edad161c3ae52fa4e8872a ChangeLog 11056
-MD5 56284499e6371ee2379be3135c336649 nvidia-kernel-1.0.2880-r1.ebuild 1920
-MD5 7743c74091c9c2a5aff6fd9491ec5bd1 nvidia-kernel-1.0.2960-r1.ebuild 1941
 MD5 c6c5f9488fddf3a6b223d08f45750b19 nvidia-kernel-1.0.3123-r2.ebuild 3072
-MD5 5c16c38d2ef5fc4895959c219023b43c nvidia-kernel-1.0.4191-r2.ebuild 3667
 MD5 4a798d53143642b8b5d2c24af6082fe1 nvidia-kernel-1.0.4349-r2.ebuild 3495
+MD5 c0a7b6bbf55f3ff8b7fe3965adcc81e1 ChangeLog 11224
+MD5 7743c74091c9c2a5aff6fd9491ec5bd1 nvidia-kernel-1.0.2960-r1.ebuild 1941
+MD5 e0aded1a33c8312ef5a2d5646bed942c nvidia-kernel-1.0.4180.ebuild 3666
+MD5 96820b4cf0ed4af72802df97f196ad77 nvidia-kernel-1.0.4496-r4.ebuild 4090
 MD5 56c81e9cf71819c026a390612b28638c nvidia-kernel-1.0.4363-r3.ebuild 3995
+MD5 5c16c38d2ef5fc4895959c219023b43c nvidia-kernel-1.0.4191-r2.ebuild 3667
 MD5 63a760a4040308b57353b40ef8a4f9ca nvidia-kernel-1.0.4496-r3.ebuild 4201
-MD5 e0aded1a33c8312ef5a2d5646bed942c nvidia-kernel-1.0.4180.ebuild 3666
 MD5 ed664fd501cf24043e0fd8b579e334dc nvidia-kernel-1.0.4499.ebuild 4034
-MD5 192b4a46fd04c5ec24387e16b022dfb7 nvidia-kernel-1.0.4496-r4.ebuild 4066
-MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569
-MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858
-MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614
-MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858
+MD5 56284499e6371ee2379be3135c336649 nvidia-kernel-1.0.2880-r1.ebuild 1920
+MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
 MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825
-MD5 7f987ae6384103d87f323d834bba87a1 files/NVIDIA_kernel-1.0-4191-2.5-tl.diff 39065
+MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74
 MD5 57f69061f52fd98e20c7d62882af2757 files/NVIDIA_kernel-1.0-4191-2.5.54.diff 1228
-MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814
-MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74
 MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122
-MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74
+MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858
+MD5 7f987ae6384103d87f323d834bba87a1 files/NVIDIA_kernel-1.0-4191-2.5-tl.diff 39065
 MD5 854b5c292ec300d7105dbd54385840f6 files/digest-nvidia-kernel-1.0.4191-r2 74
-MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74
-MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r2 74
-MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
 MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
-MD5 259cdc102f465d8a3dbb4169ac1ba194 files/digest-nvidia-kernel-1.0.4180 74
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
 MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
+MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80
 MD5 a31ceab3377afe2286673e74ddf89468 files/digest-nvidia-kernel-1.0.4496-r4 80
+MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569
+MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858
+MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614
+MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74
+MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74
+MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814
+MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
+MD5 259cdc102f465d8a3dbb4169ac1ba194 files/digest-nvidia-kernel-1.0.4180 74
+MD5 c2a29e883336157e1a3e99a0bceca549 files/1.0.4499/NVIDIA_kernel-1.0-4499-2.6-20031014.diff 69389
 MD5 31565678620709b117139345323051fd files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5-20030402.diff 70350
 MD5 439563bcf7fa96c91361226fae454e0e files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5.68.diff 1467
-MD5 c2a29e883336157e1a3e99a0bceca549 files/1.0.4499/NVIDIA_kernel-1.0-4499-2.6-20031014.diff 69389
 MD5 55a418e3a16875434624b975592c82dc files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff 79479
 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
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r4.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r4.ebuild
index 2cb65e70db82..0fbd7cdd4cc9 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r4.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r4.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2003 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-r4.ebuild,v 1.2 2003/11/02 14:12:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r4.ebuild,v 1.3 2003/11/02 15:48:02 azarah Exp $
 
+PKG_V="pkg2"
 NV_V="${PV/1.0./1.0-}"
 NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-pkg2/usr/src/nv"
+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}-pkg2.run"
+SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
 
 # The slow needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
@@ -78,7 +79,7 @@ is_2_6_kernel() {
 
 src_unpack() {
 	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-pkg2.run --extract-only
+	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
 
 	# Next section applies patches for linux-2.5 kernel, and/or
 	# bugfixes for linux-2.4.  All these are from: