gentoo resync : 29.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
commit: 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree: 83fc5facb6b12be510a37bc3d241cc63e965b13a /app-emulation
parent: feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)
41 files changed, 587 insertions, 594 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a421c56ede48..d494c63b8616 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index baf50294a42f..2043259cb3c5 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -8,5 +8,5 @@ AUX dosemu-1.4.1_pre20130107-lto.patch 921 BLAKE2B 6b36f4e5502fb8b8202ab4396e6c9
 AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393c34babe0b9172a8c9c1b168432f454ff120673496d279496d76821eda49886aaa998244bd411d4db6b465517712c4f6683d2850d SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed
 DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864
 DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd
-EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2786 BLAKE2B aa4b8d47fd518bf58899bb182397ecbde1b6a67c1c64cd34aebb58831f1cbfa9d25c63e22388dba52f4a42521e0bb0932e859c648a29c22a896bc65ed46493b0 SHA512 e2b507f6b9f6d7a09ae8e66da4c24bdcab08fe5d9e6aa95c552f04b8b02e25f2478b78c42fa5aceb2d1f5f87f5287c023b9eaf43a9b503875f252683f62802ae
+EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2955 BLAKE2B e7685142e60dc5556ded4f452802bdea49ad52e3bb5aa1e45b31cb074ce8d3cf9d354002ab646ebb1d4e420af9284016733bb9e66ded3911797eb6be4c928b5e SHA512 6221a00a8d3663fbc1ba2839a63ffc9f923cc8f150428b76805089a6e81ed3fab85940dd2435bc437704c38b1d5c8dafb35bde48ab67186083228dd70a0841c6
 MISC metadata.xml 432 BLAKE2B 06cd4821f41961fdcf266bb1175ee118cd181d17c3b38508e2a30dbbfab9e5cb02608e2b8e5af905abc24718d410a24d112c073fd6ee460b33d904c975358a61 SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index c7771af9cd8f..61a15bd1f53c 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -58,6 +58,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-as.patch
 )
 
+pkg_pretend() {
+	if tc-is-clang; then
+		die "${P} does not work on clang due to missing 16-bit assembly support: https://bugs.gentoo.org/729240. Please try gcc."
+	fi
+}
+
 src_prepare() {
 	default
 
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index d180ff9e8de2..a8406942dc29 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -3,7 +3,9 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 DIST libpod-1.8.2.tar.gz 30065262 BLAKE2B 1bf4ca9b9547a710f1882ac40aee0cf295fecdb9d43dc6fa30633331ca9e19d15e6d671075627939167cdf100d30e8299e50bd51425226ff1994778782cf261b SHA512 c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366
 DIST libpod-1.9.3.tar.gz 8869143 BLAKE2B 52c049c3a9c96729f32c1b7a9fc4b182614d18edd12ee1d5b19730a870b694f5c4489577bbf547cf86baf51b6fadfdf1a1513ff784a4c549f5b737549187f3a3 SHA512 d85cdf49b740f47a341b7717a4bc22ff326d22234e224bd572a3d879b75eaa33139bebdc293c2e7bc41a9902289d89380b9b56975a0826172324e9a54f8f5e03
 DIST libpod-2.0.0.tar.gz 9126598 BLAKE2B 3c2d18a921b88ef235b14f069e7571f83b1add39ec4ecd20b98f4879d287c481a525e01969c9b62f8b81e0be43eb864266f32f78af3f1a5ca92c4b1c4a9a16ce SHA512 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2
+DIST libpod-2.0.1.tar.gz 9136153 BLAKE2B 4c60dc047ae7fd6a2918589a30f6dc94c13251ed0002e77919adfb9dbe0a3c7b14e40e204c5879273589673a573aa318a3d5b972c32236143e166cb96a7cc3c8 SHA512 e52d3eef3d698360a0196dca6338c319511b6685c0237bd4d24a3763eb5e46262946d7609d1f36798dec6eb63d4511efdc8b77fa22c06bd55b666505f4fe6730
 EBUILD libpod-1.8.2.ebuild 3881 BLAKE2B 4555be189f9d335b03b6eb074155c039d604395b5ae0772cf3da1502b6a626266c80b9a2ec997dc4c13b31bdfb9f30877da749a0810ec2beac594ee4c0502f1f SHA512 001f631f58a2e0d11f07c5739ed7e2a3c36b0de5dfbe0637e3cb06d31ba68e730de59e05e0e155c92702f39bcd4da05d43e795c1030b800d50198158fd06bed4
 EBUILD libpod-1.9.3.ebuild 3920 BLAKE2B d65bd39116779af1c238061b5d8696615a789c2a5874a0aec558d67d5f760be6785c84be56f75a310cd312078db14b937a4695b7432a50b1236296af4155600b SHA512 e9f823ad0f4a513e760ce0108af2621a1f9f029a603cc87be4f743e99cde57c44bd28242c89f3702d2ddef3af65cfe51ecce5ea552e5320f8bd27f34c1c6777a
 EBUILD libpod-2.0.0.ebuild 4335 BLAKE2B 7d9c3f7bbbc09135dfb63034d24ffd7b23b06a107a5d00967ce4a1ec978a7d6e647e2fac818289ca5cff060f46d93075e7d8dc01762e4a0a616885d668ccad4c SHA512 cf72840fde4a723ccb39573fb6ffc460195c7fe8a056241003de385dda9e3a48a0af4e9d8130d58c70614f1d7ea84fbe5e7d1ef3a3329f725d6464688e64796c
+EBUILD libpod-2.0.1.ebuild 4335 BLAKE2B 3d031ce218cd8b0f258c3caaab69e6c337f0a54e8c4507e85cd8fe4d77a2d95ed3ab4047850584a5a0a095c82755d67a9965be93d8c0978f11b3a95e636cec3d SHA512 182349484588aa6c169fee9af2d615b7102d9fc7deae0e9cf0ebffbf853b3e7c99b82d6bf3e4407cb746daf067205263dbed6211f753b068e696622878064979
 MISC metadata.xml 999 BLAKE2B 4cc701468adb97983a347a94a76ad7966a54a5d4d5e3dcdae0a87e6bc81a45eac46ff120c576d16ea1f8145d6ab86b51b3671d9baa35945d4f104a7f8237854e SHA512 679b1a932037e7f7d209e7f6485dac8c3f2cd7be161fd342dc8158567f03c5692e487d23de4dda62c4ff629c96f0e2ea715dd9c8523e457b090bae5824bd3646
diff --git a/app-emulation/libpod/libpod-2.0.1.ebuild b/app-emulation/libpod/libpod-2.0.1.ebuild
new file mode 100644
index 000000000000..bfded9611d46
--- /dev/null
+++ b/app-emulation/libpod/libpod-2.0.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="a11c4ead10177a66ef2810a0a92ea8ce2299da07"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs +fuse +rootless selinux"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/conmon-2.0.0
+	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	>=net-misc/cni-plugins-0.8.6
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	fuse? ( sys-fs/fuse-overlayfs )"
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	local makefile_sed_args=(
+		-e '/^GIT_.*/d'
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
+		-e 's/^\(install:.*\) install\.python$/\1/'
+		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+	)
+
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -i Makefile || die
+
+	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+		-i hack/get_release_info.sh || die
+}
+
+src_compile() {
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	# Avoid this error when generating pkg/varlink/iopodman.go:
+	# cannot find package "github.com/varlink/go/varlink/idl"
+	mkdir -p _output || die
+	ln -snf ../vendor _output/src || die
+	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+	rm _output/src || die
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	insinto /usr/share/containers
+	doins seccomp.json
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	LIBPOD_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-emulation/lxc-templates/Manifest b/app-emulation/lxc-templates/Manifest
index 91af56492006..2331ee32b252 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,6 +1,4 @@
 AUX lxc-templates-3.0.1-no-cache-dir.patch 241 BLAKE2B ba9fc4fe3d663384a64600977de1c5aba413e876e6ca43464b5f5986d21d5e01729c82eb1e6ea03b087644611b9fc7bf083436e467bc69e2b3779020ca287984 SHA512 504721074d9aa4c1d71e5fb5f59c8179cbb0247b6d56d7622a68a7c55a5fdd5fa25cb92199e5400457f1bf2e4bc8e2d91d5169fb02180688c7bbca655881bdb5
-DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0 SHA512 3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632
 DIST lxc-templates-3.0.4.tar.gz 257015 BLAKE2B 599c0cb083cf358c8252467b3870450e754b2aa30daf8d72e07e746ce37e2fb26fecc0adf416325c9e02b1f98f5745af5985360e9494e5ed54a242a3e17330d4 SHA512 e5b628b40e7108fca858dbd9ae92495016069ff3cba7feb34e9559c7f61dfc36944a9ef441369952a988e821f8b5d883ae97b81f6eef0683a22f1f702b5b913e
-EBUILD lxc-templates-3.0.3.ebuild 517 BLAKE2B 1caf949f9631ad3a9d131d33a5e53e97a0015e9052f38c47ab44a470874543ce6f3af0c70658cb3a7733fab7eb98b195aefc1d6c11eff6e89df3f40127ebe21a SHA512 9a55e11c97768065397efa35377db21d2e929a4ec6cdd02ee762d7c3eb58a0c31c10fbcb7d49fa4cf2545ee9478c6604160a818601fe7b18de1213e20d57912b
-EBUILD lxc-templates-3.0.4.ebuild 557 BLAKE2B 1bcd8e1cfa156a39edffd0061f4e28698f1db858279528805ac11eb446c0424fe4dffe254cb19214e3ed03270096b3e72577dd514c7cb029c6215277817cd7c5 SHA512 5e932450edd2753d83d49d3256911aef9d34f2bb736a4e57b0773bb820c70eb5decda5bab35c143ce7fea63f7db6874122a554a58971f5acfca6372064ac42be
+EBUILD lxc-templates-3.0.4.ebuild 555 BLAKE2B 5af800a304cee234005d77195897746132c1eee02a048cb273705614c27258483e78df9991d9a4e7a16b75dc7c2f1de33ba135bd287cc88e277ad40e010c07db SHA512 258b51d75a1ed265668362be716e84477c5fec913a5ff6faedd8f9405fbb9e55bd554534e7fcba49628cb975d2afcc0edb893e2f5784d70a209a3ccf2dc15cf3
 MISC metadata.xml 363 BLAKE2B 51b326108ff85ddc7cd01c4348ac3d2117a97ffc9970da0de2843fe26a998a093d04d2faf80dc9600ef84f1e5539687abfb65aebb55be63ee9390f2096e57d75 SHA512 79e8e82f7f9596f2add9eed5c3bfb2b56a0902dc1af37710c63d06f34ce4d4359758547d7bc745238389612d44ca9052e0865a312e3e285d229d9ac1580f2ae4
diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
deleted file mode 100644
index 38950a11f0aa..000000000000
--- a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Old style template scripts for LXC"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-RDEPEND="
-	>=app-emulation/lxc-3.0"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
-DOCS=()
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
index 2c8e085f0d2f..32a572462f8b 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc-templates"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 42351bc40f05..67de090b7fc9 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,11 +1,9 @@
 AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7
 AUX lxc-3.0.0-bash-completion.patch 915 BLAKE2B 8bb879e391cec349d211b47d321c64ea091c8475ac9a8c4adfb45918c044f6c49d9b9bce546082907d696f697baf0870893c4427abeafa496db89f99190cd091 SHA512 2f3728fcf5e88eecc1ae05bf038ef83baa375194c5bef0d0ef68feaf4d8092cdd8efef6b3c27207c4abd28b085f087af517242c65747b47d0a8fa840f6b9d279
-AUX lxc.initd.7 3468 BLAKE2B 37b0d044594f1c66631f991315e49c4ceea4640bf6c459e6bba713fb76ef9a8ee1fcbc49da68bd0f1e2929cf9904e0113a3b321166f7c3d360fcebeab6665e5a SHA512 c5841cff7d8b58d4283a26719e8a5db1be2c4add0f31065393b863b6626460180d91632106bc50cde4d3e74ae46a57d581fa1f01140dfa95522aba12277f9eaa
 AUX lxc.initd.8 3669 BLAKE2B 50d41e0923ba26b9653ca3b5b559dd0905e61ec81969e709650fe7f1b26a4dcdc17158b7e449d666e2103047d9f196e53df8beca15fffd529fa8e743de97bd82 SHA512 1182b53a65399746f6d6bced0df5c1fde09c1ede4a28bfe95b5ed0bbd969d6f6423f63021d4b6f1dc62c7b2703f6963c03d881291650bdf21cfcf8432586c1b4
-AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd30208355d2f4a70a4cb46392473eccddd736988f1b72954948876601aaf99977d8e6014a7c774a416160f SHA512 d61e7103e90e6ffb3202533e7d7555d8c02b943f06ec6c0d673713c1c0ede58641312c65d6dd6a15907c1171522e6148c2313d7b11acbd85d59fe65758cd52b3
 AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1e32b69334f753faca9ecd8c6fb2a03baf04698e765f079e73ee683434d8c7c6d3b3082427a6af74ab33b1 SHA512 4c2f9846ca60bb78df7e652309900c0e788b45d569f268a9e5b98842518542b35fce253e2aedeb0eded3d37274390988ef887b01d1d37859ccddf6225286b4bb
-DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6 SHA512 cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c SHA512 0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3
-EBUILD lxc-3.0.3.ebuild 5047 BLAKE2B a648bfd8160f61c1798a6540350ad2b45ae38b5ac8587a5b1a7db7a4f750756b2d65f798c022500c7ea1bfef312aa083f403e8cb61dc116f6ebc91ae5510b077 SHA512 273ff2df6188f58bdc55efb702bd6c92f276bee3baa2cfe0ec550f7ee9707ce6dc2db0bd0ec60276fcfb137c5963dfc7840a6b750a3036a65378bb108d17f47e
-EBUILD lxc-4.0.2-r2.ebuild 4415 BLAKE2B 13a6aec708e20cc54dfd3d48e34183ed760367fa18f9c3f7ac36e9491f166350fc91f66fc1c3656e1fcbf89bf0f1120e9675561caf1c523d4214daf2be51c578 SHA512 4420cb4a4856408d66f49b15348e6cafde2efc68300b188c89ce752f337bab1bb9dd368146fdb38ef0cfc9c9a0e448667d806199401ec0d4f8acdfb7239b383a
+DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da SHA512 a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88
+EBUILD lxc-4.0.2-r2.ebuild 4413 BLAKE2B cefb6671714dc8b83bc346743cc2021f02e7a24ac6943905cb67f69bf2305f556a8151207659460487088c811576420a19a847469860517dc475ecf08d763a97 SHA512 63d40850523186a87e4c9539d4da43cbc8a45a2823a812479d8a7a75652f6d9ba425f7bfb7d2e32684a27267ed5caca00d08a263315d3991f0c47e0d7daf4e33
+EBUILD lxc-4.0.3.ebuild 4415 BLAKE2B 13a6aec708e20cc54dfd3d48e34183ed760367fa18f9c3f7ac36e9491f166350fc91f66fc1c3656e1fcbf89bf0f1120e9675561caf1c523d4214daf2be51c578 SHA512 4420cb4a4856408d66f49b15348e6cafde2efc68300b188c89ce752f337bab1bb9dd368146fdb38ef0cfc9c9a0e448667d806199401ec0d4f8acdfb7239b383a
 MISC metadata.xml 614 BLAKE2B 8c637599d38ecb5fd975fbb4385998886e450cd01d71c342a212258acf6fa0de3a377189544ab744da55b1d85ad5dd8fd2bbbb2daef7389ce61dd7d17bab7f00 SHA512 a14166b818647f0c5c6bb8402f82b333ce52591645c7ec86c8fff953889d61d00db0bcf46faca630a2f472c2918484a230b7b3fcc06099fbdbe4e31ec6bb9270
diff --git a/app-emulation/lxc/files/lxc.initd.7 b/app-emulation/lxc/files/lxc.initd.7
deleted file mode 100644
index 6a42b6aac520..000000000000
--- a/app-emulation/lxc/files/lxc.initd.7
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONTAINER=${SVCNAME#*.}
-
-LXC_PATH=`lxc-config lxc.lxcpath`
-
-lxc_get_configfile() {
-	if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
-		echo "${LXC_PATH}/${CONTAINER}.conf"
-	elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
-		echo "${LXC_PATH}/${CONTAINER}/config"
-	else
-		eerror "Unable to find a suitable configuration file."
-		eerror "If you set up the container in a non-standard"
-		eerror "location, please set the CONFIGFILE variable."
-		return 1
-	fi
-}
-
-[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
-
-lxc_get_var() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
-}
-
-lxc_get_net_link_type() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" }
-		$1 == "lxc.network.type" {_type=$2;}
-		$1 == "lxc.network.link" {_link=$2;}
-		match($1, /lxc\.net\.[[:digit:]]+\.type/) {_type=$2;}
-		match($1, /lxc\.net\.[[:digit:]]+\.link/) {_link=$2;}
-		{if(_link != "" && _type != ""){
-			printf("%s:%s\n", _link, _type );
-			_link=""; _type="";
-		}; }' <${CONFIGFILE}
-}
-
-checkconfig() {
-	if [ ${CONTAINER} = ${SVCNAME} ]; then
-		eerror "You have to create an init script for each container:"
-		eerror " ln -s lxc /etc/init.d/lxc.container"
-		return 1
-	fi
-
-	# no need to output anything, the function takes care of that.
-	[ -z "${CONFIGFILE}" ] && return 1
-
-	utsname=$(lxc_get_var lxc.uts.name)
-	if [ -z "$utsname" ] ; then
-		utsname=$(lxc_get_var lxc.utsname)
-	fi
-
-	if [ "${CONTAINER}" != "${utsname}" ]; then
-	    eerror "You should use the same name for the service and the"
-	    eerror "container. Right now the container is called ${utsname}"
-	    return 1
-	fi
-}
-
-depend() {
-	# be quiet, since we have to run depend() also for the
-	# non-muxed init script, unfortunately.
-	checkconfig 2>/dev/null || return 0
-
-	config ${CONFIGFILE}
-	need localmount
-	use lxcfs
-
-	local _x _if
-	for _x in $(lxc_get_net_link_type); do
-		_if=${_x%:*}
-		case "${_x##*:}" in
-			# when the network type is set to phys, we can make use of a
-			# network service (for instance to set it up before we disable
-			# the net_admin capability), but we might also not set it up
-			# at all on the host and leave the net_admin capable service
-			# to take care of it.
-			phys)	use net.${_if} ;;
-			*)	need net.${_if} ;;
-		esac
-	done
-}
-
-start() {
-	checkconfig || return 1
-	rm -f /var/log/lxc/${CONTAINER}.log
-
-	rootpath=$(lxc_get_var lxc.rootfs)
-
-	# Check the format of our init and the chroot's init, to see
-	# if we have to use linux32 or linux64; always use setarch
-	# when required, as that makes it easier to deal with
-	# x32-based containers.
-	case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
-		EM_X86_64)	setarch=linux64;;
-		EM_386)		setarch=linux32;;
-	esac
-
-	ebegin "Starting ${CONTAINER}"
-	env -i ${setarch} $(which lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
-	sleep 1
-
-	# lxc-start -d will _always_ report a correct startup, even if it
-	# failed, so rather than trust that, check that the cgroup exists.
-	[ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-
-	if ! [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]; then
-	    ewarn "${CONTAINER} doesn't seem to be started."
-	    return 0
-	fi
-
-	# 10s should be enough to shut everything down
-	ebegin "Stopping ${CONTAINER}"
-	lxc-stop -t 10 -n ${CONTAINER}
-	eend $?
-}
diff --git a/app-emulation/lxc/files/lxc_at.service.4 b/app-emulation/lxc/files/lxc_at.service.4
deleted file mode 100644
index 64ae7457096c..000000000000
--- a/app-emulation/lxc/files/lxc_at.service.4
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Linux Container %I
-After=network.target
-Wants=lxcfs.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/lxc-start -n %i -F
-ExecReload=/usr/bin/lxc-restart -n %i
-ExecStop=/usr/bin/lxc-stop -n %i
-Delegate=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/lxc/lxc-4.0.2-r2.ebuild b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
index 9f71458a5e7e..18554a5e703a 100644
--- a/app-emulation/lxc/lxc-4.0.2-r2.ebuild
+++ b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/lxc/lxc-3.0.3.ebuild b/app-emulation/lxc/lxc-4.0.3.ebuild
index 136493184f47..9f71458a5e7e 100644
--- a/app-emulation/lxc/lxc-3.0.3.ebuild
+++ b/app-emulation/lxc/lxc-4.0.3.ebuild
@@ -1,38 +1,38 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
+inherit autotools bash-completion-r1 linux-info flag-o-matic pam readme.gentoo-r1 systemd
 
 DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="apparmor examples pam python seccomp selinux +templates"
+IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates +tools"
 
-RDEPEND="
-	net-libs/gnutls
+RDEPEND="app-misc/pax-utils
+	sys-apps/util-linux
 	sys-libs/libcap
+	virtual/awk
+	caps? ( sys-libs/libcap )
 	pam? ( sys-libs/pam )
 	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )"
-
+	selinux? ( sys-libs/libselinux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
 DEPEND="${RDEPEND}
 	>=app-text/docbook-sgml-utils-0.6.14-r2
-	>=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-	sys-apps/util-linux
-	app-misc/pax-utils
-	virtual/awk"
-
-PDEPEND="templates? ( app-emulation/lxc-templates )
-	python? ( dev-python/python3-lxc )"
+	>=sys-kernel/linux-headers-3.2
+	apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )"
+PDEPEND="templates? ( app-emulation/lxc-templates )"
 
 CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
 	~CPUSETS ~CGROUP_CPUACCT
@@ -46,44 +46,19 @@ CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
 	~VETH ~MACVLAN
 
 	~POSIX_MQUEUE
-	~!NETPRIO_CGROUP
-
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-	~!GRKERNSEC_PROC
-	~!GRKERNSEC_SYSFS_RESTRICT
-	~!GRKERNSEC_CHROOT_FINDTASK
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
+	~!NETPRIO_CGROUP"
 
 ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
 ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
 ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
 ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
 ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
-
 ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
 ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
 
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
 
 pkg_setup() {
-	kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
 	linux-info_pkg_setup
 }
 
@@ -103,23 +78,45 @@ src_configure() {
 	# --enable-doc is for manpages which is why we don't link it to a "doc"
 	# USE flag. We always want man pages.
 	local myeconfargs=(
-		--localstatedir=/var
 		--bindir=/usr/bin
+		--localstatedir=/var
 		--sbindir=/usr/bin
+
 		--with-config-path=/var/lib/lxc
-		--with-rootfs-path=/var/lib/lxc/rootfs
 		--with-distro=gentoo
+		--with-init-script=systemd
+		--with-rootfs-path=/var/lib/lxc/rootfs
 		--with-runtime-path=/run
-		--disable-apparmor
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+
+		--disable-asan
+		--disable-coverity-build
+		--disable-dlog
+		--disable-mutex-debugging
+		--disable-rpath
+		--disable-tests
+		--disable-ubsan
 		--disable-werror
+
+		--enable-bash
+		--enable-commands
 		--enable-doc
+		--enable-memfd-rexec
+		--enable-thread-safety
+
 		$(use_enable apparmor)
+		$(use_enable caps capabilities)
+		$(use_enable doc api-docs)
 		$(use_enable examples)
 		$(use_enable pam)
-		$(use_with pam pamdir $(getpam_mod_dir))
 		$(use_enable seccomp)
 		$(use_enable selinux)
+		$(use_enable ssl openssl)
+		$(use_enable tools)
+
+		$(use_with pam pamdir $(getpam_mod_dir))
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -133,14 +130,14 @@ src_install() {
 	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
 	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
 
-	find "${D}" -name '*.la' -delete
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
 
 	# Gentoo-specific additions!
-	newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
 
 	# Remember to compare our systemd unit file with the upstream one
 	# config/init/systemd/lxc.service.in
-	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
 
 	DOC_CONTENTS="
 	For openrc, there is an init script provided with the package.
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 4d38dedd79c5..c4c509e429ce 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,11 +1,9 @@
-AUX de-translation-newline-1.patch 432 BLAKE2B 2b546cd7200f0d736bffd255bbb79d4e997241a35159e052598d4b9da77ca402a0eb90fcb6fae74ac7d9dca9b8383843fd67fb88b6cab474e547d892ac414d4b SHA512 2857ec4e4856d47340163c10644805ee7a65a0095539c7fdc422b874d1af645187a1de0aff4844d9ed0387cebbd82dbb33da32a839b6dda02df4c3d741e88d76
 AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4
 AUX lxd-4.0.0.initd 1097 BLAKE2B 8cd967f37edc7c87a5d225dc77a39e6696596fb9d53829289b75b3f136572aaaaede5ad78360c0ca2055bcf23627fd75102616ff9da604785bdcbdcb57ae81ff SHA512 5a40f0e7a6fe5e8b301f8fc22344fed64fe8b8894a175600e938f147f49ccf4fa71c75fdfe25ba936c65435fcabdc5f7a606993093e5ffdb7dbc4e0b9f03621d
-AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8
-AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
+AUX lxd-4.0.1-clang.patch 2566 BLAKE2B 1cc6db796393569512dda9b483afaac810a0d2f852308901d1a79e76ffd6def7b4d6a269054c1ec9180de616d0550f4e2542f6aa5417ce91d51ab3ac6cb72fca SHA512 748cf9bf93d4b86de230bf85313ba90e435e8e7011383cba39f4a5767c9cf9e818eb8eae3213d8745ed114a62ae633b311d2088e3e35b1ccef6f5ede5a0f424c
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
-DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
 DIST lxd-4.0.1.tar.gz 25027762 BLAKE2B 1154a427558ad5eda62b63501a2f62a5c3a1b740fac061432b06a1034b75cb906f38d6c43e8215cab8ae0bed328d75a7612c1bb7af3272cdbe3f93235d5bb920 SHA512 1f47f8239cc1d3425fc4cd075487678e219e94deddec10f52a1cd18fbdc0515f54b67552e7b41d0052803c317a861b34cfc83a25776eae7b9673b5c5fd50d70f
-EBUILD lxd-3.14.ebuild 6865 BLAKE2B 56a86d6bb704c3c562654d01953b566f34e9d57abf915972899b663b61e8d9fe1e50523a439a406b013e7396c3286e104859bf4ca23106306ee719ef41810d80 SHA512 aadb152acac7f5784028bbd89c8ebc105992dd6898e22ed36b26889969b7ce1cffdb79e8db1c0e0a43ca98cae7feee3f133165c3f624b87611dfed1dbe0c8511
-EBUILD lxd-4.0.1.ebuild 5667 BLAKE2B 0d264505373865191a0db35f39e93a02783696904f1e254e8e4eb4b698652db207bc22e222f7c70337a9db648f0af3d64f3faad0b21541a158e73cbf0bc7179d SHA512 6ce8d93d08af5f15984d4f0a099edb478a3bc42ea13a4028b01288e8436de0352e97f78a35edc8451f5f8399bb37faaf9fef5c110b71fc0ef5cb53fee36c8fd5
-MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144
+DIST lxd-4.0.2.tar.gz 25350601 BLAKE2B 2abecb61759a1a717960671516157dc7b7a36865ecdbcec1f211e5b653b2b4afc41932a4a289430de0dd4ac1e2c777de471ab26e31dbf2b8d1855f67d03886ad SHA512 6c1c668055e9677850f24e142e6741cb6b5aa8d4d9cce29af566e8090c28e04b4baf973f486aef28b7f6b34be5b9ab9bb45e77956879ff7feff6bec8e4db3077
+EBUILD lxd-4.0.1.ebuild 5715 BLAKE2B 7b5da6fd786bfbcd0381d02fe00a3f6d2da680f3ac497d2e890cac11f5b577271496540ac1e48c200a70f9d7be61887f95de0d209075386d55da509e416cef56 SHA512 c8083ec436f116f3bad879c05ab75f33c4113b79ec4ea241e2f95a85edd636166468cc76b991c53ad7469fb98ffefb8ce94de807c8d1db86f3d47026e48a27a7
+EBUILD lxd-4.0.2.ebuild 5646 BLAKE2B a12ba65e48ddbb509d7f4776581cf6347efc6a5fe9f2cd155f9da61cb7bb2b1f3201b5e9287976663727b553ac0a1de0b6510af3ccd5f5c71bcdb257ff6ac261 SHA512 4ca17c1526bdafa38fea05d19a0e9cd6c960d90bd4ef146545fd8a19c90d580fdbf07f599ccbe3db72c35716a236b72c7e6b0ba1d3150919ba2bf8b61dbb8347
+MISC metadata.xml 677 BLAKE2B 4349c9e18f865c5036e53c6cc5e6492ef35d73786408dbb54f8ad77b7e5edcdf48f5636cbd571e0a510c1faffcc17cfda32461185266af8e3f5fd541bae389b9 SHA512 0e1639760f475f9c77dfe0e1457b5ee2dec81cdb87ba92c179882ad820d82d9fa2606d88eb16eea847f0cfebab7327106abe984bead69ac6670929c181dce86b
diff --git a/app-emulation/lxd/files/de-translation-newline-1.patch b/app-emulation/lxd/files/de-translation-newline-1.patch
deleted file mode 100644
index 4c731e9023dc..000000000000
--- a/app-emulation/lxd/files/de-translation-newline-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /po/de.po	2018-06-27 19:57:56.759130047 -0500
-+++ /po/de.po	2018-06-27 20:01:09.694634346 -0500
-@@ -167,7 +167,7 @@
- "###\n"
- "### Each property is represented by a single line:\n"
- "### An example would be:\n"
--"###  description: My custom image"
-+"###  description: My custom image\n"
- msgstr ""
- "### Dies ist eine Darstellung der Eigenschaften eines Images in yaml.\n"
- "### Jede Zeile die mit '# beginnt wird ignoriert.\n"
diff --git a/app-emulation/lxd/files/lxd-4.0.1-clang.patch b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
new file mode 100644
index 000000000000..765f2f38be5d
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-4.0.1-clang.patch
@@ -0,0 +1,76 @@
+From c7ce94825871ea5d0946e92762e981354628b8ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
+Date: Mon, 22 Jun 2020 22:17:02 -0400
+Subject: [PATCH] lxd: Fix building with clang
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #7573
+
+Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
+---
+ lxd/main_forksyscall.go |  8 --------
+ lxd/seccomp/seccomp.go  | 16 ++++++++--------
+ 2 files changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
+index a304405c2e..14895b6ce0 100644
+--- a/lxd/main_forksyscall.go
++++ b/lxd/main_forksyscall.go
+@@ -34,12 +34,6 @@ extern void attach_userns_fd(int ns_fd);
+ extern int pidfd_nsfd(int pidfd, pid_t pid);
+ extern bool setnsat(int ns_fd, const char *ns);
+ 
+-static inline bool same_fsinfo(struct stat *s1, struct stat *s2,
+-			       struct statfs *sfs1, struct statfs *sfs2)
+-{
+-	return ((sfs1->f_type == sfs2->f_type) && (s1->st_dev == s2->st_dev));
+-}
+-
+ static bool chdirchroot_in_mntns(int cwd_fd, int root_fd)
+ {
+ 	ssize_t len;
+@@ -209,8 +203,6 @@ const char *ns_names[] = { "user", "pid", "uts", "ipc", "net", "cgroup", NULL };
+ 
+ static bool change_creds(int ns_fd, cap_t caps, uid_t nsuid, gid_t nsgid, uid_t nsfsuid, gid_t nsfsgid)
+ {
+-	__do_close int fd = -EBADF;
+-
+ 	if (prctl(PR_SET_KEEPCAPS, 1))
+ 		return false;
+ 
+diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
+index 8945fd9197..025efb3141 100644
+--- a/lxd/seccomp/seccomp.go
++++ b/lxd/seccomp/seccomp.go
+@@ -91,21 +91,21 @@ static int device_allowed(dev_t dev, mode_t mode)
+ {
+ 	switch (mode & S_IFMT) {
+ 	case S_IFCHR:
+-		if ((dev == makedev(0, 0))) // whiteout
++		if (dev == makedev(0, 0)) // whiteout
+ 			return 0;
+-		else if ((dev == makedev(5, 1))) // /dev/console
++		else if (dev == makedev(5, 1)) // /dev/console
+ 			return 0;
+-		else if ((dev == makedev(1, 7))) // /dev/full
++		else if (dev == makedev(1, 7)) // /dev/full
+ 			return 0;
+-		else if ((dev == makedev(1, 3))) // /dev/null
++		else if (dev == makedev(1, 3)) // /dev/null
+ 			return 0;
+-		else if ((dev == makedev(1, 8))) // /dev/random
++		else if (dev == makedev(1, 8)) // /dev/random
+ 			return 0;
+-		else if ((dev == makedev(5, 0))) // /dev/tty
++		else if (dev == makedev(5, 0)) // /dev/tty
+ 			return 0;
+-		else if ((dev == makedev(1, 9))) // /dev/urandom
++		else if (dev == makedev(1, 9)) // /dev/urandom
+ 			return 0;
+-		else if ((dev == makedev(1, 5))) // /dev/zero
++		else if (dev == makedev(1, 5)) // /dev/zero
+ 			return 0;
+ 	}
+ 
diff --git a/app-emulation/lxd/files/lxd.confd b/app-emulation/lxd/files/lxd.confd
deleted file mode 100644
index 8e342cc62d16..000000000000
--- a/app-emulation/lxd/files/lxd.confd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Group which owns the shared socket
-LXD_OPTIONS+=" --group lxd"
-
-
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" --verbose"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
diff --git a/app-emulation/lxd/files/lxd.initd b/app-emulation/lxd/files/lxd.initd
deleted file mode 100644
index b1fa7caac546..000000000000
--- a/app-emulation/lxd/files/lxd.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
-    need net
-    use lxcfs
-}
-
-start() {
-    ebegin "Starting lxd service"
-
-    start-stop-daemon --start \
-		      --pidfile ${PIDFILE} \
-		      --exec ${DAEMON} \
-		      --background \
-		      --make-pidfile \
-		      -- \
-		      ${LXD_OPTIONS}
-
-    eend $?
-}
-
-stop() {
-    if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
-	stopall
-    else
-	ebegin "Stopping lxd service (but not containers)"
-	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
-	eend $?
-    fi
-}
-
-stopall() {
-    ebegin "Stopping lxd service and containers"
-    if "${DAEMON}" shutdown; then
-	/etc/init.d/lxd zap
-	rm -f ${PIDFILE}
-    fi
-    eend $?
-}
diff --git a/app-emulation/lxd/lxd-3.14.ebuild b/app-emulation/lxd/lxd-3.14.ebuild
deleted file mode 100644
index 3639d12ad028..000000000000
--- a/app-emulation/lxd/lxd-3.14.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-RESTRICT="!test? ( test )"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-DEPEND="
-	dev-lang/tcl
-	>=dev-lang/go-1.9.4
-	dev-libs/libuv
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		dev-libs/libuv
-		dev-libs/lzo
-		dev-util/xdelta:3
-		dnsmasq? (
-			net-dns/dnsmasq[dhcp,ipv6?]
-		)
-		net-firewall/ebtables
-		net-firewall/iptables[ipv6?]
-		net-libs/libnfnetlink
-		net-libs/libnsl:0=
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6?]
-		sys-fs/fuse
-		sys-fs/lxcfs
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-	eapply_user
-	eapply "${FILESDIR}/de-translation-newline-1.patch"
-
-	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
-	eautoreconf
-}
-
-src_configure() {
-	export GOPATH="${S}/dist"
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
-}
-
-src_compile() {
-	export GOPATH="${S}/dist"
-
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	emake
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite"
-
-	# We don't use the Makefile here because it builds targets with the
-	# assumption that `pwd` is in a deep gopath namespace, which we're not.
-	# It's simpler to manually call "go install" than patching the Makefile.
-	cd "${S}"
-	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
-
-	if use daemon; then
-
-		# LXD depends on a patched, bundled sqlite with replication
-		# capabilities.
-		export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/"
-		export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
-		export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/"
-
-		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-	fi
-
-	if use tools; then
-		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
-		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
-		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
-		go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c"
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		export GOPATH="${S}/dist"
-		# This is mostly a copy/paste from the Makefile's "check" rule, but
-		# patching the Makefile to work in a non "fully-qualified" go namespace
-		# was more complicated than this modest copy/paste.
-		# Also: sorry, for now a network connection is needed to run tests.
-		# Will properly bundle test dependencies later.
-		go get -v -x github.com/rogpeppe/godeps
-		go get -v -x github.com/remyoudompheng/go-misc/deadcode
-		go get -v -x github.com/golang/lint/golint
-		go test -v ${EGO_PN}/lxd
-	else
-		einfo "No tests to run for client-only builds"
-	fi
-}
-
-src_install() {
-	local bindir="dist/bin"
-	dobin ${bindir}/lxc
-	if use daemon; then
-
-		export GOPATH="${S}/dist"
-		cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-		emake DESTDIR="${D}" install
-
-		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-		emake DESTDIR="${D}" install
-
-		# Must only install libs
-		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
-		rm -r "${D}/usr/include" || die "Can't remove include directory"
-
-		cd "${S}" || die "Can't cd to \${S}"
-		dosbin ${bindir}/lxd
-	fi
-
-	if use tools; then
-		dobin ${bindir}/fuidshift
-		dobin ${bindir}/lxc-to-lxd
-		dobin ${bindir}/lxd-benchmark
-		dobin ${bindir}/lxd-p2c
-	fi
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${PN}.initd lxd
-		newconfd "${FILESDIR}"/${PN}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	fi
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	dodoc AUTHORS doc/*
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	elog
-	elog "Though not strictly required, some features are enabled at run-time"
-	elog "when the relevant helper programs are detected:"
-	elog "- sys-apps/apparmor"
-	elog "- sys-fs/btrfs-progs"
-	elog "- sys-fs/lvm2"
-	elog "- sys-fs/zfs"
-	elog "- sys-process/criu"
-	elog
-	elog "Since these features can't be disabled at build-time they are"
-	elog "not USE-conditional."
-	elog
-	elog "Be sure to add your local user to the lxd group."
-	elog
-	elog "Networks with bridge.mode=fan are unsupported due to requiring"
-	elog "a patched kernel and iproute2."
-}
-
-# TODO:
-# - man page, I don't see cobra generating it
-# - maybe implement LXD_CLUSTER_UPDATE per
-#     https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
-#     EM I'm not convinced it's a good design.
diff --git a/app-emulation/lxd/lxd-4.0.1.ebuild b/app-emulation/lxd/lxd-4.0.1.ebuild
index 21a6fcee0663..578a64630a10 100644
--- a/app-emulation/lxd/lxd-4.0.1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
 # Needs to include licenses for all bundled programs.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+ipv6 nls"
 
 DEPEND="app-arch/xz-utils
@@ -67,6 +67,8 @@ QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
 EGO_PN="github.com/lxc/lxd"
 GOPATH="${S}/_dist" # this seems to reset every now and then, though
 
+PATCHES=( "${FILESDIR}"/lxd-4.0.1-clang.patch )
+
 common_op() {
 	local i
 	for i in dqlite raft; do
diff --git a/app-emulation/lxd/lxd-4.0.2.ebuild b/app-emulation/lxd/lxd-4.0.2.ebuild
new file mode 100644
index 000000000000..8317a5bc6fb0
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 eutils linux-info systemd
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+# 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="+ipv6 nls"
+
+DEPEND="app-arch/xz-utils
+	>=app-emulation/lxc-3.0.0[seccomp]
+	dev-lang/tcl
+	dev-libs/libuv
+	dev-libs/lzo
+	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 )"
+
+CONFIG_CHECK="
+	~BRIDGE
+	~DUMMY
+	~IP6_NF_NAT
+	~IP6_NF_TARGET_MASQUERADE
+	~IPV6
+	~IP_NF_NAT
+	~IP_NF_TARGET_MASQUERADE
+	~MACVLAN
+	~NETFILTER_XT_MATCH_COMMENT
+	~NET_IPGRE
+	~NET_IPGRE_DEMUX
+	~NET_IPIP
+	~NF_NAT_MASQUERADE_IPV4
+	~VSOCKETS
+	~VXLAN
+"
+
+# Uses internet connection.
+RESTRICT="test"
+
+# Go magic.
+QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
+	/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
+
+common_op() {
+	local i
+	for i in dqlite raft; do
+		cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+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
+
+	sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
+	sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
+
+	common_op eautoreconf
+}
+
+src_configure() {
+	export GOPATH="${S}/_dist"
+
+	export CO_CFLAGS="-I${GOPATH}/deps/libco/"
+	export CO_LIBS="${GOPATH}/deps/libco/"
+
+	export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
+	export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
+
+	export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
+	export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
+
+	export PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
+
+	cd "${GOPATH}/deps/sqlite" || die
+	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
+
+	common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
+}
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+
+	export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
+	export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
+	export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
+
+	local j
+	for j in sqlite raft libco; do
+		cd "${GOPATH}"/deps/${j} || die
+		emake
+	done
+
+	ln -s libco.so.0.1.0 libco.so || die
+
+	cd "${GOPATH}/deps/dqlite" || die
+	emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
+
+	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"
+
+	# This is mostly a copy/paste from the Makefile's "check" rule, but
+	# patching the Makefile to work in a non "fully-qualified" go namespace
+	# was more complicated than this modest copy/paste.
+	# Also: sorry, for now a network connection is needed to run tests.
+	# Will properly bundle test dependencies later.
+	go get -v -x github.com/rogpeppe/godeps || die
+	go get -v -x github.com/remyoudompheng/go-misc/deadcode || die
+	go get -v -x github.com/golang/lint/golint || die
+	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
+
+	for m in dqlite libco raft sqlite; do
+		cd "${GOPATH}"/deps/${m} || die "failed switching into ${GOPATH}/${m}"
+		emake DESTDIR="${D}" install
+	done
+
+	cd "${S}" || die
+
+	# We only need libraries, and we don't want anything to link against these.
+	rm "${ED}"/usr/bin/sqlite3 || die
+	rm -r "${ED}"/usr/include || die
+	rm -r "${ED}"/usr/lib/lxd/*.a || die
+	rm -r "${ED}"/usr/lib/lxd/pkgconfig || die
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	newconfd "${FILESDIR}"/${PN}-4.0.0.confd lxd
+	newinitd "${FILESDIR}"/${PN}-4.0.0.initd lxd
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+
+	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 "Optional features:"
+	optfeature "apparmor support" app-emulation/lxc[apparmor]
+	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/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index bc72b24a7262..6711afb51f17 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -18,15 +18,4 @@
 	<upstream>
 		<remote-id type="github">lxc/lxd</remote-id>
 	</upstream>
-	<use>
-		<flag name="daemon">
-			Build the system daemon, not just the client tool
-		</flag>
-		<flag name="dnsmasq">
-			Depend on dnsmasq to provide DHCP and DNS
-		</flag>
-		<flag name="tools">
-			Build and install optional tools
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index f2434716baff..0d08e9d3a261 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -12,6 +12,6 @@ DIST qemu-4.2.0-patches-r2.tar.xz 17868 BLAKE2B 3783d0f923ded66cce1195248981c83b
 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
 DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
 EBUILD qemu-4.2.0-r6.ebuild 24465 BLAKE2B 039d18ecffc0e41943b4b2263f5edf06e7bc4adfa8d1c95644c6d0d2e0fceb823c8e52e2549f939a4e699640fdc22dd68c3420054a933f335b008de888a70da4 SHA512 5585d835b938bb20a8959cbd41a9e86f9d0f993e9968e4b51e77028c536ee530d3bc2b25bdc31b0a3e13d27c2342b242f02a9478d28a66d5f588bfb7c9928c2f
-EBUILD qemu-5.0.0.ebuild 24541 BLAKE2B 041d0452317346b71370de0c9153a5906a4556e1154beec7fcb3e9c5fdce863a7cafa85cd9e54b6805efe086738fc2c2d19cec2038dc9cf9e86ecdcca8ca129e SHA512 ffb5465f32d1449a0e053bfa0e59a98bcecd77360e30c93a53bfbc06a4d19a442f212eca9c1900d420b8d240a9e79ed7cf7055eb5a4274d82959d9b669a35440
+EBUILD qemu-5.0.0.ebuild 24539 BLAKE2B 556790420f61cbc42129e0996b0f95a90faa1053469bdc4c6b006fdb9f76233267e899fafc58c1c64baf947d5239638fae9198ef4604f1cb7f6bcc5d005a0ee2 SHA512 83c7093c429fcbf8a1b582f8672c486f79f76e1fdf94c1014b4f3e895c8c08bf294dac511ea8bd46554758a0b8d2ec8d9d3d8fbc76f9b60613056810b53dc896
 EBUILD qemu-9999.ebuild 24541 BLAKE2B 041d0452317346b71370de0c9153a5906a4556e1154beec7fcb3e9c5fdce863a7cafa85cd9e54b6805efe086738fc2c2d19cec2038dc9cf9e86ecdcca8ca129e SHA512 ffb5465f32d1449a0e053bfa0e59a98bcecd77360e30c93a53bfbc06a4d19a442f212eca9c1900d420b8d240a9e79ed7cf7055eb5a4274d82959d9b669a35440
 MISC metadata.xml 4465 BLAKE2B ef8f4fcd42539604fd5d05228dc89b9bebe56490c20da6cd3244a9b9d8c5c66036562ff64e4a740c824a80f2fbfa70b6540873d223f4bb9f901337fe78e3012c SHA512 103ee38332f04a84527e177e9efc36847daa0bcdb6ea90a33ed8656139b7464f8d99dd6cdf7cc33460c87701786e8573cac532af2f84d5ae53d1b78c750ef770
diff --git a/app-emulation/qemu/qemu-5.0.0.ebuild b/app-emulation/qemu/qemu-5.0.0.ebuild
index db4f361eae93..31bb16d73133 100644
--- a/app-emulation/qemu/qemu-5.0.0.ebuild
+++ b/app-emulation/qemu/qemu-5.0.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index 2c83629faec5..43099d3880f1 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,3 +1,5 @@
 DIST virtio-win-0.1.173.iso 393902080 BLAKE2B a90da9d4e23a95c4cf9f02cc010664d87c987d7a9b82a90b534ec69041f763d73d7b37b1378078a162e7ef4f06b9d4cd6c5b7c4b98d77ff75bcd0d06a8ede8a2 SHA512 49cba35d74a3f480f6d23a57b68217f5732e8bcfb7657a4a87f16b286ad2c6ffd2509f034d0b4f363a389ce50d4d0e80e241f7ddff3e93b5dc315dad1713f08a
+DIST virtio-win-0.1.185.iso 413564928 BLAKE2B 84aa2d0ce16292b95431044618538f6dc176ff834f5e01b245414e27a74775a0e202c7b9262495de9d5f54476fe4dfa5e853f30b994e301080fee1a1c840f823 SHA512 62992baafce1f2eb52c23ba62291765c535c513e2598910083a8519eff58e8c57366d46add702e791fb07ec96c0fb65c9cff03b57e8f32b4357799c86b46c198
 EBUILD virtio-win-0.1.173.9.ebuild 630 BLAKE2B 5d5d9ddedd33ca2ad52c1b213edd46f7fbf2b3c310e2cbc176398bcdd29dd576bb542d1ba280720c8e717aa2f37e8aa88aa22f92c04cf42d520e45e99cb9a46c SHA512 7adef1a78a2173de5c41cb2bb2b0325a3163800c0089f6936dd21fa56d7aa8f94889c7b9da7c2a387342c27623e7e6ff55fb55ff5cd15a08025d89dec6b7a96b
+EBUILD virtio-win-0.1.185.1.ebuild 697 BLAKE2B 107141d59a78989c5cc47a712ace77c3c40be624a50fe76d0a576ed9581249701ba2edda868a5cab56f863978824817273e516137d62ee469e6dc4f816183de7 SHA512 37872fc77a00eb0c0ea43be87e53fce6743a249511861c8b357c489bc656664c4d0101ae1aac6d5875c93179965f17ed2b8c8fd626d964acc8f541ae7b2f74ba
 MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
diff --git a/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild
new file mode 100644
index 000000000000..317b5b926c06
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.185.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_cut 1-3)
+MY_DW=$(ver_rs 3 -)
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
+SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/drivers/windows
+	doins "${DISTDIR}/${PN}-${MY_PV}.iso"
+	dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 9b49e2f1d7f9..aa4dd40b8565 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -26,6 +26,6 @@ EBUILD virtualbox-5.2.40.ebuild 14429 BLAKE2B 1cb2f4e3a7c88984ad60aece1250e4bc1f
 EBUILD virtualbox-5.2.42.ebuild 14269 BLAKE2B f90265001cf0b4e5c5595e2c186ec57c12d274958d418cffb38b1671094460dae3683f762c6ce3d6b8f5d6e7eba3a7bc166f20ed6f541237ecaf0681c3233f75 SHA512 364d837d39f08905fbb133ff0cbdf83383f7f59733590c13f3cf88f637e3c6f5f7d51d9bfb618fa01610c667cbdc1fbf7bd11318183812e6100c0578bd0ff72e
 EBUILD virtualbox-6.0.20.ebuild 14663 BLAKE2B 5ece72f1aebadd85661d5af78e683067faecde668c7da1f3399c9bcf647ccb7b7da6aaf29f5a97915ba341aeadcb68d8f5521f203d33a3ba4ddf8b68bb1be84e SHA512 a5b7d584deeaf72e0970c592b36d96b7ec8a450c28c068615109d7ce09b915427ebf193b741d002a45c35540f4679c76851790e9e202e7616df8c5778ab76fed
 EBUILD virtualbox-6.0.22.ebuild 14363 BLAKE2B 0445a9c2f57615035d217dcf0a8a27978893b97ad7015dd930581d75b0640a7db5d1ae487b19f99d5191e28aa25e0c38c085048a75c73dfc4bbf394a4f5dbba0 SHA512 35fd8870bd1eac3199846d023eb2e68caed508189f1bc80b9a542cf494af81598dfea89be441277be17a33311b52f554412575f32310a5aa56ed9bf8ce86f879
-EBUILD virtualbox-6.1.10-r1.ebuild 14457 BLAKE2B 8dc8c0af62c8a506db6d3132bc48c45b9ef30100ca59aaaccb3fd914de02f1342c7c93c8b1f783f2fcc9be67773da9671e0facdfb2f2f56201b81a8f749500f2 SHA512 7a578827be81d285c935a19bd85c183f7d0b2c94f55726d19fb47b9d05686299bc0a5e8bbc44b2c20f3a788fe721429711e88887737b7bdd9fbf29911c69a72f
+EBUILD virtualbox-6.1.10-r1.ebuild 14407 BLAKE2B 8251d9a86e45884268d7edc7c3267d13d5ee8563b18e40e82ef318063f326c244b1969a37d2c14541fc528e46f9d5d3cd732bc1d3631fdde07546c9570d8cf86 SHA512 f38efad5689f2e1ef6ea8012069f9ee38a07ff038b0e95098cd032e9663451f393f9d6a068c1f06a41d899ee11428c7d565588bd033459b160316a95a17a4a4b
 EBUILD virtualbox-6.1.6.ebuild 14594 BLAKE2B 5b2ae3063e1e46a9808824f21666f67b7a95bba447b4811009678041c825d20728db80d9b446213b9b718478df262140bf89a6d55807382c2046cb63aa78a621 SHA512 ff526c7444a9c1c27535d8d24fb52d60e80d5a82b224e3926df4749459703a85924ad1be7b3df70feef1fcbc61da32da7d4ee184c64c14b1f8e25c115010259f
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
index ba14c3938f30..48c20b4aecc2 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 8881f0924916cef4ba5f7bfa39c3c3d8e02a7704 $
 
 EAPI=7
 
diff --git a/app-emulation/x48/Manifest b/app-emulation/x48/Manifest
index 5eb35ce52925..ca1176fc7cab 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,3 +1,5 @@
+AUX x48-0.6.4-static.patch 317 BLAKE2B 0ba80504f6dfdb992735496198808445778d6f75ecd7d21f276801857efcbf5a6d215d081b8ea79031fe5fcadf2dc1875854f80f6003575d9e2be03c2f7cb21f SHA512 22c97b2236b78c148cab19386718ea0be333eef8ab356da20f80d7805fdae4e73a1552faab15bd86a4644e2b149a924f65ba57cba5bef8f740ecb69930e7b794
+AUX x48-0.6.4-void_return.patch 657 BLAKE2B d72125691d4cabe90ea326f03204061ef3eca46e2b47cc43c91a67b3a994f8f995fbc313d368bbec1d3782d1aff46ff7064ebaf65f503efa28f0d468874f1256 SHA512 48d8fffff6f7a9727c813dbbc6332577d8d9f8622466af9658c135a2503a2b5b961f4c193cab3127352308716a9ab92bb6eb120897bdca9ae52482eacd12ac6e
 DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
-EBUILD x48-0.6.4-r2.ebuild 1677 BLAKE2B 2714c1760be4efb7c50365b2873a3db3a548cd819478d4df54db06fd6efc616bb73890c064e83c712abc536b9d49a6fc263f72c991dedeb944d98aea425735a1 SHA512 0742749fb892adbe543155c3ef58ddf8e0458c7c2c3cc81372e2af638716aa9d98524047dc3761cf33fc50e5727fa12c588a17d4a1224d57d16b788a2005ffcd
+EBUILD x48-0.6.4-r2.ebuild 1659 BLAKE2B 0563a9afe94bc637528c92ed63968023877031529daa67e8cb5086ac1fb2fab124666278e95cec50a1ea0e9c75de408ab6626c9c79c9d6deac1ed3e58fb96b66 SHA512 ebf6faa4954df214b72082c0b22b34734ccac4a5909a6e6b0996ba1a05050e9c80d4dd9e756e2b8eddaf80877bc8aa948b4f8dc3e51acf5a29757669819f05ee
 MISC metadata.xml 723 BLAKE2B 98911516312cc5d5617bbf9d6e33915608b30639c2354024cc74407888a699cf7464261fc7d40afad3fd6632ae39da74b5f90ede1bd51e491d0193c759d8ed07 SHA512 0de7f42012bc6624f1eca6d08c3807185f5fcd7b44a34fd701cd7af2ede5b0ab21f41b41fc7b784b3fe641b3b12b58ae412a2969679fbfcc1edbfd99b6e39685
diff --git a/app-emulation/x48/files/x48-0.6.4-static.patch b/app-emulation/x48/files/x48-0.6.4-static.patch
new file mode 100644
index 000000000000..f832e877b76e
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.4-static.patch
@@ -0,0 +1,12 @@
+diff -Naur x48-0.6.4.orig/src/emulate.c x48-0.6.4/src/emulate.c
+--- x48-0.6.4.orig/src/emulate.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/emulate.c	2020-06-23 21:30:30.895538239 +0200
+@@ -695,7 +695,7 @@
+   }
+ }
+ 
+-inline int
++static inline int
+ #ifdef __FunctionProto__
+ decode_8_thru_f(int op1)
+ #else
diff --git a/app-emulation/x48/files/x48-0.6.4-void_return.patch b/app-emulation/x48/files/x48-0.6.4-void_return.patch
new file mode 100644
index 000000000000..521ab6cd0546
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.4-void_return.patch
@@ -0,0 +1,24 @@
+diff -Naur x48-0.6.4.orig/src/debugger.c x48-0.6.4/src/debugger.c
+--- x48-0.6.4.orig/src/debugger.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/debugger.c	2020-06-23 21:33:16.071667987 +0200
+@@ -1528,7 +1528,7 @@
+   struct se *se_next;
+ };
+ 
+-char *
++void
+ #ifdef __FunctionProto__
+ get_stack (void)
+ #else
+diff -Naur x48-0.6.4.orig/src/x48_x11.c x48-0.6.4/src/x48_x11.c
+--- x48-0.6.4.orig/src/x48_x11.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/x48_x11.c	2020-06-23 21:33:32.132680745 +0200
+@@ -3833,7 +3833,7 @@
+ 
+ int last_button = -1;
+ 
+-extern char *get_stack(void);
++extern void get_stack(void);
+ 
+ int
+ #ifdef __FunctionProto__
diff --git a/app-emulation/x48/x48-0.6.4-r2.ebuild b/app-emulation/x48/x48-0.6.4-r2.ebuild
index 47413f324968..9e603e25e582 100644
--- a/app-emulation/x48/x48-0.6.4-r2.ebuild
+++ b/app-emulation/x48/x48-0.6.4-r2.ebuild
@@ -22,15 +22,15 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-libs/libXt"
 
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	unpack ${A}
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-static.patch
+	"${FILESDIR}"/${P}-void_return.patch
+	)
+
+S=${WORKDIR}
 
 src_prepare() {
 	default
-	sed -i '698s/inline/static inline/' src/emulate.c || die
 	eautoreconf
 }
 
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index e07f57c86f64..63ab410a0289 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -9,10 +9,10 @@ DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c9
 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
 DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 EBUILD xen-pvgrub-4.12.2.ebuild 4462 BLAKE2B c59b5b69a1d319637ea6ef75d2291957ff4d2c287d6b8744d55ded9c294122ee7fe0be38df368316aa5698a5f9f187364d3dbd42ff55259b48bfd2fd3e844df2 SHA512 9b6247b8762c03a02209b84b4f6303813ea4dcb9de9071cc88fe478c24708b4344f21e73fb1ba823b1484d574df078d476b10616bb03d1418b013e7fb8d03afa
 EBUILD xen-pvgrub-4.12.3.ebuild 4462 BLAKE2B c59b5b69a1d319637ea6ef75d2291957ff4d2c287d6b8744d55ded9c294122ee7fe0be38df368316aa5698a5f9f187364d3dbd42ff55259b48bfd2fd3e844df2 SHA512 9b6247b8762c03a02209b84b4f6303813ea4dcb9de9071cc88fe478c24708b4344f21e73fb1ba823b1484d574df078d476b10616bb03d1418b013e7fb8d03afa
 EBUILD xen-pvgrub-4.13.1.ebuild 4531 BLAKE2B d02b6eb33a83ab30f33a6c382a3d1874c0d213b802f7a86287019b8af791499dc03a2f7f3e9414b08ecb3d4793a56a1f1ef5db5f5829e376e22c1378d83edd5a SHA512 80072e65336fc1eb94586a70187a85ff4a0d87ed95b7bc241b7ece0556374b3a78c0f91d38274da14ef9e9bc95de1f3e89d91e1df45269bd7ee25b213f656572
-EBUILD xen-pvgrub-4.14.0_rc1.ebuild 4543 BLAKE2B ed1d139dca8a51cb02799b73c40e27e9f962c779dd0be2cd687bd70dbfdeb5ba46e5723cb849b511e481116c410981bd6b7e231d5f99e25d0562a3d8a9ba29ac SHA512 cf81c20dbc2e954e80c879442a2e5cf324a7e9456864f377bc63e3da84c8ebc41378c37906f84e7ee1316a74a4fbbcdcd635d50314311c8402884846aba1106d
+EBUILD xen-pvgrub-4.14.0_rc3.ebuild 4543 BLAKE2B ed1d139dca8a51cb02799b73c40e27e9f962c779dd0be2cd687bd70dbfdeb5ba46e5723cb849b511e481116c410981bd6b7e231d5f99e25d0562a3d8a9ba29ac SHA512 cf81c20dbc2e954e80c879442a2e5cf324a7e9456864f377bc63e3da84c8ebc41378c37906f84e7ee1316a74a4fbbcdcd635d50314311c8402884846aba1106d
 MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc3.ebuild
index 7dbff03ddf2e..7dbff03ddf2e 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc3.ebuild
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 55faef35f2e2..81a2a1307c5e 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 2282 BLAKE2B 203f67494340144d139aad0149555293aad1489eaadded057ae3bd8a6f9d827b968e1fbafe354611fb2849684467f3cbed5ecbee3402674d7dbdc98ebfc4c591 SHA512 9ed9b37dbba6e9dacd8f9371f3f9a0f6e2fe19a98f2766b1dc30be4b83c8f2c3e37fe8f06e3f93447cef950b1dfb4e2779adf062669beb840fce6ce516353310
+AUX gentoo-patches.conf 2282 BLAKE2B f0c369e500213ed72736082719f1b6a7188d1ab92151451704947cce3f8fe597328385cc85c97e9c249da7699d32edf3f97bfe07922e14eb01c8dee4367ee624 SHA512 d6673d82224ac01e7257110aa213ab4c898adabc653fa99d78314731d410ac094f87d16a625e682bddf2cc9dac1365780f44cbe592f02f32c064c37707714a71
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -29,12 +29,12 @@ DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912
 DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
 DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113 SHA512 9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
 DIST xen-gentoo-patches-20.tar.xz 17376 BLAKE2B 909795f611a089ab1eee86db5f034cec963c831873b3088f0682cdb7ec5284e75a4d49a5a1c93ee7a7e7ba3a899648b38928a1c7b726e019c2a90b66e31fee4a SHA512 d06b846ccb8c488f7155437cdf220533fc2d23ad13b0a2bd4d69d68938c4858fdb961c9e59f57c5228368b4e60dbbdf81ec15b77ecb0639bbf475333f8bf4b97
 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1
 EBUILD xen-tools-4.12.2-r1.ebuild 14966 BLAKE2B df7d4e20a1184631204f0e6f31f041c52bfd09a4c6d883a80d58f0d88cc96ec1cff25659a8995383a00f153d020b22c1e8a3a3f0e7c807dff382cae9411f2db6 SHA512 f26b572cd184cf0243d9b0c54dfb6746ecf52696e5e96858262def32530515d503a5cfbdf3f39ab8d029f4cb72a32f84f78f842f7fdfb4cf0f6e8b346a593090
 EBUILD xen-tools-4.12.3-r1.ebuild 15181 BLAKE2B 39160d51e8c2d0a6452d4a4eaa6e95237f3e5fe5d8d945733a69402c9ac16aee82879605cc61020035ca9a82ef6f6e8c7030a21daadf7de8815147040d9bdad3 SHA512 7f85d1919c6d9c93bff1b1b22cf86660cc4b776de4d910549840add24c209fb67c57cc802ef448852b85b1c8236f57457e258469916801fa5858aed22f73010c
 EBUILD xen-tools-4.13.1-r1.ebuild 15865 BLAKE2B b5c85654d0c166053891f045db686be4ed88c3252bbdf370e480500d94b7b189934d3930658159b6c6734d3b7d4664201e3c61c02b9be891cd491e584e0d6a66 SHA512 993b4b5675932eab2a2748d89faa58e0666d7dd36a39ed86da0ee21d45b4a002dbb559cdcf7b4ed3120a5a4eb9b56e64eb49daf4f525cb77188f3c24b116bcff
-EBUILD xen-tools-4.14.0_rc1.ebuild 15877 BLAKE2B ff7c4dab2e1dcf2c8dcd13c819d1890b2667079f2f08d23fe4c0661b7345a3c2b36f010c0635308a5193de6c60285ee6933c56608848c3bd2f8064bf15f4f481 SHA512 b17973909ed7c3811b9d907ab3f37074211a7cea070a25b138b7aebb370f4eed763d49d69d0bd46732cfc361a7ce094d12a15be22169bf2d67f2ad5959de7bcc
+EBUILD xen-tools-4.14.0_rc3.ebuild 15877 BLAKE2B ff7c4dab2e1dcf2c8dcd13c819d1890b2667079f2f08d23fe4c0661b7345a3c2b36f010c0635308a5193de6c60285ee6933c56608848c3bd2f8064bf15f4f481 SHA512 b17973909ed7c3811b9d907ab3f37074211a7cea070a25b138b7aebb370f4eed763d49d69d0bd46732cfc361a7ce094d12a15be22169bf2d67f2ad5959de7bcc
 MISC metadata.xml 1662 BLAKE2B 1b243436df5eb36e30f73b36db45d859aa03f7e9d3360fcdb91c35e3a1c00f1217e5e7cd1461b65d9da2883f5e8ca969b958f9b2160def4c1f15347c1887b2cd SHA512 d6cdf124c7767727f7c8d16a2dc0f85a7213db21f8d1595f7d8899c7cb81d47849fd05759ccfc460630c32917e64ea31ef6384dc050ab0eb392f571b12db68ed
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 5ef7519e2242..052e818a82eb 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -84,7 +84,7 @@ ${_gx060}
 "
 
 # xen-tools-4.14.0 patches set
-_gpv_xen_tools_4140_rc1_0="
+_gpv_xen_tools_4140_rc3_0="
 ${_gx039}
 ${_gx027}
 ${_gx028} ${_gx029}
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild
index d629c5334896..d629c5334896 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 7f54aca4b79a..937068f7c953 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -4,8 +4,8 @@ DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912
 DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
 DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113 SHA512 9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
 EBUILD xen-4.12.3-r1.ebuild 4438 BLAKE2B 19b7c8084893bbe6541dc3fcfabbbf6c2f940a0153bb310c23fb66624dc7b5e8ab4108847f5d68879766adae727df6f1a2373ef39f3f080e8f99c093ed20dd6d SHA512 ba04b747df09c27dc0d99ed2b9b585c00eb0da1b6537d0022c3c542f7a4a1febaeda8ea2d11a960075ec53620679c4543f5f924f8af62e0b1d6050362c09b60a
 EBUILD xen-4.13.1-r1.ebuild 4445 BLAKE2B 8b289338889c90f355c4a8e87d851394a7148606ea4443f026fc02a174ad8d73f44f291b68427cd1427d54509b8615918435271edec126a7a89267d28cc874bb SHA512 03169328b982de9905dd3e9e6099b6b1bb78b23ec8c00a12e99c2d7fd39abf005f5e9278817d3c567a1a9dd2442e3f00b443188d4158121f2913704a93f51585
-EBUILD xen-4.14.0_rc1.ebuild 4457 BLAKE2B 69ce574c00d0f6b60746619ddb18236ce21a637e94807957e43550a9529a67ff094ea70d311743a5af445225c59b38b1dabb0416d56b3fa784618405847d362c SHA512 f44a41e679e5d63b3b1eadb29cde9bd17e3706ee99f561b67bb90333c0b49735ff01c64ae964c10e03f61567e67173eb697e0772e0ec4b8c99158aba741d2ba2
+EBUILD xen-4.14.0_rc3.ebuild 4457 BLAKE2B 69ce574c00d0f6b60746619ddb18236ce21a637e94807957e43550a9529a67ff094ea70d311743a5af445225c59b38b1dabb0416d56b3fa784618405847d362c SHA512 f44a41e679e5d63b3b1eadb29cde9bd17e3706ee99f561b67bb90333c0b49735ff01c64ae964c10e03f61567e67173eb697e0772e0ec4b8c99158aba741d2ba2
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.14.0_rc1.ebuild b/app-emulation/xen/xen-4.14.0_rc3.ebuild
index c2aafff59da8..c2aafff59da8 100644
--- a/app-emulation/xen/xen-4.14.0_rc1.ebuild
+++ b/app-emulation/xen/xen-4.14.0_rc3.ebuild
diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index 8b605bec37b0..046ff9c1d0eb 100644
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -2,5 +2,5 @@ AUX xtrs-4.9d-lcmod.patch 3717 BLAKE2B 1172d6bd65ab10f983cd7793157a45505e16d6300
 DIST ld4-631.zip 106955 BLAKE2B 1c0e04186f14fcc840568521b09c7b55318a87dc49e394d516aa742fe7e5c499ac79771782f9b7ee687cdf55df159cef09897d19976879d4c60fff2a33f7f7c6 SHA512 8c6a24bc0af9326b5b935d7cdb1932b4cb714ab336167fed36f4f6d976cd80fe1d4d6a76e6374366fdc3fce623b2bdd6f9059a964bd6d29f59d6a052a1924c4a
 DIST ld4-631l.xd3 692 BLAKE2B 7870135e999cd358d7a3e5c254908757fa059a61654403ba146b8b866bda450b53fd1821dd3e3f8fc5c0acd17d0935d83b5df814c8e12eb5748bfcdf5688c509 SHA512 401d36fdfbceaf90673c5e9f821d26aa0a58b901d7e950d34361e5cde3252a070ff902019fcc1eb820fb1b2d3277e4c1da57ccc442ee407b0be4e5ca26dc2d13
 DIST xtrs-4.9d.tar.gz 455355 BLAKE2B b7ffda48f9a9bb534e33711b85c02734b7d3f8cee8d3cf2c2bc0a801954dcc1851b12451da03a14a7196368a9066cbaea953e871e8b68b4951f7439412e9e34e SHA512 5d6a2e1d4c2f2df63eaec8d015ea9e485615d82b7923af5c03c394862a31b1e6be2329aca18c0fa0c7d6b984164bb9b4d18f94a3d8cd140a683c5197ddff2249
-EBUILD xtrs-4.9d-r5.ebuild 2262 BLAKE2B 6985dd489ca79968ce445b8a247db8370cfb7d9ebc12dc543f28467121160af0a8db95f80711379eba1d232a26ae13f1545a14a4927dbb7ea1ea66fc1bd8abd5 SHA512 ce5dc1899a0de416862f0bf2c2adaee90adc54f25d4b124a5d328a6a9e789734a6e035c783eab229bf2f11413be87692234732183794a2f08c2bf9dc9b6fee3d
+EBUILD xtrs-4.9d-r5.ebuild 2265 BLAKE2B 01bd54df7e249888f978685334a91b7e6aedb6d5cdaa9072d9bab7a52fc92f684c15490cf873ffbd4d3748a4f31ca0d79090113bc9b546838f0e1b84f79718c6 SHA512 6645283559e7f820ad17bd1b13daac7deda694c6c3e321d6dd9b05190b0596990e7b4f30e19cb3e0ec0413d20852f709bc8ec57714a16b55beeeea67afe4cddd
 MISC metadata.xml 1106 BLAKE2B c19193deafa9ffc2b7e00df6386b1633b9180bad0ac7a6884822d38d8539f3734375a3ba5ce74c5cef895bb41d54c0b252971bd8dd03da7faa79c327c1db1b22 SHA512 fc12b813ea60239dbf8a94d98263cd77d4e35051fc7f9772547c0f52e37c02ed466f72eb5f63070d67bc86a6c546cfab4b2b01e4f994a91ae4e88569cb1beacd
diff --git a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
index 34629601e862..4785a873f452 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,10 +6,10 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="Radio Shack TRS-80 emulator"
-HOMEPAGE="http://www.tim-mann.org/xtrs.html"
-SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
+HOMEPAGE="https://www.tim-mann.org/xtrs.html"
+SRC_URI="https://www.tim-mann.org/trs80/${P}.tar.gz
 	ls-dos? (
-		http://www.tim-mann.org/trs80/ld4-631.zip
+		https://www.tim-mann.org/trs80/ld4-631.zip
 		https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3
 	)"
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
commit	90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree	83fc5facb6b12be510a37bc3d241cc63e965b13a /app-emulation
parent	feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)