Version bump. Use libkmod instead of "modules.pcimap" which is no longer generated using the depmod from sys-apps/kmod like it was with sys-apps/module-init-tools wrt #462982 by Mike Frysinger.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4868F14D

4 files changed, 105 insertions, 6 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index cdcb8e04721c..1aca36fcc858 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.214 2013/02/22 17:31:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.215 2013/04/19 15:22:29 ssuominen Exp $
+
+*pciutils-3.2.0 (19 Apr 2013)
+
+  19 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> +pciutils-3.2.0.ebuild,
+  metadata.xml:
+  Version bump. Use libkmod instead of "modules.pcimap" which is no longer
+  generated using the depmod from sys-apps/kmod like it was with
+  sys-apps/module-init-tools wrt #462982 by Mike Frysinger.
 
   22 Feb 2013; Zac Medico <zmedico@gentoo.org> pciutils-3.1.10.ebuild:
   Add ~arm-linux keyword.
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index de3199fb758d..f27462d147ee 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -9,14 +9,20 @@ AUX pciutils-3.1.9-static-pc.patch 373 SHA256 81f8c664cf844adfe2238f6dc584100340
 AUX pciutils.cron 42 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836 SHA512 aff8876eda9c66662be97277822a010bd09f6fac2ce3b3e07a6f9ada5ee33c80942181af3214580e957d3af19541636edf6a0a9619c74d30484611fdc579f03a WHIRLPOOL e4bff870e135510e827c2527f5583f25d1d99908d9af401138a3f58208c1c73e10eb84cf1896328323e0676f2dd94dcec25967ca175c02e9a13bddd977fd579c
 DIST pciutils-3.1.10.tar.gz 345149 SHA256 7ca8201f806cbad31cb86bcbb2c2c99853cc05618b360eb58bde31a0f8d1f2a3 SHA512 2227ba3bbd1d5a02986b167010305286a9ad4d2781175291dd95a8f68a06f5508228e519bb34fdf92225cbd1334843d393ff1137bfc992403fd61896607353d5 WHIRLPOOL 7a4390b0da0c1b1df396076e05d7829fc3726199d2482abe61e59fa0e2e75c2de8f6019de57ea55aadf7001674a38d6666444e913e38af7ce76e8b1233645a27
 DIST pciutils-3.1.9.tar.gz 340215 SHA256 8ae7d320c50f02b015f5e2bb17a9f815cf201dae81b6bbd46b8a45552d00a178 SHA512 9e15ae5743bfbdaeb73d02c237d2632ee31f36be3efa5c26688473d2720157ca728384d98a06738eacab0d9a160641a22d53422d0a5d507d9779e0517e18bffb WHIRLPOOL b04f19d82065d166f0fcf47a69682fbeea94ee77f3fc771ede125f7d8c2e51cbf9a2d05ad0682814ee4bc6655567bff52a6e5a9b9ff9a6a5afdf2ee862213244
+DIST pciutils-3.2.0.tar.gz 357003 SHA256 84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71 SHA512 ce619bca35c529f947b883858164584db9fd16be05b44bd20d7f30b73246076b8c80a9e0ff3f7b2c27366a08043488ccfee98dd3cb43e3c5ee8962efaa056fd1 WHIRLPOOL fda9efb423ba444b460986b82b89feb3e5940d63774377eab4dce6ed1a1c690824192ca25d04a4f34960412ddedbdb9c874dace2256ccd1dede61ee99618b418
 EBUILD pciutils-3.1.10.ebuild 2432 SHA256 57b31511b8d10ea04b9e85a8cbbea42fd9699eecbb559146951ed388de802885 SHA512 d36b4cb95c2ae8d2f55f006e34d0bfbe90f2904d9f548b16ae37fef47bc39b4b9c1f848c24cf2ffe6744bc1e6fa4c6e942c7c573b8c8e1b638c3163dd5bc4ead WHIRLPOOL 3b53be24d7fa7e9f333a73e2c460ce120b138f4b33d5017d44dd1b6b47dc7c668a2d0bfd9de47cd50095cfd17dbe9e96d1063eb93bd2e2e35f143f7f822a2906
 EBUILD pciutils-3.1.9-r1.ebuild 2014 SHA256 44a139467ac835d9a9265e39c753b8938e9e2e544061c1c00ebdc5ce05fa8066 SHA512 f756291ff3fcc18bae6c5080747a1e99920d6e01e06b45c127bb6b411653d1a80d87d08614580646c47b868be804371affcccbf90ae8aee1f13c28dc44d3a30e WHIRLPOOL b7229540aa415002074d5b701949d4b4ad14ba87236cd12f742a3d6b866d9c7838d11cadcc6ce36d1ff50fcbb51bc0d2e05845ddba4c9e922c3966b6e4efefdc
-MISC ChangeLog 28250 SHA256 be4395160a1df858569121dc98ba663051381be7d11c15ebf736dfd8497fa81a SHA512 da55cc185607a7ccffca9bdf7fba5c0e484cf14d6f6dc68d7a483f85eca5d298968287cf7b261990d02ad7d752676827394448dcb234c113049e9c516a094e76 WHIRLPOOL ce5bfc5e9da963e8af6b6af892fd4b3d57663d0ecdf0d2b5391369badfb3d158bf77db78182b3974c65b94dac55b625734f06e2ce5718d32d8d5a4c646b10942
-MISC metadata.xml 384 SHA256 6e4cdaeea704436ddddb3669f7766fc8ec9b9c62290145a49859d29c907dead8 SHA512 143b05a7e0c131469b09d37f1fb0ebe0f5519115919ae3572d68aa1f563dcd34af65b2960344528b645eb276fbc6b8fc8a6ae12c94ff53470153e0b35680adf7 WHIRLPOOL bc39799973e5e19cfabcefd4914c4fb9c3ec2168e40780ebf6965a8e09bbbb7612bf578c184ceac75073d45cfccd817ca365fa774f4d2b6c68bdb2040aea3bda
+EBUILD pciutils-3.2.0.ebuild 2361 SHA256 857502dbc641029beec16742b2ee1d1b1ef935f82fd3a1abac6dd8300bcbb760 SHA512 4a313132af8a67401492211567cc6bbd742011df776c0c41fc671f40b9401cc5c369d4051456c3c9a5633d4935f03c635b5c3a37c5bcc1b84f0b34ef94533265 WHIRLPOOL b37cc3c1ba769477a20396016447000bac0854e0bbc4c22946c82b604a9b784d1c161b9b53db26534d27a8bb03e1eca0670cfb2a7de0eb74623053e9df44a997
+MISC ChangeLog 28578 SHA256 a25eed794289d2f1ba29943deecac3d5b3b81c418a71c7e6c4fe2be9ee2ba7d7 SHA512 c8d51e1c57fc737f2244053c06bcfe2c767c6c97823f75c952c36797b8543b083bba5d910ee35b433c23967db62714911c8d36afa528bc39c1666e013052269d WHIRLPOOL 63a185d12297610a5eb80dacb7acf27acd4e5b8f2d2835291a6767da16355a2d3069f8cc0de1c16d37ca440e93b0f0230c9d4d8941576c282bce8e574aadc9a6
+MISC metadata.xml 485 SHA256 3918fd98b1c2d5c8984acb74bc77edfeba9a797fbf9e0f765c7b290054c49bea SHA512 ff2cc779af3044c06d0b0f690e1db7e5174d05591e90078c2c0ef5a38a5dd9e246d40495ed97e39c3a1090f030e371aca77ac8c96e86c3c3ceb757db0cb2351b WHIRLPOOL dc6926c902d443938655f11bf07c786327298c722fcb61362334a6fde8a3d8809d25d261a9c973a7b2bf0876b32e56107cb3a991572b014ce568ae2ff6c7832c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEnq3UACgkQ/ejvha5XGaMhswCfYlS9cqgSi+oeIwSR0I408ozf
-qcgAoPKi4RKSh0358G8ST+6LV2DGmCOt
-=BWtT
+iQEcBAEBCAAGBQJRcWEDAAoJEEdUh39IaPFNJMYH/1ApN3ie52E6ISJdMGoY50ar
+LvFOT1kPQUsGLJxXz5nHMO7jllwsIcE4dWPVAcHSd38ua3LXZIUJqNQzgQCBTJSf
+om/YsB0VMTSCvuJyairEBad+QBd4YKkk5XDWx7F6HF7KLofKl0wAyl7VrTAmNXt3
+VD29aLhGT9kTXcWhRfXUzJuf85oahErkFce3QEZ9FZJbAGf9qxxjaYAcgy3mRvtB
+mqVxIJgAkRxuyliaTrVVhbGqPAdJYlJZGyJ8fjDUuo6n2UlX9tQ/W0qyKsszATRz
+3u4pToLNC0BfHwOVyrXMXtHR+4qBo0OeoMKp8LthxIFpMpKhJpNQdFWS70BuQPU=
+=YHTg
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
index ac8266dbf250..a1df75ba582a 100644
--- a/sys-apps/pciutils/metadata.xml
+++ b/sys-apps/pciutils/metadata.xml
@@ -4,6 +4,7 @@
 <herd>base-system</herd>
 <use>
  <flag name='compress-db'>Compress pci.ids database by default</flag>
+ <flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
  <flag name='network-cron'>Monthly cronjob the update-pciids script</flag>
  <flag name='zlib'>Support compressed pci.ids database</flag>
 </use>
diff --git a/sys-apps/pciutils/pciutils-3.2.0.ebuild b/sys-apps/pciutils/pciutils-3.2.0.ebuild
new file mode 100644
index 000000000000..bbd7e8d3f1a5
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 1.1 2013/04/19 15:22:29 ssuominen Exp $
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
+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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+kmod static-libs zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )"
+DEPEND="kmod? ( sys-apps/kmod )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+DEPEND="${DEPEND}
+	kmod? ( virtual/pkgconfig )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+	fi
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		DNS="yes" \
+		IDSDIR='$(SHAREDIR)/misc' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD="$(usex kmod)" \
+		"$@"
+}
+
+src_compile() {
+	pemake OPT="${CFLAGS}" all
+	if use static-libs ; then
+		pemake \
+			-C "${S}.static" \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+src_install() {
+	pemake DESTDIR="${D}" install install-lib
+	use static-libs && dolib.a "${S}.static/lib/libpci.a"
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
+		"${ED}"/usr/share/man/man8/update-pciids.8*
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
+		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
+	fi
+}