Version bump.

(Portage version: 2.1.3_rc3)

5 files changed, 383 insertions, 1 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 342eab6f6300..149705287876 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.105 2007/06/15 13:35:56 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.106 2007/06/22 17:17:15 vapier Exp $
+
+*pciutils-2.2.6 (22 Jun 2007)
+
+  22 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-2.2.6-link.patch, +files/pcimodules-pciutils-2.2.6.patch,
+  +pciutils-2.2.6.ebuild:
+  Version bump.
 
   15 Jun 2007; Christoph Mende <angelos@gentoo.org>
   pciutils-2.2.4-r3.ebuild:
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.2.6 b/sys-apps/pciutils/files/digest-pciutils-2.2.6
new file mode 100644
index 000000000000..efee508018c5
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.2.6
@@ -0,0 +1,3 @@
+MD5 e26593ab38ef9ae4457826be9e35aff8 pciutils-2.2.6.tar.gz 226049
+RMD160 9f184affb481e51ca59134f5fd72259cf5e16298 pciutils-2.2.6.tar.gz 226049
+SHA256 30019fa23996429d3bedaa1b30e32b9ddcd2eaa4fe39ec015d533af6afc0ee6b pciutils-2.2.6.tar.gz 226049
diff --git a/sys-apps/pciutils/files/pcimodules-pciutils-2.2.6.patch b/sys-apps/pciutils/files/pcimodules-pciutils-2.2.6.patch
new file mode 100644
index 000000000000..a86accaa8014
--- /dev/null
+++ b/sys-apps/pciutils/files/pcimodules-pciutils-2.2.6.patch
@@ -0,0 +1,318 @@
+--- pciutils-2.2.6/Makefile
++++ pciutils-2.2.6/Makefile
+@@ -24,7 +24,7 @@
+ 
+ export
+ 
+-all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 $(PCI_IDS)
++all: $(PCILIB) lspci setpci pcimodules lspci.8 setpci.8 update-pciids update-pciids.8 pcimodules.8 $(PCI_IDS)
+ 
+ $(PCILIB): $(PCIINC) force
+ 	$(MAKE) -C lib all
+@@ -34,9 +34,11 @@
+ lib/config.h lib/config.mk:
+ 	cd lib && ./configure "$(IDSDIR)" "$(VERSION)" "$(HOST)" "$(RELEASE)" "$(ZLIB)"
+ 
++pcimodules: pcimodules.o common.o $(PCILIB)
+ lspci: lspci.o common.o $(PCILIB)
+ setpci: setpci.o common.o $(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)
+@@ -58,10 +60,10 @@
+ install: all
+ # -c is ignored on Linux, but required on FreeBSD
+ 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8
+-	$(INSTALL) -c -m 755 -s lspci setpci $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -c -m 755 lspci setpci pcimodules $(DESTDIR)$(SBINDIR)
+ 	$(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
+ 	$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
+-	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
++	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 pcimodules.8 $(DESTDIR)$(MANDIR)/man8
+ 
+ install-lib: $(PCIINC_INS) $(PCILIB) $(PCILIBPC)
+ 	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR)
+--- pciutils-2.2.6/pcimodules.c
++++ pciutils-2.2.6/pcimodules.c
+@@ -0,0 +1,184 @@
++/*
++ *	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 <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/utsname.h>
++#include <sys/param.h>
++#include <sys/types.h>
++
++#define _GNU_SOURCE
++#include <getopt.h>
++
++#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 "h"
++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;
++}
+--- pciutils-2.2.6/pcimodules.man
++++ pciutils-2.2.6/pcimodules.man
+@@ -0,0 +1,92 @@
++.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/<kernel-version>/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 <mj@suse.cz>.
++
++.SH AUTHOR
++.B pcimodules
++was written by Adam J. Richter <adam@yggdrasil.com>, based on public
++domain example code by Martin Mares <mj@suse.cz>.
++
++.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/pciutils-2.2.6-link.patch b/sys-apps/pciutils/files/pciutils-2.2.6-link.patch
new file mode 100644
index 000000000000..0bb2d3bf1a1a
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-2.2.6-link.patch
@@ -0,0 +1,11 @@
+--- pciutils-2.2.4/lib/configure
++++ pciutils-2.2.4/lib/configure
+@@ -119,7 +119,7 @@
+ 	echo >>$c '#define PCI_COMPRESSED_IDS'
+ 	echo >>$c '#define PCI_IDS "pci.ids.gz"'
+ 	echo >>$m 'LIBZ=-lz'
+-	echo >>$m 'LDFLAGS+=$(LIBZ)'
++	echo >>$m 'LDLIBS+=$(LIBZ)'
+ else
+ 	echo >>$c '#define PCI_IDS "pci.ids"'
+ fi
diff --git a/sys-apps/pciutils/pciutils-2.2.6.ebuild b/sys-apps/pciutils/pciutils-2.2.6.ebuild
new file mode 100644
index 000000000000..d1af42fda7f7
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.2.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.6.ebuild,v 1.1 2007/06/22 17:17:15 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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}-2.2.3-build.patch
+	epatch "${FILESDIR}"/pcimodules-${PN}-2.2.6.patch
+	epatch "${FILESDIR}"/${PN}-2.2.6-link.patch #160421
+	epatch "${FILESDIR}"/${PN}-2.2.4-update-pciids.patch
+}
+
+src_compile() {
+	export ZLIB=$(use zlib && echo yes || echo no)
+	tc-export AR CC RANLIB
+	emake OPT="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	dolib lib/libpci.* || die "libpci failed"
+	insinto /usr/include/pci
+	doins lib/{config,header,pci,types}.h || die "headers failed"
+
+	use network-cron || return 0
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/pciutils.cron update-pciids || die
+}