Add a -q (quiet) flag to update-pciids and have th cronjob use it #164800 by Horst...

Package-Manager: portage-2.1.2-r9

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 9326804d26572975816875505f1d8879b9f21766..bf812dfcb53a61f3ccd73b137da5c8c34bef9bb1 100644 (file)
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.90 2007/01/07 01:40:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.91 2007/02/10 00:30:42 vapier Exp $
+
+*pciutils-2.2.4-r1 (10 Feb 2007)
+
+  10 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-2.2.4-update-pciids.patch, files/pciutils.cron,
+  +pciutils-2.2.4-r1.ebuild:
+  Add a -q (quiet) flag to update-pciids and have th cronjob use it #164800 by
+  Horst Prote.
 
   07 Jan 2007; Mike Frysinger <vapier@gentoo.org>
   files/pciutils-2.2.4-link.patch:

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index f41793b172b88478c0ef297136058e086a39e488..ab7d35b219745f4a054d4cb9d5e1a88630f800f1 100644 (file)
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -17,24 +17,32 @@ AUX pciutils-2.2.4-link.patch 302 RMD160 6598b88179822c617ffecc5ebbebcef9e317a5f
 MD5 7fa89d4d935f43d422ee93056c09f5fc files/pciutils-2.2.4-link.patch 302
 RMD160 6598b88179822c617ffecc5ebbebcef9e317a5fe files/pciutils-2.2.4-link.patch 302
 SHA256 bbb645104dc4d0c8f5b586e929927320ce352e0118a38373e1627a43239e6721 files/pciutils-2.2.4-link.patch 302
-AUX pciutils.cron 39 RMD160 7dacb4dbca3f070a6d5b345789f693be90f93be2 SHA1 44a1c0e2b38e7a6cf2141177c43c8f1c0ab649a4 SHA256 22d6d2b7652cbb619cdfcc66ba3c4940a87879e4ec02873aeb87ed90117c8960
-MD5 c3b62d37547d69b21e95f35ed4c6ed7d files/pciutils.cron 39
-RMD160 7dacb4dbca3f070a6d5b345789f693be90f93be2 files/pciutils.cron 39
-SHA256 22d6d2b7652cbb619cdfcc66ba3c4940a87879e4ec02873aeb87ed90117c8960 files/pciutils.cron 39
+AUX pciutils-2.2.4-update-pciids.patch 914 RMD160 d01ee7ee079af7d55f62937308c7c0d306782fe4 SHA1 c8b629ceb36d29be319721b14ae4ef04510bd018 SHA256 e5a9c41972d719018cb05929899b1dfcfcdd532835e77fbf5df95493691e5c3d
+MD5 24444f21a1dda824dc16f1359f952745 files/pciutils-2.2.4-update-pciids.patch 914
+RMD160 d01ee7ee079af7d55f62937308c7c0d306782fe4 files/pciutils-2.2.4-update-pciids.patch 914
+SHA256 e5a9c41972d719018cb05929899b1dfcfcdd532835e77fbf5df95493691e5c3d files/pciutils-2.2.4-update-pciids.patch 914
+AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
+MD5 1d5918bb3ca1f28c8af745b60726565a files/pciutils.cron 42
+RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee files/pciutils.cron 42
+SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836 files/pciutils.cron 42
 DIST pciutils-2.2.3.tar.gz 1121334 RMD160 429b3b21f4cb079c2f3620a4c4d14c6dc610a098 SHA1 114b811d176c125ebdd3d10b6e7bf6d09686b780 SHA256 e501df7734738d0625a3765498e1c4625a2fbaf408c86599eca2070c57bc4d4b
 DIST pciutils-2.2.4.tar.gz 210706 RMD160 27db4b23a07a02b28b64e01fbe1c74cefa887cc0 SHA1 c20dfa13bbd3d04ce921294c51e3da94140cea8b SHA256 62fc07f688c6d17f0cf8baa540e42be6117530360c2df491ec02031973506a9f
 EBUILD pciutils-2.2.3-r2.ebuild 1105 RMD160 a62ab053b2b06a6c97fd083a547a9109ec0888cb SHA1 21db88f7c178f928b7cac3aaf3f518f052f9038f SHA256 8292bfde52c50795fefc8d0f14a9a6ddd3c4fd628977e94759e33614a2822efb
 MD5 d523189f320d388c4efaebf6b7f96338 pciutils-2.2.3-r2.ebuild 1105
 RMD160 a62ab053b2b06a6c97fd083a547a9109ec0888cb pciutils-2.2.3-r2.ebuild 1105
 SHA256 8292bfde52c50795fefc8d0f14a9a6ddd3c4fd628977e94759e33614a2822efb pciutils-2.2.3-r2.ebuild 1105
+EBUILD pciutils-2.2.4-r1.ebuild 1192 RMD160 820bb152d0508602eafac5b528c3d77fd4337c19 SHA1 2ead8616fc59638edd057d59e26b458a0f64539e SHA256 2c3d5d23f33479966cd0a6f9d70497965dd450ad595792f146b82babe6b792fe
+MD5 0fe7e700da28b03afeaa3c72019bb0af pciutils-2.2.4-r1.ebuild 1192
+RMD160 820bb152d0508602eafac5b528c3d77fd4337c19 pciutils-2.2.4-r1.ebuild 1192
+SHA256 2c3d5d23f33479966cd0a6f9d70497965dd450ad595792f146b82babe6b792fe pciutils-2.2.4-r1.ebuild 1192
 EBUILD pciutils-2.2.4.ebuild 1142 RMD160 4bf1e0c10aac94938be03e198ffc4f692271a8e1 SHA1 b73ea6ac8b4a5f4f5f78b2ad637f5b779bc4379d SHA256 2b2951b48d571339f443a439f80f59667044b16df73be0a52a5ccfe1956a42fa
 MD5 c5c31f03ef1a7c589e9eccec6d6fe563 pciutils-2.2.4.ebuild 1142
 RMD160 4bf1e0c10aac94938be03e198ffc4f692271a8e1 pciutils-2.2.4.ebuild 1142
 SHA256 2b2951b48d571339f443a439f80f59667044b16df73be0a52a5ccfe1956a42fa pciutils-2.2.4.ebuild 1142
-MISC ChangeLog 11849 RMD160 a7fa0dc4e392700baefc70a25effbfe772face47 SHA1 7873a0315839c7d2707d763b5f594ea6f39e4dfd SHA256 cdfda37286a6075c9c1dae60419d11ec25039120343af1b0419481b12c03b824
-MD5 b49c7707bb7b97615e30b6874c500ba6 ChangeLog 11849
-RMD160 a7fa0dc4e392700baefc70a25effbfe772face47 ChangeLog 11849
-SHA256 cdfda37286a6075c9c1dae60419d11ec25039120343af1b0419481b12c03b824 ChangeLog 11849
+MISC ChangeLog 12123 RMD160 a10e064b12a42fa3bbf19cb386ef7bdd8c63bb08 SHA1 6c7f316af33caa8200f83faa52f47a1a298ebdfd SHA256 cb4ec3fce504d93ecd8bb2ff7ff4af213374e1accf59a3351efb95ce00751080
+MD5 e831049dc299e299400e1c28678c2c80 ChangeLog 12123
+RMD160 a10e064b12a42fa3bbf19cb386ef7bdd8c63bb08 ChangeLog 12123
+SHA256 cb4ec3fce504d93ecd8bb2ff7ff4af213374e1accf59a3351efb95ce00751080 ChangeLog 12123
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -45,10 +53,13 @@ SHA256 d324a01ceda5ec89460a4c5691661b105c38966ded150b3146bc00e806912993 files/di
 MD5 8047d659733954340720ecb0b723fad1 files/digest-pciutils-2.2.4 244
 RMD160 8349223dbbf327febd748b605899805650b1bb85 files/digest-pciutils-2.2.4 244
 SHA256 ae83c0072554b83b7519828f5470144cfa69ca5605ed319117d5400896258701 files/digest-pciutils-2.2.4 244
+MD5 8047d659733954340720ecb0b723fad1 files/digest-pciutils-2.2.4-r1 244
+RMD160 8349223dbbf327febd748b605899805650b1bb85 files/digest-pciutils-2.2.4-r1 244
+SHA256 ae83c0072554b83b7519828f5470144cfa69ca5605ed319117d5400896258701 files/digest-pciutils-2.2.4-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFoE+d8bi6rjpTunYRAtNSAKCXTyk0uwqUVF4ubPjFJSfhZMyaZgCgrBL7
-GmKdj6Lk2aBVpiRSBdAJfvo=
-=IPG/
+iD8DBQFFzRJB8bi6rjpTunYRAow1AKC4qbN5ffj2rgDe2uFZfjOpKTfNjQCguEl2
+6Nj8akWi32T1tC+ZYqd8YD0=
+=4fZo
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/pciutils/files/digest-pciutils-2.2.4-r1 b/sys-apps/pciutils/files/digest-pciutils-2.2.4-r1
new file mode 100644 (file)
index 0000000..1ce6822
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.2.4-r1
@@ -0,0 +1,3 @@
+MD5 5629fdb049f189fb853e7021f85553d2 pciutils-2.2.4.tar.gz 210706
+RMD160 27db4b23a07a02b28b64e01fbe1c74cefa887cc0 pciutils-2.2.4.tar.gz 210706
+SHA256 62fc07f688c6d17f0cf8baa540e42be6117530360c2df491ec02031973506a9f pciutils-2.2.4.tar.gz 210706

diff --git a/sys-apps/pciutils/files/pciutils-2.2.4-update-pciids.patch b/sys-apps/pciutils/files/pciutils-2.2.4-update-pciids.patch
new file mode 100644 (file)
index 0000000..f875f8a
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-2.2.4-update-pciids.patch
@@ -0,0 +1,41 @@
+--- update-pciids.sh
++++ update-pciids.sh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++[ "$1" = "-q" ] && quiet="true" || quiet="false"
++
+ set -e
+ SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
+ DEST=pci.ids
+@@ -8,6 +8,13 @@
+ PCI_COMPRESSED_IDS=
+ GREP=grep
+ 
++# if pci.ids is read-only (because the filesystem is read-only),
++# then just skip this whole process.
++if ! touch ${DEST} >&2 >/dev/null ; then
++      ${quiet} || echo "${DEST} is read-only, exiting."
++      exit 0
++fi
++
+ if [ -n "$PCI_COMPRESSED_IDS" ] ; then
+       DECOMP="cat"
+       SRC="$SRC.gz"
+@@ -22,8 +24,10 @@
+ 
+ if which curl >/dev/null ; then
+       DL="curl -o $DEST.new $SRC"
++    ${quiet} && DL="$DL -s -S"
+ elif which wget >/dev/null ; then
+       DL="wget -O $DEST.new $SRC"
++      ${quiet} && DL="$DL -q"
+ elif which lynx >/dev/null ; then
+       DL="eval lynx -source $SRC >$DEST.new"
+ else
+@@ -59,4 +66,4 @@
+ mv $DEST.neww $DEST
+ rm $DEST.new
+ 
+-echo "Done."
++${quiet} || echo "Done."

diff --git a/sys-apps/pciutils/files/pciutils.cron b/sys-apps/pciutils/files/pciutils.cron
index 8d41816dbe5fe72f02c00d0c81bf792aee9362d3..4c694236525335acdd7560bdb28921a1915f0199 100755 (executable)
--- a/sys-apps/pciutils/files/pciutils.cron
+++ b/sys-apps/pciutils/files/pciutils.cron
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/sbin/update-pciids
+exec /usr/sbin/update-pciids -q

diff --git a/sys-apps/pciutils/pciutils-2.2.4-r1.ebuild b/sys-apps/pciutils/pciutils-2.2.4-r1.ebuild
new file mode 100644 (file)
index 0000000..1c73171
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.2.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.4-r1.ebuild,v 1.1 2007/02/10 00:30:42 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${PN}-2.2.3-build.patch
+       epatch "${FILESDIR}"/pcimodules-${PN}-2.2.4.patch
+       epatch "${FILESDIR}"/${P}-link.patch #160421
+       epatch "${FILESDIR}"/${P}-update-pciids.patch
+}
+
+src_compile() {
+       tc-export AR CC RANLIB
+       emake OPT="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+       emake install DESTDIR="${D}" || die
+
+       dolib lib/libpci.* || die "libpci failed"
+       insinto /usr/include/pci
+       doins lib/{config,header,pci,types}.h || die "headers failed"
+
+       exeinto /etc/cron.monthly
+       newexe "${FILESDIR}"/pciutils.cron update-pciids || die
+}