diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/kudzu/Manifest | 24 | ||||
| -rw-r--r-- | sys-apps/kudzu/files/1.2.52-remove-pci-device-class.patch | 32 | ||||
| -rw-r--r-- | sys-apps/kudzu/files/1.2.52-remove-pci-fill-class.patch | 21 | ||||
| -rw-r--r-- | sys-apps/kudzu/files/1.2.52-remove-sata-ata-storage-classes.patch | 45 | ||||
| -rw-r--r-- | sys-apps/kudzu/files/digest-kudzu-1.2.52 | 3 | ||||
| -rw-r--r-- | sys-apps/kudzu/files/sunlance.patch | 11 | ||||
| -rw-r--r-- | sys-apps/kudzu/kudzu-1.2.52.ebuild | 61 |
7 files changed, 197 insertions, 0 deletions
diff --git a/sys-apps/kudzu/Manifest b/sys-apps/kudzu/Manifest new file mode 100644 index 0000000..9e3cb8b --- /dev/null +++ b/sys-apps/kudzu/Manifest @@ -0,0 +1,24 @@ +AUX 1.2.52-remove-pci-device-class.patch 1177 RMD160 273ccdb53a29a5b5617199421d94f660aa736039 SHA1 cff45319f69f1a3cba854b826afae49b534c2cbe SHA256 430e59c31ef2d4640e49b12d06a9dae883cf1d9d031ca242120d25563b292d53 +MD5 05e2e2a69fb1d199220fe7537766a026 files/1.2.52-remove-pci-device-class.patch 1177 +RMD160 273ccdb53a29a5b5617199421d94f660aa736039 files/1.2.52-remove-pci-device-class.patch 1177 +SHA256 430e59c31ef2d4640e49b12d06a9dae883cf1d9d031ca242120d25563b292d53 files/1.2.52-remove-pci-device-class.patch 1177 +AUX 1.2.52-remove-pci-fill-class.patch 955 RMD160 549931e29eb68dc7f49c0b4ecb323df968cc45f8 SHA1 5d7e757b5d8b0baefe59cedf9043ad91c841d433 SHA256 fb73fe959c0a6e8065270d7452308d70855c04ad0ae4f716c918d840ca3cf183 +MD5 96b50b201a3140a8e0b0a1e35e6015a3 files/1.2.52-remove-pci-fill-class.patch 955 +RMD160 549931e29eb68dc7f49c0b4ecb323df968cc45f8 files/1.2.52-remove-pci-fill-class.patch 955 +SHA256 fb73fe959c0a6e8065270d7452308d70855c04ad0ae4f716c918d840ca3cf183 files/1.2.52-remove-pci-fill-class.patch 955 +AUX 1.2.52-remove-sata-ata-storage-classes.patch 1281 RMD160 79018915495825e100b8d1e37562bc5770c84bf9 SHA1 a930a81ae88ccc82109583bc9448c9a296c88e35 SHA256 d9b913a4e0d0d3494d2f408f649617a0edc1ad5cb1a2597fa26b50bd0209cbfa +MD5 6acefdd562367af6c8afd822b48cd02a files/1.2.52-remove-sata-ata-storage-classes.patch 1281 +RMD160 79018915495825e100b8d1e37562bc5770c84bf9 files/1.2.52-remove-sata-ata-storage-classes.patch 1281 +SHA256 d9b913a4e0d0d3494d2f408f649617a0edc1ad5cb1a2597fa26b50bd0209cbfa files/1.2.52-remove-sata-ata-storage-classes.patch 1281 +AUX sunlance.patch 447 RMD160 3d3123267f4bea76aa070df6363eb9028cb13fda SHA1 c37f5329c11b3c9ea41bc192a20ed3e1fda7ad71 SHA256 231e9ed653417cd61887c91f3fbad938d0d714c0bdc71021965a1cc495c95312 +MD5 824df36d24f8902f4a9a20b044348354 files/sunlance.patch 447 +RMD160 3d3123267f4bea76aa070df6363eb9028cb13fda files/sunlance.patch 447 +SHA256 231e9ed653417cd61887c91f3fbad938d0d714c0bdc71021965a1cc495c95312 files/sunlance.patch 447 +DIST kudzu-1.2.52-1.src.rpm 225268 RMD160 0d6e37599d729808c8608ca400185c146dab53d1 SHA1 9e238829a500b74bb8935e2d5320a7da6701fee4 SHA256 5767dd6403d9850ea66ec9fa615745053a8d66ce10ca81c093a5b8796ff6b0cb +EBUILD kudzu-1.2.52.ebuild 1534 RMD160 ddb98f548f61db1f88102a66d000a9dac5037421 SHA1 5ebddc42908e7b81741c49662a89d232167e5079 SHA256 ac7785b14d816a88206cf5065cf622837972c9f48c293f7aaa0ef1b940149dca +MD5 71203c01556e8220b37308dd02735a62 kudzu-1.2.52.ebuild 1534 +RMD160 ddb98f548f61db1f88102a66d000a9dac5037421 kudzu-1.2.52.ebuild 1534 +SHA256 ac7785b14d816a88206cf5065cf622837972c9f48c293f7aaa0ef1b940149dca kudzu-1.2.52.ebuild 1534 +MD5 1e83d68ac5113c7820e17006738ebb05 files/digest-kudzu-1.2.52 247 +RMD160 095365712bba32b761130f9ec24969c3b75534eb files/digest-kudzu-1.2.52 247 +SHA256 07691d6724b290db5c3145475ed4631176dde35685fe11e01d9549c7de867158 files/digest-kudzu-1.2.52 247 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 0000000..08c81d1 --- /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 0000000..6ac4588 --- /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 0000000..21824e9 --- /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 0000000..ecf39dd --- /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 0000000..f1f9e43 --- /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 0000000..cd19286 --- /dev/null +++ b/sys-apps/kudzu/kudzu-1.2.52.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/libkudzu-1.1.62-r1.ebuild,v 1.12 2006/08/26 04:55:47 mr_bones_ 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-gentoo" +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" + + # libkudzu installs the headers and libkudzu.a + rm -rf \ + "${D}"/usr/include \ + "${D}"/usr/$(get_libdir)/libkudzu.a \ + || die "removing colliding files failed" + + # don't install incompatible init scripts + rm -rf \ + "${D}"/etc/rc.d \ + || die "removing rc.d files failed" +} |