gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /app-emulation
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
84 files changed, 2959 insertions, 291 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1a760cf5685c..1641fe45d174 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 3bad92baf789..151b2e15031c 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,7 +1,9 @@
 DIST buildah-1.8.3.tar.gz 5114332 BLAKE2B 55ef5e10e8a2a2b95ef8f8cd28a3ccdb3e734fc3ef64a890900e20a5b8994f92571e2cdec875813203fc4e98a8c4f09656d16bc4c6242194131a25713e054492 SHA512 f875c448f81ef272ad0b7be9c1579d6650983fed4e471095cd645ae1126b49d91ec15b55a072e722205154b681eefc0fb32f5a452d827e875eb0c4779f5d712b
 DIST buildah-1.8.4.tar.gz 5122400 BLAKE2B b02a1cac77f5f16ab6cec3a74f11ee94675c717ead21fd791feb4cfbd08dcfb4313a1ee3134d3b9f9d20218935db35e28dab406a9f706ff2f46a2beb1abaa56b SHA512 a316e5e2bea7cded1db089bbc7831c9af69242caa6108c78d63864c012053bda3dc3da5bf70248b2742b2be1ad66aeb59c844558022c20f79236f5b1292d6366
 DIST buildah-1.9.0.tar.gz 5123317 BLAKE2B d38c36c2407b3a77a5f738e00ae08c4312945d5c2a4bb930e116e32171ea22c20e0a78e56cce7977844ff0d60306f5446a9c1a117d790ea83cc53e1e83e63417 SHA512 8defe72b267790a6d777eed2a68f89721184eab8df972ef59287e69e1719d1174cb120d6a0c254f8a3963721d34414ec614fb5d3e52fb85a6940c659ee720686
+DIST buildah-1.9.2.tar.gz 9505091 BLAKE2B 886e1ae5804f005f5782d011ed8440a8ac5eb09b2cf7917ac04ed1ab3e08f8cce6ef9b8efaf3392d60ed46b5bdb2efcec8b44c0448f970210cd613837a5d8f1f SHA512 1add432491fcae3b22dac2768ba71be2a47f42f3d9fae14cc5ff54220b3b7b96a48a95cb10b249de98f9c3067d463bbeca75c7c52783c111a9b5ed0ba03eb30f
 EBUILD buildah-1.8.3.ebuild 1446 BLAKE2B 9ddb64e07413b5affd6a4d6c0e8f59b96308fe9d3041228177b95de23070ee487dfb8b1a4ac70235f986c7542d06ba2dc38a1868d2c2ae913df52f0a1d9a5665 SHA512 e6b6bb15847ee1174e2299767fba88b504965ef1ef55bf9c8c7129959921c6b5f2b0e56d074a50def15d4b22abbef139b7c90bf1340c84703464e318525f123b
 EBUILD buildah-1.8.4.ebuild 1446 BLAKE2B 12ce28dbbc9cdd9b3dcc9ffb32d31e343645db77c83349b02d114d1fe26d9f3a54208df5fde51760e913ffaaa2ea3b1f8ba5ef7e2bc925767ca41899d38d5688 SHA512 7fe65e02c631a6688d402fd6922b8bfb8cb8ffe9f496ccba5ccf2356fbdc066cb827a759f57f59ad53ab85c6544244fc48f0d5e048010ce7ea23b54512fc16ec
 EBUILD buildah-1.9.0.ebuild 1446 BLAKE2B 93ed9a986eaa335c2b91eb525bf0a773f0d2c30e83b9964a519bf535014adb4120d2ad6487e2ac669ef2b6541498d0d1d4d85904d25c80301b2e17276f2912ef SHA512 0095fd84410e44ef37bdaa4fd3c2942545e789406cc654cdb1fee870f4f3df2b3cb41504a461e11b51eaee7dd1191ee5aa5ff34518836c2060fec6bac08f9e2a
+EBUILD buildah-1.9.2.ebuild 1446 BLAKE2B 5f89e5874d84b1813c39485970832ca13a7ba70add473867d14d36d1252139bc0059ee3a365b0a530297c58dffd046ba55cb88771bdc8faf8313c70ee3adcf40 SHA512 502b062366388451ea0c120b6d05a6d6cc2db7a8b1f986f3b6e72b104b0651dd313032f16f56c5bbb7c519102598d1c94c73ae9f25c2ce6080fbab6cf1948c42
 MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.9.2.ebuild b/app-emulation/buildah/buildah-1.9.2.ebuild
new file mode 100644
index 000000000000..b4ed60e4e6fa
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.9.2.ebuild
@@ -0,0 +1,57 @@
+# 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 e36484da1b4c..b92db9d77788 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,6 +1,8 @@
 DIST containers-storage-1.12.10.tar.gz 1593313 BLAKE2B 4b0c412304dc6b3aa79064a6071abfdd325cffd7405c50d57008f3139cfd9afd450a21773e4463650b63720210381e58e11b8c019efcf0297377821c3b76c276 SHA512 83b7e353efe89192e1c956742202395981849f68d53967df14a6952e36c458a2a2adaed4cf7d959e3b73114906deb5056591b8fc3aefbc83b85f9f5dd378f031
+DIST containers-storage-1.12.15.tar.gz 5968064 BLAKE2B 180583da6271c23f828ba5d91e8f1db64ac1aa8f9bb1f308b59e0eb0bdcd7afb94509aa0556bfc86a4e182cbdb6501b9c51b58499a61c2773254b03a6c3bc621 SHA512 523e4d35995fa169701551f91362fafd67f25ad1cbe733a5ae2614a198a4d71c5b5f319a539dd5a6a38e79ca46b8979ed62918a3bd69fb39d8d14d259f197408
 DIST containers-storage-1.12.9.tar.gz 1593286 BLAKE2B f53ef233e3d08dad84cda9154271254f9fe04e951643f20e8ab5bd37456e4eeb7083c1810656072c2b4bdeea0f6188871d4db566363c8363d2c2087ab9a4d3cb SHA512 0b5ad6cb52b4b74da7c574ec6841d74b92ef20f853e8d8fed83e0f9d529a7749692225e26ae4ab89fbd2a6202651c8a3a44a57bc1f42bcbb755fdba26e9cb3fd
 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
 EBUILD containers-storage-1.12.10.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d
+EBUILD containers-storage-1.12.15.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d
 EBUILD containers-storage-1.12.9.ebuild 3684 BLAKE2B 709d1851467a15e468cf51d02014a49189d723953a582011dcf3d728a6cb893a7c849f8d1b276ebab1f0d659feb62dc7ea58e456e6c1ca32527d63f494fd3708 SHA512 72ad508ba85806cf65ca5e316e36d71c2d405d4b1a6faf788a652df9f7a9379c1459ee5305aee85ebfdf12d0cb8b83d4630e5498ac25be56a7442a4ff676810d
 MISC metadata.xml 691 BLAKE2B 512255d8e2d91d64a04fcd5da04fa6db20fbaf66c580491f001716a06c0ff81ff572491cb9b4274229f2312c7235abcbe8e32b6de9e2344b418015c253866f26 SHA512 eeb059ee40101e47a81d4ff871a55295c68891c9bb6a5a2f87d7855e3aea36648f2db77317f3660602d338d6f3f8cf1018cc61f2722fcd6cb78f7f32ac62989b
diff --git a/app-emulation/containers-storage/containers-storage-1.12.15.ebuild b/app-emulation/containers-storage/containers-storage-1.12.15.ebuild
new file mode 100644
index 000000000000..312d2cda060a
--- /dev/null
+++ b/app-emulation/containers-storage/containers-storage-1.12.15.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
+)
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="containers/storage library"
+HOMEPAGE="https://github.com/containers/storage"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="btrfs +device-mapper ostree test"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+RDEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	ostree? (
+		dev-libs/glib:=
+		dev-util/ostree:=
+	)"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man
+	test? (
+		sys-fs/btrfs-progs
+		sys-fs/lvm2
+		sys-apps/util-linux
+	)"
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	default
+
+	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
+		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
+
+	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
+		"${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
+
+	[[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\ntrue" > \
+		"${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
+
+	sed -e 's:TestChrootUntarPath(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
+	sed -e 's:TestTarUntar(:_\0:' \
+		-e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
+		-e 's:TestTarWithOptions(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+	sed -e 's:TestTarUntarWithXattr(:_\0:' \
+		-e 's:TestTarWithBlockCharFifo(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
+	sed -e 's:TestTarUntarWithXattr(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+	sed -e 's:TestApplyLayer(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
+	sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
+		-e 's:TestApplyLayerInvalidHardlink(:_\0:' \
+		-e 's:TestApplyLayerInvalidSymlink(:_\0:' \
+		-e 's:TestApplyLayerWhiteouts(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
+	sed -e 's:TestCopyCaseE(:_\0:' \
+		-e 's:TestCopyCaseEFSym(:_\0:' \
+		-e 's:TestCopyCaseG(:_\0:' \
+		-e 's:TestCopyCaseGFSym(:_\0:' \
+		-e 's:TestCopyCaseH(:_\0:' \
+		-e 's:TestCopyCaseHFSym(:_\0:' \
+		-e 's:TestCopyCaseJ(:_\0:' \
+		-e 's:TestCopyCaseJFSym(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
+	sed -e 's:TestMount(:_\0:' \
+		-i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #678856
+	mkdir -p "${S}/src/github.com/pquerna" || die
+	ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
+	mkdir -p "${S}/bin" || die
+	cd "${S}/bin" || die
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
+	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
+		emake -C "${S}/src/${EGO_PN}" containers-storage docs
+}
+
+src_install() {
+	dobin "${S}/src/${EGO_PN}/${PN}"
+	while read -r -d ''; do
+		mv "${REPLY}" "${REPLY%.1}" || die
+	done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
+	find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
+}
+
+src_test() {
+	GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
+}
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 4c0c093927d5..da60783ce33d 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -4,8 +4,12 @@ DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0f
 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
 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 2806 BLAKE2B c10c55804b5ca03a11e88cf32cc96f4223e51ca9589b5edb9e23e993387ecc032a6d70e18d70ad61841d20bb41038b4b831ec100179171f24385eafec21fe811 SHA512 ad5eaafc34442183c4b25c0e73787ad13d12a4e3568a0c3eb7883a1d71e8ec0a8c6e30156a84c5ed9a1be1b4f2b3d054cc12234d7d5622d9410d757e81ab569d
 MISC metadata.xml 995 BLAKE2B 81f504df91c54970e7bc65cc4085db45f8f95f354b578cd7ddbae6c34036201335af3c3e07efb39583314c53bdb7cde341568e7d912fa926978b5f146e9e8d25 SHA512 00809a79f64c171d9df3eda85b079bf7c36e46afe8c31c0a0cddb3999d23b09ac2282cd17e4e876a132fed55e5311990a4a4461265d409e976b23ad8ee13e759
diff --git a/app-emulation/cri-o/cri-o-1.14.9.ebuild b/app-emulation/cri-o/cri-o-1.14.9.ebuild
new file mode 100644
index 000000000000..3a0a7e520181
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.14.9.ebuild
@@ -0,0 +1,110 @@
+# 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.0.ebuild b/app-emulation/cri-o/cri-o-1.15.0.ebuild
new file mode 100644
index 000000000000..32d09b53550f
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.15.0.ebuild
@@ -0,0 +1,104 @@
+# 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 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:= )
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="
+	${COMMON_DEPEND}"
+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/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/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 1f0740b03b55..c3a7360bc146 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -35,14 +35,14 @@ EBUILD crossover-bin-15.0.0.ebuild 4533 BLAKE2B 58f1853b557e183a756b6ce3602db8a0
 EBUILD crossover-bin-15.0.1.ebuild 4705 BLAKE2B d8a2391310d3d939a86e0da57d2996a62fb214eb6609a90ddce6b5a5e2d9ecf4dc5fb69bf3a2760e9aac8df5fb94b3fb10e667b897005f143aacca1b655c8cb3 SHA512 e40782eaddc88fca7b7590144021960a086dad403c07b0adcbb790bd487ca1f7916b3002557b470db4b7a122673e8285bd8fda6b1b24dbf5c9dcd0c8e31f99b3
 EBUILD crossover-bin-15.1.0.ebuild 4705 BLAKE2B d8a2391310d3d939a86e0da57d2996a62fb214eb6609a90ddce6b5a5e2d9ecf4dc5fb69bf3a2760e9aac8df5fb94b3fb10e667b897005f143aacca1b655c8cb3 SHA512 e40782eaddc88fca7b7590144021960a086dad403c07b0adcbb790bd487ca1f7916b3002557b470db4b7a122673e8285bd8fda6b1b24dbf5c9dcd0c8e31f99b3
 EBUILD crossover-bin-15.2.0.ebuild 4880 BLAKE2B 67c2576099eb4a3597028ee572e5766c71b10486cfda3d996e03da8e101d15c7f7901a24fc89fec5937b592b832422c419eae892144727ac4c6f8580557c72eb SHA512 c0fda036ae10a6cde2608f19fb834d70f405ac9b82543ca57b8f7db9bf398a337bead90d4444c234cfcfd1dcdd8517df9f552fd98fa9d87f034c70c71eec961d
-EBUILD crossover-bin-15.3.0.ebuild 4841 BLAKE2B 7b98cc1f8595e5d5c297dd16cc192c54a141d245529d9773e282147a56e96625b7183c502840a03844059d173eb3e9a029e7a83d641dfeaef76e3279954315c4 SHA512 cb746f2ee9c904f0f05efd74e6959c35decb89963629c9dc8b930ac6a11e79499d3aafcf63605fe8691464c39ee041a8d4b529c8b538bf6fbe058dc7672194b0
-EBUILD crossover-bin-15.3.1.ebuild 4841 BLAKE2B 7b98cc1f8595e5d5c297dd16cc192c54a141d245529d9773e282147a56e96625b7183c502840a03844059d173eb3e9a029e7a83d641dfeaef76e3279954315c4 SHA512 cb746f2ee9c904f0f05efd74e6959c35decb89963629c9dc8b930ac6a11e79499d3aafcf63605fe8691464c39ee041a8d4b529c8b538bf6fbe058dc7672194b0
-EBUILD crossover-bin-16.0.0.ebuild 4841 BLAKE2B 7b98cc1f8595e5d5c297dd16cc192c54a141d245529d9773e282147a56e96625b7183c502840a03844059d173eb3e9a029e7a83d641dfeaef76e3279954315c4 SHA512 cb746f2ee9c904f0f05efd74e6959c35decb89963629c9dc8b930ac6a11e79499d3aafcf63605fe8691464c39ee041a8d4b529c8b538bf6fbe058dc7672194b0
-EBUILD crossover-bin-16.2.5.ebuild 4841 BLAKE2B 7b98cc1f8595e5d5c297dd16cc192c54a141d245529d9773e282147a56e96625b7183c502840a03844059d173eb3e9a029e7a83d641dfeaef76e3279954315c4 SHA512 cb746f2ee9c904f0f05efd74e6959c35decb89963629c9dc8b930ac6a11e79499d3aafcf63605fe8691464c39ee041a8d4b529c8b538bf6fbe058dc7672194b0
-EBUILD crossover-bin-17.5.0-r1.ebuild 4717 BLAKE2B fef287182c10957a016dbc0a19a0104ab32a24b3c6cb6e43d842d515b72f517c1545a9f44979407abc81b18d63e351c63b05e8e1ce382508da80c570901fe978 SHA512 62925290cf4ad5256554464911f2497b39cba31eb35d19445f921622da2655c53e08091f2240de944142bdc4007b33c78fceff153c0c8ba782b6fd7ed3b82dc9
-EBUILD crossover-bin-17.5.0.ebuild 4683 BLAKE2B c8a09c253f81372861ed98b1fd8ab09ebf80016b1cacb96e4d7b20da0548f763be8feeeb9c69712d27203baf776cee9e087cbe87d3213a8644491eecfea77206 SHA512 ad38216f7f65f185fb4dce4f6705ce95b74aaacdb1daa81024a25656e5861bcef7e715b87cba5fd89d0417cd60b330c99db1e950cba646faa1a3b2cdb4f3fb32
-EBUILD crossover-bin-17.5.1.ebuild 5231 BLAKE2B 35ccaa8865e6f3fd3066e794c280c170249632506c8731a2eee5c86780881bec8604f94b3d5b1a41040cf882c1520de49850cedbcb5355ab2f4dd008a8fd8cd1 SHA512 2cc341a8f0cedc966092093de56a8f6c8fde8924c58e68cfd751a1e6f0fe549ef282dd64f340f5f4cbe9ed58b6e1735cc7e0e9dfccf0ad475481726e5bdcbf64
-EBUILD crossover-bin-18.0.0.ebuild 5438 BLAKE2B 2506456240454f36eaf53db6b8ef382584146e6ee82538e9464c3bd611aeb79b48d9b8a4032b87f7accb7ab2d2ff5cc5dbfe3decd504405b99a4ea8e248e9aa9 SHA512 bd213ccc86b8eb6967c5ff400fe7bd1ccb5ca1b8f98363c44e17b5dacae97ee1f07d1f736f20ab276ababd8d6f2604cd280883e182e5664d9051350f0833b6d9
-EBUILD crossover-bin-18.1.0.ebuild 5438 BLAKE2B 2506456240454f36eaf53db6b8ef382584146e6ee82538e9464c3bd611aeb79b48d9b8a4032b87f7accb7ab2d2ff5cc5dbfe3decd504405b99a4ea8e248e9aa9 SHA512 bd213ccc86b8eb6967c5ff400fe7bd1ccb5ca1b8f98363c44e17b5dacae97ee1f07d1f736f20ab276ababd8d6f2604cd280883e182e5664d9051350f0833b6d9
-EBUILD crossover-bin-18.5.0.ebuild 5438 BLAKE2B 2506456240454f36eaf53db6b8ef382584146e6ee82538e9464c3bd611aeb79b48d9b8a4032b87f7accb7ab2d2ff5cc5dbfe3decd504405b99a4ea8e248e9aa9 SHA512 bd213ccc86b8eb6967c5ff400fe7bd1ccb5ca1b8f98363c44e17b5dacae97ee1f07d1f736f20ab276ababd8d6f2604cd280883e182e5664d9051350f0833b6d9
+EBUILD crossover-bin-15.3.0.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df0ea4f86466562cb6bd6577ce313871c01e630089ce769fc21e8dac7ce71ff3e062f6dd83ac80e7913a6b372e34d18199 SHA512 24dc4e11b959c101b4bc52adcc9633772ddcb2831e844221539f96ea493e5507510b51a1a842ddefac5cfaeea14a1bc6fdf4154f739f35efb4fe885a9b0b282b
+EBUILD crossover-bin-15.3.1.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df0ea4f86466562cb6bd6577ce313871c01e630089ce769fc21e8dac7ce71ff3e062f6dd83ac80e7913a6b372e34d18199 SHA512 24dc4e11b959c101b4bc52adcc9633772ddcb2831e844221539f96ea493e5507510b51a1a842ddefac5cfaeea14a1bc6fdf4154f739f35efb4fe885a9b0b282b
+EBUILD crossover-bin-16.0.0.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df0ea4f86466562cb6bd6577ce313871c01e630089ce769fc21e8dac7ce71ff3e062f6dd83ac80e7913a6b372e34d18199 SHA512 24dc4e11b959c101b4bc52adcc9633772ddcb2831e844221539f96ea493e5507510b51a1a842ddefac5cfaeea14a1bc6fdf4154f739f35efb4fe885a9b0b282b
+EBUILD crossover-bin-16.2.5.ebuild 4877 BLAKE2B cf3367255b3c70fdb75559e0c04f27df0ea4f86466562cb6bd6577ce313871c01e630089ce769fc21e8dac7ce71ff3e062f6dd83ac80e7913a6b372e34d18199 SHA512 24dc4e11b959c101b4bc52adcc9633772ddcb2831e844221539f96ea493e5507510b51a1a842ddefac5cfaeea14a1bc6fdf4154f739f35efb4fe885a9b0b282b
+EBUILD crossover-bin-17.5.0-r1.ebuild 4753 BLAKE2B 9f563dd81089d4c679da849045c4ef916ea402dcff297c0d23c48d19e9a17e59b7d0b21e6712a8992072850a9e12b56d3613b5799aeee9da037d809bebdc8f6b SHA512 52cbb0f3397ac910bcd6d7323c998db31077f9c32555d3d8d8b0003486be14448d14ce6ef533eb74f0344de2bf12b2c930ca51fbf3b36762a47904d64d0efb82
+EBUILD crossover-bin-17.5.0.ebuild 4719 BLAKE2B 455cda74b397ccfdc4f3c6feab4a45e47aa3c4a2c0297da7496c0e317bd6038878aa6bbf7dabb2af767f9acbd44e7cd8095b64355562fc6d3d47a240ea7e813d SHA512 e1b782674ef33c04a3ffa9d60c663374401af16dae4fef4c083da01fe386b6b5e4acd188f81658d12baf4d09b67892a8ee5ee1ac14ee680ab57fad47b13d5c99
+EBUILD crossover-bin-17.5.1.ebuild 5267 BLAKE2B a950f38197953793d0d2bae5aa36fde557dbcefd16123251c77d31c5ac17c7cf34daf8bff38582e81e221fb06702c34da7909e94fc0c2ea75c216211ca0f78a1 SHA512 48230468afbee95831482c8b5142e512565dc86c8efbd2ed46a41d1327d96eac63ae50c675d49b7977874f8b61bd485bba79304e88a2223eb849a92b0d9d33ce
+EBUILD crossover-bin-18.0.0.ebuild 5490 BLAKE2B 66424f7b2e9ab71739ceba43ee795287c1e030a03ff0f1fca67654644bd95fe4eabde219f7bd038333ecb0c8dfcab4f185735ec46d7bcf3301993db89fd2df4d SHA512 7cdf726a2f6f5c28cb937c9c7285a84ee64ac5acb908442383772c465022636e396d7fd76a4d9cb1af47730b838476dbcaa36d12807713e1783ddb87660dcbb2
+EBUILD crossover-bin-18.1.0.ebuild 5490 BLAKE2B 66424f7b2e9ab71739ceba43ee795287c1e030a03ff0f1fca67654644bd95fe4eabde219f7bd038333ecb0c8dfcab4f185735ec46d7bcf3301993db89fd2df4d SHA512 7cdf726a2f6f5c28cb937c9c7285a84ee64ac5acb908442383772c465022636e396d7fd76a4d9cb1af47730b838476dbcaa36d12807713e1783ddb87660dcbb2
+EBUILD crossover-bin-18.5.0.ebuild 5490 BLAKE2B 66424f7b2e9ab71739ceba43ee795287c1e030a03ff0f1fca67654644bd95fe4eabde219f7bd038333ecb0c8dfcab4f185735ec46d7bcf3301993db89fd2df4d SHA512 7cdf726a2f6f5c28cb937c9c7285a84ee64ac5acb908442383772c465022636e396d7fd76a4d9cb1af47730b838476dbcaa36d12807713e1783ddb87660dcbb2
 MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
index 3807e0c09dab..e707286b6b06 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
index 3807e0c09dab..e707286b6b06 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
diff --git a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
index 3807e0c09dab..e707286b6b06 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
diff --git a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
index 3807e0c09dab..e707286b6b06 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
index ab2b592f6b15..ad18cd6fcd7e 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
index f2070b72ee7e..16712dfcb5b9 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
index bbb67c346a25..e8abb043c907 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="opt/cxoffice/lib/.*
diff --git a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
index 23b837f132e0..ca67eab96b62 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
@@ -45,6 +46,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
 	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
index 23b837f132e0..ca67eab96b62 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
@@ -45,6 +46,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
 	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
index 23b837f132e0..ca67eab96b62 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 
 QA_FLAGS_IGNORED="opt/cxoffice/.*"
@@ -45,6 +46,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
 	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 326a18bb8c6c..fbf4bce4c8b6 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,3 +1,5 @@
 DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B ff897b18b8265b3d718caf7afaf10f7b8eeed9be0cc9c73b02d5c42c5c9ddd1be32cf7d1259ce26d56219cda57707e25e154e50cfa2cc80e823a4b924da4e5e0 SHA512 0a833510df0029999bfc05c23445a58a8b2ff165c0fb2fd5c411498d1e89b5b1990d2778b32346dd2b6d61c166ff707c6277a5d1937db6345c77d3825eb59875
+DIST docker-proxy-0.8.0_p20190604.tar.gz 2721379 BLAKE2B edc36302ca4b2be297505a5bfd8acd45f17bc752e88bcaa72f34e2d972230d92b9bfe3d0dccbb2f1e04718fb1adc95631fc0f533ca5572bdcfc468d843ce480e SHA512 dea31fd82ab2d445fbd39fe15550a91f7e489a06f6dedd32ea1925f7e9a7971952d26b874f9687249609a0d204ea35da357e0a957b819df2026a0cf8109cb354
 EBUILD docker-proxy-0.8.0_p20190513.ebuild 780 BLAKE2B 46a02fb28634760b3fb4b048eee895b152f53fde4f501df7896966bf7e8290d2438c61a0545a2c9782fb2b7bb308a1040c493b8f180991b05a581eda747d7d02 SHA512 bd52763fab7f7b59361e6acdd2249209e72bae8cc50542f0dfa3ea8010a65cc8ebee33c4bb5891a59840d35988048c6a8a3bafc82f6c735f01860a66c066ed95
+EBUILD docker-proxy-0.8.0_p20190604.ebuild 770 BLAKE2B b89a0056ae26fa7e122bbf72b9a6b7688e44de38f1c6173d4c80641e4c1a98bb403349863fa16f05aedc30b658836748e85b28018a79f6345baa76dc5ea6536c SHA512 77d3f27c7beb8c2208774d81954f5b699ab685a0e6aa5d39d973be74050128fda2c753790c06976aebc2aa4e8f842d7df2bcebba897424d6b09ef3841fc93257
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190604.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190604.ebuild
new file mode 100644
index 000000000000..4400a3255a11
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190604.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="fc5a7d91d54cc98f64fc28f9e288b46a0bee756c"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 8a30a11594d2..e3d55b20a164 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,5 @@
-DIST docker-18.09.7.tar.gz 15264213 BLAKE2B 5aa4be6d63271fd0b9a8ea480ed55a1dc312d479d7d387a35573963393b33da96086741dbb817aff765cceb81e309fd76122b3622dd91640a492a9f46c9dbd64 SHA512 7d06ab01673b5931a8dde1d2fcebf442d1a107c98c95cd8fe3b886c123b48470950601782fe0c83e7537a1e856069e79a096b9f4523fea7984fd3e773b243b66
-EBUILD docker-18.09.7.ebuild 8291 BLAKE2B 6e02dbe5522cf438d44c78e3857d5719fddefdf245c45d1fe263a99581bc871196d92aad8d164eb7e89bb07a0ba15b567af526fdaa30f55f9153ae47e08d8402 SHA512 93e9e9f3be177a2ad5fbee6cec9fc902bbed97962cfcfe8e88697adfe112ffe09a0fc0323778b28a3c48d0ce322c6a4f0e279420d74b8755a7edca9c8c6117ef
+DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4 SHA512 34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed
+DIST docker-19.03.1.tar.gz 16652136 BLAKE2B be5c001e48bdce0ea8e520c131ff1699d12e39c45cf7dba3452689879e29abe12509c5d70e4a82eb66ac599b85717cd7e057cff1a41ba552eb2ce549e692d991 SHA512 92b4e5fe2bbf96a261d290ca807550af45146be9d21680940bd6aa45d9127ae8ddbc706df4056f1720ed6975a2a92004f1789fae4109c50206904ad827d4bf2e
+EBUILD docker-18.09.8.ebuild 8355 BLAKE2B 529357dce1baf40bd90008b7e9597be9f1a73db15e8f73a51ce27bfbfa920947dc6d588b79d866593d9ec404a89e8f5081ff8c593607882b4ed6108ca974b5c2 SHA512 2fca74c7e26ee3760b1b1b564bfcb67ef69827e49b6a9fa54ab688aff2808fee3d35c4ec7e06dfc5f7a40ffd2018fe3674df354b30a76ed908c2c5882f6f5b84
+EBUILD docker-19.03.1.ebuild 8355 BLAKE2B 57168baecd4b590148c64265a3b2d4e2952c799157c0aa57c55382a6a645d398a9038750541c43e54711e53b69650d94c19cddafcafca7eb3ebae00b8f207190 SHA512 985e8bc8ddd64cf6f3f42e0e341110dc8943cd1cc0f2b703482ddf2bbba30f40fe3c787589d481d76ef4eaac7ef1bb17889d5186a5395be53453a93c86610094
 MISC metadata.xml 1576 BLAKE2B 7a378d4abcda0352c4c96108a238d693e9104a1de624f8fb4e808bfbf5ad4960c1f6155b1f6c78ff2bc6609653285e911e7eae9f319696e39c60b63e5127ef11 SHA512 9944178c2202c12bc7364f9722e70b71583bfc60a318348060d0ee8ba713c892259da46c222ce7fea4b1294be8b01b7d1b359976931e287f574733b65403e762
diff --git a/app-emulation/docker/docker-18.09.7.ebuild b/app-emulation/docker/docker-18.09.8.ebuild
index e466c07b7c13..58711331389a 100644
--- a/app-emulation/docker/docker-18.09.7.ebuild
+++ b/app-emulation/docker/docker-18.09.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
 	inherit git-r3
 else
-	DOCKER_GITCOMMIT="2d0083d"
+	DOCKER_GITCOMMIT="00dd43dd"
 	MY_PV=${PV/_/-}
 	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64"
@@ -71,7 +71,7 @@ CONFIG_CHECK="
 	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
 	~KEYS
 	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~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
@@ -81,7 +81,7 @@ CONFIG_CHECK="
 	~CGROUP_PIDS
 	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
 
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
 	~CGROUP_PERF
 	~CGROUP_HUGETLB
 	~NET_CLS_CGROUP
@@ -141,6 +141,14 @@ pkg_setup() {
 		"
 	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
diff --git a/app-emulation/docker/docker-19.03.1.ebuild b/app-emulation/docker/docker-19.03.1.ebuild
new file mode 100644
index 000000000000..7c0a798fbfd9
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.1.ebuild
@@ -0,0 +1,308 @@
+# 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/free42/Manifest b/app-emulation/free42/Manifest
index a84de39d1e53..f3f253fad286 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -2,8 +2,10 @@ AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927
 AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f590298c5a47f50a2a20f0ac5f1968b06be19d53f03e64dcf22134938c232f68a6b989250064f45e88196c7fc8e7e9e0fca71 SHA512 1c9a16e29087c492fe1ee5bba8dc118674f4c167b5bc138ffae9ee08ad735a5b5aa2eec2e25236e5aeb95b89c94d7903e08e22cfaa321cf3c458b54defe72af8
 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
 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
 MISC metadata.xml 547 BLAKE2B c7cdf7e2a312b69ae94b467836751bbf61dc771e58866edc21d70bf1b15c776afaefc20a947f6dc8af6586ec2b5e3416bd32446ca3a92890ed573daad6e48d38 SHA512 99885c9a7abecc41f53a946d1b94d2f8d8fda74f0e3f0a0cf6a43a418a874922594841e17b6197aee9f80b007d7633f2154ba85cec81dcfc22efcc7b52edd15d
diff --git a/app-emulation/free42/free42-2.4.2.ebuild b/app-emulation/free42/free42-2.4.2.ebuild
new file mode 100644
index 000000000000..73ac9b4e00d4
--- /dev/null
+++ b/app-emulation/free42/free42-2.4.2.ebuild
@@ -0,0 +1,53 @@
+# 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/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index f07b50af4a21..5fa67b916c65 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,5 +1,5 @@
-AUX fs-uae-launcher-2.8.3-German-ROMs.patch 747 BLAKE2B a7235e3c55a0e6a365b252e5b856f5a609a8aa938cf114d5717c71d69fb4ac280d1a652f74c5a21088dca44473dd749a6e3955dac453dc8c38396054a90899b5 SHA512 9c757f68f0ed74540affe88af4b061009167c0207b346d77cccef1e3a7184b0cb2112eb2ca1547e04a245a9ccf156f9d55031a35d23ef56312cf283473ff8f26
 AUX fs-uae-launcher-2.8.3-QApplication.patch 457 BLAKE2B 814c7d04240bb3e90f18e0b4d1a8041b985fe6f3241e098b0d26f2d8b096ba79c33e04f0c938a3af2a12b55d080f831fbc9da404e8d62751b16021e3f229a530 SHA512 e1892b9a7f440ea373e7a7c8313d56328395fa054918cf402b9a8b5e96c15f48a3bee901aef4297774a79b5eb1d4f909ff4843da16a0f1a6f8a6343afe104162
-DIST fs-uae-launcher-2.8.3.tar.gz 8784242 BLAKE2B e54f73efde6563d9e4ab6b4f57cc73bca80d72d0ded4db67edc53dc344685889abf485df067541e8d635595ac5457ec456ded0306310b1ad95a3b3ef07e53bc3 SHA512 4eaa5979fe2e8f2c792d4878e9a9ad0a0433206aac42aa380d97aee21e4ba29a54caced2437b83357c2c4d2fab121bfb821fdb8a883ead971766866b02067a2d
-EBUILD fs-uae-launcher-2.8.3-r1.ebuild 2093 BLAKE2B 127c7f61cb14207ff917dea6f10ad8c469ab995e853d6fe81dfdbd9212612afcb34d83e87f971513c40f8813755eb8f26c510a2bdaf7c0338a9caf6af704aadc SHA512 32818439bd446f8e2d1b28b66c5c33c963fb7e542a6a4bb435807726b1023a9def2af1d9fd70f6e64fbc34f58207c950d46981ffc5184346a3495d4ec555b0e1
+AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
+DIST fs-uae-launcher-3.0.0.tar.gz 9631352 BLAKE2B dc2f940cbde1fe9d2386e512bf5c0ca9a4ea19332826095cc5ba95e90c7f6cfaf0cd5dbaa692c192ac7d74a3ddf245062a0faeeccc9d8a135e544d304119e239 SHA512 76f9c48d2a46ece38aebb318a6d684ff40e85fef76bcc6ac57c7f397c828dae45541ba458a7792f102a8afc69a4183b9932b637318716a8b40ff3dbd3b37cad7
+EBUILD fs-uae-launcher-3.0.0.ebuild 2087 BLAKE2B 5263b455fdf32e2e0c0f3b14839a9963145355dd3de55aaa30d1e3f6cc3f4d81441e3566a9a968566611f34eaed232bac016cab57ba90837edb27bce54b4966c SHA512 02e08e7591e755eb53f98369565e813b803e30fcaf8e1eff2a99844b0172d0e92acb00ddc9ba03ded9f1b8536a22929f5ce68ae624a2b1fb6498c16aea36d96b
 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch
deleted file mode 100644
index 41843d5230f9..000000000000
--- a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.8.3-German-ROMs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/fsgs/amiga/roms.py	2017-07-06 16:50:33.351036624 +0200
-+++ b/fsgs/amiga/roms.py	2017-07-06 16:52:58.335040977 +0200
-@@ -11,6 +11,8 @@
-     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[!]
-     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[o] (patch)
-     "891e9a547772fe0c6c19b610baf8bc4ea7fcb785",
-+    # kick13.rom - from Upgrade Commodore Amiga 500 (1989)
-+    "90933936cce43ca9bc6bf375662c076b27e3c458",
- ]
- 
- A500P_KICKSTARTS = [
-@@ -55,6 +57,9 @@
- 
-     # Kickstart v3.1 r40.68 (1993)(Commodore)(A4000)[h Cloanto]
-     # "c3c481160866e60d085e436a24db3617ff60b5f9",
-+
-+    # Kickstart v3.1 r40.10 (15.7.93) from german A4000
-+    "3b7f1493b27e212830f989f26ca76c02049f09ca",
- ]
- 
- CD32_KICKSTARTS = [
diff --git a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-3.0.0-ROMs.patch b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-3.0.0-ROMs.patch
new file mode 100644
index 000000000000..44427642253f
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-3.0.0-ROMs.patch
@@ -0,0 +1,14 @@
+diff -Naur a/fsgs/amiga/roms.py b/fsgs/amiga/roms.py
+--- a/fsgs/amiga/roms.py	2019-06-21 17:49:42.000000000 +0100
++++ b/fsgs/amiga/roms.py	2019-07-21 21:42:14.135600616 +0100
+@@ -10,7 +10,9 @@
+     # amiga-os-130.rom (decrypted, patched)
+     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[!]
+     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[o] (patch)
+-    "891e9a547772fe0c6c19b610baf8bc4ea7fcb785"
++    "891e9a547772fe0c6c19b610baf8bc4ea7fcb785",
++    # kick13.rom - from Upgrade Commodore Amiga 500 (1989)
++    "90933936cce43ca9bc6bf375662c076b27e3c458",
+ ]
+ 
+ A500_1_2_KICKSTARTS = [
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3-r1.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.0.ebuild
index ea3355abae22..62652d3eb997 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-2.8.3-r1.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.0.ebuild
@@ -18,9 +18,9 @@ IUSE="lha"
 
 RDEPEND="
 	app-emulation/fs-uae
-	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
-	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
 "
 
@@ -29,17 +29,17 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-German-ROMs.patch
-	"${FILESDIR}"/${P}-QApplication.patch
+	"${FILESDIR}"/${P}-ROMs.patch
+	"${FILESDIR}"/${PN}-2.8.3-QApplication.patch
 )
 
 src_prepare() {
 	default
 
-	# Unbundle some libraries. Keep oyoyo IRC library because upstream
+	# Unbundle OpenGL library. Keep oyoyo IRC library because upstream
 	# is long dead and it's not worth packaging separately.
-	rm -r {OpenGL,six}/ || die
-	sed -i -r "/OpenGL|six/d" setup.py || die
+	rm -r OpenGL || die
+	sed -i -r "/OpenGL/d" setup.py || die
 }
 
 src_compile() {
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index 1d5e8792ef26..d909494b1d87 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -1,4 +1,4 @@
-AUX fs-uae-2.8.3-libmpeg2.patch 1094 BLAKE2B a06d43e624cf254f21cddf73f010b5255609ac42d4c02b6ed65ce62581b6ff6c2d23e3fc184795f49cfb33fc518a0bc931102764ec4c86adfc24a74008136fe3 SHA512 ba4cc78a57d806cded8ee18076888b75ef4ecf55f0dc1a1fdc0d3186f1be58e0ffb6b46f8dd3a090775707ffc1d0a219830457af9d2b5f8c8ceec6005ba34c9d
-DIST fs-uae-2.8.3.tar.gz 5017047 BLAKE2B 3d921446381b56d39410e4d68291c1cb696abd5e1b25105bdcc367c07112e79197d8267cfcb21f3f844cf5ac0a02a19ebec76611f34e747c6d03fefc2858a020 SHA512 1ccab4329a6b678a97f336b963bfaf9ea26bccccba31c90f1b7a8c2a6d3a9f343f9095733be744d4357495c808216d32c08a2bd8ce05bba73017147616d5e8cf
-EBUILD fs-uae-2.8.3.ebuild 2376 BLAKE2B ff74f28954ff805502fceac894d0e4a55d34983af8262924d1c0b6136d8a7bbf408a8fd8e52629f70e3371ff4d2b245d334f5d4bd97d0a32e1e76e0d1cf5df44 SHA512 55969c91529ab07a139400e4efd16b8afc137ccfaf52f8f2fde47482e56fb718ab0a2b6155397e843a0da9e707fdafc3178a244bf8cb6309e4ae14bfa385e425
+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 2381 BLAKE2B cb6322fdb9c6308d7bc23aa81a3b547207e79c3268b86e04e663b580750df4157b4c861ef4e055ab19c142bac962698f7a9d318eefaf67abe0aa426c8c307ae4 SHA512 83e2a675df0ea3e94924b26d3e8a88bda0e4e178f5c63580c733750f2f22c8b26e69b1777996b5809e8e5d91213eeb61eed3e222143b4c9b8ffc072f82938e4a
 MISC metadata.xml 533 BLAKE2B 5082ca2fc578b6fcb5a13825c2264a0c1cd6c227f8d85d1d8dfd056bd12b54784b90dca1b7e61c8d127c5d06dfb1b5a45f97125831f6ef42804a00d8fd992b2d SHA512 84eb6bf83f3ccfe871a33517117968f8aaae75a3af79ab29f96f3bff839badbd9c16c1296b1693e8c293e5a1363de12e650c0406b8dbbb1026e64acea5bbd745
diff --git a/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch b/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch
deleted file mode 100644
index 660cd2fc9036..000000000000
--- a/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5937f7587de5b96cbab120e99b6ae3a0cd722c53 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 19 Apr 2019 21:56:58 +0100
-Subject: [PATCH] Only run configure in libmpeg2 when using built-in version
-
----
- configure.ac | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 39958ad..941391a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -200,7 +200,7 @@ AS_IF([test "x$with_glew" = xyes], [
- ])
- 
- AC_ARG_WITH(libmpeg2, AS_HELP_STRING(
--    [--without-libmpeg2], [or --with-libmpeg=builtin to use included version]))
-+    [--without-libmpeg2], [or --with-libmpeg2=builtin to use included version]))
- AM_CONDITIONAL([BUILTIN_LIBMPEG2], [test x$with_libmpeg2 = xbuiltin])
- AS_IF([test "x$with_libmpeg2" != xno], [
-     AS_IF([test "x$with_libmpeg2" = xbuiltin], [
-@@ -776,7 +776,9 @@ OPT_FEATURE([A_ZIP], [zip], [zip],
- 
- AC_DEFINE([FPU_UAE], [1], [Define to 1])
- 
--AC_CONFIG_SUBDIRS([libmpeg2])
-+AS_IF([test "x$with_libmpeg2" = xbuiltin], [
-+    AC_CONFIG_SUBDIRS([libmpeg2])
-+])
- 
- # Write Makefile
- 
--- 
-2.20.1
-
diff --git a/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch b/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch
new file mode 100644
index 000000000000..ad77dab4cdab
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch
@@ -0,0 +1,48 @@
+From b10a8c60fb2cc4d80eb5a95591a9e79681f7830a Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 19 Apr 2019 21:56:58 +0100
+Subject: [PATCH] Only run configure in libmpeg2 when using built-in version
+
+---
+ Makefile.am  | 3 +++
+ configure.ac | 4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 66356baa..eece9f1e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,7 @@
+ # Makefile.am for FS-UAE
+ 
+ SUBDIRS =
++DIST_SUBDIRS =
+ 
+ WARNINGS =
+ 
+@@ -1262,6 +1263,7 @@ endif
+ 
+ if BUILTIN_LIBMPEG2
+ SUBDIRS += libmpeg2
++DIST_SUBDIRS += libmpeg2
+ AM_CPPFLAGS += -I$(s)/libmpeg2/include
+ fs_uae_LDADD += \
+ 	libmpeg2/libmpeg2/.libs/libmpeg2.a \
+diff --git a/configure.ac b/configure.ac
+index 5dd3bfbd..4d4849fd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -801,7 +801,9 @@ OPT_FEATURE([A_ZIP], [zip], [zip],
+ 
+ AC_DEFINE([FPU_UAE], [1], [Define to 1])
+ 
+-AC_CONFIG_SUBDIRS([libmpeg2])
++AS_IF([test "x$with_libmpeg2" = xbuiltin], [
++    AC_CONFIG_SUBDIRS([libmpeg2])
++])
+ 
+ # Write Makefile
+ 
+-- 
+2.21.0
+
diff --git a/app-emulation/fs-uae/fs-uae-2.8.3.ebuild b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
index 698c12210c57..376c782ca59f 100644
--- a/app-emulation/fs-uae/fs-uae-2.8.3.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
+	x11-base/xorg-proto
 "
 
 BDEPEND="
@@ -35,18 +36,18 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.3-libmpeg2.patch
+	"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
 )
 
 src_prepare() {
 	default
 	AT_NO_RECURSIVE=1 eautoreconf
 
-	# Ensure bundled libraries are not used. GLee and Udis86 are unused
+	# Ensure bundled libraries are not used. Udis86 is unused
 	# regardless. Only FLAC headers are bundled and the library is never
 	# used? Lua is bundled but differs from upstream. We keep the
 	# default of disabling the Lua feature anyway as it is unfinished.
-	rm -r glee/ libmpeg2/ libudis86/ || die
+	rm -r libmpeg2/ libudis86/ || die
 }
 
 src_configure() {
@@ -67,18 +68,18 @@ src_configure() {
 		--enable-gfxboard \
 		--enable-jit \
 		--enable-jit-fpu \
-		--enable-ncr9x \
-		--enable-ncr \
 		--enable-netplay \
+		--enable-ncr \
+		--enable-ncr9x \
 		--enable-parallel-port \
 		--enable-prowizard \
-		--enable-qemu-cpu \
-		--enable-qemu-slirp \
 		--enable-savestate \
 		--enable-scp \
 		--enable-serial-port \
 		--enable-slirp \
 		--enable-softfloat \
+		--enable-qemu-cpu \
+		--enable-qemu-slirp \
 		--enable-uaenative \
 		--enable-uaenet \
 		--enable-uaescsi \
diff --git a/app-emulation/ganeti-instance-debootstrap/Manifest b/app-emulation/ganeti-instance-debootstrap/Manifest
index 716461053f5f..07607a7ed45b 100644
--- a/app-emulation/ganeti-instance-debootstrap/Manifest
+++ b/app-emulation/ganeti-instance-debootstrap/Manifest
@@ -1,5 +1,5 @@
 DIST ganeti-instance-debootstrap-0.11.tar.gz 67946 BLAKE2B 0dbf3d16ae4058f0093adcd0a33c473719cf6de267dbc4e99e3326a2885d57693e2d0408b1079681056be88c7db23ab168e38f38d4051e8847d3b552fa42d4a1 SHA512 d39ae29b49e3e0e25e9052ee5201d5aeeedfa229cc0b8674ea01a26b1b615b262c1464ca16b5268884a0fa28981e5126eec084d7bb9298a4b405574925b85b4e
 DIST ganeti-instance-debootstrap-0.16.tar.gz 23020 BLAKE2B 8e96597ee94e5806de78ade571f5287e68c5442a91fb8ef3f6e2dbb95301e036fa79225b3c8a2517b05ff14eba0fb541c792556218d0f9a9346f1ebe524a6b38 SHA512 43197d034d719b81ea8737ea60763d43bf71bc9b15b0fbee60bd42e5b0c0f3821805986d4f564db91207a83c2396e87fe081180eec3a5da77d18f2d510fbff1f
-EBUILD ganeti-instance-debootstrap-0.11.ebuild 754 BLAKE2B b2127379cb20e6a727a9ddd04c5f233ddcf1dc61184b580edbb82955f8b2943ef4f134eb8b5fe43c024b23b8dbefd1a9f3642fbf24f6c14f27c9953408cdd100 SHA512 8b7567e8ca01eb60cac1052ea9aa1f2decff3c7f051846ac94fa7de986fc28e30ab788f1b6973dc3c5ff3b8d58cc0560a473f46947f7d152df888d6b0f21ca27
+EBUILD ganeti-instance-debootstrap-0.11-r1.ebuild 668 BLAKE2B 6c059e82edd5cc1c08b9af03e8758f75fc5c55210658032e76c1c147d703e3014d8020e45755134e09d9f70427fcabebcd65ee8d541b241e02cfaa728869738c SHA512 2afeeca81c5840dcfbb0b76d0dca9a62fb13d3788c573f2f37070385a7ad0d3b031a86b3b750f35b71fd66183862c133c220c9432c0b1222675954426656a9f5
 EBUILD ganeti-instance-debootstrap-0.16.ebuild 846 BLAKE2B 1958a53d66b67c49c2534e775cbefbeff8ce5ff43d8a3f5cd11ece43c9b2636b776b6e6e41178dc676ce7d38e13b09128f2fe8ea01940bb1efff8d27d903d7b0 SHA512 49a465b86bc87209fa0e55c6ad21541476a8b4a6f28b03c905ae9339f72de06109b7d389cfe92e811eda69ddf136efe92c3e7b2e1e9acc129b82b7ec1c090111
 MISC metadata.xml 693 BLAKE2B 8e67678f49377a1e982361b80d67e2af5b4a093996d7416e1ac98925ee3cd9f3a79fcd23f9146df831c55b6aa9aa8ed4e7c5e735d9fd191b48406b256757d340 SHA512 5cc8e1aa819d16acfd1645a8f4921343e931423af0e4e6414d92599d3d9a0ea301b1549a767b9c768cb7f35d9bf580657ddf25d1165ccf59cdda54e0099fbcb3
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
index 91c4f1ab4d1c..1a4184f43e45 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Scripts to build Ganeti VMs with debootstrap"
 HOMEPAGE="http://www.ganeti.org/"
@@ -24,11 +22,11 @@ RDEPEND="app-arch/dpkg
 	sys-fs/e2fsprogs"
 
 src_configure() {
-	econf --docdir=/usr/share/doc/${P} || die "econf failed"
+	econf --docdir=/usr/share/doc/${P}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	default
 	insinto /etc/ganeti/instance-debootstrap/hooks
 	doins examples/hooks/*
 }
diff --git a/app-emulation/libcacard/Manifest b/app-emulation/libcacard/Manifest
index 8ccaf8d4ae3c..f45958e017f4 100644
--- a/app-emulation/libcacard/Manifest
+++ b/app-emulation/libcacard/Manifest
@@ -1,9 +1,5 @@
 AUX libcacard-0.1.2-underlinking.patch 15058 BLAKE2B d24bbbb319cd837c16965e7e5e46ff9816cdfa4d4b1d56dd1ef30152fb86a6e3cb0ea8fd6f980dce6eef71ffd2dee19671ea85546867ea13a9739a3877eb4603 SHA512 dca450e974fd05f0125c447d565d3e4855e5a1d034676a2f2f5871fe137cbcb84414d0760b416c1abae6feb8f4fd0a521e98adeb1db4c797ff7e922afd3bc980
 AUX libcacard-2.6.0-simpletlv-test-fix.patch 1195 BLAKE2B 77b22b09e9c1ea080adc7763bb0d0c5d91a6f3b74c39e7446aba65adaeb94c47884a195f9a88021f4ebbb7f9a3c8f3ea23c31e2f9c40878465fa6df6a3fbfacf SHA512 9251b661884cccd627a874cc9cad9385f19208680cbce4a99e50fd8b1a94740fded075ec3c4fecef923dd50785cffeeae377cf88e6e9f6d3601e9cf5c0794adc
-DIST libcacard-0.1.2.tar.bz2 276430 BLAKE2B 315d7b0c8dcd3d6b40db4c1586cf149e6681af4e0188bed22cb526d1de79bda4a7b1c5ece894c679c2e7b727b6d05628ba9f8fbc3900503f78f13a029514e15d SHA512 a3622b29fe3a059e069ad6f7da428278a915cec362a6aae3c7cad0d47dfadba67308631435993c0f41cabe92a05874b339518dc503b71b8d86db4976bb6987f6
-DIST libcacard-2.5.1.tar.xz 325692 BLAKE2B f6ce08f08f359789886a63d4554e3492e8cb570e5b476dc8185332a951fe03e7b5577856c4c60523ad673577a3a160490aaf943f401796973b0d205ca740f949 SHA512 88e66745f649f52c3fcc7745834d628e76abc21cef1b300e8750e6c0641f65d0e11224da30fa13dea20d6ebe5d36d7a8680d029e15149fddaea43558216ccc21
 DIST libcacard-2.6.0.tar.xz 364828 BLAKE2B 3a07243abb91dab05d89bf073fabb4a0ef7e820765066a8d87e72086b88cc726de77d1fdc5118e05ed47077d76ae0a57ff591a2e4e8623c3484c6cbf00cd025e SHA512 d6dfe6fe6cd2711bf8f71edc134a7caf459fc2a9c4f664ab2f1c28cc9ee8efe7a2d5a15c4dc735956638176e07e22416cad5e8e926aa7cab3fa95ded853f5982
-EBUILD libcacard-0.1.2.ebuild 741 BLAKE2B c4ad46e5168a718992a4e99e248e7c06565873ea4695843790fbe15e007a05ee45cb592d8cf710a6c7c5657560def536a3cb56aace5b4406f174b230330c5856 SHA512 591fae7bd4b09d2176c4369b717ad90c75dc00e7f077228676b096b54dba71253cdd74ff2b1ee3baf9be7a790ca7fc8f85c2d9e210912dac88fc82345ecfc760
-EBUILD libcacard-2.5.1.ebuild 670 BLAKE2B 0c83dde859da1b5fa65f0798942184ccdcd318cc55efc99846839f1c57762e42193e25b7d6269c2e77485e50b0d242fd30fa098874539e68614225183cb2e73e SHA512 47040ae3f979d378bc6977a4e3820603b5f9f43c42ea73fbd087825c43bccc0a5bf971b0ce16eb718d2b1d24fcdf0d5dff5c5f54092e38ec320054ede2d63785
 EBUILD libcacard-2.6.0.ebuild 989 BLAKE2B 2a65bbbf149bdee3ec85c143935edf6298db3a02f4977deee84b2399dc36d56745cf1f98096fc78224419cc212ebe3b1236cdad23bda823f96b95a5ce0ddfdbe SHA512 32e6d65f83573855396e2cae027bf779bf682dc59fd92e5f672e9b21d55d0433e60d417458ac0dbe9fe3de00b2cec773b5a8f08e8cb0676ab98ee2b67051270d
 MISC metadata.xml 401 BLAKE2B 585a9670acb4d98be5545e72793dd1998e8b1a01b9636899924a4a56cf1593e334bc562c615664c14897c78f975efb9844ff2935fce6ce2a443fbf318c371027 SHA512 32692892c082887a0fd59fe2ddcf68da7d46d6e79bac6d02e2420d80252f92d0a0868ebc100e94f92fdbc8a71155731c31c6fed1eebaa80d296b69aa1f25cede
diff --git a/app-emulation/libcacard/libcacard-0.1.2.ebuild b/app-emulation/libcacard/libcacard-0.1.2.ebuild
deleted file mode 100644
index 5810a1e92d50..000000000000
--- a/app-emulation/libcacard/libcacard-0.1.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
-
-inherit autotools eutils
-
-DESCRIPTION="Library for emulating CAC cards"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/nss-3.13
-	>=sys-apps/pcsc-lite-1.8"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PATCHES=(
-	"${FILESDIR}/${P}-underlinking.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-passthru works only on W$
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/app-emulation/libcacard/libcacard-2.5.1.ebuild b/app-emulation/libcacard/libcacard-2.5.1.ebuild
deleted file mode 100644
index 10439ee321a4..000000000000
--- a/app-emulation/libcacard/libcacard-2.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="virtual Common Access Card (CAC) library emulator"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/nss-3.13
-	>=dev-libs/glib-2.22
-	>=sys-apps/pcsc-lite-1.8"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}"/usr/ -name 'lib*.la' -delete
-}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 24be4dfc1801..5428e2936f6a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,9 +1,10 @@
-AUX README.gentoo-r2 2094 BLAKE2B ccfad63217f7778e97d8de49e20002dffefff32562f560b23c777c5f2f20407493b4288fc67516c7b45cf2c1868340673c7ba92ea1774a22d59524c6a626b59a SHA512 595ede7bb574c7f244a15e430b70f828bc4574b409d4cc37261bf38bfb30cdb31edb6091ff63f6517b281cc11a34eee960ea0330a6ea285dd48fe2288dd67196
+AUX README.gentoo-r2 2093 BLAKE2B 30a5cf13067a6ea11537ac2d532e842180815d7f7a75fa9a8c47077635c38cafe8f0efe0a5b56ed099efab1e5a2e45820485e418c46d8c7a9798f2908f2b937e SHA512 b8ac050161a12744c551f6986841696a4c1c0b915402c42f6b03cc4c2636945c1f63b93e2503e189597f6fb05bc8ab6a043f6f23981f060d567d708c34ddd582
 AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 BLAKE2B e796f4e32f00e8970eabf723520601b26c7fa5f7579d538299538632ba036dafbb2dc64ad40d10152c0637043b2a649e1dc08468d1f250e00ee0af095d94a093 SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588
 AUX libvirt-5.0.0-fix-paths-for-apparmor.patch 4372 BLAKE2B ac8c78097b8125932fd89756ca7332665e2080afc5de37e0a31d6f2a84e15f21e01d41b39c7781c26cf514c74a215623c0013e67cffe7543892d5b13d3022642 SHA512 391e78a2ea113c38afb07b9f0c7638748e5bc04fb88ea96be7ff439624c429ff0106024674546b01e750d8b1e1418d13040bc8462653eb8567651378b66d53a5
 AUX libvirt-5.2.0-do-not-use-sysconf.patch 5969 BLAKE2B 965e53b33424b5e62107574bc457ee886c799b247179200cf671485dff331db3e2c453e55b3a38b34a205ba3663ddf2e4fe0ce336f9c262fa886192368ada3f0 SHA512 a1683ca986d006bcce8388d3ee5e8daf699f92c6dac9714a4cce1fdd8ea3a4f745b231e0576bed08eece04acf96872257a8e2890b0a3acefb5cf2657f3223792
 AUX libvirt-5.2.0-fix-paths-for-apparmor.patch 4372 BLAKE2B ac8c78097b8125932fd89756ca7332665e2080afc5de37e0a31d6f2a84e15f21e01d41b39c7781c26cf514c74a215623c0013e67cffe7543892d5b13d3022642 SHA512 391e78a2ea113c38afb07b9f0c7638748e5bc04fb88ea96be7ff439624c429ff0106024674546b01e750d8b1e1418d13040bc8462653eb8567651378b66d53a5
 AUX libvirt-5.2.0-md-clear.patch 1268 BLAKE2B f2609a957025a59a1c5daf0faf408fdcc3c77eebb6dc315cd9ba3d6e8dc441ea6f8124ea3903ef030afe5faea0839bbf118ab22b48a424b3895a7e4b451d797f SHA512 3413ba74f841ecafdbca76496f367d85fe8ac31d637099a0c875a2ea0cab90d277a26918f7a2ffd37fd726cc1ef317a27fbdf2a73a411eb259b26a0fae0f8fd7
+AUX libvirt-5.6.0-do-not-use-sysconf.patch 6243 BLAKE2B 9cd8e5654f980369310e381cf6867776afadf4a8e4466b18f89b9698923c558de88ca05dfc007d52b621a35ef81fc0ffdf673a48246bd7d062d9f90fdd1e0ebd SHA512 7347e8aaacdcb01d9982b2d9e6579e89597ebbb497bd0f78d1169fd688e045789432151c1e60eb1ff9ed7eb85304c229d8193cf77e6cab525ca093814ad15493
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r3 5530 BLAKE2B 5de3e8577ded1401f6dca551c6098418e596287d43b1b90e133859bb9b74dff20b8518bc09853ccff7141e6baa52fc12c9b8d3e8f60b868b72b1993254fac5d9 SHA512 7aa4eac8c293c3063d9435a4ad1ea855f9fdd84eb0ed8cbf0779935f152aab380e2ee7eb9129b2f07147bfa4dd1eae4b836ccae295c35b63dbc767208dd11b0c
 AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
@@ -17,9 +18,9 @@ AUX virtlogd.init-r1 562 BLAKE2B 52b0dce0d3dd856d6cbffbe37e721d8f053d53a4802ce3a
 DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
 DIST libvirt-5.4.0.tar.xz 12346896 BLAKE2B 28efa8ddc1b3262cf195bb114d3fad8307e7b4b4578a8dca05c03e36c85c7bffb4a4f6c73f89d156fc5b046f8ff7f27950dc5cadfd944e9f3c1b854ad03f328c SHA512 03fa932d041d147cab79eab200bb33f8db72579be72ec7cbff3305f4a8d574835a80f1b99936eddf67f83d21cc5567f45c86e555209de6cd702f43f91197cfd0
 DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe SHA512 47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
-EBUILD libvirt-5.2.0-r2.ebuild 9781 BLAKE2B 0765e5f6de150cb2fbd9366c4178785219a869bb2f48f212e216cfdefb79a84465302d5a3a5ae7b9825d046cdc70a72c808d0b9914cd2458632332b0919e532d SHA512 b8345ace2a7828bb0e29e64e21edd6618ea96c3faa350209a8ebb37dc0093103c0e8d598a40cc9327a0c8714fea257fea1a5fd2442882ee4fef51744ed3a94ac
-EBUILD libvirt-5.2.0-r3.ebuild 9774 BLAKE2B 099ab0dc39f879dc43d94eb82b093d1d41278b3781024dc1e9460adba80aaf444dbabee8b8f786dbb5ff584a6dd82c6d0ca8d775558e10084c70c2b45c6d4a81 SHA512 7900b0475f7efd1d333d5374d95af90ad8815ef29af93cbf0413b28193a877421e1f5be4b8adb3fdfd2485903d576590a59eddf31f829317844ec24ce54a6882
-EBUILD libvirt-5.4.0-r1.ebuild 9760 BLAKE2B 5763c8387ce0e146db256dd188c48d53f66798e7db48242000337c02b57956e43d8e48fedca3dca67cd0075f8b480b846a95be7146ea97fb2752b03b70341b82 SHA512 5158436ddebbb408d7bb654824cc23345f2e61db162ce1111703909916cd397d78ca3f559dc116dfc3230bb77ae6952b130cbd8966c3bd62c61651830d93bd3b
-EBUILD libvirt-5.5.0-r1.ebuild 9507 BLAKE2B 60e4418bc396243692528015ffbb0a17b0056cc64894e276c467f54f199f9c4beb9a8b6b0315253766dfa7f8fc3faa684ab7d83109ac001a55d62751e04e9443 SHA512 b8f2e594168c69f2bd5dff93680ffdccfb33b5e1803e3a6bcf126dff36630be99c93b3e023b6d2d5777591b28283cf62ae48ae2d12147aa2689c9bb3c41730e5
-EBUILD libvirt-9999.ebuild 9507 BLAKE2B 60e4418bc396243692528015ffbb0a17b0056cc64894e276c467f54f199f9c4beb9a8b6b0315253766dfa7f8fc3faa684ab7d83109ac001a55d62751e04e9443 SHA512 b8f2e594168c69f2bd5dff93680ffdccfb33b5e1803e3a6bcf126dff36630be99c93b3e023b6d2d5777591b28283cf62ae48ae2d12147aa2689c9bb3c41730e5
+EBUILD libvirt-5.2.0-r2.ebuild 9710 BLAKE2B 59dcadcec2d92b8fdd8fb446a1fe506d7f6de45e0f39681f88027f45851ceb2ed9cddaf8f91cf2987601ba5052298d4f3c99d9a6c32e0eef47f0396752529653 SHA512 bf82f0b5e96e32626359a9bbbe6c4e42efa3aebdeb172c221e90fccb6029c947628c6f5d2ef9c89a49cb9d4dd1c1122804e2620ae1151f298ddf507c8f416b2f
+EBUILD libvirt-5.2.0-r3.ebuild 9703 BLAKE2B 2cbfa258df2d127470363b0c937279d0e8656a98fd1e0336a925148bc6880e7c307c3197ec54d6434ef7ef4db4fb004f4ae60d9ead3f9e6a87608a205858b7a1 SHA512 f1d5beea5b2b8b8c4c3f13b12639b01ae5fa868b7000a1d3eadab281a629de5e1a0d6e93d67b6b069df1ff4b2dd5adc197fc6cc1478e2dcf0648ad2692c906d1
+EBUILD libvirt-5.4.0-r1.ebuild 9689 BLAKE2B cb5f766044f8f4f121b94b0e158e32f3f752dd289b530f952938af4ac30f20f2f5ff5fb9ad19ca6266c8b95e6e9fc0aace3924fe680cc63c6cb8b8d0affd5161 SHA512 61307374bda45ca289d67104c8fa8fa83cb61f7b474e061f35d5a8ace885df5aa714bc1d845126236d135ac9ded595a97d103df9a0900d5d019ac0cbed9860e9
+EBUILD libvirt-5.5.0-r1.ebuild 9436 BLAKE2B 32bae6b9dc86e313d212e22b7f8fc819e25dfc20779ba27cf39580bbd59e508ac10b71dfa5acfb21da5ba2b83c02141641c0f14c9bdcfafab276ae62d484a8cc SHA512 d9438688e78e1c953e8bf01421ee2f62f5ee3f88963047117f91ee3c3db44e80a27ceffec6707113f7d0ad58849c5cdcf784b6337c0dcb7707c357fc28054eba
+EBUILD libvirt-9999.ebuild 9436 BLAKE2B ae606e8e0e0bc6e50562fb59e1e47776705710c6c4437cbc21ab894370ad3e5711d950c2ce851b5ba971f25b3e6cd8c661fac43d2724836e31dd23a0d3957356 SHA512 57f1c051503855743df472eeb250bc5e9de221bbd47235605000040f71db2a7d15068b551fc94fdf107a6861a34886e12a4dddff94e7de7a5726cc2e7b1ba2a9
 MISC metadata.xml 3858 BLAKE2B 7f1d686cbc66544ff5ab20db52cd8a77ebb92adb0c4d01c44012c720da2c3de8aa8a2ba0f125ab90e5994f7264a3cea619cb2eb6e56338645f1ba5debd9c4585 SHA512 e97d6beba9f2f6beed28c50d06b34508a841b3e916ebfd535350e2f0c22fed40098891b4d23f041f5935ca51f671f02d3488d9d0c675e2c98640a03ae30ddf88
diff --git a/app-emulation/libvirt/files/README.gentoo-r2 b/app-emulation/libvirt/files/README.gentoo-r2
index 1c086c1eb5e9..6d6fb18ed3c8 100644
--- a/app-emulation/libvirt/files/README.gentoo-r2
+++ b/app-emulation/libvirt/files/README.gentoo-r2
@@ -53,6 +53,6 @@ must change the unix sock group and/or perms in /etc/libvirt/libvirtd.conf
 in order to allow normal users to connect to libvirtd.
 
 
-If libvirtd is built with USE=caps, libvirt will now start qemu/kvm VMs
+If libvirt is built with USE=caps, libvirt will now start qemu/kvm VMs
 with non-root privileges. Ensure any resources your VMs use are accessible
 by qemu:qemu.
diff --git a/app-emulation/libvirt/files/libvirt-5.6.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.6.0-do-not-use-sysconf.patch
new file mode 100644
index 000000000000..b847392cc13d
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-5.6.0-do-not-use-sysconf.patch
@@ -0,0 +1,174 @@
+From 8b27863cd4bd4eebefe6f39b42c181d073b457ff Mon Sep 17 00:00:00 2001
+Message-Id: <8b27863cd4bd4eebefe6f39b42c181d073b457ff.1564650738.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Sat, 16 Mar 2019 12:33:00 +0100
+Subject: [PATCH] gentoo: do not use sysconf
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/Makefile.am                  | 21 ++-------------------
+ src/locking/virtlockd.service.in |  3 +--
+ src/logging/virtlogd.service.in  |  3 +--
+ src/remote/libvirtd.service.in   |  3 +--
+ tools/Makefile.am                | 13 ++-----------
+ tools/libvirt-guests.service.in  |  2 +-
+ tools/libvirt-guests.sysconf     |  7 +++++++
+ 7 files changed, 15 insertions(+), 37 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4a8cae11dc..6c93435066 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -750,23 +750,6 @@ endif WITH_SETUID_RPC_CLIENT
+ 
+ EXTRA_DIST += $(SYSCONF_FILES)
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
+-	      $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-
+-uninstall-sysconfig:
+-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
+-	do \
+-	  tgt=`basename $$f`; \
+-	  rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+-	done
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+-
+ LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
+ 
+ EXTRA_DIST += $(LOGROTATE_FILES_IN)
+@@ -825,14 +808,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
+ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
+ DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
+ 
+-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
++install-systemd: $(SYSTEMD_UNIT_FILES)
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	for f in $(SYSTEMD_UNIT_FILES); \
+ 	do \
+ 	  $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
+ 	done
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
+ 
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 3c9d587032..2449b201d9 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlockd
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
++ExecStart=@sbindir@/virtlockd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the locks is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index 3d9ae36150..43736191d5 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlogd
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
++ExecStart=@sbindir@/virtlogd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the logs is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
+index 3ddf0e229b..a38f2b08fa 100644
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -20,12 +20,11 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Type=notify
+-EnvironmentFile=-/etc/sysconfig/libvirtd
+ # libvirtd.service is set to run on boot so that autostart of
+ # VMs can be performed. We don't want it to stick around if
+ # unused though, so we set a timeout. The socket activation
+ # then ensures it gets started again if anything needs it
+-ExecStart=@sbindir@/libvirtd --timeout 120 $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd --timeout 120
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 2807b9f6fd..cde5dba193 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -334,15 +334,6 @@ install-data-local: install-systemd install-nss \
+ uninstall-local: uninstall-systemd uninstall-nss \
+ 	uninstall-bash-completion
+ 
+-install-sysconfig:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-	$(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
+-	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-
+-uninstall-sysconfig:
+-	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
+-
+ EXTRA_DIST += libvirt-guests.sh.in
+ 
+ libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
+@@ -362,12 +353,12 @@ EXTRA_DIST += libvirt-guests.service.in
+ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+ 
+ if LIBVIRT_INIT_SCRIPT_SYSTEMD
+-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
++install-systemd: libvirt-guests.service libvirt-guests.sh
+ 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+ 	$(INSTALL_DATA) libvirt-guests.service \
+ 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 
+-uninstall-systemd: uninstall-sysconfig
++uninstall-systemd:
+ 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
+ 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
+ 
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index 491ca62138..f0f417bffb 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
+index 669b046507..45b0b9ea46 100644
+--- a/tools/libvirt-guests.sysconf
++++ b/tools/libvirt-guests.sysconf
+@@ -1,3 +1,10 @@
++#
++# Warning: This configuration file is only sourced by the systemd
++# libvirt-guests.service unit. The coresponding openrc facility is in
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
++#
++
++
+ # URIs to check for running guests
+ # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
+ #URIS=default
+-- 
+2.21.0
+
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index ce11748ab116..69d15a2c4477 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -127,13 +129,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild
index 6eaa333934d9..8709e69b6fde 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -127,13 +129,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild
index 796ca2632a99..ea698db7c73b 100644
--- a/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.4.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -127,13 +129,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index 5cb42f7609c9..5c4936718f6b 100644
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -126,13 +128,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 5cb42f7609c9..f12c9732aa31 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd user
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -47,6 +47,8 @@ REQUIRED_USE="
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
 	app-misc/scrub
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
@@ -120,19 +122,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-5.6.0-do-not-use-sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
 )
 
 pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 2d6d23dff526..833f913e037f 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -7,5 +7,5 @@ AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d4
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
 EBUILD qemu-guest-agent-3.1.0.ebuild 1721 BLAKE2B e5431c5fe7028db73468c19f209a631d3737a2591142820bc6407d73fd5ee35ff107b9f1e8083c05756aeab325fa3526070177bc61e790d400ec2a9b1b5fa714 SHA512 d1d75d7c7fd0bd84d675ae83d723dc8c1dd0932a9c9b950218486eb82065744a9958262de051df9f29ecd346f5979a870acb0d0c04f7b0407da1ed77021550e2
-EBUILD qemu-guest-agent-4.0.0.ebuild 1723 BLAKE2B beda766ae8a9939a756a601e4ffd5e3554e3163b841cad64d1290a2a433c820f105fccc5ae055ed03382c32e9ee3ac86b834186fd2d6c80df61f6f1880cb3061 SHA512 2b378c0c08457596729f71aa10415c6aef444c341aabecac594042ec42aa6113a2eb17379467dda2681219317ff28b9142e85bc84479163ffa247ec71c91fe9e
+EBUILD qemu-guest-agent-4.0.0.ebuild 1721 BLAKE2B e5431c5fe7028db73468c19f209a631d3737a2591142820bc6407d73fd5ee35ff107b9f1e8083c05756aeab325fa3526070177bc61e790d400ec2a9b1b5fa714 SHA512 d1d75d7c7fd0bd84d675ae83d723dc8c1dd0932a9c9b950218486eb82065744a9958262de051df9f29ecd346f5979a870acb0d0c04f7b0407da1ed77021550e2
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
index 078447e6d187..00cdc52433d6 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
 
 SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 
 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
 HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 73721e187c5d..475d341072c3 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -5,11 +5,14 @@ AUX qemu-2.5.0-cflags.patch 410 BLAKE2B 1d072b5dd00369bb565b30c2aa7047de92b441bf
 AUX qemu-2.5.0-sysmacros.patch 333 BLAKE2B 8c38410c6ea789f669d89c7321cdc9e5c734bb3db332272657302977241f157b04fb07e27bda4f67ee560e39a7494344ad79616835e6ff483927f2b72ed9c597 SHA512 329632c5bff846ca3ffcdb4bc94ae62f17c6bdbb566f9bec0784357c943523e8ca7773790b83a9617734cab3b003baa3d636cbd08f7385810a63b0fa0383c4f0
 AUX qemu-3.1.0-md-clear-md-no.patch 2690 BLAKE2B fcf6b7599985da60dcdf873e27c832075cd9c766d10ab3784c0f935965276b8c520005a62fc884a35c78942ce225bbd9a67083ef058e03f1a7c0963b816ae7b4 SHA512 bb452d110353bae4878ec030ef5f2f05c73294cbe08e8fc18267f23f922117e7e295302ac65df8008b5db3ff72bcff2e3eefd2da8b9a53868daea321d10958c1
 AUX qemu-4.0.0-fix_infiniband_include.patch 338 BLAKE2B 9c85e27ca7e99d5600247ce788edcf30b74650012c06f3b68ec395f55ca7cdfac7f24679077b06ff7ba37fc1b0a8fce281838709cfae9d20c9ee89d9dbd68da9 SHA512 c8cebaa40ca46f2a78131d4ea1951304cc39b39c3d9ec37f4be41906ce6dee303f5b21e66e6716ac4ad20ed4bf3dc06709e7db95113f2c7abd0036e0e0cc722d
+AUX qemu-4.0.0-linux-headers-5.2.patch 11360 BLAKE2B 6299f25424044df02e892f10d735e07af35de7ec2b4a15bcf57ec03db8956406bfe690d57f2265b5ae5c63902e4ac77614c11286ec5461e7a6da3d7237030557 SHA512 2da8020655e8b4d269cdbeaa2134cbbaee85efe30d5b7ef1180f5e74a5b8141211c781be3a229ae475fb9e9b5b1022c378768c73a5acbf42993eaa6f93fe370d
 AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a81d1de7705f3b856656ec71cc0a2a29626e94918b3cc23b32e47c8073b77b62b498e71c3e956549e25ee5f4da1a8ac9cf SHA512 de48a7d663bd78051ed8a1f62d8b0b8e3bfe58d8a0001daf12518dbd087be3154e766be11c607485e7dd851b08d5675c4fb2a2fe5cf18f3b900164a4d93eab10
+AUX qemu-4.0.0-pc-q35-4.0.patch 5020 BLAKE2B ec3ad8fbf9ee1ce54109a81e913b97daebf347b2fc2217585e68741c3f77cae1272d7b721b59d7595b51d99eadbe7e26c47bcd46c96361a7f0df345fe5d6bcfb SHA512 3621525724a587f9aa1899b7b5c2130c27fca1b9a0e907e3fe1927a79a5d59f7597491538d6079822c52dd7bed41dd3cf6233a1be8472f3ed487e43447a74c7d
 AUX qemu-4.0.0-sanitize-interp_info.patch 930 BLAKE2B d555dedc493cfa1cf888cfa7ce2a4a7811f3fd12615fa5177f82c421ddd82c2d7ffcf2e5c28ca383aac1fff35d03cae6b4b6c5129c694d9b3986819aa1e12962 SHA512 7783acf1172c4fd935c2b8f5bd76e97cea6bbb3ee33a21b23a17f23933f6053b3a933f378c6eae184c2362cb090b6b2c1966f79f1f130cf7344205ef3df0178d
 AUX qemu-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-r3.ebuild 23888 BLAKE2B 7fab4d70b537066924393744bace5041fb4367aa33374ac7bdab518a7f1604bde19c2231590e26221522dd99dca562e2203565832432825f1e4a3e19a571f4e6 SHA512 d941e187e5e5dbc5d885a2ccd6247c249583c12947615cab6f33e3aaa95bbd8d1eb93e5c608d5ad6efbeffa85d4a353010e4e1a917d9dc4ab1838d4fecb734f2
-EBUILD qemu-9999.ebuild 23795 BLAKE2B 936e3f5658304f3243aeda62640be6543a595cc9296c2adbcaf130d1e68dde041c3b795c7a34a5dc7cdbef545c6016693ef997fe3fdabf02df779418c3b54983 SHA512 8aa3054a37afd58f83c989fe964f526088617482f3ec9e66277f903aa36aedd0bb70c07fb815a62cb2890a9dcf3f02cab734ed8e88450907075cc3f3c848f534
+EBUILD qemu-4.0.0-r3.ebuild 23864 BLAKE2B 4d6b6a1054dc73db598b02f27105c59433b44e6d3a32d760da1c21a9374ce68bf05c91c4e1336d358184d361f40bbabb06cff406f88d1156c93adea6a2d721b0 SHA512 c917b48680e15c63a0348fb0e9fe08cd745988eec26d420090f1d2fe4b6bf9661446ef883c5957621e5bc9a45092a16b564a4fbca599b47aa4520dfba27e3810
+EBUILD qemu-4.0.0-r4.ebuild 23961 BLAKE2B 12aeffaa05dde21aa3f88b960fe767932592d25e20417641f64fec702253c914840674d68b8b130ced3dfd58036470bda612ac71b0e9babfdf322c80102ebe44 SHA512 eca056421030717af36094c12def557382524cc1beda45c917f2954e72ba68eeae7a09a89f9762f920f27b65949eb02ab895b46410f4717a51fddffb0750ded0
+EBUILD qemu-9999.ebuild 23705 BLAKE2B 64a1b10fa978e1acd501ffd799685b5b53d8db298fc822223ea91c2f5fbf7c15219ec526a9939c7b51973f6f2dcf261435065a533a6f9d4ab7ebebc40d89f943 SHA512 e545da707433985c49a1d4e115008bf10cfd12a2aa021f8cf22af24afd2206fb1ec1b7d988aeab038ffec8d17708a97b2dbec697b1dcc60a6f8b8aa1e2d12677
 MISC metadata.xml 3903 BLAKE2B 47538d32d79321c208037c95184ab68dbbcaa2331a561142bbadc01fbc2b7973cc5ae76ac6dfa7faf1c3aa31d1d0b5dfd6a46211e94c17c5a8939b0ae99b227b SHA512 d501ede1f3182e635db02c8bac4381906ac47b8d6db4bb6b0fdeb91b35b440a2a59a5dd23b06462f1d49a6b64ae2f2bcf1f81fd0a898c8f4b67a40ccf2c58341
diff --git a/app-emulation/qemu/files/qemu-4.0.0-linux-headers-5.2.patch b/app-emulation/qemu/files/qemu-4.0.0-linux-headers-5.2.patch
new file mode 100644
index 000000000000..43be8629dfa8
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-4.0.0-linux-headers-5.2.patch
@@ -0,0 +1,334 @@
+From 6d5d5dde9adb5acb32e6b8e3dfbf47fff0f308d2 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Thu, 18 Jul 2019 15:06:41 +0200
+Subject: [PATCH] linux-user: fix to handle variably sized SIOCGSTAMP with new
+ kernels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+The SIOCGSTAMP symbol was previously defined in the
+asm-generic/sockios.h header file. QEMU sees that header
+indirectly via sys/socket.h
+
+In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115
+the asm-generic/sockios.h header no longer defines SIOCGSTAMP.
+Instead it provides only SIOCGSTAMP_OLD, which only uses a
+32-bit time_t on 32-bit architectures.
+
+The linux/sockios.h header then defines SIOCGSTAMP using
+either SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. If
+SIOCGSTAMP_NEW is used, then the tv_sec field is 64-bit even
+on 32-bit architectures
+
+To cope with this we must now convert the old and new type from
+the target to the host one.
+
+Signed-off-by: Daniel P. BerrangÃ© <berrange@redhat.com>
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+Message-Id: <20190718130641.15294-1-laurent@vivier.eu>
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+---
+ linux-user/ioctls.h        |  21 ++++++-
+ linux-user/syscall.c       | 140 ++++++++++++++++++++++++++++++++++++---------
+ linux-user/syscall_defs.h  |  30 +++++++++-
+ linux-user/syscall_types.h |   6 --
+ 4 files changed, 159 insertions(+), 38 deletions(-)
+
+diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
+index ae895162..e6a27ad9 100644
+--- a/linux-user/ioctls.h
++++ b/linux-user/ioctls.h
+@@ -219,8 +219,25 @@
+   IOCTL(SIOCGRARP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_arpreq)))
+   IOCTL(SIOCGIWNAME, IOC_W | IOC_R, MK_PTR(MK_STRUCT(STRUCT_char_ifreq)))
+   IOCTL(SIOCGPGRP, IOC_R, MK_PTR(TYPE_INT)) /* pid_t */
+-  IOCTL(SIOCGSTAMP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timeval)))
+-  IOCTL(SIOCGSTAMPNS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timespec)))
++
++  /*
++   * We can't use IOCTL_SPECIAL() because it will set
++   * host_cmd to XXX_OLD and XXX_NEW and these macros
++   * are not defined with kernel prior to 5.2.
++   * We must set host_cmd to the same value as in target_cmd
++   * otherwise the consistency check in syscall_init()
++   * will trigger an error.
++   * host_cmd is ignored by the do_ioctl_XXX() helpers.
++   * FIXME: create a macro to define this kind of entry
++   */
++  { TARGET_SIOCGSTAMP_OLD, TARGET_SIOCGSTAMP_OLD,
++    "SIOCGSTAMP_OLD", IOC_R, do_ioctl_SIOCGSTAMP },
++  { TARGET_SIOCGSTAMPNS_OLD, TARGET_SIOCGSTAMPNS_OLD,
++    "SIOCGSTAMPNS_OLD", IOC_R, do_ioctl_SIOCGSTAMPNS },
++  { TARGET_SIOCGSTAMP_NEW, TARGET_SIOCGSTAMP_NEW,
++    "SIOCGSTAMP_NEW", IOC_R, do_ioctl_SIOCGSTAMP },
++  { TARGET_SIOCGSTAMPNS_NEW, TARGET_SIOCGSTAMPNS_NEW,
++    "SIOCGSTAMPNS_NEW", IOC_R, do_ioctl_SIOCGSTAMPNS },
+ 
+   IOCTL(RNDGETENTCNT, IOC_R, MK_PTR(TYPE_INT))
+   IOCTL(RNDADDTOENTCNT, IOC_W, MK_PTR(TYPE_INT))
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 96cd4bf8..6df480e1 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -37,6 +37,7 @@
+ #include <sched.h>
+ #include <sys/timex.h>
+ #include <sys/socket.h>
++#include <linux/sockios.h>
+ #include <sys/un.h>
+ #include <sys/uio.h>
+ #include <poll.h>
+@@ -1139,8 +1140,9 @@ static inline abi_long copy_from_user_timeval(struct timeval *tv,
+ {
+     struct target_timeval *target_tv;
+ 
+-    if (!lock_user_struct(VERIFY_READ, target_tv, target_tv_addr, 1))
++    if (!lock_user_struct(VERIFY_READ, target_tv, target_tv_addr, 1)) {
+         return -TARGET_EFAULT;
++    }
+ 
+     __get_user(tv->tv_sec, &target_tv->tv_sec);
+     __get_user(tv->tv_usec, &target_tv->tv_usec);
+@@ -1155,8 +1157,26 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr,
+ {
+     struct target_timeval *target_tv;
+ 
+-    if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0))
++    if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) {
++        return -TARGET_EFAULT;
++    }
++
++    __put_user(tv->tv_sec, &target_tv->tv_sec);
++    __put_user(tv->tv_usec, &target_tv->tv_usec);
++
++    unlock_user_struct(target_tv, target_tv_addr, 1);
++
++    return 0;
++}
++
++static inline abi_long copy_to_user_timeval64(abi_ulong target_tv_addr,
++                                             const struct timeval *tv)
++{
++    struct target__kernel_sock_timeval *target_tv;
++
++    if (!lock_user_struct(VERIFY_WRITE, target_tv, target_tv_addr, 0)) {
+         return -TARGET_EFAULT;
++    }
+ 
+     __put_user(tv->tv_sec, &target_tv->tv_sec);
+     __put_user(tv->tv_usec, &target_tv->tv_usec);
+@@ -1166,6 +1186,48 @@ static inline abi_long copy_to_user_timeval(abi_ulong target_tv_addr,
+     return 0;
+ }
+ 
++static inline abi_long target_to_host_timespec(struct timespec *host_ts,
++                                               abi_ulong target_addr)
++{
++    struct target_timespec *target_ts;
++
++    if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1)) {
++        return -TARGET_EFAULT;
++    }
++    __get_user(host_ts->tv_sec, &target_ts->tv_sec);
++    __get_user(host_ts->tv_nsec, &target_ts->tv_nsec);
++    unlock_user_struct(target_ts, target_addr, 0);
++    return 0;
++}
++
++static inline abi_long host_to_target_timespec(abi_ulong target_addr,
++                                               struct timespec *host_ts)
++{
++    struct target_timespec *target_ts;
++
++    if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) {
++        return -TARGET_EFAULT;
++    }
++    __put_user(host_ts->tv_sec, &target_ts->tv_sec);
++    __put_user(host_ts->tv_nsec, &target_ts->tv_nsec);
++    unlock_user_struct(target_ts, target_addr, 1);
++    return 0;
++}
++
++static inline abi_long host_to_target_timespec64(abi_ulong target_addr,
++                                                 struct timespec *host_ts)
++{
++    struct target__kernel_timespec *target_ts;
++
++    if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0)) {
++        return -TARGET_EFAULT;
++    }
++    __put_user(host_ts->tv_sec, &target_ts->tv_sec);
++    __put_user(host_ts->tv_nsec, &target_ts->tv_nsec);
++    unlock_user_struct(target_ts, target_addr, 1);
++    return 0;
++}
++
+ static inline abi_long copy_from_user_timezone(struct timezone *tz,
+                                                abi_ulong target_tz_addr)
+ {
+@@ -4790,6 +4852,54 @@ static abi_long do_ioctl_kdsigaccept(const IOCTLEntry *ie, uint8_t *buf_temp,
+     return get_errno(safe_ioctl(fd, ie->host_cmd, sig));
+ }
+ 
++static abi_long do_ioctl_SIOCGSTAMP(const IOCTLEntry *ie, uint8_t *buf_temp,
++                                    int fd, int cmd, abi_long arg)
++{
++    struct timeval tv;
++    abi_long ret;
++
++    ret = get_errno(safe_ioctl(fd, SIOCGSTAMP, &tv));
++    if (is_error(ret)) {
++        return ret;
++    }
++
++    if (cmd == (int)TARGET_SIOCGSTAMP_OLD) {
++        if (copy_to_user_timeval(arg, &tv)) {
++            return -TARGET_EFAULT;
++        }
++    } else {
++        if (copy_to_user_timeval64(arg, &tv)) {
++            return -TARGET_EFAULT;
++        }
++    }
++
++    return ret;
++}
++
++static abi_long do_ioctl_SIOCGSTAMPNS(const IOCTLEntry *ie, uint8_t *buf_temp,
++                                      int fd, int cmd, abi_long arg)
++{
++    struct timespec ts;
++    abi_long ret;
++
++    ret = get_errno(safe_ioctl(fd, SIOCGSTAMPNS, &ts));
++    if (is_error(ret)) {
++        return ret;
++    }
++
++    if (cmd == (int)TARGET_SIOCGSTAMPNS_OLD) {
++        if (host_to_target_timespec(arg, &ts)) {
++            return -TARGET_EFAULT;
++        }
++    } else{
++        if (host_to_target_timespec64(arg, &ts)) {
++            return -TARGET_EFAULT;
++        }
++    }
++
++    return ret;
++}
++
+ #ifdef TIOCGPTPEER
+ static abi_long do_ioctl_tiocgptpeer(const IOCTLEntry *ie, uint8_t *buf_temp,
+                                      int fd, int cmd, abi_long arg)
+@@ -6160,32 +6270,6 @@ static inline abi_long target_ftruncate64(void *cpu_env, abi_long arg1,
+ }
+ #endif
+ 
+-static inline abi_long target_to_host_timespec(struct timespec *host_ts,
+-                                               abi_ulong target_addr)
+-{
+-    struct target_timespec *target_ts;
+-
+-    if (!lock_user_struct(VERIFY_READ, target_ts, target_addr, 1))
+-        return -TARGET_EFAULT;
+-    __get_user(host_ts->tv_sec, &target_ts->tv_sec);
+-    __get_user(host_ts->tv_nsec, &target_ts->tv_nsec);
+-    unlock_user_struct(target_ts, target_addr, 0);
+-    return 0;
+-}
+-
+-static inline abi_long host_to_target_timespec(abi_ulong target_addr,
+-                                               struct timespec *host_ts)
+-{
+-    struct target_timespec *target_ts;
+-
+-    if (!lock_user_struct(VERIFY_WRITE, target_ts, target_addr, 0))
+-        return -TARGET_EFAULT;
+-    __put_user(host_ts->tv_sec, &target_ts->tv_sec);
+-    __put_user(host_ts->tv_nsec, &target_ts->tv_nsec);
+-    unlock_user_struct(target_ts, target_addr, 1);
+-    return 0;
+-}
+-
+ static inline abi_long target_to_host_itimerspec(struct itimerspec *host_itspec,
+                                                  abi_ulong target_addr)
+ {
+diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
+index 12c84071..cfb3eeec 100644
+--- a/linux-user/syscall_defs.h
++++ b/linux-user/syscall_defs.h
+@@ -208,16 +208,34 @@ struct target_linger {
+     abi_int l_linger;       /* How long to linger for       */
+ };
+ 
++#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32)
++struct target_timeval {
++    abi_long tv_sec;
++    abi_int tv_usec;
++};
++#define target__kernel_sock_timeval target_timeval
++#else
+ struct target_timeval {
+     abi_long tv_sec;
+     abi_long tv_usec;
+ };
+ 
++struct target__kernel_sock_timeval {
++    abi_llong tv_sec;
++    abi_llong tv_usec;
++};
++#endif
++
+ struct target_timespec {
+     abi_long tv_sec;
+     abi_long tv_nsec;
+ };
+ 
++struct target__kernel_timespec {
++    abi_llong tv_sec;
++    abi_llong tv_nsec;
++};
++
+ struct target_timezone {
+     abi_int tz_minuteswest;
+     abi_int tz_dsttime;
+@@ -743,8 +761,17 @@ struct target_pollfd {
+ #define TARGET_SIOCATMARK      0x8905
+ #define TARGET_SIOCGPGRP       0x8904
+ #endif
+-#define TARGET_SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
+-#define TARGET_SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
++
++#if defined(TARGET_SH4)
++#define TARGET_SIOCGSTAMP_OLD   TARGET_IOR('s', 100, struct target_timeval)
++#define TARGET_SIOCGSTAMPNS_OLD TARGET_IOR('s', 101, struct target_timespec)
++#else
++#define TARGET_SIOCGSTAMP_OLD   0x8906
++#define TARGET_SIOCGSTAMPNS_OLD 0x8907
++#endif
++
++#define TARGET_SIOCGSTAMP_NEW   TARGET_IOR(0x89, 0x06, abi_llong[2])
++#define TARGET_SIOCGSTAMPNS_NEW TARGET_IOR(0x89, 0x07, abi_llong[2])
+ 
+ /* Networking ioctls */
+ #define TARGET_SIOCADDRT       0x890B          /* add routing table entry */
+diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h
+index b98a23b0..4e369838 100644
+--- a/linux-user/syscall_types.h
++++ b/linux-user/syscall_types.h
+@@ -14,12 +14,6 @@ STRUCT(serial_icounter_struct,
+ STRUCT(sockaddr,
+        TYPE_SHORT, MK_ARRAY(TYPE_CHAR, 14))
+ 
+-STRUCT(timeval,
+-       MK_ARRAY(TYPE_LONG, 2))
+-
+-STRUCT(timespec,
+-       MK_ARRAY(TYPE_LONG, 2))
+-
+ STRUCT(rtentry,
+        TYPE_ULONG, MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr),
+        TYPE_SHORT, TYPE_SHORT, TYPE_ULONG, TYPE_PTRVOID, TYPE_SHORT, TYPE_PTRVOID,
diff --git a/app-emulation/qemu/files/qemu-4.0.0-pc-q35-4.0.patch b/app-emulation/qemu/files/qemu-4.0.0-pc-q35-4.0.patch
new file mode 100644
index 000000000000..ebabc0c4c294
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-4.0.0-pc-q35-4.0.patch
@@ -0,0 +1,135 @@
+Backport of QEMU v4.1 commit for stable v4.0.1 release
+
+commit c87759ce876a7a0b17c2bf4f0b964bd51f0ee871
+Author: Alex Williamson <address@hidden>
+Date:   Tue May 14 14:14:41 2019 -0600
+
+    q35: Revert to kernel irqchip
+
+    Commit b2fc91db8447 ("q35: set split kernel irqchip as default") changed
+    the default for the pc-q35-4.0 machine type to use split irqchip, which
+    turned out to have disasterous effects on vfio-pci INTx support.  KVM
+    resampling irqfds are registered for handling these interrupts, but
+    these are non-functional in split irqchip mode.  We can't simply test
+    for split irqchip in QEMU as userspace handling of this interrupt is a
+    significant performance regression versus KVM handling (GeForce GPUs
+    assigned to Windows VMs are non-functional without forcing MSI mode or
+    re-enabling kernel irqchip).
+
+    The resolution is to revert the change in default irqchip mode in the
+    pc-q35-4.1 machine and create a pc-q35-4.0.1 machine for the 4.0-stable
+    branch.  The qemu-q35-4.0 machine type should not be used in vfio-pci
+    configurations for devices requiring legacy INTx support without
+    explicitly modifying the VM configuration to use kernel irqchip.
+
+Link: https://bugs.launchpad.net/qemu/+bug/1826422
+Fixes: b2fc91db8447 ("q35: set split kernel irqchip as default")
+Cc: address@hidden
+Reviewed-by: Peter Xu <address@hidden>
+Signed-off-by: Alex Williamson <address@hidden>
+---
+
+Same code as v1, just updating the commit log as a formal backport of
+the merged 4.1 commit.
+
+ hw/core/machine.c    |    3 +++
+ hw/i386/pc.c         |    3 +++
+ hw/i386/pc_q35.c     |   16 ++++++++++++++--
+ include/hw/boards.h  |    3 +++
+ include/hw/i386/pc.h |    3 +++
+ 5 files changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/hw/core/machine.c b/hw/core/machine.c
+index 743fef28982c..5d046a43e3d2 100644
+--- a/hw/core/machine.c
++++ b/hw/core/machine.c
+@@ -24,6 +24,9 @@
+ #include "hw/pci/pci.h"
+ #include "hw/mem/nvdimm.h"
+ 
++GlobalProperty hw_compat_4_0[] = {};
++const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
++
+ GlobalProperty hw_compat_3_1[] = {
+     { "pcie-root-port", "x-speed", "2_5" },
+     { "pcie-root-port", "x-width", "1" },
+diff --git a/hw/i386/pc.c b/hw/i386/pc.c
+index f2c15bf1f2c3..d98b737b8f3b 100644
+--- a/hw/i386/pc.c
++++ b/hw/i386/pc.c
+@@ -115,6 +115,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
+ /* Physical Address of PVH entry point read from kernel ELF NOTE */
+ static size_t pvh_start_addr;
+ 
++GlobalProperty pc_compat_4_0[] = {};
++const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
++
+ GlobalProperty pc_compat_3_1[] = {
+     { "intel-iommu", "dma-drain", "off" },
+     { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
+diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
+index 372c6b73bebd..45cc29d1adb7 100644
+--- a/hw/i386/pc_q35.c
++++ b/hw/i386/pc_q35.c
+@@ -357,7 +357,7 @@ static void pc_q35_machine_options(MachineClass *m)
+     m->units_per_default_bus = 1;
+     m->default_machine_opts = "firmware=bios-256k.bin";
+     m->default_display = "std";
+-    m->default_kernel_irqchip_split = true;
++    m->default_kernel_irqchip_split = false;
+     m->no_floppy = 1;
+     machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
+     machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
+@@ -365,12 +365,24 @@ static void pc_q35_machine_options(MachineClass *m)
+     m->max_cpus = 288;
+ }
+ 
+-static void pc_q35_4_0_machine_options(MachineClass *m)
++static void pc_q35_4_0_1_machine_options(MachineClass *m)
+ {
+     pc_q35_machine_options(m);
+     m->alias = "q35";
+ }
+ 
++DEFINE_Q35_MACHINE(v4_0_1, "pc-q35-4.0.1", NULL,
++                   pc_q35_4_0_1_machine_options);
++
++static void pc_q35_4_0_machine_options(MachineClass *m)
++{
++    pc_q35_4_0_1_machine_options(m);
++    m->default_kernel_irqchip_split = true;
++    m->alias = NULL;
++    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
++    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
++}
++
+ DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
+                    pc_q35_4_0_machine_options);
+ 
+diff --git a/include/hw/boards.h b/include/hw/boards.h
+index e231860666a1..fe1885cbffa0 100644
+--- a/include/hw/boards.h
++++ b/include/hw/boards.h
+@@ -293,6 +293,9 @@ struct MachineState {
+     } \
+     type_init(machine_initfn##_register_types)
+ 
++extern GlobalProperty hw_compat_4_0[];
++extern const size_t hw_compat_4_0_len;
++
+ extern GlobalProperty hw_compat_3_1[];
+ extern const size_t hw_compat_3_1_len;
+ 
+diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
+index ca65ef18afb4..43df7230a22b 100644
+--- a/include/hw/i386/pc.h
++++ b/include/hw/i386/pc.h
+@@ -293,6 +293,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
+ int e820_get_num_entries(void);
+ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
+ 
++extern GlobalProperty pc_compat_4_0[];
++extern const size_t pc_compat_4_0_len;
++
+ extern GlobalProperty pc_compat_3_1[];
+ extern const size_t pc_compat_3_1_len;
diff --git a/app-emulation/qemu/qemu-4.0.0-r3.ebuild b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
index 49fcec6ba3fe..120a36c5685e 100644
--- a/app-emulation/qemu/qemu-4.0.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
@@ -11,7 +11,7 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 FIRMWARE_ABI_VERSION="2.11.1-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
@@ -197,6 +197,7 @@ DEPEND="${CDEPEND}
 	)
 	static-user? ( ${ALL_DEPEND} )"
 RDEPEND="${CDEPEND}
+	acct-group/kvm
 	selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
@@ -310,10 +311,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup kvm 78
-}
-
 # Sanity check to make sure target lists are kept up-to-date.
 check_targets() {
 	local var=$1 mak=$2
diff --git a/app-emulation/qemu/qemu-4.0.0-r4.ebuild b/app-emulation/qemu/qemu-4.0.0-r4.ebuild
new file mode 100644
index 000000000000..81c3c2357646
--- /dev/null
+++ b/app-emulation/qemu/qemu-4.0.0-r4.ebuild
@@ -0,0 +1,810 @@
+# 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="2.11.1-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"
+	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 +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
+	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
+
+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(+)]
+	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 )
+	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/libssh2-1.2.8[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-2017_p20180211[binary]
+		~sys-firmware/ipxe-1.0.0_p20180211[binary]
+		~sys-firmware/seabios-1.11.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.11.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}"/${P}-sanitize-interp_info.patch
+	"${FILESDIR}"/${PN}-3.1.0-md-clear-md-no.patch
+	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+	"${FILESDIR}"/${PN}-4.0.0-fix_infiniband_include.patch #686412
+	"${FILESDIR}"/${PN}-4.0.0-linux-headers-5.2.patch
+	"${FILESDIR}"/${PN}-4.0.0-pc-q35-4.0.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
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# 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
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--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 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 libssh2)
+		$(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)
+	)
+
+	if [[ ${buildtype} == "user" ]] ; then
+		conf_opts+=( --disable-libxml2 )
+	else
+		conf_opts+=( --enable-libxml2 )
+	fi
+
+	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}"
+		conf_opts+=(
+			--audio-drv-list="${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
+
+	[[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin /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 8d1410fd8d2d..33d12d84c6eb 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -11,7 +11,7 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 FIRMWARE_ABI_VERSION="2.11.1-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
@@ -137,7 +137,7 @@ SOFTMMU_TOOLS_DEPEND="
 		>=app-emulation/spice-protocol-0.12.3
 		>=app-emulation/spice-0.12.0[static-libs(+)]
 	)
-	ssh? ( >=net-libs/libssh2-1.2.8[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(+)] )
@@ -197,6 +197,7 @@ DEPEND="${CDEPEND}
 	)
 	static-user? ( ${ALL_DEPEND} )"
 RDEPEND="${CDEPEND}
+	acct-group/kvm
 	selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
@@ -204,7 +205,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
 	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
-	"${FILESDIR}"/${PN}-4.0.0-fix_infiniband_include.patch #686412
 )
 
 QA_PREBUILT="
@@ -308,10 +308,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup kvm 78
-}
-
 # Sanity check to make sure target lists are kept up-to-date.
 check_targets() {
 	local var=$1 mak=$2
@@ -450,7 +446,7 @@ qemu_src_configure() {
 		$(conf_notuser smartcard)
 		$(conf_notuser snappy)
 		$(conf_notuser spice)
-		$(conf_notuser ssh libssh2)
+		$(conf_notuser ssh libssh)
 		$(conf_notuser usb libusb)
 		$(conf_notuser usbredir usb-redir)
 		$(conf_notuser vde)
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index f390f65d2107..e870352bc8ba 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -6,6 +6,7 @@ DIST skopeo-0.1.32.tar.gz 4366298 BLAKE2B b358cb197475d693fa47cdfda738a78f70c9f5
 DIST skopeo-0.1.34.tar.gz 2859957 BLAKE2B f36062374b2afa7363a02d6410bd35bbf5ccd0599eea7eb6d68b769e9fbf492dc7843dbd184fccc742250fcd3e573e33bd5454971730bcec2151a52a32b81680 SHA512 3ba99fcbff9f46fa1a4226bfc54961cf640150e0e0ac6b3457e862ef94991fa05a7bd609cbf8c87a0424df6942653fb5492a3893fa5282242c4df6913c4312a2
 DIST skopeo-0.1.35.tar.gz 2723348 BLAKE2B 74a98e43ff2b32ea29b9e57ea6ba20323660b631f4a7541aa1c720e283286809c501d655af18aa794123b3af727ca54bb41686a6b0d79b33c8f82f8642cc6176 SHA512 ec5aeb596aaf51512c049dc55353ce2d076ac30ae0fc3f9e90b8a8a9fb07ec86aafe51111d38e2d34ea5193c0a6f9e74a69536bf5b759fdedfa0c97deb211894
 DIST skopeo-0.1.36.tar.gz 2754977 BLAKE2B 4a25bf092b45084d252f8cf0c50f2389210e06bb8ee4f2939cfc93e1e66764ee340d77ca7ff0e731b55dfc42c48bc69b567e6d43d10da1119f5eeeae34aba291 SHA512 2ee51017a8d768c2a7b264f4c50d4a29d8b99e30049277bca5a5d47ff0ff09bb1c92c54f7f5230d966976b41353f7c8ffb9aa5571da2471f526ec8476cb127b2
+DIST skopeo-0.1.37.tar.gz 2766509 BLAKE2B 59e3f4cf37694b4ae59fe4eca6afd8abe4f7ab1aec3c0cee409be6f0f648fd2929092ee9b5a2b167c5041202dac908cd39f693d8ae8eebf621be47f302bd885c SHA512 e2de3c65f864572fe74ca55ee107703a49855f0da71c440784b06d13ed724456cf7bf30e18a5cb15cf2e136edc688b56321cf7838a2cc66f39c4ea9d9686441e
 EBUILD skopeo-0.1.22.ebuild 1341 BLAKE2B 7ad0f306ac63766a536809f9b895bd8a2a677c152f9806b593355cef618efd6aef8b1e2c8f70f979eeb1f99a8ba365b440dc9252f80cbbf0d4e882cef1840fba SHA512 84e7d05d76f896ef62021a80c093df74a575ccf2c79cab2f80e47b01e4d9ee4f60ee4713738d887579eb617a5e95d68a017c026d899c0a4d2d40b9ee5752a0e4
 EBUILD skopeo-0.1.30.ebuild 1292 BLAKE2B 554710ddbd65d0b3930ac4a0e23ce8cd2336cbc640a04e73afd885bfab1e5c84004b3e27e45ba86b19c40907cc4e28f37806cf6cef5c0e863d47da5a849cc3ea SHA512 708996e9c9bd91b474e6b443874d34c5c5752a64835ec7b279ae0c442ccbe28820bb003a1ab90fae8e23a9b8c534250c7f77f8574eef910dd8a64f5fe2449dec
 EBUILD skopeo-0.1.31.ebuild 1292 BLAKE2B 29f2228680d49b433e5376d230fe55e751d680ec24b9fd5755ba71cf635b2e8e416aef85ef0541e5e691f3ccdde5576bb43e9b7c8835aff8d2ffebc3298d83bb SHA512 11782377ce6d4263dc678e141f4b8ab96e0702e0f6b893ce41ad46f09fbcf837a20066622bd51e6640df3c5a72dd226f7879dacaf660b47d1e4d45771dde27e6
@@ -13,4 +14,5 @@ EBUILD skopeo-0.1.32.ebuild 1280 BLAKE2B 7280ea0f0f7a3040fd2cf42563f7dd8a47d508b
 EBUILD skopeo-0.1.34.ebuild 1335 BLAKE2B c18ebeb72018d0b37f6c1923c4867b528b05465d521e60b23531ba17b233ff17f26e0e7c0d57f9b912655d9bf13be46f875386e523c1b212b11edfcee95e5ed3 SHA512 4da6b6e6288e8f33b321670a363efe482199bc3c953410cfd0c82f386256ce60d9e3e90b5bea570036a257fbc4789e8a8975b1cb438ea31a43e175071bb3d356
 EBUILD skopeo-0.1.35.ebuild 1364 BLAKE2B e6be11dd4ec26eb3015a36daa38eade6aacf12ddbeb315485f8baa094b73348fa734f7b34999f5eb9d74e58169f130e09ded8feb19ee5be463924b6f632f5dfc SHA512 03e52ecb0d6f4769f05fcada7e3aa85bb98c973420cd7c235a9dd8d6d430e7c3ba1c0a4c8b2dbae797d36fada397c302d4689000ab7292fc18fd93af435327a5
 EBUILD skopeo-0.1.36.ebuild 1393 BLAKE2B 191aabe1ba3529bfdfc05d226cd55d2ecc624e8bd8b0d3f65144f68eb4fab4c23f5a482093ccfa1c37ed2c0a75f12db5819b2b0691902ddc3a47434a8bde86f4 SHA512 75ace3514d8ad5cc46f7f378b6a4cdb27494810022d04aa2132da9b5466333d7effd7daf8e9749b05ae6c335e57e49b2415b1dcedeeac564c85650d4eeb87183
+EBUILD skopeo-0.1.37.ebuild 1393 BLAKE2B 0053a48cf9c1f528756796d0ee32c1ad1a1f8e66321da6bfcab723cabc442457d1219cbabd374aa7f7456682fc4ce061ea4a4f9df804152e45f6aa5b50fd7b01 SHA512 720be9abb702fc76e9345c352bfb08f04d789e4347a3343385c23bdd33a0b37844949f0625aa52a1e324127fb7e1dcc82f53cfeee4722eb99a256dc02c533a63
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.37.ebuild b/app-emulation/skopeo/skopeo-0.1.37.ebuild
new file mode 100644
index 000000000000..a3641ef7199d
--- /dev/null
+++ b/app-emulation/skopeo/skopeo-0.1.37.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/containers/skopeo
+COMMIT=e079f9d
+inherit golang-vcs-snapshot bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
+	>=sys-fs/btrfs-progs-4.0.1
+	>=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+RESTRICT="test"
+
+src_compile() {
+	local BUILDTAGS="containers_image_ostree_stub"
+	set -- env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" \
+		go build -ldflags "-X main.gitCommit=${COMMIT}" \
+		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+		-o skopeo ./cmd/skopeo
+	echo "$@"
+	"$@" || die
+	cd docs || die
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin skopeo
+	doman docs/*.1
+	dobashcomp completions/bash/skopeo
+	insinto /etc/containers
+	newins default-policy.json policy.json
+	insinto /etc/containers/registries.d
+	doins default.yaml
+	keepdir /var/lib/atomic/sigstore
+	einstalldocs
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 6359c3ac962d..d5215c846722 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,3 +1,9 @@
 DIST slirp4netns-0.3.0.tar.gz 180149 BLAKE2B b7c552b5660f4be4a95d573ff51bbde1dec1daa7dd0d5a6c49b3d761743561e8211972d16e588519bce41eee0dd378837f7de3e4c7ccb37f13bfab21008ac640 SHA512 85eea233531123297efa5e7225cbda21c10ecb297fe13cd8bf75f8d18052bc8533c2db8ce6c1f7876f42b89e31ed2859eef33a3979cad95326d0c4b19f2871f1
+DIST slirp4netns-0.4.0_beta0.tar.gz 171557 BLAKE2B 0d4d26560807559e1783ab53086236235314b55503245474e34200be2a24541c7adfacfea7cfc91e97a5cf68a0c1c905db5ab4e38d91396e16e2bbed50f35c39 SHA512 5c6d3d55f39cb758f61cb408f5c2f05a7f31ba7d84c47dc3fadd7573122eef30eab643b79f16fdb76074b5ce485f22227390ad6055362d55d9e2352d7d490cc7
+DIST slirp4netns-0.4.0_beta1.tar.gz 171766 BLAKE2B 814151f588c431dce5e02b108051886dd1ba40027eb1b72280e7621529729bdeac8d6f4267a01b3a09f34df528aa42caef517fef5decd854fd20ece608bb3590 SHA512 459ccf75dc5a0e2d768f1553f5ce9f85a23fa7ffcbe3da57205290c2868cf0fb3fe148e59590be5914d215e7727df6f97f2f21d5e33b9463d119d307680c3071
+DIST slirp4netns-0.4.0_beta2.tar.gz 173593 BLAKE2B fd827f92db03eddea86bccf401ff67535343cf759353e3c221fe1d3de494e8cc0c83169ef5cda900e512aeb16cfb7e5ba6181729483fa48d8f3257d70035a41a SHA512 38b6a1fbaceece1fe151477b3bc7db624e79e2b7913f5cca9e826a5f4289e53cfa584cfb90a5a3520e3e342eb803ff8ae090ca9892ea1051fd79ce802328e578
 EBUILD slirp4netns-0.3.0-r1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
+EBUILD slirp4netns-0.4.0_beta0.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
+EBUILD slirp4netns-0.4.0_beta1.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
+EBUILD slirp4netns-0.4.0_beta2.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta0.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta0.ebuild
new file mode 100644
index 000000000000..87e485ef0571
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV=${PV/_/-}
+MY_PV=${MY_PV/beta/beta.}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2=
+	dev-libs/libpcre:="
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta1.ebuild
new file mode 100644
index 000000000000..87e485ef0571
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV=${PV/_/-}
+MY_PV=${MY_PV/beta/beta.}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2=
+	dev-libs/libpcre:="
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild
new file mode 100644
index 000000000000..87e485ef0571
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV=${PV/_/-}
+MY_PV=${MY_PV/beta/beta.}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2=
+	dev-libs/libpcre:="
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest
index 92076e8af22d..4be8af88ee54 100644
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@@ -1,6 +1,8 @@
-DIST spice-protocol-0.12.13.tar.bz2 73259 BLAKE2B f8694c6144cbe77d84b78c38f87f3f473b80ed97cb51e9fb89a89e66410ab8bf853f51bfa175d431ad8397e25481b7c4bae1614119b74bf95420bca531a38db3 SHA512 55840020a7a538e72bf53d2124a6b1920dd2d567418cf02dc33783ae5c78154d5c832d69f2e6570453c4086194b417d10687884de20365c13657ad7ca7b2ae02
 DIST spice-protocol-0.12.14.tar.bz2 74471 BLAKE2B ee90514f3c6ee0c8f6930e5fd0140e20447b1613f202186883a9a17eefaacbd83ff2f2cdb68b46cd1573de4cce288965a1b531ded1ab4da52c24c2c3ad098192 SHA512 4266bcbef9f641a97a2ff72f1b01380a41e51f4b1a0dbb73fdf68baf552598a62d5cf0c526adf2997a55ee5d4fe9392927c3d7f4556827bfb2933f59bfab55bb
-EBUILD spice-protocol-0.12.13.ebuild 394 BLAKE2B 4de3f75f7e0e76d338f3f9781cb0ede871c224f2af896646775cffbc13b2137207f0e7558f4069f555e2ab4af4f147841302737174fc178a75f7100ca28a5302 SHA512 786f8da71e62ecc280c42d8807446c56c5e8d62baecfd3dc7f1f74dc1cfb6ce8e7a003b7c354a24c39f053bc6fc097041bf7ca831ad6a938682aba10fd146b49
+DIST spice-protocol-0.12.15.tar.bz2 74598 BLAKE2B d8116e3905d4345fc0bc51d488d2ca4d90d1302c8f0a14bd126eb4c753660c98bd54ac5561a6464adeba6a0ed16e55f681e59c2a73b3ee9288acd3fce5624a93 SHA512 1a3c3c26239d092c6c24708f5bd070ae1cb146f92f2329b63bec2d21a7276cdf1b9567f434bfbeeb1f7cd7dd4ad47494c51dcdbbba5af8e271e66dfe5b11de9d
+DIST spice-protocol-0.14.0.tar.bz2 70938 BLAKE2B 66dfa75f7e2f5a9c0c5d9ec34744386760393908f02bd7c662e51b3bee41c3c825eac512494bbd5ffdab5375e132bc4b567f65003cca88314c9ef2e3d529f219 SHA512 797df5f529731e9fd395b5946af2490ecf02c26982cc4a0aef24c1766887a35222f68525a996f8bc7459c2c4a25fde0c9a10c489ee6cab6eed7a68a9b5d90f76
 EBUILD spice-protocol-0.12.14.ebuild 391 BLAKE2B 884ca4915ea4c7c4ae380c048ee0f97e5972ec662e082d0172a0d3c7d0ca95e61147f99272f5d722cff84bd153907f90df32db70eb45b3df060232ea659bc9c2 SHA512 b09ebd1398a01a9b4d8e9b68e8e9d03dd6ac8c0b9ad0f4d32f226366ae1fcf9b2de7889a9a0c9f5ad55be89b15322058be0b3a5ad2765fa93065554e16ad4eca
-EBUILD spice-protocol-9999.ebuild 629 BLAKE2B bccee12567d2d495a1ed2fd5418867540e6293cd071ecd8e6e77dadf5189eeabef3222450acea9c0832dce027e9ee9d93c77e2a8b3d29e5ebb2ea29791a7f199 SHA512 ff78d51efbfb26d41650149e9f5ef0222a1d8a43da0aa3b32561a139beadb9218bd00b6383ffe5c876fed39a8326c8597e0a497aab993a22688e0a6b1b228327
+EBUILD spice-protocol-0.12.15.ebuild 393 BLAKE2B eb10089ea8013707a156eba8b45763f57fb5188a05858a8b3afd00bdfaee407e80f21603030cafe944c173d59a9e290f8f9a27337307cc4d88c5c9b57fda9eae SHA512 ee10bfbdd420e5204301f3c6fc553b369cf1dd47248499abbc07078a5f6b653d8f46658fda6abaa4fcd7302d9d74afa80aa78e21c63e78a983250ea894e14fab
+EBUILD spice-protocol-0.14.0.ebuild 393 BLAKE2B eb10089ea8013707a156eba8b45763f57fb5188a05858a8b3afd00bdfaee407e80f21603030cafe944c173d59a9e290f8f9a27337307cc4d88c5c9b57fda9eae SHA512 ee10bfbdd420e5204301f3c6fc553b369cf1dd47248499abbc07078a5f6b653d8f46658fda6abaa4fcd7302d9d74afa80aa78e21c63e78a983250ea894e14fab
+EBUILD spice-protocol-9999.ebuild 626 BLAKE2B 12fdcfaab106bd1d0ec365772b671a3f583860b78eae2a5c3fe3574173c233ccd53eeaf3a3554e833357e1468df0cae67e65843ad152ef0228cf25fdb7b2f70c SHA512 3a692a024c28b44d47c89dd7d532042fb181daed5d02334cfbb1211b76487b704d617850ebf065f15ecf12a83e876927afa48f4d1eae2e10f482a17e6a2e9eae
 MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.15.ebuild
index 43fddfc1d88f..811162510d41 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.15.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Headers defining the SPICE protocol"
 HOMEPAGE="https://www.spice-space.org/"
@@ -9,7 +9,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/spice-protocol/spice-protocol-0.14.0.ebuild b/app-emulation/spice-protocol/spice-protocol-0.14.0.ebuild
new file mode 100644
index 000000000000..811162510d41
--- /dev/null
+++ b/app-emulation/spice-protocol/spice-protocol-0.14.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Headers defining the SPICE protocol"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/app-emulation/spice-protocol/spice-protocol-9999.ebuild b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
index 2e46f9e6f3b6..781224a6a4c7 100644
--- a/app-emulation/spice-protocol/spice-protocol-9999.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3 autotools
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index 06d3e07d2d0b..fe850032959e 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -1,6 +1,9 @@
 AUX spice-vdagent.confd-2 314 BLAKE2B 93d93f9e03e3aba9d889703ad24d08401222cf9d4b5fd0e72001bd0c0cf261d9f6879d1d0a89b51fc34dee2b15729425c694aca5522b1918f01edeea9b38b536 SHA512 ef3e02c65dd83ed0d4b1eaad9c6000a9d5d53fbbf2c19fe9604583f85478c92276b3b80554bd1573af6866e242c484f02da5c3500c0b4c430d3af0de755eed38
 AUX spice-vdagent.initd-3 1475 BLAKE2B 0d39828bd5be6271e0d3f1f7262751e1bee263bb52c0d409f5e85c51ac69b2ed1f6fa1b0ea377cae0e2879ed7d0ae39b93219fc961ed34c3d1d42b771a452932 SHA512 11e61f5cd8081231318248e332f081e43a36fb2315c70d52e436e83a14f1fca5ee4ddd8016e8c9d639cdafe69c3e5f360fb66dc2405f0d45f817130221ece516
+AUX spice-vdagent.initd-4 1465 BLAKE2B f03734461fac2ec869b48a3e2b4c4bd7ebfe152f3d2563fb5005477ce1eebbc887ebe0cc8e317e5b80de073b3cc27dc1475e86b2127a7f4907470e398112d05e SHA512 a10614b9058f9a6d70d350d2764809646251fe555abf7127ce49b2e794545a72a500c9b6ab9e5dcc632253a1ed24017392b6d0446d469ffce954d00e5c96a6c8
 DIST spice-vdagent-0.17.0-patches-20180319.tar.xz 38924 BLAKE2B c7c7f851d307cd7dde620278c6ea240d71f8b1f25d6367f81213c7e902d2b2c15f72c71344f965743a45b5693832a2937041ca7b5511ce1db479dafe137bc7b1 SHA512 8ac627f56605151aebc100a6c6d61243776662150095c768196d750929971f98f4b6d1a831cfb547d29ae8a6734795c93e51a9c4f27dcf53bd66aca6df437c51
 DIST spice-vdagent-0.17.0.tar.bz2 130413 BLAKE2B b2fb522f491512d94ac15fa8d253e8e682210ad40657eb9e5e40489eaab18c9f1d5ef5f97075a4389501050a758e1f56d47132de6b1c74bb153fc6b5e87a698d SHA512 b26e44f6463ba70d5815956b301cc2351db22de41ed2ce8b2828d9bfa1cc581c86acd433f8f0d35d552d20f6ca140f88fa39b079ba26e9166dc07ad35bee502e
+DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
 EBUILD spice-vdagent-0.17.0_p20180319-r1.ebuild 1684 BLAKE2B 061a8c3d2423b3824f4d86501a8fe7767c8cd55cbb4aa304ef087a6fcbf713ddfaba610c4261bdf40d495a261eee2347f814c554c959faf66c6b331adefdca6e SHA512 427881f201729f926372826cab0cb0ee2595c6340f3aa49a54bdb4b9ad9d641e42b8baf49c211ccaae9a03fbde832e7107cfbd7a06a9e9ecaef616a58f63a78a
+EBUILD spice-vdagent-0.19.0.ebuild 1571 BLAKE2B 679c8a969e0f81a73174b2f491fb16743094c935e4c10246444e0f29eb7ab32e369ab11b4ee83aaa499c714779768bb4df65825fc84683e14e954f6cb8d4612a SHA512 689c302d89f80ceb8ac4ddf4648bd97632a792219193328af23529b2dcd57d33ac77323f2dc46682bfe09b8a62d0104f7e3d78c924c7fc2f23ccdaaf457ffb43
 MISC metadata.xml 557 BLAKE2B 03e0f3f159d333513fb7a575b46ad91167fc30e96b4e982cdb2bf545f19a53982e82698b03b02df0dc7dbfb90d9d05aa155c56aa1dc2cf6a13153145fd4231b3 SHA512 1f3892771740224f1275a9eb3507e1ac32be745340b50f983383e6b09e69de75d2e0562fd13465a588d08a4d049d0b33b233ada1a3a9883e1ee24c431fa7e236
diff --git a/app-emulation/spice-vdagent/files/spice-vdagent.initd-4 b/app-emulation/spice-vdagent/files/spice-vdagent.initd-4
new file mode 100644
index 000000000000..ee416dacd899
--- /dev/null
+++ b/app-emulation/spice-vdagent/files/spice-vdagent.initd-4
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    after dbus
+}
+
+PIDFILE="/var/run/spice-vdagentd/spice-vdagentd.pid"
+
+start() {
+    PORT="${PORT:-/dev/virtio-ports/com.redhat.spice.0}"
+    DEVICE="${DEVICE:-/dev/uinput}"
+
+    ebegin "Checking for required modules and devices"
+
+    if [ ! -d /sys/module/uinput ]; then
+        modprobe -q uinput
+    fi
+
+    if [ ! -e /dev/uinput ]; then
+        eerror "Module 'uinput' not loaded or not enabled in the kernel"
+        eend 1
+        return 1
+    fi
+
+    if [ ! -c "${PORT}" ] ; then
+        eerror "Required virtio port does not exist. Make sure you"
+        eerror "started the virtual machine with appropriate parameters."
+        eend 1
+        return 1
+    fi
+    eend 0
+
+    if [ ! -c ${DEVICE} -a -c /dev/input/uinput ]; then
+        DEVICE=/dev/input/uinput
+    fi
+
+    # recreate the directory since /var/run may reside on a ramdisk
+    mkdir -p /var/run/spice-vdagentd
+
+    # cleanup stalled socket
+    rm -f /var/run/spice-vdagentd/spice-vdagent-sock
+
+    ebegin "Starting spice VD agent daemon"
+    start-stop-daemon \
+        --start \
+        --pidfile "${PIDFILE}" \
+        --exec /usr/sbin/spice-vdagentd \
+        -- -u "${DEVICE}" ${SPICE_VDAGENT_ARGS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping spice VD agent daemon"
+    start-stop-daemon \
+        --stop \
+        --pidfile "${PIDFILE}"
+    eend $?
+}
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
new file mode 100644
index 000000000000..d62b552d79d0
--- /dev/null
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+MY_P="${P/_*/}"
+PATCHSET="${P/*_p/}"
+
+DESCRIPTION="SPICE VD Linux Guest Agent"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+consolekit selinux systemd"
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND="
+	>=app-emulation/spice-protocol-0.14.0
+	media-libs/alsa-lib
+	>=x11-libs/libpciaccess-0.10
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXinerama
+	consolekit? ( sys-auth/consolekit sys-apps/dbus )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-vdagent )"
+
+CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
+ERROR_INPUT_UINPUT="User level input support (INPUT_UINPUT) is required"
+ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support (VIRTIO_CONSOLE) is required"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local opt=()
+	if use consolekit; then
+		opt+=( --with-session-info=console-kit )
+	elif use systemd; then
+		opt+=( --with-session-info=systemd )
+	else
+		opt+=( --with-session-info=none )
+	fi
+
+	econf \
+		--with-init-script=systemd \
+		--localstatedir="${EPREFIX}"/var \
+		"${opt[@]}"
+}
+
+src_install() {
+	default
+
+	cd "${ED}" && rmdir -p var/run/spice-vdagentd || die
+
+	keepdir /var/log/spice-vdagentd
+
+	newinitd "${FILESDIR}/${PN}.initd-4" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
+}
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index 6daeac659a55..f51237f9d855 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -3,6 +3,8 @@ AUX spice-0.14.0-fix-flexible-array-buffer-overflow.patch 684 BLAKE2B dfbbf0fd82
 AUX spice-0.14.0-libressl_fix.patch 530 BLAKE2B 136e0b87931d487a018cdf0be4acfc0b05d474eb2e1a0583e05f9184ac6aa3b3a5dc58537ed167b13655b9180f06ba489c7805caa95d39a1af1fff410000e675 SHA512 f29f0a47edb2552b0908d0ceea7546efa90ad572217ce9184da031507be9f65a83ef39684dc3d8610bea4993a8f26ed78bce17781c893a4fca1cbdf9ba5140e3
 AUX spice-0.14.0-openssl1.1_fix.patch 614 BLAKE2B fb7b39e73d37bc6ab27035c7d7a742fa648afb62777bcbd9dbdd7480b5b5461da6147b4f3368e04aaf04f8ef5780aeab1e7679f4fcf7aa1005df7d28a4fca7a1 SHA512 1b0b83b7222af0f60bdb5a3469881a4e84f8df824d2741710da04b8bdec95e691f97137f2ee67ad71065918b329285d215aa086d5f46dc83b18334eb17ef6dc8
 DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
+DIST spice-0.14.2.tar.bz2 1406009 BLAKE2B e6c57bedd8c8ec0444da194be7279b895bf348dfa9b427d20301cc223627bcd65b7037280bc2a3d0b531b0cdcd8cb62d34ee132c549ac3dc8f6e5a2959339ce2 SHA512 1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76
 EBUILD spice-0.14.0-r2.ebuild 2499 BLAKE2B dd891d8a45946487668b1477542d07c506844a9f521a1296c27b453fc0adb68942b1a8eb304b72f017eafd9c1043574c36fddc139638b29ef5e84965256f7e89 SHA512 42d61b11fc788736e9a5c40b765d260f3bcc6060a3b6e2ede73f7e1187d597037f9c194b0ed841e234634a960618549c42363d55b7cc6846e06bc300c0fd3bf7
-EBUILD spice-9999.ebuild 2349 BLAKE2B 90cb12cabfaa9518c4e83e53af3a292119ce2b2850ebd27084e959e59bce9df2a369d1516c261932a9c9df18c555e3b2ef67b83d59e5480b674fff232b316cd8 SHA512 fc4802d34f96d8fe8be9d60d507978c222e1215bdd3e2e960627de85a8078035a4bd0847479b59b71abd5cdea69bc1ad49a82a25529c6fe6df7740af5f07447a
+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
diff --git a/app-emulation/spice/spice-0.14.2.ebuild b/app-emulation/spice/spice-0.14.2.ebuild
new file mode 100644
index 000000000000..464cb7d9c62e
--- /dev/null
+++ b/app-emulation/spice/spice-0.14.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit autotools python-any-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="SPICE server"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
+
+# the libspice-server only uses the headers of libcacard
+RDEPEND="
+	dev-lang/orc[static-libs(+)?]
+	>=dev-libs/glib-2.22:2[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/jpeg:0=[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	!libressl? ( dev-libs/openssl:0=[static-libs(+)?] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)?] )
+	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
+	smartcard? ( >=app-emulation/libcacard-0.1.2 )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-emulation/spice-protocol-0.14.0
+	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}]"
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	xdg_environment_reset
+
+	local myconf="
+		$(use_enable static-libs static)
+		$(use_enable lz4)
+		$(use_with sasl)
+		$(use_enable smartcard)
+		--enable-gstreamer=$(usex gstreamer "1.0" "no")
+		--disable-celt051
+		"
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+	use static-libs || find "${D}" -name '*.la' -type f -delete || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 440aaabd0fe7..48cf0c3fa264 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
-inherit autotools eutils git-r3 ltprune python-any-r1 readme.gentoo-r1 xdg-utils
+inherit autotools eutils git-r3 python-any-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="SPICE server"
 HOMEPAGE="https://www.spice-space.org/"
@@ -35,7 +35,7 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	=app-emulation/spice-protocol-9999
+	~app-emulation/spice-protocol-9999
 	virtual/pkgconfig
 	$(python_gen_any_dep '
 		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
@@ -88,7 +88,7 @@ src_compile() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files
+	use static-libs || find "${D}" -name '*.la' -type f -delete || die
 	readme.gentoo_create_doc
 }
 
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 6fae1cf168af..f817700c97f0 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,6 +1,8 @@
 DIST virt-manager-2.0.0.tar.gz 2629465 BLAKE2B 8795985afb8805fdb4f1ee94c7344361a7d09d3e62e361f3126859c4d1b1077286b720de7629fd876e5bff10500cc6cea6f1d4afbba5c2c83fd61b137c40a3a7 SHA512 5d0eb65dceb5c913973edaa52414b1665d1ed9cd3f226e28a592decddec2acd8fdb589f60736edf9b7d95830893812f9aecca2cbdd715033ca7ea53a95472876
 DIST virt-manager-2.2.0.tar.gz 2628726 BLAKE2B d2f6bc7a7bcf8b220109702b7cd65dd9484c197252cf96e4748c27921a45749c476ed9d03eadac6ef3053df01ceb267c4756b0c602fad431ad9de0035d4ed5d5 SHA512 09975f7628ee302687eb6572b5f35797b4710aaae60c17542ee9edd72c65e80e93d7bbc7a2050667a9280effdbab28272886ae155b3ba73c104153ae3c048d99
+DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a
 EBUILD virt-manager-2.0.0.ebuild 2292 BLAKE2B 2d0b799a31fae20e1819f4d30bdac38cee7656d2512ff1f2898771e905bb73d362022e2166ba4d1d809aab505e7d5fc5c5d8338c857812da0601f04d663f96b3 SHA512 cae9b2fa3e29a34796f6b098c09a513bd3af6b13f63d4cdcd0429f3d5573bc0c5c9bf1070d1a7c988dbb0d720bafd0d07a765f2704e642faff9067e178d311c8
-EBUILD virt-manager-2.2.0.ebuild 2363 BLAKE2B 5581b1a92df41c5d9a281851ca5e70a70cb4dd935d65f5167689fca2133bf60c69cb5a913e39009568dcf65c823f5608a97249c3889a2728ef96a8ec685e7555 SHA512 637503f90f4a5a211d94ebd3c385ab20f6f9787a13c0e8efdfc32719dbb551f4bf4bf1e288f994a3168a11ade788ee8f819b30f978ff0f2e17fc754983878933
-EBUILD virt-manager-9999.ebuild 2363 BLAKE2B 5581b1a92df41c5d9a281851ca5e70a70cb4dd935d65f5167689fca2133bf60c69cb5a913e39009568dcf65c823f5608a97249c3889a2728ef96a8ec685e7555 SHA512 637503f90f4a5a211d94ebd3c385ab20f6f9787a13c0e8efdfc32719dbb551f4bf4bf1e288f994a3168a11ade788ee8f819b30f978ff0f2e17fc754983878933
+EBUILD virt-manager-2.2.0.ebuild 2378 BLAKE2B c449c5661fce1ad8140a3ba4dbd153c34c73f897b4ced0be84eff93d715b6065cca70352f2f8bc62eaf1e96282547f8565fe7c7fad36f8729b080f5edf4d6524 SHA512 7163fb2a80bcda2524d3f3a6bbd5d8ab2b01ecd0e66a700916b046df58209070a830173745beb44292d60f99e4a2d7cb1ebb2db0b04b79d88436b2f4caa755f4
+EBUILD virt-manager-2.2.1.ebuild 2385 BLAKE2B 49a51f35b26eb7cdc6faeb8f530aa381edb3c48922b4f9e0cebda8ca6e78d436eea5caa426b8d2c9551d44c471c73aa6300e71d1af6303c71cec2ab802e0c2b3 SHA512 8b6cb7c09595b449a300c34dd41d62faaed158be68a00a3483c3f9a97b94364c28f1498837bb7544f33db1381653084b5427b1ade9b58cd232c9b0bceffbed2a
+EBUILD virt-manager-9999.ebuild 2378 BLAKE2B c449c5661fce1ad8140a3ba4dbd153c34c73f897b4ced0be84eff93d715b6065cca70352f2f8bc62eaf1e96282547f8565fe7c7fad36f8729b080f5edf4d6524 SHA512 7163fb2a80bcda2524d3f3a6bbd5d8ab2b01ecd0e66a700916b046df58209070a830173745beb44292d60f99e4a2d7cb1ebb2db0b04b79d88436b2f4caa755f4
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
index 0cf20e4a304c..5472726ccd7f 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
@@ -41,7 +41,7 @@ RDEPEND="!app-emulation/virtinst
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
 		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:4
+		x11-libs/gtksourceview:4[introspection]
 		x11-libs/vte:2.91[introspection]
 		gnome-keyring? ( gnome-base/libgnome-keyring )
 		policykit? ( sys-auth/polkit[introspection] )
diff --git a/app-emulation/virt-manager/virt-manager-2.2.1.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1.ebuild
new file mode 100644
index 000000000000..00b4e68d53e3
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-2.2.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="http://virt-manager.org"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS="amd64 x86"
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+else
+	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring gtk policykit sasl"
+
+RDEPEND="!app-emulation/virtinst
+	${PYTHON_DEPS}
+	app-cdr/cdrtools
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=sys-libs/libosinfo-0.2.10[introspection]
+	gtk? (
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		net-misc/x11-ssh-askpass
+		x11-libs/gtk+:3[introspection]
+		x11-libs/gtksourceview:4[introspection]
+		x11-libs/vte:2.91[introspection]
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool
+"
+
+DOCS=( README.md NEWS.md )
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+distutils-r1_python_compile() {
+	local defgraphics=
+
+	esetup.py configure \
+		--default-graphics=spice
+}
+
+src_install() {
+	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+	distutils-r1_src_install
+
+	python_fix_shebang "${ED}"/usr/share/virt-manager
+}
+
+pkg_preinst() {
+	if use gtk; then
+		gnome2_pkg_preinst
+
+		cd "${ED}"
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	else
+		rm -rf "${ED}/usr/share/virt-manager/virtManager"
+		rm -f "${ED}/usr/share/virt-manager/virt-manager"
+		rm -rf "${ED}/usr/share/virt-manager/ui/"
+		rm -rf "${ED}/usr/share/virt-manager/icons/"
+		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+		rm -rf "${ED}/usr/share/icons/"
+		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+		rm -rf "${ED}/usr/bin/virt-manager"
+	fi
+}
+
+pkg_postinst() {
+	use gtk && gnome2_pkg_postinst
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 0cf20e4a304c..5472726ccd7f 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="!app-emulation/virtinst
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
 		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:4
+		x11-libs/gtksourceview:4[introspection]
 		x11-libs/vte:2.91[introspection]
 		gnome-keyring? ( gnome-base/libgnome-keyring )
 		policykit? ( sys-auth/polkit[introspection] )
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 3831e0e5d807..78ac6af01a5c 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,7 +5,6 @@ AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6
 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
-AUX virtualbox-6.0.0-libressl.patch 1249 BLAKE2B f638df39f05212e5cbb2998de97ef4c02bfc0f5cbfeee89811b3640a3c74cc9340ce50c6cc45ebc881bb5dbb6ab49b6768ee5d72014f086322e64ea9fda99d2c SHA512 496e26b2610531f3c690a2bf78360e0c5ed4dd0b2390ebee0c7fa6f41b777ea7d88cbeda69deaaeed62ae8ae2011a7f68e15a16073b52ba09853a5af1ee884b2
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
@@ -17,9 +16,9 @@ DIST VirtualBox-6.0.10.tar.bz2 154284088 BLAKE2B 6aeb2384a777bb39e7c2692c1e26291
 DIST VirtualBox-6.0.8.tar.bz2 155404889 BLAKE2B 3eb6ebf713c32e301db1673b22c367a89ce1ffb25d12baab6c7335389ce17e08efd744139acc4114231c4d4b69c6370b6e5d5b18ce97fe5494ca7a192fa43f7d SHA512 df18d5df2c82761b8a77e509b2873cdeaa46d11bc50ca166af1e6c30d3042b0cf5640957b1d411333f5bd5be3f03f382550f1afaecf0651d847bc88c95863d83
 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.ebuild 13951 BLAKE2B 3df397589abd502e86e4a757905df7fc38f593521817a3fe5202fc5d82a1fad91b755d9295b9df0a68fd29ca0459c30e4c2d4ff8c1b71df42319f564d28da286 SHA512 9807666ae2ab3312903687c181b84f6a30d55eaf636794dafd2963c7d6e106802f8bfc245634f05765f2bf63f31131eb80332bb66b92c738427c980d506725c7
-EBUILD virtualbox-5.2.30.ebuild 14459 BLAKE2B ab4a1c83cd9e6f0068b65d7d3f2ec1843b3b719c070fa9c0feb67120adafbebabaeb603598837df5743e39bdcbb163c1add2eb96d0e68f60b4a34f3831118940 SHA512 4eb6abc3e7d44ac46714abd89197319e638701016f132f3c814dd3878e9365f8e9db452b7fee1805d411879e091497cbc7db42b119c58a1bea104a341fbafad6
-EBUILD virtualbox-5.2.32.ebuild 14459 BLAKE2B ab4a1c83cd9e6f0068b65d7d3f2ec1843b3b719c070fa9c0feb67120adafbebabaeb603598837df5743e39bdcbb163c1add2eb96d0e68f60b4a34f3831118940 SHA512 4eb6abc3e7d44ac46714abd89197319e638701016f132f3c814dd3878e9365f8e9db452b7fee1805d411879e091497cbc7db42b119c58a1bea104a341fbafad6
-EBUILD virtualbox-6.0.10-r1.ebuild 14599 BLAKE2B 7cdfa39479dd33c5176054dba777bb4a41be120841ac9fb5e791060c8d51ff4a99d6a2744e52c68d57d20d4b05a66f2845230db2ea6fc5129c4f0031394d5f93 SHA512 a382c5b452a70f0c759251b8c1774101b0d44452b47d597f76c6f19523bd88915654c87f8c946c13136765c252d704a0caed6de03ffff9635f3fe45efad5811f
-EBUILD virtualbox-6.0.8.ebuild 14526 BLAKE2B 0392162bb49c29ef4aef0d58d18b9c13d6b4a7b61e29713bec7a41c70b75eafb7ccb3bf275aae00fe52e4757b8fe8766dc22b9ea167289e879f427c1dcdc01f6 SHA512 44cfa72dad3378c0817f47c3d8c6714187f2838773cd0518cd11c2e6321383a0942675eac18df37ad5e61fe70e9d309470630f06084e2276f0da57945d75fa01
+EBUILD virtualbox-5.2.26-r1.ebuild 13967 BLAKE2B c31306369c0e45061b211986f0711aac54aa60d4cfe8f0e2311d2af1c24f62bed4e75e277591711dc1e86878d4fd773b1df17c0f796a9b4f8d3456391a38ba53 SHA512 0a66db90ab0d415a3c3f3adc2daa726c4776c4db93a7b2ebc495213360b8d50cfe3eef30ed808138e76e8aadf698f31e3427811fb33beb63b7b0a5a3abee9829
+EBUILD virtualbox-5.2.30.ebuild 14475 BLAKE2B 785fd360936db62615c077213851c1c2face85ed31161138807564af0e25a7956f2dac717f23b1abe41ba9ee9d4c2c75fe5dd68f397fa3c4f011037e8a54948c SHA512 7bc871971a7d295894fddb76816fb0733ecee7ba987b27eeace7271d2d9b44167545149196d4a396017807bb0264dbb0904b9c015a6c046f3aa49eedbce0b5d7
+EBUILD virtualbox-5.2.32.ebuild 14475 BLAKE2B 785fd360936db62615c077213851c1c2face85ed31161138807564af0e25a7956f2dac717f23b1abe41ba9ee9d4c2c75fe5dd68f397fa3c4f011037e8a54948c SHA512 7bc871971a7d295894fddb76816fb0733ecee7ba987b27eeace7271d2d9b44167545149196d4a396017807bb0264dbb0904b9c015a6c046f3aa49eedbce0b5d7
+EBUILD virtualbox-6.0.10-r2.ebuild 14599 BLAKE2B fbd1763e96d401758f7ba6b823bec61dc18a0446cde2cb2a73ca7bf931afddaecfef2abff6855213fa249e66ee3fa3a2bbd9ec90631ca0fc17cb9fe6489d9547 SHA512 74b420571f31ce2108ab648a176c52299eac9f5f4e884d1b004cdd2e742a629de915c22535b5659eb09209421ce4e3fe739196606da9345238bc43285364a7c3
+EBUILD virtualbox-6.0.8.ebuild 14542 BLAKE2B 1db56bd2d00e4e090aaa0d148759dacdb25419e7ba1ce0126101eacd3414be30c4c5456438766c287d5d83dc958876c3341385d3ff4374e29c1680adea70dae7 SHA512 c90a264c058637f98eff84d9519a4fc3117e9be1cc54292f5f8460afe0ffa2ac834776ef53dbc418477e8b266df3ad59569fb1b35b4fd4e20926733650251e44
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch b/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch
deleted file mode 100644
index a79ae1ddf683..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/673800
-
-diff --git a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
-index e6d58b75..b2422983 100644
---- a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
-+++ b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
-@@ -271,7 +271,7 @@ RTDECL(int) RTCrSslCreateSessionForNativeSocket(RTCRSSL hSsl, RTHCINTPTR hNative
-             pSession->pBio = BIO_new_socket(hNativeSocket, BIO_NOCLOSE);
-             if (pSession->pBio)
-             {
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f
-                 BIO_up_ref(pSession->pBio); /* our reference. */
- # endif
-                 SSL_set_bio(pSession->pSsl, pSession->pBio, pSession->pBio);
-@@ -319,7 +319,7 @@ static int rtCrSslSessionDestroy(RTCRSSLSESSIONINT *pThis)
-     ASMAtomicWriteU32(&pThis->u32Magic, ~RTCRSSLSESSIONINT_MAGIC);
-     SSL_free(pThis->pSsl);
-     pThis->pSsl = NULL;
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f
-     BIO_free(pThis->pBio);
- # endif
-     pThis->pBio = NULL;
diff --git a/app-emulation/virtualbox/virtualbox-5.2.26.ebuild b/app-emulation/virtualbox/virtualbox-5.2.26-r1.ebuild
index 14bddc0d86b0..97af8a017a9c 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.26.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.26-r1.ebuild
@@ -53,7 +53,8 @@ RDEPEND="!app-emulation/virtualbox-bin
 	lvm? ( sys-fs/lvm2 )
 	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998.3127
 	>=dev-lang/yasm-0.6.2
diff --git a/app-emulation/virtualbox/virtualbox-5.2.30.ebuild b/app-emulation/virtualbox/virtualbox-5.2.30.ebuild
index 05f95844d592..a5834468ff54 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.30.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.30.ebuild
@@ -53,7 +53,8 @@ RDEPEND="!app-emulation/virtualbox-bin
 	lvm? ( sys-fs/lvm2 )
 	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998.3127
 	>=dev-lang/yasm-0.6.2
diff --git a/app-emulation/virtualbox/virtualbox-5.2.32.ebuild b/app-emulation/virtualbox/virtualbox-5.2.32.ebuild
index 05f95844d592..a5834468ff54 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.32.ebuild
@@ -53,7 +53,8 @@ RDEPEND="!app-emulation/virtualbox-bin
 	lvm? ( sys-fs/lvm2 )
 	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998.3127
 	>=dev-lang/yasm-0.6.2
diff --git a/app-emulation/virtualbox/virtualbox-6.0.10-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
index 74183d635e13..cd27d90f6c4a 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.10-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
@@ -56,6 +56,7 @@ CDEPEND="
 	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
 	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	${PYTHON_DEPS}
 "
 DEPEND="
 	${CDEPEND}
@@ -66,7 +67,6 @@ DEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? ( dev-qt/linguist-tools:5 )
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}
 "
 BDEPEND="
 	>=dev-util/kbuild-0.1.9998.3127
diff --git a/app-emulation/virtualbox/virtualbox-6.0.8.ebuild b/app-emulation/virtualbox/virtualbox-6.0.8.ebuild
index 627195b1a4d6..e0d132082e20 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.8.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.8.ebuild
@@ -54,7 +54,8 @@ RDEPEND="!app-emulation/virtualbox-bin
 	lvm? ( sys-fs/lvm2 )
 	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998.3127
 	>=dev-lang/yasm-0.6.2
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 2dc3a975083b..af1d3d4f0200 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -11,5 +11,5 @@ EBUILD wine-staging-4.10.ebuild 20352 BLAKE2B 9921f23eaf2e7590872f24a432022f53e2
 EBUILD wine-staging-4.11.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6
 EBUILD wine-staging-4.12.1.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6
 EBUILD wine-staging-4.9.ebuild 20347 BLAKE2B 8a0cf4b66164c7131f642b6a92605aec55ceba26589c7b6cdb2130ca7f6b93782d115e45ffe1cde8cf9a9870bdbf22482bb5d1aabc5296127aebdfa5d5bc5d1a SHA512 f0b1fc084f792086c127b48f77420b0d9fb2c3f759a126945c0212237b94de4740aabd7f85649e2680c10e27383095d6a2610ea73676cca79ac61668aba35bfe
-EBUILD wine-staging-9999.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6
+EBUILD wine-staging-9999.ebuild 20202 BLAKE2B 3a396d740c0fbef5461274b043c1d80f14d8d5d4cf0f46cd36b9761c06dfe09d5946e98d1378c2b1ad4561d37a04c33057ebd5bc7305d40261cfd040dddc94b6 SHA512 ea7fcca738893b74b4d6fc4d61e0ecb2c81a00c9a71e2ab8e5d5667b37f2860897a0cc89360446610e5420ce348fe8eed246497c0b965865e47f4e4c3db050e4
 MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 0804c00c2432..358f66f96ae8 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -356,7 +356,6 @@ src_prepare() {
 
 		local STAGING_EXCLUDE=""
 		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-		use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho"
 
 		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
 		ebegin "Running Wine-Staging patch installer"
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /app-emulation
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)