Red Hat Hardware detection tools

Package-Manager: portage-2.1.1_rc1-r1

8 files changed, 190 insertions, 0 deletions

diff --git a/sys-apps/kudzu/ChangeLog b/sys-apps/kudzu/ChangeLog
new file mode 100644
index 000000000000..0edc101c98b0
--- /dev/null
+++ b/sys-apps/kudzu/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for sys-apps/kudzu
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/ChangeLog,v 1.22 2006/09/05 21:08:48 dberkholz Exp $
+
+*kudzu-1.2.52 (05 Sep 2006)
+
+  05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.2.52-remove-pci-device-class.patch,
+  +files/1.2.52-remove-pci-fill-class.patch,
+  +files/1.2.52-remove-sata-ata-storage-classes.patch,
+  +files/sunlance.patch, +metadata.xml, +kudzu-1.2.52.ebuild:
+  Red Hat Hardware detection tools
+
diff --git a/sys-apps/kudzu/files/1.2.52-remove-pci-device-class.patch b/sys-apps/kudzu/files/1.2.52-remove-pci-device-class.patch
new file mode 100644
index 000000000000..08c81d1d659f
--- /dev/null
+++ b/sys-apps/kudzu/files/1.2.52-remove-pci-device-class.patch
@@ -0,0 +1,32 @@
+device_class only exists as a patch to Red Hat pciutils. This diff is based on
+reversing r1.108.
+
+-Donnie Berkholz <dberkholz@gentoo.org>
+
+--- pci.c.orig	2006-09-01 14:39:55.000000000 -0700
++++ pci.c	2006-09-01 14:41:28.000000000 -0700
+@@ -297,7 +297,7 @@
+ #endif	
+ 	unsigned int devtype, command;
+ 	
+-	devtype = p->device_class;
++	devtype = config[PCI_CLASS_DEVICE+1] << 8 | config[PCI_CLASS_DEVICE];
+ 	if (p->irq || pciToKudzu(devtype) != CLASS_VIDEO) {
+ 		return 0;
+ 	}
+@@ -420,13 +420,13 @@
+ 		dev->subDeviceId = subdev;
+ 		dev->pciType = bustype;
+ 		asprintf(&t,"v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",p->vendor_id,p->device_id,
+-			 subvend, subdev,(u_int8_t)(p->device_class >> 8),(u_int8_t)(p->device_class),config[PCI_CLASS_PROG]);
++			 subvend, subdev,(u_int8_t)(config[PCI_CLASS_DEVICE+1] << 8),(u_int8_t)(config[PCI_CLASS_DEVICE]),config[PCI_CLASS_PROG]);
+ 		drv = aliasSearch(aliases, "pci", t);
+ 		x_drv = aliasSearch(aliases, "pcivideo", t);
+ 		free(t);
+ 		if (drv)
+ 			dev->driver = strdup(drv);
+-		devtype = p->device_class;
++		devtype = config[PCI_CLASS_DEVICE+1] << 8 | config[PCI_CLASS_DEVICE];
+ 		if (x_drv) {
+ 			dev->classprivate = strdup(x_drv);
+ 		}
diff --git a/sys-apps/kudzu/files/1.2.52-remove-pci-fill-class.patch b/sys-apps/kudzu/files/1.2.52-remove-pci-fill-class.patch
new file mode 100644
index 000000000000..6ac45885e9cf
--- /dev/null
+++ b/sys-apps/kudzu/files/1.2.52-remove-pci-fill-class.patch
@@ -0,0 +1,21 @@
+Remove a class that only exists as a patch to Red Hat pciutils.
+
+-Donnie Berkholz <dberkholz@gentoo.org>
+
+Index: pci.c
+===================================================================
+RCS file: /usr/local/CVS/kudzu/pci.c,v
+retrieving revision 1.110
+retrieving revision 1.109
+diff -u -b -B -r1.110 -r1.109
+--- pci.c	8 Sep 2004 19:00:57 -0000	1.110
++++ pci.c	3 Sep 2004 21:14:39 -0000	1.109
+@@ -746,7 +748,7 @@
+ 		    subvend = config[PCI_SUBSYSTEM_VENDOR_ID+1] << 8 | config[PCI_SUBSYSTEM_VENDOR_ID];
+ 		    subdev = config[PCI_SUBSYSTEM_ID+1] << 8 | config[PCI_SUBSYSTEM_ID];
+ 		}
+-		pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_CLASS | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES);
++		pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES);
+ 		bustype = PCI_NORMAL;
+ 	        for (bridgenum=0; cardbus_bridges[bridgenum]; bridgenum++) {
+ 			if (p->bus == cardbus_bridges[bridgenum])
diff --git a/sys-apps/kudzu/files/1.2.52-remove-sata-ata-storage-classes.patch b/sys-apps/kudzu/files/1.2.52-remove-sata-ata-storage-classes.patch
new file mode 100644
index 000000000000..21824e950ae6
--- /dev/null
+++ b/sys-apps/kudzu/files/1.2.52-remove-sata-ata-storage-classes.patch
@@ -0,0 +1,45 @@
+Remove some storage classes that only exist as patches to Red Hat pciutils.
+
+-Donnie Berkholz <dberkholz@gentoo.org>
+
+Index: pci.c
+===================================================================
+RCS file: /usr/local/CVS/kudzu/pci.c,v
+retrieving revision 1.141
+retrieving revision 1.140
+diff -u -b -B -r1.141 -r1.140
+--- pci.c	9 Aug 2006 17:47:46 -0000	1.141
++++ pci.c	28 Feb 2006 19:49:56 -0000	1.140
+@@ -142,10 +142,6 @@
+ 	return PCI_CLASS_BRIDGE_CARDBUS;
+      case CLASS_IDE:
+ 	return PCI_CLASS_STORAGE_IDE;
+-     case CLASS_ATA:
+-	return PCI_CLASS_STORAGE_ATA;
+-     case CLASS_SATA:
+-	return PCI_CLASS_STORAGE_SATA;
+      default:
+ 	return 0;
+     }
+@@ -170,10 +166,6 @@
+ 	return CLASS_FLOPPY;
+      case PCI_CLASS_STORAGE_RAID:
+ 	return CLASS_RAID;
+-     case PCI_CLASS_STORAGE_ATA:
+-	return CLASS_ATA;
+-     case PCI_CLASS_STORAGE_SATA:
+-	return CLASS_SATA;
+      case PCI_CLASS_MULTIMEDIA_AUDIO:
+      /* HD Audio */
+      case 0x0403:
+@@ -360,9 +352,7 @@
+ 	(probeClass & CLASS_FIREWIRE) ||
+ 	(probeClass & CLASS_SOCKET) ||
+ 	(probeClass & CLASS_CAPTURE) ||
+-	(probeClass & CLASS_RAID) ||
+-	(probeClass & CLASS_ATA) ||
+-	(probeClass & CLASS_SATA)) {
++	(probeClass & CLASS_RAID)) {
+ 	pacc = pci_alloc();
+ 	if (!pacc) return devlist;
+ 	if (!getAliases(aliases, "pci")) {
diff --git a/sys-apps/kudzu/files/digest-kudzu-1.2.52 b/sys-apps/kudzu/files/digest-kudzu-1.2.52
new file mode 100644
index 000000000000..ecf39dde4171
--- /dev/null
+++ b/sys-apps/kudzu/files/digest-kudzu-1.2.52
@@ -0,0 +1,3 @@
+MD5 e7f6b605cb376e9033238fc87872ea30 kudzu-1.2.52-1.src.rpm 225268
+RMD160 0d6e37599d729808c8608ca400185c146dab53d1 kudzu-1.2.52-1.src.rpm 225268
+SHA256 5767dd6403d9850ea66ec9fa615745053a8d66ce10ca81c093a5b8796ff6b0cb kudzu-1.2.52-1.src.rpm 225268
diff --git a/sys-apps/kudzu/files/sunlance.patch b/sys-apps/kudzu/files/sunlance.patch
new file mode 100644
index 000000000000..f1f9e43aa821
--- /dev/null
+++ b/sys-apps/kudzu/files/sunlance.patch
@@ -0,0 +1,11 @@
+diff -urN kudzu-1.1.62.orig/sbus.c kudzu-1.1.62/sbus.c
+--- kudzu-1.1.62.orig/sbus.c	2003-03-24 17:39:14.000000000 -0500
++++ kudzu-1.1.62/sbus.c	2005-07-12 09:50:06.000000000 -0400
+@@ -162,6 +162,7 @@
+ 		    	devClass = CLASS_NETWORK;
+ 		} else if (!strcmp(prop, "le")) {
+ 			type = "Sun Lance Ethernet";
++			module = "sunlance";
+ 		    	devClass = CLASS_NETWORK;
+ 		} else if (!strcmp(prop, "qe")) {
+ 			prop = prom_getproperty("channel#", &len);
diff --git a/sys-apps/kudzu/kudzu-1.2.52.ebuild b/sys-apps/kudzu/kudzu-1.2.52.ebuild
new file mode 100644
index 000000000000..de12dce15c02
--- /dev/null
+++ b/sys-apps/kudzu/kudzu-1.2.52.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-1.2.52.ebuild,v 1.1 2006/09/05 21:08:48 dberkholz Exp $
+
+inherit eutils rpm multilib
+
+# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
+# tarball out of it
+RPMREV="1"
+
+MY_P="${PN/lib}-${PV}"
+
+DESCRIPTION="Red Hat Hardware detection tools"
+SRC_URI="mirror://fedora/development/source/SRPMS/${MY_P}-${RPMREV}.src.rpm"
+HOMEPAGE="http://fedora.redhat.com/projects/additional-projects/kudzu/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/popt
+	sys-apps/hwdata-redhat
+	!sys-libs/libkudzu"
+DEPEND="dev-libs/popt
+	sys-apps/pciutils"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	rpm_src_unpack
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/sunlance.patch \
+		"${FILESDIR}"/${PV}-remove-sata-ata-storage-classes.patch \
+		"${FILESDIR}"/${PV}-remove-pci-fill-class.patch \
+		"${FILESDIR}"/${PV}-remove-pci-device-class.patch
+}
+
+src_compile() {
+	emake \
+		all \
+		RPM_OPT_FLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	emake install install-program \
+		DESTDIR="${D}" \
+		libdir="${D}/usr/$(get_libdir)" \
+		|| die "install failed"
+
+	# don't install incompatible init scripts
+	rm -rf \
+		"${D}"/etc/rc.d \
+		|| die "removing rc.d files failed"
+}
diff --git a/sys-apps/kudzu/metadata.xml b/sys-apps/kudzu/metadata.xml
new file mode 100644
index 000000000000..cd89a979878d
--- /dev/null
+++ b/sys-apps/kudzu/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+<email>dberkholz@gentoo.org</email>
+<name>Donnie Berkholz</name>
+</maintainer>
+</pkgmetadata>