gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /app-emulation
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
67 files changed, 1525 insertions, 1633 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c06500fc6e8b..23fc49cdeaae 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 94707d47e5b6..9a0faac40b1f 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,7 +1,5 @@
-DIST buildah-1.14.11.tar.gz 10660686 BLAKE2B ae24982b2da66b536a0bbba21d07da8c54af7726e065545c2ab6167395ec45f7298c25811ab0e2aec5ffccd084557107313baa36f873327d7b520a61dd8081af SHA512 6522ef39cdf6166ddb6eca6e43025953d025b92a677055ec026f4e163b0bb4b3334e20369e5850593189822c74fe82e39807ea387ad22ee64b3557bbaf8e30ce
-DIST buildah-1.15.1.tar.gz 10344892 BLAKE2B e84f8d245536f8864f057f576d92c218420ac975fabfbdc8b6bf591c2ef43494d49fe9095320a07de450f2ea64d046aa4ad680f08be80210e0dce1ffa874a286 SHA512 61cbe91867dc664a9e76b367e0f99bf5c797c68dda7182ed43c6a6a5a72a0f0519e45db6b2746b26933d829834757cc93bdbd30c62ce6a947ee546dbc1f930be
 DIST buildah-1.16.1.tar.gz 10525480 BLAKE2B d7a174049b9a99d11fa31a1b52fa6acfe037197171c7112607d755c788509b0798af315d1fde5c229bd6e029fdd3e57ae93042044f373d4ff63fcb121264730d SHA512 c17358d71e9102ef5da530df54648eaa13a1384b06cd43fe74094cdbaa2dfda6aa6d1a218fb88e12898ae4b9dca2d8c555643326779c5f09b6a118f0a440d17a
-EBUILD buildah-1.14.11.ebuild 1129 BLAKE2B aca3d81fdbb6aec01fc0eda8fbada9a95b3b71ac302e06fdbc7532b5a09ba2d1f22c6a142926ac65bd86bfd4840509be5df1872b23297e7d68e1c197c6c4279d SHA512 bdd7624308543bbc66e7499a1e1a433e859f33af3ea5a2183eb047f3d67074e6e53edc403f3677e1135bcc81ca64de43563379cfcaa4f43ace70b95a90d1faea
-EBUILD buildah-1.15.1.ebuild 1136 BLAKE2B bad68647b29a09e0d995977fe7317eee20fa563ffd4c50152ccddb154a1eca7f6a22fc5a13d0e3af796a506b38f322775ddf70c712d4246fe230eb67088bbcd7 SHA512 88586493206c7db57feff5023af94fa849a96a22db51019a262c8c038174c655f543ba0c3e524925b4f3d9034cc3e648ed5bf792c070e09e5736f2d0ab01be0a
+DIST buildah-1.19.6.tar.gz 10815708 BLAKE2B c5ad1405d907f6d5973f55c15b86e4341dc4c7c0db32854b5b54655fe1af1606b1206f3c7a3e86f83962c2ab1355c9e2b770ada97abfd9b9f8f231bd4b77e981 SHA512 81a865b795588b86a61fdada40045c06f9f3bbf8bdc3f6e4c70a9e4c7b28bf3fc31dd080c9f7555a8924f8bffac10fad776275619053fee8039176d6d6b69571
 EBUILD buildah-1.16.1.ebuild 1142 BLAKE2B 6f18d182afb257f979e63e9b5773daf4ca5a116695a1e270572c182d9bd8dcb6413faa02f87a781489d96a60b87a22420dfa564b0ec3f9297ff5b8f192b07c05 SHA512 047b0a978aa9687b29c49cd2bc8df37a444a8d91662c8fd1ea393d0214f42ce0a5bc0b5bd4bb1cb729828f11ebdca9f3c60c1b36d21422241ae422a8252c7033
+EBUILD buildah-1.19.6.ebuild 1142 BLAKE2B 66e377badc4f4ab69dc41f0c04a88a92c7114f5a0171359898f3c8061dc04bca813f627cdf88390a89900d07f7ea8d89adca952a0434a0321cfc824534a6da46 SHA512 5beeba858d55b381e7de141256c6a3f07d4bad59367b3957977871b27105f455a4535a9152909a72c6bc11bc121cff5c5eef901a26ad6c5fa2f4497352f4bf84
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.14.11.ebuild b/app-emulation/buildah/buildah-1.14.11.ebuild
deleted file mode 100644
index 717adf3f3541..000000000000
--- a/app-emulation/buildah/buildah-1.14.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="selinux"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT=7a921ff79b
-SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RDEPEND="app-crypt/gpgme:=
-	app-emulation/skopeo
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-fs/lvm2:=
-	sys-libs/libseccomp:=
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-}
-
-src_compile() {
-	emake GIT_COMMIT=${GIT_COMMIT} all
-}
-
-src_install() {
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
-	doman docs/*.1
-	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
-	dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-	emake test-unit
-}
diff --git a/app-emulation/buildah/buildah-1.15.1.ebuild b/app-emulation/buildah/buildah-1.19.6.ebuild
index ef3db50fcacf..dd54c70e89b9 100644
--- a/app-emulation/buildah/buildah-1.15.1.ebuild
+++ b/app-emulation/buildah/buildah-1.19.6.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 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="selinux"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT=c967e88ef6
+GIT_COMMIT=7aedb16428
 SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
@@ -38,7 +38,7 @@ src_install() {
 	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
 	doman docs/*.1
 	dodoc -r docs/tutorials
-	dobin ${PN} imgtype
+	dobin bin/{${PN},imgtype}
 	dobashcomp contrib/completions/bash/buildah
 }
 
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index 66a0f136eab3..bdafcae634e4 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,5 +1,5 @@
-DIST conmon-2.0.20.tar.gz 64716 BLAKE2B d7eb464f5be0b117824571134f08077955f56e1637dd2cbc6b70413dc9a6f109a1b9b207f5523103f205659ac20cc65f5f2340475d771fdf4b852d6895887975 SHA512 b719e41e1ead0d38c0874a30901c5660dc8612dc7aa1c025068480846a1e458a744b55bb8d5d74d2c2ce38fdbbe03505fce216a2f2c0748740983e3272a82f0e
 DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c
-EBUILD conmon-2.0.20.ebuild 991 BLAKE2B 0f8d190d49a770b2438332c85b5de73427ff9b7f7ad1af199d63b972abb3003c5fdc9004be4a9e0bd8898257c80d26a533f5f5aafd99be6baf480ca4851cdc46 SHA512 8a6ceb7f1b5fc42638b5e43545a963676619884591950897a1e2ed001e1813de8a015f6e22e4b66502a31d69918d149c43c9fdb84481c2320ad9d26a1b028c09
+DIST conmon-2.0.26.tar.gz 104681 BLAKE2B fc8369258a414d3a169b64019199c604d1d8bded70d5a38230f243053dcf09c6f9aee931b328913e6cbbe3c495aab4894647897f40f537a79eb587ecee58517a SHA512 5cbb66053fb48b514f93b3be4d4ac428f9eea8a3e1452b4df232250e9cd01202ecb7477c05e1e4dfb21595f2d1881be35cdea9b23f43c02bb7c0e67a3161396e
 EBUILD conmon-2.0.22.ebuild 1184 BLAKE2B 75c40011ce14d692ab11310ba9e32a9bece265c4f636680bec93186fc9d751e916ef2ad4b9e6cf9f7ebcb6a6d38ff7d37f6f7ba68a50a73cc17564ad1b9a6b73 SHA512 22244dd45ac55b9231b685f0fdd7dcb62d9f4f08f7aea114cc2eb161e3911435f7042d47a7464130d240fe065871694c46f6caace4b6876dd3598dafbe154d6a
+EBUILD conmon-2.0.26.ebuild 1184 BLAKE2B efa932a65151a81d7163adce779affaa458f61a7afee968352af3703189660c5051d3de0b09dc17e1a26057e63a8f5e7b54503fb8b3d103650fdcab60e6a8b43 SHA512 91eb9099ee247b638a8cc5d256278e4dc23c7e40b3053e91d7b724f1ab6658f690e5e8cda79b0176a976319fbe1006ac095b81bec3f1a0646a5c22f20aeb8061
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-2.0.20.ebuild b/app-emulation/conmon/conmon-2.0.26.ebuild
index 8aa13fbc4d2a..e2e8f1c90b90 100644
--- a/app-emulation/conmon/conmon-2.0.20.ebuild
+++ b/app-emulation/conmon/conmon-2.0.26.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_COMMIT="13244db638cf987c415298a3c23393ae5abeb885"
+inherit toolchain-funcs
+
+EGIT_COMMIT="0e155c83aa739ef0a0540ec9f9d265f57f68038b"
 DESCRIPTION="An OCI container runtime monitor"
 HOMEPAGE="https://github.com/containers/conmon"
 SRC_URI="https://github.com/containers/conmon/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -16,7 +18,8 @@ RESTRICT="test"
 
 RDEPEND="dev-libs/glib:=
 	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man"
 
 S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
@@ -28,9 +31,12 @@ src_prepare() {
 			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
 			-i Makefile || die
 	fi
+	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
 }
 
 src_compile() {
+	tc-export CC
 	emake GIT_COMMIT="${EGIT_COMMIT}" \
 		all
 }
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index ec4a1bee15a7..7b88e508120a 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,9 +1,10 @@
 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
+AUX docker-compose-1.28.4-setup-py.patch 1844 BLAKE2B 5e9d683c5e90d30662555c050a07a3d13dd646028b62b9abfa19c84b9e3d0395fe2cedccbc8c352d6c2b89aca0244c750942ba7fb5e25fd2721c18bb47b6d008 SHA512 c60a3d56def25bdf9e884f0af8dcbba8e30d6aa05a8fc3efbef170807f007e67c2177340d6992688d531a937fbd2671656ddf74273dd4c8b4b5511dd73795cd1
+AUX docker-compose-1.28.5-setup-py.patch 1844 BLAKE2B 5fee25a003a6c0b2afcb17a38959a8f0c2284ec3f6a8ff2e09afee946dd68a4ef36d66b629922867baf7e16db26ec9b89aa943b7f1f4ee134d0881fa76024290 SHA512 fdc35b95a3a43c250aec3f71b5322badaac45a03ab17dce789ae114b0a9a5f2a493d07d3b177e295cd0ad94f0bda191eaae139517a50e229de1de599216e888e
 DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
-DIST docker-compose-1.28.0.tar.gz 318112 BLAKE2B 2e721f2aed08f8c63c7c75aa91e6ee28d997763a7d93921e9a62c41b7d48943221aa2135e6ba3925db67b2376f662f81ef71df15180895ea4d5ced1edd0cc493 SHA512 c673f25ff993e7dcaf75512c378339bb7435d96310bf9a47ee3fd3a515967b323ed911b77c030a8e9c1d04b8aca235565a0ca0eaeab401c4ac48110712da405e
-DIST docker-compose-1.28.2.tar.gz 318196 BLAKE2B 60827043135b1b1455ce0fe8cd3b6bdfad025af80d32b805e7a7a9df7949808b6575555e860a2d0f57bf07af44cb7847b38146accbb2c4eec9a8919bc4ec4141 SHA512 ababba47717e31187243478ba4a9d4082e2f64a05a0bf48cbafb2a44b62138d7dfb1cbb88da4c388b559cb35d53bcf4c42617f6ae02412b7a65f02cb09255e45
+DIST docker-compose-1.28.4.tar.gz 318110 BLAKE2B 97a39c52a2e9819fa4632a16080b9b3a029c5b81caa1bcb5143e78b9c6f3981aa462ef23c6c08fcafe80f8b786ce4962959dc84fd4fe2003ceee3dddcb85f438 SHA512 ba0b8a8a87e154c36b499b0fbb422847bcec421bdcbb6a7fc4a4d8169ae410f6bb71867fbff42b670b3d5ae61101527eeb71e68d57458906796e2d64adc0e367
+DIST docker-compose-1.28.5.tar.gz 318236 BLAKE2B 32aca16fdebd00c5b211404e82b44b9486340bfa379d4739d164d5aa75d4f35b95d914065c05fef585ea7e412035e582d8058f2b942a4ce17a9b2bc25ff0cd31 SHA512 1f2cc87b82d18c023e8c2d9eb2e991393c96f7a3ab17fa6871d0969a28162b6832f98b42c76cadc641416629f74eb00763c89e044ae8cf02a062bd74b58371c9
 EBUILD docker-compose-1.27.4.ebuild 2108 BLAKE2B 9d7a0dfad313a4311a188076d2cb06975f15a36d98d030c9f5bda18f0d5d7d35d70d65e0ddfa817eef560e575004e7c05f9b06e3a2a0582096f3d8476d480916 SHA512 e378202a4f2ae68eda0750a391d74c7fc9a2bc7614d4db4fffd32b6ca683989ef71e73c72a1d00e5e687296500c06a072c82c3b959b1c794f8942fdd94c33096
-EBUILD docker-compose-1.28.0.ebuild 2110 BLAKE2B bd958943a59a86265c73e0b91e3343e8612842d9a3bfa46daf92f216f4d96ad5502ec010be1a76e4ff217ac2cdd451b4c65242d8cccac1f93ccc543482b16e77 SHA512 f3de0fff00f8d8bee48c4642e1c07a764c2ed96532d0bffe6a7d5ff92f42b30e6f97212fb4b4effbdc455c93af117206c021cb4442e2eaa8f316577ead7a09d3
-EBUILD docker-compose-1.28.2.ebuild 2110 BLAKE2B bd958943a59a86265c73e0b91e3343e8612842d9a3bfa46daf92f216f4d96ad5502ec010be1a76e4ff217ac2cdd451b4c65242d8cccac1f93ccc543482b16e77 SHA512 f3de0fff00f8d8bee48c4642e1c07a764c2ed96532d0bffe6a7d5ff92f42b30e6f97212fb4b4effbdc455c93af117206c021cb4442e2eaa8f316577ead7a09d3
+EBUILD docker-compose-1.28.4.ebuild 2106 BLAKE2B aca5e45b0979591607a9468e4dfd1d74cdc46a6ca37f1bee0efd7ff74a043fe5d70f7a1d6b0e88f494f3be8791054a8c58afcf99a4ff45665599f2a59a92cef1 SHA512 29ac7efdddf077305e3aafed0786cfaa0af39c839e7fe129d20f540b17ad7b1d1ef276d574201be3e619aa2506b31d3909fbc709d097b59bfd59e4abe700c615
+EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be6f720ed4399735428abc46aba3e02b9ea11f3a34796f6fd89bce60e4ad614ec232293aa57c884412c5fa314bd3e9d1b65 SHA512 9310c2ac24b9d0d31505f78b1bfeaa0c87017c91bac5008de531f283fc4fd0a98343c8c80037616f427e9ed5d59e18dc6dfa96de297d19a580597727cfeff1a9
 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e
diff --git a/app-emulation/docker-compose/docker-compose-1.28.2.ebuild b/app-emulation/docker-compose/docker-compose-1.28.4.ebuild
index d610f83bb59a..0465f3ab0853 100644
--- a/app-emulation/docker-compose/docker-compose-1.28.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.28.4.ebuild
@@ -22,7 +22,7 @@ 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/docker-py-4.4.3[${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}]
@@ -46,7 +46,7 @@ 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
+	"${FILESDIR}"/${PN}-1.28.4-setup-py.patch
 )
 
 DOCS=( CHANGELOG.md README.md )
diff --git a/app-emulation/docker-compose/docker-compose-1.28.0.ebuild b/app-emulation/docker-compose/docker-compose-1.28.5.ebuild
index d610f83bb59a..c59a93b5bff8 100644
--- a/app-emulation/docker-compose/docker-compose-1.28.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.28.5.ebuild
@@ -22,7 +22,7 @@ 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/docker-py-4.4.4[${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}]
@@ -46,7 +46,7 @@ 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
+	"${FILESDIR}"/${PN}-1.28.5-setup-py.patch
 )
 
 DOCS=( CHANGELOG.md README.md )
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.4-setup-py.patch
index 0eaac41d742a..79b1c168170f 100644
--- 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.4-setup-py.patch
@@ -22,7 +22,7 @@ index 57e1313..94a3337 100644
 -    'texttable >= 0.9.0, < 2',
 -    'websocket-client >= 0.32.0, < 1',
 -    'distro >= 1.5.0, < 2',
--    'docker[ssh] >= 4.4.0, < 5',
+-    'docker[ssh] >= 4.4.3, < 5',
 -    'dockerpty >= 0.4.1, < 1',
 -    'jsonschema >= 2.5.1, < 4',
 -    'python-dotenv >= 0.13.0, < 1',
@@ -33,7 +33,7 @@ index 57e1313..94a3337 100644
 +    'texttable >= 0.9.0',
 +    'websocket-client >= 0.32.0',
 +    'distro >= 1.5.0',
-+    'docker[ssh] >= 4.4.0',
++    'docker[ssh] >= 4.4.3',
 +    'dockerpty >= 0.4.1',
 +    'jsonschema >= 2.5.1',
 +    'python-dotenv >= 0.13.0',
diff --git a/app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.28.5-setup-py.patch
new file mode 100644
index 000000000000..75967139165a
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.28.5-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.4, < 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.4',
++    '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 430ceabc5861..83715f45fdbb 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -2,6 +2,6 @@ DIST docker-proxy-0.8.0_p20200617.tar.gz 3386043 BLAKE2B b32c3b6ef97f656414fdf02
 DIST docker-proxy-0.8.0_p20201105.tar.gz 3386010 BLAKE2B 414c3d37cfe2f36dbb5cfafc6047ee0aa299ba2aeb9c5c51da308285b1e2cc0a32e83557628e0de4817651331fbcfd6b430a88fd5a0f97bb7483a8fb10ae0791 SHA512 3d81ba20a91517e14da7e75a24d4e2eeb04c1dcb9c1bfe1115247982dbdb55d2fd72d0130093e9597363b742a20f2647f229c870da9a1cbdefc69aef65f02250
 DIST docker-proxy-0.8.0_p20201215.tar.gz 3152956 BLAKE2B 7652bbc027d0cc535c227268bf240132f070dad477ac5a8b82f65d3d3ecf7c2a036a45ba66d0f3f0f0a8025fb990e931429d797f4b9f7c6796507ffd2f41e358 SHA512 dd583218fbeba8aeac2e4143369ad55a3e6c15d64f198f73e3656a80d0281a4374fb3be7bc05b01425461bf830762aa2c950da68ed0e3ae5884643e9d178c69e
 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
-EBUILD docker-proxy-0.8.0_p20201215.ebuild 798 BLAKE2B b6cda5e70e45cfd7694a1dc219e2057ba98b7f220a2976cd6332045eace33dfa6769db01a4892dabd86da8ebd1dbf57e2c01116b84165d3b04391ca16caadd92 SHA512 b82bb27d607f3c5ecae046552930e737f35c341617f7280ddaa6036fd35806813f22960d3c536fa6e5ecff4c38871ee209100602691785a2587f0b365f12b5fa
+EBUILD docker-proxy-0.8.0_p20201105.ebuild 793 BLAKE2B ef106f02423b5546b7ab2934552197fca9ff3eee9279764aaefbadd2a287a5fd49915a0a695dd0f88b7f526a3f64bac3a4ea918e975722775685545c42a9702f SHA512 ca14b9a7dcb36f21cb1147b6e2178b2c96cd8b91fe7fbebeb41d13500c6591b1602796611306655b537a23bccc85c7748865079ab5fddc124d42d50491092a57
+EBUILD docker-proxy-0.8.0_p20201215.ebuild 819 BLAKE2B 088e4022f55e967e17c5c9c9a7295a40b687b39b1ab8bf77e350c5c9d527c80be325b3af4c0a4c520b2ed98aa3bc993e302d535f9cb35aea3ecd9b8ccdc202e3 SHA512 145fa96d675106c8f2b3da0b4efb61bdc01fb472bb4176aff97272a02b971015b25e5946ff3b81931505dcce1faf3d6404d85d0219d43a286dc50bf6f99a4f55
 MISC metadata.xml 442 BLAKE2B eb43f7702d67bafa12d83006f4b6b72e5cf27e0493a22befa5e58b65e7e4b890034858052e9a7b54a36f60b28290f67e43bf2af236b56e781b51f4cad7a59a8e SHA512 8fbdf6808b9aee1a1443200d31567f818ca0a01e59c202358eaa4bde7382626ffc77da8c09038c74dc24a9c18916cacb217c1e56a9e5c06b468680cc9dcb0054
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild
index feb57a0f2c36..40d357a97cd0 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild
@@ -26,7 +26,8 @@ S=${WORKDIR}/${P}/src/${EGO_PN}
 RESTRICT="test"
 
 src_compile() {
-	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+	GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \
+		go build -o "bin/docker-proxy" ./cmd/proxy || die
 }
 
 src_install() {
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild
index 61b8e08632b5..374292183eec 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201215.ebuild
@@ -26,7 +26,8 @@ S=${WORKDIR}/${P}/src/${EGO_PN}
 RESTRICT="strip test"
 
 src_compile() {
-	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+	GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \
+		go build -o "bin/docker-proxy" ./cmd/proxy || die
 }
 
 src_install() {
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 4f0a6b1fdd64..f232d66bcc1a 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,5 @@
 DIST docker-19.03.15.tar.gz 18284803 BLAKE2B a1fac5d841934382d12c781353546b7c7a8167d0f2dc4150659a4aece210ea7361c59de25e3d450dae20fd536ea8dc33a18e55f9565ee4fdc818166810391fbf SHA512 ffd8e683a93a6ce69789603d24457aebe3379594692cb3dadc25bc8d407771a29d76087b0ca70856707f151622b1853f283a1071311c033ff90a1e44b0d9ffbc
 DIST docker-20.10.3.tar.gz 11063792 BLAKE2B 9309573dd83d0746bb492cf68e06d69e60550718f8f934a065b33d1538847a4effcf6310638daa9b535515bc43cc1b47636482c90d4499f2b46b74aa37882dd7 SHA512 8389980e0b47e34872301bbe703d7abfc7819946736bab0ef4fee983daa4f798c7c6373d823dc62a3995076e71ca6bc86dc793f736b68e8ec1040332193cfdb8
 EBUILD docker-19.03.15.ebuild 9217 BLAKE2B 8f0eeca1ce67fd8507ff2b8e5e21aaa3191325c3a27acc50d9749bcc235cc0e40d5fa3b47c4076e0a2b00699e1583a5dbe913a3661eb552816076f27f4b9c39c SHA512 a6a6e934368ab9a16635e5e4ef610ef8df087126e33ca59c90f253c5e8357ef761e60d58e275eca012176c65576d90f4213913137f84bb3d063278efe6173c6c
-EBUILD docker-20.10.3.ebuild 8102 BLAKE2B 1cda7fd700b096e0d21428f40e66331276e65269615eaa5f25f1a78fd1d8c9cb21419621479429dcd0bfa59119b69b1e6fdfa1d27b7b9ac37d9356a61050d6a1 SHA512 3755cc9759b8e544763869a6ff52d73060ddd04c149704c02de9e2ce23decec443ee95f162eaaf6a270a3191cdc604eaa5cccb86e30e6fe356b76690ea6be8a8
+EBUILD docker-20.10.3.ebuild 8121 BLAKE2B 2ab68913890270c53ad7b67b941bcd72547d42384cb45f0fbdb7b4f8b9ca0448bb1b590ab5ff2b0e2e141bbd6cff6b705a7a6455f2622bd213d2b6834514a08a SHA512 4ae778e36eb98c8b8942896b92bbbe16d40179a78797e4b8865c2230bbf945135bcd66ca9a8ed2af6ad7bc3bb93618a23a4d33affe089342bded3dc24e264403
 MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3
diff --git a/app-emulation/docker/docker-20.10.3.ebuild b/app-emulation/docker/docker-20.10.3.ebuild
index b8b0e6129674..fdb096725858 100644
--- a/app-emulation/docker/docker-20.10.3.ebuild
+++ b/app-emulation/docker/docker-20.10.3.ebuild
@@ -61,7 +61,7 @@ CONFIG_CHECK="
 	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
 	~KEYS
 	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK
 	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
 	~IP_NF_NAT ~NF_NAT
 	~POSIX_MQUEUE
diff --git a/app-emulation/firecracker-bin/Manifest b/app-emulation/firecracker-bin/Manifest
index 146d44846548..4498450449eb 100644
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@@ -1,14 +1,7 @@
-DIST firecracker-v0.23.0-aarch64 1596888 BLAKE2B 94453641206b32c42f86542d7c38a1e24e991abc1d425183e624f8a72cc74a51cf36e3463bd1c20b309a4bc4e97ebfb8cd95c47061e51cecdb8a8b28120879ad SHA512 08a51979e5979cbc5e8477e9400bcc03757a416e606903296764982f78a432749d168c4566d31df20a9bf68894b3e7cb1cbf39aee559513daa25280a9c891d2f
-DIST firecracker-v0.23.0-x86_64 2041024 BLAKE2B cb6a0d356a734ffb28ef6b88517983d1b9efac4127f8979fad085dab503446471d851ec00ff4da39b216f6fc9ba6a5d9d744455c0f1c1cbd7ef881d624536873 SHA512 5a24a95805240c1125f7fd17e69d5fea92781c3767f0a884aa8e433200e8f469b33502342d47843e5612d83d3157df59bf94a960a202978ca70dcf8f31865882
-DIST firecracker-v0.23.1-aarch64 3328424 BLAKE2B 2191e73700c9107fc30e84a044c0377c4486ecfee99deba99b0f6400036befca0d2f3f101154d851f0d7423208f8afc28e87678ed6005235ea9757a1913df3f6 SHA512 a1f5245cbe637f42f1145eb9daf3578610102535a046ea4be93dcd122194fd90305fde32840d59c50b798aa8326ea0d7ed715ab96f980a7d0e66608c33aa7ce0
-DIST firecracker-v0.23.1-x86_64 3290472 BLAKE2B 62315d4962b4debbdac383098e656e6c469b491f7303a7aaab06c885ec653b202f6a49a43ae0b76188d2f73b229c68435e19d316992eed64645decef3f611d5e SHA512 4bfb756a2ee2942a158857dfe82de838b52bc161d0ba97255eace1af4b57c3a630dfbb51413433a4fbfb3d95ba02719a608c1ea3f28a5485d005daa2c71abbef
 DIST firecracker-v0.24.1-aarch64.tgz 1427360 BLAKE2B 17d85c6843dfa90bf871d5ff7dc5f5286c7bd11559cb9a507f57fafaba7d5abbf1019239ea39529e29a8bb4fa32b9a8a44f096f1379dc2d3d801502890690024 SHA512 cbedc62e5b98cdfd6dfb565bc1b977d84fcd0fa28eb36e18922ec56c3c2dfa34c84c549c7a4e23aee9d16c53b212ef87128d42e68f1a6b9997cbec42e613a82d
 DIST firecracker-v0.24.1-x86_64.tgz 1434986 BLAKE2B a6b206042fe4dfa873cfa1da4f591242f0224d2c98b367635534497d2bf82e218c409e473be618bd2902594ea24a8c710c853f2f1a00ac96f917a100e80aec0b SHA512 b719520464e3d5c9ff072c73639af71895bfcca9ac4964f2a255ed2d8d3b264a92566f7b87078c163c0f1ce21b9d5bd11cb38eb7cb784c5e18581ee531a0bcaf
-DIST jailer-v0.23.0-aarch64 1350040 BLAKE2B def85c85daa27c648c638ed14128fef941a416269c536c55413116a686d5a0e614976fd718576a6e275ff12a1873885e1d569e2e054cb054f1278ecbe1279d74 SHA512 48de8688cf40e696f0a56689a2e6256f2be159fb1b593b223a9547c4760c1e94e245e1de77bfeeefbeffb8046b33768da1915482a62d6b36321b8c225bdef791
-DIST jailer-v0.23.0-x86_64 1457312 BLAKE2B 9a92c415e27a8442da18ab3134023acdc7b49f1246d332a864fb700180914c6b9a7f8747b1eef1657290df5287a946e0d5b0b689bd0b7a60486b472ba7b55290 SHA512 203d24794c3125afdd8cb1b07e69da4fcc40bdc9a3ec7c8e8a2deb8dc1a691156294eb4168c2422f631136a4fed7413136631b3957999fe00fb645aaed16f87d
-DIST jailer-v0.23.1-aarch64 2812344 BLAKE2B ef0b98a5438880d8473117dc051421faf4c9f4640fe017ba9cedeb88a02ff2a34fe6e0333bb7cb31cd436a95536efe5237d6a49ead6c7d1d3777928cc54f0baf SHA512 38876afcf6c5883b30156246b4b74905157b668a3e6fbe852b38a09a7f5ab5814fb9eaec87ef94390d2a40806c7b387b4266c8a0c4b4fba5e720f61d571bbcd7
-DIST jailer-v0.23.1-x86_64 2589888 BLAKE2B b22a908d551b3da8f882b9c18031f0904808d8f77783c046f9a8855e713074ea61327b7c8c5f875361728bd33e33e4cd84431ead5f1fae68bdca8161e88bdd1c SHA512 a6829ffbacd35349214087f4ba1b88304c6bfd23b50d9f97319a93fae5c94c6d0590649fbd0917f9d82b6a2a6faab1f7e37a447864a4960e0b77407ae535212a
-EBUILD firecracker-bin-0.23.0.ebuild 2668 BLAKE2B a8d81736e88bdba6216d6ce24f500fdb4be820cf3bd8a1b6ca1a27c67e068f05d2a9d4dc3944c7ad7c1acedf6ecac6f4984cbdd3b1c8f3ca72f5550e3b714fba SHA512 297f046eef8e3a18d50aa26591b3923c6e2bf8f24986e947b685186df88fd7fd974466f77423410ce6120a0195e9bc9ada1aecde47d825e554da22edba3e2afc
-EBUILD firecracker-bin-0.23.1.ebuild 2668 BLAKE2B a8d81736e88bdba6216d6ce24f500fdb4be820cf3bd8a1b6ca1a27c67e068f05d2a9d4dc3944c7ad7c1acedf6ecac6f4984cbdd3b1c8f3ca72f5550e3b714fba SHA512 297f046eef8e3a18d50aa26591b3923c6e2bf8f24986e947b685186df88fd7fd974466f77423410ce6120a0195e9bc9ada1aecde47d825e554da22edba3e2afc
+DIST firecracker-v0.24.2-aarch64.tgz 1429004 BLAKE2B 8d5624f6f6f154678ffab945bbb293e3ab53c75fa324273d9cd99366d78230aef1ce0a23c0b8efdca9fd87edabc0e196dda0cacabf7ebb33ec86edf7c46dd92e SHA512 9bd83d278c3f4f294c4391aac1bd82712bde7190ad706e1b84a0ec9ad489c09f5fa77bd448a25a08b932230b38e44b3dbcdcc37b2ccacfd87d37c7ee65e6c1c6
+DIST firecracker-v0.24.2-x86_64.tgz 1434481 BLAKE2B d2b81e2b3341317f296c63f14b2699dbf207e2e3a83871e38ef1666c105112788308c773afad61a85f7c6f4009f2373c80f12a52549120d92a42bae54891bf59 SHA512 2a574276296685117acf4e1d425ca75ecb8ad06680ae81e183d73853ff57cbca2f4cf4f42cb013d8d88d18146c0d84d2b098829ca5f6e9402213fecdf539a283
 EBUILD firecracker-bin-0.24.1.ebuild 2465 BLAKE2B 7e2fd7232b1d7409f10ea156e0813fa39da049858a71ff079fd14bf410141c63d5a9f87491befbd830bf3f323c5495ab7a8a945feecf741f5fa5a03d1985f4aa SHA512 9b910ba0af4ea9410dc573338e09396ea85d5850c957888b14c0bc92d7e4d78980335e252d8379eef3e2ee3bea5dead28b43890f7448df4bfef1bd9e57a23437
+EBUILD firecracker-bin-0.24.2.ebuild 2435 BLAKE2B 8622b836b146cbb96990dc0a65f8fc581eb8ded2fa281da6682a5bfc5fc91b65200b91ce8dd8642255eb0122d47f9318e22147f07fa89b5b24764caf34aa0fea SHA512 26d9df41a0be4785ef4b31bdf4160743c163ebae758d5241b7553469643449d943facbd8442778bc281736ca2fa4c9256360aec5b30b5252b5b664c5d52b6b39
 MISC metadata.xml 385 BLAKE2B 5637756b0993be1ae2695067acc7fdbeaae6c0d5e5cac29563a15bd54815d9b9e2c21d516754e95214f2007846c7b477ad7f70f3f42007d70552313e12e57942 SHA512 83790f17e3b5da6bea49d28a82b7eeb8caba881042450f63570cac4d3bd5d64c326ccc053b5b2f225b9fc68a8379707a77d2a484e51d9ce93399bab25058a123
diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.23.0.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.23.0.ebuild
deleted file mode 100644
index a23df2299d2b..000000000000
--- a/app-emulation/firecracker-bin/firecracker-bin-0.23.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
-HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
-SRC_URI="
-	amd64? (
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-x86_64
-	)
-	arm64? (
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-aarch64
-	)"
-
-LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test strip"
-
-RDEPEND="!app-emulation/firecracker
-	acct-group/kvm"
-
-QA_PREBUILT="/usr/bin/firecracker
-	/usr/bin/jailer"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 4 14; then
-		eerror "Firecracker requires a host kernel of 4.14 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE ~VHOST_VSOCK"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use"
-			ERROR_TUN+=" virtual network devices."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			ERROR_VHOST_VSOCK="To use AF_VSOCK sockets for communication"
-			ERROR_VHOST_VSOCK+=" between host and guest, you will need to enable"
-			ERROR_VHOST_VSOCK+=" the vhost virtio-vsock driver in your kernel."
-
-			if use amd64 || use amd64-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-src_unpack() { :; }
-src_compile() { :; }
-
-src_install() {
-	if use amd64; then
-		my_arch=x86_64
-	elif use arm64; then
-		my_arch=aarch64
-	fi
-
-	newbin "${DISTDIR}/firecracker-v${PV}-${my_arch}" firecracker
-	newbin "${DISTDIR}/jailer-v${PV}-${my_arch}" jailer
-}
diff --git a/app-emulation/firecracker-bin/firecracker-bin-0.23.1.ebuild b/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild
index a23df2299d2b..c8d53efcad41 100644
--- a/app-emulation/firecracker-bin/firecracker-bin-0.23.1.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,12 +9,10 @@ DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
 HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
 SRC_URI="
 	amd64? (
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-x86_64
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64.tgz
 	)
 	arm64? (
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64
-		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-aarch64
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64.tgz
 	)"
 
 LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
@@ -67,7 +65,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() { :; }
 src_compile() { :; }
 
 src_install() {
@@ -77,6 +74,6 @@ src_install() {
 		my_arch=aarch64
 	fi
 
-	newbin "${DISTDIR}/firecracker-v${PV}-${my_arch}" firecracker
-	newbin "${DISTDIR}/jailer-v${PV}-${my_arch}" jailer
+	newbin "firecracker-v${PV}-${my_arch}" firecracker
+	newbin "jailer-v${PV}-${my_arch}" jailer
 }
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 06765b3edcbf..f3d051f757a0 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,13 +1,7 @@
-AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927621f7e23f362fffbd537a0a988030713fe061398d2b7b2fc6120cda280249807d9aee448095b1f5cdfb824909d7d381650daafbd SHA512 192eb5e78c50ce52449c5b859369ab7258a98162c5d924ab8b8f3566f52be7a3c4aba95c3cafd60af82d5dcf1b1ad784cf3fe6bf432839baa1b4ca994ddf416b
-AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f590298c5a47f50a2a20f0ac5f1968b06be19d53f03e64dcf22134938c232f68a6b989250064f45e88196c7fc8e7e9e0fca71 SHA512 1c9a16e29087c492fe1ee5bba8dc118674f4c167b5bc138ffae9ee08ad735a5b5aa2eec2e25236e5aeb95b89c94d7903e08e22cfaa321cf3c458b54defe72af8
 AUX free42-2.5.16-fix-makefile.patch 1144 BLAKE2B 9bb78c5b5bde9fef99eace62c55e32ba769b7d900dd0ee06331dce908508d660d3324d547517bb6e806924511642970148d4a7332017b65743ee613e96ace4a9 SHA512 5bc11081460274078b87760054e3d554355eca651fe782a96d5bab7a450b61f3c007c3b9967c31412c74ce26d88f9cbd684307e5c0699427292233c3f0974093
 AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
-DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
-DIST free42-nologo-2.5.22.tgz 7418457 BLAKE2B 18086ef181d846291b9f8762c9c293997e3d61e92a80e5556c41b7a777c4324151b0662d6b8a79e9b191b83312c97e46691e90577eed276ea315a12d73c5a5d4 SHA512 16c7cfb44f0fac12e3516b065f085af884b2652af9c1acb61251c8ede5c45b34f65bc8a3e53f0aa685ff5e1a74c7a17d9c8f76bc89537d790f878d8924a1080c
 DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b
 DIST free42-nologo-2.5.25.tgz 7423321 BLAKE2B 23d69045df8e7a96669a14e5760da4e1f8578b050ff6ddb19b000c8254b04883449c38e78c5af93a9341485363ae52ce41e6398b9954a6eac61aae6276e20488 SHA512 cedc05ad60cf56b4634e0b1525ef75fac8ad16ce14ae80752fda12a6373cc2cf42d4b696e99c121b1dc42087e477ca2d948f173c9128acc91d5bc266259b2836
-EBUILD free42-2.0.20.ebuild 947 BLAKE2B 24fb1ce5c86a3dca83f459cb992aa238c3f25848be5ff00b505956d8118ecf0c0574b9647df02821f20ab47c0f8505f2c89dff9951b9b7307b114e5351cea715 SHA512 cce77ea9b6e4e5367f147091eb70cbf4e980885343510d424cba9fa8265ab0087cdaacd3f49673979fc4256219201bd9fda281a992d7bd7ea898111ae3b160d5
-EBUILD free42-2.5.22.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f
-EBUILD free42-2.5.24.ebuild 989 BLAKE2B 884e2a8cb8ab99530d78cefc1006b42d11511e8110177310c195eb0c1b2148afcb76b2291511a64d9f095119583b35f7c45ada0bfa1d0cd48c9024affec7f98a SHA512 39a37ad4e66c1514a2f30c9931a08cc832d73d3dfcbf1b550273a1f1be39290d7ef50b67b771e92fa3ecea177f5f575c3373b46574749dc7327680734017cbc0
+EBUILD free42-2.5.24.ebuild 988 BLAKE2B 018e42a0d178fddad32220fb80a8052b883341ed595aeacb8c62189167b92354df147821701c496010a2d41d4492b9c8f9591e3dc3726277fca9032f22877b7b SHA512 558ca798068bb404d040e4f95ef2a404f8184d23f1b91c03801dd29599b2615f8bbaef509edac11d958a641ba103e2871cc7d5e4f1e2b7be47f6cfdc22d3cdac
 EBUILD free42-2.5.25.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
 MISC metadata.xml 345 BLAKE2B 2693f9fd6f59806e57f9691b8b77ec0979e3ee819866bc1d9e3b3f311995a0b1fb7ae00a23b50f603064e1d35215fdd8fa6eb715fc83cd613eb828fd87f78eb2 SHA512 afbf038baa3610520f7d9b63b54acc98552b16241bf3f7efebe4048b572bf65098c74896647eed4611c29444f7d16914233744f08069468eededf34ba7a5d758
diff --git a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch
deleted file mode 100644
index 543595c6a1a1..000000000000
--- a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
---- a/gtk/build-intel-lib.sh
-+++ b/gtk/build-intel-lib.sh
-@@ -4,7 +4,7 @@
- cd IntelRDFPMathLib20U1
- patch -p0 <../intel-lib-linux.patch
- cd LIBRARY
--make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
-+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
- mv libbid.a ../../gcc111libbid.a
- cd ../..
- ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
diff --git a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
deleted file mode 100644
index 0fb915df2983..000000000000
--- a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Nuar a/gtk/Makefile b/gtk/Makefile
---- a/gtk/Makefile
-+++ b/gtk/Makefile
-@@ -15,11 +15,11 @@
- # along with this program; if not, see http://www.gnu.org/licenses/.
- ###############################################################################
- 
--CFLAGS = -MMD \
-+CFLAGS := -MMD \
- 	 -Wall \
- 	 -Wno-parentheses \
- 	 -Wno-write-strings \
--	 -g \
-+	 -Wno-error=narrowing \
- 	 -I/usr/X11R6/include \
- 	 $(shell pkg-config --cflags gtk+-2.0) \
- 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
-@@ -27,21 +27,25 @@
- 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
- 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
- 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
--	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
-+	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
-+	 ${CFLAGS}
- 
--CXXFLAGS = $(CFLAGS) \
-+CXXFLAGS := $(CFLAGS) \
- 	 -fno-exceptions \
- 	 -fno-rtti \
--	 -D_WCHAR_T_DEFINED
-+	 -D_WCHAR_T_DEFINED \
-+	 ${CXXFLAGS}
- 
--LDFLAGS = -L/usr/X11R6/lib
--LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
-+MYLDFLAGS = -L/usr/X11R6/lib
-+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
- 
- ifeq "$(shell uname -s)" "Linux"
--LDFLAGS += -Wl,--hash-style=both
-+MYLDFLAGS += -Wl,--hash-style=both
- LIBS += -lpthread
- endif
- 
-+MYLDFLAGS += ${LDFLAGS}
-+
- SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
- 	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
- 	core_commands3.cc core_commands4.cc core_commands5.cc \
-@@ -83,7 +87,7 @@
- endif
- 
- $(EXE): $(OBJS)
--	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
-+	$(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
- 
- $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
- 
-@@ -107,7 +111,7 @@
- 
- symlinks:
- 	for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done
--	sh ./build-intel-lib.sh
-+	+sh ./build-intel-lib.sh
- 	ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
- 	touch symlinks
- 
diff --git a/app-emulation/free42/free42-2.0.20.ebuild b/app-emulation/free42/free42-2.0.20.ebuild
deleted file mode 100644
index 2bc7d946d94b..000000000000
--- a/app-emulation/free42/free42-2.0.20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="https://thomasokken.com/free42/"
-SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXmu"
-
-S="${WORKDIR}/${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
-	"${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
-}
-
-src_install() {
-	dodoc CREDITS HISTORY README
-	dobin gtk/free42dec
-}
diff --git a/app-emulation/free42/free42-2.5.22.ebuild b/app-emulation/free42/free42-2.5.22.ebuild
deleted file mode 100644
index bd3148a0b387..000000000000
--- a/app-emulation/free42/free42-2.5.22.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="https://thomasokken.com/free42/"
-SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( CREDITS HISTORY README )
-S="${WORKDIR}/${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
-	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
-	emake -C gtk clean
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
-}
-
-src_install() {
-	default
-	dobin gtk/free42bin gtk/free42dec
-}
diff --git a/app-emulation/free42/free42-2.5.24.ebuild b/app-emulation/free42/free42-2.5.24.ebuild
index a12cb0bc7ff7..a8ede08965a1 100644
--- a/app-emulation/free42/free42-2.5.24.ebuild
+++ b/app-emulation/free42/free42-2.5.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa"
 
 DEPEND="dev-libs/atk
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index 848c2a6c7692..aed5dcc94fe0 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,4 +1,4 @@
 AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
 DIST fs-uae-launcher-3.0.5.tar.gz 9633819 BLAKE2B 8ce627302244bbd7d174f28c0dad345699942429c1109a7408c88412f6bb0e3e5d765e6c51abf2b95837a83261023b4f9c58d65892e58043889be8dc5e4cb759 SHA512 1a6700c56a14edce86ffbefee7494117af067da8b1dbc22937a36641ccb90927a3bbb011d15a891388bf08378aa623e00a2d45dbc49e822a5a569e110843add5
-EBUILD fs-uae-launcher-3.0.5.ebuild 2079 BLAKE2B 1a44e982647369c9dd1a93dfefc9ef3554b2111b55bdc1bc4e299ed844578766393d9a6e92d3bd30f0b04d720fed85e24b50842c23fd1372d46478582341bbcc SHA512 8be27bc7e82976730c80ab25ee2882ea0bacaad891d403b73266a54cfefcb8af5920e524d395b360dff01daaa80fd00483e1747c4b1aedfff7d825a59e66f809
+EBUILD fs-uae-launcher-3.0.5.ebuild 2081 BLAKE2B 0fb73cc83ca48acc4a6035876ada673c36f4f47b84a01167825ba34de0407ee8ce990bc413a67ec19869aa04ca675c8b409c135bd64a8b1f2fe1d27b1825e1d4 SHA512 a55428787228e4185f207b88df2edf3a9b39fed1ddf47950c9c38e91ae0bff288e679f5206c274cc8dbbf619532ac5190b49d6042f8bff56837100d6c0442ece
 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
index 6de8fc5c4297..76303d3e0ae1 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-emulation/glean/Manifest b/app-emulation/glean/Manifest
index ad24347d0da9..955dfec9574e 100644
--- a/app-emulation/glean/Manifest
+++ b/app-emulation/glean/Manifest
@@ -1,4 +1,6 @@
 AUX glean.initd 241 BLAKE2B ea451713203da8dd61eef5155e2ab2d5fa7be5d9cd210ce2d0ce890fe54af05b461671702d1a2b60b8e6b8e0cb0f4d12f90ff2884409e9f2a3dcc380ba48bb60 SHA512 a5af77b16e1864158dfe858f932dd4eecb5633bd71fbdd00085863e56bd1862d7eba4500d0f4ac8c692b06750fcfe3f9f5b2bb7a4ca6a4ba72dbc43bb12856c5
 DIST glean-1.17.0.tar.gz 62791 BLAKE2B 6429bd721655499732f84dc8db4bd31bdb128289956ab65fab78ea5461cf7945ced893fd832ac6a3cdcedb331f3885004eaa530be1ee4fcc4168870b5c345dd3 SHA512 55c8ceae941296c038acff3f40cf4d6b783d7c6530ebd6fbd6d87938de11a1be1403741a559802c9135d3fc4d904b1936319dcf7a0179f95ac3f909667f5622c
+DIST glean-1.18.2.tar.gz 67642 BLAKE2B b346fc63b361e7c7bf0b8fc100da4a047004950aff3e17fce96d47ae5a7887828a09f4b107f2af1afcf9d866e5bc0857049ddd2d9c49413e9fe4b61d1de99fd3 SHA512 de80c06952ebbbc24c8cf198f61be788fb32974652c8253787ed5a165e26bb162b48c84836779420bb7c331edeb50a7796f5a2ff578d2e612068c5fbadd343c7
 EBUILD glean-1.17.0.ebuild 591 BLAKE2B f42dff5a8cbac31b082979defc0cea3d18824507e250fb54894d120c7c26855f331cf65115c09b095d0fdf5957b152ebec4bfe7de8c52b1e6b2ae1d201bdeb2b SHA512 749093c476103e3758fe48e6ed1adaec783a2940f0e5af5fea0845a5d72562a4810e7d1b5ecd43c74f3d2083e325c6d35afd3e5e62e8f992b00a4aaa0221b591
-MISC metadata.xml 582 BLAKE2B 5681b71af4146a409d76188e969fe422028352bb5a4b43371c5f94da2f13597877d228f0b5d721efd6e7df649b5ffa8f1b9348e99e92683092070a765143abe0 SHA512 af37ef6171ada6d7480f7fb6c5514dd2ac3b0d551c88673f024f94b7737cd2b42696785b9152d688e1b48620d560f065e20ac9998ffd8edf9f621dc96ef0df4f
+EBUILD glean-1.18.2.ebuild 596 BLAKE2B 3661a2eb7d55d29cedb9ca17e97ed56fb67fc20d96cc3a0454a0fa6424e63b459204fee7fa80d4ed32cfefdd483770aa4962dbf0030233dfeb67871def824bf2 SHA512 8c8e6f43644281548c975f390a00176e769cad3685b6b40e50a308ddf9ddbab11c9dcb2c22755a0ba54ce7ffdb4a4d8340f527bd051133e6a1d4fc95773d9deb
+MISC metadata.xml 697 BLAKE2B 475d277a4631376b578b5323416f5f026036435857185732be7186e590228dfb65aaf6b9474768c36f978530e176ecc05e79976c63d4a0af3bb1056b836d731e SHA512 9afd02fefae0e5c428ffd5ab64f0706d94c5d4fadfbd7d3bbe42afa5213bcf6deab5ba07abec9779a818439b8bf7a0f307b609c2c59871fd95a8dd39338773cc
diff --git a/app-emulation/glean/glean-1.18.2.ebuild b/app-emulation/glean/glean-1.18.2.ebuild
new file mode 100644
index 000000000000..053b990f8ad6
--- /dev/null
+++ b/app-emulation/glean/glean-1.18.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Simple program to write static config from config-drive"
+HOMEPAGE="https://opendev.org/opendev/glean"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/app-emulation/glean/metadata.xml b/app-emulation/glean/metadata.xml
index 04eb5e5e3c1b..98da0ca88f35 100644
--- a/app-emulation/glean/metadata.xml
+++ b/app-emulation/glean/metadata.xml
@@ -5,6 +5,10 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index c2b806d3bead..1ae0209f1abc 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -15,6 +15,6 @@ AUX virtlogd.init-r2 572 BLAKE2B e6a86e34eda78fc032df17e1bd94095e357770f4036e19f
 DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9
 DIST libvirt-7.0.0.tar.xz 8567648 BLAKE2B 0c0b360c371a14b6d82dc6bef4b228bf7a4a17db1a8425d1354128b0705365a04440217ed0862761b2a8eaf81d81494177d777e734a9045bbc87fc613b56eb05 SHA512 dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343
 EBUILD libvirt-6.8.0-r2.ebuild 8769 BLAKE2B 5d425a9f6b776869b2d4a886100ed30730ea504b619d76ac24f823583697ea88b0fa039db1cfd927c82351abe0bea97601eb06cdb5c0ecf40bc42d65521767d9 SHA512 76a636969fb6b11c9def8cfac402762fa35a474f925beecc40b4bec2b841981a235eaf3bfa272ec63e907275dce332aa03bae8f72f033ed7f2adfae987796e09
-EBUILD libvirt-7.0.0-r1.ebuild 8455 BLAKE2B b194bd09c45cc29bf356b9d9cd30013d1c8e409c5a0b832a81636eec7495750aab422d9f7a8222354d3ee8f105f1b993bcb79b81237dfb699cbf3e2d0ab70b45 SHA512 f4a8283b7fd229121ca92fa4760834e3913855056166d8ade5c9fff42d03cf066270085541601c12015c3e0512dc41cf86ba8b77176a690c9e0550721fba49f3
+EBUILD libvirt-7.0.0-r1.ebuild 8454 BLAKE2B 50885a689f2a668de85ab03b6592720a6d85a3d0efa3fce9fc06e37ba3db03cc3fcb96958250ca2eb13b07cf421885623a8552fb4232be2c97929be09b990e60 SHA512 0e3b03bffe7416322b30db8a580e6c40c6e840978b0e13863805e640f70ba6a3fb00d87c4c1b3b0ddb05e66b7431f1177e7e1c5aa1bf292a220be321fb034593
 EBUILD libvirt-9999.ebuild 8268 BLAKE2B ce194a4cf1558734a5c6b3e925a6e7e9af530525649557b1b8c990ff23fbf3153864390c90d51557f58be1295dd5f8084263657245b2f8b82a406c47ab34b652 SHA512 9af86bde3f89bda4717ad6fca871d2ee81b196265c91d9664c88b6338d48272341a495470ebe7ac30367b22be2a77626f5c18cf1ad3bce51534445112ac9ad98
 MISC metadata.xml 3568 BLAKE2B ea4e03121fbc3aca8af2d8e12b42fefc9954e8e38fd83b1014353dd83bceeae4e1ba65329b42fb19fc0d6a9aae7c9d16cf88817d4ea7cfe767c7ef5734b291f6 SHA512 4d691fecee1ddd161a67e3b18a6071d1f0f6e1dcc6ae8deb1a63d73ca9c6d86f5a879d8ab9e43397b7988d66a7df9be6f556a52ebfe8d886b1f03e89614cf073
diff --git a/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild
index 628e451d28d4..fcc41af4f916 100644
--- a/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	SLOT="0"
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 	SLOT="0/${PV}"
 fi
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index ee75b1a1613a..9ac7d232e5c3 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -5,4 +5,4 @@ AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1
 DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43 SHA512 98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7 SHA512 baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
 EBUILD lxc-4.0.6.ebuild 4745 BLAKE2B ceebabd28840f6dee1e7c8b1ae1d6a3087e556b0629c2815c4c53c74e782ef80ff160136b93984d85113fed3ce8e0376457c0a1db2fdb7f9b8cf28e07a4433bb SHA512 d4c2340f532b667dd0a76f152123ca0ed9afd88889998d5b43560d5bd0d4008f5b30cc336615c4903bb15486a518ce3edef61f26f6a89edada2af5d5bc3bbe5f
-MISC metadata.xml 663 BLAKE2B 4e6b34cc41c0ff68c3c5867e4c81277e82255512678c495879114a9c51b3a0eb50f6f7a514752e27c2aea8215b2241c255a4a7b6258c73927cbc3f112d9985f1 SHA512 05813d7ee6a5e1ec6558b3ade26452e9cbdbaa94479ed320f0b7db9af27e7bc32543e6fad5543746b21b6983158090cff55b826d219a4f66a51264949d95f0ff
+MISC metadata.xml 620 BLAKE2B 459aa85a0e432faff7d0a2a1e61d536bde2e07e057ce8da642e07582219605643740f1241f83d19335a96de568841234bc2505273570bafbd187bb51da64a674 SHA512 303ca453f18cdbeef118e6a452b1a0e56d2466cba47fec8d021c1b8e4a9998ba743a729fdadc71e27e98f1fe12f43d17d76820986aeb93f286e74565c1a852f6
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index 67a46103842c..b332e72238d6 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -11,7 +11,6 @@
   </maintainer>
   <use>
     <flag name="apparmor">Enable AppArmor support</flag>
-    <flag name="man">Build manpages</flag>
     <flag name="tools">Build and install additional command line tools</flag>
   </use>
   <upstream>
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 8e5bd2efc070..f60e5247ed98 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,5 +1,5 @@
 AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4
-AUX lxd-4.0.0.initd 806 BLAKE2B bd28a871c8984eb27043e78cbb06ab64e8e071e9baa06a53015b4c7d28ff74b9ad54093acda51d66ed8e07921eb8c1ead8a5f6075404334e54c0d0096f19aa31 SHA512 c9a30685272ce2828d3c739a5718a388ffc70b0c613faa7d18c91b44e311f33abe2d51153c2ae6dd12d3cf921830952937214289e5b4d700d8f57e74ac2fc206
+AUX lxd-4.0.0.initd 1223 BLAKE2B 1f7ba04af8d4d22c04312bbf9243f94855e8c4912485bedde7ab8c78e21c0957de0434095811db0be4ee38723cd1e8a9bec01af4420283b297ef547154f31577 SHA512 cecd9da83e1352eec23720e84c7ad85a65dde21344b5c1aca8943f9ac74eeb0e1f66d968bba24592303fed05beefa2959c8cffc0d2e0be59168ded91b84e5fe0
 AUX lxd-4.0.0.service 519 BLAKE2B 5314820c25e52449aad8db6584739cbe0f2654111e4b42c3eef0df995373487c789390dee99420dfd1aa5768ba66ba72999e8f2d8a3b0be6e621185f185b5b85 SHA512 c68c4106e189bd32538f5f2963c43afc30418dd9afeca56e5590f354725eb0126ee0aac02082cc42d69b851f392a4977a4f95cf2886044ad563c9a36facea222
 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661
 AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67fb50360b11791cbd1ab1953fdfe5eb726e22b7091bb8e45c294b772e6b00e9ca65833512eb5b570627fa3234812e SHA512 364764d007f4800138c712fce70fe28b096b6e35dc6d2e4f8aa9aff4b335ecec7dfc9600a1a16cd38e69a96534b7462daf5f6e946a2ee81bce17977b8d5911db
@@ -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-r6.ebuild 3819 BLAKE2B be531ecbfbab005179ffede6038eb6798297c324c0870064a37e94d473bb6b6e94e42abfe1e623d78f39fc1c0c62923901c8444d2842cbedeca1e08b8f242b17 SHA512 13110a84d788c5834f8cc1deb32d3c8e296d080167923be035198dcc36e026f97b3bcad33f30787cdec68a09e03dbacd03de14902955b2e58c10fbfae8bd2370
+EBUILD lxd-4.0.4-r7.ebuild 3870 BLAKE2B 7adea6e16b9f324d2ec8bd122462ea5b18c29da1c4a4b34f722ed16a328a29f41e919cfe7ae5f13e75cad2e0155b16cd101929a36612c47bc621a40034898cdf SHA512 cc73658faf294ca21cab39f18ebf54638e36c279f2c9e4448275eb714c3bcce3c38acfff2b5ccb5394748a5f8c772b94eee07abbfa26139e363d8e995688a56d
 MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd
index 266e84fcef64..c55b2da6a84d 100644
--- a/app-emulation/lxd/files/lxd-4.0.0.initd
+++ b/app-emulation/lxd/files/lxd-4.0.0.initd
@@ -28,12 +28,20 @@ start() {
 }
 
 stop() {
-	if [[ ${RC_GOINGDOWN} = YES ]] || [[ ${RC_REBOOT} = YES ]]; then
-		"${DAEMON}" shutdown
-		rm -f ${PIDFILE}
+	if [[ "${RC_CMD}" = restart ]]; then
+		ebegin "Stopping lxd service (but not containers)"
+		# start-stop-daemon sends SIGTERM with a timeout of 5s by default.
+		# SIGTERM indicates to LXD that it will be stopped temporarily.
+		# Instances will keep running.
+		start-stop-daemon --stop --quiet -p "${PIDFILE}"
+		eend ${?}
 	else
-		ebegin "Stopping lxd service (but not containers)."
-		start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+		ebegin "Stopping lxd service and containers, waiting 40s"
+		# SIGPWR indicates to LXD that the host is going down.
+		# LXD will do a clean shutdown of all instances.
+		# After 30s all remaining instances will be killed.
+		# We wait up to 40s for LXD.
+		start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
 		eend ${?}
 	fi
 }
diff --git a/app-emulation/lxd/lxd-4.0.4-r7.ebuild b/app-emulation/lxd/lxd-4.0.4-r7.ebuild
new file mode 100644
index 000000000000..b5c87f1d9fde
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.4-r7.ebuild
@@ -0,0 +1,154 @@
+# 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[lzma]
+	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"
+	export GO111MODULE=auto
+
+	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 GO111MODULE=auto
+	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/podman/Manifest b/app-emulation/podman/Manifest
index 2a20c8e835eb..e9bd1ba034e9 100644
--- a/app-emulation/podman/Manifest
+++ b/app-emulation/podman/Manifest
@@ -1,6 +1,6 @@
 AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74dcbd3a6629b2da6f368274b4b664eaaa410773337a1f352c3144c3682ea0ea56b8c958b9d00a6 SHA512 58b05b7ff574f2153d7eeb3f726808e22ebe0821afc4d86dc3dea189944cdd6f2d6e1b051046456e149505b4b558a7957a278c1dba21db2fec65f2efbb3e1d84
 AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
-DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f SHA512 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367
-EBUILD podman-2.2.1.ebuild 4630 BLAKE2B 3b1b9931af5d3c3b22bbf25346856528c81daafc71cc501261fcf83b8e17caad1d2174c73a08ce15d9db826cb5868b8a8c5349842f3faf78a1d0e91bd19395a8 SHA512 6dbaa7d5bec77c880797a5d1ce20c9ebbd7ae83cd9a5a307e9e3864d186e21a372b021313433dcff54b6bfd048c9adbeae80dec1ac7dac40dee3ed327d1c79c6
+DIST podman-3.0.1.tar.gz 10365348 BLAKE2B 93a227bf1395145ebaec8e18aa8ad8101704e8e0f7344c8850ee9e1532b191aef96b1cbbba2e21bd716591d68969cfd16ee811621a383cb2d31e4105a44834bf SHA512 4addc986ad94b512d90b675a5a1988eeef365fff02c3449fd310582245a91d4ee96ff9fd3c56ce333a972dca627aa28fbd468a4a363c5c8963524bb67bc26754
+EBUILD podman-3.0.1.ebuild 4811 BLAKE2B 79ead1ab8488d8dcbd492ddad8b7b126c9c73d56df329b512d0c6c4a7fdce7916c9ad5d31c11f02921ee79206776ccd264e58350e91201531fe856b8ff6f524f SHA512 16a0599c46c3da78709e8f41033f879b1a6be3230c296359573d1973e90f4f2ee8be4a1694f0820922c5b121251abe52ec2fad102d185f0a95a1660f789a26af
 MISC metadata.xml 1160 BLAKE2B d56944aa9a0b3793aa581ea68233ec7b29c7caec3042aae9985d1b228e5ba205a7a631c61d31cef923e38714c934fbaf3202d5a8cf260b78f78fafe81730870e SHA512 0b1e63e5cad075899045c876d6dc93638eb36afd01fb7acef59b59c6795d767f250926cf77789f159481a7efdde09848d2a63fb7452d28ff250146d16a289064
diff --git a/app-emulation/podman/podman-2.2.1.ebuild b/app-emulation/podman/podman-3.0.1.ebuild
index 32c38f9a7901..f82494e1737f 100644
--- a/app-emulation/podman/podman-2.2.1.ebuild
+++ b/app-emulation/podman/podman-3.0.1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-EGIT_COMMIT="d8868746fd3f45b9bfd79e37bf2aa0c7103245fd"
-
 inherit bash-completion-r1 flag-o-matic go-module
 
 DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
@@ -63,6 +61,12 @@ src_prepare() {
 }
 
 src_compile() {
+	local git_commit
+	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
+	git_commit=${git_commit#*\"}
+	git_commit=${git_commit%\"*}
+	[[ ${git_commit} ]] || die "failed to determine gitCommit"
+
 	# Filter unsupported linker flags
 	filter-flags '-Wl,*'
 
@@ -100,8 +104,8 @@ src_compile() {
 		emake all \
 			GIT_BRANCH=master \
 			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${EGIT_COMMIT}" \
-			GIT_COMMIT="${EGIT_COMMIT}"
+			COMMIT_NO="${git_commit}" \
+			GIT_COMMIT="${git_commit}"
 }
 
 src_install() {
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 81520af8b08c..2b8381ecba0c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,4 +1,5 @@
 AUX 65-kvm.rules-r1 120 BLAKE2B a0d95f60e48f80e5f00b3a7ef3b520861fb781868844aff7b764875238d41982cfb5535e42757145eaea64f48e856ca92d434b33f7b3aeb5d93b0afcb461fd00 SHA512 4132ec4d3e7c1e3cf5e37224be1a3b864bcc0bfde9109e8fea9c99377289c28a7fdcf9155fbbd6605dbf8ebeb020c2ab575dd35e36bdf69f8ad07c4aa9c7b2f7
+AUX 65-kvm.rules-r2 204 BLAKE2B 71d062c1d4d0b619220da360b644a0961fc5adb619da379e80d84892ece9f365801dfc16bd358342557f32f18e2f47c507dd510c20bdbfcd5ae40b83b9def5a3 SHA512 0930e5fce6870eb20f48bde114d0b48ec87f80afa6a005f7e9c0ea84d3960f12d00b92f55c1304ffcc0c63a125c40af08d038cd179a76d6afe6e88e4d057724a
 AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b8367659c2896b7c3dd147e978ef6401b280fc3474bc959bee50f65d7525bee8bc04c19bc657ba7e22f SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533
 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab
 AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a81d1de7705f3b856656ec71cc0a2a29626e94918b3cc23b32e47c8073b77b62b498e71c3e956549e25ee5f4da1a8ac9cf SHA512 de48a7d663bd78051ed8a1f62d8b0b8e3bfe58d8a0001daf12518dbd087be3154e766be11c607485e7dd851b08d5675c4fb2a2fe5cf18f3b900164a4d93eab10
@@ -17,7 +18,8 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5
 DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7687e1425c1a297975f0e828cd2eafc11d11b589991acda87a489dd256ccf5a8947f91bb9431e515e979d8f29 SHA512 e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3
 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
 EBUILD qemu-5.1.0-r3.ebuild 25432 BLAKE2B f12769a35b050372341beb39b8ec82c9ce7527c54d570ef612af433fbc7e75f9adacca8d6ab42aca68ff5abb58a67b3dea5f2d2204a78c4fb6052c1df897e9b6 SHA512 268ea9f2be68b022b93177e795f4ef7b6955f9cacd6185a9730e76ee2ef771902316d659f73c3de5bace9290c7e75f7fe9933f12e06d779f58c54883a5c94d06
-EBUILD qemu-5.2.0-r1.ebuild 25166 BLAKE2B 490ee1d912eae15de8acb4b121db0ecf3841be870f27f96b332ec96e25ab6fb8a8160a991faf1b55fd32423c65e1fe27d0c4279ae067119baf0926257229800c SHA512 4338db442a55540c84007b1c19b55533bc29437e5a5c47593abb1e8ae686125feeaacc217efbc6e9d76fea537440e7e5d5419a779ac2ecc5c8b55b6edce96019
+EBUILD qemu-5.2.0-r1.ebuild 25165 BLAKE2B 719c716e10dab3e845e15497eaace296318d29987efd8f6f8eb1f1ece9d82138c442c1bbb600516f8aaab2886c52caad69006d06bdff39cc90fe772810a9a9c7 SHA512 5be5db0d809ded76014ddd863915ccfb5d8dec0154c1bea2720d8e06a007f882cc6fdc451b18ce2db39b58dd8e3f3e501bd074edb4690a47c3c17bb3a070a46e
 EBUILD qemu-5.2.0-r2.ebuild 25349 BLAKE2B d8de8d084b2d83df2deae8d6245ad6f3f4a851c721d2169112a241233b423c7ba139daf95d7fb9bbd8bdbbe92047e0c152cff369daa64f46b624bcd7bc94aca7 SHA512 766a1be55d9b676990d8bb5c14236ad0091ef210b706041da2c5f672b3416745b2e745c7122b69c53817ccc65f9fa34ee483c49613417dcd61261e8e2fbb53ae
-EBUILD qemu-9999.ebuild 25305 BLAKE2B a614602507a1a0940c7ff92528cf721ca0e7c7b5d75a229ba97f4777fe8b80994ba52e65ad829a3d06b041d05de16f5fece8282f4b65fc457eaf82868554e4b1 SHA512 ce2ce6f8357b72b2f7eab345ebf5cbf876d12d7af67ddd10d3cd9f1bd5c5dd727372ac71f2ec4d385ef4faef6a2e0042caceb608cd746272cda493a7a042b4c9
+EBUILD qemu-5.2.0-r3.ebuild 25349 BLAKE2B 6e5d1270efbb846cab4b21aea6bc864ad9aa19059bb4a60e7ab120c9243b9db6ebd7e26364054f875438d511ef3ebb68e5f7c1bc6dcf5f9d302f374344a4af52 SHA512 64004e9efc5afc945f96f21ecb05241da109ee89bd265f54977f2fe3f3a9bba9c429eeaf5696ffc51201f07086cdaaa8ae1bc74886d80bd5a76baf3c55124b65
+EBUILD qemu-9999.ebuild 25305 BLAKE2B 1c4bda060af3bca672dc7df26b9deef8078217878e14cbe943224f1b52289a4091fe055af6eddcf5a810656af5f51efc1cc7a804313b30ffda5546840bc0b3ef SHA512 282ee0b547ce3c6d077ae32d23b02319f88650defbcfa92445c6d102d3c6e7e65880443b6334d7e32db8ec455f8c4100e52b39cdf640ded3baaece5090b632d8
 MISC metadata.xml 4458 BLAKE2B 522818589e668292cbb756008eba7c9f6e0fac36c8d777f0490a1f66cecf576760947a8d94cf03e22af9c9da1d57e25b533c62ee73e9a4fb6da01a6d25c5db03 SHA512 3e054a17a0c86b4ddec0407d44967954170bbb030cea20de6c6841c057bd7e5c2b1b9013e3c0951db9ee570edbd9e7c433e5e3893f7bd762d44b35f9a1fae7db
diff --git a/app-emulation/qemu/files/65-kvm.rules-r2 b/app-emulation/qemu/files/65-kvm.rules-r2
new file mode 100644
index 000000000000..15c89b201879
--- /dev/null
+++ b/app-emulation/qemu/files/65-kvm.rules-r2
@@ -0,0 +1,3 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net"
+KERNEL=="vhost-vsock", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-vsock"
diff --git a/app-emulation/qemu/qemu-5.2.0-r1.ebuild b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
index ccb10ff8b9a0..5050c1ffb140 100644
--- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
@@ -23,7 +23,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/qemu/qemu-5.2.0-r3.ebuild b/app-emulation/qemu/qemu-5.2.0-r3.ebuild
new file mode 100644
index 000000000000..063ad7becb49
--- /dev/null
+++ b/app-emulation/qemu/qemu-5.2.0-r3.ebuild
@@ -0,0 +1,860 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="4.0.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1 \
+	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
+	EGIT_SUBMODULES=(
+		meson
+		tests/fp/berkeley-softfloat-3
+		tests/fp/berkeley-testfloat-3
+		ui/keycodemapdb
+	)
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://download.qemu.org/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg kernel_linux
+	kernel_FreeBSD lzo multipath
+	ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static static-user systemtap test udev usb
+	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+	xfs zstd"
+
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
+	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
+	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+	avr lm32 moxie rx tricore unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
+	tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
+	static-user? ( !plugins )
+	vhost-user-fs? ( caps seccomp )
+	virtfs? ( caps xattr )
+	vte? ( gtk )
+	multipath? ( udev )
+	plugins? ( !static !static-user )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	dev-libs/libxml2[static-libs(+)]
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:= )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? (
+		sys-fabric/libibumad:=[static-libs(+)]
+		sys-fabric/libibverbs:=[static-libs(+)]
+		sys-fabric/librdmacm:=[static-libs(+)]
+	)
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:0=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-201905[binary]
+		~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu]
+		~sys-firmware/seabios-1.12.0[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre8[binary]
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe[qemu]
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.12.0[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+	)
+"
+
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)
+"
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+	acct-group/kvm
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
+	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-5.2.0-strings.patch
+	"${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch
+	"${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable doc docs)
+		$(use_enable nls gettext)
+		$(use_enable plugins)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_notuser jemalloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp slirp system)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser vhost-user-fs)
+		$(conf_tools vhost-user-fs virtiofsd)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_notuser virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ${buildtype} == "user" ]] ; then
+		conf_opts+=( --disable-libxml2 )
+	else
+		conf_opts+=( --enable-libxml2 )
+	fi
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index dcde210564b5..1104aacd55d0 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -722,7 +722,7 @@ src_install() {
 		[[ -e check-report.html ]] && dodoc check-report.html
 
 		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
 		fi
 
 		if use python; then
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 0cc41fe424c7..95fd74682d65 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,5 +1,5 @@
-DIST slirp4netns-1.1.4.tar.gz 55346 BLAKE2B 86716ec9f42ae0087e9e7d142683f53b986275bce20b5ab0a33d0cdd63778adfeeadc86e5abb52d4a7e3e89baa0440c1a99bde920eeb2ed5293046e451d8ad01 SHA512 a6a26c55bdd4f50e668f7feeee3cd1d077e1ca9bd5bad5bbb8c47b15d366af4b1f2900241bedcd5a974a7597f43b17f970662271ec1987fbb6291c50470fa0a8
 DIST slirp4netns-1.1.8.tar.gz 58022 BLAKE2B cb65af6a5298411c158dd3da8160f8e4999ce5cb6bafc85f233d4d64a58c545ff7e9db21501f718ce7990d2497a6960853ecb9ff548859b1be19f3d74e86610b SHA512 28b2dd73cfd0a0fc71338c55a7f4ae448456620a0d27eb1e7c79f2d58da2a90f2f9af363c9abf5148d4d6435f69ea26809e5f20721fec5daf4c9897bb29c3547
-EBUILD slirp4netns-1.1.4.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
+DIST slirp4netns-1.1.9.tar.gz 58951 BLAKE2B e4fde408b3cd55dec0cca495c58936ec32c6201a0fe63c1a9fc9502ac41da615f92271d5fb365475f6864dd3c195097c81f01268b1b8d10d0f888c4e154cac34 SHA512 6471bf2b2eff9bd3ef037de986ab612f20bfce7a52bfd2b1b434d0606a3d2e6170b3fc43b168c8cc6f56ffb82f8361f21a26522ac1092c71f6e694a9588d5854
 EBUILD slirp4netns-1.1.8.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
+EBUILD slirp4netns-1.1.9.ebuild 949 BLAKE2B 7f34e0533cab1e88ea7c2db9de6dc9b2a58f60e18fcf19ebaebdf8a0f88727c4ecd5c35d8951e3cd55fd1adec5ab07ea2af6c682afe864ff0bc82804dd7e7748 SHA512 c14162894ae957d060bf20d83195c083b65f5a2ba8c8fa5efb09fec0a00157469afc6c98b32e642639b020da5d1ce81cd9600e7d6359fb48e46bba1b8a43bde0
 MISC metadata.xml 459 BLAKE2B e33a3af85acb845c8dde439efb0cc6cc87f5fb04e17d67af393a06f8b4b44242c434f3fae231118d2233c45ad733dcbeed3ed273fd4f66ff70292c39e5ad11ef SHA512 012156833690e44656fae463045a5559e564959904436adcac0af92bae8867c71bb7c24fa0fc416da890b0bad4d53e29a9b6d354b81e673e16d8b1956e9a0d04
diff --git a/app-emulation/slirp4netns/slirp4netns-1.1.4.ebuild b/app-emulation/slirp4netns/slirp4netns-1.1.9.ebuild
index ab7c659fa363..619879cf45b4 100644
--- a/app-emulation/slirp4netns/slirp4netns-1.1.4.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-1.1.9.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
diff --git a/app-emulation/umoci/Manifest b/app-emulation/umoci/Manifest
index 1d6c29eb748c..588bace88ffb 100644
--- a/app-emulation/umoci/Manifest
+++ b/app-emulation/umoci/Manifest
@@ -1,3 +1,5 @@
 DIST umoci-0.2.1.tar.gz 241472 BLAKE2B 2802fcb14e717a6460f9dc06226d3b430cce2181838a32064e86987131317947a4b117e91d11f981fa1df027804dbf2d92472b5c21749783b4f2ed371c699e7e SHA512 dfd7bbd1afd232400a9bffaf6c074d28ce4ce696c9f3c70bd436cc41b96928415d0793d57b1cf34dd70efd7d0e5eb567eaeea65d793c27ff9ea46fb190bd1807
+DIST umoci-0.4.6.tar.gz 2273608 BLAKE2B d5a36c78918697b9c8f54a5c4b914a9124b5e989dff3efc81a9f64f1bd276189d15a565a6ec2e8d4021925017e9a7a17f7cc5359a552f7c57dda414c25d2fb02 SHA512 0614dd583e00b6e2e69256f1ae1d3316e5bb5989a177d18c5ceacf3af18ab82ccf8edef879b6c813855d878d5af53c541ac433d81e6c20796885a26c57564118
 EBUILD umoci-0.2.1.ebuild 921 BLAKE2B caa93ba823c4e8f26d9c65ebeae4f96412dbd47221ccc6a2180ca09ba8ef8ad5bd0bf6a3817547745744657c981b298d2047cd4cc8bfca899cdd254e0aa43159 SHA512 875c57b7d8ba2d7f7485866bc2a12b210505fcbab62abfa901cb5353efc8e77738938cd0380c99b02bd05dd8b34ef2b42e7a23543dfab0925e34580029d40fa9
+EBUILD umoci-0.4.6.ebuild 797 BLAKE2B b79c2ac05f6ed5ae1db9e1d04781a6f46c4f2a17ec8c70db0a3a6e7e5ec96605b480b3a5a8f5386a822b9e68d46bbce34e968dc13930147515d2d0627a9c07b8 SHA512 e3217bb2e870b11ce3ac2e7cf5341193cee6b57dae1b85a33e1ae3ba6499d6f5deb8bf2852a5c9bc92fc2a3500390c5b2dac447cdcbf88310d5e55f27fb433f2
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/umoci/umoci-0.4.6.ebuild b/app-emulation/umoci/umoci-0.4.6.ebuild
new file mode 100644
index 000000000000..f315c80c886b
--- /dev/null
+++ b/app-emulation/umoci/umoci-0.4.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+COMMIT=5efa06acfb3bb4e65d2711cf5255970948e047cf
+inherit go-module
+
+DESCRIPTION="Manipulation tool for OCI images"
+HOMEPAGE="https://github.com/opencontainers/umoci"
+SRC_URI="https://github.com/opencontainers/umoci/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/go-md2man"
+
+RESTRICT+=" test "
+
+src_compile() {
+	go build -buildmode=pie -mod=vendor \
+		-ldflags "-w -X main.gitCommit=${COMMIT} -X main.version=${PV}" \
+		-o "bin/${PN}" ./cmd/${PN} || die
+	cd doc/man
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman doc/man/*.1
+	dodoc CHANGELOG.md
+	einstalldocs
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index c38225929039..753f8cf382b0 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,10 +1,11 @@
 AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
 AUX virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch 3237 BLAKE2B 5ebd53475768d4611ce9a23f8b11ad92246f561933c67a620136adcd4c7f5d1cf12cd09360eb6676221725c3732c255fcb1fe2a177fce9d007db83c776c5b202 SHA512 046e4c8e2d8f295d8e7c29c7dea53b8db18700f2ba03c7ab67ff466850f1cb2ed0dbc22aacd78b8c7011e3fb2dc02be06aba1678d1930b947988ddacf74e9174
+AUX virtualbox-modules-6.1.18-linux-5.11.patch 425 BLAKE2B b81f2c577732c51f92b524271e44f6c9763b8fd91b78e7eba977905e7e92ce6de931c05cf97d7502eaeece29c89fa3e29a419a9203b81b7ca245e11c144e2413 SHA512 896c1313c43d7917d58fcf227ac43ec6a1f1369ad5271e6184226347da680f4c0e97aea30c882b455964e7c08b342703f7d4b688cda743ad6249931256807b7a
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 8b2153874ee7a63f88679a5372215e89def49622caa7679a5c2410423eaf23ced18ece79d638fc96db40fac88857db7568dd72dd8e05371b14add3553d61d3a7 SHA512 c51dfad5f9578ad43e2fbdd35a70659640030108006f89d362bc25dead99eb3b39a78d403633b3813f62f5b510eff22d826a2750b9c88f5fcb1cde6531295bff
 DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019 SHA512 49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342
 EBUILD virtualbox-modules-6.1.16-r1.ebuild 1511 BLAKE2B 5da8447d01281777c51b21469b44397ab585659a36ade0407d74b32da4d0078ca5329479785cd2924d8c3f61fb066f84a64b4a92514454fe7368b9b54dfbebc4 SHA512 fb606c28048f9e4ce050b73de3eb7a80e5546d18ce52d13aa2a00abb42530052dd61523f5a800ed1cfb06541b272017cfc1b403a2260fe43b779238bd08a46d2
-EBUILD virtualbox-modules-6.1.18.ebuild 1433 BLAKE2B de4e7905f0df62d31e498763d0db42710f19140d16cb0aec7eee034e6a0d43e44bf883d7da60e73336ca17d68470683a831d2c09f156c4a87e481718b8713214 SHA512 daa7d3ca6970272c9605fbd11c85e1730244788871398d16aab73093baca1b26bea7f99382ffdb754040ca3bd560cc09b839802e96b438e076e25df1e21c6980
+EBUILD virtualbox-modules-6.1.18.ebuild 1491 BLAKE2B 3a03609d891215b3d14dbd8230b3f0de173e52c91ec897a7e4304e275edf103db16a1d246c8a0fca0c381c7bac11609979d98910e522e11c70a0720cd46b105d SHA512 32c9746599ec88fffe2288d89775c1994e0c082d83b71a853b04d4dcb7ac663303fdb43b09ed940af328a32fb282723b53f0cbf897f3fbc8e0b67ef87241c993
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch
new file mode 100644
index 000000000000..844e37e9fda7
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-linux-5.11.patch
@@ -0,0 +1,16 @@
+Fixes build with kernel 5.11.
+
+Bug: https://www.virtualbox.org/ticket/20198
+Bug: https://bugs.gentoo.org/762994
+From: jospezial@gmx.de
+
+--- a/vboxnetflt/linux/VBoxNetFlt-linux.c
++++ b/vboxnetflt/linux/VBoxNetFlt-linux.c
+@@ -38,6 +38,7 @@
+ #include <linux/nsproxy.h>
+ #endif
+ #include <linux/netdevice.h>
++#include <linux/ethtool.h>
+ #include <linux/etherdevice.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/miscdevice.h>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
index a884e1456d03..bbc7f312dbe5 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild
@@ -29,6 +29,10 @@ MODULESD_VBOXDRV_ENABLED="yes"
 MODULESD_VBOXNETADP_ENABLED="no"
 MODULESD_VBOXNETFLT_ENABLED="no"
 
+PATCHES=(
+	"${FILESDIR}/${P}-linux-5.11.patch" #762994
+)
+
 pkg_setup() {
 	linux-mod_pkg_setup
 	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index 1c942f657cc0..76868294a197 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -5,6 +5,6 @@ DIST vkd3d-1.2.tar.xz 611240 BLAKE2B e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e
 EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
 EBUILD vkd3d-1.1-r1.ebuild 980 BLAKE2B daaff20825a376043e4fceb986c67f317967a6b59c1d005060e4e5ced5f1b8ffc9e6f8d0d6ed3c03088c7345be584c5815d978668ef9be936e94aff7db396c7a SHA512 485bc1411a2f71639a107b3f75081a315e4fd8a948116b77f99400ce9b67a21c2e8d0c6de5e26c80cd7d9507306c85ff36f792070691fd65f081cc31a7b27cc2
 EBUILD vkd3d-1.1.ebuild 929 BLAKE2B 3b1a8b289d47ab301fec2a45d5bde71759a0c23a36c6f9009ea7626860436a77f3bb3ff45184ed94f1b26cb859b5a6ae874cb66258edb0a52b8bf78b0ae9dfaf SHA512 db1e44ca23bcc636a61f9019a02558efc948bf7347e6ba11034ac0bae7cd0562555788b69dc98f0ccf67f4760b4c02338e81c54d5ccd8ee8d3ccd004bbbf66a4
-EBUILD vkd3d-1.2.ebuild 955 BLAKE2B 162af813760b507b720587dc289a6b918526de090bb75b0b1b4c7bdb8b3c80f890c8e20d7125377c052f1f35069fa608e4feb13ded93e0b5d43392af523d38ae SHA512 91ca964bdab48060eed0173490ab62249995248600791d05d87b25aea199062fa0ab965f11f475ce5a7ed3eed87fac44e96f6bf6029d5f30bba87dc9a46a72c2
+EBUILD vkd3d-1.2.ebuild 953 BLAKE2B f0d70bc3005610e1833e9879f35acb0a5212ee046f92f43e8cbf382a3cf35ebfa674d41151722763d3a27892e56daa99b3dc57d08d0c2ca0c0f6874132f1e420 SHA512 ce7968e460c9d860b3ab3e6f52a32a5964ffcc4c35110fc377272e3200a5afb18ce57d68d2a5bd4ba58b8df30068923bcbbd1b1fe21c7049eb535f234ca94558
 EBUILD vkd3d-9999.ebuild 1037 BLAKE2B 41cbb9344a3bac1cd1a69f9b4439d020754bb2e5363f416393209c52c0e0c32dbc948065df09a1fd0b75d0d47fddb22e383f1bb3bac16c0652ae699f49c5a0d9 SHA512 ebd0d6514789760d0dedb7f4fd95fc435c0b9feeb39e9e1e86f501b3dc75d1e75a290451761bf631e50a48665ca7c34ceb537c825237b0d2bd13dfc3db906afa
 MISC metadata.xml 562 BLAKE2B 2409531d0bc65f547844ae83bfd7aaea4d996f2cdf11ebbf7e95775465d4bed916a39a38a0aae0c6df91a417df484ecaf63b29ea4286fdcfd11b07c8177e3496 SHA512 2150c80fd4315d922521b43c650012008864b3ed1ff7d80e43622ad916e52411c6ef855b46693f96165e9d89fd6a6f18cdc88baab13bec9f7053c0c1795bcd71
diff --git a/app-emulation/vkd3d/vkd3d-1.2.ebuild b/app-emulation/vkd3d/vkd3d-1.2.ebuild
index 90e8035e37ba..3589b8daabec 100644
--- a/app-emulation/vkd3d/vkd3d-1.2.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.2.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
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
 fi
 
diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest
index 5b4a873008c4..e325f6fdbd39 100644
--- a/app-emulation/wine-gecko/Manifest
+++ b/app-emulation/wine-gecko/Manifest
@@ -6,5 +6,5 @@ DIST wine_gecko-2.47-x86.msi 49266176 BLAKE2B 6b1d4ebf53fac422c2da9ae7f5b6ab9064
 DIST wine_gecko-2.47-x86_64.msi 50806272 BLAKE2B 6f91d4661a322eca41042cb7a246d5bff76ab72b4bda67183fc36735c923bd6d76624f21fd3e59f63fd872704edcf0116a6e7ab4fa6f074f5098c8fb5307534c SHA512 7c2496b15a06bc6906bc60afb3ac082e3f9931207fa624e60297020211d66aa9b420a61e95730a0dbdcefbe4b26c811d0c896ecd9c363b5107d08c3fa22fef41
 EBUILD wine-gecko-2.47-r1.ebuild 738 BLAKE2B 65313aa36c6b1f633ca53894a66824517a233b8c3d4056a951f8ec98ef0c653790b86f18a5ac046a0eab2c07107f27e5eaa981e70a91c4defcda297ccb02e75e SHA512 7c35333e8defa6956de3befa1bb6187a1353137334ee272c296d00eaca731c826ccfd6cd491a76bbec1bf36c6d4e2e8be124ca3eee2a3a7411ff3446071c2d32
 EBUILD wine-gecko-2.47.1.ebuild 709 BLAKE2B 1e3574c3be03d6e3e335d7c88f64f7af09af770ee12a4544181a7820404b0d9d7b7982a293e94b7264390a82114ae4cd4a8ca9580f920809d45526cb561396b4 SHA512 e3b7c02da2974dfaa2737095d7b9b394096ecb0f3af0a5fb729c1ea3d3efa3887921c719a14ba732896f1b6d7866ddab116b3f54673ebd40ecf42e5cdd116598
-EBUILD wine-gecko-2.47.2.ebuild 710 BLAKE2B 793e1190184dbfd12c8465c46362e8bd1de9942c5b396a04383bedabf91a69cd174499a086120e1be6dc063ce527c5c7fdb6a178701f166359f412b35a32fdd9 SHA512 0bd4e61d80831d582a2b2b34003113f609f622d7f4d7053754b88524bc952048c3ca6073dec5c23091eecdb6ae50d6bb3985b31cb6a1c334349bae3bb0433697
+EBUILD wine-gecko-2.47.2.ebuild 708 BLAKE2B 93609c14eb1bb3ab58bab1fc14cda313b729234080470abb9e6cdbc423c5a9af31e1257296ff89f12cb52450f12211a9c78dbee4ed3011ec164c18fd39b345de SHA512 64440fa69b67234aad439ceea032b1c4723cfd696dadab6c9c47d79eb7c3181ca7d43f183a39cd0ee1b5ed57aaf71c66ca79887b85106dadb3bc423e7e4d1c47
 MISC metadata.xml 321 BLAKE2B a78cdbf0755ae73cb4ec393d3febc46f39267e069001646a3db9af89382c09b2b7667edcce40975bfd890057466f8b86d14d3415b7a820d01198d8976bd5300d SHA512 a4a66f08ca203c1620732dd42b5e281d03d24675e4e471b7d6c6cd5a88b89a47b73b68b0b82f70eecee91c5c943e9886d8930f39b65b59ea285d23b010ad7635
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
index 6f99f662aee1..8f25ee06f62c 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.2.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
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="abi_x86_32 abi_x86_64"
 
 DEPEND="!!app-emulation/wine:0"
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 71baa0ec418f..dfcc00581be2 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -28,6 +28,6 @@ EBUILD wine-mono-4.9.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a21179851
 EBUILD wine-mono-4.9.4.ebuild 501 BLAKE2B 291fc02c8a792407a6e727ae5ac2a211201fa00761a5dc613cda2bd231524f187897e39725c08114316bceee53676998c2a5b4669da56919da665af5f5643c9a SHA512 710d387c1d7dce22f8a832bf7f090aa4cd9992e6622133a7cb187f2b13a7de0a88b0afc45d53882094a475de56ba5e0e4b631d778d61186686e76f9a4380cdf5
 EBUILD wine-mono-5.0.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8
 EBUILD wine-mono-5.1.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8
-EBUILD wine-mono-5.1.1.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8
+EBUILD wine-mono-5.1.1.ebuild 509 BLAKE2B 71b054382d6629d5828bb3e82b2ba8b5ee7b6582e3cb4e787ceb99b6386f26aef0f205cdcb86154ee1b1000abbd17ea1e0d85c5200962c782e25080c12340001 SHA512 377135ac3b6b82ebefd2411351e8a97a245f21f2bdf713b89ca3774e0950cff39095728ec577a59426010ed3d1fef01b9af58b81c5684a46036c0f7557027293
 EBUILD wine-mono-6.0.0.ebuild 511 BLAKE2B 2807e1fdd29bf3200690e008a981cf226dc1ab60c18437227bffd99fc683e3a8316e173937c775a910f3ccb2afcfd77b7bf9c1ab1d662048a1ef60d51d5508bd SHA512 37243bd166422fce836debc9551230290ffcc7b62f30f8676fd8b5640a9b6a6dd580a9d0af1fae4e3b4e5921cc723ea66186d859250a68ac4df9f96b41ff56b8
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-5.1.1.ebuild b/app-emulation/wine-mono/wine-mono-5.1.1.ebuild
index 30b33158592b..291b0ae7c2b6 100644
--- a/app-emulation/wine-mono/wine-mono-5.1.1.ebuild
+++ b/app-emulation/wine-mono/wine-mono-5.1.1.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
@@ -9,7 +9,7 @@ SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="!!app-emulation/wine:0"
 
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index fb36bda297fa..ad37eb1886b7 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,18 +1,16 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18
-DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271
+DIST gentoo-wine-patches-20210302.tar.xz 60112 BLAKE2B 993cc671da00e5f44022af14f7b14f41155db4f2a02a971d17e7d40c3aece59e6b0dcd2793157c91bfe1f240a4b9e59a731f07dcb3314688f978e2f79e8062f1 SHA512 623cfa1420350d76d4b3897310bb81ce86740306a16ec974762cae886ae6717194b726cb4bfa588ea451414b399c50cca72125020738cdc3e13f6cc84983f858
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0
 DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4
-DIST wine-staging-5.21.tar.gz 10362610 BLAKE2B 41f40c33b7d0853c63b81da863145f242b640a0e491b3ee92e1c687d33b85344676e764ae93921f00643b4bd3247e9c9aef4ba92cf80aa43785db1f762eac8cc SHA512 079a7fccd66d886b3498c45057b1bb215d3897e44e0c8d6afb56174fad583e8a578ea888d70d62a18da1566bb9649fdefd08227efecd21fc71b0b3d739dab636
-DIST wine-staging-5.22.tar.gz 10342905 BLAKE2B 9f59a0d8c06f29b52fec71cc09915c8a7a23a1ad9945cedeced179657645970048846517f4eced051989b0ef1ee555c9f8176de073a66b3633f3fe1fd90e0836 SHA512 0ce0314b470e90c741fd02ede522b6dd754fb69595b527e3ad5ac62d944bc7eca43eca88aa2b85d99a9945fbad05872cdcd2ac87ed809dcd41a9ce56bfcc1147
+DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
 DIST wine-staging-6.0.tar.gz 9863425 BLAKE2B b51e0c3dc426c637de4ee89ee7d519847edcb04b1fb160f5f196e5560ce570ced682165ac74958433de79e104765d4811f004d323f357b753cf56108b9a631bb SHA512 33845e398e9c3d4bacbd9cd369983e72517fd648747433eabd933b446f9d86f1d61660959ff4e05cb661cf4038550b3df3384f588f3f5504b1f8056196ca3c38
 DIST wine-staging-6.1.tar.gz 9855125 BLAKE2B e5bd41294b7f17cd283d4ab90cce4f362740c2b3de2a867ef50c44639f5472392b3c11e199a66da63018f18df2f2a99579b50f27d6dd0163bd989efe1e7983e2 SHA512 50bf3f07cf8008731cee131852cbce43c5ec44219e8e96fb70a0fc82954b0a2a9d25ee8b25b7c62b47abd131591ca8fe0461214287601465edccda80be6d598f
 DIST wine-staging-6.2.tar.gz 9820682 BLAKE2B 3de0c0ecbdabc1ffb965e6d5ebf5689fbeaf24ee33aaa2ff078db39d1542aa935b6d4d940fef570f1c60260748f4ef52b9789625b840f73e70ed3482995d505d SHA512 558c46250babaacda92885c35c438797baff7b8eb45cb3cdf7f7572c35e6412e621182061a3a4e31444cc7580f99a61de6bd433bf2bb2b8139cdd718afd9cd2e
-EBUILD wine-staging-5.21.ebuild 20422 BLAKE2B 1ddadcf68dbdb438385434de97f050e8f1343e8102d1e0fe0c683f2fefa528a0bfef2ae6bf75e80d05c6f7ce8db008eed0d370d247a7945f9854ee9fecacf772 SHA512 a984e66e22d4b6fc47a65ad27c2dd03c7c4bff07e56bdafa76885a26269a1156df5aef2aa72444be5cac9de0d50b748ea9d224d5393c0171d054484f3670be12
-EBUILD wine-staging-5.22-r2.ebuild 21675 BLAKE2B 4b4b2bb67cd92f14e0e57a6557bd3df47994d133a5dae42e47a9b6159a2b2dd0fc7db3fdf955ae0d2d7e09008f1d437a8ce60050d37731f866df8cbaef00e3d9 SHA512 0611a82a8941b1df344a1f917d956b2fbaf371971c14ad8e4480484557b2429b5fdd76deef27f1d42ab64327dfc637232a3899872272db9104232c8028a7cde1
+DIST wine-staging-6.3.tar.gz 9796930 BLAKE2B b24e5ec57435a0d797e4d913b027226b3c891477d9df5d098be52348dff4eb704275c7c59d09f6cbdf7f86940a0e6c96bf28f94bd703fd32d6770a31426043fc SHA512 ed9b3b03c466de03941d7fec00c73ff77df863c3f4ba201e7f920810675ff416995557cb62b6701dcec6928f2ab9e4d608f17b79eda0267094e506a5e66f47f2
 EBUILD wine-staging-6.0.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
 EBUILD wine-staging-6.1.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
 EBUILD wine-staging-6.2.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
+EBUILD wine-staging-6.3-r1.ebuild 22091 BLAKE2B 484991abcc53c6f006b2c21001c74fb42e1549ec4989d8dffee44598728296efa5e5abd0e2863f48bbce2701ee286fefa384f7c5dd1face7c2c52255b8dafe44 SHA512 b9290680fe60c73bdbc7b95a10ff9621516170b0ffd4c91805018e596a1adedac270a1477406c6c79a68115c935b982a692bdc914022cc1dc7cbf330d14c8a46
 EBUILD wine-staging-9999.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-5.21.ebuild b/app-emulation/wine-staging/wine-staging-5.21.ebuild
deleted file mode 100644
index 3cb0fdf62f14..000000000000
--- a/app-emulation/wine-staging/wine-staging-5.21.ebuild
+++ /dev/null
@@ -1,620 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.1 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild b/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild
index 4a5a4b35d8d5..dd1fc435646a 100644
--- a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild
@@ -7,25 +7,30 @@ PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko
 PLOCALE_BACKUP="en"
 
 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
 MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
+	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	MINOR_V=$(ver_cut 2)
+    if [[ ${MINOR_V} != "0" ]] ; then
+        MINOR_V="x"
+    fi
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
-STAGING_P="wine-staging-${PV}"
+STAGING_P="wine-staging-${MY_PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
+GWP_V="20210302"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -34,16 +39,16 @@ SRC_URI="${SRC_URI}
 	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
 "
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${MY_PV} == "9999" ]] ; then
 	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
 else
 	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
 fi
 
 LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+SLOT="${MY_PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -111,6 +116,7 @@ COMMON_DEPEND="
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
 	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
 	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
@@ -127,8 +133,8 @@ RDEPEND="${COMMON_DEPEND}
 	>app-eselect/eselect-wine-0.3
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.1 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -166,11 +172,12 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+	"${PATCHDIR}/patches/${MY_PN}-6.3-Fix-nine.patch"
 )
 PATCHES_BIN=()
 
 # https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
 	DEPEND+=" dev-util/patchbin"
 fi
 
@@ -284,44 +291,46 @@ wine_env_vcs_vars() {
 }
 
 pkg_pretend() {
-	wine_build_environment_check || die
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		wine_build_environment_check || die
+
+		# Verify OSS support
+		if use oss && ! use kernel_FreeBSD; then
+			if ! has_version ">=media-sound/oss-4"; then
+				eerror "You cannot build wine with USE=oss without having support from a"
+				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+				eerror
+				die
+			fi
+		fi
 
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
 			eerror
-			die
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target i686-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
 		fi
-	fi
 
-	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target i686-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-
-	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target x86_64-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
+		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target x86_64-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
 	fi
 }
 
@@ -329,7 +338,7 @@ pkg_setup() {
 	wine_build_environment_check || die
 	wine_env_vcs_vars || die
 
-	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${PN#wine}-${MY_PV}"
 	WINE_VARIANT="${WINE_VARIANT#-}"
 
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
@@ -343,7 +352,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${MY_PV} == "9999" ]] ; then
 		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
 		if use staging; then
 			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
@@ -504,6 +513,7 @@ multilib_src_configure() {
 		$(use_with truetype freetype)
 		$(use_with udev)
 		$(use_with unwind)
+		$(use_with usb)
 		$(use_with v4l v4l2)
 		$(use_with vkd3d)
 		$(use_with vulkan)
@@ -613,12 +623,12 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	eselect wine register ${P}
+	eselect wine register ${PN}-${MY_PV}
 	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
+		eselect wine register --vanilla ${PN}-${MY_PV} || die
 	else
 		if use staging; then
-			eselect wine register --staging ${P} || die
+			eselect wine register --staging ${PN}-${MY_PV} || die
 		fi
 	fi
 
@@ -641,12 +651,12 @@ pkg_postinst() {
 }
 
 pkg_prerm() {
-	eselect wine deregister ${P}
+	eselect wine deregister ${PN}-${MY_PV}
 	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
+		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
 	else
 		if use staging; then
-			eselect wine deregister --staging ${P} || die
+			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
 		fi
 	fi
 
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 8b11eb9c692e..e846af697956 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,18 +1,17 @@
 DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
+DIST gentoo-wine-patches-20210302.tar.xz 60112 BLAKE2B 993cc671da00e5f44022af14f7b14f41155db4f2a02a971d17e7d40c3aece59e6b0dcd2793157c91bfe1f240a4b9e59a731f07dcb3314688f978e2f79e8062f1 SHA512 623cfa1420350d76d4b3897310bb81ce86740306a16ec974762cae886ae6717194b726cb4bfa588ea451414b399c50cca72125020738cdc3e13f6cc84983f858
 DIST wine-5.0.2.tar.xz 22484932 BLAKE2B 93253a86605b32dc8f7c79a16336643e6f84937094f8c96ea336289c2076a4d9f759fc1ad128f7b1a009da5eb2ed25cdc893da99e338093608bf5fc0ef1a85fc SHA512 9ff902ff929d9ac8c81843eea141c96446d26b14f70781a40a3ea1fdef5f412ca4c87374a5a3af9b42b52236159645e55d6e54f8b06178a4d210a72fb1d5358e
 DIST wine-5.0.3.tar.xz 22495496 BLAKE2B 459399b940111fb573d3060e74c17423ff43b510a196d70eadb5d57e7d57b44c990f8c9bb69eb258a76515c2d50fb756f82229a1a7cd391a32c407bedc1e9f14 SHA512 3217cc8a91e898e15130314fb7ebc2cdd93e2a4e88a46d3778ff4790a635b28e951ba974b83a56414d387b710da21a998e519f1df0cde636ff5fffdceff7f652
-DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18
-DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
 DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0
 DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4
+DIST wine-6.3.tar.xz 24301496 BLAKE2B d36e46e369abc619d351dd3209c0c86c5e5924509fe98a9e158fd10b9ca57650b9bc20e64dc801ec1b09315ed77fd81b549ebce7f383a3f772717a2031878588 SHA512 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
 EBUILD wine-vanilla-5.0.2.ebuild 17538 BLAKE2B c7112948be20ca6f68de5053bd0cc1171eb7ebf06807ec97c1aa392c4cc756d18782805a9f501307da418298eeb8f129830e85e507613233a478bd3c452b047f SHA512 16bc462660abe1eb8dca1d5c90fb02d71ed8e98a121d4290e501f7807c72eaae6a1b2eb65867b90c79d827ac9eb9b2502b6ca4e597155eda6b74509b00a3ac55
 EBUILD wine-vanilla-5.0.3-r1.ebuild 17621 BLAKE2B ab9f9766ef5f30b3fcae5d92a4cc7237deb015fed6cec868e0360fa676f85c5f96579bbb81afd793efa21fe0c65403e747a3b08fd00b69699985298acba08853 SHA512 833096373edf13aada27e0a574097dfb2ced4589bc8f1fa5e7d93ddfdf827c9b1920ce351e66e60c435cbf831879b90b05f3da8ea7670773f364ecf39b48927f
-EBUILD wine-vanilla-5.21.ebuild 17587 BLAKE2B 3b3d801dbe8387323a06cfaf1b7b0a6f83f1d25a7cece53325e687839ad522a8db5bab1e8a87958789f7cafdf7ffad6d195f2269a117f0d8ddec5465db0b01a1 SHA512 cd749ac932ae78b8022250c830d728bb53b07e677b88e801de7c5addd97e59c86e2a7c49fcc0c3fc7860c6a12d4105bcfbe455352028db15dec8ee9a2ef8c4ec
-EBUILD wine-vanilla-5.22-r2.ebuild 18840 BLAKE2B 5bb28cfd96d41160ed20b6b0449e82a511efd7174a580056346c116a0eae4bdf1a2c8dd4405d9331070cbb6fe710ed0c6f9925df076fc69719469bba2648571f SHA512 f0b323beef8380ff7ae8f7206d1bc279b1e2ef718bf05f41f87932e4a8a57c81d928ad45c679bc7d1615cc262375b2a2babab5d39a694fd07c5f9ce33a12acba
-EBUILD wine-vanilla-6.0.ebuild 18910 BLAKE2B dc81a5e0026053e6935a5f7dc3d279a1eabede60219cfc663d7c94945f1cc72b537121918b2875b7d007cc3f8e09758e79d4909ca54a985dac9140216c46f32f SHA512 7fc60d0f87c78c6cb34ef5cc000b614d55497f61c056a1da1da699b026282f064e26a7879b00cf3c7bfcc5b9fa41206ea2b764de8a12636cc05895c1037dee1a
+EBUILD wine-vanilla-6.0.ebuild 18908 BLAKE2B 3940b795b6b9ccf31f286a8efb99fa2a754da45a5201f5afad80c2dfae227d1aa07ab5bdadd7079eb5ad2f31f7f268f79ff65c8f6e18851032dec58fd3a1ceaa SHA512 64fe38e8318eaeef5ec6676629b2d45415a1effc8a95011c5db115259a515792cca4efd16adce48f750e68ff2483b68b5796788c3b79d880288c9fdbf2357dc6
 EBUILD wine-vanilla-6.1.ebuild 18910 BLAKE2B 7f8a28cfdf2b0ffbc5196ae3aa7c6b9ead6f9a9cc05e1786723149e0c6d943fcd8080362c8c3c32e9f6a06af114e749a5b460515c82d875140e4b54c24355d03 SHA512 20837bb56938d1cb5fb828b540971621f21044e495e4e2461015cdcaa5c1b14efac011741a4403f3a6e3cb99ee6402c7003ea137acfad070b18911c6a8390285
 EBUILD wine-vanilla-6.2.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
+EBUILD wine-vanilla-6.3-r1.ebuild 18975 BLAKE2B 0d00607ee6c7faaf3396aab0fbfade31f681195faf593d453702b11da214ba78b7596472d54cbd625f0e6a3c1425b4069107f1939f7e66db02af472da1a715c9 SHA512 d2e7e68d564f1d27fba83225e039f231718ea3db574b86a37364cb4f0be2faa5d91dc2dbe7fdd893ee44cf05769bc9de45f65d6b4e9244390a48db5b6600290c
 EBUILD wine-vanilla-9999.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
deleted file mode 100644
index 7182d108ab2e..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.1 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
index ab66fc3ad9a5..207e277e7ff6 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild
index d96df570367b..a1ee6e4da5be 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild
@@ -16,6 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
+	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
@@ -23,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20200523"
+GWP_V="20210302"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -34,7 +35,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -92,6 +93,7 @@ COMMON_DEPEND="
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
 	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -107,8 +109,8 @@ RDEPEND="${COMMON_DEPEND}
 	>app-eselect/eselect-wine-0.3
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.1 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -142,6 +144,7 @@ PATCHES=(
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
 	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+	"${PATCHDIR}/patches/${MY_PN}-6.3-Fix-nine.patch"
 )
 PATCHES_BIN=()
 
@@ -437,6 +440,7 @@ multilib_src_configure() {
 		$(use_with truetype freetype)
 		$(use_with udev)
 		$(use_with unwind)
+		$(use_with usb)
 		$(use_with v4l v4l2)
 		$(use_with vkd3d)
 		$(use_with vulkan)
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index d954195c4113..16683baeded4 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,8 +1,11 @@
 AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
 DIST xen-4.13.2-upstream-patches-3.tar.xz 63660 BLAKE2B 80abc9529ff49e782b64d4b5032f724e7d95fd255c2a06b7065c693d5765e1db1df44ebd5ce00c5a1e1ff24e1e5d344b0c2e459c68282e58fa20963e208272d2 SHA512 35288a1feac1316c33586dad55685e2c6a30100795e31852f78455003ce3dd6906074bea023655ee545a97fe4a0a8ad9a05ab91fd83186e61e5b57d10aa6b155
+DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103a6318485c1da54101ec59dbdb9824be5a5ed1f977135a9c3e4ce48cf14922aa0a2e3ff5097dc870286e3b142d060c22d78079cb3 SHA512 3f0e41b685655c7753204862ea6b8e502ff4b4f76e4788ca07ab93a4bb3c636d24ad933c578f7c6e4c866cfb0d6b7b7234124da7c2fed0a4b34f2fbe401c56e1
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
+DIST xen-4.14.1-upstream-patches-1.tar.xz 11676 BLAKE2B 0d593b34e3b1b95b57c54ccc96666eb5bf36d63ba742dd9d6e6f5facdf57be62e1f8375beb23926967e6ea23c1e4fa459bb5087652716d7e45b2309440f81b0d SHA512 e530883d17738b4821fa36fd39a7597bdb42810e40740c7a3363c22945d71af80312340f6d33b18f5999498e59036f22033b7babe217bac7700702d007d5d881
 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
 EBUILD xen-4.13.2-r4.ebuild 4443 BLAKE2B 2df57309d69ec69f73e83715e1aaf0f3a273f2adfc756d87a0939b42d1c2c2688fcc755ffd5609a7281648ba9e3ba63114503d4647cc93111bd93c925f5b75f8 SHA512 8b121636cfa76c024b7dd92a0757714133502d143d42587cec19a39514356bd75a2d0b82cb4547ac7ec06370acda9dcd27991f09fd722a79d537aaf9fdaba16a
-EBUILD xen-4.14.1.ebuild 4443 BLAKE2B b130fe3a6e22344350d4977a363da8830857425ffbf127293a41aa05855882b2ed8e6b834b23063d5676f948fccee58024369e537068a2a6e92ef086ca31bcd7 SHA512 f522dd225c3f66079229d513d94d79c66dae160dd05816d5e7fc6f5900f6d5c6257028d6067443bf85ae6856743f0ebbf29e402f95b050fbe8325b0319750e80
+EBUILD xen-4.13.2-r5.ebuild 4460 BLAKE2B 8d0dda6a6c205410d844b8360d2f87de162613882c76f94ea0fde3ca39d30dd75d57b1e18963d22203f19138d3ceb1bf13a6281e8c40e213f1f749374bf73314 SHA512 4789c3808a7631c17df0194435da037ed26d48a68b179aef1638809e793d2ef761cdcc7c4d46f8186273cc9813da3f36090722fc619579affeec16ccf7871ba0
+EBUILD xen-4.14.1-r1.ebuild 4461 BLAKE2B 9f3674fcb933e69643d915a1a1954b2b43b6f99b1e38f79142733d8627b254e52c74b20455b735300719d995f2905a193883ba459bd30c9a4443ca1f880495ed SHA512 c1a2c4126a2544ea1db06d07127ef8c713c0e7be5d6c99352bb276f1e99baa5bd0fad14d2c0e3e00b0a682600be8d18e6165fa98b2fd72f3365a643efaeb63a1
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.13.2-r5.ebuild b/app-emulation/xen/xen-4.13.2-r5.ebuild
new file mode 100644
index 000000000000..c0be32c3c8ec
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.2-r5.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="amd64 ~arm -x86"
+	UPSTREAM_VER=4
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.14.1.ebuild b/app-emulation/xen/xen-4.14.1-r1.ebuild
index eab5d1a69759..92af1429434d 100644
--- a/app-emulation/xen/xen-4.14.1.ebuild
+++ b/app-emulation/xen/xen-4.14.1-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
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -138,7 +138,7 @@ src_install() {
 		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
 	fi
 
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
 
 	# make install likes to throw in some extra EFI bits if it built
 	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /app-emulation
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)