app-emulation/qemu: Apply CoreOS changes

- Apply the vpc patch.
  - Disable pin-upstream-blobs.
  - Drop the libxkbcommon dependency.

sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/files/0001-block-fix-vpc-max_table_entries-computation.patch

@@ -0,0 +1,25 @@
+From b737484f814da16b8e9d405219cc1c2e81321d6b Mon Sep 17 00:00:00 2001
+From: Nick Owens <mischief@offblast.org>
+Date: Mon, 28 Nov 2016 13:28:58 -0800
+Subject: [PATCH] block: fix vpc max_table_entries computation
+
+---
+ block/vpc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/block/vpc.c b/block/vpc.c
+index 43707ed22c..beca222b98 100644
+--- a/block/vpc.c
++++ b/block/vpc.c
+@@ -787,7 +787,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t *buf,
+ 
+     /* Write the footer (twice: at the beginning and at the end) */
+     block_size = 0x200000;
+-    num_bat_entries = (total_sectors + block_size / 512) / (block_size / 512);
++    num_bat_entries = total_sectors / (block_size / 512);
+ 
+     ret = blk_pwrite(blk, offset, buf, HEADER_SIZE, 0);
+     if (ret < 0) {
+-- 
+2.11.0.rc2
+

sdk_container/src/third_party/coreos-overlay/app-emulation/qemu/qemu-3.1.0-r4.ebuild

@@ -32,7 +32,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug
 	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
-	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
+	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-user systemtap tci test usb usbredir vde
 	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
@@ -85,7 +85,6 @@ ALL_DEPEND="
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
 	dev-libs/libxml2[static-libs(+)]
-	x11-libs/libxkbcommon[static-libs(+)]
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
 	accessibility? (
 		app-accessibility/brltty[api]
@@ -209,6 +208,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
 	"${WORKDIR}"/patches
+
+	# COREOS: fix for vpc creation in qemu-img
+	"${FILESDIR}"/0001-block-fix-vpc-max_table_entries-computation.patch
 )
 
 QA_PREBUILT="