gentoo resync : 16.02.1018

44 files changed, 572 insertions, 706 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 9cc91b59bfbd..2fa0eaa7aa0a 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 2f32eac5d7f7..dc3d1c7687d6 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -4,10 +4,12 @@ DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e9
 DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
 DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89 SHA512 0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
 DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897 SHA512 01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d
+DIST containerd-1.2.4.tar.gz 4866424 BLAKE2B bd06d2df49fa426b0bb6fdbcb091215e34a7a0c30eb97c84887451dbfc126eef89eea714bd725fdf038eb7a2c4416237a27fc12730a8f241c27a12d47bfaee43 SHA512 8a4e5064b2c1e14d39d9943f445ae18e4653f73bd3bb90f7efe558b9ffd4345db4b308362103dbfbede716eae8b547c1cec3d93962acb0a2ff34d66e4fce0d80
 EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc
 EBUILD containerd-1.1.2.ebuild 1446 BLAKE2B 73aa0c89b0899a9c6e241aa2fd811b6028aa715fe227209f7dcd1f2da481cf16d2fe955c1cce35f43a6ff9b85f89d6ab23ff1a1abd734786fc2eaffc1a908b71 SHA512 ca80fe6078f715afd01ebda4d99bc1d00f168908850d1e03830fa6df266dd1203ffdbcd5f17f729470df8333f64fa0fb6d00b94d8c8b92645dbd82a8d75a73a3
 EBUILD containerd-1.1.4.ebuild 1447 BLAKE2B 41f551cb2d004dd3b22014b88549729849b840104c573373cfd7d964f0c6f8876771930225c2fb58ecd17e98854cb050ce91eef66e83201d0d6522b4250d21bb SHA512 be79eade0670b9701670953c552d4452e583284acf3f721d22992ada3f2e55745fa85cab1ea102b5d68d709320f1f44207b43c5ba473ef8e2951ea0ac07c802a
-EBUILD containerd-1.2.2.ebuild 1472 BLAKE2B 79c964f1508ae9a5df6f2ee9fb028fb6186362982c19442532ff1eb00d29f3e408cc94e7ff95aae9db3642323f58143e74fffa54288dc0a19cfbd6e9d7d70ca1 SHA512 e23251459744ae8b3bec35fe3a0261ffb99bab0e433ce9cdc48ed39579d73e061df9674bc12372004f4050e72bb68c0f4d6d1d6d5cea985ee2173a16f5fb258c
+EBUILD containerd-1.2.2.ebuild 1471 BLAKE2B ad5699507bac5219eea6d682a2db3525eff1ba6a93125c3cc270d0c9fbe34adba1f7492502601f4f72c7933d6814c2e4a77e003bc8fd758df1bce792fd32f5d2 SHA512 e1a2de6e4f4375935234bcc21fe92586feb3d2855563fe52191462a009cf2e83a745cb32512f127ba7781713b6d17f2036a82dfc776cf9e4c9f060a80dfeeb04
 EBUILD containerd-1.2.3.ebuild 1439 BLAKE2B 291f8949af5f47e1b22c568bdc37f6c425db53ab9d6b65d31492a81145d02cb68eb6405d2d0596c3adbc938d1a86a0f41c1798851484aa02fd3f093a1bc0f8df SHA512 cfb556243ad6a477af83750a91013a0b1aed20eece4914a4a853de66201003b89e759e4bf1025dc433cabb3f0461e69c335520234ec254a6fac8cfd8f21da432
+EBUILD containerd-1.2.4.ebuild 1439 BLAKE2B b8b08284f3c7334fe2837d81f1496f0d4e6f84d2ddc1fb4af59b033a94720218bc5b34aac44c0dfe0af9d5501f5c204fc2c5d17dd4c932ed7f0dda302449fb9b SHA512 bb052f147d6eb22576e3b104d079d4bb1823c21fcbf3cecfc0eb78efff2b1518be88db475e34c783039ddc991728487fb83b3f03a906079a8dd6071bab4327bd
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3
diff --git a/app-emulation/containerd/containerd-1.2.2.ebuild b/app-emulation/containerd/containerd-1.2.2.ebuild
index 8ccee3fc69ac..0cdf19490c85 100644
--- a/app-emulation/containerd/containerd-1.2.2.ebuild
+++ b/app-emulation/containerd/containerd-1.2.2.ebuild
@@ -13,7 +13,7 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	CONTAINERD_COMMIT="9754871865f7fe2f4e74d43e2fc7ccd237edcbce"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/containerd/containerd-1.2.4.ebuild b/app-emulation/containerd/containerd-1.2.4.ebuild
new file mode 100644
index 000000000000..d34eeabe0995
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor +btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc5
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/containerd
+	dobin bin/*
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index ab9553461b97..e5a9740cf404 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,5 +1,7 @@
 DIST diskimage-builder-2.19.0.tar.gz 359520 BLAKE2B 2ddbee82cc45267faa45e7fa8b80012096676ca792eed6aee766d24fd3a5297f7f21af94c84259308fd0a48b9c913ba94575333d792b7dcd67c09d6493ff3f2b SHA512 57da6f0507a96f873bc034862dd58649d8d9ff65c7ad83f8245658fed5919b47ac29c5f8d1bb9ff2d544304955c48fa1ff3a183d90ba47bcc8d1f88c09e4014c
 DIST diskimage-builder-2.20.0.tar.gz 366139 BLAKE2B 51399a4dad2dfb9100e4d196bae0cbe21d67a603ae8a3c5fb445de30cae7216d68090a8a4cdcd7839b9a11b472f5933d5d09814e60ad3ed1df3c373d012be97f SHA512 0d7e725eed0af0c549705029cf9af465d1ea10fa5ec82d6848a437d51783f8749ed613231fd4218db65f41b560eed16db5254788a097398ac267edf2ef04cea5
+DIST diskimage-builder-2.20.1.tar.gz 361740 BLAKE2B 7e334694b2a103f9c742da6f174e40456b8d190648c32209f333a030498b2347e7dfe0f96e2143f87d9573dabc68f1acabfbc292e5796b017128f5bb1368dd5b SHA512 09567f0c6f4de44330168c52af52070e348c1e2c53e9cd2140679f97c4da8c175f2627c7851e33c8ca9133065cd65fe0f2f8256ea7a6638cad2a9c87c5219fdc
 EBUILD diskimage-builder-2.19.0.ebuild 1133 BLAKE2B 441d729ca8deca8194c23f587a510b2188d4ddd59a3dc5295cf57e287a7a78a0a69bb2ff584745e2aa55a4872f9992db90701f68dd39203d1a2cd533e6cd8390 SHA512 78e18e53ee45269e2d26262d9b21bdccdcccbf59c311ec745bf67fb2f60deb1b5407edf26262aae83acfdfcff151c48d89d1b40ef3c63fd025edcbec053e5750
 EBUILD diskimage-builder-2.20.0.ebuild 1135 BLAKE2B 273dbfee86983dc3500ff8cf9bec625dbffcca6979a1ac661a5fbc92f1bcb87b969208dd691f43998bd47c6c965eda0673f30b04f468d4a33afe4e364d54eb15 SHA512 82ada16450a46b08ebc333345900071c1d296350e7bff73a8b4361b250517eb4902f225031416adbd5e5ef62bb1d73cb1333f30673eefeae874dd80a27c628f1
+EBUILD diskimage-builder-2.20.1.ebuild 1135 BLAKE2B 273dbfee86983dc3500ff8cf9bec625dbffcca6979a1ac661a5fbc92f1bcb87b969208dd691f43998bd47c6c965eda0673f30b04f468d4a33afe4e364d54eb15 SHA512 82ada16450a46b08ebc333345900071c1d296350e7bff73a8b4361b250517eb4902f225031416adbd5e5ef62bb1d73cb1333f30673eefeae874dd80a27c628f1
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.20.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.20.1.ebuild
new file mode 100644
index 000000000000..4c5588077dbd
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.20.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+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.0[${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 cbaf6070cf54..1797381bf9c9 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -5,6 +5,6 @@ DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 46b71a4d6ac9eb0659a45c1
 EBUILD docker-proxy-0.8.0_p20180411.ebuild 828 BLAKE2B 40c072624b54c218816132f4d3b71f29e2c4d1afbb20d6be0fc518cd729b3453ea12839143d3ee32e3ce810b8650316fe718ded9c5a950b0ee9ef372f4c2ec20 SHA512 4a018ca6462c3aa371d7e02717f805d1ea5424629892d9e69c7843fb4572da68f2d23eef0bc094487ccb3212a34799541b805c00a0cf941c114140ca44ab8cc3
 EBUILD docker-proxy-0.8.0_p20180626.ebuild 825 BLAKE2B 256ce2df79ece0668908db8d64ddfdb6737ce6d1ba7ef6e7a8a4b8c16af057d7ae81b75b3b3e9a6b93adb2f874f7563839f6bd343c00c88ac0ea4ff0bc5e5bbc SHA512 e211a3ac5576960377b5de1b164b5238243a215a50a76358aae240d221c160d013f85304909cdaec1db9719ab92bfce03b1afa71aeb9fae2930fc844438ffc46
 EBUILD docker-proxy-0.8.0_p20180907.ebuild 826 BLAKE2B 19c2f5cc5094a1f47b2bb97df327902c3173f161f71e55540be7a2b60574567bed7e1739913f0331c120b4e6e66c791f8e79dea7e020a9523dad5882cac85134 SHA512 226a6faa9ac793eb9144741bb4853ec14d0f86df61c56a3610df7439b9f693ae3024c4b5f749378ce24b79789f0efeb181726057ed86f1206f7b0085e469260b
-EBUILD docker-proxy-0.8.0_p20181207.ebuild 826 BLAKE2B 33b5944afce1a5ae36b6ed96b0e17768dab5916e9db658f5663b021587d1fcb450321dfbebabdcca1c3f5698e084b4a93e8c2824f249083ad26104d0ac93cc01 SHA512 8cd01cb01d5339d64ce0e3b52e4268f48fa8c4496eb6ee70179289a3b425faf0e0a6c2ed4da9ca740981847ddd27128ef255d3d7a8d32c2a0324e8dfbd5756ff
+EBUILD docker-proxy-0.8.0_p20181207.ebuild 825 BLAKE2B ae4d246ed05a3cf8b8ed9d41955cb9edc9d9d530113ed16ceb4f44c02b00ac3e9a59a52f7b6862c584da28e8e2fccbaf6ea5000d27f87891c6669789a575df1d SHA512 2cf5e7df32c7aadf606f53a54ce58188f32801da8f0003656120762a6ad4b9fe6e58e6648cf2a37d0c131ee2a2ae6aee1ebbca07ba556f645d2915afadbfd35a
 EBUILD docker-proxy-9999.ebuild 782 BLAKE2B 9d12852020716c9fda7e8da2dac1efd32f929b4d1afdfedf186e80e8f2d1351a626833a24e01e81d0c30a9099b286051099e5065e4b0dd55f5a0b5037dbd2d36 SHA512 3b972b6ef5af055046171a6ea8c8aa8f6ec51576d0b871ccff3080d9b99a5e8762c25d3226cb24fd3db66a8f0140a38506fcc6691f0c75ddf8b2646c785d83e6
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
index 6e64beaea41f..c0bd42bd486f 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	EGIT_COMMIT="2cfbf9b1f98162a55829a21cc603c76072a75382"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index ea85dd102cbf..41c4fc07c127 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,11 +1,11 @@
 AUX bsc1073877-docker-apparmor-add-signal-r2.patch 2931 BLAKE2B 92737eb582f5c2b3bc548952e20f8b9512ea3abab785280a351202878a77fc5e7c00267498ac38cd13dfb5b21a891f5be827f8f4ed234ca34bb90523cd2ebacf SHA512 f1c57585146d89be987b19ebd99a0da69d75309885e3b2a098c1b5f339aafa360c3726fe5e99a2580c98c3f036d83eabd3d2d72461d97e8a0cbb4dbc27f895d4
 AUX bsc1073877-docker-apparmor-add-signal.patch 715 BLAKE2B cb97ebb2e7104e04264318fec93df80a5f7f9b4cfc84b9f31ea1185d7752e431d714dd901b168c490562688c124aac8d48fef9c1266d7a8fa07aa06de7e40d08 SHA512 936d3948fd3ccadd4a3810bb8fc32e31e7e24b810e87658e5e53560b515454db6b72b0cda3ace78b9267e197e55181c04fbea92a1656f6a282e29f37d2994adc
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
-DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0 SHA512 7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
-DIST docker-18.09.1.tar.gz 15247155 BLAKE2B 5c9a6c0d6e383da2b99341812b0cc1d1498e46decc3b3aaa418607d5f4d725a6842a4462c06357685a32312b90978b0349aaceb69907324761589e68cfae7bca SHA512 9813d3bd41eff63a089495a976226b93d5d43544530aea0ebce78b96e6b4b38389fe3ad1117f1ca95c38727047a24211ad2c2b44217935c26ffb5496cf90407e
+DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b SHA512 78ab030555501071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f29444407456a3914c263c04a1398dc895586026440f203b50a4
+DIST docker-18.09.2.tar.gz 15252871 BLAKE2B f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44 SHA512 eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01
 EBUILD docker-18.03.1-r1.ebuild 8338 BLAKE2B e9984640c084a99c1ba99173905b9d58f14559b0b122bb6759b16689bf40fc313d0b9a3fac45ceaf509fe28b7006c87b555c3db49c32f04360e700cca4cbb839 SHA512 1d11e2d4f67d8e16714901e56ce251d590ea2be3a786869895600a3bee4becc0f66dc88b6253df1c277455e595851ac34e608b70f46bbe88e0a33f3e17eaf4ac
 EBUILD docker-18.03.1.ebuild 8337 BLAKE2B f0b13adc75d2a334eaf91938b2774a5216fa4ef7905032f59e313d87367c7de07a6868e443f65db881bbeaabc8aeaf008aec8836827513b546ddd3bfeab599d7 SHA512 09645b50f569e37e94c7f8e36503ce949fe709ff22d579b9e2e2183a573196ae3bdf0a991c71af56a37e2e8fa7e3341289154dee4e1a336ea1b212cd63079bc9
-EBUILD docker-18.06.1-r1.ebuild 8444 BLAKE2B efd1564a829daf4811783d163be2f72ecfa3731b9594dfa4f6c2a44c227a2e1033ff32023d118b722fefdae949257faec41ea39145a8e84ca1e87c1ef6546ae5 SHA512 82bb833841c33e009c2b0f33ffc92509dca4ee9192419c92189b37a7a1dc1942931f036d8c8cc254bbad5a3c2fb7f962707c5a3ff1ab5c1fac757c742e990b17
-EBUILD docker-18.09.1.ebuild 8296 BLAKE2B b528aaa7d43867856e503d875e5f03d71291abe46fc706860126819cb2683a9ff8d8e2772b51e266ca17a839e29ddbc6aa0cf3eb9058de7a570a19a7dc7f5e6d SHA512 9def7412189f6d783b6284aa58461837bb2d9b94e9835047aaa4ea7b20407d56c99df46c435602c72da6c8761e2e163127a55e51d030356af36e4c33f4ea4782
+EBUILD docker-18.06.2.ebuild 8489 BLAKE2B cd1ce26e248cf86bbb31f5b2c023fd73df41010f0f0953bf677df2c0c823d6ab0520ac9dc6309ad5a66de879901e6968376f3956f7d79e7c28f3b2e6b2d2eed9 SHA512 a1a2be3fc79751bd93090d128ae1f3c29a3b6cc7f887e40738c566235faa741a777a7bd0778d29e40b9fb32a78899e2f19a008ef75f0a9df5f9a89bd8bda20c2
+EBUILD docker-18.09.2.ebuild 8340 BLAKE2B ca1afc4c89897f9cab93182cea146b419e0c56fb02149241d000335264c66373ca98f9891da66439cb2774e5889d6d96f4fa6312f8b5420f61b6fd3b00fca590 SHA512 23206009cf2b4b50aa83e1832c7eb6c0bc2c34f17e8b567c27356e747627cdb9108ab86ffec4e7075fcc6e554375c50e1f3a6312f05562533549d9c5bc9f1f2f
 EBUILD docker-9999.ebuild 8168 BLAKE2B d1111f0132aa330f95f8f9dcd5c49aee0c8a0eaa5ee3cbd567be89f0d2f4b8c230c80d817fe14272d7c2765f1877ad070ebe98107575ec0f43d10e2f6f6b089b SHA512 e629feee1e546a0ea4570692446697899199248334fc00337963eda8857fadde618fc42ad23288f4239cb7f6f71ad52a61a2d275e54a7694fd79fa1fc1610df3
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-18.06.1-r1.ebuild b/app-emulation/docker/docker-18.06.2.ebuild
index a5aaa520b414..8245be26fc71 100644
--- a/app-emulation/docker/docker-18.06.1-r1.ebuild
+++ b/app-emulation/docker/docker-18.06.2.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
@@ -17,7 +17,7 @@ else
 	else
 		MY_PV="$PV-ce"
 	fi
-	DOCKER_GITCOMMIT="e68fc7a"
+	DOCKER_GITCOMMIT="6247962"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64"
@@ -63,6 +63,7 @@ RDEPEND="
 	dev-libs/libltdl
 	~app-emulation/containerd-1.1.2
 	~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?]
+	>=app-emulation/runc-1.0.0_rc5_p20180509-r1
 	~app-emulation/docker-proxy-0.8.0_p20180626
 	container-init? ( >=sys-process/tini-0.18.0[static] )
 "
diff --git a/app-emulation/docker/docker-18.09.1.ebuild b/app-emulation/docker/docker-18.09.2.ebuild
index e6637e5dca26..f3387de3b5de 100644
--- a/app-emulation/docker/docker-18.09.1.ebuild
+++ b/app-emulation/docker/docker-18.09.2.ebuild
@@ -11,9 +11,9 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
 	inherit git-r3
 else
-	DOCKER_GITCOMMIT="4c52b90"
+	DOCKER_GITCOMMIT="6247962"
 	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
@@ -56,6 +56,7 @@ RDEPEND="
 	dev-libs/libltdl
 	~app-emulation/containerd-1.2.2
 	~app-emulation/runc-1.0.0_rc6_p20181203[apparmor?,seccomp?]
+	>=app-emulation/runc-1.0.0_rc6_p20181203-r1
 	~app-emulation/docker-proxy-0.8.0_p20181207
 	container-init? ( >=sys-process/tini-0.18.0[static] )
 "
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index 9f021f4e5b84..5e71840a71d0 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1,6 +1,6 @@
 DIST libvirt-glib-1.0.0.tar.gz 860450 BLAKE2B 417a3bd0df41787fbec456f301af744a04649db02192ef9c80bf42214a112a050a9f054c81549a114e7a1236c86e0066e8002f0c7f09317abb672fe5f6a76789 SHA512 72f53a90d3e40aa93d4afe5b29f631afe859532fbdb4e27086da3bd4cdaf0fb25fc808a82a1994b7c2648a1e864876ce95de28acb3b4876dac47b0f4d1c97ba5
 DIST libvirt-glib-2.0.0.tar.gz 868946 BLAKE2B 1ff4695b25766d6caa603826dcc63e64aa3ce022e6623eb31017fb67a490baeb546a9bc67e16fc16c7b86040db971748b1ef4303a21b5dec098cf732f77c92ec SHA512 6ead4c37c314eb5670c5aa282ce039a0182a71a20b349a5d9c78367381eb674fad0f2ca0f2e20e1e89ff7df2ac9f1640f20fdfa63d599d8a2538fb4c0fba4c3f
-EBUILD libvirt-glib-1.0.0-r1.ebuild 1014 BLAKE2B 7e26b59844df689ae0cf1c791ebc61d046eb45afdc014708ae3283a771a537bfc2aa0025cb2379d5bdaa20e4147385cda057a93d7423d7b26a11973878e1d4cb SHA512 fbb757c3e5fe6dc894be136fde13e177704c7fbc1bc5f46dd5a5f64708966fb0919e187ca501335fb3a736e37df26936a22b286a9176f8d6368a44ab6a55b6c7
-EBUILD libvirt-glib-1.0.0.ebuild 1234 BLAKE2B b6429e7d6151f44ac3af8db66a43984be934dc01de02cdaf45fce08721a12f63bbd84177bf1a2b847e22ea4c4c5ab800cc308d481dd09a97c68b05365bea4148 SHA512 71973f3d5429257a7434977aece98e2041f0bdada1466324c08c1453a597d0df72249f070e90aeaf987e56a5a18c2f7f3c62cd05a0d19c60602213882f10ed49
-EBUILD libvirt-glib-2.0.0.ebuild 1011 BLAKE2B 46753d7e8dde1c708edeb7f84bfb4b3c2994baedce161cd8915c8dc92c370f8625281cd88f573640e16f4fb522b55f552278a4934d43027df965facfdea1ce56 SHA512 2b5af1e0b5034b7865b829609a2e40d39d6f613a55aaa2687aa79f27ea32a605c5185a9337476bc922a66c8205b77b317ef43fba4f53f0b166049df142c565b0
+EBUILD libvirt-glib-1.0.0-r1.ebuild 1032 BLAKE2B 1f60d87c17a1e64ec297634266ed782cc1593a21b586e463c2afb5f4864d3fba4f3df0821faa5ddb863b479cb902b30cad897c2638c932e06fc1eff060add4cc SHA512 2d62a2730433fea1ca9de2dfe475c984202183412c04bf01450cde72b05b2fef1139441d37ea2ec28414949999166a2edea2b61f8da906e8335a2624ddfa365b
+EBUILD libvirt-glib-1.0.0.ebuild 1252 BLAKE2B 331970c3d455905a69f8dcda11cba72712f1aebb6f8301a299c556ff382cac494e8f3d94efdaa9e010012870f596317211181c494fba04eb5af1511f7ec9e347 SHA512 6f6ed0b1f070ae3f55040af0eb52f0759594c8926dd0776d7b934544e444506221b0322939769f64d967a9b9fa1edc546dc103bccdb9bfb02b7bdaff6689916c
+EBUILD libvirt-glib-2.0.0.ebuild 1032 BLAKE2B 1f60d87c17a1e64ec297634266ed782cc1593a21b586e463c2afb5f4864d3fba4f3df0821faa5ddb863b479cb902b30cad897c2638c932e06fc1eff060add4cc SHA512 2d62a2730433fea1ca9de2dfe475c984202183412c04bf01450cde72b05b2fef1139441d37ea2ec28414949999166a2edea2b61f8da906e8335a2624ddfa365b
 MISC metadata.xml 353 BLAKE2B 84d64fcb26b450371bcdd9ce737aeb5b0337a23d8cd5401094793fc73e63610cda3c04853a6ea98a8d352d990a5067515bff049b86c305d48ed2828e98765e4a SHA512 b32b362e0267da5954557ffde2722311523b93bd84b0f8023671cf12ccd178577007b900e745671ec1aec5cb3c7bf8f538803669efb44865380a0d5010ee8d74
diff --git a/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild b/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
index 0daa19c64aaa..c18bd71005a4 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ RDEPEND="
 	>=dev-libs/glib-2.38.0:2
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
diff --git a/app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild
index 677bcfa6826d..5f3df9674b16 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,6 +32,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
diff --git a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
index c0dbda3904fc..c18bd71005a4 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	>=dev-libs/glib-2.38.0:2
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )"
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 53cbbb80f50d..aaa403c1c9c8 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,19 +1,11 @@
 AUX 10.1.0-Werror.patch 660 BLAKE2B a2877e473e2206259cf260b22d638643ae0e1a595f79bc69c401b9e5107445764868782e3cd4d8626f9a9d62fd748b7242530d89881678c12ac49230804cab41 SHA512 3bfbc1e5c064318b36b01e656ce6296726b31632222f8cebe96cac6acf011e1237380cdad71d01a0493c1382d0e3fc471e2a4e0ed0b902e70cf29e1d8a88633f
 AUX 10.1.0-mount.vmhgfs.patch 1305 BLAKE2B 5482c6ab87c5e14e229088eb71c3e6833674eae09af4f4171ff16ee752fd354828c7eab1f7c85eb5f23f14d9412c15e4566f872d709aaead4ff7d7cf8dbd06b4 SHA512 3cf1cf89f8e39d676075a56643e9d0aef22609234166195cb31cea2cb3daf6d90cb5aab0aa84f446c34dabc9ad67ccc5532276fe1c20d5cc5a723240b1313694
-AUX 10.1.0-vgauth.patch 803 BLAKE2B 67402d20388a53cf95a43b43373546a1278fd5002f012e79c29563d4b792bffc3448ab8f346bdf86f2fa5d923919610b4c4c160e0526fdb4aca77b964cf321a6 SHA512 95b4ee3b24eb656241fa7a303429727cf5254df3a78756ff865fba6a9643a6e401c8b4fbfc014e81792a89ecab895006d42f5930e33c23fb3c381cbaf7bbd7a3
-AUX 10.2.5-libtirpc.patch 1673 BLAKE2B 2fdaddcfd7447d8345addcc59f154edfa291a2e2cf4f47badcc54cd7c1acd9403c386409d04aaf69698196603a73774000603b5c56f0c589f033e0e430a9f0b7 SHA512 81dbb13da2901eb558c5c7d40589cc36306b529a2a5b34f3c4eebd5f07b9ab5993a72cbb6a89737c22271c7c9f543ecc8dec19968084958475e962a6f14447d2
 AUX mount.vmhgfs 63 BLAKE2B 8214f6eaae9e1c2b6af7cb364572323f91e544d17d816ce93ca1a58e4f6c0ac8692000c95ef982ad6a2721bb070a5d0c4a65275a63e8cea91e14888713b560d4 SHA512 dbad70fbb96e37ffca4664abe7766c26ce3303e52ccfc80b5c83d1e21066d2a23d548910f8e15055be36e1ca162cdbbf6e19fcb672314888c63cd802a499acb9
 AUX open-vm-tools.confd 88 BLAKE2B d82267674328d1e38cc850df238b8cc6c566588883d81e59f308ddd070fde6e4f9ae4950c9d68ac6daf2ed33e1a45f323d8f954430559b03697f1a25f1e7ef6a SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be
 AUX open-vm-tools.initd 1225 BLAKE2B 279f572bfb07c40f0612c39989ba0048c640b5bdfdb06e624d8af974cd9fdff42ab0b4bb6ad79e19dedf3cd89fd90d61f7d549b9c8a8a6406129a5eab5e60cbc SHA512 a612dd69e671cd32b028caeefa8123243e46ed6ffe5f6f7cbd1f805ec10088dbe994d4ecb2346a7f6d094e913e70e87fa17fa195702a0825cc3af319d350d34d
 AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002ed64b3205f0b4ad05d4d92ae059a1b451cfa043488d15dd31dd8c152342895cd296052757c854124b SHA512 de3265980076f87ab8e0b459b2b6d60dbcf6e8453bd26200d9e05938246add8d320681c7faa3c290c8851c9a3949c62ddfe524b7e1581daf508115f340111881
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
-DIST open-vm-tools-10.1.10-6082533.tar.gz 5111726 BLAKE2B 22e2e901c542ae14b7537bc26ff848359f30bde6824a16968b70070dd6e57c92fbf76dca0d02e35ef45bda257725e207632b0602a4336bd2d9c97d10fb094967 SHA512 60c52a24509cb0630f2ad649fe6717fefff624fc2a5c736ced35cbdb8f639264d482e063e8140eedb39216adfb1231d58232bfef0233ebc477ba4f9a732c5965
-DIST open-vm-tools-10.1.15-6677369.tar.gz 5153995 BLAKE2B 03c6b359df8f42f1ba65331dcac67e8ce86b0fce9a572c1665d3f385cae14f1757611d3948d30bb5b2e40bb2b4673bb244c45f56098faf09d6de515bb937ea3f SHA512 fe3699a7f704bdadc4c274c963d177f4700067e7436074554b7cf113ffa341ad0e4753016214f947418fd5a7cb4a6f2c0342acf074b6b414b3fd18fd2ea2bc58
-DIST open-vm-tools-10.2.5-8068406.tar.gz 4818035 BLAKE2B 87e3edc42afceaf9efe69ae8cbd1abfbbf959fe09a721dbe4737ca30c6b57dcf1d8bff23bb3ed3d2236c31e7f3e6fd4d10a689b40b3b725eb580609a68bb7090 SHA512 da2f26b4b22e195af111cc16d5819aeb963f0dfa18b5d2677d897549836ec8679808315646f7f86ae36862df9e623bbcb5d553dae97a68b3ef928a5c07ea2e68
 DIST open-vm-tools-10.3.5-10430147.tar.gz 4623854 BLAKE2B a2bc0ed099cd713820aea17f01131fb4ffcdefedc04b2edb217b4a96c6c9a4007f8ecc80c40445580abffaf3fb0f67be3ca9f3df7a55d368109a53da91e0db77 SHA512 2f2b3d9a8d39b01904cf845936b51a468ba61a29ca64635f842451ca9fd90bf5a770967e4c332319327c6f920ac4fb06d304e185c18ab8898aeb4fcd491a4a1f
-EBUILD open-vm-tools-10.1.10.ebuild 3412 BLAKE2B 230f0c96a19168f8097772f2b962829b430732c025c091f0c5a2b5deb22a8dd038036b3482d7347aadab490c2335cd56a6279e2380bab925b456a5af0278281d SHA512 20d56ddb09464c77792febabe57db66a33d1c6f81e22a8b6f7b6e4c4d0ca6f58b1646bc155d1fb77a96774e023f321a74af0bb5b2f8aa08d3f50459f2f041ce5
-EBUILD open-vm-tools-10.1.15.ebuild 3597 BLAKE2B 93ceaf85d62b4049e7b1ba68ff52b0d6ffc47dbb4d4e143368f64c3be3ef1d3154801e4451da74949c50df0f3bd489c6cdfc3d7e3ec51633ce72397375aacabd SHA512 ff5467262b1bffd67a8806bd922ffa955688b9ad642707de8920e74bddf94d013e170a82d92d2f9eb95550db9f2dd4d7ba19442f2cfd2ba85d87f67345d7ee00
-EBUILD open-vm-tools-10.2.5.ebuild 3952 BLAKE2B 23c4c618eceba910f901da93e647a744b4c3025f4914782185731e96540e7a2b134b2828fada90cfc08e5b031f37b983b8de2b6c5727ded68c7826809702dc41 SHA512 2ffd16170f6ec537185b1cb31254e459b671252baa811c7488e863e842c0925d147da58836b25989687beabc589dba07a69914bec93f00ce0fd4ea150da77f1e
 EBUILD open-vm-tools-10.3.5.ebuild 3333 BLAKE2B 8d22fa3fbc5e059d6e9ad11ec8ce2df51a00e69ff30415a2282655cfb9fcbd1da2918431b9eef6553d50e359482b54d6367b6a39737a2ff9df654b2beef89018 SHA512 148f1277d0aba2c2d26b9a8af8d165566b237425866ab884c453ad76f984e30a9b8b22889a128f82f68da03ddd0c7f2c70eec50949e87fe158471b82014dffe7
-MISC metadata.xml 1572 BLAKE2B 3242a50ca7fb3fbf9bf166070d8c6d2734c52edd1983bc2992c4a329031f0fc21bdb522c46c1dce5e6e3a7682fe8706c0da5784ba168f1e4bf5a110cbf5a208e SHA512 e75e73b412df8f3a04ba5805888d09d6455ee7a5244ce0fc4ff794ddfaadf96deadc935312c66a7b1ec7e1e2b89246c4319e0a353b2413efdf29a8794d6ff153
+MISC metadata.xml 1279 BLAKE2B a684605896b5902fd97d03801a9306ba6780e31ff0bcbb10e929815090eb458225a80c4a38634ae0e60a481e15dc5e4e3e0592191ddbda926a6aa34361c37b14 SHA512 a7ada3809edd7ae8c5348afad28651babc6107919630545996e31018e993b9ae396e0242f14ee2de087874f10543d49377e0167ca037c3dfe40796ed356bd787
diff --git a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch b/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
deleted file mode 100644
index bc91b1b141ab..000000000000
--- a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 488258effa60e293a70000338422c33ce5c73f9b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 25 Nov 2016 13:59:34 -0500
-Subject: [PATCH] build: Always link VGAuthService using CXX
-
----
- open-vm-tools/vgauth/service/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/open-vm-tools/vgauth/service/Makefile.am b/open-vm-tools/vgauth/service/Makefile.am
-index 8c51d9f2..8f99dad1 100644
---- a/open-vm-tools/vgauth/service/Makefile.am
-+++ b/open-vm-tools/vgauth/service/Makefile.am
-@@ -95,7 +95,7 @@ if HAVE_ICU
-                             $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-                             $(LDFLAGS) -o $@
- else
--   VGAuthService_LINK = $(LINK)
-+   VGAuthService_LINK = $(CXXLINK)
- endif
- 
- # Message catalogs.
--- 
-2.11.0.rc2
-
diff --git a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch b/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
deleted file mode 100644
index a9dfb42b2fc4..000000000000
--- a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 75505fed193fc3779560b57c1b0d6d4209b05bf9 Mon Sep 17 00:00:00 2001
-From: Xiami <i@f2light.com>
-Date: Thu, 14 Jun 2018 16:23:00 +0800
-Subject: [PATCH] lib/dynxdr: for libtirpc
-
-glibc-2.26 do not provide RPC support by default.
-This workaround only works for Gentoo as ebuild forces libtirpc.
----
- open-vm-tools/lib/dynxdr/dynxdr.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/open-vm-tools/lib/dynxdr/dynxdr.c b/open-vm-tools/lib/dynxdr/dynxdr.c
-index 95fdc7e2..d3182733 100644
---- a/open-vm-tools/lib/dynxdr/dynxdr.c
-+++ b/open-vm-tools/lib/dynxdr/dynxdr.c
-@@ -55,7 +55,7 @@ typedef struct DynXdrData {
-  * Mac OS X, FreeBSD and Solaris don't take a const parameter to the
-  * "x_getpostn" function.
-  */
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(_TIRPC_XDR_H)
- #  define DYNXDR_GETPOS_CONST
- #else
- #  define DYNXDR_GETPOS_CONST const
-@@ -172,7 +172,7 @@ DynXdrSetPos(XDR *xdrs, // IN
- }
- 
- 
--#if defined(__GLIBC__) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
-+#if (defined(__GLIBC__) && !defined(_TIRPC_XDR_H)) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
- /*
-  *-----------------------------------------------------------------------------
-  *
-@@ -322,7 +322,7 @@ DynXdr_Create(XDR *in)  // IN
-       DynXdrSetPos,     /* x_setpostn */
-       DynXdrInline,     /* x_inline */
-       NULL,             /* x_destroy */
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) && !defined(_TIRPC_XDR_H)
-       NULL,             /* x_getint32 */
-       DynXdrPutInt32,   /* x_putint32 */
- #elif defined(__APPLE__)
--- 
-2.16.4
-
diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml
index 9e8e61bb812a..fffabeca19bc 100644
--- a/app-emulation/open-vm-tools/metadata.xml
+++ b/app-emulation/open-vm-tools/metadata.xml
@@ -16,7 +16,6 @@
 		of virtual machines.
 	</longdescription>
 	<use>
-		<flag name="caf">Build Common Agent Framework</flag>
 		<flag name="deploypkg">Build deploypkg plugin</flag>
 		<flag name="dnet">Enable support for nicinfo</flag>
 		<flag name="doc">Generate API documentation</flag>
@@ -24,11 +23,8 @@
 		<flag name="grabbitmqproxy">Build grabbitmqproxy plugin</flag>
 		<flag name="gtkmm">Compile with Gtkmm and sigc++ (Recommended)</flag>
 		<flag name="multimon">Enable multimon (Requires X)</flag>
-		<flag name="pic">Force shared libraries to be built as PIC</flag>
 		<flag name="resolutionkms">Build the linux/unix resolutionkms module</flag>
 		<flag name="vgauth">Build vgauth</flag>
-		<flag name="xml-security-c">Build vgauth with xml-security-c instead of xmlsec1</flag>
-		<flag name="xmlsec">Build vgauth with xmlsec1 instead of xml-security-c</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">vmware/open-vm-tools</remote-id>
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild
deleted file mode 100644
index 5ba66d7b94fd..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MODULES_OPTIONAL_USE="modules"
-
-inherit autotools linux-mod pam systemd toolchain-funcs user
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-6082533"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc grabbitmqproxy icu pam +pic vgauth xinerama"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libdnet
-	sys-fs/fuse:0
-	>=sys-process/procps-3.3.2
-	grabbitmqproxy? ( dev-libs/openssl:0 )
-	icu? ( dev-libs/icu:= )
-	pam? ( virtual/pam )
-	vgauth? (
-		dev-libs/openssl:0
-		dev-libs/xerces-c
-		dev-libs/xml-security-c
-	)
-	X? (
-		dev-cpp/gtkmm:3.0
-		x11-libs/gtk+:3
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-	"${FILESDIR}/10.1.0-vgauth.patch"
-	"${FILESDIR}/10.1.0-Werror.patch"
-)
-
-pkg_setup() {
-	linux-info_get_any_version
-	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
-	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
-	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
-	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
-	if use modules; then
-		linux-mod_pkg_setup
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-deploypkg
-		--disable-static
-		--disable-tests
-		--with-procps
-		--with-dnet
-		$(use_enable doc docs)
-		$(use_enable grabbitmqproxy)
-		$(use_enable vgauth)
-		$(use_enable xinerama multimon)
-		$(use_with icu)
-		$(use_with pam)
-		$(use_with pic)
-		--without-gtk2
-		--without-gtkmm
-		$(use_with X gtk3)
-		$(use_with X gtkmm3)
-		$(use_with X x)
-
-		# configure locates the kernel object directory by looking for
-		# "/lib/modules/${KERNEL_RELEASE}/build".
-		# This will fail if the user is building against an uninstalled kernel.
-		# Fixing this would mean reworking the build system.
-		$(use_with modules kernel-modules)
-		--without-root-privileges
-		--with-kernel-release="${KV_FULL}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	use modules && set_arch_to_kernel
-	default
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	if use pam; then
-		rm "${ED%/}"/etc/pam.d/vmtoolsd || die
-		pamd_mimic_system vmtoolsd auth account
-	fi
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
-	systemd_dounit "${FILESDIR}"/vmtoolsd.service
-
-	# Replace mount.vmhgfs with a wrapper
-	mv "${ED%/}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
-	dosbin "${FILESDIR}/mount.vmhgfs"
-
-	# Make fstype = vmhgfs-fuse work in fstab
-	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
-
-	if use X; then
-		fperms 4711 /usr/bin/vmware-user-suid-wrapper
-		dobin scripts/common/vmware-xdg-detect-de
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, please add the users to the 'vmware' group."
-	fi
-}
-
-pkg_postinst() {
-	enewgroup vmware
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild
deleted file mode 100644
index 3829a224743b..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MODULES_OPTIONAL_USE="modules"
-
-inherit autotools flag-o-matic linux-mod pam systemd toolchain-funcs user
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-6677369"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc grabbitmqproxy icu pam +pic vgauth xinerama"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libdnet
-	net-libs/libtirpc:0=
-	sys-fs/fuse:0
-	>=sys-process/procps-3.3.2
-	grabbitmqproxy? ( dev-libs/openssl:0 )
-	icu? ( dev-libs/icu:= )
-	pam? ( virtual/pam )
-	vgauth? (
-		dev-libs/openssl:0
-		dev-libs/xerces-c
-		dev-libs/xml-security-c
-	)
-	X? (
-		dev-cpp/gtkmm:3.0
-		x11-libs/gtk+:3
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-	"${FILESDIR}/10.1.0-vgauth.patch"
-	"${FILESDIR}/10.1.0-Werror.patch"
-)
-
-pkg_setup() {
-	linux-info_get_any_version
-	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
-	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
-	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
-	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
-	if use modules; then
-		linux-mod_pkg_setup
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)"
-	export LIBVMTOOLS_LIBADD="$($(tc-getPKG_CONFIG) --libs libtirpc)"
-	local myeconfargs=(
-		--disable-deploypkg
-		--disable-static
-		--disable-tests
-		--with-procps
-		--with-dnet
-		$(use_enable doc docs)
-		$(use_enable grabbitmqproxy)
-		$(use_enable vgauth)
-		$(use_enable xinerama multimon)
-		$(use_with icu)
-		$(use_with pam)
-		$(use_with pic)
-		--without-gtk2
-		--without-gtkmm
-		$(use_with X gtk3)
-		$(use_with X gtkmm3)
-		$(use_with X x)
-
-		# configure locates the kernel object directory by looking for
-		# "/lib/modules/${KERNEL_RELEASE}/build".
-		# This will fail if the user is building against an uninstalled kernel.
-		# Fixing this would mean reworking the build system.
-		$(use_with modules kernel-modules)
-		--without-root-privileges
-		--with-kernel-release="${KV_FULL}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	use modules && set_arch_to_kernel
-	default
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	if use pam; then
-		rm "${ED%/}"/etc/pam.d/vmtoolsd || die
-		pamd_mimic_system vmtoolsd auth account
-	fi
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
-	systemd_dounit "${FILESDIR}"/vmtoolsd.service
-
-	# Replace mount.vmhgfs with a wrapper
-	mv "${ED%/}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
-	dosbin "${FILESDIR}/mount.vmhgfs"
-
-	# Make fstype = vmhgfs-fuse work in fstab
-	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
-
-	if use X; then
-		fperms 4711 /usr/bin/vmware-user-suid-wrapper
-		dobin scripts/common/vmware-xdg-detect-de
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, please add the users to the 'vmware' group."
-	fi
-}
-
-pkg_postinst() {
-	enewgroup vmware
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild
deleted file mode 100644
index bddd12cadf29..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs user
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-8068406"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X caf +deploypkg +dnet doc +fuse +grabbitmqproxy gtkmm +icu multimon pam +resolutionkms +ssl static-libs test +vgauth +xml-security-c xmlsec"
-REQUIRED_USE="
-	multimon? ( X )
-	vgauth? (
-		^^ ( xmlsec xml-security-c )
-		ssl
-	)
-	caf? ( vgauth ssl )
-	grabbitmqproxy? ( ssl )
-"
-
-RDEPEND="
-	dev-libs/glib
-	net-libs/libtirpc
-	deploypkg? ( dev-libs/libmspack )
-	fuse? ( sys-fs/fuse:0 )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl:0 )
-	vgauth? (
-		xml-security-c? ( dev-libs/xerces-c dev-libs/xml-security-c )
-		xmlsec? ( dev-libs/libxml2 dev-libs/xmlsec )
-	)
-	X? (
-		x11-libs/libXext
-		multimon? ( x11-libs/libXinerama )
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		x11-libs/libSM
-		x11-libs/libXcomposite
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		gtkmm? (
-			dev-cpp/gtkmm:3.0
-			dev-libs/libsigc++:2
-		)
-	)
-	dnet? ( dev-libs/libdnet )
-	icu? ( dev-libs/icu:= )
-	caf? (
-		dev-libs/log4cpp
-		net-libs/rabbitmq-c
-	)
-	resolutionkms? (
-		x11-libs/libdrm[video_cards_vmware]
-		virtual/libudev
-	)
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cunit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-	"${FILESDIR}/10.1.0-Werror.patch"
-	"${FILESDIR}/10.2.5-libtirpc.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
-	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
-	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
-	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# On >=sys-libs/glibc-2.26, SunRPC no longer provided
-	# Use libtirpc and rpcsvc-proto instead
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)"
-	export LIBVMTOOLS_LIBADD="$($(tc-getPKG_CONFIG) --libs libtirpc)"
-	local myeconfargs=(
-		--without-root-privileges
-		$(use_enable multimon)
-		$(use_with X x)
-		$(use_with X gtk3)
-		$(use_with gtkmm gtkmm3)
-		$(use_enable doc docs)
-		$(use_enable test tests)
-		$(use_enable resolutionkms)
-		$(use_enable static-libs static)
-		$(use_enable deploypkg)
-		$(use_enable grabbitmqproxy)
-		$(use_with pam)
-		$(use_enable vgauth)
-		$(use vgauth && use_enable xmlsec xmlsec1)
-		$(use vgauth && use_enable xml-security-c xmlsecurity)
-		$(use_enable caf)
-		$(use_with dnet)
-		$(use_with icu)
-	)
-	# Avoid a bug in configure.ac
-	use ssl || myeconfargs+=( --without-ssl )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	if use pam; then
-		rm "${ED%/}"/etc/pam.d/vmtoolsd || die
-		pamd_mimic_system vmtoolsd auth account
-	fi
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
-
-	if use vgauth; then
-		systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service
-		systemd_dounit "${FILESDIR}"/vgauthd.service
-	else
-		systemd_dounit "${FILESDIR}"/vmtoolsd.service
-	fi
-
-	# Replace mount.vmhgfs with a wrapper
-	mv "${ED%/}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
-	dosbin "${FILESDIR}/mount.vmhgfs"
-
-	# Make fstype = vmhgfs-fuse work in fstab
-	dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
-
-	if use X; then
-		fperms 4711 /usr/bin/vmware-user-suid-wrapper
-		dobin scripts/common/vmware-xdg-detect-de
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, please add the users to the 'vmware' group."
-	fi
-}
-
-pkg_postinst() {
-	enewgroup vmware
-}
diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index 5787945e3629..1a9307964684 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -1,3 +1,5 @@
+DIST q4wine-1.3.11.tar.bz2 2868845 BLAKE2B 98893b1f65bcb8b8f301d7046a650658a9537849818fddf4803471a626f24d8c812867daec1f167b1fa5cdce9f9c0c50323d715ea06c51f3d52f85904257d2b0 SHA512 95ac66632bc46b10659e1d0e5f3c68b73934a85ddcc6582abd367d28f9949ad0ca732a5596db800bbc76b40ae7cf05fd95febf6d8b44db20cf710c2c1e23288f
 DIST q4wine-1.3.6.tar.bz2 2867547 BLAKE2B b35a638e514108e4ee4be34b446a7d2d5ba00415d8f54cfee293988707b637d41945d3197a2132147e09d5a05153fd47a55701dcba358f3a2b3a2e6037f78aaa SHA512 1ff0ea2a4523fc5582ec67f5e305622653c4e387ac5f2cecde52289117ef879a60261fdbf9ddf421812765539124d4c5b6b37ff401530d3e061723a3c35d57f8
+EBUILD q4wine-1.3.11.ebuild 1200 BLAKE2B fb469ac35923c88f8385d52518d05cc6f6a690e53a788b399ef11a8de0499b9a7b821640b435120b6dd871028a06b3ef4cf1f48a2fb512478fc24d817591fa00 SHA512 32b6adfa756ab4b9d45656b808c64aab15fd7d24280c6f6dbcbfcd3218af4278b6b2eaae14e020b8ce19b8415bbea17e7cba514cbf8347a05ec465dfcd369155
 EBUILD q4wine-1.3.6-r1.ebuild 1360 BLAKE2B 1b5be13d28f3292a3ce36263b362cbd51099b51ced181866c5ea7bc88443fd83b561a9794b0ef767b9376ff7a469bb1089d20d9575c53d8938bd9ab4ca12aa3d SHA512 58a1a5adc2f3c3767d0168a78e3e7c90da2827dc630572a5f5b7e5139a6c69c3c6cde15d6328056ab547962d665837bd9364557c284b2aa4442aa033a92591c7
 MISC metadata.xml 641 BLAKE2B af03073e86a430ccc228ba18c2dd18d4fe8d07438e5beec07f3712807a792829096cb3eeaa4e912a80c2634a1bb16ef20ddbc08684fc4fdf2b14d839cd520733 SHA512 707f77ef56bb3bcbe4bda434f1262f77c0b337a8789508e0df04d2cd791959ca7dc67b74ac81b6e248023f3da83c86bcf7f185ca689ab7b3bf346250850df8ed
diff --git a/app-emulation/q4wine/q4wine-1.3.11.ebuild b/app-emulation/q4wine/q4wine-1.3.11.ebuild
new file mode 100644
index 000000000000..3466e650c02d
--- /dev/null
+++ b/app-emulation/q4wine/q4wine-1.3.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake-utils
+
+# Upstream names the package PV-rX. We change that to
+# PV_pX so we can use portage revisions.
+MY_P=${PN}-${PV/_p/-r}
+
+DESCRIPTION="Qt GUI configuration tool for Wine"
+HOMEPAGE="https://q4wine.brezblock.org.ua/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+dbus debug +ico +iso +wineappdb"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dbus? ( dev-qt/qtdbus:5 )
+	ico? ( >=media-gfx/icoutils-0.26.0 )
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	>=sys-apps/which-2.19
+	iso? ( sys-fs/fuseiso )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEBUG=$(usex debug ON OFF)
+		-DWITH_ICOUTILS=$(usex ico ON OFF)
+		-DWITH_SYSTEM_SINGLEAPP=ON
+		-DWITH_WINEAPPDB=$(usex wineappdb ON OFF)
+		-DUSE_BZIP2=OFF
+		-DUSE_GZIP=OFF
+		-DWITH_DBUS=$(usex dbus ON OFF)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index ae566c7280b3..1d3e43b86db6 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,10 +1,9 @@
+AUX runc-fix-cve.patch 8949 BLAKE2B b968b811c139a15d39daf78bbffac35aad583f1ca1cfe4c24ecf150588269d757329cc64643084a869593faae8c1a8e56b998985be7b94c7a4a98679292aab03 SHA512 51c87fc5d3584c86d6a9f92ffd2c9f66c2d9b9f0373370e910069e778f9acd10bfb4ae450b0ec1722f80d601810057402884992d9f8b7608f13e3bf9c007a28a
 DIST runc-1.0.0_rc5.tar.gz 1183902 BLAKE2B 46d0ffd9aa79a6f74b3194fa9e1932390115a43c903ae553acb7749d6be41220874a1ff9bae9706b5fecb9495dd6686c38ee1e9baf6118a14990f142baf6f64d SHA512 714230887ff9706c29b0656c5cdb253698bde6252a23e7f48aa690747fb57abd7884c2da1c4d0e314f9f301c5962417351557d15d986e45fcc336e98069aeac6
 DIST runc-1.0.0_rc5_p20180509.tar.gz 1185576 BLAKE2B b56f9c185c061f51a1fd81c19d378b06c71d06c6eddcbc1c946b234814eb469ea4af37bf42ef3889e4d37bc430e69d0a563281b13055f855f1bc15935531fe28 SHA512 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3
-DIST runc-1.0.0_rc6.tar.gz 1202212 BLAKE2B 2795b6e88a9587fac61a50bfea52a9df8524eb87aae66129d7ea83e8c3ca586efc60a46d24af857f7ba50f8e4d7021cbd2845d322a8c0ad08be3e0f19d80ba3b SHA512 2f7ed5e835f000d9810a116a27300336f424ac2c370dd1c7d158e26a4997d1e8398612387be27cc22cc25fdd52cc4cff7963ef88ce9c41d337321b75d9be2334
 DIST runc-1.0.0_rc6_p20181203.tar.gz 1202869 BLAKE2B 5b5808fc65f3725e5cc22794c5ff6c5eba6016110358b0f60dd3378df2e5b64afb5631e5652f45e9721838dd02745b8c5a88abfcd244de202196ac16bfccd5a7 SHA512 ec3d3fec773f2f9df714b0813efb110e21e328634e0b4ae77f323a892d0327aea5d4b6f9ae2a549aa06fda5b27431f4514fd663c7033dc170ca1a03627931f9d
 EBUILD runc-1.0.0_rc5-r1.ebuild 1296 BLAKE2B 837b2acae2f5b76fea1e49c4a49b8149e9f6fe5ac06555f1ec23720ab947d5586f00d333165a2fc200a22caa7a3616976f856bf45db6769db4b991c7d27ec0f5 SHA512 746a2751e39deebac58542a5a4687fd53523046e2b12f5f543a7ef7d891adc145bd4deaaf2e42535651eb608d2b58e5ee2f9c7db64c8c32bd5805934cc8c4c39
-EBUILD runc-1.0.0_rc5_p20180509.ebuild 1293 BLAKE2B fb959be90dcd20df0504a031ee478235cc3b7da2b2638441af00fd25036472ac9724682d54e6b1e7c66adf92dd40ea341c586cebc00a81860cf5be19b001c3f4 SHA512 f779767205e310998bd58f456c6a31670b6ac36fa859fda489c11f9053995890dca5473a27dbf229ad9c21776cde75a749cb9d787d8476e7207a33b2e601fcf8
-EBUILD runc-1.0.0_rc6.ebuild 1468 BLAKE2B 555c76381e17abcdb4c24d95602817a54bd5cdacb867de12b100842da272e1c076d85db961b2394c9781d05528d59863544a69a000598c928bc0871b0b94096e SHA512 867a0495da8d9c5ec78d9480b9ee053d26d5edd15eb57cf2777812040aa86fd41b3c471e2cd6acf61c1f5fd1c97ae2227995549121773a3b0d7c2ee319a0a410
-EBUILD runc-1.0.0_rc6_p20181203.ebuild 1468 BLAKE2B 28e60cfb54e02204e13eb28af02e7bce670bd6213c7d9a45b90980639391fbbe2b1b96de74ff806d4a19e464641e02317b1cec0330b3775b4251dd56cd2ea6d5 SHA512 2c58e0a87a84de3a524b0abf863f3398f1193fcbbf1da7ea2f6d85f26776055cb39deebbb9b21a7a54ca358b12d5d50f98d4f5cad8b75729079045c1fef33b04
+EBUILD runc-1.0.0_rc5_p20180509-r1.ebuild 1408 BLAKE2B c5dde23793e7966a4d89a58d14b086e2d4a93825ac4385638b58739b583cceacd557cffb053f87de4029c55adf8ae982b1a761f7f1688fe3b49a16e94446bf34 SHA512 0cbe830942bee1b4e8dd229c29ace4a5f41244a6b1c1be1ca9e12d69bbecfb9179d7119f52fb0ec9cfbf74940f58bee57a5ae4ee0cf795fa969f5c925694a869
+EBUILD runc-1.0.0_rc6_p20181203-r1.ebuild 1534 BLAKE2B d907412e7df715865af6a5208f78b83134e2130fc00a29397b5881a74622cc9f4a0a396f7b132245840e2dccb0ffc41ceaa597070a2a8f6b66168fc4e41c2c3b SHA512 bb21bdbb24cf9ccc62c99a378efd6fe15f71587abdc487ee556e155fa33d041e3ea8e3cabca7a8c3af6154884bbc2508d9cf978c1c786bb87661bb266d93cd82
 EBUILD runc-9999.ebuild 1080 BLAKE2B 09034744e5842eb2a340b3095ee3098c58b0853d81ee899b2b8e84c15ffe59638bfc6fb89d158edd4271f1e630c97dafdb4cbe7fb9286049dfe2bbf5eef213ed SHA512 b026b5cbfd44e110a2c2cd72125c757c6b957137fe9491b85e1f25014b564226a3e76c23ea463fd4d7ad742228b2b7bc533aa6b2539b43ca5c37aa2dd07218e3
 MISC metadata.xml 870 BLAKE2B e7fdbbe8bd178b4781f9a1345cb3473b9b2371db7f824ec3351a117d8c07c4dfa208eb1d1ef946576a6aa972bb055eba03c934f2388538998bee0e742e31151f SHA512 090b4cdf0cf933ad782e9b68df78aec48265222083a17c5f8e387943b9b535fe3d3ba751629f5c3978987572a2f1e821514e54a7f5327164f0ee8f5ce48efcdd
diff --git a/app-emulation/runc/files/runc-fix-cve.patch b/app-emulation/runc/files/runc-fix-cve.patch
new file mode 100644
index 000000000000..fa85cb0444f3
--- /dev/null
+++ b/app-emulation/runc/files/runc-fix-cve.patch
@@ -0,0 +1,334 @@
+From 0a8e4117e7f715d5fbeef398405813ce8e88558b Mon Sep 17 00:00:00 2001
+From: Aleksa Sarai <asarai@suse.de>
+Date: Wed, 9 Jan 2019 13:40:01 +1100
+Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary
+ to container
+
+There are quite a few circumstances where /proc/self/exe pointing to a
+pretty important container binary is a _bad_ thing, so to avoid this we
+have to make a copy (preferably doing self-clean-up and not being
+writeable).
+
+We require memfd_create(2) -- though there is an O_TMPFILE fallback --
+but we can always extend this to use a scratch MNT_DETACH overlayfs or
+tmpfs. The main downside to this approach is no page-cache sharing for
+the runc binary (which overlayfs would give us) but this is far less
+complicated.
+
+This is only done during nsenter so that it happens transparently to the
+Go code, and any libcontainer users benefit from it. This also makes
+ExtraFiles and --preserve-fds handling trivial (because we don't need to
+worry about it).
+
+Fixes: CVE-2019-5736
+Co-developed-by: Christian Brauner <christian.brauner@ubuntu.com>
+Signed-off-by: Aleksa Sarai <asarai@suse.de>
+---
+ libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++
+ libcontainer/nsenter/nsexec.c        |  11 ++
+ 2 files changed, 279 insertions(+)
+ create mode 100644 libcontainer/nsenter/cloned_binary.c
+
+diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c
+new file mode 100644
+index 000000000..c8a42c23f
+--- /dev/null
++++ b/libcontainer/nsenter/cloned_binary.c
+@@ -0,0 +1,268 @@
++/*
++ * Copyright (C) 2019 Aleksa Sarai <cyphar@cyphar.com>
++ * Copyright (C) 2019 SUSE LLC
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++#define _GNU_SOURCE
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <stdbool.h>
++#include <string.h>
++#include <limits.h>
++#include <fcntl.h>
++#include <errno.h>
++
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/vfs.h>
++#include <sys/mman.h>
++#include <sys/sendfile.h>
++#include <sys/syscall.h>
++
++/* Use our own wrapper for memfd_create. */
++#if !defined(SYS_memfd_create) && defined(__NR_memfd_create)
++#  define SYS_memfd_create __NR_memfd_create
++#endif
++#ifdef SYS_memfd_create
++#  define HAVE_MEMFD_CREATE
++/* memfd_create(2) flags -- copied from <linux/memfd.h>. */
++#  ifndef MFD_CLOEXEC
++#    define MFD_CLOEXEC       0x0001U
++#    define MFD_ALLOW_SEALING 0x0002U
++#  endif
++int memfd_create(const char *name, unsigned int flags)
++{
++	return syscall(SYS_memfd_create, name, flags);
++}
++#endif
++
++/* This comes directly from <linux/fcntl.h>. */
++#ifndef F_LINUX_SPECIFIC_BASE
++#  define F_LINUX_SPECIFIC_BASE 1024
++#endif
++#ifndef F_ADD_SEALS
++#  define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
++#  define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
++#endif
++#ifndef F_SEAL_SEAL
++#  define F_SEAL_SEAL   0x0001	/* prevent further seals from being set */
++#  define F_SEAL_SHRINK 0x0002	/* prevent file from shrinking */
++#  define F_SEAL_GROW   0x0004	/* prevent file from growing */
++#  define F_SEAL_WRITE  0x0008	/* prevent writes */
++#endif
++
++#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */
++#ifdef HAVE_MEMFD_CREATE
++#  define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe"
++#  define RUNC_MEMFD_SEALS \
++	(F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)
++#endif
++
++static void *must_realloc(void *ptr, size_t size)
++{
++	void *old = ptr;
++	do {
++		ptr = realloc(old, size);
++	} while(!ptr);
++	return ptr;
++}
++
++/*
++ * Verify whether we are currently in a self-cloned program (namely, is
++ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather
++ * for shmem files), and we want to be sure it's actually sealed.
++ */
++static int is_self_cloned(void)
++{
++	int fd, ret, is_cloned = 0;
++
++	fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC);
++	if (fd < 0)
++		return -ENOTRECOVERABLE;
++
++#ifdef HAVE_MEMFD_CREATE
++	ret = fcntl(fd, F_GET_SEALS);
++	is_cloned = (ret == RUNC_MEMFD_SEALS);
++#else
++	struct stat statbuf = {0};
++	ret = fstat(fd, &statbuf);
++	if (ret >= 0)
++		is_cloned = (statbuf.st_nlink == 0);
++#endif
++	close(fd);
++	return is_cloned;
++}
++
++/*
++ * Basic wrapper around mmap(2) that gives you the file length so you can
++ * safely treat it as an ordinary buffer. Only gives you read access.
++ */
++static char *read_file(char *path, size_t *length)
++{
++	int fd;
++	char buf[4096], *copy = NULL;
++
++	if (!length)
++		return NULL;
++
++	fd = open(path, O_RDONLY | O_CLOEXEC);
++	if (fd < 0)
++		return NULL;
++
++	*length = 0;
++	for (;;) {
++		int n;
++
++		n = read(fd, buf, sizeof(buf));
++		if (n < 0)
++			goto error;
++		if (!n)
++			break;
++
++		copy = must_realloc(copy, (*length + n) * sizeof(*copy));
++		memcpy(copy + *length, buf, n);
++		*length += n;
++	}
++	close(fd);
++	return copy;
++
++error:
++	close(fd);
++	free(copy);
++	return NULL;
++}
++
++/*
++ * A poor-man's version of "xargs -0". Basically parses a given block of
++ * NUL-delimited data, within the given length and adds a pointer to each entry
++ * to the array of pointers.
++ */
++static int parse_xargs(char *data, int data_length, char ***output)
++{
++	int num = 0;
++	char *cur = data;
++
++	if (!data || *output != NULL)
++		return -1;
++
++	while (cur < data + data_length) {
++		num++;
++		*output = must_realloc(*output, (num + 1) * sizeof(**output));
++		(*output)[num - 1] = cur;
++		cur += strlen(cur) + 1;
++	}
++	(*output)[num] = NULL;
++	return num;
++}
++
++/*
++ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ.
++ * This is necessary because we are running in a context where we don't have a
++ * main() that we can just get the arguments from.
++ */
++static int fetchve(char ***argv, char ***envp)
++{
++	char *cmdline = NULL, *environ = NULL;
++	size_t cmdline_size, environ_size;
++
++	cmdline = read_file("/proc/self/cmdline", &cmdline_size);
++	if (!cmdline)
++		goto error;
++	environ = read_file("/proc/self/environ", &environ_size);
++	if (!environ)
++		goto error;
++
++	if (parse_xargs(cmdline, cmdline_size, argv) <= 0)
++		goto error;
++	if (parse_xargs(environ, environ_size, envp) <= 0)
++		goto error;
++
++	return 0;
++
++error:
++	free(environ);
++	free(cmdline);
++	return -EINVAL;
++}
++
++static int clone_binary(void)
++{
++	int binfd, memfd;
++	ssize_t sent = 0;
++
++#ifdef HAVE_MEMFD_CREATE
++	memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING);
++#else
++	memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711);
++#endif
++	if (memfd < 0)
++		return -ENOTRECOVERABLE;
++
++	binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC);
++	if (binfd < 0)
++		goto error;
++
++	sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX);
++	close(binfd);
++	if (sent < 0)
++		goto error;
++
++#ifdef HAVE_MEMFD_CREATE
++	int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS);
++	if (err < 0)
++		goto error;
++#else
++	/* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */
++	int newfd;
++	char *fdpath = NULL;
++
++	if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0)
++		goto error;
++	newfd = open(fdpath, O_RDONLY | O_CLOEXEC);
++	free(fdpath);
++	if (newfd < 0)
++		goto error;
++
++	close(memfd);
++	memfd = newfd;
++#endif
++	return memfd;
++
++error:
++	close(memfd);
++	return -EIO;
++}
++
++int ensure_cloned_binary(void)
++{
++	int execfd;
++	char **argv = NULL, **envp = NULL;
++
++	/* Check that we're not self-cloned, and if we are then bail. */
++	int cloned = is_self_cloned();
++	if (cloned > 0 || cloned == -ENOTRECOVERABLE)
++		return cloned;
++
++	if (fetchve(&argv, &envp) < 0)
++		return -EINVAL;
++
++	execfd = clone_binary();
++	if (execfd < 0)
++		return -EIO;
++
++	fexecve(execfd, argv, envp);
++	return -ENOEXEC;
++}
+diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c
+index 28269dfc0..7750af35e 100644
+--- a/libcontainer/nsenter/nsexec.c
++++ b/libcontainer/nsenter/nsexec.c
+@@ -534,6 +534,9 @@ void join_namespaces(char *nslist)
+ 	free(namespaces);
+ }
+ 
++/* Defined in cloned_binary.c. */
++extern int ensure_cloned_binary(void);
++
+ void nsexec(void)
+ {
+ 	int pipenum;
+@@ -549,6 +552,14 @@ void nsexec(void)
+ 	if (pipenum == -1)
+ 		return;
+ 
++	/*
++	 * We need to re-exec if we are not in a cloned binary. This is necessary
++	 * to ensure that containers won't be able to access the host binary
++	 * through /proc/self/exe. See CVE-2019-5736.
++	 */
++	if (ensure_cloned_binary() < 0)
++		bail("could not ensure we are a cloned binary");
++
+ 	/* Parse all of the netlink configuration. */
+ 	nl_parse(pipenum, &config);
+ 
diff --git a/app-emulation/runc/runc-1.0.0_rc5_p20180509.ebuild b/app-emulation/runc/runc-1.0.0_rc5_p20180509-r1.ebuild
index eb9cce7cf94b..992fdf609d60 100644
--- a/app-emulation/runc/runc-1.0.0_rc5_p20180509.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc5_p20180509-r1.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
@@ -28,6 +28,14 @@ RDEPEND="
 	!app-emulation/docker-runc
 "
 
+PATCHES=( "${FILESDIR}"/runc-fix-cve.patch )
+
+src_prepare() {
+	pushd src/${EGO_PN} || die
+	default
+	popd || die
+}
+
 src_compile() {
 	# Taken from app-emulation/docker-1.7.0-r1
 	export CGO_CFLAGS="-I${ROOT}/usr/include"
diff --git a/app-emulation/runc/runc-1.0.0_rc6.ebuild b/app-emulation/runc/runc-1.0.0_rc6.ebuild
deleted file mode 100644
index cb15bc43aaf8..000000000000
--- a/app-emulation/runc/runc-1.0.0_rc6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/opencontainers/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-build golang-vcs
-else
-	MY_PV="${PV/_/-}"
-	RUNC_COMMIT="ccb5efd37fb7c86364786e9137e22948751de7ed" # Change this when you update the ebuild
-	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-	inherit golang-build golang-vcs-snapshot
-fi
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ambient apparmor hardened +kmem +seccomp"
-
-RDEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )
-	!app-emulation/docker-runc
-"
-
-src_prepare() {
-	default
-	sed -i -e "/^GIT_BRANCH/d"\
-		-e "/^GIT_BRANCH_CLEAN/d"\
-		-e "/^COMMIT_NO/d"\
-		-e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\
-		src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usex ambient 'ambient' '')
-		$(usex apparmor 'apparmor' '')
-		$(usex seccomp 'seccomp' '')
-		$(usex kmem '' 'nokmem')
-	)
-
-	GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin runc
-	dodoc README.md PRINCIPLES.md
-	popd || die
-}
diff --git a/app-emulation/runc/runc-1.0.0_rc6_p20181203.ebuild b/app-emulation/runc/runc-1.0.0_rc6_p20181203-r1.ebuild
index c422609ace86..893c249793a5 100644
--- a/app-emulation/runc/runc-1.0.0_rc6_p20181203.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc6_p20181203-r1.ebuild
@@ -10,7 +10,7 @@ else
 	MY_PV="${PV/_/-}"
 	RUNC_COMMIT="96ec2177ae841256168fcf76954f7177af9446eb" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-build golang-vcs-snapshot
 fi
 
@@ -27,13 +27,17 @@ RDEPEND="
 	!app-emulation/docker-runc
 "
 
+PATCHES=( "${FILESDIR}/${PN}-fix-cve.patch" )
+
 src_prepare() {
+	pushd src/${EGO_PN}
 	default
 	sed -i -e "/^GIT_BRANCH/d"\
 		-e "/^GIT_BRANCH_CLEAN/d"\
 		-e "/^COMMIT_NO/d"\
 		-e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\
-		src/${EGO_PN}/Makefile || die
+		Makefile || die
+	popd || die
 }
 
 src_compile() {
diff --git a/app-emulation/spectemu/Manifest b/app-emulation/spectemu/Manifest
index 98c82b3439d6..20d0a0e17ad1 100644
--- a/app-emulation/spectemu/Manifest
+++ b/app-emulation/spectemu/Manifest
@@ -2,6 +2,5 @@ AUX spectemu-0.99.3-automagic.patch 904 BLAKE2B 25148e965f342a987b669c5b400bf0ce
 AUX spectemu-0.99.3-build.patch 1077 BLAKE2B 97038955c78e88f28c1812c3d6de8ef7e28b038a55fc7069035b9ebf99f54a83b5aea3ef21a7da8bfadc55dc8da4baa0dff634461a55f3583cc9d46c2721530f SHA512 9a650e52eb07e2bbd1109b5fe27417b3891aff79a9a7783c59fd683b4309eb9447672b4a20c0f7746fab60250d865e1d5cdbc8957e5813cec4bfebed996af493
 AUX spectemu-0.99.3-qa.patch 687 BLAKE2B fca83cada81c88c3d8e0ca5f6c66ddc593c9f1d019137708be50112d9a3283212a0fb9054859fadb161ddcf75087ffdf81bf698c9cd1dcbb2a66d19cc690dbb3 SHA512 854db7e4ab1abae52b225adb6a82b71a52a217087187970589eb694dcfdc54d8a36c7456470e8871e9af5736bc59e8f727ea5390ac5f6303e42a1d0c5efa7791
 DIST spectemu-0.99.3.tar.gz 269524 BLAKE2B f934e059bc40be8e6b3bae64c68a57654ea6d2dd9ab013dd7124446ade51b3e54cbf0d6b737f0c7c930dbd9eea89d619d47857310ea01cf2021f0e2f5a6dc54f SHA512 a2efcf46a2481a213825b452987626ade3fa95a525d26bd11a315ef885eb4f536343a7a58389733f459d05486b3da73e81503a0988ebe768ad93b089351f3e25
-EBUILD spectemu-0.99.3-r1.ebuild 883 BLAKE2B 724fede22dde476f237ed4744a8f0a91e18a15562025d896707e36a44dcf6f263fa3b9acbb473e57e5e095a737a8545954007241d038dd9d3b543e801a21c42d SHA512 36de2a7d17857392177e739d408a19697108a212c367a379f7cded2b73f004c2be0576edf81c9d67289c46470333a59adf509397becf9fa9b994e97d2b38615b
-EBUILD spectemu-0.99.3.ebuild 1195 BLAKE2B a728907fe7bce7fa5ce44c527bd4b6a48ad12099989ee7bb8d5d1a6fc71c4162540950183171779bc69876f6969de146fdc85b39cd6ba81aefa7446767bc91b6 SHA512 9ffa31f36c179bcd47e47f407e09367cfd1abcb459e1b13026b7e72a7fff82dab8910c249ac3bc0810254830911d9c7c495197e721cf1f67302e136a36564a1a
+EBUILD spectemu-0.99.3-r1.ebuild 882 BLAKE2B 79ac6ab66b8ed90a0d56ce030cf6dc18eafb5926d64554c4c17a19917686d61df4314af6a8bef0865dcccccb3999ce545220933761f963516e167b49282d35b8 SHA512 e58c6dc3af50e24528876a08196d4783e18f37ed086cee54e268bb5e3663796a5428de66769fd8fa091574a3f9cb2707e3adf4f673ed984001af5af2df838c7a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
index d00256957be7..14d083630681 100644
--- a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.inf.bme.hu/~mszeredi/spectemu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="readline svga +X"
 
 REQUIRED_USE="|| ( svga X )"
diff --git a/app-emulation/spectemu/spectemu-0.99.3.ebuild b/app-emulation/spectemu/spectemu-0.99.3.ebuild
deleted file mode 100644
index bb18f8ec2727..000000000000
--- a/app-emulation/spectemu/spectemu-0.99.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-### Several versions of specemu exist,  xspect & vgaspect, utilising X11
-### and/or svgalib. libreadline provides optional runtime features.
-### The ./configure script automagically figures out which binaries to build
-### so the run/compiletime dependancies here are use dependant
-
-inherit eutils
-
-DESCRIPTION="48k ZX Spectrum Emulator"
-HOMEPAGE="http://kempelen.iit.bme.hu/~mszeredi/spectemu/spectemu.html"
-SRC_URI="http://www.inf.bme.hu/~mszeredi/spectemu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X readline svga"
-
-DEPEND="X? ( x11-base/xorg-proto
-		>=x11-libs/libX11-1.0.0
-		>=x11-libs/libXext-1.0.0
-		>=x11-libs/libXxf86vm-1.0.0 )
-	readline? ( sys-libs/readline )"
-RDEPEND="svga? ( media-libs/svgalib )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-qa.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with readline) \
-		$(use_with X x)
-	emake CC="$(tc-getCC)" \
-		CPP="$(tc-getCPP)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	# Parallel install bug #255777
-	emake -j1 install_root="${D}" install || die "emake install failed"
-}
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index 3bf9980bdff7..70902b5fee68 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -2,10 +2,12 @@ DIST virtio-win-0.1.117.iso 56999936 BLAKE2B 7880ab46d194ed265a2e0b88ea98752be92
 DIST virtio-win-0.1.118.iso 56967168 BLAKE2B 6bcabe5384ae297838d289ad6e2a18c08089463f6c5d58de8ace4d0d47396dcab60e0f021ca009d7faa7a81ef3fc855ac1aabefda4a540f9f07b25e12fa46048 SHA512 1a1da7bfbecb1cd02eca780583c486caadd5b76b225a469af0e693f08506bf9b582f57df52b670409a1cf0d887c0ab715ecca0f08802c242a93535d2d58134d9
 DIST virtio-win-0.1.126.iso 155856896 BLAKE2B 88ccc79e43f2c9cf8d985b0d0677c76ec7eebc960eb8c6c2906cacb05e05f945a90d549bcab50754930bf43a84cd722034c3a06828622b47dc99d87fc5634528 SHA512 b57810f33746ed90420f12f6267903f595ddd02aecb8d3de58cd2d5c0b39ec2f31e0352c2548344e629827616bf2d3c284e1ff60d2132fdde39f2086b36af2e6
 DIST virtio-win-0.1.141.iso 316628992 BLAKE2B 41663ebfd084e9e386eddc3db9ba2c9fe3313260fe3158bbb67c03270c0de37d4ce33e7b6f39ec1b8b5190a9fc8918364d0e9a4ac2a03cdc988e0f26d2062389 SHA512 909f4437b69cba1edfa857326986eb8c4b58835169d70117a5ff57bfa4ebc48f74d6ffa05de50732fb60551166544160fa3b4ec5c59cfb98daeb789902a9b119
+DIST virtio-win-0.1.160.iso 322842624 BLAKE2B baa1475055c2df609931e48cc4a18a2e24fcbf07ec9df80a94b1bdb77ca76c1278c5269a95422ea5c2363df424a30b8395b539689982d609096823ebc880afaf SHA512 71c9de9086fa5b5d764d210b5f7d0238c8b294aaf17704eabe16fe65c5649944126924870f0e2eb05d030c2f521770cb5760f4016d29319f5f1bd5deb7955e50
 DIST virtio-win-0.1.96.iso 160659456 BLAKE2B 7e7784c7585af899881d44a60167e2cc08d40d5a575fd5b0815e218ddbc5e8ea3b37deda7352688364bc1c6d72186c2e1eecb5a616102576c13d61b890a330bf SHA512 a00311f29937383d0dd538b5156a078fdb0c93d39a91d66376a9567f3d4841eeb0ec2a8bf8b018d089040895c9f720e1b253a5aed8bd337dd8713a47544b2a61
 EBUILD virtio-win-0.1.117.ebuild 517 BLAKE2B 5d24b3f790cab2ac291a69cca6c26f5fb4c830667b15beffb8c674263af772d30862b6e70781552ac0710f0ca7848a294b5eacad4818b4917509e2289515fbd2 SHA512 3135bd99dc84c56f716f4ee26769b2e03abfa91d6f0b69b3e81906ce65b7df4149101651796b9d4d7fdf8927ccd45709f76fcea9d4c1d73faca1a9560e4fe25e
 EBUILD virtio-win-0.1.118.ebuild 517 BLAKE2B 8c84fc7d82eb375e68f398b2024d0232b6c9837be3ca0fb29c7f7f2d8745fd0c9aa9ce2dcc369b18b76ac7db1ded95b0fa439328ad33098477e104ad06569a17 SHA512 ee718239916dbd79534d9381e1fe353521b4c721e0d2e0da3aa35e426ad7c910e55d7650f6c13a25184b486d13e64ef5d74b6f871dd4297211461df02c169947
 EBUILD virtio-win-0.1.126.ebuild 517 BLAKE2B 8c84fc7d82eb375e68f398b2024d0232b6c9837be3ca0fb29c7f7f2d8745fd0c9aa9ce2dcc369b18b76ac7db1ded95b0fa439328ad33098477e104ad06569a17 SHA512 ee718239916dbd79534d9381e1fe353521b4c721e0d2e0da3aa35e426ad7c910e55d7650f6c13a25184b486d13e64ef5d74b6f871dd4297211461df02c169947
 EBUILD virtio-win-0.1.141.ebuild 517 BLAKE2B f07c46f623d9172ab25eb0168348459927b889bd5a1ee246eee6967675eb9fec5db83919d053aa540d865793562e90a2d5c30e00a64b1f64b111f239a9f685da SHA512 56f5ec94803b325aa499404b8300b8b5b266cdd2ae73a8ab21181c76830536e593ce0cdf422468ff1f761f17d9b86fc52661cbd2b2654a8154a9ceba7ef810e2
+EBUILD virtio-win-0.1.160.ebuild 514 BLAKE2B 92be643978614da46a322ec5a9c4e772160bb1fded2996ad8ca17ccf1478ee6c18c657c02d5126963ec4afb3a9a2391ca7d4f7f3dc82869550e92b5a92173e57 SHA512 45926753c1b078acb955c2713b6b835310ee01a041d5338357bc696198ee975fc8dd64235a0e7a92fdfcda974e1f9e54db29f6ebdb4244fb757277f3723d369c
 EBUILD virtio-win-0.1.96.ebuild 515 BLAKE2B cc2ddba339b8a881b7e6881cb538f7e5dcd6cb09c6c9ac9dba351917754f4ac1789cfa7118f94c3dc930670675e4d2ab60bee9cfbe3a31af5c0c2759d9b61e09 SHA512 f231a9cf9873fb38bfb7762f87b9d4e114a9aa58401bc078511a2a8f55867ddbf545ba0d68ba80817e57e397a9f7d23e7ccded9a2bfaa30ec2767ecf88e77641
 MISC metadata.xml 357 BLAKE2B 79e06ea8442516e589ad291e46206da4ee761a02995d986e89829c26ebb8aefefbfdd66a1e55b0e210d91cb8302d1e7af69182facd93f091010f4cdf0af64a2e SHA512 2b0032bf140fd2e98445757f6ccc1dfc1844c610d7e684263b63b42e9d5269effd3a8e9bce08af9c9009326799ab02831498ac6aff1bc714c06c0ea29bffb3b3
diff --git a/app-emulation/virtio-win/virtio-win-0.1.160.ebuild b/app-emulation/virtio-win/virtio-win-0.1.160.ebuild
new file mode 100644
index 000000000000..d241154f4ed5
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.160.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
+SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-1/${PN}-${PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${PV}.iso"
+}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 1569b37eb665..458475b5bb3c 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -25,6 +25,6 @@ DIST VirtualBoxSDK-6.0.4-128413.zip 10755635 BLAKE2B 60333b130adbacc85a84c65ee63
 EBUILD virtualbox-bin-5.2.22.126460.ebuild 8327 BLAKE2B 02bf2b29c01c69a3e8321964f494c274c0d22fd1e360235a919ebdc0a0d4c716a51540c51ff85aec6ea7f5a7cc4bb4b4625eca877e23458bb8e57fdf2c5e300b SHA512 b9a91b54c1d0a368b98a021cd24af53c452cc5731fb3495dc7f6e26578bab84d297cc7dd4e0847e8ecf696aa0057c103e1b241fa90d0dfdb11954ea15786438f
 EBUILD virtualbox-bin-5.2.24.128163.ebuild 8329 BLAKE2B 73fca46eb9e117a760c3de9bfe0fc4f58f1a2dbf27c4cab46f9d2db1f2d0114b580f8f5537ffeb7c570c0dfa15d25098236543f17cb8f0b0698de7f7d8a1e40c SHA512 bfcd05d67c9573dff6c7b90287938bfb69c11020e236e8bda0de32c37b571833b57e9f6d8e44cfac2ec792b54526544f3bd208124927efa12212932faadcf538
 EBUILD virtualbox-bin-5.2.26.128414.ebuild 8329 BLAKE2B 73fca46eb9e117a760c3de9bfe0fc4f58f1a2dbf27c4cab46f9d2db1f2d0114b580f8f5537ffeb7c570c0dfa15d25098236543f17cb8f0b0698de7f7d8a1e40c SHA512 bfcd05d67c9573dff6c7b90287938bfb69c11020e236e8bda0de32c37b571833b57e9f6d8e44cfac2ec792b54526544f3bd208124927efa12212932faadcf538
-EBUILD virtualbox-bin-6.0.2.128162.ebuild 8371 BLAKE2B 04269efd0113942d4c242c89ec49f30377581573cfabbf1d8b21ae7d77498a02721c5db27ccc0f83261bdca465c997b27718233b54a61ed2c00ce5bbd8ca8cde SHA512 28c2cf733bb6ac9e7304927d54804c03143b86eea98718919ca04637c137aca8e70e3bb896e4995fe96164c3f2e57f39dc5d7ed89ad9240029a80aa6c598c717
-EBUILD virtualbox-bin-6.0.4.128413.ebuild 8371 BLAKE2B 04269efd0113942d4c242c89ec49f30377581573cfabbf1d8b21ae7d77498a02721c5db27ccc0f83261bdca465c997b27718233b54a61ed2c00ce5bbd8ca8cde SHA512 28c2cf733bb6ac9e7304927d54804c03143b86eea98718919ca04637c137aca8e70e3bb896e4995fe96164c3f2e57f39dc5d7ed89ad9240029a80aa6c598c717
+EBUILD virtualbox-bin-6.0.2.128162.ebuild 8411 BLAKE2B 0aaf40bdca712b5928d19186771f6086f5ac5000d284412210ffb3e3624b9b42259f405ae6fb3bdcef65b04d03231c45397dd77e519126e626b906446b594eb0 SHA512 2b74013557dde03a32572e02614a76c5bb9c6647b9771295af90cf8c0c175f116789056692a5357fe9a99a0338d58baf5900c66a565a5cc2d15ae2e64b97432e
+EBUILD virtualbox-bin-6.0.4.128413.ebuild 8411 BLAKE2B 0aaf40bdca712b5928d19186771f6086f5ac5000d284412210ffb3e3624b9b42259f405ae6fb3bdcef65b04d03231c45397dd77e519126e626b906446b594eb0 SHA512 2b74013557dde03a32572e02614a76c5bb9c6647b9771295af90cf8c0c175f116789056692a5357fe9a99a0338d58baf5900c66a565a5cc2d15ae2e64b97432e
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.2.128162.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.2.128162.ebuild
index 871816079601..d3ff954fe250 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.2.128162.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.2.128162.ebuild
@@ -204,13 +204,13 @@ src_install() {
 	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
 
 	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} VirtualBox ; do
+	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} VirtualBoxVM ; do
+	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}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.4.128413.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.4.128413.ebuild
index 871816079601..d3ff954fe250 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.4.128413.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.4.128413.ebuild
@@ -204,13 +204,13 @@ src_install() {
 	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
 
 	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} VirtualBox ; do
+	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} VirtualBoxVM ; do
+	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}
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 9fdd5bbdd91a..5bbabc871ad3 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -11,10 +11,10 @@ DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa140
 DIST xen-4.11.0-upstream-patches-1.tar.xz 56664 BLAKE2B 27579f4e628bb0d3fdd59f7e133e9134d4ca175842dfdae3a3f765b133254239ae3bca94d75dd655735b5bcbd67f9b8d444dd227028642e6e459e57ed8a20341 SHA512 e90b8e7fa9433e93b1620a776833a6d3578babebe5d73dcaae11186f473945a2270046932ab314a9c6049d3b460a655456f487a5b59730fe88a4f08d482c47a1
 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
-DIST xen-4.12.0-rc1.tar.gz 26926475 BLAKE2B 19ca3a4a6ffd1537c72f35e1092e86d217fabd218568fa4206ad4e42789b8cbb8a7e9a932ef515563f288f366026a32c158858fe2f99507441f665dfb66555fc SHA512 0d6bde8931794efed972ec951143d2532b6195d6e150d731b5c8d7d7bb107724531be7ed6ae13dd9bc1e98ad02033e1aa6c7b5c33f15f04fbcb98a6b0099b417
+DIST xen-4.12-rc2.tar.gz 26932109 BLAKE2B a774d0a8b70df6c373396ace1abf1fbed643473e31196b757c2272b692bcd9f96ad9b2c6ff054312d24d081b83a7893ca0ab90a5f7fedb5a7001aa9b06275338 SHA512 e492f618bfa81394c5adc092912490761edb17d2d34882c1848bad1faa9cbc317d7c771d39d6d5b48c461b79d596af4f8001bf34b64e8d632f7afa8dd41676f7
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 EBUILD xen-pvgrub-4.10.2.ebuild 5043 BLAKE2B 2a7c7e6d9b7a7437e80e58af1fca3ed5aa27937641f4b503a3d7b358c8b4a8f5e33423b9857652b2a9f8cb1bd449d5bc7d70b5e390e6911f93909c36e8abdcce SHA512 5b8ace21d7602acfabec7f792fc8440f1522e658a82872f0b5cac06bc15a11e30fa628ff2173fb0cc2bc2a1ca61bff500b596df2a95b9ba1a3f8c4fefe7ae26f
 EBUILD xen-pvgrub-4.11.0.ebuild 5055 BLAKE2B 5f36d5ea8e6ba604c4a37cc5da0c7cbf69c481af1e0c241c92fc04eccf21d07960da278a61ca9a416b7bd2375018526ab511e0eb850c1d3411c16013530f8b47 SHA512 de08181157bb50a73ee007e0ac8d335d7830cfe9094381a361d7b60fffed44d71506e6d4c7a8339337025c4a5dfca7e2d44084ee004b882d4d29bde863a05c25
 EBUILD xen-pvgrub-4.11.1.ebuild 5051 BLAKE2B 7420eba001d658ac8aeb07ca6dc0b052cbdf89a3e729b54537dacd282738bfc7c3ba0ccc2b9ec34378a9c3bd44bc59eaac2f84ff208aa98e4974a96281e200e5 SHA512 d564cb9564521a634ae88d503c9e206db91a8e4c7750f49cf0784aa226b6188b90289008c07f2923373f5973560b4ec76c6f42d438d42f8beef750bbe7b09379
-EBUILD xen-pvgrub-4.12.0_rc1.ebuild 5090 BLAKE2B eee505b7a1521785ef871ec5bec30db06cead6bac418941c704b8a8148394c3c9b13bad76e7ca4002a9ed0d938f0b350a13a7e3a5c94d502d6408e25cb580a2d SHA512 dba1a511c695b3d806ccc47a5dbf8ff1835813cb4a7278c17c3b949d8dca5257320322dd0ab9e19b42cc4eeb49c8d01b88ae83028f677c454b9e0c979e91a25b
+EBUILD xen-pvgrub-4.12.0_rc2.ebuild 5092 BLAKE2B 935a45cc3212cf70df9f1f51a7ca09368396193f1627df274f393c835de6eb0aae43696551ab738c301602b3476f0aaa24d7875c74306d736d10c89c8ec77e8d SHA512 afdd4cd5afb29732a01dcb878116dc871fc99f6e22bf6f34da9c482ad21ca3684975926df51263faa942d4cc94b0241635715214116e2001a54f1ed0e574806b
 MISC metadata.xml 245 BLAKE2B 2bf2c7848c8c513915aaad9305b6146cf46201bbcf3ffa040c943b7188d2d2a9fe27e2b5ecde84ed2099dceadd4b057856df01ac603a6aceca0f7b7f466174c7 SHA512 3f646ec3197e46d25dde4f698b571fb85b040198f4cba7508c8d38405b4d9d0fc31dbd5ae6242aea8c2acd613aabe0486cb347a1db4811fa807b861148661f8b
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.12.0_rc1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.12.0_rc2.ebuild
index 7b6c8cecaa94..3af01cf4d9e6 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.12.0_rc1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.12.0_rc2.ebuild
@@ -17,7 +17,7 @@ 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"
 
-MY_PV=${PV/_/-}
+MY_PV=${PV/.0_/-}
 
 SRC_URI="
 		https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 7b6328df1fd2..d3c9b301f46e 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 4593 BLAKE2B 2bb97a5fc4c66a9789faf93e272751bf2051d2f8698555368deee1fbd524d2f4ac511206d72aa5dffcf190382a14b5f30273e7270ed9e13d6f291713d62b4298 SHA512 57fe07914a8a0f8a15e826946456a40777152c8fc36de303b2815dbe0258851eb4571a339a9770d3cd72c6a164efc0ca9ef3cd3a63d0d2b8f5d45524ea2307e9
+AUX gentoo-patches.conf 4593 BLAKE2B 704f67950be2f9fd3553b747fcb04b13754375b342c6809fe21c458bbcf2e67ce8bdb96f8fa3f861ca2602989920a9bde4d953c013fd5ab44c511d5932350284 SHA512 d7e3dc89b390039ae373552734d71bfb971d7dc761c245b4611090d4e7746839112ce79b5048d01f4472437149e50780bb72fd469e6a9c400fe2385d7d2f3521
 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
@@ -22,12 +22,12 @@ DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa140
 DIST xen-4.11.0-upstream-patches-2.tar.xz 83788 BLAKE2B 3f612492827a1408a3ba058c64b8b9562f7415d19f15241257b7b6754aed472e37538bfed2a017c6664b276f43a1e9c5f87b60454b2eaa0613c84edeb035a28d SHA512 cddc270f2fddbf75f33b45496f5db4586b5463d65fa3604e9df48c116231f088551213c2a021f2b0ad329f7290b36bfdd577cda506c359311c65e897cdf50bd1
 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
-DIST xen-4.12.0-rc1.tar.gz 26926475 BLAKE2B 19ca3a4a6ffd1537c72f35e1092e86d217fabd218568fa4206ad4e42789b8cbb8a7e9a932ef515563f288f366026a32c158858fe2f99507441f665dfb66555fc SHA512 0d6bde8931794efed972ec951143d2532b6195d6e150d731b5c8d7d7bb107724531be7ed6ae13dd9bc1e98ad02033e1aa6c7b5c33f15f04fbcb98a6b0099b417
+DIST xen-4.12-rc2.tar.gz 26932109 BLAKE2B a774d0a8b70df6c373396ace1abf1fbed643473e31196b757c2272b692bcd9f96ad9b2c6ff054312d24d081b83a7893ca0ab90a5f7fedb5a7001aa9b06275338 SHA512 e492f618bfa81394c5adc092912490761edb17d2d34882c1848bad1faa9cbc317d7c771d39d6d5b48c461b79d596af4f8001bf34b64e8d632f7afa8dd41676f7
 DIST xen-gentoo-patches-14.tar.xz 36244 BLAKE2B 94b751df0ae9a49d1c52ec5fa835d4a040ccb6a4a0f63ef6ef628191163ce7dbd47d4e3b2dbb1cf6cf6c8b368bea4267ff989754482c4794209a80eae9313c25 SHA512 8a23aeddbcf80c049da36e3ef9d797c16996b45be21b56f46f3c9c3833a7c1028fd9ed56fc8053faeb78db21076608de2eb32908e1ae1285f4f200ace40c8c2d
 DIST xen-gentoo-patches-15.tar.xz 36508 BLAKE2B 10b89597159916781f02e1d0f285317f7319cb26562c4e94f9a755637e31f26dd7e00fe250ceaa71ca140191c2fb76e6c889942dd2f33e0347d65b66734060c8 SHA512 60ba45d95a7f0fa34532395491de221998cf1c7d1aec6cacb8fdc163d31a79ef57a32ef9f2495a5ae10b5d4c9bc5bd43ce6c965ceb5d13291c462501bd419681
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
 EBUILD xen-tools-4.10.2-r1.ebuild 13961 BLAKE2B 8ece04061371ab20e76d186cc41779fcf16d4f89cc012c20125dac0757c1683af00548eef37280a84ec28308c4693664f782224deed737d843d445510fd66bb5 SHA512 575f6e6cb7eb30e3a1362ee026e8cc420d1f34237a641901a1d999e185f9907f7d4769f841a2f63fee615187c116edb40168d02d93e6abb6cfc1ea10e597d68b
 EBUILD xen-tools-4.11.0-r3.ebuild 14011 BLAKE2B d6f25b322ac37231862f42368475936d77c64f69f71b2fa840819192dd528a47ba173a278937153deba79548fd94f66aa01f75d40b9819a61f838d01fece003d SHA512 34a825e9884b55826c5ac6eeab82053dc6c40a76f5ed7a095b08893964c6ba84e1c2a39985d37af2c0117ef86f145d97dd7dcd6bf9bee1f4f5ad08e0556a9b5e
 EBUILD xen-tools-4.11.1.ebuild 14241 BLAKE2B 148e1920a00ecb89dfd472490146f6ab97792b48e6435672d8d9b09e10d53e27c521dda5665177f13051d7cbc217713112a73e3dccafd8be7c97149d0b31b1c0 SHA512 dbfd731c16ab4e3ee3fd1bb8a401a40a8bfe3175dfbaa740bad49df4cd1b04551e2e28dbbfc323bd74b86a1e7d666af69cccbbab797b8e04db523750b51057fa
-EBUILD xen-tools-4.12.0_rc1.ebuild 14414 BLAKE2B d1102dd08f5e40b086471c56fa4f7d3610e9e97d07969ca48f2b521649d1098f2e2d21cb3d72593e9f44a9f6f1f54d89fd421aac79ca329b0d6270eef6b8b54c SHA512 e475c7efd953e160cebe432688f321a9ea20a208c6ab365ed68967e3f4e745018e24ef4c720e63102f43a5742c619fecf526ad16936ef59ef61c9bf289cf463a
+EBUILD xen-tools-4.12.0_rc2.ebuild 14459 BLAKE2B 6f2b6a9af415ea8402828468f0c37e26e113ab658cb6d363a6d7f0b489fb3612c05b348ec30fd0c3fb78cfd1477fd76b83bf3fdd2bb3ab492bd85f8654eb1cae SHA512 261f06612bc2d0e2703f02fb6e13a43ddd3babcda6fe89bc26215cd801c043b5530474e77bbd0d563ab6c5544f3229685f09d52726060435db43b9837b2b8ba4
 MISC metadata.xml 1267 BLAKE2B 8b9111b781201a51e373b606c888440fe42630f9cb08a43a4bb5a512456f57e7bb4e4f2af0a23d4cbf75489ba01efbc38820a6881317f16a459c96f8717d2b52 SHA512 c4e947a8cff20e4c5e77f5764fe26ee86a5674cc24ba2eedb7867476f9805ca47b895fcee92e8f353bb4bce877d32832318f8f7fd9514103fb2a963d6ea74647
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 3a0129235ec6..0f3035221673 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -159,7 +159,7 @@ ${_gx049}
 "
 
 # xen-tools-4.12.0 patches set
-_gpv_xen_tools_4120_rc1_0="
+_gpv_xen_tools_4120_rc2_0="
 ${_gx038}
 ${_gx027}
 ${_gx028} ${_gx029}
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0_rc1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0_rc2.ebuild
index 240450ba102e..6a0337a64557 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.0_rc1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0_rc2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE='ncurses,xml,threads'
 
 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
 
-MY_PV=${PV/_/-}
+MY_PV=${PV/.0_/-}
 
 if [[ $PV == *9999 ]]; then
 	inherit git-r3
@@ -131,6 +131,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
 "
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 228e94279aef..d71184e958e7 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -5,10 +5,10 @@ DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa140
 DIST xen-4.11.0-upstream-patches-3.tar.xz 91692 BLAKE2B 500f6099b89d741264b72dc25919e16de0f1d5e1e3adebbe7788de25f1b82692c56b271f241e39733911e2d7d3e27e3ad29d91b94e1f4d8f0257d08b173b62f1 SHA512 bdb8dc5ff868434043d40417b013370e5fd7dc07570ac0bdaa6c253b50521d7fd79af8f7d85578a961b4631cc1ba3c4942d5c60ccc165205da0135506adfb4d2
 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
-DIST xen-4.12.0-rc1.tar.gz 26926475 BLAKE2B 19ca3a4a6ffd1537c72f35e1092e86d217fabd218568fa4206ad4e42789b8cbb8a7e9a932ef515563f288f366026a32c158858fe2f99507441f665dfb66555fc SHA512 0d6bde8931794efed972ec951143d2532b6195d6e150d731b5c8d7d7bb107724531be7ed6ae13dd9bc1e98ad02033e1aa6c7b5c33f15f04fbcb98a6b0099b417
+DIST xen-4.12-rc2.tar.gz 26932109 BLAKE2B a774d0a8b70df6c373396ace1abf1fbed643473e31196b757c2272b692bcd9f96ad9b2c6ff054312d24d081b83a7893ca0ab90a5f7fedb5a7001aa9b06275338 SHA512 e492f618bfa81394c5adc092912490761edb17d2d34882c1848bad1faa9cbc317d7c771d39d6d5b48c461b79d596af4f8001bf34b64e8d632f7afa8dd41676f7
 EBUILD xen-4.10.2-r1.ebuild 4795 BLAKE2B a92c63430183df7e014a9ebcf3b7cf9af2b2e33bc962f49766ce5fc0a7555e5e6f8fd32ea8a7718b1d33f9ec81f26202d0d1bd3d21ef797d49ad43dbb5b074c0 SHA512 0d569fb4f40fb40a22deb567f74863310f04140eb12351e06861d00dbb7d88a78d5bac5c321bee2e804d36b70a735ec2ac29e2e11ea9cf444ad44f1401c8c4db
 EBUILD xen-4.10.2-r2.ebuild 4795 BLAKE2B 2c8d72c915de0ea49d415f74653bcea64f8cbac1def72f526198ae5f3923dcf8a4011aef11cd310b36021bf5cedbe9116cd0402373380ec0ebb84aec8ff6c383 SHA512 31277e30c73c775d581804e15bbe1cd5a863a7633534f06547fc520cbf7ac296cafcccf0c3a3e290bb0c42a72d5b0270b5c34ab725d8687760187e821596a9eb
 EBUILD xen-4.11.0-r4.ebuild 4796 BLAKE2B 5c0e07427bef2e6f90d8d669304601455fb51e33cfdf66c8746ce08cd3293428f88a8bd6c0fc65cf0113d9a470680f338d56775226f48a340c680bab2fa83cff SHA512 ebdafd3984474b440c604c099e4dd46348aaf48f3b570936c9ac7a24e6b91d2439cdb0fabbb2ff22b6ae2ee07b0479a2a390675a6603a02bdb3ea0ac6569080f
 EBUILD xen-4.11.1.ebuild 4795 BLAKE2B 4d7362604ab1be1541cbca8f47d43d2b1dfade482ff4ead1ca0fe43d2078a69312f8b86205970d5bd103b5142bb54175a664b096c84fb97fe3ab055f4c77c319 SHA512 2e7dcff4c8eb9fefd05eecd333fa7a3e61cf886882d96b97a38325f9a2595a5fe61ce0a49bb877655f061a0d4cd4646dfd21a07095d38a9bf557020703ce1822
-EBUILD xen-4.12.0_rc1.ebuild 4809 BLAKE2B 5692f78d0cf4823ae463a28234752062fd374e2c6a341fc1cb2d047dfff4bdf57adbacb19eae0079ea6d89a6b75edcdc096def0eb38da662e848b4e00d3f1909 SHA512 6e963265f7f0a2c60a882d10868c23a45a6d5d48acfe9f228ec470d68d4de5c3f85272796798fdb3e676d195a32f072cda351693296cde8ac28c87d063fd62bc
+EBUILD xen-4.12.0_rc2.ebuild 4811 BLAKE2B 92f0a4f36b6c2a75a5998199660a1a7449b0410f1a22d8b1ce50981089dad21dcdc0a4f073539d0f169c6132f580f31bebce919af4a7fcc29a5678c241b8b3e8 SHA512 49e22a57e75e043df13b4b610389ae2fc81df908ed96c797e36f725dc373202ac3664765cac23ef8397e3c4ada953a7230dc743a637d2e9124f838b3a4681a22
 MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
diff --git a/app-emulation/xen/xen-4.12.0_rc1.ebuild b/app-emulation/xen/xen-4.12.0_rc2.ebuild
index 0feb6edbf07d..1b413cfd7a98 100644
--- a/app-emulation/xen/xen-4.12.0_rc1.ebuild
+++ b/app-emulation/xen/xen-4.12.0_rc2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
 
-MY_PV=${PV/_/-}
+MY_PV=${PV/.0_/-}
 MY_P=${PN}-${MY_PV}
 
 if [[ $PV == *9999 ]]; then