Added patches from the 2006.1 release to replace the nv driver with either vesa or fbdev.

Package-Manager: portage-2.1.1_rc1-r1

5 files changed, 68 insertions, 16 deletions

diff --git a/sys-apps/hwdata-gentoo/ChangeLog b/sys-apps/hwdata-gentoo/ChangeLog
index 75a548a1bfdf..79e877f0a634 100644
--- a/sys-apps/hwdata-gentoo/ChangeLog
+++ b/sys-apps/hwdata-gentoo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hwdata-gentoo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-gentoo/ChangeLog,v 1.11 2006/06/28 15:21:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-gentoo/ChangeLog,v 1.12 2006/09/01 23:09:44 wolf31o2 Exp $
+
+  01 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/0.3-nv-fbdev.patch, +files/0.3-nv-vesa.patch,
+  hwdata-gentoo-0.3.ebuild:
+  Added patches from the 2006.1 release to replace the nv driver with either
+  vesa or fbdev.
 
   28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   hwdata-gentoo-0.3.ebuild:
diff --git a/sys-apps/hwdata-gentoo/Manifest b/sys-apps/hwdata-gentoo/Manifest
index 27ae3b34333b..574f30a3c864 100644
--- a/sys-apps/hwdata-gentoo/Manifest
+++ b/sys-apps/hwdata-gentoo/Manifest
@@ -5,19 +5,27 @@ AUX 0.3-fglrx.patch 318 RMD160 0ff0d9a7803d333730a0e3bc9908b2bde9d25643 SHA1 147
 MD5 3a6455bb0b9416715363fceefed6191e files/0.3-fglrx.patch 318
 RMD160 0ff0d9a7803d333730a0e3bc9908b2bde9d25643 files/0.3-fglrx.patch 318
 SHA256 c9b34774337e3188789135652ed53a833d1f78e834379a61b63a454f27e90ae6 files/0.3-fglrx.patch 318
+AUX 0.3-nv-fbdev.patch 383 RMD160 98c528ee87f29469e0124eae204c7092fe2ffca9 SHA1 7948397ddc01108f266a9ac2550ff0248ddeefc8 SHA256 0fd9e862b75717de28db73ee681c113c64ff6134baba068ac340ee4ef14540d8
+MD5 05ac37e1106fc42943c25bdb504f647f files/0.3-nv-fbdev.patch 383
+RMD160 98c528ee87f29469e0124eae204c7092fe2ffca9 files/0.3-nv-fbdev.patch 383
+SHA256 0fd9e862b75717de28db73ee681c113c64ff6134baba068ac340ee4ef14540d8 files/0.3-nv-fbdev.patch 383
+AUX 0.3-nv-vesa.patch 381 RMD160 c01281981c93331c9cceed313135e32d53750eb9 SHA1 4bfe725f9deeab71eab1c8d26158f20155f1b4d5 SHA256 ec841415c547e045d5d5fc336bc1a02679de5766a28aa947e51549c4180f6946
+MD5 fdd559741e0983d607fb7a513354e99b files/0.3-nv-vesa.patch 381
+RMD160 c01281981c93331c9cceed313135e32d53750eb9 files/0.3-nv-vesa.patch 381
+SHA256 ec841415c547e045d5d5fc336bc1a02679de5766a28aa947e51549c4180f6946 files/0.3-nv-vesa.patch 381
 AUX 0.3-nvidia.patch 330 RMD160 6b680bf855b0a7c208eca3f5292a036c521e0b67 SHA1 5b97c951bd092b577253c6eb7fdfdba6cb8e248b SHA256 c08f86dadbf589cbb756bd45a506348d3d892aa5201cd15166675f9f24e0ffd3
 MD5 d5135ae6d833ddec37ff12bfde03aecc files/0.3-nvidia.patch 330
 RMD160 6b680bf855b0a7c208eca3f5292a036c521e0b67 files/0.3-nvidia.patch 330
 SHA256 c08f86dadbf589cbb756bd45a506348d3d892aa5201cd15166675f9f24e0ffd3 files/0.3-nvidia.patch 330
 DIST hwdata-gentoo-0.3.tar.bz2 145769 RMD160 ed214eb44eef4bbaa903adf099f77182d60e4a6f SHA1 84fa593e31b05fdf64f1eed600a91f4a957aeca1 SHA256 554934ec5b914c79e72c4874196e6d8a86294240a602785dc6563211a71fddad
-EBUILD hwdata-gentoo-0.3.ebuild 957 RMD160 a005f1519077756d45355a81baa785ec5ce52854 SHA1 bcdc00d61061da205b31641de509d7faa38179b5 SHA256 6dbc191c6cc9c1b932c658161924ae7ed0af420a2b1408e095df5070f6032601
-MD5 c35c66a29136faabe293c9d85a6c6732 hwdata-gentoo-0.3.ebuild 957
-RMD160 a005f1519077756d45355a81baa785ec5ce52854 hwdata-gentoo-0.3.ebuild 957
-SHA256 6dbc191c6cc9c1b932c658161924ae7ed0af420a2b1408e095df5070f6032601 hwdata-gentoo-0.3.ebuild 957
-MISC ChangeLog 2051 RMD160 40a40302eea940969d1a5d4815c8fed7cea9f742 SHA1 8479e0ddd3a9cc9e26d26c183b1525ddcd3a9c21 SHA256 a7a3147a2f18ead43469cf6c1e9085c681fe10d03c8d0e10f38aa683c5f9a669
-MD5 890d488e13b2609b7ac0cb627d06fc66 ChangeLog 2051
-RMD160 40a40302eea940969d1a5d4815c8fed7cea9f742 ChangeLog 2051
-SHA256 a7a3147a2f18ead43469cf6c1e9085c681fe10d03c8d0e10f38aa683c5f9a669 ChangeLog 2051
+EBUILD hwdata-gentoo-0.3.ebuild 1214 RMD160 87b62807f9a6f70f37593453c1e9c0a9fe22cf7c SHA1 affdcfeb2e13b86649f7e49dc96181bec7b9ee0a SHA256 cb7decf87ae98f91995eecb534ad07b6ee5fcdd5f0ed85537ed693fab797e2d6
+MD5 670a1c025958c3a2398f386fb40af8b8 hwdata-gentoo-0.3.ebuild 1214
+RMD160 87b62807f9a6f70f37593453c1e9c0a9fe22cf7c hwdata-gentoo-0.3.ebuild 1214
+SHA256 cb7decf87ae98f91995eecb534ad07b6ee5fcdd5f0ed85537ed693fab797e2d6 hwdata-gentoo-0.3.ebuild 1214
+MISC ChangeLog 2283 RMD160 77366ac63d114f343221f68855a63f0e8b05d788 SHA1 348fd09d32fc459f5c637aa20a4a5c7d86b46429 SHA256 4d728eeb86528eb390825419af73690d9bd7a52a29800826a75a335e8cf6bce3
+MD5 83c5521063b058579047052fc60b7f7a ChangeLog 2283
+RMD160 77366ac63d114f343221f68855a63f0e8b05d788 ChangeLog 2283
+SHA256 4d728eeb86528eb390825419af73690d9bd7a52a29800826a75a335e8cf6bce3 ChangeLog 2283
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
@@ -26,9 +34,9 @@ MD5 71c5d3da1f8e48b7a7884a9323866109 files/digest-hwdata-gentoo-0.3 256
 RMD160 a39dfbf8c76c70fc8430f2dab1ba175b8d18b76f files/digest-hwdata-gentoo-0.3 256
 SHA256 5981fa4df9273fcbf287693ce764926be6f4603acabe40988aecf31a4d1ce67b files/digest-hwdata-gentoo-0.3 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEop6ZkT4lNIS36YERAhlnAJwKesrfSEii83ZqueE8qOl0EcA7TACfduuU
-kdd+sTID3rdaoj5nERi86no=
-=D0gR
+iD8DBQFE+L3SkT4lNIS36YERAn4BAJ4/Hf3+5kjXEUl2+PMdQn6i/EuYNwCfU8NE
+le/QsjzPT8GyjPCnLSqT7Dc=
+=tlWX
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwdata-gentoo/files/0.3-nv-fbdev.patch b/sys-apps/hwdata-gentoo/files/0.3-nv-fbdev.patch
new file mode 100644
index 000000000000..4a0c7f08f844
--- /dev/null
+++ b/sys-apps/hwdata-gentoo/files/0.3-nv-fbdev.patch
@@ -0,0 +1,16 @@
+diff -urN hwdata-gentoo-0.3.orig/Cards hwdata-gentoo-0.3/Cards
+--- hwdata-gentoo-0.3.orig/Cards	2006-05-15 13:20:57.000000000 +0000
++++ hwdata-gentoo-0.3/Cards	2006-07-03 20:56:40.000000000 +0000
+@@ -322,10 +322,10 @@
+ DRIVER cyrix
+ 
+ NAME NVIDIA Legacy
+-DRIVER nv
++DRIVER fbdev
+ 
+ NAME NVIDIA GeForce
+-DRIVER nv
++DRIVER fbdev
+ 
+ NAME NVIDIA GeForce 256 (generic)
+ SEE NVIDIA Legacy
diff --git a/sys-apps/hwdata-gentoo/files/0.3-nv-vesa.patch b/sys-apps/hwdata-gentoo/files/0.3-nv-vesa.patch
new file mode 100644
index 000000000000..a473c7d2d2a8
--- /dev/null
+++ b/sys-apps/hwdata-gentoo/files/0.3-nv-vesa.patch
@@ -0,0 +1,16 @@
+diff -urN hwdata-gentoo-0.3.orig/Cards hwdata-gentoo-0.3/Cards
+--- hwdata-gentoo-0.3.orig/Cards	2006-05-15 13:20:57.000000000 +0000
++++ hwdata-gentoo-0.3/Cards	2006-07-03 20:56:40.000000000 +0000
+@@ -322,10 +322,10 @@
+ DRIVER cyrix
+ 
+ NAME NVIDIA Legacy
+-DRIVER nv
++DRIVER vesa
+ 
+ NAME NVIDIA GeForce
+-DRIVER nv
++DRIVER vesa
+ 
+ NAME NVIDIA GeForce 256 (generic)
+ SEE NVIDIA Legacy
diff --git a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild
index aa65b2eba176..61b09d63572f 100644
--- a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild
+++ b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild,v 1.2 2006/06/28 15:21:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild,v 1.3 2006/09/01 23:09:44 wolf31o2 Exp $
 
 inherit eutils
 
@@ -23,9 +23,15 @@ src_unpack() {
 	then
 		if use opengl && use binary-drivers
 		then
-			epatch ${FILESDIR}/${PV}-fglrx.patch || die "patching for ATI"
-			epatch ${FILESDIR}/${PV}-nvidia.patch || die "patching for nVidia"
+			epatch "${FILESDIR}"/${PV}-fglrx.patch || die "patching for ATI"
+			epatch "${FILESDIR}"/${PV}-nvidia.patch || die "patching for nVidia"
+		else
+			# On amd64/x86, we choose VESA over fbdev
+			epatch "${FILESDIR}"/${PV}-nv-vesa.patch || die "patching vesa"
 		fi
+	else
+		# The "nv" driver sucks so much, we choose fbdev, instead
+		epatch "${FILESDIR}"/${PV}-nv-fbdev.patch || die "patching fbdev"
 	fi
 }