gentoo resync : 25.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-25 19:33:39 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-28 08:31:11 +0100
commit: ad6182343997a405079870a2fe91c4e0c6b94595 (patch)
tree: 4aa7483cd0ad7de54338afc8e7971417abe1dd81 /app-emulation
parent: e8f81810baa21f490d6910e8e2d424546b72a333 (diff)
101 files changed, 1469 insertions, 2327 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3e52be39ace9..68011522cfe7 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 1830d22c4447..f3d9125d2f13 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,15 +1,3 @@
-DIST buildah-1.10.0.tar.gz 9362108 BLAKE2B 691b5273056f9eb3e1f1dabf22c299ae281af8db13e680351bc0f4e0b6560b0ac20def5a1b3a039d14b97bb35a935a34ae83eeadc6272ad4d68a494439cc5f57 SHA512 33d33bb622e69512a2e11592455d654f6478994e78894bd0f73e03cc01e12c7e30b1fc25bbd6b44a3ce83b9e261ffb47c3d08a99bf523f4fe0e3ff00d93861a8
-DIST buildah-1.10.1.tar.gz 9378648 BLAKE2B ea563d1a52634aa4e0172f05caf04b511bd9962cec012ed35830ceb5848dae1c14020167d61d44e11d0dcdcd6d5440c216505a11987f6806bac1336dd12152c9 SHA512 0651ed1ec6015b437ed0a786bef20c6a88fedfa4d318edc081d257720b1cc2c8d380a8cde5125ab5894bf0b4a6df90034b689097f7cc05630401e8e7700fca6a
-DIST buildah-1.11.0.tar.gz 10065996 BLAKE2B fcf709f7474bcb45f2da6f90b614b4c95036d19c05fad715f80720efbb9ad6c4be6725001de4b5198c7d81e365ff12a742b73bc5d7268819de56c4b2fbe0b8e4 SHA512 a5e852a427de4e3f3ce8d78fb8ea82e8b6e0a1bcc6a0bc786c2bcb0d4689fec5f5a6413f77898bd953dc7eeea31d1d58fe22fac40cd5209fa5016a376a9958b7
-DIST buildah-1.11.1.tar.gz 10126770 BLAKE2B 88ee8aa43490b12e0e63cbdae24d62d8fd10f8a502689dc30b748213aaf32851bc83c4fce38316f79523e3fb3a7110fc763d8bcbd24181ae45abeb5b3eecdda5 SHA512 322fe1b249ff6db160bc1dc111d19ddde8f36ae931f222aeab21e0b39f60bcbe9ad8b11cb6ee088b028478d6774a2fb231b6d457ed4c30cd5477b4a67ebcf06a
 DIST buildah-1.11.2.tar.gz 10128075 BLAKE2B ad8f4253b62cd7709bf5ae530d002190c1850da6bbfa7dff2281de0592422eccc67a4ba6e52f7a82d6c1b320b986237a84d0ffaaf9b3b1b93822a54621365250 SHA512 f491d96d5bb4d0aa03981fb58d24f36c2e3928179c8fb79e85f323ce9a65ae6da05b816d86ae43f94a83a1b2445b315f93ca28b531436d9b4e5861e4adef2aac
-DIST buildah-1.8.4.tar.gz 5122400 BLAKE2B b02a1cac77f5f16ab6cec3a74f11ee94675c717ead21fd791feb4cfbd08dcfb4313a1ee3134d3b9f9d20218935db35e28dab406a9f706ff2f46a2beb1abaa56b SHA512 a316e5e2bea7cded1db089bbc7831c9af69242caa6108c78d63864c012053bda3dc3da5bf70248b2742b2be1ad66aeb59c844558022c20f79236f5b1292d6366
-DIST buildah-1.9.2.tar.gz 9505091 BLAKE2B 886e1ae5804f005f5782d011ed8440a8ac5eb09b2cf7917ac04ed1ab3e08f8cce6ef9b8efaf3392d60ed46b5bdb2efcec8b44c0448f970210cd613837a5d8f1f SHA512 1add432491fcae3b22dac2768ba71be2a47f42f3d9fae14cc5ff54220b3b7b96a48a95cb10b249de98f9c3067d463bbeca75c7c52783c111a9b5ed0ba03eb30f
-EBUILD buildah-1.10.0.ebuild 1446 BLAKE2B 6fd24b1e8f98f2db900fdc3840e7448cb61fa1023783e22d384a0ecff4da5d8398c9c8cd1c096c6bb6cbef297517e009fbc818aed03716b05c9f4716b237ce71 SHA512 a743db9feccc105c90b0180e4151d62d4e8bb400b8f3324702896821560bdc8d08e9545c738863e4985d7fd9a264fd7cb7166446167dbeb51348d499cf47017b
-EBUILD buildah-1.10.1.ebuild 1446 BLAKE2B 0d5351236e5fce90665bc9b30e134d9a33ad4ed0cc9d6fb4f4977243946fa3dcaa94e7c156b7db58aabdbdb12c2bbe4f10b54d7eae644734b68584b30970ab85 SHA512 956d1447f322af82f0f8f88c483d980b4409e5cecb6d01980ad31b16844f46722497cd39a760c169461cf2a493fb31bc191df8dee682b02edd038054aae52487
-EBUILD buildah-1.11.0.ebuild 1446 BLAKE2B 8dc0564305db4174600aa2181a0ca5c67c4ba8c2526e148a58eff60c0078057f0a1d1c139a25167a7ba2919a1c069f2026b5f357f88217a65234b647059eedec SHA512 42b645d49dde0685aaf444166c2809d424f7fcfcaa1ebf07c919c5156988ce0b320397770ae7d4108bdb1ff40cf733806d0b1296330949c96d83d4e59df8d198
-EBUILD buildah-1.11.1.ebuild 1446 BLAKE2B 86efb60a185258e544e9ead22fe4f623bb6e3cf23be41c8db6d2e45293706fac719db412596c9168b9e9926d62334f35a45022594ad1f0ca21e95afd42402ebe SHA512 c2ecf53db18fc1db4f698284f1cefa037f41d5c0e48471377a2bbefd5f250221da813264c4754d2fb5b179ac1fe302250f2cc744cfb2d50bf51c2561d45a8dc0
-EBUILD buildah-1.11.2.ebuild 1446 BLAKE2B 1c80aa7272d8bb835a02405da85e58a5625c77b8ea975ff45430e99c1046e81642e8ae0c158e2e8d9e63932d86588c0635de111aa33c2aeeb786e80d25576db0 SHA512 7450b0c90cf10bfa964b8da88ef76cbc8ad8267a8718ca3514c85acf77f551fcceeb3e63ee26eefa02b2ffb5c7520a1651a86db60e3db5795f94d2e9730bdbaa
-EBUILD buildah-1.8.4.ebuild 1446 BLAKE2B 12ce28dbbc9cdd9b3dcc9ffb32d31e343645db77c83349b02d114d1fe26d9f3a54208df5fde51760e913ffaaa2ea3b1f8ba5ef7e2bc925767ca41899d38d5688 SHA512 7fe65e02c631a6688d402fd6922b8bfb8cb8ffe9f496ccba5ccf2356fbdc066cb827a759f57f59ad53ab85c6544244fc48f0d5e048010ce7ea23b54512fc16ec
-EBUILD buildah-1.9.2.ebuild 1446 BLAKE2B 5f89e5874d84b1813c39485970832ca13a7ba70add473867d14d36d1252139bc0059ee3a365b0a530297c58dffd046ba55cb88771bdc8faf8313c70ee3adcf40 SHA512 502b062366388451ea0c120b6d05a6d6cc2db7a8b1f986f3b6e72b104b0651dd313032f16f56c5bbb7c519102598d1c94c73ae9f25c2ce6080fbab6cf1948c42
+EBUILD buildah-1.11.2.ebuild 1485 BLAKE2B 4f766ba24804b36bc976d4e1f767e469482ab8d9930b8a5488a57cd72b3644ca7bafe8d909d6e7272d73c99daf905a589bcb8b9032aeda9869e7d0bbd8ef1943 SHA512 7b10c0998a118d0e888222fe2bee26dcb2887b1f965a114f14a823b1ea8d917d55e6af657f68e003b779642f6205de43d72c4a3f119ebe8e5594a00241d3e858
 MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.10.0.ebuild b/app-emulation/buildah/buildah-1.10.0.ebuild
deleted file mode 100644
index 397b42831fda..000000000000
--- a/app-emulation/buildah/buildah-1.10.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="5a3e9fb"
-SRC_URI="https://${EGO_PN}/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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake 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() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.10.1.ebuild b/app-emulation/buildah/buildah-1.10.1.ebuild
deleted file mode 100644
index 66aa34a76ad1..000000000000
--- a/app-emulation/buildah/buildah-1.10.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="8c1c2c5"
-SRC_URI="https://${EGO_PN}/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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake 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() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.11.0.ebuild b/app-emulation/buildah/buildah-1.11.0.ebuild
deleted file mode 100644
index 5675dd131e1f..000000000000
--- a/app-emulation/buildah/buildah-1.11.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="2c5da1b"
-SRC_URI="https://${EGO_PN}/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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake 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() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.11.1.ebuild b/app-emulation/buildah/buildah-1.11.1.ebuild
deleted file mode 100644
index 81faedfb0507..000000000000
--- a/app-emulation/buildah/buildah-1.11.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="413bd1f"
-SRC_URI="https://${EGO_PN}/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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake 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() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.11.2.ebuild b/app-emulation/buildah/buildah-1.11.2.ebuild
index 8962d91ae9cc..6a58e5f4b30b 100644
--- a/app-emulation/buildah/buildah-1.11.2.ebuild
+++ b/app-emulation/buildah/buildah-1.11.2.ebuild
@@ -7,7 +7,7 @@ inherit bash-completion-r1 golang-vcs-snapshot
 KEYWORDS="~amd64"
 DESCRIPTION="A tool that facilitates building OCI images"
 HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="ostree selinux"
 EGO_PN="${HOMEPAGE#*//}"
diff --git a/app-emulation/buildah/buildah-1.8.4.ebuild b/app-emulation/buildah/buildah-1.8.4.ebuild
deleted file mode 100644
index 1f2ce722cc45..000000000000
--- a/app-emulation/buildah/buildah-1.8.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="af8fd4a"
-SRC_URI="https://${EGO_PN}/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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake 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() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.9.2.ebuild b/app-emulation/buildah/buildah-1.9.2.ebuild
deleted file mode 100644
index b4ed60e4e6fa..000000000000
--- a/app-emulation/buildah/buildah-1.9.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="2110f05"
-SRC_URI="https://${EGO_PN}/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"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake 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() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index 348fc1064ab1..475c2f7f51e5 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,6 +1,6 @@
-DIST containers-storage-1.12.16.tar.gz 5970004 BLAKE2B 0e9f473c9315acb22b94c9cd17072659afe2270e05d7c7c595d0563bd4d96420b3ecaaaeaf61ce4a10647e40c7177b7483aadf62ce40237dea10c23cb91bba62 SHA512 17a073bb338547c1e64065a1a0013e083565abeb6aa366989160c90dfb6bd6d306ea25fc938194b607b0cc74918b1ff40b12ea274b3df771e2d848b2bbab2b5c
 DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d SHA512 9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f
+DIST containers-storage-1.13.3.tar.gz 5983607 BLAKE2B 9e591873da4824a133e3818ba9a97074bca234c3154bef9c4febcfd559d0b2ab7462c7da24ce7d391bbdbe2d9a62cb9fd711624623ba28cd8e79d0ca7fcabb47 SHA512 83fd16cbe5821c68092845defc2c5b8407b03c3972b146f409be3444a114d357709fefc25206a1ca26e6ef4a5fc219f360bb0195ffdc1c6e9f79e90f07740820
 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
-EBUILD containers-storage-1.12.16.ebuild 3668 BLAKE2B bab8635ff0d2e53f1c8d073bc0cc32c4f72b1e349f2aa125f365ccf90e55d078cea879a1da8e8491787233763146735b80ae6fc9d3089f61b6fd3b0f1bce6491 SHA512 739370782be73cd37c51478741ff280df788c26ba6582c3a25bc8e8c9002b96bf3524b97ea02696810014e922802a7693c3779461c31ba5b259245c4d8a9e656
-EBUILD containers-storage-1.13.1.ebuild 3668 BLAKE2B bab8635ff0d2e53f1c8d073bc0cc32c4f72b1e349f2aa125f365ccf90e55d078cea879a1da8e8491787233763146735b80ae6fc9d3089f61b6fd3b0f1bce6491 SHA512 739370782be73cd37c51478741ff280df788c26ba6582c3a25bc8e8c9002b96bf3524b97ea02696810014e922802a7693c3779461c31ba5b259245c4d8a9e656
+EBUILD containers-storage-1.13.1.ebuild 3686 BLAKE2B e61c082b0de35a9cddd00e37459579ea0e98112a43a62187e1e45a19a62121df830af9f7d0a67460fa8bc71eb4295b6f8405ee21796168d18ee46033d5f11b34 SHA512 29f51afd336f77f80c75c5a99813e64d98e857b0eba4b932329eb94004657bb815e4c1a875bf9fa99da044265cd6443282eaeca79c04f59b58374c287c22a94c
+EBUILD containers-storage-1.13.3.ebuild 3699 BLAKE2B 045609a6d1b3ca7a0f17b860e5d4ff581cfb7d558406ab957e9684f05850e7fb654b5ec1e40fdc3d2dc5d51fae68aa2487c57500c5d71379f3ea62c97f8c8dd1 SHA512 65a39e7b91924a764eba4ef51eecdef7477bf45aae0e08e407f3a5f67b80426b9fdbeb585c3db5e9b6cf3a92ec0b41877da77ce45e66545da209ffb490f3c69b
 MISC metadata.xml 691 BLAKE2B 512255d8e2d91d64a04fcd5da04fa6db20fbaf66c580491f001716a06c0ff81ff572491cb9b4274229f2312c7235abcbe8e32b6de9e2344b418015c253866f26 SHA512 eeb059ee40101e47a81d4ff871a55295c68891c9bb6a5a2f87d7855e3aea36648f2db77317f3660602d338d6f3f8cf1018cc61f2722fcd6cb78f7f32ac62989b
diff --git a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
index a472e58367b6..daa6f6e3484b 100644
--- a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
+++ b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
@@ -12,7 +12,7 @@ inherit golang-vcs-snapshot
 KEYWORDS="~amd64"
 DESCRIPTION="containers/storage library"
 HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
 SLOT="0"
 IUSE="btrfs +device-mapper ostree test"
 EGO_PN="${HOMEPAGE#*//}"
diff --git a/app-emulation/containers-storage/containers-storage-1.12.16.ebuild b/app-emulation/containers-storage/containers-storage-1.13.3.ebuild
index a472e58367b6..0e74471b34df 100644
--- a/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
+++ b/app-emulation/containers-storage/containers-storage-1.13.3.ebuild
@@ -12,7 +12,7 @@ inherit golang-vcs-snapshot
 KEYWORDS="~amd64"
 DESCRIPTION="containers/storage library"
 HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
 IUSE="btrfs +device-mapper ostree test"
 EGO_PN="${HOMEPAGE#*//}"
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 24bd07cb3704..9dab3d0e53dc 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -2,16 +2,10 @@ AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1
 AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d00871fde86b59e4b604ccc7cdb0058b10ccd28277f19dbdce34c83b2529c14e063126318617 SHA512 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
 DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 5d9e68c7a0ae532e2406e5e47562693cddbc34a8b3ddcab0a7a34509dff8383d1fc255cba634efb186193e5784cc6a7638387ca29e68288af7621b8b25f1a71a SHA512 1541368955c62c697dbd6b850cdf6762a13a7a308f699e3a50dbfe29fbf991f4f47cfcce75bc41745e0c27acb29457ec86d3312ef13341a5d94526865e60eb3e
-DIST cri-o-1.14.2.tar.gz 9347347 BLAKE2B 83a0d77245bc841a9f89c55c853b64e69cec124da07b1314cfc27237cc82c55e49becc0f14c579a09d23e8da047c6bbb285b0eb79c4609a23827ab24ae28ce4a SHA512 1499b09a8f5c51b426bd8fba7c254288707524a363bfa97537edd35fdf29ac354d13578f2bf3c09c2d128650082f9a2bfbf69872fa9fce77dbff43913afc8066
-DIST cri-o-1.14.4.tar.gz 9370878 BLAKE2B 50fd9b9c4802d2d89b8bbc83d1faf3084a2978835c579814730b93772f3e04cef8d1b46b2176eff494906e89fc20a53cbcab0cf0cabaed74ddcf56bd9f89b14d SHA512 2a78e7ec3ba5ff80649ec11e42da80b15ab86e5b541ffa626a65042b362ac8445bbf00ec46014c0fdd8baec2e4777e23a2463de318113f9c4c6ddda92b5cf3b7
-DIST cri-o-1.14.9.tar.gz 8357782 BLAKE2B ab4df69f231a0e1998182b086eb92e72211282c3f136e3cb2a4f06a94a4de86616d6a540ee8645cfb8d2189e791181b2b39f0e76f19e1a181e495dd5321eb7e7 SHA512 afa17b8a43e7776b44250bfa4657c6a7d4ddd1438ef012a0cb78a98fb73bdc477e990109355d97a84dd38f4ac13d42785c065eb577f978c124e6f8c95e751f94
-DIST cri-o-1.15.0.tar.gz 12153225 BLAKE2B c2db397cb2660af62c53bb5b166854d43cab665f53979ea45e6352929f0070ce7a730d356c7e71edb376d89baa0f616d84fe71017a6d6ca4d6b1270196cc1804 SHA512 4d5460f1e476085523cd82136d80ef32de645a8e6dd2da3ba7b1575cfee9e8ed44de7c144a8338aeb379a6ba506350e10cfc6feb3317b34429d41cb5fe6e20c4
 DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 2f6e223e2d3964f480e9739ee4808101ae2ca8c0a16eb589d2e3501d370c60694843309b602a4a4b8e16ed97094f97c81ff4f23b542a9536b38f9fe9a97bcd97 SHA512 2b9122692d84e8a6832d7172782c41d354185809cd3fa999951485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07
-EBUILD cri-o-1.10.6.ebuild 2850 BLAKE2B c83cc04c151b93c1fa95920dbc99e1a27f0add2fd17fdfdf5179df04438f0c62ab06c4df3cb352359bef1ba02805fe1b311ad9670481282e9dfc2e8d6feba14d SHA512 d08b6ce7eae731aed66892753dfe2ec8872bddc4054446c74ca084cf814c9a95033b996037b26d49bfff100e605edb6ee284ecb57fe959d705c5465c67ec5c2c
-EBUILD cri-o-1.13.9.ebuild 3075 BLAKE2B 232426f67cc91dce71e79bf89dfca85901bdb89cc48d9d8841e17d68414db749937ca21efaaa3f3014976a993eb598694b5ef61ee2ff8340620207db3ef22a58 SHA512 67b26c8a9b4e997ff7b5bee0603de14358f7fc4c99b662f0de839aa66457f1e81e341a3caccaececf62c721d4b059a864d6610fa0ecf38b648c70308e4f89e83
-EBUILD cri-o-1.14.2.ebuild 3004 BLAKE2B f8d1d2e2282275f99ff8132cd998cd3d378f9fe75152770f2f813e8606ef814700c304d93159e7d47a41c58b05db69699bce23fb4aa6f4f8fa61a0824345de0d SHA512 de591769d120c1c1b0898b9b7533083b94ba176684441f3ea5d02a6dbd314f85ab3152f3bcd3556509e01d81de9db4e8d56a2a52e8ba633cd48360f3b99a53a1
-EBUILD cri-o-1.14.4.ebuild 3004 BLAKE2B 465343a10bb0931ed35e025c6830bbbf9cc7ab8e63a8cb9f895e0dcd338c79d61c094b1cf07e05d42a054321cde104eee2285bf28c39477ae0ee03a03890cb06 SHA512 b859839c8dce964a1a2f7423816b7dee4917e3524cc5471983d6674057fae04511f2a9e00668b165b8e2abe0ce24c4aec93faa2355aaea59e259f0bb591fe642
-EBUILD cri-o-1.14.9.ebuild 3004 BLAKE2B 19a357244cbf2eca1e1f42a8021a7c31f77e374c62801d40141a1d4cfc8a48f1e3ab4080e1ce092deacf5b12ba12564d7c8de9abbfe440969b8eb908c18c4f2e SHA512 7467337551374601e0e105ec36ba5f465f0931287e52d4aa019455edca5f14485b297fa833c9af4b68cfa2697a988977e135a6f354d73090be63fa561a06ed94
-EBUILD cri-o-1.15.0.ebuild 2875 BLAKE2B 325c777ddd3cd5fe5ccbb05217d48a12d3ccf5920c437e3eb0e8e047b2798a43b08b99e4351dec8d3505ed340b4bcf1fff3b8069373a3d92d9a5f450a9a08e82 SHA512 6c5bf10382aa884c4b681c8f5cb6c2701bc1647b16d2e4db63d481db56ed36253c0ef3d63d1ec3956a3e874ab9dcb72a1dd0319d4332a039575c90ddacee26de
-EBUILD cri-o-1.15.1.ebuild 2875 BLAKE2B c46020899e0a4f0ad18a5e69c3d23e3b0d978be42bca2f565bc52c90e939aca974bde9af869f4eecba84ec6bb259bb28da7713d5cc415252b909fded510c29d8 SHA512 1874ade11ff9960e1baf9f13af8b8c7866a7d0166fd5521f783fd95963f52c3c4049f2f6122e7b007a6f3b31e3d6e3fe511f59942cdca9beef2f94c99a65adf1
+DIST cri-o-1.15.2.tar.gz 11861335 BLAKE2B 159bdf322540c3d49f44b1fc1106d1717706f7817e4621743078dfbb5d9088318d7dda5da54ff94ed43ea58204413d496ffda424ea94ed6fd0c6e090bbba37f0 SHA512 d30a27d98537cd73bf341267922b94434958bf5e5d3a26de3af2b7899fd9d860be12a194531f81fb704abed79eac1c5139271fab1e52b994b939dafab00f1cfd
+EBUILD cri-o-1.10.6.ebuild 2889 BLAKE2B 1dfaa54c22db81ef2dd51604465b4f0e030a0fb13249d4a31483648b6ce09b694ba1032310e58afca7e38230a2d0ee024e0ce0f57bb465f26dbafc36512cf36d SHA512 80d938b1c63f2499eb7acc992bbbd668a70f596f82c492360acaf2148cf0ad26959623aed55648b19179dc3db407d42952572726a056ee335a366086790bd5fc
+EBUILD cri-o-1.13.9.ebuild 3114 BLAKE2B 15fe25488ff4309d6fa4f1fe43e26380353d0f65fcce4a5cfb423af3d86cf6888da05f337ff799ad42256f9c40603f2a20dc4d2e3741bef64279a475c2ebe337 SHA512 6d8697a6e56795854582df64ae26eb116232e7e79e1217e154d02fcb0270bf2dcea111192270dab27ad8aa41ff11494a82a021cf5b0201251d0844562ad55a42
+EBUILD cri-o-1.15.1.ebuild 2914 BLAKE2B a7a7305cc116f348bbcbe68751f89aef1f75c28c960f0dd1c9503e21fa9a6edf3bd77edd69e9704c1f27116cc37d1254a26bdac6c404f5d15725cdf62be270fb SHA512 054721cef63a25757926bbc84ce8d04f3e452ac630ae61e96859bb636174c35fc29d8367b7d2a141883bbd5d912df74d334f4edb3b83a823d54e4df514653556
+EBUILD cri-o-1.15.2.ebuild 2914 BLAKE2B a7a7305cc116f348bbcbe68751f89aef1f75c28c960f0dd1c9503e21fa9a6edf3bd77edd69e9704c1f27116cc37d1254a26bdac6c404f5d15725cdf62be270fb SHA512 054721cef63a25757926bbc84ce8d04f3e452ac630ae61e96859bb636174c35fc29d8367b7d2a141883bbd5d912df74d334f4edb3b83a823d54e4df514653556
 MISC metadata.xml 995 BLAKE2B 81f504df91c54970e7bc65cc4085db45f8f95f354b578cd7ddbae6c34036201335af3c3e07efb39583314c53bdb7cde341568e7d912fa926978b5f146e9e8d25 SHA512 00809a79f64c171d9df3eda85b079bf7c36e46afe8c31c0a0cddb3999d23b09ac2282cd17e4e876a132fed55e5311990a4a4461265d409e976b23ad8ee13e759
diff --git a/app-emulation/cri-o/cri-o-1.10.6.ebuild b/app-emulation/cri-o/cri-o-1.10.6.ebuild
index 845da94a93bd..a5292a57902f 100644
--- a/app-emulation/cri-o/cri-o-1.10.6.ebuild
+++ b/app-emulation/cri-o/cri-o-1.10.6.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
 HOMEPAGE="https://cri-o.io/"
 SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="btrfs +device-mapper ostree seccomp selinux"
diff --git a/app-emulation/cri-o/cri-o-1.13.9.ebuild b/app-emulation/cri-o/cri-o-1.13.9.ebuild
index 8fc1dca0d81e..3331e9719be1 100644
--- a/app-emulation/cri-o/cri-o-1.13.9.ebuild
+++ b/app-emulation/cri-o/cri-o-1.13.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
 HOMEPAGE="https://cri-o.io/"
 SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="btrfs +device-mapper ostree seccomp selinux"
diff --git a/app-emulation/cri-o/cri-o-1.14.2.ebuild b/app-emulation/cri-o/cri-o-1.14.2.ebuild
deleted file mode 100644
index 5e2a18c86067..000000000000
--- a/app-emulation/cri-o/cri-o-1.14.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="76b057a5a72ae379bb2f4915b791146d37a3f6cf"
-EGO_PN="github.com/cri-o/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree selinux systemd"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-emulation/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	net-misc/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	sys-libs/libseccomp:=
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	ostree? ( dev-util/ostree )
-	selinux? ( sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	!<app-emulation/libpod-1.3.2-r1"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	sed -e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-i Makefile.inc || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-
-	if ! use systemd; then
-		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
-			-e 's| pkg-config --exists libsystemd | false |' \
-			-i conmon/Makefile || die
-	fi
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		hack/ostree_tag.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
-
-	keepdir /etc/crio
-	mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conf
-}
diff --git a/app-emulation/cri-o/cri-o-1.14.4.ebuild b/app-emulation/cri-o/cri-o-1.14.4.ebuild
deleted file mode 100644
index 219a35d48664..000000000000
--- a/app-emulation/cri-o/cri-o-1.14.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="66a9cf7c79b529c0f76546a352c1a4eb04b7721c"
-EGO_PN="github.com/cri-o/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree selinux systemd"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-emulation/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	net-misc/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	sys-libs/libseccomp:=
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	ostree? ( dev-util/ostree )
-	selinux? ( sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	!<app-emulation/libpod-1.3.2-r1"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	sed -e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-i Makefile.inc || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-
-	if ! use systemd; then
-		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
-			-e 's| pkg-config --exists libsystemd | false |' \
-			-i conmon/Makefile || die
-	fi
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		hack/ostree_tag.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
-
-	keepdir /etc/crio
-	mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conf
-}
diff --git a/app-emulation/cri-o/cri-o-1.14.9.ebuild b/app-emulation/cri-o/cri-o-1.14.9.ebuild
deleted file mode 100644
index 3a0a7e520181..000000000000
--- a/app-emulation/cri-o/cri-o-1.14.9.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="0af20c51a25a04ef77f7e038ff4f24a5a87cd1df"
-EGO_PN="github.com/cri-o/${PN}"
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
-HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree selinux systemd"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-emulation/runc
-	dev-libs/glib:=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	net-firewall/conntrack-tools
-	net-firewall/iptables
-	net-misc/cni-plugins
-	net-misc/socat
-	sys-apps/iproute2
-	sys-libs/libseccomp:=
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )
-	ostree? ( dev-util/ostree )
-	selinux? ( sys-libs/libselinux:= )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	!<app-emulation/libpod-1.3.2-r1"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	sed -e '/^GIT_.*/d' \
-		-e '/	git diff --exit-code/d' \
-		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-		-i Makefile || die
-
-	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
-
-	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
-		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
-		-i Makefile.inc || die
-
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-i contrib/systemd/* || die
-
-	if ! use systemd; then
-		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
-			-e 's| pkg-config --exists libsystemd | false |' \
-			-i conmon/Makefile || die
-	fi
-}
-
-src_compile() {
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		hack/btrfs_installed_tag.sh || die; }
-
-	[[ -f hack/libdm_installed.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
-		hack/libdm_installed.sh || die; }
-
-	[[ -f hack/ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		hack/ostree_tag.sh || die; }
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		hack/selinux_tag.sh || die; }
-
-	mkdir -p bin || die
-	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
-
-	keepdir /etc/crio
-	mv "${ED}/etc/crio/crio.conf"{,.example} || die
-
-	newinitd "${FILESDIR}/crio.initd" crio
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-	# Suppress crio log error messages triggered if these don't exist.
-	keepdir /etc/containers/oci/hooks.d
-	keepdir /usr/share/containers/oci/hooks.d
-
-	# Suppress crio "Missing CNI default network" log message.
-	keepdir /etc/cni/net.d
-	insinto /etc/cni/net.d
-	doins contrib/cni/99-loopback.conf
-}
diff --git a/app-emulation/cri-o/cri-o-1.15.1.ebuild b/app-emulation/cri-o/cri-o-1.15.1.ebuild
index cfbec5e0e93e..c439086a987c 100644
--- a/app-emulation/cri-o/cri-o-1.15.1.ebuild
+++ b/app-emulation/cri-o/cri-o-1.15.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
 HOMEPAGE="https://cri-o.io/"
 SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="btrfs +device-mapper selinux systemd"
diff --git a/app-emulation/cri-o/cri-o-1.15.0.ebuild b/app-emulation/cri-o/cri-o-1.15.2.ebuild
index 808c52e4c27e..c439086a987c 100644
--- a/app-emulation/cri-o/cri-o-1.15.0.ebuild
+++ b/app-emulation/cri-o/cri-o-1.15.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-EGIT_COMMIT="0af20c51a25a04ef77f7e038ff4f24a5a87cd1df"
+EGIT_COMMIT="f0827bb332854ffcff2f4d9f64d68b8139970b3d"
 EGO_PN="github.com/cri-o/${PN}"
 
 inherit golang-vcs-snapshot
@@ -12,7 +12,7 @@ DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
 HOMEPAGE="https://cri-o.io/"
 SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="btrfs +device-mapper selinux systemd"
diff --git a/app-emulation/cri-tools/Manifest b/app-emulation/cri-tools/Manifest
index 979aa6ea8266..1a29695f80ac 100644
--- a/app-emulation/cri-tools/Manifest
+++ b/app-emulation/cri-tools/Manifest
@@ -1,7 +1,9 @@
 DIST cri-tools-1.13.0.tar.gz 2675580 BLAKE2B 4dcac547caf048b546ea0b11401e414e8ab834171b9cf1abd773cc8b05d70e47138dde7c1195ba6e99ad5e7d7632d7cebb4a8c67f7ec9c0ee3a750ac5e591a7f SHA512 df5553913a9e8aa1e0fa896dd1da00184d059bf360080d5c4003ca20ab4b93770847e07887451a44668e588eec5ab0258e7f02ed485d9344701af0afa20d712f
 DIST cri-tools-1.14.0.tar.gz 3647742 BLAKE2B 1a308c87e7be05dd71cf11d79c841a837156529d398f1475323ff9585f9080cd0356a007f8b8c505a02943ff479a7c26869f35288d178ac8187ca6766032c488 SHA512 c8978e4380ebb2dd59ce533ade94486ae1e4091fda7acd8cf5cce662034a1d34a1851c43bf766a723c5ba71c15972733a2e80c6e82fb1c27e5a1dfc2e85476bf
 DIST cri-tools-1.15.0.tar.gz 3672568 BLAKE2B d4e9a0b2ca43efdb61c7626de518801a124fb61991f1df6a7eac106f7516ab59effa70038db7c4cbfddaf1c345c648f359c86d298dae08abb34f4b801b82b2a1 SHA512 43115fad485c2c6603e724f3529371133bcea6de069dc58d36e7880f558fa1696244b6129fe3a96fd669b27a3d9bd07bda1219e89afa348e36a85087992adf7f
+DIST cri-tools-1.16.0.tar.gz 6912563 BLAKE2B 09ceaf0ebccfdd39d7a325989447ca8c4c9e94ec0f20e8c26a5c9447d1ad6591df1c237abf130edbc84b4b1b65f81f109976d20195b3b34afca1aac460ad48e2 SHA512 c577328e11e975b15302b49082592f065be389b384cebbaa4615ef5c4ea81a4bfc88e02de6ef2749beff75ea6a27bb9d72b30af47d0f9870b297e9da53b3e25f
 EBUILD cri-tools-1.13.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.14.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 EBUILD cri-tools-1.15.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
+EBUILD cri-tools-1.16.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
 MISC metadata.xml 345 BLAKE2B a0a36cc291e52c9625d8caf20d81a06d5a94d69987a912ff9b7cc50582b06df285544ba2e050deea23628c2de34ccec9cfbb7c9beeec486733b86e54d5f73081 SHA512 bb952b4fe9687fa36406793426a8f6c922db248d75794e4f17e31b4056b10e7ce17dddb5f47eb68045babfaa9e63005cc5d408f96d52eb7c67b78b034408e7d8
diff --git a/app-emulation/cri-tools/cri-tools-1.16.0.ebuild b/app-emulation/cri-tools/cri-tools-1.16.0.ebuild
new file mode 100644
index 000000000000..a298fcbf5cbf
--- /dev/null
+++ b/app-emulation/cri-tools/cri-tools-1.16.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/kubernetes-sigs/cri-tools"
+MY_PV="v${PV/_beta/-beta.}"
+ARCHIVE_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
+HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	GOPATH="${S}" go test -c -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/critest ${EGO_PN}/cmd/critest || die
+	GOPATH="${S}" go build -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/crictl ${EGO_PN}/cmd/crictl || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,CHANGELOG,CONTRIBUTING}.md}
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 6759b538f174..66c87e28352c 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,6 @@
 DIST diskimage-builder-2.26.1.tar.gz 421821 BLAKE2B 11c0ba668494285f33f3461e1a2c091ce6d622e4be164c4ab56a93cd000c82cec6702a6ed2ae37007120320f053760473f45f58ad8b45ee14b7b3eb47ac82d9a SHA512 e8bb68d15fc0bdd4881e76a7277f3e5e481b77decb4591546a576eda015bf624da3746326735add299551e168b82ab8bb165a18a64e96532c5b846e49815528f
-DIST diskimage-builder-2.27.0.tar.gz 421632 BLAKE2B 3899f65c3fe29a9a39410393585c12c977687c6cf2865fcb4a923780600f92f09211a65f7e69e9e0c00501bf6db21341c1a2f55fc066e53574f4ad1808464dba SHA512 90a84489e4a753d6aa2a445abf3eb1402c387036959055bcdb607b7daabaa43502bd0689d450a5e785271aa3a3f696cf20fced2dfda7b9c872d59a9e2f87cf30
+DIST diskimage-builder-2.27.2.tar.gz 421433 BLAKE2B 089e68b07c6f79e54b8fb30e7a9328a6c55d1abb5f77b6592cc0b29b30a44a83803bdde93631e95e39d7fc82d9b5ff3fb425a7b94821b96f56421cbde9f8b078 SHA512 e2cc6f24d5bbfdf741d6b6e7e216d0e9631d6394cf3f3f4d34ce8a78ba2ba2ddbcb0b1434121f7ab1bd3600194777a5538651d9039c3bca06bb8cc621f06f037
 EBUILD diskimage-builder-2.26.1.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
-EBUILD diskimage-builder-2.27.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+EBUILD diskimage-builder-2.27.2.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.27.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild
index 86d3bb124b34..86d3bb124b34 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.27.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.27.2.ebuild
diff --git a/app-emulation/docker-machine-kvm/Manifest b/app-emulation/docker-machine-kvm/Manifest
index fc85222ce8b4..627efdd40cc1 100644
--- a/app-emulation/docker-machine-kvm/Manifest
+++ b/app-emulation/docker-machine-kvm/Manifest
@@ -1,5 +1,5 @@
 DIST docker-machine-kvm-0.10.0.tar.gz 12183 BLAKE2B cfc1c8286d23e7bdd3f98c542da5f9507dafd99aa37361265ac2774b910e5c900dca94cc0ac0f827715a390aea09762fd25423fe6e587990c667eda2af6935cf SHA512 d4725531e43814ae2b8c3826ad695cc853177d09aeae9c97aa24b5c0de8732bdef67b12f7218244cf44cdd589bb9878058e587c946e13481ba57cb418c535e9e
 DIST github.com-docker-machine-v0.10.0.tar.gz 1605832 BLAKE2B d53e3dcd43af3ea9d1dd764ae5a409e1d4339576c35365e7e06a28f4e37ace3998fb8c909a0af8ed7fbfcead7dcde1a4e71d3b78b601a65e59aaa13256199cf7 SHA512 337ed74474b5e55e10ccd7c8bb3b778d06fc2c56c1646678715548ddeb41a0b7320212d498ad96cbdd08137f78013506b569c4e0aa0a2f28169264d64d814f7c
 DIST github.com-libvirt-libvirt-go-c3209e4ba8b8dda65c85ca0ac04302e55895caf7.tar.gz 100068 BLAKE2B f57c460c6f833d77ea74908bbd0c72b0982b2ce24e47e68e1e509a526b1ba20f224c2492e1fd715431b13696b4110ba404f12b8bbc45deb5911438ce0b2bc6b6 SHA512 7ac5964349c90ac45f627f9c714b04c3ff07428ca2ef7edb1bd173cb7264040ddb49f9df57249a7dbc5f3500c7e1b4011b40faf4b8104f1ef56a1833cb020ab3
-EBUILD docker-machine-kvm-0.10.0.ebuild 943 BLAKE2B 91729ba1282eeb300b250045ad87e435431ea1bc570ad1a8295495287704ae146419045117d651af5d27a16fde273cff9f49ed6822ac3359bd1d3d4b202a8887 SHA512 f65da5970ddc2cab7dbb600c8bb517cf19163226a50dfbc1b318953ff5088f97f609b26de8f9aeca49dc11e0c6029f7d8733b16fcf5a0324fe4f3f890eeb34c2
+EBUILD docker-machine-kvm-0.10.0.ebuild 974 BLAKE2B 4e41ec99e86481b54149a947b9ff764bbb0e6cf2774a0720880e4cf400fe99c4d3112cf484f7e11cf3ca77c65f20c79c9fc07c14705fa69f39306997b37463c4 SHA512 0e2ae335583e2510c5e9505e0ff6c92f66169042c87570ff24d8c3c51f48863209dc3b8d02749990fc6b73a02f69450eb48ba65235bbad0ca92ab8e83def769a
 MISC metadata.xml 310 BLAKE2B 4c96bb6f52227dc4839bf6e2f2142940d9840f15bed831a544f1cfab38489ac849ffc52cbda4b70fc95553629d2ed68c5ba6d8f9e7bdc12c03f04425fc19c264 SHA512 c300a073141c91ad01121660ed2aeb85deaac9308b6296fe261a6e9a5b24e676bfd25b7a52289e3e39b2b1885518eb4fd422c8da6ba77dfdfc68272922b06d66
diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
index b9a0908fcb3c..509420dad7c1 100644
--- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
+++ b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 DESCRIPTION="KVM driver for docker-machine"
 
 HOMEPAGE="https://github.com/dhiltgen/docker-machine-kvm"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD CC-BY-SA-4.0 MIT MPL-2.0 ZLIB"
 SLOT="0"
 IUSE=""
 COMMON_DEPEND="app-emulation/libvirt:=[qemu,virt-network]"
diff --git a/app-emulation/docker-machine/Manifest b/app-emulation/docker-machine/Manifest
index df55d9d936b1..16acf2df5321 100644
--- a/app-emulation/docker-machine/Manifest
+++ b/app-emulation/docker-machine/Manifest
@@ -1,5 +1,3 @@
-DIST docker-machine-0.12.2.tar.gz 1725590 BLAKE2B 8e96fc0f54d7ce4ecea7a670c0851f5a0f9516316877da43dd3dce4e891c67a6231732a4102b82bf8bbd6f3b0be579f3c1faaaf2cad4be48ad00df21a704f240 SHA512 58b2ed13b56034f5bfb8374397aead67c669fc544409932f6c29ca56578ad61b3f584a8f32b281cafac56a9647d6e215ab5138045c2c6810a5d202c68bfdb3b0
 DIST docker-machine-0.13.0.tar.gz 1730091 BLAKE2B 9268f55c1b2a630043be7875d6ab72eced67e5e5618c95666e9c31a4180b40bf770782405b4ecdc141c50398ace0de882a60922fcfb8068a498eb81f0e614da3 SHA512 c31b3505e475f5e55310cc3b8805db8b94522703956a640954c3898c584fc3a07830c346535855cbb2fb10016dd0e7ef72e7174e919a3651f05e18b652132121
-EBUILD docker-machine-0.12.2.ebuild 904 BLAKE2B c0386ace7ee774148ed1fc967a9e93c65510e14b36d4e2a94ae91e0e90d8a4b0ef16b9e085c14b34cff74b49351d8334fc8e7fc975e95da4246dcb0bf7b3f43a SHA512 1d71e0fdeec91958575e92675c16274ad82d196384fdd1276e03baf2dfd31fbe33e9f8a48d44ea3014190fbe053b03b31cd648e9c5a5eee025a43f4923762331
-EBUILD docker-machine-0.13.0.ebuild 904 BLAKE2B c0386ace7ee774148ed1fc967a9e93c65510e14b36d4e2a94ae91e0e90d8a4b0ef16b9e085c14b34cff74b49351d8334fc8e7fc975e95da4246dcb0bf7b3f43a SHA512 1d71e0fdeec91958575e92675c16274ad82d196384fdd1276e03baf2dfd31fbe33e9f8a48d44ea3014190fbe053b03b31cd648e9c5a5eee025a43f4923762331
+EBUILD docker-machine-0.13.0.ebuild 945 BLAKE2B 5388fcb415b576d0ab0b67588cce1ff70b9c26a594c61f311028571682d0bd0272b5d8cc2279257f8317c2efc5fdf79eec62341642b9fca597c4dfea04156737 SHA512 c88f5a68bb84d6abd1617f6f536a51f83e2b2781d8fd6f6604d43b29dc1b43c7ec9a86bbb05e54cad33e86db851eac36acafc47ad9be2494335db329fd6ee64d
 MISC metadata.xml 305 BLAKE2B fa9558f67aa76f286e47eee66a77ecb8b2affbda16e67d2405423196bd73577681eb923d3786656d6dee73af3c34113e52e9a205793c28d27e855152729042fd SHA512 9d29b2f3f29ec6838395364bd85b38f0e54fc3a89f79041d5ddd492ef999018cff92e5ef6e6bcb5bc32cd7f57059531d10fd3ac5a5481da1fb1218081916a8bc
diff --git a/app-emulation/docker-machine/docker-machine-0.12.2.ebuild b/app-emulation/docker-machine/docker-machine-0.12.2.ebuild
deleted file mode 100644
index 1697e3defa68..000000000000
--- a/app-emulation/docker-machine/docker-machine-0.12.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/docker/machine
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Machine management for a container-centric world"
-HOMEPAGE="https://docs.docker.com/machine/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-RESTRICT="test"
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_prepare() {
-	default
-	# don't pre-strip binaries
-	sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
index 1697e3defa68..974d8a443e7f 100644
--- a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
+++ b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ inherit golang-build
 
 DESCRIPTION="Machine management for a container-centric world"
 HOMEPAGE="https://docs.docker.com/machine/"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0 ZLIB"
 SLOT="0"
 IUSE="hardened"
 RESTRICT="test"
diff --git a/app-emulation/docker-registry/Manifest b/app-emulation/docker-registry/Manifest
index 3211a68e7f14..d55153d01ab9 100644
--- a/app-emulation/docker-registry/Manifest
+++ b/app-emulation/docker-registry/Manifest
@@ -4,11 +4,6 @@ AUX registry.confd 85 BLAKE2B 0997c1ad7ee8fc165a87cfebeea75694487c8d8b62130fb19f
 AUX registry.initd 606 BLAKE2B ed8af2651d91be13578edb561c067cfd3e72dfe42a6111be8930d61f233248b7364659a8db5a9800eaa167d76a8b2daf9d121970622de235e61fa0f10ad85174 SHA512 af7780264d068adcd0d6a6768b88ab43c26081b71d1ebd591ca6d175e413cdeee935a6f50d9833775690f0b47daadcc33286f86fb5eb98d2e674b225122aabce
 AUX registry.logrotated 89 BLAKE2B c16fab4c6a3c4fd9f48370ae30505408a49e07c2a7ea7fc119717efcd840ad489c92855e27a5546219b3cdeb257642eb65abc2d544859295688925ae2e94ecb3 SHA512 f824b33a1fa38802a8aa79599843b0ea065603799823352e9515c50bfc61c43a03e9eb5327f9c687b8c3864fc633ad1a46bff9e91f4c54a46a09e67d2f6f833b
 AUX registry.service 323 BLAKE2B 1be481d08a283793d10ef870fc299e1c284087878e67ec54f44e662c616127bc411fdde19659cf7acd69787054c624c5c5206434c36b4e5a0fcceaf79c2e78f0 SHA512 67d2b69c1fc497774e3171628fa73b9b9521e19c76414e32721994f2ba614bd3c6896c578c9d9b8af0ad4972b9da0c504ef787a7585a550be4bfe1bd40eafc15
-DIST docker-registry-2.6.2.tar.gz 1579760 BLAKE2B d0e067f2e9124847b5e362f23ca7d67655fbf0a6227efc3fd9073d5360389d6d8531e5709b52225c54e6e3097a2d5d79102e27fd09412b95d2e5d8a4a30dde2d SHA512 a091db2e15d7c1dc8cd39a40de5bb63cc1ead68e95dfaf6b3735a789adb87f146c03eff81f700e0059e5f6ffc43e6c3dd3358503697882cb080b991629f82c60
-DIST docker-registry-2.7.0.tar.gz 1996485 BLAKE2B 49022546b72a1ea2b457a3dc059d8940bfba3070208b2962f8acd1351312d568d6facc1690ae8ee78742b5647c3a84bd6538a9eb0c279aec0a8dfae2c823fa61 SHA512 72bf5f0953c58e4d1adf6427ee13a9456204ab278d4489277e4dd1b3a3df6717cc02c966cdfcdf77d86e769209fa18e377e0b12a6c02b9f58980185e9844aec6
 DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
-EBUILD docker-registry-2.6.2-r1.ebuild 1238 BLAKE2B fdba66b66572f16b789491d79edc89ae773d91a5e5ceb05c62afc52089c59f0ac5787d90a84b54ffdce1724e1af23399ee7b9169842ee58513982398678594f0 SHA512 8f0b4f136fd4c05779f3686f3f06d094beef326d1aa8749b5aec1d0c89874e3c7f76861c2c9e403b084a78a411af8cbd1471aa9a15f60f40c23f6a94e1d8af64
-EBUILD docker-registry-2.7.0-r1.ebuild 1295 BLAKE2B 032c647b034c48c39182806e474607cb8f5da4f782818cd4f9262962586820cbd6dbff63795b6fb7cae7764395a36a8aba16ad34802951e689ca32fb85178f2d SHA512 0a399e6d88e8c5100773b5a5fc8c50cbdf4ba165bddc5d139b9041c9731ea78f66966aa402678dad5dfeb8731a6056af55f587a2926d370dd2d5290499168824
-EBUILD docker-registry-2.7.0.ebuild 1172 BLAKE2B 04e972be88aca9f4953e123e0bbf07d972dab7509d0bb7dc27b9a360c395f1282550438fd0b58678d3756208f92eed2538fe6da5362cead16f094dcf5d805929 SHA512 44a66bf217d5b504f254dcc5681efc74d20bb29ab5992e5dfdef8872b9c245da5ccbbc8071f8a34deee8af1478165c9ff91b3d880ada7e43be2e8cc8216414ff
-EBUILD docker-registry-2.7.1.ebuild 1452 BLAKE2B 0b9322c5a6ca1a9db7c3657d0256b898c5e9b8009d84e31706c4eebf2aa8d2e68175ed8754deb012eba892089e6f3df75550796bc5d72175c79eb2a9a0cd0acc SHA512 f64f8b6e27e9e443442308f599406d19c77bc9ab344f920702a15ca5a6bd82c7baeda2e01f1c55c478f0db26a95e67aff109416ce8d3ffc892e5af18203f80c5
+EBUILD docker-registry-2.7.1.ebuild 1484 BLAKE2B 45a8b0735ab623d732eef8921ac802b81b9b78a1527b2998f1f992455ee2eaba2ab4ab412998ef62f7dd3b6c59b76287c5c07fead02c2de8ed9845d30faa82d3 SHA512 44356e01116508839b3e2eab2fa031315802135c5f54de73bffbdeeb246406aafab2abf074227641b4ba4927931e8161ea4faed804c303b2b2fcd12701e233e0
 MISC metadata.xml 310 BLAKE2B b7a4e4e347c4b262857668fb0bba20e1efce6abc449cf3614538b34f03c897ce78e637db513a66e8e5ff9b1262df44d864aa41904ef7e86eee384bdafbb014cb SHA512 bcf043907e7e2ad9ef21a4b02b4aeb0f50bd17b1e5315653b2339036d4775bde661d711d4e84536f657c7bf9247ef446f1c95abdf14699620e44a104c9e1fe0a
diff --git a/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild b/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
deleted file mode 100644
index 863b9ac50826..000000000000
--- a/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-SVCNAME=registry
-
-PATCHES=( "${FILESDIR}/${PN}-2.6.1-notifications-expvar.patch" )
-
-pkg_setup() {
-	enewgroup ${SVCNAME}
-	enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681072
-	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/{lib,log}/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild b/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
deleted file mode 100644
index c117f1e13143..000000000000
--- a/app-emulation/docker-registry/docker-registry-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-SVCNAME=registry
-
-pkg_setup() {
-	enewgroup ${SVCNAME}
-	enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}"/${P}-notification-metrics.patch
-	popd || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681072
-	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/{lib,log}/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-emulation/docker-registry/docker-registry-2.7.0.ebuild b/app-emulation/docker-registry/docker-registry-2.7.0.ebuild
deleted file mode 100644
index 90b39c280c9e..000000000000
--- a/app-emulation/docker-registry/docker-registry-2.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/docker/distribution"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-SVCNAME=registry
-
-pkg_setup() {
-	enewgroup ${SVCNAME}
-	enewuser ${SVCNAME} -1 -1 /dev/null ${SVCNAME}
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681072
-	GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/..." || die
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/{lib,log}/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/{lib,log}/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
index 57b97ad055d0..23e7af931a1e 100644
--- a/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.7.1.ebuild
@@ -10,7 +10,7 @@ EGIT_COMMIT="2461543d988979529609e8cb6fca9ca190dc48da"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="Docker Registry 2.0"
 HOMEPAGE="https://github.com/docker/distribution"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
 SLOT="0"
 IUSE=""
 SVCNAME=registry
diff --git a/app-emulation/docker-swarm/Manifest b/app-emulation/docker-swarm/Manifest
index 19c9b673a1fc..3532201e0275 100644
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@@ -1,9 +1,7 @@
-DIST docker-swarm-1.2.0.tar.gz 4474619 BLAKE2B 2a0f6f06b549e8f0319c3c7f0e3a0b756a3c13aeb7cbee519e0c483b4c8831187e47b1eaae918efdce3c9fe3bf7d4da02c5e7d55b6235da5dba7827465b81508 SHA512 dab97d7df9d38c7bc7a1565788c84a13c8c792161d61a904ba9e45f43fbf835d055bd1c1a0f1d2f9b29f9b7fc6ed6fe19aef75b53288188caf82b152d37392ac
 DIST docker-swarm-1.2.5.tar.gz 4619026 BLAKE2B cae94bcb1bbb1f495b18662ac62ad3295d22547b332d6b6c4e55c070650fc3a1c314ef1ef696787b3109c0c5dce3c48979adc85031c0d65834d3d8ff5bd417b3 SHA512 2684c1fbb8e01c062c62137c874825120d0f2da0ca13808c1558ef01680a6f4d77bbff3769d1f59d9bb8011066f202dbb89c23d25597283cc24245db70731992
 DIST gobrake-2.0.8.tar.gz 6392 BLAKE2B ec3eccd5a52442163108c9e8f83e2e7a19ed45438c91e541d75af5cd44f382899098cecc5130c5d36a62ca53f1dc2062a82ec9e04b17e2db835cecdfbaa3b565 SHA512 76d1dfc55ddcbfa0b719d9eb3a75a0c8bc9d2f0308fef391cc59efa7c6b7607860c61c1e77d609d3a2d2cad473da359d0f1df98775a6da791a70d81f98ce5e6c
 DIST gogo-protobuf-0.3.tar.gz 2116795 BLAKE2B 6b90ad97648e75724c69bb9b8d3cfb17b919a1121813c09ec463df99c290c117b0e0b87f43b285eb5147a205f2f926c223cc4b4d58205a286af2afa87dbd7f5b SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8
 DIST logrus-0.11.0.tar.gz 24165 BLAKE2B 5d71a4b78d5c46e71401a08d9b0228236f74e864d14206bd6450268a3a41d5f2ac7155c39f250b9906ec132fa63ace6e8888f0ec482ed4a0828696326bbba25e SHA512 ee0b813e277cef0533800a966e6e07884b8de64e75c200439979f00986d84f98cfc750f7d4cb2a2b57d6524941fbba0c6211ce37da50d9a8ca99274f81639620
 DIST logrus-airbrake-hook-2.1.1.tar.gz 3896 BLAKE2B a41877c8201d39f79fd0fabb7bba8d513c14931ab6a2d59b9dbe5907ce32a67d852f8cd25a2ed058ee95d321e430818d5258b4e047f3b809503da58a96bc8876 SHA512 8559f821731ee086a267f43f6e150e18b24a32a2556c45499b2ec42a85642a0581a862fc827b8b9a1949d003b5e36e69972df92a005111b94e2aa9678c336240
-EBUILD docker-swarm-1.2.0.ebuild 941 BLAKE2B 7ec81166468e0be4cdebeecff453ec3808dd2a9760e139074223d85aec2b0cfa0b96b620e9ebeae26e2b011fd8bb38ae10e98eabffa8b35e2075869104d0ebd1 SHA512 809046fb932178783350cd6cb09327960656dab3b67b10d80941cc9a977561546ea9bfdc05b1f577eebc98a8b84157e568a07220a45a12b8367e4c18a203b593
-EBUILD docker-swarm-1.2.5.ebuild 2139 BLAKE2B 575c2840e4a82292373239962ec22630b1b45d6acae433750e1b4e0f4956693cd52734f38015a9f0b86461be55b58739d70326a60f29734b02d0b7e02f64804f SHA512 ab65af5d107c5153c1f50a41be577d3250384d3b50b2ca1a7626c30a58ae918314e1dfb9f9c5a745c125cad5768a8888d3cc9a0bf97f973bc5b5012dc0b7a8d4
+EBUILD docker-swarm-1.2.5.ebuild 2170 BLAKE2B 5f72fefbe686c03f7f55b2b3ba8776f5f010a728004ff957fb36f6ebcbbe243f036fd04cae8f6c6d34b8c96e1f7f3babe9018b5816602a748eae29d35a063c44 SHA512 3a3fbc32ab43fec5e3443022280ff7765d396ec1d06814f66be3eb446f1761b245aa06ee02fe0193b6728719c8fa7908b30c17e85290feab75f27761eb9bfd5f
 MISC metadata.xml 303 BLAKE2B 876c526defdc7c039b7923f9860e3fef8bfc3c835e4cc8a50e54ae3ae535c53a27fea39f17a3fbe46939a330e16e9534ebd6ec64d3141075694c4010bb858ef4 SHA512 b724e0dbde2212d3071b201aca8572059e0756f3be2a056097c84ea802ae4365a9682767725a02e3333f5f5cbd31f8e30a0a2b54b3e32619d75fbaa8400a9c22
diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
deleted file mode 100644
index c0ec9a067395..000000000000
--- a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_PN=github.com/docker/${PN##*-}/...
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="A Docker-native clustering system"
-HOMEPAGE="https://docs.docker.com/swarm"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.6:=
-	!!<app-admin/consul-0.6.3-r1"
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN%/*}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:${S}/Godeps/_workspace:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin "${WORKDIR}/${P}/bin/${PN#docker-}"
-	dosym swarm /usr/bin/docker-swarm
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
index 10d18218802d..95e2cbea5ca8 100644
--- a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://${EGO_PN%/*}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/Sirupsen/logrus/archive/v0.11.0.tar.gz -> logrus-0.11.0.tar.gz"
 DESCRIPTION="A Docker-native clustering system"
 HOMEPAGE="https://docs.docker.com/swarm"
-LICENSE="Apache-2.0 CC-BY-SA-4.0"
+LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2"
 SLOT="0"
 IUSE=""
 RESTRICT="test"
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index fb1a0c70314d..e84b7827ae27 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,9 +1,5 @@
-DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4 SHA512 34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed
 DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc SHA512 d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
-DIST docker-19.03.1.tar.gz 16652136 BLAKE2B be5c001e48bdce0ea8e520c131ff1699d12e39c45cf7dba3452689879e29abe12509c5d70e4a82eb66ac599b85717cd7e057cff1a41ba552eb2ce549e692d991 SHA512 92b4e5fe2bbf96a261d290ca807550af45146be9d21680940bd6aa45d9127ae8ddbc706df4056f1720ed6975a2a92004f1789fae4109c50206904ad827d4bf2e
 DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11 SHA512 6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
-EBUILD docker-18.09.8.ebuild 8355 BLAKE2B 529357dce1baf40bd90008b7e9597be9f1a73db15e8f73a51ce27bfbfa920947dc6d588b79d866593d9ec404a89e8f5081ff8c593607882b4ed6108ca974b5c2 SHA512 2fca74c7e26ee3760b1b1b564bfcb67ef69827e49b6a9fa54ab688aff2808fee3d35c4ec7e06dfc5f7a40ffd2018fe3674df354b30a76ed908c2c5882f6f5b84
-EBUILD docker-18.09.9.ebuild 8355 BLAKE2B 7068bcb0e97cb4cbe439d0201896d49dd64acb4f6a6d16dd8ab69ab1d9fff1ac7f20b07efc5a73cf9c4faeacb8c32384f705651851d6712a1ed79ce17c344692 SHA512 3f90883e1bde2bd89d9b08ac15eba5a78f34050fd97d692d018c6da24cd5b7092a6e1c602230bb1386438b6d36d3022cd518f957225b1041c359ae7268ec3f88
-EBUILD docker-19.03.1.ebuild 8355 BLAKE2B 57168baecd4b590148c64265a3b2d4e2952c799157c0aa57c55382a6a645d398a9038750541c43e54711e53b69650d94c19cddafcafca7eb3ebae00b8f207190 SHA512 985e8bc8ddd64cf6f3f42e0e341110dc8943cd1cc0f2b703482ddf2bbba30f40fe3c787589d481d76ef4eaac7ef1bb17889d5186a5395be53453a93c86610094
+EBUILD docker-18.09.9.ebuild 8354 BLAKE2B 5e0ab831398f7c54025bb0d03001c13625758dfb3988e0828ad2b5cda246aa55ac4536396df8c62c14b7df353e32709d2306b50220d0b9f00c2ae32ad40b24c6 SHA512 62d3bfd28f0b4feb9846fc6befe15d2b926801a7b7015784b9ca7435874a3d974c85f3ec000b1ad8dde40141ed42de5dca5e2630db7028cfeec3ad662802a437
 EBUILD docker-19.03.2.ebuild 8355 BLAKE2B 5d2b42bfae72f37eccbeb127643f2757c2379fe1b5709aa9c3cd27e194835bfe059ee6e5bd2f9617d80222cd2ae659b1efb73cf3f9669de8042d5afe467b6a62 SHA512 c6d1c6bd79e51e728b38bbc6505020cdd650525edfb961c192fd5dd99a51962e6c3e6f1f5b1d7462a4f6ea8dd318e46b172410a8f432fc2bfdaeab7943e1b141
 MISC metadata.xml 1576 BLAKE2B 7a378d4abcda0352c4c96108a238d693e9104a1de624f8fb4e808bfbf5ad4960c1f6155b1f6c78ff2bc6609653285e911e7eae9f319696e39c60b63e5127ef11 SHA512 9944178c2202c12bc7364f9722e70b71583bfc60a318348060d0ee8ba713c892259da46c222ce7fea4b1294be8b01b7d1b359976931e287f574733b65403e762
diff --git a/app-emulation/docker/docker-18.09.8.ebuild b/app-emulation/docker/docker-18.09.8.ebuild
deleted file mode 100644
index 58711331389a..000000000000
--- a/app-emulation/docker/docker-18.09.8.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	DOCKER_GITCOMMIT="00dd43dd"
-	MY_PV=${PV/_/-}
-	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.2.6
-	~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20190513
-	container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	VERSION="$(cat ../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-
-	elog " Devicemapper storage driver has been deprecated"
-	elog " It will be removed in a future release"
-}
diff --git a/app-emulation/docker/docker-18.09.9.ebuild b/app-emulation/docker/docker-18.09.9.ebuild
index 94950688f27c..86284c9e3965 100644
--- a/app-emulation/docker/docker-18.09.9.ebuild
+++ b/app-emulation/docker/docker-18.09.9.ebuild
@@ -14,7 +14,7 @@ else
 	DOCKER_GITCOMMIT="039a7df"
 	MY_PV=${PV/_/-}
 	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
diff --git a/app-emulation/docker/docker-19.03.1.ebuild b/app-emulation/docker/docker-19.03.1.ebuild
deleted file mode 100644
index 7c0a798fbfd9..000000000000
--- a/app-emulation/docker/docker-19.03.1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	DOCKER_GITCOMMIT="74b1e89"
-	MY_PV=${PV/_/-}
-	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.2.6
-	~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20190604
-	container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	VERSION="$(cat ../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-
-	elog " Devicemapper storage driver has been deprecated"
-	elog " It will be removed in a future release"
-}
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index a100ea16b16b..b7bcdf399a90 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,7 +1,5 @@
 AUX faudio.pc 245 BLAKE2B 8231bb42f6d90dd814eabd12d4d582d74ea0f154d6913fa710814d1bd75168d667463fd430d827ac7854aaa76bc07d16e5ccb3f6455e990ae0e2bc21bc633291 SHA512 bbdce2d90fcf848b8ef6a7a47a5bdf535d261aa833d6821de21907be05cca8693fede48c0e4161ae8087522297a2ec5af8c5ff5ed42efb814bbbc195ff963059
-DIST FAudio-19.03.tar.gz 886621 BLAKE2B 0cf0b60766d48472c72dc2aa9bbdb9a99db27836f38eccacb4be4bd98cf387b6009998018438e46835a9b9616d426b8a2c9f3c200b377bce2dc9bc18e42b0d37 SHA512 94e3e4f3f023879ef821d657e5a73ac25aab55c7be6a0afe77d75cabe644c9da083ae3c6a240b71af542da53a3eb34804e6a3193a0e619f89fcc20ff7d6ef095
 DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
-EBUILD faudio-19.03.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
 EBUILD faudio-19.06.ebuild 2433 BLAKE2B abec98d564c929b8aee5945ee92d1eac2614bfe91bc1daf394bbe5486761ee4777f69ea67f8f1081341ab7a13f33fe5b421fee2fd7a972dd63d7934102e23cef SHA512 52beb934cc86c94303c44dba96d586e64434beefa7b25674813f2f6df29dfcd2e2cf8bbdcb8a9e149f15421a8b325799945dc69497afad3fa6995ee2a4afbe40
-EBUILD faudio-9999.ebuild 2399 BLAKE2B 2d8340562b9215a947b77de1af488c63a765ec654e73c5638cf7fab715f28a8067aad98c32bb8e0856d663f6ea9bc04f0af6bf78286b35f9685296bc53411a0c SHA512 b786b10dc4156c815fc1189add4afbbe164458b51fd25889f3730d76bd3ebd0a6dfd12f1166b8ac82f13c451be33582b8ee82c29dd96ba09eeecf57b76f46bed
+EBUILD faudio-9999.ebuild 2433 BLAKE2B abec98d564c929b8aee5945ee92d1eac2614bfe91bc1daf394bbe5486761ee4777f69ea67f8f1081341ab7a13f33fe5b421fee2fd7a972dd63d7934102e23cef SHA512 52beb934cc86c94303c44dba96d586e64434beefa7b25674813f2f6df29dfcd2e2cf8bbdcb8a9e149f15421a8b325799945dc69497afad3fa6995ee2a4afbe40
 MISC metadata.xml 1341 BLAKE2B a5fe79fca0c7f184466254e5f251c6248c20415795933b8797a4bd899535735ed93b54754937ed1003103cbbe3d5d6c5ffc5848c255cfd759cb06fb973065003 SHA512 8ad14c2ae094ff4ffd013458db62263b97cc5e616885cb229ef57ff8a4ab0dd943c2ab3840d086a81a4a10962c0d7411741ac6a8daaefb5167fe988a1dd8122a
diff --git a/app-emulation/faudio/faudio-19.03.ebuild b/app-emulation/faudio/faudio-19.03.ebuild
deleted file mode 100644
index 295da5632494..000000000000
--- a/app-emulation/faudio/faudio-19.03.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# shellcheck disable=SC2034
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-multilib virtualx
-
-FAUDIO_PN="FAudio"
-FAUDIO_PV="${PV}"
-FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	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 ~x86-fbsd"
-	S="${WORKDIR}/${FAUDIO_P}"
-fi
-
-DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms"
-HOMEPAGE="https://fna-xna.github.io/"
-LICENSE="ZLIB"
-SLOT="0"
-
-IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
-
-COMMON_DEPEND="
-	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
-	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-"
-DEPEND="${COMMON_DEPEND}
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_INSTALL_BINDIR=bin"
-		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
-		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
-		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
-		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DBUILD_UTILS=$(usex utils ON OFF)"
-		"-DFFMPEG=$(usex ffmpeg ON OFF)"
-		"-DXNASONG=$(usex xnasong ON OFF)"
-	)
-	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)"  )
-	fi
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	cmake-multilib_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_make
-	emake -C "${BUILD_DIR}" all
-}
-
-multilib_src_install() {
-	# FIXME: do we want to install the FAudio tools?
-	cmake-utils_src_install
-
-	sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
-		> "${T}/faudio.pc" \
-		|| die "sed failed"
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins "${T}/faudio.pc"
-
-	if use test; then
-		mkdir -p "${T}/$(get_libdir)"
-		cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed"
-	fi
-}
-
-faudio_test() {
-	XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests"
-}
-
-pkg_postinst() {
-	use test || return
-
-	# FIXME: FAudio tests are broken and also don't appear to work
-	# in the Portage sandbox.
-	multilib_foreach_abi faudio_test
-}
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index 295da5632494..a8490f1cf230 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
@@ -70,8 +70,8 @@ multilib_src_install() {
 	# FIXME: do we want to install the FAudio tools?
 	cmake-utils_src_install
 
-	sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
-		> "${T}/faudio.pc" \
+	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
 		|| die "sed failed"
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins "${T}/faudio.pc"
diff --git a/app-emulation/firecracker/Manifest b/app-emulation/firecracker/Manifest
new file mode 100644
index 000000000000..74ac39d5f51c
--- /dev/null
+++ b/app-emulation/firecracker/Manifest
@@ -0,0 +1,108 @@
+DIST aho-corasick-0.6.10.crate 26122 BLAKE2B 752eccb2fbf36fbc73b8694033d2f80f6ab6d2a8c2ae023329b90bb252b537adb1e80a604b4266bfb1ccc2963fcaa6579be48ef011c9728734c7cb77fa3eab99 SHA512 4a21b0e68c416e5dcfe99ded917577abdbe7c92e50227b7906a2b3bd25105f8e7d03103514d388171a41090cc7bcb63bb5b4dc3c6847a9b4e09bb3856a1bbd9d
+DIST backtrace-0.3.35.crate 60047 BLAKE2B 716fc69b2a7999371d52792fae45fede5c3dc72c0522c0dacb275025cb97353aa0f8569ab8bad66105671babcd4e675fdf6f0d65153a83c5a0de9262cd275480 SHA512 bb4d50c57bda52b9f48772c1cdb1fb30c003a5c6d69cb5ae740115020600693b00aca7c89e8c76a5e3e0deb6e54a2ec4d68edcdebb85e3f35b8dbbaf23f88926
+DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
+DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
+DIST bitflags-0.5.0.crate 10940 BLAKE2B 69d9f52d1dfbec986034981f4629022b25b94c01d54424ae2399a0749c51f0f1c725ca312cfb3f953efc95732b7ca32e432e29b1e5bbba416cb4e0c21a266546 SHA512 220511ed57391bbbd4c8828cf485aed25d078a1cad6305367939072383e48468d545550002398a288d30d8501b9232fb9a91e7a3651f67103991677b9f25de0c
+DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST byteorder-1.2.1.crate 17841 BLAKE2B 2e61c88911454fb787ddc7601ae7530980e9dd6be55eb4605dc257b0753ce69be8e3cf05655e9bf118e3a3c25d709f674acb6162fcd6f08d6b73619f4d434a62 SHA512 3b8822286a3973ef80309f30e169dee5fd87d98a0b4f5a44da7e29c2f14f5ce47a9f109087c84cab09078ad0c3507bb459bac243528bf4d8eae7a958394a4041
+DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
+DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
+DIST cc-1.0.41.crate 48185 BLAKE2B 7fb7eba2079aed5bc7775e9e8585f9b1267066bf51cf7aa9f5ad25789f7b57021a457d2811f705d4e6bd0f38d033cea1c6be23894929df8df9f3bf1b2dcb6a20 SHA512 3a39bd28e16c3e7715e0588fb9eaef6b83075e68c1ad7aa0969d89baac1e2753f9e68b56492bf5df5b1a4882fd1b6a1df97ce559149873efacd5aa209a0bf352
+DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST cpuid-0.1.0.crate 5473 BLAKE2B ff6536dd8fa1aeaf52b3ae28e5d0c3e0033383d7265eb91f376843516492e3f9d2c43bb6667538342158e6abb9c606b4e6129786d6cb48fe86f1c1effe005df2 SHA512 5b24b49acccaa393f351fca2a2cc7c5e5227e7e0f99680c109bff19377fa5822f37ad1561a33be25e34be654dd4f118ded974c7acc79608fe1efd8c19c4f8404
+DIST device_tree-1.1.0.crate 7049 BLAKE2B 11236d709c7d35d6482eed7ccf8ac82dfbb4412bcf2fec98fd2a806bcf8740c1d0b2745c39b5971f5292ad00887f423afc28a4c674cdf37511cd8615ff654cbd SHA512 b671b582d9f5dc19d8ff28d18fd2ed77842191084c6acbb41362491ea3c994699044fe0b0505f927ad9569d933806f8129a4eb49bf25443c0806ddcb6ffefad7
+DIST epoll-4.0.1.crate 8195 BLAKE2B 1ac732ade3c441a27832ef5f7cd75a4f80dcfbf42d195433a7bca91dcebd4f6a8ad0198daa3e3e12ef5ce50615dd85ef0d4cfe6670907ad0a65d55055b25da86 SHA512 b672091bc0b051c22a6217c37bf3986b2e173a1bf5d773590a1e181c9c0981baac656278f90aaa98f7a092e636e3bf68e5ea7a9edb6120cb90636f8db7e953d9
+DIST firecracker-0.18.0.tar.gz 4064752 BLAKE2B 6d58ca099f5f891966e7ccf25e5f22836e4066847891cbacab328fcbbb44c5c9010dc47223a626cedfd1c9443a754fbcf1b333378f6947299d7abb745944f471 SHA512 af599401a9323219b9d07d7a146c382c1a7521e6dabd10d6a4282dcbb8ea7742268b7999ab6aedcdadfb5d7f07efbd03feb20ab225f5711abcd45121f4c89f09
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST futures-0.1.18.crate 153738 BLAKE2B df33639193cdfdf7c5ae7323e5798cc6decfdbfb3f1d819caf794e68411241f25cc05c5eae09a09a1df6f3fa8ac5de7fce5af4536108e5b530dd639c18860679 SHA512 5782b37be2bcd4c9d0ddfafba7718a48144c0f8533acbfd0217e1bf25c3c04ba95320b35765f57224cdfe0ee3a7748d1109d6e680e64bdb1a16addeac422b12e
+DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
+DIST getrandom-0.1.11.crate 23699 BLAKE2B 9239fb86a5d43a95821d5a378ef291842ac11616ebaa131130dad0bcc5edc632d9786f10c3a15654255461f9f6b221c70854c498ea82f7da24eba9074d49bdae SHA512 ddafcf536d72607edb1587e562dfe8d25091fb073377fe5dca2babfb56e6391b920c98c695ad74d5d2aabf6b28d50a4a54c305b41303250d58e01c4da46f210d
+DIST getrandom_package-0.1.20.crate 883 BLAKE2B b72ca1dac1e8745b3a8b49423c73340b0876eb507ecefb619bdc47c48b1320c2f2653bea9f370c0988b3103ff543ac6c22f915b7c48ab108af15126f8187047d SHA512 6152ce07fabbbb3176484e38493dc1099ebe4a56b573361a92fb624f8bb784ecd8f16f8ecdef988699156aace636548c8300b205371a90fbf14379cb257b41ae
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST hyper-0.11.16.crate 139464 BLAKE2B 4317ba59a217d40c56f145712394a1088a8ea2fd7f5aa1bea9314e9e4fdd7122526dbd0d1158b106646003d4ee83a2268605b6409a2257cc36eed7de0ce2efe7 SHA512 ce47fdc4b0e222ac17a03fbd1609fe692c77f70725a4f29782a7366391e0d8cd07ac085413ec27aed15b73c9b510ef67841dd6613a668ff42463dddd012f0d4b
+DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
+DIST ipnetwork-0.14.0.crate 12580 BLAKE2B 125321fa04e08983d94f80efc5ccf449214a119557d32e3188d861802e50746a490af3645db06e730b6c4bc97e359d9c1923020c0b7316e5e0fd9e6c669b9ce0 SHA512 28f9a73dd68c967ab285f4cc832011cd66b8e91dae8cfcd7938471c55a2fbeeb78a52778481fd62c8af22d1138c8bba32fd815f7cc8663998b401f329a178d47
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST kernel-0.1.0.crate 153163 BLAKE2B 5c1635a16f69567ceaed92c028ef92bac0a07d7dba9c4a4997710fdfa881e906a4756744b978240b35ed2ddc1ddeb0e4be3b375693c12a49e2f27dd1255afc0d SHA512 75c9dd43b9f00dacbb9a3771be458721498ef77dd74db4f2e5f116c761767a007730f028d0d7a137efb35917b264134bfdedeafb90b96d50461d98b0f11a93c5
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST kvm-bindings-0.1.1.crate 130642 BLAKE2B 254231126ca10cb8d743363f0c20d93d99318caa0aae3f9cc23f4cbe921489f33b96511bead2491b73863e75302ffb380e455d927ae96d5789001b1e6cb05efa SHA512 5dcc1162d8533d4f004268c3f3206db4f2b3b44c7ad50eb42da2ee549346c730563449b7c6cfd9a19dd4748b76c1173fd017be131dc8948032290a6a71d20b14
+DIST kvm-ioctls-0.2.0.crate 41480 BLAKE2B 7653c991502bac32e63b6d127523cde375dfa5da0780055a707fda8ec4166b40b0f8791b09dd7a626f77eab8de44762ea67a56a1ef7e984eafefa66fadf8f755 SHA512 59257755ded5584a759cf553ab9dbf2fdd9c4488377758883d3da5e3b1860c4a729d83ca407e78c1c4fdb420d2c033fefff090c601a64a45d338c8f79dcb70ce
+DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
+DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST logger-0.1.0.crate 7908 BLAKE2B ba678076c287e6c45106689220481ca04a620293398cecc2f73217095592dc0d30345b98df45722c91996cd75dfbd4b3bf6a1649cb7d4ae2434bdc78f3d5fdeb SHA512 a907cfc8a17197f7889a0b4b15880acb1eaf12b1fdb60d77bfe258c883c83b0644ab4d45381070921d3a2d5109a88d2ec7c1977f6952896097ea6daf6f638453
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST mime-0.3.13.crate 14939 BLAKE2B e522741251fe764f685b5f240da3e32148e54bc0f94a2e234de477d792fb0652748410ae7e625a509706bf9ec635d2528fc14e5d58e576026d8706747fc68f8b SHA512 92805a4eaebb1f6146facf1edd0b9cc710731949141af6bfc2226edb7fbd749b04bd8a921e79c2f4a31b79d11053e36a4b7b9dba9be1405a1174a8600654e320
+DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
+DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
+DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST pnet-0.22.0.crate 24740 BLAKE2B eb99d7de9f5952d89f0ede4d66666384cc2f6e914322a25ece97bf4ac8d794ad1adc21114c1b52e86e3e9637ed13a71363c923c5f5d75656ebf0c410569bd314 SHA512 8d708deb7c22ec45852be5e750c1561a3160bb379968fc2efa409f1bbb75eab6647b9fea870b42fdfbb61d450eb40bc482db4d366d531111adf18c6fadf94bca
+DIST pnet_base-0.22.0.crate 3941 BLAKE2B 142d69ac42371e59202a75f9944c026bfdf64436a68048925a04da612d60246259c6331823d4a1f9fa765c0a195bec9bc8b2da6e5acb33b4f2d1e5cbaf097de6 SHA512 d69a46da5f2e5873c7d5f752b0872f4cd2d1ce7967bdb3c21f6a3add001981cd689c453c8cda252c204df5f6c72f6335fe6e9d1eb6602031d089586072aa5ec6
+DIST pnet_datalink-0.22.0.crate 20961 BLAKE2B 0932fb341ab481184a73d0268634be9c7c4095c5c39910ef1b69e3c9d02e9fef0e6f364c353ce975ad0b85f7d72e3144740e684ee37a8f63d14c9b5c3160d48f SHA512 225232ac029cff051c63fcd485966e83fcc5bf3c1adfd9e5a91cfa7f3bdfcb9d0ae7af4302e755a0fbe9d0f7b0d149dcc4ce802d18a4921e89cb7aeaa71e3320
+DIST pnet_macros-0.22.0.crate 22531 BLAKE2B 9ffdafa6d0ef7c36b7f85494c28233a5bb29537647f2f96bd6d00ed38ba0cef0d67133d5e9ef4393ec74e9acfc74a067873a79227734e8d5c38c95d2d69d6878 SHA512 7bc6b638b79a75dad13f5ac4679ab5f90935c3c97ce083c5ba1eb5640e3d0bb69309f2c3c9ab1960ce4bb747317a36ab7d84fdc8af9aab7f2f856a8f976b97c2
+DIST pnet_macros_support-0.22.0.crate 4467 BLAKE2B a8cda3e4d91a52804f68779fd325e182d1721b26a0634fe52ef13d002634f45efad73080ec9b3af386153bca3aee200df257046abc710d3a87a5ff5968feefdd SHA512 2c0db253a1c00b5561a90bb88addd44ecc34772bc8802d843b9f921e939203fe2600295df3c0cfb37f5c66fa387734c714187dcc0e20e03f5de32a7ce6db0f21
+DIST pnet_packet-0.22.0.crate 24240 BLAKE2B d914322bad25fd73816020329f980325162a603bc4ee3c9fcaedd7e88a24190b5857766ccff3360970fd26509e02e52a109cb4ebe25c77ab9ba16ef92c0624f1 SHA512 1e1a95f3aac830159a25df1367fd64e65d7679fc7ab95f4674ae8a0a8ab4a44c75974ed2d3f171180d775e795ce9041f2402993e93ba41a0c0e895dccfb5cecf
+DIST pnet_sys-0.22.0.crate 3753 BLAKE2B c1e10c319d9bfc4152b8a2dc67d47afaf1609070f25ab0aa84ceb6b64ef99a1714c528eebe0e2bb75fe54b4bec1d779df1daabf5b7a0ac21342b86c368a9e3a8 SHA512 b1a9a1b708c98fff9cc52b5318d7beda08a3784a7a29b26d0752effd237ef6b82b3a05a848dff603c19952c4730c88bb232245f9bc31e9d1052b3b24186756cc
+DIST pnet_transport-0.22.0.crate 4549 BLAKE2B 38332a8d8e7e25a5ae43aef08980d85b5b897b07c79af144c6a04b274f0010c5117955c821c7ca10bfd2224e68fc5bc3374c81f52f66727e78ae8e06e115fa38 SHA512 7cc764f5ba037e209cf4976bc50f522f6e66f97996eb5ec60a7692ebb31adc17d725eddfcd0f819fea33dcb5c56b4572af6252d6f1cb4b0d77cd78b709e2070e
+DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
+DIST proc-macro2-1.0.2.crate 34779 BLAKE2B c99119a8c2158712f16524c568a03d60f0f4a72f79ea310c823c7bbf809f91f5836f4bc3388e2add1e202207fa91c24b64be438c7ee6d0eb0f27175b739382f8 SHA512 012ef53dd8f5abffa10490c95197bd0d303c681fe0da54adee75a9328a194cf827acaddc286b2237a6665a0bf9dd4c94250bce7919994412185c9de3828f733c
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST rand-0.7.0.crate 104208 BLAKE2B 61e0f8ba3a3be58fd43df55feae3bd571a2c758e6e36f7ffcb42af1ced067338b6baf9b9d3b097c3d9037a440ca961aec87267fa5147e59c1e34f3a8210e2a95 SHA512 20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST regex-1.0.6.crate 239455 BLAKE2B 0e81b18a220c6e81fb9185391f15faba2451b0fdebc7facc06a3ea76534ae32a76a6c573a686a72c62b30399939529fde08e6c33c4fe0d126df9cf5e11204456 SHA512 4779fe3896c131b418b07ec2622888b2b8dc64172744e6ff91c46a957646c796c46fcc5b1c37b5349f0c7a5adccee2e7af1e07121dfd2b59976bd0fde5b60bb4
+DIST regex-syntax-0.6.11.crate 283238 BLAKE2B 37a535b47f90449f6d41d1a5a3de69ff21e74fd5268961ff9f7cffd620080fbb212a1bd315db9b25b20aaaaa4ecd4b1afbb88a45a96b7e23d4b9e4742c081aec SHA512 619e1118aaaab60dcfc653cdae8fe2a8dcf49f2b06e718710f30179b4c95f1e31c04b2289f1d05d0c88b1996a3d8a327180ccf13bbd1d0259a70af7c7f449651
+DIST relay-0.1.1.crate 7331 BLAKE2B ca5d025d76f85b05a8453e264045871a5d552632db7f8bc61428798bd5b539ad27eec191ac153addbc86c77ec771df6058ad84d29395ddfc39558c416d8d9d91 SHA512 81b2aa587529ebf364d4b1a566acfd867623a33d32fe20c94551dc248ef28950de61094d7e1acfca618205c731cb3cb955bc8106d9a4c5c7c84f9c38b35b2261
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST rust-libcore-0.0.3.crate 4988 BLAKE2B 0d0e663d70a73afbd13f07bfe1072f76243561570ada2ee548f2811665326d530a02ed99dcaf047212efea6e451c49273d6795b56793d409a5eb5e09bb9d4616 SHA512 67c83402776606e5266c6cbba5eeb8e506a0aa8c6f5b5b310e3b289af453bdba80d32bf517a0d626405263622460fbedadbe7934836f6a0e51502d0957002db3
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST safemem-0.3.2.crate 6858 BLAKE2B f5a1b44da1289775e380b109bd458b7bbb17cc04ed718434cf05fbb7d75387c70b51c5d8f9078aebeae7e98d1873b972a70d65a345f632f42f5c67cbe9a421c0 SHA512 6d886d8b96ada623436586ebbbb84d9eea34329bab3164d915a47e3e4de00b724928c6dc224c88541aeb0715de633d129949e7bcedcc2393b348a2692451ddda
+DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
+DIST seccomp-0.1.0.crate 2750 BLAKE2B cac2a5b20e640d94474f4c3db5f6102f0c45a8211080e2cc806828d1c20220d847c8bd4cf770543be56a36de4f0486725241c63215e041d2a0c35b6523eead3a SHA512 a13d27ac138e6c9fe83d25f94dcf23ec5a2a326504290bc20efc379b05d24ea5dde06a371af7e52c62fec81b0c8dd26ffb3c0a0baa3b701ccfa4f09019c6e1c8
+DIST serde-1.0.99.crate 72436 BLAKE2B 564e206ea5363898300af959efda372115de54812553853679af173fa91562562f1508d4cb570d801ea657af3aabcf8c3bdb40b762d6dc1e6a24c4a02cb09021 SHA512 9e6e55fd38777ef238d7b6c0f9f74da1e0cdc204e4735f70e6644d81e615d90c5b245bb8f2edb88751d126b3d1ca3c1e9f6922dddb645b9a1bb40bb4a8c11a0d
+DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
+DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
+DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
+DIST syntex-0.42.2.crate 3173 BLAKE2B 40624fa9370cf2c5ef02c28fb158b34926c22942ace0855d284a2c8b0ebc968492b67440eb010df10fc3fc06ed01c894b2f5ac87456ef2b7cce933cff22f1764 SHA512 b03cf0edc5367e31215e187d5ab32b76d1e909e47a34b0b9f58fe620681b7d55eed0689eb6b6c9b7312bb791d03995ce60b7daa1035df87959aa2d3117aa82c1
+DIST syntex_errors-0.42.0.crate 14621 BLAKE2B b0a5e6c75f41b1967e980d0e3d06ea8ff13bc2da34496195ea429dfa8697abd676015039fccb8a182330eb7813c91ddb0d778184dd45bae205bda6a3dc6179ec SHA512 4e821e947190a2c5888ad73e6d1c40eee0821f8cc86f6adf404a033bb2429b772873d6a0a86f3eef323b2607e4a059addaa26eac66b4d0c4a14cdd8d64b03667
+DIST syntex_pos-0.42.0.crate 6727 BLAKE2B 2af3c7f8617483ab8289f380ee09155c21eb84b840edb9d442c53f2fd3c29c1ffc3565a182afef732713b3353e47e648c27f3ad71dad8c8d565642be32442de1 SHA512 64eae847e30b23f210b4dea68291094fbd29b3747539bda7c9b69d41d5a49a36a779c8a1d244be931fa317786129fa6c8a197b319bef14149541a447698fc77e
+DIST syntex_syntax-0.42.0.crate 256508 BLAKE2B 7717a5da3feb313fba7651eea9ccecddfce24671908cbada516bc5aa9184d80c22e08f119600e568f6358e7be8a5894e627dad117aa9c1932d8d522ac7c8f2fc SHA512 db2e1b2d90d91e5f695d0b65f06ef9cc64d51c23bd1907c1e5b3516cc38c33b471e5bc75f02426caca58d1dc8827fb5f9adcc21fb344005878d54c4d7e925ebf
+DIST sys_util-0.1.0.crate 50265 BLAKE2B 4c10ec916bcf9e211de2efe42ccdaade08091d84b26b3a135054e44052749dd7befa77dc604a35407a048a5f398e735fcf2a470c558d5671451711cf0eed1332 SHA512 17f587a891063e00ab69d0fdab3d19f2af6f5566d71ab32f56a093ddc941a1ef68a07c5d9f135a65eda7d74689c2daa5bb7798fd1a1bfa22ae064536509f29b4
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST term-0.4.6.crate 38250 BLAKE2B e4509c0754dc87e6048fdeb42f9d0e6e2c888c5e43fa3aed451ad21a88a399179a1f9935532f6483c3ec374b4676066125f2de35aa2805b1ed1908f45722cd82 SHA512 b88d9a93082521d12071148b98fc236ceba43d7a13bbaf5da679ca03ea9a6a95e38a14ea72e71fe108a5fc6deba1c8c8b25afe5abb511d19965f5e219e7c1cf1
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST timerfd-1.0.0.crate 5535 BLAKE2B 0b961061d55987361915036fb36b65fc4413bb69bc67937b20d6c9658ccda2ea916876ff23e1ecf0d2b4ae1d7eae7cd4a5368f3892aba48748c62eef4a16ecde SHA512 aebf8d04e4fc2b569ff56aa556864505ea71e674bda8fe209eaa4cdbac32e9540030ba308c3bb285323ce49ca5130f45cb2eade19345ab4029adb753396f7430
+DIST tokio-core-0.1.12.crate 75654 BLAKE2B 5def63ba5b22aaa5ee0cf094365a0aa652b104c5970c55bc3ec777d44e4d4d313d0a1c6861d0a3da251c082f98649bfbb367035dd5a83cd318e15f0b1a6a40b3 SHA512 1ca199ec3640906e0ca42414c12212d00c4c42ef690225f3449d35e81a22e39008ec03a3b7a5762d6f84fb8d64bf07bdc2182ca3defb8a77342e732d6a4a025b
+DIST tokio-io-0.1.5.crate 33064 BLAKE2B d519c56dd896e25fe8134a0e57682c148a78215b46cae08b4b0bae1f36a11f66c0c69605d11259f5ea2c0783cd45ec66a1fd205f79f2ae2b34c83db3aa6b3f6a SHA512 702e9caab81c7a22717b77dd6931d76fa5a1d9d447ee88ebd0beea8cdac1fd75b84c93f3924903cda9e9d30e53e2e729b080261c4a8e0bd234308202567f343f
+DIST tokio-service-0.1.0.crate 8376 BLAKE2B bb2193af371d14c19a7f79760d4544bc5ebcba46d38d9b2836e46b6041c4b0c68f7902af51dcd3c83970084f271b1f29591b1fa461b854cb1bcc46b4db2c4d4c SHA512 a22b5a33fc957abeb8556ad1f01c6574a855b24053f7bf1ec23376df42b1e83f2fa0a538828742f24f586456e0e1314abe74ca3ac62d364f905b74c2e45903c8
+DIST tokio-uds-0.1.7.crate 15094 BLAKE2B 82b9eb1726c3f5c6c52e70c40be42618bf0bb42eb61f045999af04809d98a40afb64f9e0b31097c6d6ade4d7a2239d72f28462a126a204b4a8c318c341374c50 SHA512 2d21490ceef08554e5633d602ba1c15751a9e36d3a51b58358bb99ee117de1cb029b262ec0174545ef5c88f7cf2e54823c678715e8b83ca91e6491213eeeb9eb
+DIST unicase-2.4.0.crate 20143 BLAKE2B c579faae980fc52693a229c2ca1fca62647b8dbd1566f58ed50726e3e31db238fb33da168527630c4e55a786e595ce62aaa0d0d0cdbff46d53b628d96b8d00eb SHA512 d4b7d0e217a8a9180cd01cbce4d1e2bc80a9dbeee735954968c0372c9679f4f84b73294952947890340f20f4f9158b70ec2c13adc11b1f0cb53aa893755cff22
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-xid-0.0.3.crate 15998 BLAKE2B 2e112dbd311399836dd12ee37bbe7b9d83ed6fba89549784f1bf2ca9479b3e3cedd1bc2b15bf5e21b0cdb30fd3b88b973aadf37cb634024316ac33fc77d98d11 SHA512 268c1f3ec79ed2255c4e3759e4526b4892cb04f54ced07afbfff0ff8dcdec953e5b540fcb58b30bfec01b6401b58ef3b21320a0c1bf3a43aec22f0715568dcc5
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST utf8-ranges-1.0.4.crate 8575 BLAKE2B 686bfd854cdcb7510b07751630089f4f0cb0884017792288a63a4a8fa00e6cf1a10b38c39142e57d5b4d1f494c95f3445f343f1b34fc1883dbacfd708d8c13b6 SHA512 acd7008c92ed23cc0ad3fbacecfba2169781687c6aaa475ef5388fe416391cd209218a2cb19b9d4fc87a2a616f1dd67129d39978fe1b58be134a013f90cd53d4
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST wasi-0.5.0.crate 31104 BLAKE2B 91bf384f8f9abbdd4f75d0690056568792b7aa6a16834b73e8a5fca98d12b008f2be8101cb4e55864d2e057ba8d169010785f2acd395b69d894f8c32a62ee1ea SHA512 3996da04af8d178a6a7a2129de59ca62e51e9ff0c4dc99000919489f258598c2d6c6264736588b711df22679e8aca103fcc9e13f5a429b33bb4a28f7b909c79e
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+EBUILD firecracker-0.18.0.ebuild 2766 BLAKE2B 993aed6a569e7ca25108c0443fa803d9f98bf3e84636fcac4abd57149100339ea0f74af214d7b1138da0626400d2ee0dd85185d3c08eeffe8e455965dd0c5af6 SHA512 5742507711b65aec724b9510665b167209678dc75b26f08f0715f740037582fea6222080447993f57345f33c6648e570dccb7e0f02164f5af333961d0d9d22b5
+MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-emulation/firecracker/firecracker-0.18.0.ebuild b/app-emulation/firecracker/firecracker-0.18.0.ebuild
new file mode 100644
index 000000000000..d8166ac49973
--- /dev/null
+++ b/app-emulation/firecracker/firecracker-0.18.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.10
+backtrace-0.3.35
+backtrace-sys-0.1.31
+base64-0.9.3
+bitflags-0.5.0
+bitflags-1.1.0
+byteorder-1.2.1
+bytes-0.4.12
+c2-chacha-0.2.2
+cc-1.0.41
+cfg-if-0.1.9
+clap-2.33.0
+cpuid-0.1.0
+device_tree-1.1.0
+epoll-4.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.18
+futures-cpupool-0.1.8
+getrandom-0.1.11
+getrandom_package-0.1.20
+glob-0.2.11
+httparse-1.3.4
+hyper-0.11.16
+iovec-0.1.2
+ipnetwork-0.14.0
+itoa-0.4.4
+kernel-0.1.0
+kernel32-sys-0.2.2
+kvm-bindings-0.1.1
+kvm-ioctls-0.2.0
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.3.9
+log-0.4.8
+logger-0.1.0
+memchr-2.2.1
+mime-0.3.13
+mio-0.6.19
+mio-uds-0.6.7
+miow-0.2.1
+net2-0.2.33
+num_cpus-1.10.1
+percent-encoding-1.0.1
+pnet-0.22.0
+pnet_base-0.22.0
+pnet_datalink-0.22.0
+pnet_macros-0.22.0
+pnet_macros_support-0.22.0
+pnet_packet-0.22.0
+pnet_sys-0.22.0
+pnet_transport-0.22.0
+ppv-lite86-0.2.5
+proc-macro2-1.0.2
+quote-1.0.2
+rand-0.7.0
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.0.6
+regex-syntax-0.6.11
+relay-0.1.1
+remove_dir_all-0.5.2
+rustc-demangle-0.1.16
+rustc-serialize-0.3.24
+ryu-1.0.0
+safemem-0.3.2
+scoped-tls-0.1.2
+seccomp-0.1.0
+serde-1.0.99
+serde_derive-1.0.99
+serde_json-1.0.40
+slab-0.4.2
+syn-1.0.5
+syntex-0.42.2
+syntex_errors-0.42.0
+syntex_pos-0.42.0
+syntex_syntax-0.42.0
+sys_util-0.1.0
+tempfile-3.1.0
+term-0.4.6
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+timerfd-1.0.0
+tokio-core-0.1.12
+tokio-io-0.1.5
+tokio-service-0.1.0
+tokio-uds-0.1.7
+unicase-2.4.0
+unicode-width-0.1.6
+unicode-xid-0.0.3
+unicode-xid-0.2.0
+utf8-ranges-1.0.4
+version_check-0.1.5
+wasi-0.5.0
+ws2_32-sys-0.2.1
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+rust-libcore-0.0.3
+"
+
+inherit cargo linux-info toolchain-funcs
+
+DESCRIPTION="Secure and fast microVMs for serverless computing"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="test"
+
+BDEPEND="acct-group/kvm"
+
+set_target_arch() {
+	case "$(tc-arch)" in
+		amd64) target_arch=x86_64 ;;
+		x86)   target_arch=i686 ;;
+	esac
+}
+
+pkg_setup() {
+
+	if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+	else
+		        CONFIG_CHECK+=" ~KVM_AMD" || \
+			CONFIG_CHECK+=" ~KVM_INTEL"
+			ERROR_KVM="${P} requires KVM in-kernel support."
+	fi
+}
+
+src_compile() {
+	local target_arch
+	set_target_arch
+	cargo_src_compile --target ${target_arch}-unknown-linux-gnu
+}
diff --git a/app-emulation/firecracker/metadata.xml b/app-emulation/firecracker/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/app-emulation/firecracker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest
index 5435772c5392..b54e7820499f 100644
--- a/app-emulation/flannel/Manifest
+++ b/app-emulation/flannel/Manifest
@@ -4,8 +4,6 @@ AUX flanneld.confd 40 BLAKE2B 7e3aae756e872ead179c34119e39bb054c7e23255b647c9c4f
 AUX flanneld.initd 518 BLAKE2B 36859121c77fcd7b53f679eff455ad1ba1f9c6c58fc6a015e195c7639434f941106c44349671c1fe15f4f0c63c3d753f69e9b8cfe2a8d706cd33dbf62a928154 SHA512 3f6f33fe90adca1dd17b503ce0cd3a7f3cc0ca7fc10d0ca5b631f4c87ed513c0133dfd7679618cf95540b252b3176f9bbefd6454867ef792258c46cafc039d86
 AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca56b1df3297df4ff0a4c9ec6e70a3ddbf16c55c0bd5be146bcfa20f7b4ac8ceb08fa9af223164c19a905 SHA512 d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942
 AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220
-DIST flannel-0.10.0.tar.gz 4799262 BLAKE2B 7341f34f72bf2d51aa727d03eb94f376fd9da825dea1865db9d0b46d5bcc0338569b8aa81c3442b101768cd7b58bef3957bea86a38e8c1cca921b7a03d1b2bf3 SHA512 b71fff80f7c4891279e82c6c430cdbff1eb3966cc4817d1c2c5ed7a731e9466f04e51532734244510ab47cba07557c052fbaa9a4a9ecced56fa1e37f6681b1c9
 DIST flannel-0.11.0.tar.gz 6443391 BLAKE2B 5358e513a73fec6d8fcdb0182ec814fcf204eb12830f7d60acb3d4432f821ccc9e174fcc7adb57584ab1782c3f285e46b51bb0f76635fab9cf851cb2bd40c1b3 SHA512 72d18cd4ec58ede3848da3b94b7f3e33f8dda59d9fceb13864757998a24f0b312bc5b5d7927d3da8a805475efee469095ac09390fa632eb0c6ef9dd0f5d38a3b
-EBUILD flannel-0.10.0.ebuild 1403 BLAKE2B 669a75baef87e9c5cf6f8c221f3a16e91dfc15b9dcb59d06fc1a2f1790e07b52ebaa47c970c1a046e88caad122beeb83bf3ebecc6c70db143287ee6417710ec8 SHA512 2ba72e8c1f358224876b5ad2504a8cfe12b7d748a1038c69eac03b1d6e43f10473ac1b2cfa2c6daa32728004526f82b064f842fa82256e01473e5b7c2e0ddf6b
-EBUILD flannel-0.11.0.ebuild 1400 BLAKE2B 393d9facefcf3aeeafaafe9123635c308716132696582eb620a6f227d870cf119b00ee832856527f45f0e304ccb2fd9667e2a489adcaa669e9911aa93f251274 SHA512 520622789211655592ec31f81daa9e5469d44e5494dd9f2e233deba9330430705324992be3d7cf8be950d50a71c80b2f8bb2afcd09f2a716fd5f6b70a0d769d0
+EBUILD flannel-0.11.0.ebuild 1419 BLAKE2B 46f7a12e4cd40fc39ec71e545ed31524b98902dbee1cbc3e2ad895eb28922949fd7671f81aab740f604d0721a0e4cd768ac1e4f81f0ffcbeda8ab73b24d726ba SHA512 ec22340ff8ae9195ba99cda97d34acf4d5f04aa394a2f383247941dba4eabe2009812adcf762ea0199a01bbc89f0581dd15d3f86f94c0bd1d000087540d68553
 MISC metadata.xml 417 BLAKE2B e6ca7a068ab883a47cd7bd9d1fcad86c0e2e76304225d17c1aa1f02ebed1fd58bd885e8484873b6c900717e78a7398339f49f5fd74f100467c7d09b5b5800bff SHA512 f776dd802b80a94b819998c46ce5adcd163942fade01f13b3ea6c718bab1fcc6b08cdd0630f51fea305deb760fe9e8b3dd750dab3b2d1e3b2c6a257e7d4b1595
diff --git a/app-emulation/flannel/flannel-0.10.0.ebuild b/app-emulation/flannel/flannel-0.10.0.ebuild
deleted file mode 100644
index 3fd362881d8c..000000000000
--- a/app-emulation/flannel/flannel-0.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="An etcd backed network fabric for containers"
-EGO_PN="github.com/coreos/flannel"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
-		-i "${S}/src/${EGO_PN}/version/version.go" || die
-}
-
-src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
-	GOPATH="${WORKDIR}/${P}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	[[ -x bin/${PN} ]] || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	newbin "bin/${PN}" ${PN}d
-	cd "src/${EGO_PN}" || die
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	newinitd "${FILESDIR}"/flanneld.initd flanneld
-	newconfd "${FILESDIR}"/flanneld.confd flanneld
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/flanneld.logrotated flanneld
-	systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-	dodoc README.md
-}
diff --git a/app-emulation/flannel/flannel-0.11.0.ebuild b/app-emulation/flannel/flannel-0.11.0.ebuild
index 0753cf0bc62e..921d9cf19280 100644
--- a/app-emulation/flannel/flannel-0.11.0.ebuild
+++ b/app-emulation/flannel/flannel-0.11.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="An etcd backed network fabric for containers"
 EGO_PN="github.com/coreos/flannel"
 HOMEPAGE="https://github.com/coreos/flannel"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
 SLOT="0"
 IUSE="hardened"
 RESTRICT="test"
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 9a3daab4cb0c..4230f5bb2305 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -3,13 +3,9 @@ AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f59
 AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
 AUX free42-2.5.3-fix-makefile.patch 1902 BLAKE2B 1d8ae0054275bba2f8fa46aa8c6086e5b41dae17a417d8f0fbf14bb63fe9504577f67bd92b612665d414e55396ed6bc7b1ac36983b4dcfb32b4eb98514d0f768 SHA512 895fe2a42a8e1129dbc2bd8b523ae9235eb606ae8d48f53fd2689d9991ee1818334f66d154218592d9bc92b9e1d080b148ff6fca6f80295b0dd0475d9e1bbad9
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
-DIST free42-nologo-2.2.1.tgz 7398286 BLAKE2B 041c9672305b712efab8e7d5eb73bc0bd159b5fd61e9ecf39d5ce691aff045be4a6a4c635c0948e610e51832db64b388bdd001eb57aad41724e27dff4cf95a0a SHA512 2ed735ff161ea14ca5be97131b69065410faa699ed05d3eb94abbb9653c694d83fc4e45ea2bcf0c2a7894f89e731ee7839105dc1d58d6a6326047c9bd55da5d7
-DIST free42-nologo-2.4.2.tgz 7403471 BLAKE2B a2dba75bbdb8ceaee2f11dbc053ce50d71e0b5f46165fb61c6d3441326dc43b2afcdc2b99cbb638bbc59e19c5da948ce748b76ff4c612d5ed44e706583b159fb SHA512 046a42aebf1b4220acb9227dc365c26349b7a69c39d765b5ab59c83d9fc644055324c6288aaf87e6f9265310b5969335bc8be7035a84935fd7dda29bd9caf5a7
-DIST free42-nologo-2.4.tgz 7402688 BLAKE2B 5e1a46977a3e385fc44f09b5e0088cf73f4a67c3657110311e95795a5b7beb2583dc56bee14e0f578f6ee3517acc78b311b2da0e1671c38d7a5bb150c1e30197 SHA512 a74efd40a952892f346bb4c4096b6e0c00c337e782696de1064d626ea1bbc8aa5a9b557ad233ac92bd27ce8fe4202837e72eddf8f0b31c9320e8c150c6c0b408
 DIST free42-nologo-2.5.3.tgz 7406566 BLAKE2B a8fcad4738b46e5725e323eb7c16929c32fe0c72eccadf2f692950a3ee952f3b8f7e1e46d6e4eee4e822ca5a3b2c42adb09e2b43f0480c954aef87dc81b1edd3 SHA512 9a96bc5453f938ba806117ac3162db4f87d3584662c8a1aae370f17a06c1e92167adb2c2bb9bbd17b91473f272f8c031c7ffc1944247962571a94cb7063f0904
+DIST free42-nologo-2.5.9.tgz 7408535 BLAKE2B a64c925e5c93e396efc2a46f8d495201b039763269c9d326469f9b77435b6ef5a6b434f83a2c7017587ef7223724ed7986aafa60bcb542f79d20630eee0016fc SHA512 fba421b181649881092b398458e2065f9f133b76d88e140f046de805dd42a5ba513168cf2ecd4c94821e1b8374e596a2b696533d29c11ccae4106a14f1fdaba4
 EBUILD free42-2.0.20.ebuild 948 BLAKE2B 59ada24ef7746d402bfc2e9cb8ea80c23a68e3ffcd1a3da035281d7544422b21ee3c41fe005721672a180f97a850a7066f3a8087f4aa377fb4c0b4e6233fe49f SHA512 3c117630b0266091dff0b540c1975f6e5c69ec46d8a1f8ad55d7757147df9fc2a6bc9bd3bcfead241cfa8dde29deed727bc1bf39e1f833aab686f2c98504a123
-EBUILD free42-2.2.1.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
-EBUILD free42-2.4.2.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
-EBUILD free42-2.4.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
 EBUILD free42-2.5.3.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
+EBUILD free42-2.5.9.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
 MISC metadata.xml 547 BLAKE2B c7cdf7e2a312b69ae94b467836751bbf61dc771e58866edc21d70bf1b15c776afaefc20a947f6dc8af6586ec2b5e3416bd32446ca3a92890ed573daad6e48d38 SHA512 99885c9a7abecc41f53a946d1b94d2f8d8fda74f0e3f0a0cf6a43a418a874922594841e17b6197aee9f80b007d7633f2154ba85cec81dcfc22efcc7b52edd15d
diff --git a/app-emulation/free42/free42-2.2.1.ebuild b/app-emulation/free42/free42-2.2.1.ebuild
deleted file mode 100644
index 73ac9b4e00d4..000000000000
--- a/app-emulation/free42/free42-2.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXmu"
-
-DOCS=( CREDITS HISTORY README )
-S="${WORKDIR}/${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
-	"${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
-	emake -C gtk clean
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
-}
-
-src_install() {
-	default
-	dobin gtk/free42bin gtk/free42dec
-}
diff --git a/app-emulation/free42/free42-2.4.2.ebuild b/app-emulation/free42/free42-2.4.2.ebuild
deleted file mode 100644
index 73ac9b4e00d4..000000000000
--- a/app-emulation/free42/free42-2.4.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXmu"
-
-DOCS=( CREDITS HISTORY README )
-S="${WORKDIR}/${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
-	"${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
-	emake -C gtk clean
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
-}
-
-src_install() {
-	default
-	dobin gtk/free42bin gtk/free42dec
-}
diff --git a/app-emulation/free42/free42-2.4.ebuild b/app-emulation/free42/free42-2.5.9.ebuild
index 73ac9b4e00d4..67e64a2dd933 100644
--- a/app-emulation/free42/free42-2.4.ebuild
+++ b/app-emulation/free42/free42-2.5.9.ebuild
@@ -31,8 +31,8 @@ DOCS=( CREDITS HISTORY README )
 S="${WORKDIR}/${MY_PV}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
-	"${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
+	"${FILESDIR}/${PN}-2.5.3-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
 )
 
 src_prepare() {
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index d072e5947509..c007ab5e3b49 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -1,5 +1,5 @@
 AUX fs-uae-3.0.0-Xatom.h.patch 669 BLAKE2B 3463b8f19551b8ea3d634bc75f9de2fb77685af9c24e1fba555991d1d094f4d75be048e4d9a7852bfd8882b1e9826f174550bc3953e3ec636193aaa647462d12 SHA512 af86c772049d8ff5eef36c8988888891ea60a68e929d752c8f1c9e325af584175f14496a2099654381bb33a3adecb913991e129fee05524ecad4a166228dbd68
 AUX fs-uae-3.0.0-libmpeg2.patch 1078 BLAKE2B 119d797854beb0148af9a77003b7b06696d9a474645ff15181044dcffd783a91f89a66cf90b072603c4f324b95a4a0cf124abefc6adc71b9be4b8a92f36060ac SHA512 8624c3404b627321a2b6673271be27daa24924a8c56903c870fd5a6f2dc50c18fd97810a1aab3cd684a5a97544c1e64f68c855c822d3e5bb5981faf264d28ae7
 DIST fs-uae-3.0.0.tar.gz 4841427 BLAKE2B 318bf457cca60e763a938d3d1a846e72a50f9b899dd8eefd79bc331f385a3529cb2bf2adc1616c1c5a04c1a1c92d4257c88593ada103d3e05847656a26a1c435 SHA512 3ceee2434b3aa3f545370a17149b3cda8d2eeb1bd093a45869a897a00b82ae4395efc52c129124e44262b47b7f56337e1adb9f58b0a1562efa73ee3ea3915b68
-EBUILD fs-uae-3.0.0.ebuild 2424 BLAKE2B 7a3fc9be3751977d0b6dde690f5184442555cb8ea6a70eaccc76bc35e79ea92527ba9b614682875c859424586f0481572897d24e08de071b97bef1967624d6ff SHA512 f56299658b80607ab85e87b556351dc4ca9117fefa492f8ff47e1b1c7ef3cd4c32c26d46cd832b6350fb15faf1655aad0b41113b8a96cf997c67365689aa56c0
+EBUILD fs-uae-3.0.0.ebuild 2438 BLAKE2B cbd56c50a7fd699d8ab3726e7dab2ddbdf2c118dc0c3e10b3b589a509550e384f9caa72a4ad0cf29fdb90cfea4a54d16482e26eacbad986338f7b432e84ac492 SHA512 984248fec9239d526c6fd90fb68581675e0413a5751412ccef671d131a1f0f98bd26d87f758e25611e4212e88446dd020af946af0ef250517071b248b0a34657
 MISC metadata.xml 533 BLAKE2B 5082ca2fc578b6fcb5a13825c2264a0c1cd6c227f8d85d1d8dfd056bd12b54784b90dca1b7e61c8d127c5d06dfb1b5a45f97125831f6ef42804a00d8fd992b2d SHA512 84eb6bf83f3ccfe871a33517117968f8aaae75a3af79ab29f96f3bff839badbd9c16c1296b1693e8c293e5a1363de12e650c0406b8dbbb1026e64acea5bbd745
diff --git a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
index f0492ee2c5ae..6d0c2446b7e8 100644
--- a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 "
 
 BDEPEND="
+	app-arch/zip
 	sys-devel/gettext
 	virtual/pkgconfig
 "
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 36b97d8b0e5d..2d438d0876f4 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,11 +1,5 @@
 AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
-DIST libpod-1.3.2.tar.gz 6901289 BLAKE2B 5de0cf9f47f7e10866839ba01f3c3ed930ebdb716ce10ca4cb6f6b4d0e96088e10a069726125f2dc4af6febe08e6b2fc058fb8e8ecd7dd870612ecb98f29bba5 SHA512 fb959bf6af314baf3d01c53b513390b6d181adca3f9ff2ca747fabd53abdd45907e8a3f8189ff2d1bd70cff8e8bad690407cf278392a0831e6109669a1c1b12b
-DIST libpod-1.4.0.tar.gz 6937356 BLAKE2B d8fa4920485be89c84adca8a15946bfbac01671ff5460cb0e519cddd208e28b2dae392bfff93cf0b344d7d887e000d4edf430c81bd8a903678e10578a459cf70 SHA512 711de3cf02c96316aaec3d62fb5eaf5d16c6689b4b84cfcc3a375ba5c0554d3a7d2f789eb8d330e38be37d8907427641c077038c9945ed0ca6cd19ec872a451c
-DIST libpod-1.4.4.tar.gz 8286321 BLAKE2B 2f7d529d1780694e450d7ac63aef53ad2bbe27a9cdd939fe7b7d5c71020173639a6b7c20e3732cb2a8320e0f55ec906acab29fc3b1bdbec8a05add1baf688194 SHA512 18e9f2cbd308d1fd5cd9d4931530b7c8357784a1cfd84ceb106813e5bfbd404424c656dd82d74c04678e8d83c03d2ef44c16d3a866b6844a3ed0adc0e88dd8b0
 DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee SHA512 d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02
-EBUILD libpod-1.3.2-r1.ebuild 3883 BLAKE2B 69659832d27cc862714e4f1e3c38f4ed17347849287c4d56a74ee13dbb0c76963d05792b583f250a5277d1e73bce69891568df2b1e355f28656faf8a4983868c SHA512 143e0f3590c2314574513f9884e4041381e9b246524e5b30ab9950eb05c297e91d8b22be21bde2c92ce3d98632baaaf0b86548931982bd62e7c911c9d70bdda6
-EBUILD libpod-1.4.0.ebuild 3883 BLAKE2B d0dc897d5e3768c2b63e1f07dcc7d12856a505c780cc53ed404508cb1d73a5b8df09ad0c6a9a8e76210d6f25d20c4b3e57058648f43150804dea4b6d50d91d90 SHA512 57e50da85c7c455b81c0cf9d10d271628f924f2483cc1a51a54119622353a65fadb9d9348b004410d5050df8b243a112bcfed5cb75d095d876ad970babe188a6
-EBUILD libpod-1.4.4.ebuild 3879 BLAKE2B 5b6d38fab756fc0d1728bde36e2fc32eafe780c68aae71915460a677399ad6dc15d8aadc0af0f2d7d64b1f925a433dbb4d22cc9ff5a8cfd4220da2c6c38ad553 SHA512 f22a57de1247161b34efd9e9c1897b538a43c49954afa591fec9aa184825dddbcebc7a948b33ccdd70a15fcdc0d6f0fd7ee49d01ab92f5993a252ca5cbbc51de
-EBUILD libpod-1.5.1-r1.ebuild 3908 BLAKE2B cbc1b96a85bad658281e1d5847073727c60ebdb95d6c774aa0d857c8f7a988e41b653c75df35fc7c21d665809850c91de068648f520112f635ee245e1287a0fa SHA512 9de63d09ada32a3a9e36049f6a587be0e0706b429438a784340ebe5326220c087ab74b712906c8545f98d195247f9b80c600f2cee77ccbfd13d505a0f33d6dc6
+EBUILD libpod-1.5.1-r1.ebuild 3947 BLAKE2B b2e0acf87c7d929a85fea55eb4eb01029e6a62cf50c3e8009941d360bee2089c2ff24ae7e42ef29e6b6b47b907e8996e52b842d9d7b935a3b2046226e82a56e3 SHA512 709f350e30b2512c4d9eb22729b0a6b66b94e7411ecec8429ebbe96ce6d974fe984b9590b3ea113279f10af9d07b42a46f3713915d7a7bcd0d42f72e28af28aa
 MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555
diff --git a/app-emulation/libpod/libpod-1.3.2-r1.ebuild b/app-emulation/libpod/libpod-1.3.2-r1.ebuild
deleted file mode 100644
index aa7383b13970..000000000000
--- a/app-emulation/libpod/libpod-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="14fdcd0dedaec2fa89ccb58840e297ecb98cc617"
-EGO_PN="github.com/containers/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-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"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!selinux? ( !ostree )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-emulation/conmon
-	>=app-emulation/runc-1.0.0_rc6
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	ostree? (
-		dev-libs/glib:=
-		dev-util/ostree:=
-	)
-	rootless? ( app-emulation/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	# 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
-}
-
-src_compile() {
-	[[ -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/ostree_tag.sh ]] || die
-	if use ostree; then
-		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_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
-
-	env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${EGIT_COMMIT}" \
-			GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	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.4.0.ebuild b/app-emulation/libpod/libpod-1.4.0.ebuild
deleted file mode 100644
index 13e252945a3b..000000000000
--- a/app-emulation/libpod/libpod-1.4.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="41365a8f6760349cac826a7c1d50ba2c4057ed50"
-EGO_PN="github.com/containers/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-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"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!selinux? ( !ostree )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-emulation/conmon
-	>=app-emulation/runc-1.0.0_rc6
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	ostree? (
-		dev-libs/glib:=
-		dev-util/ostree:=
-	)
-	rootless? ( app-emulation/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	# 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
-}
-
-src_compile() {
-	[[ -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/ostree_tag.sh ]] || die
-	if use ostree; then
-		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_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
-
-	env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${EGIT_COMMIT}" \
-			GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	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.4.4.ebuild b/app-emulation/libpod/libpod-1.4.4.ebuild
deleted file mode 100644
index 8dfcea5cf943..000000000000
--- a/app-emulation/libpod/libpod-1.4.4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="b3f10c8be229bcc58c1673b0431285fd5fce1293"
-EGO_PN="github.com/containers/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-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"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!selinux? ( !ostree )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	app-emulation/conmon
-	>=app-emulation/runc-1.0.0_rc6
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	ostree? (
-		dev-libs/glib:=
-		dev-util/ostree:=
-	)
-	rootless? ( app-emulation/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-
-	# 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
-}
-
-src_compile() {
-	[[ -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/ostree_tag.sh ]] || die
-	if use ostree; then
-		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_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
-
-	env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/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
-
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	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.5.1-r1.ebuild b/app-emulation/libpod/libpod-1.5.1-r1.ebuild
index a3cd4c059627..f1061d08281f 100644
--- a/app-emulation/libpod/libpod-1.5.1-r1.ebuild
+++ b/app-emulation/libpod/libpod-1.5.1-r1.ebuild
@@ -11,7 +11,7 @@ inherit bash-completion-r1 flag-o-matic golang-vcs-snapshot
 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"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 
 KEYWORDS="~amd64"
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 92e4a1029518..08661fc18396 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,9 +9,12 @@ AUX qemu-4.0.0-linux-headers-5.2.patch 11360 BLAKE2B 6299f25424044df02e892f10d73
 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-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
-EBUILD qemu-4.0.0-r50.ebuild 23981 BLAKE2B 75a7d09180d9e348ca8bac2a767642e2fb75fbd21f06face1fe2bb4faaa1de05f1912db48cda8c2a19ecc12c34ab31e51f2d1d4189ad8957db78cfe415812822 SHA512 ba6fd9433fa359cd6ddeff940bbf1c096721eae4dcdedee93ada5e6fee1c4cf9e14e3d5ee4781bab7509e8ea9c638d37d2222719e847c5c20709f19d6a88b5e4
-EBUILD qemu-9999.ebuild 23727 BLAKE2B c7c4b5b01fcc0e970286f9b77f2a9e479e19fe10250acf1ececdcee90321aa6b214b9fd18e468ea68cbdbbd64c88ae798cc851810ebe4b8989a2b27bb197ffb7 SHA512 e37d21022b042498b3ff297f348d370f75877d465b1cec481c017d5542149c7378d83724f227f31de2adc7406c5228a874d2de37e70135d3f1b91f45e83ae50b
-MISC metadata.xml 3903 BLAKE2B 47538d32d79321c208037c95184ab68dbbcaa2331a561142bbadc01fbc2b7973cc5ae76ac6dfa7faf1c3aa31d1d0b5dfd6a46211e94c17c5a8939b0ae99b227b SHA512 d501ede1f3182e635db02c8bac4381906ac47b8d6db4bb6b0fdeb91b35b440a2a59a5dd23b06462f1d49a6b64ae2f2bcf1f81fd0a898c8f4b67a40ccf2c58341
+DIST qemu-4.1.0.tar.xz 54001708 BLAKE2B fc89d0c967fb31a73cbdca556e79c05c44b241382a83f02150a8e39b00cb7de7fb6f248e82e1364e314680481bfb3843e74804534c0ba91a5bb2ff1b8d771130 SHA512 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2
+EBUILD qemu-4.0.0-r50.ebuild 24059 BLAKE2B 1b37f45dfc3f73f23fba024bed185f75df72f55ad8d68a273ce954eb01021a51ecffecc08ead6b92f015319861b3906ca1d54e731db8a81717d090828bc65570 SHA512 240b96516c7cea8f1b8d9be3d8a736e05384dd984b7d1f0973f71fd68337d2ae6955fa7e129c3b8c5cfce0c1cde1596b760412068694bc5835c124d199d2234d
+EBUILD qemu-4.1.0.ebuild 24163 BLAKE2B 33a35941a60017acec0e4600504c3462d0aae79de320da812be097a9b2c3f4971c279a8ed8a5c38db4c83026cdc847b7f877d3d263791fc856746cded9153b81 SHA512 48686acbb7b97737e7851c53798afdc9601a521db4c719364d72de8915779abc1d9d0f06d129f69dd57e0fde2d362a278d0624bffce81e1f4bca6b3d69ab6b61
+EBUILD qemu-9999.ebuild 24066 BLAKE2B 391e815b990ae5bd97e24ff35f58c0abb818688d82785f0f6449ca32a170d5df84087d2b82db581318b23f1fe51a5db9865b31ecffdec64ec15bebd40873ba22 SHA512 7084f305e683c1a625704ba99f4d17abb188bb3090f83222d1bb8fc0e54c98fb3560331bf1ed7e769dab8a56811e658e0763e02754cdd11e3368abbe6b6959a7
+MISC metadata.xml 4012 BLAKE2B 1777649cce22dce3bc047584df1ab428fb3216f126a175b727df0857de99f857b6f6a1465a39eedb81355a0348e11ae504f92d60d03b0ffddeb3529ac4854a85 SHA512 85a4126971ea026e21371a4eb1f2e6f0c194644902bd9cc64a066f161b353e4a39cdcdd51af8fc554e446c0b13817c3416cce9f6261d5d8ab93ba50d58eb6dab
diff --git a/app-emulation/qemu/files/qemu-4.0.0-xkbcommon.patch b/app-emulation/qemu/files/qemu-4.0.0-xkbcommon.patch
new file mode 100644
index 000000000000..3d9a5163ecf5
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-4.0.0-xkbcommon.patch
@@ -0,0 +1,38 @@
+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/metadata.xml b/app-emulation/qemu/metadata.xml
index e6ed85bf1f7e..4c468733de52 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -37,9 +37,9 @@
 		<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="static-user">Build the User targets as static binaries</flag>
 		<flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag>
-		<flag name="snappy">Enable support for snappy compression</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="tci">Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
+		<flag name="jemalloc">Enable jemalloc allocator support</flag>
 		<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
 		<flag name="png">Enable png image support for the VNC console server</flag>
 		<flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
@@ -55,5 +55,6 @@
 		<flag name="xen">Enables support for Xen backends</flag>
 		<flag name="xfs">Support xfsctl() notification and syncing for XFS backed
 		virtual disks.</flag>
+		<flag name="xkb">Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index d547b37ab845..cc99fdbbcc18 100644
--- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
-	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
+	+fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
 	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
 	spice ssh static static-user systemtap tci test usb usbredir vde
@@ -108,6 +108,7 @@ SOFTMMU_TOOLS_DEPEND="
 		sys-fabric/librdmacm:=[static-libs(+)]
 	)
 	iscsi? ( net-libs/libiscsi )
+	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? (
@@ -436,6 +437,7 @@ qemu_src_configure() {
 		$(conf_notuser gtk)
 		$(conf_notuser infiniband rdma)
 		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jemalloc jemalloc)
 		$(conf_notuser jpeg vnc-jpeg)
 		$(conf_notuser kernel_linux kvm)
 		$(conf_notuser lzo)
diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild
new file mode 100644
index 000000000000..f4991a5e13ad
--- /dev/null
+++ b/app-emulation/qemu/qemu-4.1.0.ebuild
@@ -0,0 +1,824 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="4.0.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1 \
+	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	EGIT_SUBMODULES=(
+		slirp
+		tests/fp/berkeley-{test,soft}float-3
+		ui/keycodemapdb
+	)
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+	+fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
+	kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+	+png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
+	spice ssh static static-user systemtap tci test usb usbredir vde
+	+vhost-net virgl virtfs +vnc vte xattr xen xfs +xkb"
+
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
+	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
+	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+	lm32 moxie tricore unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
+	tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	dev-libs/libxml2[static-libs(+)]
+	xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:= )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? (
+		sys-fabric/libibumad:=[static-libs(+)]
+		sys-fabric/libibverbs:=[static-libs(+)]
+		sys-fabric/librdmacm:=[static-libs(+)]
+	)
+	iscsi? ( net-libs/libiscsi )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:0=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[X]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-201905[binary]
+		~sys-firmware/ipxe-1.0.0_p20190728[binary]
+		~sys-firmware/seabios-1.12.0[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre8[binary]
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC64_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.12.0[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+	)
+"
+
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)
+"
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+	acct-group/kvm
+	selinux? ( sec-policy/selinux-qemu )"
+
+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.0.0-xkbcommon.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR LD NM OBJCOPY PKG_CONFIG
+	export WINDRES=${CHOST}-windres
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Run after we've applied all patches.
+	handle_locales
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--with-confsuffix=/qemu
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable doc docs)
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		--disable-bluez
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jemalloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_notuser seccomp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_notuser virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+		$(conf_notuser xkb xkbcommon)
+	)
+
+	if [[ ${buildtype} == "user" ]] ; then
+		conf_opts+=( --disable-libxml2 )
+	else
+		conf_opts+=( --enable-libxml2 )
+	fi
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			$(usev alsa)
+			$(usev oss)
+			$(usev sdl)
+			$(usex pulseaudio pa "")
+		)
+		conf_opts+=(
+			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+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
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index c58b83277ecd..51deb16ff036 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -15,6 +15,11 @@ inherit eutils linux-info toolchain-funcs multilib python-r1 \
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	EGIT_SUBMODULES=(
+		slirp
+		tests/fp/berkeley-{test,soft}float-3
+		ui/keycodemapdb
+	)
 	inherit git-r3
 	SRC_URI=""
 else
@@ -27,12 +32,13 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
+
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
-	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
-	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
-	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
+	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg jemalloc kernel_linux
+	kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+	+png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
 	spice ssh static static-user systemtap tci test usb usbredir vde
-	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
+	+vhost-net virgl virtfs +vnc vte xattr xen xfs +xkb"
 
 COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
 	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
@@ -80,7 +86,7 @@ ALL_DEPEND="
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
 	dev-libs/libxml2[static-libs(+)]
-	x11-libs/libxkbcommon[static-libs(+)]
+	xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
 	accessibility? (
 		app-accessibility/brltty[api]
@@ -108,6 +114,7 @@ SOFTMMU_TOOLS_DEPEND="
 		sys-fabric/librdmacm:=[static-libs(+)]
 	)
 	iscsi? ( net-libs/libiscsi )
+	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? (
@@ -161,7 +168,7 @@ X86_FIRMWARE_DEPEND="
 	)"
 PPC64_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.11.0[binary,seavgabios]
+		~sys-firmware/seabios-1.12.0[binary,seavgabios]
 	)
 	!pin-upstream-blobs? (
 		>=sys-firmware/seabios-1.10.2[seavgabios]
@@ -357,8 +364,9 @@ src_prepare() {
 
 	default
 
-	# Fix ld and objcopy being called directly
-	tc-export AR LD OBJCOPY
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR LD NM OBJCOPY PKG_CONFIG
+	export WINDRES=${CHOST}-windres
 
 	# Verbose builds
 	MAKEOPTS+=" V=1"
@@ -385,8 +393,13 @@ qemu_src_configure() {
 	local conf_opts=(
 		--prefix=/usr
 		--sysconfdir=/etc
+		--bindir=/usr/bin
 		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
 		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--with-confsuffix=/qemu
+		--localstatedir=/var
 		--disable-bsd-user
 		--disable-guest-agent
 		--disable-strip
@@ -431,6 +444,7 @@ qemu_src_configure() {
 		$(conf_notuser gtk)
 		$(conf_notuser infiniband rdma)
 		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jemalloc jemalloc)
 		$(conf_notuser jpeg vnc-jpeg)
 		$(conf_notuser kernel_linux kvm)
 		$(conf_notuser lzo)
@@ -458,6 +472,7 @@ qemu_src_configure() {
 		$(conf_notuser xen)
 		$(conf_notuser xen xen-pci-passthrough)
 		$(conf_notuser xfs xfsctl)
+		$(conf_notuser xkb xkbcommon)
 	)
 
 	if [[ ${buildtype} == "user" ]] ; then
@@ -468,12 +483,14 @@ qemu_src_configure() {
 
 	if [[ ! ${buildtype} == "user" ]] ; then
 		# audio options
-		local audio_opts="oss"
-		use alsa && audio_opts="alsa,${audio_opts}"
-		use sdl && audio_opts="sdl,${audio_opts}"
-		use pulseaudio && audio_opts="pa,${audio_opts}"
+		local audio_opts=(
+			$(usev alsa)
+			$(usev oss)
+			$(usev sdl)
+			$(usex pulseaudio pa "")
+		)
 		conf_opts+=(
-			--audio-drv-list="${audio_opts}"
+			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
 		)
 	fi
 
diff --git a/app-emulation/simplevirt/Manifest b/app-emulation/simplevirt/Manifest
index 0a3cd13ed7ca..cacc230f17d9 100644
--- a/app-emulation/simplevirt/Manifest
+++ b/app-emulation/simplevirt/Manifest
@@ -1,5 +1,5 @@
 AUX simplevirtd.confd 103 BLAKE2B 897b17aac8b81b60171267560c36a742dcd812cb3c883bb2855b2ec6fc0664d582f0779f2a5593105c94c0e18b82468dcbfc1b935f215f7d6b42f33043cd7121 SHA512 3e529de36a18bf082d7de220c8c0b52aedf6a1eb3860192db7a79cad5dc0d224d727d7377c8afde3c8d899d42b3ac4a6c56cbb4e17cd5b9217413b1657d0a516
-AUX simplevirtd.initd 334 BLAKE2B 356fcfa12c26bd1d26f4a2bfeee9c598d7c543739b2ea94a73fabce8f7180fcf2abec9ba9384be1c91e5415ae07786c513400ec627e81e4c2bf7f5f01a5dde12 SHA512 642efacdbfce06f6e78a2f9d62ee8417d230f94e55e79d2334c5b049ada1b38174a8ff057b27c00c5a87e64500ca37c542aaeb37a9eb59125e0ef5fe0b39ca28
+AUX simplevirtd.initd 334 BLAKE2B beecf30220f420c787bc200e149bb47509f9ed46e22354ecc8faf41ee4f7745a0ac2a484acf8d69d43098124f060f79ea84a714c51619cc923d82df4688c6e16 SHA512 97be762c5a1a50255e2b64ff1b0ffa91f882062fe93c583191e2ab612d9e299f277b536fde322b613f720827e747a371487678653d818849b4d08c81a94ff8b8
 DIST github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz 30367 BLAKE2B c18a0f1aff1bde8e6fc533ea627377ca4de4830d84289355f68163855ec97ac47f537b3b2627568c31714ac3a7672ebf86d60452269c75c80c2cd7565d7c97a0 SHA512 94342de3aad4db1c4442062f4cf4e57c723a43bbcb0069a8bed3b719e3864eef7500a24c9c99c755114708d6822e9b23f296b6d0b2b46f32cc6ffc65944d1729
 DIST github.com-go-yaml-yaml-v2.2.1.tar.gz 70217 BLAKE2B 4ba34bd9432699ec60348d13d8b95498abf751a922f782bf177695e6854faf907c1728d1dc13ad1cb63215fe3a86366cd99068247d15c726ba77bd0cf434b9c6 SHA512 d49267ee361196b0a1e1b9ad6f6cfa903627ccf7925fc3acc8d1bd214b64d362a9dcee10ba524fb8887226235c5baa2c8812a9f62adc7e6719d4ed84baa4ce4b
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
diff --git a/app-emulation/simplevirt/files/simplevirtd.initd b/app-emulation/simplevirt/files/simplevirtd.initd
index f7ba444d6d98..d8dfadbcb69b 100755..100644
--- a/app-emulation/simplevirt/files/simplevirtd.initd
+++ b/app-emulation/simplevirt/files/simplevirtd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 name="simplevirtd"
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index fe850032959e..62d1ceac9769 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -5,5 +5,5 @@ DIST spice-vdagent-0.17.0-patches-20180319.tar.xz 38924 BLAKE2B c7c7f851d307cd7d
 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 1684 BLAKE2B 061a8c3d2423b3824f4d86501a8fe7767c8cd55cbb4aa304ef087a6fcbf713ddfaba610c4261bdf40d495a261eee2347f814c554c959faf66c6b331adefdca6e SHA512 427881f201729f926372826cab0cb0ee2595c6340f3aa49a54bdb4b9ad9d641e42b8baf49c211ccaae9a03fbde832e7107cfbd7a06a9e9ecaef616a58f63a78a
-EBUILD spice-vdagent-0.19.0.ebuild 1571 BLAKE2B 679c8a969e0f81a73174b2f491fb16743094c935e4c10246444e0f29eb7ab32e369ab11b4ee83aaa499c714779768bb4df65825fc84683e14e954f6cb8d4612a SHA512 689c302d89f80ceb8ac4ddf4648bd97632a792219193328af23529b2dcd57d33ac77323f2dc46682bfe09b8a62d0104f7e3d78c924c7fc2f23ccdaaf457ffb43
+EBUILD spice-vdagent-0.19.0.ebuild 1588 BLAKE2B 2daeac37a0d7c09f0849a6c3f98e59262759cc7d873b36c605752b44b8818a9f7555bb2725e1e5f91c478c352e7fc489c61f26be6859eb6a2e74200ab84dc07f SHA512 d65269c92273fae7c43114483c12517928fffebecf61fc36e3a528467749e3495a3148bab3cc0ce586e2af993086a103b375cd17ef9fbe8d1dff983a4c993990
 MISC metadata.xml 557 BLAKE2B 03e0f3f159d333513fb7a575b46ad91167fc30e96b4e982cdb2bf545f19a53982e82698b03b02df0dc7dbfb90d9d05aa155c56aa1dc2cf6a13153145fd4231b3 SHA512 1f3892771740224f1275a9eb3507e1ac32be745340b50f983383e6b09e69de75d2e0562fd13465a588d08a4d049d0b33b233ada1a3a9883e1ee24c431fa7e236
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
index d62b552d79d0..30ce2ee207e0 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
@@ -22,6 +22,7 @@ CDEPEND="
 	>=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
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index f51237f9d855..856d75485857 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -5,6 +5,6 @@ AUX spice-0.14.0-openssl1.1_fix.patch 614 BLAKE2B fb7b39e73d37bc6ab27035c7d7a742
 DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
 DIST spice-0.14.2.tar.bz2 1406009 BLAKE2B e6c57bedd8c8ec0444da194be7279b895bf348dfa9b427d20301cc223627bcd65b7037280bc2a3d0b531b0cdcd8cb62d34ee132c549ac3dc8f6e5a2959339ce2 SHA512 1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76
 EBUILD spice-0.14.0-r2.ebuild 2499 BLAKE2B dd891d8a45946487668b1477542d07c506844a9f521a1296c27b453fc0adb68942b1a8eb304b72f017eafd9c1043574c36fddc139638b29ef5e84965256f7e89 SHA512 42d61b11fc788736e9a5c40b765d260f3bcc6060a3b6e2ede73f7e1187d597037f9c194b0ed841e234634a960618549c42363d55b7cc6846e06bc300c0fd3bf7
-EBUILD spice-0.14.2.ebuild 2437 BLAKE2B 799d9c327fa7dce4478e55342e7b410b5065619e3fcd87cd8965d4888f5aab9922cec37899f088a81327f1a176008cbba50d92343d5d4ca890e4d092d2555d5a SHA512 7e4b6016cba8e679f6410673dc84381be795940d980226fad9acfce150b8ad2fd5049be0da76189221dbf130ae024813609824e217b4307b0d652d8407fdd3d8
-EBUILD spice-9999.ebuild 2365 BLAKE2B 16aa7424b66382318ee14b7449d3087b3e00fbdeb6b154906aad2398540039b80bde961234918cfdddd62f0a1dc451c0be500cd13d1076f94a521b916f81a75a SHA512 d2fc894b11162f2569824849c65ede60f3362bee31af7cee14048b1fdaf2bd8f578e3df5726e7ccc434dbd5f91b37d7635b43db9cd1f724330d9aff3c8c1c2c3
-MISC metadata.xml 476 BLAKE2B 2cda64935d0117db099551f30928c447c4d1d7f4e1c355e619c0134ec31e4d7779b646329218c48f9be671d0f0e92fa496caaa34f6aa4136748dd9bd6d2d868a SHA512 3ae95b689c812e19679cb9a9db2f0811077a4eb205cadf4baeb78a2ddfeb7fc0086e2514540fad59e447bbca6c9dba81001a8ff156a1d18ba2d58171ba301f9b
+EBUILD spice-0.14.2.ebuild 2452 BLAKE2B d57cf9e0bc1c9b14273ae1d91b4ba28e5da0c448796bbed5d0043d09e16299e8bd7d42b3eddc0301b45b2f68edf3900a04f1cb665229cd8d94d3d961edb3d959 SHA512 adacf97c66ba14baffca32e0ca3148af5bed9ee218924364b43c610fa56b34c751e81da51e7e8dad9f0cb2fe4315260de6b9f57e66a65f9560876b1724e6e932
+EBUILD spice-9999.ebuild 2516 BLAKE2B 7c64c6889233f066fa0dcc4dd638d8259ee596ef3ccad9d344c11fca7fc3511e890ed2b35d88e5d8f273e1b7097173ef9372cc84497cb4fa7d463d2e73372417 SHA512 4d7c8e899aab2b9453eb3fb5b92ecf8cf550ace49a6612a81fbc9d5d1db5db690f5e31f55525d7b1ee692e1d26ec92b053a3acc7da0773cbef63267eb04ac707
+MISC metadata.xml 385 BLAKE2B 599bae33d9264b8b3b4474b0d2234d66e6c6f2cd3da1710bfea64f75570264da7f4de712cecb95408a059f70e3dba2de2a421c02f1f728e39c2bf913c2c570a0 SHA512 c75966298d69fb56b3e16c98b0cc7b3b2514d2ad2a6b790777c00493754e678388f0eb17fbabc6f58a667883e87d2a4f19c2a1c34f5c87f81fb13a8948ab85c8
diff --git a/app-emulation/spice/metadata.xml b/app-emulation/spice/metadata.xml
index 0f32fa2a88cf..ee309bddf45f 100644
--- a/app-emulation/spice/metadata.xml
+++ b/app-emulation/spice/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
 	<use>
-		<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
 		<flag name="smartcard">Enable smartcard remoting using <pkg>app-emulation/libcacard</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/spice/spice-0.14.2.ebuild b/app-emulation/spice/spice-0.14.2.ebuild
index 464cb7d9c62e..58de3c678521 100644
--- a/app-emulation/spice/spice-0.14.2.ebuild
+++ b/app-emulation/spice/spice-0.14.2.ebuild
@@ -33,22 +33,22 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	>=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}]
-	')
-	smartcard? ( app-emulation/qemu[smartcard] )"
+	')"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.0-openssl1.1_fix.patch
 )
 
 python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version "dev-python/six[${PYTHON_USEDEP}]"
+	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 48cf0c3fa264..d4bf02488571 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -34,18 +34,18 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	~app-emulation/spice-protocol-9999
+	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}]
-	')
-	smartcard? ( app-emulation/qemu[smartcard] )"
+	')"
 
 python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version "dev-python/six[${PYTHON_USEDEP}]"
+	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -55,6 +55,10 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Delete repo-only Makefile that causes build to fail.
+	# https://gitlab.freedesktop.org/spice/spice/issues/35
+	rm GNUmakefile || die
+
 	eautoreconf
 }
 
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index d7533eb6a5ee..019f0d480a5c 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,5 +1,5 @@
 DIST virt-viewer-7.0.tar.gz 924475 BLAKE2B 003efaf88445ec6f523e678459ed1e11562d0cd87fb4811105df9ac1e3129f4a97170c5b783f1d504d157055ae51ac8dc23ffa8f3f79dd6cd55707d962e1d9ad SHA512 e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904
 DIST virt-viewer-8.0.tar.gz 937457 BLAKE2B 107a5f77d0e272665561e22c950416275c939d000fbb522401a954e6836bbd9e9399e768bc4363a1ea3110dd3229fe33738560563271774c3054278b2399cab8 SHA512 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918
 EBUILD virt-viewer-7.0.ebuild 913 BLAKE2B 0b6dfcfe940c93c9d1cb2feaa5b2b67b710fe35b75dde82066b4f133ce060933742aea8dc437f394a1492d1ff579ad13f0f45acfebb5db80ed665aafdc050be1 SHA512 3d219e4c9aab912f6fdd0fe4b0fce8d7959d103305069629ce95a5baea8209b707e5bb51eeb87e2fc6f85178acdb8bc811baa9293bb6a256ac6ce8a4d9b4d47c
-EBUILD virt-viewer-8.0.ebuild 915 BLAKE2B fcc75de702cfd583e8ccc1c698a41e68eb0e4ac0eed643e5b21ef33743dcf08714c8df33ea652ba4b98432da28bad9d78ab51fa9fe866df28f933180aa24b70d SHA512 e411557c687fd162f56c4331c1c1a7730b9348d36da1634f7a533b2509e5ebf09420e2e87d37d74a80deb2232e8a85ac8063d532780e4a06abe68d89c962ab81
-MISC metadata.xml 452 BLAKE2B cb307dd6593ae8c96ca9c6925783e0b26335f1d1b11c21ccbf7e54003ef2e9e32701304464380afea75a642914e2334c053417aa5e18de5737443b2b60f65d0d SHA512 c97651a4477db1452310d3b53efec56c596963827d1b13385bdbaee5bd8725774b40edc88dc5389b5c0a4ac50f9801de5f649d8f941d315f1e28b6ebf1c9cb79
+EBUILD virt-viewer-8.0.ebuild 967 BLAKE2B 2f3810f8b25b619a93fa668eb4c9143bb2a7764ab3c4e124eac1133375b2e08cd7fe25b3e3c1fc51d809e5fc0ae6e6d09244ae342d2d4a360038af52253157b4 SHA512 e9931de53a2a41b443464a6a690eeb988212169a47961acbc0a7a4c3b483dcebeb48bedd89114c50167099b49612b8ec709b1d809323646e0819851d9600e474
+MISC metadata.xml 544 BLAKE2B 125383557e6658e70c990469aa93d536d9d885aa37715c769fc407f81c1045cfb3e306bb637055bf89dc5c107029c2a11a8807522aeb804ff7d9ba2bd5215907 SHA512 945e22e3a177bca8579619fca0444181bdefbe33ee107b2b05ac9cbb942d4b1aab07734e6d300a862c19d035bcd4bdf2bda98a5ca4851b227bf05fd69b5c42b0
diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml
index 62904a2c9586..3311e82897cd 100644
--- a/app-emulation/virt-viewer/metadata.xml
+++ b/app-emulation/virt-viewer/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
 	<use>
+		<flag name="libvirt">Support connecting to virtual machines
+			managed by libvirt.</flag>
 		<flag name="spice">Support connecting to SPICE-enabled virtual
 			machines.</flag>
 		<flag name="vnc">Support connecting to VNC-enabled virtual
diff --git a/app-emulation/virt-viewer/virt-viewer-8.0.ebuild b/app-emulation/virt-viewer/virt-viewer-8.0.ebuild
index bff9034cfbdb..9e3cc152d67e 100644
--- a/app-emulation/virt-viewer/virt-viewer-8.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-8.0.ebuild
@@ -5,18 +5,20 @@ EAPI=6
 inherit gnome2
 
 DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+HOMEPAGE="https://virt-manager.org/"
+SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="sasl +spice +vnc"
+IUSE="+libvirt sasl +spice +vnc"
 
-RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
-	app-emulation/libvirt-glib
-	>=dev-libs/libxml2-2.6
+RDEPEND=">=dev-libs/libxml2-2.6
 	x11-libs/gtk+:3
+	libvirt? (
+		>=app-emulation/libvirt-0.10.0[sasl?]
+		app-emulation/libvirt-glib
+	)
 	spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] )
 	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
 DEPEND="${RDEPEND}
@@ -31,6 +33,7 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-update-mimedb \
 		--without-ovirt \
+		$(use_with libvirt) \
 		$(use_with vnc gtk-vnc) \
 		$(use_with spice spice-gtk)
 }
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 28e44bb7910b..893492a7219c 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -3,7 +3,7 @@ DIST VBoxGuestAdditions_5.2.32.iso 49620992 BLAKE2B 04853f4b9a95898263ca7238a78b
 DIST VBoxGuestAdditions_6.0.10.iso 77162496 BLAKE2B 71c95b89055a1eeaa38f650c2572d1fbabf4425d13e5473ae4a56a488125781a33e079c6390bcc5b2499b796221ef89e7373c641b8a75bbf31ffeede4f8f0ffc SHA512 d1d1602688ebdad4975b7b800012f6195774cfa29d00900fa49ded88f6cdfe4c1abdfd25ca55b08e2fc97a7f2f204511424dd561aebd68d4ee8222b9b0f0b8ff
 DIST VBoxGuestAdditions_6.0.12.iso 77195264 BLAKE2B bc7956a8eaf4a3ddc92b20c52696e298af63980bc607f8caea51ac00b826f62a3214a30a232070c3ded7a2db9d81114a81de2f6d9b04bdec1ea5cfb26808287e SHA512 83c9703588f14b6a24d878cb929fc09dddd94510f8a63092ff91864275abf8dd47f10e8bd300128305e1ed2e8504c76260b72e5d534c6d45de1e0d64d038ec58
 EBUILD virtualbox-additions-5.2.26.ebuild 710 BLAKE2B 300f594457535bad16e10b7242da27091ff0e8fe20e3db76b73f4b6a47e525f4a39f972c2ab80b0ddf6a1908d2e84996368d12e73e8feb3c7a16cee2e325f447 SHA512 ee73c7a249ae300709068273d0fbde262883334d079fe618d3fc8715112c3c52b8b07cde5229f8fe8312cc7611088ba0742fc4233a25fd75683e58dbe1376cb6
-EBUILD virtualbox-additions-5.2.32.ebuild 711 BLAKE2B 9859f45eee9d0888cf0f010c3999364591262250174ee6d80749068b4a6c61055ad4cb2a8b50fb28012267d36c79358dc92f160f1072783f801f7deee77ed116 SHA512 b70b84f5eeb701242ef8ac3fcfb2416f159e4bd8e81146bb124edce3f5c493869570fda9d12fb7641839e6b39bf83447599b4a6613a2da63031f614fd6ac6d75
+EBUILD virtualbox-additions-5.2.32.ebuild 710 BLAKE2B 300f594457535bad16e10b7242da27091ff0e8fe20e3db76b73f4b6a47e525f4a39f972c2ab80b0ddf6a1908d2e84996368d12e73e8feb3c7a16cee2e325f447 SHA512 ee73c7a249ae300709068273d0fbde262883334d079fe618d3fc8715112c3c52b8b07cde5229f8fe8312cc7611088ba0742fc4233a25fd75683e58dbe1376cb6
 EBUILD virtualbox-additions-6.0.10.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
 EBUILD virtualbox-additions-6.0.12.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.32.ebuild
index c940c25a2f8c..d5584316c421 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.32.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.32.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index f5ab56d6ae9e..2aa4a601cd1b 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -15,7 +15,7 @@ DIST VirtualBox-6.0.12-133076-Linux_amd64.run 127118808 BLAKE2B b654fce2e9134390
 DIST VirtualBoxSDK-5.2.26-128414.zip 10159276 BLAKE2B 32a9e0a70cc63c8e0daa7080f8e10ac8a514837be98a66b00161cd0c9bf2cc42ef0a11f3a69a742a2f6745b4c8b8fe9e946e18f81cd5ef3ab2f68d5e3c95c568 SHA512 f3d1cc622734ecb0f56fcdf5728fcc747e3b084cb2358d420c55c1acd98d2f24870f0fd18cea430f118f34bca10199526ba195a314d6ce7fb6c4bc8281d89f09
 DIST VirtualBoxSDK-5.2.32-132073.zip 10200195 BLAKE2B 0de34e166b94889c605014233142887e7a8857d1915866156a0cc63850937730ec063e63b550f0d39ad241259158f033b028dbab7eec3f6f38c3715139413b3a SHA512 ccbe2af819bff46055bd6f079a03d69e721a09286e83d4f650583bc7692f5d19ae1a725cf3a6eb1b75167a2c73ff2e020d1f932bf9cfeee9ee709d1174c4cabf
 DIST VirtualBoxSDK-6.0.12-133076.zip 10799655 BLAKE2B 93fc5093454a21bf5da26d00f35ab107410cddfed63c9af8494cd194cdc080a70ec8cc8af57233be0472b84a25709a3719f51d399585c1b474ddb4d40e6488ab SHA512 f270a6c404f1bf49ca6bbbc8c4fdba70e6c65001e9731a689f391e6d4c18866ceb14c94a241c15a4e5dd01e08f2c5c61f0fe7feb43ffe36acc9868a72a75603c
-EBUILD virtualbox-bin-5.2.26.128414.ebuild 8327 BLAKE2B dbc945c46ee55ef5c11ea3a7c169632ecae5d039fd7e5961255c2006c6f827860e59bf877fd4845e0543006e57c7fee12c28848dbeddc98741d0ce6fa57a5974 SHA512 248b591075c526b2c246dfb32cb9a00166a9243391cd6caf9d9b776835e1d201e1227c2d435f403ec2f357c54fe1246b68282ec1abe7796e428c1e505e75d5d6
-EBUILD virtualbox-bin-5.2.32.132073.ebuild 8328 BLAKE2B afb27eef7f7daa384d5acce90205fb8577c65c56ea276201372784a0a03c98182857f7e5c3183eab2620fe88062f3238008b07b46f8831e3227c4a2f381f3449 SHA512 bd59bd894f84357702e9d5ba4373e68b11ee0c8befed8188db3d38deaa75b560f94e8d5a4a8285b408c1d5022638775722b463950421fe7d9ed3538f40cdcd1e
-EBUILD virtualbox-bin-6.0.12.133076.ebuild 8490 BLAKE2B 0acedaa47d39ac39c6739053a20343d18f6d53294177039cb54de95f0eb5d2d58a8557b852713a3e3e9c6e3b8549cd70f6c307684e569716c8e3a68b7f5f021b SHA512 a8cd2174ae64b1dc0977dbcd388c26989779546fde33d1c5e89e4d22d026154a4f5cdeeb134c67c81c161b0114a9f4648d78be1862ff5dd44d6fda205db3f822
+EBUILD virtualbox-bin-5.2.26.128414.ebuild 8335 BLAKE2B 95852652033916357d0f518bf215377d6223348973cab35ba706c2f2924974ceba3000e2f3910279b7f01440373e089fcf204cc4b1f3dcc4f02f8976d8087c23 SHA512 d429e0eecc1128a5db042c71cf20b121279688fbd7d26a612e9e2b9c38c328822bc3c0824896098d5d5965eec1b819559e1ba9c048e5a71b1dd55836afe2d89b
+EBUILD virtualbox-bin-5.2.32.132073.ebuild 8335 BLAKE2B 95852652033916357d0f518bf215377d6223348973cab35ba706c2f2924974ceba3000e2f3910279b7f01440373e089fcf204cc4b1f3dcc4f02f8976d8087c23 SHA512 d429e0eecc1128a5db042c71cf20b121279688fbd7d26a612e9e2b9c38c328822bc3c0824896098d5d5965eec1b819559e1ba9c048e5a71b1dd55836afe2d89b
+EBUILD virtualbox-bin-6.0.12.133076.ebuild 8498 BLAKE2B 0d7ceb1c762a8fcaf5b57c2b13084ad4e6e1883ccd33f1505a324808b69c543ba9d40127ae1d649ea0459ebc2133529fbd323c9b7771ea9dcceac92bd233feae SHA512 7fba20a288e059bd415423df2ad5207a4b3f9d0aca363c5bc03fa60b44716c9e184ea800dd0f0ef0a0b4096eade613df73d5149d531b50be857fa4fe2970ca18
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
index 59c9a9a87aba..de48142651ba 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
@@ -36,7 +36,7 @@ LICENSE="GPL-2 PUEL"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
+RESTRICT="bindist mirror"
 
 if [[ "${PV}" != *beta* ]] ; then
 	SRC_URI+="
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild
index 30622f1d5ddc..de48142651ba 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild
@@ -34,9 +34,9 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
+RESTRICT="bindist mirror"
 
 if [[ "${PV}" != *beta* ]] ; then
 	SRC_URI+="
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
index 0d68ba80c9dc..ea3b735a7474 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
@@ -36,7 +36,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
 LICENSE="GPL-2 PUEL"
 SLOT="0"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
+RESTRICT="bindist mirror"
 
 if [[ "${PV}" != *beta* ]] ; then
 	SRC_URI+="
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index b25e9c9df24a..851916da2a15 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,8 +2,8 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 8
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.10-132072.tar.gz 23160596 BLAKE2B 5cd7d1490305236f99b759520b4c63afd207cab53e861aaca0b0c318fe96f991756db60652bf65b26b5b9690366b6a5df13c225b44df75a30c1cc04badc7dbb2 SHA512 2c99b9917c65b4287bd1b78e9b9312630850307becea526188f97de569f541fab6bfbc4d5cff2ea9aab784dc4bbb23ada3679f76116ba94169f9c73566cc6c09
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
-EBUILD virtualbox-extpack-oracle-5.2.26.128414.ebuild 1005 BLAKE2B 09ef58c0138c11e9fd2d4eb9e9ac44cec2401ddec19561e4552992cce71cb2caae461bb41460701391a61b07936d68d7c169ceb00fbde834ece475a14b556423 SHA512 3ae5144ff4cce24390628935595b2369892700fbed750a1844e40ea9f9ac904c517f9b29947e03b1acdf67e7cde75b94cb2b846de19f9e2d0136bbe319a3a3f3
-EBUILD virtualbox-extpack-oracle-5.2.32.132073.ebuild 1006 BLAKE2B 31fb68210891843cf873aa863e42b979afc74a493fe545b32b89546f59cd16b82f6e1cdc2baeaabd816fb4df90d3f740e0a93b230696678a52d8e1c90e45421a SHA512 57c2222ef7856e8e766ed118e239bed1f5267648a03c883ba93e7aadcc406cf50d2577eb129cb7a601996c08b902bf0d18445aa6a57c02cd7898dbbc7e38957f
-EBUILD virtualbox-extpack-oracle-6.0.10.132072.ebuild 1065 BLAKE2B 83a4e3f497988899b19922a2b89c3bb056f04f4e739ca685e76e15f3e9b19a6e69b7124d65d522b13b3f992e9b66bd54f52b1db358b578030cad822512a61ed7 SHA512 110a0179f35ab854400d8c08a8ec361ca0c92e275865c76342d41475cd9bfa798ae57a8b750df9aea4de91ac0b2851a8daba3c1d1700559694197110d33ad989
-EBUILD virtualbox-extpack-oracle-6.0.12.133076.ebuild 1065 BLAKE2B 83a4e3f497988899b19922a2b89c3bb056f04f4e739ca685e76e15f3e9b19a6e69b7124d65d522b13b3f992e9b66bd54f52b1db358b578030cad822512a61ed7 SHA512 110a0179f35ab854400d8c08a8ec361ca0c92e275865c76342d41475cd9bfa798ae57a8b750df9aea4de91ac0b2851a8daba3c1d1700559694197110d33ad989
+EBUILD virtualbox-extpack-oracle-5.2.26.128414.ebuild 1013 BLAKE2B 822e606ede4d2981350c5a553af7632bb310ad32bb57bd6ecd6c65c9c105f3c571243df92c0be0400b483488e063f6f8def5dd7c63ab2fb5b936bccb26cfb00e SHA512 5d68098ef54662639f62de3262297e912d8b786a9509c5692363830a2f343d6ff5f217bf8db25f53dd7d9f38a86a354de8948e920437acc0fa70f4ba9fdb5a07
+EBUILD virtualbox-extpack-oracle-5.2.32.132073.ebuild 1013 BLAKE2B 822e606ede4d2981350c5a553af7632bb310ad32bb57bd6ecd6c65c9c105f3c571243df92c0be0400b483488e063f6f8def5dd7c63ab2fb5b936bccb26cfb00e SHA512 5d68098ef54662639f62de3262297e912d8b786a9509c5692363830a2f343d6ff5f217bf8db25f53dd7d9f38a86a354de8948e920437acc0fa70f4ba9fdb5a07
+EBUILD virtualbox-extpack-oracle-6.0.10.132072.ebuild 1073 BLAKE2B 05694fdc8c4b39bf7b4f2953febcbc99305b3a8a8e1e50534b47130dca7782c6a9003d70c59f09b5ab92896d56a0ea0b6d9b29d148b4b08a7dff66656445680e SHA512 884d1e2a800342f1b21c2af0f295dc99c5bb92282595c731718536050667957dae8f872a394b9b2df4603a05e0b2c130281af93c62ef719f42b5dd4193d80a20
+EBUILD virtualbox-extpack-oracle-6.0.12.133076.ebuild 1073 BLAKE2B 05694fdc8c4b39bf7b4f2953febcbc99305b3a8a8e1e50534b47130dca7782c6a9003d70c59f09b5ab92896d56a0ea0b6d9b29d148b4b08a7dff66656445680e SHA512 884d1e2a800342f1b21c2af0f295dc99c5bb92282595c731718536050667957dae8f872a394b9b2df4603a05e0b2c130281af93c62ef719f42b5dd4193d80a20
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
index f31f9f849a01..d8c083d99b72 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
@@ -27,7 +27,7 @@ LICENSE="PUEL"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
-RESTRICT="mirror strip"
+RESTRICT="bindist mirror strip"
 
 RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.32.132073.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.32.132073.ebuild
index 8a287415fecd..d8c083d99b72 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.32.132073.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.32.132073.ebuild
@@ -25,9 +25,9 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
-RESTRICT="mirror strip"
+RESTRICT="bindist mirror strip"
 
 RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.10.132072.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.10.132072.ebuild
index a260ead1a63b..0252ea9c1872 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.10.132072.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.10.132072.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="mirror strip"
+RESTRICT="bindist mirror strip"
 
 RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.12.133076.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.12.133076.ebuild
index a260ead1a63b..0252ea9c1872 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.12.133076.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.12.133076.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="mirror strip"
+RESTRICT="bindist mirror strip"
 
 RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 712f9e114ee5..419bd65d88eb 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -2,6 +2,7 @@ AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947
 AUX vboxguest-4.1.0-log-use-c99.patch 393 BLAKE2B 5363bcc98696e06d64e232043f89e4881390f43efafe8624ab23d78338e64bfee385c18a160553f17cfa36e81151d1c5d1889d31abd7caf942d7034043ab1288 SHA512 7327faccd5095706d097f2b47acfea21736291ed54ee7b605670fdfddf5f09815759dc49f9497d06e5920043e0b5b9af1b4ee0993ea13e5055641cbeedd66d6f
 AUX vboxguest-6.0.6-log-use-c99.patch 282 BLAKE2B df1d521c39ab6b3fa421f866fd83545bfea972dbbb1a952ce6aa388845175a4a3f71bc1cd34151f537994713ad1144fb0497f1383ed116357e7971f02c38ada9 SHA512 31fc13e5bb6286f80fde312aeb7917f662addc5b889ca1aeafa4f3545bece46eccface3b94df01c25a33d60302a14b3ae5b1eef87f25a4eef9a9dd4a75b3d7cb
 AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40
+AUX virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch 2951 BLAKE2B d804e9f0b10695a19212baad58f0ec455ad407412950ef57d3f5ea69026d1fa6a0a0d1bd9a9c491d2e0b4e22b4bda610d82e2a301573ce9c8381633e9c869650 SHA512 870a742f4b80ac82a28c033e76b2a0367f35459bc346b98fa58a80f486771641feaf2b53ae11ca042fdd67d2f2618ef705d36f1889ae1ec5336afc390bbc286f
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
@@ -12,7 +13,7 @@ DIST VirtualBox-6.0.12.tar.bz2 154250538 BLAKE2B 1c0da29a1d4f4a9ce57280593b219d1
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
 EBUILD virtualbox-guest-additions-5.2.26.ebuild 6114 BLAKE2B 894f6fc0a4f021a905b51c1d56f7bf06f692a84af7c5f37b6fe3dd138c30c7e005d78998610a4503e7032757f51dc002dd89d57be731cbad5733ecbd139e6b8c SHA512 e042d7159a77f10c8f671d77b30a83a27f61d96cb1d822218da5084e4932ae6c1df4d758c6b0bab0d7ed29be3f8c4cf92a8dd188fb8c54c53c35e1b13698ead5
-EBUILD virtualbox-guest-additions-5.2.32.ebuild 6115 BLAKE2B e96611a9d03b16d984fdbf0642179a829cb6f0a1240e3dd36209ede0320e0aabbb76950ef7a07e7bf69efeafb7fe9349fe2b436d15fcec60a02a026a76bb8bc9 SHA512 8114d4dbff038844487da67388210ae73db4ea737e8f9dde721ef204a700845cdaebb55bee7303fbb39770d99695b12e45d5aa532918a66669056dca9c679a8f
+EBUILD virtualbox-guest-additions-5.2.32.ebuild 6114 BLAKE2B 894f6fc0a4f021a905b51c1d56f7bf06f692a84af7c5f37b6fe3dd138c30c7e005d78998610a4503e7032757f51dc002dd89d57be731cbad5733ecbd139e6b8c SHA512 e042d7159a77f10c8f671d77b30a83a27f61d96cb1d822218da5084e4932ae6c1df4d758c6b0bab0d7ed29be3f8c4cf92a8dd188fb8c54c53c35e1b13698ead5
 EBUILD virtualbox-guest-additions-6.0.10.ebuild 6001 BLAKE2B 20cd1ce48e0c9fab06c8f486b23f9b5ac73b4881dad607e4a9c91c9275e375e656749008368f32d9d9db5066f7efe6422511897bc46217b9b3ad686482c80c73 SHA512 d8b9772b0ac02cb6fb2d7944cfa206869693b74d0406fb29d8a0b782b15bb98d33c4eedbe824ff58c6f13e61c119403fd9cb545184677ae11c55a3dbe10d5bfc
-EBUILD virtualbox-guest-additions-6.0.12.ebuild 6001 BLAKE2B 20cd1ce48e0c9fab06c8f486b23f9b5ac73b4881dad607e4a9c91c9275e375e656749008368f32d9d9db5066f7efe6422511897bc46217b9b3ad686482c80c73 SHA512 d8b9772b0ac02cb6fb2d7944cfa206869693b74d0406fb29d8a0b782b15bb98d33c4eedbe824ff58c6f13e61c119403fd9cb545184677ae11c55a3dbe10d5bfc
+EBUILD virtualbox-guest-additions-6.0.12.ebuild 6149 BLAKE2B 95db5659ab2b6b89dea567768ae31d15e1bdabe8614c692c0460c14bc3a3f4ea5c34409b1e69bd952bfc1083c6132e12663a48bd88ef22c649ac1bd415fa40cf SHA512 643dd0ff05d296f032b5832c63d8f730ac7df78e0157deca4ebc204dbdbb87a79c176e8d7c07a8cdd0873c084d63719077936e02dc0664a64500c25f1b279fb4
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch
new file mode 100644
index 000000000000..ad4b460c8142
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch
@@ -0,0 +1,75 @@
+https://bugs.gentoo.org/694614
+https://www.virtualbox.org/ticket/18911#comment:5
+
+--- a/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ b/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign
+ #endif
+     if (in_dev != NULL)
+     {
+-        for_ifa(in_dev) {
++        struct in_ifaddr *ifa;
++
++        for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
+             if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
+                 return NOTIFY_OK;
+ 
+@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign
+ 
+             pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
+                 /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
+-        } endfor_ifa(in_dev);
++        }
+     }
+ 
+     /*
+--- a/Runtime/r0drv/linux/mp-r0drv-linux.c
++++ b/Runtime/r0drv/linux/mp-r0drv-linux.c
+@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
+     if (RTCpuSetCount(&OnlineSet) > 1)
+     {
+         /* Fire the function on all other CPUs without waiting for completion. */
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++        smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++        Assert(!rc); NOREF(rc);
+ # else
+         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
+-# endif
+         Assert(!rc); NOREF(rc);
++# endif
+     }
+ #endif
+ 
+@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
+ {
+ #ifdef CONFIG_SMP
+     IPRT_LINUX_SAVE_EFL_AC();
+-    int rc;
+     RTMPARGS Args;
+ 
+     RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
+     Args.cHits = 0;
+ 
+     RTThreadPreemptDisable(&PreemptState);
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+-    rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++    smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++    Assert(rc == 0); NOREF(rc);
+ # else /* older kernels */
+-    rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++    Assert(rc == 0); NOREF(rc);
+ # endif /* older kernels */
+     RTThreadPreemptRestore(&PreemptState);
+ 
+-    Assert(rc == 0); NOREF(rc);
+     IPRT_LINUX_RESTORE_EFL_AC();
+ #else
+     RT_NOREF(pfnWorker, pvUser1, pvUser2);
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild
index 350e4c1e96cb..e3a38e9dd881 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild
index efbf2bd2fdf9..9ac2195b1e09 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild
@@ -71,6 +71,10 @@ src_prepare() {
 	eend
 	popd &>/dev/null || die
 
+	pushd src/VBox &>/dev/null || die
+	eapply "${FILESDIR}"/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch
+	popd &>/dev/null || die
+
 	# PaX fixes (see bug #298988)
 	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
 	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 099ce0e5d65c..16235572656d 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,12 +1,13 @@
 AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
+AUX virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch 2930 BLAKE2B a6875c7b0e93caf7388db66e4e76df0c0c0e41f01fd57a415b6ad4cf128570a8cb0330adf26fb45e40c6104d029f40bac53ef0fcbd061b391372c24459693fee SHA512 0da03204d3575563abb95036d54fccf5a002413b5a2ee1f9a5d4ab3433062fcc49d6fe41cc05e5775b3c9d703227e79cb6bae193f6ab2d2bdab306d37abf985b
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
 DIST vbox-kernel-module-src-5.2.26.tar.xz 642096 BLAKE2B fa908b8dda4c49e880005f22d4ec159ba4e84b20d3cf8f514ec5ad0ea556499b0df25fb714bb5f9a3474e6fc1cba67f6d56fddaee748b9561bbe31a003dd0657 SHA512 7f37be1b35772d59cd3df9b61dec436450de3c038faf2cd22fb891fee7270aa7f87f146f72497ffeb63dfe869cccd3f2788562d23fc51afd83ca19159f2a6810
 DIST vbox-kernel-module-src-5.2.32.tar.xz 642428 BLAKE2B 0dda5cb5608c1eed22bea209564d53c5f7eab58ca620db2cc441e3c1ba9ad66609c4ef13df07fd29b691f2941a070f9852e8729cd386081df6a82ede345f33c5 SHA512 fadedab690cb7dee8b9a6747ed711d924bf3bce8999b24e7b64cb8738c53c2fa7372b1a8e8535e7e4ef0235aec02d4a3f1f67cd07d7621934fab684c5163329e
 DIST vbox-kernel-module-src-6.0.10.tar.xz 669008 BLAKE2B 80250aeca8421aa0b88efb1d090f78d0bc6c7b4b2c3b7e0c5c7953d9ef5246ee25df6fa14b75b821e1e3d05cda3ff975560ede89dc482e34faa801a592405a9f SHA512 afab0130c14b86e822f2a9528373388a9eeee952deec9ff7158e4b788b64343235f3a3da10218bfabcb71dd4d89c8ace0031ea9b64d7385140f6c580b5087333
 DIST vbox-kernel-module-src-6.0.12.tar.xz 669148 BLAKE2B 2291e3fcb9f049ce5657288151d182dfc9a3d6d6e8e1b32047e4b682f35e56f0a5bb5d3ad7efbc98082d2d1823aeb821099e9878b8a237322e8900fb2e2d65de SHA512 e9d8fcbfc076bf4e7d4dc5954e0c24509273c6358ee2de9ddfa87ea650b69fdc31d223595d610c1dd921efd6620ba5285f7f6a10170e90e706bf731e3629dc51
 EBUILD virtualbox-modules-5.2.26.ebuild 1187 BLAKE2B 87f131dcdde7d6acf35a48183ed2423c20366d1c57bfde56b9c6b265006b049d6d5cf2f058867150f30cddfda308512907702208c15d4ae5a868c6e8d6468091 SHA512 80d1deb4b4142e7a4b718a460829ed99e5a4c24e50d65266263a872d247de519972bb13623881382ca8e12a4387e94f327fb9491728dff65ce8449244df0199f
-EBUILD virtualbox-modules-5.2.32.ebuild 1188 BLAKE2B f148cd3ce1b5caa09744b06212f5e419b181a6491c66358d529824e0150717ff32d0a70234d95fcfd0ecae327e8fca2570957bb811dc6833ce9a2e9f6868ad9c SHA512 035f21ba4dadf969dcabb97f2fa47dc18a642487ab0b65c7a16da3d16d867f5d42362956bbb30e404c0626acc5e4771d37f1374379b844104d13065f32771d46
+EBUILD virtualbox-modules-5.2.32.ebuild 1187 BLAKE2B 87f131dcdde7d6acf35a48183ed2423c20366d1c57bfde56b9c6b265006b049d6d5cf2f058867150f30cddfda308512907702208c15d4ae5a868c6e8d6468091 SHA512 80d1deb4b4142e7a4b718a460829ed99e5a4c24e50d65266263a872d247de519972bb13623881382ca8e12a4387e94f327fb9491728dff65ce8449244df0199f
 EBUILD virtualbox-modules-6.0.10.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
-EBUILD virtualbox-modules-6.0.12.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
+EBUILD virtualbox-modules-6.0.12.ebuild 1316 BLAKE2B 996e40c230c441f6a5ba9020e2236a311594b3a02f56b0f50482f91e3dcec936be021ef18470681483c6f6ed3934430184a4b9a241abf413c9af2ce57734600c SHA512 6cbb8bfe065b65093d9c7566e2601ce3464c61f0afae12f35584bb3ba5ec3e8b850c99f864c021b6da66170819bea68b87cad8d6c796ac9d57ea8aac5842074f
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch
new file mode 100644
index 000000000000..ff573dd69b67
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/694560
+
+https://www.virtualbox.org/ticket/18911#comment:5
+
+--- a/vboxnetflt//linux/VBoxNetFlt-linux.c
++++ b/vboxnetflt//linux/VBoxNetFlt-linux.c
+@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign
+ #endif
+     if (in_dev != NULL)
+     {
+-        for_ifa(in_dev) {
++        struct in_ifaddr *ifa;
++
++        for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
+             if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
+                 return NOTIFY_OK;
+ 
+@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign
+ 
+             pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
+                 /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
+-        } endfor_ifa(in_dev);
++        }
+     }
+ 
+     /*
+--- a/vboxdrv/r0drv/linux/mp-r0drv-linux.c
++++ b/vboxdrv/r0drv/linux/mp-r0drv-linux.c
+@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
+     if (RTCpuSetCount(&OnlineSet) > 1)
+     {
+         /* Fire the function on all other CPUs without waiting for completion. */
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++        smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++        Assert(!rc); NOREF(rc);
+ # else
+         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
+-# endif
+         Assert(!rc); NOREF(rc);
++# endif
+     }
+ #endif
+ 
+@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
+ {
+ #ifdef CONFIG_SMP
+     IPRT_LINUX_SAVE_EFL_AC();
+-    int rc;
+     RTMPARGS Args;
+ 
+     RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
+     Args.cHits = 0;
+ 
+     RTThreadPreemptDisable(&PreemptState);
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+-    rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++    smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++    Assert(rc == 0); NOREF(rc);
+ # else /* older kernels */
+-    rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++    Assert(rc == 0); NOREF(rc);
+ # endif /* older kernels */
+     RTThreadPreemptRestore(&PreemptState);
+ 
+-    Assert(rc == 0); NOREF(rc);
+     IPRT_LINUX_RESTORE_EFL_AC();
+ #else
+     RT_NOREF(pfnWorker, pvUser1, pvUser2);
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild
index 095ffe009b84..c0ab27d0eef5 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
index 7257cb3b5812..90528f502491 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
@@ -21,6 +21,8 @@ IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
 
+PATCHES=( "${FILESDIR}"/${PN}-6.0.12-linux-5.3+-compatibility.patch )
+
 S="${WORKDIR}"
 
 BUILD_TARGETS="all"
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 9a1134529b09..40620aa3e0bb 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -16,7 +16,7 @@ DIST VirtualBox-6.0.12.tar.bz2 154250538 BLAKE2B 1c0da29a1d4f4a9ce57280593b219d1
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
 EBUILD virtualbox-5.2.26-r1.ebuild 13967 BLAKE2B c31306369c0e45061b211986f0711aac54aa60d4cfe8f0e2311d2af1c24f62bed4e75e277591711dc1e86878d4fd773b1df17c0f796a9b4f8d3456391a38ba53 SHA512 0a66db90ab0d415a3c3f3adc2daa726c4776c4db93a7b2ebc495213360b8d50cfe3eef30ed808138e76e8aadf698f31e3427811fb33beb63b7b0a5a3abee9829
-EBUILD virtualbox-5.2.32.ebuild 14474 BLAKE2B c043a328eed467500d2c3e2de696698dbda398929477820a918f00ed0e5e828a180bc9d3461b7ea01e75c48d240dbe1b39516c54992b9d870f2c8073dd2c27b3 SHA512 b6c9af5f87310b0c878b1d8cecf5c9481a906ca76c819de73968de50a19ab48bfa81eee6c13348f87334d2b7a60511639b913d0864e50090cc968ecce76fadd6
+EBUILD virtualbox-5.2.32.ebuild 14473 BLAKE2B 4498464c3d219b3d89cd9e0c0e2e40f95e10024bd0c94e677cd1f96aa56b2f69c3278be9096eeead59c6433b0af1641eb84ba592d8eb4e76aa45b129d8f131dd SHA512 b0d156d10e8af35c19033ce1bdc9381b472c199406808789598b90b5c5fa3a694d258e06c28f712deda49bc02f258c6a0d86c070879846936b5b357f977a26b1
 EBUILD virtualbox-6.0.10-r2.ebuild 14581 BLAKE2B 1eeb82ddd9a5c8da8719f939fcadabd98354765a5e804f93605a8a56949ebcfd5a4acfdc7b05013ac41f5cdd5a9ba20bf080ab121078dcee4d1856d31df9b2f7 SHA512 6d3fb30f7955f03368408093db5808ee759f2a1530f7d0cbbc4f5edd988191054ff6bc739f71a62b48cdebbc0f8d0f406396e098f613a8009e693be66bdaada8
 EBUILD virtualbox-6.0.12.ebuild 14580 BLAKE2B 8216a40e53ab0fbae65aa7043463b96944b8673bcfb36c753ffb525780af65c92904765d443dc157dfe39e62a0fc511c54df74233e183bf3417cc7ff77182ca2 SHA512 fe38948468c23d8fe7fcaa237570f390e1e6fa4ad8b0d7b52cada8d35355aee51f7cab7a7096ea351ca9ccb1ffe6814496729be840155eb7791e04c337e36364
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-5.2.32.ebuild b/app-emulation/virtualbox/virtualbox-5.2.32.ebuild
index eb8a3b08289c..a55c3b9db734 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.32.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 4aa767015f76..777b5be0535c 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,7 +1,7 @@
 DIST winetricks-20190310.tar.gz 673467 BLAKE2B b6c6a6d28e49f9b2745ac623f9a9d35bdcaa402c11b3f2055f3d2ef2d13ccff6adcda47261447aff7b70bfcd9bc65ea2a278368616df93f031fe212aa3201a5d SHA512 4f08228306a84cd2e1ecf0df46e951dfc5844716fadab903eca7ed09f15ed2bbba7ca5bf48384f934783be6a85b812129427a296a580561ee5b8483df0e64025
-DIST winetricks-20190615.tar.gz 681040 BLAKE2B f66a23b47b4bf48f44be99c6d9fa890638cb19273bb0f556c0ca91133e2941b44fde7214616a9f379fbb4713249339edec7486b080e16c632a127d9a818de1fe SHA512 dbb078e8d4e001db506b6038e1898dc2e319432e85d1539a53635454efc5d635238ca03a07ee57aec9349b903027586fef34461f4e8eba0b41d25d99d15e7ba8
+DIST winetricks-20190912.tar.gz 679544 BLAKE2B 633c407f8560fa3aa38806befded957d0bf1276164483b08fb3ef285fe873531d6362ae6305f5a33a85891d75990e6e0271fe954358e49425c4f36f0f918f48d SHA512 a0017cc08c56a511e523116daf2024b1462460d00b3d07de87720c7912dccab3d953db3653d7d611c5ae3b457a45de8d36688ee703e805c1e1f5be5c0fa7739f
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
 EBUILD winetricks-20190310.ebuild 1910 BLAKE2B ce6174352c8370e08edb836801010698fc2b717c438e8661818e2f0b6538f3af4ff647b7693e6a56e07b1d7db8732dd3e651d24ecd186e135603c521d8d0c6e0 SHA512 9fec59c039413af08fff8d8ee301607683fd9645f79b1bd4e4fdc52a0e93e40a1cc126dd160a7387722e22bddab1e8a2d90e4afc58558e3d3a7532176b0f7d26
-EBUILD winetricks-20190615.ebuild 1912 BLAKE2B fe3c652325f6d428cacbc22f74ae0fd93e397e8b4b81287e7611608cbf7f3c0261e5844d722ddc1823a94be344b4e3c1d3bafb07e958afd7568cfc1b576f105a SHA512 b10f311f6be55a688021dc83821b0c78e8305271e3bc1a982fab034b9b0c8f489a26df94140c2c4f545d79b0639930f90ea7380cbfccdcc460ee0e88d2a5b946
+EBUILD winetricks-20190912.ebuild 1912 BLAKE2B fe3c652325f6d428cacbc22f74ae0fd93e397e8b4b81287e7611608cbf7f3c0261e5844d722ddc1823a94be344b4e3c1d3bafb07e958afd7568cfc1b576f105a SHA512 b10f311f6be55a688021dc83821b0c78e8305271e3bc1a982fab034b9b0c8f489a26df94140c2c4f545d79b0639930f90ea7380cbfccdcc460ee0e88d2a5b946
 EBUILD winetricks-99999999.ebuild 1912 BLAKE2B fe3c652325f6d428cacbc22f74ae0fd93e397e8b4b81287e7611608cbf7f3c0261e5844d722ddc1823a94be344b4e3c1d3bafb07e958afd7568cfc1b576f105a SHA512 b10f311f6be55a688021dc83821b0c78e8305271e3bc1a982fab034b9b0c8f489a26df94140c2c4f545d79b0639930f90ea7380cbfccdcc460ee0e88d2a5b946
 MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20190615.ebuild b/app-emulation/winetricks/winetricks-20190912.ebuild
index 900a5b539221..900a5b539221 100644
--- a/app-emulation/winetricks/winetricks-20190615.ebuild
+++ b/app-emulation/winetricks/winetricks-20190912.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-25 19:33:39 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-28 08:31:11 +0100
commit	ad6182343997a405079870a2fe91c4e0c6b94595 (patch)
tree	4aa7483cd0ad7de54338afc8e7971417abe1dd81 /app-emulation
parent	e8f81810baa21f490d6910e8e2d424546b72a333 (diff)