Stop forcing USE="-zlib" for sys-apps/pciutils as part of bug #360849

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 29 insertions, 15 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index b7493d6f2860..220e7d47d860 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.650 2012/03/11 23:38:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.651 2012/03/15 07:58:26 ssuominen Exp $
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild,
+  udev-181.ebuild, udev-9999.ebuild:
+  Stop forcing USE="-zlib" for sys-apps/pciutils as part of bug #360849
 
   11 Mar 2012; William Hubbs <williamh@gentoo.org> udev-181.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9477e9517496..a8cc2b0e30e3 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -129,16 +129,20 @@ EBUILD udev-146-r1.ebuild 15266 RMD160 fb2b448c4a3c300e0ceb2e44cf4f8ec272d8b5ea
 EBUILD udev-149.ebuild 16424 RMD160 463967bffcfe474491b5282bf77b8aef249f9b43 SHA1 76dbae2b8869b4fb0ce12cdb25f87907357d3d42 SHA256 20420ca04b4d801efab7a404d66004f983c10fb36d54e8ea8a7c69442c537924
 EBUILD udev-151-r4.ebuild 16663 RMD160 a86faa791d5ecf2d84b53881abae8db6507bd302 SHA1 1d3a1a2a21e70ef33c1c5d9288bbe02c77abf04a SHA256 953c62eda14481446518c51eb7fb7fbb8dc0fe5a2c335c72aee833f12cb0adaf
 EBUILD udev-164-r2.ebuild 15102 RMD160 7ed8900771e83abbd3f2a14dd880d5c7462310f2 SHA1 2533fed6842fc8b3708bcf1ca541a4f13508cb1f SHA256 cca3497d3e06df3da7cc387543f3dc367782755cb504855e50e7900ae99e6b35
-EBUILD udev-171-r5.ebuild 15556 RMD160 c45b51cc75bd9a29bff3208b1287a957fc3d46f1 SHA1 162f19412aa499a8f255b82369ce33e7397eb4c1 SHA256 9a4d2d8dd9e0687371064ca120fd4f0529b765b025421cd5654bd0b40c4fb273
-EBUILD udev-181.ebuild 9929 RMD160 368eff0df891f5982a4cad30104e04cf6eaef770 SHA1 6847ea798beaf940434b8cdbe9057f5e1597dd21 SHA256 603c02812c44478d0764a9e701d66e30a383b5db35a4ee4ba9d57cce8e23ab17
-EBUILD udev-9999.ebuild 9753 RMD160 d8e16db720d7646f369da06a9ea97763f9f0f7e4 SHA1 de552571b61526224163ddc41cb22c01727c7f4d SHA256 3124ada98b305c87bcaa6d55d1165bb545df5b02ed28dd14b087ee010f612902
-MISC ChangeLog 25291 RMD160 792028a1a10de96de72570f823c4f82daff3eac8 SHA1 b444fac1570811585cede28c3d219da777f0a7b8 SHA256 4cbf39ab9aef82673199b36b894d99663f23ae19f41ac90756ae1400c65d4410
+EBUILD udev-171-r5.ebuild 15616 RMD160 31366a2c3bf18913aa13502cdc55510347bddb6e SHA1 05e9cfd2918ab912a68bda47624d801b299a5e5b SHA256 e17f2facb19d520ce1f8e6daf76da0a368fc49d8a525bb12e86d8c34e088c21a
+EBUILD udev-181.ebuild 9996 RMD160 d5df1ec151c3ee80d7b49083bff88cb52f939c0b SHA1 623a10430f92b8ef76b8623c98bdbbef9ee8cfe7 SHA256 6f9360ba8c239c56ba9ff41151d9fb97eb7c478b93c71e0defe35980cd57d7c1
+EBUILD udev-9999.ebuild 9821 RMD160 d53b9a8380d6dcc3bbfe32c56929312ef46fcdba SHA1 3fd07e6db8a0f3c5f43d40b7178923bdc2a716a6 SHA256 b78c0363d81c4f4f7958666f4ccba8220451c01f16e223cd393878db8e1addf5
+MISC ChangeLog 25476 RMD160 cae1c1f1e09284c2b7a89f7459db7cc05937b969 SHA1 a044b9d5f3ef4bd1ef9ebb103273714d958b3280 SHA256 a094d2abe13e72199ddcefef0ffec6700521fb398c30390e9e07448a731565ac
 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9dN34ACgkQblQW9DDEZTi2qwCggWaAHLJquo7ejZtMCR1/Ni7W
-bnYAmwY2iHBu3LoAR1yis6+wR05d3feP
-=/WZC
+iQEcBAEBAgAGBQJPYaEjAAoJEEdUh39IaPFNWicH/jnFq4gces0Vk4+ZpV8O2Gvg
+9H2oXoU1muil4Kdz90ss5YJm5tlDmzm14J5Ur8Q0FAjBy16pxPtu8hBnJS81HkD+
+36gOFjjD7x2ZjwLpnFp+qPzcUXaaEGMw5qhSSL947ZMWvJU8L3iTk2m3fPWQCfB2
+gpEIfsDxig4FyufY4ImD7Lz01En/ZAYI5EEpnXr8xGKC8aE/zB9pU2+FnBizazex
+M+4Zc7neeRaKuF2GQ7yfAWdY7gTQWtTcQR26OubNdLPFmjI/H9vj5mhescT2wePf
+VVDw5FhRUtWsRoM+AcrFcQnPZiEqIGp2nL4VTVAsafcxnquKAc8axR+G5hGfS7I=
+=BsqL
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-171-r5.ebuild b/sys-fs/udev/udev-171-r5.ebuild
index adbad87e6a8c..e663d5b415f4 100644
--- a/sys-fs/udev/udev-171-r5.ebuild
+++ b/sys-fs/udev/udev-171-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r5.ebuild,v 1.7 2012/02/25 15:21:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r5.ebuild,v 1.8 2012/03/15 07:58:26 ssuominen Exp $
 
 EAPI=4
 
@@ -65,7 +65,7 @@ RDEPEND="${COMMON_DEPEND}
 	hwdb?
 	(
 		>=sys-apps/usbutils-0.82
-		sys-apps/pciutils[-zlib]
+		|| ( >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] )
 	)
 	extras?
 	(
diff --git a/sys-fs/udev/udev-181.ebuild b/sys-fs/udev/udev-181.ebuild
index 1e1de6de283d..2136b6c2db2b 100644
--- a/sys-fs/udev/udev-181.ebuild
+++ b/sys-fs/udev/udev-181.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-181.ebuild,v 1.4 2012/03/11 23:38:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-181.ebuild,v 1.5 2012/03/15 07:58:26 ssuominen Exp $
 
 EAPI=4
 
@@ -59,7 +59,10 @@ else
 fi
 
 RDEPEND="${COMMON_DEPEND}
-	hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils[-zlib] )
+	hwdb? (
+		>=sys-apps/usbutils-0.82
+		|| ( >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] )
+		)
 	acl? ( sys-apps/coreutils[acl] )
 	sys-fs/udev-init-scripts
 	!sys-apps/coldplug
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 2e3e49c50a45..d4b82d2d8069 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.74 2012/03/11 23:38:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.75 2012/03/15 07:58:26 ssuominen Exp $
 
 EAPI=4
 
@@ -58,7 +58,10 @@ else
 fi
 
 RDEPEND="${COMMON_DEPEND}
-	hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils[-zlib] )
+	hwdb? (
+		>=sys-apps/usbutils-0.82
+		|| ( >=sys-apps/pciutils-3.1.9-r1[-compress-db]  <sys-apps/pciutils-3.1.9-r1[-zlib] )
+		)
 	sys-fs/udev-init-scripts
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45