gentoo resync : 25.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
commit: 38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree: 04e2cf4bd43601b77daa79fe654e409187093c5e /app-emulation
parent: 623ee73d661e5ed8475cb264511f683407d87365 (diff)
130 files changed, 1342 insertions, 2057 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a67ea0d68001..bcbb54ff8cb2 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index f00d02aac19a..40fa6b5a2d7e 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,5 +1,7 @@
 DIST buildah-1.14.5.tar.gz 11023227 BLAKE2B ebd6cecfc6fa4635ae662dddc722a350fd0b9c87c3d4d67f8010d5ea070270da4f4cd5759612b84d55ecd27b90904950b96471d75057bc6b7d45989312ebec8e SHA512 759d2ba26af43d6ff7ee891f88114a0cde6307439f7837343bfa6edba2473805f0f2e584264e8be01b9f0af07b1fd323243af5feeb9535ada4475ce53a980ff6
 DIST buildah-1.14.6.tar.gz 11104320 BLAKE2B fa618e095523e853454170504aa2747d29e8bec16282eb4bdcf9d8ddeccceeb7ad706d0d127dc621ef0840136737b328c31d9b6b2f9bd1b734beb6d24a15bea3 SHA512 869addbd41c115ca92eab30133c76cd0d449184e95f3b64fa57ad84f50834e6f6189bd1a7e4871aba270b96bf69192ff00da7f0e086439c811c5093342ac14d2
+DIST buildah-1.14.8.tar.gz 10660799 BLAKE2B b32375900c3509b88ae37366f1d2e2b593d0705cabf74c305bf0838f8e22ef9805e37b6bbe1a054d9fc3e48fa5c086fd0524362d570742eec846fb4b079c74d5 SHA512 8cc64d8262ffe3727f4c32051f4f3456ab0b54f221ce6d144a301b732170eb487dc356f4e056c804ca9806172e60920239b62800a0aac2dc5de83cd656ea97f3
 EBUILD buildah-1.14.5.ebuild 1124 BLAKE2B 30c1cbfe0c90d0f93c2ec25cc49cea13503329a65dc92e17da10bc3ef3c926514f09c52c6a9297aa2315365de6c28d219d671ba47e276d12a4a9109348408dc2 SHA512 1eb7b89fe046fe1f02850b3451a9a125a34c4adfc20cbaa3f11053e3ee31c7504850e6519fcb912ced3ea9be9bcff7cc6b98fa2745f26e8720a57eae1b015c3c
 EBUILD buildah-1.14.6.ebuild 1125 BLAKE2B 916ae6de2bdac9991a2b04489cc6f06afa422c12f006c5c460bab00433e4fa3ea346368c5f0a9ffa5db458f84f94ff084ecf3a7ace70e84de2abbd1ab5f97eb5 SHA512 3d85d286096c7e8ab3d123c63d97bff19b536b5a116842f5c57dfae1eef15e6beb42946dfc490012c6b96e909dd94dae602e3efe78babc81cfb40eab0c2cbd39
+EBUILD buildah-1.14.8.ebuild 1127 BLAKE2B 741f08120fa2bbcc63bf3aa0c9bf0902fcee9793801e844e1b1dbed1a4455bf9a9557ac9691e0a1446bbcaaa2d0034f7d01ee23c05a9d3dc8e0d5690b1e3b7e0 SHA512 5fa88e3d2f46673d76ebacb9afc2db86129c6a8a0bce7f9e79d31cb68594802cab1389ee9559835a73d480dc693fbcd0cdafd27a8bf407063ba2a87746a78091
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.14.8.ebuild b/app-emulation/buildah/buildah-1.14.8.ebuild
new file mode 100644
index 000000000000..ee3be785fd27
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.14.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="selinux"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT=155ce56a
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index a5a05055acc8..3a47bd04dad7 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -4,9 +4,12 @@ AUX 18.4-fix-update_package_sources-function.patch 880 BLAKE2B f8a50714d5763f43c
 AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7
 AUX cloud-init-19.4-gentoo-support-upstream-templates.patch 3445 BLAKE2B e7a7e9d3d36d78ab00f2d495f9a3fad795b142c755c797c4cfaf93263c98392b6a03f14bfd38fe4f3a332b108d3c5624051c267e60d0bad1c3469457a0f2f937 SHA512 b88f71c2131e15ead8638f0e094930c76eb1da213443402b4ac15fd735a307393952d4970f6584a2d0199cf58f535956ffa8226a0ce0b51a309299f4424b2f5d
 AUX cloud-init-19.4_CVE-2020-8631.patch 821 BLAKE2B 1c684ab25b44ab35d027d342647070c2558f4740d2117316790ef244a3fac0cd47d205f4af9968c7b6438602172a4f383d211ac58726431e7d1eeeb4bafb4600 SHA512 057158b90890bd14c8252da2c53f04f818f1e7ac7146f39fcbd90fa9cc6ab4914881804bfdf552bc8af589f6f297a8c96584131f648165d9dbbe42a3ce6f3617
+AUX cloud-init-20.1-gentoo-support-upstream-templates.patch 3505 BLAKE2B 6f4b75493e6354c73ad87546337d4520f334883cd0bcd7f3f7eb34276a5c6d57dfbd46f5dc22306ab9843164b56638196238025431a319ad67c9e3d03945ef05 SHA512 3151504396a55baca141a8f509e93007bfe93e4e5945cfcd17ef98a2394ba64564cd7233e792233389776c5baa0b1fd3609a868a5f386dcf5d84563e00d7885b
 AUX cloud.cfg 1815 BLAKE2B df997117fc3e15303171942c2127eb1ae8c333a04c3d8ba7aa6e55b6f0641872e90bc643cb4ac576876c50af09136777507b739b4cc50b5b4094272b5e8bcdb0 SHA512 ff9a978befebdc177000ce50252a89d2b9adf4e2ab92c7c87300c54cebe5ff160fd6619dd56f0432a6ec8a819a4f948aa3e99c06e37dc6650ed41fdce16daeb3
 AUX hosts.gentoo.tmpl 920 BLAKE2B 9195167754ff1f09c37c0220a2dbf7c0c098daf8e71edabe944a96cbf66d2b029fbb36fef9efe6ffa7410bb8ee33f71f04a4dc1f7c62811fdd87e5216eb6589a SHA512 39e6bcdf40bd842a1d2e4ccd1c993b432016f7b3c4d5455b71896a16ee87a5d698e214919172f0a7e2f647156f5efe0964fed999dd193e4f16c944efdcc0f9c5
 DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df SHA512 e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3
+DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7 SHA512 ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb
 EBUILD cloud-init-19.4.ebuild 2552 BLAKE2B a95aca51ab2d3c1562c9f9f0a8f92ae8ae56d08734d92cf516d18adc004fdf4a7726efbdd207d8c52458aeca69b1507b783397223d0c5cf5697118d736098fe4 SHA512 59b7100764eb6ed249e4a4376d291c020d6edb5c39fe7d58355c057372ecf11aaefbe477ec1e9bb4b052d688fba10100cd279bca1a22b6bbe2763fae76e299f5
-EBUILD cloud-init-9999.ebuild 2568 BLAKE2B 42dc81be7422506e73e7e5de34a84837fc6e8af7866421622f5d30b5879bea418026679f6fe9a018ce70914b12c1801d77aac4311c7638bbffd58c617da311ef SHA512 714b9e5d6b1bf98111e8da94ff40742babb39b30d2d537c894e9fa98ed2e2c714ee817554dbde7dbc75a262facf302d738736da2a5fde594153e1b5e560624f8
+EBUILD cloud-init-20.1.ebuild 2721 BLAKE2B 48889920205267745f0121e26ae4708783c080d8c67bd2718a2f7d49d2c8dbd57b53d409b6ced1b41f282542f51abbb0561465566ec40509aa610d14999bc459 SHA512 2df1f9a6e82f962221b6304fd7efe8c1fb953266f8d7ddf99268966e0426cb0d729bf94e95d6a8c2bb4e869440f13a8442984ebe512190f7aa5a974c01a6f519
+EBUILD cloud-init-9999.ebuild 2721 BLAKE2B 48889920205267745f0121e26ae4708783c080d8c67bd2718a2f7d49d2c8dbd57b53d409b6ced1b41f282542f51abbb0561465566ec40509aa610d14999bc459 SHA512 2df1f9a6e82f962221b6304fd7efe8c1fb953266f8d7ddf99268966e0426cb0d729bf94e95d6a8c2bb4e869440f13a8442984ebe512190f7aa5a974c01a6f519
 MISC metadata.xml 769 BLAKE2B 4a6e831e4cd77a81826f3d8a1f16603ece81cb75261a0dfb0b4ff2cea47a4458abf3f7fb5d61672a3bbe38d538b8ba827fd50a7c9c12ef69a69107216e923c29 SHA512 760c8e7a756438fc511eb6959b0ce50cf58e0df6e553e3634a233c2bd95ad0a04310be96ee6ce392eb97e12d2d8760399ab135c4c9eb97b0dd9cd62aeecd1859
diff --git a/app-emulation/cloud-init/cloud-init-20.1.ebuild b/app-emulation/cloud-init/cloud-init-20.1.ebuild
new file mode 100644
index 000000000000..f1f5ed321e91
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-20.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
+else
+	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=(
+	# Fix Gentoo support
+	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
+	"${FILESDIR}/${PN}-18.4-fix-packages-module.patch"
+	"${FILESDIR}/${PN}-20.1-gentoo-support-upstream-templates.patch"
+	"${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
+	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
+	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
+)
+
+python_prepare_all() {
+	# Fix location of documentation installation
+	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
+	sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Do not use Makefile target as it does not setup environment correclty
+	esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index 6c2ca0f3c26a..f1f5ed321e91 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -1,18 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
+else
+	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Cloud instance initialisation magic"
 HOMEPAGE="https://launchpad.net/cloud-init"
-EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -51,7 +57,7 @@ PATCHES=(
 	# Fix Gentoo support
 	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
 	"${FILESDIR}/${PN}-18.4-fix-packages-module.patch"
-	"${FILESDIR}/${PN}-19.4-gentoo-support-upstream-templates.patch"
+	"${FILESDIR}/${PN}-20.1-gentoo-support-upstream-templates.patch"
 	"${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
 	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
 	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
diff --git a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
new file mode 100644
index 000000000000..c840f4fde3eb
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
@@ -0,0 +1,93 @@
+From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 24 Oct 2018 10:52:46 +0200
+Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates
+
+---
+ config/cloud.cfg.tmpl       |  8 ++++++--
+ templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++
+ tools/render-cloudcfg       |  2 +-
+ 3 files changed, 31 insertions(+), 3 deletions(-)
+ create mode 100644 templates/hosts.gentoo.tmpl
+
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 1fef133a..3f5a41a2 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -134,7 +134,7 @@ cloud_final_modules:
+ # (not accessible to handlers/transforms)
+ system_info:
+    # This will affect which distro class gets used
+-{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse", "ubuntu"] %}
++{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "gentoo", "rhel", "suse", "ubuntu"] %}
+    distro: {{ variant }}
+ {% else %}
+    # Unknown/fallback distro.
+@@ -172,7 +172,7 @@ system_info:
+          primary: http://ports.ubuntu.com/ubuntu-ports
+          security: http://ports.ubuntu.com/ubuntu-ports
+    ssh_svcname: ssh
+-{% elif variant in ["amazon", "arch", "centos", "fedora", "rhel", "suse"] %}
++{% elif variant in ["amazon", "arch", "centos", "fedora", "gentoo", "rhel", "suse"] %}
+    # Default user name + that default users groups (if added/used)
+    default_user:
+      name: {{ variant }}
+@@ -180,6 +180,10 @@ system_info:
+ {% endif %}
+ {% if variant == "suse" %}
+      groups: [cdrom, users]
++{% elif variant == "gentoo" %}
++     groups: [users, wheel]
++     primary_group: users
++     no_user_group: true
+ {% elif variant == "arch" %}
+      groups: [wheel, users]
+ {% else %}
+diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
+new file mode 100644
+index 00000000..cd045fa6
+--- /dev/null
++++ b/templates/hosts.gentoo.tmpl
+@@ -0,0 +1,24 @@
++## template:jinja
++{#
++This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
++if enabled in cloud-config.  Specifically, in order to enable it
++you need to add the following to config:
++  manage_etc_hosts: True
++-#}
++# Your system has configured 'manage_etc_hosts' as True.
++# As a result, if you wish for changes to this file to persist
++# then you will need to either
++# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
++# b.) change or remove the value of 'manage_etc_hosts' in
++#     /etc/cloud/cloud.cfg or cloud-config from user-data
++# 
++# The following lines are desirable for IPv4 capable hosts
++127.0.0.1 {{fqdn}} {{hostname}}
++127.0.0.1 localhost.localdomain localhost
++127.0.0.1 localhost4.localdomain4 localhost4
++
++# The following lines are desirable for IPv6 capable hosts
++::1 {{fqdn}} {{hostname}}
++::1 localhost.localdomain localhost
++::1 localhost6.localdomain6 localhost6
++
+diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
+index 8b7cb875..d109044e 100755
+--- a/tools/render-cloudcfg
++++ b/tools/render-cloudcfg
+@@ -4,7 +4,7 @@ import argparse
+ import os
+ import sys
+ 
+-VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel",
+-            "suse", "ubuntu", "unknown"]
++VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd",
++            "gentoo", "rhel", "suse", "ubuntu", "unknown"]
+ 
+ if "avoid-pep8-E402-import-not-top-of-file":
+     _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+-- 
+2.19.1
+
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index d556a0a738ba..33ab594947e8 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,5 +1,5 @@
-DIST conmon-2.0.10.tar.gz 54124 BLAKE2B 0f7b3a3a488fdcf4978c9c69bbb1649b7bca2935c824d0169bb4b6ce5a97d788e2016ed3018beac98ad31723656cca3124c3014f115ce600a4ba4c3c9c02badc SHA512 50145a0e00a595213cf5db684bb51633d8129a770cbd2aca49207b3d6b8b97090b6e6eb52b3f4664978d48c6b404be369bb7d8d5e6ce26b362c377a30ddc0411
 DIST conmon-2.0.11.tar.gz 58791 BLAKE2B a2b9e06041e0455d1445974b76d87e96fc6e248053ca52d48625e635ff709e180d1f9cc96cbcae9896261cf9b7401f1f10749b161451c4aa1bff4ec2d89118d0 SHA512 6ec1f14e1d0216305cc5f866566804204233239b6b428d040385e38b7c9f0d1160bb3af4ec31a441171934358f7f4b315b127507d54bc180e765846ed7b2588e
-EBUILD conmon-2.0.10.ebuild 968 BLAKE2B 54993233f11290922a6c7d6ef594f546fc89cdc5d3b2b9ac08fc92e7222656d08429a284580c3b5f33ef1a284f2fea8e8a949200a32d71049c01436ec54cc527 SHA512 f99d028c835c94bc1ffbd91106ef556ee4941e54bb7664ef83c5f45058c7ad2716ac8c269414f5592487186ae5b1ac047612bb6d1c1577bf91b47e22b8f3a75f
+DIST conmon-2.0.15.tar.gz 61983 BLAKE2B c29de3c9df41b9f27fc2a0f0ac64c1ce27e5dbb21c9a74b060516692a910be4370f7cc4b6225e0243b809fd36848515b28017cb1766cc032a48d7e14b9a72726 SHA512 8310236045d8678bdd07bfd5a56f7ad1e9a01019e27ed8d24dcb83b4489240adce9e118a4fccb6cb0c0f3c31a0272d75bdafba9c50130903d87b7cb68288b470
 EBUILD conmon-2.0.11.ebuild 984 BLAKE2B 91da7cda589991ccf1bbe6e4377467f13eb37bf2fbe99c65de0b01964caeed61f8ce72206a6d0d7b7535f26eb7985669dd990eb7d5863b93b210b0fec2613cf8 SHA512 727d64b336201947f8d8ed96de5880cf0e818046969f26cf8d5dffe2875d56ed9f3332889e5f4f32c9327a0a2e93b9b540fc724c3ca8d9f16e4e5e2aef86e272
+EBUILD conmon-2.0.15.ebuild 984 BLAKE2B c2486e7ee6acf3fdc0c5736891c3ab711db0ac822e4d5c5cc1a0202c3bb4b35bc9679079e7e78d6905a7f51d84caee5ad2d4aafbf667078af0d3245f5a2a4610 SHA512 fc282cc1bf20553d6948825d42a22deee3f08b0b93e991883be3de5ee5ef4d0d19d9244cb20a9cf54b9f613dac3ab6a0cb4b708e110d5a660e83bdbba6f15cba
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-2.0.10.ebuild b/app-emulation/conmon/conmon-2.0.15.ebuild
index 094875d653de..b76b5b1f201f 100644
--- a/app-emulation/conmon/conmon-2.0.10.ebuild
+++ b/app-emulation/conmon/conmon-2.0.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-EGIT_COMMIT="7a830be343876ac381c965c7429a7fb9b3d7a609"
+EGIT_COMMIT="1bddbf7051a973f4a4fecf06faa0c48e82f1e9e1"
 DESCRIPTION="An OCI container runtime monitor"
 HOMEPAGE="https://github.com/containers/conmon"
 SRC_URI="https://github.com/containers/conmon/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -12,6 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="systemd"
+RESTRICT="test"
 
 RDEPEND="dev-libs/glib:=
 	systemd? ( sys-apps/systemd:= )"
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 52dd303b302b..b59b291fce46 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -7,6 +7,7 @@ DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 6cf98e370547d3ca5158f546e72e3ff5fdc
 DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
 DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
 DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29 SHA512 768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
+DIST containerd-1.3.4.tar.gz 5700890 BLAKE2B 9d5642399eafbf3df25d2bdb6ffeb8e98362e9f2c6cdcd7a64fff12bad40f58fa97451228a607def408cc8a8cfbfce67c47fcfdf86865d8086d0b7aad7595d5a SHA512 b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa
 EBUILD containerd-1.2.10.ebuild 1435 BLAKE2B 4b55020f19d1349c90c2faa063c59f161a9ce1c7f9a02aef795de49f8b6ec3229964c2726547b3ad803ea84c7d2ab12c6b7f7b8afd53181a6e2f06e3e4df41ae SHA512 138989a2beb954c4e2d1be54fab432f3e38838cbd18c6341b297afae0c896f7fc9f4d234d96c70af3faee5b9d53bc095a0637c1e8b44b682c6359078bc8b69b4
 EBUILD containerd-1.2.12.ebuild 1434 BLAKE2B b1f6f907d6502dc829780b2e6150dc0e523ea9138840e31e0c88862aa0d07f489966a78d081c208e51e57ee5383ecf5b02cae19f2dda542ab8a6616ea0aaddd6 SHA512 2c9d32a48c78e7dbbf7837dcef9ffaff7d2e5c8fec67da47aff3985a6f898134317e7a13e4f370eb681013238eb085ed7c49d35ba240729cc605731bb5bfa301
 EBUILD containerd-1.2.13.ebuild 1433 BLAKE2B 444dca3d19fda544ad0652d68073b31a31b99c01cc720f9710d6bde42c3afaf6acd6f7bceb5017d9f618a52de7f9104aaeee1aa87f94bf1999d5769a5c9c914d SHA512 81c2a8173cc723e4b76823725334be88ca987163d708b809d4722e0a9612f60145cc0207c613f3820baf994ab6e45f3b091bcc6b04baded826174932ed365de5
@@ -15,4 +16,5 @@ EBUILD containerd-1.2.7.ebuild 1436 BLAKE2B fadea431a169fd01c58bad3ec746ba521d8a
 EBUILD containerd-1.3.0.ebuild 1436 BLAKE2B 221c0f5bf08fcaa1c1956859fc59b8b69830e0e26a221842894d385faadf243f76b575c6a4920b621c679c4c8d025f7ecc679a49d1a70dff738298c281335237 SHA512 133d213aa8115df74f5282843d0a0dc0832f0ca4f320ab4ffa541e3f85f0eb6ba89f66421498a857986fac8b368265445c9d01595def2a613d85c7abadf85dcf
 EBUILD containerd-1.3.1.ebuild 1403 BLAKE2B 27f63eea492f0b4069edbd19692ef501cb79d227ac02623684c408fc33da1d974ca2f2dbd78cdc1c6af9269f146b77c37ff427aea47c5b578eafc3c8d0f81550 SHA512 829b2b8943714ffe79759acf7b40d279e24047a9e77858910f7f820a89331fba8b91a8968cf4a4469a7395c1bec990d27702d583a15d074bd765104942505bca
 EBUILD containerd-1.3.2.ebuild 1407 BLAKE2B 82b111b3749b2f67729854cb50367139a7ac0ca25bc552713f875c5a7d9f7daad9c80c4e6071c01d7e3145d41bd608d08b28b6fd32b1508a2ec8b2324ad3c8fb SHA512 85cb4c29b6d2a77b0c278882ceac51315e34f103491bb7f5c209667572917facfb4debfc4b822728d8316a9ec0f771c3f6cb75d4b5c1b4c1e35ef6ff69837d99
+EBUILD containerd-1.3.4.ebuild 1407 BLAKE2B 559bed738625533707473147c978b4ea26e7df2cf952e2e5c0dffa1499caefc8a7b956b40867e9c38516822e72dbc214327347e10a33c3acbe3fef7843cb083b SHA512 8529ff278c6a01393ce70a7f8ffb124323c6214a6d509571f479bd8c309f6f3537721c6fe9ac1b0c6898c5a69aa4539af2653ea49752875e567acacb16094a4f
 MISC metadata.xml 986 BLAKE2B ea61cc405375a3a31cb6dcc51c8fcb5771d5da886b03c1718d9fa8933e13834ee5da915edf8b02557800f1a6919d95ff41930a5535ab8ecd371dd61dccbb214a SHA512 1aec368575f40d5ff0cb1d9fd2a13bed6cf15af319873cb5401f69946c5e65603a13d67e51013fbd3b25c3d4aa4747d1ccb621745fdea8a658eff2931b57e5ab
diff --git a/app-emulation/containerd/containerd-1.3.4.ebuild b/app-emulation/containerd/containerd-1.3.4.ebuild
new file mode 100644
index 000000000000..4733a84998c6
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/containerd/${PN}"
+inherit toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT=814b7956
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc9
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="strip test"
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/containerd
+	dobin bin/*
+}
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest
index 120236e5d8ed..860f6fa71ebf 100644
--- a/app-emulation/crun/Manifest
+++ b/app-emulation/crun/Manifest
@@ -1,3 +1,3 @@
 DIST crun-0.10.6.tar.gz 1242736 BLAKE2B 840699c6a07ddaef3f6ab4ce226fa6c4ebf0e32641012b6467a2a622d575a48286555b84140d5a1c947b5ef00a691045b0618533fb246bfb6d605baa262febe4 SHA512 b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15
 EBUILD crun-0.10.6.ebuild 1650 BLAKE2B 35568e68e2ca72d932d51ac50dc2c48c260ee75e82250253c725936a0a99cd49961e4f94f1f2bb38f519b244edab34a6ae3e99f378ff59f1b2ea6d9202723c21 SHA512 fff73b11a9e505ae218c974e028a15bfe7c222d9ca3a999d1e45895d8f99af37895885d02edd3fed8e9102a67dffd8323bdb71cb268b6c5f8f4f24ad7246ba26
-MISC metadata.xml 1222 BLAKE2B 7130b8aef5ee4e0a6ddf3a6c1fe40e4918ba2ace244dfad9626ba743553507d3405fca2ec450107bd353f9c2b2fbd8de265f358199dd26e19306fdc662c28906 SHA512 e8f6507a4de83775a04ebf3abddf893cdbde6f82a18e86f2575cd0711fce05650421d1ebd19c35963794fde743747db1cc4ed28d3ea3a3ef2908d1d8d9db2bd5
+MISC metadata.xml 1031 BLAKE2B e0351ab86fa999bd962aa4b793df9dedc431885033d759590dcd4f3abb47436b7f83832138fe78c413898a04af97326d806b96b5f41b25b1ef1da0e10f947a53 SHA512 34e3e9fd8819f5fcf698a0f80acd99465b6fefb2aa33ddef9a302ced25a0eee4e522768a65e09ec3c1f9f7042f98b603978d502ef3dcea24a39bde4ded42c7d3
diff --git a/app-emulation/crun/metadata.xml b/app-emulation/crun/metadata.xml
index 1b7e66ca64b3..53609eb7d97b 100644
--- a/app-emulation/crun/metadata.xml
+++ b/app-emulation/crun/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dan@danmolik.com</email>
-		<name>Dan Molik</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		While most of the tools used in the Linux containers ecosystem are written in
 		Go, crun authors believe C is a better fit for a lower level tool like a
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 72fd6c00292e..0e39c479685e 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -4,6 +4,6 @@ DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7
 DIST FAudio-20.02.tar.gz 908051 BLAKE2B 7f9323e7528949680b39469b3549adbef9acafe6f293c643676117648fd6871639fa8c7a47fdc0e1232c0533c0af9e89953415a0935fa4ad7b831aa8a8243f30 SHA512 69995fa1fb9ea41182e47f8143252db517adf4e9dc4a0556c9032af5c867259cc7edc81196b10ef043e6118a2e3687b34368f3ac8ffe9294398c5143b9928476
 EBUILD faudio-19.06.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
 EBUILD faudio-19.09.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
-EBUILD faudio-20.02.ebuild 2508 BLAKE2B 5eeaec2d55bdfb58f1e272b8d25561e55127c757e800c41eb39c1be65a00735838d09a66123ca56789c5462fbda0d1779a75716820f4b69836ef79844877c4a7 SHA512 a3e2698446f1402c2d58391801aa3e28bf0b569fa587b7a70e6c6391e8e2d5d355587b01d52f6fbfe326d4445d11e1222b22e9cc26ac365824402ca9a5aebbf3
+EBUILD faudio-20.02.ebuild 2506 BLAKE2B a313fbda2f0ed92df9bd0452f7a872e8701c093c5e9d847bda62cd673ce55f22f5768b4d22e28e9021e4501ee6dbee64dc5d6727ce6f42f0b629f1be9e6c18a0 SHA512 c5bd2e5fdb42e47802e4cc244fbcbd20ff77de4cd864c64968d437c0ef2e0d590924b1c5cf6813f3edb8534713fcf5a80cb039cbbeb0e0c1cb0893b9d74c06de
 EBUILD faudio-9999.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
 MISC metadata.xml 1485 BLAKE2B 2be9f299ab02a56e964c19978b78e201ff03e06bc870f8b7703ab6f7ff2f4ec8ce567433ecf3deb6736b96d1bc411ab147fc84c68a28b4c3f2afcd159e813a8b SHA512 b9df5b457ef4139f8be77d92c2f6992452ed1d69dd654743742e1421f4893997a190be6746ac850aae54510ddea398834e3de937a198e3aea54731b10668f178
diff --git a/app-emulation/faudio/faudio-20.02.ebuild b/app-emulation/faudio/faudio-20.02.ebuild
index 3b8290fd8804..5afb2e48be25 100644
--- a/app-emulation/faudio/faudio-20.02.ebuild
+++ b/app-emulation/faudio/faudio-20.02.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
 else
 	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 	S="${WORKDIR}/${FAUDIO_P}"
 fi
 
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index 55374ff6d776..d59e75a9edc5 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,4 +1,4 @@
 AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
 DIST fs-uae-launcher-3.0.3.tar.gz 9633064 BLAKE2B e5f80762407d95a64611121aaf936efaa915bdaef85a87e20998c0349f3f9c9b0640de0a9122c57b957ef031b15461012b5a8aecf13147d987b5db647b26e983 SHA512 dcb88af8e6f791dba9a48aa6fa706dd99288f1fe4b44250cc9c55342eee943c52f94c53b502fe8d570cc259f54583f345ed430e0e3a9878bd2a966ade4789b3c
-EBUILD fs-uae-launcher-3.0.3.ebuild 2103 BLAKE2B b0d95798d91229e02bfba5088fa5e4e967ac6d8025763b6839364856bc4d96b17d68ef3b792306cdd8f77fa5c2d5fcce60ba2cdc271e9161f1ccd73377c39d22 SHA512 dbe1de99a8f319993db2c02cd06d46b61998e6f6a11a0c16435d72cb252861346bf457e04e55d12926780b763439bc793157576733c1de6f88170b4ba08ed96e
+EBUILD fs-uae-launcher-3.0.3.ebuild 2081 BLAKE2B d7abd9b9fbfd6fc116a45191184ce5fc64119b1e9aaab0d68a76dd7a10c245267d1f60d7f5b198cf8c3e34df67a07d3c7a341c0197bf993546f72bb4eb7dac89 SHA512 d964253b8e0ead001167d1e3f5e403475f7dbe06af7ffa05760a926d52ca68f52b35a0ae7defbf2c59ec10f50179c944b4de0338d3c238036fa9e24e14549123
 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild
index 53aa235293ca..14013d591da6 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild
@@ -3,10 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 xdg
 
 DESCRIPTION="PyQt5-based launcher for FS-UAE"
 HOMEPAGE="https://fs-uae.net/"
@@ -26,7 +27,7 @@ RDEPEND="
 	')
 "
 
-DEPEND="
+BDEPEND="
 	sys-devel/gettext
 "
 
@@ -39,19 +40,21 @@ src_prepare() {
 
 	# Unbundle OpenGL library. Keep oyoyo IRC library because upstream
 	# is long dead and it's not worth packaging separately.
-	rm -r OpenGL || die
+	rm -r OpenGL/ || die
 	sed -i -r "/OpenGL/d" setup.py || die
 }
 
-src_compile() {
+python_compile_all() {
 	emake
 }
 
-src_install() {
+python_install() {
 	local dir=${EPREFIX}/usr/share/${PN}
 	distutils-r1_python_install --install-lib="${dir}" --install-scripts="${dir}"
-	dosym ../share/${PN}/${PN} /usr/bin/${PN}
+}
 
+python_install_all() {
+	dosym ../share/${PN}/${PN} /usr/bin/${PN}
 	emake install-data DESTDIR="${D}" prefix="${EPREFIX}"/usr
 	mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
 }
@@ -73,6 +76,3 @@ pkg_postinst() {
 	elog "   Alternatively, you can start FS-UAE and/or FS-UAE Launcher with"
 	elog "   --base-dir=/path/to/desired/dir"
 }
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/app-emulation/ganeti-instance-debootstrap/Manifest b/app-emulation/ganeti-instance-debootstrap/Manifest
index 03209c801e4e..b63ea974af22 100644
--- a/app-emulation/ganeti-instance-debootstrap/Manifest
+++ b/app-emulation/ganeti-instance-debootstrap/Manifest
@@ -1,5 +1,5 @@
 DIST ganeti-instance-debootstrap-0.11.tar.gz 67946 BLAKE2B 0dbf3d16ae4058f0093adcd0a33c473719cf6de267dbc4e99e3326a2885d57693e2d0408b1079681056be88c7db23ab168e38f38d4051e8847d3b552fa42d4a1 SHA512 d39ae29b49e3e0e25e9052ee5201d5aeeedfa229cc0b8674ea01a26b1b615b262c1464ca16b5268884a0fa28981e5126eec084d7bb9298a4b405574925b85b4e
 DIST ganeti-instance-debootstrap-0.16.tar.gz 23020 BLAKE2B 8e96597ee94e5806de78ade571f5287e68c5442a91fb8ef3f6e2dbb95301e036fa79225b3c8a2517b05ff14eba0fb541c792556218d0f9a9346f1ebe524a6b38 SHA512 43197d034d719b81ea8737ea60763d43bf71bc9b15b0fbee60bd42e5b0c0f3821805986d4f564db91207a83c2396e87fe081180eec3a5da77d18f2d510fbff1f
-EBUILD ganeti-instance-debootstrap-0.11-r1.ebuild 611 BLAKE2B b7a9b1ccf7fd0fbd096075398f29c09dfbaf679a59ab5ac70b22ad88dfaa2db5b89c36b03f19aedc060d6828e2a96d656db19784258502fb4009bb7e93fd3e1f SHA512 699d0c1083031f92739205981762407b747ac076f35aa55d9caa9c09a0bd9821f267471a3b02b388a421816d4dbf9be958c2fb505a8a095f31ef84036f6593aa
-EBUILD ganeti-instance-debootstrap-0.16.ebuild 784 BLAKE2B 6804462e61ae87d891b3b0534a7f9c14d6ebb9319bf4e28469e35f3b932af6706743133d51b71e7f4dffcafe9146498616bd047b0b73f87afb5ee84ffb7361c6 SHA512 efae7027375400e1ddd962949c309832d689cc8a03b86a76baab870869fcea6664c1612af7da882d1c60990ffbd1d91d2686db5a4a409c22bf30e29797581201
+EBUILD ganeti-instance-debootstrap-0.11-r1.ebuild 613 BLAKE2B b272f6b3d82db2937e3284b7da7ca98dfb0e7bfc6b9bee5a84e1c5b906866f3b8924e11e09420dac052a07e6a2dc81093ccd9e262c6c2d2cd7d96ca0ec493a7f SHA512 99a95ed0351ae6c70d59326379706ad7ef8fa6c242678689dce6fc473a3b5df12c8f4d97c4fdbd3099d6c28d07a33badfb88f3829293d9be78e41c40ffe0e3e4
+EBUILD ganeti-instance-debootstrap-0.16.ebuild 786 BLAKE2B 8844e3491763bd837e17ed4111546fd515e5945df3c12336b4bc28fd67237a9b60f618965eb9b224fab85ed61a082ab1443769aeea7137d2477fd33aafdbaf92 SHA512 9adbfd8d5dd509a4ce5a2e2a76e700d19b60e0214885acdaeb462316c55f7f432ea71e1973c96a4b78216a78d1210c514df0188585a0c0390157efbb033ebe59
 MISC metadata.xml 693 BLAKE2B 8e67678f49377a1e982361b80d67e2af5b4a093996d7416e1ac98925ee3cd9f3a79fcd23f9146df831c55b6aa9aa8ed4e7c5e735d9fd191b48406b256757d340 SHA512 5cc8e1aa819d16acfd1645a8f4921343e931423af0e4e6414d92599d3d9a0ea301b1549a767b9c768cb7f35d9bf580657ddf25d1165ccf59cdda54e0099fbcb3
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
index d164143bdc9a..dac122fc12ab 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://ganeti.googlecode.com/files/ganeti-instance-debootstrap-${PV}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
index 29e713715a4c..b4859961ac2e 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ganeti.org/instance-debootstrap/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	${DEPEND}
diff --git a/app-emulation/ganeti-instance-image/Manifest b/app-emulation/ganeti-instance-image/Manifest
index 9d80e64f4a85..8ad403f154e6 100644
--- a/app-emulation/ganeti-instance-image/Manifest
+++ b/app-emulation/ganeti-instance-image/Manifest
@@ -1,4 +1,4 @@
 DIST ganeti-instance-image-0.6.tar.gz 82534 BLAKE2B 8a16f1ead6307400031425c60dae2585ea9ad53e55276a73177b46652c9054c6c24ea7068347ecaeafa77cea27b1b97350420bd6cf0e69e5ac18692cede47bbc SHA512 92b5048fe8c40692e8e7c4cb73b21e764660d7cb5f585a8489fc4338eef7df8aae1147d38a849103585a884a0216a0bfb42473d5c1922130e5aada31f5d580c3
-EBUILD ganeti-instance-image-0.6-r2.ebuild 962 BLAKE2B 3f4fb1305c8582a2254eda5fa0d27b84ba830748658d376ba980d7beca005d6c710491b0680aa488871539cc99d554671f2511a1e598b93bcc3bb02ad5d0f985 SHA512 27c104fe48fcc68658aa85b65a2de282b1537df754d5bcdacd6950365201c02d8715263f76418fbc6953254a68c2395f2c767701d17412a05e606ceb7129e555
-EBUILD ganeti-instance-image-0.6.ebuild 966 BLAKE2B fe3400f7adf4ed2b44dc64d690f95f663d05403aea2659a4fe4ada334ce05a1990b912a96c9c2ed519465ab7cc5961482f3f71700549a1b338c5af0cdaca0997 SHA512 6457e094541bf40920506de80a3a2fcfbab6f34b37d26c5dd26da1b11c5acd794be744eae8ef47148e17c065ad0265f339ebfb24243ae36e8f9cff162339eab0
+EBUILD ganeti-instance-image-0.6-r2.ebuild 963 BLAKE2B dd5d989e5b5076654449b8fd49c62296196eaf7a649e1e8de3c80c43dec2774c1ba3d6f06d0176e793efba07f3764f73fbc78131a3880847832aaff224c482db SHA512 02b90a2ec954630057f3204463183521fdce1f78b0c60d2bf70698b5dec68a6cfd0b2eea97224f12b71fc15b0bc492a08ae95fa8b9abae590698ee225dc00ebe
+EBUILD ganeti-instance-image-0.6.ebuild 968 BLAKE2B 1026024848238a060b25dedd2578e1bcc87717ff73d4a7952f326fd2c4ed05c8fe683fb482915fe0d924f7924587291330525bbb5d8ab70b2d993ca248be389a SHA512 739d76c25f5a9206a70b634a67c292d381cd29e4e90613949fc997fe42ade53f5017246f88cd2d7f6d67bd6c7373c12a4d821014448563c6ede3409bee78bf66
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
index 45a28c15d3cb..1cb4bb0a4467 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://code.osuosl.org/projects/ganeti-image"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
index e621e1ec228e..111a33276b5f 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://code.osuosl.org/projects/ganeti-image"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 695849dd4b7f..368bb2d1db43 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -35,7 +35,7 @@ DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfd
 DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be
 DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e
 DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af
-EBUILD ganeti-2.15.2-r9.ebuild 12218 BLAKE2B 29a58d729c90e4c3de9a6777b22fdd79a077ebc41697bfe0731db8867335e8504e28ae2a5dcaeec05b71b529a9ff594ec6ec1ee87d70fd45cb12e060f8fb96b8 SHA512 d7a5f0b28e385ccca8a0f93f68a944df6ab8feee5292420eb3d259ead68b9896487f38eaf514aa27310771c7ab89f9da56a8f89c22a1311773bfdbec5ee533d7
+EBUILD ganeti-2.15.2-r9.ebuild 12220 BLAKE2B 9afceba7d515ed36d740f255aefa6424a8666e9bf61b608d3e0c79848500a95d1d098c78e8a9c12a6a260720a9ff039c86cfc9bcc0b17901d80280f8a9eb6678 SHA512 39c34793b7e13b67821ce9c7eaf50e35decf395898dc93318bd97e326ddd40f1d717ff7ffab3ad22d99c1481c208a44fe24dc7a74cfeed6733bb2a8ae8e24967
 EBUILD ganeti-2.16.0_rc1.ebuild 10619 BLAKE2B 6f3a4aca5ac36c41671ce34a489e79fd6382055683722e34aee736c2baf9fa3ec4cb60e90eab9c2d9a7fed57391c84a793bfdd855a664238876a58931166e141 SHA512 a11bf679646bcd6081efb028fc1333e3e98c6551cefeff4d9336f585990050533ef57ba2ca5cb7ef3aa0f966afa0c9e532b999c169df30b453cedb03bd638801
 EBUILD ganeti-2.17.0_beta1.ebuild 10646 BLAKE2B 75c7e1d72d0a778dbaa0c5703c7a41ea7df3f3b1b20f4744d62e130be022d030953c1b3636f3f8d9e58a71d4c6ac4863f2cc4ed493db0e66eab95b5cb529e5a0 SHA512 77da930bdf819620f06c3e722b02a0afa4bfb4beed918a88f9f330d11605c9b8fdbb413f8af9f791a6c7e1c1071720f89966d52b958fe790209efe4582cf773f
 MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
index 8b8fe0676e4e..385e68848589 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
 	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 PATCHES=(
 	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
 	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 42fdc9380cc7..5d1fd2013458 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,3 @@
-DIST genymotion-3.0.4-linux_x64.bin 38811828 BLAKE2B 6b8c2aa824bc232d09b43e1c69c1531d447bfc3341ea83a277058198f812d66e9e900abb7186d1c4a45c9e12c92ebec7c809e1641d0e3e30edf77c52fa1818e7 SHA512 28bebf3468049b5eeda9890167f89a0537fa21a42eacd3c30ae9a40616fd215282075853f35179fa40b21b124f400106d82e1cfb4949fffca741ed83ba69417b
-EBUILD genymotion-bin-3.0.4.ebuild 3559 BLAKE2B f3b755b96d458638882eef4f9a258b7fbd8c65ab763e1ce2211ebea51c01e57146fb41cb5a7d4fb5d9c71ca64a0dc907b9a9acb50c6cc5a394590c78ffd079d0 SHA512 6e58e121ee0baaa3b0c4a08b3775bad487a75a333f9d25e8195ebc91ef230a273c216b57119a27b0c10e6507347fd8c22e29fdae0517c6e4af623dafbba2a2cc
+DIST genymotion-3.1.0-linux_x64.bin 40490397 BLAKE2B 4601ff24b5cc2f33c442ec6cf76e04eaa010304d4097b30ac82c7d6824dc3949b409ec5867cc7f08ee2985e254eefc9d8282ff77a5a92961dec0df9f3f80c6d7 SHA512 53a325b0a7eac6998ae525277d3a566ab6a73e21eccd6496caecefc175138b604a516d2bba1fac9f61ad52aaf9dcf0dd1fe2cd2da0c5c31a2f48c08f88a2a68a
+EBUILD genymotion-bin-3.1.0.ebuild 3592 BLAKE2B 86cf768889157d29282a787c244d2819f83c18969f127ade68556be74a61e965ee1643fe7868cd46637d77009f9bb1104798e27ac095d29446a0129569232d07 SHA512 4094ee96e501dad45c108b1e8b74e3f91e9fe307d2074cff99aba46705c7a07a216bbd687f59ff5ce2c43f5064178a555332d2e5acfeeea2bebfe7cf2f13666e
 MISC metadata.xml 483 BLAKE2B 1ed85dae79388f3c548163e5fafd2838e1adf9bfc9a9c793ce7f9e7e323f8e3c9e7e2f3190b3ec54a0c598d048c61b6ad67c8eefb3845cd446ea67b01e0df8a8 SHA512 e88ad9fd8c20d5be5569c64544c3f4dd72eb3243d46333c30aaa1b939eb6ce35855aa3e771008b2fff990de5b2e5bf79ca378714e3cf7dc375144b7cd8f5649c
diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.0.4.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.1.0.ebuild
index a76eebb7929d..f5745370f0d7 100644
--- a/app-emulation/genymotion-bin/genymotion-bin-3.0.4.ebuild
+++ b/app-emulation/genymotion-bin/genymotion-bin-3.1.0.ebuild
@@ -86,16 +86,17 @@ src_install() {
 	doins -r "${MY_PN}"/{geoservices,Qt,QtGraphicalEffects,QtLocation,QtPositioning,QtQuick,QtQuick.2}
 	doins -r "${MY_PN}"/{icons,imageformats,platforms,plugins,sqldrivers,translations,xcbglintegrations}
 	doins "${MY_PN}"/libQt*
+	doins "${MY_PN}"/libqgsttools_p.so.1
 	doins "${MY_PN}"/qt.conf
 	doins "${MY_PN}"/libicu*
 
 	doexe "${MY_PN}"/{libcom,librendering,libswscale,libavutil}.so*
 	# android library
-	doexe "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so*
+	doexe "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender,libemugl_logger}.so*
 
 	find "${ED}/opt/${MY_PN}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed"
 
-	doexe "${MY_PN}"/{genymotion,genyshell,player,genymotionadbtunneld,gmtool}
+	doexe "${MY_PN}"/{genymotion,genyshell,player,gmtool}
 
 	pax-mark -m "${ED}/opt/${MY_PN}/genymotion"
 	pax-mark -m "${ED}/opt/${MY_PN}/gmtool"
diff --git a/app-emulation/glean/Manifest b/app-emulation/glean/Manifest
index f15fdfd329f2..f840e15e6e6c 100644
--- a/app-emulation/glean/Manifest
+++ b/app-emulation/glean/Manifest
@@ -1,4 +1,6 @@
 AUX glean.initd 241 BLAKE2B ea451713203da8dd61eef5155e2ab2d5fa7be5d9cd210ce2d0ce890fe54af05b461671702d1a2b60b8e6b8e0cb0f4d12f90ff2884409e9f2a3dcc380ba48bb60 SHA512 a5af77b16e1864158dfe858f932dd4eecb5633bd71fbdd00085863e56bd1862d7eba4500d0f4ac8c692b06750fcfe3f9f5b2bb7a4ca6a4ba72dbc43bb12856c5
 DIST glean-1.10.3.tar.gz 51898 BLAKE2B 95bcee5caae1bdcdc586c8d8ab8097b1dfaa35c521d7b90d128db14f496d4d31e1d0d4c540c4205861e5c7fa87d0e7038227ae9db0e898e3bf43b8b9b989e766 SHA512 27d4f29bf35585f73813e9efdea0253f0be3a8fa059c6ce524fbdd37b865d9c9e10d29bb8f970317ffe772c110cc76f10ae7debce5f7433461639dc63b9349db
+DIST glean-1.17.0.tar.gz 62791 BLAKE2B 6429bd721655499732f84dc8db4bd31bdb128289956ab65fab78ea5461cf7945ced893fd832ac6a3cdcedb331f3885004eaa530be1ee4fcc4168870b5c345dd3 SHA512 55c8ceae941296c038acff3f40cf4d6b783d7c6530ebd6fbd6d87938de11a1be1403741a559802c9135d3fc4d904b1936319dcf7a0179f95ac3f909667f5622c
 EBUILD glean-1.10.3.ebuild 593 BLAKE2B 88652cb271f366b33dcc74309b543ed1eea54f2a1b7c283bd653e5a30c49dcee8adb040af5a86bd247ea43c7caf9fd2fda037d4cb58d92d01f79fa3335c9d9cb SHA512 b5b6c1bbff11ab7a5e4320059664628bcd5683d11a7c4f6a4bf34df8758aea4b49bfb90c5c6041fdec1efcd0d38f567f593dd6f8231e754a134e8be7259bfdce
+EBUILD glean-1.17.0.ebuild 613 BLAKE2B 41656ea79c42932ff422d65c797d2cf6b476d1868cf60ab69babca3e78a28f26374379f4df7ef7675de105d2aaaf127ba3c32648aee87cfb0b35bdf6c37e50fa SHA512 cd9962cd19f33a6c627f909d568f4cded89a03cbbb5536ff6753ba4979fcc03a0ad9405c7190fec89a4f321355629a7188ff8e0a9e84a9710f66761d374d0e80
 MISC metadata.xml 641 BLAKE2B ee81e3a785b2622805b1d30e1283daf523d5c6577c313aa970c8745f870e5058af90a46c11a954a3f641b93b7ece772336be4330f7f1e77625ec9869053342bd SHA512 28e64d8afd054e05b0155773b4b35c8b03b1488be4aba776c0b6b23397e2e8ac35330be8da668c57239a0826c5af00d93a17ba4d00936829e9b67d4d53ee3c7a
diff --git a/app-emulation/glean/glean-1.17.0.ebuild b/app-emulation/glean/glean-1.17.0.ebuild
new file mode 100644
index 000000000000..521c8d3efe66
--- /dev/null
+++ b/app-emulation/glean/glean-1.17.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple program to write static config from config-drive"
+HOMEPAGE="https://github.com/openstack-infra/glean"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index ba39dc97ea51..3a1a05f54afa 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,12 +1,7 @@
 AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
-DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
-DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
-DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c68d8436655c37a40375e3dd1a2b621672643e430acc8a656fcd516fa5a542e7104d6cfdbee3d213aca6228d410 SHA512 986ec7123127d3ffb26cecc39a2ae3d8a6dd3d147327449fc4e9d17f6e6606bde278f13920d0aef59410262801251e7b4cfe099cb5caafe9773533e8476848fe
-DIST libpod-1.8.0.tar.gz 8992983 BLAKE2B a3b12dbfbdb0fe01ef8791de2c938cbf21c01ac0b36314d2a170c593d22eea08d912f8547861b239bb982db6acc9d2426adb97ffda4603739321cff0fb9ff1d8 SHA512 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87
 DIST libpod-1.8.2.tar.gz 30065262 BLAKE2B 1bf4ca9b9547a710f1882ac40aee0cf295fecdb9d43dc6fa30633331ca9e19d15e6d671075627939167cdf100d30e8299e50bd51425226ff1994778782cf261b SHA512 c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366
-EBUILD libpod-1.6.4.ebuild 4073 BLAKE2B f0b50d64b5df8ecd7079d744fc26fab7c236d30b50a2ee855db64171ef112d95aa86a9defd71bf4d0ab348b59301e7814543d40ba5bf80a6ea012121a332697c SHA512 c4c99e465743ca0f97351e691edf91c535a734b4e9ac499724904341352dbffb9f5f5772df61bab87ac47bc45e9ff5a72d79eebf4de34c3046a9d458a75a146f
-EBUILD libpod-1.7.0.ebuild 3740 BLAKE2B 3de42be1182622ed7b050bd15b442b791f2b4ad53472276d46b5cf730d0d179f35c13b621ea210c3395480e7a4353ff93a9749ed13b957e14cbfb7ae20bd456c SHA512 3799b940413f1c02df27133dd93289dd8d9776c84838292dafbd424ffc8fa25ace3f440fb06e579f1d0d11f33d868af643a15cbf96f61e9ff726794f24e28bdc
-EBUILD libpod-1.8.0.ebuild 3849 BLAKE2B e53bb5e9d01d104de15d8d8a13190cb2d9a53a49c9b583b2aeb30660a85c003b6a2d63f2a3b3d947ca5dff4089a4c58bc3ca123cb2afd095dfbc78384ba06ef2 SHA512 fcb10d5f350d53863190e3b8d328d6c21535042de092ba617b03250fc3c652422fb853f134b785f4a5c7adba7e93a27ef0ef669d5206ab64e3b535d079efe2e2
+DIST libpod-1.9.0.tar.gz 8865279 BLAKE2B 70b83f7c0482f0cbf94f235752b241aec61790d2ec01abed6ab3eb98c5de4a338e84e70c7d5fbcb239f33a7a209160c8c4868b3b86797ac8be58f08ddde5d35d SHA512 ba7de72e03dc55896025b698465745873f3030547e19133b835e4f47c1cd1c0261f17845d50cbe7b824db2a9ed77def7883405637333e141f7abecada644b5be
 EBUILD libpod-1.8.2.ebuild 3873 BLAKE2B 649f6f8b597b1befc950a99a715a6eb561671293e90e0b136647a16cf02d5d71f58991e25627441414870b7069ea14846e5397236cc8653c056c7ee8a1c9dd87 SHA512 2345393f43e103c442bbe389fa14389bfde5719a3a8e916f2f18dd3808feb5490ba0fea594f3e1177388730a90fea803d29863e65ca1f09182fe9f2a3dcfa4a7
-MISC metadata.xml 879 BLAKE2B 71e5ad7ed29e426919198aafd97805d704938cf938db4c6ce72e6e490753ed1c7a61e63209e855fddea0598f7c869dc1dde42cd5152f94377763d7163455ca53 SHA512 6a1a84612a4aa99a10d6f9b64168c748e2d19ea26e938938e1581e5f09bfac3d972382dfe7ea78e446d326743e8adf872a2010742d256cb04093c6d3fef36a31
+EBUILD libpod-1.9.0.ebuild 3912 BLAKE2B dfaeacb536215dba220f97b7e9c658f5c17f04258eb08fa6653c1c0cf0581fc995760f2e2f197068644665168adadc0b0226301983d0e945dbb798a6b989ad26 SHA512 2ebdc7d9f37573024fddcc5fe9e87c0bd629c9164f4aeb4ebbf2202fb414ee41834940f09d187ccd020e6e4285f189f6080717a4c9e18fac8e697081f88d6bea
+MISC metadata.xml 999 BLAKE2B 4cc701468adb97983a347a94a76ad7966a54a5d4d5e3dcdae0a87e6bc81a45eac46ff120c576d16ea1f8145d6ab86b51b3671d9baa35945d4f104a7f8237854e SHA512 679b1a932037e7f7d209e7f6485dac8c3f2cd7be161fd342dc8158567f03c5692e487d23de4dda62c4ff629c96f0e2ea715dd9c8523e457b090bae5824bd3646
diff --git a/app-emulation/libpod/libpod-1.6.4.ebuild b/app-emulation/libpod/libpod-1.6.4.ebuild
deleted file mode 100644
index c12fd7d1e1c6..000000000000
--- a/app-emulation/libpod/libpod-1.6.4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-emulation/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
-		"${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
-		"${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
-	eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	sed -e '/^GIT_.*/d' \
-		-e 's/$(GO) build/$(GO) build -v -work -x/' \
-		-e 's/^\(install:.*\) install\.python$/\1/' \
-		-i Makefile || die
-
-	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-		-i hack/get_release_info.sh || die
-}
-
-src_compile() {
-	# Filter unsupported linker flags
-	filter-flags '-Wl,*'
-
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	export -n GOCACHE GOPATH XDG_CACHE_HOME
-	GOBIN="${S}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${EGIT_COMMIT}" \
-			GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins seccomp.json
-
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	dobashcomp completions/bash/*
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	LIBPOD_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-emulation/libpod/libpod-1.7.0.ebuild b/app-emulation/libpod/libpod-1.7.0.ebuild
deleted file mode 100644
index 329e1e7a7204..000000000000
--- a/app-emulation/libpod/libpod-1.7.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="b7ce1157b00af09f4a09e39b377aa3abff46ee05"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-emulation/conmon-2.0.0
-	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	rootless? ( app-emulation/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	sed -e '/^GIT_.*/d' \
-		-e 's:GO111MODULE=off:GO111MODULE=on:' \
-		-e 's/$(GO) build/$(GO) build -v -work -x/' \
-		-e 's/^\(install:.*\) install\.python$/\1/' \
-		-i Makefile || die
-
-	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-		-i hack/get_release_info.sh || die
-}
-
-src_compile() {
-	# Filter unsupported linker flags
-	filter-flags '-Wl,*'
-
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	export -n GOCACHE GOPATH XDG_CACHE_HOME
-	GOBIN="${S}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${EGIT_COMMIT}" \
-			GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins seccomp.json
-
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	dobashcomp completions/bash/*
-
-	keepdir /var/lib/containers
-}
-
-pkg_preinst() {
-	LIBPOD_ROOTLESS_UPGRADE=false
-	if use rootless; then
-		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
-	fi
-}
-
-pkg_postinst() {
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
-		${want_newline} && elog ""
-		elog "For rootless operation, you need to configure subuid/subgid"
-		elog "for user running podman. In case subuid/subgid has only been"
-		elog "configured for root, run:"
-		elog "usermod --add-subuids 1065536-1131071 <user>"
-		elog "usermod --add-subgids 1065536-1131071 <user>"
-		want_newline=true
-	fi
-}
diff --git a/app-emulation/libpod/libpod-1.8.0.ebuild b/app-emulation/libpod/libpod-1.9.0.ebuild
index 27fe79a5b91b..de6c7c91cbb5 100644
--- a/app-emulation/libpod/libpod-1.8.0.ebuild
+++ b/app-emulation/libpod/libpod-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-EGIT_COMMIT="2ced9094d4728dd09f60a177faa32339a8d0f721"
+EGIT_COMMIT="d985723506a29766ed21585ba8541033db6bd572"
 
 inherit bash-completion-r1 flag-o-matic go-module
 
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 
 KEYWORDS="~amd64"
-IUSE="apparmor btrfs +rootless selinux"
+IUSE="apparmor btrfs +fuse +rootless selinux"
 RESTRICT="test"
 
 COMMON_DEPEND="
@@ -23,6 +23,7 @@ COMMON_DEPEND="
 	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
+	net-misc/cni-plugins
 	sys-fs/lvm2
 	sys-libs/libseccomp:=
 
@@ -34,7 +35,8 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	fuse? ( sys-fs/fuse-overlayfs )"
 
 src_prepare() {
 	default
@@ -47,7 +49,7 @@ src_prepare() {
 		-e 's/^\(install:.*\) install\.python$/\1/'
 	)
 
-	has_version -b '>=dev-lang/go-1.14' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
 
 	sed "${makefile_sed_args[@]}" -i Makefile || die
 
diff --git a/app-emulation/libpod/metadata.xml b/app-emulation/libpod/metadata.xml
index 0ce2c6b92f8c..8b673ef7a51a 100644
--- a/app-emulation/libpod/metadata.xml
+++ b/app-emulation/libpod/metadata.xml
@@ -19,6 +19,10 @@
 			Enables dependencies for the "btrfs" graph driver, including
 			necessary kernel flags.
 		</flag>
+		<flag name="fuse">
+			Enables fuse dependencies (fuse-overlayfs is especially useful
+			for rootless mode).
+		</flag>
 		<flag name="rootless">
 			Enables dependencies for running in rootless mode.
 		</flag>
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index e01921ec4270..75f865d58e38 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -20,7 +20,7 @@ DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 669054aa3bb3e4f2cf0be2e9ea796b82078666
 DIST libvirt-6.1.0.tar.xz 8276964 BLAKE2B cf57e28d17e868ab4a69f03fe77b0d779362c6cb8cf1a38196ba7bad873ec4ecfa8ad1744ce97251820ab898be1ddc9bf30b788f1708172bfd23ec2c7cd3bdac SHA512 17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606
 DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4
 EBUILD libvirt-6.0.0-r3.ebuild 8891 BLAKE2B ad688cf1ccc1dc04d34844ef0dc9387f42be1547b73e4c331ea4879884fd8de70dba24edb1a865ac0416162248b8e90411df678a67a9759b6b08329087e9a13f SHA512 f77ec0b1abcb41a5e0418fc4fcee2ddc6f3d9ca00e94a0beebfd8b0a5b03a972efa99835fb5c4b935c41766adab78dcb9b02bb282c3ff08850932f07742f9fe2
-EBUILD libvirt-6.1.0-r1.ebuild 8784 BLAKE2B c69c953c7408b9d73e8d53de046cc3b271a0fc88b54d1cff54e8367d073111474fa727d57453bb36cb3ecced8a45b3e0be12399b777e33218960908ff1323181 SHA512 0a46e7638e9c86afec68ea8127a6c5cbeac76729af5039bfef90dd0191beb7f246ea51f812f24e8f63cde8b60b9eb8ce83dc9c8fdd07749eab807ae6362bfbde
-EBUILD libvirt-6.2.0-r2.ebuild 8784 BLAKE2B 78361e2aff9be822503cd51fe5707e9889a9f5988bc2e46866f9dbf046a85339595e691556b80c92a96c5aa2c4293016593bb74f79598ee848202f39e25806be SHA512 fa52bfc5225388200bcddfbc6e26f11395210bc3514ef654aab63ad5d45b8669bfbd41b09c3ebc0971eac931a443aceb1e985e188face8d0d21dafe4c68e87e4
-EBUILD libvirt-9999.ebuild 8730 BLAKE2B 69343ac53142d98de1648ef9636172dff1c6dbdbf7af53d76afadeaa5773ca2e6e15b41a84242be7adce5fe96b70937af52b0764e2210a1c4efc157090c5c8fa SHA512 0b45e236fc4c9271b13bd905b5821a99718a5ff5dbc2c0ca0a8e61faa1114d1e4d4564b06d74499d278cb60fcf0ecfe5b5e3bf40c3358185ff8eeb5931252c0d
+EBUILD libvirt-6.1.0-r1.ebuild 8777 BLAKE2B d093067d76d19a47a804e88c66c35a161866f23a5a048cd10c865c26493f98db7b8fa729c6adf24cbe5af6cdae5b6570c4c1d0a88a4b1571575a15351e5a9e40 SHA512 786874faf23852522bdb3b8e5917d9ace7cc4341a5d3b50e87117d03cff078deb4071881d492afdb29108427224f8c9c1aeaf7efd45bc246845de51f2c4db832
+EBUILD libvirt-6.2.0-r2.ebuild 8777 BLAKE2B 1c9b51501534b2a22902b9f8db8b2c9ec78723bd026ee5d76942ccb4c0c7380610c5b9291387a2ea2b22368227976c3bf0d17d03211185d8942c490fd3aa6686 SHA512 6be30022ebb91201ee4bd3bc6e970ef1fe38bff44757a1134e6a472bc9ac72518ab3c600ec6182c49a3de64d231d4699b41682225c613db98b3a3d0de623d495
+EBUILD libvirt-9999.ebuild 8723 BLAKE2B d546b8941b1f8f8bc764bbc18a9052da46bb3fb379e622dc3eb6651a1b6bdf27d0a3d39591f42b9f8418dbf31a8b088da6680f522d5d57c60fcd8ee988eac240 SHA512 2549ee1c77dceec462ba28e798d5505d94eb891ad03afdd52d956f515ac7d31de5d145014f6047b150ff1cc677611c5dfdb4f20182c6c9cdedce8390b683f6a7
 MISC metadata.xml 3702 BLAKE2B cf4bd9200b3cc77129b7a56ad3e399d1371613dbb4fbdda96c4977ff2b2e8340afef5f10efe6a5f82015c34662dcccef4db8740a666b4714741d97973ec772a8 SHA512 2ba4fd9991263b8884856512faedfaecec0896e8cfdd9bf76a19838f6aaea766c43ca97d40753cd434c6b38a859ddd59b3c9d26b759871c6bdebbff160521509
diff --git a/app-emulation/libvirt/libvirt-6.1.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.1.0-r1.ebuild
index a387149a3641..305df5436e36 100644
--- a/app-emulation/libvirt/libvirt-6.1.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-6.1.0-r1.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	dtrace? ( dev-util/systemtap )
 	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	fuse? ( sys-fs/fuse:0= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
diff --git a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild
index 8079bd8549bb..422f22851ddf 100644
--- a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	dtrace? ( dev-util/systemtap )
 	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	fuse? ( sys-fs/fuse:0= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 0f0e3da1713f..a761557096f1 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	dtrace? ( dev-util/systemtap )
 	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	fuse? ( sys-fs/fuse:0= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 4e2a35e5aaad..a376ad630ef8 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,3 +1,6 @@
+AUX protontricks-1.4.1_no-setuptools-scm.patch 1291 BLAKE2B 8d97cc8ab7d7dcdba72a3245d7bbd6965d0e0da1f22e290babe6a967057c0ddd6ba85920799f3fa85de4e395f29ea6362472380d3888f2a59bd7c1c167151337 SHA512 730180ce050a81ad42680bb884e3b86b4cc7c2d0efadc07f3a0708f55ab0158b8257e3528ce748d4be830d728e9a238c6d5deef15bc2c926b13ce1c7a1f9a4f2
+DIST protontricks-1.4.1.gh.tar.gz 40029 BLAKE2B 3937f69ad1113c0a368117db38cf8bf1b66feea5cc7c509eaee2f7adabdeea724368baa15f51134a5a9749171a34f439878bfda3fc6b813caba11faf7be76373 SHA512 96d4b3aa5b1ca8f7f9bad0859f5984eb29a0bed01f420d108e537deef0436af314e73fcfaccfd58b5b1dc912698404bd4b0157e69ab6a055d65eb3701a60d00b
 DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9
-EBUILD protontricks-1.4.1.ebuild 1382 BLAKE2B 24e2b8329ce804f6ad8ae72aa3eddec70c0a2f935efb9925d607a7d6fd5186a3fe52dcb493338f75cdebea3edca2cb24611df8a61b51a770bc2d2917d8c35423 SHA512 5fea56aa3d51cdc84f8d6a99f34f960bc0bc2d73b51076a12e9b11a01693ac13058c066191080585a8ce2206bffb93a46d4a61521b9e7f50250eb8ea38f255ba
+EBUILD protontricks-1.4.1-r1.ebuild 1456 BLAKE2B 09599e44b0fb23daf393dcb82ca79183652610588daaa0487f3830c81511008c6ff90aec6ce533e4b3260c8b6a943c7f7d4497ed9943286ab9ae0e90ca28b43b SHA512 89d288f7bf374b68412a611562efb09c95ddc298e988f955f2361d1ad88f7c170e285fdf1857314c800c43f2d7912b99ff24075e379ab709582431c429608cb0
+EBUILD protontricks-1.4.1.ebuild 1415 BLAKE2B fd3e09407cfac634bc86a26df6d107ecd07abbfd097ff74a2ea7baaeba40cd8db95460d7b37004b4e54a79ec99c46b3c1ccd162e7d40d4c8ff89b8370b28c3aa SHA512 74bc259a1c1ec202540a36a3d402c1dd71d3350ed9c2c048390c501e4e7c84fd83c7c259a2481d70f83d211821097a560460bb530b96fd0db1fd6b01427353ba
 MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
diff --git a/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch b/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch
new file mode 100644
index 000000000000..fac3ed813d4e
--- /dev/null
+++ b/app-emulation/protontricks/files/protontricks-1.4.1_no-setuptools-scm.patch
@@ -0,0 +1,36 @@
+Since version 1.4.1 upstream has used setuptools-scm to determine the
+current version number. Unfortunately the package in question does not
+support GitHub release archives, using GitHub VCS snapshots would require
+retrieving and updating commit hashes corresponding to release tags, and
+PyPI tarballs do not contain tests. setuptools_scm_git_archive does not
+help because it requires extra files to be included in the repository,
+which upstream has not done.
+
+Seeing as we already know the version number, bypass setuptools_scm
+altogether and create the version file ourselves. For obvious reasons the
+latter cannot be done with a patch alone - have to call sed in src_prepare.
+
+--- a/setup.py
++++ b/setup.py
+@@ -16,9 +16,6 @@
+ 
+ setup(
+     name="protontricks",
+-    use_scm_version={
+-        "write_to": "src/protontricks/_version.py"
+-    },
+     description=DESCRIPTION,
+     long_description=LONG_DESCRIPTION,
+     author=AUTHOR,
+@@ -28,7 +25,6 @@
+     packages=["protontricks"],
+     package_data={"": ["LICENSE"]},
+     package_dir={"protontricks": "src/protontricks"},
+-    setup_requires=["setuptools_scm"],
+     install_requires=["vdf>=2.4"],
+     entry_points={
+         "console_scripts": [
+--- /dev/null
++++ b/src/protontricks/_version.py
+@@ -0,0 +1 @@
++version = '@VERSION@'
diff --git a/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild b/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..d17ef1b45996
--- /dev/null
+++ b/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
+HOMEPAGE="https://github.com/Matoking/protontricks"
+# Will remove the .gh bit come next version bump
+SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gui"
+
+RDEPEND="app-emulation/winetricks
+	$(python_gen_cond_dep '
+		dev-python/vdf[${PYTHON_USEDEP}]
+	')
+	gui? ( gnome-extra/zenity
+		|| (
+			app-emulation/winetricks[gtk]
+			app-emulation/winetricks[kde]
+		)
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1_no-setuptools-scm.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i -e "s/@VERSION@/${PV}/" "${S}"/src/${PN}/_version.py || die
+}
+
+pkg_postinst() {
+	elog
+
+	if ! use gui; then
+		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+		ewarn
+	fi
+
+	elog "Protontricks can only find games for which a Proton prefix already exists."
+	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+	elog
+}
diff --git a/app-emulation/protontricks/protontricks-1.4.1.ebuild b/app-emulation/protontricks/protontricks-1.4.1.ebuild
index 82293afad32a..cd8f8b2402a3 100644
--- a/app-emulation/protontricks/protontricks-1.4.1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.4.1.ebuild
@@ -15,11 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"
 
-BDEPEND="${PYTHON_DEPS}
-	dev-python/setuptools_scm"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	')"
 RDEPEND="${PYTHON_DEPS}
 	app-emulation/winetricks
 	$(python_gen_cond_dep '
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 9efceac0a8e6..88769010af55 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -4,11 +4,12 @@ AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a61
 AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e
 AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
+AUX qemu-guest-agent-4.2.0-fix-shutdown.patch 515 BLAKE2B b70f9f67464b91042ced22a2e3e9712c62d51d5f7bb2a6e1579f44efbf877a0e4accf1b6af0e7f87cedc05bc3059ff5318524f9d00e7c513147b4d24348d6724 SHA512 d286c115f7be53f5de35068c6f2925323dde7f034f32c9e993929111591068236e21c9d85b1e9b727077f38a773b978b71a6a851dd1ff8f3b4a9d32b9b9f333a
 AUX qemu-guest-agent-4.2.0-sysmacros.patch 367 BLAKE2B c52061d00b354917f701dadd37218f8e61d5a2e245ba3908f054891420c7626a8df7ecd0329edf1d11246d38e5591cb4530d63969134a34a5065c5ef041004b4 SHA512 41cb67cb02cf5a8eb5a5b929e2a6adcb6dfe376d6ea512d404edf18d0ca85fbec93140f83ee5d8f4980095fc46040cfd27b22f378cc61dcd6e147badd8b1a045
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
-EBUILD qemu-guest-agent-3.1.0.ebuild 1717 BLAKE2B 873d1d238f306636907e39ebd90e9029ceb74cb2219b8ba7fb844da28abafa72e9d8e2065690c5ac6a1890fdf8414600f354295dadbd37af07b29e3dba048d62 SHA512 bee6c955a0eb63de22cd54fa6c15bbe4002f462453933cd53e70853be2c8106ff60e5217733f79c6bc6e786e04b6a24e64f8514877323f59b0f02a59299bd44f
-EBUILD qemu-guest-agent-4.0.0.ebuild 1717 BLAKE2B 873d1d238f306636907e39ebd90e9029ceb74cb2219b8ba7fb844da28abafa72e9d8e2065690c5ac6a1890fdf8414600f354295dadbd37af07b29e3dba048d62 SHA512 bee6c955a0eb63de22cd54fa6c15bbe4002f462453933cd53e70853be2c8106ff60e5217733f79c6bc6e786e04b6a24e64f8514877323f59b0f02a59299bd44f
-EBUILD qemu-guest-agent-4.2.0.ebuild 1719 BLAKE2B 625c51cedfdd48036d1f703a72256748c902bd335b85ed9af28df520cc5858655ab8b2e09aa5eae795258b8365f7e982f2c8047e70453a8a33269d5cbf550712 SHA512 f8d0177c2ddbb78a5380b2a57ae67c47976ee335fb9c7ebe0a77beb1cecc01e79455d79a5d8c3522ca97720d85062c0117a051569e172a8c358abaf6c40732cb
+EBUILD qemu-guest-agent-3.1.0.ebuild 1724 BLAKE2B e8bc0ef4afe0a500816c317e405e937fa6fdd3bcc4e7315903a5333be428d17d1627ef8dd20ee9314ec9aa29ab11f87280407f84242222bc3dec852723527fa8 SHA512 69be0c816457a38030c24f1852975ef203276daf8a54069468acb00d61440052679bc01046bf14495da05db6dfe79d2addd2d813e45f96a686bf46d8ad02a8d6
+EBUILD qemu-guest-agent-4.0.0.ebuild 1724 BLAKE2B e8bc0ef4afe0a500816c317e405e937fa6fdd3bcc4e7315903a5333be428d17d1627ef8dd20ee9314ec9aa29ab11f87280407f84242222bc3dec852723527fa8 SHA512 69be0c816457a38030c24f1852975ef203276daf8a54069468acb00d61440052679bc01046bf14495da05db6dfe79d2addd2d813e45f96a686bf46d8ad02a8d6
+EBUILD qemu-guest-agent-4.2.0-r1.ebuild 1778 BLAKE2B 7c4d7f058efcdbb4e3c047babe19602c74e2242f0d6954d630b89f917d6e0fe9c7e2c44ac71018c3ebf756a5078f51aa2e386f7e41b81333638f4ecdd10eeb50 SHA512 ecbe35457a6f0d4b15c323c68f620aeeff1b9586412c18b18b3f06cf0f7a541e5344fa540e087f295121446130f29381042d4e5c5d41132f5e02fbab13f3b986
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch
new file mode 100644
index 000000000000..f69781694f1d
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch
@@ -0,0 +1,11 @@
+--- qemu-4.2.0/qga/commands-posix.c.orig	2020-03-23 11:15:05.972610989 +0300
++++ qemu-4.2.0/qga/commands-posix.c	2020-03-23 11:15:39.676015087 +0300
+@@ -108,7 +108,7 @@
+         reopen_fd_to_null(1);
+         reopen_fd_to_null(2);
+ 
+-        execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
++        execle("/sbin/shutdown", "shutdown", "-h", "now", shutdown_flag, "+0",
+                "hypervisor initiated shutdown", (char*)NULL, environ);
+         _exit(EXIT_FAILURE);
+     } else if (pid < 0) {
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
index 9f59a9fcd2f8..bef260b3de02 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_configure() {
-	tc-export AR LD OBJCOPY
+	tc-export AR LD OBJCOPY RANLIB
 
 	local myconf=(
 		--prefix=/usr
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
index 9f59a9fcd2f8..bef260b3de02 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_configure() {
-	tc-export AR LD OBJCOPY
+	tc-export AR LD OBJCOPY RANLIB
 
 	local myconf=(
 		--prefix=/usr
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
index 27782cf6ca5a..ec59e153ca27 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
 
 SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
 HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
@@ -29,10 +29,11 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.0-sysmacros.patch #580924
+	"${FILESDIR}"/${PN}-4.2.0-fix-shutdown.patch #681874
 )
 
 src_configure() {
-	tc-export AR LD OBJCOPY
+	tc-export AR LD OBJCOPY RANLIB
 
 	local myconf=(
 		--prefix=/usr
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index d36a0efc6adb..9be1c90119e7 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,21 +2,14 @@ AUX 65-kvm.rules-r1 120 BLAKE2B a0d95f60e48f80e5f00b3a7ef3b520861fb781868844aff7
 AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b8367659c2896b7c3dd147e978ef6401b280fc3474bc959bee50f65d7525bee8bc04c19bc657ba7e22f SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533
 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab
 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-3.1.0-md-clear-md-no.patch 2690 BLAKE2B fcf6b7599985da60dcdf873e27c832075cd9c766d10ab3784c0f935965276b8c520005a62fc884a35c78942ce225bbd9a67083ef058e03f1a7c0963b816ae7b4 SHA512 bb452d110353bae4878ec030ef5f2f05c73294cbe08e8fc18267f23f922117e7e295302ac65df8008b5db3ff72bcff2e3eefd2da8b9a53868daea321d10958c1
-AUX qemu-4.0.0-fix_infiniband_include.patch 338 BLAKE2B 9c85e27ca7e99d5600247ce788edcf30b74650012c06f3b68ec395f55ca7cdfac7f24679077b06ff7ba37fc1b0a8fce281838709cfae9d20c9ee89d9dbd68da9 SHA512 c8cebaa40ca46f2a78131d4ea1951304cc39b39c3d9ec37f4be41906ce6dee303f5b21e66e6716ac4ad20ed4bf3dc06709e7db95113f2c7abd0036e0e0cc722d
-AUX qemu-4.0.0-linux-headers-5.2.patch 11360 BLAKE2B 6299f25424044df02e892f10d735e07af35de7ec2b4a15bcf57ec03db8956406bfe690d57f2265b5ae5c63902e4ac77614c11286ec5461e7a6da3d7237030557 SHA512 2da8020655e8b4d269cdbeaa2134cbbaee85efe30d5b7ef1180f5e74a5b8141211c781be3a229ae475fb9e9b5b1022c378768c73a5acbf42993eaa6f93fe370d
 AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a81d1de7705f3b856656ec71cc0a2a29626e94918b3cc23b32e47c8073b77b62b498e71c3e956549e25ee5f4da1a8ac9cf SHA512 de48a7d663bd78051ed8a1f62d8b0b8e3bfe58d8a0001daf12518dbd087be3154e766be11c607485e7dd851b08d5675c4fb2a2fe5cf18f3b900164a4d93eab10
-AUX qemu-4.0.0-pc-q35-4.0.patch 5020 BLAKE2B ec3ad8fbf9ee1ce54109a81e913b97daebf347b2fc2217585e68741c3f77cae1272d7b721b59d7595b51d99eadbe7e26c47bcd46c96361a7f0df345fe5d6bcfb SHA512 3621525724a587f9aa1899b7b5c2130c27fca1b9a0e907e3fe1927a79a5d59f7597491538d6079822c52dd7bed41dd3cf6233a1be8472f3ed487e43447a74c7d
-AUX qemu-4.0.0-sanitize-interp_info.patch 930 BLAKE2B d555dedc493cfa1cf888cfa7ce2a4a7811f3fd12615fa5177f82c421ddd82c2d7ffcf2e5c28ca383aac1fff35d03cae6b4b6c5129c694d9b3986819aa1e12962 SHA512 7783acf1172c4fd935c2b8f5bd76e97cea6bbb3ee33a21b23a17f23933f6053b3a933f378c6eae184c2362cb090b6b2c1966f79f1f130cf7344205ef3df0178d
-AUX qemu-4.0.0-xkbcommon.patch 1107 BLAKE2B 865f6578677199b7a78fb285548982c47b1ab624eed28a474d9eb66af3bb266748f045389fdacf945f40ce58352f5041bcaa3ec1966e3f39591d2138455c6435 SHA512 0048751b6883e206b5c486c418e0b2b71f09dfe8dd156b9ac7b331bce1ac5ef9cd7d2e605da144c3983b7a74a8b2f1bb2c9eef991197ee4bfea014af53f54427
-AUX qemu-4.2.0-CVE-2020-11102.patch 4924 BLAKE2B 59def39ea9088447bd033870be36e0b3e79f1b581a553118e06279f2ca322a86398ef7b3f31bbfaa210b4a767bb370fb828c1da9451196347ee1f5c1d89f19a9 SHA512 31bb5772d493506266bcbff5fa3fbaea32569fb4f8fe7c569306b9eccd7b62d0f00592e82787ea5c06a20dcc73c5a0c14ce62e402393ebf4cfe1d838a2c7aefb
+AUX qemu-4.2.0-ati-vga-crash.patch 4213 BLAKE2B bd67a7fa5cc782360e42dba38be05d973a18ee0a281a1d6623b836769f6d3e0e7de87111ab5b20ddc4d6b3e069e0dd9dc9c6a4fc56fc076562b69d89f4600936 SHA512 6075eed84d4cd0252fd8c82316c0b47c56e3deef5852acf5677a9e091610102c1d790ea1da4c7b6595f84bf1362e824f4ffe06675d4dc0b96da4c6401b4d0cc0
 AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15b82bb4e340f3ddb8471f47e854276ff33adee7bd5682ecb797efdb048e9d028d954a064712d1e817e1eb6e26 SHA512 5bfb8f0e739d7bb260b5b5b0a2d28f30b97833b8037227c511f55c9bd9502241c891e7e3780e750598ccfd7fb01615254f1c7f6634787fec67539a61a217e18d
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
-DIST qemu-4.2.0-patches-r1.tar.xz 14552 BLAKE2B e8832ce5b7ccda02dcd63fa60a458322a36ba754c8bc682839de4ee33cf21a83cde434bdc062916d3c83e81026b68ebf2fbe099dc6c54c191875f830d95c63ae SHA512 7495e4c9ca80fd25a1bc8244b384f88f3bc6d7190e2840b1614e3bc6fd51938e42792c6a4dbdb2d400a45532e558814462647f35d5ab21e175bec84868a4161d
+DIST qemu-4.2.0-patches-r2.tar.xz 17868 BLAKE2B 3783d0f923ded66cce1195248981c83bbaf8b7ad2a270207e92e60b4d05d4787cd9324649c113a4616c2a9ddcef99841264f19915615b7a0a24dac9febed48ba SHA512 556f1c595a35ee4279b2d0890d90e48cd43d9d641ccca495e2494f62ab48dfc000dbe23718276271ced3d4b7680c814f8f8846195089ff56186f618063a83b48
 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
-EBUILD qemu-4.2.0-r2.ebuild 24433 BLAKE2B 76aa9bfba93a69410762da8228a66bdf768031e3636fae9b7dd3f9393f6ab35baccf2840900f5eaf5c751dbcdcbbbd6a02de9eebf41d8b8b69d5adb055f09836 SHA512 3cf46d297948865e72d19190ad09e6eb38a9413c3c9cddf68fb5d54db6dad2c8afeaac85ef26178dcbd69b1f2b38d204b52214b2a87edd2d437acb9330f97adb
-EBUILD qemu-4.2.0-r3.ebuild 24588 BLAKE2B 62d1b2d813eba84c499fa72746006958294a73ac940496b1c8606b77f17e19e551cfea8e5af5e5e389ca1153ede8a6a73cddb10b7971ce3ec353e38d882d309e SHA512 298f54434c03ec9c32dfd6b1c677d5fe876ca4e605d7e236698c3d0a3199981119f17b6c5e2a636914893c49573c09a69c25040e58ed18048ead72d6bd9195e1
-EBUILD qemu-9999.ebuild 24336 BLAKE2B 2c37e9f9dde0a942daf432579c4f0a47c5373dc3f640c139f3c96936aa92150274aa3d7fe37bf795a166c40e3abead8874eb1e7666ed6001183485bb67402e79 SHA512 5888ca6188a32b39e2dfad3a4c10a8356cbf32502522d244eb33ece87f348e3f546b15d5c413d6b281760f87150ce8bc9b86cc49e233d5798c2e8d7e96c47203
+EBUILD qemu-4.2.0-r5.ebuild 24410 BLAKE2B 62165db1afd588b237dbcfd6383e140d4c3b82336a0dd921e7a0249ec2400d82c721a85036ccfb5d8ad97c0f4659f17101e93aa673b4e6626b188a784e2d8857 SHA512 7e5e226646041d42cf34721c837a0bbdf14c14cf6fa8cf181e5c4af85cb20c5fc4ee29524133e09024da4fc7ae6d3626a6d17da205b3161de2f4d3ca8010472a
+EBUILD qemu-4.2.0-r6.ebuild 24467 BLAKE2B 850484ea855dc4939329b19e46414844b2b0a505ba4c4190377f47197681f3d1d249074573f388de759dc9340ff0bfdc6e2a56df8c1eefca41dd02cdeffccb74 SHA512 f18d944c2683ef1d93f017cc8025bd51dd7ef561d7f1ad8c0176b146bbd23d3a3b3f8d4e155eee1865d940b707179febe6ee37ae04e8cd16373875bd504119d3
+EBUILD qemu-9999.ebuild 24313 BLAKE2B ef0e66599c42688b16d3576e799681004acc1f83709a0307fb12b535bbb9a79a95c3343a5261f0bb14e1cf83844ccf9223c236661d5ecb459845585f75362a40 SHA512 4783f436324c02d1b58cb6f6a7d144d7a52eb3667600f28b32830d63eca43e2500361f4765010a2ee5f4d32335f33bd51637051780da698e77e3d11c9d0d1fab
 MISC metadata.xml 4379 BLAKE2B 6608d9d9926e801dd84c9b8dc8f177fea1ee1896754c717cd0189aa2399e85abedd67d92f4fa0b35a84a3d86fa2871232098b6380caf408ace7a6dc96968228d SHA512 ff90794397e5e10df98bccc55508d5b5a963c0a14ee506fb2130499660e9b64aee6fcdba41906103a4f6e77a27f228b7cd34835b7035ce49bd6a8cbf2f25242e
diff --git a/app-emulation/qemu/files/qemu-2.5.0-sysmacros.patch b/app-emulation/qemu/files/qemu-2.5.0-sysmacros.patch
deleted file mode 100644
index f2e766dc1c35..000000000000
--- a/app-emulation/qemu/files/qemu-2.5.0-sysmacros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Linux C libs are moving away from implicit header pollution with sys/types.h
-
---- a/include/qemu/osdep.h
-+++ b/include/qemu/osdep.h
-@@ -78,6 +78,10 @@ extern int daemon(int, int);
- #include <assert.h>
- #include <signal.h>
- 
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
-+
- #ifdef __OpenBSD__
- #include <sys/signal.h>
- #endif
diff --git a/app-emulation/qemu/files/qemu-3.1.0-md-clear-md-no.patch b/app-emulation/qemu/files/qemu-3.1.0-md-clear-md-no.patch
deleted file mode 100644
index a7b3e8cb8f20..000000000000
--- a/app-emulation/qemu/files/qemu-3.1.0-md-clear-md-no.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0fb766134bd97ead71646e13349f93769e536ed9 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@43-1.org>
-Date: Fri, 17 May 2019 02:21:10 -0500
-Subject: [PATCH] Define md-clear bit, expose md-no CPUID
-
-Fixes for CVE-2018-121{26|27|30}, CVE-2019-11091
-
-See related fixes for Ubuntu:
-  https://launchpad.net/ubuntu/+source/qemu/1:3.1+dfsg-2ubuntu3.1
----
- target/i386/cpu.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index d6bb57d2..331a364a 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -1076,7 +1076,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
-         .feat_names = {
-             NULL, NULL, "avx512-4vnniw", "avx512-4fmaps",
-             NULL, NULL, NULL, NULL,
--            NULL, NULL, NULL, NULL,
-+            NULL, NULL, "md-clear", NULL,
-             NULL, NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-@@ -1183,7 +1183,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
-         .type = MSR_FEATURE_WORD,
-         .feat_names = {
-             "rdctl-no", "ibrs-all", "rsba", "skip-l1dfl-vmentry",
--            "ssb-no", NULL, NULL, NULL,
-+            "ssb-no", "mds-no", NULL, NULL,
-             NULL, NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index 83fb5225..d0bab4d7 100644
---- a/target/i386/cpu.h
-+++ b/target/i386/cpu.h
-@@ -694,6 +694,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];
- 
- #define CPUID_7_0_EDX_AVX512_4VNNIW (1U << 2) /* AVX512 Neural Network Instructions */
- #define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) /* AVX512 Multiply Accumulation Single Precision */
-+#define CPUID_7_0_EDX_MD_CLEAR      (1U << 10) /* Microarchitectural Data Clear */
- #define CPUID_7_0_EDX_SPEC_CTRL     (1U << 26) /* Speculation Control */
- #define CPUID_7_0_EDX_ARCH_CAPABILITIES (1U << 29)  /*Arch Capabilities*/
- #define CPUID_7_0_EDX_SPEC_CTRL_SSBD  (1U << 31) /* Speculative Store Bypass Disable */
-diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
-index 4d957fe8..b453552f 100644
---- a/target/i386/hvf/x86_cpuid.c
-+++ b/target/i386/hvf/x86_cpuid.c
-@@ -90,7 +90,8 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
-             }
- 
-             ecx &= CPUID_7_0_ECX_AVX512BMI | CPUID_7_0_ECX_AVX512_VPOPCNTDQ;
--            edx &= CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4FMAPS;
-+            edx &= CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4FMAPS | \
-+                   CPUID_7_0_EDX_MD_CLEAR;
-         } else {
-             ebx = 0;
-             ecx = 0;
diff --git a/app-emulation/qemu/files/qemu-4.0.0-fix_infiniband_include.patch b/app-emulation/qemu/files/qemu-4.0.0-fix_infiniband_include.patch
deleted file mode 100644
index 2778cc8f4f2e..000000000000
--- a/app-emulation/qemu/files/qemu-4.0.0-fix_infiniband_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c
-index d1660b64..86715bfd 100644
---- a/hw/rdma/rdma_backend.c
-+++ b/hw/rdma/rdma_backend.c
-@@ -21,7 +21,6 @@
- #include "qapi/qapi-events-rdma.h"
- 
- #include <infiniband/verbs.h>
--#include <infiniband/umad_types.h>
- #include <infiniband/umad.h>
- #include <rdma/rdma_user_cm.h>
- 
diff --git a/app-emulation/qemu/files/qemu-4.0.0-linux-headers-5.2.patch b/app-emulation/qemu/files/qemu-4.0.0-linux-headers-5.2.patch
deleted file mode 100644
index 43be8629dfa8..000000000000
--- a/app-emulation/qemu/files/qemu-4.0.0-linux-headers-5.2.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-From 6d5d5dde9adb5acb32e6b8e3dfbf47fff0f308d2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Thu, 18 Jul 2019 15:06:41 +0200
-Subject: [PATCH] linux-user: fix to handle variably sized SIOCGSTAMP with new
- kernels
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-The SIOCGSTAMP symbol was previously defined in the
-asm-generic/sockios.h header file. QEMU sees that header
-indirectly via sys/socket.h
-
-In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115
-the asm-generic/sockios.h header no longer defines SIOCGSTAMP.
-Instead it provides only SIOCGSTAMP_OLD, which only uses a
-32-bit time_t on 32-bit architectures.
-
-The linux/sockios.h header then defines SIOCGSTAMP using
-either SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. If
-SIOCGSTAMP_NEW is used, then the tv_sec field is 64-bit even
-on 32-bit architectures
-
-To cope with this we must now convert the old and new type from
-the target to the host one.
-
-Signed-off-by: Daniel P. BerrangÃ© <berrange@redhat.com>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
-Reviewed-by: Arnd Bergmann <arnd@arndb.de>
-Message-Id: <20190718130641.15294-1-laurent@vivier.eu>
-Signed-off-by: Laurent Vivier <laurent@vivier.eu>
----
- linux-user/ioctls.h        |  21 ++++++-
- linux-user/syscall.c       | 140 ++++++++++++++++++++++++++++++++++++---------
- linux-user/syscall_defs.h  |  30 +++++++++-
- linux-user/syscall_types.h |   6 --
- 4 files changed, 159 insertions(+), 38 deletions(-)
-
-diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index ae895162..e6a27ad9 100644
---- a/linux-user/ioctls.h
-+++ b/linux-user/ioctls.h
-@@ -219,8 +219,25 @@
-   IOCTL(SIOCGRARP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_arpreq)))
-   IOCTL(SIOCGIWNAME, IOC_W | IOC_R, MK_PTR(MK_STRUCT(STRUCT_char_ifreq)))
-   IOCTL(SIOCGPGRP, IOC_R, MK_PTR(TYPE_INT)) /* pid_t */
--  IOCTL(SIOCGSTAMP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timeval)))
--  IOCTL(SIOCGSTAMPNS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timespec)))
-+
-+  /*
-+   * We can't use IOCTL_SPECIAL() because it will set
-+   * host_cmd to XXX_OLD and XXX_NEW and these macros
-+   * are not defined with kernel prior to 5.2.
-+   * We must set host_cmd to the same value as in target_cmd
-+   * otherwise the consistency check in syscall_init()
-+   * will trigger an error.
-+   * host_cmd is ignored by the do_ioctl_XXX() helpers.
-+   * FIXME: create a macro to define this kind of entry
-+   */
-+  { TARGET_SIOCGSTAMP_OLD, TARGET_SIOCGSTAMP_OLD,
-+    "SIOCGSTAMP_OLD", IOC_R, do_ioctl_SIOCGSTAMP },
-+  { TARGET_SIOCGSTAMPNS_OLD, TARGET_SIOCGSTAMPNS_OLD,
-+    "SIOCGSTAMPNS_OLD", IOC_R, do_ioctl_SIOCGSTAMPNS },
-+  { TARGET_SIOCGSTAMP_NEW, TARGET_SIOCGSTAMP_NEW,
-+    "SIOCGSTAMP_NEW", IOC_R, do_ioctl_SIOCGSTAMP },
-+  { TARGET_SIOCGSTAMPNS_NEW, TARGET_SIOCGSTAMPNS_NEW,
-+    "SIOCGSTAMPNS_NEW", IOC_R, do_ioctl_SIOCGSTAMPNS },
- 
-   IOCTL(RNDGETENTCNT, IOC_R, MK_PTR(TYPE_INT))
-   IOCTL(RNDADDTOENTCNT, IOC_W, MK_PTR(TYPE_INT))
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 96cd4bf8..6df480e1 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -37,6 +37,7 @@
- #include <sched.h>
- #include <sys/timex.h>
- #include <sys/socket.h>
-+#include <linux/sockios.h>
- #include <sys/un.h>
- #include <sys/uio.h>
- #include <poll.h>
-@@ -1139,8 +1140,9 @@ static inline abi_long copy_from_user_timeval(struct timeval *tv,
- {
-     struct target_timeval *target_tv;
- 
--    if (!lock_user_struct(VERIFY_READ, target_tv, target_tv_addr, 1))
-+    if (!lock_user_struct(VERIFY_READ, target_tv, target_tv_addr, 1)) {
-         return -TARGET_EFAULT;
-+    }
- 
-     __get_user(tv->tv_sec, &target_tv->tv_sec);
-     __get_user(tv->tv_usec, &target_tv->tv_usec);
-@@ -1155,8 +1157,26 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr,
- {
-     struct target_timeval *target_tv;
- 
--    if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0))
-+    if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) {
-+        return -TARGET_EFAULT;
-+    }
-+
-+    __put_user(tv->tv_sec, &target_tv->tv_sec);
-+    __put_user(tv->tv_usec, &target_tv->tv_usec);
-+
-+    unlock_user_struct(target_tv, target_tv_addr, 1);
-+
-+    return 0;
-+}
-+
-+static inline abi_long copy_to_user_timeval64(abi_ulong target_tv_addr,
-+                                             const struct timeval *tv)
-+{
-+    struct target__kernel_sock_timeval *target_tv;
-+
-+    if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) {
-         return -TARGET_EFAULT;
-+    }
- 
-     __put_user(tv->tv_sec, &target_tv->tv_sec);
-     __put_user(tv->tv_usec, &target_tv->tv_usec);
-@@ -1166,6 +1186,48 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr,
-     return 0;
- }
- 
-+static inline abi_long target_to_host_timespec(struct timespec *host_ts,
-+                                               abi_ulong target_addr)
-+{
-+    struct target_timespec *target_ts;
-+
-+    if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1)) {
-+        return -TARGET_EFAULT;
-+    }
-+    __get_user(host_ts->tv_sec, &target_ts->tv_sec);
-+    __get_user(host_ts->tv_nsec, &target_ts->tv_nsec);
-+    unlock_user_struct(target_ts, target_addr, 0);
-+    return 0;
-+}
-+
-+static inline abi_long host_to_target_timespec(abi_ulong target_addr,
-+                                               struct timespec *host_ts)
-+{
-+    struct target_timespec *target_ts;
-+
-+    if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) {
-+        return -TARGET_EFAULT;
-+    }
-+    __put_user(host_ts->tv_sec, &target_ts->tv_sec);
-+    __put_user(host_ts->tv_nsec, &target_ts->tv_nsec);
-+    unlock_user_struct(target_ts, target_addr, 1);
-+    return 0;
-+}
-+
-+static inline abi_long host_to_target_timespec64(abi_ulong target_addr,
-+                                                 struct timespec *host_ts)
-+{
-+    struct target__kernel_timespec *target_ts;
-+
-+    if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) {
-+        return -TARGET_EFAULT;
-+    }
-+    __put_user(host_ts->tv_sec, &target_ts->tv_sec);
-+    __put_user(host_ts->tv_nsec, &target_ts->tv_nsec);
-+    unlock_user_struct(target_ts, target_addr, 1);
-+    return 0;
-+}
-+
- static inline abi_long copy_from_user_timezone(struct timezone *tz,
-                                                abi_ulong target_tz_addr)
- {
-@@ -4790,6 +4852,54 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,
-     return get_errno(safe_ioctl(fd, ie->host_cmd, sig));
- }
- 
-+static abi_long do_ioctl_SIOCGSTAMP(const IOCTLEntry *ie, uint8_t *buf_temp,
-+                                    int fd, int cmd, abi_long arg)
-+{
-+    struct timeval tv;
-+    abi_long ret;
-+
-+    ret = get_errno(safe_ioctl(fd, SIOCGSTAMP, &tv));
-+    if (is_error(ret)) {
-+        return ret;
-+    }
-+
-+    if (cmd == (int)TARGET_SIOCGSTAMP_OLD) {
-+        if (copy_to_user_timeval(arg, &tv)) {
-+            return -TARGET_EFAULT;
-+        }
-+    } else {
-+        if (copy_to_user_timeval64(arg, &tv)) {
-+            return -TARGET_EFAULT;
-+        }
-+    }
-+
-+    return ret;
-+}
-+
-+static abi_long do_ioctl_SIOCGSTAMPNS(const IOCTLEntry *ie, uint8_t *buf_temp,
-+                                      int fd, int cmd, abi_long arg)
-+{
-+    struct timespec ts;
-+    abi_long ret;
-+
-+    ret = get_errno(safe_ioctl(fd, SIOCGSTAMPNS, &ts));
-+    if (is_error(ret)) {
-+        return ret;
-+    }
-+
-+    if (cmd == (int)TARGET_SIOCGSTAMPNS_OLD) {
-+        if (host_to_target_timespec(arg, &ts)) {
-+            return -TARGET_EFAULT;
-+        }
-+    } else{
-+        if (host_to_target_timespec64(arg, &ts)) {
-+            return -TARGET_EFAULT;
-+        }
-+    }
-+
-+    return ret;
-+}
-+
- #ifdef TIOCGPTPEER
- static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry *ie, uint8_t *buf_temp,
-                                      int fd, int cmd, abi_long arg)
-@@ -6160,32 +6270,6 @@ static inline abi_long target_ftruncate64(void *cpu_env, abi_long arg1,
- }
- #endif
- 
--static inline abi_long target_to_host_timespec(struct timespec *host_ts,
--                                               abi_ulong target_addr)
--{
--    struct target_timespec *target_ts;
--
--    if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1))
--        return -TARGET_EFAULT;
--    __get_user(host_ts->tv_sec, &target_ts->tv_sec);
--    __get_user(host_ts->tv_nsec, &target_ts->tv_nsec);
--    unlock_user_struct(target_ts, target_addr, 0);
--    return 0;
--}
--
--static inline abi_long host_to_target_timespec(abi_ulong target_addr,
--                                               struct timespec *host_ts)
--{
--    struct target_timespec *target_ts;
--
--    if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0))
--        return -TARGET_EFAULT;
--    __put_user(host_ts->tv_sec, &target_ts->tv_sec);
--    __put_user(host_ts->tv_nsec, &target_ts->tv_nsec);
--    unlock_user_struct(target_ts, target_addr, 1);
--    return 0;
--}
--
- static inline abi_long target_to_host_itimerspec(struct itimerspec *host_itspec,
-                                                  abi_ulong target_addr)
- {
-diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index 12c84071..cfb3eeec 100644
---- a/linux-user/syscall_defs.h
-+++ b/linux-user/syscall_defs.h
-@@ -208,16 +208,34 @@ struct target_linger {
-     abi_int l_linger;       /* How long to linger for       */
- };
- 
-+#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
-+struct target_timeval {
-+    abi_long tv_sec;
-+    abi_int tv_usec;
-+};
-+#define target__kernel_sock_timeval target_timeval
-+#else
- struct target_timeval {
-     abi_long tv_sec;
-     abi_long tv_usec;
- };
- 
-+struct target__kernel_sock_timeval {
-+    abi_llong tv_sec;
-+    abi_llong tv_usec;
-+};
-+#endif
-+
- struct target_timespec {
-     abi_long tv_sec;
-     abi_long tv_nsec;
- };
- 
-+struct target__kernel_timespec {
-+    abi_llong tv_sec;
-+    abi_llong tv_nsec;
-+};
-+
- struct target_timezone {
-     abi_int tz_minuteswest;
-     abi_int tz_dsttime;
-@@ -743,8 +761,17 @@ struct target_pollfd {
- #define TARGET_SIOCATMARK      0x8905
- #define TARGET_SIOCGPGRP       0x8904
- #endif
--#define TARGET_SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
--#define TARGET_SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-+
-+#if defined(TARGET_SH4)
-+#define TARGET_SIOCGSTAMP_OLD   TARGET_IOR('s', 100, struct target_timeval)
-+#define TARGET_SIOCGSTAMPNS_OLD TARGET_IOR('s', 101, struct target_timespec)
-+#else
-+#define TARGET_SIOCGSTAMP_OLD   0x8906
-+#define TARGET_SIOCGSTAMPNS_OLD 0x8907
-+#endif
-+
-+#define TARGET_SIOCGSTAMP_NEW   TARGET_IOR(0x89, 0x06, abi_llong[2])
-+#define TARGET_SIOCGSTAMPNS_NEW TARGET_IOR(0x89, 0x07, abi_llong[2])
- 
- /* Networking ioctls */
- #define TARGET_SIOCADDRT       0x890B          /* add routing table entry */
-diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
-index b98a23b0..4e369838 100644
---- a/linux-user/syscall_types.h
-+++ b/linux-user/syscall_types.h
-@@ -14,12 +14,6 @@ STRUCT(serial_icounter_struct,
- STRUCT(sockaddr,
-        TYPE_SHORT, MK_ARRAY(TYPE_CHAR, 14))
- 
--STRUCT(timeval,
--       MK_ARRAY(TYPE_LONG, 2))
--
--STRUCT(timespec,
--       MK_ARRAY(TYPE_LONG, 2))
--
- STRUCT(rtentry,
-        TYPE_ULONG, MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr),
-        TYPE_SHORT, TYPE_SHORT, TYPE_ULONG, TYPE_PTRVOID, TYPE_SHORT, TYPE_PTRVOID,
diff --git a/app-emulation/qemu/files/qemu-4.0.0-pc-q35-4.0.patch b/app-emulation/qemu/files/qemu-4.0.0-pc-q35-4.0.patch
deleted file mode 100644
index ebabc0c4c294..000000000000
--- a/app-emulation/qemu/files/qemu-4.0.0-pc-q35-4.0.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Backport of QEMU v4.1 commit for stable v4.0.1 release
-
-commit c87759ce876a7a0b17c2bf4f0b964bd51f0ee871
-Author: Alex Williamson <address@hidden>
-Date:   Tue May 14 14:14:41 2019 -0600
-
-    q35: Revert to kernel irqchip
-
-    Commit b2fc91db8447 ("q35: set split kernel irqchip as default") changed
-    the default for the pc-q35-4.0 machine type to use split irqchip, which
-    turned out to have disasterous effects on vfio-pci INTx support.  KVM
-    resampling irqfds are registered for handling these interrupts, but
-    these are non-functional in split irqchip mode.  We can't simply test
-    for split irqchip in QEMU as userspace handling of this interrupt is a
-    significant performance regression versus KVM handling (GeForce GPUs
-    assigned to Windows VMs are non-functional without forcing MSI mode or
-    re-enabling kernel irqchip).
-
-    The resolution is to revert the change in default irqchip mode in the
-    pc-q35-4.1 machine and create a pc-q35-4.0.1 machine for the 4.0-stable
-    branch.  The qemu-q35-4.0 machine type should not be used in vfio-pci
-    configurations for devices requiring legacy INTx support without
-    explicitly modifying the VM configuration to use kernel irqchip.
-
-Link: https://bugs.launchpad.net/qemu/+bug/1826422
-Fixes: b2fc91db8447 ("q35: set split kernel irqchip as default")
-Cc: address@hidden
-Reviewed-by: Peter Xu <address@hidden>
-Signed-off-by: Alex Williamson <address@hidden>
----
-
-Same code as v1, just updating the commit log as a formal backport of
-the merged 4.1 commit.
-
- hw/core/machine.c    |    3 +++
- hw/i386/pc.c         |    3 +++
- hw/i386/pc_q35.c     |   16 ++++++++++++++--
- include/hw/boards.h  |    3 +++
- include/hw/i386/pc.h |    3 +++
- 5 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/hw/core/machine.c b/hw/core/machine.c
-index 743fef28982c..5d046a43e3d2 100644
---- a/hw/core/machine.c
-+++ b/hw/core/machine.c
-@@ -24,6 +24,9 @@
- #include "hw/pci/pci.h"
- #include "hw/mem/nvdimm.h"
- 
-+GlobalProperty hw_compat_4_0[] = {};
-+const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
-+
- GlobalProperty hw_compat_3_1[] = {
-     { "pcie-root-port", "x-speed", "2_5" },
-     { "pcie-root-port", "x-width", "1" },
-diff --git a/hw/i386/pc.c b/hw/i386/pc.c
-index f2c15bf1f2c3..d98b737b8f3b 100644
---- a/hw/i386/pc.c
-+++ b/hw/i386/pc.c
-@@ -115,6 +115,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
- /* Physical Address of PVH entry point read from kernel ELF NOTE */
- static size_t pvh_start_addr;
- 
-+GlobalProperty pc_compat_4_0[] = {};
-+const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
-+
- GlobalProperty pc_compat_3_1[] = {
-     { "intel-iommu", "dma-drain", "off" },
-     { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
-diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
-index 372c6b73bebd..45cc29d1adb7 100644
---- a/hw/i386/pc_q35.c
-+++ b/hw/i386/pc_q35.c
-@@ -357,7 +357,7 @@ static void pc_q35_machine_options(MachineClass *m)
-     m->units_per_default_bus = 1;
-     m->default_machine_opts = "firmware=bios-256k.bin";
-     m->default_display = "std";
--    m->default_kernel_irqchip_split = true;
-+    m->default_kernel_irqchip_split = false;
-     m->no_floppy = 1;
-     machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
-     machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
-@@ -365,12 +365,24 @@ static void pc_q35_machine_options(MachineClass *m)
-     m->max_cpus = 288;
- }
- 
--static void pc_q35_4_0_machine_options(MachineClass *m)
-+static void pc_q35_4_0_1_machine_options(MachineClass *m)
- {
-     pc_q35_machine_options(m);
-     m->alias = "q35";
- }
- 
-+DEFINE_Q35_MACHINE(v4_0_1, "pc-q35-4.0.1", NULL,
-+                   pc_q35_4_0_1_machine_options);
-+
-+static void pc_q35_4_0_machine_options(MachineClass *m)
-+{
-+    pc_q35_4_0_1_machine_options(m);
-+    m->default_kernel_irqchip_split = true;
-+    m->alias = NULL;
-+    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
-+    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
-+}
-+
- DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
-                    pc_q35_4_0_machine_options);
- 
-diff --git a/include/hw/boards.h b/include/hw/boards.h
-index e231860666a1..fe1885cbffa0 100644
---- a/include/hw/boards.h
-+++ b/include/hw/boards.h
-@@ -293,6 +293,9 @@ struct MachineState {
-     } \
-     type_init(machine_initfn##_register_types)
- 
-+extern GlobalProperty hw_compat_4_0[];
-+extern const size_t hw_compat_4_0_len;
-+
- extern GlobalProperty hw_compat_3_1[];
- extern const size_t hw_compat_3_1_len;
- 
-diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
-index ca65ef18afb4..43df7230a22b 100644
---- a/include/hw/i386/pc.h
-+++ b/include/hw/i386/pc.h
-@@ -293,6 +293,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
- int e820_get_num_entries(void);
- bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
- 
-+extern GlobalProperty pc_compat_4_0[];
-+extern const size_t pc_compat_4_0_len;
-+
- extern GlobalProperty pc_compat_3_1[];
- extern const size_t pc_compat_3_1_len;
diff --git a/app-emulation/qemu/files/qemu-4.0.0-sanitize-interp_info.patch b/app-emulation/qemu/files/qemu-4.0.0-sanitize-interp_info.patch
deleted file mode 100644
index 58ff0c788288..000000000000
--- a/app-emulation/qemu/files/qemu-4.0.0-sanitize-interp_info.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-linux-user: Sanitize interp_info and, for mips
-
-Sanitize interp_info structure in load_elf_binary() and, for mips only,
-init its field fp_abi. This fixes appearances of "Unexpected FPU mode"
-message in some MIPS use cases.
-
-Signed-off-by: Daniel Santos <address@hidden>
-Signed-off-by: Aleksandar Markovic <address@hidden>
----
- linux-user/elfload.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/linux-user/elfload.c b/linux-user/elfload.c
-index c1a2602..7f09d57 100644
---- a/linux-user/elfload.c
-+++ b/linux-user/elfload.c
-@@ -2698,6 +2698,11 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info)
-     char *elf_interpreter = NULL;
-     char *scratch;
- 
-+    memset(&interp_info, 0, sizeof(interp_info));
-+#ifdef TARGET_MIPS
-+    interp_info.fp_abi = MIPS_ABI_FP_UNKNOWN;
-+#endif
-+
-     info->start_mmap = (abi_ulong)ELF_START_MMAP;
- 
-     load_elf_image(bprm->filename, bprm->fd, info,
--- 
-2.7.4
-
-
diff --git a/app-emulation/qemu/files/qemu-4.0.0-xkbcommon.patch b/app-emulation/qemu/files/qemu-4.0.0-xkbcommon.patch
deleted file mode 100644
index 3d9a5163ecf5..000000000000
--- a/app-emulation/qemu/files/qemu-4.0.0-xkbcommon.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cef396dc0b11a09ede85b275ed1ceee71b60a4b3 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 14 Sep 2019 15:47:20 +0100
-Subject: [PATCH] configure: Add xkbcommon configure options
-
-This dependency is currently "automagic", which is bad for distributions.
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- configure | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/configure b/configure
-index 30aad233d1..30544f52e6 100755
---- a/configure
-+++ b/configure
-@@ -1521,6 +1521,10 @@ for opt do
-   ;;
-   --disable-libpmem) libpmem=no
-   ;;
-+  --enable-xkbcommon) xkbcommon=yes
-+  ;;
-+  --disable-xkbcommon) xkbcommon=no
-+  ;;
-   *)
-       echo "ERROR: unknown option $opt"
-       echo "Try '$0 --help' for more information"
-@@ -1804,6 +1808,7 @@ disabled with --disable-FEATURE, default is enabled if available:
-   capstone        capstone disassembler support
-   debug-mutex     mutex debugging support
-   libpmem         libpmem support
-+  xkbcommon       xkbcommon support
- 
- NOTE: The object files are built at the place where configure is launched
- EOF
--- 
-2.23.0
-
diff --git a/app-emulation/qemu/files/qemu-4.2.0-CVE-2020-11102.patch b/app-emulation/qemu/files/qemu-4.2.0-CVE-2020-11102.patch
deleted file mode 100644
index 118c81971d83..000000000000
--- a/app-emulation/qemu/files/qemu-4.2.0-CVE-2020-11102.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 8ffb7265af64ec81748335ec8f20e7ab542c3850 Mon Sep 17 00:00:00 2001
-From: Prasad J Pandit <pjp@fedoraproject.org>
-Date: Tue, 24 Mar 2020 22:57:22 +0530
-Subject: [PATCH] net: tulip: check frame size and r/w data length
-
-Tulip network driver while copying tx/rx buffers does not check
-frame size against r/w data length. This may lead to OOB buffer
-access. Add check to avoid it.
-
-Limit iterations over descriptors to avoid potential infinite
-loop issue in tulip_xmit_list_update.
-
-Reported-by: Li Qiang <pangpei.lq@antfin.com>
-Reported-by: Ziming Zhang <ezrakiez@gmail.com>
-Reported-by: Jason Wang <jasowang@redhat.com>
-Tested-by: Li Qiang <liq3ea@gmail.com>
-Reviewed-by: Li Qiang <liq3ea@gmail.com>
-Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
----
- hw/net/tulip.c | 36 +++++++++++++++++++++++++++---------
- 1 file changed, 27 insertions(+), 9 deletions(-)
-
-diff --git a/hw/net/tulip.c b/hw/net/tulip.c
-index cfac2719d3..1295f51d07 100644
---- a/hw/net/tulip.c
-+++ b/hw/net/tulip.c
-@@ -170,6 +170,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
-         } else {
-             len = s->rx_frame_len;
-         }
-+
-+        if (s->rx_frame_len + len > sizeof(s->rx_frame)) {
-+            return;
-+        }
-         pci_dma_write(&s->dev, desc->buf_addr1, s->rx_frame +
-             (s->rx_frame_size - s->rx_frame_len), len);
-         s->rx_frame_len -= len;
-@@ -181,6 +185,10 @@ static void tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
-         } else {
-             len = s->rx_frame_len;
-         }
-+
-+        if (s->rx_frame_len + len > sizeof(s->rx_frame)) {
-+            return;
-+        }
-         pci_dma_write(&s->dev, desc->buf_addr2, s->rx_frame +
-             (s->rx_frame_size - s->rx_frame_len), len);
-         s->rx_frame_len -= len;
-@@ -227,7 +235,8 @@ static ssize_t tulip_receive(TULIPState *s, const uint8_t *buf, size_t size)
- 
-     trace_tulip_receive(buf, size);
- 
--    if (size < 14 || size > 2048 || s->rx_frame_len || tulip_rx_stopped(s)) {
-+    if (size < 14 || size > sizeof(s->rx_frame) - 4
-+        || s->rx_frame_len || tulip_rx_stopped(s)) {
-         return 0;
-     }
- 
-@@ -275,7 +284,6 @@ static ssize_t tulip_receive_nc(NetClientState *nc,
-     return tulip_receive(qemu_get_nic_opaque(nc), buf, size);
- }
- 
--
- static NetClientInfo net_tulip_info = {
-     .type = NET_CLIENT_DRIVER_NIC,
-     .size = sizeof(NICState),
-@@ -558,7 +566,7 @@ static void tulip_tx(TULIPState *s, struct tulip_descriptor *desc)
-         if ((s->csr[6] >> CSR6_OM_SHIFT) & CSR6_OM_MASK) {
-             /* Internal or external Loopback */
-             tulip_receive(s, s->tx_frame, s->tx_frame_len);
--        } else {
-+        } else if (s->tx_frame_len <= sizeof(s->tx_frame)) {
-             qemu_send_packet(qemu_get_queue(s->nic),
-                 s->tx_frame, s->tx_frame_len);
-         }
-@@ -570,23 +578,31 @@ static void tulip_tx(TULIPState *s, struct tulip_descriptor *desc)
-     }
- }
- 
--static void tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *desc)
-+static int tulip_copy_tx_buffers(TULIPState *s, struct tulip_descriptor *desc)
- {
-     int len1 = (desc->control >> TDES1_BUF1_SIZE_SHIFT) & TDES1_BUF1_SIZE_MASK;
-     int len2 = (desc->control >> TDES1_BUF2_SIZE_SHIFT) & TDES1_BUF2_SIZE_MASK;
- 
-+    if (s->tx_frame_len + len1 > sizeof(s->tx_frame)) {
-+        return -1;
-+    }
-     if (len1) {
-         pci_dma_read(&s->dev, desc->buf_addr1,
-             s->tx_frame + s->tx_frame_len, len1);
-         s->tx_frame_len += len1;
-     }
- 
-+    if (s->tx_frame_len + len2 > sizeof(s->tx_frame)) {
-+        return -1;
-+    }
-     if (len2) {
-         pci_dma_read(&s->dev, desc->buf_addr2,
-             s->tx_frame + s->tx_frame_len, len2);
-         s->tx_frame_len += len2;
-     }
-     desc->status = (len1 + len2) ? 0 : 0x7fffffff;
-+
-+    return 0;
- }
- 
- static void tulip_setup_filter_addr(TULIPState *s, uint8_t *buf, int n)
-@@ -651,13 +667,15 @@ static uint32_t tulip_ts(TULIPState *s)
- 
- static void tulip_xmit_list_update(TULIPState *s)
- {
-+#define TULIP_DESC_MAX 128
-+    uint8_t i = 0;
-     struct tulip_descriptor desc;
- 
-     if (tulip_ts(s) != CSR5_TS_SUSPENDED) {
-         return;
-     }
- 
--    for (;;) {
-+    for (i = 0; i < TULIP_DESC_MAX; i++) {
-         tulip_desc_read(s, s->current_tx_desc, &desc);
-         tulip_dump_tx_descriptor(s, &desc);
- 
-@@ -675,10 +693,10 @@ static void tulip_xmit_list_update(TULIPState *s)
-                 s->tx_frame_len = 0;
-             }
- 
--            tulip_copy_tx_buffers(s, &desc);
--
--            if (desc.control & TDES1_LS) {
--                tulip_tx(s, &desc);
-+            if (!tulip_copy_tx_buffers(s, &desc)) {
-+                if (desc.control & TDES1_LS) {
-+                    tulip_tx(s, &desc);
-+                }
-             }
-         }
-         tulip_desc_write(s, s->current_tx_desc, &desc);
--- 
-2.24.1
-
diff --git a/app-emulation/qemu/files/qemu-4.2.0-ati-vga-crash.patch b/app-emulation/qemu/files/qemu-4.2.0-ati-vga-crash.patch
new file mode 100644
index 000000000000..5f442f0fd07a
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-4.2.0-ati-vga-crash.patch
@@ -0,0 +1,94 @@
+https://bugs.gentoo.org/719266
+
+From ac2071c3791b67fc7af78b8ceb320c01ca1b5df7 Mon Sep 17 00:00:00 2001
+From: BALATON Zoltan <balaton@eik.bme.hu>
+Date: Mon, 6 Apr 2020 22:34:26 +0200
+Subject: [PATCH] ati-vga: Fix checks in ati_2d_blt() to avoid crash
+
+In some corner cases (that never happen during normal operation but a
+malicious guest could program wrong values) pixman functions were
+called with parameters that result in a crash. Fix this and add more
+checks to disallow such cases.
+
+Reported-by: Ziming Zhang <ezrakiez@gmail.com>
+Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
+Message-id: 20200406204029.19559747D5D@zero.eik.bme.hu
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ hw/display/ati_2d.c | 37 ++++++++++++++++++++++++++-----------
+ 1 file changed, 26 insertions(+), 11 deletions(-)
+
+--- a/hw/display/ati_2d.c
++++ b/hw/display/ati_2d.c
+@@ -53,12 +53,20 @@ void ati_2d_blt(ATIVGAState *s)
+             s->vga.vbe_start_addr, surface_data(ds), surface_stride(ds),
+             surface_bits_per_pixel(ds),
+             (s->regs.dp_mix & GMC_ROP3_MASK) >> 16);
+-    int dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
+-                 s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_width);
+-    int dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
+-                 s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_height);
++    unsigned dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
++                      s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_width);
++    unsigned dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
++                      s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_height);
+     int bpp = ati_bpp_from_datatype(s);
++    if (!bpp) {
++        qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n");
++        return;
++    }
+     int dst_stride = DEFAULT_CNTL ? s->regs.dst_pitch : s->regs.default_pitch;
++    if (!dst_stride) {
++        qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n");
++        return;
++    }
+     uint8_t *dst_bits = s->vga.vram_ptr + (DEFAULT_CNTL ?
+                         s->regs.dst_offset : s->regs.default_offset);
+ 
+@@ -82,12 +90,16 @@ void ati_2d_blt(ATIVGAState *s)
+     switch (s->regs.dp_mix & GMC_ROP3_MASK) {
+     case ROP3_SRCCOPY:
+     {
+-        int src_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
+-                     s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_width);
+-        int src_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
+-                     s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_height);
++        unsigned src_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
++                       s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_width);
++        unsigned src_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
++                       s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_height);
+         int src_stride = DEFAULT_CNTL ?
+                          s->regs.src_pitch : s->regs.default_pitch;
++        if (!src_stride) {
++            qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n");
++            return;
++        }
+         uint8_t *src_bits = s->vga.vram_ptr + (DEFAULT_CNTL ?
+                             s->regs.src_offset : s->regs.default_offset);
+ 
+@@ -137,8 +149,10 @@ void ati_2d_blt(ATIVGAState *s)
+                                     dst_y * surface_stride(ds),
+                                     s->regs.dst_height * surface_stride(ds));
+         }
+-        s->regs.dst_x += s->regs.dst_width;
+-        s->regs.dst_y += s->regs.dst_height;
++        s->regs.dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
++                         dst_x + s->regs.dst_width : dst_x);
++        s->regs.dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
++                         dst_y + s->regs.dst_height : dst_y);
+         break;
+     }
+     case ROP3_PATCOPY:
+@@ -179,7 +193,8 @@ void ati_2d_blt(ATIVGAState *s)
+                                     dst_y * surface_stride(ds),
+                                     s->regs.dst_height * surface_stride(ds));
+         }
+-        s->regs.dst_y += s->regs.dst_height;
++        s->regs.dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
++                         dst_y + s->regs.dst_height : dst_y);
+         break;
+     }
+     default:
+-- 
+2.26.2
+
diff --git a/app-emulation/qemu/qemu-4.2.0-r2.ebuild b/app-emulation/qemu/qemu-4.2.0-r5.ebuild
index c23828e7a8d6..b0b4efc874c5 100644
--- a/app-emulation/qemu/qemu-4.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-4.2.0-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz
-		https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
+		https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz"
 	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 fi
 
@@ -216,9 +216,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-4.0.0-sanitize-interp_info.patch
 	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
 	"${WORKDIR}"/patches
 )
@@ -374,7 +372,7 @@ src_prepare() {
 	default
 
 	# Use correct toolchain to fix cross-compiling
-	tc-export AR LD NM OBJCOPY PKG_CONFIG
+	tc-export AR LD NM OBJCOPY PKG_CONFIG RANLIB
 	export WINDRES=${CHOST}-windres
 
 	# Verbose builds
@@ -496,6 +494,8 @@ qemu_src_configure() {
 	if [[ ! ${buildtype} == "user" ]] ; then
 		# audio options
 		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
 			$(usex pulseaudio pa "")
 			$(usev sdl)
 			$(usev alsa)
@@ -609,8 +609,7 @@ src_test() {
 	if [[ -n ${softmmu_targets} ]]; then
 		cd "${S}/softmmu-build"
 		pax-mark m */qemu-system-* #515550
-		emake -j1 check
-		emake -j1 check-report.html
+		emake check
 	fi
 }
 
diff --git a/app-emulation/qemu/qemu-4.2.0-r3.ebuild b/app-emulation/qemu/qemu-4.2.0-r6.ebuild
index 83a1b141b2a8..172ce2eba7b5 100644
--- a/app-emulation/qemu/qemu-4.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-4.2.0-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz
-		https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
+		https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -216,11 +216,9 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${PN}-4.0.0-sanitize-interp_info.patch
 	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
-	"${FILESDIR}"/${PN}-4.2.0-CVE-2020-11102.patch #716518
+	"${FILESDIR}"/${PN}-4.2.0-ati-vga-crash.patch #719266
 	"${WORKDIR}"/patches
 )
 
@@ -375,7 +373,7 @@ src_prepare() {
 	default
 
 	# Use correct toolchain to fix cross-compiling
-	tc-export AR LD NM OBJCOPY PKG_CONFIG
+	tc-export AR LD NM OBJCOPY PKG_CONFIG RANLIB
 	export WINDRES=${CHOST}-windres
 
 	# Verbose builds
@@ -612,8 +610,7 @@ src_test() {
 	if [[ -n ${softmmu_targets} ]]; then
 		cd "${S}/softmmu-build"
 		pax-mark m */qemu-system-* #515550
-		emake -j1 check
-		emake -j1 check-report.html
+		emake check
 	fi
 }
 
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index dac2f00c38e8..b189a315909f 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
@@ -370,7 +370,7 @@ src_prepare() {
 	default
 
 	# Use correct toolchain to fix cross-compiling
-	tc-export AR LD NM OBJCOPY PKG_CONFIG
+	tc-export AR LD NM OBJCOPY PKG_CONFIG RANLIB
 	export WINDRES=${CHOST}-windres
 
 	# Verbose builds
@@ -606,8 +606,7 @@ src_test() {
 	if [[ -n ${softmmu_targets} ]]; then
 		cd "${S}/softmmu-build"
 		pax-mark m */qemu-system-* #515550
-		emake -j1 check
-		emake -j1 check-report.html
+		emake check
 	fi
 }
 
diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
index 63a4732e867c..59109be88b58 100644
--- a/app-emulation/simh/Manifest
+++ b/app-emulation/simh/Manifest
@@ -1,8 +1,6 @@
 AUX simh-3.11.0-fcommon.patch 1218 BLAKE2B e791f49dfa42f0bd0a36d8c04405ed74bf4bf56fddf285cbac306f7c5188da52ab37f7a16bb55a4e9e5d6aa7f4d2ceb716cea823f2430cc19b53580f4eb5d044 SHA512 12eefe8c535b813ba55c7fb16929915d7c2715980d4e778ad357b4f8e5cfe73c3b00530252551bd22765f2b893a4f9d5d8404bed714c2dd4b5173029e7f70e58
 AUX simh-3.11.0-fix-mkdir-race.patch 333 BLAKE2B 2b50d8997d5a782391c6a0174c4c4471a98e6388d9a135068caf864531d075529e7dd8b264c096102ac18266c3c05691e5c723d1ef02c0cd93fdf49b45e5c3f1 SHA512 5ca8022e0c6521627c5d6075e04a10c42bfe61d6ac860b0f2dfde2cb70fb3df5e2f77d1a12e35ea75c3357effc3f5bc26e76e3ecb0a1461f7366297bd0e784e5
 AUX simh-3.11.0-respect-FLAGS.patch 265 BLAKE2B ba4134c8e3b0aafc71bbccb2e036d6532532816f30d1ac2a1759eb998479233c5e52a65fea77adf67c28a2e374b9edb998f91b30df9ea6e00f6f77723fdab61f SHA512 0e3c69ce2a7960c872933e60b0a8f043e0b0ae5563c4c5110045d53c34276a04cc110a0831057029ac84b21d818e1698514438d4f890bf4cd8d8e613af2cd9ef
-AUX simh-3.9.0-fix-mkdir-race.patch 324 BLAKE2B 03cbbbfaf958cb43769a0e2935dfb5f3e9148e5092b7726f2ea570afc34018459692e2c28721e698fc9f158b23176bd1623d99a6b1a15e0fe81bb6c7da370ade SHA512 3ca847ea6c34370c88788c4c3d8997dfe3e7740a201c531731425bc17375b405cef9f1db28d1eb66548add7953aef1d4cdc1b8c7212ab56d0c5f43fa4caea18a
-AUX simh-3.9.0-respect-FLAGS.patch 336 BLAKE2B 990f49c6da04f6f0e8a8f7c8170a6013376f12271063dab4c01345d98fe406981e3de49cf421017a902732755900d905d13c3a23d03091fa854dedff9bdabfaf SHA512 438386edcca386da7ed3f3a2247584e9aed708d5c54164d736e1dd26b565c065a0f6b62d0dab6e0ed4fc2dd211fa656b5e15388c2a2f18bf0393bf7c902616b2
 DIST simh-3.11.1.tar.gz 2576391 BLAKE2B bebaba75d4264c47202cc0daca2023c03d2e87722798f1ab37c9e3b2cec0b80cd180fccc0077347b2cb5255d26e1ce35f99a908deaf252c1e60e22e0a381e66d SHA512 7c2f81a64d3016b9a44409fc336c804c0da836317745d47594cc48c64cb57dc8f22084d9086e3f86868ec485ee56ac63301f350cee6d275e705b7c5fc82875db
 DIST simhv311-0.zip 2790607 BLAKE2B f9399977093f07d7f58067ed40e22f60e43228bbb1e0fdaa6b04408956962d9ea14b6dc57d758b819cee59f3bade9505a6802d42804df49622990402c0f22600 SHA512 e5fb6915c050e7402363cd9c1f99feb00874c3693905067ce901ffa86fc29a0cd2648684f111216b09a3c847f75812e2db2e2f2fa9f9d0db5dc932d53ec832fa
 EBUILD simh-3.11.0.ebuild 1252 BLAKE2B 7b25129df1e3da425081a73146ed08dd57a349315ad6c0d2de004f586c9d42c68dd2d2a51c8df2d716f190a17d4fd0cdcac9b4174dbf32a9dadd75d9766674e2 SHA512 71ae8835be89bdaab5dcfc6642a23f6f70d1c97531b61a7222914f279b7238667480fe9f7332436f6448f2ab6bf2ced393291d5d5baf2e051bc80abaf4c480fe
diff --git a/app-emulation/simh/files/simh-3.9.0-fix-mkdir-race.patch b/app-emulation/simh/files/simh-3.9.0-fix-mkdir-race.patch
deleted file mode 100644
index 3a2aae35207c..000000000000
--- a/app-emulation/simh/files/simh-3.9.0-fix-mkdir-race.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- simh-3.9.0/makefile
-+++ simh-3.9.0/makefile
-@@ -249,7 +249,7 @@
-     NETWORK_OPT = $(NETWORK_CCDEFS)
-   endif
-   ifneq (binexists,$(shell if $(TEST) -e BIN; then echo binexists; fi))
--    MKDIRBIN = if $(TEST) ! -e BIN; then mkdir BIN; fi
-+    MKDIRBIN = mkdir -p BIN
-   endif
- else
-   #Win32 Environments (via MinGW32)
diff --git a/app-emulation/simh/files/simh-3.9.0-respect-FLAGS.patch b/app-emulation/simh/files/simh-3.9.0-respect-FLAGS.patch
deleted file mode 100644
index 0f7cd1d114ea..000000000000
--- a/app-emulation/simh/files/simh-3.9.0-respect-FLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- simh-3.9.0/makefile
-+++ simh-3.9.0/makefile
-@@ -300,8 +300,8 @@
-   CFLAGS_O = -O0
-   BUILD_FEATURES = - debugging support
- else
--  CFLAGS_O = -O2
--  LDFLAGS_O = 
-+  CFLAGS_O ?= -O2
-+  LDFLAGS_O ?= 
-   GCC_MAJOR_VERSION = $(firstword $(subst  ., ,$(GCC_VERSION)))
-   ifneq (3,$(GCC_MAJOR_VERSION))
-     ifeq (,$(GCC_OPTIMIZERS_CMD))
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index 252b44a9f510..8d76574636e5 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -2,7 +2,9 @@ DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25
 DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
 DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3
 DIST skopeo-0.1.41.tar.gz 4692408 BLAKE2B d5e99be0cb478065f1478beda355abc11c8f13ad8446251048502da1b1af38d407ec46d284e59d2018af5d1ca6a953ad6156a306e9bc1acbdb22b447fe17a59f SHA512 924af178eb9621395cfffcf51aa072886dc8c20746bce1599a503df8c54794e34184a1fc6fd9582b889c7c8efecf8cf192797bc8e208b90c71cca31bb970d8e9
+DIST skopeo-0.2.0.tar.gz 4295805 BLAKE2B 4ad13ff49bec56f3766e8d94f80fe8e22edb011b8862fb1249882e5695fa9260a6e2ce3d8345411ee7717cb92d4c1516268678f0884a62b02bfc8c9a554367ee SHA512 89d416110561dbe967860f752db607634a37b12adc376736de48264ec064abfed6b3db9ae195ffb3e9616dd6d65528660a23f2a5145d4674ed47cf443f17295a
 EBUILD skopeo-0.1.39.ebuild 1451 BLAKE2B 9652f26926ef19838041dbb50d355aaaddb975e4a8896fc35b90cfb145b75411f8964222d10229d8df1c9f2b80821746573e4485e5df79493b7bfb07025e519e SHA512 3f91ec57eac22a82c9a5a7e9eb755d0933476554ccf9a223a40b01452c3d57c5996a6e1b204f58ca7189c3260cec5a31971775778ddbbe32f8c920068c8bbe9d
 EBUILD skopeo-0.1.40-r1.ebuild 1734 BLAKE2B 3ad25540278b444c94b7bbdda5684f74118afef56989e439efb8451217248b1a3062945c1b5a6d40844162b2ccb8e8981405df250a25e7c8475c020214adc816 SHA512 b4b45ae2bda0f877828edc0cdf6befd900d9d232f7416eff57724163401ca04f95ebec6a13d7c0d54810a5a7f994794d69be78a1528a7f36c5032ee2996e29ed
 EBUILD skopeo-0.1.41.ebuild 1330 BLAKE2B d17e46533d449b957b0829d2bd7790610fa3f1f314500b9a830d2710eeef33c6b0c8125bd803125245b361aae351e241bd8754683d0d28a6f63746d2cabd58a6 SHA512 c907e07d0587e652f425ac91be2dd5648820622864fea7845558db2f6df1f3c21ccd029f24b9be8edccf3e51679290fde22526590dcd55558227909ae520878f
+EBUILD skopeo-0.2.0.ebuild 1318 BLAKE2B ca82dd7a456dde9cd8b354691d18123e7e66e163eadd04f9ecf2079f584b5b5a09dca5beb0a0ac905a94c0929da589474852606f2af380535918a5fa91b9fefe SHA512 4b73306b099f55d4216f4269a937c35755e7a1bd091dae00a8280803dc68c56ea34acbd722ce3a72b94823dbc36f0ade1844c6a96ba24be318c47762353efb6c
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.2.0.ebuild b/app-emulation/skopeo/skopeo-0.2.0.ebuild
new file mode 100644
index 000000000000..41797bfbd1bb
--- /dev/null
+++ b/app-emulation/skopeo/skopeo-0.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+COMMIT=1119299c4b27e16680744e8bcf3b5362344a40d7
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
+	>=sys-fs/btrfs-progs-4.0.1
+	>=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+src_compile() {
+	local BUILDTAGS="containers_image_ostree_stub"
+	set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
+		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+		-o skopeo ./cmd/skopeo
+	echo "$@"
+	"$@" || die
+	cd docs || die
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin skopeo
+	doman docs/*.1
+	dobashcomp completions/bash/skopeo
+	insinto /etc/containers
+	newins default-policy.json policy.json
+	insinto /etc/containers/registries.d
+	doins default.yaml
+	keepdir /var/lib/atomic/sigstore
+	einstalldocs
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index bf6237c461fa..a7e2f624eb26 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,9 +1,5 @@
-DIST slirp4netns-0.3.3.tar.gz 162154 BLAKE2B b4a477ca94ee17e14ae0d255eb1f22713388d32cee1faff308e902a8134bc52e08cfa92537c19fbfc9869d936637c1196fee462d9699c1b5f97a0d0138dc4792 SHA512 9cccbfd30348d895c8c3f6a80ebe7991131c5a5f4907733ec65df5ce70b63427e5f666bf7c4dcb08e8dd50f1769aff0f6642c23c29eb6b9921a2d10f62d46f63
-DIST slirp4netns-0.4.1.tar.gz 168785 BLAKE2B 90e2510121177771fb77d5e48baa8a1acb95f9778e72add244b2df10d92c9cc6ef284bfbeef699bd8e58724b50254a4eb6fa485a58c7c8e6cca8469cf722e1f2 SHA512 bb2a0946f4e360eb08efb46e097d21ab1bf05d199d1e3d381e065617eb9ba15434bccb5d1e76ac27664f23c8da79349383095b4d28d2a1a8ddc0fb9675aebf34
-DIST slirp4netns-0.4.2.tar.gz 169120 BLAKE2B bbb809da871c885e910be771f3a6e90f7d18880d82ddeb0e569a1db33e38c80cbb1a7279341c0efcd514d88fa2874920ae89365f9fa97a38e3fb09f0eb8e5642 SHA512 87dd032afe6862fc8f7f5c3770a1d939832c29c2f55fa3579a4eac717979442e1b081aa886cc94c5638ec1339ccebe73ed1844af37a479fed2d5826bc761fc05
-DIST slirp4netns-0.4.3.tar.gz 169895 BLAKE2B a8919ced6d9d68823c79396bc8914d32d157c2da566735a495d68c995c5cfafafba7eb1f761cbe9f82c3291afeae4ac55d00de4c094d5f48e2268d540dfca9e6 SHA512 a3415529486f11cf12c799cabc889dca30fbf64d08818359a285ac67c15fc7926d61105291cd8f2652174747e641e159b5b805a8954fd82f7eb9e35058b23265
-EBUILD slirp4netns-0.3.3.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
-EBUILD slirp4netns-0.4.1-r1.ebuild 762 BLAKE2B bf04b7ace6f29e4d5f3172b49a5b38f1f438de246a1c53c2164f950885b92cb58d89a73da69e877f62f18ae686f5fd3078801537962da2d2e2b73491520b97a9 SHA512 f90e0500618de2cc8059fc33d8261f6050d43c95abd17806df46362b55730ecbc138f41c9895e8278f5daefa62de77e033df4db6ceccb311da361246abb466a4
-EBUILD slirp4netns-0.4.2.ebuild 762 BLAKE2B bf04b7ace6f29e4d5f3172b49a5b38f1f438de246a1c53c2164f950885b92cb58d89a73da69e877f62f18ae686f5fd3078801537962da2d2e2b73491520b97a9 SHA512 f90e0500618de2cc8059fc33d8261f6050d43c95abd17806df46362b55730ecbc138f41c9895e8278f5daefa62de77e033df4db6ceccb311da361246abb466a4
-EBUILD slirp4netns-0.4.3.ebuild 762 BLAKE2B 307a4916c666b3a368b4268ab556c044eb34d754f5b5a0f2b50b7057a4b2663b574c73c9a2c8f54925312f72e2ef66a281d4bfd26b80b4542aa288ed392b0891 SHA512 45fcd96f5f700044f84739b6ed0ef5ab61fd07a860fd8542c88e74a413b3d72e762280441ae3b65fdb6568b43e0d6b40354a8e816ff736cb1563ae5219f840e6
+DIST slirp4netns-1.0.0.tar.gz 51919 BLAKE2B 9d2d95de80e644981f185a6c243949e55761b25cb908c1ee727f06264d08e794e8228a197e0cc858f81f582d3ddb349c5d6cd2566944c63f41299fb2a5a0d3d2 SHA512 fe0256f0b91647b361999915c6c2b975ee33c437afef3cf490f5e33f582da4db97e360e86654831d7e9b2a8b0d78c91080874a9377247693ac54ffdb60ca6fb9
+DIST slirp4netns-1.0.1.tar.gz 51911 BLAKE2B d125dd2c24fd7a817d2b8f16c6bac66399a4a0f37c49d43541f336e7ff09673bca2d6ed2c62cc856034b8e2f6e11ac1ff3753d3546148e68ddf085e8b9aca354 SHA512 4947e32d88c3c8f1b7b2e94a1e73041a48cc8ddf75ffaf691d44cb6ebeaef5cf0b0abb7a8df8919682dfc854a76d73fc5bdebcf01b3ace97be187068d704bf63
+EBUILD slirp4netns-1.0.0.ebuild 783 BLAKE2B 93a68b4f0ddc4b385d120b2c782d93349e03fe0098bce11a426e8fa53ee6cd049337688aa581c87307c57b59e4e5ada8656b24d89ef6da3dbbf360ab54167a5c SHA512 bbf7d29b57ea330aff86edc3547a08ffa13ca247d3e0f1979be201b27568c70cf714b9d8fb6c16b81886a4583a3d7c042476b9b61815b9f202e1f8a468a7c5e2
+EBUILD slirp4netns-1.0.1.ebuild 783 BLAKE2B 93a68b4f0ddc4b385d120b2c782d93349e03fe0098bce11a426e8fa53ee6cd049337688aa581c87307c57b59e4e5ada8656b24d89ef6da3dbbf360ab54167a5c SHA512 bbf7d29b57ea330aff86edc3547a08ffa13ca247d3e0f1979be201b27568c70cf714b9d8fb6c16b81886a4583a3d7c042476b9b61815b9f202e1f8a468a7c5e2
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.3.3.ebuild b/app-emulation/slirp4netns/slirp4netns-0.3.3.ebuild
deleted file mode 100644
index a87e63fe9495..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-0.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libpcre:="
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.1-r1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.1-r1.ebuild
deleted file mode 100644
index e12c5cc91bc5..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2=
-	dev-libs/libpcre:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild b/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild
index 632654ce2a10..4aaf598fb7e5 100644
--- a/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 RDEPEND="
 	dev-libs/glib:2=
 	dev-libs/libpcre:=
+	net-libs/libslirp:=
 	sys-libs/libseccomp:=
 	sys-libs/libcap:="
 
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.2.ebuild b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
index e12c5cc91bc5..4aaf598fb7e5 100644
--- a/app-emulation/slirp4netns/slirp4netns-0.4.2.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ SLOT="0"
 RDEPEND="
 	dev-libs/glib:2=
 	dev-libs/libpcre:=
+	net-libs/libslirp:=
 	sys-libs/libseccomp:=
 	sys-libs/libcap:="
 
diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest
index 14b37a57ec7d..7559e8512a14 100644
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@@ -1,10 +1,4 @@
-DIST spice-protocol-0.12.14.tar.bz2 74471 BLAKE2B ee90514f3c6ee0c8f6930e5fd0140e20447b1613f202186883a9a17eefaacbd83ff2f2cdb68b46cd1573de4cce288965a1b531ded1ab4da52c24c2c3ad098192 SHA512 4266bcbef9f641a97a2ff72f1b01380a41e51f4b1a0dbb73fdf68baf552598a62d5cf0c526adf2997a55ee5d4fe9392927c3d7f4556827bfb2933f59bfab55bb
-DIST spice-protocol-0.12.15.tar.bz2 74598 BLAKE2B d8116e3905d4345fc0bc51d488d2ca4d90d1302c8f0a14bd126eb4c753660c98bd54ac5561a6464adeba6a0ed16e55f681e59c2a73b3ee9288acd3fce5624a93 SHA512 1a3c3c26239d092c6c24708f5bd070ae1cb146f92f2329b63bec2d21a7276cdf1b9567f434bfbeeb1f7cd7dd4ad47494c51dcdbbba5af8e271e66dfe5b11de9d
-DIST spice-protocol-0.14.0.tar.bz2 70938 BLAKE2B 66dfa75f7e2f5a9c0c5d9ec34744386760393908f02bd7c662e51b3bee41c3c825eac512494bbd5ffdab5375e132bc4b567f65003cca88314c9ef2e3d529f219 SHA512 797df5f529731e9fd395b5946af2490ecf02c26982cc4a0aef24c1766887a35222f68525a996f8bc7459c2c4a25fde0c9a10c489ee6cab6eed7a68a9b5d90f76
 DIST spice-protocol-0.14.1.tar.bz2 73444 BLAKE2B 12050c38ee3d24814b57a340a88423352edae6412b5a20e27d59b7235e753f51aaf757f7e9e6ce702d0b0c0afeadfde7f3937725ae4715ae4dc4da20ee7fd663 SHA512 88b0e652564a1f826ee6d3c165ab05c40d13f366567db3840805f03d433d13d7f722225219c26759770d2cde33221fe6d97528521d0eb14bc069cd7ce9af8482
-EBUILD spice-protocol-0.12.14.ebuild 391 BLAKE2B 884ca4915ea4c7c4ae380c048ee0f97e5972ec662e082d0172a0d3c7d0ca95e61147f99272f5d722cff84bd153907f90df32db70eb45b3df060232ea659bc9c2 SHA512 b09ebd1398a01a9b4d8e9b68e8e9d03dd6ac8c0b9ad0f4d32f226366ae1fcf9b2de7889a9a0c9f5ad55be89b15322058be0b3a5ad2765fa93065554e16ad4eca
-EBUILD spice-protocol-0.12.15.ebuild 393 BLAKE2B eb10089ea8013707a156eba8b45763f57fb5188a05858a8b3afd00bdfaee407e80f21603030cafe944c173d59a9e290f8f9a27337307cc4d88c5c9b57fda9eae SHA512 ee10bfbdd420e5204301f3c6fc553b369cf1dd47248499abbc07078a5f6b653d8f46658fda6abaa4fcd7302d9d74afa80aa78e21c63e78a983250ea894e14fab
-EBUILD spice-protocol-0.14.0.ebuild 393 BLAKE2B eb10089ea8013707a156eba8b45763f57fb5188a05858a8b3afd00bdfaee407e80f21603030cafe944c173d59a9e290f8f9a27337307cc4d88c5c9b57fda9eae SHA512 ee10bfbdd420e5204301f3c6fc553b369cf1dd47248499abbc07078a5f6b653d8f46658fda6abaa4fcd7302d9d74afa80aa78e21c63e78a983250ea894e14fab
 EBUILD spice-protocol-0.14.1.ebuild 391 BLAKE2B ea5409351da04760ffd9c1bf5466f8044bff868d5612940882c5b440337086ee140a709799e78c43abb8d784db4d0d0764f2a2277665669b91feb25084884a6c SHA512 74b4e9d993bcc9eedcdb2b63b64ebaa7b343c80f27dbb921455f0cabf0201c550a3e7d30ea6817e6e6a4d6874161c7451b0fb070d7e93e1e3fe0f0ed68fd5879
 EBUILD spice-protocol-9999.ebuild 566 BLAKE2B 19bfd31a646d468f0b77ccc704156ca2e723acb6c3974d6bd036bf9fe25afd4152c6c4a4defd7165cdf4c5f8fcf597e09fde7caa2f047bf141029e7ea13f186d SHA512 dea4bf3539e88112fd65b23cf192ecdf9695723aee89986460d357010ca816cff64f4ee7d6541e3aa0dda9176c16ace57d979691e533028d0940b432f5acc20d
 MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.14.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.14.ebuild
deleted file mode 100644
index b4a375b4daea..000000000000
--- a/app-emulation/spice-protocol/spice-protocol-0.12.14.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="https://www.spice-space.org/"
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.15.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.15.ebuild
deleted file mode 100644
index 811162510d41..000000000000
--- a/app-emulation/spice-protocol/spice-protocol-0.12.15.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="https://www.spice-space.org/"
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-emulation/spice-protocol/spice-protocol-0.14.0.ebuild b/app-emulation/spice-protocol/spice-protocol-0.14.0.ebuild
deleted file mode 100644
index 811162510d41..000000000000
--- a/app-emulation/spice-protocol/spice-protocol-0.14.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="https://www.spice-space.org/"
-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"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index 28457aef781c..c7cbb1305435 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -1,9 +1,8 @@
 AUX spice-vdagent.confd-2 314 BLAKE2B 93d93f9e03e3aba9d889703ad24d08401222cf9d4b5fd0e72001bd0c0cf261d9f6879d1d0a89b51fc34dee2b15729425c694aca5522b1918f01edeea9b38b536 SHA512 ef3e02c65dd83ed0d4b1eaad9c6000a9d5d53fbbf2c19fe9604583f85478c92276b3b80554bd1573af6866e242c484f02da5c3500c0b4c430d3af0de755eed38
 AUX spice-vdagent.initd-3 1475 BLAKE2B 0d39828bd5be6271e0d3f1f7262751e1bee263bb52c0d409f5e85c51ac69b2ed1f6fa1b0ea377cae0e2879ed7d0ae39b93219fc961ed34c3d1d42b771a452932 SHA512 11e61f5cd8081231318248e332f081e43a36fb2315c70d52e436e83a14f1fca5ee4ddd8016e8c9d639cdafe69c3e5f360fb66dc2405f0d45f817130221ece516
 AUX spice-vdagent.initd-4 1465 BLAKE2B f03734461fac2ec869b48a3e2b4c4bd7ebfe152f3d2563fb5005477ce1eebbc887ebe0cc8e317e5b80de073b3cc27dc1475e86b2127a7f4907470e398112d05e SHA512 a10614b9058f9a6d70d350d2764809646251fe555abf7127ce49b2e794545a72a500c9b6ab9e5dcc632253a1ed24017392b6d0446d469ffce954d00e5c96a6c8
-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
 DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
-EBUILD spice-vdagent-0.17.0_p20180319-r1.ebuild 1680 BLAKE2B 7a9019d3e5d3e303b09f2c31b79c7ca8fd44905b19ee9e722e83c1a7ca44a7ff61340da6fb00884d8d91f3f57a5065f022da6c768fc2615c73780422505ad582 SHA512 31050b50116202a58f075443c9eeed79960c1a98bfa1501811f4f69beb21ae10ac755eaa450ddc10552c0caf5a8731ff8499dfeda6b661b160ceb6e579fbd3c9
+DIST spice-vdagent-0.20.0.tar.bz2 152510 BLAKE2B b00caadab385f4208bd18b78a006831953f99387e55fd86226efffdf537426627f02bb46708173b700eecd21f598a0db94f454c5252b0f4bfb93c30b39d69d16 SHA512 a6288e056645c071834f9ce5800669cb64e0f86a5efeb8eec61ac1e11f1fd56f7da8ea19b28a94c88741d794a0290fac9bcf74d45bcef271c2c5abfb2573a8e1
 EBUILD spice-vdagent-0.19.0-r1.ebuild 1547 BLAKE2B d43fc922789d4c6d31fa3b6c5fda1de6510f1a77265729c058b4cce1d1f2e8fad8068c2ba087a4d67bd314afdc03f7de4e05a274b58e4b52a52e0830904689e0 SHA512 d7f08bd18da68a8edafcda4d2a409f0e5113e65617549daecd80c0841c393b4da94e3ca536d7f69771deac1ec79a9c1bc55f282d6f638de8a21c25753219767e
+EBUILD spice-vdagent-0.20.0.ebuild 1549 BLAKE2B bf17b60d824dbf69f20c9d3c20da94fe550ac5e9a78c1d7604a11e8ee7c49eee43f611c0920c36a65a6b1accef3ffb7646176375770dca00cca2283c24e0da44 SHA512 86d8e668087cef6b30a8af1ef75657809aeedd8c07d862e83a252c2309f4df41afd8ab19947bbd8f3c6d05c29dd78fa21c7c414626a1b28f0b79557036c960de
 MISC metadata.xml 446 BLAKE2B 263e7a9d21436d2549384fe53b85c4cbeec35d55714a4bd1f926f68077641da84991a4c670b79057f3bc4bb62d419f1c18fa558fb9d290df5a6607f626f965f2 SHA512 7b47aee99363ac11c21733be4ce320e4dc704924c80372f28af7da08b975845aa11a96d7c48e01ab9ae78e77c89fbe71d177f41b474f84a3fa9c27c597ed3f1b
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.20.0.ebuild
index 5a356f6ee6ef..2cac3817d767 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.20.0.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools linux-info
 
-MY_P="${P/_*/}"
-PATCHSET="${P/*_p/}"
-
 DESCRIPTION="SPICE VD Linux Guest Agent"
 HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~tamiko/distfiles/${MY_P}-patches-${PATCHSET}.tar.xz"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="consolekit selinux systemd"
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="~amd64 ~x86"
+IUSE="consolekit gtk selinux systemd"
 
 CDEPEND="
-	>=app-emulation/spice-protocol-0.12.8
+	dev-libs/glib:2
+	>=app-emulation/spice-protocol-0.14.0
 	media-libs/alsa-lib
 	>=x11-libs/libpciaccess-0.10
+	x11-libs/libdrm
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libX11
 	x11-libs/libXinerama
 	consolekit? ( sys-auth/consolekit sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:3 )
 	systemd? ( sys-apps/systemd )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -38,15 +36,6 @@ CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
 ERROR_INPUT_UINPUT="User level input support (INPUT_UINPUT) is required"
 ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support (VIRTIO_CONSOLE) is required"
 
-PATCHES=(
-	"${WORKDIR}"/patches
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	local opt=()
 	if use consolekit; then
@@ -60,6 +49,7 @@ src_configure() {
 	econf \
 		--with-init-script=systemd \
 		--localstatedir="${EPREFIX}"/var \
+		$(use_with gtk) \
 		"${opt[@]}"
 }
 
@@ -70,6 +60,6 @@ src_install() {
 
 	keepdir /var/log/spice-vdagentd
 
-	newinitd "${FILESDIR}/${PN}.initd-3" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd-4" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
 }
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index edb19522b58c..53612b1b78a9 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -1,12 +1,5 @@
 AUX README.gentoo 270 BLAKE2B 979c3e8d2a3c1d4f30af8f2d9954434dd685abf42992abf0e63e9dbe2d16d8fb3b135ecf3b81344e12d585ed92543d6b8adffb01e55772964de0f97f320d785c SHA512 9202046d629d12eee0435bb0ee8bafc1d8a0b52784275a7b3989fd430de8ed0ec2e59cfdf963a58494a05296a55bc99fe7095e661398182d62286e8816895dd1
-AUX spice-0.14.0-fix-flexible-array-buffer-overflow.patch 684 BLAKE2B dfbbf0fd8231d48b82bc907b8a2b84cc78f701e04ec9e265061bc68136a3f0c53e3884997ccaf1a3558772a43bd78dc3d7e7509e7c014fa0a00860ef7a7cfb4e SHA512 bd69990b33fa0f5bded35d8e37a51cf87f28c44dedbc24f73d682d465e5514fd809b6fcd95e067a9f5adcb0e1a3b10c8a739412feac088d058e44970268815be
-AUX spice-0.14.0-libressl_fix.patch 530 BLAKE2B 136e0b87931d487a018cdf0be4acfc0b05d474eb2e1a0583e05f9184ac6aa3b3a5dc58537ed167b13655b9180f06ba489c7805caa95d39a1af1fff410000e675 SHA512 f29f0a47edb2552b0908d0ceea7546efa90ad572217ce9184da031507be9f65a83ef39684dc3d8610bea4993a8f26ed78bce17781c893a4fca1cbdf9ba5140e3
-AUX spice-0.14.0-openssl1.1_fix.patch 614 BLAKE2B fb7b39e73d37bc6ab27035c7d7a742fa648afb62777bcbd9dbdd7480b5b5461da6147b4f3368e04aaf04f8ef5780aeab1e7679f4fcf7aa1005df7d28a4fca7a1 SHA512 1b0b83b7222af0f60bdb5a3469881a4e84f8df824d2741710da04b8bdec95e691f97137f2ee67ad71065918b329285d215aa086d5f46dc83b18334eb17ef6dc8
-DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
-DIST spice-0.14.2.tar.bz2 1406009 BLAKE2B e6c57bedd8c8ec0444da194be7279b895bf348dfa9b427d20301cc223627bcd65b7037280bc2a3d0b531b0cdcd8cb62d34ee132c549ac3dc8f6e5a2959339ce2 SHA512 1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76
 DIST spice-0.14.3.tar.bz2 1504304 BLAKE2B be655e1d4c48dae29903ab8e0dc52da63723e3252052afccc9587065531f28c8af7dbab4c585093f26d98f2273c6e734a553c18d4779a9f4464334ae1764f682 SHA512 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4
-EBUILD spice-0.14.0-r2.ebuild 2491 BLAKE2B 99a415733fa66136e796c4185d9369400e2bc27efbd04b60bc27f08a42adc8fe2ea0c33ad032c9a3280ccf10b2022b5ca00490e0f2ee417abc71d27dcf393f7f SHA512 62b6520e710622e2eb5e8ae4dbf9a712902319fcae6e1a65f3549fe2f826e6b2c8e4932ae5b1592e411eb6439ef0600dc19f6efd121de9d02dc7f013bc8db0bb
-EBUILD spice-0.14.2.ebuild 2448 BLAKE2B d502a0f890ab488c561ccf5555d84c4c2c101f78a87e3eae1e415ff37a97c5bb76bddd69950702800251fe152f563fb530380bdd40304a538cf6d6d37c20c93d SHA512 3fb6b35e2d6890bef4237716920b29ba07721f8588c342c890800981134ab9c4cfcba9e9eb0e356a14f2637f9817963b7784e25b93c82939dbc8607af4e7b7cd
 EBUILD spice-0.14.3.ebuild 2384 BLAKE2B 4c352c30ffa1735e1aa949217dfecdae8f911d84992d91ba5e98c94b383f07f58cce71fd473292fd4c2e8c0ba2c53fa6db02f2ebb6ac10efa16d17504fbc69df SHA512 dd1c95f6c369c2dbaf080afa79d85bdce8365b98754c1a5d0200767275f0368fd2686207cb889fa4927fecde83edf63159f3f435d006e82aeb9dea2ca8f1daa0
 EBUILD spice-9999.ebuild 2262 BLAKE2B 88f200d91a64ecabefb393b683e3aae49802090062ba2a8bca5c9df53a6ea50b895daaf7cda2d6d494f1b1884e134c092db37e70c51ac80b5c696e689def4ab3 SHA512 e49600cfd9d9dc688089782df9b65b566780cb796805d7200223e614b5f82ef7d57623b58bfcb8532a63a01a9c8e57ffb11f31fe0483c831620d733523fff098
 MISC metadata.xml 385 BLAKE2B 599bae33d9264b8b3b4474b0d2234d66e6c6f2cd3da1710bfea64f75570264da7f4de712cecb95408a059f70e3dba2de2a421c02f1f728e39c2bf913c2c570a0 SHA512 c75966298d69fb56b3e16c98b0cc7b3b2514d2ad2a6b790777c00493754e678388f0eb17fbabc6f58a667883e87d2a4f19c2a1c34f5c87f81fb13a8948ab85c8
diff --git a/app-emulation/spice/files/spice-0.14.0-fix-flexible-array-buffer-overflow.patch b/app-emulation/spice/files/spice-0.14.0-fix-flexible-array-buffer-overflow.patch
deleted file mode 100644
index a05bbb7545aa..000000000000
--- a/app-emulation/spice/files/spice-0.14.0-fix-flexible-array-buffer-overflow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/spice-common/python_modules/demarshal.py b/spice-common/python_modules/demarshal.py
-index 1ea131d..7172762 100644
---- a/spice-common/python_modules/demarshal.py
-+++ b/spice-common/python_modules/demarshal.py
-@@ -318,6 +318,7 @@ def write_validate_array_item(writer, container, item, scope, parent_scope, star
-         writer.assign(nelements, array.size)
-     elif array.is_remaining_length():
-         if element_type.is_fixed_nw_size():
-+            writer.error_check("%s > message_end" % item.get_position())
-             if element_type.get_fixed_nw_size() == 1:
-                 writer.assign(nelements, "message_end - %s" % item.get_position())
-             else:
diff --git a/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
deleted file mode 100644
index 1dfce9480e9c..000000000000
--- a/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c
-index a9ed650..27aa5d3 100644
---- a/spice-common/common/ssl_verify.c
-+++ b/spice-common/common/ssl_verify.c
-@@ -33,7 +33,7 @@
- #include <string.h>
- #include <gio/gio.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
- {
-     return M_ASN1_STRING_data(asn1);
diff --git a/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch b/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch
deleted file mode 100644
index c1c5a1c04ba1..000000000000
--- a/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- spice-0.13.90-orig/server/reds.c	2017-07-27 01:04:10.000000000 +1000
-+++ spice-0.13.90/server/reds.c	2017-10-18 21:42:12.054934199 +1100
-@@ -34,6 +34,8 @@
- #include <ctype.h>
- 
- #include <openssl/err.h>
-+#include <openssl/bn.h>
-+#include <openssl/rsa.h>
- 
- #if HAVE_SASL
- #include <sasl/sasl.h>
-@@ -2795,9 +2797,12 @@
- 
- static gpointer openssl_global_init(gpointer arg)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined (LIBRESSL_VERSION_NUMBER)
-+    OPENSSL_init_ssl(0, NULL);
-+#else
-     SSL_library_init();
-     SSL_load_error_strings();
--
-+#endif
-     openssl_thread_setup();
- 
-     return NULL;
-
diff --git a/app-emulation/spice/spice-0.14.0-r2.ebuild b/app-emulation/spice/spice-0.14.0-r2.ebuild
deleted file mode 100644
index 49bf1e178a9a..000000000000
--- a/app-emulation/spice/spice-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="SPICE server"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
-
-# the libspice-server only uses the headers of libcacard
-RDEPEND="
-	dev-lang/orc[static-libs(+)?]
-	>=dev-libs/glib-2.22:2[static-libs(+)?]
-	media-libs/opus[static-libs(+)?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/jpeg:0=[static-libs(+)?]
-	>=x11-libs/pixman-0.17.7[static-libs(+)?]
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)?] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)?] )
-	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
-	smartcard? ( >=app-emulation/libcacard-0.1.2 )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=app-emulation/spice-protocol-0.12.13
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	smartcard? ( app-emulation/qemu[smartcard] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libressl_fix.patch
-	"${FILESDIR}"/${P}-openssl1.1_fix.patch
-	"${FILESDIR}"/${P}-fix-flexible-array-buffer-overflow.patch
-)
-
-python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version "dev-python/six[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #586560
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	xdg_environment_reset
-
-	local myconf="
-		$(use_enable static-libs static)
-		$(use_enable lz4)
-		$(use_with sasl)
-		$(use_enable smartcard)
-		--enable-gstreamer=$(usex gstreamer "1.0" "no")
-		--disable-celt051
-		"
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #586560
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	default
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/spice/spice-0.14.2.ebuild b/app-emulation/spice/spice-0.14.2.ebuild
deleted file mode 100644
index d6489c713699..000000000000
--- a/app-emulation/spice/spice-0.14.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit autotools python-any-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="SPICE server"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
-
-# the libspice-server only uses the headers of libcacard
-RDEPEND="
-	dev-lang/orc[static-libs(+)?]
-	>=dev-libs/glib-2.22:2[static-libs(+)?]
-	media-libs/opus[static-libs(+)?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/jpeg:0=[static-libs(+)?]
-	>=x11-libs/pixman-0.17.7[static-libs(+)?]
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)?] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)?] )
-	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
-	smartcard? ( >=app-emulation/libcacard-0.1.2 )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.14.0
-	smartcard? ( app-emulation/qemu[smartcard] )"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-openssl1.1_fix.patch
-)
-
-python_check_deps() {
-	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #586560
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	xdg_environment_reset
-
-	local myconf="
-		$(use_enable static-libs static)
-		$(use_enable lz4)
-		$(use_with sasl)
-		$(use_enable smartcard)
-		--enable-gstreamer=$(usex gstreamer "1.0" "no")
-		--disable-celt051
-		"
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #586560
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	default
-}
-
-src_install() {
-	default
-	use static-libs || find "${D}" -name '*.la' -type f -delete || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 86c9c1ee70a8..e79872e319af 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,10 +1,6 @@
-AUX vice-2.4.27-autotools.patch 353 BLAKE2B 01b25d40ad4dd621e32896b0c7f30715fcf0ea7cce8bffdb742caf241ebb0ed7c7d0d40c2cea852640f8b0e4d84bac1d5a87653c9641a33acd8f177a39130c80 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3
-AUX vice-3.1-ffmpeg4.patch 1971 BLAKE2B 6fcf4f8ddb3cb26727075483f8e17f8b07a22c081440356abdd733a91a41908a4d4344ad4aa2839bf79fc123a8e342d026a93e9d37bbef550ea3a6ee6dcf6741 SHA512 3240ab6287131813a56ac2c64613b5ea93560f0b0ed572b042aeed47594e7bb7c6b03e36edaee4efdc5350533dbde8adb10451658406ef9998c3c5742e08233c
 AUX vice-pkg-config.patch 825 BLAKE2B 6f46115866805299ba9354b9d15c3a766508ad1fe8aa82ac427a00d48ee2d1af41096bedeb7d3b579e704511164c37d55eeb7f00a39586f60737eb3ea394f043 SHA512 fe1e6b6d13012a4550336d716232418f5e1bf90ede4d4a36ad73244c7f957f641a425ccda50c5802c2e313e54081288da583c516a8689a18021b6e376fe18424
-DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
 DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998
-EBUILD vice-3.1.ebuild 4061 BLAKE2B 043e0115b7e39e73da029034bf2cf5b851c4391850ecf7bdf17634629a1e6d65537775543457fc2b2e56e56ef0795c65791d8cf16af049cf58e8fe2153f0fbe8 SHA512 18571cc5a39baf5b1a224972adbfeb0ee8aec612c00eaf7c5cebfeabc606424ebdef21d75822a5f803b1c0ca353577596a3bcb3fa621570c7d97e1bbbb17a738
-EBUILD vice-3.4_p37498.ebuild 4167 BLAKE2B bd95c1a66547be7206be299f8a7f5c4b975d31825ae82fea5e3ad7032fb86a46cc8edd51670ae42bb952d6c44f097bacbdf01557cfaf34b465aaa429c7c48075 SHA512 00432a7c1d15b73cf902dcf19731ac0a2992c432b1ef001471b890b20fff3e78a4066a64f4c7d97e7220c5d9fef0283180e20d1a6df5effd0aaf59c40fc575a4
+EBUILD vice-3.4_p37498.ebuild 4166 BLAKE2B 8bb99120020c12260e811927071e425e4ec4be00fd0b6cd962d9b9404afc799723b3d52b04c771bba52fcf00e908905cd5318ff1a7f663c5ef01655885f3d3a9 SHA512 2989578734dcabe8700af3e1b19384e4b8e17df82ded0e0a6a9708299a3ba008b8f50d6b5e3309f47dc163f2ec4bf7c90aaf0d256e3bde6ef3258509d747b9a5
 EBUILD vice-3.4_p37605.ebuild 4218 BLAKE2B cf422c8347f23e492786b203912967ac1240e54ba1d5e79d9702ddb36c3d7c84227f0a978c3e9b32f6b877e2ef38f93b2ea86cfe7c8ca124dbd57a31d1face8b SHA512 dd7dd55f0552d406d6981d37fab577f2ecbf2d576a359d8a2cc3204a7669e96dc11501e9f8639c97d3bc61322c107a12b39ec5160b4d1246b98a86f4abeff1ae
-MISC metadata.xml 935 BLAKE2B 2be70fd66a8fad1d34e34e0c5c53cedae60d32ffdfe5fa9e715db1444994d1858af8f0fe5920a64b0088837b786a241842f9976d1385f8df6d8d6804e5c516cc SHA512 4911527e6659f4bb300931883552a2417e5e36555681a15fc97ac29a130ddff29b31e954922bf6b5f005d205141dfdc96e00030c2cb35258f5db2995136d01ad
+MISC metadata.xml 692 BLAKE2B d9f0e48aab3fb0ed8ccc7b044f561a96cd563eeeabfae63371cf4b3772a8068c2b4191c09d89465402a202496a2aac7234ffab8adbcc4c17be54ab0e0c9d307c SHA512 f7be3c1e6a6394452d3f7aac52b25ba0eeb098841ecac32bbcc92257a7f09430f9a18927234ba166014523eb7b930c66d803d9105025b79ac1dbebed781fec96
diff --git a/app-emulation/vice/files/vice-2.4.27-autotools.patch b/app-emulation/vice/files/vice-2.4.27-autotools.patch
deleted file mode 100644
index 7bebd2800ef6..000000000000
--- a/app-emulation/vice/files/vice-2.4.27-autotools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vice-2.4.7.orig/configure.ac
-+++ vice-2.4.7/configure.ac
-@@ -124,7 +118,7 @@
- AC_SUBST(VICE_VERSION)
- 
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
diff --git a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch b/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
deleted file mode 100644
index d232ee22337e..000000000000
--- a/app-emulation/vice/files/vice-3.1-ffmpeg4.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/src/gfxoutputdrv/ffmpegdrv.c
-+++ b/src/gfxoutputdrv/ffmpegdrv.c
-@@ -46,6 +46,13 @@
- #include "util.h"
- #include "soundmovie.h"
- 
-+/** \brief  Helper macro to determine ffmpeg version
-+ */
-+#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR >= 18)
-+# define HAVE_FFMPEG4
-+#endif
-+
-+
- static gfxoutputdrv_codec_t avi_audio_codeclist[] = {
-     { AV_CODEC_ID_MP2, "MP2" },
-     { AV_CODEC_ID_MP3, "MP3" },
-@@ -354,7 +361,11 @@
-     }
- 
-     audio_is_open = 1;
-+#ifdef HAVE_FFMPEG4
-+    if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+#else
-     if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+#endif
-         audio_inbuf_samples = 10000;
-     } else {
-         audio_inbuf_samples = c->frame_size;
-@@ -447,8 +458,13 @@
-     audio_st.samples_count = 0;
- 
-     /* Some formats want stream headers to be separate. */
--    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
-+    if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#ifdef HAVE_FFMPEG4
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
-         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
-+    }
- 
-     /* create resampler context */
- #ifndef HAVE_FFMPEG_AVRESAMPLE
-@@ -781,7 +797,11 @@
- 
-     /* Some formats want stream headers to be separate. */
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
-+#ifdef HAVE_FFMPEG4
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+#else
-         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+#endif
-     }
- 
-     if (audio_init_done) {
-@@ -961,6 +981,7 @@
- 
-     video_st.frame->pts = video_st.next_pts++;
- 
-+#ifdef AVFMT_RAWPICTURE
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
-         AVPacket pkt;
-         VICE_P_AV_INIT_PACKET(&pkt);
-@@ -971,7 +992,9 @@
-         pkt.pts = pkt.dts = video_st.frame->pts;
- 
-         ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
--    } else {
-+    } else
-+#endif
-+    {
-         AVPacket pkt = { 0 };
-         int got_packet;
- 
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index 8ff137c8c207..2294b11c8d08 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -7,13 +7,10 @@
 	</maintainer>
 	<use>
 		<flag name="ethernet">Enable ethernet emulation</flag>
-		<flag name="fullscreen">Enable the ability to run fullscreen</flag>
 		<flag name="headless">Include the headless variant of the emulator</flag>
 		<flag name="mpg123">Enable mp3@64 cartridge support</flag>
 		<flag name="parport">Enable parallel port SID support</flag>
 		<flag name="pci">Enable PCI device discovery using <pkg>sys-apps/pciutils</pkg></flag>
-		<flag name="sdlsound">Use <pkg>media-libs/libsdl</pkg> for sound support</flag>
-		<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">vice-emu</remote-id>
diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild
deleted file mode 100644
index 083344470e3c..000000000000
--- a/app-emulation/vice/vice-3.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Versatile Commodore 8-bit Emulator"
-HOMEPAGE="http://vice-emu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa ethernet ffmpeg fullscreen +gtk ipv6 lame libav nls oss png pulseaudio sdl +sdlsound threads vte Xaw3d zlib"
-
-# upstream says gtk3 and sdl2 shouldn't be exposed yet.
-#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
-REQUIRED_USE="?? ( gtk sdl )"
-
-#	gtk3? (
-#		x11-libs/cairo
-#		x11-libs/gtk+:3
-#		x11-libs/pango
-#		vte? ( x11-libs/vte:2.90 )
-#	)
-RDEPEND="
-	media-libs/giflib
-	virtual/jpeg:0
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	ethernet? (
-	    >=net-libs/libpcap-0.9.8
-	    >=net-libs/libnet-1.1.2.1:1.1
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-		x11-libs/pango
-		vte? ( x11-libs/vte:0 )
-	)
-	lame? ( media-sound/lame )
-	nls? ( virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl[joystick,video] )
-	!sdl? (
-		sys-libs/readline:0=
-		x11-libs/libX11
-		x11-libs/libXext
-		fullscreen? (
-			x11-libs/libXrandr
-			x11-libs/libXxf86vm
-		)
-		!gtk? (
-			x11-libs/libXmu
-			x11-libs/libXpm
-			x11-libs/libXt
-			x11-libs/libXv
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? ( x11-libs/libXaw )
-		)
-	)
-	sdlsound? ( media-libs/libsdl[sound] )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	media-libs/fontconfig
-	x11-apps/bdftopcf
-	>=x11-apps/mkfontscale-1.2.0
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!gtk? ( !sdl? (
-			x11-libs/libICE
-			x11-libs/libSM
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.27-autotools.patch
-	"${FILESDIR}"/${P}-ffmpeg4.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/building//' \
-		doc/Makefile.am || die
-	sed -i \
-		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
-		doc/Makefile.am \
-		doc/readmes/Makefile.am || die
-	sed -i \
-		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
-		doc/html/Makefile.am || die
-	sed -i \
-		-e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \
-		man/vice.1 \
-		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
-	sed -i \
-		-e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \
-		configure.ac || die
-	sed -i \
-		-e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \
-		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
-		src/arch/unix/archdep.h \
-		src/arch/sdl/archdep_unix.h || die
-	rm -rf src/lib/{libffmpeg,liblame} || die
-	sed -i \
-		-e '/SUBDIRS/s/libffmpeg//;' \
-		-e '/SUBDIRS/s/liblame//;' \
-		src/lib/Makefile.am || die
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-	local gui_arg=() snd_arg=()
-
-	snd_arg+=( $(use_with alsa) )
-	snd_arg+=( $(use_with oss) )
-	snd_arg+=( $(use_with pulseaudio pulse) )
-	snd_arg+=( $(use_with sdlsound) )
-
-	gui_arg+=( $(use_enable sdl sdlui) )
-	# The gtk UI code has raw calls to XOpenDisplay and
-	# is missing -lX11 if vte doesn't pull it in.
-	#if use gtk2 || use gtk3 ; then
-	if use gtk ; then
-		use vte || append-libs -lX11
-	fi
-	gui_arg+=( $(use_enable gtk gnomeui) )
-	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
-	gui_arg+=( $(use_enable Xaw3d xaw3d) )
-
-	# --with-readline is forced to avoid using the embedded copy
-	# don't try to actually run fc-cache (bug #280976)
-	FCCACHE=/bin/true \
-	PKG_CONFIG=$(tc-getPKG_CONFIG) \
-	econf \
-		--enable-parsid \
-		--with-resid \
-		--with-readline \
-		--without-arts \
-		--without-midas \
-		$(use_enable ethernet) \
-		$(use_enable ffmpeg) \
-		$(use_enable ffmpeg external-ffmpeg) \
-		$(use_enable fullscreen) \
-		$(use_enable ipv6) \
-		$(use_enable lame) \
-		$(use_enable nls) \
-		$(use_enable vte) \
-		$(use_with png) \
-		$(use_with threads uithreads) \
-		$(use_with zlib) \
-		"${gui_arg[@]}" \
-		"${snd_arg[@]}" \
-		--disable-option-checking
-		# --disable-option-checking has to be last
-}
-
-src_install() {
-	default
-	dodoc FEEDBACK
-}
diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild b/app-emulation/vice/vice-3.4_p37498.ebuild
index 2971e5b5d0a4..9e9f6f6462e5 100644
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index e08cefd006b2..a9e81c0c0dc3 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,4 +1,4 @@
 DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a
-EBUILD virt-manager-2.2.1-r2.ebuild 2391 BLAKE2B d639615e77942cc2aeb23947228ccc6c7b6b40ddc5ed630db8c0768d12c17474585442e46ed85c350918e5a01db1e9a8d4cf4c8bd5c65af5ea379567c7beefb5 SHA512 3d059ffaba72e7a781b7b817da76066c47b273a3572f6245f025fcf3a56d97ce5f867e071a13756802fcde87789000d417385fd0132d59bd027c8603681f7d45
-EBUILD virt-manager-9999.ebuild 2433 BLAKE2B 460b7a77ec28eb915ecb7c01f20a0b3b47f80dfeb87f64408a3f49f2285bf95ffdc41dfb246610651ec17b4f664dd97175093893e55103046fed4fbed6d6f198 SHA512 2196058bb6ef7f2ad081b2b1266397050f1a5ee9d1da66d09c54168bcbbd1888f182447829501a00cd9be31dd633b4895c683f5564d72b8686fab4acbb8dbfb7
+EBUILD virt-manager-2.2.1-r3.ebuild 2428 BLAKE2B edc17b2b770ed6ee1fdab7731a6c7282837470ed80c2865953598fbc211cee49530fdf6ad0e91d86c76acdbb76d36378c0c25a102973765cbcd0271717edc5e1 SHA512 a4226f0f3aa7b79a64dce3d2e786640b6c2ba13950e16788fe379f11bcf591d85cb11f73cb4c36b995221bd854561199f4727c57a84fd762f6ec6dffd11e63fd
+EBUILD virt-manager-9999.ebuild 2470 BLAKE2B 2c580d80a54ac043fa8f5e832a09bb33135e5f2270a037b9be17b0e7e3b21307cb650eeec48f2905c8283015b171b58d4ec337a4105873fa616ac0da4426a578 SHA512 c9715914829a0d4b597739cfda257ee3c430b9bc25406369cfcb4add225d3986878d32f9d24c2945acf24d7f44ab5db4d2692796e09d826f6ec467441c8e05e9
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-2.2.1-r2.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild
index ee09a0d573f2..091a92f50ba5 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.1-r2.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
+DISTUTILS_USE_SETUPTOOLS=no
 inherit gnome2 distutils-r1
 
 DESCRIPTION="A graphical tool for administering virtual machines"
@@ -59,13 +60,15 @@ src_prepare() {
 	distutils-r1_src_prepare
 }
 
-distutils-r1_python_compile() {
-	local defgraphics=
-
+python_configure() {
 	esetup.py configure \
 		--default-graphics=spice
 }
 
+python_install() {
+	esetup.py install
+}
+
 src_install() {
 	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 	distutils-r1_src_install
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 5b01845daf0a..b7b613db8926 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
+DISTUTILS_USE_SETUPTOOLS=no
 inherit gnome2 distutils-r1
 
 DESCRIPTION="A graphical tool for administering virtual machines"
@@ -60,13 +61,15 @@ src_prepare() {
 	distutils-r1_src_prepare
 }
 
-distutils-r1_python_compile() {
-	local defgraphics=
-
+python_configure() {
 	esetup.py configure \
 		--default-graphics=spice
 }
 
+python_install() {
+	esetup.py install
+}
+
 src_install() {
 	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 	distutils-r1_src_install
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index bf1532465e8a..2c83629faec5 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,3 +1,3 @@
-DIST virtio-win-0.1.160.iso 322842624 BLAKE2B baa1475055c2df609931e48cc4a18a2e24fcbf07ec9df80a94b1bdb77ca76c1278c5269a95422ea5c2363df424a30b8395b539689982d609096823ebc880afaf SHA512 71c9de9086fa5b5d764d210b5f7d0238c8b294aaf17704eabe16fe65c5649944126924870f0e2eb05d030c2f521770cb5760f4016d29319f5f1bd5deb7955e50
-EBUILD virtio-win-0.1.160.ebuild 514 BLAKE2B 92be643978614da46a322ec5a9c4e772160bb1fded2996ad8ca17ccf1478ee6c18c657c02d5126963ec4afb3a9a2391ca7d4f7f3dc82869550e92b5a92173e57 SHA512 45926753c1b078acb955c2713b6b835310ee01a041d5338357bc696198ee975fc8dd64235a0e7a92fdfcda974e1f9e54db29f6ebdb4244fb757277f3723d369c
-MISC metadata.xml 268 BLAKE2B fc720112c357f73a31bc48f4c85526021faa1023465e8ab5c2c990fb66aabe737fa03ac9413ee5dacb2a2e169865280149c58d4b96c68ba82520b658e43131de SHA512 5ec3669490d9310461ab6cfaa58eed747c762753578026827818ded5bd9a5221f0860fa2c9308adee2b11ee7d328a8c3b4908fd2ba76c5c4949524c8fd48ca64
+DIST virtio-win-0.1.173.iso 393902080 BLAKE2B a90da9d4e23a95c4cf9f02cc010664d87c987d7a9b82a90b534ec69041f763d73d7b37b1378078a162e7ef4f06b9d4cd6c5b7c4b98d77ff75bcd0d06a8ede8a2 SHA512 49cba35d74a3f480f6d23a57b68217f5732e8bcfb7657a4a87f16b286ad2c6ffd2509f034d0b4f363a389ce50d4d0e80e241f7ddff3e93b5dc315dad1713f08a
+EBUILD virtio-win-0.1.173.9.ebuild 630 BLAKE2B 5d5d9ddedd33ca2ad52c1b213edd46f7fbf2b3c310e2cbc176398bcdd29dd576bb542d1ba280720c8e717aa2f37e8aa88aa22f92c04cf42d520e45e99cb9a46c SHA512 7adef1a78a2173de5c41cb2bb2b0325a3163800c0089f6936dd21fa56d7aa8f94889c7b9da7c2a387342c27623e7e6ff55fb55ff5cd15a08025d89dec6b7a96b
+MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
diff --git a/app-emulation/virtio-win/metadata.xml b/app-emulation/virtio-win/metadata.xml
index 4ded5b79f93d..d155fdbc0406 100644
--- a/app-emulation/virtio-win/metadata.xml
+++ b/app-emulation/virtio-win/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">crobinso/virtio-win-pkg-scripts</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtio-win/virtio-win-0.1.160.ebuild b/app-emulation/virtio-win/virtio-win-0.1.160.ebuild
deleted file mode 100644
index d241154f4ed5..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.160.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
-SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-1/${PN}-${PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${PV}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild b/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild
new file mode 100644
index 000000000000..8f43008b5179
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.173.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_cut 1-3)
+MY_DW=$(ver_rs 3 -)
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
+SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 6f974654e6d1..892cbac4355f 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,11 +1,15 @@
 DIST VBoxGuestAdditions_5.2.32.iso 49620992 BLAKE2B 04853f4b9a95898263ca7238a78b5d8751882a21874e4745d675642185542eb617f2a74b3e55b4444067822511d33b6d358e37e179d1b1c6464d701a8ab45a54 SHA512 86f1d7071a9033b7826dcacbcf23822acc772d909af8a8a12345bd5fe68375677b522d0e1987f2908412d5a29369d0a1221fd099f8b692c8d25fe9cbe40fd11e
 DIST VBoxGuestAdditions_5.2.36.iso 49661952 BLAKE2B 181c26b5362ebdd8508bcc5b3f75993fc6ab7036093004a614c5153a8c772e2bdaab309adc452cfe78ee09fbd528c00a875193f4183b75e3cb6ce169b4f68507 SHA512 4be8e943f61b17445b17d092db84ddd6841d933bf2b8dd1fad7cc0095d31932347f861e110917ca6d0ebec2ee62b2afa7e5977123830e50a4e0e4a6c1872e28e
+DIST VBoxGuestAdditions_5.2.40.iso 49770496 BLAKE2B 4d9ca6cde78da325575f56f0b12d7beccfd09a564b98c808495ac8425f47bd0ce1b86a5cfb79c30256b36b109032013a0677ff07c45808324ca3b85efe5b7f51 SHA512 a2ea5539de454bb062dffa0b61ac4962c8932539ab0cdaae98f7703528c201bc856b0597b92c20e83fab5b97981be3811061386022ca3687d8c102983e05ec7b
 DIST VBoxGuestAdditions_6.0.16.iso 77201408 BLAKE2B 713381429cbef6685c4890c47dc0896571ca24cacc96d73903cdd91220a6b5ba7c6012c69d62489eaabd1fe75dd0000a3415d7d316fbc79b3b8ac2cf45cba75a SHA512 d17de374714023b02fef76bad53a15fe4d5d4bc752e900843419e9c3ba4988bd9bdc8fd6797bb4fdfa722d0f41ff144ed6865a0778609a7aea5e96de34c7beb8
-DIST VBoxGuestAdditions_6.1.2.iso 59539456 BLAKE2B 904105943fb4004d3f91ef48cf8999bb1e4a8d4658e99b8d815f8f7031cedb870a1ae5825473cabbaedb38d2e9e2df12e4e8ed52c33a7e4595e0a37f6d51ade4 SHA512 c0d916c50f7377feade9a00417c759666442dd881f9e863d9704e12dda274e14bd84313a5bd340192a8e1d634eab4d69379bfee06324207e1025fe7af1a8c07c
+DIST VBoxGuestAdditions_6.0.20.iso 77297664 BLAKE2B 72c3e6b3c757d866bbf94cb2593b81d05362dcb1485db8412c8c3a95a7619754eeeaa75f8d813bd26bb3c27a718e3f687fb5904dd2574d29eb96988f48fcc67b SHA512 16c69ddee28650ac35ee25bead96568cdfe269042ed6a4138b5870322ff9dab405ea844d75886a0b52c44f0c47a34814a30d48734a6683df6b6ad042b1bea68d
 DIST VBoxGuestAdditions_6.1.4.iso 59688960 BLAKE2B e7c86bbb2eddfc1e9dd555a5d9e5b808194a0124f0cf3bfb09aa226a89cd348cf979f523361fbd0cc400912709310592f938e56ef410a9f81c1bb514db58c2e7 SHA512 a1e8f404c3d58adc60adb6a14cecc3e56f0705bd810891038d2fd6691e9f54f61daa4ffe804c77005b2764cb7c7c8d97fb67077e05aca94cf21c4afa89cd7f4a
+DIST VBoxGuestAdditions_6.1.6.iso 59760640 BLAKE2B dac4f92c851d37ad995ff631f1b7ecda702c3dce5b299232fc7ec956009fb13e09fc0e5d6980d09c4a9f1b58ab5fcff93c791ecc0fb184cefa701f072e68b87c SHA512 b87cc85d46ffcbf6ae8b21ef5932144b956f59925a1c5a87bbcc81dd9dbd845b1f3f282b92cea3dcc15d3e338e676dd58f81762e27019c1fb6736c541b1fdd9a
 EBUILD virtualbox-additions-5.2.32.ebuild 710 BLAKE2B 300f594457535bad16e10b7242da27091ff0e8fe20e3db76b73f4b6a47e525f4a39f972c2ab80b0ddf6a1908d2e84996368d12e73e8feb3c7a16cee2e325f447 SHA512 ee73c7a249ae300709068273d0fbde262883334d079fe618d3fc8715112c3c52b8b07cde5229f8fe8312cc7611088ba0742fc4233a25fd75683e58dbe1376cb6
 EBUILD virtualbox-additions-5.2.36.ebuild 711 BLAKE2B b26c7ff1e2302c53e08ca632ca1531b11529f714702e41ebf0c9626dd0014f7955b8f1c247592cc0ce70504defe3cf208d4104b9953358d185ed87c2d0913137 SHA512 455688eafa83a3b01af4c8c516ccb102b7f6008e9e029fb5543b843c9926bc6f59aa0d5bd2da933ffc0d3ae923d90c35171bbc1dd499983a5a5be4070be73ecb
+EBUILD virtualbox-additions-5.2.40.ebuild 711 BLAKE2B b26c7ff1e2302c53e08ca632ca1531b11529f714702e41ebf0c9626dd0014f7955b8f1c247592cc0ce70504defe3cf208d4104b9953358d185ed87c2d0913137 SHA512 455688eafa83a3b01af4c8c516ccb102b7f6008e9e029fb5543b843c9926bc6f59aa0d5bd2da933ffc0d3ae923d90c35171bbc1dd499983a5a5be4070be73ecb
 EBUILD virtualbox-additions-6.0.16.ebuild 768 BLAKE2B bf059ba8cc66f0cd95ed56f055a0c552621817f036996a5df95f664f7689a642453d3b065eea0b2cc510ca7a0fdcb1d39c72704e935b04ed21aa870c3a3bc8c8 SHA512 4c3281e2c7069f644e9e8b2d2ac181fe5be9b4805c7788a8009f3269595d800af17f4e97101ff3696d4a9568f104502fa162c92c3883b0808bafa3b82e07ce18
-EBUILD virtualbox-additions-6.1.2.ebuild 763 BLAKE2B c57b3c6b7602771dc32a940bd3c770407809cd5acb5b02e80c0f9c2e5cbacd000e267a2cf4081f19ea17a4744b2e0eb7e40dde9662fc2ef00f478a83522b3dfa SHA512 eeb8c4d8333f2044e41eb908463b37508fa31a74cd4eefa09ec9da7def8790d71a9f55c7404c9d2355480b5547adcf0f5438fa35a0b0c9513307f26cf46b8ff5
+EBUILD virtualbox-additions-6.0.20.ebuild 768 BLAKE2B bf059ba8cc66f0cd95ed56f055a0c552621817f036996a5df95f664f7689a642453d3b065eea0b2cc510ca7a0fdcb1d39c72704e935b04ed21aa870c3a3bc8c8 SHA512 4c3281e2c7069f644e9e8b2d2ac181fe5be9b4805c7788a8009f3269595d800af17f4e97101ff3696d4a9568f104502fa162c92c3883b0808bafa3b82e07ce18
 EBUILD virtualbox-additions-6.1.4.ebuild 763 BLAKE2B c57b3c6b7602771dc32a940bd3c770407809cd5acb5b02e80c0f9c2e5cbacd000e267a2cf4081f19ea17a4744b2e0eb7e40dde9662fc2ef00f478a83522b3dfa SHA512 eeb8c4d8333f2044e41eb908463b37508fa31a74cd4eefa09ec9da7def8790d71a9f55c7404c9d2355480b5547adcf0f5438fa35a0b0c9513307f26cf46b8ff5
+EBUILD virtualbox-additions-6.1.6.ebuild 763 BLAKE2B c57b3c6b7602771dc32a940bd3c770407809cd5acb5b02e80c0f9c2e5cbacd000e267a2cf4081f19ea17a4744b2e0eb7e40dde9662fc2ef00f478a83522b3dfa SHA512 eeb8c4d8333f2044e41eb908463b37508fa31a74cd4eefa09ec9da7def8790d71a9f55c7404c9d2355480b5547adcf0f5438fa35a0b0c9513307f26cf46b8ff5
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild
new file mode 100644
index 000000000000..a36f5980fbe3
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.20.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.20.ebuild
new file mode 100644
index 000000000000..1afb82dc197a
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.2.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.6.ebuild
index 97264897ea7d..97264897ea7d 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.2.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.6.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index a8df229f2807..88efdafc8112 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -6,26 +6,33 @@ AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a2
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.36-135684.tar.gz 26989444 BLAKE2B fae15190bb434918e1ee15582c261b0bf33fbffa0ada922708892cc63ef8ca007decc7611394b056207df4f3ceb9fef781ace6f05e357e4849ae619ccc810b84 SHA512 c2a8f905ddde2c75a852e0391cfef252d45c6582994be53de8198c5c6276fe1827610620ae7e515c7cd7358ae8c9ab49766a8d968ea371895e7553955fd9cdec
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.40-137108.tar.gz 26737982 BLAKE2B 4a050067c0111929fe73695ec4f057e6b33cb224c034ca564beb65cc4fb73491b2c03e0b88ddb77ede5fbd392b0e0c9eae3226f937998b2c06484ff083b4a714 SHA512 5e3e528707b7f3eab19db5358258a69518996a98364e57df9853a549d7310b8db58b40041470f263b212fe6e2bb163e745a3b9b7567c681834d99442289407f4
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.16-135674.tar.gz 23164167 BLAKE2B 59885f2710e8169c28cc1f5e0e9edb3b761030aee1eeeb645bed1085e145a02fb2e518108cf4426620a369b17b6ce7ff4b5c442ef69b29b33257993603874d7c SHA512 de4732d1c3ef5589c3af388c71003a1a1b4b48c7c47f26ab8b5950ccd2b906c3785af2e310df27e8f9b83ecf572857c4178c8f7cb96d3a3bca103da4fbc036ea
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.2-135662.tar.gz 10925771 BLAKE2B dee75544489c467873c7cd46456be3ece0119d68947f05ac3f4163322b8023dfc9066377794d18b2662b34ff9adee11fa8afb70628e0b9014ee0b127ae0087c2 SHA512 0d86696179ccda05583fb0c876567751734904677e13bfdd8f922751dfe949bbd12753d31048fc5f32df75d89b6cb59a662c2d1f524582adab8eb90b10da1b23
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.20-137117.tar.gz 23238318 BLAKE2B 160e92cb889c765ae28eccb535478af81377d6ce2cadde53e572c41e52f230ca266975b8fe37db0743450bb9e90b23d2fe6d1974496bbb93280381de1379cdd6 SHA512 26f81b5ca3aa5c8423ea42cd1d650657351114f46373d9ca7fa08895865229008d1dff225b9caae6a603758da1c15d2b025da6add86fded377a2700bdbf9b65c
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.4-136177.tar.gz 10997977 BLAKE2B 066a0302b53a62ef27f5c0fafc499e8fd8f253807bc8808e88c32a4b71872c0cc8a57ffc6727f9e2bf7f6ba1b4e1d41c3001b8e9b3e490acfd4339bf8b02dfdd SHA512 373aa70182c4f86de14c40026f1d435832f2f377a8fe422fcbc3644b5e6a5f7abfc56df3f4b9acf1fa70cccb0bc483f12b6f70f6009a725ca0fa1b7e38dbfeab
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.6-137129.tar.gz 10999815 BLAKE2B f7c0e3ec1ba3c2eb991f76a574c1605eebc0a2a40751f6c822f37cbff743b642c9c09ce8dcebc725bdf51f2099dc044aed6486909ab7dd9d62335a1dd483bfb1 SHA512 938564a68e7b18a83022329217c2304470a3682ccd5a837be3caa1b802d3c7bed450428c1d3176fac571eb8a53dca2405ca53853163ad613ef056bc3b3beef68
 DIST VirtualBox-5.2.32-132073-Linux_amd64.run 83854803 BLAKE2B 3522df31f4f98efcd40adcaaf8ac458078adf0bbfed96c7d309d4726ddb8b8dd78eef830b3cfcb2f1fa6329bcc30ea2449f5c88cab66fa0c7d20818d7b5aa07a SHA512 aea9b27793f3363eba2ed627cc3b35ca51445946e6e9f20382fb3034afbb7470d27fdc476066c04acc595690a9e34109e8b8ce6dcab10fdc990b241b24ec47fb
 DIST VirtualBox-5.2.32-132073-Linux_x86.run 82943439 BLAKE2B 31a22e8b52a53d6948a5af533b5c8f374d703c44736678c0bbe6fd9b5298bed4817996c32902a69c2c59dbf751cea04f22beb7203deaeadf79d2424e123e9d37 SHA512 05f99b673224c2b3d94b0d568067ae5ee74200c88a3b7f6665988a9d0c35f69f81c07292b838d07c07fd6d5484979615fd255650b138387501a593f3833b9071
 DIST VirtualBox-5.2.36-135684-Linux_amd64.run 83885521 BLAKE2B 6940d009069a80f46f0e568732e81e0151e18f7c24c5ff44dab3b305e5f21d4cf729ce162f67b21b4f034b8dc7ab4df4a07a24ab00a7349083bb15d3af27c0c4 SHA512 288a4ec1ba2f245771c87034876e1cfa59ea3eaed124bd77ffed20fadc54dbf3071624a94fefeb26a7d356fb55fe206d11510136194e15b10fa9585c8d5efe73
 DIST VirtualBox-5.2.36-135684-Linux_x86.run 82974158 BLAKE2B d2c44159f00111438c51c60d4356247693c6773e8b244fcdf24cd2029b423c36edbea20e2130cf414ca5f076d04b1c085e9fac9a6b8504a991dcf76e61feb2c0 SHA512 888fafda0986066edf32c208503857ce58f220251d142ac0a327989d0d24987b2d69798143142e749c49cf37fddec23b3fe624503914327d0c53e3794db2d688
+DIST VirtualBox-5.2.40-137108-Linux_amd64.run 83865043 BLAKE2B d44f3ee6b05446fbe36b5672ec00d2ffcf5b8592ebfdfc6d091dd1bf92d821644976bad55ca390ad834d274dbe738341457888fb78030de9ddadd680362c4b11 SHA512 1f068f776ef65ed930eed0ecc6304a374ea36339c21dfc7b41a61b6e82d61f5c8de13f4b93f19500f9eccbe9e3d0f1a816c46b7b7b4d5ed195ce1ddc45c57e7f
+DIST VirtualBox-5.2.40-137108-Linux_x86.run 82994639 BLAKE2B 4f90a72d5d8952ae05bff9c50262e377c0ffbc134741eddc0aa6dccd9a575de746bcdcf0e0fc2db8f5ee36e730bcf814e0fd1291a739dd33260be7219f11c44a SHA512 580f8a6c7a1fe04132789b60ce4cb4db39f980590731e18b9c2cd7727d59efdd5250fbe80704a4542f8876d8fdc89cc048b669259e8170a28350157901bc14c4
 DIST VirtualBox-6.0.16-135674-Linux_amd64.run 127251928 BLAKE2B a0aa634be851ba5620ae89b0c324204aa4a069c1480fe0d7effcb3796900b688d39f1204778e16e407c266d06583d3531e7831b789de238bab380160a9821036 SHA512 d3cdd40a5f7d2bc1537244db1dd5c5cb58a5b7df527952c1abcd5bd701afd59dd77ec1aa90489cd7640fe88a01aac9b20cc8522750f534a5d11af6f7e125482c
-DIST VirtualBox-6.1.2-135662-Linux_amd64.run 117165515 BLAKE2B cb2aeda9997d8b5f6cfc353e95532fe687362efde03256d6136b8546a74b0a87b9fdc0e9e273c1cde7f226951af7cf5d02218c68b962573ccc80ae94be987c0d SHA512 0775a5085b4eeba5244df3896afe270c79873da2e87038566bfab63f1552b90e235e20dff5703c6faac44f1c5c4ecbfac64c29608edd8b217bf34fb08cdc1999
+DIST VirtualBox-6.0.20-137117-Linux_amd64.run 127231448 BLAKE2B 2fa6307add56b318708cdb88615aa15e39577f43c0d65e74037d6f184a3937144ae8f5abcf217809776dd19e4f3141e5bb78adadebc0be63d47bc69786cfa0c7 SHA512 9ac9b893c7cad4dc58833f6132ec0da6564a11112d8bef881bf1dab584abf046e167513c2e4c4ed3c5ce2e4b845c9cf99721fda657b2993b5692eb4ca15d2f5b
 DIST VirtualBox-6.1.4-136177-Linux_amd64.run 117185995 BLAKE2B 4ce483efd27c3183024f7baa3e07c1d6484767ba957582cad3111359c9d5b24b293f3b860ea566eb1bbc383710cb81b27b4e39c2aa24c9cc56dc6ba593fd1adb SHA512 14609ff7c76e93b561763456fc92dc3d3ed8d0c556af1ea0906abfb88a8fce9b8da6f392f3146945d03c7874f78d3f1f61df563c9f0160ef3315f30c286316e6
+DIST VirtualBox-6.1.6-137129-Linux_amd64.run 110530008 BLAKE2B 9f2f2e65ace7bc5919dcaba23b0a979a1b246af65722fd955dfb6110bda0fc119f9388e8d404bbdbf00bd8a96c25c505dc7a3589fc98680cdb115f1c1327936d SHA512 a4ea1a37bcbc70a9be3bf201dac06e31bb5d8e4dd9d9f04fb8f2fc6387c6ae165c0812d357062e1593a2d5a6d7902ba068984bc8658750df49d991025b96dc05
 DIST VirtualBoxSDK-5.2.32-132073.zip 10200195 BLAKE2B 0de34e166b94889c605014233142887e7a8857d1915866156a0cc63850937730ec063e63b550f0d39ad241259158f033b028dbab7eec3f6f38c3715139413b3a SHA512 ccbe2af819bff46055bd6f079a03d69e721a09286e83d4f650583bc7692f5d19ae1a725cf3a6eb1b75167a2c73ff2e020d1f932bf9cfeee9ee709d1174c4cabf
 DIST VirtualBoxSDK-5.2.36-135684.zip 10203411 BLAKE2B 241dca39482d620063476b86514d3b71d69b3187be15fdf8774ee3fc34ff98ac66ba97baebe4cc107727a07594d3c124c05867a7f62661cf11bc6bd43528cdba SHA512 646bc84b605c236ecf9c38fd14cfc5f2d1ddf72a874482dd9a0f799bc099e3c2ca11512607d988c411495fcf12495ea49e0fabea2ca04a22e73efecb94928190
+DIST VirtualBoxSDK-5.2.40-137108.zip 10201020 BLAKE2B db4a2fd69fdc3ab4201c086c15f14144dd1f75e87d13c4493aaeaf2b69e06a599623416e17a3715c9836b7b7bf36aaba34c06e27ddd70900ca6c5fdd43e311e1 SHA512 15bf89ca622396a5b2f66fb42762959548e8d0b2e0bd3b63223bcccff449f5c094af0315deecae167e105276915fb6b2e61a1f71465be4e85b52a58e313a2830
 DIST VirtualBoxSDK-6.0.16-135674.zip 10803791 BLAKE2B 2b8507cf5143370ab753f55b27c1890ded25b1ed28457bb8ba094f2b2fa7e813d0605a25c5adbcbe828aec34c9fe7526e7a60c2e1cfc1085a611959474016280 SHA512 c7b811b89d6fa892c86c60e41922051d75ff079c9868eaf3b454aca73b3de77aa9361422216668203d105c910fffa94bd7b4bae4243c769660209c979009d7fe
-DIST VirtualBoxSDK-6.1.2-135662.zip 11174224 BLAKE2B 54ca9c127b15ab2917d9150313ae3c779efa80e07440f8e24694f14440120a415b35aa0b906de4b03330dd9c73c9dcb978bb0a1b39e438f39f46da4dfa4ddc3a SHA512 4011690019ae7804d85cdbf2c1649588472ef0db019c54507f30cb319cb28ffe27a36bc8ee59d4f1cba60c9a04f0f52096ac0596c826e8a5bb4bba1a7941e134
+DIST VirtualBoxSDK-6.0.20-137117.zip 10803680 BLAKE2B aaec9c6b9f0d758528f8490920bc98c594e8aa2bd241f941e9093553d5353b4999f4041519198740344da92af3d7fb7992dcb6945a55d5471d9952a76daea4f5 SHA512 b2574f7d93c3d92a09a2cd18f68db3ac78d5c51d454cc322800b0d8555c4fdb541b5c797e11795dda51f5998f98dc9ed4839b836f4c64f8f95211b6ae71c198d
 DIST VirtualBoxSDK-6.1.4-136177.zip 11173848 BLAKE2B 816b18bcfe2cde169dca3c5f3e89854b61f2bb7b59d28749f994c8f9a60e18c5f1cbe659c53c7a3b49a0bcb90959c0cd0b36c2254879f735e835b463927b2190 SHA512 e7b2a0dc892a9989cd0142edad131d0cf4240029d98f80a230e3e401be3a6f1d8c82c810b19b7e865946145b77cd87d91602adc640c182a2dfbdae1c21821a48
+DIST VirtualBoxSDK-6.1.6-137129.zip 11176791 BLAKE2B 9ad2592604e9b007c8d302d8efb67a3b5e069549bca7e6330a417d1c719e2de533e0f429909f95cfb77a5633eb806955c4ae4113ad6707af33854b7605215531 SHA512 d46549657fd8f2eb95196c310a9d81163fb231ce663ac7e24e1e8ac15b5830b25188c547db91fdca5b9524c2ba340f0b638e34863f8e26b4d118bf832b7f99bf
 EBUILD virtualbox-bin-5.2.32.132073.ebuild 8328 BLAKE2B 7cbf1dc1c97c89206aed7d59ea9af49c1ed43335f98dd954001b891692f20ac77db051c1d0c9fa45094d99f5aa72cfb15a07e853a9c7542cabd8837c826adab1 SHA512 eaef0196a2d0bc5b0b50ba04125c33100821018a91149fd07e97e4cb85082f4d2df78536343905756608feb89fcb3b87a1a9aee07043555e72dde6b91c4f9c9b
 EBUILD virtualbox-bin-5.2.36.135684.ebuild 8329 BLAKE2B 83fdc9985fc0ce401ecf69e178e57a928c8befcd46645f7f84c1c27b83dc696183b9a89b70f408fd8c9ab7744625f3ef98d53042744ad02f68a6fb6d81350389 SHA512 bfa64d3d0c43ffdad8fa1ba95325f1cee497478c6750deaf1e8d23f8ce0d5abcc272db2503f2b524135af29840df5a65295018547138a0d42c1763cbf5d11549
+EBUILD virtualbox-bin-5.2.40.137108.ebuild 8329 BLAKE2B 83fdc9985fc0ce401ecf69e178e57a928c8befcd46645f7f84c1c27b83dc696183b9a89b70f408fd8c9ab7744625f3ef98d53042744ad02f68a6fb6d81350389 SHA512 bfa64d3d0c43ffdad8fa1ba95325f1cee497478c6750deaf1e8d23f8ce0d5abcc272db2503f2b524135af29840df5a65295018547138a0d42c1763cbf5d11549
 EBUILD virtualbox-bin-6.0.16.135674-r1.ebuild 8513 BLAKE2B a7f8888ac85d53c08e8c70602c951e1c0432c5b908d29e1a1e9dfe762778f5d11d6e28b6bd392c6a9d40d00cd1c1a964fe6400b79d0c59422d950ef53b38c9ff SHA512 1f6fe943790a95332b7fe3c240fc355b842dd34e193605f73171507fca7fec77cc0da322cc0815580930c29a21594dfbe2305bf831ef49fb280a72e9fef23a1f
-EBUILD virtualbox-bin-6.0.16.135674.ebuild 8491 BLAKE2B 273267c5f01e3eb5acf282f436200879755854791f60e53b7f9e71a4959f68523c274969ed924b42b5ec13016e1e4e407112b711079a3c08ef57a58bb38f6076 SHA512 e0e0dc6d94601ddca2b01dee94feb99ed9e770d9a85d8d2056c2ea9d7b61b03f810a4b2a52e410fc4e0ed5923cf7260c1ac07e3e3ba52ac583ceec0911a0ce6b
-EBUILD virtualbox-bin-6.1.2.135662.ebuild 8491 BLAKE2B 2c442d3da8a91dffbf2c942af60a9a0961a661446b7b173215f67ac846b1dd633d64b6fec43b1df169cbad1e18cf80dd11453bc89ef46a06ec8c4cff047a23f6 SHA512 165c5015a0dbf1a4d417fa30da12a4f2cbec44f9826494899da2aae3ea1400603c8a50c790157714a5fdffd97ad3a62168d9a31b8d583761a302cc119bcd8687
+EBUILD virtualbox-bin-6.0.20.137117.ebuild 8513 BLAKE2B a7f8888ac85d53c08e8c70602c951e1c0432c5b908d29e1a1e9dfe762778f5d11d6e28b6bd392c6a9d40d00cd1c1a964fe6400b79d0c59422d950ef53b38c9ff SHA512 1f6fe943790a95332b7fe3c240fc355b842dd34e193605f73171507fca7fec77cc0da322cc0815580930c29a21594dfbe2305bf831ef49fb280a72e9fef23a1f
 EBUILD virtualbox-bin-6.1.4.136177-r1.ebuild 8513 BLAKE2B fd3084df313b23a8c45282bc0b0aeabc3e1796182f2388b255c6f2af83c7808995f5c6beacc222e8bc49d500ccddf8b0b8ea7fa3fb237f83363894a28231cfa7 SHA512 413336dc5117771963b1ddc5601a752240d41f5f990103c511639ad1aa716639eca1ff827229a4db0b95ae7a552f1a6ffd95a09228a1e89ca899361582f2b9d3
-EBUILD virtualbox-bin-6.1.4.136177.ebuild 8491 BLAKE2B 2c442d3da8a91dffbf2c942af60a9a0961a661446b7b173215f67ac846b1dd633d64b6fec43b1df169cbad1e18cf80dd11453bc89ef46a06ec8c4cff047a23f6 SHA512 165c5015a0dbf1a4d417fa30da12a4f2cbec44f9826494899da2aae3ea1400603c8a50c790157714a5fdffd97ad3a62168d9a31b8d583761a302cc119bcd8687
+EBUILD virtualbox-bin-6.1.6.137129.ebuild 8513 BLAKE2B fd3084df313b23a8c45282bc0b0aeabc3e1796182f2388b255c6f2af83c7808995f5c6beacc222e8bc49d500ccddf8b0b8ea7fa3fb237f83363894a28231cfa7 SHA512 413336dc5117771963b1ddc5601a752240d41f5f990103c511639ad1aa716639eca1ff827229a4db0b95ae7a552f1a6ffd95a09228a1e89ca899361582f2b9d3
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.4.136177.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild
index 2d743cbbe872..accb093039ef 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.4.136177.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild
@@ -9,12 +9,11 @@ inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
 
 MAIN_PV="$(ver_cut 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
 	MY_PV="${MY_PV/beta/BETA}"
 	MY_PV="${MY_PV/rc/RC}"
 else
 	MY_PV="${MAIN_PV}"
-	KEYWORDS="~amd64" #~x86
 fi
 VBOX_BUILD_ID="$(ver_cut 4)"
 VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
@@ -30,11 +29,12 @@ SDK_P="VirtualBoxSDK-${SDK_PV}"
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
 	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-	#x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
+KEYWORDS="amd64 ~x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="bindist mirror"
 
@@ -49,7 +49,7 @@ DEPEND="app-arch/unzip
 
 RDEPEND="!!app-emulation/virtualbox
 	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MY_PV,,}
+	~app-emulation/virtualbox-modules-${MAIN_PV}
 	!headless? (
 		dev-libs/glib
 		media-libs/fontconfig
@@ -181,7 +181,7 @@ src_install() {
 	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
 	# The compile phase makes VBoxPython2_7.so.
 	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so
+	use python && doins VBoxPython.so VBoxPython2_7.so
 
 	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
 		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
@@ -191,7 +191,7 @@ src_install() {
 		VBoxPython?_*.so
 
 	if use headless ; then
-		rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
 	fi
 
 	doins -r *
@@ -204,21 +204,19 @@ src_install() {
 	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
 
 	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} $(usex headless '' VirtualBox) ; do
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
 		fowners root:vboxusers /opt/VirtualBox/${each}
 		fperms 0750 /opt/VirtualBox/${each}
 		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
 	done
 	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	for each in VBoxNet{AdpCtl,DHCP,NAT} $(usex headless '' VirtualBoxVM) ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 4750 /opt/VirtualBox/${each}
-		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
-	done
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
 
 	if ! use headless ; then
 		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} ; do
+		for each in VBox{SDL,Headless} VirtualBox; do
 			fowners root:vboxusers /opt/VirtualBox/${each}
 			fperms 4510 /opt/VirtualBox/${each}
 			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
@@ -258,9 +256,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
 	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
+
+	gnome2_icon_cache_update
 
 	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
 
@@ -285,7 +283,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	xdg_icon_cache_update
 	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
 }
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.16.135674.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.20.137117.ebuild
index d7fb14845bcb..0b44094702c5 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.16.135674.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.20.137117.ebuild
@@ -49,6 +49,7 @@ DEPEND="app-arch/unzip
 
 RDEPEND="!!app-emulation/virtualbox
 	!app-emulation/virtualbox-additions
+	acct-group/vboxusers
 	~app-emulation/virtualbox-modules-${MAIN_PV}
 	!headless? (
 		dev-libs/glib
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.2.135662.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.6.137129.ebuild
index 2d743cbbe872..067dfbaf487d 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.2.135662.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.6.137129.ebuild
@@ -49,6 +49,7 @@ DEPEND="app-arch/unzip
 
 RDEPEND="!!app-emulation/virtualbox
 	!app-emulation/virtualbox-additions
+	acct-group/vboxusers
 	~app-emulation/virtualbox-modules-${MY_PV,,}
 	!headless? (
 		dev-libs/glib
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 4616d1452a34..953a48c2c89d 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,11 +1,15 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.36-135684.tar.gz 26989444 BLAKE2B fae15190bb434918e1ee15582c261b0bf33fbffa0ada922708892cc63ef8ca007decc7611394b056207df4f3ceb9fef781ace6f05e357e4849ae619ccc810b84 SHA512 c2a8f905ddde2c75a852e0391cfef252d45c6582994be53de8198c5c6276fe1827610620ae7e515c7cd7358ae8c9ab49766a8d968ea371895e7553955fd9cdec
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.40-137108.tar.gz 26737982 BLAKE2B 4a050067c0111929fe73695ec4f057e6b33cb224c034ca564beb65cc4fb73491b2c03e0b88ddb77ede5fbd392b0e0c9eae3226f937998b2c06484ff083b4a714 SHA512 5e3e528707b7f3eab19db5358258a69518996a98364e57df9853a549d7310b8db58b40041470f263b212fe6e2bb163e745a3b9b7567c681834d99442289407f4
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.16-135674.tar.gz 23164167 BLAKE2B 59885f2710e8169c28cc1f5e0e9edb3b761030aee1eeeb645bed1085e145a02fb2e518108cf4426620a369b17b6ce7ff4b5c442ef69b29b33257993603874d7c SHA512 de4732d1c3ef5589c3af388c71003a1a1b4b48c7c47f26ab8b5950ccd2b906c3785af2e310df27e8f9b83ecf572857c4178c8f7cb96d3a3bca103da4fbc036ea
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.2-135662.tar.gz 10925771 BLAKE2B dee75544489c467873c7cd46456be3ece0119d68947f05ac3f4163322b8023dfc9066377794d18b2662b34ff9adee11fa8afb70628e0b9014ee0b127ae0087c2 SHA512 0d86696179ccda05583fb0c876567751734904677e13bfdd8f922751dfe949bbd12753d31048fc5f32df75d89b6cb59a662c2d1f524582adab8eb90b10da1b23
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.20-137117.tar.gz 23238318 BLAKE2B 160e92cb889c765ae28eccb535478af81377d6ce2cadde53e572c41e52f230ca266975b8fe37db0743450bb9e90b23d2fe6d1974496bbb93280381de1379cdd6 SHA512 26f81b5ca3aa5c8423ea42cd1d650657351114f46373d9ca7fa08895865229008d1dff225b9caae6a603758da1c15d2b025da6add86fded377a2700bdbf9b65c
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.4-136177.tar.gz 10997977 BLAKE2B 066a0302b53a62ef27f5c0fafc499e8fd8f253807bc8808e88c32a4b71872c0cc8a57ffc6727f9e2bf7f6ba1b4e1d41c3001b8e9b3e490acfd4339bf8b02dfdd SHA512 373aa70182c4f86de14c40026f1d435832f2f377a8fe422fcbc3644b5e6a5f7abfc56df3f4b9acf1fa70cccb0bc483f12b6f70f6009a725ca0fa1b7e38dbfeab
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.6-137129.tar.gz 10999815 BLAKE2B f7c0e3ec1ba3c2eb991f76a574c1605eebc0a2a40751f6c822f37cbff743b642c9c09ce8dcebc725bdf51f2099dc044aed6486909ab7dd9d62335a1dd483bfb1 SHA512 938564a68e7b18a83022329217c2304470a3682ccd5a837be3caa1b802d3c7bed450428c1d3176fac571eb8a53dca2405ca53853163ad613ef056bc3b3beef68
 EBUILD virtualbox-extpack-oracle-5.2.32.132073.ebuild 1013 BLAKE2B 822e606ede4d2981350c5a553af7632bb310ad32bb57bd6ecd6c65c9c105f3c571243df92c0be0400b483488e063f6f8def5dd7c63ab2fb5b936bccb26cfb00e SHA512 5d68098ef54662639f62de3262297e912d8b786a9509c5692363830a2f343d6ff5f217bf8db25f53dd7d9f38a86a354de8948e920437acc0fa70f4ba9fdb5a07
 EBUILD virtualbox-extpack-oracle-5.2.36.135684.ebuild 1014 BLAKE2B 98430a4df92cb561f976e21c54549b34bb6667ca8e11b8cd05fae0e143bacb5f558d9714454f4d2c7dcdc3e118c436a3245e81b8964ca006c713dfa1db620744 SHA512 aa348126bfa07bada186d37b61cb381c72259cb91649c269115aa5323e8f677add4174b7e6a6319c7b1eb116ef73d14eeef81dc59ec327a6a60e249516a7fa6e
+EBUILD virtualbox-extpack-oracle-5.2.40.137108.ebuild 1014 BLAKE2B 98430a4df92cb561f976e21c54549b34bb6667ca8e11b8cd05fae0e143bacb5f558d9714454f4d2c7dcdc3e118c436a3245e81b8964ca006c713dfa1db620744 SHA512 aa348126bfa07bada186d37b61cb381c72259cb91649c269115aa5323e8f677add4174b7e6a6319c7b1eb116ef73d14eeef81dc59ec327a6a60e249516a7fa6e
 EBUILD virtualbox-extpack-oracle-6.0.16.135674.ebuild 1073 BLAKE2B d8455cc34906468bcca74b6b97d036697f73ccaa7a9e4dd8e75c0788d77992fa47cf17b36af62252d1ab60d414139d2e6d91573205e511bdab74811dea664fae SHA512 be6697071823d650e389c892bf09fb84b5aa5ca98211ee2b13e9af3aaa5182890ab3f1d3b7fc004c9995c645e9c2a2a279dd2c8676ced2802406a7ce9d1e46a6
-EBUILD virtualbox-extpack-oracle-6.1.2.135662.ebuild 1068 BLAKE2B 33ade4b37520ea9e963ccdb462ab3e84b9670440490d30eed75dadf10facdbca1573e438d011365c8489240c06cb9ec6c208c1cc2197ad9f40e8623afcef9fa6 SHA512 0bf4c4bb7bde40d808056b2ac8877bda00c5e529f3056f1e476222ab7c8bbcb0eb6478c3636e012037c00407ae9b9a3f47271742272fa9262270b435a3312611
+EBUILD virtualbox-extpack-oracle-6.0.20.137117.ebuild 1073 BLAKE2B d8455cc34906468bcca74b6b97d036697f73ccaa7a9e4dd8e75c0788d77992fa47cf17b36af62252d1ab60d414139d2e6d91573205e511bdab74811dea664fae SHA512 be6697071823d650e389c892bf09fb84b5aa5ca98211ee2b13e9af3aaa5182890ab3f1d3b7fc004c9995c645e9c2a2a279dd2c8676ced2802406a7ce9d1e46a6
 EBUILD virtualbox-extpack-oracle-6.1.4.136177.ebuild 1068 BLAKE2B 33ade4b37520ea9e963ccdb462ab3e84b9670440490d30eed75dadf10facdbca1573e438d011365c8489240c06cb9ec6c208c1cc2197ad9f40e8623afcef9fa6 SHA512 0bf4c4bb7bde40d808056b2ac8877bda00c5e529f3056f1e476222ab7c8bbcb0eb6478c3636e012037c00407ae9b9a3f47271742272fa9262270b435a3312611
+EBUILD virtualbox-extpack-oracle-6.1.6.137129.ebuild 1068 BLAKE2B 33ade4b37520ea9e963ccdb462ab3e84b9670440490d30eed75dadf10facdbca1573e438d011365c8489240c06cb9ec6c208c1cc2197ad9f40e8623afcef9fa6 SHA512 0bf4c4bb7bde40d808056b2ac8877bda00c5e529f3056f1e476222ab7c8bbcb0eb6478c3636e012037c00407ae9b9a3f47271742272fa9262270b435a3312611
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild
new file mode 100644
index 000000000000..e91c340762ab
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+RESTRICT="bindist mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.20.137117.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.20.137117.ebuild
new file mode 100644
index 000000000000..f47c45cca29a
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.20.137117.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.2.135662.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.6.137129.ebuild
index 80cbd84e9501..80cbd84e9501 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.2.135662.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.6.137129.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 5e76f70431ca..7d291536fe01 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -8,18 +8,21 @@ AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e
 DIST VirtualBox-5.2.36.tar.bz2 118253892 BLAKE2B 6b54a8c4aa996bc595b163bce501b97d543d4335507723cf3f6f9fd723f1d9ed42bddc90a8d3028688c0ac4918bbd4a32ab94f81daa867b99d0f0ce9cc9a4c59 SHA512 3437ef3300a706c2b4a4cdabdb3b100786f727e2052659d74cde955a88363052bce48820aa92f2eea9029c08bd23a2473ff080a754dfe0671ab0a6392d887071
+DIST VirtualBox-5.2.40.tar.bz2 118285273 BLAKE2B 5d1fa572522c0a4d0124b49d68ec6f2bf240431bbe9ebd3dcf34252cc4710ec158c295c3cdb9628f045ce672a840b251b644cd92131cd4ff5ec9eab958609bc6 SHA512 3632c7184593350e484b055f85040f2a1883db4c228b04dc41e36d60de6e3123284cc9eb89ee0eba68bcd317dfdf1a5bb8594738108ea642528cafba965f3a18
 DIST VirtualBox-6.0.16.tar.bz2 154406073 BLAKE2B 8d0c9c1e6c675c5e2c7f01802072370fded7c5d7f7f581c6570b111c4aa4ac327fb74370ac36e4a4e31c6627640f8eb697a43b32fd2818f78e6b119f063d560f SHA512 ff9b726a5a865ed3fc5436e778da434ce532113898ed50434e2a561150410eabeee7194320eb115552542ecfd7c332f46f2d04fba782509dda8e66511e2a1a61
-DIST VirtualBox-6.1.2.tar.bz2 165400546 BLAKE2B 38eec6064896a250f4b7079f4bd52f23e43a6482d94bd8bba0a1102bd1cfaf00bd227f8dd2cc8382194c7d18509c6412440b8deb0d283e1e26550eb8a4cc96cc SHA512 476dedd9dd7a213bd70920f4cdf594b5336555f31e5becb15b5c01d88fa7bed917258831af31600514362384401fd7040cb748a7c76896e4a027bef05026b585
+DIST VirtualBox-6.0.20.tar.bz2 154286741 BLAKE2B e5000919dd21ebca52a508e88a54d404c0cbceb9c101d47d146b45af2509f1e922403e0ea05753dac7293870f64f8c3e478fa0c0a77611f35a3f3ce52b1fa4c1 SHA512 0ecfcc68514ca89f9bee818c43e19e999561798cba72afa27f44a46bf53c7e45e05371d973fc76b7af003e85528b19b3156531fd9bf9a0d5f30dc53665e2f48f
 DIST VirtualBox-6.1.4.tar.bz2 165450190 BLAKE2B acb99e64b095d414556d129ee96ef00d59900d8bb4f20f4fdfd4415d027eb0b1df9656b56940656c19074ea088dcca2e6e13372d38bcc30fb3a8372293a36117 SHA512 021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167
+DIST VirtualBox-6.1.6.tar.bz2 159389496 BLAKE2B 00a5dd823e3136417b075aac2f526f954b5bcaad828cb6abcbd5b3ad7412c4afe8d499e0fb2a8897f4cdab7e7084e848fde69a0d8e355c14767eafde21ebac46 SHA512 4a94417fe69c40755b55526cee67068ca8d32e71e5b6ebe0cccf46062dfb4ee76b33ac92f8b8f4748d438eda1714129360fdbaa39c16df3877b20109a7c6439a
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-5.2.36-patches-01.tar.xz 3440 BLAKE2B 66749efba87d82ed4a11ff09444c68f86f82a360e9dbb44fa6072d6c28120f3c23cff8c15bacbd38bce8b69b3d8f35c4d3d493684df962ea6e353eec413dcc38 SHA512 3cf2526d209a54e94cd94840793769fd96fa988e21555d76eda2207a7f87e04b446a28ac6c8a2954e7c00a35107c144cadaec276d171214acdcc2900eb41306c
 DIST virtualbox-6.0.16-patches-01.tar.xz 3520 BLAKE2B 1ca10c5902ece4657c6a9a03fe28c80a364d999e181cc46fc52d7dac0f0272faca6d6b19cb12d126bb0f4f6014b8c391b2b0f82ca016625410287fcc0c240778 SHA512 33b14fa1ce5526be88d6d5b72b5c86c68c37f565074a764b9d7a65f5c0a39e3d81533f9923087add71783556c1e51e816b674ce46d2800eb678846f65226fb69
+DIST virtualbox-6.0.20-patches-01.tar.xz 3464 BLAKE2B dbfd15322edf178e752139c6f82be966422ff0d3c5d914fe8d4b6980f5805d27552dc813e97ea17665004d5f6cc3486461732edaaeabdd59cd1799b2ee85af06 SHA512 04f0c9d0565c77bca334cbcfd8ac439dff1a1d8246dbea3f5e06035eff6f6dd72b54f2227d6197e2851e418ad74bb4feeef07e442f3441bc75d80a72d0d0e00d
 DIST virtualbox-6.1.0_rc1-patches-01.tar.xz 2152 BLAKE2B 5ca1aa008d0a4bd2d8ff4e8b02e506f2bdd68d41b1ae6a733362925b12a82e4f26b4040817800342c69be8e1eec73477d1731e05eb677d09948ed59881be190c SHA512 31f5b77cc86e7fe83e08df956639f50b9936aeab32d98d8f8800c4fa762245a7e6784189409006f82f8ed4bbdadbad7249e2663063448f3f0b0e157acfba6c42
 EBUILD virtualbox-guest-additions-5.2.32.ebuild 6142 BLAKE2B 052c9424b2c54340900c0435929aff514e1f93194c24500854ee46951f186c4ce3f47a58a3b8ae3dedc787b7fe34ad913cfe7915e3b027124cdf9138b5656cba SHA512 21111797b8a8cb64c42715fa918940db187a509ef8600ed3a767f7f5b192e7f7925c59d6ea2049bcfe789d26c902b20fa82491aa9dd563e665b3fb5a1d3e1024
 EBUILD virtualbox-guest-additions-5.2.36.ebuild 6143 BLAKE2B 0d0a04fc98e076a1d003aedcea38242782ee76ff4d19354214af45dd6a8df756b1c10b1774992b6b3f9470b321223888d82d1da341dac5fee0ded23ad3c724d8 SHA512 24e211f891e623acb8f6f56ca5372b8294543e214fce549aa59eb6a7dc9605386f72fa8e012cc56a44b35f171c9af50cdd73c00da4ae3fa00831fd89fe5245c0
+EBUILD virtualbox-guest-additions-5.2.40.ebuild 6143 BLAKE2B 0d0a04fc98e076a1d003aedcea38242782ee76ff4d19354214af45dd6a8df756b1c10b1774992b6b3f9470b321223888d82d1da341dac5fee0ded23ad3c724d8 SHA512 24e211f891e623acb8f6f56ca5372b8294543e214fce549aa59eb6a7dc9605386f72fa8e012cc56a44b35f171c9af50cdd73c00da4ae3fa00831fd89fe5245c0
 EBUILD virtualbox-guest-additions-6.0.16-r1.ebuild 5971 BLAKE2B 2a8fdfd3c91af9c710382b0af3fc33d9ed0186be534e0fcf904781957b5f1ff36a0f807191606fe2e3015cb35e76b5c1321c98c79bb93f083cc2b19a10758728 SHA512 0251f905b075eaef9229fd2d8f6f0e605b5b5ae087ecd2a931d4ac81a332334e3f499c3a91b56b726584e97c77c69b7b67665db0c1fa21da17bf989a08f5316a
-EBUILD virtualbox-guest-additions-6.0.16.ebuild 6024 BLAKE2B 73e9221ff3df2dc003942e83e20a16904ab250405a9727bba557b9b13be249c6fb6db14f82e080b85ba3726f76a4dbe553283f8b19299ed61c103b1ed4020002 SHA512 c60a8dd69d68f60f9fbac5671bdcd42f76ee4c241ae016b498d02b5a7e03af7658dea359c8461893cf3ecaf8e6e6433149b632c919112ba3ea2a903c036d0077
-EBUILD virtualbox-guest-additions-6.1.2.ebuild 5961 BLAKE2B 6da943ce0906fb71b92b0a0d976967005ba7a1604ef1b22fbbf7d314301c9510c302c295898d3370a395180c402ee12819bc6cfd4b866b0289c66491ffa2c3a0 SHA512 db4c607371499c767d0483e749ee0c03a69373077c0f0dae3c5629030c9c41ae8be8d1e4fb9c8b906ae23aacd7abeeda5ca99179e14a569f8623f3100e28818a
+EBUILD virtualbox-guest-additions-6.0.20.ebuild 5971 BLAKE2B d2aca16b35685ff57a6ff7242e2e97f1b57a36e20f168217ee3a00b13b4331797a9fffd33f58b8a12fcb6b69a35582050d244f4a4b57710f857b530490ca61ad SHA512 7d8b04f85ef1cac52ddda9db7c18788968528343b8f111d68eac8cb7ac155b507067486aa9d77151f20e2423f987208be9648fa554a20cac9cf34d90b0f43eb5
 EBUILD virtualbox-guest-additions-6.1.4-r1.ebuild 5908 BLAKE2B 66efeeec93ad81817b29a91a7d11ce925175f9ed4a6090b73bc0c8680872c62fe9758f22bab238dd52e957cb04060e248697ad47cc2d6eceae772672fc33113b SHA512 4c82f114e15a190ad72e87a670ce45b042e8220b6a0c84b572b108d593fa516572bc2865871da66fdcd3ef4ae917dcf8c46a6c947a9aa1f434a855ddc94bb7bf
-EBUILD virtualbox-guest-additions-6.1.4.ebuild 5961 BLAKE2B 6da943ce0906fb71b92b0a0d976967005ba7a1604ef1b22fbbf7d314301c9510c302c295898d3370a395180c402ee12819bc6cfd4b866b0289c66491ffa2c3a0 SHA512 db4c607371499c767d0483e749ee0c03a69373077c0f0dae3c5629030c9c41ae8be8d1e4fb9c8b906ae23aacd7abeeda5ca99179e14a569f8623f3100e28818a
+EBUILD virtualbox-guest-additions-6.1.6.ebuild 5908 BLAKE2B 66efeeec93ad81817b29a91a7d11ce925175f9ed4a6090b73bc0c8680872c62fe9758f22bab238dd52e957cb04060e248697ad47cc2d6eceae772672fc33113b SHA512 4c82f114e15a190ad72e87a670ce45b042e8220b6a0c84b572b108d593fa516572bc2865871da66fdcd3ef4ae917dcf8c46a6c947a9aa1f434a855ddc94bb7bf
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild
index 49b1b01c1e52..31dd32c71431 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild
@@ -11,12 +11,11 @@ MY_P="VirtualBox-${MY_PV}"
 DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.0_rc1-patches-01.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.36-patches-01.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X"
 
 RDEPEND="
@@ -48,41 +47,53 @@ BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 
 S="${WORKDIR}/${MY_P}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
 
 pkg_setup() {
 	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
 
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
 }
 
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
+src_unpack() {
+	unpack ${A}
 
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
-	eend
-	popd &>/dev/null || die
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
 
+src_prepare() {
 	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
+	pushd "${WORKDIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
 	popd &>/dev/null || die
 
 	# Disable things unused or splitted into separate ebuilds
 	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
 	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
 
+	# stupid new header references...
+	local vboxheader mdir
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
 	# Remove pointless GCC version check
 	sed -e '/^check_gcc$/d' -i configure || die
 
+	rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die
 	eapply "${WORKDIR}/patches"
 
 	eapply_user
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.16.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.20.ebuild
index d62a598fce9c..c4a0a45622b2 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.16.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-mod systemd user toolchain-funcs
+inherit linux-mod systemd toolchain-funcs
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -11,7 +11,7 @@ MY_P="VirtualBox-${MY_PV}"
 DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.16-patches-01.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.20-patches-01.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,7 +19,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
 RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
 	X? ( x11-apps/xrandr
 		x11-apps/xrefresh
 		x11-libs/libXmu
@@ -174,13 +178,6 @@ src_install() {
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
-pkg_preinst() {
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
 pkg_postinst() {
 	linux-mod_pkg_postinst
 	if ! use X ; then
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.6.ebuild
index 49b1b01c1e52..6779b7c6ccc0 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-mod systemd user toolchain-funcs
+inherit linux-mod systemd toolchain-funcs
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -19,7 +19,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
 RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
 	X? ( x11-apps/xrandr
 		x11-apps/xrefresh
 		x11-libs/libXmu
@@ -173,13 +177,6 @@ src_install() {
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
-pkg_preinst() {
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
 pkg_postinst() {
 	linux-mod_pkg_postinst
 	if ! use X ; then
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index c5389db4a721..f50e5c586862 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -6,14 +6,16 @@ AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-5.2.32.tar.xz 642428 BLAKE2B 0dda5cb5608c1eed22bea209564d53c5f7eab58ca620db2cc441e3c1ba9ad66609c4ef13df07fd29b691f2941a070f9852e8729cd386081df6a82ede345f33c5 SHA512 fadedab690cb7dee8b9a6747ed711d924bf3bce8999b24e7b64cb8738c53c2fa7372b1a8e8535e7e4ef0235aec02d4a3f1f67cd07d7621934fab684c5163329e
 DIST vbox-kernel-module-src-5.2.36.tar.xz 643160 BLAKE2B 50f1aee4d56c8b78a5e7512cb843b4e36137c38b160ca0419b2061892f29a98edaa266afb8f94ee0952e4c8af57b41da24a7d70b43a5adf5c5a15b2a4ac867b9 SHA512 b8aa3e8de1573ac728dc00d85ffbb0c25cdb118af92f16f7a4c1a7d394526b8f3005aab1b4422af6251bdafb958c6dc86b31f13c1f35116c8ff39a9288aed277
+DIST vbox-kernel-module-src-5.2.40.tar.xz 644200 BLAKE2B 0083423831bcec17f4960747c3ae939a8b4a5d2f89d6f09ad88308b078035bc6f068314d2c74182c9bb7ea0007e9c6a5b3eaa8f48ce58330294a78f66ed3faa5 SHA512 b62359104fdd0a1fd2b506cec2e4b71fa9582f1a89088d3a45791835981e1cd2e0895861b688cfbd7306454aa66c18bcd1444b26181f084b7af69f43d3e9b499
 DIST vbox-kernel-module-src-6.0.16.tar.xz 669392 BLAKE2B 19e718097ee4da75c8dc3b565735f0a378d94547911ec89af52d8dccb36d67391a2f6700575c374552cd4fc4eb8a7e3d6618a800380e473429bd3759e0d1f9c0 SHA512 8979da4cba07c9095778864af0fd29c0acf10d71ea587819954a349e8c193a03b2268bf80dca9004803d8cf2a40974994fcd1f2c6e2ac657b5032f6c04977793
-DIST vbox-kernel-module-src-6.1.2.tar.xz 664844 BLAKE2B 4fbdbac98558309c4dd1a25e44f061e2c7386c418f40b0da364914d58cf69048d9c3b1693fb75ce590c63280e79a124433ce7ff4f8f08e327ab67c5d55a163cf SHA512 f26e38a35b0cbf3ca51d98299ea2018641a35c17df5b1bc8a50352738afaafcc95efc9e61efc7d7406e203f3e514125b8afd8ed4406c190f82fe83934a042158
+DIST vbox-kernel-module-src-6.0.20.tar.xz 670656 BLAKE2B ccd4130272545e57fa64f56adcc3b16d96dac2e6e44f8057a447fddb9c51e3be7729298b835b7e335a7d0e58e0603d96ee084547375a331209cf6fa3751868cd SHA512 fa7fd8dbff39bf65852522481c4725be7aeedb3052f7a628f15defd78dd8353ae3466a294f25bc51b555db9da774ad8ca756fa8d01f45af250ab57f7e2ce7193
 DIST vbox-kernel-module-src-6.1.4.tar.xz 664412 BLAKE2B b4cfe5b2792c8f5dc2bf6038f69e32d07aaead358b144e154806f404bcc0ffbb72d470db265b96f41ca714edc0588ce06748054b8358675c24848614253a7cfb SHA512 bb247a8d2450694937095bc9c263554f805c51676e2da726f124ce4f775c69bedab95286e8d00686e04c1d8fff67f6335aa29f51a0c0ec00b862ad4e56fe290c
+DIST vbox-kernel-module-src-6.1.6.tar.xz 667048 BLAKE2B 00cdddc108d54cb829e771eac1c95f254e97465960b50f6f95595cf4f25485146d9d807de903152f3472a9e57246379f15ea82f6464fc00053e4b6b6e9dbeebe SHA512 5fb91051d6f41c25f4ac642249f2dac289c06134d3815578c094db089dc36903a573913933c34d32e8bbf5d704f7225eabb849fd559430247a89a713f059012e
 EBUILD virtualbox-modules-5.2.32.ebuild 1203 BLAKE2B 564094a44633e5193d26e88bc866b0354a3dbec67d08c6b09869c8863487fe30f939f9039a6f23fb9061e200ea428c728fa689e6db643c1710716d565bac42ed SHA512 f3ab32231d5c050d39bae1af958de61e4964b2146aed215d6eae95b96a3a2428b8411b2f9f7bf9f0e81259120f2229b81498cb8b4d9e7d18d511bfb223d4f16c
 EBUILD virtualbox-modules-5.2.36.ebuild 1471 BLAKE2B 3470de73e2295b5e3e23ab0ca3a4d0d1b87651c7394f7e74caec4357ba9d8a52f882af11fdbf75e7ad1e77ad645028450bf5fcc919616e20b36d47338b1b708a SHA512 494ef76097b12598f99bca623d0099ccacf129cd591ea6f5e16a5e147ed1d9a093708eebcac3d28f5b654586717a0001d675ecc294d747fe42298f3c1963d22b
+EBUILD virtualbox-modules-5.2.40.ebuild 1471 BLAKE2B 3470de73e2295b5e3e23ab0ca3a4d0d1b87651c7394f7e74caec4357ba9d8a52f882af11fdbf75e7ad1e77ad645028450bf5fcc919616e20b36d47338b1b708a SHA512 494ef76097b12598f99bca623d0099ccacf129cd591ea6f5e16a5e147ed1d9a093708eebcac3d28f5b654586717a0001d675ecc294d747fe42298f3c1963d22b
 EBUILD virtualbox-modules-6.0.16-r1.ebuild 1458 BLAKE2B ab41e8a5636a52182198d2f0696f29885542a6dfb3ca65fbd315606905b42300e02f451391ea5517e02c963e6296f2af44ad3e639082bd32085f7eedfffa530b SHA512 7e326b960ccc58174fffd07046f2e6d5289ee4dca3031fa1c517b3f4e3c3aaf6dfee44382f6af4372ba6d96d0e7252c73519910ad50bbc3bcc02362b53b7f0be
-EBUILD virtualbox-modules-6.0.16.ebuild 1484 BLAKE2B d477ab2b18bb21a0d24bfac1cc2e81e0ca3dae9b9b1ce4442d14b3a8aab2c98e638118d51b43e24d972c1e72afb9836dbdf570ddbca1827ce949afc4eaff527e SHA512 b45be21e1f33dca217c4d4b38d742a4c937c75aeb75596c790122ceea0212e2f054444e77e63ee97e318e4f02f3f19403d071447b84333669334e298a2ddf624
-EBUILD virtualbox-modules-6.1.2.ebuild 1445 BLAKE2B 81a87a298473d95592e4e462eb6c6c3bac473c432b1c35afa2e3780ccfb7895f6c1459d423496565605143cc69bf447f62f176d336fbdcb91002b8421e53db33 SHA512 eab1130033e8ce3cc8900d23260c97d963ebd6b5fe3a10bcad6320e454307350ed17e13d14085edb425d8226240c1648a5cd1b5a63887c3988a085ae9ee4ebe5
+EBUILD virtualbox-modules-6.0.20.ebuild 1458 BLAKE2B ab41e8a5636a52182198d2f0696f29885542a6dfb3ca65fbd315606905b42300e02f451391ea5517e02c963e6296f2af44ad3e639082bd32085f7eedfffa530b SHA512 7e326b960ccc58174fffd07046f2e6d5289ee4dca3031fa1c517b3f4e3c3aaf6dfee44382f6af4372ba6d96d0e7252c73519910ad50bbc3bcc02362b53b7f0be
 EBUILD virtualbox-modules-6.1.4-r1.ebuild 1419 BLAKE2B ff41b1aded92f404c199e42076227efd4f5fde305fbd67e4a3b1f198c58a54786f72ba0e7eaf0e789a7bd13d67c1435e91f96e329362498187234a8918d29ac1 SHA512 d12adaafe5d3369dc793e9051ca3eedb10e52a76a9d0ea1805e6476808831613a93eaf71c93a836b075af2c822580e35e2b26e03216abdbecc3b44f83cfb6345
-EBUILD virtualbox-modules-6.1.4.ebuild 1445 BLAKE2B 81a87a298473d95592e4e462eb6c6c3bac473c432b1c35afa2e3780ccfb7895f6c1459d423496565605143cc69bf447f62f176d336fbdcb91002b8421e53db33 SHA512 eab1130033e8ce3cc8900d23260c97d963ebd6b5fe3a10bcad6320e454307350ed17e13d14085edb425d8226240c1648a5cd1b5a63887c3988a085ae9ee4ebe5
+EBUILD virtualbox-modules-6.1.6.ebuild 1419 BLAKE2B ff41b1aded92f404c199e42076227efd4f5fde305fbd67e4a3b1f198c58a54786f72ba0e7eaf0e789a7bd13d67c1435e91f96e329362498187234a8918d29ac1 SHA512 d12adaafe5d3369dc793e9051ca3eedb10e52a76a9d0ea1805e6476808831613a93eaf71c93a836b075af2c822580e35e2b26e03216abdbecc3b44f83cfb6345
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild
index 79fd2c9e0fc5..9a370bd79a45 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild
@@ -15,8 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
@@ -24,10 +23,16 @@ RDEPEND="!=app-emulation/virtualbox-9999"
 S="${WORKDIR}"
 
 BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
 MODULESD_VBOXDRV_ENABLED="yes"
 MODULESD_VBOXNETADP_ENABLED="no"
 MODULESD_VBOXNETFLT_ENABLED="no"
+# The following is a security measure that comes directly from usptream.
+# Do NOT remove this!!!
+MODULESD_VBOXPCI_ADDITIONS=(
+	"blacklist vboxpci"
+	"install vboxpci /bin/true"
+)
 
 pkg_setup() {
 	enewgroup vboxusers
@@ -50,7 +55,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
 	linux-mod_pkg_postinst
 }
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.20.ebuild
index 273b3fee8640..0dac94ce21ac 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.20.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod toolchain-funcs user
+inherit linux-mod toolchain-funcs
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
@@ -36,7 +36,6 @@ MODULESD_VBOXPCI_ADDITIONS=(
 )
 
 pkg_setup() {
-	enewgroup vboxusers
 	linux-mod_pkg_setup
 	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
 }
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.6.ebuild
index 79fd2c9e0fc5..6ad5644e2ed2 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.2.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.6.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=7
 
-inherit linux-mod toolchain-funcs user
+inherit linux-mod toolchain-funcs
 
 MY_P="vbox-kernel-module-src-${PV}"
 DESCRIPTION="Kernel Modules for Virtualbox"
@@ -30,7 +30,6 @@ MODULESD_VBOXNETADP_ENABLED="no"
 MODULESD_VBOXNETFLT_ENABLED="no"
 
 pkg_setup() {
-	enewgroup vboxusers
 	linux-mod_pkg_setup
 	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
 }
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d7dc3b476c99..0b37f31a97a2 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -11,19 +11,21 @@ AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e
 DIST VirtualBox-5.2.36.tar.bz2 118253892 BLAKE2B 6b54a8c4aa996bc595b163bce501b97d543d4335507723cf3f6f9fd723f1d9ed42bddc90a8d3028688c0ac4918bbd4a32ab94f81daa867b99d0f0ce9cc9a4c59 SHA512 3437ef3300a706c2b4a4cdabdb3b100786f727e2052659d74cde955a88363052bce48820aa92f2eea9029c08bd23a2473ff080a754dfe0671ab0a6392d887071
+DIST VirtualBox-5.2.40.tar.bz2 118285273 BLAKE2B 5d1fa572522c0a4d0124b49d68ec6f2bf240431bbe9ebd3dcf34252cc4710ec158c295c3cdb9628f045ce672a840b251b644cd92131cd4ff5ec9eab958609bc6 SHA512 3632c7184593350e484b055f85040f2a1883db4c228b04dc41e36d60de6e3123284cc9eb89ee0eba68bcd317dfdf1a5bb8594738108ea642528cafba965f3a18
 DIST VirtualBox-6.0.16.tar.bz2 154406073 BLAKE2B 8d0c9c1e6c675c5e2c7f01802072370fded7c5d7f7f581c6570b111c4aa4ac327fb74370ac36e4a4e31c6627640f8eb697a43b32fd2818f78e6b119f063d560f SHA512 ff9b726a5a865ed3fc5436e778da434ce532113898ed50434e2a561150410eabeee7194320eb115552542ecfd7c332f46f2d04fba782509dda8e66511e2a1a61
-DIST VirtualBox-6.1.2.tar.bz2 165400546 BLAKE2B 38eec6064896a250f4b7079f4bd52f23e43a6482d94bd8bba0a1102bd1cfaf00bd227f8dd2cc8382194c7d18509c6412440b8deb0d283e1e26550eb8a4cc96cc SHA512 476dedd9dd7a213bd70920f4cdf594b5336555f31e5becb15b5c01d88fa7bed917258831af31600514362384401fd7040cb748a7c76896e4a027bef05026b585
+DIST VirtualBox-6.0.20.tar.bz2 154286741 BLAKE2B e5000919dd21ebca52a508e88a54d404c0cbceb9c101d47d146b45af2509f1e922403e0ea05753dac7293870f64f8c3e478fa0c0a77611f35a3f3ce52b1fa4c1 SHA512 0ecfcc68514ca89f9bee818c43e19e999561798cba72afa27f44a46bf53c7e45e05371d973fc76b7af003e85528b19b3156531fd9bf9a0d5f30dc53665e2f48f
 DIST VirtualBox-6.1.4.tar.bz2 165450190 BLAKE2B acb99e64b095d414556d129ee96ef00d59900d8bb4f20f4fdfd4415d027eb0b1df9656b56940656c19074ea088dcca2e6e13372d38bcc30fb3a8372293a36117 SHA512 021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167
+DIST VirtualBox-6.1.6.tar.bz2 159389496 BLAKE2B 00a5dd823e3136417b075aac2f526f954b5bcaad828cb6abcbd5b3ad7412c4afe8d499e0fb2a8897f4cdab7e7084e848fde69a0d8e355c14767eafde21ebac46 SHA512 4a94417fe69c40755b55526cee67068ca8d32e71e5b6ebe0cccf46062dfb4ee76b33ac92f8b8f4748d438eda1714129360fdbaa39c16df3877b20109a7c6439a
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-5.2.36-patches-01.tar.xz 3440 BLAKE2B 66749efba87d82ed4a11ff09444c68f86f82a360e9dbb44fa6072d6c28120f3c23cff8c15bacbd38bce8b69b3d8f35c4d3d493684df962ea6e353eec413dcc38 SHA512 3cf2526d209a54e94cd94840793769fd96fa988e21555d76eda2207a7f87e04b446a28ac6c8a2954e7c00a35107c144cadaec276d171214acdcc2900eb41306c
 DIST virtualbox-6.0.16-patches-01.tar.xz 3520 BLAKE2B 1ca10c5902ece4657c6a9a03fe28c80a364d999e181cc46fc52d7dac0f0272faca6d6b19cb12d126bb0f4f6014b8c391b2b0f82ca016625410287fcc0c240778 SHA512 33b14fa1ce5526be88d6d5b72b5c86c68c37f565074a764b9d7a65f5c0a39e3d81533f9923087add71783556c1e51e816b674ce46d2800eb678846f65226fb69
-DIST virtualbox-6.1.0_rc1-patches-01.tar.xz 2152 BLAKE2B 5ca1aa008d0a4bd2d8ff4e8b02e506f2bdd68d41b1ae6a733362925b12a82e4f26b4040817800342c69be8e1eec73477d1731e05eb677d09948ed59881be190c SHA512 31f5b77cc86e7fe83e08df956639f50b9936aeab32d98d8f8800c4fa762245a7e6784189409006f82f8ed4bbdadbad7249e2663063448f3f0b0e157acfba6c42
+DIST virtualbox-6.0.20-patches-01.tar.xz 3464 BLAKE2B dbfd15322edf178e752139c6f82be966422ff0d3c5d914fe8d4b6980f5805d27552dc813e97ea17665004d5f6cc3486461732edaaeabdd59cd1799b2ee85af06 SHA512 04f0c9d0565c77bca334cbcfd8ac439dff1a1d8246dbea3f5e06035eff6f6dd72b54f2227d6197e2851e418ad74bb4feeef07e442f3441bc75d80a72d0d0e00d
 DIST virtualbox-6.1.14-patches-01.tar.xz 2344 BLAKE2B cb89af8ffe0ecaa54929349abfb1541ca8630063d8282e773e4c66c3eec3ed108328b1ee81247d997981e5d49792b4019e1358b270c3622508b62e647c544ae4 SHA512 b08c2f66a050270a5c8b4d7264b1cf0afaf7809c3888c48a9b55ac75f0906bdb6bc28eef136ce032c777a810f2ce0a3cf6bb3df0259e5a6737f9ecc3ea708bba
 EBUILD virtualbox-5.2.32.ebuild 14473 BLAKE2B 4498464c3d219b3d89cd9e0c0e2e40f95e10024bd0c94e677cd1f96aa56b2f69c3278be9096eeead59c6433b0af1641eb84ba592d8eb4e76aa45b129d8f131dd SHA512 b0d156d10e8af35c19033ce1bdc9381b472c199406808789598b90b5c5fa3a694d258e06c28f712deda49bc02f258c6a0d86c070879846936b5b357f977a26b1
 EBUILD virtualbox-5.2.36.ebuild 14436 BLAKE2B f17dda45a12edc196ff15c96537adb8fa503baade17d928f50d883f7fd82818d1663729ef4a74714274243faf820d05df63232945464c0e59c33ee1dcbbe0a8e SHA512 9a8d3a395f98cc71bbc0892fc517cbc6a1fce438cd03daa739683f1689f3e21da7ec658df15454d6bb9f306d5ab1b45475b01643854c70482ae34ac0b885f294
+EBUILD virtualbox-5.2.40.ebuild 14436 BLAKE2B f17dda45a12edc196ff15c96537adb8fa503baade17d928f50d883f7fd82818d1663729ef4a74714274243faf820d05df63232945464c0e59c33ee1dcbbe0a8e SHA512 9a8d3a395f98cc71bbc0892fc517cbc6a1fce438cd03daa739683f1689f3e21da7ec658df15454d6bb9f306d5ab1b45475b01643854c70482ae34ac0b885f294
 EBUILD virtualbox-6.0.16-r1.ebuild 14597 BLAKE2B 41b401627936df95add918202877f30ad40df76d99084c6c50210e4be7b2b733ae45f553c3ad4deead23f5f1f852d2bbf5068e2ec132fb6be5506a008a384e01 SHA512 8cc1904470925a6fbc1d0150e25694f70a482c83d133ce92c4b5504203d68c0ac80ca2b03114040cccdc30fab5c25702dd717f4f8119cf869e526e4d43b6792a
-EBUILD virtualbox-6.0.16.ebuild 14575 BLAKE2B 4263cae26e3e074a225f6dd9dd679f3e8e613a3d64d77398e1473127d54c89ae9ee922fe58cd4c2e440d87ee75b65bcfe44f745d399e38b6f9ea25771f2d4f00 SHA512 c18a567b68fad1a32495909cf3e95f0075f15be7d314743368baff90656c992a5b3513e7812b1b57db5281461fed3412c2ecd24b1f87763f01f9cfd477e805f6
-EBUILD virtualbox-6.1.2.ebuild 14350 BLAKE2B f86ba667c91a014a86210f11d85a16c5f55d6ef0d53fead5da8ac660a8329f1bdd393da43d28409e1b3e032fbcd08fd1f6173b0e32d569fb362a2705f64d266b SHA512 a1cba77b6701fe99b533d9fb88f558b52da85c0989081f764c67761d2c057a6b5616073e88fec4102a75e585bb9e0ba1c512c6b7e6ef53cfc1313f844588151a
-EBUILD virtualbox-6.1.4-r1.ebuild 14372 BLAKE2B d7aee0bc42412f1c7902a42e14e6d27c0ec696f4be4f31d651c41732bea6a9ff7a87277592c59214ecf79dd2bf7dd7abed72e67e1f0080a300dfa382be8c0048 SHA512 6dd0e1691744d81eb08c873c762b07e07c3d4b210b207380e77226e3ef5b64a22bb74d7e078a84df6e9ecd476a7c2ca52eaab6ce50d4b34b220dd1c159802753
+EBUILD virtualbox-6.0.20.ebuild 14597 BLAKE2B deb61a423398a90621333f98c8490801d82ac5643bbaa6bde338593779842d11d4b58a8f156652b047c3cdace662e06d32f6902fe4dce288b363de041c2ac333 SHA512 03e2f26998374244f922f364a3c6071d5ec8bab8b68b06061bb5c1fbaf4af71b3ebb7fa85a0930ffef25a8d54e473a9e3cab175fef601aad385bac0dac5ec827
 EBUILD virtualbox-6.1.4-r2.ebuild 14468 BLAKE2B 6df18fc2376e5f568c295358c0681eb0582d098827829f15b3f80f7e53cb387d5980f35a90d446386cc1b07733d7262f8e67dade5a860ad504ca82a02d45ccbd SHA512 827573c866c28241a1a1499fa9b96b9e5799d7850c6094aed369aa8c5fc62e8d02d0e45ccbb2df8ef337ab1c4d40df8b1547f2c4a7e0846abd00e60841d7da75
+EBUILD virtualbox-6.1.6.ebuild 14468 BLAKE2B 6df18fc2376e5f568c295358c0681eb0582d098827829f15b3f80f7e53cb387d5980f35a90d446386cc1b07733d7262f8e67dade5a860ad504ca82a02d45ccbd SHA512 827573c866c28241a1a1499fa9b96b9e5799d7850c6094aed369aa8c5fc62e8d02d0e45ccbb2df8ef337ab1c4d40df8b1547f2c4a7e0846abd00e60841d7da75
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-6.1.2.ebuild b/app-emulation/virtualbox/virtualbox-5.2.40.ebuild
index fb112b9e937c..44876802ad93 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.40.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -13,17 +13,14 @@ MY_P=VirtualBox-${MY_PV}
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.0_rc1-patches-01.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.36-patches-01.tar.xz"
 
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+KEYWORDS="amd64 ~x86"
+IUSE="alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
-CDEPEND="
-	${PYTHON_DEPS}
-	!app-emulation/virtualbox-bin
+RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
 	dev-libs/libIDL
 	>=dev-libs/libxslt-1.1.19
@@ -31,6 +28,7 @@ CDEPEND="
 	dev-libs/libxml2
 	media-libs/libpng:0=
 	media-libs/libvpx:0=
+	media-libs/opus
 	sys-libs/zlib:=
 	!headless? (
 		media-libs/libsdl:0[X,video]
@@ -54,28 +52,17 @@ CDEPEND="
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
 	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-	${CDEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998.3127
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
 	sys-libs/libcap
 	sys-power/iasl
 	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	doc? (
 		app-text/docbook-sgml-dtd:4.4
 		dev-texlive/texlive-basic
@@ -85,12 +72,16 @@ BDEPEND="
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-fontsextra
 	)
+	!headless? ( x11-libs/libXinerama )
 	java? ( >=virtual/jdk-1.6 )
-"
-RDEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jre-1.6 )
-"
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
 	usr/lib/virtualbox/VBoxSDL.so
@@ -166,7 +157,7 @@ src_prepare() {
 
 	# Replace pointless GCC version check with something less stupid.
 	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
 		-i configure || die
 
 	# Disable things unused or split into separate ebuilds
@@ -197,7 +188,7 @@ src_prepare() {
 	fi
 
 	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
+	if  gcc-specs-pie ; then
 		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
 	fi
 
@@ -206,6 +197,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
+	rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die
 	eapply "${WORKDIR}/patches"
 
 	eapply_user
@@ -227,7 +219,6 @@ src_configure() {
 		$(usex doc '' --disable-docs)
 		$(usex java '' --disable-java)
 		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
 		$(usex pulseaudio '' --disable-pulse)
 		$(usex python '' --disable-python)
 		$(usex vboxwebsrv --enable-webservice '')
@@ -270,16 +261,18 @@ src_compile() {
 }
 
 src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
 
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
 
 	vbox_inst() {
 		local binary="${1}"
 		local perms="${2:-0750}"
 		local path="${3:-${vbox_inst_path}}"
 
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
 		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
 
 		insinto ${path}
@@ -295,11 +288,11 @@ src_install() {
 	# Set the correct libdir
 	sed \
 		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
 
 	# Install the wrapper script
 	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
 	fowners root:vboxusers ${vbox_inst_path}/VBox
 	fperms 0750 ${vbox_inst_path}/VBox
 
@@ -307,7 +300,12 @@ src_install() {
 	insinto ${vbox_inst_path}
 	doins -r components
 
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 iPxeBaseBin ; do
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
 		vbox_inst ${each}
 	done
 
@@ -317,18 +315,20 @@ src_install() {
 	done
 
 	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
 	done
+	popd &>/dev/null || die
 
 	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
 	# VBoxXPCOMIPCD (bug #524202)
 	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
 	done
 
 	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
 		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
 	done
 	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
@@ -343,27 +343,23 @@ src_install() {
 	doenvd "${T}/90virtualbox"
 
 	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
 		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
 
 		for each in vboxsdl VBoxSDL ; do
 			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
 		done
 
 		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox
 
 			if use opengl ; then
 				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
 			fi
 
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			for each in virtualbox VirtualBox ; do
 				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
 			done
 
@@ -371,7 +367,7 @@ src_install() {
 			doins -r nls
 			doins -r UnattendedTemplates
 
-			domenu ${PN}.desktop
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
 		fi
 
 		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
@@ -403,8 +399,8 @@ src_install() {
 		doins -r sdk
 
 		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
 		fi
 	fi
 
@@ -434,15 +430,13 @@ src_install() {
 		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
 		|| die
 
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
 	if use vnc ; then
-		insinto ${extensions_dir}
+		insinto ${vbox_inst_path}/ExtensionPacks
 		doins -r ExtensionPacks/VNC
 	fi
 
 	if use dtrace ; then
-		insinto ${extensions_dir}
+		insinto ${vbox_inst_path}/ExtensionPacks
 		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
 	fi
 
@@ -453,12 +447,9 @@ src_install() {
 	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
 pkg_postinst() {
-	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
 
 	if use udev ; then
 		udevadm control --reload-rules \
@@ -492,13 +483,14 @@ pkg_postinst() {
 		elog ""
 		elog "WARNING!"
 		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
+	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
 		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
 		elog "or else USB in ${PN} won't work."
 	fi
 }
 
 pkg_postrm() {
-	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-emulation/virtualbox/virtualbox-6.0.16.ebuild b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
index 207772925288..73d398156286 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.16.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild
@@ -13,7 +13,7 @@ MY_P=VirtualBox-${MY_PV}
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.16-patches-01.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.20-patches-01.tar.xz"
 
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0"
@@ -24,6 +24,7 @@ IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel puls
 CDEPEND="
 	${PYTHON_DEPS}
 	!app-emulation/virtualbox-bin
+	acct-group/vboxusers
 	~app-emulation/virtualbox-modules-${PV}
 	dev-libs/libIDL
 	>=dev-libs/libxslt-1.1.19
diff --git a/app-emulation/virtualbox/virtualbox-6.1.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
index 6106edde19fa..7ddbfdc42040 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.4-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
 
 MY_PV="${PV/beta/BETA}"
@@ -13,7 +13,7 @@ MY_P=VirtualBox-${MY_PV}
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.0_rc1-patches-01.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.14-patches-01.tar.xz"
 
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0"
@@ -267,6 +267,7 @@ src_compile() {
 		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
 		VBOX_GCC_OPT="${CXXFLAGS}" \
 		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		VBOX_WITH_VBOXIMGMOUNT=1 \
 		all
 }
 
@@ -308,7 +309,7 @@ src_install() {
 	insinto ${vbox_inst_path}
 	doins -r components
 
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 iPxeBaseBin ; do
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
 		vbox_inst ${each}
 	done
 
@@ -333,6 +334,7 @@ src_install() {
 		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
 	done
 	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
 
 	if use pam ; then
 		# VRDPAuth only works with this (bug #351949)
diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest
index 4c307c8663e3..ccd332d14e51 100644
--- a/app-emulation/wine-gecko/Manifest
+++ b/app-emulation/wine-gecko/Manifest
@@ -3,5 +3,5 @@ DIST wine-gecko-2.47.1-x86_64.msi 52311040 BLAKE2B 2a9aa68461d2b9f69ada1e50925de
 DIST wine_gecko-2.47-x86.msi 49266176 BLAKE2B 6b1d4ebf53fac422c2da9ae7f5b6ab9064d2b6cc20d57fe13707395e71305ac1607a440624d3a545fe1e0391bc92bf5b594173549e519eda967bb833b69b2f52 SHA512 e0d06102dcb8ec2d24e8c8c3f5c2ee5cb47c18e203dfb43d85de008d682ff874fb664fef1df909a5a7857de39c7e8ce5175e734a11964ec4cd35f8fbacaea3a4
 DIST wine_gecko-2.47-x86_64.msi 50806272 BLAKE2B 6f91d4661a322eca41042cb7a246d5bff76ab72b4bda67183fc36735c923bd6d76624f21fd3e59f63fd872704edcf0116a6e7ab4fa6f074f5098c8fb5307534c SHA512 7c2496b15a06bc6906bc60afb3ac082e3f9931207fa624e60297020211d66aa9b420a61e95730a0dbdcefbe4b26c811d0c896ecd9c363b5107d08c3fa22fef41
 EBUILD wine-gecko-2.47-r1.ebuild 738 BLAKE2B 65313aa36c6b1f633ca53894a66824517a233b8c3d4056a951f8ec98ef0c653790b86f18a5ac046a0eab2c07107f27e5eaa981e70a91c4defcda297ccb02e75e SHA512 7c35333e8defa6956de3befa1bb6187a1353137334ee272c296d00eaca731c826ccfd6cd491a76bbec1bf36c6d4e2e8be124ca3eee2a3a7411ff3446071c2d32
-EBUILD wine-gecko-2.47.1.ebuild 711 BLAKE2B 3250ae3acee2435e4ca65741cee12b03f9a366b51067e5bf48ae4f55ed0e8c689f8aeeb893c12078d24452af4d8535f1d8ca9077b65ffea91e3fd946f8264607 SHA512 b0a4f169fb7c521a3af31f45b700ed3b67c3abfbc55c97990986bb8795af38bb868b7e60631fc5cff81ce0a304f2e0bea3ab0406496a21eabed4c2f22eaf0a4f
+EBUILD wine-gecko-2.47.1.ebuild 709 BLAKE2B 1e3574c3be03d6e3e335d7c88f64f7af09af770ee12a4544181a7820404b0d9d7b7982a293e94b7264390a82114ae4cd4a8ca9580f920809d45526cb561396b4 SHA512 e3b7c02da2974dfaa2737095d7b9b394096ecb0f3af0a5fb729c1ea3d3efa3887921c719a14ba732896f1b6d7866ddab116b3f54673ebd40ecf42e5cdd116598
 MISC metadata.xml 422 BLAKE2B ba34670321999a9c388e61d8377278b08bc2fcda1412a4e04fcb8ac6a083a2030a4fa602057ce2fd1c01599da4964556ccf94b8e0174c665248f2d26c37a3267 SHA512 b8a26dd6451de2c3a022c586e1b96bab179eb1d04c04b5622ae3911140d50a63ff1fcd94685e3c1db9089136153bc306a854e0a671d27e75cc2be6bdc47eaccf
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.1.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.1.ebuild
index 7330018c9c4b..b71c2e539912 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.1.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="abi_x86_32 abi_x86_64"
 
 DEPEND="!!app-emulation/wine:0"
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index d1dbc6cfca22..6f93605d027b 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -21,5 +21,5 @@ EBUILD wine-mono-4.8.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a21179851
 EBUILD wine-mono-4.9.0.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
 EBUILD wine-mono-4.9.2.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
 EBUILD wine-mono-4.9.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
-EBUILD wine-mono-4.9.4.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
+EBUILD wine-mono-4.9.4.ebuild 501 BLAKE2B 291fc02c8a792407a6e727ae5ac2a211201fa00761a5dc613cda2bd231524f187897e39725c08114316bceee53676998c2a5b4669da56919da665af5f5643c9a SHA512 710d387c1d7dce22f8a832bf7f090aa4cd9992e6622133a7cb187f2b13a7de0a88b0afc45d53882094a475de56ba5e0e4b631d778d61186686e76f9a4380cdf5
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-4.9.4.ebuild b/app-emulation/wine-mono/wine-mono-4.9.4.ebuild
index 15aab248909e..063347ed1e0e 100644
--- a/app-emulation/wine-mono/wine-mono-4.9.4.ebuild
+++ b/app-emulation/wine-mono/wine-mono-4.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="!!app-emulation/wine:0"
 
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 43ca54f5e83a..d21e659b4276 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -14,7 +14,7 @@ EBUILD wine-vanilla-4.0.1.ebuild 17271 BLAKE2B 0dc8b48e1686efa414ae9a6ea82915435
 EBUILD wine-vanilla-4.0.2.ebuild 17271 BLAKE2B 0dc8b48e1686efa414ae9a6ea8291543507fd5caa46d9becd1739a26b5750d5a3bcbee297a7d36938667533e1bdf90cb8f84aa379da3e053d117f8e40bb4b17a SHA512 904d8f283ebe05ab6d819105c841ccb056ce1e0a688006136af8db70f11592b1492595afdfd3904f15cc669c121865473b7c646490af3fc7986212fc827f922d
 EBUILD wine-vanilla-4.0.3.ebuild 17273 BLAKE2B 31f49631a2eb96a0d20c98891c3ace1874bab916e8c75d6b6a003b7cf35b84f2014891c99defb1da6a77d2ce56353566e212282c4c4f607312245c6ec7e66803 SHA512 341f4e04041395f2b4a46dde9e46854e783936a4dbf0859946d4f7cb4b25072fb28f397b61c1916bb3aa9708d2e6a7a1e04ac157bd36f03be63b4d6180b9fb05
 EBUILD wine-vanilla-4.0.ebuild 17268 BLAKE2B a4d0bb90b8554762ae188f7261661d500c8fcf951a42ef4d5133dd45b22f28810e8794c36d290026b0fdc864ce497f9f3b3a08e67f923ed63f6e1a8fd74d4a1b SHA512 3c964ff70281401cce1fd39d9a0843321f5f1ae19a6d2bda4b3c478bb772ec064de76e143d676c37858b7d9252fe1f0cfb5460ba1148cb678e15fa7d9496c345
-EBUILD wine-vanilla-5.0.ebuild 17492 BLAKE2B 5e8cc9f593f96690437260afa02f23df732f926bb5c28d04ad9f2f8a9c620c80d062b0bff0bb334b0f8727b383719603920e91e664708ec9b96ce902aa5fe363 SHA512 fb703b58a7150b96fa4878d36d4288829d04462b39cfb6926d4dfcd4d8a918f0b0c07f71bb8d6a1045cb54193a78ddb3bce358ac0c60fea01aadf0f4cfa8d464
+EBUILD wine-vanilla-5.0.ebuild 17490 BLAKE2B 99c20620e3a74afb13605a253695de535a1fb09afd3c79c12769379993cceb2cfd387433023c7a45bb265df77eac933e3edd31fdf5e36cc7eefc28b96abd7924 SHA512 229049df1bfe362260b46a71608010be777ca26de04340aa465f6675c1e249d5e8a2b9d5f7b42c9ab55207d90bca3fd1bb6625ba5e1d27ed2993cf3b4176be0b
 EBUILD wine-vanilla-5.2.ebuild 17484 BLAKE2B 66f8ae074ec3cd6f982864e3d7294aca5c1ffdfa517cc3df4a3de5262e5fb1d0758341b2d6a1cfbe76cb9b5e65b764ec453f3ace0b9975daee720b6838b97d0f SHA512 d76182430dfc766f78de84ed8bc427aee60146562e386ff7c2889eb518b862baabade4bed3c080ccccab515d4bebdc0f19eb9368a735e6828b735f826277f8f7
 EBUILD wine-vanilla-5.3.ebuild 17554 BLAKE2B 179a429261514a73ae4fe6bf8b34fab85209e4366b6c97f25ad9450698612e041ae938454876d5f6731543d0e0492144f2b98fb0fbefeb0ac71ddb8ea3eb289c SHA512 200d007480309c951f6d3dc973065e296c43c7e1fd4dd82d1deff9c2307d897e9a87536178aa4b75cb3b2ca021fa2262386ee33a9404136ff818387c5f497d22
 EBUILD wine-vanilla-5.4.ebuild 17554 BLAKE2B 179a429261514a73ae4fe6bf8b34fab85209e4366b6c97f25ad9450698612e041ae938454876d5f6731543d0e0492144f2b98fb0fbefeb0ac71ddb8ea3eb289c SHA512 200d007480309c951f6d3dc973065e296c43c7e1fd4dd82d1deff9c2307d897e9a87536178aa4b75cb3b2ca021fa2262386ee33a9404136ff818387c5f497d22
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
index 152d8c0b6dde..a395c3bba9e2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index e40facd4003c..b58b0d69e17c 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,7 +1,9 @@
 DIST winetricks-20190912.tar.gz 679544 BLAKE2B 633c407f8560fa3aa38806befded957d0bf1276164483b08fb3ef285fe873531d6362ae6305f5a33a85891d75990e6e0271fe954358e49425c4f36f0f918f48d SHA512 a0017cc08c56a511e523116daf2024b1462460d00b3d07de87720c7912dccab3d953db3653d7d611c5ae3b457a45de8d36688ee703e805c1e1f5be5c0fa7739f
 DIST winetricks-20191224.tar.gz 683074 BLAKE2B 53e89f57883c7527e083610d4ea036887cc8e058d281ee77b0e8fd7dec8520bcd27d5d86f6cadfa5d11bc191a33571086128e6729642e7f302dc37e27b1ce402 SHA512 31c0866e78d866e569da6c1123af7823a07b6358a79fcba84296938d89a39447ec9f504ca524471abc74ec2e3b24024bbc8a579413b4fe0ee74b1d5612f5d41a
+DIST winetricks-20200412.tar.gz 684548 BLAKE2B e29eba0c73ec0649523dac0f0efd145a5c9fe60d94ae98bc55ec430f511cc5bdf3149d87289973a85a373f2f91c3bd5521470853e06f5ec4af83fc810aa4fdc5 SHA512 d6ca5628b7d296b3168ef088ca0b03aff8b73da8a139061ca64fac0685ec29bf2b7e075b89226f8ce3af511947eac45d4c72cfb1199e6b72666fc67547b77588
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
 EBUILD winetricks-20190912.ebuild 1937 BLAKE2B 231d6da06a48480219664c749f5c032135444bb8490ab49387a37f97ce1b7dfe27a8815bc0cbc3e9e3d74d764af4b0d4d0e395e89ff4a6d698770f3638abc3b8 SHA512 ecaf370db1513bd7119fbbf85710f1a7d22c250e60d51946ddea8efd885136e18012add92bb3283664ecb3995af235a1ee7cccbfee8e215950a9a08141956dd4
 EBUILD winetricks-20191224.ebuild 1940 BLAKE2B 30f6f3d7548bf5a7e10c24359b55785139893109eb216fd0d701e1699b514f34165bede6655f5fac0c7d662bb957e03caebed60d46c34f7adfac5ffac8aadbe3 SHA512 03acb9a0064760effa8aefd613f91c19a7ca4e7755ad09b10419f760aa4718dd1d04ed33aa99ef7b90a01b4903c4b9f2d418143fec22cd2bc1a30abe897f93c8
+EBUILD winetricks-20200412.ebuild 1939 BLAKE2B 94a9f211746e1f93d86c86d36b7011bcd3d85d8a65eca7210b495b5d66d2b6b7e5d9475e4c462e75ba0fbf72b72367a8abdad4e2fa087c8e75b26e34cd4565be SHA512 3f22a208a52e2bd057ee426da446e51307b872a3ebfd5dd116f57282e7cdb1c11a3e32e20adece4b60795f3fa27089ca92de5712ba11d43da65055fd3f90b604
 EBUILD winetricks-99999999.ebuild 1939 BLAKE2B 99a9a25d9981607a9f1de4c0c934c1d13659037fb5665c0b8b8c9d249e93cde40f347575b5c58dee10325fc98feeeb257905cff7e08cc4b30c8a4595fb95d715 SHA512 eb76845444cc9e93089371db14d22abe9acc6ec1ddc5d11c9b6a88354b42eeacaade10924354a5f854818b320445b0d0d05e2e89548c7f66994cd6a6b6d635c1
 MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20200412.ebuild b/app-emulation/winetricks/winetricks-20200412.ebuild
new file mode 100644
index 000000000000..a35bc33a2081
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-20200412.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+wtg="winetricks-gentoo-2012.11.24"
+
+SRC_URI="${SRC_URI}
+	gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
+	kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
+"
+
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk kde rar test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/bashate
+		dev-util/checkbashisms
+		dev-util/shellcheck
+	)
+"
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	net-misc/wget
+	virtual/wine
+	x11-misc/xdg-utils
+	gtk? ( gnome-extra/zenity )
+	kde? ( kde-apps/kdialog )
+	rar? ( app-arch/unrar )
+"
+
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
+
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]]; then
+		git-r3_src_unpack
+
+		if use gtk || use kde; then
+			unpack ${wtg}.tar.bz2
+		fi
+
+	else
+		default
+	fi
+}
+
+src_test() {
+	./tests/shell-checks || die "Test(s) failed."
+}
+
+src_install() {
+	default
+
+	if use gtk || use kde; then
+		cd "${WORKDIR}/${wtg}" || die
+		domenu winetricks.desktop
+		insinto /usr/share/icons/hicolor/scalable/apps
+		doins wine-winetricks.svg
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index c45a646118e3..cd498935f86c 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,9 +1,11 @@
 AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
 AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689
 DIST xen-4.12.2-upstream-patches-1.tar.xz 17016 BLAKE2B 5bd27f6187c13b1c4792aa81c0ca8cde0d687566e0fde322e7cb249e1c8665fca0def5a137493a04598b617c46f052cf69701257ea1b97823fd1534d94cabd8f SHA512 dab5e7a3ac1a82faff3069f07945dc0b9651f90e8e87b3c342bb98a06ac244d212dc0baf8c7f1997f285b06baca9dc57d4823bfb220ca34274bd3d6d31421b02
+DIST xen-4.12.2-upstream-patches-2.tar.xz 34484 BLAKE2B 79799a2fa9e638adf80ff1b5a1609b28747dad254da2e8ebd94afd75d5b7c061d25d507e7d388af17905347e180537dec8d0e27bd18cf6c53f51f7272d4adafe SHA512 abf9d82fe20fc9411384283876cf020a31e6c22ab2e54a7fae0d95ade02f434e4afb08d47c3ed5e4bc7ea5f518df7dc57baef2b8e76e3439bd937e2ee3c2b658
 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
-DIST xen-4.13.0-upstream-patches-1.tar.xz 26000 BLAKE2B 0ab884f4b64f318c256d1959fde34da85e85a1d6974f00001125e29838f3f7d9b06ff767dff437635648eed1449976ff88250cbe141e9175d4430135e8923667 SHA512 f37514bf7ad92f8d8be798129c446fe9ec0d409e904f6b4971f07dd8b899dd20f40424a72106d7c50da83fed1f7097c575fbdeee06e18f9f4255bf6b2a71f08a
+DIST xen-4.13.0-upstream-patches-2.tar.xz 55980 BLAKE2B b85512456cac253d7f4dd0dca120d694cde0b0f4d0270023bca337f9bc693eb768c1a43d74d412c38dc665ee50a70d2985e5bfc6edde3eacc4376d2f6d7877c8 SHA512 fb852be98209e135a11241dd15e9bd174a5a3724bfaea1fc3b12ba964b8fc275946b1c443c70a78212dff0bc9b25015a00d9f902183c135053e27957b55b6bb6
 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225
 EBUILD xen-4.12.2-r1.ebuild 4438 BLAKE2B 5ce21712847014902bd61b988be35433d66d0d24f037a0898b4bb4ac8415edf1f045e4186fdd2fc728f2897ec6b7ecfd5912b37d1310c43c7a5bfcef7fe29538 SHA512 a66e3803812a90325a29b45cc0faca670bcbcd0882975f9dac5353320d8a5c327268d688af6cb1a7bad2960c02a003eef69bb2c27e580b0b5b0f671ba76e9e65
-EBUILD xen-4.13.0-r2.ebuild 4439 BLAKE2B 99ef4fced66b15fe06b80676653468934a0b32c049a239a086025c2bfa03be6225bac1bdd0ec53947b49251c4be46ad0e3034047c30b6ea59660c50e8786d049 SHA512 23d99e5d555aa72c8d87a4665390be52e07fc955c1748b91a9b0b36046006109dd141bc35a188360c272e00db9d13bb84c80911f6aa26e6d12ebe2bc242ab229
+EBUILD xen-4.12.2-r2.ebuild 4438 BLAKE2B f7c59b7e260b7a2fab93501ac0213769c9835bf8e5068a7376b7c473c87a03f927b40948cc74d55a913b45283f1b03dc4373e4c5e884c1168e7767f51fa289fc SHA512 7fdd14a30c867e9a312d9d7e65f7ae85780a4f56d26ca3daae5919f90358d22057940385920daaba4b2f94955e915fff40fbc410213d542263df8369b8e504dc
+EBUILD xen-4.13.0-r3.ebuild 4439 BLAKE2B c6c5d13844b559e630643e8b4ee18d450e4d57c8c919eae5354070d74d52aa62596584eed5ecd67f6d5ccd8994a810f150b14bd155e3c0de9121d0cb49d8ec97 SHA512 f360730e1a31b6dd51a43d1cb0d7623397bb96e9c8dec3eb298d6c3aba8798d0793f99c1ef175720b8cdddda6d41dad4d5c08f258c52525995f7599ab4463f45
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.12.2-r2.ebuild b/app-emulation/xen/xen-4.12.2-r2.ebuild
new file mode 100644
index 000000000000..966bf2a23294
--- /dev/null
+++ b/app-emulation/xen/xen-4.12.2-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="amd64 ~arm -x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.13.0-r2.ebuild b/app-emulation/xen/xen-4.13.0-r3.ebuild
index 72ddbb0ed002..f95ccf1dab63 100644
--- a/app-emulation/xen/xen-4.13.0-r2.ebuild
+++ b/app-emulation/xen/xen-4.13.0-r3.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	GENTOO_VER=
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
commit	38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree	04e2cf4bd43601b77daa79fe654e409187093c5e /app-emulation
parent	623ee73d661e5ed8475cb264511f683407d87365 (diff)