gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /app-emulation
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
60 files changed, 986 insertions, 291 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 14cd93edc606..bfc827afabc7 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 99e79795bfdf..e363e2a80df9 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,6 +1,8 @@
 AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
+DIST containerd-1.4.3.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
 EBUILD containerd-1.3.7.ebuild 1974 BLAKE2B 40e9d21e8bfc04de4931748ce962897a62353faaaf400b1f66ac625b24cd1f0aa8ed74ed808b3c5e97ebc0f4649126f9b9d806974a1103772f91537e89ec03f5 SHA512 6fe127a926c668b3c47ab90b82f56335125084dacfc75bc75a7af3d63adb8b7ade4fa5baaf437a80ef55f3383834e25d320106ca02ca3af106fbfdf92c54e8fe
 EBUILD containerd-1.3.9.ebuild 1941 BLAKE2B 4902047b9a87daf7aa960d4472fb7c0483515a8aea5cdba86970a408dd43b805cc0ca7cf69d45fea51fa47dfe5a4157016145293a083750d35af411db10e7fea SHA512 8bcecd9396a51ba28eb4a1008362e05f6bce203edeb97ab4b52f89f22bc5be67e8bbe05c8a27a330048feaab616c9660cdc91982d5de5bf90c2c56d27fdc976d
-MISC metadata.xml 1175 BLAKE2B ee2c3165391688c6e20b0ecb35ccb59a5b621624b0dbfe72d8311ea3d0c1fc17894870f4be00282c9e50c7f931889b8d5f9667fd925eba98756f7b4fbf98cd20 SHA512 68dcef07630bd32f06360c0afd5742a7e3ad75645cfa77ef56a6d0236634ed0c8e69b517c53114d95fab5dbc6cae37f306d3328289b1e562a0a335a36596d19e
+EBUILD containerd-1.4.3-r1.ebuild 1944 BLAKE2B 6c9f2b9ed1dc0078dd1fc12663e49978c2b6e1bc2f4ba7c15e4683b76ccdda35fe872074ffe511b23a32d88c86bb7b6e1f77565f0ef35fb953e3723daf4d9e43 SHA512 9906b9736c8a6c545c8d23187939a849a6f94492e4b1e7b6350c6176c50bacb2d37265cbe586a92333a3dd3b7812a1629f7c955432173568713da44cd4f61dee
+MISC metadata.xml 1073 BLAKE2B 5f1a667e9b8812a71e24318d51353b010f9a3662c608627c68cdd13431a6d8380b51b8b8619b2a98fd9dece381a391f18a35458156ef7743b10825aee4c58e8f SHA512 46e110750ad8da48d741b612c8c1f030d493636c0255f1944134660eddb5693488c1093df47252d09589bf90565d525819a82a0594ce8f727165f1a822acb537
diff --git a/app-emulation/containerd/containerd-1.4.3-r1.ebuild b/app-emulation/containerd/containerd-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..d8b675092ae4
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.4.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer
+CONTAINERD_COMMIT="ea765ab"
+EGO_PN="github.com/containerd/${PN}"
+
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+	${DEPEND}
+	~app-emulation/runc-1.0.0_rc92
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+	test? ( "${RDEPEND}" )
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+		-e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
+		-e "s/-s -w//" \
+		Makefile || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		DESTDIR="${ED}"
+		LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+	)
+
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	export GOFLAGS="-v -x -mod=vendor"
+	emake "${myemakeargs[@]}" all man
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -rf docs/man || die
+	local DOCS=( README.md PLUGINS.md docs/. )
+	einstalldocs
+}
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml
index 46b01647099c..0795c4ce61ef 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -9,10 +9,6 @@
 		and live migration of containers.
 	</longdescription>
 	<maintainer type="person">
-		<email>admwiggin@gmail.com</email>
-		<name>Tianon</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest
new file mode 100644
index 000000000000..a2aba483b2b2
--- /dev/null
+++ b/app-emulation/docker-cli/Manifest
@@ -0,0 +1,3 @@
+DIST docker-cli-20.10.1.tar.gz 7705467 BLAKE2B e1bbca2a0bf4e8a78600f8c4090d20f6ce173fe8efa9609048771312afb420b9176257d0540a8dc0700c02fb0c117cfdbb0c8ffc6f81049c62b78417b1b18d14 SHA512 47d15647db2a4ca6de29ba1d67aa198b9baa4af9ccf08e92e2a7222f28391567f8a2f6beeb4d8d80fa16a05ce8902de16b8951da2a34cbed9e27c72e0443c3e8
+EBUILD docker-cli-20.10.1.ebuild 1823 BLAKE2B f2cfec3be88532c82bd2b875978a2ce8ee90629747eebd471b3ad1f434c15b34d6fb6edea495863f1d091cab577a1f96355b6afbd7179baa161c01423555d2e9 SHA512 6c0050f769bf95fc9c02063f3597f6199a0f1f822a5b740fcc49872e1652a6fdcd535a926b5e3b512f61a49cfa3852a412c4bffb65ffbc3cdbc8658d44bb46da
+MISC metadata.xml 257 BLAKE2B 8a445824133c1734e7b46cdd3a60bb4ac98fb4159b48856d0e296c796c700a2d9ec9ae3c94072f07aaaed98ac22088892b03c358e577df9cfbafa40194e756ee SHA512 9d6339780243409ea9233a9f5faa5c1f5b13431d35792fc6986ed5c3e9ae2e21139f44c11140519ea6cf10ab6db1d06408c1305af9e99cbbd1f2d4b27361a13c
diff --git a/app-emulation/docker-cli/docker-cli-20.10.1.ebuild b/app-emulation/docker-cli/docker-cli-20.10.1.ebuild
new file mode 100644
index 000000000000..f1767197a60e
--- /dev/null
+++ b/app-emulation/docker-cli/docker-cli-20.10.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=831ebeae96
+EGO_PN="github.com/docker/cli"
+inherit bash-completion-r1  golang-vcs-snapshot
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="hardened"
+
+RDEPEND="!<app-emulation/docker-20.10.1"
+BDEPEND="dev-go/go-md2man"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+	sed -i 's@md2man@go-md2man@' man/md2man-all.sh || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	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)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat VERSION)" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+
+	# build man pages
+	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+	go build -o "${T}"/gen-manpages ./man ||
+		die 'build gen-manpages failed'
+	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
+		die 'gen-manpages failed'
+	./man/md2man-all.sh -q ||
+		die 'md2man-all.sh failed'
+}
+
+src_install() {
+	dobin build/docker
+	doman man/man*/*
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
diff --git a/app-emulation/docker-cli/metadata.xml b/app-emulation/docker-cli/metadata.xml
new file mode 100644
index 000000000000..3c49bd23955c
--- /dev/null
+++ b/app-emulation/docker-cli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+			<name>William Hubbs</name>
+				</maintainer>
+					</pkgmetadata>
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 3f6113b6fd50..625133b4ddc1 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,6 +1,9 @@
 AUX docker-compose-1.27.0_rc3-setup-py.patch 1840 BLAKE2B 15269cc09ad609008afbf2d61beabc5242d63f2e3c6cfb8c65c1768de3aea559dd99e6ab7ff6acd1b93420402d0a176fdb1390c5477c7820e3173b0ff2d39853 SHA512 12a1b996a8d37289991ea979ddf1a303241217f43b26df5b7d2a1241006c7de38234c11ed0b9e99ca92348159d0681c3316e3413a4d639c13fa29acb0ae8cf23
+AUX docker-compose-1.28.0_rc2-setup-py.patch 1844 BLAKE2B d33325e712bd3d3d5eb0dc1969d41e9b71876901414aa29da75f881007bcade7af8e66a2b24cd3e9ceb0be545050c93e8b21814d4d396024aa7ccd365e13b5e5 SHA512 9cf33c42ee436905aa58343c2acaa1147ff241d06f4002f86073a0ee3632a2fc67a70f87502ffc208b7f38294d11431d7fc0da23d064ebea1262117230ba167a
 DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
 DIST docker-compose-1.28.0_rc1.tar.gz 313984 BLAKE2B 3307aab3ec842d21de73ab282905016f6b0934a2ce9d1dde474ea1e7c5894cea028363c03ec9f597cb3e9b2910e9286b2ffb3070885b20787f28767fec909a73 SHA512 87704f16bd2d6551fed0b3d38264e10cf12604f40a68637ac9dacc3aebe618872f54a890aa6bb1412143055021751bcba1b542d51b252e78b0b8948e2b8cc8fd
+DIST docker-compose-1.28.0_rc2.tar.gz 314331 BLAKE2B c2e169152a6da067e47ca7654b3866fd2b46779bbf35f917008dc71a4c70ede1704bd3f6e5f2231b42d50d6d11ae9df402ed1b01832c26d5d14bdb4db33e7432 SHA512 0320f96b177034c5575797540d38981d591fe22d39ee2e1c338589189333c9eac5e595103bc7295b43b90f697b5a09daffa7f611b395e6bcf81fdce3a391eed6
 EBUILD docker-compose-1.27.4.ebuild 2110 BLAKE2B be9b90255ec650ca4abf0331e440e08bff51cfa73df3650db71ca8c0e39727072521678cfa0e5183e0301c26191da00fa627fafa3c70a0faf049acbfa3c701cd SHA512 6074b7b0ec6b634f265bfcb7d89f249396108e9f8aeee5d833913780513a2734931da3586e8e728b6512c1c549a3853bfa88b7a3ec0009877bfda2fa9e7182f5
 EBUILD docker-compose-1.28.0_rc1.ebuild 2112 BLAKE2B 3a483383fd0b410fc4f2675a8df27ca2e5f1e61363abffc5cb180e8744973c40265027776c02e76063e7422e8c92131f5817f6898aec0ef72bbd552668de06ce SHA512 2ecef6032c24a4c7dc226dee463a3d0d1651a8f3f6f261f4c8aef682a6e4c217608def560055bfb88287eb9ccec6784944e56e72c701f98cfaf999e3a7a74425
+EBUILD docker-compose-1.28.0_rc2.ebuild 2112 BLAKE2B 1632274da8e0e70186f519023cf00b6b776d58998c9fc3f4185d5a637d2ae2054237dbbcd9fcf9d2bdc1c4ce2a318f6c1a9cabf2a6bef2eaeba10ffae8008603 SHA512 1d927e646e8a38a1c436d64c071ea45e363915d209e1ea776fecb79cc384891bc1485cae25da3fd5ab902fc39ad527e3c8e584a61c0af6e0e7bcb7dbb95b359d
 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e
diff --git a/app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild b/app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild
new file mode 100644
index 000000000000..b76ffd2a6855
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/files/docker-compose-1.28.0_rc2-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.28.0_rc2-setup-py.patch
new file mode 100644
index 000000000000..0eaac41d742a
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.28.0_rc2-setup-py.patch
@@ -0,0 +1,67 @@
+From 7a5520d0b478e9bb20c9c3ff2614a8afd392b020 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 4 Jan 2021 17:36:44 +0100
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 57e1313..94a3337 100644
+--- a/setup.py
++++ b/setup.py
+@@ -25,33 +25,33 @@ def find_version(*file_paths):
+ 
+ 
+ install_requires = [
+-    'cached-property >= 1.2.0, < 2',
+-    'docopt >= 0.6.1, < 1',
+-    'PyYAML >= 3.10, < 6',
+-    'requests >= 2.20.0, < 3',
+-    'texttable >= 0.9.0, < 2',
+-    'websocket-client >= 0.32.0, < 1',
+-    'distro >= 1.5.0, < 2',
+-    'docker[ssh] >= 4.4.0, < 5',
+-    'dockerpty >= 0.4.1, < 1',
+-    'jsonschema >= 2.5.1, < 4',
+-    'python-dotenv >= 0.13.0, < 1',
++    'cached-property >= 1.2.0',
++    'docopt >= 0.6.1',
++    'PyYAML >= 3.10',
++    'requests >= 2.20.0',
++    'texttable >= 0.9.0',
++    'websocket-client >= 0.32.0',
++    'distro >= 1.5.0',
++    'docker[ssh] >= 4.4.0',
++    'dockerpty >= 0.4.1',
++    'jsonschema >= 2.5.1',
++    'python-dotenv >= 0.13.0',
+ ]
+ 
+ 
+ tests_require = [
+-    'ddt >= 1.2.2, < 2',
+-    'pytest < 6',
++    'ddt >= 1.2.2',
++    'pytest',
+ ]
+ 
+ 
+ if sys.version_info[:2] < (3, 4):
+-    tests_require.append('mock >= 1.0.1, < 4')
++    tests_require.append('mock >= 1.0.1')
+ 
+ extras_require = {
+-    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
+-    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
+-    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
++    ':sys_platform == "win32"': ['colorama >= 0.4'],
++    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+     'tests': tests_require,
+ }
+ 
+-- 
+2.30.0.rc2
+
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 27042f8a246d..03b85e3f7184 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,5 +1,7 @@
 DIST docker-proxy-0.8.0_p20200617.tar.gz 3386043 BLAKE2B b32c3b6ef97f656414fdf026307f4054d4dd11cc91dc44a235eb5e5dc9f5f3da0cc4b001eaa28387b79f8f79f0124e6c01b8aab56d5c9e37d777e21cc186cb9c SHA512 fe8644611e975c051ee6e7ad4871624fb45862d9b4a2fd62ea4283e76ad9804d91d585e2165915b09356f11f9dfb31c40dd9ce6a66d63c5032c8c62354960538
 DIST docker-proxy-0.8.0_p20201105.tar.gz 3386010 BLAKE2B 414c3d37cfe2f36dbb5cfafc6047ee0aa299ba2aeb9c5c51da308285b1e2cc0a32e83557628e0de4817651331fbcfd6b430a88fd5a0f97bb7483a8fb10ae0791 SHA512 3d81ba20a91517e14da7e75a24d4e2eeb04c1dcb9c1bfe1115247982dbdb55d2fd72d0130093e9597363b742a20f2647f229c870da9a1cbdefc69aef65f02250
+DIST docker-proxy-0.8.0_p20201211.tar.gz 3152873 BLAKE2B 01e33637a5e7619631b61a4063d85ab3c40818f090540f5737b5d50989b9dccaac91c522ccaaa6b0650427648ab8656946809740610e18de8a86108582518ede SHA512 f4f5b957fa23024b380444a0f77b5aefdd275503b89eb487785b34248d44a48e9de8dc53ba80c7f13b5666fa8c732a357ce7e4f0309aad7a35f94240381b24fb
 EBUILD docker-proxy-0.8.0_p20200617.ebuild 772 BLAKE2B df0bec6f5cb6556af0b2ce0b06b93d2fdd324d746175c897cd21aacd6b4700e9c77690230a107ed6d2b0ac5bad501206269c3ed4c98e75ec3e7945c964617729 SHA512 42a76db8d1205e28db64dd95eab6b6020131c35fe6216be247da9a70c8a3ee28350fda47e310927f85e02e6b9270c18bc79053ba695652c7f79e30d8d745e7d3
 EBUILD docker-proxy-0.8.0_p20201105.ebuild 772 BLAKE2B 66ee164b2e0bc59d9166a041a8a5cc447ed3d4d7dae1ae165c593dd5755dbd97e96c758f86f5a423e6483606c03dd6081b194398e3bb17653a6f437d93f91e27 SHA512 5dedd4dca31623dbd715975ede6a22f945bd07c04d3600e9bdf368c9d48d494162e43dc3cbab2dbba61545295dc61bed8aa299611e6732be056504da0e443a8c
-MISC metadata.xml 549 BLAKE2B 7e18ea0a99b0943c8d275ca674f97f82fae990dbe778a662c414dbae3eb84f29dce92b4ab7b1d7e623a79544c3c2ed0f6b1815a25be21cedce54a3e710e789f8 SHA512 3d0fbb5922dee2dc482f67b193c55a77e9eeba0380b1cc9d89a00c5a3b167d72ae37a35f13c87ddc9ea6abe12aed59f1ae755dd16ca146bcc9d7392374832a0d
+EBUILD docker-proxy-0.8.0_p20201211.ebuild 798 BLAKE2B 9119c9cc5e25631a4143aec38621b1120e9d2e3e81f3073842bd103ff935c85e03947b38cae5db5d529244991deabb1c15aa0c233c4b53267ce2fbe9632268b5 SHA512 0bf0cf91716ac7d343463b4bf7a8c2adaac824b8b530606eca5e95dd3054f1a61d4e4b6c2752ddb97e7ebdbf37f5273844fb3530d9e083af536206c0a9192823
+MISC metadata.xml 442 BLAKE2B eb43f7702d67bafa12d83006f4b6b72e5cf27e0493a22befa5e58b65e7e4b890034858052e9a7b54a36f60b28290f67e43bf2af236b56e781b51f4cad7a59a8e SHA512 8fbdf6808b9aee1a1443200d31567f818ca0a01e59c202358eaa4bde7382626ffc77da8c09038c74dc24a9c18916cacb217c1e56a9e5c06b468680cc9dcb0054
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201211.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201211.ebuild
new file mode 100644
index 000000000000..f38858c48aee
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201211.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT=5c6a95bfb20c61571a00f913c6b91959ede84e8d
+	SRC_URI="https://github.com/docker/libnetwork/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+# needs dockerd
+RESTRICT="strip test"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker-proxy/metadata.xml b/app-emulation/docker-proxy/metadata.xml
index ec233abe232c..46bc689bb8cd 100644
--- a/app-emulation/docker-proxy/metadata.xml
+++ b/app-emulation/docker-proxy/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>tianon@dockerproject.org</email>
-		<name>Tianon</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index c18be328c394..95b682695660 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,7 @@
 DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873
 DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28
+DIST docker-20.10.1.tar.gz 11042081 BLAKE2B 98fec753f0695983d197993291a4fd0f3c94e3e3bfe548977df6659c9458109fa35edc9cf2cdd94e2277250672b9a265b50b35bd52228665f7dddf6875a24604 SHA512 5e32a46dab5b527839594e48b715495a77aa9c9e0c7e427eb227409c20c3af0d95a731080048ee20b7c68288bd77e32458bf30c658406d8585ccf8d33e7b79e3
 EBUILD docker-19.03.13-r2.ebuild 9217 BLAKE2B c75a45738a89c1205a6515e3c9796cdffa63776cc54ba6f345579ecaae9642dbb8c8246af1b78b0cd14002a25a1bb8ff8238a4eca874bdfd30ea23bf1c5ff5c1 SHA512 65f016b40849652aea58353a6a3045c0aaac8793891db727ab597a97e885a27ba8380413b108ce090afa66474fa3502b74c8278722bcae454fc98b4a3c226bf4
 EBUILD docker-19.03.14.ebuild 9216 BLAKE2B 01bb9dde2f897bc65e4eabefc07be637118e19d512e4a0c46e8ba6d5aec6b5b2aba8f1e702eda11a4641f08acc3c91661348b89561b3d2f11e7e59bf6991ec3e SHA512 cf68f486054ed21d6a690f364e84db2e8b8efab22d8eb1a8de0e381d1011c221f0ab664be5e22973d82cc1a98fac29135cc3baa0171362b7152e80da1d5a186b
-MISC metadata.xml 1480 BLAKE2B d55259087f20646d81686efc1def000be31b841eb450b16b41de984955688282c541dbf127d3638cabc1219f22d2dad77c6c0431a374148329f73f0ab91f8ca7 SHA512 2ca140b93f15f63d3e07989f4ff1e702b61e4ef62d199564e1fd91f995750740c08f28aafe35f0a0945fa588bc6240e3f02aa84aa06c6be7944ad5f5d2764bfa
+EBUILD docker-20.10.1.ebuild 7808 BLAKE2B 64673a8dfedba6ff4fc00d55a72fa106a8a8b642b8670c4ccf06187604249d19cb664f0e5aa5d103225234c7bd630a434f537659111835d14f6fd4ddf018fa1f SHA512 acc221da87ea52a944478c2a38bc2288e3a5cab19ae42fb29cdd122767b412107fb572bf8d1992d345cef70d0e030e47e20dd4d9a710d4f8e9ca05b8c8e1281e
+MISC metadata.xml 1476 BLAKE2B 8bd9a290bc8b1bfda9044d4e013a78b2622ea43832788dcad1b8d58cdcbc6717c8758c9df92729c0b6346e5d17385ab74e4f7d5b38880640b76bc8c2a7ee1549 SHA512 e747b4c18573d720d74fa0c4c5e87260753f3dcca2b4564395b1b10f232a765b8e2deb95c266822d10b4000c89318f2694285e9e23edb95629a2dd4d89a77f90
diff --git a/app-emulation/docker/docker-20.10.1.ebuild b/app-emulation/docker/docker-20.10.1.ebuild
new file mode 100644
index 000000000000..f7fa1a56f93d
--- /dev/null
+++ b/app-emulation/docker/docker-20.10.1.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/docker/docker"
+GIT_COMMIT=f0014860c1
+inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/moby/moby/tree/master//hack/dockerfile/install
+# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
+# for appropriate branchch/version of course
+RDEPEND="
+	${DEPEND}
+	>=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.4.3[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
+	~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?,selinux(-)?]
+	~app-emulation/docker-proxy-0.8.0_p20201211
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.13.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+
+	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
+	~EXT4_FS_SECURITY
+	~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is lt 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	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 is patched to kernel instead of using standalone"
+	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
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	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)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp selinux; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	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
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+}
+
+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
+	newbin bundles/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/*
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+splitting_docker_cli() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -lt 20.10.1 && return 0
+	done
+	return 1
+}
+
+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:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+
+	if splitting_docker_cli; then
+		ewarn "Starting with docker 20.10.1, docker has been split into"
+		ewarn "two packages upstream, so Gentoo has followed suit."
+		ewarn "app-emulation/docker contains the daemon and"
+		ewarn "app-emulation/docker-cli contains the docker command."
+	fi
+}
diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml
index 6a9a6876f14f..fdd881c3fea6 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -42,6 +42,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">docker/docker</remote-id>
+		<remote-id type="github">moby/moby</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/hercules/Manifest b/app-emulation/hercules/Manifest
index 2ff2a50eb597..2d79ce2e0dc8 100644
--- a/app-emulation/hercules/Manifest
+++ b/app-emulation/hercules/Manifest
@@ -4,7 +4,7 @@ AUX hercules-3.13-unbundle-libltdl.patch 12565 BLAKE2B fe5e78dbd91b8bb4ca8d7f128
 DIST hercules-3.10.tar.gz 2608321 BLAKE2B df6dd9c93531ee3d68efbfad5b0152ef984e1804e211861e86ea5f7b271081abbd29664d4e97d0e887af10315549bdd7e890ec741baa7b69336f1f08be63c6cf SHA512 de8b3e2e90fdb745dea9c8ce4dbe506de2aba3bf08b3e937605798e6a8020576a949d6ea3496b7c42bd23d617fc96648d2d8ec05a66e8ed174ce46a3bc31c5d1
 DIST hercules-3.12.tar.gz 2569617 BLAKE2B e6b6dc2406bc198e25ddcbdc5dbf141e52cd15ddd690711fdd4ed69ca5baaddd582c437e28aa7793ac667c03f7617adb3bdf3a00cc7c3a28e3f28984f665eb9a SHA512 81d6e151c1c8534753f2db532a0a7bd36fb3806c1ffbab5d6e4a9af3eecea46b95105c37574910714dcfc0fe9b74a72140d573099c24fd44021159ce697414ef
 DIST hercules-3.13.tar.gz 2640742 BLAKE2B 1a84ceab346a591c494fb133d1654ffa73e44f73183564167a74f68eb3e5f3f187cc2f66cef444b951645fa85c111da261b9dd8907594ccb770f5b743f891649 SHA512 76f75ef3f1eb10c0fac0d6fa1ab9809b8d1dfe3deccbcd69366b05ee58f1ecb8ea0f387f7201ab4722b121478676f00e707ad27b6ecf1980fb09e900de63d718
-EBUILD hercules-3.10.ebuild 1329 BLAKE2B cc125e40bf7b9ef56607c8a57f9eae6a21bb4147df43b6f5e5d743a3a971fcaa0e1c425f93f8e3ae19e082be8b0a41c35fcf7eae86f8374a849d75af545ecb34 SHA512 1a8652538c4bba69f5e49730b8a1d85a2db40be86272a0fb9a907818a579145dca8edbc9512644447c88af03406168e45823960899a7b0d6449cddc4ec5944a6
-EBUILD hercules-3.12.ebuild 1333 BLAKE2B 03bb3e8021278258c7ecfdd452e6c3e2194fcb49e20bdcbaf939d195877b704e9e68d242b5e11348c8566170f316af12b5e2477b469b5041c050323da6b7a756 SHA512 54ec4d1b54ff19745716115df1b671c5870300c442cfbb5710bd96b97d31d8390bf7ca636e41e417d969ee027aeab6fc94d6360d7d89c8518a062d21feafb518
-EBUILD hercules-3.13.ebuild 1223 BLAKE2B c0f8377cf12d9c0bd6d15e50f2c1369ef1371e27e7b4536af85fe0169eacded2fb7aa200e71cc1a23fed8fae2ff85d9a07e6d368000b1e2aa099feae58593c83 SHA512 62ba727d1aaf6b22cbd6f53ef8799b6a0be28c40b01c534b18d732d41098be27db1cdf18526be4545cebaab46d3685d4623fd0a46d9d9a10cf701e1f01766ad0
+EBUILD hercules-3.10.ebuild 1318 BLAKE2B c9bf2cd72c3659c9d4354ffc85fe4312960c2b3b4d9fae808479838dc22d47fa17d7d46d8343dba3a21d72694d8f888d58478a447bea19ef99e772465c8e1132 SHA512 80d4414b3c6304c556c2640ba74d47dd26d3996ea88b876b0fcb7359b9c4d2e34f5518b14b988766e048faa1009a6f1fcf29146641ffe202c20acf4cd0044831
+EBUILD hercules-3.12.ebuild 1322 BLAKE2B 120cfd78bec73dc3643cf74dd81186dc7f12fab88cdde485658f8f6231892168414a5459c2b020d118a6562c16f62ce9c933495df74c363a60a6927e81c94bfe SHA512 79c7bc909d84d2fb0fdfc48df4dc5aabcfd159c9e6c431799134bbaeabcae2ed69a94490c474793a0e9329b899a46d60c40c7eb66813b710f07ad998dd5620c8
+EBUILD hercules-3.13.ebuild 1212 BLAKE2B d82513e767db471cd21313903b779994dd1131c6196d4e450600395e0d8a191bdff269122cb07363e3d5b801de73b594dfb2790e9deef51c277aa2c0d6f39004 SHA512 2bdcb55add001df9265f3b1e156a6a10e83bd91060758589ec59409062b8ec07fcc5e918e565fb01647f7a4fa2c352093d22c1c146e3cf625160c355a0c79cbf
 MISC metadata.xml 580 BLAKE2B 7b8d677b252db63214074827db7e3ba8bf2a93362c62793321d436268f8bc4c79a2c9a2fcfe92b17c2107ad61afa6bd2340441fb04a3ba786c7c01c449d7c1fa SHA512 ac91e21edfcaefcf36af5c15336d3371f503c43e727a92df3eb14a11279e0a66719a8879725c34d10ac17e80b83f940ac5a90fffe38448918d0a665408416794
diff --git a/app-emulation/hercules/hercules-3.10.ebuild b/app-emulation/hercules/hercules-3.10.ebuild
index d165c020c390..2759a92bd42b 100644
--- a/app-emulation/hercules/hercules-3.10.ebuild
+++ b/app-emulation/hercules/hercules-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
 
 LICENSE="QPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ppc sparc x86 ~x64-macos"
 IUSE="bzip2 custom-cflags +suid"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-emulation/hercules/hercules-3.12.ebuild b/app-emulation/hercules/hercules-3.12.ebuild
index d121c6a69fa7..ea0d3fecd24e 100644
--- a/app-emulation/hercules/hercules-3.12.ebuild
+++ b/app-emulation/hercules/hercules-3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
 
 LICENSE="QPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos"
 IUSE="bzip2 custom-cflags +suid"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-emulation/hercules/hercules-3.13.ebuild b/app-emulation/hercules/hercules-3.13.ebuild
index 90fb943156a9..1131976ea5ea 100644
--- a/app-emulation/hercules/hercules-3.13.ebuild
+++ b/app-emulation/hercules/hercules-3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
 
 LICENSE="QPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos"
 IUSE="bzip2 custom-cflags +suid"
 
 RDEPEND="
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 47701b827549..e5038486927a 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -13,8 +13,8 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2
 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
 DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13.ebuild 4169 BLAKE2B 9bff5ec22e19a3fdc6151a703ab59b983a6a9f2a92d9d4da486e6c44fbba77f4c2ea089f267c2d1f045ff74bbabe5c3c42e72844baaadc14fc7c8b0ac42ccb7e SHA512 3cc7013ca42c13e60039b6328d5ce0fef228f0ca400e4a6a72882512bda387117466a7d368d0980fd38c4c0288b3dc50fc6dd2af1bb26dbab5c566063fa90417
-EBUILD libguestfs-1.36.15.ebuild 4373 BLAKE2B 4266e0cf2c4755879e78127c28b7442ffb7b12ccd3da62437661c7242f2e7bf0abaac0b2e62d30f23043b275451bfb6cdc5e55e1fc909cf31a51d0ee9e48239f SHA512 908a69ae90c178884fca7a9932ff790b721d932ed348fa874356f9f710bb0dffd6b155d76cb1d5e57839c48ab0d87e4903ec9ebe9a6c278f9df18129c655a1c5
-EBUILD libguestfs-1.38.6-r100.ebuild 4346 BLAKE2B 42199953bfc61d8022161dbb24f0dac352a32013edf574211e215e35e8823d9778e724b152ca81c0053aca08e60b6c13e9ce308e974385c7d29f9d1a83a4e0f1 SHA512 a334bde422c984357077acfada734809135e638f33fe716d705738526e2e07877a4983ed184e96a975f951b76537568bec543c1a635a85618f7033d21b9216f9
-EBUILD libguestfs-1.38.6.ebuild 4108 BLAKE2B 2e059e6e858b462653827a71da9ac263ff4cbef317df7d00cf9554c1409a249894652b7b8c0dcbf3f33d77a9ddfdb0b4061467cef537bdddbd4ac589966b5d21 SHA512 01edb567f0230ef1fc554a82c67b7a3ae54730f88d5f9894fa3493f9643d640ffc6b19a013dc8a80836a51b86760cd3e100a364b1fb809580f00a613a4999489
+EBUILD libguestfs-1.36.13-r1.ebuild 4180 BLAKE2B b75851e01f5ac7de049d9564692ca3d26d203f64ac543ca16d0f349d8e429934503ccaf7a9b5c3aa60f461f86806d2bca95b27ce979f7382138f3a992f094dfd SHA512 5ed05d84bf16c169508966ac8736f1c5b9d39535f3020e9ed9f5434ca077b7e9fc73eed3c1ea266809d8283828322e98775c266f9e1612b81b6111d43b982d8e
+EBUILD libguestfs-1.36.15-r1.ebuild 4384 BLAKE2B 8974197d9050926cfb2d3f016a42e89a943f9aa0fde18183e14ec54a3c677e1bddd123cd3273613b7289a4bd17808cecf86d68f60d0a04b9516b0704f488dff2 SHA512 52c450897b0eb4daa7a093678d91db1e9594af29b3061508619fa477c5e964b67212eaa309da3155fc5042c1c0e566f90875014bdf732c73249284cf323da91e
+EBUILD libguestfs-1.38.6-r1.ebuild 4117 BLAKE2B b7acb5937cdb72465d3a9b0ffcc9d291826dc8c5e12e80fbfe85175a0a89af4482306bbeb689c66ad9747a3e8fedb0efbb6081f8113400d31786a990e0194600 SHA512 521dfebba8682e5a1b0971eb34d000c8a13946d048a4c7add77837b2810ea0f125463b4429259ef46eba8eb1cfc0ddfb519fd047a128c4c26886875235c021c3
+EBUILD libguestfs-1.38.6-r101.ebuild 4359 BLAKE2B fea4573518abd3cb3f7afde60f53f6478fbddd0b0ab432597d0bb0ba9b9930a03a34e1f4954819dd988f722da44380cfd3097c91533f49615bc01467bfedb88f SHA512 b96f719044be1eaab27ecff8f5db80155dbb30c1e823f8860356a89f428c0fe3e192fbb171f1c6ee5513df7059ac068a2ba3eb3c2ed755bc9e19bd0d1e760d7d
 MISC metadata.xml 845 BLAKE2B 002345b189789a28d74b674c9f32cd5b6793cd84e50fa3f54212c0d05ba6463ffcf75629f2459979dd20a85312018054325660b16d4df04e87222b5ce9ac95c9 SHA512 c32515f853783a1935a2285305e1b54e7309be52b6ac3cd4084a26b28f2b53c4378faa95ae3e24e6b0349ed1e84c46df0a5337c258e3726870aa7d45e3ed5366
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild
index a9896d1ca1ad..258c8907bcca 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,11 +40,11 @@ COMMON_DEPEND="
 	sys-apps/fakeroot
 	sys-apps/file
 	app-emulation/libvirt
-	dev-libs/libxml2:2
+	dev-libs/libxml2:2=
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.0.0
 	sys-fs/squashfs-tools:*
-	dev-libs/libconfig
+	dev-libs/libconfig:=
 	sys-libs/readline:0=
 	>=sys-libs/db-4.6:*
 	app-arch/xz-utils
@@ -73,9 +73,9 @@ COMMON_DEPEND="
 	)
 	systemtap? ( dev-util/systemtap )
 	ocaml? (
-		>=dev-lang/ocaml-4.02[ocamlopt]
+		>=dev-lang/ocaml-4.02:=[ocamlopt]
 		dev-ml/findlib[ocamlopt]
-		dev-ml/ocaml-gettext
+		dev-ml/ocaml-gettext:=
 		>=dev-ml/ounit-2
 	)
 	erlang? ( dev-lang/erlang )
@@ -92,8 +92,8 @@ COMMON_DEPEND="
 		sys-apps/dbus
 		x11-libs/gtk+:3
 	)
-	net-libs/libtirpc
-	sys-libs/libxcrypt
+	net-libs/libtirpc:=
+	sys-libs/libxcrypt:=
 	"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild
index 7ec4be7a95e1..0bc5439dea8e 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,11 +39,11 @@ COMMON_DEPEND="
 	sys-apps/fakeroot
 	sys-apps/file
 	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2
+	dev-libs/libxml2:2=
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.0.0
 	sys-fs/squashfs-tools:*
-	dev-libs/libconfig
+	dev-libs/libconfig:=
 	sys-libs/readline:0=
 	>=sys-libs/db-4.6:*
 	app-arch/xz-utils
@@ -71,9 +71,9 @@ COMMON_DEPEND="
 	)
 	systemtap? ( dev-util/systemtap )
 	ocaml? (
-		>=dev-lang/ocaml-4.02[ocamlopt]
+		>=dev-lang/ocaml-4.02:=[ocamlopt]
 		dev-ml/findlib[ocamlopt]
-		dev-ml/ocaml-gettext
+		dev-ml/ocaml-gettext:=
 		>=dev-ml/ounit-2
 	)
 	erlang? ( dev-lang/erlang )
@@ -89,8 +89,8 @@ COMMON_DEPEND="
 		sys-apps/dbus
 		x11-libs/gtk+:3
 	)
-	net-libs/libtirpc
-	sys-libs/libxcrypt
+	net-libs/libtirpc:=
+	sys-libs/libxcrypt:=
 	"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
index 9828f1232d0b..8764f049efc3 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,11 +39,11 @@ COMMON_DEPEND="
 	sys-apps/fakeroot
 	sys-apps/file
 	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2
+	dev-libs/libxml2:2=
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.8.0
 	sys-fs/squashfs-tools:*
-	dev-libs/libconfig
+	dev-libs/libconfig:=
 	sys-libs/readline:0=
 	>=sys-libs/db-4.6:*
 	app-arch/xz-utils
@@ -70,7 +70,7 @@ COMMON_DEPEND="
 		sys-libs/libsemanage
 	)
 	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] )
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
 	erlang? ( dev-lang/erlang )
 	inspect-icons? (
 		media-libs/netpbm
@@ -84,8 +84,8 @@ COMMON_DEPEND="
 		sys-apps/dbus
 		x11-libs/gtk+:3
 	)
-	net-libs/libtirpc
-	sys-libs/libxcrypt
+	net-libs/libtirpc:=
+	sys-libs/libxcrypt:=
 	"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild
index 5c28a6fd58bb..63600cbe2d16 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,11 +41,11 @@ COMMON_DEPEND="
 	sys-apps/fakeroot
 	sys-apps/file
 	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2
+	dev-libs/libxml2:2=
 	>=sys-apps/fakechroot-2.8
 	>=app-admin/augeas-1.8.0
 	sys-fs/squashfs-tools:*
-	dev-libs/libconfig
+	dev-libs/libconfig:=
 	sys-libs/readline:0=
 	>=sys-libs/db-4.6:*
 	app-arch/xz-utils
@@ -72,7 +72,7 @@ COMMON_DEPEND="
 		sys-libs/libsemanage
 	)
 	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] )
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
 	erlang? ( dev-lang/erlang )
 	inspect-icons? (
 		media-libs/netpbm
@@ -86,14 +86,14 @@ COMMON_DEPEND="
 		sys-apps/dbus
 		x11-libs/gtk+:3
 	)
-	net-libs/libtirpc
-	sys-libs/libxcrypt
+	net-libs/libtirpc:=
+	sys-libs/libxcrypt:=
 	"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
-	>=dev-lang/ocaml-4.03[ocamlopt]
+	>=dev-lang/ocaml-4.03:=[ocamlopt]
 	dev-ml/findlib[ocamlopt]
-	dev-ml/ocaml-gettext
+	dev-ml/ocaml-gettext:=
 	>=dev-ml/ounit-2
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index dfe12073763c..c3125892ff2b 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -7,4 +7,5 @@ AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c29
 DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea SHA512 800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
 DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b SHA512 7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15
 EBUILD lxd-4.0.4-r1.ebuild 3511 BLAKE2B 8dabc47cc1b4ae2b165d5e1f4027816a31a7c7bf1069f198a90859c0b68b94ff9b3f273345a58156cd6771860a4c4eac96d364ade2efeda71dcd1a7ca459d474 SHA512 8a60709dbc465933c2de7c7097dc06e131b3a69b1535fb1af90dd9fbb2ffb05fa524e458bd80394437ad652138c07be9cde45f602f69d85930f3322433020889
+EBUILD lxd-4.0.4-r2.ebuild 3811 BLAKE2B e2affa44f362eeb92c7a6f94c26e32586cb7f57b6bfbe6df35d322323790d866cca13d94d99234afcd318025292bbee19807e50471d75a20688e8d638e959944 SHA512 593c379655756a3ca45006f6708a103972f5ed81e701f28143661d83eed542d4d61e2a0b46f083a2e3f146dc206e36db0c718e0804ad8461717333d76697c2eb
 MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/lxd-4.0.4-r2.ebuild b/app-emulation/lxd/lxd-4.0.4-r2.ebuild
new file mode 100644
index 000000000000..060fd2fab5e0
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.4-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
+
+# Needs to include licenses for all bundled programs and libraries.
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="app-arch/xz-utils
+	>=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+	dev-libs/dqlite
+	dev-libs/lzo
+	dev-libs/raft
+	net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+	acct-group/lxd
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6?]
+	sys-apps/iproute2[ipv6?]
+	sys-fs/fuse:0=
+	sys-fs/lxcfs
+	sys-fs/squashfs-tools
+	virtual/acl"
+BDEPEND="dev-lang/go
+	nls? ( sys-devel/gettext )
+	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+	~CGROUPS
+	~IPC_NS
+	~NET_NS
+	~PID_NS
+
+	~SECCOMP
+	~USER_NS
+	~UTS_NS
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+	/usr/bin/lxc
+	/usr/bin/lxc-to-lxd
+	/usr/bin/lxd-agent
+	/usr/bin/lxd-benchmark
+	/usr/bin/lxd-p2c
+	/usr/sbin/lxd"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+	default
+
+	export GOPATH="${S}/_dist"
+
+	sed -i \
+		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
+		-e "s:make:make ${MAKEOPTS}:g" \
+		Makefile || die
+
+	# Fix hardcoded ovmf file path, see bug 763180
+	sed -i \
+		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
+		doc/environment.md \
+		lxd/apparmor/instance_qemu.go \
+		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
+}
+
+src_configure() { :; }
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+
+	cd "${S}" || die
+
+	for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
+	done
+
+	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	export GOPATH="${S}/_dist"
+	go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+	local bindir="_dist/bin"
+	export GOPATH="${S}/_dist"
+
+	dosbin ${bindir}/lxd
+
+	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		dobin ${bindir}/${l}
+	done
+
+	cd "${S}" || die
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
+	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
+
+	if use apparmor; then
+		systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
+	else
+		systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
+	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
+
+	dodoc AUTHORS doc/*
+	use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+	elog
+	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
+	elog
+	elog "Optional features:"
+	optfeature "btrfs storage backend" sys-fs/btrfs-progs
+	optfeature "lvm2 storage backend" sys-fs/lvm2
+	optfeature "zfs storage backend" sys-fs/zfs
+	elog
+	elog "Be sure to add your local user to the lxd group."
+}
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 28fff7daa671..78f86d709f6c 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -7,5 +7,5 @@ AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002e
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
 DIST open-vm-tools-11.2.0-16938113.tar.gz 4050857 BLAKE2B b0e5e1e985d9f3d50dbbb8a4a7939d37d8968f0aa15e6d7200b7ec8511bd059d3a78a4ddd763d22965dc6da614d156e6b7ee23af73490f8bbf8e1dc2664041d3 SHA512 c950d6e8ba5218dd40e845f3c2b09eeb640ef0d33c7ea1671164027927e062dcf0b4745f6e4515a7495ec20a6d06a8fbf700819f6211073194b5ef97d7be441d
-EBUILD open-vm-tools-11.2.0_p16938113-r1.ebuild 3139 BLAKE2B 4837833b60a4335d77d86dfefe38337d5daefb1313cc871eb8ae6130fe0c9d2941af67e0042064be3b760df2a65c0c0efa328dcc90d4592ca6cd8b0a5155be76 SHA512 5dfa5fff7d5ef518e8f6bb53b5a58dc920da5f6602b8dce3a66b8ad38cca61c6b18c3401dc98e45b9866bb26a0d2111964ba4a43fad34c6e19d0f0bc47274245
+EBUILD open-vm-tools-11.2.0_p16938113-r1.ebuild 3138 BLAKE2B 89fd2f0ad743c54e9df564749e4163be037dbed8f159717779419c9c5430528634a36ffb22712be305ad39accadfd12c5cabf99180d782744c028819369c0baf SHA512 0d463a4ac777a0e0afdc6df7035bf5c832b38c60e06c5f96485fec88a7f054d842e487fbe307d41cbf489c44ff83566ef9c94ac3495957120c8074f94d26a628
 MISC metadata.xml 1098 BLAKE2B f4a5ef8cb8661438d0d1e01da16993a3334c25dcf8a43e55ecabd0b02734b33681d1b0824db1f08431086f8287094d7aee559e50af8c0ef0f4819cc2c14158eb SHA512 f4eb924b8a5269f0fe7f4c00f3a4747f56dfdc5c028a913785cf1929938ad333102ebfba6f3ca9ac15fb7e25f06d629be528abdcd7bb96a8c31e257405cda201
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild
index 736a7c37f20d..16c6fc0874c7 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2007-2020 Gentoo Authors
+# Copyright 2007-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth"
 REQUIRED_USE="
 	multimon? ( X )
diff --git a/app-emulation/pcem/Manifest b/app-emulation/pcem/Manifest
index be8d0cc823f2..8b28e18b3e29 100644
--- a/app-emulation/pcem/Manifest
+++ b/app-emulation/pcem/Manifest
@@ -1,7 +1,4 @@
-AUX pcem-15-respect-cflags.patch 300 BLAKE2B 4531829e43d43501fe889b34381fc056ffa2734ca499686558cf39ef245f3808e6488c32d6938487d018175ab8a370a28e491cc957406ea6e430a9afff44dae2 SHA512 7800d9056fc1ab4b38f97a6021da7288b990ab9c562846be1ae4ec6636c888fd444c635076f070c50f39681202995a41575823a225c77017d389638feaf1a93c
 AUX pcem-17-respect-cflags.patch 273 BLAKE2B 5c6bb6335677a1784b7fe99de3ebfc47351ab1c849d03f656e5428fd309256c46736ce6faf709aa379279c52ebdc7b46ea2e15ab1aa60a43dbdfc91fa09581af SHA512 4b83837f623971ccb91f525cee9bace2b9fd6b3a776a7d6907ec8e8796a021d8d68e665fc0dff7db083c7e068d6e07d3d61049ee2d9209c5b3d59a0fca388064
-DIST PCemV16Linux.tar.gz 1859892 BLAKE2B e388031e661b9320cc783e6400bdb7c191a2f946d9c207d9a58daa9270115b32ed55ac6a0b87227b51d10168e7d161bb03811eb83f5405ed1a71f7bfc6fd8aa5 SHA512 97d33ae1c4b59f281abe553ed4297c0d6c3956cf32b44474bfd5773700dd5c4ea6c209c679b9add5d4a7cba61748ee9794afa3c59af3230fa2a15812e13fd1c5
 DIST PCemV17Linux.tar.gz 1880868 BLAKE2B 64068f0f98e8fe3e9bfe42a04f462375a7ee0cb8259b103237f3b0542f54ad13ed625a55c8379e2c54a87348ed504496a6b163419855ceeda8e4f18e1ea5dcd9 SHA512 6d84c8cbe9b6116f6439f542ac08139cfc5652a34b615a1ed841a6f8c227e77f1d26573ec35d57511b9a69e7472fbe51f2abb9307f8f8c1207c74fbe8107cadd
-EBUILD pcem-16-r1.ebuild 1633 BLAKE2B 735440b0bda54c7433fda65d0147c201ce0afa98f138afaa2f5837ee1fffdbb2613996b15ddeb97f0c529db498336a58225b1647c1d760c41c8a21a0dbe79cce SHA512 6896184bbdb47b3e112abffe1296c147f67b07fe56ecb5bff7a399ee8de4dd42d2642eec936c0ceb08e45d8142fba1879a66fc658bf151f961a3fc42033548a2
-EBUILD pcem-17.ebuild 1664 BLAKE2B d43817f2f4f7cde340a081d4f9d740bad55d776d6926bdebe167aceaee72f2f3852734e51514fa093f7d7011ac0578286411f6c4c35294b8aae013bf6fa0aa50 SHA512 ddd6634df57c85ec406ac1147707b61c2035c59a56bc85ddafe85f16eee8ca36626f45d3bd642fd4a26f3c7eb25034b250f7496621cf2566fa0503d739d4cd41
+EBUILD pcem-17.ebuild 1663 BLAKE2B 3c628cc74e0083ae25eac0b2ad3e7dee4c89d8fe271c7ddeb794d433a756c3ef8f1beeb4b24698c0908d6319982e77aa7261863328705a70385c1539f170dcb7 SHA512 765cd28863d077b1daa70cfb1810d055940b950f4124e44a8b07cc2be452519a204ec241d718c61c8db4029eeff9cbc30d26e3686f95ff15f4534d60a31f60a3
 MISC metadata.xml 857 BLAKE2B c678e4578dca5c14416690cf8a421d4d1d8887237a4600580aad48d1d4ea6b641cc3c1f47c6c00be44344b760aa87c2b9bbded7625e0ccaedd0c8c2cb14dd057 SHA512 e610d16662365ae271fab8a2364e5781ba4be7a841d36759bc4e319b7f87a589c02131aeea83f194eabf940c0c4439459127468c0a65a72e3e2e91c74c0d409d
diff --git a/app-emulation/pcem/files/pcem-15-respect-cflags.patch b/app-emulation/pcem/files/pcem-15-respect-cflags.patch
deleted file mode 100644
index 734812a69daa..000000000000
--- a/app-emulation/pcem/files/pcem-15-respect-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac	2019-05-19 18:40:05.000000000 +0200
-+++ b/configure.ac	2019-09-21 17:34:53.499993726 +0200
-@@ -31,8 +31,8 @@
-    CXXFLAGS="-Wall -O0 -g -D_DEBUG"
-    AC_MSG_RESULT([yes])
- else
--   CFLAGS="-O3"
--   CXXFLAGS="-O3"
-+   CFLAGS?="-O3"
-+   CXXFLAGS?="-O3"
-    AC_MSG_RESULT([no])
- fi
- 
diff --git a/app-emulation/pcem/pcem-16-r1.ebuild b/app-emulation/pcem/pcem-16-r1.ebuild
deleted file mode 100644
index d87a88a78bbd..000000000000
--- a/app-emulation/pcem/pcem-16-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic wxwidgets
-
-WX_GTK_VER="3.0-gtk3"
-
-DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
-HOMEPAGE="
-	https://pcem-emulator.co.uk/
-	https://github.com/sarah-walker-pcem/pcem/
-"
-SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="alsa networking"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libsdl2
-	media-libs/openal
-	x11-libs/wxGTK:${WX_GTK_VER}[tiff,X]
-"
-
-DEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-15-respect-cflags.patch" )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Does not compile with -fno-common.
-	# See https://pcem-emulator.co.uk/phpBB3/viewtopic.php?f=3&t=3443
-	append-cflags -fcommon
-
-	local myeconfargs=(
-		--enable-release-build
-		$(use_enable alsa)
-		$(use_enable networking)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/pcem
-	doins -r configs nvr roms
-
-	newicon src/icons/32x32/motherboard.png pcem.png
-	make_desktop_entry "pcem" "PCem" pcem "Development;Utility"
-
-	dodoc readme.txt
-}
-
-pkg_postinst() {
-	elog "In order to use PCem, you will need some roms for various emulated systems."
-	elog "You can either install globally for all users or locally for yourself."
-	elog ""
-	elog "To install globally, put your ROM files into '${ROOT}/usr/share/pcem/roms/<system>'."
-	elog "To install locally, put your ROM files into '~/.pcem/roms/<system>'."
-}
diff --git a/app-emulation/pcem/pcem-17.ebuild b/app-emulation/pcem/pcem-17.ebuild
index 825619a6ac61..027a2355b1e0 100644
--- a/app-emulation/pcem/pcem-17.ebuild
+++ b/app-emulation/pcem/pcem-17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa networking"
 
 S="${WORKDIR}"
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 04e38bdd4026..4e6e39eb46ce 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -15,6 +15,6 @@ DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7
 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
 EBUILD qemu-5.1.0-r2.ebuild 25362 BLAKE2B fb87a664b35972a7da2ad8bf73c0f67051cbd0bec154cf3f74d9e6f4339f833aded63323799982a5ae34e05daee981a3511112320572635beeb953838677e732 SHA512 f25ce8c1fe9ad7d6e098bfff7e94ce49b0cc2c00d25997bb33f22763c1ba5fb6ae4be9149187be9493c82d9329b620298a271bfc3bb5e154493fa4c006ee5545
 EBUILD qemu-5.1.0-r3.ebuild 25437 BLAKE2B aeaefc91ac2a3e0c8e6efefb9aa3be98b017c5957e56955755d71acd47b0b9eb12447f9ae0f9454a7057fe1b5a7944ce8e11e278eff9ab3ee460eb37aba9cd93 SHA512 a7e394010c778f367ff6898c8dfc5ef0b45f48003bcd5f43c1cdb34eb65446a6078345083a450ed752326c238821e3e1e3f75f82efeff4029f3b80ccd164569b
-EBUILD qemu-5.2.0-r1.ebuild 25150 BLAKE2B a99105b89fc0b6dd01681c7c64927d138ca49224b8bcc0939d56b710d527b96375b094cd6ff73ff71d567ae65704ac537b36ee8688ab40da21b0593c0bd61c0e SHA512 153f82f7988c248d4c3f74af35ee20ce8948f0862db711c002e0890ba2fb949cfeef0165456bb50347dd85b9f5f341ec963aba22d2ed880afc11ed4f2b4b091e
-EBUILD qemu-9999.ebuild 25054 BLAKE2B ebf3e591a99bdbf91b8c600a09946542eddf14edf179c224ca0f9db842ffeae1033b8fef9ece14b8d03216b729bd71583e72e6071276e903f9364d55fd610050 SHA512 00ce262e208a39c34888767be788979cadbcd6d46056440e3c6f146d03bd987c793410757ae862597974b38ab0a28515a2b819b6ebb72e7a170284a28590c5ec
+EBUILD qemu-5.2.0-r1.ebuild 25171 BLAKE2B b829cb5bf13e2c4da681399ec1450004887fa159af0bfcb3ba7a3829461d5105174bfaf7262b699c7c10a94de32d8edd75f13a3e5adb90337bd5cd78b24ea719 SHA512 ab48a575441beb385f0c9a9b3f525d5ec349b05b5f5ef6daefaa52719c978fd0bf7056e6f4df50f9c547136f3f151d36721868277950b5a4c738cccb751ac88d
+EBUILD qemu-9999.ebuild 25075 BLAKE2B 5bfcd256a30718a644ef330226668fe536ef47e590f79d46f5aecaec3a06458bfb14239bda931f30e2230e5b48053621a8002aab768193a9c21c5df84577b261 SHA512 fda2bafceb94a545bdc2796f617c845b64d1d1b96014be3504dde8243e2c4b52beb85b2ff3f9ae98996756e7688b4378a67495f415c58a95415134b27b879963
 MISC metadata.xml 4458 BLAKE2B 521a9c7b7c3371ca4352decbaf2324ef22822a176bf22b4f26761dfc40535cb4a6d6438f39ae6803804fdac8891bd2ded0f972279eec9076b80803826946f954 SHA512 9ba9e2805b6fa423fad3da849f57fdc328e8d6276a0a3d15a8970fc117d8174a76a20be96cf9eaa2a92149de922aa0c9b807cd4f2412f335375088dc32a79b61
diff --git a/app-emulation/qemu/qemu-5.2.0-r1.ebuild b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
index 1e1391ca41b8..727692305af6 100644
--- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -72,6 +72,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	vhost-user-fs? ( caps seccomp )
 	virtfs? ( caps xattr )
 	vte? ( gtk )
+	multipath? ( udev )
 	plugins? ( !static !static-user )
 "
 
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index d9b98ce0aa0e..7e09941a8c50 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -72,6 +72,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	vhost-user-fs? ( caps seccomp )
 	virtfs? ( caps xattr )
 	vte? ( gtk )
+	multipath? ( udev )
 	plugins? ( !static !static-user )
 "
 
diff --git a/app-emulation/qt-virt-manager/Manifest b/app-emulation/qt-virt-manager/Manifest
deleted file mode 100644
index e7c79d5934fd..000000000000
--- a/app-emulation/qt-virt-manager/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD qt-virt-manager-9999.ebuild 1021 BLAKE2B cc6a88b0d570b4da55372a887e1f4ded595daf79958f31052e977a1b0c6921a95b83dd231b738708b524af1bbe3aa28f088d2853f0ff753a1fac452d5ecbcc89 SHA512 f2bafb1bc9b57f4466c8acc1f0079e61c810972993887fa7890d5340daff29641a7714bcc07065bb3f67eb4498898833f822fa48fd5e129fa4eaa77d65291a5f
-MISC metadata.xml 471 BLAKE2B 7307e926dce20e9bdbb4cd61e7f0aca3db7dfd26d6a5513db65dafe0f650ed18ad91e331204d0850249fc335a8088870bdb8ed8666815d60108043bf1d7ffe11 SHA512 b0637d54fe36b6879123c672b7b0a2eeab9fb8c2c6d46618a10b17dd279165eef5fe3258efa5d73e096b088ebef0030da244e3ad3383074b7726de5da06234d2
diff --git a/app-emulation/qt-virt-manager/metadata.xml b/app-emulation/qt-virt-manager/metadata.xml
deleted file mode 100644
index 911710bc8d2c..000000000000
--- a/app-emulation/qt-virt-manager/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>virtualization@gentoo.org</email>
-		<name>Gentoo Virtualization Project</name>
-	</maintainer>
-	<use>
-		<flag name="smartcard">Enable smartcard remoting using <pkg>app-emulation/libcacard</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="github">F1ash/qt-virt-manager</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild b/app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild
deleted file mode 100644
index 7eb26346c9a9..000000000000
--- a/app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/F1ash/qt-virt-manager.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/F1ash/qt-virt-manager/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="A GUI application for managing virtual machines"
-HOMEPAGE="https://github.com/F1ash/qt-virt-manager"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="smartcard"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtnetwork:5
-	>=x11-libs/qtermwidget-0.7.0
-	smartcard? ( >=app-emulation/libcacard-2.5.0 )
-	dev-libs/glib
-	net-misc/spice-gtk
-	net-libs/libvncserver
-	app-emulation/libvirt
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_QT_VERSION=5
-		-DWITH_LIBCACARD="$(usex smartcard ON OFF)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index fa78653a6fe9..c0d121ca40a9 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,3 +1,5 @@
 DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
+DIST runc-1.0.0_rc92.tar.gz 2061469 BLAKE2B 06444eaf7602fe9ddaf7728c7f55bd718d1fe8f5f0ce6b21abc49a1d84eaa2fc3550d0d275ba5548ee9ebb6948a8ed415de8562a990d6085d1da8fb37e46afb9 SHA512 770a31736f5ab4ba359d91bd236750511f90b29af0af2bad5c238b611f465d7302e78b57ce8a702068440fda2d74588b92fd4d24c6d34e6fc1bd649ea3d8ee40
 EBUILD runc-1.0.0_rc10-r1.ebuild 1837 BLAKE2B ffc28565f2daf8dbda38f643dfb2bd26596531a19b3087a17a3f59a9c535080ac93c530c21055716a5d4c36211a62e3aecce74ed385a0446bb47784bd49e8420 SHA512 cdceb2bf1583bdb678da403a3e47bd4cdcdf1af081889ca36da0bdf606e93d477950e1e8e58d51d7d36d78a4a7f482bdc49e677f106f53e8d4326fbc2e56b820
+EBUILD runc-1.0.0_rc92.ebuild 1775 BLAKE2B 0a82eb9eb4e9b70cf4679da76b9cc81a9bddfadd3137c905f46fa551e68d2b6f75adc72de725178675f77e73ae3f5b4c6d88b3c8355f7d7c23b657cd8f96613c SHA512 3fed1c9dc08706ec96d5315888b04f2558d2f004b8af595f74b2b0aa384b63c624144bf793ce3e6547975e536d919da3c2e949e3d42dba3d0b3b107fed76b664
 MISC metadata.xml 876 BLAKE2B db5667a946ce043848f7cf87bcaa8c03594e9c4c35186fc905befd344202028742ab51a783751629086fc79cc3d6ee0d5b316978b2aa8677d6f47bd167fdca99 SHA512 0ad802b914d57523092f574450357bf90d54bce93d22e217061fce2817f68a43e5fd3402f80820c2b5e33ade763cb91ddb261250bfddf8ec4785e457981d69f0
diff --git a/app-emulation/runc/runc-1.0.0_rc92.ebuild b/app-emulation/runc/runc-1.0.0_rc92.ebuild
new file mode 100644
index 000000000000..2a192400ef49
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc92.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module linux-info
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
+RUNC_COMMIT=ff819c7e9184c13b7c2607fe6c30ae19403a7aff
+CONFIG_CHECK="~USER_NS"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+
+RDEPEND="
+	${DEPEND}
+	!app-emulation/docker-runc
+	apparmor? ( sys-libs/libapparmor )
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	test? ( "${RDEPEND}" )
+"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	# Taken from app-emulation/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usev ambient)
+		$(usev apparmor)
+		$(usev seccomp)
+		$(usev selinux)
+		$(usex kmem '' 'nokmem')
+	)
+
+	myemakeargs=(
+		BINDIR="${ED}/usr/bin"
+		BUILDTAGS="${options[*]}"
+		COMMIT=${RUNC_COMMIT}
+		DESTDIR="${ED}"
+		PREFIX="${ED}/usr"
+	)
+
+	emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" install install-man install-bash
+
+	local DOCS=( README.md PRINCIPLES.md docs/. )
+	einstalldocs
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" localunittest
+}
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 5f4735612ac5..6e4355bbc19b 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -2,5 +2,5 @@ AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb
 DIST snapd-2.47.1.tar.xz 3664756 BLAKE2B 90cb117ea385890c38c6efdecd3652c115158ad769858ebe1a5035d37c9543da5b2a8768ce4f56cfcee053701d308f826bf7993d9b5f9d5313f2840ca829ab23 SHA512 e08dd7057b85b970a1177996c483d3f663b1424cdbf6643a69923a7012d38fc13109b449ce3a2c5c8d65e5836f93a36567f2f641a62caea6e9989a458f7f2892
 DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
 EBUILD snapd-2.47.1-r1.ebuild 5572 BLAKE2B ae6c639cdda970dd44a23025b735ca370d976279f7a311892eeb8c802e52c2ae6c4c611c3160ca933d9409aab5b31a4e046d4614a79d5aeb2e80f29e80a73157 SHA512 d09ab7989bff32bf1f257573c12a7c50c490e154580c87f852ff935a6990901d5f0f7b90bf2a8c49c51ffbeb5ba2e342808fd543f0d9141ed066b8d125091cbd
-EBUILD snapd-2.48.ebuild 5344 BLAKE2B 445ce9232da1d6b881154b2dd033a170e576133496f40611087e8490f855976a35f02a75d17b7cc65055deb5a84f484bbe1ec68cce8511f9cffba953a924b697 SHA512 1b42ad9a59579d7fc44d2afdb975b6dbbd70f9579d5ca8eec72ad4d91f695482489de6e74eff820daf5afbc952be0d24522c5325af9d8d75cd132c44ce82ce98
+EBUILD snapd-2.48.ebuild 5366 BLAKE2B 1dd5ce2d317e9be68f85edae48806f53fd8e79f7479c08af66b0dd329273f80fc9d8fded1550af67210e751ae276a4848fb3e51f13c172376cd865d47bff9ea0 SHA512 2f237c6514e5319eb4d99578f7b1ad2c4a9f506bf29e7f3d5212a41eb56c0a9158f19b11f4a0385653e146691890427f2b07eaf5dbd4c743a95aba1339c13ad1
 MISC metadata.xml 635 BLAKE2B b3ed2d2b0fa24d4f06a0ff8a01391856432c6cb97eca89d49bafccbd1f5421073f4d5366484b784e8683d288e26908306a5abbe3e1766e784c1effd2f29ee3fd SHA512 e9319595c1e6b96c2907010873d5793b981c88b34bc1df2f3f6e34ef48ba7bb9b98d32419372688a48ec4d8310083055a6be735e9bcc6e59df2ed162e311ea1e
diff --git a/app-emulation/snapd/snapd-2.48.ebuild b/app-emulation/snapd/snapd-2.48.ebuild
index c1a8f5af38ba..b25ca4a9b988 100644
--- a/app-emulation/snapd/snapd-2.48.ebuild
+++ b/app-emulation/snapd/snapd-2.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-lang/go-1.9
 	dev-python/docutils
-	sys-devel/gettext"
+	sys-devel/gettext
+	sys-fs/xfsprogs"
 
 PDEPEND="sys-auth/polkit[gtk?,kde?]"
 
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index b3d6443f80b2..019735e4cae4 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,5 +1,5 @@
 AUX spim-8.0-r1-respect_env.patch 5058 BLAKE2B dabd459ef87e3c9db6304703d2067297f4be53af269ab9b1335dc38302c2e828ab6e9b357e45619fbe4dbdb375abb2dd91795e728a25e9772b3bdaf0a7e3e846 SHA512 adc8bb7815f15a0dfbd67e14875d7f5773c3b0153e9f031a957a9b6deeb0cf2dfd1983b835d7446467433c044a1caea0c13ba43ee5e4f77d5096cd62e2c27948
 AUX xspim.svg 8364 BLAKE2B 0a2f13b78c87e821b6d669a750ea1be0003442f75c20c5387954c1e6c11f99f80b9e1a42ea88bc4e894011ff08cb8b40450674ec415d1be18eb63d5e2a9b0188 SHA512 1860705ef2677b5bd84b7cdf4daf3143033050e5ed014e22d63fc3bec48a0a296a9767fa7cbf7ab71f31c5cc712e40be0799a9c43b96c789273de7604d57c0d5
 DIST spim-8.0.tar.gz 355204 BLAKE2B c7da952df552c5e070c601e7c3d251f15988d377e1c9943730f6cf8eee1e3b64ec4a05b56d4bdbc181b811aa349e3b08fccf0b9ccfc3efe2c0e410580e70dd7f SHA512 c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf
-EBUILD spim-8.0-r3.ebuild 1549 BLAKE2B eba11163cd0f515042e89a8c34e663eb09fdc82cfff503e9072ca9173b29d64b3b93819f5c38ee3cf03f444b7886361f7ab6361ef47af006079e713d04d630af SHA512 dacf57993cc1ea5dc0969baebf3c61bac34ea18f2c52851711252354ccc78308cab58c4fa8d8f9a8644831947129c3e3630aa3b5e89efba791a1e55a4ba29154
+EBUILD spim-8.0-r3.ebuild 1535 BLAKE2B eb416d0d3a1eb4c36f5fc06f83ed3f5c8eb0105c0333caa0b637a24c5e40748741a6feb15c358ecc7df4b19a9ca5b6ed9b58328960a189cc6cf312e9ec4b7066 SHA512 a810d431c89ec8077553587ed56b92b6ea0f30774c5049a76798319ab795999a142f2a8448c6021171ac4aab6217191bba3b825f592ab223e75d6c8cc91808a2
 MISC metadata.xml 465 BLAKE2B a26e388f7a6a0610e0fb4d4c59b0d1a60c3934927f41e0d953dfab8cef1c9fc5da06902263ba29d984db1f0d1d3f636d503b8fe605571f4976e9bbd3e28cf4be SHA512 624df1312b5a85232c892f18eb39a62877c085d79461cf875b46a107eeaf5b99a9062e8f175a62c80565d42b26144ab2227d2f97b2d67fe16e66890e2843fe6c
diff --git a/app-emulation/spim/spim-8.0-r3.ebuild b/app-emulation/spim/spim-8.0-r3.ebuild
index 2717b50ee23c..2b2aacf0d76d 100644
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc X"
 
 RDEPEND="
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 38bf1da34256..d12055331672 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,6 +1,6 @@
 AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d363a65640fc72df27e991f783c8fbea2b2bf962fca00384fe673a577cc354aa03861482dfadb9de6f6afa91b48b673022 SHA512 cd6b6068a4e3c521bfbcf60986ae770a379d373723e005816ad599a9a199af973f75ef9b8806f486223d2017fa118eb3a814f5efb0e3eea81c7eadeaedc54d90
-DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
+DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86
-EBUILD vice-3.4_p37498.ebuild 4112 BLAKE2B 3e30d925e86759e7d35a05617102975e95ee15cda966645c724b30e72df7ba9233e84fb104e42c527038ccbca03ea9a959aef186d4cec9c5c514fd87a737a88f SHA512 65f9367778d826d487d0f6fea6f6faa3b09e86d6e1e82f526b4fc77739944c64ff1343c4afaceade3ca0f242084dc6d071c872909b060511352dfe6576397001
-EBUILD vice-3.4_p38553.ebuild 4412 BLAKE2B d8c7c9b01a5189916dc555bae8e44a318a090288b8ef5382f59f3feb5693e5217f13a4a5239f8d44f89e04ffe6d9befca9e3d32a610b34dcb95199d8f340cb9b SHA512 3564aa2fe0552fc2d07a59bc3956e4e5545668ba1a35bc0e2d565d463b45f9900cee16d6457800b23b1238f0950b6edab7d0de3b6df7c90dd5cd213ee94d1505
+EBUILD vice-3.4_p38553.ebuild 4410 BLAKE2B ea6539484a88baac8d3d98bbff3c4f589c4bac49c76586496b8453e7b1cfa5c402ff5a1e7a029483da5cf07d78006bc35a3557a67a63230bc85a8b12f3f469d6 SHA512 dd7a3ad05ceb453a71667e0628d8d925b03c864d07c90857d283e5737e0105895222f6bf635c28f0274c005c1f03324dfffef57610b9f32c031b76e2782339eb
+EBUILD vice-3.5.ebuild 3988 BLAKE2B 24c714ef41b6767487eeacf1380f9bbaa67cfee2e3b5d899ba050a6e2581f788379ccc39bc051b0c22a9a61d22139ea09282c361a62d2a8eba7b5175d337ec69 SHA512 e97e9b518b396bee62f8edab31de4ae8c2423bdaee100de354f3384b85cd9546ebaff3039a95729de2bf97f9d382f4194e545d9fc46489612e9ada2d59af2fc5
 MISC metadata.xml 692 BLAKE2B d9f0e48aab3fb0ed8ccc7b044f561a96cd563eeeabfae63371cf4b3772a8068c2b4191c09d89465402a202496a2aac7234ffab8adbcc4c17be54ab0e0c9d307c SHA512 f7be3c1e6a6394452d3f7aac52b25ba0eeb098841ecac32bbcc92257a7f09430f9a18927234ba166014523eb7b930c66d803d9105025b79ac1dbebed781fec96
diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild b/app-emulation/vice/vice-3.4_p38553.ebuild
index 6035ab43a443..17bb3310b2ab 100644
--- a/app-emulation/vice/vice-3.4_p38553.ebuild
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 
diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild b/app-emulation/vice/vice-3.5.ebuild
index 9053d48c332d..8bbf1366c06f 100644
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.5.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multibuild
-
-MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
+inherit multibuild xdg
 
 DESCRIPTION="The Versatile Commodore Emulator"
 HOMEPAGE="https://vice-emu.sourceforge.io/"
-#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 
 RDEPEND="
@@ -32,11 +29,11 @@ RDEPEND="
 	gtk? (
 		dev-libs/glib:2
 		media-libs/fontconfig:1.0
+		media-libs/glew:0=
+		x11-libs/cairo
 		x11-libs/gtk+:3
-		opengl? (
-			media-libs/glew:0=
-			virtual/opengl
-		)
+		x11-libs/pango
+		virtual/opengl
 	)
 	jpeg? ( virtual/jpeg )
 	lame? ( media-sound/lame )
@@ -61,6 +58,7 @@ DEPEND="
 
 BDEPEND="
 	app-arch/unzip
+	app-text/dos2unix
 	dev-embedded/xa
 	dev-lang/perl
 	sys-apps/texinfo
@@ -69,9 +67,9 @@ BDEPEND="
 	virtual/pkgconfig
 	virtual/yacc
 	doc? ( virtual/texi2dvi )
+	gtk? ( x11-misc/xdg-utils )
 "
 
-S="${WORKDIR}/${MY_P}"
 ECONF_SOURCE="${S}"
 
 src_prepare() {
@@ -80,15 +78,6 @@ src_prepare() {
 	# Delete some bundled libraries.
 	rm -r src/lib/lib{ffmpeg,lame,x264} || die
 
-	sed "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" < configure.proto > configure.ac || die
-
-	local DIR
-	for DIR in src/resid src/resid-dtv .; do
-		pushd "${DIR}" || die
-		AT_NO_RECURSIVE=1 eautoreconf
-		popd || die
-	done
-
 	# Strip the predefined C(XX)FLAGS.
 	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
 }
@@ -114,9 +103,6 @@ multibuild_enable() {
 multibuild_src_configure() {
 	# Some dependencies lack configure options so prevent them becoming
 	# automagic by using configure cache variables.
-	use flac || export ac_cv_header_FLAC_stream_decoder_h=no
-	use mpg123 || export ac_cv_header_mpg123_h=no
-	use ogg || export ac_cv_header_vorbis_vorbisfile_h=no
 	use pci || export ac_cv_header_pci_pci_h=no
 
 	# Ensure we use giflib, not ungif.
@@ -131,31 +117,34 @@ multibuild_src_configure() {
 
 	econf \
 		--program-transform-name="${xform}" \
-		--disable-sdlui \
-		$(multibuild_enable sdl sdlui2) \
-		$(multibuild_enable gtk native-gtk3ui) \
+		--disable-arch \
+		$(use_enable debug) \
 		$(use_enable debug debug-gtk3ui) \
-		$(multibuild_enable headless headlessui) \
-		$(use_enable opengl hwscale) \
-		--disable-shared-ffmpeg \
-		--disable-static-ffmpeg \
 		$(use_enable ffmpeg external-ffmpeg) \
+		$(multibuild_enable headless headlessui) \
+		--enable-html-docs \
 		$(use_enable ethernet) \
 		$(use_enable ipv6) \
-		$(use_enable parport libieee1284) \
-		$(use_enable portaudio) \
 		$(use_enable lame) \
-		$(use_enable debug) \
-		--disable-arch \
+		$(use_enable parport libieee1284) \
+		$(multibuild_enable gtk native-gtk3ui) \
 		$(use_enable doc pdf-docs) \
-		--enable-html-docs \
-		$(use_with pulseaudio pulse) \
+		$(use_enable portaudio) \
+		--disable-sdlui \
+		$(multibuild_enable sdl sdlui2) \
+		--disable-shared-ffmpeg \
+		--disable-static-ffmpeg \
+		$(multibuild_enable gtk desktop-files) \
 		$(use_with alsa) \
-		$(use_with oss) \
+		$(use_with gif) \
 		$(use_with jpeg) \
+		$(use_with oss) \
 		$(use_with png) \
-		$(use_with gif) \
-		$(use_with zlib)
+		$(use_with pulseaudio pulse) \
+		$(use_with zlib) \
+		$(use_with mpg123) \
+		$(use_with ogg vorbis) \
+		$(use_with flac)
 }
 
 src_compile() {
@@ -163,8 +152,13 @@ src_compile() {
 }
 
 src_install() {
-	multibuild_foreach_variant run_in_build_dir default
-	dodoc FEEDBACK
+	# Get xdg-desktop-menu to play nicely while doing the install.
+	dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
+	XDG_UTILS_INSTALL_MODE=system \
+	XDG_DATA_DIRS="${ED}"/usr/share \
+	XDG_CONFIG_DIRS="${ED}"/etc/xdg \
+		multibuild_foreach_variant run_in_build_dir default
+	rm -f "${ED}"/usr/share/applications/*.cache || die
 
 	# Delete the bundled fonts. These could be packaged separately but
 	# they're only for the HTML documentation.
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index e248ef096001..21eaac4469d0 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -4,5 +4,5 @@ DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee
 EBUILD virt-manager-2.2.1-r3.ebuild 2397 BLAKE2B 7fc787ffdb0ffe89164586233bb919856481a032069d51fc5265e22b9b9baca093abb20c161d79f88ec98d927b48b7823079e24afb3569331c90314d2db45bc5 SHA512 f6c77b03078942b912170c0bf3c68dc5110e22c0d67875d9e210eaa57fb440ed1352614aca0e7e14b2af9aa623deab5af7e20a9ffa48408a41665334f5956219
 EBUILD virt-manager-3.1.0.ebuild 2455 BLAKE2B c94d782f649f08f52d0c6621557f0f8c58e726de7129cd7a1b8770c3172d5bb769456b35f2cfd50e04eb03d0900af32f9e63c88552e420b5d84f411edfe5a2b2 SHA512 249cd64213e7ea8b574ae2eb915133be418793d3e0d17e0ca116a52cf09c9a2c426cfbda3924d61c3fc9504c739feb22023e46cf8e2574d842f7430dcb5d2ffe
 EBUILD virt-manager-3.2.0.ebuild 2440 BLAKE2B cfad50535705db101fe016a904eb5885458a870277c85866f4b7c7d7450b0367c2f8949d546752e5dc508867161e6f6deaa0b6ff16e825c7dc0977359c13bca3 SHA512 449695d40e3039a3ec56e8b08dff7269c313aecc0b65b945e9aa0ed9d8ef4d44dbf5a458dfa03fc4c4f437927fca4f601f93791a8083f8c6fbcff08980a8ade3
-EBUILD virt-manager-9999.ebuild 2418 BLAKE2B bf0dd3260243545dc2a7c0a2b6fe99987a93d18bf0353504ca47ceac40a96ef096afad18198a35fecf529e74074687ddabcf7024a4051200c37206ab1b5e6f2b SHA512 f3b32f68a8b10f3052d3b1b428cb87fbe5bd7ce94a877334a25459fa8125e558d7fac836fe7d57ba34ac0fa50c82c237e6cb2fd5a3e971f64a2f664efcc92cf3
+EBUILD virt-manager-9999.ebuild 2418 BLAKE2B c90043625298564d14a2212bbf0e4af29ca5f796ed194dec6f8ce4d40e25eb41d4a73d07508b88d5d41d5b26098935bdfb9d09e1cdcbb6eb9c161ea0f2baa655 SHA512 97aa27c1afb9f8d33a020ffe5b7a8b71568c950e65becb382470f75bf10965775cce2c27555042dc9593558206da4b1d23fc05c9c204c06fa0ac6b78356616e9
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index ea1e3be6ec37..08f5fd5f3011 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
 		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/libvirt-python-0.6.10[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 	')
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 6b431a43937c..23ef89f6211f 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,5 @@
 DIST VBoxGuestAdditions_6.0.24.iso 77355008 BLAKE2B 3bb611323ba41ad94a75d5d28198aaf732bd7c36965abc65755c0ffeec29bd378cf4351b838675667958086e499f5791b942a8e3877c1ed815a22c4d564147a1 SHA512 aea64aff216a0cfa3535d2215ec74dd46243f9aba0c1b95f476bb8f0b3d561994f4fc8cc7d454f03482e1cec9a227014f10045e75756767bd8006e8beb9aaade
 DIST VBoxGuestAdditions_6.1.16.iso 60987392 BLAKE2B d4452f43c72ab8c49633f717f7a49257e14a8c6c7b60c6d61ee65ae5e4bcce00c30e19ba78d6f28fb85dfbc95ca6139aec2c7069e5afecae145dffc6ff38793a SHA512 e7606fba6e7490318b7dbadff52578040e4370bbe81fa67e6653e798176eb929ed37e363792647ab3c6626ee9e32af40f63167521997af7b446c25173ff60280
 EBUILD virtualbox-additions-6.0.24-r1.ebuild 781 BLAKE2B fbda6311a77ff20cabf4075c35e682f143a7e267f907ea63e948f66e2370c773f9831bb407b7607bfc9a006c9548b93f6d66142f1da49ead9c4488f42a9a2dcf SHA512 b7be1bcbcc119214c8e293f997031abf84ab19920c859e488660d5c8a5c1146ce6ef87b558886f0be633dde8090cd71d27f72ee9ac34f057ba5dc6b5d14460a9
-EBUILD virtualbox-additions-6.1.16-r1.ebuild 778 BLAKE2B a735cdf919f7faeef219b23f35917ad2a6d56293ef77345f9cb37fc13a508d03cf4ffe254b395d53a3bf95641b9a30db19ade39d4b4e7b3d87cb4645fe2cec2c SHA512 31fbc1321579db09b745e137872162741dba1ec352b43092e48c1a6ce78fae17011d3a897610e94b49ff991adda4c27bb01ea5da045e88ecd33630f65d440892
+EBUILD virtualbox-additions-6.1.16-r1.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild
index 9ef18440687e..5f7f607a912a 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 65c863d0e388..d1b24d61e0cb 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,5 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.24-139119.tar.gz 23238486 BLAKE2B cad4e6822b51db05fb0b919f4c44ace1743a9d2b5ebcc0da6fe3c9ec43612ec6079614f5d3a9423c320e65b5438089aeef42f331946eb74093e3f8b1ef137300 SHA512 4be76fffb8508dda561e74daf68c71641a0903e554ecdf6b102f3fe35af03883bc88c2ac3cbdae2b3ddfb7ee5c9bdfa8df670662eef139f2a894dea4aa6f2e18
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.16-140961.tar.gz 11145670 BLAKE2B 86e620ebaea9803b9bf633990a39d9e2828fbe70cdc98cbb6ba98accc374e0ea2300a7135cae0f0ec8d13184ccc8e0ff075ca1f81132ed97206f14c20adeb3bc SHA512 89b9c709da1c4b8268c4c1849e074f4d8dc76a36663b401c9ea63f02422bec50e2b77056289144bb161b1dd226b78687379d6ab86281112a71561c1777f525fb
 EBUILD virtualbox-extpack-oracle-6.0.24.139119-r1.ebuild 1086 BLAKE2B 99cdee4d3ad71bb23128613cf34977c565910add5e74cec1e3eb7d93f479b9b458888eaa050fa6e014ba62953f05533c10d2e74b98f0e7125705bb173a79f198 SHA512 85cb99d4f621df810805994132b939079986b6959e49889d4d34fa9d1bc62630c79d4bcb8914807450f137112330520553982735929ca7c7db95c789b6c923f2
-EBUILD virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild 1084 BLAKE2B 5152d6e203afeaa7e95e43f03b1a4e4b33a386acd1100de2155b5a1b32354e12751d6065686fcc522e0da919410ea2f8e0acee5c68aa1409213a7c1c6cdfa5d9 SHA512 f6ae69ff1fd9e99875bb6a88b9af22b1491734e2fb4f9195e8dad7a92001d7d8a315e5c286f7d6dd0f2e3be758cf0449aefc75fce70efc09bd3b02e9b7c126bd
+EBUILD virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild
index 6e11f5652823..54db34dd7a15 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 LICENSE="PUEL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="bindist mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 6a2a46717ffe..8c82cd1ecc55 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -9,5 +9,5 @@ DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19
 DIST virtualbox-6.0.24-patches-01.tar.xz 3640 BLAKE2B e55c30395978471edd0f291cd34ecb772cce2f27bea88c6fe348e83046777638be9bdd36bf3a2fd1967357ea7ff53936398cd94ee74d8e55d31c1896069404ff SHA512 b8d9395083769a641a5d7f78ac734a86220fec817e3e49461208f8e72ef7d11c19fe4507e6766fe7c8c815c9888f793fd66f3fae36d6e3a217e53620b5d95029
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-guest-additions-6.0.24-r2.ebuild 6108 BLAKE2B 0d096d671de70e69d37bb5bead993413b5f6dbe6ea3d95ca491907341ff6e546ca0c0676e85f79840c2e666b537f2b25976f44aa419873931a0875fd538ddfb3 SHA512 4753a3d1ab46464e4047d8d88bab548bea5ebdfed21f79039a065b02d4ea0d34f9a4d49bed368a9dd9e5002d8530652231def7902a7fa68ef965be12e6f1f6ac
-EBUILD virtualbox-guest-additions-6.1.16-r1.ebuild 6204 BLAKE2B 59101364bc6c6684b260ccc6758d0e046ee7d64f5b08697742e38abd646899063febc44beaf236c7c81d976b5f54de738f4af38aa834165079ae8ce44b1a5906 SHA512 87aeaf57def24ee1d8c4f0ef25ead340520b2caa714c42bb815eab7082161f1a43f2b6ca6a90bba18dfa4558fb363680ad3686b8a709bf5327ce180e8c9ec9cd
+EBUILD virtualbox-guest-additions-6.1.16-r1.ebuild 6203 BLAKE2B 3d718face26d4c0178ee16cdbb95504eb6bc15c63b1112adfdd67ae4cc56d4963810ed2f4417154c0a3d70c539220b99ef30a9904b54be6acda93fa3498b240e SHA512 5f534315e95e50008b1f704bbef4feaaebb702f72443b7cd63cd6ae7a2bc143f5fa2907cbeda370369b03f83a3025364ab89853a52a981c5976f4d103e9c7c55
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
index bfe310a7db9d..113acb8e12ca 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X"
 
 # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index dfc064270bc2..ed029e7e83b3 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -6,5 +6,5 @@ AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636
 DIST vbox-kernel-module-src-6.0.24.tar.xz 670960 BLAKE2B 26e4b1b6b9ab8c8fd0312b2162fe745dc11ef3f8a7e2f08f49df9d9ef346ec21b64e4a0a480bd726e9cca6ab2ce5d3cf2637aa8923c0843bf78a3ed160b98810 SHA512 9b1093307dffeb64f3ec22c4797268858e1fcc729403e89294c2e3cf0852662b7b0aad4416a593fd25b2107a1995d6bc17078f072b6f7718ed111ab61df8324e
 DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 8b2153874ee7a63f88679a5372215e89def49622caa7679a5c2410423eaf23ced18ece79d638fc96db40fac88857db7568dd72dd8e05371b14add3553d61d3a7 SHA512 c51dfad5f9578ad43e2fbdd35a70659640030108006f89d362bc25dead99eb3b39a78d403633b3813f62f5b510eff22d826a2750b9c88f5fcb1cde6531295bff
 EBUILD virtualbox-modules-6.0.24-r2.ebuild 1471 BLAKE2B 405d9600d0f8d00f9442db9bea087094a035114acf58e2357cb18797c9273ecec65c26f4b470711fcc6372a641e718553fb436a52eb366b3f563800277c5f3aa SHA512 a8ee80d7c9c0e31ac4f4c0115d2a4f11798a182549e009ed55dcaddf1b8b893a54838696cffcc01f4760f212b55fc80319917235ea40776d280496386c9e278e
-EBUILD virtualbox-modules-6.1.16-r1.ebuild 1512 BLAKE2B 5a6cb34498170aa3f9bf5fe4387f0d4918325155c1c8b87d0f8307c2011fda971af63cce5db155e9a070ca7aabdd75042b1e05f60d30a87cf09ad551692a28d9 SHA512 d1d2bec59f9ac961fba04116dd77359481309b4cab600bc04d0ff09f894fdaf792d5a75dbabb9d308a43fa79c267cea7c82abeeb42f1f19f59b18249fa9b2af9
+EBUILD virtualbox-modules-6.1.16-r1.ebuild 1511 BLAKE2B 5da8447d01281777c51b21469b44397ab585659a36ade0407d74b32da4d0078ca5329479785cd2924d8c3f61fb066f84a64b4a92514454fe7368b9b54dfbebc4 SHA512 fb606c28048f9e4ce050b73de3eb7a80e5546d18ce52d13aa2a00abb42530052dd61523f5a800ed1cfb06541b272017cfc1b403a2260fe43b779238bd08a46d2
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
index 28c26bd6c0c9..0519b12c7cd0 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: the tarball here is just the kernel modules split out of the binary
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 7e8f4f9ca638..ec0c287a6485 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,5 +12,5 @@ DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19
 DIST virtualbox-6.0.24-patches-01.tar.xz 3640 BLAKE2B e55c30395978471edd0f291cd34ecb772cce2f27bea88c6fe348e83046777638be9bdd36bf3a2fd1967357ea7ff53936398cd94ee74d8e55d31c1896069404ff SHA512 b8d9395083769a641a5d7f78ac734a86220fec817e3e49461208f8e72ef7d11c19fe4507e6766fe7c8c815c9888f793fd66f3fae36d6e3a217e53620b5d95029
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-6.0.24-r1.ebuild 14396 BLAKE2B 1bea8d995578378b2a25037089e81ca4c0153c2ebd5bd9029ab368ea3203210f98acd63ad5dff2b98655a0b97acbc27ac134537986529db835b241d4f131fc17 SHA512 616c12eb22d560791adf61096a2b80b74b2a4fbc3f6abae3626a6a2eacdd7ab5b5b6deda89f84b504dce481872c1ffc6da1e728e22a546851554a408085f0452
-EBUILD virtualbox-6.1.16-r1.ebuild 14560 BLAKE2B 4acd66117b1e29108719bcd4f66587046cb7de326f849381d10f2ff794cd94a6f9721a94ad404c6c14a4be5cb4e881344908f0a3909f801bda22f4b97316ea82 SHA512 ce0ef30cf949efcfe2aeb65bf120563572167da5560d23f53c87f2726a3198861da7b7d2a53041189327da819aea82d7d4af7d5f1d5b6d0fbaa5b908c3bdda09
+EBUILD virtualbox-6.1.16-r1.ebuild 14559 BLAKE2B bf41053a4be4e156d4132f1e10479558edfa6bb5d6a23600e91a4301dd5600a853d5c1d91b0b4377cdae974914ad4fc8ca92d1f2db05b0375f634f6231f1159a SHA512 f3e11dba150273f388a3c96068aedb0bdb1eb9ed7a2b8ebed3a5ceb2c223164d590b619d9979f11fee512b21085b38d80fdb060bc2d02e8d5c20e71df8fb7141
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild
index 407cae5c0acd..05b9f985100c 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 CDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /app-emulation
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)