Version bump. Removed old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 50 insertions, 31 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index b6505621a6ed..46ced1293d6e 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.236 2015/02/17 00:00:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.237 2015/04/15 11:37:18 polynomial-c Exp $
+
+*pciutils-3.3.1 (15 Apr 2015)
+
+  15 Apr 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -pciutils-3.3.0-r1.ebuild, +pciutils-3.3.1.ebuild:
+  Version bump. Removed old.
 
   16 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
   pciutils-3.3.0-r2.ebuild:
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index f35803fc300f..bcc451a70432 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -7,28 +7,27 @@ AUX pciutils-3.1.9-static-pc.patch 373 SHA256 81f8c664cf844adfe2238f6dc584100340
 DIST pciutils-3.2.0.tar.gz 357003 SHA256 84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71 SHA512 ce619bca35c529f947b883858164584db9fd16be05b44bd20d7f30b73246076b8c80a9e0ff3f7b2c27366a08043488ccfee98dd3cb43e3c5ee8962efaa056fd1 WHIRLPOOL fda9efb423ba444b460986b82b89feb3e5940d63774377eab4dce6ed1a1c690824192ca25d04a4f34960412ddedbdb9c874dace2256ccd1dede61ee99618b418
 DIST pciutils-3.2.1.tar.gz 367046 SHA256 b31131b721fa26378b4af61b1c49986ff40fe590bc210545b210b6b774337858 SHA512 b8b2983743728eebe9f26de3b96fc8242853bbcac07df02684510c9a3ac43b0258601f5063d16fb09407cadcda7e5778a41f57423d031244f66e34041c4dbf02 WHIRLPOOL 877cfa1d28df52389179eb5ec7bc1dab7fc1677574f2694d5ca8fe33bb76dcae04a2b25b3f0cc704dd9fe6d4cf4206671799f49aa92476e9f3f74e2ca108ff1f
 DIST pciutils-3.3.0.tar.gz 424967 SHA256 4b576a1c2570046fda83fa2c5488661de698874ab04fd8e06eef4b6ab806d58a SHA512 bd8c1177dfd59250f573e22c933df1673af1489758218aeb73d1b480954993fc34e7f67ae7f1a257e8b23044f7f52a806fe37947f6ea20a39e30471d9a8a4085 WHIRLPOOL 67f99d6130344e866601f5e14ff28f0929812d7d5d36e2485e51d00d1c61a514288bb8b899703a50b90e886668a485a013b40be98475a52fbc20896d08229976
+DIST pciutils-3.3.1.tar.gz 393912 SHA256 02beeb14503707c5a3293fe084c18e12e6937c0d4dd1e29e6bcb6b12f124df46 SHA512 4f8b0e62cfd0ffad1674be13c95f5581bc0037ed9843f9866b13eea6fa2703bb39bb878e96df805972f4e9bac36fc67a0a313c463f0764218211f1276cef36b2 WHIRLPOOL 315f1f4f5b98e6e90e3a6af9a8a03acf9732eb5b6de02ced53b32bdaca67360153ee4db1551729e3534d25c81ce2308d89c0715e0554552d029cbb3f18786ff6
 EBUILD pciutils-3.2.0.ebuild 2353 SHA256 1ac7212f396e6c218569cda57684f3248d871742ddcdc0eda9c29c82f211721b SHA512 c1c6960087a88a218ce110b88f3a8345eb76ef9b5fbc438e45f070b2d91724588b0644ad28454accc4b306ebcffb5293ba81063424a42ee62580393f2c2eab05 WHIRLPOOL d69c484efa630c65b6e1aa0a3438ec908145d8d87bf499fd81b603506cac0640e65e1b033350b37935b273c9a5cd9eefb6699b08cbfd9828db3ba77497670c8c
 EBUILD pciutils-3.2.1.ebuild 2373 SHA256 a0e93da5617f00df6f2f3f90c80fc3c35ae585b118098b2d6ebe80922b0f8638 SHA512 a13853ae95a2ba0c7914eac16b2c28270bf9f23050d3c418224334f3910ae9f131b673dc033ac9718fbcec0955325ade03675d07d85097d5b7f64e1e6d51f0eb WHIRLPOOL 5d6d90fe665a69afb4f7c677357d9ea589b56931eae247314e220efe3d45877d7165053345c9b7e1f1850f11507cadd3afaf668987d99b8ffa426da6fe710425
-EBUILD pciutils-3.3.0-r1.ebuild 2573 SHA256 5d77c3580909665f335e178d6612e47a7099d17553757a3a6687a5ca0335e3b7 SHA512 36bbcb6cdc7cc602a6121df2f234b05a5a509a763266729cf3e188de2038ba5d2b07798c7bb57c04cc08dba6a85a03974c89b290e98323abb8212019de9394fb WHIRLPOOL 0fe1322e3b375f66ccc0d4e4aea551406864cdc351cc8f98aa32893a2e72e2c29ff5549716bcb85999d7ac132a40cfb362b0cf34ff434f47ab281472c6eb160f
 EBUILD pciutils-3.3.0-r2.ebuild 3024 SHA256 2eb91234d6e3abf1d05fc7c09ec9235c796f8da95744af21ac2e83374d4d60d0 SHA512 5a3aa5b7f604a924227d38c3bc2e766fa7cf9fe9f891bba1802594234471708716129a3ec5ae4a4e29758d7bb5f50a1ef36680d84d502d54b70a4cdffc60ca3d WHIRLPOOL 6b96eaab93b0ff700a0efcfc418b0cb0526c2be29dd281c272ea7f3a4c48797edb155fb4defa963d1e5331259f4ba2f9dcca355c6c435df577ebd3a474425718
-MISC ChangeLog 31120 SHA256 4cf8ead446c11f3b5251717450352dfa685e4471773c63a49e3ceaddd3156c86 SHA512 e3240ca8d249b5b4e08e5399fdf0e6fce23e1544af2615d45ed7995d409947256a119563a27fe7cedbc6f59af2a3c6ee8540dcf6341da7da4822f574eb30dffa WHIRLPOOL 6ab4f9fe740570a574112f2dda9d0162cc4e251746ddbc7ef211a1df9dd049caf91f0120f825fa040e5fe80c6addcf0ae2a864d71a4588f51e39623b14496997
+EBUILD pciutils-3.3.1.ebuild 3024 SHA256 a0ac33ba8c52dedef962ddbf57cbd0148649913a1813efdbccc10eb84f3fa3f0 SHA512 ccb6b1a00523399d4dbf4a89c380b459758234fced257626cc38fdcdd25faf9a930e53b2bf4e27e5a5d0b87e9b115212affe8667984d212fe71eafde232724fa WHIRLPOOL c3d3465693eb0b547ba00edf4207b4caa39b5147e4db50faaac90aa91d49da4d16663b1ecb9bb10c1ede069b2db2a38895adc012c754f26b7ea6442a6053fde2
+MISC ChangeLog 31291 SHA256 33359ce47c368b00b29c0aecf55f323312c704b7415ddb631887fd48eec7f4ec SHA512 490d607ff67d14ca06aea988b125e1fd74073e48b6009dd9b7ecaf954cbc88012cfd51df0226b53a5275e98346eabcc225f290d9e3ef6f3e963338482380327c WHIRLPOOL 5dae2b9b16deb6bd060eeff5ceeef854f7a5c0a4bc461e6bca80a66f02469d375f04a55a0a31690dd1b8f2a6473f4e79f52294329ce950444339572f9e939f5b
 MISC metadata.xml 441 SHA256 3b59e464a347f70ba8253b0dfe68d2782bedcce66d6463cb70ca8d726b51ff7a SHA512 11928700ad20848f7218d6206b65619005d4c9552b0ae65f66ae7d3c21539b2fca664ea46e6d2f47553e3de6e25a5d89e4c9d4eb41fea358016e1549472934e0 WHIRLPOOL 6b8388c472839846d0bf04b8329e71f1acf787c465ff60e1d7abb7717fe717f1cff14e495ec9b6b9de6169b71a7546b22519cd38bcc8472f7090c7a996d2d7ec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU4oSUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNmkMP/2d5yBmC67tMXXDbHFcr/+Aw
-XFYGYDUcMSD++XuqoDljOSaNRek0/2d2pz6RiG1epsdkYykJGIjoo+ABV4E0CdTt
-y6AiQmvUqHWp8+NZe/ckWvh8TqRBwmZ+dma0gtUOQMaYuqrREvtUUUiQ5xVyc3r1
-rcwd8KMQAKMTfsp28H4Bs01SNsbGDA/Zz7amIj8Q+jkP/kb4Cd7A3IQnQjyI8Njo
-JuisSn6PQRryFZruFZxwHPE1mxm/mLvjhile81ni9ReWzwMJDmthvhraLqeziHhX
-7okWfCojxrg67LmYoB8ZVLwl4fISo9/3o5IpqiPSkYefa1gpa66+9/lpwt9GgLNu
-2l7oTEssZWOAjiDDFWD4XGwREzBW6UA7jgcLbxn5aZ0Gr3Y6EyzNBBzsCNJFuw4Q
-63l4+U0JFcf6gsvyXCoM/3+9pGO5P/4w3imlvaOceuH+WHE5l8ynwhCJ72vNpt0F
-4vheaPqXqKWav+lgeDj8IAE6cJGfK3lkdB0bEvxM+JD+ab62RbQCEF5h3UKAyB2r
-13qaJpcP3AGwcbpPxs7UO2/qSZpwjens6uvRDNnyMuLx5cCcPZoVy0DRpEQQc07i
-mQ80KoF4KytNLjfaA+AReVVYcONZnF1IszMkjtf8g7zG3So2nzEweMN/5KfzUgOp
-pJyDCdUsDaELyVbz5jTA
-=H+Ey
+iQIcBAEBCAAGBQJVLk1vAAoJEPiazRVxLXTFxaIQAMq/tvf1Y6SF8NE0e7BcKQUR
+Y9iCcjQQd51KnzAvKkzkODC43HAlrJQWQVdz5YK1cQV0hiFpYjK0IaW8ujLpbV+d
+MFwIU18o5tGXmbKjyRHLAXzuknwvVodJ8AN1awAjQDhp9C4/Oil/gHlTZEECgMvS
+PAaErC0MBEwH2rP9gZhYeCvuYbXE0zIJa6u+Vb1XYuQTlmoLtzMLH3HYxFPLkQ3c
+4wBmqT729nm5Op6ZOUOT+lWXBOIvW2kn6hvPHNmN7RzgwcPF4joMkiCQ3HaDSuq7
+ZZSdPIRHl7cF/3v5SjXZIciLZMD0WRBSE/wxOgU4HG2I3D48r1obarLtnbnBNsy6
+9tEzwvxzUvq6E38PNKY6pYoIUNQ3hKajFApN+CImjGHJLy6bi44h8xwbOkBHfxfA
+v/PuoDht9IwVEWdjW+clD848f5AHwkZDySzP0T08J+VFhgcxDiaJd/VK2nEIjuzj
+0U3EH8HjahpXfwArMKQ1WKiZl/LEwWHT3yQ4jZlh/mgwri//GpYAiDizKjc4EvA8
+bG009jX4L3EwELyB1LH2JjA5Zk9rg/65ZAPvxmXrbZuTWGCcYQkglMpGZKhpcmiR
+y+ScPwmEokaPw8BfVaPZLMTPzziBOoOPwGoShLy7cKKDxGW9c5BtBS78/9VLqezl
+y4UCyR/8rxjhZoIT7GEU
+=kNaw
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/pciutils-3.3.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.3.1.ebuild
index ef26c0baa843..1839116a042b 100644
--- a/sys-apps/pciutils/pciutils-3.3.0-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r1.ebuild,v 1.1 2014/12/29 08:25:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.3.1.ebuild,v 1.1 2015/04/15 11:37:18 polynomial-c Exp $
 
 EAPI="5"
 
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs multilib-minimal
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -17,16 +17,22 @@ IUSE="dns +kmod static-libs +udev 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(+)] )"
+LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
 DEPEND="kmod? ( sys-apps/kmod )
 	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	udev? ( virtual/libudev )"
+	!static-libs? ( ${LIB_DEPEND//static-libs(+),} )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
-	sys-apps/hwids"
+	sys-apps/hwids
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 DEPEND="${DEPEND}
 	kmod? ( virtual/pkgconfig )"
 
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
 switch_config() {
 	[[ $# -ne 2 ]] && return 1
 	local opt=$1 val=$2
@@ -40,7 +46,10 @@ src_prepare() {
 
 	if use static-libs ; then
 		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
 	fi
+
+	multilib_copy_sources
 }
 
 pemake() {
@@ -48,6 +57,8 @@ pemake() {
 		HOST="${CHOST}" \
 		CROSS_COMPILE="${CHOST}-" \
 		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
 		DNS=$(usex dns) \
 		IDSDIR='$(SHAREDIR)/misc' \
 		MANDIR='$(SHAREDIR)/man' \
@@ -58,25 +69,28 @@ pemake() {
 		PCI_COMPRESSED_IDS=0 \
 		PCI_IDS=pci.ids \
 		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(usex kmod) \
+		LIBKMOD=$(multilib_native_usex kmod) \
 		HWDB=$(usex udev) \
 		"$@"
 }
 
-src_compile() {
+multilib_src_compile() {
 	pemake OPT="${CFLAGS}" all
 	if use static-libs ; then
 		pemake \
-			-C "${S}.static" \
+			-C "${BUILD_DIR}/static" \
 			OPT="${CFLAGS}" \
 			SHARED="no" \
 			lib/libpci.a
 	fi
 }
 
-src_install() {
+multilib_src_install() {
 	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${S}.static/lib/libpci.a"
+	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
+}
+
+multilib_src_install_all() {
 	dodoc ChangeLog README TODO
 
 	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \