From fac68d716fb018fc6fcdb74919c471731614cae6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 10 Apr 2010 19:28:32 +0000 Subject: [PATCH] old --- .../files/pcimodules-pciutils-3.0.0.patch | 14 -- .../files/pcimodules-pciutils-3.1.0.patch | 18 -- sys-apps/pciutils/files/pcimodules.8 | 92 --------- sys-apps/pciutils/files/pcimodules.c | 184 ------------------ .../pciutils/files/pciutils-3.0.0-build.patch | 11 -- .../pciutils-3.0.0-locale-happiness.patch | 26 --- .../files/pciutils-3.0.0-resolv.patch | 44 ----- .../files/pciutils-3.1.0-null-ptr.patch | 24 --- sys-apps/pciutils/pciutils-3.0.0.ebuild | 64 ------ sys-apps/pciutils/pciutils-3.0.2.ebuild | 68 ------- sys-apps/pciutils/pciutils-3.1.0-r1.ebuild | 70 ------- sys-apps/pciutils/pciutils-3.1.2.ebuild | 67 ------- 12 files changed, 682 deletions(-) delete mode 100644 sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch delete mode 100644 sys-apps/pciutils/files/pcimodules-pciutils-3.1.0.patch delete mode 100644 sys-apps/pciutils/files/pcimodules.8 delete mode 100644 sys-apps/pciutils/files/pcimodules.c delete mode 100644 sys-apps/pciutils/files/pciutils-3.0.0-build.patch delete mode 100644 sys-apps/pciutils/files/pciutils-3.0.0-locale-happiness.patch delete mode 100644 sys-apps/pciutils/files/pciutils-3.0.0-resolv.patch delete mode 100644 sys-apps/pciutils/files/pciutils-3.1.0-null-ptr.patch delete mode 100644 sys-apps/pciutils/pciutils-3.0.0.ebuild delete mode 100644 sys-apps/pciutils/pciutils-3.0.2.ebuild delete mode 100644 sys-apps/pciutils/pciutils-3.1.0-r1.ebuild delete mode 100644 sys-apps/pciutils/pciutils-3.1.2.ebuild diff --git a/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch b/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch deleted file mode 100644 index b79f22d36dee..000000000000 --- a/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- pciutils-3.0.0/Makefile -+++ pciutils-3.0.0/Makefile -@@ -34,9 +34,11 @@ - lib/config.h lib/config.mk: - cd lib && ./configure - -+pcimodules: pcimodules.o common.o lib/$(PCILIB) - lspci: lspci.o common.o lib/$(PCILIB) - setpci: setpci.o common.o lib/$(PCILIB) - -+pcimodules.o: pcimodules.c pciutils.h $(PCIINC) - lspci.o: lspci.c pciutils.h $(PCIINC) - setpci.o: setpci.c pciutils.h $(PCIINC) - common.o: common.c pciutils.h $(PCIINC) diff --git a/sys-apps/pciutils/files/pcimodules-pciutils-3.1.0.patch b/sys-apps/pciutils/files/pcimodules-pciutils-3.1.0.patch deleted file mode 100644 index f7c66f1e5d94..000000000000 --- a/sys-apps/pciutils/files/pcimodules-pciutils-3.1.0.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- pciutils-3.1.0/Makefile -+++ pciutils-3.1.0/Makefile -@@ -62,6 +62,7 @@ - lib/config.h lib/config.mk: - cd lib && ./configure - -+pcimodules: pcimodules.o common.o lib/$(PCILIB) - lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB) - setpci: setpci.o common.o lib/$(PCILIB) - -@@ -74,6 +75,7 @@ - ls-tree.o: ls-tree.c $(LSPCIINC) - ls-map.o: ls-map.c $(LSPCIINC) - -+pcimodules.o: pcimodules.c pciutils.h $(PCIINC) - setpci.o: setpci.c pciutils.h $(PCIINC) - common.o: common.c pciutils.h $(PCIINC) - diff --git a/sys-apps/pciutils/files/pcimodules.8 b/sys-apps/pciutils/files/pcimodules.8 deleted file mode 100644 index 0cdb5e5b254a..000000000000 --- a/sys-apps/pciutils/files/pcimodules.8 +++ /dev/null @@ -1,92 +0,0 @@ -.TH pcimodules 8 "@TODAY@" "@VERSION@" "Linux PCI Utilities" -.IX pcimodules -.SH NAME -pcimodules \- List kernel driver modules available for all currently plugged -in PCI devices -.SH SYNOPSIS -.B pcimodules -.RB [ --class class_id ] -.RB [ --classmask mask ] -.RB [ --help ] -.SH DESCRIPTION -.B pcimodules -lists all driver modules for all currently plugged in PCI devices. -.B pcimodules -should be run at boot time, and whenever a PCI device is "hot plugged" -into the system. This can be done by the following Bourne shell syntax: -.IP - for module in $(pcimodules) ; do -.IP - modprobe -s -k "$module" -.IP - done -.PP -When a PCI device is removed from the system, the Linux kernel will -decrement a usage count on PCI driver module. If this count drops -to zero (i.e., there are no PCI drivers), then the -.B modprobe -r -process that is normally configured to run from cron every few minutes -will eventually remove the unneeded module. -.PP -The --class and --classmask arguments can be used to limit the search -to certain classes of PCI devices. This is useful, for example, to -generate a list of ethernet card drivers to be loaded when the kernel -has indicated that it is trying to resolve an unknown network interface. -.PP -Modules are listed in the order in which the PCI devices are physically -arranged so that the computer owner can arrange things like having scsi -device 0 be on a controller that is not alphabetically the first scsi -controller. -.SH OPTIONS -.TP -.B --class class --classmask mask -.PP ---class and --classmask limit the search to PCI -cards in particular classes. These arguments are always used together. -The arguments to --class and --classmask -can be given as hexadecimal numbers by prefixing a leading "0x". -Note that the classes used by pcimodules are in "Linux" format, -meaning the class value that you see with lspci would be shifted -left eight bits, with the new low eight bits programming interface ID. -An examples of how to use class and classmask is provided below. -.B --help, -h -Print a help message and exit. -.SH EXAMPLES -.TP -pcimodules -lists all modules corresponding to currently plugged in PCI devices. -.TP -pcimodules --class 0x200000 --classmask 0xffff00 -lists all modules corresponding to currently plugged in ethernet PCI devices. -.SH FILES -.TP -.B /lib/modules//modules.pcimap -This file is automatically generated by -.B depmod, -and used by -.B pcimodules -to determine which modules correspond to which PCI ID's. -.TP -.B /proc/bus/pci -An interface to PCI bus configuration space provided by the post-2.1.82 Linux -kernels. Contains per-bus subdirectories with per-card config space files and a -.I devices -file containing a list of all PCI devices. - -.SH SEE ALSO -.BR lspci (8) - -.SH MAINTAINER -The Linux PCI Utilities are maintained by Martin Mares . - -.SH AUTHOR -.B pcimodules -was written by Adam J. Richter , based on public -domain example code by Martin Mares . - -.SH COPYRIGHT -.B pcimodules -is copyright 2000, Yggdrasil Computing, Incorporated, and may -be copied under the terms and conditions of version 2 of the GNU -General Public License as published by the Free Software Foundation -(Cambrige, Massachusetts, United States of America). diff --git a/sys-apps/pciutils/files/pcimodules.c b/sys-apps/pciutils/files/pcimodules.c deleted file mode 100644 index 2271e88f4bab..000000000000 --- a/sys-apps/pciutils/files/pcimodules.c +++ /dev/null @@ -1,184 +0,0 @@ -/* - * pcimodules: Load all kernel modules for PCI device currently - * plugged into any PCI slot. - * - * Copyright 2000 Yggdrasil Computing, Incorporated - * This file may be copied under the terms and conditions of version - * two of the GNU General Public License, as published by the Free - * Software Foundation (Cambridge, Massachusetts, USA). - * - * This file is based on pciutils/lib/example.c, which has the following - * authorship and copyright statement: - * - * Written by Martin Mares and put to public domain. You can do - * with it anything you want, but I don't give you any warranty. - */ - -#include -#include -#include -#include -#include -#include -#include - -#define _GNU_SOURCE -#include - -#include "pciutils.h" - -#define MODDIR "/lib/modules" -#define PCIMAP "modules.pcimap" - -#define LINELENGTH 8000 - -#define DEVICE_ANY 0xffffffff -#define VENDOR_ANY 0xffffffff - -#include "lib/pci.h" - -struct pcimap_entry { - unsigned int vendor, subsys_vendor, dev, subsys_dev, class, class_mask; - char *module; - struct pcimap_entry *next; -}; - -static struct pcimap_entry *pcimap_list = NULL; - -const char program_name[] = "pcimodules"; - -#define OPT_STRING "hcm" -static struct option long_options[] = { - {"class", required_argument, NULL, 'c'}, - {"classmask", required_argument, NULL, 'm'}, - {"help", no_argument, NULL, 'h'}, - { 0, 0, 0, 0} -}; - -static unsigned long desired_class; -static unsigned long desired_classmask; /* Default is 0: accept all classes.*/ - -static void -read_pcimap(void) -{ - struct utsname utsname; - char filename[MAXPATHLEN]; - FILE *pcimap_file; - char line[LINELENGTH]; - struct pcimap_entry *entry; - unsigned int driver_data; - char *prevmodule = ""; - char module[LINELENGTH]; - - if (uname(&utsname) < 0) { - perror("uname"); - exit(1); - } - sprintf(filename, "%s/%s/%s", MODDIR, utsname.release, PCIMAP); - if ((pcimap_file = fopen(filename, "r")) == NULL) { - perror(filename); - exit(1); - } - - while(fgets(line, LINELENGTH, pcimap_file) != NULL) { - if (line[0] == '#') - continue; - - entry = xmalloc(sizeof(struct pcimap_entry)); - - if (sscanf(line, "%s 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", - module, - &entry->vendor, &entry->dev, - &entry->subsys_vendor, &entry->subsys_dev, - &entry->class, &entry->class_mask, - &driver_data) != 8) { - fprintf (stderr, - "modules.pcimap unparsable line: %s.\n", line); - free(entry); - continue; - } - - /* Optimize memory allocation a bit, in case someday we - have Linux systems with ~100,000 modules. It also - allows us to just compare pointers to avoid trying - to load a module twice. */ - if (strcmp(module, prevmodule) != 0) { - prevmodule = xmalloc(strlen(module)+1); - strcpy(prevmodule, module); - } - entry->module = prevmodule; - entry->next = pcimap_list; - pcimap_list = entry; - } - fclose(pcimap_file); -} - -/* Return a filled in pci_access->dev tree, with the device classes - stored in dev->aux. -*/ -static void -match_pci_modules(void) -{ - struct pci_access *pacc; - struct pci_dev *dev; - unsigned int class, subsys_dev, subsys_vendor; - struct pcimap_entry *map; - const char *prevmodule = ""; - - pacc = pci_alloc(); /* Get the pci_access structure */ - /* Set all options you want -- here we stick with the defaults */ - pci_init(pacc); /* Initialize the PCI library */ - pci_scan_bus(pacc); /* We want to get the list of devices */ - for(dev=pacc->devices; dev; dev=dev->next) { - pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES); - class = (pci_read_word(dev, PCI_CLASS_DEVICE) << 8) - | pci_read_byte(dev, PCI_CLASS_PROG); - subsys_dev = pci_read_word(dev, PCI_SUBSYSTEM_ID); - subsys_vendor = pci_read_word(dev,PCI_SUBSYSTEM_VENDOR_ID); - for(map = pcimap_list; map != NULL; map = map->next) { - if (((map->class ^ class) & map->class_mask) == 0 && - ((desired_class ^ class) & desired_classmask)==0 && - (map->dev == DEVICE_ANY || - map->dev == dev->device_id) && - (map->vendor == VENDOR_ANY || - map->vendor == dev->vendor_id) && - (map->subsys_dev == DEVICE_ANY || - map->subsys_dev == subsys_dev) && - (map->subsys_vendor == VENDOR_ANY || - map->subsys_vendor == subsys_vendor) && - prevmodule != map->module) { - printf("%s\n", map->module); - prevmodule = map->module; - } - } - - } - pci_cleanup(pacc); -} - -int -main (int argc, char **argv) -{ - int opt_index = 0; - int opt; - - while ((opt = getopt_long(argc, argv, OPT_STRING, long_options, - &opt_index)) != -1) { - switch(opt) { - case 'c': - desired_class = strtol(optarg, NULL, 0); - break; - case 'm': - desired_classmask = strtol(optarg, NULL, 0); - break; - case 'h': - printf ("Usage: pcimodules [--help]\n" - " Lists kernel modules corresponding to PCI devices currently plugged" - " into the computer.\n"); - } - } - - read_pcimap(); - match_pci_modules(); - return 0; -} diff --git a/sys-apps/pciutils/files/pciutils-3.0.0-build.patch b/sys-apps/pciutils/files/pciutils-3.0.0-build.patch deleted file mode 100644 index f1735a0e4ce6..000000000000 --- a/sys-apps/pciutils/files/pciutils-3.0.0-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Makefile -+++ lib/Makefile -@@ -52,7 +52,7 @@ - else - CFLAGS += -fPIC -fvisibility=hidden - $(PCILIB): $(addsuffix .o,$(OBJS)) -- $(CC) -shared $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS) -+ $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS) - endif - - $(PCILIBPC): libpci.pc.in diff --git a/sys-apps/pciutils/files/pciutils-3.0.0-locale-happiness.patch b/sys-apps/pciutils/files/pciutils-3.0.0-locale-happiness.patch deleted file mode 100644 index 5a818b4c089f..000000000000 --- a/sys-apps/pciutils/files/pciutils-3.0.0-locale-happiness.patch +++ /dev/null @@ -1,26 +0,0 @@ -et_EE is a very fun locale. [a-z] does not expand to the full alphabet in that -crazy place. Force tr to use locale C just to avoid the problem. - -diff -Nuar pciutils-3.0.2.orig/lib/configure pciutils-3.0.2/lib/configure ---- pciutils-3.0.2.orig/lib/configure 2008-09-19 11:04:37.000000000 -0700 -+++ pciutils-3.0.2/lib/configure 2008-10-07 02:27:57.043215842 -0700 -@@ -39,7 +39,7 @@ - HOST=${3:-$cpu-$sys} - fi - # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. --host=`echo $HOST | sed 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'` -+host=`echo $HOST | sed 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | LANG=C tr '[A-Z]' '[a-z]'` - cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - echo " $host $rel" -@@ -47,8 +47,8 @@ - c=config.h - m=config.mk - echo >$c '#define PCI_CONFIG_H' --echo >>$c "#define PCI_ARCH_`echo $cpu | tr '[a-z]' '[A-Z]'`" --echo >>$c "#define PCI_OS_`echo $sys | tr '[a-z]' '[A-Z]'`" -+echo >>$c "#define PCI_ARCH_`echo $cpu | LANG=C tr '[a-z]' '[A-Z]'`" -+echo >>$c "#define PCI_OS_`echo $sys | LANG=C tr '[a-z]' '[A-Z]'`" - echo >$m 'WITH_LIBS=' - - echo_n "Looking for access methods..." diff --git a/sys-apps/pciutils/files/pciutils-3.0.0-resolv.patch b/sys-apps/pciutils/files/pciutils-3.0.0-resolv.patch deleted file mode 100644 index e57c354db69e..000000000000 --- a/sys-apps/pciutils/files/pciutils-3.0.0-resolv.patch +++ /dev/null @@ -1,44 +0,0 @@ -http://bugs.gentoo.org/218555 - -From 28ef4182c8ce8070008275e3c8f854ee5e27bce2 Mon Sep 17 00:00:00 2001 -From: Alexis Ballier -Date: Mon, 16 Jun 2008 23:44:15 +0200 -Subject: [PATCH] dont try to link to libresolv on freebsd, needed functions are in the libc - ---- - lib/configure | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/lib/configure b/lib/configure -index d855a3c..024878a 100755 ---- a/lib/configure -+++ b/lib/configure -@@ -48,6 +48,8 @@ echo >$m 'WITH_LIBS=' - - echo_n "Looking for access methods..." - -+RESOLVLIB="-lresolv" -+ - case $sys in - linux*) - echo_n " sysfs proc" -@@ -80,6 +82,7 @@ case $sys in - echo_n " fbsd-device" - echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE' - echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"' -+ RESOLVLIB="" - ;; - openbsd) - echo_n " obsd-device" -@@ -148,7 +151,7 @@ fi - if [ "$DNS" = yes ] ; then - echo >>$c "#define PCI_USE_DNS" - echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\"" -- echo >>$m 'WITH_LIBS+=-lresolv' -+ echo >>$m "WITH_LIBS+=$RESOLVLIB" - fi - - echo "Checking whether to build a shared library... $SHARED (set manually)" --- -1.5.5.4 - diff --git a/sys-apps/pciutils/files/pciutils-3.1.0-null-ptr.patch b/sys-apps/pciutils/files/pciutils-3.1.0-null-ptr.patch deleted file mode 100644 index f7aee8a63afb..000000000000 --- a/sys-apps/pciutils/files/pciutils-3.1.0-null-ptr.patch +++ /dev/null @@ -1,24 +0,0 @@ -http://bugs.gentoo.org/256464 - -if "f" is NULL, dont try to deref it - -patch by Andreas Wiese - ---- a/setpci.c -+++ b/setpci.c -@@ -630,13 +630,13 @@ - e = strchr(value, ','); - if (e) - *e++ = 0; -- if (parse_x32(value, &f, &ll) < 0 || *f && *f != ':') -+ if (parse_x32(value, &f, &ll) < 0 || f && *f != ':') - parse_err("Invalid value \"%s\"", value); - lim = max_values[op->width]; - if (ll > lim && ll < ~0UL - lim) - parse_err("Value \"%s\" is out of range", value); - op->values[j].value = ll; -- if (*f == ':') -+ if (f && *f == ':') - { - if (parse_x32(f+1, NULL, &ll) <= 0) - parse_err("Invalid mask \"%s\"", f+1); diff --git a/sys-apps/pciutils/pciutils-3.0.0.ebuild b/sys-apps/pciutils/pciutils-3.0.0.ebuild deleted file mode 100644 index d5456315180c..000000000000 --- a/sys-apps/pciutils/pciutils-3.0.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.0.0.ebuild,v 1.12 2009/01/26 03:28:41 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs multilib - -DESCRIPTION="Various utilities dealing with the PCI bus" -HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="network-cron zlib" - -DEPEND="zlib? ( sys-libs/zlib )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.0.0-build.patch #233314 - epatch "${FILESDIR}"/${PN}-3.0.0-resolv.patch #218555 - epatch "${FILESDIR}"/pcimodules-${PN}-3.0.0.patch - epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch - cp "${FILESDIR}"/pcimodules.c . || die - sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile -} - -uyesno() { use $1 && echo yes || echo no ; } -pemake() { - emake \ - DNS="yes" \ - IDSDIR="/usr/share/misc" \ - MANDIR="/usr/share/man" \ - PREFIX="/usr" \ - SHARED="yes" \ - STRIP="" \ - ZLIB=$(uyesno zlib) \ - "$@" -} - -src_compile() { - tc-export AR CC RANLIB - pemake OPT="${CFLAGS}" all pcimodules || die "emake failed" -} - -src_install() { - pemake DESTDIR="${D}" install install-lib || die - dosbin pcimodules || die - doman "${FILESDIR}"/pcimodules.8 - - if use network-cron ; then - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/pciutils.cron update-pciids \ - || die "Failed to install update cronjob" - fi - - # Install both forms until HAL has migrated - if use zlib ; then - local sharedir="${D}/usr/share/misc" - elog "Providing a backwards compatibility non-compressed pci.ids" - gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids - fi -} diff --git a/sys-apps/pciutils/pciutils-3.0.2.ebuild b/sys-apps/pciutils/pciutils-3.0.2.ebuild deleted file mode 100644 index eb1a83daac1e..000000000000 --- a/sys-apps/pciutils/pciutils-3.0.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.0.2.ebuild,v 1.13 2009/02/07 14:50:20 armin76 Exp $ - -inherit eutils flag-o-matic toolchain-funcs multilib - -DESCRIPTION="Various utilities dealing with the PCI bus" -HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="network-cron zlib" - -DEPEND="zlib? ( sys-libs/zlib )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.0.0-build.patch #233314 - epatch "${FILESDIR}"/pcimodules-${PN}-3.0.0.patch - epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch - epatch "${FILESDIR}"/${PN}-3.0.0-locale-happiness.patch - cp "${FILESDIR}"/pcimodules.c . || die - sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile -} - -uyesno() { use $1 && echo yes || echo no ; } -pemake() { - emake \ - DNS="yes" \ - IDSDIR="/usr/share/misc" \ - MANDIR="/usr/share/man" \ - PREFIX="/usr" \ - SHARED="yes" \ - STRIP="" \ - ZLIB=$(uyesno zlib) \ - "$@" -} - -src_compile() { - tc-export AR CC RANLIB - pemake OPT="${CFLAGS}" all pcimodules || die "emake failed" -} - -src_install() { - pemake DESTDIR="${D}" install install-lib || die - dosbin pcimodules || die - doman "${FILESDIR}"/pcimodules.8 - dodoc ChangeLog README TODO - - if use network-cron ; then - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/pciutils.cron update-pciids \ - || die "Failed to install update cronjob" - fi - - # Install both forms until HAL has migrated - if use zlib ; then - local sharedir="${D}/usr/share/misc" - elog "Providing a backwards compatibility non-compressed pci.ids" - gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids - fi - - newinitd "${FILESDIR}"/init.d-pciparm pciparm - newconfd "${FILESDIR}"/conf.d-pciparm pciparm -} diff --git a/sys-apps/pciutils/pciutils-3.1.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.1.0-r1.ebuild deleted file mode 100644 index 2c3daeb8cda4..000000000000 --- a/sys-apps/pciutils/pciutils-3.1.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.0-r1.ebuild,v 1.1 2009/01/29 18:57:16 vapier Exp $ - -inherit eutils multilib - -DESCRIPTION="Various utilities dealing with the PCI bus" -HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="network-cron zlib" - -DEPEND="zlib? ( sys-libs/zlib )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-3.0.0-build.patch #233314 - epatch "${FILESDIR}"/pcimodules-${PN}-3.1.0.patch - epatch "${FILESDIR}"/${P}-null-ptr.patch #256464 - epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch - cp "${FILESDIR}"/pcimodules.c . || die - sed -i -e 's:| tr:| LC_ALL=C tr:' lib/configure - sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile -} - -uyesno() { use $1 && echo yes || echo no ; } -pemake() { - emake \ - HOST="${CHOST}" \ - CROSS_COMPILE="${CHOST}-" \ - DNS="yes" \ - IDSDIR="/usr/share/misc" \ - MANDIR="/usr/share/man" \ - PREFIX="/usr" \ - SHARED="yes" \ - STRIP="" \ - ZLIB=$(uyesno zlib) \ - "$@" -} - -src_compile() { - pemake OPT="${CFLAGS}" all pcimodules || die "emake failed" -} - -src_install() { - pemake DESTDIR="${D}" install install-lib || die - dosbin pcimodules || die - doman "${FILESDIR}"/pcimodules.8 - dodoc ChangeLog README TODO - - if use network-cron ; then - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/pciutils.cron update-pciids \ - || die "Failed to install update cronjob" - fi - - # Install both forms until HAL has migrated - if use zlib ; then - local sharedir="${D}/usr/share/misc" - elog "Providing a backwards compatibility non-compressed pci.ids" - gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids - fi - - newinitd "${FILESDIR}"/init.d-pciparm pciparm - newconfd "${FILESDIR}"/conf.d-pciparm pciparm -} diff --git a/sys-apps/pciutils/pciutils-3.1.2.ebuild b/sys-apps/pciutils/pciutils-3.1.2.ebuild deleted file mode 100644 index b35554fadd13..000000000000 --- a/sys-apps/pciutils/pciutils-3.1.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.2.ebuild,v 1.1 2009/02/03 05:35:57 vapier Exp $ - -inherit eutils multilib - -DESCRIPTION="Various utilities dealing with the PCI bus" -HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="network-cron zlib" - -DEPEND="zlib? ( sys-libs/zlib )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/pcimodules-${PN}-3.1.0.patch - epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch - cp "${FILESDIR}"/pcimodules.c . || die - sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile -} - -uyesno() { use $1 && echo yes || echo no ; } -pemake() { - emake \ - HOST="${CHOST}" \ - CROSS_COMPILE="${CHOST}-" \ - DNS="yes" \ - IDSDIR="/usr/share/misc" \ - MANDIR="/usr/share/man" \ - PREFIX="/usr" \ - SHARED="yes" \ - STRIP="" \ - ZLIB=$(uyesno zlib) \ - "$@" -} - -src_compile() { - pemake OPT="${CFLAGS}" all pcimodules || die "emake failed" -} - -src_install() { - pemake DESTDIR="${D}" install install-lib || die - dosbin pcimodules || die - doman "${FILESDIR}"/pcimodules.8 - dodoc ChangeLog README TODO - - if use network-cron ; then - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/pciutils.cron update-pciids \ - || die "Failed to install update cronjob" - fi - - # Install both forms until HAL has migrated - if use zlib ; then - local sharedir="${D}/usr/share/misc" - elog "Providing a backwards compatibility non-compressed pci.ids" - gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids - fi - - newinitd "${FILESDIR}"/init.d-pciparm pciparm - newconfd "${FILESDIR}"/conf.d-pciparm pciparm -} -- 2.26.2