Added a patch to enable support for detection of ati and nvidia binary drivers if both livecd and opengl in USE.

4 files changed, 211 insertions, 7 deletions

diff --git a/sys-apps/hwdata-knoppix/ChangeLog b/sys-apps/hwdata-knoppix/ChangeLog
index 6037e683d9c3..dabd58e18bf5 100644
--- a/sys-apps/hwdata-knoppix/ChangeLog
+++ b/sys-apps/hwdata-knoppix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hwdata-knoppix
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/ChangeLog,v 1.12 2004/06/24 22:10:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/ChangeLog,v 1.13 2004/06/30 17:46:08 wolf31o2 Exp $
+
+  30 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/hwdata-knoppix-0.107-binary_drivers.patch,
+  hwdata-knoppix-0.107.ebuild:
+  Added a patch to enable support for detection of ati and nvidia binary drivers
+  if both livecd and opengl in USE.
 
   02 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   hwdata-knoppix-0.107.ebuild:
diff --git a/sys-apps/hwdata-knoppix/Manifest b/sys-apps/hwdata-knoppix/Manifest
index 3ff1eca50cdf..d93649c69db6 100644
--- a/sys-apps/hwdata-knoppix/Manifest
+++ b/sys-apps/hwdata-knoppix/Manifest
@@ -1,8 +1,9 @@
-MD5 47bc79b56cc42bc959e49f06ce0f55fe ChangeLog 1427
-MD5 7e677d13b12a53575087d086aab362f6 hwdata-knoppix-0.107.ebuild 861
+MD5 363f03bb73468602dcfc8b64daacc20b hwdata-knoppix-0.107.ebuild 949
 MD5 524219b74e6a96dd5c2380fbbf1b2e8b hwdata-knoppix-0.8.ebuild 648
-MD5 1ca5f9c0d7f52d41a8ee09112ed33359 hwdata-knoppix-0.95.ebuild 839
+MD5 598219dee41ff774a4c423b07628b028 ChangeLog 1682
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
+MD5 1ca5f9c0d7f52d41a8ee09112ed33359 hwdata-knoppix-0.95.ebuild 839
 MD5 1dcf14de4ed419348ede294770ccf895 files/digest-hwdata-knoppix-0.107 74
-MD5 f56c8e23d08e21a9eabb55e837b522ee files/digest-hwdata-knoppix-0.8 72
 MD5 c7b9750e303a453935f35d4d7e84c47a files/digest-hwdata-knoppix-0.95 73
+MD5 66b28b078d17b41b283267375957ec8f files/hwdata-knoppix-0.107-binary_drivers.patch 3363
+MD5 f56c8e23d08e21a9eabb55e837b522ee files/digest-hwdata-knoppix-0.8 72
diff --git a/sys-apps/hwdata-knoppix/files/hwdata-knoppix-0.107-binary_drivers.patch b/sys-apps/hwdata-knoppix/files/hwdata-knoppix-0.107-binary_drivers.patch
new file mode 100644
index 000000000000..5435084bd1ea
--- /dev/null
+++ b/sys-apps/hwdata-knoppix/files/hwdata-knoppix-0.107-binary_drivers.patch
@@ -0,0 +1,196 @@
+diff -urN hwdata-knoppix-0.107.orig/Cards hwdata-knoppix-0.107/Cards
+--- hwdata-knoppix-0.107.orig/Cards	2004-06-30 12:15:04.821517568 -0400
++++ hwdata-knoppix-0.107/Cards	2004-06-30 12:15:13.090260528 -0400
+@@ -1995,103 +1995,89 @@
+ 
+ NAME ATI Radeon 8500LE
+ CHIPSET R200
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI FireGL 8700
+ CHIPSET R200
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI FireGL 8800
+ CHIPSET R200
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9000
+ CHIPSET R250
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9000 Pro
+ CHIPSET R250
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9100
+ CHIPSET R250
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI Radeon Mobility M9
+ CHIPSET R250
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9200
+ CHIPSET R250
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9200SE
+ CHIPSET R250
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9500
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9500 Pro
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9600
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9600 Pro
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9700
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9700 Pro
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9800
+ CHIPSET R350
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI Radeon 9800 Pro
+ CHIPSET R350
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI FireGL Z1/X1
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI FireGL X1
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ NAME ATI FireGL Z1
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ # No idea if this works or not.  I'm adding it here pointing to the vesa driver
+ # for now (mharris Feb 10, 2002 - XFree86 4.2.99.901)
+ NAME ATI Radeon Mobility U1
+ CHIPSET R300
+-DRIVER radeon
+-LINE #Option "nodri"
++DRIVER fglrx
+ 
+ 
+ 
+@@ -3068,7 +3054,7 @@
+ 
+ NAME NVIDIA GeForce
+ CHIPSET GeForce
+-DRIVER nv
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ NAME ELSA VICTORY ERAZOR
+@@ -3169,17 +3155,17 @@
+ 
+ NAME NVIDIA GeForce 256 (generic)
+ CHIPSET GeForce 256
+-DRIVER nv
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ NAME NVIDIA GeForce DDR (generic)
+ CHIPSET GeForce DDR
+-DRIVER nv
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ NAME NVIDIA GeForce 2 (generic)
+ CHIPSET GeForce 2
+-DRIVER nv
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ NAME NVIDIA GeForce 2 MX (generic)
+@@ -3195,14 +3181,14 @@
+ 
+ NAME NVIDIA GeForce 3 (generic)
+ CHIPSET GeForce 3
+-DRIVER nv
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ # 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
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ NAME NVIDIA GeForce 4 MX (generic)
+@@ -3210,17 +3196,17 @@
+ 
+ NAME NVIDIA Quadro 4 (generic)
+ CHIPSET Quadro 4
+-DRIVER nv
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ NAME NVIDIA GeForce FX (generic)
+ CHIPSET GeForce FX
+-DRIVER nv
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ NAME NVIDIA Quadro FX (generic)
+ CHIPSET Quadro FX
+-DRIVER nv
++DRIVER nvidia
+ NOCLOCKPROBE
+ 
+ #########################################################################
diff --git a/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107.ebuild b/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107.ebuild
index e9217e0dcc27..35b3b6cfe7a1 100644
--- a/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107.ebuild
+++ b/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107.ebuild,v 1.6 2004/06/25 23:47:21 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107.ebuild,v 1.7 2004/06/30 17:46:08 wolf31o2 Exp $
 
 MY_PV=${PV}-4
 DESCRIPTION="Data for the hwsetup program"
 SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
 HOMEPAGE="http://www.knopper.net"
 
-IUSE=""
+IUSE="opengl livecd"
 KEYWORDS="x86 ~ppc amd64 ~alpha"
 SLOT="0"
 LICENSE="GPL-2"
@@ -17,6 +17,7 @@ RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
+	use livecd && use opengl && epatch ${FILESDIR}/${P}-binary_drivers.patch
 }
 
 src_install() {