Version bump to 0.3 and making patches version specific.

(Portage version: 2.1_rc2-r1)

8 files changed, 104 insertions, 11 deletions

diff --git a/sys-apps/hwdata-gentoo/ChangeLog b/sys-apps/hwdata-gentoo/ChangeLog
index 67c693345279..5867ecb84993 100644
--- a/sys-apps/hwdata-gentoo/ChangeLog
+++ b/sys-apps/hwdata-gentoo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.8 2006/02/08 23:05:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-gentoo/ChangeLog,v 1.9 2006/05/23 22:16:29 wolf31o2 Exp $
+
+*hwdata-gentoo-0.3 (23 May 2006)
+
+  23 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/0.2-fglrx.patch, +files/0.3-fglrx.patch, +files/0.2-nvidia.patch,
+  +files/0.3-nvidia.patch, -files/fglrx.patch, -files/nvidia.patch,
+  hwdata-gentoo-0.2.ebuild, +hwdata-gentoo-0.3.ebuild:
+  Version bump to 0.3 and making patches version specific.
 
   08 Feb 2006; Aron Griffis <agriffis@gentoo.org> hwdata-gentoo-0.2.ebuild:
   Mark 0.2 stable on alpha
diff --git a/sys-apps/hwdata-gentoo/files/0.2-fglrx.patch b/sys-apps/hwdata-gentoo/files/0.2-fglrx.patch
new file mode 100644
index 000000000000..551cc9593abb
--- /dev/null
+++ b/sys-apps/hwdata-gentoo/files/0.2-fglrx.patch
@@ -0,0 +1,12 @@
+diff -urN hwdata-gentoo-0.2.orig/Cards hwdata-gentoo-0.2/Cards
+--- hwdata-gentoo-0.2.orig/Cards	2005-11-18 08:28:25.000000000 -0500
++++ hwdata-gentoo-0.2/Cards	2005-11-18 08:29:04.000000000 -0500
+@@ -36,7 +36,7 @@
+ DRIVER fbdev
+ 
+ NAME ATI Radeon (fglrx)
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI Radeon
+ DRIVER radeon
diff --git a/sys-apps/hwdata-gentoo/files/0.2-nvidia.patch b/sys-apps/hwdata-gentoo/files/0.2-nvidia.patch
new file mode 100644
index 000000000000..3b8d19180175
--- /dev/null
+++ b/sys-apps/hwdata-gentoo/files/0.2-nvidia.patch
@@ -0,0 +1,16 @@
+diff -urN hwdata-gentoo-0.2.orig/Cards hwdata-gentoo-0.2/Cards
+--- hwdata-gentoo-0.2.orig/Cards	2005-11-18 08:28:25.000000000 -0500
++++ hwdata-gentoo-0.2/Cards	2005-11-18 08:30:25.000000000 -0500
+@@ -322,10 +322,10 @@
+ DRIVER cyrix
+ 
+ NAME NVIDIA Legacy
+-DRIVER nv
++DRIVER nvidia
+ 
+ NAME NVIDIA GeForce
+-DRIVER nv
++DRIVER nvidia
+ 
+ NAME NVIDIA GeForce 256 (generic)
+ SEE NVIDIA Legacy
diff --git a/sys-apps/hwdata-gentoo/files/0.3-fglrx.patch b/sys-apps/hwdata-gentoo/files/0.3-fglrx.patch
new file mode 100644
index 000000000000..787ebc51cc0e
--- /dev/null
+++ b/sys-apps/hwdata-gentoo/files/0.3-fglrx.patch
@@ -0,0 +1,12 @@
+diff -urN hwdata-gentoo-0.3.orig/Cards hwdata-gentoo-0.3/Cards
+--- hwdata-gentoo-0.3.orig/Cards	2005-11-18 08:28:25.000000000 -0500
++++ hwdata-gentoo-0.3/Cards	2005-11-18 08:29:04.000000000 -0500
+@@ -36,7 +36,7 @@
+ DRIVER fbdev
+ 
+ NAME ATI Radeon (fglrx)
+-DRIVER radeon
++DRIVER fglrx
+ 
+ NAME ATI Radeon
+ DRIVER radeon
diff --git a/sys-apps/hwdata-gentoo/files/0.3-nvidia.patch b/sys-apps/hwdata-gentoo/files/0.3-nvidia.patch
new file mode 100644
index 000000000000..e5e45777bade
--- /dev/null
+++ b/sys-apps/hwdata-gentoo/files/0.3-nvidia.patch
@@ -0,0 +1,12 @@
+diff -u hwdata-gentoo-0.3.orig/Cards hwdata-gentoo-0.3/Cards
+--- hwdata-gentoo-0.3.orig/Cards	2006-05-15 09:24:15.000000000 -0400
++++ hwdata-gentoo-0.3/Cards	2006-05-15 09:25:52.000000000 -0400
+@@ -325,7 +325,7 @@
+ DRIVER nv
+ 
+ NAME NVIDIA GeForce
+-DRIVER nv
++DRIVER nvidia
+ 
+ NAME NVIDIA GeForce 256 (generic)
+ SEE NVIDIA Legacy
diff --git a/sys-apps/hwdata-gentoo/files/digest-hwdata-gentoo-0.3 b/sys-apps/hwdata-gentoo/files/digest-hwdata-gentoo-0.3
new file mode 100644
index 000000000000..078382f4f084
--- /dev/null
+++ b/sys-apps/hwdata-gentoo/files/digest-hwdata-gentoo-0.3
@@ -0,0 +1,3 @@
+MD5 ed1c799d8772ada39b82776c4ba48a30 hwdata-gentoo-0.3.tar.bz2 145769
+RMD160 ed214eb44eef4bbaa903adf099f77182d60e4a6f hwdata-gentoo-0.3.tar.bz2 145769
+SHA256 554934ec5b914c79e72c4874196e6d8a86294240a602785dc6563211a71fddad hwdata-gentoo-0.3.tar.bz2 145769
diff --git a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.2.ebuild b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.2.ebuild
index 377e09ac3677..66219723629d 100644
--- a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.2.ebuild
+++ b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.2.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.2.ebuild,v 1.6 2006/02/08 23:05:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-gentoo/hwdata-gentoo-0.2.ebuild,v 1.7 2006/05/23 22:16:29 wolf31o2 Exp $
 
 inherit eutils
 
@@ -19,18 +19,12 @@ DEPEND="!sys-apps/hwdata
 
 src_unpack() {
 	unpack ${A}
-	if use x86
+	if use x86 || use amd64
 	then
 		if use livecd && use opengl
 		then
-			epatch ${FILESDIR}/fglrx.patch || die "patching for ATI"
-			epatch ${FILESDIR}/nvidia.patch || die "patching for nVidia"
-		fi
-	elif use amd64
-	then
-		if use livecd && use opengl
-		then
-			epatch ${FILESDIR}/nvidia.patch || die "patching for nVidia"
+			epatch ${FILESDIR}/${PV}-fglrx.patch || die "patching for ATI"
+			epatch ${FILESDIR}/${PV}-nvidia.patch || die "patching for nVidia"
 		fi
 	fi
 }
diff --git a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild
new file mode 100644
index 000000000000..8180563674fc
--- /dev/null
+++ b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.3.ebuild
@@ -0,0 +1,36 @@
+# 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.1 2006/05/23 22:16:29 wolf31o2 Exp $
+
+inherit eutils
+
+DESCRIPTION="Data for the hwsetup program"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~wolf31o2/sources/hwdata-gentoo/${P}.tar.bz2"
+HOMEPAGE="http://www.gentoo.org"
+
+IUSE="opengl livecd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="!sys-apps/hwdata
+	!sys-apps/hwdata-knoppix"
+
+src_unpack() {
+	unpack ${A}
+	if use x86 || use amd64
+	then
+		if use livecd && use opengl
+		then
+			epatch ${FILESDIR}/${PV}-fglrx.patch || die "patching for ATI"
+			epatch ${FILESDIR}/${PV}-nvidia.patch || die "patching for nVidia"
+		fi
+	fi
+}
+
+src_install() {
+	dodoc ChangeLog check-cards
+	insinto /usr/share/hwdata
+	doins Cards MonitorsDB pcitable blacklist
+}