Version bump #314499 by Toffanin.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 145 insertions, 18 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 1c2ea1f822b5..9a34dbbb17d7 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.174 2010/01/30 18:36:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.175 2010/04/10 19:28:55 vapier Exp $
+
+*pciutils-3.1.7 (10 Apr 2010)
+
+  10 Apr 2010; Mike Frysinger <vapier@gentoo.org> +pciutils-3.1.7.ebuild,
+  +files/pciutils-3.1.7-fbsd.patch, +files/pciutils-3.1.7-install-lib.patch:
+  Version bump #314499 by Toffanin.
 
   30 Jan 2010; Raúl Porcel <armin76@gentoo.org> pciutils-3.1.4.ebuild:
   sparc stable wrt #296772
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 701c1912049b..2599c9f0b307 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,25 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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-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 717 RMD160 b900f82cf519d602ec2b35879277c5227409a03e SHA1 239ee90f036005970fafa4133737decb5a1c6f67 SHA256 003805f721184379960839519751b2a67ec8d020a229f7876cf339bb232fa162
-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-3.1.0-null-ptr.patch 666 RMD160 0a7c227245dda3bac4c38e30d7d5d748b6705a34 SHA1 456f68df91755e6c3d15728e965d34284ef71da6 SHA256 05beaebdcf50b75e212ec002621844e5650af32d660556d462e348370b62a98d
 AUX pciutils-3.1.4-install-lib.patch 1548 RMD160 42d82a6b4616577f60039236f60355672d6ba540 SHA1 846e763c4cf001ff10d2cbfb429ddd3a4d74a85c SHA256 ce1f27cf8d76f441e976e2379ac587553a8a790a5ea7d7f451d74d17e041357d
+AUX pciutils-3.1.7-fbsd.patch 289 RMD160 ed741fd03a35c3bd28715a2eb9d84a51c65fc840 SHA1 e6957db6d54d446818fad874f606af29ea407d95 SHA256 801b01e0698711fc3695e6d8c2f088c88756d912ac561eda3d617fecf5556af4
+AUX pciutils-3.1.7-install-lib.patch 1507 RMD160 15d74ee481137937d60216b45354c035d6b37055 SHA1 a5f03e474d2a824355d97024d353fede8fa8ec44 SHA256 d1c5179274e238c619f751aeb8c3b992f2f4fe884a3d69cbca61acf18667d81c
 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
-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
-DIST pciutils-3.1.0.tar.gz 290333 RMD160 5e3e5118327e34c83930970ecd4e490946f67da0 SHA1 582c149f7adfdcf09ac91b6340f5949300d1d4e7 SHA256 7e581c881979001f4ca52fd3ca6c8b141e99ffd4df51002dae8c398ad5ee8888
-DIST pciutils-3.1.2.tar.gz 291324 RMD160 05190a2d13c92eb04a88714434e46c202158199b SHA1 a9b75a5afde21eae483bee577d9060646e3eba25 SHA256 7b682329410a39e6d61183e168342e1d125c875a35acd4c746ff1bec2ab6789d
 DIST pciutils-3.1.4.tar.gz 305747 RMD160 86ed925d1345e8050aa990ce212fff114e569111 SHA1 eafde87ac5bb3f0bcabc98461f22a23f8e7229f2 SHA256 676b941ddaf912387092c6925597b14cef4f35f495bdbb229c1e5947151a1b20
-EBUILD pciutils-3.0.0.ebuild 1841 RMD160 0eaa5e8714ad27985809d046a44be29a3e950f65 SHA1 1ad671455feb9838467562fbd75e31015fee6dc9 SHA256 f10f0b345a7eb665e22013d2ce314a45b812a552ec13c550d7c85e013e5eafc5
-EBUILD pciutils-3.0.2.ebuild 1968 RMD160 02278fab3eb538911d73dcea17b87c7166256974 SHA1 39df603513905b705955cc89be1e603d1bd2476e SHA256 d07cca4805e7bd7bd2e146bf30270edf0201eeb7ef08d75e69f2e43ae41835a0
-EBUILD pciutils-3.1.0-r1.ebuild 2020 RMD160 bb1c4abc662ccfb97ea3c8f15de81f5bedf0b085 SHA1 750304d3905c1a2d019d2715d64b6f17edf72e56 SHA256 e6e0898b7bde3a9259155c0ac1722ec08c1bdf63a8aff530792678689c768fd0
-EBUILD pciutils-3.1.2.ebuild 1864 RMD160 de00ee3a1ec89d4be9398fd7e22d6162ad6e6f8b SHA1 3f9910b832413a506173617bdca6b813dababe49 SHA256 20bc559f2354967740bdc5a75ba9cb6c3614bd133662e575ab54a969f1529705
+DIST pciutils-3.1.7.tar.gz 320603 RMD160 2d81a6a7fdf06889f7d5954dff716bb0516ffd20 SHA1 58336ef8c1bbe870f2cc0ed9481a8cf8a58e039c SHA256 0f39818eabd793bb48d5b98ca52141d8247306a85876482c0075d0c95aeccea2
 EBUILD pciutils-3.1.4.ebuild 1852 RMD160 375f032c885dada98b812e05c6a70dd376776227 SHA1 4e5ef48ad8e43566665c4727411f31d72f3e4eb9 SHA256 5753a5f019ed50b795885580b334c155dd0a659d93aa4fa52460b803b5693284
-MISC ChangeLog 22903 RMD160 b30920aa7ba240ec1b1648614aa0b311cc13e746 SHA1 8892332ddad78f64cf807d5209a80f1cd18a0cd2 SHA256 18cf09744f8ec95036faad8e4248e69d6b3066eed6f6eb83cd66af7ada95f18b
+EBUILD pciutils-3.1.7.ebuild 1933 RMD160 24e8bd963a98c5871e6392c24206ea6fc08cca76 SHA1 b5227b55e819a44450548f8bdaf0f4cb1c24b0eb SHA256 a758aebcfa823a0c8c47d7ef544ba1df38c66d97e3d8f6666d30dba374e7f996
+MISC ChangeLog 23121 RMD160 5f16a3da9697e8910151f00175c66044c4f7552c SHA1 c3e27637179f86ab2d22fc61b25dedf22a484d6f SHA256 4af2cb4813f84498302db454f84a69b4a135971f482258ab950b99365188e942
 MISC metadata.xml 257 RMD160 bda78cd844850cace7d31b3bff6de2d1a7a298d5 SHA1 d754bc91dd7fc7496f5c3aa307879ae74ce3b465 SHA256 665e73270ac904a5c3989d16be4ad8e3d3b492049adebb76621f772d60647a97
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkvA0WsACgkQTwhj9JtAlp6FtgD9EH5LhhIpsOaiFZCdZ/IgS3jK
+64H2UBDu8/a82+44l64A/3Y+x3yyAReF2yOPNx2/nydfbxDP0yEvtqCy6/am9kub
+=Ir0f
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch b/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch
new file mode 100644
index 000000000000..5f424635ab5e
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch
@@ -0,0 +1,11 @@
+--- pciutils-3.1.7/lib/configure
++++ pciutils-3.1.7/lib/configure
+@@ -85,7 +85,7 @@
+ 		esac
+ 		echo >>$c '#define PCI_HAVE_STDINT_H'
+ 		;;
+-	freebsd)
++	freebsd*)
+ 		echo_n " fbsd-device"
+ 		echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
+ 		echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
diff --git a/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch b/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch
new file mode 100644
index 000000000000..ad49aa62b1a9
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch
@@ -0,0 +1,41 @@
+don't have the install and install-lib targets install the same files
+otherwise we can hit parallel install failures
+
+http://bugs.gentoo.org/273489
+
+patch by Kevin Pyle
+
+--- Makefile
++++ Makefile
+@@ -90,6 +90,13 @@
+ 
+ distclean: clean
+ 
++install-pcilib: lib/$(PCILIB)
++	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
++
++ifeq ($(SHARED),yes)
++install: install-pcilib
++endif
+ install: all
+ # -c is ignored on Linux, but required on FreeBSD
+ 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
+@@ -99,15 +103,12 @@
+ 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
+ 	$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
+ ifeq ($(SHARED),yes)
+-	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
+-	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
+ 	ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
+ endif
+ 
+-install-lib: $(PCIINC_INS) lib/$(PCILIB) lib/$(PCILIBPC)
+-	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR)
++install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib
++	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR)
+ 	$(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
+-	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
+ ifeq ($(SHARED),yes)
+ 	ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
diff --git a/sys-apps/pciutils/pciutils-3.1.7.ebuild b/sys-apps/pciutils/pciutils-3.1.7.ebuild
new file mode 100644
index 000000000000..6ae807351573
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.1.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.7.ebuild,v 1.1 2010/04/10 19:28:55 vapier Exp $
+
+EAPI="2"
+
+inherit eutils multilib 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="network-cron zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install-lib.patch #273489
+	epatch "${FILESDIR}"/${P}-fbsd.patch #262321
+	epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
+	sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
+}
+
+uyesno() { use $1 && echo yes || echo no ; }
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		DNS="yes" \
+		IDSDIR="/usr/share/misc" \
+		MANDIR="/usr/share/man" \
+		PREFIX="/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(uyesno zlib) \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		"$@"
+}
+
+src_compile() {
+	pemake OPT="${CFLAGS}" all || die
+}
+
+src_install() {
+	pemake DESTDIR="${D}" install install-lib || die
+	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
+}
+
+pkg_postinst() {
+	elog "The 'pcimodules' program has been replaced by 'lspci -k'"
+}