Add USE=pin-upstream-blobs so people can opt to use any version of seabios/etc... on their local systems.

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

5 files changed, 56 insertions, 42 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 982e98c1a6a8..4d52bbb23ab2 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.280 2014/08/05 08:54:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.281 2014/08/05 09:29:12 vapier Exp $
+
+  05 Aug 2014; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  qemu-2.1.0.ebuild, qemu-9999.ebuild:
+  Add USE=pin-upstream-blobs so people can opt to use any version of
+  seabios/etc... on their local systems.
 
   05 Aug 2014; Mike Frysinger <vapier@gentoo.org> qemu-2.1.0.ebuild,
   qemu-9999.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index c93715b4b485..cee3c16e6944 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -35,24 +35,24 @@ EBUILD qemu-1.7.0.ebuild 17679 SHA256 beb978b28d6659537cf3728f47e3676e30de84ff16
 EBUILD qemu-1.7.1.ebuild 17679 SHA256 5f1210b57f7b0c78f7f800a4945e7a5705bd92ccd7badfd41269034235ef3940 SHA512 2d596e280f3b2c312df5448109534043ce27038529a22cd068c6a5973e44e0f8b955b358883b007c62d3cc02374412d31084e3c2eb55abeb1d55ae23b4d46bf0 WHIRLPOOL 75fd489fab0857a3bd1728a0212c3d6690eb8acb159fb002115e575f1a7747374f1a04696374af830d5a3af6035cde30dbc2ef698c71ffd96a1dd7bb64309ed7
 EBUILD qemu-2.0.0-r1.ebuild 18119 SHA256 325afb75953af0aa52fd60abcc955c8697d1e0ed8745122be98bd312f2e7ebee SHA512 7f330df4962cc164ac825dbc42c8ce7cdf67cf8cf26136934fbddf082f561f02f521eca28433bb492a7fd22fcf925247865c41630cd117b2665a478a79651034 WHIRLPOOL b7838d5ffaf2451b081c9c94543375f249cbe6171e3a3202cdfa736438f8a2bff0084571021d2be25f60b5450343aedacdf3293adbbeb49ccf4e0b915ab812f9
 EBUILD qemu-2.0.0.ebuild 17268 SHA256 65f46652d72cac72a29aff89449d76a7d43805e4f69fd0e525059a9a115d55fd SHA512 c0b5f5220bc383b9700b7d74f88a9367e883af0ff6336a7154c1e86632fa073c3188762091bc496d7f6415d068c023a1423ffd4095696fce44835e44cd70efea WHIRLPOOL 21365f0036f741034380ba4b4b6994a0db6b2aa71bec86e6f5515c883c20d60ebe86294d745df57ff33668970a9b82f38922f6e7c4bb56bc7655ac7de4f51c34
-EBUILD qemu-2.1.0.ebuild 17921 SHA256 cb4c99b8069792cc8fd96b924e875f76ef0d4fc305fcd9bdc42647288c7c8b96 SHA512 9ff51dd5890b9336e07e60ba3a981795f098b0715e3660b6cc049ef47353d5cf5b3058b43a121d445580a4ad03a6eb783535773cc38348e5fab38b47b6246000 WHIRLPOOL 57db3eece64766c9047123143695fd209d949eaf4455addc25b5f5eef2c35a539ec05eac413270367156e40554ee92c7ab9db3497b842f20e34408ed9af98eeb
-EBUILD qemu-9999.ebuild 17875 SHA256 a62e4e2f6e5a445d4808ef422050da9483b6702b3710746e98272258df96d2ae SHA512 0dca116f0bc569671e1aedfd85301b02eb06581d824e891f7abe6df9d974dfa05852693948093ae4b0c41e4f775d9cbfeff081cd472db867579fd6470eb646f4 WHIRLPOOL e62eae1a6a73b39e172fdfe1d5b580368c41fe4d0f023f8411adfff2b1f4d4e74ac8283848e120eec5554f8c94cf184dcee0df788075e385871b2b8e954df1e9
-MISC ChangeLog 46499 SHA256 02d7cfb55839e901f5c899ca6e9713fc40e949c0a4acb54e2259650e9835062f SHA512 bc3d4e0eaad5705208559f801d4af05442faa98f4b7e82975a470366f6224406a3cdc5a280ff9b81a81b49c06e1d9207958619b47e07cdb5b0525b718bb02451 WHIRLPOOL 243b75ec58f3963373d4b55888aaa54d2ed9d258754946ea6859c9ee5513d3d018dfe58e069ac704b1a6b8be27a52c530838676fe730fd6d1e4ee0c310f98b90
-MISC metadata.xml 3736 SHA256 7ff4801a839f7763cb1d173121b3af5872a24e9de9988a6543eb30619f031162 SHA512 775190eda170d72eaaa8408aee1ea0a111ad3eecdbdb369980008589373de24f84eb7908bf247b447f22bf87d79b68215b75ef65e85f3b465309b0e2e29bdfc0 WHIRLPOOL f663d705ba19642ed3eac7bfa0c69253f45e6f07b30f4678eb1d977862e27b559fd05a3c7963c07e25e27b50a565215e037092b7184ce1b38dcf55bf08863b7f
+EBUILD qemu-2.1.0.ebuild 17999 SHA256 8feeca596f7666581b5309c382cda52651596ad9b3bfd5d807d04198b35ecfc1 SHA512 61a772d8bf31c25555ab5c581ca9e50698ed9d7ad7b12f7dfc3bf09bcc5962927d4c86ee915da02bf984e0917fe73d6d15cee79d64c6b0be8d73882b1c9349dc WHIRLPOOL 894366454d02b1ebac3ce8780ff0c852bdf4d22905b1acdf1670e85e741a9ba1c936fae72eb19214c6a46aa339261b22184152ab428ea7f314275154021c2ac2
+EBUILD qemu-9999.ebuild 17999 SHA256 a4abdd5fa8802185adcaf54774775565b039e684b5c8cb86101e942cb7b6b3e9 SHA512 39e47c98ce6d2e554dca3135a5cba2018af14ea9ff4823bc4e4568d7cabba16dafe8e0e6563cdbb7b85fd8622d1d45ee6915fab578cc7761c741671400f03532 WHIRLPOOL efa20e720f6101dd2dfdf211038beff2f3f738a943fdeeacfb38247565dc72af95ca7fb1617443674b4d83c6ac35e6a3456d1625b3f625c8e497d3c32768a9d8
+MISC ChangeLog 46713 SHA256 0a514e9a66d24bfb4a4420d42f8d62c9fcab33c6eef24eb3ce9ac5b4fa133344 SHA512 a571cb2f0af5cbe5c1ccfd7c2589457d0f326f85ec3fbc93d0c226602f9dfe2fbc9e1b47e6dfb1d85a4f9dc68195fbd646343ff7be5aec03f947633c8152a8cf WHIRLPOOL 3ade71ec4b8264085e75a983730be50fb8610ea5c0402ddd586c168ca85701ac89c924723675ea0746baab90f84d07ca25bd5919e9a6bc75e48ebaf3fca634eb
+MISC metadata.xml 4040 SHA256 041a8fed054ca585f7dd1fc6b48af8e218083d165891bd6933d9c3df67937200 SHA512 db43cfd6891cfc1d0944b2c928b8cf6c39a86bf97d2556ab2d728c4dd6a01d739d7c1bad6ede4c86f8102140ac8a0fc1ec2e269f42486e19bd9238088f5e280c WHIRLPOOL d2749e5c546ac3c0d4d28da5886cbb9f09c7056f2c449c8a51f83030f3b19a8c279e8db57f12e7cbaa6d3a0c4706a55af29e6ce7671a5be2adf2c25cb9967417
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT4JvlAAoJEPGu1DbS6WIAVu8P/A6Utv/4gJsPp9ShQACA+zVN
-CwXoo1wXclCV0bAcOeQwAvlZMU8M9Hs7QDPqItgZ/b3ofw7TNatDRWYAKR0Q2lPR
-VsgL3TaJ+NStXFiZTWoA70w7perXNK5yhtMkkT+dIZAPz7TdrgFhsFsr1tEJiw8F
-gVpJaf+MrJHHlckq4zTzU/zZqeUGESccBT9/sO4JSOU/KBHlXXuK0YGAu7oxj4eC
-arETjNyBIaWWNEKcjeuv2grynGlFy65lx90CtbiiPWjjuo9QVL3JgonA6m84rA52
-Xe4Ltlkr/rnsOdbMdTPRePQyfEldKoeUOwnCnNqpOHKXb1BkHqyizQHpihI/Q4Yd
-sRG4IZUZzXD/suEnfhBnepc1WQYPbigG2M9Agcu0WofHH7EguiZL1Y9XKAPKsyU2
-ljCVluHNf6eLowXRtk9D+txDCPVV33I+gjrZVIRSpvDlf7jsoIJhpNARZssNZjZB
-v3jicki7FU9n6P9GdniykVhDHxTsDliBtrthFZs1JBSSzvhskeuEctALcytHCLKL
-bCtTMhCbkTiOM1QgHm+R5RMpNvXqCR4kX1PZ7IsyMabJkErV/PmRmAeH20hR0hNl
-D2K6bMwoGe/sSTq+lMlV6myrWKhrGzFdHkL1tgo6ZXa1XEIIigOlGB3719vqZLXb
-EvSpnK6LrLbSKgrZk6SR
-=UFxt
+iQIcBAEBCAAGBQJT4KPqAAoJEPGu1DbS6WIAI1sP/jOGH16vhOjoS4yhtYRBMFIz
+mW0AZvuQcxii2TrpNRc/2fNblUeq9nm27KfimJEJNDcog3k+X974N/GV/p1X7oj5
+KlY+5qxbD1Hu0kkEGnHA+aHQmT6WGZD5E8MJSltlUNqeuV+eob6cpWkgZmYt4P+z
+pXAr4QB8gzZ12Gnk7OIANbkbWm+Gs++G7EX0SyRixBwJKz8JzgjZdejr1ymLp8xr
+cfjuk1Ai2Td5SS2hP34cNkDmnUPdrEoiXx4hhQG3iwRnN+AKN4zC/WJPPoDxVzYn
+wCTfu3f/Sa8dtGC1P5tu5TkL8MgKKBYpFHHYf2EyiH+tx4deBcNwfoM6/mYFYajp
+WQoAU6djuQ0XECjFXzsL043+sIhly4brX4DsPU9Jb+DarlhWIB8XZi1/6OJjHmX0
+noNg1iVvKpJBd5F1mfQ3cy+0ajr8eCFpIfFM1edWVvd4M04LXp21BELQ7oRLzDAH
++AGmhWTrRFEh0EJs2a8F7RJjwep6gQ05EoYbMrR9t/YVM/9qlb3QQWZetyFDdb3f
+I7pjkGNi/0f7K/njrk1L3TLCjkUJKAhCE4ZEWVlAh5pJ++2TjAEREO9y4jziSny5
+EHQkFKTUCOYyelcP42z6gzRlTgvRhI+5Jok20B9K4UAPkNZ1pXwn/9LhaCwHWE57
+rmZU1vdJSgsqdyn2w1TK
+=/1DC
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 7276a657c2ae..4d1fd1c7e1a2 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -21,6 +21,9 @@
     <flag name='ncurses'>Enable the ncurses-based console</flag>
     <flag name='nfs'>Enable NFS support</flag>
     <flag name='numa'>Enable NUMA support</flag>
+	<flag name='pin-upstream-blobs'>Pin the versions of BIOS firmware to the version included in the upstream release.
+		This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances.
+		When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag>
     <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
     <flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
     <flag name='sdl'>Enable the SDL-based console</flag>
diff --git a/app-emulation/qemu/qemu-2.1.0.ebuild b/app-emulation/qemu/qemu-2.1.0.ebuild
index ad356abba56a..5b3bf817dc40 100644
--- a/app-emulation/qemu/qemu-2.1.0.ebuild
+++ b/app-emulation/qemu/qemu-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.0.ebuild,v 1.7 2014/08/05 08:54:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.0.ebuild,v 1.8 2014/08/05 09:29:12 vapier Exp $
 
 EAPI=5
 
@@ -31,7 +31,8 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
 gtk infiniband iscsi +jpeg \
-kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +png pulseaudio python \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
++png pulseaudio python \
 rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
 static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
 virtfs +vnc xattr xen xfs"
@@ -91,20 +92,22 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	xattr? ( sys-apps/attr[static-libs(+)] )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
-RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
-	!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.5
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
 		~sys-firmware/seabios-1.7.5
 		~sys-firmware/sgabios-0.1_pre8
 		~sys-firmware/vgabios-0.7a
 	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
+	!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
 	accessibility? ( app-accessibility/brltty )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index ae7a498a7cf8..73fcce507c62 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.85 2014/08/05 08:54:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.86 2014/08/05 09:29:12 vapier Exp $
 
 EAPI=5
 
@@ -31,7 +31,8 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
 gtk infiniband iscsi +jpeg \
-kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +png pulseaudio python \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
++png pulseaudio python \
 rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
 static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
 virtfs +vnc xattr xen xfs"
@@ -91,20 +92,22 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	xattr? ( sys-apps/attr[static-libs(+)] )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
-RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
-	!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		sys-firmware/seabios
-		sys-firmware/sgabios
-		sys-firmware/vgabios
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.7.5
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
 	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
+	!pin-upstream-blobs? (
 		sys-firmware/seabios
 		sys-firmware/sgabios
 		sys-firmware/vgabios
-	)
+	)"
+RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
+	!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
 	accessibility? ( app-accessibility/brltty )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )