Update xinf file, used by sys-apps/kudzu and thus by system-config-display.

Package-Manager: portage-2.1.4_rc4

3 files changed, 31 insertions, 32 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 54557d512126..eb47a68ef1e9 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.64 2007/12/01 20:12:20 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.65 2007/12/01 20:13:54 dberkholz Exp $
+
+  01 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>; files/i810.xinf:
+  Update xinf file, used by sys-apps/kudzu and thus by system-config-display.
 
 *xf86-video-i810-2.2.0 (01 Dec 2007)
 
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index bab480935b52..453354223a45 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -13,10 +13,10 @@ AUX fix_965_xv.patch 909 RMD160 e58792c2d330c6880a90b8634a4c87dc6156ec17 SHA1 20
 MD5 ce3f0db6c5757f2a1190d02df4d56102 files/fix_965_xv.patch 909
 RMD160 e58792c2d330c6880a90b8634a4c87dc6156ec17 files/fix_965_xv.patch 909
 SHA256 18a3b8fd01e0e414b93f7259746dff216c8790cf27a6cc04acc3f9e71031f00c files/fix_965_xv.patch 909
-AUX i810.xinf 1502 RMD160 1d59f5670ab14e9a73faf3840ad13da1cc150c5b SHA1 91144515e2fe82c1e584158b5f1cbeb496ebe6f8 SHA256 7a8862d29326053cb9a0a71d88169383020989b0b08010e245bca3b726a1a902
-MD5 ed26577cb085f83a2c4723daf5b741f3 files/i810.xinf 1502
-RMD160 1d59f5670ab14e9a73faf3840ad13da1cc150c5b files/i810.xinf 1502
-SHA256 7a8862d29326053cb9a0a71d88169383020989b0b08010e245bca3b726a1a902 files/i810.xinf 1502
+AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
+MD5 a7f1da50867a369008e22efbbcc8b7db files/i810.xinf 1442
+RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 files/i810.xinf 1442
+SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347 files/i810.xinf 1442
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST x11-driver-patches-3.tar.bz2 404 RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff SHA1 ea479b7a3bc1400fad443801887f593d9eb11084 SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a
 DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
@@ -54,10 +54,10 @@ EBUILD xf86-video-i810-2.2.0.ebuild 1140 RMD160 30532b690fe1624268cd922d0a7b2e9c
 MD5 797cd40140b40235fd46fdc75d592494 xf86-video-i810-2.2.0.ebuild 1140
 RMD160 30532b690fe1624268cd922d0a7b2e9c928e9799 xf86-video-i810-2.2.0.ebuild 1140
 SHA256 0e89526773697fa97f3b759a08b01864e766202b4b75d8d86088ac50cbc0fd54 xf86-video-i810-2.2.0.ebuild 1140
-MISC ChangeLog 11961 RMD160 9f5d2ead3cd843bc9850f98c806152e88e1c35ee SHA1 b597818e7e666afd04cfc2a4ea4a949f68ff4823 SHA256 ed6a1fcaad5563c9a5aa8afd231d75154e0b9cbf11a6c0734ca7a56336f43c8d
-MD5 e6d7a14c1e0c8fe1e117d5fefb89fdcf ChangeLog 11961
-RMD160 9f5d2ead3cd843bc9850f98c806152e88e1c35ee ChangeLog 11961
-SHA256 ed6a1fcaad5563c9a5aa8afd231d75154e0b9cbf11a6c0734ca7a56336f43c8d ChangeLog 11961
+MISC ChangeLog 12112 RMD160 bd4791df113ba11f523da481b8862c4a712614a8 SHA1 ec6fad0125a9eb1e80714d2a3efe3f618dd8cfe7 SHA256 998f0cb000100b8961b14cd020ed619c70b38bf80438a06243748f46a7af1a71
+MD5 dc159998f9a297644960e9aecb0b387f ChangeLog 12112
+RMD160 bd4791df113ba11f523da481b8862c4a712614a8 ChangeLog 12112
+SHA256 998f0cb000100b8961b14cd020ed619c70b38bf80438a06243748f46a7af1a71 ChangeLog 12112
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -86,7 +86,7 @@ SHA256 5820877be3c0a8795f247d9a1ebb748de550e418e13157da607844c020bffc61 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHUcAuXVaO67S1rtsRAldQAKDYWPw9uTHBy41uxu4pvdhAK+dEcwCfee9a
-LOOlaInQksV8w7XB44uMpWU=
-=KING
+iD8DBQFHUcCHXVaO67S1rtsRAhKiAJ9Gy9z2EfHMe233M7ZCbpiIHM0aaACdFOy8
+TxC+AY0fi5GgknBF5fkV66M=
+=CBLX
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-i810/files/i810.xinf b/x11-drivers/xf86-video-i810/files/i810.xinf
index 5d414d82fbcd..ac5af9328344 100644
--- a/x11-drivers/xf86-video-i810/files/i810.xinf
+++ b/x11-drivers/xf86-video-i810/files/i810.xinf
@@ -1,27 +1,23 @@
-# kudzu effectively does latest match scanning; the list of aliases is built
-# via head insertion, but then scanned from head to tail, so later lines in
-# this file will win.
-#
-# Therefore, we whitelist devices over to the modesetting driver by listing
-# subdevice matches _after_ the general match.
-
-alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* i810	# i815
-alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* i810	# 845G
-alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810	# 865G
-alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* i810	# 915G
-# ajax's desktop
-alias pcivideo:v00008086d00002582sv00008086sd00004556bc*sc*i* intel
-alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* i810	# E7221G
+alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* intel	# i815
+alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* intel	# 845G
+alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* intel	# 865G
+alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* intel	# 915G
+alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* intel	# E7221G ("915G")
 alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* intel	# 915GM
-alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* i810	# 945G
+alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* intel	# 945G
 alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* intel	# 945GM
+alias pcivideo:v00008086d000027AEsv*sd*bc*sc*i* intel	# 945GME
 alias pcivideo:v00008086d00002972sv*sd*bc*sc*i* intel	# 946GZ, really a 965
 alias pcivideo:v00008086d00002982sv*sd*bc*sc*i* intel	# 965G1
 alias pcivideo:v00008086d00002992sv*sd*bc*sc*i* intel	# 965Q
 alias pcivideo:v00008086d000029A2sv*sd*bc*sc*i* intel	# 965G
+alias pcivideo:v00008086d000029B2sv*sd*bc*sc*i* intel	# Q35
+alias pcivideo:v00008086d000029C2sv*sd*bc*sc*i* intel	# G33
+alias pcivideo:v00008086d000029D2sv*sd*bc*sc*i* intel	# Q33
 alias pcivideo:v00008086d00002A02sv*sd*bc*sc*i* intel	# 965GM
-alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810	# i830
-alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* i810	# 855GM
-alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* i810	# i810
-alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* i810	# i810 DC100
-alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* i810	# i810E
+alias pcivideo:v00008086d00002A12sv*sd*bc*sc*i* intel	# 965GME
+alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* intel	# i830
+alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* intel	# 855GM
+alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* intel	# i810
+alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* intel	# i810 DC100
+alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* intel	# i810E