Improve update-pciids some more in quiet mode and in cleaning up after itself #164800...

Package-Manager: portage-2.1.2-r9

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 2ef60381b48b61eadca621ade99241e753a27587..098703904bb3f0cdaeed23f388ecb9ca3c067ba7 100644 (file)
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.94 2007/02/14 07:14:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.95 2007/02/14 22:45:12 vapier Exp $
+
+*pciutils-2.2.4-r2 (14 Feb 2007)
+
+  14 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+  files/pciutils-2.2.4-update-pciids.patch, +pciutils-2.2.4-r2.ebuild:
+  Improve update-pciids some more in quiet mode and in cleaning up after
+  itself #164800 by Horst Prote.
 
   14 Feb 2007; Mike Frysinger <vapier@gentoo.org> pciutils-2.2.4.ebuild,
   pciutils-2.2.4-r1.ebuild:

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index d1554db1c6f364ee4953e3dbe3de45d1d28f88ec..91ac019c0ea14e913bf9c47f87c0b040b6f23d8a 100644 (file)
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -17,10 +17,10 @@ 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-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-2.2.4-update-pciids.patch 1484 RMD160 d76ebecb8bdbeef34f3acabb282c77347fd73014 SHA1 783d472b49ac8e215eef92dbd3c1378806297c2e SHA256 ffed29675abdc08edccc2a7ca31ebd2009a7d0ca1c4d44db655b2466a8f763c8
+MD5 bb7a47f04e2578b6cdfe2c23e18728fe files/pciutils-2.2.4-update-pciids.patch 1484
+RMD160 d76ebecb8bdbeef34f3acabb282c77347fd73014 files/pciutils-2.2.4-update-pciids.patch 1484
+SHA256 ffed29675abdc08edccc2a7ca31ebd2009a7d0ca1c4d44db655b2466a8f763c8 files/pciutils-2.2.4-update-pciids.patch 1484
 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
 MD5 1d5918bb3ca1f28c8af745b60726565a files/pciutils.cron 42
 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee files/pciutils.cron 42
@@ -31,18 +31,18 @@ EBUILD pciutils-2.2.3-r2.ebuild 1105 RMD160 a62ab053b2b06a6c97fd083a547a9109ec08
 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 1267 RMD160 d9b2cfe028e2b21d3cca84de159a997d3638b34b SHA1 415d11b8279b145b0b6eb75059b82aa0efc01ae1 SHA256 59bad16cf81f8dbccd9569b9b51c268b1fa312582618659214f02f30ecf56761
-MD5 f658769cf3e6264d159b8fb65ea24dbf pciutils-2.2.4-r1.ebuild 1267
-RMD160 d9b2cfe028e2b21d3cca84de159a997d3638b34b pciutils-2.2.4-r1.ebuild 1267
-SHA256 59bad16cf81f8dbccd9569b9b51c268b1fa312582618659214f02f30ecf56761 pciutils-2.2.4-r1.ebuild 1267
+EBUILD pciutils-2.2.4-r2.ebuild 1310 RMD160 db0fe245ec2961821b84f9c182eb5c9b3a3e0e06 SHA1 fce67bdc3f99d43a1d85b964d81e9ae12102010a SHA256 5b36ec977e50b6b126ab484d6f7b59f949181567798535f6c6c0a8ecd0899df7
+MD5 5fd8f73e8d5013517fe1705bcd6d42e1 pciutils-2.2.4-r2.ebuild 1310
+RMD160 db0fe245ec2961821b84f9c182eb5c9b3a3e0e06 pciutils-2.2.4-r2.ebuild 1310
+SHA256 5b36ec977e50b6b126ab484d6f7b59f949181567798535f6c6c0a8ecd0899df7 pciutils-2.2.4-r2.ebuild 1310
 EBUILD pciutils-2.2.4.ebuild 1216 RMD160 d6a674f1c216bc98e666dbca49bf4d4c0cf63cf0 SHA1 cf4d0c46e75ab3de5238e02dd2229d576ed6c692 SHA256 510cdb4bf7aebcabcbb5cdba13f99697d357fc83c4ef8ab4ff62a4e05ddaca0d
 MD5 98495ca258c2734d0d4a6c78d8d60e4d pciutils-2.2.4.ebuild 1216
 RMD160 d6a674f1c216bc98e666dbca49bf4d4c0cf63cf0 pciutils-2.2.4.ebuild 1216
 SHA256 510cdb4bf7aebcabcbb5cdba13f99697d357fc83c4ef8ab4ff62a4e05ddaca0d pciutils-2.2.4.ebuild 1216
-MISC ChangeLog 12350 RMD160 0d052d44943e83055c4f39a8686b547ae9f3bfec SHA1 0ef27030b680b6b02abce53e591f370e3f87bf6e SHA256 df546094dd9d396fdd2ec5b31503b81ce8f35406927141d855b76f27796384dd
-MD5 8aff6b0bfc06bb7e866c6d76107ad593 ChangeLog 12350
-RMD160 0d052d44943e83055c4f39a8686b547ae9f3bfec ChangeLog 12350
-SHA256 df546094dd9d396fdd2ec5b31503b81ce8f35406927141d855b76f27796384dd ChangeLog 12350
+MISC ChangeLog 12612 RMD160 ff4c553d433465b80536784e6e37b7c3183d0dfa SHA1 07c3e70155a2ef792c1e53842c8dd3b46c7c526e SHA256 78c6602ea7c1dd5fc1a12987bab5d63499463070dd798c58182a3e07caea7e0c
+MD5 3ba2a03f5c7bdce4527497b7264e7cac ChangeLog 12612
+RMD160 ff4c553d433465b80536784e6e37b7c3183d0dfa ChangeLog 12612
+SHA256 78c6602ea7c1dd5fc1a12987bab5d63499463070dd798c58182a3e07caea7e0c ChangeLog 12612
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -53,13 +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
+MD5 8047d659733954340720ecb0b723fad1 files/digest-pciutils-2.2.4-r2 244
+RMD160 8349223dbbf327febd748b605899805650b1bb85 files/digest-pciutils-2.2.4-r2 244
+SHA256 ae83c0072554b83b7519828f5470144cfa69ca5605ed319117d5400896258701 files/digest-pciutils-2.2.4-r2 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF0rbs8bi6rjpTunYRAmIrAJ4lIuHVsAFjJLOARAEUrxMB0UxGOgCggz9+
-ehRT+LTcg7yuPaAehM7vOjU=
-=H1gT
+iD8DBQFF05Ea8bi6rjpTunYRApSEAKDZyWRiiu1XNCzEG2lEVDB2ydNCvACcDFe3
+0zZayiKYK9NvmfJ9t56T0Es=
+=3RwR
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/pciutils/files/digest-pciutils-2.2.4-r2 b/sys-apps/pciutils/files/digest-pciutils-2.2.4-r2
new file mode 100644 (file)
index 0000000..1ce6822
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.2.4-r2
@@ -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
index f875f8a825c09fde78de98baefad593ed07cb7ab..b37309c8e7a30e8cc457b5996d917593408b5d0b 100644 (file)
--- a/sys-apps/pciutils/files/pciutils-2.2.4-update-pciids.patch
+++ b/sys-apps/pciutils/files/pciutils-2.2.4-update-pciids.patch
@@ -1,6 +1,6 @@
 --- update-pciids.sh
 +++ update-pciids.sh
-@@ -1,5 +1,7 @@
+@@ -1,30 +1,41 @@
  #!/bin/sh
  
 +[ "$1" = "-q" ] && quiet="true" || quiet="false"
@@ -8,7 +8,6 @@
  set -e
  SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
  DEST=pci.ids
-@@ -8,6 +8,13 @@
  PCI_COMPRESSED_IDS=
  GREP=grep
  
@@ -22,20 +21,41 @@
  if [ -n "$PCI_COMPRESSED_IDS" ] ; then
        DECOMP="cat"
        SRC="$SRC.gz"
-@@ -22,8 +24,10 @@
+       GREP=zgrep
+-elif which bzip2 >/dev/null ; then
++elif which bzip2 >&2 >/dev/null ; then
+       DECOMP="bzip2 -d"
+       SRC="$SRC.bz2"
+-elif which gzip >/dev/null ; then
++elif which gzip >&2 >/dev/null ; then
+       DECOMP="gzip -d"
+       SRC="$SRC.gz"
+ else
+       DECOMP="cat"
+ fi
  
- if which curl >/dev/null ; then
+-if which curl >/dev/null ; then
++if which curl >&2 >/dev/null ; then
        DL="curl -o $DEST.new $SRC"
+-elif which wget >/dev/null ; then
 +    ${quiet} && DL="$DL -s -S"
- elif which wget >/dev/null ; then
++elif which wget >&2 >/dev/null ; then
        DL="wget -O $DEST.new $SRC"
+-elif which lynx >/dev/null ; then
 +      ${quiet} && DL="$DL -q"
- elif which lynx >/dev/null ; then
++elif which lynx >&2 >/dev/null ; then
        DL="eval lynx -source $SRC >$DEST.new"
  else
-@@ -59,4 +66,4 @@
+       echo >&2 "update-pciids: cannot find curl, wget or lynx"
+@@ -55,4 +66,10 @@
  mv $DEST.neww $DEST
  rm $DEST.new
  
 -echo "Done."
++# Older versions did not compress the ids file, so let's make sure we
++# clean that up.
++if [ ${DEST%.gz} != ${DEST} ] ; then
++      rm -f ${DEST%.gz} ${DEST%.gz}.old
++fi
++
 +${quiet} || echo "Done."

diff --git a/sys-apps/pciutils/pciutils-2.2.4-r2.ebuild b/sys-apps/pciutils/pciutils-2.2.4-r2.ebuild
new file mode 100644 (file)
index 0000000..4aa5e33
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.2.4-r2.ebuild
@@ -0,0 +1,43 @@
+# 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-r2.ebuild,v 1.1 2007/02/14 22:45:12 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="zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )"
+
+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
+       cp update-pciids.sh update-pciids.sh.orig
+       epatch "${FILESDIR}"/${P}-update-pciids.patch
+}
+
+src_compile() {
+       export ZLIB=$(use zlib && echo yes || echo no)
+       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
+}