gentoo resync : 31.03.2018

16 files changed, 11 insertions, 281 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 26205dad3b8a..7d20cf4a3b13 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index c04d45abd273..5f5ddc817efb 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,5 +1,5 @@
 DIST docker-compose-1.18.0.tar.gz 231256 BLAKE2B be9b57dd89a81734b850f61622a924a3ace5ace907c4d1365a18315ddfbe3f1a9a56b222766980d16d5eddbe6818caf94a5833c5cddac082fa230bf290977ee3 SHA512 9cf29d892f6419e9ef639e1b9edddecb47ddb5ba7f97830f732e463ee510ac5464d6d81f58a2bf4ae5e7aee78b3d2d4afd59e6e1b53974899edb3e090bcb991f
 DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
-EBUILD docker-compose-1.18.0.ebuild 2422 BLAKE2B cf2b623a27b85b61e73bc93834b0027daa525a4c5d636dde1ab73573242330de8164a31528c76139ebef3467bde3c206d6865a2a9e58d0c8db37c505e5ed327d SHA512 48e9c336eea12efcfc1365e819ea09e6dfa0578545410f2a42f9c373780343bebb75e4579be0da71a9a02689ccbce5a42b87b2d97f4bbd46ae59c69d919b5218
+EBUILD docker-compose-1.18.0.ebuild 2421 BLAKE2B 070e116b0354b3965202ea93698a8846c032b774b2a16154d1be5ced36e963780675cad11fdb43b01baf6997b35b85b87907f32fc56ee5daa1191c1c7265eca0 SHA512 988e42951a910fbd70f9605483240ee7fca1c003adde6b1cb7aeb21cd70ef074b5a919db8bd4a8bd89c6dd158041ece024fcc8dc46e1e2c5d69e1de56d27acc7
 EBUILD docker-compose-1.19.0.ebuild 2422 BLAKE2B e1ae8b4b44640361fdc8fca0cdda1ce95340b3cfa564b2d6cf3e0785bf65057ea53e14b773204d1d7c93c142394b3800e78364eaa6cd0ce9372d24135ab73bff SHA512 1b283b87382f6cd0402dfdc4c97cbb16e1c2eb7da645b50bdcadd048054c769ddcf742b7067b686ab1d8288256e713f277d1e97b32c27821bd3c9ce507e4b7ee
 MISC metadata.xml 322 BLAKE2B 4d738cf090acd0f720b7805c8dd1a2288a1779dcf4af21ab5aeb4cf81b609d0bd2a18cbe79c165f9c9e60b993a8b864e1e5c61cfa773c57b08aef468d93a0391 SHA512 6ecf808eb20a0f475101524b1f4b29db49d4fce9bc3408b3e806e225e4de7b5f0c7af019809c329969f25dd050ba164a09effccefea0d2ada8e8bcf9790d39f2
diff --git a/app-emulation/docker-compose/docker-compose-1.18.0.ebuild b/app-emulation/docker-compose/docker-compose-1.18.0.ebuild
index 534ceb504f63..d2e564ff337a 100644
--- a/app-emulation/docker-compose/docker-compose-1.18.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 CDEPEND="
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 7bb81946e8dc..e0d400e36636 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,10 +1,7 @@
 AUX README.gentoo-r2 2094 BLAKE2B ccfad63217f7778e97d8de49e20002dffefff32562f560b23c777c5f2f20407493b4288fc67516c7b45cf2c1868340673c7ba92ea1774a22d59524c6a626b59a SHA512 595ede7bb574c7f244a15e430b70f828bc4574b409d4cc37261bf38bfb30cdb31edb6091ff63f6517b281cc11a34eee960ea0330a6ea285dd48fe2288dd67196
 AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 BLAKE2B e796f4e32f00e8970eabf723520601b26c7fa5f7579d538299538632ba036dafbb2dc64ad40d10152c0637043b2a649e1dc08468d1f250e00ee0af095d94a093 SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588
-AUX libvirt-1.3.0-do_not_use_sysconf.patch 4072 BLAKE2B 2281954430dbc38262221bb4d2bc3296a067ef79ce70b7d93fee7da92753d808d208fc1e190e4779c2daf44df5e18ae2d0a0aaea04170f9ffa2d851918533fee SHA512 44428e16cf1998db0bcae1b54d3ba32363a71db3f45f493bd675f6ad7d6bf131667749f33226ab5f40be52e833ec0899bb9202a8f0e150d007c3f7c71a9cf314
-AUX libvirt-1.3.4-glibc-2.23.patch 2049 BLAKE2B 8e283846a2442ef4bf3fd5ca88033387d150818972e1b8f4732584423652179d2d6f8df964a8b8a4e51219a946eec30450838207446e20e9bd77ff97c31996de SHA512 022b610c2e343c9cb595babcc8b2e5e0e0db1a19d6bfc9babdc817bc1e093ff12ee1c26304c188151fecc32481ffd225d7a3d36324613dd5b4ea7139280629c4
 AUX libvirt-3.1.0-musl-fix-includes.patch 221 BLAKE2B 65f486f4055c0ccae59601970d770f23f570f127ba26ce1d932855e784b83fce99389f22f12630005be61e5de2e64e0125d0bf5270024f736fe597fa5b81ff78 SHA512 876c7dacedcce1d69938779b978b3a23b2f51128f121b4aa53f5f301d7740f90d77f335523210ed492b68b5f7a0b864b25a694ee562fb5e8ab1b6411d3da48e7
 AUX libvirt-3.10.0-r2-fix_paths_for_apparmor.patch 2730 BLAKE2B ae92a37cdfb929862bd58d1cd208e3f8a3aab10dae98ec8e51d6c3ab579295e3f59ff091970499c6c57b625edec77b98421502df625b1d10c1c3d0be3dfbe489 SHA512 751b971fd0f109f3a4147feea8481adb9c868313ea57d293a89ee548661514f124318324823d9380839a7a5c8ae7c1e3ae8c4c6e62027587f163c8856e353a6a
-AUX libvirt-4.0.0-bash_completion_bugfixes.patch 1863 BLAKE2B ed54b4e308297907001bb2fbcba76197c341c292fc29139f50b9c03cb9ea61696dbd177a4d0055cdca3184a9ecbd283f576c491d2d3c581e31415465bd8e92e1 SHA512 f718408ce57c0abd68023356d5980c5e85dfb5c90759a6758309408dea7115b0ae18a18be2e625401d985fab7b1a374ab1e10caa27527ed002a852bb3f08ca73
 AUX libvirt-4.1.0-do_not_use_sysconf.patch 6867 BLAKE2B 3105dd0ff7c0275f1edb279acd2674f76029bdcb3649f4564d0b57e202b4353d9fca7bd1e98e2fb5ad9e2acafd5616f693058150f6696d00fe4a22d7374bf35a SHA512 a38061d6f9d100f40f429c1b4f5c0a1fe480c412ff9a59aa6c53c22809c88892928aae265e91b5561c02ef29aa075aa68f6e4f2f33bb24045ca82b2ec85087d7
 AUX libvirt-4.1.0-unbreak_my_bridge.patch 2881 BLAKE2B 19110dc2a78fded57d952a5044022d1788aab77ddf3b35d0bea3c064b5000afa7d801d0252c9b44b7632bf3ce6fbd8a8d1c86ac121c5da0095d16a63ba35f78b SHA512 c27614fd652196da2261438aa28e4cf7369d1e54f589815644501e93a6a02d997e1b845ac0fa461c6fb2f6c915441602b22361bfa2109e67280767370517673c
 AUX libvirt-4.2.0-do_not_use_sysconf.patch 6651 BLAKE2B 1863ad6d83e0e3749f506792d8d1fc3a530e4b203c60b1530b6c00727e96441200b25261f2774bea35ac3975498a3ecdad95aff9e026e6aa0da117411c3c2e34 SHA512 8db31a568a41bf76339bb33076aec40b6d485f5b71a94030fc322013d1e7fac717f6d7abdd17729aaede132baf6a3b0a99e7ef315c9bf78cc5e9522ff551813a
diff --git a/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch
deleted file mode 100644
index 47010c4f7478..000000000000
--- a/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index be1b5a9..5ce0e1e 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -385,9 +385,7 @@ uninstall-logrotate:
- 	rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
- 
- install-sysconfig:
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
--	$(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
--	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-+
- uninstall-sysconfig:
- 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
- 	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
-diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index 608221c..63708f4 100644
---- a/daemon/libvirtd.service.in
-+++ b/daemon/libvirtd.service.in
-@@ -12,8 +12,7 @@ Documentation=http://libvirt.org
- 
- [Service]
- Type=notify
--EnvironmentFile=-/etc/sysconfig/libvirtd
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
-+ExecStart=@sbindir@/libvirtd
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
- Restart=on-failure
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7219f7c..c474a23 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2473,11 +2473,6 @@ EXTRA_DIST += \
- 	logging/virtlogd.sysconf
- 
- install-sysconfig:
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
--	$(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \
--	  $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
--	$(INSTALL_DATA) $(srcdir)/logging/virtlogd.sysconf \
--	  $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
- 
- uninstall-sysconfig:
- 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index 57089b0..ace0c83 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -5,8 +5,7 @@ Documentation=man:virtlockd(8)
- Documentation=http://libvirt.org
- 
- [Service]
--EnvironmentFile=-/etc/sysconfig/virtlockd
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
-+ExecStart=@sbindir@/virtlockd
- ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the locks is a really bad thing that will
- # cause the machine to be fenced (rebooted), so make
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
-index a264d3a..b467884 100644
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -5,8 +5,7 @@ Documentation=man:virtlogd(8)
- Documentation=http://libvirt.org
- 
- [Service]
--EnvironmentFile=-/etc/sysconfig/virtlogd
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
-+ExecStart=@sbindir@/virtlogd
- ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the logs is a really bad thing that will
- # cause the machine to be fenced (rebooted), so make
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 9180564..e72d5f4 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -293,7 +293,7 @@ uninstall-local: uninstall-init uninstall-systemd
- install-sysconfig:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
- 	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
--	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-+	  $(DESTDIR)$(sysconfdir)/libvirt/libvirt-guests.conf
- 
- uninstall-sysconfig:
- 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index c31f663..71cb79d 100644
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)
- Documentation=http://libvirt.org
- 
- [Service]
--EnvironmentFile=-/etc/sysconfig/libvirt-guests
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
- # Hack just call traditional service until we factor
- # out the code
- ExecStart=@libexecdir@/libvirt-guests.sh start
-diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
-index 2770056..accd4f5 100644
---- a/tools/libvirt-guests.sysconf
-+++ b/tools/libvirt-guests.sysconf
-@@ -1,3 +1,10 @@
-+#
-+# Warning: This configuration file is only sourced by the systemd
-+# libvirt-guests.service unit. The coresponding openrc facility is in
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
-+#
-+
-+
- # URIs to check for running guests
- # example: URIS='default xen:/// vbox+tcp://host/system lxc:///'
- #URIS=default
diff --git a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch b/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch
deleted file mode 100644
index adeff5c3f305..000000000000
--- a/app-emulation/libvirt/files/libvirt-1.3.4-glibc-2.23.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-get major/minor macros by using AC_HEADER_MAJOR
-
-https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html#AC_HEADER_MAJOR
-
-https://bugs.gentoo.org/579960
-diff --git a/configure.ac b/configure.ac
-index 93d347c..1e7ee51 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -282,2 +282,5 @@ AC_CHECK_SIZEOF([long])
- 
-+dnl detect system-specific headers for major()/minor()
-+AC_HEADER_MAJOR
-+
- dnl Availability of various common functions (non-fatal if missing),
-diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
-index bd2eeb6..74b2487 100644
---- a/src/conf/domain_audit.c
-+++ b/src/conf/domain_audit.c
-@@ -28,2 +28,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "domain_audit.h"
-diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
-index 76bef82..49c0648 100644
---- a/src/lxc/lxc_controller.c
-+++ b/src/lxc/lxc_controller.c
-@@ -48,2 +48,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "virerror.h"
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 3c6c839..983cd21 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -38,2 +38,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "virerror.h"
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 38398fd..4b45458 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -31,2 +31,10 @@
- #endif
-+
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include <fcntl.h>
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index bb9604a..9840a9e 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -68,2 +68,9 @@
- 
-+#ifdef MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #include "c-ctype.h"
diff --git a/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
deleted file mode 100644
index 65894ed4e1d8..000000000000
--- a/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://www.redhat.com/archives/libvir-list/2018-January/msg00903.html
-https://www.redhat.com/archives/libvir-list/2018-January/msg00904.html
-
-diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
-index e216d9076..e3b8234b4 100644
---- a/tools/virsh-completer.c
-+++ b/tools/virsh-completer.c
-@@ -45,18 +45,11 @@ virshDomainNameCompleter(vshControl *ctl,
- 
-     virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE |
-                   VIR_CONNECT_LIST_DOMAINS_INACTIVE |
-+                  VIR_CONNECT_LIST_DOMAINS_OTHER |
-+                  VIR_CONNECT_LIST_DOMAINS_PAUSED |
-                   VIR_CONNECT_LIST_DOMAINS_PERSISTENT |
--                  VIR_CONNECT_LIST_DOMAINS_TRANSIENT |
-                   VIR_CONNECT_LIST_DOMAINS_RUNNING |
--                  VIR_CONNECT_LIST_DOMAINS_PAUSED |
--                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF |
--                  VIR_CONNECT_LIST_DOMAINS_OTHER |
--                  VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE |
--                  VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE |
--                  VIR_CONNECT_LIST_DOMAINS_AUTOSTART |
--                  VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART |
--                  VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT |
--                  VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT,
-+                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF,
-                   NULL);
- 
-     if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 0f329d6d7..5a0e0c1b2 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -1037,7 +1037,7 @@ static const vshCmdInfo info_autostart[] = {
- };
- 
- static const vshCmdOptDef opts_autostart[] = {
--    VIRSH_COMMON_OPT_DOMAIN_FULL(0),
-+    VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_PERSISTENT),
-     {.name = "disable",
-      .type = VSH_OT_BOOL,
-      .help = N_("disable autostarting")
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 6bfe01a3030e..77e069e685c8 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,7 +2,6 @@ AUX 65-kvm.rules-r1 120 BLAKE2B a0d95f60e48f80e5f00b3a7ef3b520861fb781868844aff7
 AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b8367659c2896b7c3dd147e978ef6401b280fc3474bc959bee50f65d7525bee8bc04c19bc657ba7e22f SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533
 AUX qemu-2.11.0-glibc-2.27.patch 1481 BLAKE2B 513430c8c3d10d3e9ec2d16bf95013fc639266a73d7e9d1d285a9daa62cb2567212b167d07235c4d6df31c63d48a4924d180bbcc568f60dc2f042f7087dd7eb0 SHA512 b3fe1d933f43e4a545e3aa6bce024d38b4431fa854cfa2342888875d0735a0a3171a00da2032238da9dc3b7a1ad4fc456a8d5b469394e2de1eea79b0957cbb7c
 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab
-AUX qemu-2.11.9999-cflags.patch 864 BLAKE2B 2b7c7daf5274ce36f6c676d950e2e3f866376c0be09edd34ad5a995c2a589f1810f1a4d473389bd02038a0a10cc7053b3b4411662b4452ce2a8bb5b6ff04bafb SHA512 50bcfaf620cf729f6146a9c6ac1508f3ebde1c4168b4a9323b0f37a4e11373433e3ceead83dd73b2f17346abdd69920c01cb3bbd04556941a841bc6ea72bfb9c
 AUX qemu-2.5.0-cflags.patch 410 BLAKE2B 1d072b5dd00369bb565b30c2aa7047de92b441bf103faadb5dd42daf36ad1c5e39c5bdfdc2b5f2bb0bfec2ea1255b4182caeb467614a487f5cfcb341109a4884 SHA512 0194d28de08b4e51c5bd1c9a2cc7965ba7f66dfddb8fd91de3da93677e6cf2d38ad3270f69aaea8a20cf2533c2980018d6e0fed711be2806fe2053fba7c081f3
 AUX qemu-2.5.0-sysmacros.patch 333 BLAKE2B 8c38410c6ea789f669d89c7321cdc9e5c734bb3db332272657302977241f157b04fb07e27bda4f67ee560e39a7494344ad79616835e6ff483927f2b72ed9c597 SHA512 329632c5bff846ca3ffcdb4bc94ae62f17c6bdbb566f9bec0784357c943523e8ca7773790b83a9617734cab3b003baa3d636cbd08f7385810a63b0fa0383c4f0
 AUX qemu-binfmt.initd.head 1445 BLAKE2B 5762a38034331a13e308f6fc8cb979e38ae01a053691726edfc1d99e1bca1698919ad564a593e018308f1fd00e2f887865fd9db157d8de83941295bc47c1db6c SHA512 a735268ae9ac84d8f2f2893bf018ee6de33231fa94a823bd8502b529bb456635c1ab5cf9b440df5ede8e414291f8bf45fc53898c2f3939c50d5ec4ffa554396a
@@ -12,7 +11,7 @@ DIST qemu-2.11.0.tar.bz2 32816398 BLAKE2B 2014a8246f3cba9069186629d9ec8c221672fc
 DIST qemu-2.11.1-patches-r1.tar.xz 2064 BLAKE2B 533c916b01c014bcfa6c733b76aa6da1f12cdf5f0d4ae33136453705a8aca9fdfeef998747cfdc72d19e08fa40ea97e2fd4c21412c030af314605059282f49ef SHA512 12de7b4777ec98871d0786291534f61b37534feef64b556caeab72e020ff14d61fe19d24cb151ebfdb912df2a7ba72c0d882566b368d88d02c9f1354c2adae4a
 DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354
 EBUILD qemu-2.11.0.ebuild 23630 BLAKE2B 0a6a289e37840774e92c506ad332d39213dc692ea5cfab4b3f54c45e159e0c3eb07f4831b27a808aefa1184697810336985cc79039773d40e1a50fd6780e6013 SHA512 74cb6375469740801198daa99606f26cf570a2298c8cd78eff362105474128d082d59aaefef627abb16484feee901f53c3b37b958d8c32843437dadb1655cb0e
-EBUILD qemu-2.11.1-r1.ebuild 23631 BLAKE2B 3cb2abaa98bc47c3ac892d006b713aea87ebb2e082fdbf43b686c8c9e499dd4fab8cbdbe60972ad1449388af7e7a93808a5cdddb0aa4bb0827ba5ec65f788a26 SHA512 8612772f40f454290128a4d812d6acb44ac958a22908d9656ab1e7e4cd2053346bbe71c7fe0234b3ae40457a4fb10f6a6a3a957223cde954d5227618739fbd39
+EBUILD qemu-2.11.1-r1.ebuild 23630 BLAKE2B f081ef952d4ca075474d62bd60ac9a0ecfe82c6f8032d64386cfef8d23bc891c00369d8a6646eed9fcea69f696c388236970b96b793be9123541a8f50b3ad19f SHA512 21c831ece5422d66074874e3e0c19bb449631f402f9718c402862550c84e723edcf52b8688b3447cc996ee613877dca9d41011f25e58ae77154373fe9962903a
 EBUILD qemu-2.11.1-r52.ebuild 23723 BLAKE2B 30b62d91f4e6e2a09822ebcb404b809c0ffaea8bf84c5cacb8c5c63b34875886542622466602e23497e46a4af7477b490599fb945911854742bd8480b2a36498 SHA512 7c439a895d64cd64f5ea892978a8283dea90b767cb303ec51bd2c301a99652d3485f679d7153c2f5cf630a408025c11e3f5de830ba64f77245db40a3efe4c300
 EBUILD qemu-9999.ebuild 23576 BLAKE2B 851d4d1ea9b7a92339ca280f9f9806ef7839cf13cba9a97c5d78a5641668725e37212af380d20c23b5bef1d3cd6c06d77889c0c5a662595543edafa4811e273b SHA512 44d44335d6fb4c60d389072ac7779602f7b94caff6871456f4ff2b0b0219de3d552f4d36f183325e882feb5f8c7ae2f213da4c815bd075be719d8ed1116e7e20
 MISC metadata.xml 3886 BLAKE2B cdb2e81e36f77af3faba1142d5d58360d2cf9e7bd832bff49a7c0968066093c42e0d032d85a6a2aacbe6b1daa56d2ea42d918a2d75cf8a3a202dd8d0ce71239e SHA512 f1c489986c357f17b36686705d58378550684a43660522298f73283e2caffd2f68239b30d43999f04b7e71092c79d58169583d95f77a9fd5160080dd91f8bee5
diff --git a/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch b/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch
deleted file mode 100644
index 8d7c387851a5..000000000000
--- a/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/configure	2018-02-01 22:51:53.068467555 +0000
-+++ b/configure	2018-02-01 22:52:23.965041387 +0000
-@@ -5212,21 +5212,12 @@ fi
- if test "$gcov" = "yes" ; then
-   CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
-   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
--elif test "$fortify_source" = "yes" ; then
--  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
- elif test "$debug" = "yes"; then
--  if compile_prog "-Og" ""; then
--      CFLAGS="-Og $CFLAGS"
--  elif compile_prog "-O1" ""; then
--      CFLAGS="-O1 $CFLAGS"
--  fi
-   # Workaround GCC false-positive Wuninitialized bugs with Og or O1:
-   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=24639
-   if cc_has_warning_flag "-Wno-maybe-uninitialized"; then
-       CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
-   fi
--else
--    CFLAGS="-O2 $CFLAGS"
- fi
- 
- ##########################################
diff --git a/app-emulation/qemu/qemu-2.11.1-r1.ebuild b/app-emulation/qemu/qemu-2.11.1-r1.ebuild
index d0d85a2ac09a..482424fd1a80 100644
--- a/app-emulation/qemu/qemu-2.11.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.11.1-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 
 	# Gentoo specific patchsets:
 	SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest
index 2d3f66bed083..a3bed4a83ab7 100644
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@@ -1,6 +1,6 @@
 DIST spice-protocol-0.12.12.tar.bz2 80628 BLAKE2B 86ae09a97606e227828117e19c76742504a147489222d307893de6efb71f36a62750b23245f37e52b8df1de9b477f8d3d2e2ce2ec7656da4eed42697b080b018 SHA512 66e7a902b3c4a5a778cb91ffd9d324b12d414184146ac834dfb3bd81b4b6b1bb56258d3e1ce240b6f8747e1960fce8f0f6b0ada3617e9f9819be7118195fce6b
 DIST spice-protocol-0.12.13.tar.bz2 73259 BLAKE2B f8694c6144cbe77d84b78c38f87f3f473b80ed97cb51e9fb89a89e66410ab8bf853f51bfa175d431ad8397e25481b7c4bae1614119b74bf95420bca531a38db3 SHA512 55840020a7a538e72bf53d2124a6b1920dd2d567418cf02dc33783ae5c78154d5c832d69f2e6570453c4086194b417d10687884de20365c13657ad7ca7b2ae02
 EBUILD spice-protocol-0.12.12.ebuild 394 BLAKE2B 210264303cdd1656a2a8ed4a9b7ce1ec770be103282cd52029c7654112aba17ddff38f7a4a7e26c97880e1a434dea2cf276e03dd29496775b3ba5abb21e8b945 SHA512 3707ec4d90a0c950649b2b45b908232aefbf08c49de5b6d2a884976b83f7193446f1517959fcf54e9557d62292ef6223f58b8b02ebc80fcbe17cbda5253dc0f9
-EBUILD spice-protocol-0.12.13.ebuild 395 BLAKE2B c9c3f52c3fbee4e6695dff4e62e993f61d993d35442fd797f7792acee38e1502f5e329074dcd4830ff276075013210c98983ef9c39954621449d567c9ec83f5a SHA512 db2a7f0680c6de948ebf6e1f519e2a0606a2c2a85501e68d1467ad4c8e84f2a04b00dd0d324d0eb386f306578becfcbcab30857084d30f7818ca97ac9fbed557
+EBUILD spice-protocol-0.12.13.ebuild 394 BLAKE2B 4de3f75f7e0e76d338f3f9781cb0ede871c224f2af896646775cffbc13b2137207f0e7558f4069f555e2ab4af4f147841302737174fc178a75f7100ca28a5302 SHA512 786f8da71e62ecc280c42d8807446c56c5e8d62baecfd3dc7f1f74dc1cfb6ce8e7a003b7c354a24c39f053bc6fc097041bf7ca831ad6a938682aba10fd146b49
 EBUILD spice-protocol-9999.ebuild 629 BLAKE2B bccee12567d2d495a1ed2fd5418867540e6293cd071ecd8e6e77dadf5189eeabef3222450acea9c0832dce027e9ee9d93c77e2a8b3d29e5ebb2ea29791a7f199 SHA512 ff78d51efbfb26d41650149e9f5ef0222a1d8a43da0aa3b32561a139beadb9218bd00b6383ffe5c876fed39a8326c8597e0a497aab993a22688e0a6b1b228327
 MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild
index 2581ebf9a335..43fddfc1d88f 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index b1d8cd8d137d..cc3cf3252f4d 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -4,5 +4,5 @@ AUX spice-vdagent.initd-3 1475 BLAKE2B 0d39828bd5be6271e0d3f1f7262751e1bee263bb5
 DIST spice-vdagent-0.17.0-patches-20180319.tar.xz 38924 BLAKE2B c7c7f851d307cd7dde620278c6ea240d71f8b1f25d6367f81213c7e902d2b2c15f72c71344f965743a45b5693832a2937041ca7b5511ce1db479dafe137bc7b1 SHA512 8ac627f56605151aebc100a6c6d61243776662150095c768196d750929971f98f4b6d1a831cfb547d29ae8a6734795c93e51a9c4f27dcf53bd66aca6df437c51
 DIST spice-vdagent-0.17.0.tar.bz2 130413 BLAKE2B b2fb522f491512d94ac15fa8d253e8e682210ad40657eb9e5e40489eaab18c9f1d5ef5f97075a4389501050a758e1f56d47132de6b1c74bb153fc6b5e87a698d SHA512 b26e44f6463ba70d5815956b301cc2351db22de41ed2ce8b2828d9bfa1cc581c86acd433f8f0d35d552d20f6ca140f88fa39b079ba26e9166dc07ad35bee502e
 EBUILD spice-vdagent-0.17.0.ebuild 1529 BLAKE2B 0fe73b36c13b53956de50b4336219f3d1be114d9139698e43cef90796a3f15faceac3919222328839e1cf183370d7dfa2fabcaa59215d649a2ab331a6456b49f SHA512 a9f36bec7245932f69e0c6c24055288667d0ceb8a6e99ad389ed913b746b19c12e288fdd7d5f9e07bab558b51c47c89b1a1b6e48d00019db23cf9b2bfce475a1
-EBUILD spice-vdagent-0.17.0_p20180319-r1.ebuild 1685 BLAKE2B 536572ee15cd0853d4464a37c265c90add06931f89b95ba35be67f8c50938d29f753b349e968a772bc77c5c97098c3c7b7a652d5859ee4951012bef2dfa489a7 SHA512 be13e2af400f5842eed4dd83e192f26096ae766b10ab8256c0693f5107229290f4226c99c60dc2d3c263e3eb5f71e7118c448c10176c4fd0d4a1fc6398144146
+EBUILD spice-vdagent-0.17.0_p20180319-r1.ebuild 1684 BLAKE2B 061a8c3d2423b3824f4d86501a8fe7767c8cd55cbb4aa304ef087a6fcbf713ddfaba610c4261bdf40d495a261eee2347f814c554c959faf66c6b331adefdca6e SHA512 427881f201729f926372826cab0cb0ee2595c6340f3aa49a54bdb4b9ad9d641e42b8baf49c211ccaae9a03fbde832e7107cfbd7a06a9e9ecaef616a58f63a78a
 MISC metadata.xml 557 BLAKE2B 03e0f3f159d333513fb7a575b46ad91167fc30e96b4e982cdb2bf545f19a53982e82698b03b02df0dc7dbfb90d9d05aa155c56aa1dc2cf6a13153145fd4231b3 SHA512 1f3892771740224f1275a9eb3507e1ac32be745340b50f983383e6b09e69de75d2e0562fd13465a588d08a4d049d0b33b233ada1a3a9883e1ee24c431fa7e236
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
index 4a7c49b1c148..1b644dbfda11 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${MY_P}.tar.bz2
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+consolekit selinux systemd"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index 3c7fa412a75f..8449262ec0e5 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -8,6 +8,6 @@ AUX spice-0.14.0-openssl1.1_fix.patch 614 BLAKE2B fb7b39e73d37bc6ab27035c7d7a742
 DIST spice-0.13.3.tar.bz2 1322505 BLAKE2B 56f9cd34bb48fdcf750230242b27567db713ef749649d4b780a82d0d4ec5d326b19540c9bb4f36c164d40a692eb0368c39e05ee8dba319dd8461a0315e5a9a17 SHA512 63496fbd3df0fd453052cef8e1fb00a3a28f0105610676fdc4a58043cbc6da571ae4407701af2b817e410d05ce727d60d5ee0c93c8897231e25229897c51d95a
 DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
 EBUILD spice-0.13.3-r2.ebuild 2712 BLAKE2B dc0b6c6ec539682690d5a7f240beb49669fa7260a92214a8434b8e527b4f07434fa0feee54db5906fea7cc3256d8fcaed207bbf255aa79bdc640577647dc1110 SHA512 d0cbb81eaaacdf131c914b83ef42071e3f373d1154b0d3c530db6d4ff39c44f814e5a20c3ba2182bbf3cea3598cab1f6e7201ca74377cadb710808554a4f3228
-EBUILD spice-0.14.0-r1.ebuild 2442 BLAKE2B aca19f6484b0d69f6f95d2440cdb9adc9382ecbd1105153cd060a4dcb1f5f93b4b64cea7671b3da684c3a7cb46414bca7dc4aa238abecce6ba64957463c20dfa SHA512 0e13482f4f4dcec33a9a9319ad486ec9c0b65ff92c235c095afdff4788b18830a5a0ae3c4b089cc3ab80dbd87ce02fb5e524f6a7332e0951dcc029877864eccf
+EBUILD spice-0.14.0-r1.ebuild 2441 BLAKE2B a432d483ea50e5ff01e7e44feeb4db6597e83fa013e175b8723ab0e693c5339db1c9586cee671b9a01b0e49db6ffc76294803543123014cb91fd48ad21696d0e SHA512 121da2c47e2a214ab63f56e3a1aa462f3ef629890be79e50d4d8a380600f21304533b7fc700d7b3c4c9e4f6fd45c810ed495f54e608eb756ec79f90967450e12
 EBUILD spice-9999.ebuild 2352 BLAKE2B 5c858640f75e932517b6e6d02a9295885790282311bdefd18a44d77a1e245f9037245ef3d15c65d505be0583427eed7a38222dc776635c6be952bd1d1468b9ed SHA512 4fd7bbe6296eefd04e65510e7983a329e58fa80ffac67f76be7ab35d007d6eadd87cea27e6db1d223bfc92d912ef8ec67e40a07b12092ce554872ca37e2e24fe
 MISC metadata.xml 476 BLAKE2B 2cda64935d0117db099551f30928c447c4d1d7f4e1c355e619c0134ec31e4d7779b646329218c48f9be671d0f0e92fa496caaa34f6aa4136748dd9bd6d2d868a SHA512 3ae95b689c812e19679cb9a9db2f0811077a4eb205cadf4baeb78a2ddfeb7fc0086e2514540fad59e447bbca6c9dba81001a8ff156a1d18ba2d58171ba301f9b
diff --git a/app-emulation/spice/spice-0.14.0-r1.ebuild b/app-emulation/spice/spice-0.14.0-r1.ebuild
index d462ab18b643..b3727d668a7e 100644
--- a/app-emulation/spice/spice-0.14.0-r1.ebuild
+++ b/app-emulation/spice/spice-0.14.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
 
 # the libspice-server only uses the headers of libcacard