gentoo resync : 10.02.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
commit: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree: cee0a97398040001220ece3cd48c3d568bcddb4a /app-emulation
parent: 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)
55 files changed, 909 insertions, 1065 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7d92719a9d7c..9cc91b59bfbd 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 5b7252c969d8..74f105832689 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -3,9 +3,11 @@ DIST buildah-1.3-issue-966-containers-storage-c7ba5749d44a65fde2daf114c16fb0272d
 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
 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
 MISC metadata.xml 433 BLAKE2B 5b06389433033a1cf28f5fcae5dd41f4ebe0582d9537e8e163fad82046a66477a6ac3ed26ea63e60ea392919afcd3f0f45ae8ddabefd3a518707d5adff04e9d6 SHA512 3ab67ceda6ca0c8bd10f8868172d9686c8eeaa856760453be1c3ba907abb734ba37f5e9885547a16f69c67aa8d96e576de1ddf3208c08f4d44c2d90b081c74a6
diff --git a/app-emulation/buildah/buildah-1.6.ebuild b/app-emulation/buildah/buildah-1.6.ebuild
new file mode 100644
index 000000000000..64ef1d8793e7
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/containers/buildah"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ostree selinux"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="5f95bd9"
+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 install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" emake test-unit
+}
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 913a11b1aae6..2f32eac5d7f7 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,19 +1,13 @@
-AUX containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch 1494 BLAKE2B ac48bd7835011bd3cad719bf2d0bdf6457bb6271989e1e7159ea5c3049e332cea6f5649f39d89820c724a03d50044ea3177fd48b23f5ea67f8518b9f011bd0c5 SHA512 7e6f499eb27372a068909c823884a788f7bab7f0852ec2b67c2a2d475f9dae15dedad130d548b6986978c3b85a4c5e2ba12ee37e529d18461be82546d5e2a638
 AUX containerd.initd 609 BLAKE2B 8a8c20d037c2695855a673266e98dd8ba19893656e1e7a4525c7097da022cc1f294085551cb51bc4a9672b3e37b56000578ab7a3aab8fabc23643a85d288f340 SHA512 ae1745ea7c656ce66e64e5c0efb8c334351e5410e74d777a70a5cf1dbe249f7b5d9b79147b44b9361dc6ccf21f89d48cf8f29ca0a95c006ca29b274a00643336
 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
-DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd
 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.0.tar.gz 4605096 BLAKE2B 5bcfb252933d4f8d5ab6c7e91505cfec34137545121440cd6935e05cd3c62a4969fff8b90b628634c01cc9a4dc3901c307604ab30f45a03dd20112653da9437d SHA512 f7e1ede8db253c666dc9d68642951a427722945da60acf8631312377c84aab14c7a8b14e81f9a63ab8f909d25eb55911c0f2eef68f11380c66cd77bada8577bd
-DIST containerd-1.2.1.tar.gz 4605947 BLAKE2B 340daac847eaa653d15894fd65c190702807400dfb8293b5a2507b9a13a86752c00357cf6aeb3735c57878c34f79c35076d7087a905ee7efe7971746c792a212 SHA512 0949299afe17e269a6c551e865e500afeeaba700cf78bb12fef4af8e6d48a2f699976e81dad44d797bb13079361f5d5e05e9abe903a3b158af93f2aaa95712e5
 DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89 SHA512 0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
+DIST containerd-1.2.3.tar.gz 4612104 BLAKE2B 9b975bea8f848c667c44e3b597fd16889796b5b482b2ea528505db9089da46da8d4e655ba8e77f6e205825be193984124b315231b9bda8bb75dc28d3500f9897 SHA512 01c6e196ddaebfffd069aca87c669acae3923bc9b25f3a59070a6fdbe28661afd4e548b9bb6a4faec3d3d3a937f36eacd7c179986d04f83428cff439e41b1e0d
 EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc
-EBUILD containerd-1.1.1.ebuild 1296 BLAKE2B 19ac8685f774a4ccafbe0433a11b15a2b31c270af9b199a6f543789f93403f1715ac021d24f68e2a7278fab25065900ba02c3efca92e18aa44589d54667d6571 SHA512 f37c5cacabd3f6713af25a9343cb532ba6f73ec842d5d7cbe600bed510a4e11e3c7b27541666af6542dda2be658129c144929c4d2e7a0d8824e308983b4a0a66
 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.0-r1.ebuild 1470 BLAKE2B 08fc579fcb7ce245aa6f2b855fb690100efbe2f5f7ee6745daa80e8661cbeb96593d83c4a00945a5a5981042908b23ca47de0b7a1a0b939e73f7da84ddbb67a6 SHA512 1a0c08342c1737710be44c24630a39b67c41d5592f3cf7d5f08a3e237acd4000bc603cc8675b1f89349a7bcd1fbb9fd9777eecf82402ea1c86e5137cdcb10a76
-EBUILD containerd-1.2.0.ebuild 1447 BLAKE2B 51c626c9a8255accf1aaffa70db0e5eda300a042f5cd500a82d8dc025e10d845bfd43de7c449297edc93173fa770c42596c53456dce06c1a9b63fc39c48f57a8 SHA512 327bc4d0276821ad4f535f39a3ff3f056ccfef84ffeafbc5fb329ea2c82f2ed3abf072029358d42892c21caf378ed52b8340307356205cf27d8a83aca0a5e6ef
-EBUILD containerd-1.2.1.ebuild 1470 BLAKE2B 5aa1c618327ae0b37ac7c429afc1f77c1d80201397c437dbe99770adc5bafe62910232fedc3607baf74cae5bc1be84471a0c2a352d37c6f428eb8383665f543a SHA512 81cd413485049545a340ed9d1d8b08d30c016ea7bd90c92accf8f3c85e3a00517a010217e862f95eb41e91491f84ec5a28e6bc4011bc3832227ff56305303995
 EBUILD containerd-1.2.2.ebuild 1472 BLAKE2B 79c964f1508ae9a5df6f2ee9fb028fb6186362982c19442532ff1eb00d29f3e408cc94e7ff95aae9db3642323f58143e74fffa54288dc0a19cfbd6e9d7d70ca1 SHA512 e23251459744ae8b3bec35fe3a0261ffb99bab0e433ce9cdc48ed39579d73e061df9674bc12372004f4050e72bb68c0f4d6d1d6d5cea985ee2173a16f5fb258c
+EBUILD containerd-1.2.3.ebuild 1439 BLAKE2B 291f8949af5f47e1b22c568bdc37f6c425db53ab9d6b65d31492a81145d02cb68eb6405d2d0596c3adbc938d1a86a0f41c1798851484aa02fd3f093a1bc0f8df SHA512 cfb556243ad6a477af83750a91013a0b1aed20eece4914a4a853de66201003b89e759e4bf1025dc433cabb3f0461e69c335520234ec254a6fac8cfd8f21da432
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3
diff --git a/app-emulation/containerd/containerd-1.1.1.ebuild b/app-emulation/containerd/containerd-1.1.1.ebuild
deleted file mode 100644
index 0dc6845f4ea2..000000000000
--- a/app-emulation/containerd/containerd-1.1.1.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/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="d64c661f1d51c48782c9cec8fda7604785f93587"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+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}
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	if [[ ${PV} != *9999* ]]; then
-		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
-			-e "s/-s -w//" \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	local options=( $(usex btrfs "" "no_btrfs") )
-	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/containerd/containerd-1.2.0.ebuild b/app-emulation/containerd/containerd-1.2.0.ebuild
deleted file mode 100644
index d7d5430a826a..000000000000
--- a/app-emulation/containerd/containerd-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	MY_PV="${PV/_rc/-rc.}"
-	EGIT_COMMIT="v${MY_PV}"
-	CONTAINERD_COMMIT="c4446665cb9c30056f4998ed953e6d4ff22c7c39"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )"
-RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
-	>=app-emulation/runc-1.0.0_rc4 )
-	seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	if [[ ${PV} != *9999* ]]; then
-		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
-			-e "s/-s -w//" \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
-	dobin bin/containerd{-shim,-stress,} bin/ctr
-}
diff --git a/app-emulation/containerd/containerd-1.2.1.ebuild b/app-emulation/containerd/containerd-1.2.1.ebuild
deleted file mode 100644
index c9791d3160db..000000000000
--- a/app-emulation/containerd/containerd-1.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	MY_PV="${PV/_rc/-rc.}"
-	EGIT_COMMIT="v${MY_PV}"
-	CONTAINERD_COMMIT="9b32062dc1f5a7c2564315c269b5059754f12b9d"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor +btrfs +cri hardened +seccomp"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )"
-RDEPEND=">=app-emulation/runc-1.0.0_rc5
-	seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	if [[ ${PV} != *9999* ]]; then
-		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
-			-e "s/-s -w//" \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	dodir /var/lib/containerd
-	dobin bin/containerd{-shim,-stress,} bin/ctr
-}
diff --git a/app-emulation/containerd/containerd-1.2.0-r1.ebuild b/app-emulation/containerd/containerd-1.2.3.ebuild
index 27e3a7531553..e548ba8fb086 100644
--- a/app-emulation/containerd/containerd-1.2.0-r1.ebuild
+++ b/app-emulation/containerd/containerd-1.2.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,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc.}"
 	EGIT_COMMIT="v${MY_PV}"
-	CONTAINERD_COMMIT="c4446665cb9c30056f4998ed953e6d4ff22c7c39"
+	CONTAINERD_COMMIT="7f5f1176dd9fb3cc8d3ce5de91759ed3dc969fa2"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 	inherit golang-vcs-snapshot
@@ -51,6 +51,6 @@ src_compile() {
 
 src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	dodir /var/lib/containerd
-	dobin bin/containerd{-shim,-stress,} bin/ctr
+	keepdir /var/lib/containerd
+	dobin bin/*
 }
diff --git a/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
deleted file mode 100644
index f08fab6e592d..000000000000
--- a/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9686d822284aa8fc9d4d136cc01314f5bf455cba Mon Sep 17 00:00:00 2001
-From: Stephen J Day <stephen.day@docker.com>
-Date: Fri, 2 Mar 2018 13:23:31 -0800
-Subject: [PATCH] btrfs: remove C constant redefinitions
-
-Signed-off-by: Stephen J Day <stephen.day@docker.com>
----
- btrfs.go | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/vendor/github.com/containerd/btrfs/btrfs.go b/vendor/github.com/containerd/btrfs/btrfs.go
-index 1deab47..efdf528 100644
---- a/vendor/github.com/containerd/btrfs/btrfs.go
-+++ b/vendor/github.com/containerd/btrfs/btrfs.go
-@@ -7,10 +7,6 @@ import "sort"
- #include <btrfs/ioctl.h>
- #include "btrfs.h"
- 
--// Required because Go has struct casting rules for negative numbers
--const __u64 u64_BTRFS_LAST_FREE_OBJECTID = (__u64)BTRFS_LAST_FREE_OBJECTID;
--const __u64 negative_one = (__u64)-1;
--
- static char* get_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct) {
- 	return btrfs_struct->name;
- }
-@@ -100,9 +96,9 @@ func subvolMap(path string) (map[uint64]*Info, error) {
- 	args.key.min_type = C.BTRFS_ROOT_ITEM_KEY
- 	args.key.max_type = C.BTRFS_ROOT_BACKREF_KEY
- 	args.key.min_objectid = C.BTRFS_FS_TREE_OBJECTID
--	args.key.max_objectid = C.u64_BTRFS_LAST_FREE_OBJECTID
--	args.key.max_offset = C.negative_one
--	args.key.max_transid = C.negative_one
-+	args.key.max_objectid = C.BTRFS_LAST_FREE_OBJECTID
-+	args.key.max_offset = ^C.__u64(0)
-+	args.key.max_transid = ^C.__u64(0)
- 
- 	subvolsByID := make(map[uint64]*Info)
- 
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 8d132da84a39..38da9f6573ba 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -18,25 +18,25 @@ DIST install-crossover-16.0.0.bin 197872657 BLAKE2B d500ed4f6a426154b376ead6c2b5
 DIST install-crossover-16.2.5.bin 198336730 BLAKE2B a11252dab552846fe0a1527cd59cd62907142385062b744591cef6707213d03945879fc5da6bcfaaa315967c51ae15159ad14d8519407542b82f0eb53c5fd02e SHA512 17cb711e7257f094e9ccf939edc1ca6be362f18b86078fe307b7e1337850e182d02fde087789f13ea2bf96ca89736f941c1a7bd93ff1b37a78fe8f846a1d5e22
 DIST install-crossover-17.5.0.bin 198287744 BLAKE2B c594192927874e5a80626ad110f0089f2bf8b7385a16ff7755923d63ebb0559b1aa505ec4e8b6f85253ac13736b7f9af178c64ed042a515d31cd4565295db163 SHA512 8592d2c91c437d62d1fd5fecf6230eeabfe56c38f49ea795bf4d3b51d8ae4399f1b01801d60dcccb94caeb4dd662675c2739f730f39ef178db32dd4f72182197
 DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf26144375dd559bcd58af3ef05364cfb7a00b8cd68d879e6ef31e92b165876e4c3f85ebcb823dd6585c3edcb8e4cafb76d8e59 SHA512 d1e41c5290c56bbb23a6317e91800d7c23d2b4389ebf08ef4416718103aa06b05b33c655d3ef413fe76773dd3599d8fe3d4ea64274fcc18518923990f980bf2a
-EBUILD crossover-bin-12.5.0-r2.ebuild 3824 BLAKE2B 1a9ca391e86797796cc5d22c432f8c43b7278384bf67e7167b8161ab152c71b270f2c32704ef2be61d700b67163af88f0508f7dc480ce5ae65e55a6706734d7c SHA512 17ccf40a7c77a18e9de57284ecf521750af7b09123084ab97cdb9cf3e5ad281be4b3a5aa112eee2503e085206ec0849305d60b6532958a1c40736b4884601c16
-EBUILD crossover-bin-12.5.1-r2.ebuild 3825 BLAKE2B e28ba7c1861e2edc865aee1b19cf8ce5120500d532cab48930e161465dae21d8dfb685163234eba55b8b3f2035997c1bb8e79aed0ea32fd25576c6bb1eace1fc SHA512 821c241482a60079931a5f36e0ffe02dea879578f0033c6c61785f353404f5a854af6b61a4bb63625d17468334538c5fe5d4b5323b1612ce428d908a58e26cf4
-EBUILD crossover-bin-13.0.0-r2.ebuild 3825 BLAKE2B e28ba7c1861e2edc865aee1b19cf8ce5120500d532cab48930e161465dae21d8dfb685163234eba55b8b3f2035997c1bb8e79aed0ea32fd25576c6bb1eace1fc SHA512 821c241482a60079931a5f36e0ffe02dea879578f0033c6c61785f353404f5a854af6b61a4bb63625d17468334538c5fe5d4b5323b1612ce428d908a58e26cf4
-EBUILD crossover-bin-13.0.1-r2.ebuild 3825 BLAKE2B e28ba7c1861e2edc865aee1b19cf8ce5120500d532cab48930e161465dae21d8dfb685163234eba55b8b3f2035997c1bb8e79aed0ea32fd25576c6bb1eace1fc SHA512 821c241482a60079931a5f36e0ffe02dea879578f0033c6c61785f353404f5a854af6b61a4bb63625d17468334538c5fe5d4b5323b1612ce428d908a58e26cf4
-EBUILD crossover-bin-13.1.0-r2.ebuild 3825 BLAKE2B e28ba7c1861e2edc865aee1b19cf8ce5120500d532cab48930e161465dae21d8dfb685163234eba55b8b3f2035997c1bb8e79aed0ea32fd25576c6bb1eace1fc SHA512 821c241482a60079931a5f36e0ffe02dea879578f0033c6c61785f353404f5a854af6b61a4bb63625d17468334538c5fe5d4b5323b1612ce428d908a58e26cf4
-EBUILD crossover-bin-13.1.2-r2.ebuild 3825 BLAKE2B e28ba7c1861e2edc865aee1b19cf8ce5120500d532cab48930e161465dae21d8dfb685163234eba55b8b3f2035997c1bb8e79aed0ea32fd25576c6bb1eace1fc SHA512 821c241482a60079931a5f36e0ffe02dea879578f0033c6c61785f353404f5a854af6b61a4bb63625d17468334538c5fe5d4b5323b1612ce428d908a58e26cf4
-EBUILD crossover-bin-13.1.3-r2.ebuild 3825 BLAKE2B e28ba7c1861e2edc865aee1b19cf8ce5120500d532cab48930e161465dae21d8dfb685163234eba55b8b3f2035997c1bb8e79aed0ea32fd25576c6bb1eace1fc SHA512 821c241482a60079931a5f36e0ffe02dea879578f0033c6c61785f353404f5a854af6b61a4bb63625d17468334538c5fe5d4b5323b1612ce428d908a58e26cf4
-EBUILD crossover-bin-13.2.0-r2.ebuild 3825 BLAKE2B e28ba7c1861e2edc865aee1b19cf8ce5120500d532cab48930e161465dae21d8dfb685163234eba55b8b3f2035997c1bb8e79aed0ea32fd25576c6bb1eace1fc SHA512 821c241482a60079931a5f36e0ffe02dea879578f0033c6c61785f353404f5a854af6b61a4bb63625d17468334538c5fe5d4b5323b1612ce428d908a58e26cf4
-EBUILD crossover-bin-14.0.3-r1.ebuild 4200 BLAKE2B e96f1831c005b10933851b53cc5f7110cc2f9a1d00ad1cf9866bc21b8a838e2d715c5ff050b3e5203e824fe1b1203280a244b84e7a6f5ce80d4c63e4b40236e6 SHA512 1590e458a7f602d244ab9bca43997be82d225adf896a9c3b9ea2ae5cdeba56381e4d4ffb35f2dbfb968dd4d1ed2118d8d2c1e7737e14b2a77073cc79093d63b8
-EBUILD crossover-bin-14.1.4-r1.ebuild 4201 BLAKE2B d2d1c8e646725c9f7fb982181978c62c46e8edb368dbed011207028379b626b1f1d4b1f8db3239dfa3b0a49ed1970ed1088ee8dfd58d66d4ef7952d4dd7cfa16 SHA512 5aef5e3b45aec7f24cbadaf419273f4c63a47f3fae9c18251b9c5596bd29d00ef6b2de181c6f0dbc890373cc3f93505d0ad5dc07b8e4098ed25a69b353f5c99e
-EBUILD crossover-bin-15.0.0.ebuild 4531 BLAKE2B 435d8e1c4942791ee9d0481d134b061e3b9996bf46ad8d30364e8719fe0550abe4c90f4fbfcf052c59b3db787056a771555c962df060ad0a5d4ca8eb6b063e5d SHA512 c4514281a8ceb1065bda7ece31917ce88fbc8723ab0685750552891fdd906cd4f28986f1d32017ecd44df6501ea80f0fd490a9b8edd698498203bdbdc9f4cdf5
-EBUILD crossover-bin-15.0.1.ebuild 4703 BLAKE2B 3e5c2915f26393e7377ef9cf8e4e4bc4f342e0939f221c8bd45a5d5fdaabc84e6922d362deb86244482c38bb6c3f2603cc498d30db360057a595dbab5ba40753 SHA512 cbb8c0c8d45267b5b4c01e46a7cf85679e47cd4a43a834b9af1cd55cf0510d44e49566d0b4bea1ef5175ab0a9c0b3930f7f24e21387c677dd28cffe8336637d0
-EBUILD crossover-bin-15.1.0.ebuild 4703 BLAKE2B 3e5c2915f26393e7377ef9cf8e4e4bc4f342e0939f221c8bd45a5d5fdaabc84e6922d362deb86244482c38bb6c3f2603cc498d30db360057a595dbab5ba40753 SHA512 cbb8c0c8d45267b5b4c01e46a7cf85679e47cd4a43a834b9af1cd55cf0510d44e49566d0b4bea1ef5175ab0a9c0b3930f7f24e21387c677dd28cffe8336637d0
-EBUILD crossover-bin-15.2.0.ebuild 4878 BLAKE2B 9be06af742ff143a05dc8ea47b5bb311e20b4b1475a006ef0a9da5f2dc9e473d0d8a8eabb7821c12d1e723bb1b2b462e0abc159c43e40acb5633312ba00b133e SHA512 fce81734343625cc9ec508fbd6d2fc78c79071506cd28aae689c3fe92a50f99fdf19f7d5253dabaef1035ecc4138d8f15ffc0761d68cebad1c0ffad9ddb823ba
-EBUILD crossover-bin-15.3.0.ebuild 4839 BLAKE2B 98f870f400e4aa3e1c5c2056b4f5736e6ef5a114f34fbb4dd40d87dbb2a850ed2d5da6d5bd589beeefbaef04556b771dd30100c2d65117dd16655f4f42b06870 SHA512 24f75b5b056b9188855ec08c1077160bb946ad74b5a936220a8aad9ec01b63585ca99c47c971c40534b15efbb5b94341cf88468b2903d6d4423702037dd4c0e7
-EBUILD crossover-bin-15.3.1.ebuild 4839 BLAKE2B 98f870f400e4aa3e1c5c2056b4f5736e6ef5a114f34fbb4dd40d87dbb2a850ed2d5da6d5bd589beeefbaef04556b771dd30100c2d65117dd16655f4f42b06870 SHA512 24f75b5b056b9188855ec08c1077160bb946ad74b5a936220a8aad9ec01b63585ca99c47c971c40534b15efbb5b94341cf88468b2903d6d4423702037dd4c0e7
-EBUILD crossover-bin-16.0.0.ebuild 4839 BLAKE2B 98f870f400e4aa3e1c5c2056b4f5736e6ef5a114f34fbb4dd40d87dbb2a850ed2d5da6d5bd589beeefbaef04556b771dd30100c2d65117dd16655f4f42b06870 SHA512 24f75b5b056b9188855ec08c1077160bb946ad74b5a936220a8aad9ec01b63585ca99c47c971c40534b15efbb5b94341cf88468b2903d6d4423702037dd4c0e7
-EBUILD crossover-bin-16.2.5.ebuild 4839 BLAKE2B 98f870f400e4aa3e1c5c2056b4f5736e6ef5a114f34fbb4dd40d87dbb2a850ed2d5da6d5bd589beeefbaef04556b771dd30100c2d65117dd16655f4f42b06870 SHA512 24f75b5b056b9188855ec08c1077160bb946ad74b5a936220a8aad9ec01b63585ca99c47c971c40534b15efbb5b94341cf88468b2903d6d4423702037dd4c0e7
-EBUILD crossover-bin-17.5.0-r1.ebuild 4715 BLAKE2B baae2631b13be883f6dc8156d4e610088f0c9ed7e90235ae61a239f57f424cd321468852268df667aaab4f30bfa09f7a9fa0cf3f5634a3e8bcd3cf992e9a4566 SHA512 3617337451ac6c609f84a19d44ce1f356f9339dc49a54d7fc07c1cf8e62aacb1d2e787c804465b0aad02cbf8e67299cefed1440b150e5b90b33303bbdde5d72f
-EBUILD crossover-bin-17.5.0.ebuild 4681 BLAKE2B 138a030b175977d74d57046e6696ce6af29279191c864eeda37717a0a5107e6de78d99f86653a16af3267ace863234f1d605a1c06ccf6a7e60833ad51f212f08 SHA512 3497724107b984ec653c96bb8fbfa8b70c2c3f997ba6b05e0f23529e86b4cc11814502082baf3d722a215d0b6bb97db56917b3e2411b2bc9805ae938e98eb522
-EBUILD crossover-bin-17.5.1.ebuild 5229 BLAKE2B 6f5ab62815a2bbae490aa1487728399c3e74ae6b1d33a41e648e4b5bae098fc827d93576ac8c3de1937dd307018d57275d3c1bc12baf4ebdad192048bc7f4526 SHA512 073fa95c2f15dbee9f1d7aea00d823b006911c14ca82c9baea7cdf67a137af01cbf8cb6f76a705030cc369bfccfa40f895e74a3ba2285b2be0c907665e9c44f8
+EBUILD crossover-bin-12.5.0-r2.ebuild 3835 BLAKE2B 8e6207e5aa87368e5ab419382c1158e3db9eab0947ba095675d31860216c83abe15ce2f6207f22bf4b2e7faf5aa6ed6f184ecb5d6f4570c5b881f7f5ff419bba SHA512 cbdf323454aeae3ffb3246df4e1521e3e22d1d24be8d7cc9308df4bc50616e523996f7d809913fc0732c0f4f2c5b559c20d5ad00871e06724c33ee53798239cb
+EBUILD crossover-bin-12.5.1-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
+EBUILD crossover-bin-13.0.0-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
+EBUILD crossover-bin-13.0.1-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
+EBUILD crossover-bin-13.1.0-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
+EBUILD crossover-bin-13.1.2-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
+EBUILD crossover-bin-13.1.3-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
+EBUILD crossover-bin-13.2.0-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
+EBUILD crossover-bin-14.0.3-r1.ebuild 4211 BLAKE2B 51c73f0160e21ed64abed2d2bb96cfa5171cf5ddd763477fd3ec9c0dfb176251c70f7b9ecc60a8a1200dade110f6084949d033a7bd376b62871380c12a7a407f SHA512 fe52671e372ef47dc7f91ac08cdaf76a55b66b84c3f023bcb31e1c96d56f7b010939e958fdef595c8cbc4f85d5eafbe0cc41f0a279787cbd11d743847da5f7fd
+EBUILD crossover-bin-14.1.4-r1.ebuild 4212 BLAKE2B 12346668bb41ce0b145b84fe0cf4d9e3ade81744937aca78f7dab32d4e2b9656fcb59bb8105c1da3ecb367f7d106be5d9a4c80ecdbfa70dd04064e383468eb6f SHA512 835091a0845cdd1d8883d90b42d9567421bbc29254a5de54169fa8ee69f67062e2eda873522f29763222b555d93df2250b3ce3290b210f64768e07f9f4288bfe
+EBUILD crossover-bin-15.0.0.ebuild 4542 BLAKE2B be26c45d4b7e4833747cf3e031182d40fa5eb0fc19368fb365365d6dcfeee0ace7a1a39500210d0f59be03c17f3305c2bd9563297a69e6b9a550385db11c46df SHA512 102ec475e2a28b73e8624dec0a4d868889c6a73d5a8be244a1a4143b492fda277f92f3b55bee15b4ba5f013aad841be50516a8fb2763869ace99cb38b66fca2b
+EBUILD crossover-bin-15.0.1.ebuild 4714 BLAKE2B a96df93929139cd7813bf7d468f25dc26e3d000d5ca50778ce7ab57232322b4055cad5452080633ea88b299f14fe25c1cf7bad28067deab37eb8b5aa6f52c0a2 SHA512 47dd8882420d4c0b79c97ce1d848dd6eb7dc0156cde5d11b9b74fd2113ebbb89ea5d014211413a12720d3f02b8bcac5dc7e8097d8456157f74606e40affe068c
+EBUILD crossover-bin-15.1.0.ebuild 4714 BLAKE2B a96df93929139cd7813bf7d468f25dc26e3d000d5ca50778ce7ab57232322b4055cad5452080633ea88b299f14fe25c1cf7bad28067deab37eb8b5aa6f52c0a2 SHA512 47dd8882420d4c0b79c97ce1d848dd6eb7dc0156cde5d11b9b74fd2113ebbb89ea5d014211413a12720d3f02b8bcac5dc7e8097d8456157f74606e40affe068c
+EBUILD crossover-bin-15.2.0.ebuild 4889 BLAKE2B 147afe87438d813bfe696b7b4135ea5c5d8e6f7356b18ed4e10deb28db99c067a03319ede77a08d2e2f74071e883333f58bf8f506e73d098802bbf4e75d8fc46 SHA512 e8ef43b3bde0af61207413777673f066ad2ee27e3396fac9fffde2d385b814c331ba4a3595a3858d5e9752c6e5d247dab07e0d3842edb99aed815b549e4448f5
+EBUILD crossover-bin-15.3.0.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a1786151cc10b9cf3d091a092d85b8cf99355b2e80202080954654fcbe02637c46393c176452cbf4ed2053e4495ccc3f69e8 SHA512 1add86b4e6b8bca5c8e33596b03c596a562143c2c8fd960e8d3b383d90e79495bade2a22c612af16b785259a55d2560fe091b52a9e04f9e97fa93040a4cfcb33
+EBUILD crossover-bin-15.3.1.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a1786151cc10b9cf3d091a092d85b8cf99355b2e80202080954654fcbe02637c46393c176452cbf4ed2053e4495ccc3f69e8 SHA512 1add86b4e6b8bca5c8e33596b03c596a562143c2c8fd960e8d3b383d90e79495bade2a22c612af16b785259a55d2560fe091b52a9e04f9e97fa93040a4cfcb33
+EBUILD crossover-bin-16.0.0.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a1786151cc10b9cf3d091a092d85b8cf99355b2e80202080954654fcbe02637c46393c176452cbf4ed2053e4495ccc3f69e8 SHA512 1add86b4e6b8bca5c8e33596b03c596a562143c2c8fd960e8d3b383d90e79495bade2a22c612af16b785259a55d2560fe091b52a9e04f9e97fa93040a4cfcb33
+EBUILD crossover-bin-16.2.5.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a1786151cc10b9cf3d091a092d85b8cf99355b2e80202080954654fcbe02637c46393c176452cbf4ed2053e4495ccc3f69e8 SHA512 1add86b4e6b8bca5c8e33596b03c596a562143c2c8fd960e8d3b383d90e79495bade2a22c612af16b785259a55d2560fe091b52a9e04f9e97fa93040a4cfcb33
+EBUILD crossover-bin-17.5.0-r1.ebuild 4726 BLAKE2B ce87b80217b5161d2abaf681c9348ae519bbf4547bd0405627b74cf02414e1b3f347afb0ff9f075b14b8fbca65526c54837acc849d8623d4f10a310d5a8818ae SHA512 51acebb632d091cccb09686a9ce9fdea67fcbbeb2054ae63b48a3fe7321f7036d93d143124b4023a3e76003bd4acff57856d02ec7af478e5ae95f7f5dc2f7282
+EBUILD crossover-bin-17.5.0.ebuild 4692 BLAKE2B 17c98f5a466f223710cd3d9245fa42138354797a1a8dd7dfe6ca1d943e4fe7775884f93a99c472ead60f08f8e2da7ddfe25dcd2ea5a0718a89b51ab5a3566f05 SHA512 b0f161809b491d4ede37c250af2fab225c2c7f574d7bbb4a13fc70037d46561074573e46809a0f28952ad77cc2726b6b9bb2f62acaa8c138c05e1293601c3fcc
+EBUILD crossover-bin-17.5.1.ebuild 5240 BLAKE2B 2cb2a64bab5581cec4f1cab04c73775059b2f2c4d7ab3b4635204a8c1649ec7df9a615f9fb910e74901c48e27ceb6deb17cace229f8b638a7fbf31403b296c9f SHA512 26c63fd19ab3d231d5cadf737c7c8864fac798db820a74cd21e63e0d48c2b789b75bdfbada6edd6124ed74dd62130d95db48e932813e09f21ad7ecf37bc5e18d
 MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
index 125534103ad2..39f5ad2aa9da 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
index e40b134c2d32..e3853f9203b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
index e40b134c2d32..e3853f9203b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
index e40b134c2d32..e3853f9203b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
index e40b134c2d32..e3853f9203b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
index e40b134c2d32..e3853f9203b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
index e40b134c2d32..e3853f9203b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
index e40b134c2d32..e3853f9203b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
index 7bd7130de0af..5b3093be419b 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
index 6db28ecf6f12..3c3f71614522 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
index 62a656e10332..ce07b1ed007b 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
index 15d9857da0c3..5c2cc64229ab 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
index 15d9857da0c3..5c2cc64229ab 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
index e7e599896f1f..c980e47e967e 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
index 22d50a7a3921..98bdd0b207b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
index 22d50a7a3921..98bdd0b207b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.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=5
@@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
index 22d50a7a3921..98bdd0b207b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
index 22d50a7a3921..98bdd0b207b1 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -77,7 +77,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
index d5b281cbba85..81de56bbbccd 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@@ -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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
index 8e0b9a0bb03f..b60ef201ecae 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -78,7 +78,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
index 1d2e3bb99523..aedc0eaa927e 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.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=5
@@ -79,7 +79,7 @@ RDEPEND="${DEPEND}
 
 pkg_nofetch() {
 	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} in ${DISTDIR}"
+	einfo "and place ${A} into your DISTDIR directory"
 }
 
 src_unpack() {
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index ba575502b585..ab9553461b97 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD diskimage-builder-2.19.0.ebuild 1133 BLAKE2B 441d729ca8deca8194c23f587a510b2188d4ddd59a3dc5295cf57e287a7a78a0a69bb2ff584745e2aa55a4872f9992db90701f68dd39203d1a2cd533e6cd8390 SHA512 78e18e53ee45269e2d26262d9b21bdccdcccbf59c311ec745bf67fb2f60deb1b5407edf26262aae83acfdfcff151c48d89d1b40ef3c63fd025edcbec053e5750
+EBUILD diskimage-builder-2.20.0.ebuild 1135 BLAKE2B 273dbfee86983dc3500ff8cf9bec625dbffcca6979a1ac661a5fbc92f1bcb87b969208dd691f43998bd47c6c965eda0673f30b04f468d4a33afe4e364d54eb15 SHA512 82ada16450a46b08ebc333345900071c1d296350e7bff73a8b4361b250517eb4902f225031416adbd5e5ef62bb1d73cb1333f30673eefeae874dd80a27c628f1
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.20.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.20.0.ebuild
new file mode 100644
index 000000000000..4c5588077dbd
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.20.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index b9b9ea04bac8..ea85dd102cbf 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -2,12 +2,10 @@ AUX bsc1073877-docker-apparmor-add-signal-r2.patch 2931 BLAKE2B 92737eb582f5c2b3
 AUX bsc1073877-docker-apparmor-add-signal.patch 715 BLAKE2B cb97ebb2e7104e04264318fec93df80a5f7f9b4cfc84b9f31ea1185d7752e431d714dd901b168c490562688c124aac8d48fef9c1266d7a8fa07aa06de7e40d08 SHA512 936d3948fd3ccadd4a3810bb8fc32e31e7e24b810e87658e5e53560b515454db6b72b0cda3ace78b9267e197e55181c04fbea92a1656f6a282e29f37d2994adc
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0 SHA512 7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
-DIST docker-18.09.0.tar.gz 15196102 BLAKE2B 99b791da6351268ccd54424f1ec1d0b1246d7283e5bf8f41f604f0437202a0c494f7017d68c58f01782eea8539fcc189c290f494125878eb3ca368f3d8cdd57d SHA512 a6173d9e2dde33c6059b3464720207a3bc0f4d6d79af65ad10cd30b4b437134ad45fc2039cebcaa41b2dfb68a21963010d63a4051ade6a6d25fcd93c8d560c67
 DIST docker-18.09.1.tar.gz 15247155 BLAKE2B 5c9a6c0d6e383da2b99341812b0cc1d1498e46decc3b3aaa418607d5f4d725a6842a4462c06357685a32312b90978b0349aaceb69907324761589e68cfae7bca SHA512 9813d3bd41eff63a089495a976226b93d5d43544530aea0ebce78b96e6b4b38389fe3ad1117f1ca95c38727047a24211ad2c2b44217935c26ffb5496cf90407e
 EBUILD docker-18.03.1-r1.ebuild 8338 BLAKE2B e9984640c084a99c1ba99173905b9d58f14559b0b122bb6759b16689bf40fc313d0b9a3fac45ceaf509fe28b7006c87b555c3db49c32f04360e700cca4cbb839 SHA512 1d11e2d4f67d8e16714901e56ce251d590ea2be3a786869895600a3bee4becc0f66dc88b6253df1c277455e595851ac34e608b70f46bbe88e0a33f3e17eaf4ac
 EBUILD docker-18.03.1.ebuild 8337 BLAKE2B f0b13adc75d2a334eaf91938b2774a5216fa4ef7905032f59e313d87367c7de07a6868e443f65db881bbeaabc8aeaf008aec8836827513b546ddd3bfeab599d7 SHA512 09645b50f569e37e94c7f8e36503ce949fe709ff22d579b9e2e2183a573196ae3bdf0a991c71af56a37e2e8fa7e3341289154dee4e1a336ea1b212cd63079bc9
 EBUILD docker-18.06.1-r1.ebuild 8444 BLAKE2B efd1564a829daf4811783d163be2f72ecfa3731b9594dfa4f6c2a44c227a2e1033ff32023d118b722fefdae949257faec41ea39145a8e84ca1e87c1ef6546ae5 SHA512 82bb833841c33e009c2b0f33ffc92509dca4ee9192419c92189b37a7a1dc1942931f036d8c8cc254bbad5a3c2fb7f962707c5a3ff1ab5c1fac757c742e990b17
-EBUILD docker-18.09.0.ebuild 8370 BLAKE2B 53cc4f700ea0e83bf7b5bbcf47480b748e07be387f5a40bd1cfdc91b354885df1f6f10320f7f22eb14ca0a378ea89365a02f27a3966eb70cecf530c841c238cc SHA512 43f8566891ae72d50534c61f240fde9fd345d644061e0a1475b0fdb9f06d32bc3c727055eac1c7b4f7f7091727ce0121137941f935dc1bdaf7a7bab72d35ce14
 EBUILD docker-18.09.1.ebuild 8296 BLAKE2B b528aaa7d43867856e503d875e5f03d71291abe46fc706860126819cb2683a9ff8d8e2772b51e266ca17a839e29ddbc6aa0cf3eb9058de7a570a19a7dc7f5e6d SHA512 9def7412189f6d783b6284aa58461837bb2d9b94e9835047aaa4ea7b20407d56c99df46c435602c72da6c8761e2e163127a55e51d030356af36e4c33f4ea4782
 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.09.0.ebuild b/app-emulation/docker/docker-18.09.0.ebuild
deleted file mode 100644
index 2b1d6a9b7fc0..000000000000
--- a/app-emulation/docker/docker-18.09.0.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	DOCKER_GITCOMMIT="4d60db4"
-	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
-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.1.2
-	~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20180907
-	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-r2.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/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-
-	elog " Devicemapper storage driver has been deprecated"
-	elog " It will be removed in a future release"
-}
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 9b35fafaa360..805e05703320 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -16,6 +16,7 @@ AUX ganeti-2.15-kvmd-run-as-daemon-user.patch 1267 BLAKE2B ec993c7eefca32eea4515
 AUX ganeti-2.15-noded-must-run-as-root.patch 1652 BLAKE2B ed019d793ede24eef2edf3e525bd1c859edfd71cb814b75b84565547e63df64bd21999f4c9a181209b98539b5c6c3aaad92a93b8ad10ace103480795a95758db SHA512 6c055cd56088762e143fdcc1903943f2bcd565b46d9669b8905128b9885db27819f65d0c80dfd2ff05776bb8e38f23fc055597343e5a7eeb41821653e08a0f3a
 AUX ganeti-2.15-python-mock.patch 869 BLAKE2B 0be8ccb3c193cb363a71175022f2c31554acd0383f1cf1ec2494aaf92c077a4d557ac1d9cb0e38b0368ae4a141e57552ff0260748698bbd763a055ee19e55c00 SHA512 7b375daba2ff0ebe866ff0640d4a96d3fc1257d581404781bb7b103f6d1c79ce35aa8fd4abc40d664763f5ea51881abe441630ec6337aaad0c1db7b8c683034b
 AUX ganeti-2.15-respect-HFLAGS.patch 332 BLAKE2B 360b7473870d9e803aa958f58ddad8e5de1e5c33f6d669014ebd71fc9e3b96608987ea3e7357e26782a3b9fcd62fb7b84b9024e8c68c1db0067fc92c8dc45c6a SHA512 f9d223a072ca7c842ca688b9d7ab6ab2d514647c9346d01fed4f8c5e1111e1531a0a16cfa2f6b1600a8e72cba06abc7d81f0789f1c68c48991c260b8d6a88f94
+AUX ganeti-2.15-use-balloon-device.patch 711 BLAKE2B 23eb3434a0a24905fb3fdc49e129bdb6d044f2ee0b72bc9ec1994e355fa4df662b04194c20829f9afbdd93635bfd34c8c0a3a6bd32d64052a875dfd38bfb48f6 SHA512 e3f90d71dc595de554ead6ec21a79404b6a1098f3157fb3c6bcb95e8f27044c78451531e5e38ffc04b19e26ccd89ff14672d35b6a5e61c180e43fe95425d0794
 AUX ganeti-2.15.2-bdev_py.patch 601 BLAKE2B 95ee87cf14344a5fdb224e8972ac64431beed8b7d90d08e615d4012d11d23c6df55a8c6bde1d217e86b926bd5d2a939ccabb81a0ed9080b8e9e2b110d4b783fa SHA512 b8c4ab1d67c8b1a0ef4b9581776b5f70178f501d476c3b1a3891a7d4633fd0146b2ac3f95e2a19584e7cc3422c67ef1169a65a57498ccd5d5c18b5196060201f
 AUX ganeti-2.15.2-remove-sandbox-failing-tests.patch 2641 BLAKE2B ecf41445e52160a754fb9a433fad59141ae0058ed5a86d9cd0981b7ee952015528b85467b77226d70f4cd1847dbc813efbd8198e6424b1405835ea256e983448 SHA512 51e8f10a8a20100dbe290023d3cfd9d585052f441d79daeb18188940977f19401ffe46924df88118b662a26b2423ca119968e8de9c8664cde531b9d7ea23af93
 AUX ganeti-2.16-kvmd-run-as-daemon-user.patch 1257 BLAKE2B 43766f2cf5fd18ca23ed4072258a3973c343dd92fbfcba51e62b3a7533b720092042a8bbc2f371cfab515085c54d349eecbd13f044cd18e3ee99c3869e848333 SHA512 c913ea0ba2af8d73342f105990234b4cfe4060a41cee1530d3dfe828a3e048d5c7cb473de22094330ab3efe9d2ade64bc15d98585a56d1d0f10e0b13b95485a5
@@ -27,7 +28,8 @@ AUX ganeti-kvm-poweroff.confd 186 BLAKE2B 3f82aea50562d181f2f84616a6d1c5f7bf59a7
 AUX ganeti-kvm-poweroff.initd 1502 BLAKE2B baeef3110b3e16e7aba443b4e1cb0b15869492c5f4e779199ac4c12ef0ceabfd4fa1fa2d84b2d8e009bf3e22dbec06e7350c1ee0185fc53e02baebf73eb6d571 SHA512 ae2e9f9342bbbe7ae3f1ce5f1a2b44943e6cee7371de12bef36522acc180430af8f9eef37a0f3fdd2fdfd8ec959ca1691571e654cc4c9017e7b3fd2fa777f4f6
 AUX ganeti-lockdir.patch 468 BLAKE2B b3684c79376ab468b4162de9104291c89f73cf69fed9fb452ee9a0073de69c49458d115694b9bcc53d308751a3c4a6a84bda07b93a2431f357df238061f514b4 SHA512 1581e4e60dcd2f615a7c6366550dd367b1aba8e422e70db17cb02fb1ed109827d4e8ef9898f417680c4377235cf8dd4770fab21895ca26f3f490ea54f1c0e3f6
 AUX ganeti.confd-r2 422 BLAKE2B 384e4e479fcf3fe57c45c18cf16bfca84f03eda2e7a60e5512dbb5122a33c300469c3315cd41b621e86e850ed3bcb49822de93b35f40a156f7e7e38aef228619 SHA512 4ac93d7c252c3b4dbba4146e991fdb49f4cf832cc96c48425748d279c459c5e4a8a8e1bdbc719027a7bd751896b469b996ed324bc180c9c674030eeb0b7a0d9a
-AUX ganeti.initd-r3 2602 BLAKE2B 4a8ebd292cfd922aed63c7db739cbcc51924c85b3074afd5adab32376a1ce5ba5f4954ea2d299aaff5af009fc0fa6344c04de7f7cb1a45b5ff5f804cfd207017 SHA512 e4dd9cfe5ee41b70ecb45786991e22e3d1dac92c1ee14a9020fc4c62b94ae6f0a2a79c20e685e880b5d83c959cc759a3500f3f78b5f57c1ae3c6261b57c16928
+AUX ganeti.initd-r3 2599 BLAKE2B 4f6d4d8f72022fe56590491818fb884fd58d7fef59e021cb06433a15f346f7716b52f4a6fe109176a9d8bd21c7819a85f7ddf1aa9ce25f161602c54df2f30239 SHA512 d52b1d0e726fd24427aa6b6b764d62597220fa9b353d2281e3cbac0d9b6df500fd9d586715e0c8bd81462755276c68aa405434a6fe1bba605fc456e152387e14
+AUX ganeti.initd-r4 2604 BLAKE2B 5a7eb8946c5240e72358d7c99c430dad7217de03518678dd87ea0f4e9db4a360a6e05f088443106d6c48a353e930a7f276b3b0b5d8ac3624d22b06410145a20e SHA512 d929f0a7b2d6db2e4129a3bc1e78c4753a4dd621549c3343af663b90c15fd779b9d2c998758b3990f17aaf760430b32e3ca34fa6969b7fd536e02662b0084265
 DIST ganeti-2.15.2.tar.gz 4723007 BLAKE2B d49d2ed9df515514a99d42303799e5ffc751eb8e6b397f86174cb3d48ec846fd3d146737240eea9ec0ce6fd9d07e04a27831a45a4354d3d49597b9f5cff33d7b SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85
 DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfdc46867f0e3eed276086de9ad2e86def1e7894012b89f3f9c111076c37ef37b857967e4bae5cf769eaabf5907b3a42bc806b4472 SHA512 1c992b9842f1a8492eeaaab8950939c96cc03abf679234211753b92f4753278b086a0a77e2e32b912d4a69635c11e8305d350cda8285734d706cce741d897aa3
 DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be
@@ -37,6 +39,7 @@ DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4
 EBUILD ganeti-2.15.2-r5.ebuild 9757 BLAKE2B caaa94ddb315b7b4ea5f93ce6015521c3e70d835f6aa339ead3a9f1c1da3645e0d603cb6dfa94339822c63bc85c095a88e630c34ba08df2bb6361dba95127c83 SHA512 ae8d599d9338b10e7fdfb22ae8a0c89a76380fee6a03692508294144953e5acc18ba76a9052824e22c09fc00f76a357aca5b0bb4afe5b0bfc25e971fef5f0499
 EBUILD ganeti-2.15.2-r6.ebuild 10209 BLAKE2B 17fe1545ce1866c40f188ec54b86f2cf709cdf6637a4227eaa633ddd00a565cf6b87ee99a152af1e426ce2b1fe4ce2cd765028dc108bb27ddc1e565ab5b14cdf SHA512 446cd91e65c576cb827f2b66f01d7cec1cd9ff57022d664fb2bfbb8b93cb4e02a9d57aacd4ddc2c4d691c3d7b730d751ec3d4c54e26ec2d07869f309f7d931ad
 EBUILD ganeti-2.15.2-r7.ebuild 11657 BLAKE2B c7961e5bf8ea1906e9dff5598f1bbaac496cd8b64d4ebb3f999f75a5d59f60bb6bf597958ddf6579129b1fbba65026cdf9d204fe81c49ef03022ca66f1cf7a1b SHA512 df09969e05a989261487f95af64962f5393714a9ebf33fe3df300e3ca35ee709d2bade6f58c409c8aca1aa158932f1f84881e7131ba5f167b9adccbdfda989aa
+EBUILD ganeti-2.15.2-r8.ebuild 12090 BLAKE2B 89fb227d99927247747a5a2fa95606a7df4a1a81f04c75aa1e94622de076b1e5b8f3f105552bd69b2967dd64c4fecb25353b53445fbf5fb7e6b69709c94add58 SHA512 15e40b4713b3cd55617f668b090eb891d094954c5cc41deb94fb46df94826c738564cdf6c4008a6a6bf2f76d47645aca07224ffd0f71819cf385ec873fe28895
 EBUILD ganeti-2.16.0_rc1.ebuild 10455 BLAKE2B 27e2d97c7e53ec58790b84596ac9915735c049bd196caf75e85a719f2bd7779a5bb4e51c2f5595c724ff11bc46c13072949813cd01d3897d8a4f63be49f2d853 SHA512 1dfd0c29731e02a453e79c72c112e85ad0f95ff51d486dc28bd9685640b6459a0dade98dff3ca2305790134f87973fbecf11e56edba41712974b3f6aa7b3e3a1
 EBUILD ganeti-2.17.0_beta1.ebuild 10482 BLAKE2B c1e4aa4ee3ec0bf191f29d8b63537ec96a8f411517bd274b3872c5a9fc394bc8944cde3fcb0670f678be1c2382860a21adb5f9d76265288b6d7b427317109a39 SHA512 22111278c2ec0491876eaafc45dc3ff401b93298c5caf1f1fe039094cffbbb6e3c74092c04569cdb1c748edbe69111257f2ef965181473394e4fd7148218191b
 MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/files/ganeti-2.15-use-balloon-device.patch b/app-emulation/ganeti/files/ganeti-2.15-use-balloon-device.patch
new file mode 100644
index 000000000000..ae57a213fc00
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-use-balloon-device.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py
+index 174621fcc..1f598e7ef 100644
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -1094,7 +1094,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+     # Add id to ballon and place to the first available slot (3 or 4)
+     addr = utils.GetFreeSlot(pci_reservations, reserve=True)
+     pci_info = ",bus=pci.0,addr=%s" % hex(addr)
+-    kvm_cmd.extend(["-balloon", "virtio,id=balloon%s" % pci_info])
++    kvm_cmd.extend(["-device", "virtio-balloon,id=balloon%s" % pci_info])
+     kvm_cmd.extend(["-daemonize"])
+     if not instance.hvparams[constants.HV_ACPI]:
+       kvm_cmd.extend(["-no-acpi"])
diff --git a/app-emulation/ganeti/files/ganeti.initd-r3 b/app-emulation/ganeti/files/ganeti.initd-r3
index 6869f48313db..18b3116a517f 100644
--- a/app-emulation/ganeti/files/ganeti.initd-r3
+++ b/app-emulation/ganeti/files/ganeti.initd-r3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="forcestart is_master"
diff --git a/app-emulation/ganeti/files/ganeti.initd-r4 b/app-emulation/ganeti/files/ganeti.initd-r4
new file mode 100644
index 000000000000..6393de8e2803
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti.initd-r4
@@ -0,0 +1,96 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="forcestart is_master"
+
+depend() {
+	need localmount logger
+	after bootmisc sshd
+	use net
+}
+
+DAEMON_UTIL="/usr/%LIBDIR%/ganeti/daemon-util"
+
+is_master() {
+	[ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
+	[ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
+	[ "${ganeti_master}" = "${local_hostname}" ]
+}
+
+# This exists specifically for restarting a 2-node cluster where quorum might
+# not be available.
+forcestart() {
+	ewarn "Forcing non-quorum Ganeti master start"
+	GANETI_WCONFD_OPTS="${GANETI_WCONFD_OPTS} --no-voting --yes-do-it"
+	GANETI_LUXID_OPTS="${GANETI_LUXID_OPTS} --no-voting --yes-do-it"
+	GANETI_MASTERD_OPTS="${GANETI_LUXID_OPTS} --no-voting --yes-do-it"
+	export GANETI_WCONFD_OPTS GANETI_LUXID_OPTS GANETI_MASTERD_OPTS
+	start
+}
+
+start() {
+	if ! [ -e ${DAEMON_UTIL} ]; then
+		eerror "Could not find daemon utility at ${DAEMON_UTIL}"
+		return 1
+	elif ! ${DAEMON_UTIL} check-config ; then
+		eerror "Incomplete configuration, will not run."
+		return 1
+	fi
+
+	local daemon retval=0 optsvar started_daemons daemon_opts
+
+	for daemon in $(${DAEMON_UTIL} list-start-daemons); do
+		optsvar="$(printf "${daemon}_OPTS" | tr - _ | LC_ALL=C tr '[:lower:]' '[:upper:]')"
+
+		case "${daemon#ganeti-}" in
+			masterd|rapi|luxid) is_master || continue;;
+		esac
+
+		eval daemon_opts=\"\$\{${optsvar}\}\"
+
+		ebegin "Starting ${daemon}"
+		eindent
+		veinfo ${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts}
+		${DAEMON_UTIL} start ${daemon} ${GANETI_OPTS} ${daemon_opts} || retval=${?}
+
+		if [ ${retval} != 0  ] && [ -n "${started_daemons}" ]; then
+			case ${daemon} in
+				*-kvmd) retval=0; ewarn "Failed to start kvmd, continuing anyway";;
+				*)
+					eerror "Stopping already started daemons"
+					eindent
+					eend ${code} "$(${DAEMON_UTIL} check-exitcode ${code})"
+
+					for daemon in ${started_daemons}; do
+						ebegin "Stopping ${daemon}"
+						${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
+						eend ${?}
+					done
+					eoutdent; eoutdent
+					return ${retval}
+				;;
+			esac
+		fi
+		eoutdent
+		started_daemons="${started_daemons} ${daemon}"
+	done
+}
+
+stop() {
+	if ! [ -e ${DAEMON_UTIL} ]; then
+		eerror "Could not find daemon utility at ${DAEMON_UTIL}"
+		return 1
+	fi
+
+	local daemon
+
+	for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
+		case "${daemon#ganeti-}" in
+			masterd|rapi|luxid) is_master || continue;;
+		esac
+		${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
+	done
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
new file mode 100644
index 000000000000..0d2eaac25e1b
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(ver_cut 1-2)"
+
+DEBIAN_PATCH=11
+SRC_URI="
+	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+"
+KEYWORDS="~amd64 ~x86"
+PATCHES=(
+	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
+	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+	"${WORKDIR}"/debian/patches/relax-deps
+	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+	"${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch
+	"${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
+	"${WORKDIR}"/debian/patches/0001-GHC-8-support.patch
+	"${WORKDIR}"/debian/patches/ghc8-fixes
+	"${WORKDIR}"/debian/patches/snap-server-1.0-compat
+	"${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch
+	"${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch
+	"${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch
+	"${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch
+	"${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch
+	"${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
+	"${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch
+	"${WORKDIR}"/debian/patches/fix-cpu-affinity.patch
+	"${WORKDIR}"/debian/patches/fix-fcntl-i386.patch
+	"${WORKDIR}"/debian/patches/fix-ovf-test-path.patch
+	"${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch
+	"${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch
+	#"${WORKDIR}"/debian/patches/THH-2.12.patch
+	"${WORKDIR}"/debian/patches/sphinx-1.7.patch
+	"${WORKDIR}"/debian/patches/ca-use-sha256-md.patch
+	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch
+	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch
+)
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )
+	kvm? ( || ( amd64 x86 ) )
+	${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+	dev-libs/openssl:0
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/bitarray[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/fdsend[${PYTHON_USEDEP}]
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
+	net-analyzer/fping
+	net-misc/bridge-utils
+	net-misc/curl[ssl]
+	net-misc/openssh
+	net-misc/socat
+	sys-apps/iproute2
+	>=sys-fs/lvm2-2.02.181
+	>=sys-apps/baselayout-2.0
+	>=dev-lang/ghc-8.0:0=
+	<dev-lang/ghc-8.1:0=
+	dev-haskell/cabal:0=
+	dev-haskell/cabal-install:0=
+	!<app-emulation/ganeti-instance-image-0.6-r1
+	>=dev-haskell/mtl-2.1.1:0=
+	>=dev-haskell/old-time-1.1.0.0:0=
+	>=dev-haskell/random-1.0.1.1:0=
+	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+	>=dev-haskell/transformers-0.3.0.0:0=
+
+	>=dev-haskell/attoparsec-0.10.1.1:0=
+	<dev-haskell/attoparsec-0.14:0
+	>=dev-haskell/base64-bytestring-1.0.0.1:0=
+	<dev-haskell/base64-bytestring-1.1:0=
+	>=dev-haskell/crypto-4.2.4:0=
+	<dev-haskell/crypto-4.3:0=
+	>=dev-haskell/curl-1.3.7:0=
+	<dev-haskell/curl-1.4:0=
+	>=dev-haskell/hinotify-0.3.2:0=
+	<dev-haskell/hinotify-0.4:0=
+	>=dev-haskell/hslogger-1.1.4:0=
+	<dev-haskell/hslogger-1.3:0=
+	>=dev-haskell/json-0.5:0=
+	>=dev-haskell/lens-3.10:0=
+	>=dev-haskell/lifted-base-0.2.0.3:0=
+	<dev-haskell/lifted-base-0.3:0=
+	>=dev-haskell/monad-control-1.0.1.0:0=
+	<dev-haskell/monad-control-1.0.2:0=
+	>=dev-haskell/network-2.3.0.13:0=
+	<dev-haskell/network-2.7:0=
+	>=dev-haskell/parallel-3.2.0.2:3=
+	<dev-haskell/parallel-3.3:3=
+	>=dev-haskell/temporary-1.1.2.3:0=
+	<dev-haskell/temporary-1.3:0=
+	>=dev-haskell/regex-pcre-0.94.2:0=
+	<dev-haskell/regex-pcre-0.95:0=
+	>=dev-haskell/transformers-base-0.4:0=
+	<dev-haskell/transformers-base-0.5:0=
+	>=dev-haskell/utf8-string-0.3.7:0=
+	>=dev-haskell/zlib-0.5.3.3:0=
+	<dev-haskell/zlib-0.7:0=
+
+	>=dev-haskell/psqueue-1.1:0=
+	<dev-haskell/psqueue-1.2:0=
+	>=dev-haskell/snap-core-1.0.1:0=
+	<dev-haskell/snap-core-1.1:0=
+	>=dev-haskell/snap-server-1.0.1:0=
+	<dev-haskell/snap-server-1.1:0=
+	>=dev-haskell/case-insensitive-0.4.0.1
+
+	dev-haskell/vector:0=
+	xen? ( >=app-emulation/xen-3.0 )
+	kvm? (
+		dev-python/psutil
+		app-emulation/qemu
+	)
+	lxc? ( app-emulation/lxc )
+	drbd? ( sys-cluster/drbd-utils )
+	rbd? ( sys-cluster/ceph )
+	ipv6? ( net-misc/ndisc6 )
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="
+	sys-devel/m4
+	app-text/pandoc
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	media-fonts/urw-fonts
+	media-gfx/graphviz
+	>=dev-haskell/test-framework-0.6:0=
+	<dev-haskell/test-framework-0.9:0=
+	>=dev-haskell/test-framework-hunit-0.2.7:0=
+	<dev-haskell/test-framework-hunit-0.4:0=
+	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+	<dev-haskell/test-framework-quickcheck2-0.4:0=
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/haddock:0=
+		>=dev-haskell/hunit-1.2.4.2:0=
+		<dev-haskell/hunit-1.3:0=
+		>=dev-haskell/quickcheck-2.4.2:2=
+		<dev-haskell/quickcheck-2.8.3:2=
+		sys-apps/fakeroot
+		>=net-misc/socat-1.7
+		dev-util/shelltestrunner
+	)"
+
+PATCHES+=(
+	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
+	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+	"${FILESDIR}/${PN}-2.10-rundir.patch"
+	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+	"${FILESDIR}/${PN}-2.11-tests.patch"
+	"${FILESDIR}/${PN}-lockdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
+	"${FILESDIR}/${PN}-2.15-python-mock.patch"
+	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+	"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+	"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+	"${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
+	"${FILESDIR}/ganeti-2.15.2-bdev_py.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+	usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+# haskell...
+QA_FLAGS_IGNORED="
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-metad
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-wconfd
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-confd
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-luxid
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-kvmd
+	/usr/lib64/ganeti/2.15/usr/bin/htools
+"
+
+pkg_setup () {
+	local user
+	python-single-r1_pkg_setup
+
+	if use multiple-users; then
+		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+			enewgroup ${user}
+			enewuser ${user} -1 -1 -1 ${user}
+		done
+	fi
+}
+
+src_prepare() {
+	local testfile
+	if has_version '>=dev-lang/ghc-7.10'; then
+		# Breaks the build on 7.8
+		PATCHES+=(
+			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+		)
+	fi
+	if use experimental; then
+		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+		PATCHES+=(
+			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+			# backport available for 2.15, but refused upstream due to RPC breakage.
+			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
+		)
+	fi
+	eapply "${PATCHES[@]}"
+	# Upstream commits:
+	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+	# 24618882737fd7c189adf99f4acc767d48f572c3
+	sed -i \
+		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+		cabal/ganeti.template.cabal
+	# Neuter -Werror
+	sed -i \
+		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+		Makefile.am
+
+	# not sure why these tests are failing
+	# should remove this on next version bump if possible
+	for testfile in test/py/import-export_unittest.bash; do
+		printf '#!/bin/bash\ntrue\n' > "${testfile}"
+	done
+
+	# take the sledgehammer approach to bug #526270
+	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \
+		> "${T}/ganeti.initd"
+
+	eapply_user
+
+	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+	rm autotools/missing
+	eautoreconf
+}
+
+src_configure () {
+	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
+	local kvm_arch
+
+	if use amd64; then
+		kvm_arch=x86_64
+	elif use x86; then
+		kvm_arch=i386
+	elif use kvm; then
+		die "Could not determine qemu system to use for kvm"
+	fi
+
+	econf --localstatedir=/var \
+		--sharedstatedir=/var \
+		--disable-symlinks \
+		--with-ssh-initscript=/etc/init.d/sshd \
+		--with-export-dir=/var/lib/ganeti-storage/export \
+		--with-os-search-path=/usr/share/${PN}/os \
+		$(use_enable restricted-commands) \
+		$(use_enable test haskell-tests) \
+		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+		$(use_enable syslog) \
+		$(use_enable monitoring) \
+		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+		--enable-socat-escape \
+		--enable-socat-compress
+}
+
+src_install () {
+	emake V=1 DESTDIR="${D}" install
+
+	newinitd "${T}"/ganeti.initd ${PN}
+	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+	if use kvm; then
+		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+	fi
+
+	# ganeti installs it's own docs in a generic location
+	rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+	newbashcomp doc/examples/bash_completion gnt-instance
+	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+	use monitoring && bashcomp_alias gnt-instance mon-collector
+
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+	docinto html
+	dodoc -r doc/html/* doc/css/*.css
+
+	docinto examples
+	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+	docinto examples/hooks
+	dodoc doc/examples/hooks/{ipsec,ethers}
+
+	insinto /etc/cron.d
+	newins doc/examples/ganeti.cron ${PN}
+
+	insinto /etc/logrotate.d
+	newins doc/examples/ganeti.logrotate ${PN}
+
+	# need to dodir rather than keepdir here (bug #552482)
+	dodir /var/lib/${PN}
+
+	keepdir /var/log/${PN}/
+	keepdir /usr/share/${PN}/${SERIES}/os/
+	keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+	dosym ${SERIES} "/usr/share/${PN}/default"
+	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+	if use multiple-users; then
+		elog "You have enable multiple user support, the users for this must"
+		elog "be created. You can use the provided tool for this, which is"
+		elog "located at:"
+		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
+	fi
+}
+
+src_test () {
+	PATH="${S}/scripts:${S}/src:${PATH}" \
+		TMPDIR="/tmp" \
+		GANETI_MASTER="$(hostname -f)" \
+		emake check || die "emake check failed"
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 1959a463a896..0720b35bbab6 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -3,9 +3,11 @@ AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655
 AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
 AUX ptbr-translation-newline.patch 599 BLAKE2B a60e323bfcbdde55bb82f930165a56f0806975370ea090d30a2f40057445b7552b1ff368aac4518e3539f2a4f9b66bd474498f7797002c9bf92d0d837cb72246 SHA512 07c7682ac24b138da10e1a24da02b0cf6144d911200d89ae74d4a03c16fd2a75a22f5956902d071fb93ae1b9b74aacd4ad98e98764678881e19773ab64561581
+DIST lxd-3.10.tar.gz 27057432 BLAKE2B b5a5c3cd4f1045419c806510aab21c3bcde8c8687ede808b1b832e2a0caba0ff3af5d79367141b29e84c0bd3bcf6958d917bc813700220e238cd21933963009b SHA512 25ed7675af7b6861d754607b19485e329ae344befac06fe33f326e34030755359bea6f574c414849b85f034533fd5dccb95a326ae0ad9e44b8ea366f7ee44d04
 DIST lxd-3.7.tar.gz 26321652 BLAKE2B ce7faab689ffe3950aa6f57a0fd2601f231ad26fc7fb09f02300f9c2226deda0876183fe2a4a14cc982c3c2a829acc1785e5e6e030f4dbeaf03a8fbba83e4cfc SHA512 a485c26ea04e6686a9fdac2219535e866f1906ff9a8e25fcd954d061a4cfc1585c4fa81b00247c34f571dbfb7f382be3e7208e3da72a4e281b714715a4f145fb
 DIST lxd-3.8.tar.gz 26914475 BLAKE2B 9cf7ee1b5d57a3588d3ccecd47b22ef28da0faa684de03c7273949be1902f77ff7c49f4e7e5c942f7266e4e462ee009b1e70d25362610050cc41d81029d42d7b SHA512 20085f05c59287fc8f350d8ef314c19fd7361f8394812e4a0466f76d9df6957348fc954d952f70e50e7227d593a9db9af994e15f69fd76e6ca4812174bfa907c
 DIST lxd-3.9.tar.gz 27031818 BLAKE2B 7956aa9d0cf773fbdae64e8770ebee474d0b1e20aa1399d96eb317efb8a8e1cc1673bf345cea7a7cf99746905b9e16c6b2b507e571931a0cab37ff7ff5df67fd SHA512 8d61912adeb33d06e4065aab7eaf80ab7b6e9cbc2b20dcca1cc5c74b999838aec32e805af3a6ae1262948514a619f4332ec44912ca720fa1b0e8b962165c117a
+EBUILD lxd-3.10.ebuild 6892 BLAKE2B 803831d6d665bddcc3c81d33764516b6c24f35cfe60ae69eb0e565e61fa6c2d11eef4493b6142473f86072ab8129030504d6d7c1a760d0bfd6e1c8378e9d9af6 SHA512 fc6b94e39829ec8a741963e61f7b9ea030feaf89cc6413f036586c8c683b53e629610d2907b673c04c22e50e6d349b006987b0b83e4969c5f4fc60e0719baa29
 EBUILD lxd-3.7.ebuild 6774 BLAKE2B 9ff0ba0be0f774c308b73e85423a8bc25889c161db96341d689adfbf5fcb9c7395b0d6fb5898a55e78ccf98363c7fef435955d46f3435fa1f6eb28e91b55998b SHA512 c1b0d28b58c01ddde55fbf7b87c3ff9ac3306429d9b79741c19d11acaf4c4cce8407676b3e66ba8ff1cc1d521a6fdcf26485637a0429c0a7f6326bad91f5c319
 EBUILD lxd-3.8.ebuild 6891 BLAKE2B bbb357a94d424fe6c33bf797079bb80e35a4b5e0d7c7a0a6144372a678b37790fa3d9f2ead0a8d226a5ea80cd6873a861ff0cc1834770aacbdbe797da18e9af8 SHA512 56a231f3ad8ace033dea0736b2ae1ad6ce3e29eddaa523457d866735291d0807365b03cc82ab3999ca940dfdc3d1edda5e16d7b58455ae47f905e616f13c3fb3
 EBUILD lxd-3.9.ebuild 6892 BLAKE2B 1fe9e958374a0b3170b64341cc40f65790ce1087092ad1b4c68e5fb414a495d12e01b2cca321653aff72adde818fef56a3a89e64b650966e7c198dd3dec67e41 SHA512 6e615e5334ea1b99d3cca78e4735f00c0169a8e3e45f8eda24d8ad0c43e4fadbd25e4995f3a7a4b564e3cbbc4f4910161e867c6f70924612eaa947e3cb1a53ec
diff --git a/app-emulation/lxd/lxd-3.10.ebuild b/app-emulation/lxd/lxd-3.10.ebuild
new file mode 100644
index 000000000000..988a505aa241
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.10.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+DEPEND="
+	dev-lang/tcl
+	>=dev-lang/go-1.9.4
+	dev-libs/libuv
+	dev-libs/protobuf
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-arch/xz-utils
+		>=app-emulation/lxc-2.0.7[seccomp]
+		dev-libs/libuv
+		dev-libs/lzo
+		dev-util/xdelta:3
+		dnsmasq? (
+			net-dns/dnsmasq[dhcp,ipv6?]
+		)
+		net-firewall/ebtables
+		net-firewall/iptables[ipv6?]
+		net-libs/libnfnetlink
+		net-libs/libnsl:0=
+		net-misc/rsync[xattr]
+		sys-apps/iproute2[ipv6?]
+		sys-fs/fuse
+		sys-fs/lxcfs
+		sys-fs/squashfs-tools
+		virtual/acl
+	)
+"
+
+CONFIG_CHECK="
+	~BRIDGE
+	~DUMMY
+	~IP6_NF_NAT
+	~IP6_NF_TARGET_MASQUERADE
+	~IPV6
+	~IP_NF_NAT
+	~IP_NF_TARGET_MASQUERADE
+	~MACVLAN
+	~NETFILTER_XT_MATCH_COMMENT
+	~NET_IPGRE
+	~NET_IPGRE_DEMUX
+	~NET_IPIP
+	~NF_NAT_MASQUERADE_IPV4
+	~NF_NAT_MASQUERADE_IPV6
+	~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+	eapply_user
+	eapply "${FILESDIR}/de-translation-newline-1.patch"
+	eapply "${FILESDIR}/ptbr-translation-newline.patch"
+
+	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
+	eautoreconf
+}
+
+src_configure() {
+	export GOPATH="${S}/dist"
+	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
+
+	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
+}
+
+src_compile() {
+	export GOPATH="${S}/dist"
+
+	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+	emake
+
+	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+	emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite"
+
+	# We don't use the Makefile here because it builds targets with the
+	# assumption that `pwd` is in a deep gopath namespace, which we're not.
+	# It's simpler to manually call "go install" than patching the Makefile.
+	cd "${S}"
+	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
+
+	if use daemon; then
+
+		# LXD depends on a patched, bundled sqlite with replication
+		# capabilities.
+		export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/"
+		export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
+		export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/"
+
+		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+	fi
+
+	if use tools; then
+		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
+		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
+		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
+		go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c"
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		export GOPATH="${S}/dist"
+		# This is mostly a copy/paste from the Makefile's "check" rule, but
+		# patching the Makefile to work in a non "fully-qualified" go namespace
+		# was more complicated than this modest copy/paste.
+		# Also: sorry, for now a network connection is needed to run tests.
+		# Will properly bundle test dependencies later.
+		go get -v -x github.com/rogpeppe/godeps
+		go get -v -x github.com/remyoudompheng/go-misc/deadcode
+		go get -v -x github.com/golang/lint/golint
+		go test -v ${EGO_PN}/lxd
+	else
+		einfo "No tests to run for client-only builds"
+	fi
+}
+
+src_install() {
+	local bindir="dist/bin"
+	dobin ${bindir}/lxc
+	if use daemon; then
+
+		export GOPATH="${S}/dist"
+		cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
+		emake DESTDIR="${D}" install
+
+		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
+		emake DESTDIR="${D}" install
+
+		# Must only install libs
+		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
+		rm -r "${D}/usr/include" || die "Can't remove include directory"
+
+		cd "${S}" || die "Can't cd to \${S}"
+		dosbin ${bindir}/lxd
+	fi
+
+	if use tools; then
+		dobin ${bindir}/fuidshift
+		dobin ${bindir}/lxc-to-lxd
+		dobin ${bindir}/lxd-benchmark
+		dobin ${bindir}/lxd-p2c
+	fi
+
+	if use nls; then
+		domo po/*.mo
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${PN}.initd lxd
+		newconfd "${FILESDIR}"/${PN}.confd lxd
+
+		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	fi
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	dodoc AUTHORS doc/*
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	elog
+	elog "Though not strictly required, some features are enabled at run-time"
+	elog "when the relevant helper programs are detected:"
+	elog "- sys-apps/apparmor"
+	elog "- sys-fs/btrfs-progs"
+	elog "- sys-fs/lvm2"
+	elog "- sys-fs/zfs"
+	elog "- sys-process/criu"
+	elog
+	elog "Since these features can't be disabled at build-time they are"
+	elog "not USE-conditional."
+	elog
+	elog "Be sure to add your local user to the lxd group."
+	elog
+	elog "Networks with bridge.mode=fan are unsupported due to requiring"
+	elog "a patched kernel and iproute2."
+}
+
+# TODO:
+# - man page, I don't see cobra generating it
+# - maybe implement LXD_CLUSTER_UPDATE per
+#     https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
+#     EM I'm not convinced it's a good design.
diff --git a/app-emulation/spectemu/Manifest b/app-emulation/spectemu/Manifest
index 807e2cf43a94..98c82b3439d6 100644
--- a/app-emulation/spectemu/Manifest
+++ b/app-emulation/spectemu/Manifest
@@ -2,6 +2,6 @@ AUX spectemu-0.99.3-automagic.patch 904 BLAKE2B 25148e965f342a987b669c5b400bf0ce
 AUX spectemu-0.99.3-build.patch 1077 BLAKE2B 97038955c78e88f28c1812c3d6de8ef7e28b038a55fc7069035b9ebf99f54a83b5aea3ef21a7da8bfadc55dc8da4baa0dff634461a55f3583cc9d46c2721530f SHA512 9a650e52eb07e2bbd1109b5fe27417b3891aff79a9a7783c59fd683b4309eb9447672b4a20c0f7746fab60250d865e1d5cdbc8957e5813cec4bfebed996af493
 AUX spectemu-0.99.3-qa.patch 687 BLAKE2B fca83cada81c88c3d8e0ca5f6c66ddc593c9f1d019137708be50112d9a3283212a0fb9054859fadb161ddcf75087ffdf81bf698c9cd1dcbb2a66d19cc690dbb3 SHA512 854db7e4ab1abae52b225adb6a82b71a52a217087187970589eb694dcfdc54d8a36c7456470e8871e9af5736bc59e8f727ea5390ac5f6303e42a1d0c5efa7791
 DIST spectemu-0.99.3.tar.gz 269524 BLAKE2B f934e059bc40be8e6b3bae64c68a57654ea6d2dd9ab013dd7124446ade51b3e54cbf0d6b737f0c7c930dbd9eea89d619d47857310ea01cf2021f0e2f5a6dc54f SHA512 a2efcf46a2481a213825b452987626ade3fa95a525d26bd11a315ef885eb4f536343a7a58389733f459d05486b3da73e81503a0988ebe768ad93b089351f3e25
-EBUILD spectemu-0.99.3-r1.ebuild 884 BLAKE2B 8e903de062bdc6793355f0952ad8e770de96a81ab5bd2c6a0cdf8d932f0807210495f456eb8553557bc30ca870a7cf50d4281c07e23667f495f26d7defefa218 SHA512 44292e15d00bd8aa9bb14389aedab93bb3468b8a82e5128bfbc6b4f581193419be5c524647cabcca5460436b71f5e134b6ed2c9062cef2c7df3a9c02a81a4696
+EBUILD spectemu-0.99.3-r1.ebuild 883 BLAKE2B 724fede22dde476f237ed4744a8f0a91e18a15562025d896707e36a44dcf6f263fa3b9acbb473e57e5e095a737a8545954007241d038dd9d3b543e801a21c42d SHA512 36de2a7d17857392177e739d408a19697108a212c367a379f7cded2b73f004c2be0576edf81c9d67289c46470333a59adf509397becf9fa9b994e97d2b38615b
 EBUILD spectemu-0.99.3.ebuild 1195 BLAKE2B a728907fe7bce7fa5ce44c527bd4b6a48ad12099989ee7bb8d5d1a6fc71c4162540950183171779bc69876f6969de146fdc85b39cd6ba81aefa7446767bc91b6 SHA512 9ffa31f36c179bcd47e47f407e09367cfd1abcb459e1b13026b7e72a7fff82dab8910c249ac3bc0810254830911d9c7c495197e721cf1f67302e136a36564a1a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
index 9f0f7fdafdae..d00256957be7 100644
--- a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.inf.bme.hu/~mszeredi/spectemu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="readline svga +X"
 
 REQUIRED_USE="|| ( svga X )"
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index b302e6afd0dd..dcbae72e0f6c 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,6 +1,4 @@
 AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
-AUX virtualbox-modules-4.1.4-pax-const.patch 1729 BLAKE2B 3cada201a2bfde671c073ad49ddd239f90fa2c5338e698b35226e2ac88b4773549a216daa1caeca432e151f892974950dac5defdf91a87916e037d56d5972f5b SHA512 efca9213ace1076e354e168fa3d92da683b2dc27e5306b60452da74cb7f5a024a92033dd07d3559bca70f972aec86be3f0ed186dd951161096df2bcd9e390abe
-AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
 DIST vbox-kernel-module-src-5.2.22.tar.xz 638492 BLAKE2B 71aba29b056bb3dfeffbf4632fbf7f15d89b988267ba24c766b78b1d9c50a4d27fb1b8e699108b973af68024f9f77ca0a8ad787355d7342fe1400f14189487ff SHA512 3361bb536af8e8d490377be04d1b1b9af478538e23ec409d3e0205ad930c16e5228c57ae7d92d214ac533ae64298d9eaff3c9284ff9bb308108d1ad7d69fb507
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch
deleted file mode 100644
index f9878848ae13..000000000000
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-4.1.4-pax-const.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- vboxdrv/SUPDrvIDC.h
-+++ vboxdrv/SUPDrvIDC.h
-@@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM
-         {
-             /** The symbol address. */
-             PFNRT           pfnSymbol;
--        } Out;
-+        } __no_const Out;
-     } u;
- } SUPDRVIDCREQGETSYM;
- /** Pointer to a SUPDRV IDC get symbol request. */
---- vboxnetflt/include/VBox/intnet.h
-+++ vboxnetflt/include/VBox/intnet.h
-@@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY
-     DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY *pIfFactory, const char *pszName,
-                                                    PINTNETTRUNKSWPORT pSwitchPort, uint32_t fFlags,
-                                                    PINTNETTRUNKIFPORT *ppIfPort));
--} INTNETTRUNKFACTORY;
-+} __no_const INTNETTRUNKFACTORY;
- /** Pointer to the trunk factory. */
- typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY;
- 
---- vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -840,7 +840,7 @@ typedef struct ethtool_ops OVR_OPSTYPE;
- 
- # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
- 
--typedef struct net_device_ops OVR_OPSTYPE;
-+typedef net_device_ops_no_const OVR_OPSTYPE;
- # define OVR_OPS  netdev_ops
- # define OVR_XMIT pOrgOps->ndo_start_xmit
- 
---- vboxpci/include/VBox/rawpci.h
-+++ vboxpci/include/VBox/rawpci.h
-@@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY
-     DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY       pFactory,
-                                             PVM                  pVM,
-                                             PRAWPCIPERVM         pPciData));
--} RAWPCIFACTORY;
-+} __no_const RAWPCIFACTORY;
- 
- #define RAWPCIFACTORY_UUID_STR   "ea089839-4171-476f-adfb-9e7ab1cbd0fb"
- 
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
deleted file mode 100644
index b9f695e49a1b..000000000000
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.1.30-udp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/work/vboxnetflt/linux/VBoxNetFlt-linux.c b/work/vboxnetflt/linux/VBoxNetFlt-linux.c
-index f824654..b61d82c 100644
---- work/vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ work/vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -126,6 +126,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOXNETFLTNOTIFIER;
- # endif
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+#define SKB_GSO_UDP 0
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
- # define VBOX_HAVE_SKB_VLAN
- #else
-diff --git a/work/vboxpci/linux/VBoxPci-linux.c b/work/vboxpci/linux/VBoxPci-linux.c
-index 2dbf47f..e361ef3 100644
---- work/vboxpci/linux/VBoxPci-linux.c
-+++ work/vboxpci/linux/VBoxPci-linux.c
-@@ -353,12 +353,16 @@ static void  vboxPciFileClose(struct file* file)
- static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsigned char* data, unsigned int size)
- {
-     int          ret;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
-+    ret = kernel_write(file, data, size, &offset);
-+#else
-     mm_segment_t fs_save;
-
-     fs_save = get_fs();
-     set_fs(get_ds());
-     ret = vfs_write(file, data, size, &offset);
-     set_fs(fs_save);
-+#endif
-     if (ret < 0)
-         printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index b5ac8ad86257..0711d3bd0c35 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -7,7 +7,7 @@ AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c4446
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
 AUX virtualbox-6.0.0-libressl.patch 1249 BLAKE2B f638df39f05212e5cbb2998de97ef4c02bfc0f5cbfeee89811b3640a3c74cc9340ce50c6cc45ebc881bb5dbb6ab49b6768ee5d72014f086322e64ea9fda99d2c SHA512 496e26b2610531f3c690a2bf78360e0c5ed4dd0b2390ebee0c7fa6f41b777ea7d88cbeda69deaaeed62ae8ae2011a7f68e15a16073b52ba09853a5af1ee884b2
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
-AUX virtualbox-ose-6-wrapper 3573 BLAKE2B 733b250badff6473b6ee18f82c151be7db8ceaa6bcf325d6563d1662f3bc6f4b5bfddb74d9ec611522430735ecdeb7144ce4205145e6fe63d92533e13948684b SHA512 7cf444d5bc9da4cf50805fef1acdc0126b53103a626ac3490ad1b1d8d633d50fd882e7c2799bc4ea78b5e74686e94978643d16e9c13efcb52cf932e5f206ab81
+AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
@@ -21,5 +21,5 @@ EBUILD virtualbox-5.2.22.ebuild 13857 BLAKE2B 2b27ee756ccb7b3dc03228c236768d2c07
 EBUILD virtualbox-5.2.24.ebuild 13953 BLAKE2B ecfd06ec1542ce65a71189538204c439dfd6fe289d7fb099af6bac5e82b61732db9e77f55e46a30182508cf65e88a4cc987ebb437576e66a507aed8cb6ef55a9 SHA512 185d0d8b25ce396d8103eac7d5596d6e53140b4c345f37ad1b0f9aaccd718d7b6034b88539a9b5d391d037c63dc266bf01190ca9dff2db08616c942bcdbe39b2
 EBUILD virtualbox-5.2.26.ebuild 13953 BLAKE2B ecfd06ec1542ce65a71189538204c439dfd6fe289d7fb099af6bac5e82b61732db9e77f55e46a30182508cf65e88a4cc987ebb437576e66a507aed8cb6ef55a9 SHA512 185d0d8b25ce396d8103eac7d5596d6e53140b4c345f37ad1b0f9aaccd718d7b6034b88539a9b5d391d037c63dc266bf01190ca9dff2db08616c942bcdbe39b2
 EBUILD virtualbox-6.0.2.ebuild 14203 BLAKE2B 342d89df9490c33664c49997c1eb472d2ee76d92e3b64750ffc498297c72b9b294734688e0e2c808f22ecb0d17406e3eca878da64921018a60459c6f03bd66ed SHA512 c674bbdf752b56051bc9d05197588b106832fd9eccd8842d46394ee7b72025b72c87341432b0b6e69b1b0608f1ff31089618f5d237c6568815e775ea5f0ad54c
-EBUILD virtualbox-6.0.4.ebuild 14203 BLAKE2B 342d89df9490c33664c49997c1eb472d2ee76d92e3b64750ffc498297c72b9b294734688e0e2c808f22ecb0d17406e3eca878da64921018a60459c6f03bd66ed SHA512 c674bbdf752b56051bc9d05197588b106832fd9eccd8842d46394ee7b72025b72c87341432b0b6e69b1b0608f1ff31089618f5d237c6568815e775ea5f0ad54c
+EBUILD virtualbox-6.0.4-r1.ebuild 14160 BLAKE2B 64ebb7a3a02458c716c2b20ef521d0d1d8ff9b0aa97c7676f3d6e58c6c069e045ff6ed0c398335e1a9b1191dc64bba8d01e0fcf01239929a0ed7497461479d20 SHA512 3a4a3771923322a04a21e6f72d3b7045565146af4a34098e55bc7aeaa7cc0a6f07697344dc922ca423b4917f38c878fbfb0448312bbc1fd22326601e43c7dc82
 MISC metadata.xml 715 BLAKE2B 76ee0065ae39b8775af3837eea940291bfd584ddc92b03629c138013d342c8e388ed61fe2dc6f22caaec093f1aa5dabddb6b8c3ae5f7e07150dd063a1e567b47 SHA512 8997ad296ccb4100bc34551601b5361b8ac0d4f2f863bb5a85f55d5b6eeb6b3fcc3dee9c91bd731f52009a2892936e170db8674bf453b59fe4768a5a1c94b2b2
diff --git a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
index 6108afe14b26..af8090dd09af 100644
--- a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
@@ -84,9 +84,9 @@ case "$APP" in
     VirtualBox|virtualbox)
         exec "$INSTALL_DIR/VirtualBox" "$@"
         ;;
-    #VirtualBoxVM|virtualboxvm)
-    #    exec "$INSTALL_DIR/VirtualBoxVM" "$@"
-    #    ;;
+    VirtualBoxVM|virtualboxvm)
+        exec "$INSTALL_DIR/VirtualBoxVM" "$@"
+        ;;
     VBoxManage|vboxmanage)
         exec "$INSTALL_DIR/VBoxManage" "$@"
         ;;
diff --git a/app-emulation/virtualbox/virtualbox-6.0.4.ebuild b/app-emulation/virtualbox/virtualbox-6.0.4-r1.ebuild
index 32183eb05b9f..e8d806027ab3 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.4-r1.ebuild
@@ -363,8 +363,7 @@ src_install() {
 				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
 			fi
 
-			#for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			for each in virtualbox VirtualBox ; do
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
 				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
 			done
 
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 8d5dcd630407..047db9cc7db0 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,15 +1,7 @@
 DIST winetricks-20170823.tar.gz 639027 BLAKE2B ce0de22ff3363bd6fd675d07ea235ed5fb03ea7a84b3242329c094d6a9190c61813a1f360e74ece49d43d2dbf48dbbb1e94c4febc6e1a0d84cf1df895b0be6f9 SHA512 edc805be1a1c4fa64ae16b14fdd46786e259b88a0cde7afdf24bf934fa79f4acf3d9e599727fa589f155ec265569953b9e419cda79d54057157cbb1510261e3a
-DIST winetricks-20180217.tar.gz 646726 BLAKE2B 3cde3ca1cd7c74946732c530a49ca532975e037bc2907e88239b4697b3828dfcde3ce250d95e6c03ca36cc36b4e00cd545b0f6b63f984722a737674aff808e27 SHA512 3f90ef3381d89c0dac8c4b7acea04d71fe898207c534d4fe00c3db4e5c2e18db90602b78672e8ecf6f754206a999465ba5d8f1f5962e0291386badfc8202cd73
-DIST winetricks-20180513.tar.gz 652299 BLAKE2B fb4c55e534e368d5d7e94247feed031d0f6f98a2f3604f6187e32d25659f1cfa7f5589806e429ee054b4a94c00ebd6ac63cb99012fd94a99622891132a477001 SHA512 49fc022fc3db068145baf3a51444dc937deb092aceac8e31259888fea21ffe86f747a0d4dbd5ff10f253a94b15de090c01f20dacbe838c8444bdb00b98cbf5c6
-DIST winetricks-20180603.tar.gz 651678 BLAKE2B a70ae685bd49e429199619176e130681ab2d28ba8659f68bdba298d82e610c77df86c3d998273e60bb53d9da24bddcfe80f6d89e044007c1477a92bbc0e6043f SHA512 e88b0d4375331c94d3e2d995985b6c28fd208f1e32b1e4d84f33997a8a69fc9f8a4173325a571f5d10f233bcf40fe4cde644401c1563c8cfe7915748448a08cd
-DIST winetricks-20180815.tar.gz 666135 BLAKE2B 4bdac7980bf180d296c9d42074b7e0a6fa4c04e704e3022ae3c07a56f787ddd0d30dbb253f247772bf53861df71affc88acef1cd92c2db6fc1962e6a31b57939 SHA512 81222610f6c29e67d1b3914912dd1980fca9b7f15f283b78128780d1e667c7203b27ab3c5c4220e855c6f329a5df58c585fb70d3a7fff07db648bf63a556ad6f
 DIST winetricks-20181203.tar.gz 671138 BLAKE2B 4a6f7154509bdd4c0ec73da8b94e44f80ca732f3e3e6c85149676df4eebfe586bcc1ffafffd4937e7d3b5efe6bde015bfc8ba53a1489d553001a9600c178b1bd SHA512 ff960b7830fd688315a6cef9c50f45435d95f4d8bb8feb5f3cab3c24302369b5876afdc8145d395be4b33c9d11c3606312aaf84cb675eeb511479c46490b1585
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
 EBUILD winetricks-20170823.ebuild 1844 BLAKE2B c6781f586fc1ed47ac10e44e46c5d45cdec3af746ee58b091138a309a296c61b0f57985031b4543416e359e34b0cf87c014fa5130c6b63f08845b24ed2536f82 SHA512 49ba07ab2db89109ba4a444827849c1aa96cdfa3485cb013f1a92967a9923943225784c34427aa160a476c31b3b55aac30b28a95959a6f6d5f98c59ef5d41c94
-EBUILD winetricks-20180217.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
-EBUILD winetricks-20180513.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
-EBUILD winetricks-20180603.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
-EBUILD winetricks-20180815.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 EBUILD winetricks-20181203.ebuild 2137 BLAKE2B ae231898680bb0b59d596d2a8becef6773100c3fea7d7b6e8fe26cd275273cca47350fb409b0b927eaba369b57fd8b7df66e503ae1a1c483f2451e361ccd880c SHA512 670a876d4dda678399d0611fee6f9b7b7753382ed9de91ae8a34e9c4f8715750999d3af079d77df453ec950396c8c632e0d296ac5638059648ff8afb2be9b870
 EBUILD winetricks-99999999.ebuild 2140 BLAKE2B 0de1330040e1e56a2947d259901ee27cbb0d0526047b76c0719b85a0772b034788386a17a9f0dd09fe22a2bc65b6ea24166b92dc8518b8fdab319981a7d1cdde SHA512 4aee342c529aeb656a5d9b0ab81453800397895568766069b07825e6792ef8274a664625c046a2a3fdaac0d867c34c41eada85f41ff8753b21aeb9a6b7fd4f32
 MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20180217.ebuild b/app-emulation/winetricks/winetricks-20180217.ebuild
deleted file mode 100644
index 58d2e71829ba..000000000000
--- a/app-emulation/winetricks/winetricks-20180217.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils eutils
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-wtg=winetricks-gentoo-2012.11.24
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )"
-
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk kde rar test"
-
-DEPEND="test? (
-		dev-python/bashate
-		dev-util/checkbashisms
-		dev-util/shellcheck
-	)"
-
-RDEPEND="app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	net-misc/wget
-	virtual/wine
-	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
-	rar? ( app-arch/unrar )"
-
-# Test targets include syntax checks only, not the "heavy duty" tests
-# that would require a lot of disk space, as well as network access.
-
-# This uses a non-standard "Wine" category, which is provided by
-# '/etc/xdg/menus/applications-merged/wine.menu' from the
-# 'app-emulation/wine-desktop-common' package.
-# https://bugs.gentoo.org/451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-	else
-		default
-	fi
-}
-
-src_test() {
-	./tests/shell-checks || die "Test(s) failed."
-}
-
-src_install() {
-	default
-	if use gtk || use kde; then
-		cd "${WORKDIR}/${wtg}" || die
-		domenu winetricks.desktop
-		insinto /usr/share/icons/hicolor/scalable/apps
-		doins wine-winetricks.svg
-	fi
-}
-
-pkg_preinst() {
-	if use gtk || use kde; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emulation/winetricks/winetricks-20180513.ebuild b/app-emulation/winetricks/winetricks-20180513.ebuild
deleted file mode 100644
index 58d2e71829ba..000000000000
--- a/app-emulation/winetricks/winetricks-20180513.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils eutils
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-wtg=winetricks-gentoo-2012.11.24
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )"
-
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk kde rar test"
-
-DEPEND="test? (
-		dev-python/bashate
-		dev-util/checkbashisms
-		dev-util/shellcheck
-	)"
-
-RDEPEND="app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	net-misc/wget
-	virtual/wine
-	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
-	rar? ( app-arch/unrar )"
-
-# Test targets include syntax checks only, not the "heavy duty" tests
-# that would require a lot of disk space, as well as network access.
-
-# This uses a non-standard "Wine" category, which is provided by
-# '/etc/xdg/menus/applications-merged/wine.menu' from the
-# 'app-emulation/wine-desktop-common' package.
-# https://bugs.gentoo.org/451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-	else
-		default
-	fi
-}
-
-src_test() {
-	./tests/shell-checks || die "Test(s) failed."
-}
-
-src_install() {
-	default
-	if use gtk || use kde; then
-		cd "${WORKDIR}/${wtg}" || die
-		domenu winetricks.desktop
-		insinto /usr/share/icons/hicolor/scalable/apps
-		doins wine-winetricks.svg
-	fi
-}
-
-pkg_preinst() {
-	if use gtk || use kde; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emulation/winetricks/winetricks-20180603.ebuild b/app-emulation/winetricks/winetricks-20180603.ebuild
deleted file mode 100644
index 58d2e71829ba..000000000000
--- a/app-emulation/winetricks/winetricks-20180603.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils eutils
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-wtg=winetricks-gentoo-2012.11.24
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )"
-
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk kde rar test"
-
-DEPEND="test? (
-		dev-python/bashate
-		dev-util/checkbashisms
-		dev-util/shellcheck
-	)"
-
-RDEPEND="app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	net-misc/wget
-	virtual/wine
-	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
-	rar? ( app-arch/unrar )"
-
-# Test targets include syntax checks only, not the "heavy duty" tests
-# that would require a lot of disk space, as well as network access.
-
-# This uses a non-standard "Wine" category, which is provided by
-# '/etc/xdg/menus/applications-merged/wine.menu' from the
-# 'app-emulation/wine-desktop-common' package.
-# https://bugs.gentoo.org/451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-	else
-		default
-	fi
-}
-
-src_test() {
-	./tests/shell-checks || die "Test(s) failed."
-}
-
-src_install() {
-	default
-	if use gtk || use kde; then
-		cd "${WORKDIR}/${wtg}" || die
-		domenu winetricks.desktop
-		insinto /usr/share/icons/hicolor/scalable/apps
-		doins wine-winetricks.svg
-	fi
-}
-
-pkg_preinst() {
-	if use gtk || use kde; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emulation/winetricks/winetricks-20180815.ebuild b/app-emulation/winetricks/winetricks-20180815.ebuild
deleted file mode 100644
index 58d2e71829ba..000000000000
--- a/app-emulation/winetricks/winetricks-20180815.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils eutils
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-wtg=winetricks-gentoo-2012.11.24
-
-SRC_URI="${SRC_URI}
-	gtk? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )
-	kde? ( https://dev.gentoo.org/~tetromino/distfiles/wine/${wtg}.tar.bz2 )"
-
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk kde rar test"
-
-DEPEND="test? (
-		dev-python/bashate
-		dev-util/checkbashisms
-		dev-util/shellcheck
-	)"
-
-RDEPEND="app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	net-misc/wget
-	virtual/wine
-	x11-misc/xdg-utils
-	gtk? ( gnome-extra/zenity )
-	kde? ( kde-apps/kdialog )
-	rar? ( app-arch/unrar )"
-
-# Test targets include syntax checks only, not the "heavy duty" tests
-# that would require a lot of disk space, as well as network access.
-
-# This uses a non-standard "Wine" category, which is provided by
-# '/etc/xdg/menus/applications-merged/wine.menu' from the
-# 'app-emulation/wine-desktop-common' package.
-# https://bugs.gentoo.org/451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		if use gtk || use kde; then
-			unpack ${wtg}.tar.bz2
-		fi
-	else
-		default
-	fi
-}
-
-src_test() {
-	./tests/shell-checks || die "Test(s) failed."
-}
-
-src_install() {
-	default
-	if use gtk || use kde; then
-		cd "${WORKDIR}/${wtg}" || die
-		domenu winetricks.desktop
-		insinto /usr/share/icons/hicolor/scalable/apps
-		doins wine-winetricks.svg
-	fi
-}
-
-pkg_preinst() {
-	if use gtk || use kde; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk || use kde; then
-		gnome2_icon_cache_update
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
commit	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree	cee0a97398040001220ece3cd48c3d568bcddb4a /app-emulation
parent	1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)