Only install the firmware components if we're building a target that uses them. Update some USE=static blockers. Update the elog message to print out in correct cases.

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

5 files changed, 136 insertions, 70 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index e1d7f511f4bd..35f15ab43816 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.168 2013/01/13 02:53:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.169 2013/01/14 22:24:07 cardoe Exp $
+
+  14 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.2.ebuild,
+  qemu-1.3.0.ebuild, qemu-9999.ebuild:
+  Only install the firmware components if we're building a target that uses
+  them. Update some USE=static blockers. Update the elog message to print out
+  in correct cases.
 
   13 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.2.ebuild:
   Rebase backport patchset to fix a glaringly obvious mistake I made when
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index a0687e5fb01f..8bc34c8dabb8 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -14,8 +14,12 @@ DIST qemu-kvm-1.2.0.tar.gz 6839420 SHA256 e98ab96c24337e312864f2341016695ac11cb9
 EBUILD qemu-1.1.1-r1.ebuild 12063 SHA256 a3f92888f96d664c0dd26ca257ebce3dd1716c12156bd66a5baf9368f55d05d0 SHA512 6b516298b3819a1b4da1ddc23ea5ba7c6e71bbef44be976d8942f0b0ea474644549437cfb60c12b90d5ab3cfdbcb48e746f65603633a6b07d3f747e1eb6c5e3c WHIRLPOOL 66d8f516e0becd96dd6fa2b35590e7fc3968e8b26f3e51c17882bdc48c70015ac3e9dbfe79c79abaaf48e4c54593ca14a60834f8ff6974e092fac2cbf495655e
 EBUILD qemu-1.1.2-r2.ebuild 12149 SHA256 b73be920f461c0d416483776750668ce68deb4214049a29e600b6268a1e6fae2 SHA512 368d8086ec85fddc60189c8e53d9e407f1321a6ac7a98da04d048f436dbd56088eaca3fd77a5888ea8865b4f6a0311d75f82a736ecda5f9ca8e02a2c03931a25 WHIRLPOOL 943f6cb80fc610a4615783e1bd5b3152366ba80877cce142ef00709a5d8461ebee5c2bb975c8b9dca6452075fc810c3e601bb4aee01f6700b7c7aa8c149e8d6e
 EBUILD qemu-1.2.1.ebuild 12715 SHA256 bd53340e0d01ec18df8a47a7c8b314dfdb4a10b8548634197f8f417e7b282cf9 SHA512 191ee242d50f5811dc22dd58a8fec4475eb80d3e38b2cd959c04f4c086251e2764f49373e6d4247d828265e8abd423be80c8d4c272d7bf506ce58027c9c7a59b WHIRLPOOL e00d063577478b979062f6c6813614441f4ab90fac8bf296e42d579a6fba258c997d0637ebde89b4d276810d9639b38756b06aa03a526c763a60f16d36d9231f
-EBUILD qemu-1.2.2.ebuild 13014 SHA256 fbbbabd0081e0300f7333cf6bc362976be074b3283d159cd7f75f883da131981 SHA512 157bd87849b117762fac3d321dad49bf260e351aa647dc70391b416baf7d0573ac128027ee2ae64c7346b4e0a12890943f98803e190c7b18ff7de34c1d38a2f2 WHIRLPOOL 40971184e910478572a55b79d30cba2fbf10834796571d616954a5f9d5cbbdb331eaecfe3b69dd1f3f1002fcd6370784f3c42facf05056d62f04ad667f2da3ac
-EBUILD qemu-1.3.0.ebuild 12901 SHA256 f541da6f1301b3fd10868e0e858983cfcbe00e5d8cf3d81f810ab7ea2f17cdfc SHA512 cbafa8a3a8e2b23fba4d68bab3b031b2ad22b59ec2680e253e6d1aaef59e604dbc7b7bb081bf7ee240732a8e66b914071d65b55976a4330733296dc221b2ddc2 WHIRLPOOL d8db52d41d234e79703b9bb658ec6c9ea0e690d4a59e6bddba09e8ac8bc638f0c78c6ff5d76320f1d7bccf9acb335597f6059e95d4561447e708e54935e74cd2
-EBUILD qemu-9999.ebuild 12908 SHA256 cf798b917491a56fcc07abaa0a557966b889078c3c32fadf186e4937e3583015 SHA512 9efdc3bcc3fcbb8ec4050895dbde80e66eeaa7e25af9c81c9c3b4a4eb784fa724e051364a47eb45a455f2b71e39edf21fef0be57c7c24013dc641203b8afa284 WHIRLPOOL 77dc184c8b1e44354e1e85c4e83ef2afef23d2ec7e4fd742cfc7f35d1aaf30ab587e169d21725ff6ac655eb80195fc781958bb34b7813ca6cffa3ff7478529b1
-MISC ChangeLog 27244 SHA256 4f6ddb8712b949422500700b476671b1582332907856cd7db62015df41e123d4 SHA512 a2ed8537ec888c2890a2bbdd003223285067f2d7c2aca4014a44a3d0163d1ad27f472491fdcc72910fe5067df6efdeee6184eaab53f614a3abb6d013ad699873 WHIRLPOOL df2cdbb0a3281b9da049e6743e5e1e309184f8b2754eb4b84151347076bff1a8d330e5ee09ea49275425c4cf7d73202c898eb836d8b22aab3af497cf6fa94905
+EBUILD qemu-1.2.2.ebuild 13673 SHA256 caa7bdcc0c7090f16b23e0aad1195959b8324d20cad4ae271457bcb4a882ec9b SHA512 4766b1805a606ae11878710ee510e46326451f35add7b6e9b56f4777135626e3b66764ec62aaa2a7456c60152a5566af7c9ab10dbd5f12437726587dc2d97b36 WHIRLPOOL b703a43d41596bbfb0a31383dd5e05f2b69a14bc829041c7d0936aad72b323241c2d8c6dd2e0e55defdf30bf50cc60e26653fd26ecf67e880146860e1f31ecbb
+EBUILD qemu-1.3.0.ebuild 13531 SHA256 0e9f14f67b2e3bf7118fccd4b1ee10e9f16acf377cd81ed7e6aab48ec5a4afef SHA512 7b8388a8f587bc6dcecc330531f9e8117f97cb111d38d62e6bc09e7d13bb93b94b829cc6df0bae69796515890561ad567d63df8f0770cf27abc4392fb09a21ce WHIRLPOOL 3e729bc5193e28a8bc7c347b6cf5cee17a146b9a5d26dfcc9c8a200f8c975da02cb8f73811b2335de52dc7b2e2d8566033c59205e0d65777a2a15ef5b3a87848
+EBUILD qemu-9999.ebuild 13552 SHA256 7ad89faaefae3091bbb861b21ae4d1fb4f6a82103c459749291d8d01df11d4f4 SHA512 820e50c647d9182604dd2621d2d92b6fd71d14b3d7c1e44cfba349785a9a4d75617f1e08f597a88f1a83b4b6dfe06d0fb5d2e83130e2a4f1fb7569c0f785bc4c WHIRLPOOL afa54eaff3e7517984dedd94625e9dab89c2aec19862aae467c4edb805df427c98f5d50e5acf6d82c38c6ebe5d9b198ba2f0ef4b5269847641f948cdc6cc06dd
+MISC ChangeLog 27527 SHA256 3585166979c885ad81cb5773fca2c6742dd8fe21aa4b2fec483175a64d4e51b2 SHA512 1dceac5e6b73d6c48024cda8000f3fb91ca0f78e4702157ac9d4d72df5dcbfe54b93c7ae7c3100a4aba9a2229ef5972bf89ffacadc4f5c8cbec0d94a6ed636d0 WHIRLPOOL 4e82574fb95bc6f5ffa393acff042c7490f4e8d278eccb072d9888e57e8901136fabca511708b559ed60efb47f8ed92960da80f2efc4c30cfd5cb257b4ed6d1b
 MISC metadata.xml 2722 SHA256 0d2c9fb51a2177ac7750c15ed830479795b67b15734ed2b916afae556a3cadf7 SHA512 3b364d79b6790c7c7c4826aff13dd380e8a914abf691431e22821337d1ab91281614beaa2736ab459b0c996893aa80e09db45eeb1f6a0b14ca251b1a645310e5 WHIRLPOOL a0521b8ee57b1d7c31133701d7e1c7348473e54d1b39708a49c31baa352f365c65dd3cba53860139551723f26ee7213b0db759b65e03b843e94e24b3723b5575
+MISC qemu-1.3.0.ebuild.orig 12901 SHA256 f541da6f1301b3fd10868e0e858983cfcbe00e5d8cf3d81f810ab7ea2f17cdfc SHA512 cbafa8a3a8e2b23fba4d68bab3b031b2ad22b59ec2680e253e6d1aaef59e604dbc7b7bb081bf7ee240732a8e66b914071d65b55976a4330733296dc221b2ddc2 WHIRLPOOL d8db52d41d234e79703b9bb658ec6c9ea0e690d4a59e6bddba09e8ac8bc638f0c78c6ff5d76320f1d7bccf9acb335597f6059e95d4561447e708e54935e74cd2
+MISC qemu-1.3.0.ebuild.rej 777 SHA256 734563d3b9109e4f4bef1c19f5a9202f6f24ef8356b511ed0cf4ad6d30a1f161 SHA512 75c682a68f39f5cd1158f84c1dc82b4e75f7b918f549f9b2158145acfae07ed6080a228e62d3783141ba1d5d427e3f0b625ef767972a55364aebfb4d5c055082 WHIRLPOOL 029f33a70b2a97f245688e2b43c8fe421df23c3e2c6c7412b24c8659c57e3d597aa6aa2893378160c91c77ef380388aef102fd7610ff0294a1184e6d96053a14
+MISC qemu-9999.ebuild.orig 12908 SHA256 cf798b917491a56fcc07abaa0a557966b889078c3c32fadf186e4937e3583015 SHA512 9efdc3bcc3fcbb8ec4050895dbde80e66eeaa7e25af9c81c9c3b4a4eb784fa724e051364a47eb45a455f2b71e39edf21fef0be57c7c24013dc641203b8afa284 WHIRLPOOL 77dc184c8b1e44354e1e85c4e83ef2afef23d2ec7e4fd742cfc7f35d1aaf30ab587e169d21725ff6ac655eb80195fc781958bb34b7813ca6cffa3ff7478529b1
+MISC qemu-9999.ebuild.rej 775 SHA256 7de3b3fb5552076d83d3e9bde53bf8a6a07c5f5a8a4ce977a6a7ba0b9bf84667 SHA512 ff1f67277e487417f5e3b2f53b74a761998cdb324dae7caa6ad3049d1e57d50df0f5dd1f800d5ec862f8ecaf7d5c58289b5b07c4487f3981259fee754ba99fc1 WHIRLPOOL 2dd6d5a7fd432929fd57ab3dca0d31ea2a71f42765a9e6e42e719a57f25803b979f23097f41642d25e70cf329dcf36fec8391b8f02ea2e25c596cbb6ffee1bff
diff --git a/app-emulation/qemu/qemu-1.2.2.ebuild b/app-emulation/qemu/qemu-1.2.2.ebuild
index c095ee161ee6..bdbe1f88374e 100644
--- a/app-emulation/qemu/qemu-1.2.2.ebuild
+++ b/app-emulation/qemu/qemu-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2.ebuild,v 1.7 2013/01/13 02:53:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2.ebuild,v 1.8 2013/01/14 22:24:07 cardoe Exp $
 
 EAPI="4"
 
@@ -54,7 +54,7 @@ done
 
 # Block USE flag configurations known to not work
 REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
+	static? ( !alsa !pulseaudio !bluetooth !opengl )
 	virtfs? ( xattr )"
 
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
@@ -80,10 +80,18 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!app-emulation/kqemu
-	sys-firmware/ipxe
-	~sys-firmware/seabios-1.7.1
-	~sys-firmware/sgabios-0.1_pre8
-	~sys-firmware/vgabios-0.7a
+	qemu_softmmu_targets_i386? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.1
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	qemu_softmmu_targets_x86_64? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.1
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
@@ -344,7 +352,9 @@ src_install() {
 
 	# Remove SeaBIOS since we're using the SeaBIOS packaged one
 	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
 
 	# Remove vgabios since we're using the vgabios packaged one
 	rm "${ED}/usr/share/qemu/vgabios.bin"
@@ -352,28 +362,36 @@ src_install() {
 	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
 	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	fi
 
 	# Remove sgabios since we're using the sgabios packaged one
 	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	fi
 
 	# Remove iPXE since we're using the iPXE packaged one
 	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
+		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	fi
 }
 
 pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"
 		elog "ensure that the kernel module is loaded is to load it on boot."
@@ -384,7 +402,8 @@ pkg_postinst() {
 		elog "Make sure your user is in the 'kvm' group"
 		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
 		elog
-		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 	fi
+
+	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 }
diff --git a/app-emulation/qemu/qemu-1.3.0.ebuild b/app-emulation/qemu/qemu-1.3.0.ebuild
index 73f905e60622..2228201c9567 100644
--- a/app-emulation/qemu/qemu-1.3.0.ebuild
+++ b/app-emulation/qemu/qemu-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.3.0.ebuild,v 1.1 2013/01/12 23:38:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.3.0.ebuild,v 1.2 2013/01/14 22:24:07 cardoe Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ done
 
 # Block USE flag configurations known to not work
 REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
+	static? ( !alsa !pulseaudio !bluetooth !opengl )
 	virtfs? ( xattr )"
 
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
@@ -77,9 +77,16 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!app-emulation/kqemu
-	sys-firmware/ipxe
-	~sys-firmware/seabios-1.7.2
-	~sys-firmware/sgabios-0.1_pre8
+	qemu_softmmu_targets_i386? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.2
+		~sys-firmware/sgabios-0.1_pre8
+	)
+	qemu_softmmu_targets_x86_64? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.2
+		~sys-firmware/sgabios-0.1_pre8
+	)	
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
@@ -338,7 +345,9 @@ src_install() {
 
 	# Remove SeaBIOS since we're using the SeaBIOS packaged one
 	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
 
 	# Remove vgabios since we're using the vgabios packaged one
 	rm "${ED}/usr/share/qemu/vgabios.bin"
@@ -346,28 +355,36 @@ src_install() {
 	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
 	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	fi
 
 	# Remove sgabios since we're using the sgabios packaged one
 	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	fi
 
 	# Remove iPXE since we're using the iPXE packaged one
 	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
+		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	fi
 }
 
 pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"
 		elog "ensure that the kernel module is loaded is to load it on boot."
@@ -378,7 +395,8 @@ pkg_postinst() {
 		elog "Make sure your user is in the 'kvm' group"
 		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
 		elog
-		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 	fi
+
+	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 }
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 628da3dc04f2..76d246ab8f39 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.41 2013/01/12 07:36:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.42 2013/01/14 22:24:07 cardoe Exp $
 
 EAPI="4"
 
@@ -50,7 +50,7 @@ done
 
 # Block USE flag configurations known to not work
 REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
+	static? ( !alsa !pulseaudio !bluetooth !opengl )
 	virtfs? ( xattr )"
 
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
@@ -76,10 +76,18 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!app-emulation/kqemu
-	sys-firmware/ipxe
-	>=sys-firmware/seabios-1.7.0
-	sys-firmware/sgabios
-	sys-firmware/vgabios
+	qemu_softmmu_targets_i386? (
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.7.0
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)
+	qemu_softmmu_targets_x86_64? (
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.7.0
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
@@ -338,7 +346,9 @@ src_install() {
 
 	# Remove SeaBIOS since we're using the SeaBIOS packaged one
 	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
 
 	# Remove vgabios since we're using the vgabios packaged one
 	rm "${ED}/usr/share/qemu/vgabios.bin"
@@ -346,28 +356,36 @@ src_install() {
 	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
 	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	fi
 
 	# Remove sgabios since we're using the sgabios packaged one
 	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	fi
 
 	# Remove iPXE since we're using the iPXE packaged one
 	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
+		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	fi
 }
 
 pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"
 		elog "ensure that the kernel module is loaded is to load it on boot."
@@ -378,7 +396,8 @@ pkg_postinst() {
 		elog "Make sure your user is in the 'kvm' group"
 		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
 		elog
-		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 	fi
+
+	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 }