Changed pkg1 and pkg2 to pkg0 for bug #146182.

Package-Manager: portage-2.1.2_pre3-r3

8 files changed, 59 insertions, 43 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 846dfea49568..d2064c885eda 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.21 2006/10/17 00:29:52 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.22 2006/10/17 13:48:46 wolf31o2 Exp $
+
+  17 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/1.0.9625/NVIDIA-1.0.9625-i2c.diff,
+  +files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, nvidia-drivers-1.0.8178.ebuild,
+  nvidia-drivers-1.0.8774.ebuild, -nvidia-drivers-1.0.9625.ebuild,
+  nvidia-drivers-1.0.9626.ebuild:
+  Changed pkg1 and pkg2 to pkg0 for bug #146182.
 
   17 Oct 2006; Olivier Crête <tester@gentoo.org>
   nvidia-drivers-1.0.9626.ebuild:
diff --git a/x11-drivers/nvidia-drivers/files/1.0.9626/NVIDIA-1.0.9626-i2c.diff b/x11-drivers/nvidia-drivers/files/1.0.9626/NVIDIA-1.0.9626-i2c.diff
new file mode 100644
index 000000000000..cae4581af6bf
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/1.0.9626/NVIDIA-1.0.9626-i2c.diff
@@ -0,0 +1,16 @@
+diff -ru usr/src/nv/nv-i2c.c usr/src/nv.NOSMBUS/nv-i2c.c
+--- usr/src/nv/nv-i2c.c	2006-09-15 01:10:17.000000000 +0200
++++ usr/src/nv.NOSMBUS/nv-i2c.c	2006-09-22 21:56:17.259789750 +0200
+@@ -138,11 +138,7 @@
+ 
+ static u32 nv_i2c_algo_functionality(struct i2c_adapter *adap)
+ {
+-    return (I2C_FUNC_I2C |
+-            I2C_FUNC_SMBUS_QUICK |
+-            I2C_FUNC_SMBUS_BYTE |
+-            I2C_FUNC_SMBUS_BYTE_DATA |
+-            I2C_FUNC_SMBUS_WORD_DATA);
++    return I2C_FUNC_I2C;
+ }
+ 
+ static struct i2c_algorithm nv_i2c_algo = {
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8178 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8178
index b1295173933f..a628b4ff7fff 100644
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8178
+++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8178
@@ -1,9 +1,9 @@
 MD5 ef6d63b01ff062b9f5c2dd458e7e89b1 NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056
 RMD160 75d3ef8bab67868056f540f580aa907c8a32d0b6 NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056
 SHA256 90d3fd6acf916471a6d41737e83f5ed5489effd920cb695bc44bec791262a280 NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056
-MD5 bc9d459bfeee93735e3959de041635df NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-RMD160 4075969c4229dd75467113b8eb22ab9645893385 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-MD5 524acaed325910bed26e880ce65e7405 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
-RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
-SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
+MD5 6c8081bfde4a806a487efc2a9a1ff016 NVIDIA-Linux-x86-1.0-8178-pkg0.run 6139948
+RMD160 386e8009b7a458bdc161380e833de137eb43017d NVIDIA-Linux-x86-1.0-8178-pkg0.run 6139948
+SHA256 c0d61f2276455c29467c6880f90b00ee105d4947cbf850f6bcfdf76b73901afc NVIDIA-Linux-x86-1.0-8178-pkg0.run 6139948
+MD5 28518c410fc8129a7d9747bd72b56fe4 NVIDIA-Linux-x86_64-1.0-8178-pkg0.run 6967611
+RMD160 23dc587b409e1d9cabf917a98fa88d17713cee11 NVIDIA-Linux-x86_64-1.0-8178-pkg0.run 6967611
+SHA256 498c901a3670c97e3dcac0efaa5d5dbf9eb66f74c7855af862e07225d9a2d0a0 NVIDIA-Linux-x86_64-1.0-8178-pkg0.run 6967611
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8774 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8774
index 14f94bedb52b..e3f144d3c7f1 100644
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8774
+++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8774
@@ -1,9 +1,9 @@
 MD5 0fe3cbc309815f4ac3d70e7d1a3a4f9e NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433
 RMD160 f9e9a2f370bd19e5ae723e21dfaadf9328bfcdff NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433
 SHA256 a5156d4da19fa544172ec9eca4e612c6b48c7d9f932cebf695e7206343ed9a07 NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433
-MD5 eb01a4372096ee7799e6560cf568c1c2 NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959
-RMD160 2d7249f4ca06db151d80870ff0da27edb402ee8a NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959
-SHA256 099b597b93d794ec74b34583d3cbe6ea39f8ac5b2f7ae96d3aafbdfdd89daa83 NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959
-MD5 1f569a860caf1c4314444536c7e659dd NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211
-RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211
-SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214 NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211
+MD5 33950a867c2d45014191025dc789476f NVIDIA-Linux-x86-1.0-8774-pkg0.run 6479697
+RMD160 ada4a46bd70d11f1c337a3c4be8c3f860591562c NVIDIA-Linux-x86-1.0-8774-pkg0.run 6479697
+SHA256 79d86b5cc43e230584ffb93a7bc7e83d29ee8a7b3c376fbba30cf0b7dd7e9b01 NVIDIA-Linux-x86-1.0-8774-pkg0.run 6479697
+MD5 1907ba3001329cc1972d3fb8d8e4b213 NVIDIA-Linux-x86_64-1.0-8774-pkg0.run 7369606
+RMD160 c8762a7eea178007fb329a224558bee74a539b4c NVIDIA-Linux-x86_64-1.0-8774-pkg0.run 7369606
+SHA256 50d6c81ba1f576bf2c15775f67fc40b089c70fd2a685f3bd6df2f00cafbbd27d NVIDIA-Linux-x86_64-1.0-8774-pkg0.run 7369606
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9626 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9626
index 6ecd4477e66a..dce2db792d73 100644
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9626
+++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9626
@@ -1,9 +1,9 @@
 MD5 28cae98f6b3e6d8b71c731a40f0f9f25 NVIDIA-FreeBSD-x86-1.0-9626.tar.gz 9731946
 RMD160 9c0f9baafd921bab45b015b2553aed6b4a1fcdeb NVIDIA-FreeBSD-x86-1.0-9626.tar.gz 9731946
 SHA256 98e9a71b8264436f3100bd145993ee710a193db4e1aae1be1b3bc9213f7f4b2b NVIDIA-FreeBSD-x86-1.0-9626.tar.gz 9731946
-MD5 5a3af501f4e65bdaf7e22ce5b093cd74 NVIDIA-Linux-x86-1.0-9626-pkg1.run 13407646
-RMD160 9ae7bd524bd1c8c51e4d518da427808870ac60aa NVIDIA-Linux-x86-1.0-9626-pkg1.run 13407646
-SHA256 ceecc1d54827c5323a041c06ccd7c557f4245a8f42d2e1a1d6164bd7ceac1396 NVIDIA-Linux-x86-1.0-9626-pkg1.run 13407646
-MD5 11d39ec95f04b40c5559c4f190db6d85 NVIDIA-Linux-x86_64-1.0-9626-pkg2.run 10296145
-RMD160 2bdbe5aff2ab7afebece102db62233748bd302e6 NVIDIA-Linux-x86_64-1.0-9626-pkg2.run 10296145
-SHA256 56e8bc38e8966fe7e7046071409a27f02af909432b54f82b2e8079c1d6c3cc5d NVIDIA-Linux-x86_64-1.0-9626-pkg2.run 10296145
+MD5 69ee44874b924742f1f3187f299355b2 NVIDIA-Linux-x86-1.0-9626-pkg0.run 6630792
+RMD160 5d1fbbbde5a5bc5331b1cf8900c69f0b65bb23d8 NVIDIA-Linux-x86-1.0-9626-pkg0.run 6630792
+SHA256 da92ca07761719d12a5b0eda428852f83ed7dd0cfd3f6a2aef44de8df09453ed NVIDIA-Linux-x86-1.0-9626-pkg0.run 6630792
+MD5 0525f05fb3df986f615ec53ff9f8af0f NVIDIA-Linux-x86_64-1.0-9626-pkg0.run 7449076
+RMD160 04c7bd9b232e3c7c12ddd213826236f113a2d247 NVIDIA-Linux-x86_64-1.0-9626-pkg0.run 7449076
+SHA256 4958d6bf5ba621894b72b54fcab00a8da98908a1dc04698147f0bcf055ae35e0 NVIDIA-Linux-x86_64-1.0-9626-pkg0.run 7449076
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
index 89676058faec..adb45166c0c1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild,v 1.7 2006/10/13 16:26:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild,v 1.8 2006/10/17 13:48:46 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
-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}"
@@ -13,8 +11,8 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
 
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 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 )
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg0.run )
 	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
@@ -67,10 +65,10 @@ QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
 export _POSIX2_VERSION="199209"
 
 if use x86; then
-	PKG_V="-${X86_PKG_V}"
+	PKG_V="-pkg0"
 	NV_PACKAGE="${X86_NV_PACKAGE}"
 elif use amd64; then
-	PKG_V="-${AMD64_PKG_V}"
+	PKG_V="-pkg0"
 	NV_PACKAGE="${AMD64_NV_PACKAGE}"
 elif use x86-fbsd; then
 	PKG_V=""
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
index 18a2e6e466ff..544e05063249 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.8 2006/10/13 16:26:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.9 2006/10/17 13:48:46 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
-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}"
@@ -13,8 +11,8 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
 
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 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 )
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg0.run )
 	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
@@ -66,10 +64,10 @@ QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
 export _POSIX2_VERSION="199209"
 
 if use x86; then
-	PKG_V="-${X86_PKG_V}"
+	PKG_V="-pkg0"
 	NV_PACKAGE="${X86_NV_PACKAGE}"
 elif use amd64; then
-	PKG_V="-${AMD64_PKG_V}"
+	PKG_V="-pkg0"
 	NV_PACKAGE="${AMD64_NV_PACKAGE}"
 elif use x86-fbsd; then
 	PKG_V=""
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild
index 8ef3eeb8b989..677edfbfd5e4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild,v 1.3 2006/10/17 00:29:52 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild,v 1.4 2006/10/17 13:48:46 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
-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}"
@@ -13,8 +11,8 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
 
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 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 )
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg0.run )
 	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
@@ -66,10 +64,10 @@ QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
 export _POSIX2_VERSION="199209"
 
 if use x86; then
-	PKG_V="-${X86_PKG_V}"
+	PKG_V="-pkg0"
 	NV_PACKAGE="${X86_NV_PACKAGE}"
 elif use amd64; then
-	PKG_V="-${AMD64_PKG_V}"
+	PKG_V="-pkg0"
 	NV_PACKAGE="${AMD64_NV_PACKAGE}"
 elif use x86-fbsd; then
 	PKG_V=""
@@ -113,7 +111,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/1.0.9625/NVIDIA-1.0.9625"
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}"
 
 	if ! use x86-fbsd; then
 		if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
@@ -145,8 +143,7 @@ src_unpack() {
 
 	if ! use x86-fbsd; then
 		# Zander kernel patches
-		# None yet.
-		# Zander i2c patch
+		# i2c patch
 		epatch ${NV_PATCH_PREFIX}-i2c.diff
 
 		# Quiet down warnings the user do not need to see