Improved the sysfs patch to accomodate dual-kernel-boots; updated copyright years; fixed invalid "ppc64" flags.

4 files changed, 22 insertions, 7 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index fd99e4365ca6..18b01141bfaf 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.20 2004/01/19 04:44:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.21 2004/01/24 18:25:47 plasmaroo Exp $
 
 *pciutils-2.1.11-r1 (18 Jan 2004)
 
@@ -8,6 +8,10 @@
   Add sysfs support (patch from the deb guys) #38645.
   Move libpci.a into /usr/lib/ #36453.
 
+  24 Jan 2004; <plasmaroo@gentoo.org> files/2.1.11-sysfs.patch:
+  Fixed the sysfs patch to happily co-exist on both < 2.4 and 2.6 systems, and not
+  use sysfs on < 2.4 kernels.
+
   15 Jan 2004; Jon Portnoy <avenj@gentoo.org> pciutils-2.1.11.ebuild :
   Stable on AMD64.
 
diff --git a/sys-apps/pciutils/files/2.1.11-sysfs.patch b/sys-apps/pciutils/files/2.1.11-sysfs.patch
index 39dc36f9ece8..b154736cd4ca 100644
--- a/sys-apps/pciutils/files/2.1.11-sysfs.patch
+++ b/sys-apps/pciutils/files/2.1.11-sysfs.patch
@@ -72,9 +72,9 @@ unchanged:
 unchanged:
 --- pciutils-2.1.11.orig/lib/sysfs.c
 +++ pciutils-2.1.11/lib/sysfs.c
-@@ -0,0 +1,281 @@
+@@ -0,0 +1,292 @@
 +/*
-+ *	$Id: 2.1.11-sysfs.patch,v 1.1 2004/01/19 04:44:03 vapier Exp $
++ *	$Id: 2.1.11-sysfs.patch,v 1.2 2004/01/24 18:25:47 plasmaroo Exp $
 + *
 + *	The PCI Library -- Configuration Access via /sys/bus/pci
 + *
@@ -94,6 +94,7 @@ unchanged:
 +#include <dirent.h>
 +#include <fcntl.h>
 +#include <sys/types.h>
++#include <sys/utsname.h>
 +
 +#include "internal.h"
 +
@@ -169,6 +170,16 @@ unchanged:
 +
 +static int sysfs_detect(struct pci_access *a)
 +{
++	struct utsname buf;
++	int major, minor, patch;
++	if(uname(&buf) != 0 || sscanf(buf.release, "%d.%d.%d", &major, &minor, &patch) < 3)
++	{
++		a->warning("Cannot determine kernel version; attempting sysfs support...");
++		return 1;
++	}
++	if(major < 2 || (( major == 2 ) && ( minor < 6 )))
++		return 0;
++
 +	if (access(SYSFS_PATH_ROOT, R_OK))
 +		return 0;
 +	if (access(SYSFS_PATH, R_OK)) {
diff --git a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
index b4e885590d8e..379350c3dc2f 100644
--- a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild,v 1.12 2004/01/24 18:25:47 plasmaroo Exp $
 
 inherit eutils
 
diff --git a/sys-apps/pciutils/pciutils-2.1.11.ebuild b/sys-apps/pciutils/pciutils-2.1.11.ebuild
index ccbbe948a14f..d7f9fef8ae3f 100644
--- a/sys-apps/pciutils/pciutils-2.1.11.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11.ebuild,v 1.8 2004/01/15 05:16:13 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11.ebuild,v 1.9 2004/01/24 18:25:47 plasmaroo Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~ppc sparc alpha hppa ~arm ia64 ppc64"
+KEYWORDS="x86 amd64 ~ppc sparc alpha hppa ~arm ia64 ~ppc64"
 
 DEPEND="virtual/glibc
 	net-misc/wget"