Split pcimodules files apart to share across versions.

5 files changed, 284 insertions, 289 deletions

diff --git a/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch b/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch
index 5d0500f07112..b79f22d36dee 100644
--- a/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch
+++ b/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch
@@ -12,285 +12,3 @@
  lspci.o: lspci.c pciutils.h $(PCIINC)
  setpci.o: setpci.c pciutils.h $(PCIINC)
  common.o: common.c pciutils.h $(PCIINC)
---- pciutils-3.0.0/pcimodules.c
-+++ pciutils-3.0.0/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 "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;
-+}
---- pciutils-3.0.0/pcimodules.man
-+++ pciutils-3.0.0/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/pcimodules.8 b/sys-apps/pciutils/files/pcimodules.8
new file mode 100644
index 000000000000..0cdb5e5b254a
--- /dev/null
+++ b/sys-apps/pciutils/files/pcimodules.8
@@ -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/pcimodules.c b/sys-apps/pciutils/files/pcimodules.c
new file mode 100644
index 000000000000..2271e88f4bab
--- /dev/null
+++ b/sys-apps/pciutils/files/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 "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/pciutils-3.0.0.ebuild b/sys-apps/pciutils/pciutils-3.0.0.ebuild
index e4bc5e233736..d5456315180c 100644
--- a/sys-apps/pciutils/pciutils-3.0.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.11 2008/10/26 03:35:36 vapier Exp $
+# $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
 
@@ -22,6 +22,7 @@ src_unpack() {
 	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
 }
 
@@ -46,7 +47,7 @@ src_compile() {
 src_install() {
 	pemake DESTDIR="${D}" install install-lib || die
 	dosbin pcimodules || die
-	newman pcimodules.man pcimodules.8
+	doman "${FILESDIR}"/pcimodules.8
 
 	if use network-cron ; then
 		exeinto /etc/cron.monthly
diff --git a/sys-apps/pciutils/pciutils-3.0.2.ebuild b/sys-apps/pciutils/pciutils-3.0.2.ebuild
index 00979d2cd82e..94128e1cc026 100644
--- a/sys-apps/pciutils/pciutils-3.0.2.ebuild
+++ b/sys-apps/pciutils/pciutils-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.3 2008/10/19 11:11:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.0.2.ebuild,v 1.4 2009/01/26 03:28:41 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -19,10 +19,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-3.0.0-build.patch #233314
-	#epatch "${FILESDIR}"/${PN}-3.0.0-resolv.patch #218555 #Merged
 	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
 }
 
@@ -47,7 +47,7 @@ src_compile() {
 src_install() {
 	pemake DESTDIR="${D}" install install-lib || die
 	dosbin pcimodules || die
-	newman pcimodules.man pcimodules.8
+	doman pcimodules.8
 	dodoc ChangeLog README TODO
 
 	if use network-cron ; then