Removing sys-apps/hwdata as it is superceded by sys-apps/hwdata-gentoo.

7 files changed, 0 insertions, 912 deletions

diff --git a/sys-apps/hwdata/ChangeLog b/sys-apps/hwdata/ChangeLog
deleted file mode 100644
index a06743e58274..000000000000
--- a/sys-apps/hwdata/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-# ChangeLog for sys-apps/hwdata
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata/ChangeLog,v 1.3 2006/07/27 14:51:14 wolf31o2 Exp $
-
-  27 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> hwdata-0.158.ebuild:
-  Removed blocker on hwdata-knoppix, since it is no longer in the tree.
-
-  18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwdata-0.158.ebuild:
-  Added hwdata-gentoo to blocks.
-
-*hwdata-0.158 (16 Nov 2005)
-
-  16 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  +files/hwdata-0.158-binary_drivers.patch,
-  +files/hwdata-0.158-binary_drivers_nv.patch, +metadata.xml,
-  +hwdata-0.158.ebuild:
-  Initial import. Ebuild by me. Since this is just a copy from hwdata-knoppix,
-  I kept the same KEYWORDS, after changing arch to ~arch on each.
-
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
deleted file mode 100644
index 7bd0cff4a006..000000000000
--- a/sys-apps/hwdata/Manifest
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX hwdata-0.158-binary_drivers.patch 9034 RMD160 f26442d90f5394fd578ea71ea7085040af775480 SHA1 8b536dc32d6cc52eb6a95513814e16ebf3f6c169 SHA256 6ab359a92d1a46dedecf5de1e4c6922fd82095f0279f15f2eacf744ddc047ffa
-MD5 28a290336b6b759c4ca8a49bfc3e5041 files/hwdata-0.158-binary_drivers.patch 9034
-RMD160 f26442d90f5394fd578ea71ea7085040af775480 files/hwdata-0.158-binary_drivers.patch 9034
-SHA256 6ab359a92d1a46dedecf5de1e4c6922fd82095f0279f15f2eacf744ddc047ffa files/hwdata-0.158-binary_drivers.patch 9034
-AUX hwdata-0.158-binary_drivers_nv.patch 5373 RMD160 fe915c49e0f1c0895e99ed3c40fc8587485859fe SHA1 7627cf3e055d3d0aefb78f90eb79d1b6e39fadcf SHA256 e911e559e38ac94d7ab90a3ac56fa407f72f92d1dd756adf46804c78cc1741e4
-MD5 726ef26b52edda1de1f70a62a06ecc4e files/hwdata-0.158-binary_drivers_nv.patch 5373
-RMD160 fe915c49e0f1c0895e99ed3c40fc8587485859fe files/hwdata-0.158-binary_drivers_nv.patch 5373
-SHA256 e911e559e38ac94d7ab90a3ac56fa407f72f92d1dd756adf46804c78cc1741e4 files/hwdata-0.158-binary_drivers_nv.patch 5373
-DIST hwdata-0.158.tar.gz 253972
-EBUILD hwdata-0.158.ebuild 917 RMD160 4ee581c0a9cd5637c7027ca75eb2cd566b13b728 SHA1 22249a7d7a19e35f05e1413eaf618762a7069064 SHA256 7d372f11bf1927893b6d6084c2ade0144bf5b69bdc8b09fc1d9f768729019877
-MD5 db03e9154d773d55c8b7b3a9f6c775a1 hwdata-0.158.ebuild 917
-RMD160 4ee581c0a9cd5637c7027ca75eb2cd566b13b728 hwdata-0.158.ebuild 917
-SHA256 7d372f11bf1927893b6d6084c2ade0144bf5b69bdc8b09fc1d9f768729019877 hwdata-0.158.ebuild 917
-MISC ChangeLog 821 RMD160 1ae30ba066a24f42086b23195e229818b9ff1917 SHA1 d83e16d23b73bb650706590d2c8a298f0d40725d SHA256 471b29ce9e94d5f99767727f3d67f17bcccb697f6967426b7ef55e2d296087b2
-MD5 f6b3b3b029577974581675052b87ddae ChangeLog 821
-RMD160 1ae30ba066a24f42086b23195e229818b9ff1917 ChangeLog 821
-SHA256 471b29ce9e94d5f99767727f3d67f17bcccb697f6967426b7ef55e2d296087b2 ChangeLog 821
-MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
-MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
-SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d metadata.xml 159
-MD5 6fcd4828ae6c07d30757de89a8c23d98 files/digest-hwdata-0.158 64
-RMD160 1fbaf0b17b00db0eda974f172d9f31544e622c91 files/digest-hwdata-0.158 64
-SHA256 0d692f0d21dc34486798f51ba3f4692da549e0795a803dcdaf2268eca4d4c2ef files/digest-hwdata-0.158 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEyNLwkT4lNIS36YERAk24AKC0nMTsYGzRtukcbt9QoNdOvjzRVACdFQVz
-MIBaxfX9x5wlY2yavGMRjRc=
-=+hpw
------END PGP SIGNATURE-----
diff --git a/sys-apps/hwdata/files/digest-hwdata-0.158 b/sys-apps/hwdata/files/digest-hwdata-0.158
deleted file mode 100644
index bcbf3308b601..000000000000
--- a/sys-apps/hwdata/files/digest-hwdata-0.158
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b57ec242f13cd74c85bb6cdc87da962c hwdata-0.158.tar.gz 253972
diff --git a/sys-apps/hwdata/files/hwdata-0.158-binary_drivers.patch b/sys-apps/hwdata/files/hwdata-0.158-binary_drivers.patch
deleted file mode 100644
index c3261a630317..000000000000
--- a/sys-apps/hwdata/files/hwdata-0.158-binary_drivers.patch
+++ /dev/null
@@ -1,520 +0,0 @@
-diff -urN hwdata-0.158.orig/Cards hwdata-0.158/Cards
---- hwdata-0.158.orig/Cards	2005-04-10 21:40:42.000000000 -0400
-+++ hwdata-0.158/Cards	2005-11-16 09:32:09.000000000 -0500
-@@ -2014,130 +2014,89 @@
- CHIPSET RV200
- DRIVER radeon
- 
-+NAME ATI Radeon (fglrx)
-+DRIVER fglrx
-+
- NAME ATI Radeon 8500
--CHIPSET R200
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 8500LE
--CHIPSET R200
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL 8700
--CHIPSET R200
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL 8800
--CHIPSET R200
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9000
--CHIPSET R250
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9000 Pro
--CHIPSET R250
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9100
--CHIPSET R250
--DRIVER radeon
-+SEE ATI Radeon R250 (fglrx)
- 
- NAME ATI Radeon Mobility M9
--CHIPSET R250
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9200
--CHIPSET R250
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9200SE
--CHIPSET R250
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9500
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9500 Pro
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9600
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9600 Pro
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon Mobility 9600 M10
--CHIPSET RV350
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9700
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9700 Pro
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9800
--CHIPSET R350
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9800 Pro
--CHIPSET R350
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 9800 XT
--CHIPSET R350
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL Z1/X1
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL X1
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL X2
--CHIPSET RV350
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL Z1
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL T2
--CHIPSET RV350
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL Mobility T2
--CHIPSET RV350
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon Mobility U1
--CHIPSET R300
--DRIVER radeon
--LINE #Option "nodri"
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI FireGL D1100
- DRIVER radeon
-@@ -2167,7 +2126,7 @@
- DRIVER radeon
- 
- NAME ATI FireGL X3
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon 7000 IGP
- DRIVER radeon
-@@ -2197,37 +2156,37 @@
- DRIVER radeon
- 
- NAME ATI Radeon Mobility 9200
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon Mobility 9200 IGP
- DRIVER radeon
- 
- NAME ATI Radeon Mobility 9800
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon Mobility M300
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon Mobility X600
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon X800LE
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon X800PRO
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon X800SE
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon X300
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon X600
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- NAME ATI Radeon X800XT
--DRIVER radeon
-+SEE ATI Radeon (fglrx)
- 
- ######################################################################
- NAME ATI Rage Fury Pro AGP
-@@ -3191,30 +3150,25 @@
- DRIVER nv
- NOCLOCKPROBE
- 
--NAME RIVA TNT
--CHIPSET RIVATNT
--DRIVER nv
-+NAME NVIDIA (nvidia)
-+DRIVER nvidia
- NOCLOCKPROBE
- 
-+NAME RIVA TNT
-+SEE NVIDIA (nvidia)
-+
- NAME RIVA TNT2
--CHIPSET RIVATNT2
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- # mharris - Nov 23, 2002 - Commented out the swcursor option, if it is still
- # needed, then lets disable it right in the driver completely, or possibly
- # fix it.
- # swcursor added to default configuration for bug #22173
- NAME RIVA Ultra TNT2 
--CHIPSET RIVA ULTRA TNT2 
--DRIVER nv
--LINE #Option "swcursor"
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce
--CHIPSET GeForce
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME ELSA VICTORY ERAZOR
- SEE RIVA128
-@@ -3226,19 +3180,19 @@
- SEE RIVA128
- 
- NAME ELSA ERAZOR II
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME ELSA ERAZOR III
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME ELSA Synergy II
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Leadtek WinFast 3D S320II
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Leadtek WinFast 3D S320
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME Leadtek WinFast 3D S3500
- SEE RIVA128
-@@ -3247,13 +3201,13 @@
- SEE RIVA128
- 
- NAME Diamond Viper 550
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME Diamond Viper 770
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME AOpen PS3010
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME STB Velocity 128
- SEE RIVA128
-@@ -3268,173 +3222,138 @@
- SEE RIVA128
- 
- NAME Chaintech Desperado RI30
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME Chaintech Desperado RI40/41
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Chaintech Desperado RI50
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Chaintech Desperado RI60
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Graphics Blaster TNT
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME Creative Graphics Blaster TNT2
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Hercules Dynamite TNT
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME MELCO WGA-TS 
--SEE RIVA TNT2 
-+SEE NVIDIA (nvidia)
- 
- NAME Canopus SPECTRA 3200R2 
--SEE RIVA TNT 
-+SEE NVIDIA (nvidia)
- 
- NAME Canopus SPECTRA 5400 
--SEE RIVA TNT2 
-+SEE NVIDIA (nvidia)
- 
- NAME Canopus SPECTRA 5400 Premium Edition 
--SEE RIVA Ultra TNT2 
-+SEE NVIDIA (nvidia)
- 
- NAME Guillemot Maxi Gamer Xentor 32
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Riva 128 (generic)
- SEE RIVA128
- 
- NAME NVIDIA Riva TNT (generic)
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Riva TNT2 (generic)
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 256 (generic)
--CHIPSET GeForce 256
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce DDR (generic)
--CHIPSET GeForce DDR
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 2 (generic)
--CHIPSET GeForce 2
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 2 MX (generic)
--SEE NVIDIA GeForce 2 (generic)
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 2 GTS (generic)
--SEE NVIDIA GeForce 2 (generic)
-+SEE NVIDIA (nvidia)
- 
--# Supported in XFree86 4.3.0
--# UNSUPPORTED by XFree86 4.2.1 and earlier
- NAME nVidia GeForce 2 Go
--SEE NVIDIA GeForce 2 (generic)
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 3 (generic)
--CHIPSET GeForce 3
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- # mharris - Nov 23, 2002 - enabling "nv" driver for GeForce 4 and Quadro 4 as
- # CVS XFree86 support them now in 4.2.99.2
- NAME NVIDIA GeForce 4 (generic)
--CHIPSET GeForce 4
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 4 MX (generic)
--SEE NVIDIA GeForce 4 (generic)
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro 4 (generic)
--CHIPSET Quadro 4
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce FX (generic)
--CHIPSET GeForce FX
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX (generic)
--CHIPSET Quadro FX
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6200
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6600
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6600 GT
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6610 XL
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6800
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6800 GT
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6800 LE
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6800 Ultra
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce FX 5100
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce FX 5500
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce Go 6600
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce Go 6600 TE/6200 TE
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
--NAME NVIDIA GeForce4 448 Go
--DRIVER nv
--NOCLOCKPROBE
-+NAME NVIDIA GeForce4 440 Go
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX 4000
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX 4400
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX 540
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX 700
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro NVS 50 PCI
- DRIVER nv
diff --git a/sys-apps/hwdata/files/hwdata-0.158-binary_drivers_nv.patch b/sys-apps/hwdata/files/hwdata-0.158-binary_drivers_nv.patch
deleted file mode 100644
index 305f3dd55127..000000000000
--- a/sys-apps/hwdata/files/hwdata-0.158-binary_drivers_nv.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-diff -urN hwdata-0.158.orig/Cards hwdata-0.158/Cards
---- hwdata-0.158.orig/Cards	2005-04-10 21:40:42.000000000 -0400
-+++ hwdata-0.158/Cards	2005-11-16 09:32:09.000000000 -0500
-@@ -3191,30 +3150,25 @@
- DRIVER nv
- NOCLOCKPROBE
- 
--NAME RIVA TNT
--CHIPSET RIVATNT
--DRIVER nv
-+NAME NVIDIA (nvidia)
-+DRIVER nvidia
- NOCLOCKPROBE
- 
-+NAME RIVA TNT
-+SEE NVIDIA (nvidia)
-+
- NAME RIVA TNT2
--CHIPSET RIVATNT2
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- # mharris - Nov 23, 2002 - Commented out the swcursor option, if it is still
- # needed, then lets disable it right in the driver completely, or possibly
- # fix it.
- # swcursor added to default configuration for bug #22173
- NAME RIVA Ultra TNT2 
--CHIPSET RIVA ULTRA TNT2 
--DRIVER nv
--LINE #Option "swcursor"
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce
--CHIPSET GeForce
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME ELSA VICTORY ERAZOR
- SEE RIVA128
-@@ -3226,19 +3180,19 @@
- SEE RIVA128
- 
- NAME ELSA ERAZOR II
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME ELSA ERAZOR III
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME ELSA Synergy II
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Leadtek WinFast 3D S320II
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Leadtek WinFast 3D S320
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME Leadtek WinFast 3D S3500
- SEE RIVA128
-@@ -3247,13 +3201,13 @@
- SEE RIVA128
- 
- NAME Diamond Viper 550
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME Diamond Viper 770
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME AOpen PS3010
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME STB Velocity 128
- SEE RIVA128
-@@ -3268,173 +3222,138 @@
- SEE RIVA128
- 
- NAME Chaintech Desperado RI30
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME Chaintech Desperado RI40/41
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Chaintech Desperado RI50
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Chaintech Desperado RI60
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Graphics Blaster TNT
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME Creative Graphics Blaster TNT2
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME Hercules Dynamite TNT
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME MELCO WGA-TS 
--SEE RIVA TNT2 
-+SEE NVIDIA (nvidia)
- 
- NAME Canopus SPECTRA 3200R2 
--SEE RIVA TNT 
-+SEE NVIDIA (nvidia)
- 
- NAME Canopus SPECTRA 5400 
--SEE RIVA TNT2 
-+SEE NVIDIA (nvidia)
- 
- NAME Canopus SPECTRA 5400 Premium Edition 
--SEE RIVA Ultra TNT2 
-+SEE NVIDIA (nvidia)
- 
- NAME Guillemot Maxi Gamer Xentor 32
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Riva 128 (generic)
- SEE RIVA128
- 
- NAME NVIDIA Riva TNT (generic)
--SEE RIVA TNT
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Riva TNT2 (generic)
--SEE RIVA TNT2
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 256 (generic)
--CHIPSET GeForce 256
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce DDR (generic)
--CHIPSET GeForce DDR
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 2 (generic)
--CHIPSET GeForce 2
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 2 MX (generic)
--SEE NVIDIA GeForce 2 (generic)
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 2 GTS (generic)
--SEE NVIDIA GeForce 2 (generic)
-+SEE NVIDIA (nvidia)
- 
--# Supported in XFree86 4.3.0
--# UNSUPPORTED by XFree86 4.2.1 and earlier
- NAME nVidia GeForce 2 Go
--SEE NVIDIA GeForce 2 (generic)
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 3 (generic)
--CHIPSET GeForce 3
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- # mharris - Nov 23, 2002 - enabling "nv" driver for GeForce 4 and Quadro 4 as
- # CVS XFree86 support them now in 4.2.99.2
- NAME NVIDIA GeForce 4 (generic)
--CHIPSET GeForce 4
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 4 MX (generic)
--SEE NVIDIA GeForce 4 (generic)
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro 4 (generic)
--CHIPSET Quadro 4
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce FX (generic)
--CHIPSET GeForce FX
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX (generic)
--CHIPSET Quadro FX
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6200
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6600
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6600 GT
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6610 XL
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6800
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6800 GT
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6800 LE
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce 6800 Ultra
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce FX 5100
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce FX 5500
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce Go 6600
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA GeForce Go 6600 TE/6200 TE
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
--NAME NVIDIA GeForce4 448 Go
--DRIVER nv
--NOCLOCKPROBE
-+NAME NVIDIA GeForce4 440 Go
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX 4000
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX 4400
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX 540
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro FX 700
--DRIVER nv
--NOCLOCKPROBE
-+SEE NVIDIA (nvidia)
- 
- NAME NVIDIA Quadro NVS 50 PCI
- DRIVER nv
diff --git a/sys-apps/hwdata/hwdata-0.158.ebuild b/sys-apps/hwdata/hwdata-0.158.ebuild
deleted file mode 100644
index c73c9081391e..000000000000
--- a/sys-apps/hwdata/hwdata-0.158.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata/hwdata-0.158.ebuild,v 1.3 2006/07/27 14:51:14 wolf31o2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Hardware information used by hwsetup and other utilities"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	http://dev.gentoo.org/~wolf31o2/sources/hwdata/${P}.tar.gz"
-HOMEPAGE="http://www.knopper.net"
-
-IUSE="livecd opengl"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="!sys-apps/hwdata-gentoo"
-
-src_unpack() {
-	unpack ${A}
-	use x86 && use livecd && use opengl && \
-		epatch ${FILESDIR}/${P}-binary_drivers.patch
-	use amd64 && use livecd && use opengl && \
-		epatch ${FILESDIR}/${P}-binary_drivers_nv.patch
-}
-
-src_install() {
-	insinto /usr/share/hwdata
-	doins CardMonitorCombos Cards MonitorsDB pcitable upgradelist usb.ids \
-	pci.ids
-}
diff --git a/sys-apps/hwdata/metadata.xml b/sys-apps/hwdata/metadata.xml
deleted file mode 100644
index 88653ddd7172..000000000000
--- a/sys-apps/hwdata/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>livecd</herd>
-</pkgmetadata>