Version bump #246497 by Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 106 insertions, 12 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index bef0cb2de438..752b4ccf2b45 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.150 2009/01/26 03:29:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.151 2009/01/26 03:29:37 vapier Exp $
+
+*pciutils-3.1.0 (26 Jan 2009)
+
+  26 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/pcimodules-pciutils-3.1.0.patch, +pciutils-3.1.0.ebuild:
+  Version bump #246497 by Arfrever Frehtes Taifersar Arahesis.
 
   26 Jan 2009; Mike Frysinger <vapier@gentoo.org> +files/pcimodules.8,
   files/pcimodules-pciutils-3.0.0.patch, +files/pcimodules.c,
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 7c19adfb4626..a317db07e348 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -3,26 +3,27 @@ Hash: SHA1
 
 AUX conf.d-pciparm 988 RMD160 47d31ca9710c1be47e060e235394784b7831a6e0 SHA1 740ff1012c2fa2211357f707d17875c8d1ca66a5 SHA256 ffdec7d6c510a502d212129d31a9b37c3b9c75393a48a8b1ee6010b7d4aa1887
 AUX init.d-pciparm 1871 RMD160 45f027ad3369e2e60b83ec62fd67188c079b4b70 SHA1 d45ffbd09058a49ac219a9456a70fddbea693928 SHA256 30a62e5778997954f766cdf289a11ac124502943e8422bc33c49b6aa118df6a5
-AUX pcimodules-pciutils-2.2.6.patch 10096 RMD160 5a89bed94911789ed99e52f5b6fade90027ea050 SHA1 fef276e0b650dd66aab821941a6f433667c53e8b SHA256 993eca5530ac3b9a1f210b9f8d5df7cc37a2a1958f391554aabb1fb9a26c2f5b
-AUX pcimodules-pciutils-3.0.0.patch 9041 RMD160 ab4a9d7cc3df5f3492a72d1ce54013891223730f SHA1 a22d0eb22a8042bcb6efc1face16fa9987ca1c7d SHA256 a18b6e41c1e0c4b295ecba923541ae1206889f82893c7edddc588c091ee8164c
-AUX pciutils-2.2.7-build.patch 716 RMD160 f142d0fbfaed97d4b75d479ac295757befd9935a SHA1 33f5b05c97dd0e74a6cd08ebf8495c55fb4eca81 SHA256 43c963ac3af01878a4a2303a657a3fbecc0c9a1cc545cc724ba2edaa3a14bf45
+AUX pcimodules-pciutils-3.0.0.patch 431 RMD160 13b893c84eb72ba89c35868ff15ff34cc82a182a SHA1 c32a0f439131bc241eb2093ce47d74eceb99bc50 SHA256 4d1d90a43b348f116cf16db5727ea124ae0cb6a925bb1b175d0c61c7a808c3e3
+AUX pcimodules-pciutils-3.1.0.patch 540 RMD160 76ca68a766c30ad3d505dbf8fd080eabcca07166 SHA1 128af5ed8ab4627bb8958462337066dd25c18968 SHA256 3677886e03913ccbe440cd86cdbceb65feb5b45aea96e863116238940af4be8d
+AUX pcimodules.8 3220 RMD160 59ab95c358f30157bd49c84ada19324f534b6d75 SHA1 cc529791cfd868de19a0f9302eeb6de0e90a60aa SHA256 b05b561fb4b54687560e75a63813157f134fc1cb7ca13fab11a5ec05971c05fd
+AUX pcimodules.c 4944 RMD160 4be729671eef485b90ae8b2274dc64d2757a86b9 SHA1 6383f2f482317e5663f41e9a1d80096e0021c710 SHA256 e3af196913e27c23b96c99036bee32f3fc4c90876927713ea5cbff0eb58c25eb
 AUX pciutils-2.2.7-update-pciids-both-forms.patch 843 RMD160 6be4dd832f8274512bfc79b753147ea768d5fbf8 SHA1 d351b16196bc02f85a5523a6f3397218568abb6c SHA256 78c3e5758064464a826ce7df74c6b27065db422434f936022b404d112f5403f2
 AUX pciutils-3.0.0-build.patch 340 RMD160 b734b9bc3148f68e479fe763c182cd294ba16802 SHA1 0464ceb78aa3f80760a94f3ed0b5b4e55786980b SHA256 969f2496e2310342aed5af38d6470714ac1d34a5547a4195ce779c5d5131dc8d
 AUX pciutils-3.0.0-locale-happiness.patch 1199 RMD160 3b1bb4df333de85929748d4290ccb46923f82c81 SHA1 10b018ca036cd48528d48510b78b6d42eb8ac1cd SHA256 5e56f412bd51647cf43fa860d48a7de8d01c8185ac04940f29099194f82fccaa
 AUX pciutils-3.0.0-resolv.patch 1163 RMD160 5cfe106380413349a514db75dda37d3163404d7b SHA1 c51a69794c252ea63083a40363dbb38e84fcfbaa SHA256 1756e747cfe0801e4189e69f516115fba207564d5ff7bc0e697fac1a0aa7b242
 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
-DIST pciutils-2.2.10.tar.gz 234869 RMD160 80f536bec73cd39cfdba8b00921c20fb5dca652f SHA1 1b4f355e0b12e9564d87c5fcdfcaaf87c14a473c SHA256 4ef3474cd8f296f788f576a1c46b9a1f408faf6d95f82f0acece366b5f62d514
 DIST pciutils-3.0.0.tar.gz 244756 RMD160 e0ac0d4f4da0732a159520d8ca4fdea547d97230 SHA1 75436a6b88604bdd288492c4076d39edd2321b92 SHA256 df1a63315bbea8f81591fdeaed2005606eb9f675ab1f9839bea5fba02855a773
 DIST pciutils-3.0.2.tar.gz 270474 RMD160 bab0a8261267dd7be50c29984c1d813174c4a0f7 SHA1 4591785f6f70ed44e593933bb34012d83b4c3853 SHA256 ab11bd88c7e20b2bc4801df044086be69b6d728dc88cf6e73db47cdd02c46584
-EBUILD pciutils-2.2.10.ebuild 1489 RMD160 e526319da981149203c7de5f11fddb743a08a33b SHA1 703e8af045ea0b1b00e83b33bf284a4f465e70f5 SHA256 7571bcaa536bf6b68905f1b8c8259ab6279dfeb4ce181ecb2ee88db28dac5b38
-EBUILD pciutils-3.0.0.ebuild 1803 RMD160 f18265fd03d956a618a6ed00c4c4671c04b29459 SHA1 731fb8d31e80e4f6fd115ba4a58cadebc38bca6f SHA256 83ae819d3e07cb700e17cc398b60f05a3e00f40ddbcb2800993993cd6104f190
-EBUILD pciutils-3.0.2.ebuild 2005 RMD160 eea2804151fe81592f5c22d75e073fc841657481 SHA1 16b8f28795333cd9a132ebf521d55e34e28beaaa SHA256 d56c32b3ff980d526c05b0484e31ba5702461e822c429d32d206064a6166a747
-MISC ChangeLog 19619 RMD160 61b75616d9ac7b592d60dc03c46fcfa7ddd96d5b SHA1 2170143f0799f27e5b35819e80bb6f4851561790 SHA256 1c968408114ddd07f29aaaee60a5ab492232a282ad873b0c680e0cf6d1263b08
+DIST pciutils-3.1.0.tar.gz 290333 RMD160 5e3e5118327e34c83930970ecd4e490946f67da0 SHA1 582c149f7adfdcf09ac91b6340f5949300d1d4e7 SHA256 7e581c881979001f4ca52fd3ca6c8b141e99ffd4df51002dae8c398ad5ee8888
+EBUILD pciutils-3.0.0.ebuild 1841 RMD160 0eaa5e8714ad27985809d046a44be29a3e950f65 SHA1 1ad671455feb9838467562fbd75e31015fee6dc9 SHA256 f10f0b345a7eb665e22013d2ce314a45b812a552ec13c550d7c85e013e5eafc5
+EBUILD pciutils-3.0.2.ebuild 1964 RMD160 416abc022fb618f1921f93f17f15cf2ed8939805 SHA1 3c1eb33536982f63ffde2576c05ae17248597ecb SHA256 d0c4253ba081a9b7161f322dc71f05ce81ff6f475a24e6e38f151116ef6a7c17
+EBUILD pciutils-3.1.0.ebuild 1982 RMD160 e402e8560e81501124efe8cc8a204125a27b4e86 SHA1 4d43a5f184513d1137ebd0d139e3eccf9984bc97 SHA256 7ad18f937e1ff2e40847616f1a6910b0111b0220ded4ecb131ee7dea4e4ce30a
+MISC ChangeLog 20068 RMD160 59802375f404d2183a8420fb0f70036ba4a6600d SHA1 8d0da3aa7b8fa0ab580728891642d06c0c7d411e SHA256 e4789b41995d52c80771257adde54b8484754c36be0800db3c40bd33f6338c7f
 MISC metadata.xml 257 RMD160 bda78cd844850cace7d31b3bff6de2d1a7a298d5 SHA1 d754bc91dd7fc7496f5c3aa307879ae74ce3b465 SHA256 665e73270ac904a5c3989d16be4ad8e3d3b492049adebb76621f772d60647a97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkD5Y8ACgkQ67wieSYcaxdFGgCg4QMcnmtcW2pGgr4WDuX3NF8v
-25UAoMMU5V4AfU9FqV6rMD4CWw2lwUjQ
-=A3CE
+iEYEARECAAYFAkl9LicACgkQn/5bYzqsSmFKqwCgvTqIQog5kJXGzyRgqq4o228D
+H3kAn17YEkuu5bsBQ742OuPHOPUqQcL4
+=V8Y5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pcimodules-pciutils-3.1.0.patch b/sys-apps/pciutils/files/pcimodules-pciutils-3.1.0.patch
new file mode 100644
index 000000000000..f7c66f1e5d94
--- /dev/null
+++ b/sys-apps/pciutils/files/pcimodules-pciutils-3.1.0.patch
@@ -0,0 +1,18 @@
+--- pciutils-3.1.0/Makefile
++++ pciutils-3.1.0/Makefile
+@@ -62,6 +62,7 @@
+ lib/config.h lib/config.mk:
+ 	cd lib && ./configure
+ 
++pcimodules: pcimodules.o common.o lib/$(PCILIB)
+ lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB)
+ setpci: setpci.o common.o lib/$(PCILIB)
+ 
+@@ -74,6 +75,7 @@
+ ls-tree.o: ls-tree.c $(LSPCIINC)
+ ls-map.o: ls-map.c $(LSPCIINC)
+ 
++pcimodules.o: pcimodules.c pciutils.h $(PCIINC)
+ setpci.o: setpci.c pciutils.h $(PCIINC)
+ common.o: common.c pciutils.h $(PCIINC)
+ 
diff --git a/sys-apps/pciutils/pciutils-3.1.0.ebuild b/sys-apps/pciutils/pciutils-3.1.0.ebuild
new file mode 100644
index 000000000000..917791d772d5
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.1.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.0.ebuild,v 1.1 2009/01/26 03:29:37 vapier Exp $
+
+inherit eutils 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}-3.0.0-build.patch #233314
+	epatch "${FILESDIR}"/pcimodules-${PN}-3.1.0.patch
+	epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
+	cp "${FILESDIR}"/pcimodules.c . || die
+	sed -i -e 's|A-Z|:upper:|' -e 's|a-z|:lower:|' lib/configure
+	sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
+}
+
+uyesno() { use $1 && echo yes || echo no ; }
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		DNS="yes" \
+		IDSDIR="/usr/share/misc" \
+		MANDIR="/usr/share/man" \
+		PREFIX="/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(uyesno zlib) \
+		"$@"
+}
+
+src_compile() {
+	pemake OPT="${CFLAGS}" all pcimodules || die "emake failed"
+}
+
+src_install() {
+	pemake DESTDIR="${D}" install install-lib || die
+	dosbin pcimodules || die
+	newman pcimodules.man pcimodules.8
+	dodoc ChangeLog README TODO
+
+	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
+	if use zlib ; then
+		local sharedir="${D}/usr/share/misc"
+		elog "Providing a backwards compatibility non-compressed pci.ids"
+		gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids
+	fi
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}