diff options
| -rw-r--r-- | sys-apps/pciutils/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-apps/pciutils/Manifest | 30 | ||||
| -rw-r--r-- | sys-apps/pciutils/files/digest-pciutils-2.2.8 | 3 | ||||
| -rw-r--r-- | sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch | 22 | ||||
| -rw-r--r-- | sys-apps/pciutils/pciutils-2.2.8.ebuild | 49 |
5 files changed, 99 insertions, 15 deletions
diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog index d700288d78ef..d325de974ff0 100644 --- 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.111 2007/10/11 05:53:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.112 2007/11/02 21:25:49 robbat2 Exp $ + +*pciutils-2.2.8 (02 Nov 2007) + + 02 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> + +files/pciutils-2.2.7-update-pciids-both-forms.patch, + +pciutils-2.2.8.ebuild: + Version bump. Contains an agreed-upon workaround for the HAL zlib issue, see + the gentoo-dev list for the discussion. *pciutils-2.2.7 (11 Oct 2007) diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest index 4abc949aa69c..608f72412ab1 100644 --- a/sys-apps/pciutils/Manifest +++ b/sys-apps/pciutils/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX pcimodules-pciutils-2.2.0.patch 10855 RMD160 3de80ff3017c6582af5d83c1c0e46986abe1b47d SHA1 65d96761e1a8ce2ed7d78b0a639a31a5eb972b39 SHA256 e80acd88775c6ed2af05e751d28aeddfa6836a0465f187a35d7ae9e5224827a5 MD5 7460ee88d1643e8a87d04438bd4f5fdd files/pcimodules-pciutils-2.2.0.patch 10855 RMD160 3de80ff3017c6582af5d83c1c0e46986abe1b47d files/pcimodules-pciutils-2.2.0.patch 10855 @@ -37,6 +34,10 @@ AUX pciutils-2.2.7-build.patch 716 RMD160 f142d0fbfaed97d4b75d479ac295757befd993 MD5 51728b5d8923d7f10f9f48e097a69ac1 files/pciutils-2.2.7-build.patch 716 RMD160 f142d0fbfaed97d4b75d479ac295757befd9935a files/pciutils-2.2.7-build.patch 716 SHA256 43c963ac3af01878a4a2303a657a3fbecc0c9a1cc545cc724ba2edaa3a14bf45 files/pciutils-2.2.7-build.patch 716 +AUX pciutils-2.2.7-update-pciids-both-forms.patch 843 RMD160 6be4dd832f8274512bfc79b753147ea768d5fbf8 SHA1 d351b16196bc02f85a5523a6f3397218568abb6c SHA256 78c3e5758064464a826ce7df74c6b27065db422434f936022b404d112f5403f2 +MD5 8305b0964d63e17e6f5fab5503fe1a24 files/pciutils-2.2.7-update-pciids-both-forms.patch 843 +RMD160 6be4dd832f8274512bfc79b753147ea768d5fbf8 files/pciutils-2.2.7-update-pciids-both-forms.patch 843 +SHA256 78c3e5758064464a826ce7df74c6b27065db422434f936022b404d112f5403f2 files/pciutils-2.2.7-update-pciids-both-forms.patch 843 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836 MD5 1d5918bb3ca1f28c8af745b60726565a files/pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee files/pciutils.cron 42 @@ -45,6 +46,7 @@ DIST pciutils-2.2.3.tar.gz 1121334 RMD160 429b3b21f4cb079c2f3620a4c4d14c6dc610a0 DIST pciutils-2.2.4.tar.gz 210706 RMD160 27db4b23a07a02b28b64e01fbe1c74cefa887cc0 SHA1 c20dfa13bbd3d04ce921294c51e3da94140cea8b SHA256 62fc07f688c6d17f0cf8baa540e42be6117530360c2df491ec02031973506a9f DIST pciutils-2.2.6.tar.gz 226049 RMD160 9f184affb481e51ca59134f5fd72259cf5e16298 SHA1 b37c20907857961e88c77812452a30c27044441d SHA256 30019fa23996429d3bedaa1b30e32b9ddcd2eaa4fe39ec015d533af6afc0ee6b DIST pciutils-2.2.7.tar.gz 229424 RMD160 5d334078572cde947da0a33158733c8d64cdd578 SHA1 05df02d7455222df5938f5d5d47f5185bf3ffa05 SHA256 3c8536fd30d3288b1baffc75ae0521dfeed6eb72a27d800992d1bfabcc8b2441 +DIST pciutils-2.2.8.tar.gz 232602 RMD160 a041fe7b65e0e60b6baeeca1daf77257fa84c30a SHA1 95a316b9e187533c1c84c2e29149b917ded321bb SHA256 8bdbcac28a80e05799c3e788bbb24417059537aff53b8bf16c7c8e08b3979fa2 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 @@ -61,10 +63,14 @@ EBUILD pciutils-2.2.7.ebuild 1382 RMD160 941527a62f2fd19620b9c7411cadb5d1aba66ae MD5 d525c7ad81d741fb845339a141910391 pciutils-2.2.7.ebuild 1382 RMD160 941527a62f2fd19620b9c7411cadb5d1aba66ae1 pciutils-2.2.7.ebuild 1382 SHA256 7b0537317644c5772b095582a8b07614400560d4c84e12c614506e20f16a1ad5 pciutils-2.2.7.ebuild 1382 -MISC ChangeLog 14780 RMD160 051e51db3e4294587f03f8b0927e68cd13e4099b SHA1 d03efbeeceae24ecd1718d896f3a6d866a9b7556 SHA256 86579e525501897691b7f65b6f08fed98306d7e5383bd9e75688dd2cc8ba1ab7 -MD5 83f842adb10ad0c2ecc43eb51d361c46 ChangeLog 14780 -RMD160 051e51db3e4294587f03f8b0927e68cd13e4099b ChangeLog 14780 -SHA256 86579e525501897691b7f65b6f08fed98306d7e5383bd9e75688dd2cc8ba1ab7 ChangeLog 14780 +EBUILD pciutils-2.2.8.ebuild 1597 RMD160 a2977919f0c9c42d6ba1bda46fac5af5aeb9383c SHA1 fc0185528e73c95db00f386714af661692a8cf2f SHA256 fa77e78380c2827cd748a55c70c1b0b2381f179303e2aacb03a0d867988207c2 +MD5 734112491fe207457fe3443ddcf66e4d pciutils-2.2.8.ebuild 1597 +RMD160 a2977919f0c9c42d6ba1bda46fac5af5aeb9383c pciutils-2.2.8.ebuild 1597 +SHA256 fa77e78380c2827cd748a55c70c1b0b2381f179303e2aacb03a0d867988207c2 pciutils-2.2.8.ebuild 1597 +MISC ChangeLog 15069 RMD160 054eb3c0b836de2f9b24194df889c5ca124db136 SHA1 a7acb5db49501f384096e8c59edf7e917867cd3d SHA256 0a1694ed45083c23a9900f0e7aa86159b443134ac847f75203ba7664e7de8a04 +MD5 e1452e660a3af48758d48193a648d37c ChangeLog 15069 +RMD160 054eb3c0b836de2f9b24194df889c5ca124db136 ChangeLog 15069 +SHA256 0a1694ed45083c23a9900f0e7aa86159b443134ac847f75203ba7664e7de8a04 ChangeLog 15069 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -81,10 +87,6 @@ SHA256 fc18c3f1d11767824326e47279a1b087a9324a8ed2d4e5eedb44397a5e487206 files/di MD5 0916aab29fe8c5dc3ab1e51bb491a25c files/digest-pciutils-2.2.7 244 RMD160 35dc6165ecdabd69505860ac9a6b8d8856f9edd4 files/digest-pciutils-2.2.7 244 SHA256 14797c58675249f39ca67aab2cb3028cbbb5c09e943206f7e0a90a5b6d673fb6 files/digest-pciutils-2.2.7 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFHDboAp/wUKkr7RBoRAlnsAKDHQm48LeAPVOmrlK/vt7bgOUcpqQCcCg1i -Z3ZneLUM6Vg16MfZXaVVPcc= -=PA3Q ------END PGP SIGNATURE----- +MD5 1ef4d997f68c1700ea4ef589b17eef2c files/digest-pciutils-2.2.8 244 +RMD160 5c1f0017fa811387c53466d8cc6843784d746907 files/digest-pciutils-2.2.8 244 +SHA256 c8da5762580bd4b9457c73a23b50623fe98a143710af9492f98263ead714f2ee files/digest-pciutils-2.2.8 244 diff --git a/sys-apps/pciutils/files/digest-pciutils-2.2.8 b/sys-apps/pciutils/files/digest-pciutils-2.2.8 new file mode 100644 index 000000000000..47465fb787be --- /dev/null +++ b/sys-apps/pciutils/files/digest-pciutils-2.2.8 @@ -0,0 +1,3 @@ +MD5 c0b742521a13ef624b9a0a237f46c1c8 pciutils-2.2.8.tar.gz 232602 +RMD160 a041fe7b65e0e60b6baeeca1daf77257fa84c30a pciutils-2.2.8.tar.gz 232602 +SHA256 8bdbcac28a80e05799c3e788bbb24417059537aff53b8bf16c7c8e08b3979fa2 pciutils-2.2.8.tar.gz 232602 diff --git a/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch b/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch new file mode 100644 index 000000000000..375945a835a3 --- /dev/null +++ b/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch @@ -0,0 +1,22 @@ +diff -Nuar pciutils-2.2.7.orig/update-pciids.sh pciutils-2.2.7/update-pciids.sh +--- pciutils-2.2.7.orig/update-pciids.sh 2007-10-30 16:17:03.253630000 -0800 ++++ pciutils-2.2.7/update-pciids.sh 2007-10-30 16:39:46.810463056 -0800 +@@ -72,4 +72,18 @@ + rm -f ${DEST%.gz} ${DEST%.gz}.old + fi + ++# if the gzip version exists, but we are not using compressed mode, ++# erase the gzip version, as it is old and crufty ++if [ -z "$PCI_COMPRESSED_IDS" ] && [ -f $DEST.gz ]; then ++ rm -f ${DEST}.gz ++fi ++ ++# Lastly, because HAL still reads the plaintext version only and ++# has not yet migrated to using a library we leave the plaintext ++# version in addition to the gzip version. ++# They need to migrate because the pci.ids format will be changing. ++if [ ${DEST%.gz} != ${DEST} ] ; then ++ gzip -d <${DEST} >${DEST%.gz} ++fi ++ + ${quiet} || echo "Done." diff --git a/sys-apps/pciutils/pciutils-2.2.8.ebuild b/sys-apps/pciutils/pciutils-2.2.8.ebuild new file mode 100644 index 000000000000..37b38e4ee8a6 --- /dev/null +++ b/sys-apps/pciutils/pciutils-2.2.8.ebuild @@ -0,0 +1,49 @@ +# 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.8.ebuild,v 1.1 2007/11/02 21:25:49 robbat2 Exp $ + +inherit eutils flag-o-matic toolchain-funcs multilib + +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="network-cron zlib" + +DEPEND="zlib? ( sys-libs/zlib )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-2.2.7-build.patch + epatch "${FILESDIR}"/pcimodules-${PN}-2.2.6.patch + epatch "${FILESDIR}"/${PN}-2.2.6-link.patch #160421 + epatch "${FILESDIR}"/${PN}-2.2.4-update-pciids.patch + epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch + sed -i "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile +} + +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 install-lib DESTDIR="${D}" || die + + if use network-cron; then + exeinto /etc/cron.monthly + newexe "${FILESDIR}"/pciutils.cron update-pciids \ + || die "Failed to install update cronjob" + fi + # Install both forms until HAL has migrated + sharedir="${D}"/usr/share/misc + if use zlib; then + elog "Providing a backwards compatability non-compressed pci.ids" + gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids + fi +} |