Move seabios bin clean up under the softmmu check since user tools do not install blobs.

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

4 files changed, 38 insertions, 33 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index ed0cce0f5c63..6c1cdaf07b9a 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # 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.346 2015/08/05 06:27:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.347 2015/08/05 06:43:00 vapier Exp $
+
+  05 Aug 2015; Mike Frysinger <vapier@gentoo.org> qemu-2.3.0-r5.ebuild,
+  qemu-9999.ebuild:
+  Move seabios bin clean up under the softmmu check since user tools do not
+  install blobs.
 
   05 Aug 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
   Unify target logic a bit.
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 9cfbbff2d7fe..a612b19aad3c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -24,24 +24,24 @@ AUX qemu-2.3.0-CVE-2015-5166.patch 1176 SHA256 dead84667dd4868d0688dc4e62a54a148
 AUX qemu-binfmt.initd-r1 8078 SHA256 2560f1d12374a2dea74e18365ac3d759c2eab35eb9a77b989e1bb8346d9bc3f8 SHA512 82d8ebdb5a4c452f03281c28f074ea52acfb730f1c3ddf68de2ce496c7ca23fd379041948371b021355f00f9c260383fdecf47218ddf2764ab75d6ec8a7a2715 WHIRLPOOL a0f54e133fbda2fd050ef8168fee676a763bb94a890f8c1d99d44e37e4a29322d513d9f5ddad9247f44e3ee0ac779050a3b06cf909678fdfb9f46777701de492
 DIST qemu-2.3.0.tar.bz2 24683085 SHA256 b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588 SHA512 7a40d213c5696b27784abd2a3119e49d42c38c923be431826c73a8f14c19074435d7f1a652686c53baf08e81f5a3005b2ddc92d67c32f6a2b19659ab627e9eaa WHIRLPOOL 9dad6e342027c3be512b4e0b40e810e0a6f1dc84a16847aa5aac74d97f7a347e60d42e770335a090f83e90a1614294f86552a84edc1faafc7093d3e32602f5de
 EBUILD qemu-2.3.0-r4.ebuild 19056 SHA256 9bff0981aa03eb7489eabb6c2bb952f293ad6c5b002e0321b2b33638564afe11 SHA512 62516308746cc7402ad46e7fde02d53947f43fe28b60d6f41373e419f44987c25c17f7e27eb96f13586076f48d7408a049f57b60db46845c3ee72f6f9b07cdce WHIRLPOOL d5ca0a0395b9ab6e8e4b9646d7e91da9323c7b1707b2c8d950580a4e2190738de75edc77e4ec399cb9aaca94725755dc1477438f0f251face6155104dae763b2
-EBUILD qemu-2.3.0-r5.ebuild 19509 SHA256 69ae214c3b6fec207fcc179dc26c0fbb75afb9d5290d03e7bc6c2a77808e7939 SHA512 dba7edb5d01af1de14b51757c51d7ed2f3ccd6e1b5935c055164ea0defae4656031cfebedbb6daea1985c0a2cc74960e96c1a9b8c03ccd334e13c09c23478645 WHIRLPOOL 871352c651a22a021c7c2045bd449fe32e36a30df52cb46872ca3d2d898e4027dbf18d2274fe5efe64bfe70a6801ce9a3163919c40865c928456a1e8293821a3
-EBUILD qemu-9999.ebuild 18032 SHA256 77bc80716edb8404769acf8624ac3a9e95f132d9109bef398fff72eaaa3026b6 SHA512 46bbb7288e54d5b5ba3c424f8430c7c0db3c86286b9b065e3486b7b40ccd5daf350b92c98901451745de53b2eed489f2a1aad7499f568d2d3cb76942190152bb WHIRLPOOL af71f748e10d189db736768484331b60f4684b01b8570a073533655aec69437d7c750d3b4ad6b118f283c5d1f1f2e5ac28372f34fcae403178e0a88a08313dbb
-MISC ChangeLog 57804 SHA256 d21be54fbcd6e82ac1c45a7c2a0af49eecc86e2cb4274ee6c3ec6dbe840aefba SHA512 300868a2b40c8e42f2259d8054663e2814f58b6439782d80dee5b0d3c389313d63e12a5e4aa7045eaae7bed90cf13aeaf163d2cc11fdca1cf667aebfe251c8db WHIRLPOOL 6e3e6eb0a46a9fb4972f131e8338db02d723fb0c959f3a6efc5f9c742fbbbeaf79d5e1a0ca2cd22ac3c51563c96cb6bc216b675e6093b75815228bf636ab0df7
+EBUILD qemu-2.3.0-r5.ebuild 19518 SHA256 bc0180d0df478992c7c4a26a51229f4c799bbb7e9112ec789bcfc297301f4c1f SHA512 1ce12120db2a4475280eb3125683e6db7069bc35e49380d76903a6e6a5f674b976fe575075b3fca3cada00dfc1147d0ed6510a23a16651b36a6410b28cd34581 WHIRLPOOL 29456ddc3375e8cc12e90d1912d2cbecd9deb21deac21622072690d6270dba164ec459a131c04d2339744ae3e2651214c66633e43dfe69c33a2ed9778082eef8
+EBUILD qemu-9999.ebuild 18038 SHA256 04d7d7bc203476a9c9701e89606460f5d2facccba574bb6419e7e955d438d55c SHA512 be37c814765d7c34782038e70b86d3ac27d6893195d4bccfa5255ec6412548b14b800540e037031048b8568ff7185298bac7c910a4354687461f1ff16e5c2f85 WHIRLPOOL 134bedbc3a010a95fd44c06c67572ce47cb314c6e5aa6ab2b72e7767e09313e7a4ee11fe6e09bb3def7d8ca067c9b5f238a200be6477a98ec44f2657517f9eb3
+MISC ChangeLog 57990 SHA256 3c65ac2f1396aee882938abfda47e9040159866416ed5765b314634e56db76db SHA512 ec6f83a7d6ab5ec7ce6158bbca9fcc4090bc71362928dc28fad0465f3d5cdaaba17dcbd2a89f3632020ab802a773cbfd0043375e9808cb1f93fe5b297dfa8190 WHIRLPOOL d0434f6bf38cff41f8f98a0aa2f2e605b31c3bde2dd6e117c58200d52a2a0d1f78e937924c2697ae25c23a26be4b4a5cb7afe78b18b95a278c8a0660f403f146
 MISC metadata.xml 3708 SHA256 9f5c1b781f9924046cc0fa050a93e632935c58b67d6de4f3a872eb63341e86ee SHA512 cb2582c698b5913c70e07bd27c39e84e45c319f95faa3494c0ad5273c25127bae888da3cdcec3e73b8d3ae7b950f7f128a550977755e8f8fbec53d931ac89117 WHIRLPOOL d08403a3f8659bec79644a4042c3f71653152a7d1e078efd3959565e794c7f837e735f4e774dcdb4077eeadc3f493a1a5170d7973db72b14b31c77c1093e22de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVwazMAAoJEPGu1DbS6WIAddwQAJVWZugAZMk92UCYygwGrItu
-A394YeUr6RPR/Ut5KBN39NQbSJTVSdaYT77NTxCkge3sxenigqL/J979H2gqd1RD
-5GmuqXO4izDQx0vOhTlHzj0N2SnU5PZwI/mr+xcXK2SoAAkCV3lyz2gjd4E+14/u
-NaE2yewKAx3tp3PzexfUe2c3gp6DNUohUAkVymrWZcOp+4NYtW2LsinUcBuR0SEf
-83Oz6maNh0LhBN0iW5wvaCrktaNk2ksN8ahhIWQZXCij4bJvUto8tEq5ioCVunIh
-7t7Jt5Jd6/VEYOHAB2X6HNwqOb1pCdTeFBRg2hFyRy9ukLGPLLGuK3L04CK1UYGy
-Z4aS6dEHrrsKEL9IxruSX/mc9xc5OspyD7l7ILyL3Qci8CRgQtFGhFrtuuA7evfQ
-0PuLWxL9Fq++zpR+Yt5+sXnBsDlhvWlkslmLo2nr7Tj2acHoInpAvT6GyF6pbpQC
-npmEZPFN5/tCZLefZLqd01h4zJQXyHsV6Y6kH+3V1VM5yjSNfeu9lLyTMKxXCUyv
-3RV+VDkyuSgw/h1ZtV0ZoS5u8WdWGhmhyGpbN1tew0igmKMkKfWVjzzDMQHeWE+Y
-YMrmdDl9IjnqhTgEk5nlsdANlR+dFarUBb64jh1DOS5aB2Tol7MKv/S6w48jw2yr
-CQsQH68h1VQdWGgPPpkz
-=6wYC
+iQIcBAEBCAAGBQJVwbB/AAoJEPGu1DbS6WIApv4P/j+oUUSykkiktq2ksQUWP4eZ
+2P+pcImTER9cCCj7Rv5IQRN7I695Vxwrzvtv2pBwq7W/rm0wbUv/CS4QJk9VDtMa
+kJ4SUdl9595whIw5OH95NhTggyv2JX4UMYcslQ24wVQ52dcq6w8vQNhTZoKs728i
+rZGBcXlbvd2TMUAcV1d0s2zI1+8thsKs39SY7b9+JWVfkAxKaI4o4KcHA0LT7KSu
+k4Ett2UmqHTh1tDJXWIG/PpSLUZx+VdX+NsrfEH7dBr3wpp2lELv3VCUyXDQIlto
+sxkS0qqvluRqf6sfPl9tMH+Mjf6/apUd9tb255d9h0zhldiOj76WXxJZ/b7u+E2Y
+gvJm0My3uda3obLCYNSBnThhkocqiaV6YsSu4WjrEc4iYTJgBrKBUf6Xf2FMgwyN
+kSG7CdsxUhyofhuLEBSRL4479/VB7PVHdaKQAoxv0Zhd1Bu/6/xHmoNSD1HG37Lu
+BgPmzBiZs8fMXvutFMoio2fEYgnEMYhZpI0jR58yTD7G6suT80vWv/Eiyw8DUCYZ
+KZaVXp/mcizpgZZnyRWNuNIDLtq8Le9iju6IifPC2MH57skhj7P5jQeDGmlPSc0m
+s06ER0wU9PYtHg9W6s8J0ZWUwPEyDj8EyAR5Bvk0UAjTWSNJEFcdJKt0lK2I/otU
+PzshRWw9gDI2WpyTb7Dx
+=5I7a
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-2.3.0-r5.ebuild b/app-emulation/qemu/qemu-2.3.0-r5.ebuild
index c15040a84c7b..143c594d2d7f 100644
--- a/app-emulation/qemu/qemu-2.3.0-r5.ebuild
+++ b/app-emulation/qemu/qemu-2.3.0-r5.ebuild
@@ -1,6 +1,6 @@
 # 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-2.3.0-r5.ebuild,v 1.3 2015/08/04 08:19:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r5.ebuild,v 1.4 2015/08/05 06:43:00 vapier Exp $
 
 EAPI=5
 
@@ -528,14 +528,14 @@ src_install() {
 	newdoc pc-bios/README README.pc-bios
 	dodoc docs/qmp/*.txt
 
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/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
 	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/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"
 		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
 		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 57a8d128a88c..c0948c65b2f0 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.104 2015/08/05 06:27:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.105 2015/08/05 06:43:00 vapier Exp $
 
 EAPI=5
 
@@ -522,14 +522,14 @@ src_install() {
 	newdoc pc-bios/README README.pc-bios
 	dodoc docs/qmp/*.txt
 
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/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
 	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/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"
 		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
 		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"