Removing use of nv-disable-preempt-on-smp_processor_id-2.patch, reverting to old version, see bug #74950

3 files changed, 25 insertions, 30 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 7c9385af8b26..6b80c0bfa4f5 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2004/12/19 15:52:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.105 2004/12/21 00:59:42 cyfred Exp $
+
+  21 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-kernel-1.0.6629-r1.ebuild:
+  Removing use of nv-disable-preempt-on-smp_processor_id-2.patch, reverting to
+  old version, see bug #74950
 
 *nvidia-kernel-1.0.6629-r1 (19 Dec 2004)
 
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index c02cfdb71441..7154e9a1fab6 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,40 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 1ec80ecb4a67000d810ca3e0c4e6852b ChangeLog 27497
+MD5 c84a79e7d9b69a204003fb8c2dbaad01 metadata.xml 297
 MD5 9e3d151cbb86b10e80feb4e57caf8a51 nvidia-kernel-1.0.6629.ebuild 4640
 MD5 6ec1ac8788c77524bd37df3829654c7f nvidia-kernel-1.0.6111-r3.ebuild 4487
-MD5 569ee75d8103a0ab1f4a74681091b7a2 nvidia-kernel-1.0.6629-r1.ebuild 4689
-MD5 77f158f165dbe31babc7fcfe13ed8307 ChangeLog 27302
-MD5 c84a79e7d9b69a204003fb8c2dbaad01 metadata.xml 297
+MD5 204cc3fe485c11ad7b1709925a11ff3b nvidia-kernel-1.0.6629-r1.ebuild 4687
+MD5 d8fcf2021aa68584d4a4d9e96b671da0 files/nvidia 501
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629 163
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111-r3 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629-r1 163
-MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629 163
-MD5 d8fcf2021aa68584d4a4d9e96b671da0 files/nvidia 501
 MD5 762e6f6e16aa6dd5b2469e99fe8decd3 files/1.0.6111/nv-pci_find_class.patch 2903
+MD5 c2b155f40d7b904f07550e8e326969c2 files/1.0.6111/nv-remap-range.patch 5715
+MD5 29eafcaf7ab5d59dd90d3d3243bf57c3 files/1.0.6111/nv_enable_pci.patch 3640
+MD5 5177339888e44bb5f4b6124fa5830e7f files/1.0.6111/vmalloc-reserve.patch 542
 MD5 b5b7f947ffb9e6c19f7457ff7c14d0db files/1.0.6111/conftest_koutput_includes.patch 1082
 MD5 14924b09123b075f910c73316baff848 files/1.0.6111/power-suspend-2.6.9-changes.patch 856
-MD5 5177339888e44bb5f4b6124fa5830e7f files/1.0.6111/vmalloc-reserve.patch 542
-MD5 29eafcaf7ab5d59dd90d3d3243bf57c3 files/1.0.6111/nv_enable_pci.patch 3640
-MD5 c2b155f40d7b904f07550e8e326969c2 files/1.0.6111/nv-remap-range.patch 5715
+MD5 e70739410861defb6bf3d40f2706d554 files/1.0.6629/nv-pgd_offset.patch 3139
+MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/nv-pgprot-speedup.patch 1518
+MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch 1518
 MD5 ddeae194df6bb2112d7de723df8d84c2 files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch 18398
-MD5 64d76075a90dedc83f1dc971389c910e files/1.0.6629/nv-shutup-warnings.patch 712
+MD5 5a17c3fa427b4d0ff8e38f82e57cd817 files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch 9417
 MD5 ada7d22def202e56c01c1e72c8000d45 files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch 581
-MD5 c3d0a0f59fa6b06a5ee139fb01858287 files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch 542
+MD5 f1a5a01593ef996b38fe70bc93fa7440 files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch 2160
+MD5 e7162316266722bc8550ecbc2c63023e files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch 1615
 MD5 dbf80a2cbaf69a10521429e1b2a7e10c files/1.0.6629/conftest_koutput_includes.patch 1082
 MD5 5aef5c6a394896bbb8392816f6795147 files/1.0.6629/nv-amd64-shutup-warnings.patch 902
-MD5 e7162316266722bc8550ecbc2c63023e files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch 1615
-MD5 ddeae194df6bb2112d7de723df8d84c2 files/1.0.6629/nv-fix-memory-limit.patch 18398
-MD5 5a17c3fa427b4d0ff8e38f82e57cd817 files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch 9417
-MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/nv-pgprot-speedup.patch 1518
-MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch 1518
+MD5 c3d0a0f59fa6b06a5ee139fb01858287 files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch 542
 MD5 16125c4aba9dbfb3fa527c1620b0954f files/1.0.6629/nv-disable-preempt-on-smp_processor_id-2.patch 644
-MD5 e70739410861defb6bf3d40f2706d554 files/1.0.6629/nv-pgd_offset.patch 3139
-MD5 f1a5a01593ef996b38fe70bc93fa7440 files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch 2160
+MD5 ddeae194df6bb2112d7de723df8d84c2 files/1.0.6629/nv-fix-memory-limit.patch 18398
+MD5 64d76075a90dedc83f1dc971389c910e files/1.0.6629/nv-shutup-warnings.patch 712
 MD5 7c9db721d244f6ca709e2b8003ce4e0d files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch 677
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBxcQXI1lqEGTUzyQRApSGAKCfdNjdeAWMuGMefgAbknIJTy6bQgCeIRTi
-92dAMisDtN0OgszghY9o0OY=
-=KGPU
------END PGP SIGNATURE-----
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r1.ebuild
index 1f4c9b168cc8..f9d2b8414b64 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-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.6629-r1.ebuild,v 1.2 2004/12/19 18:10:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r1.ebuild,v 1.3 2004/12/21 00:59:42 cyfred Exp $
 
 inherit eutils linux-mod
 
@@ -108,7 +108,7 @@ src_unpack() {
 		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
 		epatch ${FILESDIR}/${PV}/conftest_koutput_includes.patch
 		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${FILESDIR}/${PV}/nv-disable-preempt-on-smp_processor_id-2.patch
+		epatch ${FILESDIR}/${PV}/nv-disable-preempt-on-smp_processor_id.patch
 	fi
 
 	# if you set this then it's your own fault when stuff breaks :)