gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-emulation
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
91 files changed, 1908 insertions, 747 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 19a0d6a5dc9c..8b84b91ae256 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index f3d9125d2f13..0325ff2fca53 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,3 +1,5 @@
 DIST buildah-1.11.2.tar.gz 10128075 BLAKE2B ad8f4253b62cd7709bf5ae530d002190c1850da6bbfa7dff2281de0592422eccc67a4ba6e52f7a82d6c1b320b986237a84d0ffaaf9b3b1b93822a54621365250 SHA512 f491d96d5bb4d0aa03981fb58d24f36c2e3928179c8fb79e85f323ce9a65ae6da05b816d86ae43f94a83a1b2445b315f93ca28b531436d9b4e5861e4adef2aac
+DIST buildah-1.11.3.tar.gz 10429884 BLAKE2B 2d433a128d115c6b2f3a9d246d41406993905dee357237796cea3295036d026ca93f8c98ca992cfebfa574ab0d5e7b974fd356a146b7cde58986166bc18a5645 SHA512 07fff3f8c044ad01a663bf5470b19f75568ce741b3bb45f656200099ba559622597111ede3e20331dc06139f2e58d962d92bf0fdd00284ca6ed05b5b66500975
 EBUILD buildah-1.11.2.ebuild 1485 BLAKE2B 4f766ba24804b36bc976d4e1f767e469482ab8d9930b8a5488a57cd72b3644ca7bafe8d909d6e7272d73c99daf905a589bcb8b9032aeda9869e7d0bbd8ef1943 SHA512 7b10c0998a118d0e888222fe2bee26dcb2887b1f965a114f14a823b1ea8d917d55e6af657f68e003b779642f6205de43d72c4a3f119ebe8e5594a00241d3e858
+EBUILD buildah-1.11.3.ebuild 1485 BLAKE2B 01285630eb57227136150c22ff37c364786541b891c0141614e5c08a19403257ec0f2e0c7947a011c9c72d066d0581ea46a09e8cd4714bcde069a78f990efec5 SHA512 0af5f84ecf95ae34df0ed7617cb7459f9f679021e388b7247bba13a16e18649f3a0ad1cd16deca6cd3b03aa40f3ef63884bce790ca7dd25c1c2222040806cf01
 MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.11.3.ebuild b/app-emulation/buildah/buildah-1.11.3.ebuild
new file mode 100644
index 000000000000..42661d17b64a
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.11.3.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 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="ostree selinux"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="bdd78ad"
+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/conmon/Manifest b/app-emulation/conmon/Manifest
index ce300b1e71d2..258e034c66a1 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,9 +1,5 @@
-DIST conmon-0.3.0.tar.gz 49021 BLAKE2B ca753f8fe0801cef4e392e2f60e58c51100628f0576c46d139c9c9827a927970ec63bb0aaebce6ac6ffaedae75b141730833b8adcafc8d9777900d96319edff3 SHA512 9a60f3eace596a8d12dc950597a9e3619a6728bf4555bb1636da3ac8ed8a6bc2ae28471cba9c7c3ad04b61a24aa4bbd28242a22940240bf27babb834031deea4
-DIST conmon-0.4.0.tar.gz 48889 BLAKE2B 50bfa534d04428b422902ab3cd4feec5cb1cf7a6411eb35fc2420680eccc95dd17d7cd1ed8af904f6d246f10511b23b69ff112fee70d3a734098fcd7f5d7d7e7 SHA512 6aa9e0f72231bd890df4f4fe96b8831ad0fcb3e1f0edef74af8471aa227aefc3d8ea20d8bf0d50a6c06913c6360970464ea1b44fb68c77dbcc2da55073704bdd
-DIST conmon-2.0.0.tar.gz 51805 BLAKE2B 4c9e89c7d2339c82eda41b35f014ef392e185a28e93e81770bb1b9c629709c9b20ce0e7d78a0a1e2a68193e791ec45e70d427d8f4533adf5817bf806e919b524 SHA512 0d903f1b83248a130fa6a5c212f96a5bcc37113cfb93c73847a3744b9da8ca355f93f16ca57f4bfb50bcba13b272f23970fdec8ab7ac1862e93b3057512e572b
 DIST conmon-2.0.1.tar.gz 52250 BLAKE2B 59d0786975d0332ce2eb68024bbfe4c3275388d1e12561a279918fb4d2fdc2c8fd24d5872b724ccbc32722b50debf2de5c9e904aa26e25c3363f0418f5f74f8d SHA512 ba7ccdb61b6092987a3fe0fbcf76c11edaf4e15e4af4d831a8e5fdd58202a81be4d9ddf5c1d71eba5824b284f3b4416a65864e19d65dec4dfd511210c75480b1
-EBUILD conmon-0.3.0.ebuild 917 BLAKE2B f725e979caeecc2467d5152230530b4cc0c63f536c0dc47c198b2c0b03e41b365b12e0f0f707cb598ef757e5d294611d0926457ee1e75ad71d1b5a8a817ecf1f SHA512 bf854a15acae1b18a6ec2ca80a5063ed64da5b46b4b39d6a8f213fd7bd7005ab672e3ede077531fa01dc32c4accb00651aaedb27294b56b7ec1bd0c70b61bd1d
-EBUILD conmon-0.4.0.ebuild 923 BLAKE2B adc16561c26da5483166b64cade0b8964f8549145f9bd503187c1d17829794c6dceacfa5276168ac51f33d5bdca5bd616c08db33f44c7f57ae0bb93d057f1ef8 SHA512 578a793aed849dc6f438a7ce35e9c9de1b914831983c423e01ab4496848699513a87ae78f918d06943636d533720e234c80cab2b8d567d564ccbd1cc2bc232b0
-EBUILD conmon-2.0.0.ebuild 923 BLAKE2B 3e6cf43b42c098ce9d4e3ec7cb62884c5587d591c0e2f1060d323954102ffeff7710a44de0560aab5ab3652c1ce34e9669d550d5057504d11330c35ed28fa256 SHA512 ba960efa3aba615d0ba4b82b832072a383c01acc2b4ffaa74af454bf8fe2bd86984fc34eb681927703868e707730d74887fae12d707cff3caf993978575b99f3
+DIST conmon-2.0.2.tar.gz 52364 BLAKE2B 6acf8265c28da6fedf43ea585a773a213bf7405fcd0b53a1b91c6eca314dde19e59e5883994d1d90a68b5cdc267d97587b7461d3f71da65055e52896a444cfc0 SHA512 f325906b0a9d884e84cb899e4eb2843f1f6a08fa03d255c7ebd4c1c47f7192defc98698c09c5ef428c31d1ccf21dc813f86fd3213e73ceb4d4ee8b2cbc4e7e89
 EBUILD conmon-2.0.1.ebuild 923 BLAKE2B 7da7a89493aaa48a78e3eb9feb22ac959286c938d0c5120d70ae23ac4c86c7fcb70544aec33e1379ad569ee4c4979a380a97237934e70b743f82e0b55a01aee1 SHA512 261c988791417e610e006e16e6faae6c313387492a3da3f6688de823616736cf14acc1ca47b05f54d20246db752c78d931ee6ef04be1c50b7d2695e197be8634
+EBUILD conmon-2.0.2.ebuild 923 BLAKE2B 0d0a2159a480e0a7dbe91a04747999c3781ad795ee69f1f9b1483b067c6f6be3450b0cd9f075845d33a1d9c162b60554fabf5965f53d9d368bf3ab95d670037c SHA512 a0e070d59eb86dfcd6f43b5ea1684c82ac18b0817e015c271b6059c7ab501d4d13bf6c1f9475018274ca902575ef147dc40173c4fd2ff1c456724d95c9162ee8
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-0.3.0.ebuild b/app-emulation/conmon/conmon-0.3.0.ebuild
deleted file mode 100644
index 0946d32bf2f1..000000000000
--- a/app-emulation/conmon/conmon-0.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="8455ce1ef385120deb827d0f0588c04357bad4c4"
-DESCRIPTION="An OCI container runtime monitor"
-HOMEPAGE="https://github.com/containers/conmon"
-SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="systemd"
-
-RDEPEND="dev-libs/glib:=
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
-			-e 's| pkg-config --exists libsystemd | false |' \
-			-i Makefile || die
-	fi
-}
-
-src_compile() {
-	emake GIT_COMMIT="${EGIT_COMMIT}" \
-		all
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="/usr" \
-		install
-	dodir /usr/libexec/podman
-	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
-	dodoc README.md
-}
diff --git a/app-emulation/conmon/conmon-2.0.0.ebuild b/app-emulation/conmon/conmon-2.0.0.ebuild
deleted file mode 100644
index f204af5c41de..000000000000
--- a/app-emulation/conmon/conmon-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="e217fdff82e0b1a6184a28c43043a4065083407f"
-DESCRIPTION="An OCI container runtime monitor"
-HOMEPAGE="https://github.com/containers/conmon"
-SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="systemd"
-
-RDEPEND="dev-libs/glib:=
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
-			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
-			-i Makefile || die
-	fi
-}
-
-src_compile() {
-	emake GIT_COMMIT="${EGIT_COMMIT}" \
-		all
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="/usr" \
-		install
-	dodir /usr/libexec/podman
-	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
-	dodoc README.md
-}
diff --git a/app-emulation/conmon/conmon-0.4.0.ebuild b/app-emulation/conmon/conmon-2.0.2.ebuild
index 65866c0ffe79..9a58b4847e72 100644
--- a/app-emulation/conmon/conmon-0.4.0.ebuild
+++ b/app-emulation/conmon/conmon-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-EGIT_COMMIT="ba305505e9621fc0b4429287bfc2c2a7057af51a"
+EGIT_COMMIT="65fe0226d85b69fc9e527e376795c9791199153d"
 DESCRIPTION="An OCI container runtime monitor"
 HOMEPAGE="https://github.com/containers/conmon"
 SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index 475c2f7f51e5..4298fe5a2958 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,6 +1,8 @@
 DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d SHA512 9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f
 DIST containers-storage-1.13.3.tar.gz 5983607 BLAKE2B 9e591873da4824a133e3818ba9a97074bca234c3154bef9c4febcfd559d0b2ab7462c7da24ce7d391bbdbe2d9a62cb9fd711624623ba28cd8e79d0ca7fcabb47 SHA512 83fd16cbe5821c68092845defc2c5b8407b03c3972b146f409be3444a114d357709fefc25206a1ca26e6ef4a5fc219f360bb0195ffdc1c6e9f79e90f07740820
+DIST containers-storage-1.13.5.tar.gz 5968281 BLAKE2B 9690ebc87ce32a82b7560d594e192e0ad4dc9e8885797593d8c9699c13b9ddf0814773bce081edafe3050aba5d2bc470855c0717874c091b1468d52f7ad08658 SHA512 7f9f65e3141b7843a42389c78b3fbcc55a205eb661968f85942ccc2751fa6eb3fdf1199e8d244264d1b8f392e290a1770f93d5a8fd58de98f9d9a277aa39155f
 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
 EBUILD containers-storage-1.13.1.ebuild 3686 BLAKE2B e61c082b0de35a9cddd00e37459579ea0e98112a43a62187e1e45a19a62121df830af9f7d0a67460fa8bc71eb4295b6f8405ee21796168d18ee46033d5f11b34 SHA512 29f51afd336f77f80c75c5a99813e64d98e857b0eba4b932329eb94004657bb815e4c1a875bf9fa99da044265cd6443282eaeca79c04f59b58374c287c22a94c
 EBUILD containers-storage-1.13.3.ebuild 3699 BLAKE2B 045609a6d1b3ca7a0f17b860e5d4ff581cfb7d558406ab957e9684f05850e7fb654b5ec1e40fdc3d2dc5d51fae68aa2487c57500c5d71379f3ea62c97f8c8dd1 SHA512 65a39e7b91924a764eba4ef51eecdef7477bf45aae0e08e407f3a5f67b80426b9fdbeb585c3db5e9b6cf3a92ec0b41877da77ce45e66545da209ffb490f3c69b
+EBUILD containers-storage-1.13.5.ebuild 3485 BLAKE2B 539646c67e3f3559b47d10f14924a708c6762ba2dedbb243e26507b1223cbb103d9e123d9c937dfe75af86885a2af5ce025ea5d5dc90c77bbbdc7e559baf8039 SHA512 4d23fee826634ab51e11f2208bb024ffab896143ce8027345e699e669ffb93ecbeffd1aa3c87c1a1f96741f963eecee0b997ad84cee0a37fda14adcaec6fdcb9
 MISC metadata.xml 691 BLAKE2B 512255d8e2d91d64a04fcd5da04fa6db20fbaf66c580491f001716a06c0ff81ff572491cb9b4274229f2312c7235abcbe8e32b6de9e2344b418015c253866f26 SHA512 eeb059ee40101e47a81d4ff871a55295c68891c9bb6a5a2f87d7855e3aea36648f2db77317f3660602d338d6f3f8cf1018cc61f2722fcd6cb78f7f32ac62989b
diff --git a/app-emulation/containers-storage/containers-storage-1.13.5.ebuild b/app-emulation/containers-storage/containers-storage-1.13.5.ebuild
new file mode 100644
index 000000000000..abe57aef3e08
--- /dev/null
+++ b/app-emulation/containers-storage/containers-storage-1.13.5.ebuild
@@ -0,0 +1,102 @@
+# 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 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+IUSE="btrfs +device-mapper 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:= )"
+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 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; }
+
+	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/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index be3b7d1cf08d..c9cfd96d9196 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,10 @@
 DIST diskimage-builder-2.27.2.tar.gz 421433 BLAKE2B 089e68b07c6f79e54b8fb30e7a9328a6c55d1abb5f77b6592cc0b29b30a44a83803bdde93631e95e39d7fc82d9b5ff3fb425a7b94821b96f56421cbde9f8b078 SHA512 e2cc6f24d5bbfdf741d6b6e7e216d0e9631d6394cf3f3f4d34ce8a78ba2ba2ddbcb0b1434121f7ab1bd3600194777a5538651d9039c3bca06bb8cc621f06f037
 DIST diskimage-builder-2.28.0.tar.gz 425808 BLAKE2B f3cceec35f019b248df8aaa94f70231dc51a9fed06cf93b16366536cfcf45b4477b7aa09371bb3cffe95f51c74d0abf9065285b7b74c5d805604c2b00df8f38f SHA512 6eddef513e8550fb6f90e917a504bac1166ef4355791bd9b0c10addebb8f84b783bf4e53dd472e6ed9acb5d3dcd951e675f4e9983ec4170c31afdb257b84e24d
+DIST diskimage-builder-2.28.2.tar.gz 424565 BLAKE2B 77bad24f857de7fb17cb727f7f5168f86434e4cfeecef286da5b3351e9fdfeb0d1dc2472f800024a35adb40aa04155bb7cfa3a0772ed8186a21b31b582809312 SHA512 0bdce552a896834c97f2a982865a93f39f62d0ee68d001c60d320e831c25456a392b4510ed94d7123851dad262e5ccb38a541d0dda5d620f91cf9ab54776efaa
+DIST diskimage-builder-2.29.1.tar.gz 426780 BLAKE2B cd5b9c2cce5c289ef7f76ad41bf4b51ba6319c782be91b97a82d828c177912696ce6f94774d7294aca0d4af401d4d4e0ddd5fdd6d799e4e560ab03f971498b03 SHA512 cb083024739486c7651ce97ab36a30461754aae226af23b2ce757eca7c71e0fec42af07b8973f9c8344012238c4ae9d6252189ce6288d6451e020302f2dc35bf
 EBUILD diskimage-builder-2.27.2.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
 EBUILD diskimage-builder-2.28.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+EBUILD diskimage-builder-2.28.2.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+EBUILD diskimage-builder-2.29.1.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild
new file mode 100644
index 000000000000..86d3bb124b34
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild
new file mode 100644
index 000000000000..86d3bb124b34
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 199ebf9e03e2..a3dec19a5956 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,7 +1,9 @@
 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
 DIST docker-proxy-0.8.0_p20190807.tar.gz 3377742 BLAKE2B c1ccc76dd9157c715d09db27b6800a86b0dc7532089d87eb78a6e656f3b42d4c4824c34e972196038f915e3b08b12197f305fd1a86e3fe75fec621ed49e5e71a SHA512 ffe18805dc6b85f8b058e342cde2baedf2497465298daa444fecba8222885606c85242ca59016bc32a5c2c0164c1c980b92ed3d5f82e011a7e9871a67d67b947
+DIST docker-proxy-0.8.0_p20191011.tar.gz 3377526 BLAKE2B 10dd1817ffa65dc75855daba5efbe6dc7c8a048e8868354d2ad7c2cc4e99dcedb95ba4c5e37a54d60e4bd89c5f5bcac5fde4db8d21b7cc903fd42e4224a084e0 SHA512 a21b9b5883056cf75dda9f229ff199e6daad63d94dcf75ebe3e21204bdeef89c41ddd5730bb6bb4387af9a84a8a81e7adfaf726b2fdd299d8aa9d6d35a096ce2
 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
 EBUILD docker-proxy-0.8.0_p20190807.ebuild 770 BLAKE2B 8a90022b2b412cc1e0d389b55e84bfac47c3d3965c5b0a1817b0b68acd9f2e446fe458e8c69aa1136f5c965f9b586b33251213aaca6fee5a1d3af64d3f374f39 SHA512 6b634b77da647e181ed5ba4d546919cc8dc068ddc6055fd7ebddba099b3f938b47aa862af3c2946c9221f20befadc626b05e86bb6417904c986e9fc61893b03e
+EBUILD docker-proxy-0.8.0_p20191011.ebuild 770 BLAKE2B 39d3de91ff99d885b952c9ce9c06a7d7c0e0805c814213a403ff05594e9600d7a0eafed0a0b8775ae44f4729dd6ce48ef122f64cfbbc70d64d0806593941cd46 SHA512 61c4b7115ea20f509e03d041f757b4cfd56689af6d8d06e1fcac684faf4d6b7cd823ec5c5c2e06d765a327adc237d6e09107c085e61cb636bf94ede813ef2830
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
new file mode 100644
index 000000000000..dbfc6c6a965b
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.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="3eb39382bfa6a3c42f83674ab080ae13b0e34e5d"
+	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 f480b228fdda..261adfe93f60 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,7 +1,9 @@
 DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc SHA512 d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
 DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11 SHA512 6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
 DIST docker-19.03.3.tar.gz 16960782 BLAKE2B 8ce23ca22edf7c4435dbaca5a0321de52b108951b935d5ed82439c57409757cd054698934f9dbabbbbb0db74d5c9f6a6d04c5ca33e64212dedc0c9bf92d06ddb SHA512 251756ca8b5d8eb962fde447fdab8307ce8013e14dc3b955387af5d8bdfdee16ea170ecb37a59e5900fa5c2e366f0d4080e79c28e5b8ef945cc67cb959d88eef
+DIST docker-19.03.4.tar.gz 16961040 BLAKE2B 15d88d6f97ff70f6a0220f3d62b2040b4d859414b323b07e54802cb8e8dbb8d074562635bbfd9d00df529d0792fb5767d28548843ec73ad21cf7d7fcb1ac0c6e SHA512 bcf79f82eb8433b8c04ceb2fd90a80101b148dd819f5bbda83d535ff2fad65d08aee2f72ac41c38ce879f3970a087555bb7ab63c5bb071a3c1cd6aa177621cac
 EBUILD docker-18.09.9.ebuild 8354 BLAKE2B 5e0ab831398f7c54025bb0d03001c13625758dfb3988e0828ad2b5cda246aa55ac4536396df8c62c14b7df353e32709d2306b50220d0b9f00c2ae32ad40b24c6 SHA512 62d3bfd28f0b4feb9846fc6befe15d2b926801a7b7015784b9ca7435874a3d974c85f3ec000b1ad8dde40141ed42de5dca5e2630db7028cfeec3ad662802a437
 EBUILD docker-19.03.2.ebuild 8355 BLAKE2B 5d2b42bfae72f37eccbeb127643f2757c2379fe1b5709aa9c3cd27e194835bfe059ee6e5bd2f9617d80222cd2ae659b1efb73cf3f9669de8042d5afe467b6a62 SHA512 c6d1c6bd79e51e728b38bbc6505020cdd650525edfb961c192fd5dd99a51962e6c3e6f1f5b1d7462a4f6ea8dd318e46b172410a8f432fc2bfdaeab7943e1b141
 EBUILD docker-19.03.3.ebuild 8358 BLAKE2B e3341a43f8d8f049ce5a2d47076ac612a15e68317b05274277dca827d3fd174f0ca2e5fabcacd08d80d4784668c41700b9cc0f8992590189d91a527e2bb26809 SHA512 f07974b7fac5f9563df351ca07519383edb1f877d56872621f27ae22b8d0e0a51548040fff7f3081c79b4cc3aecb375bd88842d5080b4136f9e4ed0595398721
+EBUILD docker-19.03.4.ebuild 8358 BLAKE2B 71fe7c49bd11c46b50860112f8b0437da38119c8fd3c185c218b783cbb360660c1268632cded26d3769697dd6b98729e25da0889826656e02a5751efc250dad3 SHA512 c5670282d4401bf2cf2a2685f88d14fb06e36b8dcf99f877d87915d902fe390abbab926c60ceca3b46bd332a98647b03eeaf05d7ea1976e2cec2d72bf44b072c
 MISC metadata.xml 1576 BLAKE2B 7a378d4abcda0352c4c96108a238d693e9104a1de624f8fb4e808bfbf5ad4960c1f6155b1f6c78ff2bc6609653285e911e7eae9f319696e39c60b63e5127ef11 SHA512 9944178c2202c12bc7364f9722e70b71583bfc60a318348060d0ee8ba713c892259da46c222ce7fea4b1294be8b01b7d1b359976931e287f574733b65403e762
diff --git a/app-emulation/docker/docker-19.03.4.ebuild b/app-emulation/docker/docker-19.03.4.ebuild
new file mode 100644
index 000000000000..8d52724b145c
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.4.ebuild
@@ -0,0 +1,309 @@
+# 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="9013bf5"
+	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-lang/go-1.12
+	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.10
+	~app-emulation/runc-1.0.0_rc9[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20191011
+	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 bundles/dynbinary-daemon/dockerd-${PV} 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/dosemu/Manifest b/app-emulation/dosemu/Manifest
index d064e047f450..e9145bc90430 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -6,5 +6,5 @@ AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1787 BLAKE2B a265263de5ccb12df72
 AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393c34babe0b9172a8c9c1b168432f454ff120673496d279496d76821eda49886aaa998244bd411d4db6b465517712c4f6683d2850d SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed
 DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864
 DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd
-EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2605 BLAKE2B 9bc7d0a5e268f61dfe8422f9175f28cdbb76b529540e4a781207107b06f96a7d1ec4751c3bc1aa325a95209ddfa3429048b3e190100f80e05c22ecb9dd15b101 SHA512 064419839372e9f2ac136bd7bc0fd6be567c1cc6d982a01b8020c95605dbf905ee356f4b7ba6f8f477526497ebdf56f14fce29ca3732a5f9aa1a6b6c62ee11ee
+EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2672 BLAKE2B 4ffc138e6cec18c5a57e2c32b462c7c435590e8539500590c1c6bbb33e3be5d60ee61edcbfbc20ce68210b9b6cbe1108dbdc8eaf851be2b5d5a84ed9da5f71db SHA512 fad2cd3d235e77b32224cfb72e5b71a94f8ddc0968a03ddfa5554b5f981ff69e93167ab8fcdc28d9940d04f1ac515dc7c02a5031658d46c37291314ede3c8ccd
 MISC metadata.xml 432 BLAKE2B 06cd4821f41961fdcf266bb1175ee118cd181d17c3b38508e2a30dbbfab9e5cb02608e2b8e5af905abc24718d410a24d112c073fd6ee460b33d904c975358a61 SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index ca290fb74bb1..d6de58d0a4b9 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2002-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit autotools eutils flag-o-matic pax-utils toolchain-funcs
 
@@ -18,30 +18,32 @@ SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="X svga gpm debug alsa sndfile fluidsynth"
+IUSE="X alsa debug fluidsynth gpm svga"
 
-RDEPEND="X? ( x11-libs/libX11
-		x11-libs/libXxf86vm
-		x11-libs/libXau
-		x11-libs/libXext
-		x11-libs/libXdmcp
-		x11-apps/xset
-		x11-apps/xlsfonts
+BDEPEND="app-arch/unzip
+	X? (
 		x11-apps/bdftopcf
-		x11-apps/mkfontdir )
-	svga? ( media-libs/svgalib )
-	gpm? ( sys-libs/gpm )
+		>=x11-apps/mkfontscale-1.2.0
+	)"
+COMMON_DEPEND="media-libs/libsdl
+	>=sys-libs/slang-1.4
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+	)
 	alsa? ( media-libs/alsa-lib )
-	sndfile? ( media-libs/libsndfile )
-	fluidsynth? ( media-sound/fluidsynth
-		media-sound/fluid-soundfont )
-	media-libs/libsdl
-	>=sys-libs/slang-1.4"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	X? ( x11-base/xorg-proto )
-	>=sys-devel/autoconf-2.57"
+	fluidsynth? (
+		media-sound/fluid-soundfont
+		media-sound/fluidsynth
+	)
+	gpm? ( sys-libs/gpm )
+	svga? ( media-libs/svgalib )"
+#	sndfile? ( media-libs/libsndfile )
+DEPEND="${COMMON_DEPEND}
+	X? ( x11-base/xorg-proto )"
+RDEPEND="${COMMON_DEPEND}
+	X? ( x11-apps/xset )"
 
 S="${WORKDIR}/${PN}-code-${COMMIT}"
 
@@ -79,13 +81,14 @@ src_configure() {
 		fi
 	fi
 
+	# sndfile support is unconditionally disabled in src/plugin/sndfile/snd_o_wav.c
 	econf $(use_with X x) \
 		$(use_with svga svgalib) \
 		$(use_enable debug) \
 		$(use_with gpm) \
 		$(use_with alsa) \
-		$(use_with sndfile) \
 		$(use_with fluidsynth) \
+		--without-sndfile \
 		--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
 		--sysconfdir="${EPREFIX}"/etc/dosemu/ \
 		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 4230f5bb2305..c593be3db4eb 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -3,9 +3,11 @@ AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f59
 AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
 AUX free42-2.5.3-fix-makefile.patch 1902 BLAKE2B 1d8ae0054275bba2f8fa46aa8c6086e5b41dae17a417d8f0fbf14bb63fe9504577f67bd92b612665d414e55396ed6bc7b1ac36983b4dcfb32b4eb98514d0f768 SHA512 895fe2a42a8e1129dbc2bd8b523ae9235eb606ae8d48f53fd2689d9991ee1818334f66d154218592d9bc92b9e1d080b148ff6fca6f80295b0dd0475d9e1bbad9
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
+DIST free42-nologo-2.5.10.tgz 7408769 BLAKE2B eec27805199b80ce659517479bbaefe871f8e4d2fc06c138e4741d63748acdef7e04b54324ff679a820ca451fcfa34e4202edf196e426679adabe397313f8f37 SHA512 309ee3779b792208ab887b91e43c4bf7a61862b02e3c250fd09367c154345878ad80c2c949138cb5d0c5d7031ebb0d4c6d192962866b6b68fce220ab2d651b42
 DIST free42-nologo-2.5.3.tgz 7406566 BLAKE2B a8fcad4738b46e5725e323eb7c16929c32fe0c72eccadf2f692950a3ee952f3b8f7e1e46d6e4eee4e822ca5a3b2c42adb09e2b43f0480c954aef87dc81b1edd3 SHA512 9a96bc5453f938ba806117ac3162db4f87d3584662c8a1aae370f17a06c1e92167adb2c2bb9bbd17b91473f272f8c031c7ffc1944247962571a94cb7063f0904
 DIST free42-nologo-2.5.9.tgz 7408535 BLAKE2B a64c925e5c93e396efc2a46f8d495201b039763269c9d326469f9b77435b6ef5a6b434f83a2c7017587ef7223724ed7986aafa60bcb542f79d20630eee0016fc SHA512 fba421b181649881092b398458e2065f9f133b76d88e140f046de805dd42a5ba513168cf2ecd4c94821e1b8374e596a2b696533d29c11ccae4106a14f1fdaba4
 EBUILD free42-2.0.20.ebuild 948 BLAKE2B 59ada24ef7746d402bfc2e9cb8ea80c23a68e3ffcd1a3da035281d7544422b21ee3c41fe005721672a180f97a850a7066f3a8087f4aa377fb4c0b4e6233fe49f SHA512 3c117630b0266091dff0b540c1975f6e5c69ec46d8a1f8ad55d7757147df9fc2a6bc9bd3bcfead241cfa8dde29deed727bc1bf39e1f833aab686f2c98504a123
+EBUILD free42-2.5.10.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
 EBUILD free42-2.5.3.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
 EBUILD free42-2.5.9.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
 MISC metadata.xml 547 BLAKE2B c7cdf7e2a312b69ae94b467836751bbf61dc771e58866edc21d70bf1b15c776afaefc20a947f6dc8af6586ec2b5e3416bd32446ca3a92890ed573daad6e48d38 SHA512 99885c9a7abecc41f53a946d1b94d2f8d8fda74f0e3f0a0cf6a43a418a874922594841e17b6197aee9f80b007d7633f2154ba85cec81dcfc22efcc7b52edd15d
diff --git a/app-emulation/free42/free42-2.5.10.ebuild b/app-emulation/free42/free42-2.5.10.ebuild
new file mode 100644
index 000000000000..67e64a2dd933
--- /dev/null
+++ b/app-emulation/free42/free42-2.5.10.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.5.3-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.5.3-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/ganeti-instance-image/Manifest b/app-emulation/ganeti-instance-image/Manifest
index b93d05873ff5..2efb11e319b7 100644
--- a/app-emulation/ganeti-instance-image/Manifest
+++ b/app-emulation/ganeti-instance-image/Manifest
@@ -1,4 +1,4 @@
 DIST ganeti-instance-image-0.6.tar.gz 82534 BLAKE2B 8a16f1ead6307400031425c60dae2585ea9ad53e55276a73177b46652c9054c6c24ea7068347ecaeafa77cea27b1b97350420bd6cf0e69e5ac18692cede47bbc SHA512 92b5048fe8c40692e8e7c4cb73b21e764660d7cb5f585a8489fc4338eef7df8aae1147d38a849103585a884a0216a0bfb42473d5c1922130e5aada31f5d580c3
-EBUILD ganeti-instance-image-0.6-r2.ebuild 987 BLAKE2B 2394defd8cf8b9b6ab8b06614ee0cbd7c0b582af81ad57859bd64ce5613d404feb8be33ce570aaae1108f6165960d25bd63fe29006c3041c282eaf029dfd50a7 SHA512 3cba2e12ae9f97b60e57ed44e829cd7b4eb9d3594c0779616b9b7d0e9a336e1b7e3d1d89d750ec161f7bf7e9dc2195d10369e13b90701c87cd2dc4868c05ebd5
+EBUILD ganeti-instance-image-0.6-r2.ebuild 986 BLAKE2B 3e2d8bf945f8707b173170bf3013c903bf2096527fe3128d66bb3ca342dad604b274e5adb74cf351d533bfc9ede7e2e20f3d904320fc57c4552d167589cbcb45 SHA512 21fdc5ee8ae370c8b1daac3258c67c76ebb66a6f15eecf24cb1effb60c26b4929768bd00b16dd755596710b4290c022bc5f8e269ab09b948e8b5a040b6b07bbc
 EBUILD ganeti-instance-image-0.6.ebuild 990 BLAKE2B 79251b99b7a51045025577f5481c08cecbff9b8bfc860c243e83c6ab08f4f0d9b3d31f08fc78899bef632aa6bd7b362b139d75d9e421f263ca76a3105dd8c870 SHA512 98764555f1dfd871a16cc8cc65ce5e6682b01575b6746a6560c65434f2e95a1ddcade4ada125c75aa79f3bcdcf65c51d6c3eca40c1acedf1c7e682c38418b340
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
index 9e62e96a8908..d60896758bb0 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://code.osuosl.org/projects/ganeti-image"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 2badfa782267..5dec3f96e309 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,3 +1,5 @@
 DIST kompose-1.16.0.tar.gz 5241785 BLAKE2B 9958b200827b70c94a499981880cc7a5d8137354205d96657d854aefebbd877e332ac3047f59e13b62dd6b9a9235d1ed83bb8b8de973d59f81906b3f376176a0 SHA512 267601ba51f5cfcbb95b9fbf52bbb99f9c810de8edb301b635a50936d7a714dc8410352ff3a4aa8819de1659a45cbb42caf5e552023cfa594a0eb8e99db57522
+DIST kompose-1.19.0.tar.gz 5314491 BLAKE2B c03f7ece6dc91979a147bb1689525318b7c31b22242e6fbf5387469d3196dfc569178235b5a52ccdd9647ceb626be313017484451f149e375edf3b48da063328 SHA512 571c5f23a19ba1f7a403e2369d74a5f6ba051c5e9c27b79bf5ab05f8dfc9abd523862dad7da3cd0d503e4de2e76666cd1eea8d8921b0bbe79db81f11a23fbe64
 EBUILD kompose-1.16.0.ebuild 914 BLAKE2B 135028b699263569332cc9e7e1d9559ac448ddcae5517505bf170a17b591a581b3513eb9d29deda4d103a93b556ddc2bc77f052b80ab4f786f7f4003254f63e6 SHA512 ad339be916fe398edd62cab08a67c47b83eb91cd91603402520609e9e3dc4218d3ed5d206f386cad75c8b0b0b0a63efc13cf1514166b1eacab9b63663a2e6231
+EBUILD kompose-1.19.0.ebuild 911 BLAKE2B 9f272a27c96ff9d6b1698653dfca5a348bbdf2e85a7d8d174e4ed31451dcc047eea889c80e55faeff56101a00355f1ff46fc48463e9d4fc6e30616307947eedf SHA512 2cb175dbe11246b42b4e52099356d463f8d6993e34c8aa3d1c60e5ecd0f1015effaec6e9441456de29bafeea2efbcffcb1930b2d4ddda0f8bf0bf1d21b699c2f
 MISC metadata.xml 250 BLAKE2B 7269bb56889c307f4610c9e7e3e2444b8e08cb953745cc674df9bbe1c1d9acfad6f542314a5770439c3bd65fc91f78e1e82a3bc5d14ecb158c4fde6dd5b8b062 SHA512 4f70d3e271588e217f8ec4e0acc7b86a70a4b5380405a0a3a4ffc923806e0d086327534de893e82e28b72d5616b8b0904626010aa3591bc46ccbc540523c7443
diff --git a/app-emulation/kompose/kompose-1.19.0.ebuild b/app-emulation/kompose/kompose-1.19.0.ebuild
new file mode 100644
index 000000000000..6262daaf7558
--- /dev/null
+++ b/app-emulation/kompose/kompose-1.19.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/kubernetes/kompose"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="f63a961ca7972cb243507755c69cd066aa792289"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Tool to move from docker-compose to Kubernetes"
+HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+RESTRICT="test"
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
+}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 2d438d0876f4..a901755e1e68 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,5 +1,7 @@
 AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee SHA512 d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02
+DIST libpod-1.6.2.tar.gz 8270781 BLAKE2B 5d86533ddc821f731292e126102a31d651956c275a22c5c4ab3c57b9351832a1d85d75be877343c60af47716f9d1776315b3bf41fb17037d02fee10cf88efba3 SHA512 68192dda019623e3f3af9f82f946be8efbaf3e2c54acf23f62af67ac1ca093dd4dba11d2a7c1c950b99060393ed7e945752c1eaa9eada0dfc30f3dcaac8e1c04
 EBUILD libpod-1.5.1-r1.ebuild 3947 BLAKE2B b2e0acf87c7d929a85fea55eb4eb01029e6a62cf50c3e8009941d360bee2089c2ff24ae7e42ef29e6b6b47b907e8996e52b842d9d7b935a3b2046226e82a56e3 SHA512 709f350e30b2512c4d9eb22729b0a6b66b94e7411ecec8429ebbe96ce6d974fe984b9590b3ea113279f10af9d07b42a46f3713915d7a7bcd0d42f72e28af28aa
+EBUILD libpod-1.6.2.ebuild 3947 BLAKE2B 00d279c3e2c57affac72db1cf22c9896fc6679713071c8b50157baf42158c7eb9a0b86a8ec1edf8c800450cb1582206acfc837d04b87380c0ebebd414071b2c3 SHA512 c88241f30dabb2a97d253980bf7c6776149d6d03aded2d63d2af1347ba40e78fceb510598c8633c76c26e8b7f75ecc66aba72916a39df906c2b45eeef3557ca2
 MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555
diff --git a/app-emulation/libpod/libpod-1.6.2.ebuild b/app-emulation/libpod/libpod-1.6.2.ebuild
new file mode 100644
index 000000000000..9c1a41555c18
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.6.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="f3ffda1e08f19e9a6a88484136b5eed76533f21a"
+EGO_PN="github.com/containers/${PN}"
+
+inherit bash-completion-r1 flag-o-matic golang-vcs-snapshot
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree +rootless selinux"
+REQUIRED_USE="!selinux? ( !ostree )"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/conmon-2.0.0
+	>=app-emulation/runc-1.0.0_rc6
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	ostree? (
+		dev-libs/glib:=
+		dev-util/ostree:=
+	)
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	sed -e '/^GIT_.*/d' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/^\(install:.*\) install\.python$/\1/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/ostree_tag.sh ]] || die
+	if use ostree; then
+		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	LIBPOD_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index f53a275b2de4..dbde2dcee8bd 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -4,7 +4,7 @@ AUX libvirt-5.2.0-do-not-use-sysconf.patch 5969 BLAKE2B 965e53b33424b5e62107574b
 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-5.7.0-do-not-use-sysconf.patch 6289 BLAKE2B 894077daf73a49b9e8ef4fb019847f0e59381ae26ef39ae9d2ef438bf93f08a4da752ddb5a4cf1f35b6a68a39f96fac287d49c212094c9c2a91af571a7468ef6 SHA512 87d852dbf18c51c7b244f0e1a3faaa7b7d06f59db62dfc8c561197162764eea9e1f8136915e9dd9b5916027603bce704005f3c6b9af34b4a88b87a862de43766
+AUX libvirt-5.7.0-do-not-use-sysconf.patch 6015 BLAKE2B 6b8d7a4ee9c28d777ad3aa39b030ecd12af3585dc14676ff97bc2a6960408a173af02b8832ce3ebc347a43d030af712089afa17cd3907dec7a619358ca82aa6b SHA512 a3776b94a9a8ffdeac5f5cce98da15fb265baddf4c394ebb3a52c4fa1f7e893962755b3bf7343eb001f1d2ea9c630ddf968fee917b2d0b92d93270c080431af5
 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
@@ -18,8 +18,10 @@ AUX virtlogd.init-r1 562 BLAKE2B 52b0dce0d3dd856d6cbffbe37e721d8f053d53a4802ce3a
 DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
 DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe SHA512 47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
 DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
+DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
 EBUILD libvirt-5.2.0-r2.ebuild 9748 BLAKE2B a193479eb74f656a41a96eb134e05e32e464c85e421b720627318ba78ab0dbe95649941b5ffb03821b52f95010f26977d30cc0154de30f6e7b21fb653e4437ff SHA512 87b84568d861cecdfe106a7b6f31570890c77f6fb58484faf586dad7827f6ef8bb52b0f25f8dd92556cd811aadada99700612d1afaf603d32545d5a41eaa916f
 EBUILD libvirt-5.5.0-r1.ebuild 9481 BLAKE2B ccf8b08a0073e88ef5718cbe48b5bbf256cc25520f55d486c3a79da2f6b0ff5380c4e6cc680eba125a738655d2ecb7d8f24756ad51743990becb5f313aa64bc4 SHA512 84ecf64c0fcdde9cd7a40f745ea8cd69a6c5476acdf4804eb63048d2f31b9b0cd535ea4fb7ed062cd16844c2c8053786e652b9febfa091a93827459b6989ecb3
 EBUILD libvirt-5.6.0.ebuild 9474 BLAKE2B 0ef7d9e54a1005739b18a7a383b91a2067ce0d40450be9c1786f509be0034b019192edf56a31b6f00864f88d5dae944707450f781ebb3991b763ee628934981b SHA512 a70deffb64868dae879ee3282d3426114798a46f4e9c6c64f932a7544d4bc5093638fab914e9b6dd2b867b29a82fa9d2c7724ec5a8052d8477c4bb131d61e32d
-EBUILD libvirt-9999.ebuild 9474 BLAKE2B 314db32e07b35f8346782ddaeaa35d00ebde7496082b2bde0acf0d0d9875cbd8769716903462970c39818e13170f502e4f7d15fd283c7460144419961d3132bc SHA512 bc8afcfbc4d67c30f870e39dd421daccc1d9edca91b18f8bc8519be8d9c49465df083fb8a9b3bc57848003c775a6d265ace26f5ab5174d967b65427c555eadca
-MISC metadata.xml 3858 BLAKE2B 7f1d686cbc66544ff5ab20db52cd8a77ebb92adb0c4d01c44012c720da2c3de8aa8a2ba0f125ab90e5994f7264a3cea619cb2eb6e56338645f1ba5debd9c4585 SHA512 e97d6beba9f2f6beed28c50d06b34508a841b3e916ebfd535350e2f0c22fed40098891b4d23f041f5935ca51f671f02d3488d9d0c675e2c98640a03ae30ddf88
+EBUILD libvirt-5.8.0.ebuild 9606 BLAKE2B 226fb93c598b9afa0d6b60a03cbe7bf414ff0f818b98f03d5e371e51e6453becb0a8a775f037bf7abab5c3edf09486b894a712e2969d89672edd2cbd9abd0760 SHA512 c04a324286074b91876f7a544235068c4322359f1712c33ca24afcf831777a0be6db6d4fc54b8729b97407c39c4fad710e1948007973e8891c2b9e45c0d48b90
+EBUILD libvirt-9999.ebuild 9498 BLAKE2B 90016d6cb9d864dd8522de41a4b1c83775a465762d7ee5d3af8102d3eec1e1c8e79accb96a10c1d3119f12ded8668145f272d702cbd91a10de25270fd7edfe2d SHA512 dcbcb4d2719b3377ffda32121efd7caf758e43b540949319916c495c81c88fbc488c3bff2ecbe54b503c8f3feb61fdd240efdf1235d39c8a02ac6e163b622ff9
+MISC metadata.xml 3947 BLAKE2B a848dbc3ec81fd6d97a4067b3a0b508b2cbb6154b42af9f29830b801c801bf2db4706be9ab5bbb256ceff34f47a4b5d04215f5990a3b864e2070c7479632d753 SHA512 5c2a17a277bf942c6a28013659c3fd7c9b9dffa7c9209cb370852e018dd572a1a7080e56909bf2245ea29cc889f61c47e466e8eb5cf2f701f4a3b2d2fbdcaef8
diff --git a/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
index f4850f6ae63c..2ffffe492db3 100644
--- a/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
+++ b/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
@@ -1,5 +1,5 @@
-From eee203f582af1f96e7a9451d447079cf49f47495 Mon Sep 17 00:00:00 2001
-Message-Id: <eee203f582af1f96e7a9451d447079cf49f47495.1565963722.git.mprivozn@redhat.com>
+From e387be8671d0de88632d063e2ecd2c12eb1b2fdf Mon Sep 17 00:00:00 2001
+Message-Id: <e387be8671d0de88632d063e2ecd2c12eb1b2fdf.1567522968.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
@@ -16,10 +16,10 @@ Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
  7 files changed, 15 insertions(+), 37 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 3ae4b87abb..69729d15b4 100644
+index f5093b9c90..e2ebc51c87 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -666,23 +666,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
+@@ -672,23 +672,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
  
  EXTRA_DIST += $(SYSCONF_FILES)
  
@@ -43,7 +43,7 @@ index 3ae4b87abb..69729d15b4 100644
  LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
  
  EXTRA_DIST += $(LOGROTATE_FILES_IN)
-@@ -740,14 +723,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+@@ -746,14 +729,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
  BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
  DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
  
@@ -89,20 +89,16 @@ index daff48e67d..43736191d5 100644
  # 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 4c5b28b478..032ea940fa 100644
+index 9c8c54a2ef..a042280cef 100644
 --- a/src/remote/libvirtd.service.in
 +++ b/src/remote/libvirtd.service.in
-@@ -22,12 +22,11 @@ Documentation=https://libvirt.org
+@@ -25,8 +25,7 @@ Documentation=https://libvirt.org
  
  [Service]
  Type=notify
 -EnvironmentFile=-@sysconfdir@/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
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
  ExecReload=/bin/kill -HUP $MAINPID
  KillMode=process
  Restart=on-failure
diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild
new file mode 100644
index 000000000000..696f81fcdc79
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
+	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
+	parted pcap phyp pm-utils policykit +qemu rbd sasl selinux +udev +vepa
+	virtualbox virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	qemu? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# 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
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	!sys-apps/systemd[-cgroup-hybrid(+)]
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dbus? ( sys-apps/dbus )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	pm-utils? ( sys-power/pm-utils )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-1.5.0
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.6.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.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() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		# Reinitialize submodules as this is required for gnulib's bootstrap
+		git submodule init
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+		    git submodule status .gnulib | awk '{ print $1 }'
+		    git hash-object bootstrap.conf
+		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
+		) >.git-module-status
+	fi
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with dtrace)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with pm-utils )
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen libxl)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--localstatedir="$EPREFIX/var"
+		--with-runstatedir="$EPREFIX/run"
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	newbashcomp "${S}/tools/bash-completion/vsh" virsh
+	bashcomp_alias virsh virt-admin
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index d623c5145d17..63900def37dc 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -50,6 +50,7 @@ RDEPEND="
 	acct-user/qemu
 	policykit? ( acct-group/libvirt )
 	app-misc/scrub
+	>=dev-libs/glib-2.48.0
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
 	>=dev-libs/libxml2-2.7.6
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 870d636e83d2..3b887d5ce0c5 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -71,6 +71,9 @@
 	<flag name="pcap">
 		Support auto learning IP addreses for routing
 	</flag>
+	<flag name="pm-utils">
+		Add runtime support for <pkg>sys-power/pm-utils</pkg>
+	</flag>
 	<flag name="macvtap">
 		Support for MAC-based TAP (macvlan/macvtap). For networking instead
 		of the normal TUN/TAP. It has its advantages and disadvantages.
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 3a62eb9160b9..05ce39103db4 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1,5 +1,5 @@
-DIST punes-0.103.tar.gz 5366838 BLAKE2B cb4a9a1336293891e06d573f68c52962e79220e7024fad716a957f5423a72703a34efc3fb6129dbe9ffde2c96fe7abd2a1ad4a622aaca89e90f6a2d5af8c1a53 SHA512 db0fbc075b9fd46be8013b17c03fd7abd12b209ce166557c83283c917e53224712ba5838cd8b9e7fad3d21271f29e475460996dd9800b9f759602e289bad4205
 DIST punes-0.104.tar.gz 5381182 BLAKE2B fefa6eb85e9cfe5eb10fd987061e6f708a2d29db374552ca217e1e47bfd3a982390d2fdf33f23407bb54d7e1a3491e33cc2c520ff3ead4566f687c6c652bcc6a SHA512 9636440cf66cb9f48b532cebff4342a775ddacffd98748e5669d820e213a648cbfb3e4e94f67389f21f88b4fa618bf514e31738c10df079abe22d4b19593d904
-EBUILD punes-0.103.ebuild 967 BLAKE2B 544a6b435b37df81d70cb910306166b9ed8abea34affe35907df7eef299a5afe1d555807badadc5fee5d096c466a46593641b8a6e24e37e9ed086a3d677a7102 SHA512 da0c115bfb8d7d138054e7e5b2cbc29449ff9ed6f63c4ea000fd630ebb87e1e72ccee7e637cc4a741aedc2ebdf68f1e799d58afc9530d3384e9d57948d7a8824
+DIST punes-0.105.tar.gz 5376203 BLAKE2B 9008ee14189d669c4c4c815de1c5498e3af22cbae52a25b538ae658fdc3fe9d39600a431e6652c84b24e20b1e713847462e4b802021a635c8f14f7d91317678f SHA512 4ce1487554218b17b0e3e2966c7b4ac0852e0b0bc83aeabbb0e3127d4952f0ef921374a97ce59990d01b5e0ac08204cca5f13476cd7e4a1e7a238850e8305d29
 EBUILD punes-0.104.ebuild 967 BLAKE2B 225fb2763ad92dee3da274b30396bd2a6759666c91689b5cd9f2a88c3097ccd410f24b3ca77437d4541dc57216b7aeaad42a0b7293abde5c5c463fce4d3dbac7 SHA512 40d1905cc954f63040b61dbe33c2864e8ef35c71cd800a39e1edbbb6a50fb09ce022bd876d8496365174e34ac62ab42a2321dfaba21b1feb0f600f1feba02779
+EBUILD punes-0.105.ebuild 1108 BLAKE2B f281520c83dba6cb74456b2929ec30a9acf2e9179c3c9b561083f338950ed3a3d7a1937a15cffed35420f6bb5b5eb8538eb7762a3e305b9c7e06f9614d33f927 SHA512 5c361a293a34750afcc7c91855619be9e8e97e0191bf352beeb5585f89778728dfdc28269b1fca1f67f8ce69764ac1a334206b17f412fd725c8e43b956fd921f
 MISC metadata.xml 625 BLAKE2B 3ae9de8ff12a46dd98f0132843cf2fe0f7be77d33497fc2a97b026adba711f2bafd04f71140bf4cddaf6242dc4a9b85ea26f8ec905f0325041dc10b0afa85e4b SHA512 d93f23a57d82c716a4b25526ba184ab135fdd81de106e90b7ba2589607d42f16c28b326e257345f34a85f7cda09cd90cda4dc6989b02b46de6350e343c71c2f6
diff --git a/app-emulation/punes/punes-0.103.ebuild b/app-emulation/punes/punes-0.105.ebuild
index a12d37ba11e8..2cf0ce244142 100644
--- a/app-emulation/punes/punes-0.103.ebuild
+++ b/app-emulation/punes/punes-0.105.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools xdg-utils
 
 DESCRIPTION="Nintendo Entertainment System (NES) emulator"
 HOMEPAGE="https://github.com/punesemu/puNES"
 SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cg"
@@ -18,12 +19,12 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	cg? ( media-gfx/nvidia-cg-toolkit )
 	media-libs/alsa-lib
 	virtual/opengl"
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 S="${WORKDIR}/puNES-${PV}"
@@ -44,9 +45,13 @@ src_configure() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
+	xdg_icon_cache_update
 	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index 62d1ceac9769..5d673ef61d40 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -4,6 +4,6 @@ AUX spice-vdagent.initd-4 1465 BLAKE2B f03734461fac2ec869b48a3e2b4c4bd7ebfe152f3
 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 1588 BLAKE2B 2daeac37a0d7c09f0849a6c3f98e59262759cc7d873b36c605752b44b8818a9f7555bb2725e1e5f91c478c352e7fc489c61f26be6859eb6a2e74200ab84dc07f SHA512 d65269c92273fae7c43114483c12517928fffebecf61fc36e3a528467749e3495a3148bab3cc0ce586e2af993086a103b375cd17ef9fbe8d1dff983a4c993990
+EBUILD spice-vdagent-0.17.0_p20180319-r1.ebuild 1680 BLAKE2B 7a9019d3e5d3e303b09f2c31b79c7ca8fd44905b19ee9e722e83c1a7ca44a7ff61340da6fb00884d8d91f3f57a5065f022da6c768fc2615c73780422505ad582 SHA512 31050b50116202a58f075443c9eeed79960c1a98bfa1501811f4f69beb21ae10ac755eaa450ddc10552c0caf5a8731ff8499dfeda6b661b160ceb6e579fbd3c9
+EBUILD spice-vdagent-0.19.0-r1.ebuild 1637 BLAKE2B 73e073f9fef1297af333154a8e5b28d169389ebc7f0b851a188cd54d1498d1b5b8989df4359cdd372ef73d912ce85cc1a5813321bf3bf22415555374a0832cb2 SHA512 28ad87eea84688392f17c49c930c8c7982731fa1aeb416126ca28c67dc4c0e0e9ab863d2f1ffcaa03c902f3a2ef7b962e5ec04cb719ad922c0da6fcb0208dff3
 MISC metadata.xml 557 BLAKE2B 03e0f3f159d333513fb7a575b46ad91167fc30e96b4e982cdb2bf545f19a53982e82698b03b02df0dc7dbfb90d9d05aa155c56aa1dc2cf6a13153145fd4231b3 SHA512 1f3892771740224f1275a9eb3507e1ac32be745340b50f983383e6b09e69de75d2e0562fd13465a588d08a4d049d0b33b233ada1a3a9883e1ee24c431fa7e236
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
index 1b644dbfda11..5a356f6ee6ef 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ 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"
+IUSE="consolekit selinux systemd"
 S="${WORKDIR}/${MY_P}"
 
 CDEPEND="
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild
index 30ce2ee207e0..de4e147bf833 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.19.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit selinux systemd"
+IUSE="consolekit gtk selinux systemd"
 S="${WORKDIR}/${MY_P}"
 
 CDEPEND="
@@ -28,6 +28,7 @@ CDEPEND="
 	x11-libs/libX11
 	x11-libs/libXinerama
 	consolekit? ( sys-auth/consolekit sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:3 )
 	systemd? ( sys-apps/systemd )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -56,6 +57,7 @@ src_configure() {
 	econf \
 		--with-init-script=systemd \
 		--localstatedir="${EPREFIX}"/var \
+		$(use_with gtk) \
 		"${opt[@]}"
 }
 
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index ff99a771d86e..1727b68c7edc 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -4,8 +4,10 @@ DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce45
 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957
 DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a
 DIST vagrant-2.2.5.tar.gz 1272879 BLAKE2B f89aed3e07f12b3390f1db089cc15bc091ee19336174260d39534c32b69a5f4682cc4d84295f81aeec80781e942b66266b37b3032aba562471ecb596d9309e92 SHA512 dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272
+DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a
 EBUILD vagrant-2.1.5.ebuild 2271 BLAKE2B 559c5a681c251d29f0c5605011340c4b05c3ae42e56afe5d283a802b20294bf2c61c47083a065b3d327c2e108efa370172866275f5177a18186dc84208904c17 SHA512 c92cbf8aa76f82c44dff2533b3f18758f4f601cb876bcca54b849547d35275993abb852845724c4d6ccb5c7eca86069cf88281c12f715c8480998aec63d15028
 EBUILD vagrant-2.2.2-r2.ebuild 2446 BLAKE2B 544a0481a24fac8e077ec9c264b238293978d5c855c8febfe731e0e780568aa80a72534b2bcbfe46908dcaf38d34c39c5e640a48ccb9015ceee4262e892a98bb SHA512 88ca23b220a1b37665beb29b4bb8988fcba5dc9c966de7d3b0d72c2c53f13e6c7b5f4fb13525984a9dcdd69add3c72a2aef1ebf16d1f6e195506c9f2b762b8c7
 EBUILD vagrant-2.2.4.ebuild 2456 BLAKE2B 9f2a1be02b05d423e136ebc500c84640380c850dab5b739ae15c5f1aaed73880c46324811ba8bc8d6b78d57387a9355fed5868669348419f24b3500d4e69eeb3 SHA512 1009cea7c291b1790e6c56f385f32812715c0e2ead2412502eb7d5753d73eed5320ad4bf7b4e28d79684f0b652cd15c6bf7d77f4d0cc87875da25d5c6805da84
 EBUILD vagrant-2.2.5.ebuild 2456 BLAKE2B 9f2a1be02b05d423e136ebc500c84640380c850dab5b739ae15c5f1aaed73880c46324811ba8bc8d6b78d57387a9355fed5868669348419f24b3500d4e69eeb3 SHA512 1009cea7c291b1790e6c56f385f32812715c0e2ead2412502eb7d5753d73eed5320ad4bf7b4e28d79684f0b652cd15c6bf7d77f4d0cc87875da25d5c6805da84
+EBUILD vagrant-2.2.6.ebuild 2458 BLAKE2B ceb701deed9427174ce31dd82b77923e3be3a019c3cea599d8cd73a6764022744416323815a321e7d303349c86ba73b34662fb8cd75da244116750345bcb0638 SHA512 5d633b46cffa56f0b991ed6e181e29b6af54b5bf44bc34b9f5ed4ddbf536eb6c37f83a5f2a92bfff26c4d6f8e050f50700a5f8afc003c91ad94f5bd7a75efb58
 MISC metadata.xml 413 BLAKE2B 1b57ae29cf2bcdf4bd7d97071e081818e114104bd5a22438e0fe47bd4bce9b2fc1b831c544579cc8b652860c9637caa9134e6f1a4abcb21216e39e62fa058862 SHA512 417deb9af12420ac037b15b526d77ea3fdad12d047c4ea9ede5465ea9ea772fe96ee1625714e74e6dbad6ee224916e9b9304c38293aec4c5e2a52555e1c9f4e8
diff --git a/app-emulation/vagrant/vagrant-2.2.6.ebuild b/app-emulation/vagrant/vagrant-2.2.6.ebuild
new file mode 100644
index 000000000000..d3796ed1651a
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.2.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+virtualbox"
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+	>=dev-ruby/bcrypt_pbkdf-1.0.0
+	>=dev-ruby/childprocess-0.6.0
+	>=dev-ruby/ed25519-1.2.4
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/i18n-1.1.1:1
+	>=dev-ruby/listen-3.1.5
+	<dev-ruby/log4r-1.1.11
+	<dev-ruby/mime-types-3:*
+	>=dev-ruby/net-ssh-5.1.0:*
+	>=dev-ruby/net-sftp-2.1
+	>=dev-ruby/net-scp-1.2.0
+	dev-ruby/rest-client:2
+	>=dev-ruby/rubyzip-1.2.2:*
+	>=dev-ruby/vagrant_cloud-2.0.3
+"
+
+# upstream specifies rake>=12 but it apparently doesn't need something this
+# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
+# is tricky, we specify a lower dependency requirement here. This way, we'll be
+# able to stabilize vagrant sooner.
+ruby_add_bdepend "
+	>=dev-ruby/rake-10.5.0
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
+		-e '/ruby_dep/s/<=/>=/' \
+		-i ${PN}.gemspec || die
+
+	# remove windows-specific gems
+	sed -e '/wdm\|winrm/d' \
+		-i ${PN}.gemspec || die
+
+	# remove bsd-specific gems
+	sed -e '/rb-kqueue/d' \
+		-i ${PN}.gemspec || die
+
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp contrib/bash/completion.sh ${PN}
+
+	# provide executable similar to upstream:
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins contrib/vim/vagrantfile.vim
+}
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 96934694a36d..e68c4cf789bb 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,5 +1,5 @@
 AUX vice-2.4.27-autotools.patch 353 BLAKE2B 01b25d40ad4dd621e32896b0c7f30715fcf0ea7cce8bffdb742caf241ebb0ed7c7d0d40c2cea852640f8b0e4d84bac1d5a87653c9641a33acd8f177a39130c80 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3
 AUX vice-3.1-ffmpeg4.patch 1971 BLAKE2B 6fcf4f8ddb3cb26727075483f8e17f8b07a22c081440356abdd733a91a41908a4d4344ad4aa2839bf79fc123a8e342d026a93e9d37bbef550ea3a6ee6dcf6741 SHA512 3240ab6287131813a56ac2c64613b5ea93560f0b0ed572b042aeed47594e7bb7c6b03e36edaee4efdc5350533dbde8adb10451658406ef9998c3c5742e08233c
 DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
-EBUILD vice-3.1.ebuild 4051 BLAKE2B 4b015996ba774adb0f2448a833edcc95b802ccdbb188b6bba848d077250ccb2679b13f08dbaca16958943f5e2b90904af1da12dbd853e26467b6eceec1e9de13 SHA512 032d6a388b51e4148577a18a0130ef0bb72b59820bafda3812152856bb1cf9acb232d06c6463834132ebce5e6e1e170be38ea08003135d1a0027c7eb7469bc3d
+EBUILD vice-3.1.ebuild 4061 BLAKE2B 043e0115b7e39e73da029034bf2cf5b851c4391850ecf7bdf17634629a1e6d65537775543457fc2b2e56e56ef0795c65791d8cf16af049cf58e8fe2153f0fbe8 SHA512 18571cc5a39baf5b1a224972adbfeb0ee8aec612c00eaf7c5cebfeabc606424ebdef21d75822a5f803b1c0ca353577596a3bcb3fa621570c7d97e1bbbb17a738
 MISC metadata.xml 646 BLAKE2B 94f3652c8e4217e34415b84f35b468febdefb688fe85b5b0b2ddafa0b3739bc36fbfaab12e4100df1cad3c5b4cd823b4af260811110da4410c09d32596ac7f43 SHA512 1d641f0e1ba5962aa7b9e230c20ade01595aed9f853be25ec4d5022aff22cbd75414a41fbf64427bf5a27485057ee3e767521561f396a5bf70ffa3e1da31739f
diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild
index e5b69137fe9b..083344470e3c 100644
--- a/app-emulation/vice/vice-3.1.ebuild
+++ b/app-emulation/vice/vice-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -72,7 +72,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	media-libs/fontconfig
 	x11-apps/bdftopcf
-	x11-apps/mkfontdir
+	>=x11-apps/mkfontscale-1.2.0
 	x11-base/xorg-proto
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 893492a7219c..c7941c6c3b67 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,9 +1,9 @@
-DIST VBoxGuestAdditions_5.2.26.iso 58433536 BLAKE2B 1d7bae647923a57cdcee38a1609a07cd081d593a0852dcf67b549ed178508e93f7ee4d076ac700ab7e7ec828e660eb09cc8a55a0f2400b1ff0912cc2fafdff7f SHA512 fea91c442d3f05a35435155d3a3890e2c29e2523f1106cc8c7fb6513826263ff450e72b393796e0dff99b3bd85d85d8d55309e81f68ddfd39689df8f54bca1fe
 DIST VBoxGuestAdditions_5.2.32.iso 49620992 BLAKE2B 04853f4b9a95898263ca7238a78b5d8751882a21874e4745d675642185542eb617f2a74b3e55b4444067822511d33b6d358e37e179d1b1c6464d701a8ab45a54 SHA512 86f1d7071a9033b7826dcacbcf23822acc772d909af8a8a12345bd5fe68375677b522d0e1987f2908412d5a29369d0a1221fd099f8b692c8d25fe9cbe40fd11e
-DIST VBoxGuestAdditions_6.0.10.iso 77162496 BLAKE2B 71c95b89055a1eeaa38f650c2572d1fbabf4425d13e5473ae4a56a488125781a33e079c6390bcc5b2499b796221ef89e7373c641b8a75bbf31ffeede4f8f0ffc SHA512 d1d1602688ebdad4975b7b800012f6195774cfa29d00900fa49ded88f6cdfe4c1abdfd25ca55b08e2fc97a7f2f204511424dd561aebd68d4ee8222b9b0f0b8ff
+DIST VBoxGuestAdditions_5.2.34.iso 49661952 BLAKE2B 2e1455d19e2e6be374b3ab4e2400b838202f8b978884a631317bcfd08ae3adfcb48dadc1ff1d26731c1c55df9e407de005291f37c28d020b7c72acc82fb77e87 SHA512 5e01d3f2692a0e0fa8651bcd4084761d67732f008d4438e3d8428e8ef39e8e5e10f0fb4637901fc733d2d773f9ddce6de7c62e471098824cf72b6fffdaf65f6f
 DIST VBoxGuestAdditions_6.0.12.iso 77195264 BLAKE2B bc7956a8eaf4a3ddc92b20c52696e298af63980bc607f8caea51ac00b826f62a3214a30a232070c3ded7a2db9d81114a81de2f6d9b04bdec1ea5cfb26808287e SHA512 83c9703588f14b6a24d878cb929fc09dddd94510f8a63092ff91864275abf8dd47f10e8bd300128305e1ed2e8504c76260b72e5d534c6d45de1e0d64d038ec58
-EBUILD virtualbox-additions-5.2.26.ebuild 710 BLAKE2B 300f594457535bad16e10b7242da27091ff0e8fe20e3db76b73f4b6a47e525f4a39f972c2ab80b0ddf6a1908d2e84996368d12e73e8feb3c7a16cee2e325f447 SHA512 ee73c7a249ae300709068273d0fbde262883334d079fe618d3fc8715112c3c52b8b07cde5229f8fe8312cc7611088ba0742fc4233a25fd75683e58dbe1376cb6
+DIST VBoxGuestAdditions_6.0.14.iso 77195264 BLAKE2B 5f87fa4f561aaed80678eaadf3cb2b08edc5cc8de49aa6039c23621c736ad5b73b70ea5e4fcfb0a484dbd170010019350a1b1b4c712148648a9eb58d648f1682 SHA512 33b265b5a5635cb490a16ded64739ced39dcd4cc3c12d381f952b24ddac4ec2de9b36d34bc6e425f6d39f6a090250f64d3b517544f9b4ee91cbaf3de3984aea9
 EBUILD virtualbox-additions-5.2.32.ebuild 710 BLAKE2B 300f594457535bad16e10b7242da27091ff0e8fe20e3db76b73f4b6a47e525f4a39f972c2ab80b0ddf6a1908d2e84996368d12e73e8feb3c7a16cee2e325f447 SHA512 ee73c7a249ae300709068273d0fbde262883334d079fe618d3fc8715112c3c52b8b07cde5229f8fe8312cc7611088ba0742fc4233a25fd75683e58dbe1376cb6
-EBUILD virtualbox-additions-6.0.10.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
+EBUILD virtualbox-additions-5.2.34.ebuild 712 BLAKE2B b5aec1c104906135655ac4a467d65620e52bc081143a40846649c693942624c944efcfc56e05dedc846070aa84032ac2dbcc2c9d7a28c33d96037d954d0728cc SHA512 42d1e17e8170e48bf493efebcbb7b9b0c0441c102af20b25b9f27c0823029d0b98f521dc47844825302f1d17c822104c83598619920cc063df6d83a4e8e87422
 EBUILD virtualbox-additions-6.0.12.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
+EBUILD virtualbox-additions-6.0.14.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.34.ebuild
index d5584316c421..6faf7e7e8a0d 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.26.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.34.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.10.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.14.ebuild
index 5124a818a150..5124a818a150 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.10.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.14.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 2aa4a601cd1b..7f62e9e19cc2 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -4,18 +4,22 @@ AUX vboxwebsrv-initd 674 BLAKE2B be1cb2574ff5e9e1efc6a137d18e67b2ecbe0e94b6a3a2d
 AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234bed907e6d1e055993f34a2459720bd8b0c56b61eae9c2e159e2b820d5117a6f9bed6ebfc3b327fa133c8f3aa812 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac
 AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.34-133893.tar.gz 26985633 BLAKE2B 718bb568a8819250f90d57d57115f84e09da5c2e29539a8585c6916fd794bf2715ea9fc340dc349dbabeab8674230bab2b311686bfb5d343b0a7bdb23578effc SHA512 b932768bbf652f29a4e4ded8e65b944da63b76a02206da77dddf2bf8504cb165c67e215d270cdb4d9ff81adc4a24c146ad9793e074b0cf4e3a3fe77619017716
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
-DIST VirtualBox-5.2.26-128414-Linux_amd64.run 89220562 BLAKE2B d937e3a8f622ed1afc8ab7d2479401c6b41f6b1404197b2d86933d741a209071b1bc98de14ea4f25b2b0f2a22a328393908f85955f8879dbf8b28e2b981e4d04 SHA512 c8d7741408d234e7c05709dd0ed66d30b427b0f39976f232b1fe8a17160d36c4dda7d3adda46a38cbdd6626d34570805f582ac0aae2a975385a1f1d06e97f354
-DIST VirtualBox-5.2.26-128414-Linux_x86.run 88339918 BLAKE2B 0fe177a8d9ab4c4cb894151a00f9554713dee27af1fe3036591a0e7865c8869eef17368ab42270d5a9081c849e6550ebef809c3f8f09a9238e2f5a5f0c9e76e5 SHA512 6a809cf29a2cd70bddeca0443955ea10044553ef85744949b604f92a8bca96b9deb1c37f723388d1f27f903c9469e7cb853a0bf7d6928bb18ba61cb19b216fba
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.14-133895.tar.gz 23160651 BLAKE2B c140375bae78f4efe02744ac1b55c76e736eefe58e6adc9edf1fd232433cc572183590963789ab88490f56c6c95154a2755ef16f044b6948801d56ff63edea20 SHA512 fdeedfefeab884a546e7f477b28052c32ab2a2782a66b3afca1e56804552f54d310fbb5dcfd494e4bdb99e7fe1df5f9e4de5263a6db2dcaf9218002607f2967f
 DIST VirtualBox-5.2.32-132073-Linux_amd64.run 83854803 BLAKE2B 3522df31f4f98efcd40adcaaf8ac458078adf0bbfed96c7d309d4726ddb8b8dd78eef830b3cfcb2f1fa6329bcc30ea2449f5c88cab66fa0c7d20818d7b5aa07a SHA512 aea9b27793f3363eba2ed627cc3b35ca51445946e6e9f20382fb3034afbb7470d27fdc476066c04acc595690a9e34109e8b8ce6dcab10fdc990b241b24ec47fb
 DIST VirtualBox-5.2.32-132073-Linux_x86.run 82943439 BLAKE2B 31a22e8b52a53d6948a5af533b5c8f374d703c44736678c0bbe6fd9b5298bed4817996c32902a69c2c59dbf751cea04f22beb7203deaeadf79d2424e123e9d37 SHA512 05f99b673224c2b3d94b0d568067ae5ee74200c88a3b7f6665988a9d0c35f69f81c07292b838d07c07fd6d5484979615fd255650b138387501a593f3833b9071
+DIST VirtualBox-5.2.34-133893-Linux_amd64.run 83895763 BLAKE2B 1f7212410c6cf1b2c58efcc0987980024a130a7d80f392ae5007c02aa7f5c3401f72c563c704a2e87282eb92d7d940e648cf6b4202010f068878005396474186 SHA512 ea369b80b8449280f7d605970f31784141bbc43420edde81ad394cb976eca19038455769d65fff9f9b2e4dd70a1c7ec406cc017dc7e50e1a6292bb7da074b845
+DIST VirtualBox-5.2.34-133893-Linux_x86.run 82974159 BLAKE2B 30e4e41fa3e3e8aaf928638ad6665a3dc874373daf99032c40381ee0e7ab2146daaf02c5b1d65e32e1fa8286cec4f898d924a9b62fc253a097d1f568538a6939 SHA512 f5fb27bb6d338841357445823fbaa5893fa338d8ef7c146f800baf3ceebb778c29239a82a4d9ceb9e23980177c5d0ccf10b3fc9b63b8b2232f23077bda4332d7
 DIST VirtualBox-6.0.12-133076-Linux_amd64.run 127118808 BLAKE2B b654fce2e9134390c7cf27e30e2c2e15e5d3bfd40df85627b266f250c112b0f4f60062d3f50dbb0e5bc0ac7f4b819694cdb65d2148b4b015b8e0c5c71c13e4ec SHA512 cce0e95de6e7ecb879807ec47cff0f4423c471132fc157e4c1656824ab5c914684db53bf73c77f9a98e72f654a7af13b21ad2954ef8f5a961b39ab9bb7c04990
-DIST VirtualBoxSDK-5.2.26-128414.zip 10159276 BLAKE2B 32a9e0a70cc63c8e0daa7080f8e10ac8a514837be98a66b00161cd0c9bf2cc42ef0a11f3a69a742a2f6745b4c8b8fe9e946e18f81cd5ef3ab2f68d5e3c95c568 SHA512 f3d1cc622734ecb0f56fcdf5728fcc747e3b084cb2358d420c55c1acd98d2f24870f0fd18cea430f118f34bca10199526ba195a314d6ce7fb6c4bc8281d89f09
+DIST VirtualBox-6.0.14-133895-Linux_amd64.run 127200729 BLAKE2B dc39bcfd02d48bebba59eda8d70bed42c24ae68385b248f168b372a36145b8eb8043f2f59496ce6fa425c2eae4dcd1c78b0d6b44c147dba29ba1362bf6bd2f14 SHA512 4bb4cb398863ec812de9580a3a831cb5aed3ec8e471a519caf58dc988691deb5de7afe56b0c96d6295d2942da142786b4a014079fbc2f3dedae86680a4460cb1
 DIST VirtualBoxSDK-5.2.32-132073.zip 10200195 BLAKE2B 0de34e166b94889c605014233142887e7a8857d1915866156a0cc63850937730ec063e63b550f0d39ad241259158f033b028dbab7eec3f6f38c3715139413b3a SHA512 ccbe2af819bff46055bd6f079a03d69e721a09286e83d4f650583bc7692f5d19ae1a725cf3a6eb1b75167a2c73ff2e020d1f932bf9cfeee9ee709d1174c4cabf
+DIST VirtualBoxSDK-5.2.34-133893.zip 10199934 BLAKE2B 4f1f82e374b90e002183272c467074608d437ed43b4a0cc6875f5560d7fafa7432c1fe32287e1afbfc5aac91cc65a226f7b164df2fd036c385c211aa11b24b04 SHA512 deaca4f2480771056079bd2f857ea4a4d834a77f19fd5fa04b6e959f6e54141e901de0387e77418fd8e6ba06de528a3dde1c7b335e9c6eb8bb3278ae08a44d7a
 DIST VirtualBoxSDK-6.0.12-133076.zip 10799655 BLAKE2B 93fc5093454a21bf5da26d00f35ab107410cddfed63c9af8494cd194cdc080a70ec8cc8af57233be0472b84a25709a3719f51d399585c1b474ddb4d40e6488ab SHA512 f270a6c404f1bf49ca6bbbc8c4fdba70e6c65001e9731a689f391e6d4c18866ceb14c94a241c15a4e5dd01e08f2c5c61f0fe7feb43ffe36acc9868a72a75603c
-EBUILD virtualbox-bin-5.2.26.128414.ebuild 8335 BLAKE2B 95852652033916357d0f518bf215377d6223348973cab35ba706c2f2924974ceba3000e2f3910279b7f01440373e089fcf204cc4b1f3dcc4f02f8976d8087c23 SHA512 d429e0eecc1128a5db042c71cf20b121279688fbd7d26a612e9e2b9c38c328822bc3c0824896098d5d5965eec1b819559e1ba9c048e5a71b1dd55836afe2d89b
+DIST VirtualBoxSDK-6.0.14-133895.zip 10801711 BLAKE2B 30f8befbd52bee336f3a63029061d1ebd76975149af1a1960bca298de2e4fee95cde80f9a7e822e589a2cc0e5a7526d07c006575a0508328b2482034e2bd347a SHA512 fd9dc1f077f8c842e0c52e08750af456973eab534e3de4d771d2c212f6024ad953426a62e82ce89895ad77d8de65d1fb39defd9c370864cb16d3d37fd9a31699
 EBUILD virtualbox-bin-5.2.32.132073.ebuild 8335 BLAKE2B 95852652033916357d0f518bf215377d6223348973cab35ba706c2f2924974ceba3000e2f3910279b7f01440373e089fcf204cc4b1f3dcc4f02f8976d8087c23 SHA512 d429e0eecc1128a5db042c71cf20b121279688fbd7d26a612e9e2b9c38c328822bc3c0824896098d5d5965eec1b819559e1ba9c048e5a71b1dd55836afe2d89b
+EBUILD virtualbox-bin-5.2.34.133893.ebuild 8337 BLAKE2B a161528da30c953125f535bcf94ea252c58f3ec7b7b0f2e8c75124685246e195423a23f37ee948ebfd9c12f8b292330d7a6f156c6d771d64b86d0c4149349e50 SHA512 d8303f454165a287575b24496657208afafa680d2854df917127746fb6ef1ae2fd68195eeadd4e626ee4e26c1c0200b68134b0402f07278023982bf9ff4ecfa1
 EBUILD virtualbox-bin-6.0.12.133076.ebuild 8498 BLAKE2B 0d7ceb1c762a8fcaf5b57c2b13084ad4e6e1883ccd33f1505a324808b69c543ba9d40127ae1d649ea0459ebc2133529fbd323c9b7771ea9dcceac92bd233feae SHA512 7fba20a288e059bd415423df2ad5207a4b3f9d0aca363c5bc03fa60b44716c9e184ea800dd0f0ef0a0b4096eade613df73d5149d531b50be857fa4fe2970ca18
+EBUILD virtualbox-bin-6.0.14.133895.ebuild 8498 BLAKE2B 0d7ceb1c762a8fcaf5b57c2b13084ad4e6e1883ccd33f1505a324808b69c543ba9d40127ae1d649ea0459ebc2133529fbd323c9b7771ea9dcceac92bd233feae SHA512 7fba20a288e059bd415423df2ad5207a4b3f9d0aca363c5bc03fa60b44716c9e184ea800dd0f0ef0a0b4096eade613df73d5149d531b50be857fa4fe2970ca18
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild
index de48142651ba..cb4e5663f7c1 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.26.128414.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild
@@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="bindist mirror"
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild
new file mode 100644
index 000000000000..ea3b735a7474
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	KEYWORDS="~amd64" #~x86
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+	#x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="bindist mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} $(usex headless '' VirtualBox) ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} $(usex headless '' VirtualBoxVM) ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 4750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} ; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+		done
+
+		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 851916da2a15..4e3a672c5a18 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,9 +1,9 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.10-132072.tar.gz 23160596 BLAKE2B 5cd7d1490305236f99b759520b4c63afd207cab53e861aaca0b0c318fe96f991756db60652bf65b26b5b9690366b6a5df13c225b44df75a30c1cc04badc7dbb2 SHA512 2c99b9917c65b4287bd1b78e9b9312630850307becea526188f97de569f541fab6bfbc4d5cff2ea9aab784dc4bbb23ada3679f76116ba94169f9c73566cc6c09
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.34-133893.tar.gz 26985633 BLAKE2B 718bb568a8819250f90d57d57115f84e09da5c2e29539a8585c6916fd794bf2715ea9fc340dc349dbabeab8674230bab2b311686bfb5d343b0a7bdb23578effc SHA512 b932768bbf652f29a4e4ded8e65b944da63b76a02206da77dddf2bf8504cb165c67e215d270cdb4d9ff81adc4a24c146ad9793e074b0cf4e3a3fe77619017716
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
-EBUILD virtualbox-extpack-oracle-5.2.26.128414.ebuild 1013 BLAKE2B 822e606ede4d2981350c5a553af7632bb310ad32bb57bd6ecd6c65c9c105f3c571243df92c0be0400b483488e063f6f8def5dd7c63ab2fb5b936bccb26cfb00e SHA512 5d68098ef54662639f62de3262297e912d8b786a9509c5692363830a2f343d6ff5f217bf8db25f53dd7d9f38a86a354de8948e920437acc0fa70f4ba9fdb5a07
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.14-133895.tar.gz 23160651 BLAKE2B c140375bae78f4efe02744ac1b55c76e736eefe58e6adc9edf1fd232433cc572183590963789ab88490f56c6c95154a2755ef16f044b6948801d56ff63edea20 SHA512 fdeedfefeab884a546e7f477b28052c32ab2a2782a66b3afca1e56804552f54d310fbb5dcfd494e4bdb99e7fe1df5f9e4de5263a6db2dcaf9218002607f2967f
 EBUILD virtualbox-extpack-oracle-5.2.32.132073.ebuild 1013 BLAKE2B 822e606ede4d2981350c5a553af7632bb310ad32bb57bd6ecd6c65c9c105f3c571243df92c0be0400b483488e063f6f8def5dd7c63ab2fb5b936bccb26cfb00e SHA512 5d68098ef54662639f62de3262297e912d8b786a9509c5692363830a2f343d6ff5f217bf8db25f53dd7d9f38a86a354de8948e920437acc0fa70f4ba9fdb5a07
-EBUILD virtualbox-extpack-oracle-6.0.10.132072.ebuild 1073 BLAKE2B 05694fdc8c4b39bf7b4f2953febcbc99305b3a8a8e1e50534b47130dca7782c6a9003d70c59f09b5ab92896d56a0ea0b6d9b29d148b4b08a7dff66656445680e SHA512 884d1e2a800342f1b21c2af0f295dc99c5bb92282595c731718536050667957dae8f872a394b9b2df4603a05e0b2c130281af93c62ef719f42b5dd4193d80a20
+EBUILD virtualbox-extpack-oracle-5.2.34.133893.ebuild 1015 BLAKE2B 49d996fa6acf74e1d4f47dfa0cde10f4673a6e5c704ce43f36d5c2f533148cfbeecab4721fd7c233167e1f5db946eff4399601c4d02de5b7dc8c9447ab62faa8 SHA512 7e81290872ad14b61ebcd21d83cac3b307b429be1babcd0304d4f8fa415426f638cc49a99a8d45cabbff84c5d9c355c7e411febdfa2df630d81920666d4e1448
 EBUILD virtualbox-extpack-oracle-6.0.12.133076.ebuild 1073 BLAKE2B 05694fdc8c4b39bf7b4f2953febcbc99305b3a8a8e1e50534b47130dca7782c6a9003d70c59f09b5ab92896d56a0ea0b6d9b29d148b4b08a7dff66656445680e SHA512 884d1e2a800342f1b21c2af0f295dc99c5bb92282595c731718536050667957dae8f872a394b9b2df4603a05e0b2c130281af93c62ef719f42b5dd4193d80a20
+EBUILD virtualbox-extpack-oracle-6.0.14.133895.ebuild 1073 BLAKE2B 05694fdc8c4b39bf7b4f2953febcbc99305b3a8a8e1e50534b47130dca7782c6a9003d70c59f09b5ab92896d56a0ea0b6d9b29d148b4b08a7dff66656445680e SHA512 884d1e2a800342f1b21c2af0f295dc99c5bb92282595c731718536050667957dae8f872a394b9b2df4603a05e0b2c130281af93c62ef719f42b5dd4193d80a20
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.34.133893.ebuild
index d8c083d99b72..613a651a15e6 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.26.128414.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.34.133893.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist mirror strip"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.10.132072.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.14.133895.ebuild
index 0252ea9c1872..0252ea9c1872 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.10.132072.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.14.133895.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 419bd65d88eb..ad125cb86a38 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -6,14 +6,15 @@ AUX virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch 2951 BLAKE2
 AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
 DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e
-DIST VirtualBox-6.0.10.tar.bz2 154284088 BLAKE2B 6aeb2384a777bb39e7c2692c1e262914296650f1448e8db45a03b864a824d3e8b337208087fa7f4469b1ee15e39c8cdae3707f742eb229872e8cb681d118880c SHA512 96fa3c672790239163829b3c40ac0d75d717b29a7b947ec48709eb7811c5800e314a0fc90d87810e4a03da40b3a65914605f648b287314386b371489e5d974c9
+DIST VirtualBox-5.2.34.tar.bz2 118268064 BLAKE2B 2ac0359e35012662e850e16e6ee74c4c00898a02eaa9a3dcf4299c444efaf56c17e02b33f165c37a22598ab3967169d32c03c383ca253aaaaa3d9d5bafc9b50f SHA512 a5f8771ddcdf2271006f2ce7de497cfb73cee46c51b0c761c9e79d03bbdf44441e3f1e4ce569967de5c33c469b7b664901c998ca9107acee7fe0ea83896bf0c2
 DIST VirtualBox-6.0.12.tar.bz2 154250538 BLAKE2B 1c0da29a1d4f4a9ce57280593b219d1fe507fa31dd419d5ef7e62fa8b76bc8b7b21a414edec79ce03b7b4471176e322cb5a0a592a7f61c1f6096c59ca16072ce SHA512 a2182750c6b7e2f7fe8548a923829c05167b739ad84ed025e6cfd85ce787aaa43d41c72c5a93f17e6b976561bae0aa538d81830c52c1d326b75f5a32ba3d441c
+DIST VirtualBox-6.0.14.tar.bz2 154236138 BLAKE2B 18cd508269b2a809ec03b5bacc197131ebd775354e16b9141573ddd037de9ba180e3186347e77067a1767169d2ab1e9ff21590a2702b7705c87cf326204d3424 SHA512 e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
+DIST virtualbox-5.2.34-patches-01.tar.xz 2960 BLAKE2B e62ab64939e9251a715b3b54b479bc51315acf561ce3d542a4b1358cefb2158353a046003cb0a62e78015f01b626719afb39590090662dd58bfc587bd63cb994 SHA512 25f402c0f96ac25c4d1afdf5d9fff60292caabd2af032a7e2f3e1f70e85bb24f03bbe3625b8bdb7618f77d2890e4c0b9fa7ade2eed590f6658361cca3db4a4b9
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
-EBUILD virtualbox-guest-additions-5.2.26.ebuild 6114 BLAKE2B 894f6fc0a4f021a905b51c1d56f7bf06f692a84af7c5f37b6fe3dd138c30c7e005d78998610a4503e7032757f51dc002dd89d57be731cbad5733ecbd139e6b8c SHA512 e042d7159a77f10c8f671d77b30a83a27f61d96cb1d822218da5084e4932ae6c1df4d758c6b0bab0d7ed29be3f8c4cf92a8dd188fb8c54c53c35e1b13698ead5
 EBUILD virtualbox-guest-additions-5.2.32.ebuild 6114 BLAKE2B 894f6fc0a4f021a905b51c1d56f7bf06f692a84af7c5f37b6fe3dd138c30c7e005d78998610a4503e7032757f51dc002dd89d57be731cbad5733ecbd139e6b8c SHA512 e042d7159a77f10c8f671d77b30a83a27f61d96cb1d822218da5084e4932ae6c1df4d758c6b0bab0d7ed29be3f8c4cf92a8dd188fb8c54c53c35e1b13698ead5
-EBUILD virtualbox-guest-additions-6.0.10.ebuild 6001 BLAKE2B 20cd1ce48e0c9fab06c8f486b23f9b5ac73b4881dad607e4a9c91c9275e375e656749008368f32d9d9db5066f7efe6422511897bc46217b9b3ad686482c80c73 SHA512 d8b9772b0ac02cb6fb2d7944cfa206869693b74d0406fb29d8a0b782b15bb98d33c4eedbe824ff58c6f13e61c119403fd9cb545184677ae11c55a3dbe10d5bfc
+EBUILD virtualbox-guest-additions-5.2.34.ebuild 6116 BLAKE2B 2506803b2edc56d059895ebc363afd75243e1d6ebe26fad1fd07dbdf125e8b44bdecaec9d30478cc8353ab8836970c8fdfed780d01fe45745c7d1038fe76ab01 SHA512 4ac04c2189aecc34317e7abb893e53780be5bbcf2ca61d5b794af52e62e39e038c319a23d9bc15de9ac06a11c9242174d7415d00545f2357996c1bacbb2c8d8b
 EBUILD virtualbox-guest-additions-6.0.12.ebuild 6149 BLAKE2B 95db5659ab2b6b89dea567768ae31d15e1bdabe8614c692c0460c14bc3a3f4ea5c34409b1e69bd952bfc1083c6132e12663a48bd88ef22c649ac1bd415fa40cf SHA512 643dd0ff05d296f032b5832c63d8f730ac7df78e0157deca4ebc204dbdbb87a79c176e8d7c07a8cdd0873c084d63719077936e02dc0664a64500c25f1b279fb4
+EBUILD virtualbox-guest-additions-6.0.14.ebuild 6001 BLAKE2B 20cd1ce48e0c9fab06c8f486b23f9b5ac73b4881dad607e4a9c91c9275e375e656749008368f32d9d9db5066f7efe6422511897bc46217b9b3ad686482c80c73 SHA512 d8b9772b0ac02cb6fb2d7944cfa206869693b74d0406fb29d8a0b782b15bb98d33c4eedbe824ff58c6f13e61c119403fd9cb545184677ae11c55a3dbe10d5bfc
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.34.ebuild
index e3a38e9dd881..c672d02986f6 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.26.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.34.ebuild
@@ -11,11 +11,11 @@ MY_P="VirtualBox-${MY_PV}"
 DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.34-patches-01.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.14.ebuild
index efbf2bd2fdf9..efbf2bd2fdf9 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.10.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.14.ebuild
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 16235572656d..63e588db763e 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,12 +2,12 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1de
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
 AUX virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch 2930 BLAKE2B a6875c7b0e93caf7388db66e4e76df0c0c0e41f01fd57a415b6ad4cf128570a8cb0330adf26fb45e40c6104d029f40bac53ef0fcbd061b391372c24459693fee SHA512 0da03204d3575563abb95036d54fccf5a002413b5a2ee1f9a5d4ab3433062fcc49d6fe41cc05e5775b3c9d703227e79cb6bae193f6ab2d2bdab306d37abf985b
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
-DIST vbox-kernel-module-src-5.2.26.tar.xz 642096 BLAKE2B fa908b8dda4c49e880005f22d4ec159ba4e84b20d3cf8f514ec5ad0ea556499b0df25fb714bb5f9a3474e6fc1cba67f6d56fddaee748b9561bbe31a003dd0657 SHA512 7f37be1b35772d59cd3df9b61dec436450de3c038faf2cd22fb891fee7270aa7f87f146f72497ffeb63dfe869cccd3f2788562d23fc51afd83ca19159f2a6810
 DIST vbox-kernel-module-src-5.2.32.tar.xz 642428 BLAKE2B 0dda5cb5608c1eed22bea209564d53c5f7eab58ca620db2cc441e3c1ba9ad66609c4ef13df07fd29b691f2941a070f9852e8729cd386081df6a82ede345f33c5 SHA512 fadedab690cb7dee8b9a6747ed711d924bf3bce8999b24e7b64cb8738c53c2fa7372b1a8e8535e7e4ef0235aec02d4a3f1f67cd07d7621934fab684c5163329e
-DIST vbox-kernel-module-src-6.0.10.tar.xz 669008 BLAKE2B 80250aeca8421aa0b88efb1d090f78d0bc6c7b4b2c3b7e0c5c7953d9ef5246ee25df6fa14b75b821e1e3d05cda3ff975560ede89dc482e34faa801a592405a9f SHA512 afab0130c14b86e822f2a9528373388a9eeee952deec9ff7158e4b788b64343235f3a3da10218bfabcb71dd4d89c8ace0031ea9b64d7385140f6c580b5087333
+DIST vbox-kernel-module-src-5.2.34.tar.xz 642756 BLAKE2B 8a1dacc71b0c033130db84f46ab6029839e4c95cd20b6c982716fde9a83070f4597a9418ef2747c5b5714eafd5c1453c67eb1477104cd1185baf408301bc0226 SHA512 2feefa7867c664f1a1af04181e6db4cf2ab18e8a42dc57afe5fe13d35de889c2a88b79eb43642e024d99decfdd79c42891989158016edb09d5001783c4cb7ac3
 DIST vbox-kernel-module-src-6.0.12.tar.xz 669148 BLAKE2B 2291e3fcb9f049ce5657288151d182dfc9a3d6d6e8e1b32047e4b682f35e56f0a5bb5d3ad7efbc98082d2d1823aeb821099e9878b8a237322e8900fb2e2d65de SHA512 e9d8fcbfc076bf4e7d4dc5954e0c24509273c6358ee2de9ddfa87ea650b69fdc31d223595d610c1dd921efd6620ba5285f7f6a10170e90e706bf731e3629dc51
-EBUILD virtualbox-modules-5.2.26.ebuild 1187 BLAKE2B 87f131dcdde7d6acf35a48183ed2423c20366d1c57bfde56b9c6b265006b049d6d5cf2f058867150f30cddfda308512907702208c15d4ae5a868c6e8d6468091 SHA512 80d1deb4b4142e7a4b718a460829ed99e5a4c24e50d65266263a872d247de519972bb13623881382ca8e12a4387e94f327fb9491728dff65ce8449244df0199f
+DIST vbox-kernel-module-src-6.0.14.tar.xz 669396 BLAKE2B e2dc77f33176af16be0fcad8851dd42eb2b7b21da35dc434951e3300e45fec4b516741f6122ae43aed2ee332323221098f047b5206ca63eb7741925a40682728 SHA512 1bcc78dff3305bb7186cec2a844188411a62fe32d0581c4de21843ee513925d5dfc9bd4dedb3cc90f0e1c165c7ae6d856590cc359e36cc8605b164c2c9979380
 EBUILD virtualbox-modules-5.2.32.ebuild 1187 BLAKE2B 87f131dcdde7d6acf35a48183ed2423c20366d1c57bfde56b9c6b265006b049d6d5cf2f058867150f30cddfda308512907702208c15d4ae5a868c6e8d6468091 SHA512 80d1deb4b4142e7a4b718a460829ed99e5a4c24e50d65266263a872d247de519972bb13623881382ca8e12a4387e94f327fb9491728dff65ce8449244df0199f
-EBUILD virtualbox-modules-6.0.10.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
+EBUILD virtualbox-modules-5.2.34.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
 EBUILD virtualbox-modules-6.0.12.ebuild 1316 BLAKE2B 996e40c230c441f6a5ba9020e2236a311594b3a02f56b0f50482f91e3dcec936be021ef18470681483c6f6ed3934430184a4b9a241abf413c9af2ce57734600c SHA512 6cbb8bfe065b65093d9c7566e2601ce3464c61f0afae12f35584bb3ba5ec3e8b850c99f864c021b6da66170819bea68b87cad8d6c796ac9d57ea8aac5842074f
+EBUILD virtualbox-modules-6.0.14.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.34.ebuild
index c0ab27d0eef5..c4b01a1b3f96 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.26.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.34.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
index 7257cb3b5812..7257cb3b5812 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.10.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 40620aa3e0bb..4cd814447680 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -9,14 +9,15 @@ AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f6
 AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
 DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e
-DIST VirtualBox-6.0.10.tar.bz2 154284088 BLAKE2B 6aeb2384a777bb39e7c2692c1e262914296650f1448e8db45a03b864a824d3e8b337208087fa7f4469b1ee15e39c8cdae3707f742eb229872e8cb681d118880c SHA512 96fa3c672790239163829b3c40ac0d75d717b29a7b947ec48709eb7811c5800e314a0fc90d87810e4a03da40b3a65914605f648b287314386b371489e5d974c9
+DIST VirtualBox-5.2.34.tar.bz2 118268064 BLAKE2B 2ac0359e35012662e850e16e6ee74c4c00898a02eaa9a3dcf4299c444efaf56c17e02b33f165c37a22598ab3967169d32c03c383ca253aaaaa3d9d5bafc9b50f SHA512 a5f8771ddcdf2271006f2ce7de497cfb73cee46c51b0c761c9e79d03bbdf44441e3f1e4ce569967de5c33c469b7b664901c998ca9107acee7fe0ea83896bf0c2
 DIST VirtualBox-6.0.12.tar.bz2 154250538 BLAKE2B 1c0da29a1d4f4a9ce57280593b219d1fe507fa31dd419d5ef7e62fa8b76bc8b7b21a414edec79ce03b7b4471176e322cb5a0a592a7f61c1f6096c59ca16072ce SHA512 a2182750c6b7e2f7fe8548a923829c05167b739ad84ed025e6cfd85ce787aaa43d41c72c5a93f17e6b976561bae0aa538d81830c52c1d326b75f5a32ba3d441c
+DIST VirtualBox-6.0.14.tar.bz2 154236138 BLAKE2B 18cd508269b2a809ec03b5bacc197131ebd775354e16b9141573ddd037de9ba180e3186347e77067a1767169d2ab1e9ff21590a2702b7705c87cf326204d3424 SHA512 e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
+DIST virtualbox-5.2.34-patches-01.tar.xz 2960 BLAKE2B e62ab64939e9251a715b3b54b479bc51315acf561ce3d542a4b1358cefb2158353a046003cb0a62e78015f01b626719afb39590090662dd58bfc587bd63cb994 SHA512 25f402c0f96ac25c4d1afdf5d9fff60292caabd2af032a7e2f3e1f70e85bb24f03bbe3625b8bdb7618f77d2890e4c0b9fa7ade2eed590f6658361cca3db4a4b9
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
-EBUILD virtualbox-5.2.26-r1.ebuild 13967 BLAKE2B c31306369c0e45061b211986f0711aac54aa60d4cfe8f0e2311d2af1c24f62bed4e75e277591711dc1e86878d4fd773b1df17c0f796a9b4f8d3456391a38ba53 SHA512 0a66db90ab0d415a3c3f3adc2daa726c4776c4db93a7b2ebc495213360b8d50cfe3eef30ed808138e76e8aadf698f31e3427811fb33beb63b7b0a5a3abee9829
 EBUILD virtualbox-5.2.32.ebuild 14473 BLAKE2B 4498464c3d219b3d89cd9e0c0e2e40f95e10024bd0c94e677cd1f96aa56b2f69c3278be9096eeead59c6433b0af1641eb84ba592d8eb4e76aa45b129d8f131dd SHA512 b0d156d10e8af35c19033ce1bdc9381b472c199406808789598b90b5c5fa3a694d258e06c28f712deda49bc02f258c6a0d86c070879846936b5b357f977a26b1
-EBUILD virtualbox-6.0.10-r2.ebuild 14581 BLAKE2B 1eeb82ddd9a5c8da8719f939fcadabd98354765a5e804f93605a8a56949ebcfd5a4acfdc7b05013ac41f5cdd5a9ba20bf080ab121078dcee4d1856d31df9b2f7 SHA512 6d3fb30f7955f03368408093db5808ee759f2a1530f7d0cbbc4f5edd988191054ff6bc739f71a62b48cdebbc0f8d0f406396e098f613a8009e693be66bdaada8
+EBUILD virtualbox-5.2.34.ebuild 14425 BLAKE2B af138f1129ae76cc015215d9b8246eca2ab3bbb0e7407e302514335844b58a271396970af3be0ec3127baa20507867458d9e4814488fdd0b576f267b0fe5a2f2 SHA512 97cac7fcac7e4e82370a3fdff345c46fa501f1f99f9e095f36d2b84eeee459931062f5b7afbd3570191a0f9525adf83e7c78f50b4f9494614f02294ff3930665
 EBUILD virtualbox-6.0.12.ebuild 14580 BLAKE2B 8216a40e53ab0fbae65aa7043463b96944b8673bcfb36c753ffb525780af65c92904765d443dc157dfe39e62a0fc511c54df74233e183bf3417cc7ff77182ca2 SHA512 fe38948468c23d8fe7fcaa237570f390e1e6fa4ad8b0d7b52cada8d35355aee51f7cab7a7096ea351ca9ccb1ffe6814496729be840155eb7791e04c337e36364
+EBUILD virtualbox-6.0.14.ebuild 14580 BLAKE2B 8216a40e53ab0fbae65aa7043463b96944b8673bcfb36c753ffb525780af65c92904765d443dc157dfe39e62a0fc511c54df74233e183bf3417cc7ff77182ca2 SHA512 fe38948468c23d8fe7fcaa237570f390e1e6fa4ad8b0d7b52cada8d35355aee51f7cab7a7096ea351ca9ccb1ffe6814496729be840155eb7791e04c337e36364
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-5.2.26-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.2.34.ebuild
index 97af8a017a9c..99e428abb937 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.26-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.34.ebuild
@@ -13,12 +13,12 @@ MY_P=VirtualBox-${MY_PV}
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
 HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.34-patches-01.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -28,6 +28,7 @@ RDEPEND="!app-emulation/virtualbox-bin
 	dev-libs/libxml2
 	media-libs/libpng:0=
 	media-libs/libvpx:0=
+	media-libs/opus
 	sys-libs/zlib:=
 	!headless? (
 		media-libs/libsdl:0[X,video]
@@ -51,7 +52,6 @@ RDEPEND="!app-emulation/virtualbox-bin
 	libressl? ( dev-libs/libressl:= )
 	!libressl? ( dev-libs/openssl:0= )
 	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
 	vnc? ( >=net-libs/libvncserver-0.9.9 )
 	${PYTHON_DEPS}"
@@ -219,7 +219,6 @@ src_configure() {
 		$(usex doc '' --disable-docs)
 		$(usex java '' --disable-java)
 		$(usex lvm '' --disable-devmapper)
-		$(usex opus --build-libopus '')
 		$(usex pulseaudio '' --disable-pulse)
 		$(usex python '' --disable-python)
 		$(usex vboxwebsrv --enable-webservice '')
@@ -425,6 +424,22 @@ src_install() {
 		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
 	fi
 
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	if use vnc ; then
+		insinto ${vbox_inst_path}/ExtensionPacks
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${vbox_inst_path}/ExtensionPacks
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
 	if use doc ; then
 		dodoc UserManual.pdf
 	fi
diff --git a/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.14.ebuild
index a451933cccba..7b77c1872296 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.14.ebuild
@@ -22,6 +22,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
+	${PYTHON_DEPS}
 	!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
 	dev-libs/libIDL
@@ -56,7 +57,6 @@ CDEPEND="
 	opus? ( media-libs/opus )
 	udev? ( >=virtual/udev-171 )
 	vnc? ( >=net-libs/libvncserver-0.9.9 )
-	${PYTHON_DEPS}
 "
 DEPEND="
 	${CDEPEND}
@@ -69,6 +69,7 @@ DEPEND="
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/kbuild-0.1.9998.3127
 	>=dev-lang/yasm-0.6.2
 	sys-devel/bin86
@@ -85,7 +86,6 @@ BDEPEND="
 		dev-texlive/texlive-fontsextra
 	)
 	java? ( >=virtual/jdk-1.6 )
-	${PYTHON_DEPS}
 "
 RDEPEND="
 	${CDEPEND}
@@ -197,7 +197,7 @@ src_prepare() {
 	fi
 
 	# Only add nopie patch when we're on hardened
-	if  gcc-specs-pie ; then
+	if gcc-specs-pie ; then
 		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
 	fi
 
diff --git a/app-emulation/vmips-cross-bin/Manifest b/app-emulation/vmips-cross-bin/Manifest
deleted file mode 100644
index 69e30216cb89..000000000000
--- a/app-emulation/vmips-cross-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vmips-cross-bin-1.0.ppc.tar.bz2 9301855 BLAKE2B 7917419fc7d7c2e04442029ae6606de9bae370acf259224cf1bf1923883eaf61e2fde4ec39b6131741cbd6d8466712de19c8adc2de58d75a8df8f79daf5584f8 SHA512 e1296dcc457133e8ab42f3cff42ee26d5744a6ed89d7b5b217d6aec63a36d463bae1a022365d5586208b1f59cad4c5f7964d82ea78bebd4c9a354f817cbbf4dc
-EBUILD vmips-cross-bin-1.0.ebuild 382 BLAKE2B 9480b7492b5e60d607b1a6af2da2dc365eeecd3c1f5a8caa97b6d49eb788a5366ad77fe8746477b4938e8a397ea089f475cc60c30a9a26d9f8a07e5cedd85db8 SHA512 e83a061d7d0888048ac4bd88ce53c316bae14cbec5be88418d88112f5ae356c50fb5d54a43a9c131098a02a35c38a5f95d8ded66f09946694a568562117be462
-MISC metadata.xml 242 BLAKE2B b47a6fe96061f6b3f54ac91552625275c58b7aad19b84494ea39cad5c5b83441d0dba97b98384d75b16cf80cf0f6ef720e47f50abd3d02851c2cc59ddef8a987 SHA512 9342202fdcc8fcaa01e693f8430b42018efd5889460f2cac7289705c1e076daf37bdc36ea32f0d275feee56a1c56535233cf6bab28bf837bbaccc4ed40c42058
diff --git a/app-emulation/vmips-cross-bin/metadata.xml b/app-emulation/vmips-cross-bin/metadata.xml
deleted file mode 100644
index 68616d1d386f..000000000000
--- a/app-emulation/vmips-cross-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">vmips</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/vmips-cross-bin/vmips-cross-bin-1.0.ebuild b/app-emulation/vmips-cross-bin/vmips-cross-bin-1.0.ebuild
deleted file mode 100644
index 6d8f0cb6e33e..000000000000
--- a/app-emulation/vmips-cross-bin/vmips-cross-bin-1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SRC_URI="ppc? ( mirror://gentoo/${P}.ppc.tar.bz2 )"
-DESCRIPTION="vmips cross-development tools"
-HOMEPAGE="http://vmips.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc"
-DEPEND=""
-IUSE=""
-
-src_install() {
-	mkdir -p ${D}/opt
-	mv ${WORKDIR}/mips ${D}/opt
-}
diff --git a/app-emulation/vmips/Manifest b/app-emulation/vmips/Manifest
deleted file mode 100644
index b387cc4a852f..000000000000
--- a/app-emulation/vmips/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vmips-1.3.1.tar.gz 1144409 BLAKE2B e39942e397c9c21d5861141a01ef1cc828a6785d88795215a59a7bb4b846677d75844f4e798b874bf6cc16cbea603638f4e6c3d7d1e3558b434bbad713d8ddad SHA512 53f2277dad25b7a6a7b811c58d2b2e22496476cb57815835715789fd73f1c1279a0ad0ae3663a257a962a61182dc1b0be0f6f76d118a064b433f04d995ef915a
-DIST vmips-1.3.tar.gz 1086275 BLAKE2B 3952e53ff40f93a3637a690444bb5b5deca230fad5470ec2a78ea057243b2fc68e54048b74df6f4066ef9c99d27ca243c6210c37c868d242038a8d8510faacc4 SHA512 9c0aa01588645c4083041ba7fdcd35d6e4e03a9df69c98853a060c91e921bf754701baa4f81611342d0a5245c6f71a8497bf558c2826d0a8b14a876a2087a8e4
-EBUILD vmips-1.3.1.ebuild 370 BLAKE2B 4c42df64627e8677480242c64c74e5d48850a66b5bae4ff19e97384dc27b6fe609453901b6c090e18ba9c8266e8abb250fedd58f78849271a5b950f05bbe0d0d SHA512 2d4432aa2a50e35988f71f54c6833af96283e0a92ef8c7355a495635f0f88253456778e8e30183e38cff26657776900f53dac2df4f6df10b4fe0d66aa094988a
-EBUILD vmips-1.3.ebuild 369 BLAKE2B d48ac12c0ebda55d90416c430f3c41e59f49ca82750aacc3cd0f3d8a6d11c8656df85d6748a6dd797b0670def98d0565bc6eb178c4c5b5d979d1a7b7e040938e SHA512 6f4e28dd6a73ced6f5e6f792da7c558e5d0fe7c2365247543c5fe11f71a5ae50b30f6a4a85db7796691cda3135fe9ec33580d357ecbf0c6d3a366ce3821bf187
-MISC metadata.xml 242 BLAKE2B b47a6fe96061f6b3f54ac91552625275c58b7aad19b84494ea39cad5c5b83441d0dba97b98384d75b16cf80cf0f6ef720e47f50abd3d02851c2cc59ddef8a987 SHA512 9342202fdcc8fcaa01e693f8430b42018efd5889460f2cac7289705c1e076daf37bdc36ea32f0d275feee56a1c56535233cf6bab28bf837bbaccc4ed40c42058
diff --git a/app-emulation/vmips/metadata.xml b/app-emulation/vmips/metadata.xml
deleted file mode 100644
index 68616d1d386f..000000000000
--- a/app-emulation/vmips/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">vmips</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/vmips/vmips-1.3.1.ebuild b/app-emulation/vmips/vmips-1.3.1.ebuild
deleted file mode 100644
index 0430de4046a4..000000000000
--- a/app-emulation/vmips/vmips-1.3.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A virtual machine simulator based on a MIPS R3000 processor"
-HOMEPAGE="http://vmips.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-
-DEPEND="app-emulation/vmips-cross-bin"
diff --git a/app-emulation/vmips/vmips-1.3.ebuild b/app-emulation/vmips/vmips-1.3.ebuild
deleted file mode 100644
index d640ab369f7e..000000000000
--- a/app-emulation/vmips/vmips-1.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A virtual machine simulator based on a MIPS R3000 processor"
-HOMEPAGE="http://vmips.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE=""
-
-DEPEND="app-emulation/vmips-cross-bin"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 07261cb8d31e..2f4ce892b472 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
-DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
-DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa
 DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86
 DIST wine-4.17.tar.xz 22230616 BLAKE2B 428d9b781acbadabb2ce677b08c1a38f130c39d2acb95364dc0ac4cfef8f7c9efe4199846bf0bfc745dc25ba632847f224da1b0a09b8ee6c4927154771a538cf SHA512 f762aab2596a4b5cf73d3282be561d25a2fe69e5d4a5ec2e29db47b3eda7496ca9eb7e57ff7765853d258422898bfa775bf9b458e61eef837b213e422bd748b8
-DIST wine-staging-4.14.tar.gz 9910499 BLAKE2B 2e9d2983156a3f309e740503825ff0ebb2461ffc785147e9853122e7d64269409f7e73fea0b5a0fac149a4fb7d27a11cdc8ba0759ca9fc0fb0492d8d3884c503 SHA512 481a50f4ba3f1c445bd5b9754d7b27bdcd0bc386930e3597051a0962778288f8d4649e9f4e8bc188738c6896821a198f3af15b47e9db719f52d0b3db16a407f0
-DIST wine-staging-4.15.tar.gz 9904734 BLAKE2B 163d6f51a6fe649c8c107b013aafa5c5729bb93cafe94446cde966138c18d5aed2e950ce9a71ae4c719efb358406af079efb21cc8546d97e2b7146a5cae27a56 SHA512 0c34695c1d39773fb34a58f0cdb91d427945615e7b76b8a7222bc84fda8df08125832297b75aca55e69511b6b3686df70dade84bcc7cc9324f30c042146761b0
+DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
+DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
 DIST wine-staging-4.16.tar.gz 9905714 BLAKE2B fe72d1123c7f418dc9702b113679de7d21a8f20b2bed5e9b2f7a2b411ca28b407e0d2d134dee19ee06414df7a3ccfaa784d5689e3dc79043544d17c6768e6a17 SHA512 8782e4aecb34443404b1ac02c6b1ba91887ad12f07c7960601f879b034937d5ee6f1c1493437e765804beed6e68fa20383f7c02a09534526cc5f4bb857048faf
 DIST wine-staging-4.17.tar.gz 9914906 BLAKE2B a5a430588aaede6f6ac2e30710bf58d57100a37444a2610b57529116b2d9b88a6f4bcfb56ad71153734d8f1a99a70eab4cb568d3cfb6d5ce6198eb662e3cc201 SHA512 1f27511c8ff6619f4138eb3b2cd0cc1cdf42c0cd4206c68bdf792ae17c339611016e32babad121f0decf20331f7ce4400033be03c4db26cb6a4dc601c9c4b14d
-EBUILD wine-staging-4.14.ebuild 20292 BLAKE2B 2fade16f762642ec7292a42c5a1af18039745fe15e09102419fd46bb99870b0b2b8804ed38ff1e6f46b19631b756ba80c40833844d2d97db378232ea67c65d63 SHA512 3551365f1392d538ea63a133fa3019e6fee8e1556ea47a8d9c23ebd5e614243a6271096f2f89829f105af9d3d340774f3c3c0ee2e0f6d6343baf8daebbc5972e
-EBUILD wine-staging-4.15.ebuild 20292 BLAKE2B 2fade16f762642ec7292a42c5a1af18039745fe15e09102419fd46bb99870b0b2b8804ed38ff1e6f46b19631b756ba80c40833844d2d97db378232ea67c65d63 SHA512 3551365f1392d538ea63a133fa3019e6fee8e1556ea47a8d9c23ebd5e614243a6271096f2f89829f105af9d3d340774f3c3c0ee2e0f6d6343baf8daebbc5972e
+DIST wine-staging-4.18.tar.gz 9917480 BLAKE2B 477da02f5177e7efad33ca30267b2a8755c493972c2ff4ebec32275b699a4c08fd9d4b72181f8ad87c58b1c120b7a7b47951057db36963bcd161afe10b1a89aa SHA512 e5ddb7ac09322b5f2c8e8facff9639699a6a3e72a96f4028e88e23e81f73c766bde1479e54a9a80bd7f33c7747a8220e2699f4dcfe55117b9832ff4cdba60a04
+DIST wine-staging-4.19.tar.gz 9908545 BLAKE2B 36674228de808ac9d1f3f66e9274fd9de68173a6a1acca405eb08836a8a787e4e78465442ef6769c02f8fd2e20c3f059d59a1408ed3a8add8a91a68efd07b7bc SHA512 a47ae16dd39797b54011f942fe7e722897af7ddc0bed2bf2e39c46aecf60a02769f7287609c63b4c0c3f1c8e40172e0cdf3bdb53562a07d7a2b7ac53e570dbdc
 EBUILD wine-staging-4.16.ebuild 20292 BLAKE2B 2fade16f762642ec7292a42c5a1af18039745fe15e09102419fd46bb99870b0b2b8804ed38ff1e6f46b19631b756ba80c40833844d2d97db378232ea67c65d63 SHA512 3551365f1392d538ea63a133fa3019e6fee8e1556ea47a8d9c23ebd5e614243a6271096f2f89829f105af9d3d340774f3c3c0ee2e0f6d6343baf8daebbc5972e
 EBUILD wine-staging-4.17.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
+EBUILD wine-staging-4.18.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
+EBUILD wine-staging-4.19.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
 EBUILD wine-staging-9999.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
 MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/wine-staging-4.14.ebuild b/app-emulation/wine-staging/wine-staging-4.18.ebuild
index 1c459adafb0f..2d1bd8b5970e 100644
--- a/app-emulation/wine-staging/wine-staging-4.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.18.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.2 )
+	mono? ( app-emulation/wine-mono:4.9.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-staging/wine-staging-4.15.ebuild b/app-emulation/wine-staging/wine-staging-4.19.ebuild
index 1c459adafb0f..2d1bd8b5970e 100644
--- a/app-emulation/wine-staging/wine-staging-4.15.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.19.ebuild
@@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.2 )
+	mono? ( app-emulation/wine-mono:4.9.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 6d4ac4cfa0f3..5c9fa482e1f7 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,16 +3,16 @@ DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f88
 DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
 DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc
 DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
-DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa
 DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86
 DIST wine-4.17.tar.xz 22230616 BLAKE2B 428d9b781acbadabb2ce677b08c1a38f130c39d2acb95364dc0ac4cfef8f7c9efe4199846bf0bfc745dc25ba632847f224da1b0a09b8ee6c4927154771a538cf SHA512 f762aab2596a4b5cf73d3282be561d25a2fe69e5d4a5ec2e29db47b3eda7496ca9eb7e57ff7765853d258422898bfa775bf9b458e61eef837b213e422bd748b8
+DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
+DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
 EBUILD wine-vanilla-4.0.1.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
 EBUILD wine-vanilla-4.0.2.ebuild 17335 BLAKE2B 6c313ee907ba258f737b19a9e2c1ab3bf04555649c558d569d7372170704ce2134b6a9d009cfb0e8040ebaf7d50a68c5e8a44fd109557a0e0d77c8293fa0f8ff SHA512 e8b8fae470d371aae55cd69677dadf14da758443f4be3ca19a9782ae8ec51696a1c7e113be38ffeef3270160d155c383daf6482e283def2ccebb5df0cfd3a803
 EBUILD wine-vanilla-4.0.ebuild 17330 BLAKE2B 1dbe6a5dc59af64bfebf087f84efdcad0a1ad56b3f29e567926d4f036ed36ba53bed1ad5072363cde853b18e1ecc848a2804e716b35e85f0ea04faf7e7306d82 SHA512 5535dd99e33a4895d8e6cc9a42c4fe47ccc69e44ff7270e0ebd89701cee1262a1270d2a781f0ac35ef708d9e1c194c02e43c98b1fec7895bd6f83d4b88c02353
-EBUILD wine-vanilla-4.14.ebuild 17552 BLAKE2B a3d8858dae156aaf8e64c5dab402db4ef89f0d000da275374aee488d7be1e2c3c4e402f12c1ddcccf2d3da47f9c2c97328fbf843046b8638e3948b039c1ac92d SHA512 dcbb3c9a513c2cca2cd23da3fec45a817500de43d5dfae7a4cfe551bb3fb2848da8859373e97dd598e8ffd3ab464b38da91d930d5f090fae64b3edd464a63246
-EBUILD wine-vanilla-4.15.ebuild 17552 BLAKE2B a3d8858dae156aaf8e64c5dab402db4ef89f0d000da275374aee488d7be1e2c3c4e402f12c1ddcccf2d3da47f9c2c97328fbf843046b8638e3948b039c1ac92d SHA512 dcbb3c9a513c2cca2cd23da3fec45a817500de43d5dfae7a4cfe551bb3fb2848da8859373e97dd598e8ffd3ab464b38da91d930d5f090fae64b3edd464a63246
 EBUILD wine-vanilla-4.16.ebuild 17552 BLAKE2B a3d8858dae156aaf8e64c5dab402db4ef89f0d000da275374aee488d7be1e2c3c4e402f12c1ddcccf2d3da47f9c2c97328fbf843046b8638e3948b039c1ac92d SHA512 dcbb3c9a513c2cca2cd23da3fec45a817500de43d5dfae7a4cfe551bb3fb2848da8859373e97dd598e8ffd3ab464b38da91d930d5f090fae64b3edd464a63246
 EBUILD wine-vanilla-4.17.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
+EBUILD wine-vanilla-4.18.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
+EBUILD wine-vanilla-4.19.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
 EBUILD wine-vanilla-9999.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild
index 85ad8429a752..d502188edebb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.2 )
+	mono? ( app-emulation/wine-mono:4.9.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
index 85ad8429a752..d502188edebb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.2 )
+	mono? ( app-emulation/wine-mono:4.9.3 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index d945a392587d..965bb5a1c21e 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -7,13 +7,11 @@ DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329
 DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
 DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
-DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
-DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
 DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
-DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
+DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
+DIST xen-4.13.0-rc1.tar.gz 38984903 BLAKE2B c8fa19a2cff2de67712e5976670ecbbeff1528b987cdd7523a7f8c8952b889255af4e21c50c68537ffff9273153dfc619582f8072f6f356e20f38dae1e331fb6 SHA512 392d1f77faec4d9868aff928a2eb2918e8cef576a92f7a853d3bbd1ba609bad6abcd4d675f7c618e7bf630feea4c8da081c31926c281a17c8f6b41c3ea9fd607
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
-EBUILD xen-pvgrub-4.10.3.ebuild 5043 BLAKE2B f3a0b8b7e2f1ed974273191c962d1c8889002f4edaa1a0eb173e8b78775fb2ef8792b7861298d7d525323b5e098f46a90e7eaab4f34f9dfc481f427dd80eb45e SHA512 5d10c9a3558291613b431d8a11e1cddcedb30dbe7c98cddcfcdfa51b2784b79a86f91cf5dc4894d1802ca0683614bb35af1605eb95d4b6bc57074980e8dba8e8
-EBUILD xen-pvgrub-4.11.1.ebuild 5106 BLAKE2B 611e4797e596f5e7c5117fa284e7841319119bdf2745a63bdd743da993140225fa5e1dd026c8966dedec0a976bcd1c8419b7cac08f5efbad5d3243ac5653a7c5 SHA512 1dc318e1179a8e8bee5212c323ff887fd991b39f5803499cb8472d2d963eb7928ecb676fec674aedad34bd07a82d9188f1759e1a6751c5223eb52a703b410977
-EBUILD xen-pvgrub-4.11.2.ebuild 5108 BLAKE2B 2e88a5833f1b58b4e3aabb9f7479bfac4e3f2b5308ebc6bc5579fd48208bc26a1039e87b5b083ac55919c375fb1967efbabf52d74b2498e189e8395c9dbc6794 SHA512 a4135ffbd9e8fb167bfc81f3d500d770c0b08ff3dd7b525629428fa19d3cf84abee03fd43827c363c456bc8a16744bc1dfd04a934ff1382edda227663fd7bb72
-EBUILD xen-pvgrub-4.12.0.ebuild 5108 BLAKE2B 2e88a5833f1b58b4e3aabb9f7479bfac4e3f2b5308ebc6bc5579fd48208bc26a1039e87b5b083ac55919c375fb1967efbabf52d74b2498e189e8395c9dbc6794 SHA512 a4135ffbd9e8fb167bfc81f3d500d770c0b08ff3dd7b525629428fa19d3cf84abee03fd43827c363c456bc8a16744bc1dfd04a934ff1382edda227663fd7bb72
-MISC metadata.xml 245 BLAKE2B 2bf2c7848c8c513915aaad9305b6146cf46201bbcf3ffa040c943b7188d2d2a9fe27e2b5ecde84ed2099dceadd4b057856df01ac603a6aceca0f7b7f466174c7 SHA512 3f646ec3197e46d25dde4f698b571fb85b040198f4cba7508c8d38405b4d9d0fc31dbd5ae6242aea8c2acd613aabe0486cb347a1db4811fa807b861148661f8b
+EBUILD xen-pvgrub-4.11.2.ebuild 5106 BLAKE2B 611e4797e596f5e7c5117fa284e7841319119bdf2745a63bdd743da993140225fa5e1dd026c8966dedec0a976bcd1c8419b7cac08f5efbad5d3243ac5653a7c5 SHA512 1dc318e1179a8e8bee5212c323ff887fd991b39f5803499cb8472d2d963eb7928ecb676fec674aedad34bd07a82d9188f1759e1a6751c5223eb52a703b410977
+EBUILD xen-pvgrub-4.12.1.ebuild 4464 BLAKE2B e1194d9348aa2aeb0c269b86b658f2bf515f7cc15ac12836748a31e331e2714381ab8b266d7bd69947d33f9ddb48670dee6dd98dafa6a09d919ecfc64800d4fb SHA512 1ecddb92301bb9af5b9a30e0f978e8cb6768cd74b09b8ff7015c8b36b03cba53d81704d2f344b40918cd5ab4034056c9001051a8433d89c7642f8c18bd3d8a15
+EBUILD xen-pvgrub-4.13.0_rc1.ebuild 4503 BLAKE2B fd9752ef20e0dccdc551ae1313b81a36c48edc73aa13a7cc34bfc5d29c2a20343b761f79319864003588b65476f6d17d18c02bcfed01654d72ac3f8707591da4 SHA512 f7cbdc4be93d0de30617404cfd3273bf350ae5ada504b97482a871abb5ff2c785e87a14f132494acc3136a19d4119899c06edc760d68043bd210458479253cd7
+MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046
diff --git a/app-emulation/xen-pvgrub/metadata.xml b/app-emulation/xen-pvgrub/metadata.xml
index 64e6e971243c..fd12a2726425 100644
--- a/app-emulation/xen-pvgrub/metadata.xml
+++ b/app-emulation/xen-pvgrub/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>xen@gentoo.org</email>
-	<name>Gentoo Xen Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>xen@gentoo.org</email>
+		<name>Gentoo Xen Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.10.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.3.ebuild
deleted file mode 100644
index f2ffbddfdde7..000000000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.10.3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-inherit flag-o-matic multilib python-single-r1 toolchain-funcs
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
-
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="
-		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
-		$GRUB_URL/grub-0.97.tar.gz
-		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
-		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
-		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
-		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
-		${UPSTREAM_PATCHSET_URI}"
-
-S="${WORKDIR}/xen-${PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="custom-cflags"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-	sys-devel/bin86
-	sys-apps/texinfo
-	x11-libs/pixman"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-emulation/xen-tools-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-retar-externals() {
-	# Purely to unclutter src_prepare
-	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-		-i "${WORKDIR}"/zlib-1.2.3/configure
-	sed -e 's:^AR=ar rc:AR=ar:' \
-		-e s':$(AR) $@:$(AR) rc $@:' \
-		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
-	einfo "zlib Makefile edited"
-
-	cd "${WORKDIR}"
-	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
-	tar czp grub-0.97 -f grub-0.97.tar.gz
-	tar czp lwip -f lwip-1.3.0.tar.gz
-	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
-	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
-	mv $set "${S}"/stubdom/
-	einfo "tarballs moved to source"
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \;
-	fi
-
-	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
-	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
-	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
-	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
-
-	# fix jobserver in Makefile
-	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
-
-	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-	retar-externals || die "re-tar procedure failed"
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
-
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-		if has_multilib_profile; then
-			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-		fi
-	fi
-}
-
-src_install() {
-	if use x86; then
-		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-	fi
-	if use amd64; then
-		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
-		if has_multilib_profile; then
-			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild
index 90600bb0eeef..b9022166805e 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild
@@ -33,7 +33,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
 HOMEPAGE="https://www.xenproject.org"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="custom-cflags"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.12.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.12.1.ebuild
index 90600bb0eeef..b0120ed0adeb 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.12.0.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.12.1.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.xenproject.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="custom-cflags"
+IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -82,19 +82,6 @@ src_prepare() {
 			eapply "${WORKDIR}"/patches-upstream
 	fi
 
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \;
-	fi
-
 	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
 	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
 
@@ -122,7 +109,7 @@ src_configure() {
 }
 
 src_compile() {
-	use custom-cflags || unset CFLAGS
+	unset CFLAGS
 	if test-flag-CC -fno-strict-overflow; then
 		append-flags -fno-strict-overflow
 	fi
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc1.ebuild
index b9022166805e..a6ce1762a973 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc1.ebuild
@@ -8,6 +8,8 @@ PYTHON_REQ_USE='xml,threads'
 
 inherit flag-o-matic multilib python-single-r1 toolchain-funcs
 
+MY_PV=${PV/_/-}
+
 XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
 LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 GRUB_URL=mirror://gnu-alpha/grub
@@ -18,7 +20,7 @@ UPSTREAM_VER=
 		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
 
 SRC_URI="
-		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+		https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
 		$GRUB_URL/grub-0.97.tar.gz
 		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
 		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
@@ -27,14 +29,15 @@ SRC_URI="
 		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
 		${UPSTREAM_PATCHSET_URI}"
 
-S="${WORKDIR}/xen-${PV}"
+S="${WORKDIR}/xen-${MY_PV}"
 
 DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
 HOMEPAGE="https://www.xenproject.org"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="custom-cflags"
+#KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
+IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -82,19 +85,6 @@ src_prepare() {
 			eapply "${WORKDIR}"/patches-upstream
 	fi
 
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \;
-	fi
-
 	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
 	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
 
@@ -122,7 +112,7 @@ src_configure() {
 }
 
 src_compile() {
-	use custom-cflags || unset CFLAGS
+	unset CFLAGS
 	if test-flag-CC -fno-strict-overflow; then
 		append-flags -fno-strict-overflow
 	fi
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 7606874a1af4..583da2327e43 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 2303 BLAKE2B a3c16fcc06a861aba37cfc9ff6a186b52e292b6bd3dbfcc7493b2cc2aa2191a8c4d342a947cb8ed039d08b7f147aa356061f9d995e01e25ae9bb9cf1b9f360dc SHA512 eb01cdb6d013d64bc575e1f39b4e9319f8d7302d078ddbe0fbd27a343cabea4be012ccce5fc950ea7dfa524b26436d5b762d60ddf663e4b2769d7f1030f0bb2b
+AUX gentoo-patches.conf 1842 BLAKE2B 4c0717dc3984f5c757b6ba6ca8a9a437f8af2a497d79d009122c353a784c543a312f5fc9864728a9cccc35f0c9383df8445b5ce2917f446efbfe9177deea598b SHA512 f3f7d575befe643ebf104ffbf97fab809afcc6f40b144c8d7d7b744e29297aa10982de9246b9f9326bccda9653babf9da2551edc4661a2975d5c0a34f8c15b42
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -15,26 +15,20 @@ AUX xenstored.confd 42 BLAKE2B 61153f1bb17c78614e215f25f59642f35185f7f7a2e911e04
 AUX xenstored.initd 1058 BLAKE2B ef28c6f9f1f91dd46d5d431a70736d76a9a72b215b6b8f7955e5cc11abcbadb796d464a3a084b26afbfbe315617e929c207c66126bf5845520a0d9ef1ee75bab SHA512 f07febb0436d65dfab03e2125380b25dc2bcd7512a533879a152ab939a12b1a954b70babb69fc854b37bcb039a8897c2dc84a3988df426946f1e4af310dc1392
 AUX xenstored.initd-r1 916 BLAKE2B 5acda60c3d1c8aaf91d14d980a0b68f3d5ff803b617431c87f46b5c2c6f4c87548fa8db32ebd554e8aad4928d7ec0b16598bf8dfb0aa7e3642caa96eb164a292 SHA512 1404c9c454f5359389a2e9588317f10412dafdbdeb1de5da945c10f8e6efd09007e96d35b75d04a4c3d5c59baa9c3bbee4192240cacee128b0adf9066d3efc10
 DIST edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz 38714813 BLAKE2B 1c0670c6447aa7d2610e59481324eafe3dbf54cc0480c855380372cf5b95469de4182b569d1c4429df71ceb9be014cb414e070a808609d185b488519955b8677 SHA512 8eb88006500d9d6982e5565bdb71bf47dfe2b9669e107f48b6b237d7efbbfb54b9fd81841421c347e5c0ca45ef9c08f0b95983c8b922c2e1072b0e42b8ede92c
+DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b95266ec7fcee5c27065ba999b023ded9eb42a3690555e626911493f1dc995927fa67071bdc6432b3995df82134f8c49ea0d72eaf407f455dd1e2675d5b8d844 SHA512 8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050
 DIST ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz 3792227 BLAKE2B 720ac29ab3187d7abaec33823dda967caab7eea9631123a7619d2f83d3ad6c7bb47db01665a4c54548fe367866606936d36690a06ecf42323b9bd0ef00e41569 SHA512 2b4ae8e65cd678dbb376f24001294eb54aead8d66456e06fc270dec178d90b282c1eb19731234d8b458054e49c5b8b8c4a89345c63ed0a4dafaf205e642b00b7
-DIST ovmf-20170321.tar.xz 22141096 BLAKE2B 79e991c8f9deb297865c319e88b6e6d46b1d08067d3fd639c83f2a379670779ecc60c74c2671ea4eb4a6659fe08ac2d7d4ff337b010b42a908a50829a2d18eeb SHA512 f65dabde3df967224e2072817211786ee4fc3994ee31f8f9d6f67fd74e3479e1da459c720169dd81020cdc1777e4600e531bb124b4625c2ded42c6005bdc802a
-DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c
 DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
 DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273
-DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
-DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
-DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77
-DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
 DIST xen-4.11.2-upstream-patches-0.tar.xz 11532 BLAKE2B e36509d6256ac4018f20711baba77619a7c3a684d81e25a94cffba9c9f53ec9e0efdcefcd6a7ffa26b49fd3d4e0dfc2126f1ea620f0bd35ea83188b4587e5b38 SHA512 4a97d1e56cb3e5152372f0c0b99f8838194b2e03ed1255e87611d8bb28af9c9199fe123d3542f5ba9b3f652c29a519b5e4255b8925c0c8dfbd588f83ed8806d9
+DIST xen-4.11.2-upstream-patches-1.tar.xz 77556 BLAKE2B f95af370f8a99a27bfc762e661364da6f1ef1b08dd5a6b81a5421d32bcad820097a694c5656e174cec7ed53ff140f80d63f57ac31867edf12e68ef4d87ea8b44 SHA512 f41f2ff20648eed76918c865958d42b99d2743188514c63e27797c80e9169f7f5843ac48195e38d269d02edcb9889f042b992b85773ca61c267282e41ea8dae6
 DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
-DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
-DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
-DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2 SHA512 7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56
-DIST xen-gentoo-patches-17.tar.xz 15688 BLAKE2B d5e3bdb15e182c5f0c21adfa5cb5b88e3453e5035659823e3322074646c3ea89b55bf54d0ec6c54966d9739544d156de365a60acf928b799b68978be3380a002 SHA512 f1000ca36166fa21d4b18fb9ecf36f55b1450c312622fbe38545f78aabc150e2d6cce4bd58472c41bd9be8945940a0bc953ba7e470cd5095cf2e7d8a87769b2b
+DIST xen-4.12.1-upstream-patches-1.tar.xz 62920 BLAKE2B a7f070e4b48c04fa26b75ccbd46aa1172df306060ae180f29f5ea61a5f0b4c2e854a5d1127ed42c05b21977a0e43b36b7e137c1758496b242f48626c5a00e22b SHA512 d7094b86f297a4b1da7007d73752ca8478a26c675ec5d93ade4599935cd51ebd80220a4ea7223d878e0d2c2209336577d196017c463abe9e47ff20914ffa5021
+DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
+DIST xen-4.13.0-rc1.tar.gz 38984903 BLAKE2B c8fa19a2cff2de67712e5976670ecbbeff1528b987cdd7523a7f8c8952b889255af4e21c50c68537ffff9273153dfc619582f8072f6f356e20f38dae1e331fb6 SHA512 392d1f77faec4d9868aff928a2eb2918e8cef576a92f7a853d3bbd1ba609bad6abcd4d675f7c618e7bf630feea4c8da081c31926c281a17c8f6b41c3ea9fd607
 DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
 DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a
-DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
-EBUILD xen-tools-4.10.3-r2.ebuild 14271 BLAKE2B 6d5754c5a1e83c5d32cb569d19836e866fbe52ac5db68e0ad85e2a47873af97b457c6fb5709e912aebba72df91efdc28c57c63aab14173993d22eb80af12c478 SHA512 6748ed5b0871043334293561ec588256f079d81059d60fd5e486563d5274aee775cacde2bfc01ed45836fc8b8858f8df8107e118ff89766477832ac00f788dbd
-EBUILD xen-tools-4.11.1-r5.ebuild 14524 BLAKE2B 04c598fec6b8764c5d28584b52798f38f245e92ea890276b15eb6f2ee01b15526bd2789113a70fac5a42dfc57da854c2701bb810d865460e1714f224a053c649 SHA512 c8e7d2a272f4cb12d12557826ee7a0e4ba8c20dc90dec27168a341e3272951bdd291fe3c102bb5a9b7434a1409a93364a75d87d7ddb92d1ccc1a331f8ac6316f
-EBUILD xen-tools-4.11.2.ebuild 14526 BLAKE2B b8c61fd3c7860d068bfceab36c34b24d8b1f935ad9436d69d34c77f1b6b1846f3275272c9bef8acf42c71a937fda053889dae7cc230c3a6abdc041182c409bb2 SHA512 0ee7d364a9bad6d6bf292cc5ecc5af7605cd1c0f277dd9effbc40f2a5ad38e5094ef755fd49c4e75f2e8735300995309a1d90894e7aa55bad51621cbb92637a2
-EBUILD xen-tools-4.12.0-r3.ebuild 15250 BLAKE2B 2b4085469cc0d28bb8eca87c053857e8b3902391b4a8aa54529126f6dbc9ca8b5e64cb43fb22b420797d6844a83dcdef01646f0f09592a2aa816060439100ba7 SHA512 14a58addc05c4a0d90017212ca44ddac1c94cff35ad3ae4e6c2dbd8bf00a99de3d6cdaebb4555f03fa457db26efd766a633931747a11c472da2c412dc1974258
-MISC metadata.xml 1479 BLAKE2B 1b994f8dcaa5cf67f588af6ce9533467816f7c4726e412566640138e631427decaf890856fa255b516580502c97c2e29c21bb84b4888df7603a9491a012381a5 SHA512 d125649737e0b34407fb32b67b741feca60d100454fdbc84b07305849295f134e1b657f5e13b6e74a90d25d7b408880316d470ee94447b7a6f99abd75eb82a83
+EBUILD xen-tools-4.11.2-r1.ebuild 13855 BLAKE2B 60dd1de7438f5d1a0dc265baa413aa0ec2eca47c9d6ca31661d878b89fe5bdc07e3c27b0ee205fbba01f85522be0f99d792c091e6ebaf3be115aa7277036552b SHA512 7c98ff40a82cb23a9009e82c22dd267b2ee9697274d15f2af1b60fdc2e9e3606b2dd0a0dc7a7f8f6cb05578b1ff50182c438f83b1e2208ded5addd0089a2a0ab
+EBUILD xen-tools-4.11.2.ebuild 14524 BLAKE2B 5b9287e1c6697990484c09c766bad77f115b5139dd25da8f068b416f80bcb1dab9f2ae9fd9e7c945baf07a32753fd0434a1e7e7c1effeb868d6f1a924fae24e8 SHA512 e99845d244f8896d21c1a6904d63b15d5a16c77b6f227e1d98c3cda5748502c64019cc910aec299d4f3f39150d67432bcda016a3c5aa774f07b3c5f459b513c6
+EBUILD xen-tools-4.12.1-r1.ebuild 14581 BLAKE2B 2f1635d7037e9b099340c707231bfaca085dcd06b2d6da54683ecb4e8b5fd6580013cc748d650a1617f0af45e84bce7052992d46b6ecfc814acd6916dfd9ab89 SHA512 61a2a47a702d48508036c9e67815d366b4bd4eba897779d2e99fc6c3d474043566dc0156345dcc5cb85ba1330146b80e256553755c13529ff540b787423deabd
+EBUILD xen-tools-4.13.0_rc1.ebuild 14396 BLAKE2B 3a42d032b046b5d3f061263ea7b06f39603985a15f72bbfa767802328b7a53dbce964c16e3cea4d004a4e6b39e84efd9118cd647d5ad92b53c5023413b28bb3c SHA512 23ca66cf8b18d5fc932eaf1fdc82d84375b6531c37e0b2f3b10ecfbd5bc26f4447a81827f3b0200f990243b1a2672a3211546ad1b29e243bdac15618f449ef0a
+MISC metadata.xml 1707 BLAKE2B becd24142b3d885f0a26c1444e5191c3906c260ba57755257d04eee76be5a21aede5741ca0bea12a77e9c0c872cd5f8436fc5c11fec3f3f5f543f4fda75fb5be SHA512 137f36f883e4476f1820e630fa1f5feb52244cad235885bff09c838755feba1df8428f631e255de25b29ce7dac8aa62e0df37517875cce3a26e5114dee7a70f7
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 6c12664cca1c..1091565e0d27 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -34,9 +34,7 @@ _gx046=" xen-tools-4.10.1-shim.patch"
 _gx050=" xen-tools-4.12.0-shim.patch"
 
 # Fix building with gcc 8, bug #657388
-_gx047=" xen-tools-4.10.1-gcc8.patch"
 _gx048=" xen-tools-4.11.1-gcc8.patch"
-_gx052=" xen-tools-4.10.3-gcc8.patch"
 _gx053=" xen-tools-4.12.0-gcc8.patch"
 
 # Fix building with gcc 9, bug #689082
@@ -45,52 +43,32 @@ _gx055=" xen-tools-4.11.2-gcc9.patch"
 # Fix pdf document generation, bug #650396
 _gx049=" xen-tools-4.10.1-pdfdoc.patch"
 
-# xen-tools-4.10.3 patches set
-_gpv_xen_tools_4103_0="
-${_gx038} ${_gx017} ${_gx043}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037} ${_gx042}
-${_gx045} ${_gx046} ${_gx047}
-${_gx049}
-"
-
-# xen-tools-4.10.3 patches set r1
-_gpv_xen_tools_4103_1="
-${_gx038} ${_gx017} ${_gx043}
-${_gx027}
-${_gx028} ${_gx029}
-${_gx037} ${_gx042}
-${_gx045} ${_gx046} ${_gx052}
-${_gx049}
-"
-
-# xen-tools-4.11.1 patches set
-_gpv_xen_tools_4111_0="
+# xen-tools-4.11.2 patches set
+_gpv_xen_tools_4112_0="
 ${_gx038} ${_gx017} ${_gx043}
 ${_gx027}
 ${_gx028} ${_gx029}
 ${_gx037} ${_gx042}
 ${_gx045} ${_gx046} ${_gx048}
-${_gx049}
+${_gx049} ${_gx055}
 "
 
-# xen-tools-4.11.2 patches set
-_gpv_xen_tools_4112_0="
-${_gx038} ${_gx017} ${_gx043}
+# xen-tools-4.12.1 patches set
+_gpv_xen_tools_4121_0="
+${_gx038}
 ${_gx027}
 ${_gx028} ${_gx029}
 ${_gx037} ${_gx042}
-${_gx045} ${_gx046} ${_gx048}
-${_gx049} ${_gx055}
+${_gx053} ${_gx050} ${_gx051}
+${_gx054}
 "
 
-# xen-tools-4.12.0 patches set
-_gpv_xen_tools_4120_0="
+# xen-tools-4.13.0 patches set
+_gpv_xen_tools_4130_rc1_0="
 ${_gx038}
 ${_gx027}
 ${_gx028} ${_gx029}
-${_gx037} ${_gx042}
+${_gx037}
 ${_gx053} ${_gx050} ${_gx051}
 ${_gx054}
 "
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 3d5273174a37..0e42a47368fb 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>xen@gentoo.org</email>
 		<name>Gentoo Xen Project</name>
diff --git a/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.11.2-r1.ebuild
index aa27319fb101..ac40bea35e0c 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.2-r1.ebuild
@@ -17,10 +17,10 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=2
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
-	GENTOO_VER=17
+	GENTOO_VER=19
 	# xen-tools's gentoo patches version which apply to this specific ebuild
 	GENTOO_GPV=0
 	# xen-tools ovmf's patches
@@ -60,7 +60,7 @@ SLOT="0/$(ver_cut 1-2)"
 # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
 # >=dev-lang/ocaml-4 stable
 # Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask +hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+IUSE="api debug doc flask +hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -254,25 +254,11 @@ src_prepare() {
 	# Drop .config, fixes to gcc-4.6
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
 
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
 
 	if ! use pygrub; then
 		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
@@ -404,7 +390,7 @@ src_install() {
 	python_fix_shebang "${D}"
 
 	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
+	rm -rf "${D}/tmp" || die
 
 	if use doc; then
 		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
diff --git a/app-emulation/xen-tools/xen-tools-4.11.2.ebuild b/app-emulation/xen-tools/xen-tools-4.11.2.ebuild
index 409d2a256949..b1beaa8102ea 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.2.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	UPSTREAM_VER=0
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild
index 8a13631173e4..83c7552e06e4 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=18
@@ -62,7 +62,7 @@ SLOT="0/$(ver_cut 1-2)"
 # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
 # >=dev-lang/ocaml-4 stable
 # Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -268,25 +268,11 @@ src_prepare() {
 	# Drop .config, fixes to gcc-4.6
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
 
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
 
 	if ! use pygrub; then
 		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
@@ -421,7 +407,7 @@ src_install() {
 	python_fix_shebang "${D}"
 
 	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
+	rm -rf "${D}/tmp" || die
 
 	if use doc; then
 		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
diff --git a/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0_rc1.ebuild
index 11abf9ebb62f..d0908764bb57 100644
--- a/app-emulation/xen-tools/xen-tools-4.10.3-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.0_rc1.ebuild
@@ -16,19 +16,20 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=1
+	#KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS=""
+	UPSTREAM_VER=
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
-	GENTOO_VER=16
+	GENTOO_VER=18
 	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=1
+	GENTOO_GPV=0
 	# xen-tools ovmf's patches
-	OVMF_VER=3
+	OVMF_VER=
 
-	SEABIOS_VER=1.10.0
-	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
-	OVMF_PV=20170321
+	SEABIOS_VER=1.12.0
+	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
+	IPXE_COMMIT=1dd56dbd11082fb622c2ed21cfaced4f47d798a6
 
 	[[ -n ${UPSTREAM_VER} ]] && \
 		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
@@ -42,9 +43,9 @@ else
 		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
 
 	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
-	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
 		${OVMF_PATCHSET_URI} )
 	${UPSTREAM_PATCHSET_URI}
 	${SECURITY_PATCHSET_URI}
@@ -55,20 +56,24 @@ fi
 
 DESCRIPTION="Xen tools including QEMU and xl"
 HOMEPAGE="https://www.xenproject.org"
-DOCS=( README docs/README.xen-bugtool )
+DOCS=( README )
 
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
 # >=dev-lang/ocaml-4 stable
 # Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
+	ipxe? ( rombios )
 	ovmf? ( hvm )
-	^^ ( qemu system-qemu )"
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
 
 COMMON_DEPEND="
 	sys-apps/pciutils
@@ -85,6 +90,7 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-4.11
 	dev-python/lxml[${PYTHON_USEDEP}]
 	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
 		sys-power/iasl )
 	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	api? ( dev-libs/libxml2
@@ -94,11 +100,10 @@ DEPEND="${COMMON_DEPEND}
 		$(python_gen_impl_dep sqlite)
 		)
 	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-devel/bin86
+	amd64? ( sys-power/iasl
 		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		sys-devel/dev86
-		sys-power/iasl )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
 	dev-lang/perl
 	app-misc/pax-utils
 	doc? (
@@ -130,6 +135,7 @@ RDEPEND="${COMMON_DEPEND}
 # Approved by QA team in bug #144032
 QA_WX_LOAD="
 	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/hppa-firmware.img
 	usr/share/qemu-xen/qemu/s390-ccw.img
 	usr/share/qemu-xen/qemu/u-boot.e500
 "
@@ -139,7 +145,9 @@ QA_PREBUILT="
 	usr/libexec/xen/bin/ivshmem-server
 	usr/libexec/xen/bin/qemu-img
 	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
 	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
 	usr/libexec/xen/bin/qemu-system-i386
 	usr/libexec/xen/bin/virtfs-proxy-helper
 	usr/libexec/xen/libexec/xen-bridge-helper
@@ -233,11 +241,17 @@ src_prepare() {
 	if use ovmf; then
 		if [[ -n ${OVMF_VER} ]];then
 			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
 			eapply "${WORKDIR}"/patches-ovmf
 			popd > /dev/null
 		fi
-		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
 	fi
 
 	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
@@ -245,32 +259,18 @@ src_prepare() {
 	# Fix texi2html build error with new texi2html, qemu.doc.html
 	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
 
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
 	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
 		-i tools/firmware/Makefile || die
 
 	# Drop .config, fixes to gcc-4.6
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
 
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-		unset CPPFLAGS
-	fi
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
 
 	if ! use pygrub; then
 		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
@@ -332,6 +332,10 @@ src_prepare() {
 		-e 's:^#vif.default.script=:vif.default.script=:' \
 		-i tools/examples/xl.conf  || die
 
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
 	# disable glusterfs
 	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
 		-i tools/Makefile || die
@@ -348,10 +352,13 @@ src_configure() {
 		--disable-xen \
 		--enable-tools \
 		--enable-docs \
-		$(use_enable pam) \
 		$(use_enable api xenapi) \
-		$(use_enable ovmf) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
 		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
 		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
 		"
 
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 67616039e28a..00ea561f1fc2 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,15 +1,12 @@
 AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689
-AUX xen.gcc9.fixes.patch 1265 BLAKE2B 0ebf81cd2f43a0da99b4580b0bb9ac09128f26674a173bc74c2dbdb1f668148230d09b6b90a29f2aeca54a6e6107b9001069765281cfe628640e348e2961cf7b SHA512 c305c526732e479e95684f74ef3f90501ff33e7da38e38c5ea373f3db28d40e6fcd7768c4420d43268fb71fcdbd1e41b217d0a317ad74a8c073a2af12588a832
-DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
-DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
-DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77
-DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
 DIST xen-4.11.2-upstream-patches-0.tar.xz 11532 BLAKE2B e36509d6256ac4018f20711baba77619a7c3a684d81e25a94cffba9c9f53ec9e0efdcefcd6a7ffa26b49fd3d4e0dfc2126f1ea620f0bd35ea83188b4587e5b38 SHA512 4a97d1e56cb3e5152372f0c0b99f8838194b2e03ed1255e87611d8bb28af9c9199fe123d3542f5ba9b3f652c29a519b5e4255b8925c0c8dfbd588f83ed8806d9
+DIST xen-4.11.2-upstream-patches-1.tar.xz 77556 BLAKE2B f95af370f8a99a27bfc762e661364da6f1ef1b08dd5a6b81a5421d32bcad820097a694c5656e174cec7ed53ff140f80d63f57ac31867edf12e68ef4d87ea8b44 SHA512 f41f2ff20648eed76918c865958d42b99d2743188514c63e27797c80e9169f7f5843ac48195e38d269d02edcb9889f042b992b85773ca61c267282e41ea8dae6
 DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
-DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
-DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
-EBUILD xen-4.10.3-r1.ebuild 4795 BLAKE2B f1b5a6416aa0157162eda97a4d889f46325b51144d9aba769832ec7f503d7ee4cd74c580fdb6b61c51894abb9fb2761eef80183c6c4666fb65e1295aaf08c510 SHA512 6d82456c23ea10b238edb48920d5bc00ac262b2593415dd6f1528336487c036b100c0f8fe00afc109dd9dbdeede9909d1c7d8f2e0423e586f5746af280b8fc6c
-EBUILD xen-4.11.1-r3.ebuild 4918 BLAKE2B 2af67b4cdf322365f397f4a74adb1cf306934bca6a30034b2730701d1bd52025a0db6cc3f50a48900f781e5a5590aa6c22b77baea0c56c00a75ff2e14ab917d2 SHA512 60a9948a680cf588fb9d82cce1d73350b91062df69c0c086831af0ada3f7b63fe80a2560e942ec4d0d157461f47bd9b642569289c956b5b070b0707f56a23b06
-EBUILD xen-4.11.2.ebuild 4796 BLAKE2B f653a6ad08d02979ae08574e30ec1e5f32022f9837c3f0fad1ebda5a9a421bfe55025b9446181d3f3ec70749000d21591924ca7afb97a1253494d6517e638ade SHA512 76671cb83ea9303bae0a8b6c1acdca345a1727fc57465261620ab2fd06472ed48f60a993cabe405e3a3a462cdb5dc37a0e0dce36591164084c3cf4832686b2b3
-EBUILD xen-4.12.0-r1.ebuild 4919 BLAKE2B 2c1bbe11f0342fef28e7315dd8a0635cae7c40508f8ac9e177be1051bb3b3618835b37e155f8734996aea4b9a65e5d8fa6102f579a4ef2ed8adb3234aed20d9b SHA512 baf9d3881cd2ad8810dc9960aa4b27798aabec125b65d62c1824089eb2b91a140cd1821693fca0ad7b5739f1d5b8c83633764745a4c73fd542c62dc4b784c7db
-MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
+DIST xen-4.12.1-upstream-patches-1.tar.xz 62920 BLAKE2B a7f070e4b48c04fa26b75ccbd46aa1172df306060ae180f29f5ea61a5f0b4c2e854a5d1127ed42c05b21977a0e43b36b7e137c1758496b242f48626c5a00e22b SHA512 d7094b86f297a4b1da7007d73752ca8478a26c675ec5d93ade4599935cd51ebd80220a4ea7223d878e0d2c2209336577d196017c463abe9e47ff20914ffa5021
+DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
+DIST xen-4.13.0-rc1.tar.gz 38984903 BLAKE2B c8fa19a2cff2de67712e5976670ecbbeff1528b987cdd7523a7f8c8952b889255af4e21c50c68537ffff9273153dfc619582f8072f6f356e20f38dae1e331fb6 SHA512 392d1f77faec4d9868aff928a2eb2918e8cef576a92f7a853d3bbd1ba609bad6abcd4d675f7c618e7bf630feea4c8da081c31926c281a17c8f6b41c3ea9fd607
+EBUILD xen-4.11.2-r1.ebuild 4043 BLAKE2B 04c7a09304e03180e86107c73adfe9bba9eec7e0bd86a30b87c5f178cfabeb5b78cba1cc4c2f89f53f09befd351e2197dcb534cdc563a55c1f3eb7f6e4635b8b SHA512 a0a2d719f1676bc413d959093ad8e1315c445d1d56abfc9972b1097ed425d8786f3d8e718ee2c3b71344b78a6b0f4cc2ff4a4498e8f0e8c5c5ce5162630e7b1c
+EBUILD xen-4.11.2.ebuild 4795 BLAKE2B bb005034814214fb85dd5fd456ae45e98c8144478e2815fb97238a19d0d974da1ce57d17fdf7bb04637fbb3670cfa30ed3db0181126f10ff197a885ff57dbee2 SHA512 cab2b86f26164e6c2de18b488fa990852a05662a6b85f36777a22c93bf2c972a2f05cc21d96368bac11f92fcae4f8c1af0a13d5b2468b1a18b3a46d39c2c3ea8
+EBUILD xen-4.12.1-r1.ebuild 4044 BLAKE2B a95ddc09a99c6bae40719583478e1c0c5a5cf67e2d4b515a7eaf89ba8d03a9eb5d8c2864274fc8e1f52f7faea51720f33ed23180745fe564995e618143020211 SHA512 51af627bb780afd0abe555929f0e2fe169a1828187cd55d5241541ea91d0fcabd3af08dd48be19173e8104422beccc648fc986e7488b615de06b8babb507092c
+EBUILD xen-4.13.0_rc1.ebuild 4057 BLAKE2B 047c8bc7dabf02fb6b7b8487254b858547d53a8522de2f11b3d7b7fe3d9375eeef100321d6a610febb3bd9323e5b3ce862b99011a1fd0301e5646c0e737a5a36 SHA512 76e26c992c5b406dc03741d32ff99adcbfbf177e9cf6d148fd6819a65ed9b6da8b0206f4a17b3e576e28d0416d16c8cee99981216c10154a30f1e1aade8e6ff7
+MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/files/xen.gcc9.fixes.patch b/app-emulation/xen/files/xen.gcc9.fixes.patch
deleted file mode 100644
index 111b063f9c1d..000000000000
--- a/app-emulation/xen/files/xen.gcc9.fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h.orig	2018-11-29 14:04:11.000000000 +0000
-+++ xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h	2019-02-05 21:32:50.056774501 +0000
-@@ -28,7 +28,7 @@
- /* Allow for both IOAPIC and IOSAPIC. */
- #define IO_xAPIC_route_entry IO_APIC_route_entry
- 
--struct IO_APIC_route_remap_entry {
-+struct __packed IO_APIC_route_remap_entry {
-     union {
-         u64 val;
-         struct {
---- xen-4.11.1/xen/common/trace.c.orig	2018-11-29 14:04:11.000000000 +0000
-+++ xen-4.11.1/xen/common/trace.c	2019-02-06 20:31:27.370256971 +0000
-@@ -819,7 +819,7 @@
- void __trace_hypercall(uint32_t event, unsigned long op,
-                        const xen_ulong_t *args)
- {
--    struct __packed {
-+    struct {
-         uint32_t op;
-         uint32_t args[6];
-     } d;
---- xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c.orig	2018-11-29 14:04:11.000000000 +0000
-+++ xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c	2019-02-10 19:24:09.378805103 +0000
-@@ -171,6 +171,9 @@
- 	printk("%sMTRR variable ranges %sabled:\n", level,
- 	       mtrr_state.enabled ? "en" : "dis");
- 	width = (paddr_bits - PAGE_SHIFT + 3) / 4;
-+	if (  width > 64 ) {
-+		width=64;
-+	}
- 
- 	for (i = 0; i < num_var_ranges; ++i) {
- 		if (mtrr_state.var_ranges[i].mask & MTRR_PHYSMASK_VALID)
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index f69cd9e4d539..574d6261f8e3 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>xen@gentoo.org</email>
 		<name>Gentoo Xen Project</name>
diff --git a/app-emulation/xen/xen-4.10.3-r1.ebuild b/app-emulation/xen/xen-4.11.2-r1.ebuild
index c776b7262c64..40dd9f3cfa95 100644
--- a/app-emulation/xen/xen-4.10.3-r1.ebuild
+++ b/app-emulation/xen/xen-4.11.2-r1.ebuild
@@ -37,7 +37,7 @@ DESCRIPTION="The Xen virtual machine monitor"
 HOMEPAGE="https://www.xenproject.org"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="custom-cflags debug efi flask"
+IUSE="debug efi flask"
 
 DEPEND="${PYTHON_DEPS}
 	efi? ( >=sys-devel/binutils-2.22[multitarget] )
@@ -108,19 +108,6 @@ src_prepare() {
 		export EFI_MOUNTPOINT="boot"
 	fi
 
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
 	default
 }
 
@@ -129,14 +116,10 @@ src_configure() {
 
 	use debug && myopt="${myopt} debug=y"
 
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
 }
 
 src_compile() {
diff --git a/app-emulation/xen/xen-4.11.2.ebuild b/app-emulation/xen/xen-4.11.2.ebuild
index 18215b62c1d6..b5c663a0742b 100644
--- a/app-emulation/xen/xen-4.11.2.ebuild
+++ b/app-emulation/xen/xen-4.11.2.ebuild
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 	UPSTREAM_VER=0
 	SECURITY_VER=
 	GENTOO_VER=
diff --git a/app-emulation/xen/xen-4.12.0-r1.ebuild b/app-emulation/xen/xen-4.12.1-r1.ebuild
index ca265f67d882..5413034a7ea0 100644
--- a/app-emulation/xen/xen-4.12.0-r1.ebuild
+++ b/app-emulation/xen/xen-4.12.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -37,7 +37,7 @@ DESCRIPTION="The Xen virtual machine monitor"
 HOMEPAGE="https://www.xenproject.org"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="custom-cflags debug efi flask"
+IUSE="debug efi flask"
 
 DEPEND="${PYTHON_DEPS}
 	efi? ( >=sys-devel/binutils-2.22[multitarget] )
@@ -100,9 +100,6 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
 
-	# https://src.fedoraproject.org/rpms/xen/blob/master/f/xen.gcc9.fixes.patch
-	eapply "${FILESDIR}"/${PN}.gcc9.fixes.patch
-
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
 
@@ -111,19 +108,6 @@ src_prepare() {
 		export EFI_MOUNTPOINT="boot"
 	fi
 
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
 	default
 }
 
@@ -132,14 +116,10 @@ src_configure() {
 
 	use debug && myopt="${myopt} debug=y"
 
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
 }
 
 src_compile() {
diff --git a/app-emulation/xen/xen-4.11.1-r3.ebuild b/app-emulation/xen/xen-4.13.0_rc1.ebuild
index e02c8edeb432..c18edd05ce4a 100644
--- a/app-emulation/xen/xen-4.11.1-r3.ebuild
+++ b/app-emulation/xen/xen-4.13.0_rc1.ebuild
@@ -15,8 +15,9 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=2
+	#KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS=""
+	UPSTREAM_VER=
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -37,7 +38,7 @@ DESCRIPTION="The Xen virtual machine monitor"
 HOMEPAGE="https://www.xenproject.org"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="custom-cflags debug efi flask"
+IUSE="debug efi flask"
 
 DEPEND="${PYTHON_DEPS}
 	efi? ( >=sys-devel/binutils-2.22[multitarget] )
@@ -100,9 +101,6 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
 
-	# https://src.fedoraproject.org/rpms/xen/blob/master/f/xen.gcc9.fixes.patch
-	eapply "${FILESDIR}"/${PN}.gcc9.fixes.patch
-
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
 
@@ -111,19 +109,6 @@ src_prepare() {
 		export EFI_MOUNTPOINT="boot"
 	fi
 
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \; || die "failed to re-set custom-cflags"
-	fi
-
 	default
 }
 
@@ -132,14 +117,10 @@ src_configure() {
 
 	use debug && myopt="${myopt} debug=y"
 
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-		unset LDFLAGS
-		unset ASFLAGS
-	fi
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
 }
 
 src_compile() {
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-emulation
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)