try to update pci.ids, but if it fails, use cached version #43484

4 files changed, 36 insertions, 15 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 67561a2a1979..1faff8849740 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.37 2004/10/14 21:07:40 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.38 2004/10/19 14:54:28 vapier Exp $
+
+  19 Oct 2004; Mike Frysinger <vapier@gentoo.org> pciutils-2.1.11-r3.ebuild:
+  Try to grab latest pci.ids file, but if that fails, use a cached version
+  #43484 by Spider.
 
   14 Oct 2004; <plasmaroo@gentoo.org> pciutils-2.1.11-r3.ebuild:
   Fixing the position of "emake lib" since under certain conditions lspci and
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 3ba28a630b4d..e8de32e3994b 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,13 +1,23 @@
-MD5 07d3f3e9e855bcb455448c1bdddc33ff ChangeLog 5108
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8fde6f472587e13da9b2b934bd38ce8b ChangeLog 5278
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 ce79533e91cb25037d69c041062945a8 pciutils-2.1.11-r1.ebuild 1664
-MD5 d84b02b16fc1ea2fd1ee5a79cf2cf6e0 pciutils-2.1.11-r3.ebuild 1866
 MD5 a715840d9c61913486ef33b98fdf654c pciutils-2.1.11.ebuild 1248
+MD5 ce79533e91cb25037d69c041062945a8 pciutils-2.1.11-r1.ebuild 1664
 MD5 2380e2fca2ab6252e7520f845c495253 pciutils-2.1.11-r2.ebuild 1770
-MD5 1532c4c74daf454495048467b2a8b04b files/2.1.11-sysfs.patch 10425
-MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r3 67
-MD5 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r2 67
+MD5 c17847ea94b6b6d406b87591efee12de pciutils-2.1.11-r3.ebuild 2048
 MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
-MD5 70f9f6cb767230245ac30ec658b3fd0a files/pciutils-2.1.11-fix-pci-ids-location-refs.patch 925
-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 be96d45f9e9ed5a1580bc6583f8c0023 files/digest-pciutils-2.1.11-r1 67
+MD5 a6be9cf60dc5043160d757c9772b1e57 files/digest-pciutils-2.1.11-r3 131
+MD5 1532c4c74daf454495048467b2a8b04b files/2.1.11-sysfs.patch 10425
+MD5 70f9f6cb767230245ac30ec658b3fd0a files/pciutils-2.1.11-fix-pci-ids-location-refs.patch 925
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBdSrWHTu7gpaalycRAmgxAKC6M5PkD4ykB6iW3E3nI+112jHw1QCgjbsq
+NP4fx72eGJpJszOW6O4kwSw=
+=rPUk
+-----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
index 5bab57abb8f5..7176fddcbf74 100644
--- a/sys-apps/pciutils/files/digest-pciutils-2.1.11-r3
+++ b/sys-apps/pciutils/files/digest-pciutils-2.1.11-r3
@@ -1 +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-r3.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
index 1757385708f1..848b61e25047 100644
--- a/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
@@ -1,20 +1,21 @@
 # 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.2 2004/10/14 21:07:40 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild,v 1.3 2004/10/19 14:54:28 vapier Exp $
 
 inherit eutils flag-o-matic
 
+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"
+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="~x86 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~amd64 ~ia64 ~ppc64"
 IUSE=""
 
-DEPEND="virtual/libc
-	net-misc/wget"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -22,7 +23,7 @@ src_unpack() {
 
 	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
+	epatch ${FILESDIR}/pciutils-2.1.11-fix-pci-ids-location-refs.patch #62786
 
 	# Unconditionally use -fPIC for libs (#55238)
 	sed -i \
@@ -38,7 +39,12 @@ src_unpack() {
 	sed -i -e s/'rate\[8\]'/'rate\[9\]'/g lspci.c \
 		|| die "sed failed on lspci.c"
 
-	./update-pciids.sh
+	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() {