Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

29 files changed, 588 insertions, 114 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 95ae9100d2dd..fbb3bc1c485a 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 661271fd6d17..03937ba7342a 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,13 +1,11 @@
 DIST buildah-1.10.0.tar.gz 9362108 BLAKE2B 691b5273056f9eb3e1f1dabf22c299ae281af8db13e680351bc0f4e0b6560b0ac20def5a1b3a039d14b97bb35a935a34ae83eeadc6272ad4d68a494439cc5f57 SHA512 33d33bb622e69512a2e11592455d654f6478994e78894bd0f73e03cc01e12c7e30b1fc25bbd6b44a3ce83b9e261ffb47c3d08a99bf523f4fe0e3ff00d93861a8
 DIST buildah-1.10.1.tar.gz 9378648 BLAKE2B ea563d1a52634aa4e0172f05caf04b511bd9962cec012ed35830ceb5848dae1c14020167d61d44e11d0dcdcd6d5440c216505a11987f6806bac1336dd12152c9 SHA512 0651ed1ec6015b437ed0a786bef20c6a88fedfa4d318edc081d257720b1cc2c8d380a8cde5125ab5894bf0b4a6df90034b689097f7cc05630401e8e7700fca6a
 DIST buildah-1.11.0.tar.gz 10065996 BLAKE2B fcf709f7474bcb45f2da6f90b614b4c95036d19c05fad715f80720efbb9ad6c4be6725001de4b5198c7d81e365ff12a742b73bc5d7268819de56c4b2fbe0b8e4 SHA512 a5e852a427de4e3f3ce8d78fb8ea82e8b6e0a1bcc6a0bc786c2bcb0d4689fec5f5a6413f77898bd953dc7eeea31d1d58fe22fac40cd5209fa5016a376a9958b7
-DIST buildah-1.11.1.tar.gz 10126770 BLAKE2B 88ee8aa43490b12e0e63cbdae24d62d8fd10f8a502689dc30b748213aaf32851bc83c4fce38316f79523e3fb3a7110fc763d8bcbd24181ae45abeb5b3eecdda5 SHA512 322fe1b249ff6db160bc1dc111d19ddde8f36ae931f222aeab21e0b39f60bcbe9ad8b11cb6ee088b028478d6774a2fb231b6d457ed4c30cd5477b4a67ebcf06a
 DIST buildah-1.8.4.tar.gz 5122400 BLAKE2B b02a1cac77f5f16ab6cec3a74f11ee94675c717ead21fd791feb4cfbd08dcfb4313a1ee3134d3b9f9d20218935db35e28dab406a9f706ff2f46a2beb1abaa56b SHA512 a316e5e2bea7cded1db089bbc7831c9af69242caa6108c78d63864c012053bda3dc3da5bf70248b2742b2be1ad66aeb59c844558022c20f79236f5b1292d6366
 DIST buildah-1.9.2.tar.gz 9505091 BLAKE2B 886e1ae5804f005f5782d011ed8440a8ac5eb09b2cf7917ac04ed1ab3e08f8cce6ef9b8efaf3392d60ed46b5bdb2efcec8b44c0448f970210cd613837a5d8f1f SHA512 1add432491fcae3b22dac2768ba71be2a47f42f3d9fae14cc5ff54220b3b7b96a48a95cb10b249de98f9c3067d463bbeca75c7c52783c111a9b5ed0ba03eb30f
 EBUILD buildah-1.10.0.ebuild 1446 BLAKE2B 6fd24b1e8f98f2db900fdc3840e7448cb61fa1023783e22d384a0ecff4da5d8398c9c8cd1c096c6bb6cbef297517e009fbc818aed03716b05c9f4716b237ce71 SHA512 a743db9feccc105c90b0180e4151d62d4e8bb400b8f3324702896821560bdc8d08e9545c738863e4985d7fd9a264fd7cb7166446167dbeb51348d499cf47017b
 EBUILD buildah-1.10.1.ebuild 1446 BLAKE2B 0d5351236e5fce90665bc9b30e134d9a33ad4ed0cc9d6fb4f4977243946fa3dcaa94e7c156b7db58aabdbdb12c2bbe4f10b54d7eae644734b68584b30970ab85 SHA512 956d1447f322af82f0f8f88c483d980b4409e5cecb6d01980ad31b16844f46722497cd39a760c169461cf2a493fb31bc191df8dee682b02edd038054aae52487
 EBUILD buildah-1.11.0.ebuild 1446 BLAKE2B 8dc0564305db4174600aa2181a0ca5c67c4ba8c2526e148a58eff60c0078057f0a1d1c139a25167a7ba2919a1c069f2026b5f357f88217a65234b647059eedec SHA512 42b645d49dde0685aaf444166c2809d424f7fcfcaa1ebf07c919c5156988ce0b320397770ae7d4108bdb1ff40cf733806d0b1296330949c96d83d4e59df8d198
-EBUILD buildah-1.11.1.ebuild 1446 BLAKE2B 86efb60a185258e544e9ead22fe4f623bb6e3cf23be41c8db6d2e45293706fac719db412596c9168b9e9926d62334f35a45022594ad1f0ca21e95afd42402ebe SHA512 c2ecf53db18fc1db4f698284f1cefa037f41d5c0e48471377a2bbefd5f250221da813264c4754d2fb5b179ac1fe302250f2cc744cfb2d50bf51c2561d45a8dc0
 EBUILD buildah-1.8.4.ebuild 1446 BLAKE2B 12ce28dbbc9cdd9b3dcc9ffb32d31e343645db77c83349b02d114d1fe26d9f3a54208df5fde51760e913ffaaa2ea3b1f8ba5ef7e2bc925767ca41899d38d5688 SHA512 7fe65e02c631a6688d402fd6922b8bfb8cb8ffe9f496ccba5ccf2356fbdc066cb827a759f57f59ad53ab85c6544244fc48f0d5e048010ce7ea23b54512fc16ec
 EBUILD buildah-1.9.2.ebuild 1446 BLAKE2B 5f89e5874d84b1813c39485970832ca13a7ba70add473867d14d36d1252139bc0059ee3a365b0a530297c58dffd046ba55cb88771bdc8faf8313c70ee3adcf40 SHA512 502b062366388451ea0c120b6d05a6d6cc2db7a8b1f986f3b6e72b104b0651dd313032f16f56c5bbb7c519102598d1c94c73ae9f25c2ce6080fbab6cf1948c42
 MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.11.1.ebuild b/app-emulation/buildah/buildah-1.11.1.ebuild
deleted file mode 100644
index 81faedfb0507..000000000000
--- a/app-emulation/buildah/buildah-1.11.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="413bd1f"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RDEPEND="app-crypt/gpgme:=
-	app-emulation/skopeo
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-fs/lvm2:=
-	sys-libs/libseccomp:=
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
-
-	[[ -f ostree_tag.sh ]] || die
-	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
-		ostree_tag.sh || die; }
-
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	GOPATH="${WORKDIR}/${P}" emake all
-}
-
-src_install() {
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
-	doman docs/*.1
-	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
-	dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" emake test-unit
-}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 6759b538f174..16859a65b6c4 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,6 @@
+DIST diskimage-builder-2.25.0.tar.gz 419297 BLAKE2B 78ac5b1119233080dddef917b05ca4f51f73382bb325cbf228f63837ab79be9ce524351404f2a26cf735440c66a3dc246a1642258b77f217406998650860eb39 SHA512 4afd257b01924a526ef335bf6699f5fbf49ca0c08bb3d288a6823783b842827e3afb51794771994f068332c6ee2ecf6f105fc03112d6a7807932fb5ab1fa4c24
 DIST diskimage-builder-2.26.1.tar.gz 421821 BLAKE2B 11c0ba668494285f33f3461e1a2c091ce6d622e4be164c4ab56a93cd000c82cec6702a6ed2ae37007120320f053760473f45f58ad8b45ee14b7b3eb47ac82d9a SHA512 e8bb68d15fc0bdd4881e76a7277f3e5e481b77decb4591546a576eda015bf624da3746326735add299551e168b82ab8bb165a18a64e96532c5b846e49815528f
-DIST diskimage-builder-2.27.0.tar.gz 421632 BLAKE2B 3899f65c3fe29a9a39410393585c12c977687c6cf2865fcb4a923780600f92f09211a65f7e69e9e0c00501bf6db21341c1a2f55fc066e53574f4ad1808464dba SHA512 90a84489e4a753d6aa2a445abf3eb1402c387036959055bcdb607b7daabaa43502bd0689d450a5e785271aa3a3f696cf20fced2dfda7b9c872d59a9e2f87cf30
-EBUILD diskimage-builder-2.26.1.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
-EBUILD diskimage-builder-2.27.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+EBUILD diskimage-builder-2.25.0.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
+EBUILD diskimage-builder-2.26.1.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.27.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.25.0.ebuild
index 86d3bb124b34..20cf3dfed3ae 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.27.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.25.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
index 20cf3dfed3ae..86d3bb124b34 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/ganeti-instance-image/Manifest b/app-emulation/ganeti-instance-image/Manifest
index b93d05873ff5..cc62dccdcd68 100644
--- a/app-emulation/ganeti-instance-image/Manifest
+++ b/app-emulation/ganeti-instance-image/Manifest
@@ -1,4 +1,6 @@
+AUX ganeti-2.15.2-os-image-common_sh.patch 1869 BLAKE2B 61c3ee20a7774874a85b773b221dfbfe6151d5849e677198a8657ef8a5244be5546caf8fdd1d1c771dfb195c7748c430689ab854a0d7998f7636d60456f81846 SHA512 5ed87c15884aae8ce23dae6e40ddf48e91c417bafd9e20b97acd5e20583bacfa9d37433466c2f91e27770f86f3b462c056e35f5ac4235e955348c52ba67b8e6b
 DIST ganeti-instance-image-0.6.tar.gz 82534 BLAKE2B 8a16f1ead6307400031425c60dae2585ea9ad53e55276a73177b46652c9054c6c24ea7068347ecaeafa77cea27b1b97350420bd6cf0e69e5ac18692cede47bbc SHA512 92b5048fe8c40692e8e7c4cb73b21e764660d7cb5f585a8489fc4338eef7df8aae1147d38a849103585a884a0216a0bfb42473d5c1922130e5aada31f5d580c3
+EBUILD ganeti-instance-image-0.6-r1.ebuild 1057 BLAKE2B 232dcf827777247b952f2401d0adfac3c20df4b10ff521c29319167d08e13a6a899ae4d803512d2ec74118153ab51e7d83b75e1c655fe4323efa9f26bccd8ccb SHA512 1457c2beb8fd4eb5176285bb2ac67315675d810008842150fcef168b76a068d520067c376a0752fbbebf52dc1cd047532f112e7585ca8354d3cb46a86dbad946
 EBUILD ganeti-instance-image-0.6-r2.ebuild 987 BLAKE2B 2394defd8cf8b9b6ab8b06614ee0cbd7c0b582af81ad57859bd64ce5613d404feb8be33ce570aaae1108f6165960d25bd63fe29006c3041c282eaf029dfd50a7 SHA512 3cba2e12ae9f97b60e57ed44e829cd7b4eb9d3594c0779616b9b7d0e9a336e1b7e3d1d89d750ec161f7bf7e9dc2195d10369e13b90701c87cd2dc4868c05ebd5
 EBUILD ganeti-instance-image-0.6.ebuild 990 BLAKE2B 79251b99b7a51045025577f5481c08cecbff9b8bfc860c243e83c6ab08f4f0d9b3d31f08fc78899bef632aa6bd7b362b139d75d9e421f263ca76a3105dd8c870 SHA512 98764555f1dfd871a16cc8cc65ce5e6682b01575b6746a6560c65434f2e95a1ddcade4ada125c75aa79f3bcdcf65c51d6c3eca40c1acedf1c7e682c38418b340
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch b/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch
new file mode 100644
index 000000000000..73e7ab8a923d
--- /dev/null
+++ b/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch
@@ -0,0 +1,43 @@
+--- a/common.sh.in        2018-09-05 23:23:07.811528673 +0000
++++ b/common.sh.in        2018-09-06 00:10:36.993693654 +0000
+@@ -284,13 +284,13 @@
+     blockdev="$1"
+     filesystem_dev_base=`$KPARTX -l -p- $blockdev | \
+                             grep -m 1 -- "-1.*$blockdev" | \
+-                            $AWK '{print $1}'`
++                            $AWK '{print $1}' | sed -r -e 's/-([0-9]{1,2})$/p\1/g'`
+     if [ -z "$filesystem_dev_base" ]; then
+         log_error "Cannot interpret kpartx output and get partition mapping"
+         exit 1
+     fi
+     $KPARTX -a -p- $blockdev > /dev/null
+-    filesystem_dev="/dev/mapper/${filesystem_dev_base/%-1/}"
++    filesystem_dev="/dev/mapper/${filesystem_dev_base/%p1/}"
+     if [ ! -b "/dev/mapper/$filesystem_dev_base" ]; then
+         log_error "Can't find kpartx mapped partition: /dev/mapper/$filesystem_dev_base"
+         exit 1
+@@ -302,17 +302,17 @@
+     filesystem_dev="$1"
+     partition="$2"
+     if [ "${SWAP}" = "yes" -a -z "${KERNEL_PATH}" ] ; then
+-        boot_dev="${filesystem_dev}-1"
+-        swap_dev="${filesystem_dev}-2"
+-        root_dev="${filesystem_dev}-3"
++        boot_dev="${filesystem_dev}p1"
++        swap_dev="${filesystem_dev}p2"
++        root_dev="${filesystem_dev}p3"
+     elif [ "${SWAP}" = "no" -a -z "${KERNEL_PATH}" ] ; then
+-        boot_dev="${filesystem_dev}-1"
+-        root_dev="${filesystem_dev}-2"
++        boot_dev="${filesystem_dev}p1"
++        root_dev="${filesystem_dev}p2"
+     elif [ "${SWAP}" = "yes" -a -n "${KERNEL_PATH}" ] ; then
+-        swap_dev="${filesystem_dev}-1"
++        swap_dev="${filesystem_dev}p1"
+         root_dev="${filesystem_dev}-2"
+     elif [ "${SWAP}" = "no" -a -n "${KERNEL_PATH}" ] ; then
+-        root_dev="${filesystem_dev}-1"
++        root_dev="${filesystem_dev}p1"
+     fi
+     echo "$(eval "echo \${$(echo ${partition}_dev)"})"
+ }
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild
new file mode 100644
index 000000000000..6d10cc0ad0dd
--- /dev/null
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://git.osuosl.org/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3 autotools
+else
+	SRC_URI="http://ftp.osuosl.org/pub/osl/ganeti-instance-image/${P}.tar.gz"
+fi
+
+DESCRIPTION="Scripts to build out CD or image based VMs using Ganeti"
+HOMEPAGE="http://code.osuosl.org/projects/ganeti-image"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-arch/dump
+	>=app-emulation/ganeti-2.15.2-r7
+	app-emulation/qemu
+	sys-apps/util-linux
+	sys-fs/multipath-tools
+	sys-fs/e2fsprogs"
+
+PATCHES=(
+	"${FILESDIR}/ganeti-2.15.2-os-image-common_sh.patch"
+)
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf --with-default-dir=/etc/ganeti
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	rm -rf "${D}"/usr/share/doc/${PN}
+	dodoc README.markdown NEWS ChangeLog
+	insinto /etc/ganeti
+	newins defaults ${PN}
+}
diff --git a/app-emulation/grub-xen-host/Manifest b/app-emulation/grub-xen-host/Manifest
index b299862a0fe5..58d32507e5a5 100644
--- a/app-emulation/grub-xen-host/Manifest
+++ b/app-emulation/grub-xen-host/Manifest
@@ -1,2 +1,2 @@
 EBUILD grub-xen-host-1.0.ebuild 1682 BLAKE2B 3d718f06ccef3a0fc4d3d39d64e8fb39af24f558793e4f7c96ec616585cf95371091737287bbc282476c1a649bd390e0a4eda0da168c8c40b5c9294e24eded8f SHA512 08e24d2b9b0c45af8cc757fe8c7dd29d5e69803b953897c2e552053f09358a8ae1a328402f148337ba738476c14e1c6db4fa4f37d68d04a4c65b7cdc208bb83c
-MISC metadata.xml 436 BLAKE2B 03924f7f085a065b132b43ed495da190beeba74930b19492331cdab438aecf1af8d1677682500db01868bc01615114a48824832f1c032dcc2abd9f5d6c2ee4f6 SHA512 0abf2f429df9f3bf35b4314842b9cd8b3469655b061d1daf988f432f657575196c9762ec4b2c5003b7b6cf22534292a711738ecb26491a42b32245bd9d2a557a
+MISC metadata.xml 514 BLAKE2B 851dced55bcc8b7188be4b3b0758af207a0cbac7c5bd59138592fcd0ea185e701abbf08e36faae46dc41cce794c8fe95143c7393f0ce428f9aca9c7b27fee380 SHA512 356a5343e7133e6778d3b1e3715c76c2c873bd74049c13b4b9689ea0a69bedae6ef5fd9529b944540f6c22d4f66d02aa098f0c15dfada9cbe16ea74337b6f3aa
diff --git a/app-emulation/grub-xen-host/metadata.xml b/app-emulation/grub-xen-host/metadata.xml
index 84e79366a42d..bddad784d7fd 100644
--- a/app-emulation/grub-xen-host/metadata.xml
+++ b/app-emulation/grub-xen-host/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
+	<maintainer type='project'>
 		<email>xen@gentoo.org</email>
 	</maintainer>
+	<maintainer type='person'>
+		<email>cardoe@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 		A grub 2 built to run in dom0 which is a PV grub that can chain load
 		a guest installed PV grub (grub legacy or grub 2) or handle a guest
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 2867f64c9358..87a52c545c65 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,3 +1,5 @@
+DIST img-0.5.6.tar.gz 3429213 BLAKE2B a1525d4aa09e11d122b41b54da8b90557dac3d0bfed5ea93dd6dad31269b7095d58d6d44dcd92dad9d56436132493d7ec8f1517b32eaa2bfb608bfb1fef639ec SHA512 e1a4469717df66f167f859cbf82ce54dd877e3e9c2f2d723f4424480c0429ac6ad99a13718c103bed3a823a91bef2f3ee3ac6c17e6f951f74f2f1b3ed0021785
 DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
+EBUILD img-0.5.6.ebuild 918 BLAKE2B 4585d6c42446ba7c649791d5d4fdfd3c916457b26e40827d785900384f74ec5d888422e752538a195070858692405173f5f7cbe932cacd30087c8c7939fabf70 SHA512 fbd4cfd7778ea358f7ce43305bb52a9213269b7307e005cc0cbd053ce081087e1924069f001b105c163f87ed3caa1ecfe442980c965f4fd0a4895a51687796d4
 EBUILD img-0.5.7.ebuild 889 BLAKE2B 50e79b991e0398aa79085dee21ab1d37e7c4e46d7a77794d88080de7d67e1101e1e8f0a1a5f0ea88492afc4f91416077e382345bbbabde8f16bfc00480f08d29 SHA512 d1ca0e8d9a670a16389d3e06683a6ca3873a8761ef29b317496e45d1461ec6bf624a79561caca39e79b4d9c325f2ef5164f7b9cc576a6bfe89bd6613bc2bf96b
 MISC metadata.xml 248 BLAKE2B 65f712fa82650530a08edb7671e6c6104649422106cd65d55253bdf920e84cc64ed47038feca9da18e770997c52cc6fdec416a6d82eb4146677b78d8509048ca SHA512 0de2cc5b3231aa87bc19df0801003e020b1599bf4a006a991a2d46d84495569245bb04756c1537376293765593167f2c083c46470389a5438ca7b44abafb0a2c
diff --git a/app-emulation/img/img-0.5.6.ebuild b/app-emulation/img/img-0.5.6.ebuild
new file mode 100644
index 000000000000..acb7de2fa244
--- /dev/null
+++ b/app-emulation/img/img-0.5.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/genuinetools/img"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="d08b52517b4f2ec47e621541b8799de82c1a31f6"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
+HOMEPAGE="https://github.com/genuinetools/img"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE="seccomp"
+
+RESTRICT="test"
+
+src_compile() {
+	local TAGS=$(usex seccomp 'seccomp' '')
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/README.md
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 4fd252de5b35..22dfd3172d8a 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -2,8 +2,9 @@ AUX de-translation-newline-1.patch 432 BLAKE2B 2b546cd7200f0d736bffd255bbb79d4e9
 AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8
 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.12.tar.gz 27365315 BLAKE2B 2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0 SHA512 fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
-DIST lxd-3.16.tar.gz 24863601 BLAKE2B 0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9 SHA512 11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
-EBUILD lxd-3.14.ebuild 6838 BLAKE2B 19767cc66314b0faa5270a51fb0f5db7264c6f55bec02ddbed3673b3c051d16f9556d59da592b55b638b0e93d76fe549ac1ab24a5fe997d0af19c71f0ae4cb47 SHA512 8f7309e0eb05b64e6dbaf2c048511737d7df96d35bb1d0a340c9e80b2a025b3d49a37795303b02b4c0429fdfb43e881be22d1f4b555949a25c4e51b9607f3dbd
-EBUILD lxd-3.16.ebuild 8078 BLAKE2B 48585fc59909c1d404fbc1cb44e4c7ed4c49b78e2685dac1a542c9be44efffdd679c6bea7997cc0e52f0e434a4d96d1cedaf3ff53fc9e2bf96018da770484780 SHA512 03cd8e9a1e2da16f6f1b6720556fe781c96bd9376135cfdfca17bbd4028d31a71ff490bae8a6317e8bfea89394a87fd5b9505a8803fd80cdecd60f03764f96a4
+EBUILD lxd-3.12.ebuild 6891 BLAKE2B 91296155f7a1d53ae46e594a9171945fc371c5d03276b28734d180d3eeb4a6b1ef973cdf47abadfdc2d580b5879c1aab77d517c1a9034070b64f6c43aec1c55c SHA512 a3f8525e2da1cba2c1ce2ed4f05ec13f78faa7c76a90e08d11eea5d7d3840b34c2bd0f6e3edff6759cb037974ea7c9f9b9f527fef8bafad314995c42d64fbcd1
+EBUILD lxd-3.14.ebuild 6839 BLAKE2B 939781e111424f59cee080925c822bd8574953c311a7a15906482eb69613e03ff161e85149890724191fe3b01eb4ef877ebb7440826155a9438bccbefd89cdf8 SHA512 13d4537a75ef22eb92a8da9053b46ec48ff033bec6a01bf7ee6b63b5c7dc611bd729b718b646b406c7c5de54dad06236ea9ae63afd304bb8baf6034627eebb03
 MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144
diff --git a/app-emulation/lxd/files/ptbr-translation-newline.patch b/app-emulation/lxd/files/ptbr-translation-newline.patch
new file mode 100644
index 000000000000..92d78ca14270
--- /dev/null
+++ b/app-emulation/lxd/files/ptbr-translation-newline.patch
@@ -0,0 +1,19 @@
+--- /po/pt_BR.po.orig	2018-10-13 23:27:01.523645894 -0500
++++ /po/pt_BR.po	2018-10-13 23:28:04.730644762 -0500
+@@ -95,7 +95,6 @@
+ "###\n"
+ "### Note that the name is shown but cannot be changed"
+ msgstr ""
+-"\n"
+ "### Esta é uma representação em yaml da configuração.\n"
+ "### Qualquer linha começando com '#' será ignorada.\n"
+ "###\n"
+@@ -112,7 +111,7 @@
+ "###     type: disk\n"
+ "### ephemeral: false\n"
+ "###\n"
+-"### Observe que o nome é exibido mas não pode ser modificado\n"
++"### Observe que o nome é exibido mas não pode ser modificado"
+ 
+ #: lxc/config_metadata.go:63
+ msgid ""
diff --git a/app-emulation/lxd/lxd-3.16.ebuild b/app-emulation/lxd/lxd-3.12.ebuild
index 8c7e5f94a4d8..a330cfbac4e1 100644
--- a/app-emulation/lxd/lxd-3.16.ebuild
+++ b/app-emulation/lxd/lxd-3.12.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 
@@ -91,47 +91,29 @@ 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/deps/raft" || die "Can't cd to raft dir"
-	# Workaround for " * ACCESS DENIED:  open_wr:      /dev/zfs"
-	sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' configure.ac || die "Can't sed configure.ac for raft"
+	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
 	eautoreconf
-
-	cd "${S}/_dist/deps/dqlite" || die "Can't cd to dqlite dir"
-	eautoreconf
-
 }
 
 src_configure() {
-	export GOPATH="${S}/_dist"
-	cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
+	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}/deps/raft" || die "Can't cd to raft dir"
-	PKG_CONFIG_PATH="${GOPATH}/raft/" econf --libdir=${EPREFIX}/usr/lib/lxd
-
-	cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
-	export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
-	export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
-	export CO_CFLAGS="-I${GOPATH}/deps/libco/"
-	export CO_LIBS="${GOPATH}/deps/libco/"
+	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"
+	export GOPATH="${S}/dist"
 
-	cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
+	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
 	emake
 
-	cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir"
-	emake
-
-	cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir"
-	emake
-
-	cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
-	emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
+	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.
@@ -143,9 +125,9 @@ src_compile() {
 
 		# LXD depends on a patched, bundled sqlite with replication
 		# capabilities.
-		export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
-		export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
-		export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
+		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
@@ -162,7 +144,7 @@ src_compile() {
 
 src_test() {
 	if use daemon; then
-		export GOPATH="${S}/_dist"
+		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.
@@ -178,21 +160,15 @@ src_test() {
 }
 
 src_install() {
-	local bindir="_dist/bin"
+	local bindir="dist/bin"
 	dobin ${bindir}/lxc
 	if use daemon; then
 
-		export GOPATH="${S}/_dist"
-		cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
+		export GOPATH="${S}/dist"
+		cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
 		emake DESTDIR="${D}" install
 
-		cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir"
-		emake DESTDIR="${D}" install
-
-		cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir"
-		dolib.so libco.so || die "Can't install libco.so"
-
-		cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
+		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
 		emake DESTDIR="${D}" install
 
 		# Must only install libs
diff --git a/app-emulation/lxd/lxd-3.14.ebuild b/app-emulation/lxd/lxd-3.14.ebuild
index 4d7ff49b9d13..80bccb3ac766 100644
--- a/app-emulation/lxd/lxd-3.14.ebuild
+++ b/app-emulation/lxd/lxd-3.14.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 
diff --git a/app-emulation/qemu-init-scripts/Manifest b/app-emulation/qemu-init-scripts/Manifest
index a2e09f36f0a4..e47d0a0a549c 100644
--- a/app-emulation/qemu-init-scripts/Manifest
+++ b/app-emulation/qemu-init-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST qemu-init-scripts-0.3.0.tar.xz 4584 BLAKE2B 836cdf49b5c85333a18fb9c18efb012598474617ffa35d2ff2eea717546da0f1f0374b98b315ad67a1fedc32bd65f3879f6553915aec2f3e230644a93862909b SHA512 49427572ce0636400ad3e389ed143fa9b1d637a7a89649cd5e265e409d3d745babe28f6af8cac3d9a249a8d5cc6554b321c0613f35824d604dcd814a44033c51
 EBUILD qemu-init-scripts-0.3.0.ebuild 899 BLAKE2B 87d9829842fd19720de1039a1bd02a6c0102197a16ed788f856c768e38ed50db6e72ebac194c36bdfec266dafecc79b3b4b9c98bca5eaff7e26aa2d3170300a4 SHA512 8b525350d3725cf6806c5ab45db1093a0a87c1e44cde78cb5177a9658ada754b2c13a020c84aa32342c4d0bbb00d1a6f1c9fac4270f0c6e07492b754a11b43ca
-MISC metadata.xml 254 BLAKE2B 05e90c5eb1f2a48da63b95e38ffa2e2fffd9fc2d51ce6b4abfdc3538b1efa1955b9c1fe72e0be076a4ee74d18408dae7a23f143ac252bce6b123da7fa0ecf37c SHA512 3ffe6103a749aa1ae8495f7f837181c59440b62e2d8df3248939d68be029a513be65ffd60b23d7b9680d162765f26054f60ee0f9136332ddddb05ba8276b8016
+MISC metadata.xml 360 BLAKE2B 847b11592ee02f8894809907bf04f974798e2d280a73fe578eeed7427e7af3d9386c3d7633f337c74a89e0a35da00b12c54ae2be17b1c1c72775fd74b1e93d95 SHA512 54b1475832c925059926edac8b587049c2e940969623a5626e080cf2d3cbea749ca7b33c2907f6624c036a157fca3f626ff3749eb0c32f4d10f510ebb50d0b55
diff --git a/app-emulation/qemu-init-scripts/metadata.xml b/app-emulation/qemu-init-scripts/metadata.xml
index 00bc0c58b6a6..e5001f234976 100644
--- a/app-emulation/qemu-init-scripts/metadata.xml
+++ b/app-emulation/qemu-init-scripts/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael Martins</name>
 	</maintainer>
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index 87272c778682..5eda57ec9ca8 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -2,4 +2,4 @@ DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef
 DIST virt-what-1.19.tar.gz 183594 BLAKE2B 36b58cbe41f195cf81e0b0cf35ab881c3746ac352c57f470e1fe0005d65534f38886d7688ee9393837e667fd1c8bf41af013f3a12748db5f8615b9b5c944f7a9 SHA512 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820
 EBUILD virt-what-1.18.ebuild 609 BLAKE2B c2e183482354a5623ee7ac84a0f50d36d80065f1f803a9086e687f16416be6f1b62482d67d99890f2f1f61c371f6053b03eb2eb71c099c309a049474494aa57b SHA512 56ee0708fa083bee61d82106227238cbce18027557b75ffed68fdaecf47f6cafe84766a03f0c55d0ed7060af90b929cd6fa80453ff355adb2f5f00e70dffa7ed
 EBUILD virt-what-1.19.ebuild 613 BLAKE2B 7ca204c642e7d587100829db36311d0c1711dcfcca0304c889eb21c2b6ff5049e6865cea646903659240c8689a23ae734d1e0021f817db4505502aa867b05905 SHA512 81f456788def5e4b3b5792b22f2e217aeb2c1cdf43bb3613d38e7df7a96e53e90fa3005e948a8023d90bf8a7a036cdfb1f00afb34d5c06e8e4b16b2a709ad3a9
-MISC metadata.xml 348 BLAKE2B 6f0d91006e793eb3ed8da45a845d5fb6ae09874c5a0c3fb1731b0b6c002c3188b4496a201af07b6c68004f33327b65374e23446c6ca28d93d7736f3388c0a773 SHA512 49f92316c1ac28eebeb160fa9cfc6c1956c25ffcb69b202eb3e9492ab023be6debd780f6aa6a7e6e6dd5f116308f34e2c1c16f131438c48d2634d13702ade0f6
+MISC metadata.xml 456 BLAKE2B 7f4f5daff8e3d30e59981cb50fcc8da98ee032dc33c16cb441f9aec580c101eab57fb25257a7298e32d6093a7ddb25c292f35858b0392bde2a2ec5e528b49079 SHA512 9b3ce56970ef01166980d6e5275bf4d740c47c044ab531cedeaac4e606d369f2c65b22fd8d8387332f0428ed7d9970d8b7e6363b48cb73c5b3326c7b463906bd
diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml
index be34d3dcfa08..7e3c0f29d1a5 100644
--- a/app-emulation/virt-what/metadata.xml
+++ b/app-emulation/virt-what/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>eva@gentoo.org</email>
 		<name>Gilles Dartiguelongue</name>
 	</maintainer>
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index bf1532465e8a..be3c83e1bbfb 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,3 +1,13 @@
+DIST virtio-win-0.1.117.iso 56999936 BLAKE2B 7880ab46d194ed265a2e0b88ea98752be9297af13f8b74b6c5b4f5249505ec3d84ffc70cc927816f0d45b7560df82c6ed1a27632db8bf4d78372af3ea96373fe SHA512 695d4bf0bbe469269ef46735997c33d3bec83bec30b86ffefe6ee3a7142e4c70a5cdb6aeca1bef6b538792faee752296452535c0276a3f7686d8a96bdf9eb6d4
+DIST virtio-win-0.1.118.iso 56967168 BLAKE2B 6bcabe5384ae297838d289ad6e2a18c08089463f6c5d58de8ace4d0d47396dcab60e0f021ca009d7faa7a81ef3fc855ac1aabefda4a540f9f07b25e12fa46048 SHA512 1a1da7bfbecb1cd02eca780583c486caadd5b76b225a469af0e693f08506bf9b582f57df52b670409a1cf0d887c0ab715ecca0f08802c242a93535d2d58134d9
+DIST virtio-win-0.1.126.iso 155856896 BLAKE2B 88ccc79e43f2c9cf8d985b0d0677c76ec7eebc960eb8c6c2906cacb05e05f945a90d549bcab50754930bf43a84cd722034c3a06828622b47dc99d87fc5634528 SHA512 b57810f33746ed90420f12f6267903f595ddd02aecb8d3de58cd2d5c0b39ec2f31e0352c2548344e629827616bf2d3c284e1ff60d2132fdde39f2086b36af2e6
+DIST virtio-win-0.1.141.iso 316628992 BLAKE2B 41663ebfd084e9e386eddc3db9ba2c9fe3313260fe3158bbb67c03270c0de37d4ce33e7b6f39ec1b8b5190a9fc8918364d0e9a4ac2a03cdc988e0f26d2062389 SHA512 909f4437b69cba1edfa857326986eb8c4b58835169d70117a5ff57bfa4ebc48f74d6ffa05de50732fb60551166544160fa3b4ec5c59cfb98daeb789902a9b119
 DIST virtio-win-0.1.160.iso 322842624 BLAKE2B baa1475055c2df609931e48cc4a18a2e24fcbf07ec9df80a94b1bdb77ca76c1278c5269a95422ea5c2363df424a30b8395b539689982d609096823ebc880afaf SHA512 71c9de9086fa5b5d764d210b5f7d0238c8b294aaf17704eabe16fe65c5649944126924870f0e2eb05d030c2f521770cb5760f4016d29319f5f1bd5deb7955e50
+DIST virtio-win-0.1.96.iso 160659456 BLAKE2B 7e7784c7585af899881d44a60167e2cc08d40d5a575fd5b0815e218ddbc5e8ea3b37deda7352688364bc1c6d72186c2e1eecb5a616102576c13d61b890a330bf SHA512 a00311f29937383d0dd538b5156a078fdb0c93d39a91d66376a9567f3d4841eeb0ec2a8bf8b018d089040895c9f720e1b253a5aed8bd337dd8713a47544b2a61
+EBUILD virtio-win-0.1.117.ebuild 517 BLAKE2B 5d24b3f790cab2ac291a69cca6c26f5fb4c830667b15beffb8c674263af772d30862b6e70781552ac0710f0ca7848a294b5eacad4818b4917509e2289515fbd2 SHA512 3135bd99dc84c56f716f4ee26769b2e03abfa91d6f0b69b3e81906ce65b7df4149101651796b9d4d7fdf8927ccd45709f76fcea9d4c1d73faca1a9560e4fe25e
+EBUILD virtio-win-0.1.118.ebuild 517 BLAKE2B 8c84fc7d82eb375e68f398b2024d0232b6c9837be3ca0fb29c7f7f2d8745fd0c9aa9ce2dcc369b18b76ac7db1ded95b0fa439328ad33098477e104ad06569a17 SHA512 ee718239916dbd79534d9381e1fe353521b4c721e0d2e0da3aa35e426ad7c910e55d7650f6c13a25184b486d13e64ef5d74b6f871dd4297211461df02c169947
+EBUILD virtio-win-0.1.126.ebuild 517 BLAKE2B 8c84fc7d82eb375e68f398b2024d0232b6c9837be3ca0fb29c7f7f2d8745fd0c9aa9ce2dcc369b18b76ac7db1ded95b0fa439328ad33098477e104ad06569a17 SHA512 ee718239916dbd79534d9381e1fe353521b4c721e0d2e0da3aa35e426ad7c910e55d7650f6c13a25184b486d13e64ef5d74b6f871dd4297211461df02c169947
+EBUILD virtio-win-0.1.141.ebuild 517 BLAKE2B f07c46f623d9172ab25eb0168348459927b889bd5a1ee246eee6967675eb9fec5db83919d053aa540d865793562e90a2d5c30e00a64b1f64b111f239a9f685da SHA512 56f5ec94803b325aa499404b8300b8b5b266cdd2ae73a8ab21181c76830536e593ce0cdf422468ff1f761f17d9b86fc52661cbd2b2654a8154a9ceba7ef810e2
 EBUILD virtio-win-0.1.160.ebuild 514 BLAKE2B 92be643978614da46a322ec5a9c4e772160bb1fded2996ad8ca17ccf1478ee6c18c657c02d5126963ec4afb3a9a2391ca7d4f7f3dc82869550e92b5a92173e57 SHA512 45926753c1b078acb955c2713b6b835310ee01a041d5338357bc696198ee975fc8dd64235a0e7a92fdfcda974e1f9e54db29f6ebdb4244fb757277f3723d369c
+EBUILD virtio-win-0.1.96.ebuild 515 BLAKE2B cc2ddba339b8a881b7e6881cb538f7e5dcd6cb09c6c9ac9dba351917754f4ac1789cfa7118f94c3dc930670675e4d2ab60bee9cfbe3a31af5c0c2759d9b61e09 SHA512 f231a9cf9873fb38bfb7762f87b9d4e114a9aa58401bc078511a2a8f55867ddbf545ba0d68ba80817e57e397a9f7d23e7ccded9a2bfaa30ec2767ecf88e77641
 MISC metadata.xml 268 BLAKE2B fc720112c357f73a31bc48f4c85526021faa1023465e8ab5c2c990fb66aabe737fa03ac9413ee5dacb2a2e169865280149c58d4b96c68ba82520b658e43131de SHA512 5ec3669490d9310461ab6cfaa58eed747c762753578026827818ded5bd9a5221f0860fa2c9308adee2b11ee7d328a8c3b4908fd2ba76c5c4949524c8fd48ca64
diff --git a/app-emulation/virtio-win/virtio-win-0.1.117.ebuild b/app-emulation/virtio-win/virtio-win-0.1.117.ebuild
new file mode 100644
index 000000000000..240e35c8dfda
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.117.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
+SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-1/${PN}-${PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${PV}.iso"
+}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.118.ebuild b/app-emulation/virtio-win/virtio-win-0.1.118.ebuild
new file mode 100644
index 000000000000..a2efd51ccb8a
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.118.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
+SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-2/${PN}-${PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${PV}.iso"
+}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.126.ebuild b/app-emulation/virtio-win/virtio-win-0.1.126.ebuild
new file mode 100644
index 000000000000..a2efd51ccb8a
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.126.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
+SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-2/${PN}-${PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${PV}.iso"
+}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.141.ebuild b/app-emulation/virtio-win/virtio-win-0.1.141.ebuild
new file mode 100644
index 000000000000..7a1b03cb92e8
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.141.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
+SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-1/${PN}-${PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${PV}.iso"
+}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.96.ebuild b/app-emulation/virtio-win/virtio-win-0.1.96.ebuild
new file mode 100644
index 000000000000..5744f3efd289
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.96.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
+SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}/${PN}-${PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${PV}.iso"
+}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index f5ab56d6ae9e..722279b33ae1 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -6,16 +6,20 @@ AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a2
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.10-132072.tar.gz 23160596 BLAKE2B 5cd7d1490305236f99b759520b4c63afd207cab53e861aaca0b0c318fe96f991756db60652bf65b26b5b9690366b6a5df13c225b44df75a30c1cc04badc7dbb2 SHA512 2c99b9917c65b4287bd1b78e9b9312630850307becea526188f97de569f541fab6bfbc4d5cff2ea9aab784dc4bbb23ada3679f76116ba94169f9c73566cc6c09
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
 DIST VirtualBox-5.2.26-128414-Linux_amd64.run 89220562 BLAKE2B d937e3a8f622ed1afc8ab7d2479401c6b41f6b1404197b2d86933d741a209071b1bc98de14ea4f25b2b0f2a22a328393908f85955f8879dbf8b28e2b981e4d04 SHA512 c8d7741408d234e7c05709dd0ed66d30b427b0f39976f232b1fe8a17160d36c4dda7d3adda46a38cbdd6626d34570805f582ac0aae2a975385a1f1d06e97f354
 DIST VirtualBox-5.2.26-128414-Linux_x86.run 88339918 BLAKE2B 0fe177a8d9ab4c4cb894151a00f9554713dee27af1fe3036591a0e7865c8869eef17368ab42270d5a9081c849e6550ebef809c3f8f09a9238e2f5a5f0c9e76e5 SHA512 6a809cf29a2cd70bddeca0443955ea10044553ef85744949b604f92a8bca96b9deb1c37f723388d1f27f903c9469e7cb853a0bf7d6928bb18ba61cb19b216fba
 DIST VirtualBox-5.2.32-132073-Linux_amd64.run 83854803 BLAKE2B 3522df31f4f98efcd40adcaaf8ac458078adf0bbfed96c7d309d4726ddb8b8dd78eef830b3cfcb2f1fa6329bcc30ea2449f5c88cab66fa0c7d20818d7b5aa07a SHA512 aea9b27793f3363eba2ed627cc3b35ca51445946e6e9f20382fb3034afbb7470d27fdc476066c04acc595690a9e34109e8b8ce6dcab10fdc990b241b24ec47fb
 DIST VirtualBox-5.2.32-132073-Linux_x86.run 82943439 BLAKE2B 31a22e8b52a53d6948a5af533b5c8f374d703c44736678c0bbe6fd9b5298bed4817996c32902a69c2c59dbf751cea04f22beb7203deaeadf79d2424e123e9d37 SHA512 05f99b673224c2b3d94b0d568067ae5ee74200c88a3b7f6665988a9d0c35f69f81c07292b838d07c07fd6d5484979615fd255650b138387501a593f3833b9071
+DIST VirtualBox-6.0.10-132072-Linux_amd64.run 127108569 BLAKE2B f2313b8e797f1292975d6d0f214985b16541b4b05cd0efa3f9b417a02b85ad7affa8c1d4929f161f90548242541628000c3ef39acece29a376f11aaf4d3536e9 SHA512 026c9b5d5f24714293cafb522840c2c84b86ebaa903f7e402472a916bd549cf3b279ef6de02ff0c9c7cb6df74ea402568df64ed224c0173d445d80f04a2d93d1
 DIST VirtualBox-6.0.12-133076-Linux_amd64.run 127118808 BLAKE2B b654fce2e9134390c7cf27e30e2c2e15e5d3bfd40df85627b266f250c112b0f4f60062d3f50dbb0e5bc0ac7f4b819694cdb65d2148b4b015b8e0c5c71c13e4ec SHA512 cce0e95de6e7ecb879807ec47cff0f4423c471132fc157e4c1656824ab5c914684db53bf73c77f9a98e72f654a7af13b21ad2954ef8f5a961b39ab9bb7c04990
 DIST VirtualBoxSDK-5.2.26-128414.zip 10159276 BLAKE2B 32a9e0a70cc63c8e0daa7080f8e10ac8a514837be98a66b00161cd0c9bf2cc42ef0a11f3a69a742a2f6745b4c8b8fe9e946e18f81cd5ef3ab2f68d5e3c95c568 SHA512 f3d1cc622734ecb0f56fcdf5728fcc747e3b084cb2358d420c55c1acd98d2f24870f0fd18cea430f118f34bca10199526ba195a314d6ce7fb6c4bc8281d89f09
 DIST VirtualBoxSDK-5.2.32-132073.zip 10200195 BLAKE2B 0de34e166b94889c605014233142887e7a8857d1915866156a0cc63850937730ec063e63b550f0d39ad241259158f033b028dbab7eec3f6f38c3715139413b3a SHA512 ccbe2af819bff46055bd6f079a03d69e721a09286e83d4f650583bc7692f5d19ae1a725cf3a6eb1b75167a2c73ff2e020d1f932bf9cfeee9ee709d1174c4cabf
+DIST VirtualBoxSDK-6.0.10-132072.zip 10801181 BLAKE2B 9ad30a0db9e0e87594277c10d869f915a1981c8a7fef294c34bbc904714141bc69e9ad80b79fa61b418ab537f65ccb574f72b6a2985110b51c54d8bfeac9f42a SHA512 b1cf9d3d289a3ba765e3ef9af2491b9f785e241c2c1ff9606009d3983c8fa8660a80dbd37404c773aa57b76a06fd2d1136644565643a58d1d4e1700a7cc329fd
 DIST VirtualBoxSDK-6.0.12-133076.zip 10799655 BLAKE2B 93fc5093454a21bf5da26d00f35ab107410cddfed63c9af8494cd194cdc080a70ec8cc8af57233be0472b84a25709a3719f51d399585c1b474ddb4d40e6488ab SHA512 f270a6c404f1bf49ca6bbbc8c4fdba70e6c65001e9731a689f391e6d4c18866ceb14c94a241c15a4e5dd01e08f2c5c61f0fe7feb43ffe36acc9868a72a75603c
 EBUILD virtualbox-bin-5.2.26.128414.ebuild 8327 BLAKE2B dbc945c46ee55ef5c11ea3a7c169632ecae5d039fd7e5961255c2006c6f827860e59bf877fd4845e0543006e57c7fee12c28848dbeddc98741d0ce6fa57a5974 SHA512 248b591075c526b2c246dfb32cb9a00166a9243391cd6caf9d9b776835e1d201e1227c2d435f403ec2f357c54fe1246b68282ec1abe7796e428c1e505e75d5d6
 EBUILD virtualbox-bin-5.2.32.132073.ebuild 8328 BLAKE2B afb27eef7f7daa384d5acce90205fb8577c65c56ea276201372784a0a03c98182857f7e5c3183eab2620fe88062f3238008b07b46f8831e3227c4a2f381f3449 SHA512 bd59bd894f84357702e9d5ba4373e68b11ee0c8befed8188db3d38deaa75b560f94e8d5a4a8285b408c1d5022638775722b463950421fe7d9ed3538f40cdcd1e
+EBUILD virtualbox-bin-6.0.10.132072.ebuild 8490 BLAKE2B 0acedaa47d39ac39c6739053a20343d18f6d53294177039cb54de95f0eb5d2d58a8557b852713a3e3e9c6e3b8549cd70f6c307684e569716c8e3a68b7f5f021b SHA512 a8cd2174ae64b1dc0977dbcd388c26989779546fde33d1c5e89e4d22d026154a4f5cdeeb134c67c81c161b0114a9f4648d78be1862ff5dd44d6fda205db3f822
 EBUILD virtualbox-bin-6.0.12.133076.ebuild 8490 BLAKE2B 0acedaa47d39ac39c6739053a20343d18f6d53294177039cb54de95f0eb5d2d58a8557b852713a3e3e9c6e3b8549cd70f6c307684e569716c8e3a68b7f5f021b SHA512 a8cd2174ae64b1dc0977dbcd388c26989779546fde33d1c5e89e4d22d026154a4f5cdeeb134c67c81c161b0114a9f4648d78be1862ff5dd44d6fda205db3f822
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.10.132072.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.10.132072.ebuild
new file mode 100644
index 000000000000..0d68ba80c9dc
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.10.132072.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	KEYWORDS="~amd64" #~x86
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+	#x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} $(usex headless '' VirtualBox) ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} $(usex headless '' VirtualBoxVM) ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 4750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} ; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+		done
+
+		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}