Handle more USE=static/static-libs cases.

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

4 files changed, 80 insertions, 60 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 6d038acc2119..8cd6ac46a9af 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.122 2012/10/09 20:41:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.123 2012/10/10 19:20:53 vapier Exp $
+
+  10 Oct 2012; Mike Frysinger <vapier@gentoo.org> qemu-1.1.2.ebuild,
+  qemu-9999.ebuild:
+  Handle more USE=static/static-libs cases.
 
   09 Oct 2012; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   Update maintainer
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index e3a9ae559905..6227c6736b7c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920
 AUX qemu-0.11.0-mips64-user-fix.patch 313 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f SHA512 ca7f92b7d094ed62c15e539ac760aab50255699edfd6faf2bc017e13fb73da66f455c07999c6ee6a1f2196b7c0a2e2caa6c7a584be22d04717d1abea08781dbf WHIRLPOOL 2eb95b7dd79e30ecd4b50a4901553866180c0022760cb1e425bb23f14411ef84356db00eca593230d8fc204f5f5b724567d051fad299a8d6bdb81a346bfa7436
 AUX qemu-0.11.1-CVE-2012-0029-backport.patch 1448 SHA256 fb739ca478977f17b73489823b92d8964da1bb308db997596e1160900f2c9236 SHA512 d143a497af349aa58a4542754c757a73bc9ab89ed54498c6d22a18452634f81a8d009aaa3aa4a9a06888af4461987390b8ccae7b2e4c9f5095b38bcb108c608a WHIRLPOOL ae30b58043818d0643d04b689105fb19ded7220152b838305d1db30ad6d47a0230acbeaae788a833246d5c0b975a2106421ba561332c2c5aa7c9e4bf05e9dea0
@@ -18,8 +21,25 @@ DIST qemu-kvm-1.1.2.tar.gz 6605075 SHA256 2be9cb9986c0b67ef97a2d21a51a945e91c403
 EBUILD qemu-0.11.1-r1.ebuild 4894 SHA256 25ef257efc5ee950d5f93ad3dc059c24cc8104e094b62840477ec719c66bd5f5 SHA512 0afcc745a78a23a8fba3cdd518595894f4ed12b4048b128c55be3f53c96f97d7701dd5bebbfcbb06cf37da617a78f3813f847792542e27e85e932ba9395eb542 WHIRLPOOL 3b606df1b67a37b61f858a0e76133867b2c281d0cde1024c510cf4bcdb433e25db117bd817e6e91eadf0d42246c55873e69078bb5f4c212122fc89a36cd7c5c4
 EBUILD qemu-0.11.1.ebuild 4826 SHA256 7aaf359e5b09721faeb9b97ff0fd8ac4c91ba8906d8f9439ac21550af786fcda SHA512 5a9631fe38c86b1fd56519544f381ab4fdb064004a1b229adda361916724ef88451dd72713c61b092a056111a7a66143d9dd0e4b5638a69f9c782f21b63d2289 WHIRLPOOL 2c50d082e32176108d661a199dd9633c4d5bdd94288921d443148c62657cf9f8f24db268f0babf4fdc707d24e3f317e0a019670104849b6b00b272cb505a2006
 EBUILD qemu-1.1.1-r1.ebuild 12073 SHA256 7f408c7425a3e34d31e48a6c886d4a415a970e7d2fb4ffaf58b44f9d9e88f50c SHA512 efd0c757fab7fa7e06b86e32fcedd0347f8728a7ea0bf67718b34b3b0c0135450276fc13ec02755d173626a5e69f09d5382afe2e901c310f3b50efb2e3e2f21a WHIRLPOOL 63949afad70876a426db6808a60d09d0fcf98e221afc24005181114203bb6586509620dee18b9009cf602c57cc0429cb8e718fc89c44a1d64ac2d7309f9ddb67
-EBUILD qemu-1.1.2.ebuild 11901 SHA256 925770c70b62a68f4908e1ae5ad3f2e6058249de1772144df2d2076d4e8fb2c9 SHA512 c1baf475391a4492d50e3b346a0a1914c23499a4864df30c3a4608d4d7254f66d54e24de4877b3682a2fc0f30b07ba9659e7a2d2087c407702719e1334049d60 WHIRLPOOL 0b3c5dcb1dbd8ff0431ecfc31b7b02238226f02f0e64ec6ed16cc1aa6a5f843222fd3bd9920ced63ab223808a0def4e2f45bda99e0f64133432bef653f4fa4f8
+EBUILD qemu-1.1.2.ebuild 12131 SHA256 f2c6ff05fd4989af8215c423b94a9df08e2569f140aa830f1bd7766f88efaf72 SHA512 2e1b5f0eae1610af3ed0abd9453615d4972206841c2e55cfabb6cd872e24f928cb510b300f237e04d6c46356ce9dc8220524ae98648758dc6d0e0b8c23e71e04 WHIRLPOOL 2ef6d02842b16dff75142ac8a1b64a66955392b32f7f4cdd713847f4b9d37079f78194cffa61ec5b8ce04efca5dc59b177c5fc298b88d4db455971a3fb4e8405
 EBUILD qemu-1.2.0.ebuild 6781 SHA256 c3315377ba5fe331fa028bc2e1dc4231b09c9180856732943e5fb3b5534c9445 SHA512 68d1422c70f52461294ac703cb8bb6c6daca0efa41fa994f034d5dfc5a47674774b9e60cc03eefe9f635b750a6b089a3333b95ef3be0792d1648437a14a13017 WHIRLPOOL c6ed1c57c820d77c804f6ff5127aa0e16b3597462c3c0005cb1d8a364ac7f84ff00b641d1e95a1d914e48b8e2a1421b326d3095af56163179afe51548d15d4f2
-EBUILD qemu-9999.ebuild 12736 SHA256 26c3b6463bb4e83a0dda30442fec254628c547d6c611851b0e1aaf1249fbb3fa SHA512 dc637bce32dc6a7ec45ce4f379a9381ae259578f3c7258a92e428a72aeff53d4fae9af7df43e085bfe65db1e295f51ec3a49306fe54f63b3ebde684a06015a1c WHIRLPOOL c15199c17c85619e3708d93e81556e8ae093dad21986bd03d13db8950f342631a181c23e605542bb5f5ada91bdf609dfb35152767f79da1e67a98a14c8f1f54e
-MISC ChangeLog 18686 SHA256 29eaa4cd09bdd973a08dff9c41e1fa88cdc7bc2b8a5ca63bf7598db17931c814 SHA512 0213b6170fabd50ff10b3880c593a94999daba5722da035959c14f3dbb4f1c2694469a980e71c38f73eab053920fdfaefa2e97ea30695059b1812f86f9dbcef4 WHIRLPOOL 3bb80b41a11a3fbe54ee8794b00af080828c6afcc735ab6564ca7ea197353e0da046406fb0f876bf1fd8937d704c7f6771d1dac7265f9ba878f9124e9f7a6b45
+EBUILD qemu-9999.ebuild 12966 SHA256 47cb6e3c790b883dedbdb68aa736a3d9e3d91646b3a69accc3261cfe0471b255 SHA512 aad12338e10a2c8742217a990d559b8b3d3d648b08126250ee46178048557a98ec661886649cf8ce96f37fce6e6219fef2f1d7dba991cfdb0c23fb7d624ab2c9 WHIRLPOOL 6fc36f3df92d5c97469f692b951087da552c853778901df07de191bac665e95b53e29087174d343ae0d4ed25ccfddb51736951eb5bf422af6ceeb20cadb2e1a5
+MISC ChangeLog 18820 SHA256 0ee24fa27200c745f85c936ae6a0e3ea5246c58b4e3715283a4f8bb637b066e8 SHA512 d106993c2f38c2c1b977be3efe979d22e9b4abd91cd360d7e044fa4431d98a932eebf5de8bcd6d4cc721e22c05b1c48a5a53d0d1223a4070c02961d4ec3a86ef WHIRLPOOL 3c8155cb58528761450d3845eb1e7fb6b891d40605f3f85aaa8f6e028b66df816de1945e00157c15d7463f39a6ea1d000c30628c47def4d304c8719caf676d5c
 MISC metadata.xml 2620 SHA256 b72af52566abe6ab9771e3bfa27cfdcc4e4da67e827c34f958b40f3071e74e0b SHA512 9e26fafc7f6d60f6475794e20cd745ab59ad9b555e7fd2a61c1d78773acd373d3b35d652719adb603029568049010498933129e9491d82740511cae31d8b87d3 WHIRLPOOL fb4e8533724a093ad8636d8fa80debcc91f921f56a3edab18ddeec3bae95cd48f8f25fdbf6f829870175e1e18b485b1cbb30a61d7f9502bbf2b945a37f3db2b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQdcqYAAoJELEHsLL7fEFWrrwQAKl8STik6A92zlWMQ+2b0JY2
+WDjlnNC5tfIUDlj84hlVqJjejbl1JLwc2qr6a/ODmDH9MaY5qPD1A7J4NxNWMfNu
+VTni3JQ54t8UCZGpD6TgASX2Vo6HeZBwyoia5bW7JdXcpEEO880qwTkFpxUv3wO9
+4W8ttgF78W/zsVYI4yAw5Syazuu7Oocts9uWFK0voWVMkG8AMkiep574YrZLsWMD
+6oa+l3aZweqrrMAzxRTlmVWXwEpxev3aXtT/hWInYOLnULLCXQBblqSUvQCQ3wke
+iKi2yaBwgFA8ymHmye72znWU8beCiA3rd0t+VG3blDuwIdGaHnToqMCgVryKDNJc
+JxoO7PEpmlqsdfuzgHq5VAa28HONQCxAUcVztsycocWN7hVgIxnNR35b8sLqhFz7
+wEc+aVMkcaVNgjYT4SEKGTCeY/P0KJenA58VtiQO3wRin3/INDPKVTiUrOQB3xFU
+529tIN/EfrfDSdg9ACUNdcXIuVPKJ3mNNuX9ZvpP+ijzOTxyBi7GfoD2So/CdDhk
+KiSMs3n/Msowdg5+kqEpuWCE8zl1hNquJGogCmVKU7zyzP/Mq5YdIWxQirQxSyYX
+NZiIgjYnoSTRsc+vu6ptrH/G6SpR89yJlAgY4YpAuB531BVReNku4tyxIbY2NkmV
+a/Z8FG5cM9jA9oDIZd3+
+=bdgG
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-1.1.2.ebuild b/app-emulation/qemu/qemu-1.1.2.ebuild
index 3f6d8a609e4a..3e60c7df93ea 100644
--- a/app-emulation/qemu/qemu-1.1.2.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2.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/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.2 2012/10/09 20:18:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.3 2012/10/10 19:20:53 vapier Exp $
 
 EAPI="4"
 
@@ -57,53 +57,51 @@ REQUIRED_USE="${REQUIRED_USE}
 	virtfs? ( xattr )"
 
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-RDEPEND="
+LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	media-libs/libpng[static-libs(+)]
+	sys-apps/pciutils[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	virtual/jpeg[static-libs(+)]
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
+	kernel_linux? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
+	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!app-emulation/kqemu
 	!app-emulation/qemu
 	!<app-emulation/qemu-1.0
-	>=dev-libs/glib-2.0
-	media-libs/libpng
-	sys-apps/pciutils
 	>=sys-firmware/seabios-1.7.0
 	sys-firmware/sgabios
 	sys-firmware/vgabios
-	virtual/jpeg
-	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
-	caps? ( sys-libs/libcap-ng )
-	curl? ( >=net-misc/curl-7.15.4 )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
-	ncurses? ( sys-libs/ncurses )
 	opengl? ( virtual/opengl )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( =dev-lang/python-2*[ncurses] )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
-		!static? ( >=media-libs/libsdl-1.2.11[X] ) )
-	static? ( sys-libs/zlib[static-libs(+)] )
-	!static? ( sys-libs/zlib )
+	sdl? ( media-libs/libsdl[X] )
 	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.8.1
-			static? ( >=app-emulation/spice-0.9.0[static-libs] )
-			!static? ( >=app-emulation/spice-0.9.0 )
-	)
+	spice? ( >=app-emulation/spice-protocol-0.8.1 )
 	systemtap? ( dev-util/systemtap )
-	tls? ( net-libs/gnutls )
 	usbredir? ( sys-apps/usbredir )
-	vde? ( net-misc/vde )
 	virtfs? ( sys-libs/libcap )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-	xfs? ( sys-fs/xfsprogs )"
+	xen? ( app-emulation/xen-tools )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )"
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? ( ${LIB_DEPEND} )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 2655dc96a5ab..c039e493d843 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-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/app-emulation/qemu/qemu-9999.ebuild,v 1.22 2012/10/09 20:40:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.23 2012/10/10 19:20:53 vapier Exp $
 
 EAPI="4"
 
@@ -63,54 +63,52 @@ REQUIRED_USE="${REQUIRED_USE}
 	virtfs? ( xattr )"
 
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-RDEPEND="
+LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	media-libs/libpng[static-libs(+)]
+	sys-apps/pciutils[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	virtual/jpeg[static-libs(+)]
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
+	kernel_linux? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
+	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!app-emulation/kqemu
 	!app-emulation/qemu
 	!<app-emulation/qemu-1.0
-	>=dev-libs/glib-2.0
-	media-libs/libpng
-	sys-apps/pciutils
 	sys-firmware/ipxe
 	>=sys-firmware/seabios-1.7.0
 	sys-firmware/sgabios
 	sys-firmware/vgabios
-	virtual/jpeg
-	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
-	caps? ( sys-libs/libcap-ng )
-	curl? ( >=net-misc/curl-7.15.4 )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
-	ncurses? ( sys-libs/ncurses )
 	opengl? ( virtual/opengl )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( =dev-lang/python-2*[ncurses] )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
-		!static? ( >=media-libs/libsdl-1.2.11[X] ) )
-	static? ( sys-libs/zlib[static-libs(+)] )
-	!static? ( sys-libs/zlib )
+	sdl? ( media-libs/libsdl[X] )
 	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.8.1
-			static? ( >=app-emulation/spice-0.9.0[static-libs] )
-			!static? ( >=app-emulation/spice-0.9.0 )
-	)
+	spice? ( >=app-emulation/spice-protocol-0.8.1 )
 	systemtap? ( dev-util/systemtap )
-	tls? ( net-libs/gnutls )
 	usbredir? ( sys-apps/usbredir )
-	vde? ( net-misc/vde )
 	virtfs? ( sys-libs/libcap )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-	xfs? ( sys-fs/xfsprogs )"
+	xen? ( app-emulation/xen-tools )"
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
 	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )"
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? ( ${LIB_DEPEND} )"
 
 STRIP_MASK="/usr/share/qemu/palcode-clipper"