Cleaning up older version and adjusting patches.

Package-Manager: portage-2.0.53_rc7

6 files changed, 14 insertions, 55 deletions

diff --git a/sys-apps/hwdata-gentoo/ChangeLog b/sys-apps/hwdata-gentoo/ChangeLog
index e79063c1df12..f09b5314134d 100644
--- a/sys-apps/hwdata-gentoo/ChangeLog
+++ b/sys-apps/hwdata-gentoo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hwdata-gentoo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-gentoo/ChangeLog,v 1.2 2005/11/30 22:35:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-gentoo/ChangeLog,v 1.3 2005/12/01 13:21:39 wolf31o2 Exp $
+
+  01 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/fglrx.patch,
+  files/nvidia.patch, -hwdata-gentoo-0.1.ebuild:
+  Cleaning up older version and adjusting patches.
 
 *hwdata-gentoo-0.2 (30 Nov 2005)
 
diff --git a/sys-apps/hwdata-gentoo/Manifest b/sys-apps/hwdata-gentoo/Manifest
index 42bc054a674f..cb2af60cd0fa 100644
--- a/sys-apps/hwdata-gentoo/Manifest
+++ b/sys-apps/hwdata-gentoo/Manifest
@@ -1,8 +1,6 @@
-MD5 5f9eb0159feceac8473d08a135e522d6 ChangeLog 602
-MD5 205c0ec7301daabd8ca6c67c437ae7e8 files/digest-hwdata-gentoo-0.1 70
+MD5 7996caa37158ef909d9da5d115dd5caf ChangeLog 776
 MD5 abcf3e9f1887a57adeeaedd286b7dcce files/digest-hwdata-gentoo-0.2 70
-MD5 b830f494f246fd467e4156e12d016876 files/fglrx.patch 318
-MD5 c1074707476f78fda268efac7d5135bd files/nvidia.patch 385
-MD5 e418918e96429549a6b2e47e94f9e867 hwdata-gentoo-0.1.ebuild 1051
+MD5 57bbd10ff7c831988da5912e4c9e3e14 files/fglrx.patch 318
+MD5 018005f2d16cc9b6b989578fca68019f files/nvidia.patch 385
 MD5 1a8709d06ee32c9b754485bd2f344df8 hwdata-gentoo-0.2.ebuild 1049
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
diff --git a/sys-apps/hwdata-gentoo/files/digest-hwdata-gentoo-0.1 b/sys-apps/hwdata-gentoo/files/digest-hwdata-gentoo-0.1
deleted file mode 100644
index 0dcb8112be19..000000000000
--- a/sys-apps/hwdata-gentoo/files/digest-hwdata-gentoo-0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa1e24e23d2275d9bfebcddb55151213 hwdata-gentoo-0.1.tar.bz2 139481
diff --git a/sys-apps/hwdata-gentoo/files/fglrx.patch b/sys-apps/hwdata-gentoo/files/fglrx.patch
index 2347eeb371a4..551cc9593abb 100644
--- a/sys-apps/hwdata-gentoo/files/fglrx.patch
+++ b/sys-apps/hwdata-gentoo/files/fglrx.patch
@@ -1,6 +1,6 @@
-diff -urN hwdata-gentoo-0.1.orig/Cards hwdata-gentoo-0.1/Cards
---- hwdata-gentoo-0.1.orig/Cards	2005-11-18 08:28:25.000000000 -0500
-+++ hwdata-gentoo-0.1/Cards	2005-11-18 08:29:04.000000000 -0500
+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
  
diff --git a/sys-apps/hwdata-gentoo/files/nvidia.patch b/sys-apps/hwdata-gentoo/files/nvidia.patch
index 36126c7cea93..3b8d19180175 100644
--- a/sys-apps/hwdata-gentoo/files/nvidia.patch
+++ b/sys-apps/hwdata-gentoo/files/nvidia.patch
@@ -1,6 +1,6 @@
-diff -urN hwdata-gentoo-0.1.orig/Cards hwdata-gentoo-0.1/Cards
---- hwdata-gentoo-0.1.orig/Cards	2005-11-18 08:28:25.000000000 -0500
-+++ hwdata-gentoo-0.1/Cards	2005-11-18 08:30:25.000000000 -0500
+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
  
diff --git a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.1.ebuild b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.1.ebuild
deleted file mode 100644
index 75db2dc6e97b..000000000000
--- a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 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.1.ebuild,v 1.1 2005/11/18 14:59:16 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
-	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"
-		fi
-	fi
-}
-
-src_install() {
-	dodoc ChangeLog check-cards
-	insinto /usr/share/hwdata
-	doins Cards MonitorsDB pcitable blacklist
-}