Put softmmu/user deps behind the respective flags so we do not pull in one set when they are not enabled #538958 by Anthoine Bourgeois.

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

3 files changed, 33 insertions, 30 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index c659ff8f8694..caa84e1eb167 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.317 2015/03/25 14:04:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.318 2015/03/28 04:15:37 vapier Exp $
+
+  28 Mar 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+  Put softmmu/user deps behind the respective flags so we do not pull in one set
+  when they are not enabled #538958 by Anthoine Bourgeois.
 
   25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> qemu-2.2.0.ebuild:
   Stable for x86, wrt bug #542910
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 558e76b02687..95af364549f2 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -19,23 +19,23 @@ EBUILD qemu-2.1.2-r2.ebuild 18532 SHA256 d795b0501835ba5e55aefd8bd9f3f5035dd5b6d
 EBUILD qemu-2.1.3.ebuild 18523 SHA256 53842e99bd44dd35a5e5b92d864173b875755494e3e4b4dbf8ac07fd2641572c SHA512 8b5a58b9565d7d2c439750d9ac57e2d28cdb9b0efc7148f3266a52e569cf90668d3f5035a3a13ce7d1c03262f3da075b2037ef7183ada7e4685b4c14e068fdad WHIRLPOOL 89d3e9d420ae3869a963d84fea323cda518f9b74b6a2110ad77fd37987c5e1bd241ec0d81c94bfe573670939f789fff7109d0fff6961c7309b8d367b652231a8
 EBUILD qemu-2.2.0.ebuild 18391 SHA256 f6d9b749908c068dcf76f32d1a4c1fe2621c747249c1d408b4bf0ff64360fd6b SHA512 50c3b17d760acb436fd81ebe07dd9bb968d31cde34cf2c1aa88e0504f5f038389e2edee426f844667485157ba268302d4e5c1adac5307cd79c2c20b7cfc9fb35 WHIRLPOOL 958707a446b7ff6335f02d0150aa5f31aaf0f93f988be4d2a7a5be5f35bf758d14c856df08c5c367255a84539664130833f8712ff65cab98636c80eb8c2a6f95
 EBUILD qemu-2.2.1.ebuild 18342 SHA256 fe5daaaca5b38520fbacadcda2cfd2e66a3c0c84cbfdddf4c96188ca2c1ec35d SHA512 83a046c529979fa1b05aed3a8802709bd987aee6cae955845192e79b29e7d9d1fa874e1e23a170f39d16c11704edd926d08ff613b8d62e6e60085676fe127564 WHIRLPOOL 370e16f00b7c5c78a74afa0d3f8c36bd020835279ccdc339d26684d75802417d0d73fbbb74398b2362657b089629a2ab7bdcca41954bbcafbd329774836e54ef
-EBUILD qemu-9999.ebuild 18339 SHA256 6e233da6c9f9e13ea9b15b60f403b8726016b5b75ee886a081115741ed0fe81d SHA512 5bdd51602b0ad29ba4854bc2c6cc1fff26f45bba07d4c381d2287ab51d42171260cd4c6122ac9592aa405a9f8bb46e7f676fb1d21b8f3a3da7f6633deabfaeaa WHIRLPOOL 5672654a47b77f45b96aa6a0560564d75af1be0c002c0d2b86a5f5ead165ef16810880a340d5e850b599c17c3e2d0b71685a1a106325abf0e0a90a76450fc7ce
-MISC ChangeLog 52083 SHA256 13b9f4c2c1666189bf874d7f08e5e7f234b336d78626a59a43fbfe409fc9c708 SHA512 4cf45126758642bcec8a56d0db0cceb22d577be2aff4b132092c19063449ade59f08ef6f381d96ee29e771b8bf33f70e2b56e78a1580871ea4d0a0d0b4e3ae40 WHIRLPOOL 4305f0b43e5081fb20256490dca8944654e7d2243b121e8dcef675a27bd3826279956d47445a734de67f3686b7c389ce776a7b3dab5e77b32a042ec59d59d9ee
+EBUILD qemu-9999.ebuild 18585 SHA256 22d3bc69a0c768f7d446c9cb7951e9e2beb1a53e7d5a050cbdbfd81b04de7308 SHA512 bd91374aac29db455921d6f0fb018ce55bd6d76ba838e195948a93b76329781b10b53d779088e78d0762f2539cbd86f9d6c80d76ef94bd91b0fbde99ce628ca1 WHIRLPOOL 0758fd6c42aa41b749a9f417b658b2900b99de4e80dbb59bfb972b1a17f66d92ffaf350abe29450594a91f27c173730d51617dc2cb880d01c87c1a4faccb02be
+MISC ChangeLog 52295 SHA256 5f4bea6d8737fdebe51766af0f0807525ac394b896840442a3704f2c234ec818 SHA512 53d8dab011cf5033d361cbcd4bc3dff1f92c7f1bef84e554da4c5aee5fd210bf724c98b802848021e5a3e7287e2eaab031a479627e008dcb4b0a524b1cb22a94 WHIRLPOOL d9ced1f1db7e8c65c47fe3161b1dd081f6387975e0da84ff09511f157b9bdb82b69a9d28767c610f7310a26e5ca00a3200b58aaea6b65c48f138e95a91a0b423
 MISC metadata.xml 3595 SHA256 1f78b84a325125ff473ecb496a951898d139b73c755367fea5489406dd0a3c9c SHA512 d460ac28d0b1fbb0ceb5514a6f4e5c6bf27faa1dbeaa739890fbf4e9e9c28a8ec190b57a818a717baaa6384170f983c62be1b1f5044e8650b5559c80542bb880 WHIRLPOOL 12c616e8c9337382c31fa16464d5d5d880f911784f93f85937957b669387b201a15e421a62fd5c3132ba6166df3aac2656532e2e920932d1f7f19cb8275831f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVEsB9AAoJELp701BxlEWfknQP/AvhF6B1XaqyFiRhJmX5LNNR
-lhBDZf+T3JqbO+bc5MdGl8HGCKaH97F1MfdKxNoJ3Cuh+/3nI3xlNlyKgoEWtYiL
-BFEKfDH+qaW9BdZVha8uoXE/q3K933ASyBhbCrt1XJJrn5UuW65liiVga4aIcOhV
-dxMKpk00ZLiuYmvvnxqbgrTSm5tnepl8TKeXOxu+5GV1K3/Kupuq+MegZjpltjm1
-K8jruf4TrnDWPn+nKC8iKT0sUIP3UgK5DkwXrc7FUxVCSPVDlNlwwDxsnuwi0MEL
-J1jZnHeJ74Fj4UcrvpoYeNMsf/Q0kaL6WnSf7ll5WKAieSJF3ZNkoaC8+iyOElh4
-bgp56VGQzS7P2IcGtZIV2ISXQaXtmPqnZAyBlV50yOd3xjT8qdxgPy3HX/siniuH
-6Efc+JQX1F5yqBkbez8wPbEy2teyJYjrn/W0A3loC6h89bZKOTZ4wlwlkp45tSKz
-GfLERfEqBr+9jrgHGYnnYj3QfCgXlsX1R2Dy5ICG7ql7+Ds9UOXzcqoAeAwE9m57
-6mfpWJuQ2BuDWQs85epb0DsXuxTKIXxQfq0TqPMKqA8A5bKnYXrgWbUbomqUmnK4
-+3vl2qXZC5sEMz07TWDgmTeDtXO1VnPVfYKx013QEX8bIuj+aJvs/lEpOJupxVi9
-B+FUYwxVgqnfuh4ydlKC
-=0eRk
+iQIcBAEBCAAGBQJVFirrAAoJEPGu1DbS6WIAgboP/3C7ypkDCxZl7IusYcwTjxSn
+qKeNw3QPMSEKr7oITDzB4fHwIj5S5ZgXC+t571nxCyaj/KaFnAAjC1Wd/wedO9jP
+uL5d06V9tip8bDHXET0Pa0wbqEc+NYpEMlOSNjfq7tWUfYYxEsE3i5Tvy2LBkmck
+XLSbDBErXK4nN/4IOaLnxlqQKbPQ242ceTb9pA/ImEwh29M11c55iyDX4tjHFQtK
+l7qLsDgy57WEErbyA8SHDWb0+JrJe9XJptILDc3zTN09BsKt6xrucdO8/OAYdKvV
+WtflVWmkK5sDyQpicrHunEq8ndfiA7JXZRZ8f9pl2s0Ad/CoNza87G/WlD646Z03
+1p5TfH97KiZR/1+jSQfr7NmivfCt3c3YoQldcnm2qNdidy+JWla2DVLCLXtGf/0C
+fs6yfWkrI45OcCSrPra5lE0E+JfrYBTkmoUVLiLsTzJPL0S2BM26w3qamNZ/f7Cn
+sy7gWjQrJlG4NTYZOHV0AiDeLydwUSIkoxfo1D0HMv853BFBUKGsUiGizpo9BZiC
+RdT01rCVB2Kg+LyrRddIMM0Ijq3bib2xatMgsywQ2DYuxnQOzrFQpRq6Ilsc35Dp
+8Ppiy+DmaTs+XCxcTMFDpkX4x2ZJhmjFH4c5OmMn3RpRSWprqWDOMBvUdfvf2M6o
+eKjOXejWYiOgGhUWruhs
+=pSJB
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index c19e9d8bbc51..f2f8bd8172d0 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 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.94 2015/03/16 18:41:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.95 2015/03/28 04:15:37 vapier Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ncurses,readline"
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
@@ -43,15 +43,13 @@ x86_64"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
 IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
 
-use_targets="
-	$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-	$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-"
-IUSE+=" ${use_targets}"
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 
 # Require at least one softmmu or user target.
 # Block USE flag configurations known to not work.
-REQUIRED_USE="|| ( ${use_targets} )
+REQUIRED_USE="|| ( ${use_softmmu_targets} ${use_user_targets} )
 	${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
@@ -77,12 +75,12 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
 	infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
+	jpeg? ( virtual/jpeg:=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? ( sys-libs/ncurses[static-libs(+)] )
 	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
+	png? ( media-libs/libpng:0=[static-libs(+)] )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
@@ -108,8 +106,9 @@ X86_FIRMWARE_DEPEND="
 		sys-firmware/sgabios
 		sys-firmware/vgabios
 	)"
-CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
-	!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
 	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
 	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
 	accessibility? ( app-accessibility/brltty )
@@ -137,8 +136,8 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
 	gtk? ( nls? ( sys-devel/gettext ) )
-	static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
-	static-user? ( ${USER_LIB_DEPEND} )
+	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
 	test? (
 		dev-libs/glib[utils]
 		sys-devel/bc