path fixing bug #62786
authorDoug Goldstein <cardoe@gentoo.org>
Sat, 9 Oct 2004 08:36:07 +0000 (08:36 +0000)
committerDoug Goldstein <cardoe@gentoo.org>
Sat, 9 Oct 2004 08:36:07 +0000 (08:36 +0000)
sys-apps/pciutils/ChangeLog
sys-apps/pciutils/Manifest
sys-apps/pciutils/files/digest-pciutils-2.1.11-r3 [new file with mode: 0644]
sys-apps/pciutils/files/pciutils-2.1.11-fix-pci-ids-location-refs.patch [new file with mode: 0644]
sys-apps/pciutils/pciutils-2.1.11-r3.ebuild [new file with mode: 0644]

index b5b3c863e5b6c830752e25324ba961d27435af40..702237f492e313b9ce90c2ee0e670974bc5eca49 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.35 2004/09/03 21:03:24 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.36 2004/10/09 08:36:07 cardoe Exp $
+
+*pciutils-2.1.11-r3 (09 Oct 2004)
+
+  09 Oct 2004; Doug Goldstein <cardoe@gentoo.org>
+  +files/pciutils-2.1.11-fix-pci-ids-location-refs.patch,
+  +pciutils-2.1.11-r3.ebuild:
+  path fixing bug #62786
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   pciutils-2.1.11-r1.ebuild:
index bdf3b1d858b29f078f7d377a251739d1f7e08c48..2dc70efbab23a74c9c7a96adabad98ea106b7bf4 100644 (file)
@@ -1,10 +1,23 @@
-MD5 3ba0038377c867f08f9cf2f90b100859 ChangeLog 4688
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 ce79533e91cb25037d69c041062945a8 pciutils-2.1.11-r1.ebuild 1664
-MD5 2380e2fca2ab6252e7520f845c495253 pciutils-2.1.11-r2.ebuild 1770
 MD5 a715840d9c61913486ef33b98fdf654c pciutils-2.1.11.ebuild 1248
-MD5 1532c4c74daf454495048467b2a8b04b files/2.1.11-sysfs.patch 10425
-MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11 67
+MD5 4679ff7ac335c0c54b39b68549e96123 pciutils-2.1.11-r3.ebuild 1852
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 21f7f11cb4dd4c8e2b9b2a17389f0820 ChangeLog 4885
+MD5 2380e2fca2ab6252e7520f845c495253 pciutils-2.1.11-r2.ebuild 1770
+MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r3 67
 MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r1 67
 MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r2 67
+MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11 67
+MD5 1532c4c74daf454495048467b2a8b04b files/2.1.11-sysfs.patch 10425
 MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
+MD5 70f9f6cb767230245ac30ec658b3fd0a files/pciutils-2.1.11-fix-pci-ids-location-refs.patch 925
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBZ6L/Fhz/XBeRBtARAtiLAKCBdEjAVTvvaiXtP195QAqbDIvc0wCcDDcY
+fRqU7zuyWFDfEOwLEbAD5kA=
+=BaoW
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.11-r3 b/sys-apps/pciutils/files/digest-pciutils-2.1.11-r3
new file mode 100644 (file)
index 0000000..5bab57a
--- /dev/null
@@ -0,0 +1 @@
+MD5 1d40f90aaae69594790bdb8ff90b4a41 pciutils-2.1.11.tar.gz 120948
diff --git a/sys-apps/pciutils/files/pciutils-2.1.11-fix-pci-ids-location-refs.patch b/sys-apps/pciutils/files/pciutils-2.1.11-fix-pci-ids-location-refs.patch
new file mode 100644 (file)
index 0000000..dd51f8a
--- /dev/null
@@ -0,0 +1,33 @@
+diff -urN pciutils-2.1.11.orig/lspci.man pciutils-2.1.11/lspci.man
+--- 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
+diff -urN pciutils-2.1.11.orig/update-pciids.man pciutils-2.1.11/update-pciids.man
+--- 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/pciutils-2.1.11-r3.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
new file mode 100644 (file)
index 0000000..f2b064d
--- /dev/null
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 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-r3.ebuild,v 1.1 2004/10/09 08:36:07 cardoe Exp $
+
+inherit eutils flag-o-matic
+
+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="~x86 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE=""
+
+DEPEND="virtual/libc
+       net-misc/wget"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch ${FILESDIR}/pcimodules-${P}.diff
+       epatch ${FILESDIR}/${PV}-sysfs.patch #38645
+       epatch ${FILESDIR}/pciutils-2.1.11-fix-pci-ids-location-refs.patch  # bug #62786
+
+
+       # Unconditionally use -fPIC for libs (#55238)
+       sed -i \
+               -e "/^include/s/$/\nCFLAGS+=-fPIC/" 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"
+
+       ./update-pciids.sh
+}
+
+src_compile() {
+       emake PREFIX=/usr lib || die "emake lib failed"
+
+       cd ${S}/lib
+       sed -i \
+               -e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" config.h \
+               || die "sed config.h failed"
+
+       cd ${S}
+       emake PREFIX=/usr || die "emake failed"
+
+       sed -i \
+               -e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" \
+               update-pciids lspci.8 update-pciids.8 \
+               || die "sed failed"
+}
+
+src_install() {
+       into /
+       dosbin setpci lspci pcimodules update-pciids || die "dosbin failed"
+       doman *.8
+
+       insinto /usr/share/misc
+       doins pci.ids || die
+
+       into /usr
+       dolib lib/libpci.a
+
+       insinto /usr/include/pci
+       doins lib/*.h
+}