gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /app-emulation
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
47 files changed, 229 insertions, 962 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2199ddf45de1..31bd6cc86605 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 74f105832689..899bc9a7f303 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,13 +1,12 @@
-DIST buildah-1.2.tar.gz 4403310 BLAKE2B df3a1d12a41e9d585d3191103140fc232a2c247283996f394bd151f61615057b15d934e165be47794465c30217c32b3e6b53fbf4d2ef5a2f3349840dadad8171 SHA512 0aac0a80c3c50f0171199e549c0321ce1a756ca838dd9d92b0b0d58bd6b4e212390642c8a4a2aea794616292058624ab0c8707d2ea0cdcbcc555b387df611dc2
 DIST buildah-1.3-issue-966-containers-storage-c7ba5749d44a65fde2daf114c16fb0272d82d73b.patch 4507 BLAKE2B 85a02751a91a73f1f99a1ae138e712304feeb46a40c792f4ec4ac895ce074d15eab4d76bf5e9be759254d0a023371c074a633607a689b42d238ac3f32b4e1d3d SHA512 63c74989dc649582170fc6657c9bfc805bcec6c4aa31017d53c4fa0f86acf00986adf05a8101605963eb3a358d237aad43c124ebcb5be635cff85efe4aa1eaa4
 DIST buildah-1.3.tar.gz 4486873 BLAKE2B 35fb62626d2466495da47579cf4ab23603797ef42a9308245fa97c87a91fcb978f4d02724ce79c2b4ac620d9868ca8974e4701ba6a96ccf739e5ccb4e6d9693a SHA512 c8e161254495cb652caf9a54a051155008e41575487d26aacd38355f0a447ae0e8973b33a978e6a2d5a6c8105400d49dae46878c5f3631ab51aa3556d5033ccd
 DIST buildah-1.4.tar.gz 4529960 BLAKE2B 20878d322d75c6c7c2921f91a9d5434231456d2e6a94c1d4b9ca4fc068bcde1359ba0113dbf97c05738e328933068cbe2a101a1fb429e602533a42a94282a840 SHA512 8b7fc6e94da3615ce42a13621f766602465404f30c7e4e0fcb50998aefb59ebd50a4e000b8b3887e150656a2dd8b8fb3541991f8cac1193322e828448b89056d
 DIST buildah-1.5.tar.gz 4549438 BLAKE2B 0b547f2e06a012540e633e3e55d12d5f44141be7e7231643efd1914571b0d3b03411b5d95f2b8e616679c1f8c966fda818ac8d2a2ca016e89218480ca1c9392c SHA512 291bf7d174500e96279f7fba143f72349648b09fd2d100e6409ae75c8436ff323143ed5b8b1a3448865171916bd44790292344247f0579c33a72c1ff774631e5
 DIST buildah-1.6.tar.gz 6296936 BLAKE2B 1c5e0b1a8d3f3be381c0b7cad5c52af95ee8977c46500e24888bda3f33fffead493b53deb6bbec879d342639fbaab69acbbf0186d7794f6261b3a81b958475e9 SHA512 fb946351602370ecadce84bddde9b8c954b5ecd1ed88f75db8335bf3b5cb0fc68b90a253433d51ddab04d32a6ec2e87d48282f51ec2c3965410533f1247e96f0
-EBUILD buildah-1.2.ebuild 1407 BLAKE2B b57e8bf75b9db19b56b8a9f4bda2cf0c9347a2919b41c22194b17a88880ea98b7e3e75f00bdc4bea61b314ad90d511c64732fe7dd0f37409b9cc727a394f2ca3 SHA512 3a69febb77c2a22d93e5bf868db42b498b5d464e73182916f4754fabe7e55f91033cfc302c025ac45519f559f48f32524daad04e0ee89ded3b964d6481035f90
+DIST buildah-1.7.tar.gz 5041530 BLAKE2B 5a30cd75783448cfc0df8167406669c1b687781e819513c11d2941087aa4ccc1b87f10acc6e4a77de5dc991435640aefd6139ee9bb66e5952de63d1593b6fab9 SHA512 fb44787b59c4ba26bc9b38ba434c6eeebbdeeeb3d28d44819bfe05c42e1a8db63e41d75382d8f25c2c72b44c7512dd5f5b7f3e4838afa40fb67037616594f8c0
 EBUILD buildah-1.3-r1.ebuild 2054 BLAKE2B 0451a2f5b941d833d4df6568bd0cfbbe631c80bd17d76c13fad1c522997957656f6133b030ee005c1f2c107188d2f24fc22b48af971065a096ba2c5025e9e994 SHA512 e5d7586db5cd9b3af24c04a147ec48d3d000dc73910fcd4222b44df94d02a92ebb37bd4cc2cc71b65dc9f452208033a5ac4633fe042fadc103b1e503bebfd865
-EBUILD buildah-1.3.ebuild 1418 BLAKE2B ade5ca1b6c9a5d3d2d8ef4f5c7335b5826f9ad671593b064bdf2b297b546a10b6139c2a937817acf820c3a5f67d610d50f8bfe5d48a8f41fece8c9b2e6e2b716 SHA512 7638b2557ca122a566026e2fb7d7050d13d16c6623bb958edb1895b08e02c32cd9754760bae3c7d8a31f1a611e27cece6038a6000b796bd48101790d1f6671d7
 EBUILD buildah-1.4.ebuild 1412 BLAKE2B 8ba820689066f0b078e2c19e5571275d2b9963f5ffeb5a1ceb09294da665aaf8defd025f0fa993d7cc5c0fdac5297ce74ee08ab4c6a061a7dc1967b1a8d8c981 SHA512 c679acd2f7a02d2dab0c3b87b4a919be7e1474cc72a2b3d184d153420134d5ae8e3a7748180d181f25c203a2b3fb125b3c5adfa4f2d1e8691dfe29b50f1829b9
 EBUILD buildah-1.5.ebuild 1412 BLAKE2B 8ba820689066f0b078e2c19e5571275d2b9963f5ffeb5a1ceb09294da665aaf8defd025f0fa993d7cc5c0fdac5297ce74ee08ab4c6a061a7dc1967b1a8d8c981 SHA512 c679acd2f7a02d2dab0c3b87b4a919be7e1474cc72a2b3d184d153420134d5ae8e3a7748180d181f25c203a2b3fb125b3c5adfa4f2d1e8691dfe29b50f1829b9
 EBUILD buildah-1.6.ebuild 1412 BLAKE2B 511b9dde818042cfbe49bc07d161888ea3383f80b87d5afe6c649b70cee0228c8b617d1bcac7f5e84b9a021f9c3a369251e2b0abaedbb2e0d6b568413da0d3c8 SHA512 cbfc5c4725b6323f34b52828e4511aeffd150fb239de9f129f15b61af7771d56a78eefef0608260e10971a17fe71ead658a4142cf4b12b2071a4057a636cab87
+EBUILD buildah-1.7.ebuild 1412 BLAKE2B 799ca0da805e15f418189b6b82084f94c3e47fce4ae6ee3dbabf9fcc4d0f79d2b3d6db9017ebd6c203d3ca9c437623fa6e08af255410796ca423e94cb574dd62 SHA512 14cc66b762cd3370ea5f21085db4d69ded6ddeb64cfe469b457436946e253ec135fce320a60c54a4edd2cdd7a3277c6b937f80faae662df832f1ce807d8c3647
 MISC metadata.xml 433 BLAKE2B 5b06389433033a1cf28f5fcae5dd41f4ebe0582d9537e8e163fad82046a66477a6ac3ed26ea63e60ea392919afcd3f0f45ae8ddabefd3a518707d5adff04e9d6 SHA512 3ab67ceda6ca0c8bd10f8868172d9686c8eeaa856760453be1c3ba907abb734ba37f5e9885547a16f69c67aa8d96e576de1ddf3208c08f4d44c2d90b081c74a6
diff --git a/app-emulation/buildah/buildah-1.2.ebuild b/app-emulation/buildah/buildah-1.2.ebuild
deleted file mode 100644
index 437d140179f6..000000000000
--- a/app-emulation/buildah/buildah-1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/projectatomic/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="be87762"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RDEPEND="app-crypt/gpgme:=
-	app-emulation/skopeo
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-fs/lvm2:=
-	sys-libs/libseccomp:=
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md troubleshooting.md
-	doman docs/*.1
-	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
-	dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.3.ebuild b/app-emulation/buildah/buildah-1.7.ebuild
index 2a0a4173a777..47dd102aac4a 100644
--- a/app-emulation/buildah/buildah-1.3.ebuild
+++ b/app-emulation/buildah/buildah-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,13 @@ inherit bash-completion-r1 golang-vcs-snapshot
 
 KEYWORDS="~amd64"
 DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/projectatomic/buildah"
+HOMEPAGE="https://github.com/containers/buildah"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="ostree selinux"
 EGO_PN="${HOMEPAGE#*//}"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="be87762"
+GIT_COMMIT="873f001"
 SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
@@ -28,7 +28,7 @@ S="${WORKDIR}/${P}/src/${EGO_PN}"
 
 src_prepare() {
 	default
-	sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
 
 	[[ -f ostree_tag.sh ]] || die
 	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest
index 676fefd27ee9..7946527ee463 100644
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@@ -1,6 +1,8 @@
 AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f732193a2e3cededa3807ddfebcb417086c4d6d61257ce209019766b01f11b68eb0225cd131c90d4bf34 SHA512 c38d258b2416070076a51354f0b78be42809c571064a2b4098482137130b63c731fe8c97f9d8295170302b04d6bd5b5313c682594a36787f66193dc3d4f67429
 DIST cadvisor-0.31.0.tar.gz 4604581 BLAKE2B b39cc3c2482353f1fb64ee0bb9baccdd310e6315819c21aaaef034970f39e2d6ffae05de4289b50838e8bad889f7d9a8e516768ba56a6854c76829a621e57554 SHA512 13b92c2148a439def2394232b3591c0367431f09f5998b5a79210e5b871e2986934fda8b1a3bbeb10691bb5b512556b76f32976b977005d767974c565bcf9072
 DIST cadvisor-0.32.0.tar.gz 4623510 BLAKE2B 7145d0224b3d64cd438bb94047d8682bcad842d7841d98f264a3118a2c0fabb7f67b183db80e054362428efc4f47c699692e53e651a14a1871cc3c32d3a0695f SHA512 734ad1f33e0948dba7e43a1695c3a96ce6bf4367a604b5b79f011c893e18ec697c48199ddb21edb7c176929ddd389e42de9b6f502a01c938c45612ffd96b5f5d
+DIST cadvisor-0.33.0.tar.gz 4646920 BLAKE2B ce0e264321efcfbbf422f086cd15dfde389a099d183cbc2daaefb5aa6aa36da0c6e213dc4c12a000b9049ce2a1444addee93746f5650a56fa0f7c6612aa25bd9 SHA512 3d1dd1b9dc684e71bca9dc64949911f5f3ae72c97aa3b6cd45dd51a404fc101b5591ec8c19c469d6a410de3cf46c3d8c104d34e5dd1fdc85c18c2d1b6a45b2af
 EBUILD cadvisor-0.31.0.ebuild 1067 BLAKE2B 1e282eb04f7572e8dd7d26d08351096e626c34546119450dacd5c0ce68e864e9a2e2fccd56e2735416c1d27ec83204401e0d7b8221e42da9f3d6684e7ccbb8be SHA512 8c2551ae24c4f36ef93312978de2a886cab7b1c75e5f204993009ac69fad9f79d42454bced417e7a6737a71ef406c727c78febd7673a697b5d83d198390b3147
 EBUILD cadvisor-0.32.0.ebuild 1064 BLAKE2B 47a67947f0e2554936bd3bfb205e809c48cc9edfcacdadb2218de243e7205109023c56d392e588d95288679bd46e2c5062291e88e59ca08c826be727db7b7f68 SHA512 1f5666ab1a60f5277c7982ef6e56760288be6202bd66778fdd8a313274205ec6b72dffa1fcda876c5666f77fe8a02f24f566cef2776c3bacb04ca02b8e109433
+EBUILD cadvisor-0.33.0.ebuild 1064 BLAKE2B 136a6c1f8bbe958d2d412fcf856be9edf6c797fb78aad2f32abb8bf92d3616a34e4446403623ec1996eec38b337e6c90a2dc9074aac39375c36f4e265323e0e2 SHA512 30e55585686f7e4a5b05dcd1d0bd051134ac0c3a703ee763f13dd6ec37bac566d1fc7aa9ed76bd7bf40fcdd221202cf8afabeca46745207125b3abbe719b4a8f
 MISC metadata.xml 325 BLAKE2B 3a83be7d0ee504a5ef4b25d8826101878da8bac2228afbe0598ec0aef7435d69ed6d754b88453336fd84a1ef38ab1646eb890bfbff1e8549836aa12c7d497f4b SHA512 d083dae5366eaea34ba9697c49a4399e822000a19b11cffffe82e08f4a331eb0f4672c8271ac342cebb79a66c1a245e41a17ff1d40ecbad2354940bfa14c1b06
diff --git a/app-emulation/cadvisor/cadvisor-0.33.0.ebuild b/app-emulation/cadvisor/cadvisor-0.33.0.ebuild
new file mode 100644
index 000000000000..1c6593a306f2
--- /dev/null
+++ b/app-emulation/cadvisor/cadvisor-0.33.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/google/cadvisor"
+
+inherit user golang-build golang-vcs-snapshot
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+COMMIT="511ec9e"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
+HOMEPAGE="https://github.com/google/cadvisor"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
+	sed -i -e "s/git describe.*/echo ${PV} )/"\
+		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
+		src/${EGO_PN}/build/build.sh || die
+	default
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}"
+	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
+	popd || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	dobin src/${EGO_PN}/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index dc3d1c7687d6..29fa0603106e 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,11 +1,9 @@
 AUX containerd.initd 609 BLAKE2B 8a8c20d037c2695855a673266e98dd8ba19893656e1e7a4525c7097da022cc1f294085551cb51bc4a9672b3e37b56000578ab7a3aab8fabc23643a85d288f340 SHA512 ae1745ea7c656ce66e64e5c0efb8c334351e5410e74d777a70a5cf1dbe249f7b5d9b79147b44b9361dc6ccf21f89d48cf8f29ca0a95c006ca29b274a00643336
-DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
 DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c
 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 1471 BLAKE2B ad5699507bac5219eea6d682a2db3525eff1ba6a93125c3cc270d0c9fbe34adba1f7492502601f4f72c7933d6814c2e4a77e003bc8fd758df1bce792fd32f5d2 SHA512 e1a2de6e4f4375935234bcc21fe92586feb3d2855563fe52191462a009cf2e83a745cb32512f127ba7781713b6d17f2036a82dfc776cf9e4c9f060a80dfeeb04
diff --git a/app-emulation/containerd/containerd-1.0.3.ebuild b/app-emulation/containerd/containerd-1.0.3.ebuild
deleted file mode 100644
index 446548c25d77..000000000000
--- a/app-emulation/containerd/containerd-1.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="773c489"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+btrfs hardened"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )"
-RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
-	>=app-emulation/runc-1.0.0_rc4 )
-	sys-libs/libseccomp"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-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") )
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
-}
-
-src_install() {
-	dobin bin/containerd{-shim,-stress,} bin/ctr
-}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index e5a9740cf404..57658415e9b1 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,7 +1,3 @@
-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
+DIST diskimage-builder-2.20.3.tar.gz 403533 BLAKE2B 08aba837288123081d53b9f79af55c520acf5120dc7126781764c85aa633884ca812b46cd000f619f36138df34252652ea427dbd73aa215196883046b0baa469 SHA512 efefd3c19643e75794293519286d1df81b8bf88511d394b13addfd8953368f3ff6cd57a884b77a161d0b7d01b97624e4dd91d79497e22058f24747ee4a24df3a
+EBUILD diskimage-builder-2.20.3.ebuild 1133 BLAKE2B 441d729ca8deca8194c23f587a510b2188d4ddd59a3dc5295cf57e287a7a78a0a69bb2ff584745e2aa55a4872f9992db90701f68dd39203d1a2cd533e6cd8390 SHA512 78e18e53ee45269e2d26262d9b21bdccdcccbf59c311ec745bf67fb2f60deb1b5407edf26262aae83acfdfcff151c48d89d1b40ef3c63fd025edcbec053e5750
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.20.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.20.0.ebuild
deleted file mode 100644
index 4c5588077dbd..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.20.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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/diskimage-builder/diskimage-builder-2.20.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.20.1.ebuild
deleted file mode 100644
index 4c5588077dbd..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.20.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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/diskimage-builder/diskimage-builder-2.19.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.20.3.ebuild
index 8188442a1626..8188442a1626 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.19.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.20.3.ebuild
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 41c4fc07c127..7b9df6c44f67 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,11 +1,10 @@
 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.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
+DIST docker-18.09.3.tar.gz 15249718 BLAKE2B ca63e611185d8514a3719e95dcc4688a1fcb4b155ffb8997e11442bd6719cc63d9e6aea9153254d281bcff1c48ea7f8c40c38bcda09b7f21b7718ccd348ee3a0 SHA512 c7df08c03c6bfd8451977cb86593d8ac68390c846c84cc4d8a32e05e815688ccd84a6296f819e440c850c2aa52c131686492206ec4d47765cd0af90c3c39dc03
 EBUILD docker-18.06.2.ebuild 8489 BLAKE2B cd1ce26e248cf86bbb31f5b2c023fd73df41010f0f0953bf677df2c0c823d6ab0520ac9dc6309ad5a66de879901e6968376f3956f7d79e7c28f3b2e6b2d2eed9 SHA512 a1a2be3fc79751bd93090d128ae1f3c29a3b6cc7f887e40738c566235faa741a777a7bd0778d29e40b9fb32a78899e2f19a008ef75f0a9df5f9a89bd8bda20c2
 EBUILD docker-18.09.2.ebuild 8340 BLAKE2B ca1afc4c89897f9cab93182cea146b419e0c56fb02149241d000335264c66373ca98f9891da66439cb2774e5889d6d96f4fa6312f8b5420f61b6fd3b00fca590 SHA512 23206009cf2b4b50aa83e1832c7eb6c0bc2c34f17e8b567c27356e747627cdb9108ab86ffec4e7075fcc6e554375c50e1f3a6312f05562533549d9c5bc9f1f2f
+EBUILD docker-18.09.3.ebuild 8341 BLAKE2B 922b2e6e906451eafeba2ae5c4098ffa5670b6b493dfbb24a20bdc38db9e81d79cc8ba36fa3b6b0b8517f34a29c4420abf5223cf1988d157e31993d362eea302 SHA512 9e2ab24d4e0bf35a9bcd16313c898166867eb8831b55acb9c94d2c5184dafbe557e46814bc3c507b28c97c8898aae1640b50703b84fcb5532c2e2ee205e03e54
 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.03.1.ebuild b/app-emulation/docker/docker-18.03.1.ebuild
deleted file mode 100644
index 6f39be99a19f..000000000000
--- a/app-emulation/docker/docker-18.03.1.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	inherit versionator
-	if [ "$(get_version_component_count)" = 4 ]; then
-		MY_PV="$(replace_version_separator 3 '-ce-')"
-	else
-		MY_PV="$PV-ce"
-	fi
-	DOCKER_GITCOMMIT="9ee9f40"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.0.3
-	~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20180411
-	container-init? ( >=sys-process/tini-0.16.1[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal.patch )
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor pkcs11 seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	VERSION="$(cat ../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-}
diff --git a/app-emulation/docker/docker-18.03.1-r1.ebuild b/app-emulation/docker/docker-18.09.3.ebuild
index 0af07da23fd9..c1958f2b8078 100644
--- a/app-emulation/docker/docker-18.03.1-r1.ebuild
+++ b/app-emulation/docker/docker-18.09.3.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
@@ -11,16 +11,9 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
 	inherit git-r3
 else
-	inherit versionator
-	if [ "$(get_version_component_count)" = 4 ]; then
-		MY_PV="$(replace_version_separator 3 '-ce-')"
-	else
-		MY_PV="$PV-ce"
-	fi
-	DOCKER_GITCOMMIT="9ee9f40"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	DOCKER_GITCOMMIT="774a1f4"
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
@@ -30,7 +23,7 @@ DESCRIPTION="The core functions you need to create Docker images and run Docker
 HOMEPAGE="https://dockerproject.org"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay pkcs11 seccomp"
 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
 CDEPEND="
@@ -61,18 +54,17 @@ RDEPEND="
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
 	dev-libs/libltdl
-	~app-emulation/containerd-1.0.3
-	~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20180411
-	container-init? ( >=sys-process/tini-0.16.1[static] )
+	~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] )
 "
 
 RESTRICT="installsources strip"
 
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
-PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal-r1.patch )
-
 # see "contrib/check-config.sh" from upstream's sources
 CONFIG_CHECK="
 	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
@@ -282,6 +274,8 @@ src_install() {
 	doman man/man*/*
 
 	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
 	insinto /usr/share/zsh/site-functions
 	doins contrib/completion/zsh/_*
 	popd || die # components/cli
@@ -300,4 +294,7 @@ pkg_postinst() {
 	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
 	elog "  usermod -aG docker youruser"
 	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
 }
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index b779be5ba222..3f7263e311b0 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,6 +1,6 @@
+AUX 0.3-nine-dll-path.patch 414 BLAKE2B a1747c90521f2fec6ba70ea77c2b7a2adafd705e04a46ea14fe983859f00c0aa33ec73dc24a03805579b84b57a2528857994943bb999e2f38c6f652404fd661e SHA512 423a7ebd8284c475d226109e0af9d867753b75ff1d1a9100d948c91e71dbc76bd8d8973e4ecf3fdb8fab5555da6339484459c623f028f7091e9d010395f24970
 AUX flags.patch 928 BLAKE2B 62f7d6c3e904ad13f39f6e554fb02784b1d68bcea92208c16f0583d41dbd95c1bc52d6b58ee7b88aff54073f9afc078839759f752ee765ebb8059a81fe52dee3 SHA512 e37221abb35a4c170a38db0129a0413b54863952ed00efa36dd0b8af67850cde3949d8b81547bad8c13783ddd7a32407b6eaf33881505cdfe165a29ec9c31c19
-AUX nine-dll-path.patch 550 BLAKE2B 8f9478144cef848f813a044a7c7f56f197aa604d2e5bfb872962cdae67f7f2a62a2d9196959998a2cfe4043ec547956c2fb48d15784257de8af97c5483f8e328 SHA512 98e697430ea2ed59e213bb4af0d87312e5931996bfaa04834877e2405562f881b761c6886aa1331a82d1fd6ad63e2e1c2d83b271df8ce3cd2ed4a2a039737f85
-DIST gallium-nine-standalone-0_p20190113.tar.gz 58954 BLAKE2B 29be3f5501cc4463aa05216b7360e2a5a949c498dd1c3a0170d5a2f7f508c1fe3171f90f8e35bbe95530be5d6b98b70c5a99362e69d4a64615e40fbb9c8eb96a SHA512 2b2ab79b3d9f2c19967a16200cf69e7eba589d4d3d8918890b9504a5cb4895cd76000b6f3852baa738845e8508c6d67843f45d368225878d446ec6e907f75de4
-EBUILD gallium-nine-standalone-0_p20190113.ebuild 2883 BLAKE2B 228f96e4547f11e361ba4e91e397dd10b51b845a8c2ebe9d1b0c2192eeda707cf5ce64a6429b16ca6a7ede0ab87bf640b48fa1c6b2701decb508b6ddec6e8cea SHA512 1f0a69c12b618fa34d6f8b8d4db3f97b7fa9f5474aae367dc605767e5e3240966e233291e4d6bc224f2cde4475448649d62a0cd64f2f2ef029d62ae2183a03cf
-EBUILD gallium-nine-standalone-9999.ebuild 2843 BLAKE2B 6fe8899d0f247b3e4d61bdbdc2ea51af18062444b80e9182c1b46ec5459b8c7753e824e0d5e72b49a83ebed5b46b0fda1fb911690497e46e8f31fe9dcebfad64 SHA512 7b1bf2b0696612bd026ea81d2391b1503c5b44ac7b8e5e979b3754f258844eb0e98a2c486cce5f98632c18c104584c3b595b9883342d35e38c106c9599692d94
-MISC metadata.xml 759 BLAKE2B 926b6b0ea3893a2dad8506f19ecc42a6ba51086fe536aad0bc0db750a809c9e184ed5e0118f89edf8fdccf4f5efd163242ff2b5ce5384d400219022c163ec896 SHA512 ea74c7b0efd60b6c40a6d4b2c371dca663220c3d196fd942a9c896d1695f803cca02f3c9b4c427b2e4e894248229cb5869c7f567bebc8b88a2f6ae384db3ecd5
+DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829
+EBUILD gallium-nine-standalone-0.3.ebuild 2928 BLAKE2B aec5af41c488c7a0d56b432a6fa103c6f485668f0c068c5aaa85501d4b6c29bd952124799508deb99926822cf58b17e0a86c4ec4e37b79d88aadcb7b690516d1 SHA512 3c93f520498e0b9de4d2f7552fd41944111801f38cf540acda048c61bd83f878e433b273c547c1b21f6945a529881ae94cdaf9c03b27f10908a70a4d16d612c9
+EBUILD gallium-nine-standalone-9999.ebuild 2928 BLAKE2B aec5af41c488c7a0d56b432a6fa103c6f485668f0c068c5aaa85501d4b6c29bd952124799508deb99926822cf58b17e0a86c4ec4e37b79d88aadcb7b690516d1 SHA512 3c93f520498e0b9de4d2f7552fd41944111801f38cf540acda048c61bd83f878e433b273c547c1b21f6945a529881ae94cdaf9c03b27f10908a70a4d16d612c9
+MISC metadata.xml 774 BLAKE2B 8b793ed6e079a800628ed7e59786bc82dd191c05367ef5e1600f903f3ebfd32c9ab0034a1dba1701ec104348cf1b9a8b437b63300e607a65ee92b1887be4800f SHA512 9453d7d767ba7f788291c6980a86388a0f952b893a474aa17e249c4f3b9b77b864108230fdc8f8b94e74eb45443f608a8d9ecde10cbc121234c9b91f59e7b752
diff --git a/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch b/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch
new file mode 100644
index 000000000000..830bdc4b32ed
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch
@@ -0,0 +1,13 @@
+diff --git a/ninewinecfg/main.c b/ninewinecfg/main.c
+index 3d58d67..e69668d 100644
+--- a/ninewinecfg/main.c
++++ b/ninewinecfg/main.c
+@@ -32,7 +32,7 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(ninecfg);
+ 
+-static const char * const fn_nine_dll = "d3d9-nine.dll";
++static const char * const fn_nine_dll = G9DLL;
+ static const char * const fn_d3d9_dll = "d3d9.dll";
+ static const char * const fn_nine_exe = "ninewinecfg.exe";
+ 
diff --git a/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch b/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch
deleted file mode 100644
index 9399dde3e4f6..000000000000
--- a/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/ninewinecfg/main.c b/ninewinecfg/main.c
---- a/ninewinecfg/main.c	2019-01-12 19:43:40.113737110 +0000
-+++ b/ninewinecfg/main.c	2019-01-12 19:46:54.213703713 +0000
-@@ -47,7 +47,7 @@
- #define WINE_STAGING 1
- #endif
-
--static const char * const fn_nine_dll = "d3d9-nine.dll";
-+static const char * const fn_nine_dll = G9DLL;
- static const char * const reg_path_dll_overrides = "Software\\Wine\\DllOverrides";
- static const char * const reg_path_dll_redirects = "Software\\Wine\\DllRedirects";
- static const char * const reg_key_d3d9 = "d3d9";
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
index 74e8ff9eb033..852055dc803a 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
@@ -5,16 +5,16 @@ EAPI=7
 
 inherit meson multilib-minimal toolchain-funcs
 
+MY_PN="wine-nine-standalone"
 DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/dhewg/nine"
+HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
 
 if [[ $PV = 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dhewg/nine.git"
+	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
 else
-	COMMIT="e10dd1a770c91d5ff13343c9a0186665b7df6114"
-	SRC_URI="https://github.com/dhewg/nine/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/nine-${COMMIT}"
+	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
@@ -39,7 +39,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/flags.patch
-	"${FILESDIR}"/nine-dll-path.patch
+	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
 bits() {
@@ -82,6 +82,8 @@ multilib_src_configure() {
 	local emesonargs=(
 		--cross-file "${S}/tools/cross-wine$(bits)"
 		--bindir "$(get_libdir)"
+		-Ddistro-independent=false
+		-Ddri2=false
 	)
 	meson_src_configure
 }
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index 0e73ee93be3c..852055dc803a 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -5,16 +5,16 @@ EAPI=7
 
 inherit meson multilib-minimal toolchain-funcs
 
+MY_PN="wine-nine-standalone"
 DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/dhewg/nine"
+HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
 
 if [[ $PV = 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dhewg/nine.git"
+	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
 else
-	COMMIT=""
-	SRC_URI="https://github.com/dhewg/nine/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/nine-${COMMIT}"
+	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-	media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+	media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
@@ -39,7 +39,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/flags.patch
-	"${FILESDIR}"/nine-dll-path.patch
+	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
 bits() {
@@ -82,6 +82,8 @@ multilib_src_configure() {
 	local emesonargs=(
 		--cross-file "${S}/tools/cross-wine$(bits)"
 		--bindir "$(get_libdir)"
+		-Ddistro-independent=false
+		-Ddri2=false
 	)
 	meson_src_configure
 }
diff --git a/app-emulation/gallium-nine-standalone/metadata.xml b/app-emulation/gallium-nine-standalone/metadata.xml
index c661f33f58dd..99949f5b76d0 100644
--- a/app-emulation/gallium-nine-standalone/metadata.xml
+++ b/app-emulation/gallium-nine-standalone/metadata.xml
@@ -15,6 +15,6 @@ Gallium Nine Standalone, as the name implies, is a standalone version of the WIN
 This decouples Gallium Nine from the WINE tree, so that it can be used with any WINE version. There is no need for any WINE patches. A stable, development, or staging WINE release is sufficient.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">dhewg/nine</remote-id>
+		<remote-id type="github">iXit/wine-nine-standalone</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/ganeti-htools/Manifest b/app-emulation/ganeti-htools/Manifest
deleted file mode 100644
index 05ad62a3e747..000000000000
--- a/app-emulation/ganeti-htools/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ganeti-htools-0.2.8-use-QC-1.patch 526 BLAKE2B 928c7668b3d59a9b059725a44a2ebcd98d2f67b76594998f6e86bd948a7f9f03b0cf92823ea81b575b6dc46fd13d26efe4d02c66585a98784feb29afd9971608 SHA512 5f14ef6f045a8bb381203b6d9bc68e995992649b910658df210c4db427b8faa76bf48afc2df0513ee26d072011c8b85abaf6d77b3b6a71ff9bd1154d355a0c47
-AUX ganeti-htools-0.3.1-base-4.patch 4511 BLAKE2B 5a4d89a1820a8a4d8b9579e9b53755b631a57b91a94e1f702da9c122dcee1e32aba7f7080d3e82be762336c557d7a2340755337504f65eae3ff0d825667a2d51 SHA512 e0ec8a7bcd15e047f3d61640f8fab946560e035776f455019fc825809a19ca24a06a265c08e9e469c613a5ad7014ec910a080ce36b674d08f439ec9ce5caad14
-AUX ganeti-htools-0.3.1-containers.patch 363 BLAKE2B 2d0e1c3ee562a89d385e8e567299e5af13bd9c42e9c66f23042e40ad7aba4068928e609cdafb811af058c1be5f4baa8ecf8bb529150b2a24b7e9b678b885ab5c SHA512 4e0e552db9cb9e79be71b55b2d50c4d740074ea57d425e7d4e6ea5dbb136da175f6551131b97e36a0106554c49b337626b667a353c4056750e0150a28d7d2784
-AUX ganeti-htools-0.3.1-ghc-7.10.patch 772 BLAKE2B d6d6d0978272236eca4479c24c80c3e2641a53dc04bec0d75ea38cb027406fe084df46609141e0711d32c5b611739171dac2a16a588ade29936488dde2c9435b SHA512 c1ea60f053e528b465a916b9045e580bd364df7c9bbe6b67041339dc3dd983347c8b9d590249649ec1ed236d566de924dee41a37884329b9b059d53858dc44d4
-DIST ganeti-htools-0.3.1.tar.gz 300261 BLAKE2B b7eb1a94ff4a5026955a9b8c7331dc6b529ff9eb688ae4cafe1822b93d3705bff4f9c5006bd674cd03ecb2bf41d0e32142d039b485e08a797240e8f51f553c2a SHA512 76acc476dc5b3add808db41b7aad4be6ee4b62d31e81eaefa17fbf010daa817bcc920b4e290727ebeddebbe6015017b19d2b7643dbc6d529f158b9746b7a4b43
-EBUILD ganeti-htools-0.3.1.ebuild 1227 BLAKE2B 1cd454248b76d7efcbf5f1175187cf31573b5960c0a07cf291c86a649e18155b52c3bab3758760a68dcd0bf74d061f701abdc824598551bb0891ceddf9c87eb7 SHA512 509b06a1953db536a3a5ce40e373f79758be505d5b136d095260a020e82e776f6c190140753df1b2188ebf32abf49311683d3474d1a4772404f724380e71f92d
-MISC metadata.xml 1091 BLAKE2B e1177d26ac85678879e3e7e0ab956e08d3b56a28c78654b6ae8c8810fab1eb1e6a03f8ec37798bf2ee6c1078ec6319b47c0d367a3cf7782bafea420c9d45de38 SHA512 1cf1ae0572dedb5d9969f631edb0484ffa29246abbf3da158060ae752db9bf90390e391b24976eaf6c5d99d6a7127d8f52d7b49fb9a703b1dc7075c770ff136e
diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch
deleted file mode 100644
index fd7943fe7057..000000000000
--- a/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5e189fc..bfdf175 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,8 @@ $(HALLPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
- 
- test live-test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \
- 	-fno-warn-monomorphism-restriction -fno-warn-orphans \
--	-fno-warn-missing-methods -fno-warn-unused-imports
-+	-fno-warn-missing-methods -fno-warn-unused-imports \
-+	-package $(shell ghc-pkg list | sed -n '/ QuickCheck-1./p')
- 
- $(DOCS) : %.html : %
- 	rst2html -v --strict $< $@
diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch
deleted file mode 100644
index aa0d973a9e40..000000000000
--- a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-diff --git a/Ganeti/HTools/CLI.hs b/Ganeti/HTools/CLI.hs
-index b000a00..d9177c6 100644
---- a/Ganeti/HTools/CLI.hs
-+++ b/Ganeti/HTools/CLI.hs
-@@ -74,11 +74,11 @@ module Ganeti.HTools.CLI
- 
- import Data.Maybe (fromMaybe)
- import qualified Data.Version
--import Monad
-+import Control.Monad
- import System.Console.GetOpt
- import System.IO
- import System.Info
--import System
-+import System.Exit
- import Text.Printf (printf)
- 
- import qualified Ganeti.HTools.Version as Version(version)
-diff --git a/Ganeti/HTools/ExtLoader.hs b/Ganeti/HTools/ExtLoader.hs
-index 0412c1b..17b8449 100644
---- a/Ganeti/HTools/ExtLoader.hs
-+++ b/Ganeti/HTools/ExtLoader.hs
-@@ -36,10 +36,11 @@ module Ganeti.HTools.ExtLoader
-     ) where
- 
- import Data.Maybe (isJust, fromJust)
--import Monad
-+import Control.Monad
-+import qualified Control.Exception as E
- import System.FilePath
- import System.IO
--import System
-+import System.Exit
- import Text.Printf (printf, hPrintf)
- 
- import qualified Ganeti.HTools.Luxi as Luxi
-@@ -56,8 +57,8 @@ import Ganeti.HTools.CLI
- import Ganeti.HTools.Utils (sepSplit, tryRead)
- 
- -- | Error beautifier
--wrapIO :: IO (Result a) -> IO (Result a)
--wrapIO = flip catch (return . Bad . show)
-+wrapIO :: (Show a) => IO (Result a) -> IO (Result a)
-+wrapIO = flip (E.catch :: IO a -> (E.IOException -> IO a) -> IO a) (return . Bad . show )
- 
- parseUtilisation :: String -> Result (String, DynUtil)
- parseUtilisation line =
-diff --git a/hail.hs b/hail.hs
-index 541e1a9..68f4488 100644
---- a/hail.hs
-+++ b/hail.hs
-@@ -27,10 +27,10 @@ module Main (main) where
- 
- import Data.List
- import Data.Maybe (isJust, fromJust)
--import Monad
--import System (exitWith, ExitCode(..))
-+import Control.Monad
-+import System.Environment
-+import System.Exit
- import System.IO
--import qualified System
- 
- import qualified Ganeti.HTools.Cluster as Cluster
- 
-@@ -99,7 +99,7 @@ readRequest opts args = do
- -- | Main function.
- main :: IO ()
- main = do
--  cmd_args <- System.getArgs
-+  cmd_args <- getArgs
-   (opts, args) <- parseOpts cmd_args "hail" options
- 
-   let shownodes = optShowNodes opts
-diff --git a/hbal.hs b/hbal.hs
-index 46cccf8..0254008 100644
---- a/hbal.hs
-+++ b/hbal.hs
-@@ -30,12 +30,12 @@ import Control.Exception (bracket)
- import Data.List
- import Data.Maybe (isJust, isNothing, fromJust)
- import Data.IORef
--import Monad
--import System (exitWith, ExitCode(..))
-+import Control.Monad
- import System.IO
-+import System.Exit
- import System.Posix.Process
- import System.Posix.Signals
--import qualified System
-+import System.Environment
- 
- import Text.Printf (printf, hPrintf)
- 
-@@ -223,7 +223,7 @@ runJobSet master fin_nl il cmd_jobs = do
- -- | Main function.
- main :: IO ()
- main = do
--  cmd_args <- System.getArgs
-+  cmd_args <- getArgs
-   (opts, args) <- parseOpts cmd_args "hbal" options
- 
-   unless (null args) $ do
-diff --git a/hscan.hs b/hscan.hs
-index c14846f..d613f83 100644
---- a/hscan.hs
-+++ b/hscan.hs
-@@ -28,11 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- module Main (main) where
- 
- import Data.Maybe (isJust, fromJust, fromMaybe)
--import Monad
--import System (exitWith, ExitCode(..))
-+import Control.Monad
-+import System.Environment
-+import System.Exit
- import System.IO
- import System.FilePath
--import qualified System
- 
- import Text.Printf (printf)
- 
-@@ -135,7 +135,7 @@ writeDataInner nlen name opts cdata fixdata = do
- -- | Main function.
- main :: IO ()
- main = do
--  cmd_args <- System.getArgs
-+  cmd_args <- getArgs
-   (opts, clusters) <- parseOpts cmd_args "hscan" options
-   let local = "LOCAL"
- 
-diff --git a/hspace.hs b/hspace.hs
-index 57d0302..f207c67 100644
---- a/hspace.hs
-+++ b/hspace.hs
-@@ -29,10 +29,10 @@ import Data.Char (toUpper, isAlphaNum)
- import Data.List
- import Data.Maybe (isJust, fromJust)
- import Data.Ord (comparing)
--import Monad
--import System (exitWith, ExitCode(..))
-+import Control.Monad
-+import System.Exit
-+import System.Environment
- import System.IO
--import qualified System
- 
- import Text.Printf (printf, hPrintf)
- 
-@@ -207,7 +207,7 @@ printAllocationMap verbose msg nl ixes =
- -- | Main function.
- main :: IO ()
- main = do
--  cmd_args <- System.getArgs
-+  cmd_args <- getArgs
-   (opts, args) <- parseOpts cmd_args "hspace" options
- 
-   unless (null args) $ do
-diff --git a/test.hs b/test.hs
-index 12aa50d..81838eb 100644
---- a/test.hs
-+++ b/test.hs
-@@ -29,7 +29,7 @@ import Data.IORef
- import Test.QuickCheck.Batch
- import System.IO
- import System.Exit
--import System (getArgs)
-+import System.Environment (getArgs)
- 
- import Ganeti.HTools.QC
- 
diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch
deleted file mode 100644
index 2305aa5c6547..000000000000
--- a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Ganeti/HTools/QC.hs b/Ganeti/HTools/QC.hs
-index 534a7b1..6f99a96 100644
---- a/Ganeti/HTools/QC.hs
-+++ b/Ganeti/HTools/QC.hs
-@@ -753,3 +753,3 @@ prop_ClusterAllocBalance node =
-     let nl = makeSmallCluster node count
--        (hnode, nl') = IntMap.deleteFindMax nl
-+        ((_k, hnode), nl') = IntMap.deleteFindMax nl
-         il = Container.empty
diff --git a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch
deleted file mode 100644
index 51c39fe5fce5..000000000000
--- a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Ganeti/HTools/Types.hs b/Ganeti/HTools/Types.hs
-index 104bf64..8146870 100644
---- a/Ganeti/HTools/Types.hs
-+++ b/Ganeti/HTools/Types.hs
-@@ -65,2 +65,4 @@ import qualified Data.Map as M
- import qualified Text.JSON as JSON
-+import Control.Applicative
-+import Control.Monad
- 
-@@ -221,2 +223,9 @@ data Result a
- 
-+instance Functor Result where
-+    fmap  = liftM
-+
-+instance Applicative Result where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Result where
-@@ -252,2 +261,9 @@ data OpResult a = OpFail FailMode -- ^ Failed operation
- 
-+instance Functor OpResult where
-+    fmap  = liftM
-+
-+instance Applicative OpResult where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad OpResult where
diff --git a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
deleted file mode 100644
index 7068c10267c8..000000000000
--- a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="Cluster tools for fixing common allocation problems on Ganeti 2.0
-clusters"
-HOMEPAGE="http://www.ganeti.org/"
-SRC_URI="https://ganeti.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-DEPEND="dev-lang/ghc
-	dev-haskell/json
-	dev-haskell/curl
-	dev-haskell/network
-	dev-haskell/parallel"
-RDEPEND="${DEPEND}
-	!<app-emulation/ganeti-2.4"
-DEPEND+=" test? ( dev-haskell/quickcheck:1 )"
-
-src_prepare() {
-	# htools does not currently compile cleanly with ghc-6.12+, so remove this
-	# for now
-	sed -i -e "s:-Werror ::" Makefile
-	# Workaround to skip pandoc
-	sed -i -e "s:) man:):" Makefile
-	epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629
-	epatch "${FILESDIR}"/${PN}-0.3.1-base-4.patch #424299
-	epatch "${FILESDIR}"/${PN}-0.3.1-ghc-7.10.patch
-	epatch "${FILESDIR}"/${PN}-0.3.1-containers.patch
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dosbin hspace hscan hbal
-	exeinto /usr/$(get_libdir)/ganeti/iallocators
-	doexe hail
-	doman man/*.1
-	dodoc README NEWS AUTHORS
-	use doc && dohtml -r apidoc/*
-}
diff --git a/app-emulation/ganeti-htools/metadata.xml b/app-emulation/ganeti-htools/metadata.xml
deleted file mode 100644
index 56690a9ca1ec..000000000000
--- a/app-emulation/ganeti-htools/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>virtualization@gentoo.org</email>
-		<name>Gentoo Virtualization Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription lang="en">
-	These are some simple cluster tools for fixing common allocation
-	problems on Ganeti 2.0 clusters.
-
-	Note that these tools are most useful for bigger cluster sizes
-	(e.g. more than five or ten machines); at lower sizes, the computations
-	they do can also be done manually.
-
-	Most of the tools revolve around the concept of keeping the cluster N+1
-	compliant: this means that in case of failure of any node, the instances
-	affected can be failed over (via ``gnt-node failover`` or ``gnt-instance
-	failover``) to their secondary node, and there is enough memory reserved
-	for this operation without needing to shutdown other instances or
-	rebalance the cluster.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 7bd068033b73..cdc7d9968961 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -20,9 +20,9 @@ DIST libvirt-4.10.0.tar.xz 14841188 BLAKE2B b52f2ed1c4c65930339a6b6fc9e7b034c766
 DIST libvirt-4.5.0.tar.xz 14743956 BLAKE2B 930852765104b1b22744df0ec4f1c74d89bc0fda80852978f7c857943858cc45eed9b74a3d42668f872540be2637f26c4d9d7859594847e58e6fb4cd33350130 SHA512 26710c7e5219f007524e9f93a642e55e4e8ea197afa6b2ca6a4b67b7028313f4b0d82924ee9a1e91ff688a4d2b53f89f3655fbeef0fa99a34f8418f37d787984
 DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90
 DIST libvirt-5.0.0.tar.xz 14832576 BLAKE2B 8839a10e4ec8de012ca17e348efd75cbd94cc3b1cf378c867d958b61079105d6eb4f98d8d4b89dd5a6a368a3d9ea41f30498e44b7e039cdf8931ae6de8fa47b3 SHA512 d93042f49d2550d14577b5257c548d7108462fe1ad69420c128acf094ffd3e80deb744db13d4c3d5fbe5e4c1826d13131be12e3413710711a2d8cba6cb5a9db9
-EBUILD libvirt-4.10.0.ebuild 9664 BLAKE2B 917ab8653ce95ed8321c30aa0ba55db9a1b35eea19fef22f3720d978549328c66ebe706188ab76535a93fbee28374c159670d1e21759af7ef68e1e2119b74231 SHA512 2197606640c27deaa98a5eed7436a18cdf0969b96455d3a5104fbbe3b31c0740878efb33d3f882d2fcc6f046d50536b2fe788c516308d71e2ff72d5388ec7321
+EBUILD libvirt-4.10.0.ebuild 9771 BLAKE2B 45827db69a427d1f55571580c486f9aa938be7a06e10187920226a85964675a1aa71429975f6a9f7372648358e858f091cf0117a768c650c13146087642ca144 SHA512 35d03f478ee6273e281e19268f9ef0a67f0106c8016844d054cc3a7d7fe6363d171a5ad19ec9c1495e964b5b02cc0d90bd8412495eccf5a08f1f044749b8faab
 EBUILD libvirt-4.5.0-r1.ebuild 9654 BLAKE2B 68f875b79a4e7af8674b87fd47dc7081b31c0d617444bfca5d0ebe1b0b10fa4ddfef1305110f3689591a6a5ef32ace833a28e854126369ea2896b3d894b9d230 SHA512 05ba73308bdcabcf8a3c179814519331bc3ac2e557ec383ce9beaa3f8657436a9358461d5e03271811d56ef570e80eaf8a781d54b9b583381a418429934053c5
-EBUILD libvirt-4.9.0.ebuild 9605 BLAKE2B c191450fab9fdf673dc15bc308e4d7a1d8adfc7b90f3e6bd1683d35424c4755a56d75a18105f406724e062b9df98d39ccef4fbd64f05a80791b2f73006662b2e SHA512 151f0930d2500205e25753465910a4f5806fc102f536a6624b9d6de02806dfa592c2b4bc37a1f11481a50bb4b30c30955f21976d74a0a95b3ebbc424c057b3fe
+EBUILD libvirt-4.9.0.ebuild 9712 BLAKE2B 9b200fdc07bff57673039fbc1a14a57b631b3d42a26756cafb43e9ecbe28ace716eaa455b0b21d8085fca2336e9a823ad77232a49f09f60e48531bc833c9f036 SHA512 2b97188d90046d96e5a1ca1f2d43fd930482bcc7b288e8d18077c03a9c2353d9658fa47d6b838a29950ba084a0973327597f5ccb2797833902a3a17ab31456f6
 EBUILD libvirt-5.0.0.ebuild 9641 BLAKE2B 782bc6ed905e1b9d09b102f04c726a0d216e26851cf415acaf2acda983f26764b677dc64ae9705b3583a0a803bb2e996cde755f27595811d1ff0bf221fb0a51b SHA512 d3fc92f9e733a56fde88b9c17c5e5deff26dc1dcc84411bdce90e85ba73d955aef6d11e10bcff35a951fb6273306f4e2c1e7ddce59ff4aaac8811337c82c08d8
-EBUILD libvirt-9999.ebuild 9641 BLAKE2B cc9c28723e56e570f31081f6ae4484894a401c921dddc26ac3c0920b021ac1a258f2e2fbdd67059bd9b64a07de847f1da0174389f7613ffafdd95e20eaadc6a7 SHA512 32459525ce46f12e96ebb6b87824a5167d079f05fb5bbf78e2ab8799977a302afd28d50d26fd7093776050eb96ff41722eced1e5cde3dc7a503ece5cdf32548a
-MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
+EBUILD libvirt-9999.ebuild 9748 BLAKE2B 3ae5cae87b41a45cdc4d432987862b36563c8d36b8f347e52813dec0d6e8829de937eb0c8f9786be68bcb7fb4b03a02578cf281835a8604f2f2afc18524ad7b0 SHA512 1957f37b1b3aaf8126d65053a08f38fe0a45d4cc05971a4774d2344aa163a05533a60ff91a0ab64d22775ed64f3f7f2ca55d4b07c5f98049af1f26548cf12547
+MISC metadata.xml 3857 BLAKE2B bc5dc60897ca70f3a586c947784dec74cf7daa35909836955dc52a442668b08323398473f9df8be46f2819e762638dcfcb646a8fb7ee768210f27584fb91e3f6 SHA512 33274100068f99fe0c69546e81fb47517818adf2991529533b9bacfc6bcb23ee08ae00b9d0a7a7ff47cb920d2ff1e24b5fc788a3533a89ff477ab04dad0194fc
diff --git a/app-emulation/libvirt/libvirt-4.10.0.ebuild b/app-emulation/libvirt/libvirt-4.10.0.ebuild
index 4ee860eb76cc..72cf7a3a0106 100644
--- a/app-emulation/libvirt/libvirt-4.10.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.10.0.ebuild
@@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+	policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
 	wireshark-plugins xen zeroconf zfs
 "
 
@@ -81,6 +81,7 @@ RDEPEND="
 	fuse? ( >=sys-fs/fuse-2.8.6:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( net-libs/libssh )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
 	nfs? ( net-fs/nfs-utils )
@@ -257,6 +258,7 @@ src_configure() {
 		$(use_with glusterfs)
 		$(use_with glusterfs storage-gluster)
 		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
 		$(use_with libvirtd)
 		$(use_with libssh)
 		$(use_with lvm storage-lvm)
diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild
index fb60857d3dca..15e0499ef873 100644
--- a/app-emulation/libvirt/libvirt-4.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild
@@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+	policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
 	wireshark-plugins xen zeroconf zfs
 "
 
@@ -76,6 +76,7 @@ RDEPEND="
 	fuse? ( >=sys-fs/fuse-2.8.6:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( net-libs/libssh )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
 	nfs? ( net-fs/nfs-utils )
@@ -252,6 +253,7 @@ src_configure() {
 		$(use_with glusterfs)
 		$(use_with glusterfs storage-gluster)
 		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
 		$(use_with libvirtd)
 		$(use_with libssh)
 		$(use_with lvm storage-lvm)
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 52082872960b..18c56b58956b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev +vepa virtualbox virt-network
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+	policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network
 	wireshark-plugins xen zeroconf zfs
 "
 
@@ -75,6 +75,7 @@ RDEPEND="
 	fuse? ( >=sys-fs/fuse-2.8.6:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( net-libs/libssh )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
 	nfs? ( net-fs/nfs-utils )
@@ -253,6 +254,7 @@ src_configure() {
 		$(use_with glusterfs)
 		$(use_with glusterfs storage-gluster)
 		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
 		$(use_with libvirtd)
 		$(use_with libssh)
 		$(use_with lvm storage-lvm)
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 06697bca0c7e..63d0a74b30b4 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -11,6 +11,9 @@
 </maintainer>
 <use>
 	<!-- Pool backend flags -->
+	<flag name="iscsi-direct">
+		Allow using libiscsi for iSCSI storage pool backend
+	</flag>
 	<flag name="iscsi">
 		Allow using an iSCSI remote storage server as pool for disk image storage
 	</flag>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 33795e85d6b5..bd26b16d7499 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -10,5 +10,5 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 EBUILD qemu-3.1.0-r1.ebuild 23852 BLAKE2B 806b0941d78b6db3100ff11a255b322f5fa2932227d78139340589df2a7d8ec414ffc3f823bfc2ebafcdaa0d7381cbe94b4f195a006c59a603aa4628f29e5d8a SHA512 757420b4d9866cdbb926860d77ecf30ded9ba8b0b2a7fb4ffcd69b9e4b73781e22434a816df032af820b4f9b3f7ffe686e2f30e0dd6eefb593374ab8b5cd51f1
 EBUILD qemu-3.1.0-r2.ebuild 23882 BLAKE2B 3e334ba5b54bfd9c70fc4f9863f086da4b5c28ad4bba74b62467bfbbacc55322479296fc24030410227d30c0a6e768e37a45c760ad4913c6822eb29a92825ff1 SHA512 e04facec92ed09574eb31afc6985568cccbf9d4eb5a08507796f220831a77a52779196cad098300723140333ce8349f8fc0bf947158be1cd513135e928d83b8c
-EBUILD qemu-9999.ebuild 23626 BLAKE2B 79a1229fe82c0c6e8f9343b69844974857396e503efb6bfe852b2ae2bb32c1e1f1dc5fb5c68d74f2df33e2c2db865e69ec39a0f64f6fc118bd438fbca9abe59c SHA512 95ad1680212a1224b71c5cc10593bab37831df25f486c3d6d3ecead3066635f5dd9258c8ae4c0ac5f64892c6df25e76391283ea4c9a34f42b910c36c5c5b3233
+EBUILD qemu-9999.ebuild 23580 BLAKE2B 58c29027b97fbabc8bd427aafacd21215e4058fd73546d9c546d4ab0c535782ee4d9f0edc4c5362e4da9ec1b9f17fee3a7ddff0b860467b688f1d7943927f109 SHA512 670a0a76423bed889ccec8aa195e4481dbbf437caa8c2f8e09377cb0b8175f18c440a23d04073c5fdc00cc7ff10a93af1d1cb03b253b83f13b7072ecb3c86807
 MISC metadata.xml 3903 BLAKE2B 47538d32d79321c208037c95184ab68dbbcaa2331a561142bbadc01fbc2b7973cc5ae76ac6dfa7faf1c3aa31d1d0b5dfd6a46211e94c17c5a8939b0ae99b227b SHA512 d501ede1f3182e635db02c8bac4381906ac47b8d6db4bb6b0fdeb91b35b440a2a59a5dd23b06462f1d49a6b64ae2f2bcf1f81fd0a898c8f4b67a40ccf2c58341
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 41fd6e7737bf..36a3408c93b9 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -484,7 +484,6 @@ qemu_src_configure() {
 		conf_opts+=(
 			--audio-drv-list="${audio_opts}"
 		)
-		use sdl && conf_opts+=( --with-sdlabi=2.0 )
 	fi
 
 	case ${buildtype} in
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 1d3e43b86db6..dbe54699d3ad 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,8 +1,6 @@
 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_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-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
diff --git a/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
deleted file mode 100644
index 77b4011db44f..000000000000
--- a/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/_/-}"
-	EGIT_COMMIT="v${MY_PV}"
-	RUNC_COMMIT="4fc53a81fb7c994640722ac585fa9ca548971871" # Change this when you update the ebuild
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_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 +seccomp"
-
-RDEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )
-	!app-emulation/docker-runc
-"
-
-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')
-	)
-
-	GOPATH="${S}"\
-		emake BUILDTAGS="${options[*]}" \
-		COMMIT="${RUNC_COMMIT}" -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/spectemu/Manifest b/app-emulation/spectemu/Manifest
index 20d0a0e17ad1..a20c995870e1 100644
--- a/app-emulation/spectemu/Manifest
+++ b/app-emulation/spectemu/Manifest
@@ -1,6 +1,5 @@
 AUX spectemu-0.99.3-automagic.patch 904 BLAKE2B 25148e965f342a987b669c5b400bf0cea093fcd5c54221e7720acf1ffa47fd9d1b8e719b578a9bf52be1cc0258393cbb95f0c86d5225b4e06f828ca6295c4b8f SHA512 c5a99c037ff014c402efb93b420a6e7c04939a88f3e0cd87ba558d2fe952d548c4ff2d80e35741f60a8139d2e78c2ff821b3aafb7363d0081b34af879f7eb2af
 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 882 BLAKE2B 79ac6ab66b8ed90a0d56ce030cf6dc18eafb5926d64554c4c17a19917686d61df4314af6a8bef0865dcccccb3999ce545220933761f963516e167b49282d35b8 SHA512 e58c6dc3af50e24528876a08196d4783e18f37ed086cee54e268bb5e3663796a5428de66769fd8fa091574a3f9cb2707e3adf4f673ed984001af5af2df838c7a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-emulation/spectemu/files/spectemu-0.99.3-qa.patch b/app-emulation/spectemu/files/spectemu-0.99.3-qa.patch
deleted file mode 100644
index 00d136305819..000000000000
--- a/app-emulation/spectemu/files/spectemu-0.99.3-qa.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- spectemu-0.99.3/Makefile.in
-+++ spectemu-0.99.3/Makefile.in
-@@ -45,9 +45,9 @@
- 
- install_prog: $(progs)
- 	if test -f xspect; then \
--	   $(INSTALL_PROGRAM) -s -m 755 xspect $(i_bindir); fi
-+	   $(INSTALL_PROGRAM) -m 755 xspect $(i_bindir); fi
- 	if test -f vgaspect; then \
--	   $(INSTALL_PROGRAM) -s -m 4755 vgaspect $(i_bindir); fi
-+	   $(INSTALL_PROGRAM) -m 4755 vgaspect $(i_bindir); fi
- 
- install_man:
- 	$(INSTALL_DATA) ./xspect.1 $(i_mandir)
-@@ -88,7 +88,7 @@
- 	./sp_to_s < i386emul.sp > i386emul.s
- 
- i386emul.o: i386emul.s
--	$(CC) -c $(CFLAGS) i386emul.s
-+	$(CC) -c $(ASFLAGS) -Xassembler --noexecstack i386emul.s
- 
- sp_to_s: sp_to_s.o
- 	$(CC) -o sp_to_s $(LDFLAGS) sp_to_s.o
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index b5bcb78a4849..5de7f1f9c8c1 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -2,7 +2,9 @@ AUX vagrant.in 1872 BLAKE2B a129780601946f3c53b1cb84dfce33d6cc912069dd784cb49e97
 DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238
 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957
 DIST vagrant-2.2.3.tar.gz 1236158 BLAKE2B 083b153bc723b94aa543e02b275d1864dba5b2d7408266f8fe3813ba19302725aabc25e20e5b4df004055ea1ffa937f16f27307626cec137a253a6dab2b8f972 SHA512 ff3d95968a51a37a397342c013ebcc3bbfe7ff5b76fb35fead92e9a3b770c85f2f4720514aa68878b0b6e4fbd92629832dc1ddf925691529adf0c84c8f44d84c
+DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a
 EBUILD vagrant-2.1.5.ebuild 2278 BLAKE2B 0f9a9e8cbab0928c7ee1042577dc83efc00d4ec50114bdf93185483e21da24f99fe575da0b2e5844a7e5a343fe99ef3c43886ad0256221feecf60a8c49ba6878 SHA512 79b2752ec86feae5c21453a021ffe90c3734a1bcb4e313512a2fc89161d85e60d7b629818468df270c0cba43049b202535c6b4a9eed45659d64ab94d31a3203c
 EBUILD vagrant-2.2.2-r2.ebuild 2453 BLAKE2B ced3f18626e649bf56e91b3deff46acc8d5cda0aeaefb5bd89357e688aae7fe5d7d339233a7e04e76c6d6e8a569741162d7b2b0bf6cf9bd266e397e39fb15b3e SHA512 8bbf87b8ddefffb6035caafa174e72942cc93277a4a57e42ee618914cebf1b1a1160bc9631057e3af28c14c0839f8d6ba57150f472d0196f5b04518dec828617
 EBUILD vagrant-2.2.3.ebuild 2453 BLAKE2B 432cac82d18a0e3b402d838fa4a9b38a66198ef027a88c4c4c5e0e1349da31f6cab1061681fde57210d5c312149b3b2ab91e42fb2d4ebbb8da16332266af1350 SHA512 2bb822310bd82cb95772c35b916f1c95aee50b4de9f0a75b0b323890f302d8bb0067c802212a00193fb2d2c5e1a2d4e279db1c7ec7cdc6e9aaf0215633bea501
+EBUILD vagrant-2.2.4.ebuild 2453 BLAKE2B 432cac82d18a0e3b402d838fa4a9b38a66198ef027a88c4c4c5e0e1349da31f6cab1061681fde57210d5c312149b3b2ab91e42fb2d4ebbb8da16332266af1350 SHA512 2bb822310bd82cb95772c35b916f1c95aee50b4de9f0a75b0b323890f302d8bb0067c802212a00193fb2d2c5e1a2d4e279db1c7ec7cdc6e9aaf0215633bea501
 MISC metadata.xml 413 BLAKE2B 1b57ae29cf2bcdf4bd7d97071e081818e114104bd5a22438e0fe47bd4bce9b2fc1b831c544579cc8b652860c9637caa9134e6f1a4abcb21216e39e62fa058862 SHA512 417deb9af12420ac037b15b526d77ea3fdad12d047c4ea9ede5465ea9ea772fe96ee1625714e74e6dbad6ee224916e9b9304c38293aec4c5e2a52555e1c9f4e8
diff --git a/app-emulation/vagrant/vagrant-2.2.4.ebuild b/app-emulation/vagrant/vagrant-2.2.4.ebuild
new file mode 100644
index 000000000000..a55cc3486a28
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.2.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+virtualbox"
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+	>=dev-ruby/bcrypt_pbkdf-1.0.0
+	>=dev-ruby/childprocess-0.6.0
+	>=dev-ruby/ed25519-1.2.4
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/i18n-1.1.1:1
+	>=dev-ruby/listen-3.1.5
+	<dev-ruby/log4r-1.1.11
+	<dev-ruby/mime-types-3:*
+	>=dev-ruby/net-ssh-5.1.0:*
+	>=dev-ruby/net-sftp-2.1
+	>=dev-ruby/net-scp-1.2.0
+	dev-ruby/rest-client:2
+	>=dev-ruby/rubyzip-1.2.2
+	>=dev-ruby/vagrant_cloud-2.0.2
+"
+
+# upstream specifies rake>=12 but it apparently doesn't need something this
+# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
+# is tricky, we specify a lower dependency requirement here. This way, we'll be
+# able to stabilize vagrant sooner.
+ruby_add_bdepend "
+	>=dev-ruby/rake-10.5.0
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
+		-e '/ruby_dep/s/<=/>=/' \
+		-i ${PN}.gemspec || die
+
+	# remove windows-specific gems
+	sed -e '/wdm\|winrm/d' \
+		-i ${PN}.gemspec || die
+
+	# remove bsd-specific gems
+	sed -e '/rb-kqueue/d' \
+		-i ${PN}.gemspec || die
+
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp contrib/bash/completion.sh ${PN}
+
+	# provide executable similar to upstream:
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins contrib/vim/vagrantfile.vim
+}
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index 6e3a883f0c0d..63697767a8e9 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1,6 +1,6 @@
 DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
 DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
 EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
-EBUILD vkd3d-1.1.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
+EBUILD vkd3d-1.1.ebuild 925 BLAKE2B e2324280b688042a072eea6a80bf89d52c8b30408594f3b22c0c2559c2e98aead7ef73f6def448a36152850f1b86d4eae302c99eddbfa511779d8745dd3eaefe SHA512 57ddaa5e08415286944f43c4d65162ae6487347744eef37d4575e46544943ed83b2d9bdd8a701d654fecaa65018fa183f6ccb524fdbaefa92b48701262472daf
 EBUILD vkd3d-9999.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
 MISC metadata.xml 562 BLAKE2B 2409531d0bc65f547844ae83bfd7aaea4d996f2cdf11ebbf7e95775465d4bed916a39a38a0aae0c6df91a417df484ecaf63b29ea4286fdcfd11b07c8177e3496 SHA512 2150c80fd4315d922521b43c650012008864b3ed1ff7d80e43622ad916e52411c6ef855b46693f96165e9d89fd6a6f18cdc88baab13bec9f7053c0c1795bcd71
diff --git a/app-emulation/vkd3d/vkd3d-1.1.ebuild b/app-emulation/vkd3d/vkd3d-1.1.ebuild
index adf1fb7481d8..70010769b99e 100644
--- a/app-emulation/vkd3d/vkd3d-1.1.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
 fi
 
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index e911ca2e22da..1e38d96f6bc5 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -7,5 +7,5 @@ EBUILD wine-mono-4.6.4.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef
 EBUILD wine-mono-4.7.0.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
 EBUILD wine-mono-4.7.1.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
 EBUILD wine-mono-4.7.3.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
-EBUILD wine-mono-4.7.5.ebuild 503 BLAKE2B fe57ec97ba1e4d3305e40c2bade254cad8d5459a7bf4fc1583593149ea1e08215f31bf0c33e54e2e1163f671db4711c2c5d923954178a05554f71b53d5a9cf2c SHA512 232882960cf8c4499f2e3d50eabfc3afb49cc5cb44e82380ebd75be3f1bccc32f4ec3096f9e61884035ffcfd674f83c622ed739469c26a1bc5ec1632d796c647
+EBUILD wine-mono-4.7.5.ebuild 502 BLAKE2B 3ec803fe7a608c2549ecdda1bbd30a3bac1cfa9325d2c66021a78335364f6ff4051c4aa45627070ced52568328c0d2afa38f174deddd181f01bae3bd6a054d2f SHA512 162093bbec17a3e06049afda69afff8977e09af0b94110548b325c2e547f7dd77fd9e2800941366670cce468af459a93a247bab9b6b9eaa23b279da02fc66d14
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-4.7.5.ebuild b/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
index 9343b2896550..770121472548 100644
--- a/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
+++ b/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="!!app-emulation/wine:0"
 
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 75df87a0e6e7..d89884b3d1eb 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -9,7 +9,7 @@ EBUILD wine-vanilla-3.0.3.ebuild 17120 BLAKE2B a8cf3d4872ba5f91a691817bfc9421a6a
 EBUILD wine-vanilla-3.0.4.ebuild 17085 BLAKE2B d1831445374f36c0fd20b930b2786c79054473868b1d319d1824b935e5e3f2fd07aafa24948040ac1cade51e5748843438f51e473a385c654fa3fe282277e0d7 SHA512 20342989e375114278c77c3dbd8fc1e9483281ab4147006a5f7fc6e657287c327b25cf002581c1a94fec9e9e982710b179415af4cbcf9eebae708ac41079765e
 EBUILD wine-vanilla-3.20.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-3.21.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
-EBUILD wine-vanilla-4.0.ebuild 17346 BLAKE2B f4aba7937070a0d1fb801538260e18286f40319663a9a741ed1ce59631643f653b6c17e44fe60849f6521ecdbb6b9e91bc37b89f91a009c1d692db965eed6860 SHA512 15382c1b9ca91463924b5cc7b5df3a9e3a1cf75ec0caaca70b88600ccad506564a8db75a2ce03614106da24de811563209f8bb9ad69e796522b87b37eb606af2
+EBUILD wine-vanilla-4.0.ebuild 17345 BLAKE2B 06a9905a4ab18d22acc6bbad6839160eadfa68e0e4b5094640eb8d9f0bcb4b5e6ca7c811ca4e2731a7ba18f476375cb6c61ac9b9ed822b2353fd93e617f03ac9 SHA512 f2e79a48aebed8384b622026b7d11abaecfd30016e904ca4043a8899740e8ce077239334511ef3b6849d0c304c3121be8180264c5f79009a2dcca42de578a91c
 EBUILD wine-vanilla-4.1.ebuild 17308 BLAKE2B 04b39cc4f7dd0be69db375471993cdb51f37344e60af9369c6863e1353ba48d89d4ed460b7c55503a49dd875aac5b525a73b8516f0712477950e2734fa6ef30b SHA512 17289cb988d36bf3cbbfebcf90595dc26bdd2e924b7a752fa57f45e37b361a342faece2d8dc9ad63f6b3a7f1ee8c0e8a5f1c47053791656f0c52b767202741b9
 EBUILD wine-vanilla-9999.ebuild 17308 BLAKE2B 04b39cc4f7dd0be69db375471993cdb51f37344e60af9369c6863e1353ba48d89d4ed460b7c55503a49dd875aac5b525a73b8516f0712477950e2734fa6ef30b SHA512 17289cb988d36bf3cbbfebcf90595dc26bdd2e924b7a752fa57f45e37b361a342faece2d8dc9ad63f6b3a7f1ee8c0e8a5f1c47053791656f0c52b767202741b9
 MISC metadata.xml 3157 BLAKE2B 917ac49661429459c488ba4e4e83a0fb558dab3068635d2ac307eabd9e1576c9034fe53ec80bd71023be925d184aca442d8c61eb5ab788a947e22a0d2aa0882b SHA512 2709187f3765e00e14c19049fa81f920a8f8ef60dc4b36db17faccf26df8b04edd017368d820fce91c65836662ba21d29a104b6ac0ac17164047f29bb7c85d91
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
index be747fee393c..ec2ddfe94a80 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@@ -21,7 +21,7 @@ else
 	MAJOR_V=$(ver_cut 1)
         MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /app-emulation
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)