Make sure USE=static-libs requires zlib[static-libs] accordingly.

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

3 files changed, 25 insertions, 18 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 5dc45fe098f4..9669fc71dc81 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.200 2012/04/24 14:43:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.201 2012/04/27 03:11:35 vapier Exp $
+
+  27 Apr 2012; Mike Frysinger <vapier@gentoo.org> pciutils-3.1.9-r2.ebuild:
+  Make sure USE=static-libs requires zlib[static-libs] accordingly.
 
   24 Apr 2012; Mike Frysinger <vapier@gentoo.org>
   +files/pciutils-3.1.9-static-pc.patch, pciutils-3.1.9-r1.ebuild,
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 9bd9800f4367..dbe3ada08149 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -18,24 +18,24 @@ EBUILD pciutils-3.1.7-r1.ebuild 1883 RMD160 6cb7d60afdf40115ed1f1c827ad879c5dca5
 EBUILD pciutils-3.1.7.ebuild 1870 RMD160 f59bfdbd557bb890a160fb29aa645dd5bd6e0af5 SHA1 66486a2b852eba8683919e4c980ae6f35e3232a7 SHA256 cd6a33fb8a6369c4f7e15d165dfd416bed36243c0eb7dc929f792caffb23653d
 EBUILD pciutils-3.1.8.ebuild 1884 RMD160 1502f24c6ef8293c1dfb38b72e24c709a379291a SHA1 3011cc093aa321636555800f43d5d8d7206f1d44 SHA256 bbbcf3e2ffb42d3f9ef84af2586cb7dfa8bc41d168e9daf8601580a8307fccb0
 EBUILD pciutils-3.1.9-r1.ebuild 1977 RMD160 f4a09fa71348e97b2318365df6893e8f9dff5a2f SHA1 ef3bfeb638bddd10dd5c79ccf3b05071ddb11d96 SHA256 79a35a59d7b2571fce8bd61bda7fec77859cd14e9ab8e77452b260844831bf1e
-EBUILD pciutils-3.1.9-r2.ebuild 2057 RMD160 4e4dd2ab03165d1147cc45eed2309ef0644a26f8 SHA1 e98b05a7dec498393d281e7b0be56160ab9fc1f0 SHA256 edc620754d2f79604d8a56d26b1a61a2f942e90f36a7f35d32bcb39460a08e3d
+EBUILD pciutils-3.1.9-r2.ebuild 2289 RMD160 61d4d57a8a28c123175ea3ccf15ba685e821997d SHA1 205bbf65ab124f8a767f41a349bfa14203cc5a1e SHA256 66b84d86d49ce905acab0c43714e7d014813903c95551431d66d52ba04c2e88b
 EBUILD pciutils-3.1.9.ebuild 1797 RMD160 fc67390ac9e35aa5efa81a37d77275742a5cb395 SHA1 1eb5ba901c3cc175ca76c1eb6bd9c1f7a580ecd2 SHA256 79b5892336135a7eeee050dd67aaf74f97ff4fadf594de567adbea748aa12ac8
-MISC ChangeLog 26343 RMD160 03f5df33dcac2d4d677b33ea01f9ec2236705065 SHA1 47d0316c02e88b5bff6f602f297e3de679134fda SHA256 f6dfed2452a057557e879bdbcf65f06250de75bc4e9a6216b3e05a2f46199316
+MISC ChangeLog 26488 RMD160 c04cbe64f349bad591ff1ef5b70e2d76abb4bcc1 SHA1 da831762d833ebb80e43c27af2fbecba0565a15e SHA256 a93ad738fa51a9c7ec89b50413a10fbd23c71c8759383276638cd67413d586c8
 MISC metadata.xml 384 RMD160 47a8075a8d2431dd41a0e81d27f383235f6f1b9c SHA1 2ea81a6202a81879bdaa52cda253ff0118d71e02 SHA256 6e4cdaeea704436ddddb3669f7766fc8ec9b9c62290145a49859d29c907dead8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPlrx/AAoJELEHsLL7fEFWSHEQAI/DDNybfS8/HVSlIBYwxlDC
-JRxySLSXZT/S9IaTne8UWqfuev5wVFLPvK9HGFJN2NtV+1cE7km1QAzCXoLwJWZ+
-sxv7haFqanaK/mD2KY2GK854vfMdvOi5Ydu0SM1N1gi1FPBWemZDDlp8KUoNeezF
-zWLLqpLYBWJrlOBFKp/D+/vPD+7i676itHqjGO4To/M0Ger9hdkWN1GX6nvqHLxi
-eVBhqLk2tnfI90wvadIsWPoaniAqh26jK6GbCLHMw+E9pVhbIxj45u3YdTJLr0sC
-GZGGqYZmygc3MOrO1hhijdg2yDn+4VHHSLkmdtgGm6oBFMFRZd+EQRtkrsmDPe2x
-2Rwm83EhNDgMT8xmeo9SMtqJ7dEHM6kRtGUc3pEjMJpm7WDc99iRqozEdFTthvHE
-axXl6Zpnd2oDVaFdfNhDR+9v4Aysb+jAnkWcZ0dd0AT3alymeKKCcVYPFLhIWoUO
-Tytf2R2kLzIm8oJgNsz0zVC+oHQqdU7m1pHuV+dmKzwXoicj6pjs0L2H+avhREW2
-4KClvtJGKoXG5gY7aweP2lw+JdjHVb++Urhn7ndD2ZjcppFodPk0Fn0c9KtdQQS8
-DiByQ+vQOxCWjeCHJLyOXHE45E/xc5FNWRqi09jrQyia2ImbiwM4Xg08tjzw2yT5
-bbpBxVwKaOx50JEGgjsR
-=NpRi
+iQIcBAEBAgAGBQJPmg7cAAoJELEHsLL7fEFWBOMP/jCPb3QevUbTtQv1NmiA3kxT
+E7KAbTyOnR2IvA1O7RJ1N7eg4Yv0CvZFzG6UH+mCF7c5NpsAtallGGZJN45GNi7l
+nqBQJuNCL9phQKX9wQR3nFY1/3tnUW8mDfG7bttIfkfAY+XJNFGaXGEJUYi1GyJv
+I/Wl2e/Iie2sQOG+FiWqCf5SuNEeOBvXecCi61nS8+7TmsyT0H7fas31/QgFpdgl
+LBjzjrMeJ0FaYITqAxXAPHlHJDtUhEEg3eaYJxYySiUCo6ec+Hxyk92eHl9YIfbA
+SJxIGen0DrN4psk+IrNCeYosg+YBxkUpAQjDHVSywfw7AmsupeOENPSnbkFRxKeR
+Yxh2+MZkpX2i35FCfaD8HkNAV/yR9gYRgsyleKRQmqlI52o4sN7+RBTLYAcw7eQ6
+KMH0R+p0hG0eINRjN3oRyqAKAtwzFdNE2rjkTQHWpvcNZYkMhwyE++RdvCzq14FS
+q3f0lduhJ713szC8wdzRtmsU1gFx/wooCuWN9MtEe9MvGDt7UeyVCXYhYQ/lHznm
+qay3HZDz62ile7TrGbrFbh3ze6LA67+uX2YBaNMaqn1/DNkMrmdUKE37NHjIqeKt
+OyanKyxp7PDjggFXKz+uxCbmrNSdN5bbEzQ6gy9uQNt/XwrK4iA0nL3p0g6b7pd8
+u7Senc783UsL00zMgtVB
+=zV1f
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild b/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild
index 0153c0804bcb..1e39a3023878 100644
--- a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild
+++ b/sys-apps/pciutils/pciutils-3.1.9-r2.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-apps/pciutils/pciutils-3.1.9-r2.ebuild,v 1.6 2012/04/24 14:43:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild,v 1.7 2012/04/27 03:11:35 vapier Exp $
 
 EAPI="4"
 
@@ -15,7 +15,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs zlib"
 
-DEPEND="zlib? ( sys-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="static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 RDEPEND="${DEPEND}
 	sys-apps/hwids"