Clean up the pci.ids location patch, add a tiny patch from fedora to fix segfault when pci bus is missing, and make sure pciutils respects $AR/$CC/$RANLIB.

(Portage version: 2.0.51-r15)

6 files changed, 151 insertions, 2 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 39195f9de990..b67fcc86a69c 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.40 2005/01/20 22:45:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.41 2005/01/31 04:08:03 vapier Exp $
+
+*pciutils-2.1.11-r4 (30 Jan 2005)
+
+  30 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.1.11-fix-pci-ids-location-refs.patch, +files/2.1.11-scan.patch,
+  +pciutils-2.1.11-r4.ebuild:
+  Clean up the pci.ids location patch, add a tiny patch from fedora to fix
+  segfault when pci bus is missing, and make sure pciutils respects
+  $AR/$CC/$RANLIB.
 
   20 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   pciutils-2.1.11-r3.ebuild:
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 0664594a2e94..e6b7e4ed4e60 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,9 +1,11 @@
 MD5 98f67a3de771602e3f28f19fdc0fa011 ChangeLog 5488
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 8f313a400d387b25b966fc29640d8310 pciutils-2.1.11-r1.ebuild 1663
-MD5 556837bd636ca36585313ec34354893c pciutils-2.1.11-r3.ebuild 2110
+MD5 4dca235adf8ee4c47b0ed73c3f4cd2d7 pciutils-2.1.11-r4.ebuild 2308
 MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
 MD5 1532c4c74daf454495048467b2a8b04b files/2.1.11-sysfs.patch 10425
 MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r1 67
+MD5 a6be9cf60dc5043160d757c9772b1e57 files/digest-pciutils-2.1.11-r4 131
 MD5 a6be9cf60dc5043160d757c9772b1e57 files/digest-pciutils-2.1.11-r3 131
 MD5 70f9f6cb767230245ac30ec658b3fd0a files/pciutils-2.1.11-fix-pci-ids-location-refs.patch 925
+MD5 60d79fbf53038186b939f83841d5f318 files/pciutils-2.1.11-scan.patch 277
diff --git a/sys-apps/pciutils/files/2.1.11-fix-pci-ids-location-refs.patch b/sys-apps/pciutils/files/2.1.11-fix-pci-ids-location-refs.patch
new file mode 100644
index 000000000000..d9a7718cd041
--- /dev/null
+++ b/sys-apps/pciutils/files/2.1.11-fix-pci-ids-location-refs.patch
@@ -0,0 +1,46 @@
+--- pciutils-2.1.11.orig/lib/configure	2004-08-30 14:37:52.623313920 -0500
++++ pciutils-2.1.11/lib/configure	2004-08-30 14:38:58.500299096 -0500
+@@ -98,6 +98,6 @@
+ if [ -z "$ok" ] ; then
+ 	echo "WARNING: No real configuration access method is available."
+ fi
+-echo >>$c "#define PATH_PCI_IDS \"$sharedir/pci.ids\""
++echo >>$c "#define PATH_PCI_IDS \"$sharedir/misc/pci.ids\""
+ echo >>$c "#define PCILIB_VERSION \"$version\""
+ sed '/^#define [^ ]*$/!d;s/^#define \(.*\)/\1=1/' <$c >config.mk
+--- pciutils-2.1.11.orig/Makefile	2004-08-30 14:37:52.623313920 -0500
++++ pciutils-2.1.11/Makefile	2004-08-30 14:38:58.500299096 -0500
+@@ -52,1 +52,1 @@
+-	sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/pci.ids@"
++	sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/misc/pci.ids@"
+--- pciutils-2.1.11.orig/lspci.man	2004-08-30 14:37:52.623313920 -0500
++++ pciutils-2.1.11/lspci.man	2004-08-30 14:38:58.500299096 -0500
+@@ -70,7 +70,7 @@
+ Use
+ .B
+ <file>
+-as PCI ID database instead of /usr/share/pci.ids.
++as PCI ID database instead of /usr/share/misc/pci.ids.
+ .TP
+ .B -p <dir>
+ Use
+@@ -131,7 +131,7 @@
+ 
+ .SH FILES
+ .TP
+-.B @SHAREDIR@/pci.ids
++.B @SHAREDIR@/misc/pci.ids
+ A list of all known PCI ID's (vendors, devices, classes and subclasses).
+ .TP
+ .B /proc/bus/pci
+--- pciutils-2.1.11.orig/update-pciids.man	2004-08-30 14:37:52.634312248 -0500
++++ pciutils-2.1.11/update-pciids.man	2004-08-30 14:39:53.749899880 -0500
+@@ -17,7 +17,7 @@
+ 
+ .SH FILES
+ .TP
+-.B @SHAREDIR@/pci.ids
++.B @SHAREDIR@/misc/pci.ids
+ Here we install the new list.
+ 
+ .SH SEE ALSO
diff --git a/sys-apps/pciutils/files/2.1.11-scan.patch b/sys-apps/pciutils/files/2.1.11-scan.patch
new file mode 100644
index 000000000000..590c21dd1902
--- /dev/null
+++ b/sys-apps/pciutils/files/2.1.11-scan.patch
@@ -0,0 +1,12 @@
+--- pciutils-2.1.10/lib/access.c.foo	Wed Feb 12 15:44:05 2003
++++ pciutils-2.1.10/lib/access.c	Wed Feb 12 15:44:33 2003
+@@ -180,7 +180,8 @@
+ void
+ pci_scan_bus(struct pci_access *a)
+ {
+-  a->methods->scan(a);
++  if (a->methods)
++    a->methods->scan(a);
+ }
+ 
+ struct pci_dev *
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.11-r4 b/sys-apps/pciutils/files/digest-pciutils-2.1.11-r4
new file mode 100644
index 000000000000..7176fddcbf74
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.1.11-r4
@@ -0,0 +1,2 @@
+MD5 1d40f90aaae69594790bdb8ff90b4a41 pciutils-2.1.11.tar.gz 120948
+MD5 29d45fd4f233e88fabe08fd2ac4d8ccf pci.ids-20041019.bz2 86174
diff --git a/sys-apps/pciutils/pciutils-2.1.11-r4.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r4.ebuild
new file mode 100644
index 000000000000..07c07656ee5b
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.1.11-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r4.ebuild,v 1.1 2005/01/31 04:08:03 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+STAMP=20041019
+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
+	mirror://gentoo/pci.ids-${STAMP}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/pcimodules-${P}.diff
+	epatch ${FILESDIR}/${PV}-sysfs.patch #38645
+	epatch ${FILESDIR}/${PV}-fix-pci-ids-location-refs.patch #62786
+	epatch ${FILESDIR}/${PV}-scan.patch #from fedora
+
+	# Unconditionally use -fPIC for libs (#55238)
+	# Make sure we respect $AR / $RANLIB / $CFLAGS
+	sed -i \
+		-e "/^include/s/$/\nCFLAGS+=-fPIC/" \
+		-e '/ar rcs/s:ar:$(AR):' \
+		-e 's:ranlib:$(RANLIB):' \
+		lib/Makefile \
+		|| die "sed lib/Makefile failed"
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" Makefile \
+		|| die "sed Makefile failed"
+
+	# fix command line overflow which did not allow for null terminator
+	# when using  lspci -vvv (AGPx1 and AGPx2 and AGPx4) bug #41422
+	sed -i -e s/'rate\[8\]'/'rate\[9\]'/g lspci.c \
+		|| die "sed failed on lspci.c"
+
+	ebegin "Updating pci.ids"
+	if ! ./update-pciids.sh &> /dev/null ; then
+		# if we cant update, use a cached version
+		mv ${WORKDIR}/pci.ids-${STAMP} ${S}/pci.ids
+	fi
+	eend 0
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+	cd ${S}/lib
+	./configure || die "lib configure failed"
+	cd ${S}
+	# we run the lib target ourselves to work around broken 
+	# dependency tracking inside of the makefile
+	emake PREFIX=/usr lib || die "emake lib failed"
+	emake PREFIX=/usr || die "emake failed"
+}
+
+src_install() {
+	into /
+	dosbin setpci lspci pcimodules update-pciids || die "dosbin failed"
+	doman *.8
+
+	insinto /usr/share/misc
+	doins pci.ids || die "pciids failed"
+
+	into /usr
+	dolib lib/libpci.a || die "libpci failed"
+
+	insinto /usr/include/pci
+	doins lib/*.h || die "headers failed"
+}