gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /app-emulation
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
56 files changed, 2501 insertions, 210 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2e2fc7982dbe..7681a6fcf75f 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index fb09284db46e..7a008d22c0b6 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,6 @@
 DIST diskimage-builder-3.16.0.tar.gz 499320 BLAKE2B 2cf520957c270696a6c4c7f59d6c875d30e7245c9fa24d556ef90eca4bab9e45eb95ecc422bc84ac202df0ba8afbaac412663892c8ab18bd4847e5d630ea4e43 SHA512 e592fd9200681314519b6e58b4b3ba9106d3834e83e708b3f32c125a8f597252f43abec05b37a9f6b30397874d53b56740e2374d6d13f69e737d460f191bdd98
+DIST diskimage-builder-3.17.0.tar.gz 500580 BLAKE2B f219e8e1a3224dd23871a3d4f4688c6e8b75ad681763227a0dde34b3f89b0f5a7af827c1717a161f310590090cc0852936edb6b9e7298bbc989b01e4af28662d SHA512 466039b6cf83636a2a245b5d36f7bf0e71e897edf092010219a40bcbe1804b0fe1f205eec2388cfbcd2e2adfdaf9256c53a01e3cf7ca48663e0296d4bf542a31
 EBUILD diskimage-builder-3.16.0.ebuild 1122 BLAKE2B 387a23f9fe737c3e9bd5289853bd4367796747ee606b0ae4518303abb874fbf908fb8b59a94ed4caa14fe226227d511f9adfc135be5204226b96cbdd24c6dde4 SHA512 e339c5f0f084f7adb8d6fe6e79a93764e269c0a72af2525da37d994b75ae8583a15785abe1e5105d5711b3c9d6676c1e67fb040e89d02fbdcf7ed200fb4267e8
+EBUILD diskimage-builder-3.17.0.ebuild 1124 BLAKE2B 51595dda9fed08e6145a56986c5ac1f642b1941a788934f30774c05123b4299e4f9d6bf448ea4b62dd7f298181ab1f4d1c8996b2c4f79a29fdc2544eb0068188 SHA512 b539f393292f77ecc2eb6b6e905ecbbe97f4c81afcb50fd310f63b3a0f539d519add2a71597b1bea194f6197046a90c9605f95fdca0d17e3799a51529a0770d2
 EBUILD diskimage-builder-9999.ebuild 1124 BLAKE2B 0b733151cdc60c77f226ee88743ad4f9000ce26f09490bca167eb5c7fb5b89461bb45d2e6919519da631a7fee9aaeb61ced3a9d850b2fbe24cf719d7c4e4b925 SHA512 979884491e9615e5ae76e8b8b1dfa5a57ad31e0bfb015c8b4293689a551329b3c211a0c867f3ab53abfa5776490c85b2211c8a98ba91cac533a1deaee2bd4e3b
 MISC metadata.xml 719 BLAKE2B 872a4d37e8ddb2a28eb85d18cd88990934327bc23194f3be9e5dea03627a6169987b246a93b50754cbe5e331f8c854a808bf307b70521c481d83b846f7385606 SHA512 d151fd95659211b2057ef0a61a6020e2f9efebebf3d7c5e1392ddb9954e3627e1040f2a9fe84ea4caeb65a745411fefebf2d896bbddbe0ddbb56acf42d2fedc3
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.17.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.17.0.ebuild
new file mode 100644
index 000000000000..a2d3ad209af7
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.17.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder"
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index 740a5adce584..f7a2095edbf6 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,6 +1,6 @@
 AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
-DIST fs-uae-launcher-3.1.64.tar.xz 7719268 BLAKE2B 7753006e40e11d557f9cca90296b189638b832b8c2caebceb3fd5aa0393d3b1236ef2d47b176a900d26ab37012198afeb1549da92ba0570eb9b61df42c896550 SHA512 2f7c485f7707595a847130ebbaad3cf1fe9dc11149744bad2683b1b912a53830b687c0aa5ce97dc95a883182ef51020cc02fa434eac903752530f3780342090a
 DIST fs-uae-launcher-3.1.66.tar.xz 7730328 BLAKE2B 68e141658d267c0bc574b216be5c99d10dff23d153e13cccc6a19c5abe618657ce3faf5c685e604ef55927a0dc713c0606f9e1f41e3bcd0015aeb232b9266713 SHA512 6232f43a0a41e67d912b277294079608808a7243512e7970900fab2be483ba82da99eaae547c41be059828c1f5d316e9b58ab8018651c9643b2b72cf7eb6f67e
-EBUILD fs-uae-launcher-3.1.64.ebuild 1943 BLAKE2B 690bf924153964981ba86443bb511b813918416e5b9b3c5d48373132b2ae86e2666022f2ad34793c56140525d43954fcd9686c02c2ce3efd005adeefe5123715 SHA512 459365ebe205235bf6f9988b2f1001eb5f8899c4640f316643057153edbae29a6738f006468ba17e38bfb611bce69a10f1e324bd5d6f3d8ec1198f42d05a0237
+DIST fs-uae-launcher-3.1.68.tar.xz 7736036 BLAKE2B b2b14d568efa8c00b45497dea1bf73ac0b2522171269903f50ee68eff7e990f54c1b836af84a0b338caffd159fe3f638e6326db95f86482e190238e75894decd SHA512 a637117602c7276b60350ac3bb9c69eec4c18454efd4024e7b822da897eee0f9299f406e4126771f753b75f29d53591e9bbe3e4cbc016dda1ec063e73fe51f07
 EBUILD fs-uae-launcher-3.1.66.ebuild 1943 BLAKE2B 690bf924153964981ba86443bb511b813918416e5b9b3c5d48373132b2ae86e2666022f2ad34793c56140525d43954fcd9686c02c2ce3efd005adeefe5123715 SHA512 459365ebe205235bf6f9988b2f1001eb5f8899c4640f316643057153edbae29a6738f006468ba17e38bfb611bce69a10f1e324bd5d6f3d8ec1198f42d05a0237
+EBUILD fs-uae-launcher-3.1.68.ebuild 1946 BLAKE2B 72a1d5ba6524bbd6e2aea6d31c7508aa5f39aeaca066343eb4f83fe6768ba2be755826881ed99d0a99581ad91fdb43d0178b407502e9e4b13532c3def3a81297 SHA512 1a5274dd5d2fa26278f036f9203b9a7367dc3c85754a1841dd230c9e82bf2e26afd81a0f133d2fb50b2ce368f02c8e83d09608c77f61032bd95acf0775401cdb
 MISC metadata.xml 409 BLAKE2B 0e27dad4e68facd0066f0f7d02e859eef7147a16cffa734b74efce77eea44ed333052e3a2a9956c052d9c7e8459b50893b0af78eb2061d1c0a1eaf32597ee1d0 SHA512 a4cf13ffb131f6049cdbd83c16ee1114651450d874dca73f68dfa19686ab09021277e860068a4ed6e8318d9bb1b750f861cb2a693945bcd8d0d4eece7f576e94
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.64.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.68.ebuild
index 79ca9670131e..f0f95ef7d072 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.64.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.68.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index 1f8ebc510c41..4419fa65583a 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -1,6 +1,5 @@
 AUX fs-uae-3.0.0-Xatom.h.patch 669 BLAKE2B 3463b8f19551b8ea3d634bc75f9de2fb77685af9c24e1fba555991d1d094f4d75be048e4d9a7852bfd8882b1e9826f174550bc3953e3ec636193aaa647462d12 SHA512 af86c772049d8ff5eef36c8988888891ea60a68e929d752c8f1c9e325af584175f14496a2099654381bb33a3adecb913991e129fee05524ecad4a166228dbd68
 AUX fs-uae-3.0.0-libmpeg2.patch 1078 BLAKE2B 119d797854beb0148af9a77003b7b06696d9a474645ff15181044dcffd783a91f89a66cf90b072603c4f324b95a4a0cf124abefc6adc71b9be4b8a92f36060ac SHA512 8624c3404b627321a2b6673271be27daa24924a8c56903c870fd5a6f2dc50c18fd97810a1aab3cd684a5a97544c1e64f68c855c822d3e5bb5981faf264d28ae7
-AUX fs-uae-3.1.35-ar.patch 609 BLAKE2B 3e31b1cd19aaa88f73cb806d91b8187d7cf23338caec519afe29553fabcc7884fcc1c95a87731f1459b6e64c8eacfda060aec221a0342f4b5983fa80cc623b61 SHA512 0d808e8f6782ce4f9653ab3a100483a6f3e5d9104f8b0afc67ea7010beae7ebf4d1fb44a9a97bf21c119547d7fa2730a046f6e64cf24606f1e78c8a8ca0ad617
 AUX fs-uae-3.1.35-deepbind.patch 1150 BLAKE2B 2b75ae7e8ad353af78d02afec6e2c27f4bf442d201bd67ff9548e2c26d5ac2d15199ff1f649c0e1e6ed662e433bd103420f737d0a50db030bccc6eb687905fa6 SHA512 a645a05f16a9825d9f3f2ff798f0982687b8cae4accad1685e047e98648680e7b785d9efe0676c68ed9caf57ea39d08a70c60c3dc810117db714b800ef67a9a0
 DIST fs-uae-3.1.62.tar.xz 3632040 BLAKE2B 7d38a7bedca979c88d1c7566ae3a3c3df8009b2c02aec28753b6dc72d27049de37c5c0d3436fe5e8309511e9710ae3238f6f2d7eea36285acf4807294621bce5 SHA512 bafa9b012042c2b973ea0e5aaac88404f00bdfac85a2239513088d5432bda631242244f66f72b5879794815167409b127ee0a9dd320dd90ba8dac16019adbb28
 DIST fs-uae-3.1.66.tar.xz 3627688 BLAKE2B 9c7742b78055b4c2409c4527ab3b5daac829fa8d09363c5640ce433770ec0f7f6417cfa5dc7689bfdf747083bad654a8d433216b2c94e93ef3189f7e6f7213d9 SHA512 3d93c6481d4aebb21607fa6cd0716bb809a902a5e6e20cda97751f7878157a0737b80df1290c2e1cf4e13f1e9a824b750c52479cd05e56bff291be7471d167a1
diff --git a/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch b/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch
deleted file mode 100644
index 9075723da74c..000000000000
--- a/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4e6295094978817ba02e16ac5404ac9c9e287c82 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 17 Oct 2021 09:54:24 +0100
-Subject: [PATCH] Have configure respect the AR variable instead of setting it
- to "ar"
-
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index bb2c69de..6e41d68e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -66,6 +66,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
-+AM_PROG_AR
- AM_PROG_CC_C_O
- # AC_PATH_TOOL(OBJCOPY, objcopy)
- AC_PATH_PROG([MSGFMT], [msgfmt], [not found])
--- 
-2.32.0
-
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 1dd63780e165..0996e6226db0 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -4,6 +4,7 @@ AUX libvirt-6.7.0-do-not-use-sysconfig.patch 5001 BLAKE2B 65e6dfacc598ba771fccc1
 AUX libvirt-6.7.0-fix-paths-for-apparmor.patch 1974 BLAKE2B b5e9a151aa6bfbccf76ef0d6638b00cfbc3f8c4d5a722ba83699d29a32ef2f9a7d9eb678c1f61a128b0fee958a3349a4b843be08cec940f7d1e22757bc66bb95 SHA512 f81627e9c3d6c117e76a7a30af162a8ff8fafa191313155ceecf39bae2c457417152a0380d06cd3a4958b52a6ba410730cf66cd912072f7ec951b507c0a83f96
 AUX libvirt-7.10.0-fix_soname.patch 488 BLAKE2B 83a69686fa431f0ac360b9658abec16fb08c8373b4b79c75aaaa0c38c3251f803d907396f4cc92762d7e72be18b78da83def39dbb235cf543585d0d1e98407f9 SHA512 a492dc55799165b4b23e773e198a7092115bf128a5a6e368e802f04e504f5fd68ab80560c76fc37e204fb92149fd64f252e82e4fff394318e5c212e0da826a9a
 AUX libvirt-7.9.0-fix_cgroupv2.patch 1273 BLAKE2B a51442511a9f3b1ce3702dec2c59cb1cdbc7a67710b5e7e48e16265ddd48d8e5bfca908ad2c6000497fea9332c1d62b9786a2fb96bbc3cace6dc002448a4d5a9 SHA512 f00dfb1ed1f4f3e2f26178b6c2b821af9deb3ee6c63f79c194612432f9a735567c4d81c8928a02e1c9dbe7d6ac0f16bb526e506b0c6d84b727b99ae8f654417d
+AUX libvirt-8.1.0-do-not-use-sysconfig.patch 8246 BLAKE2B bcac53a75a724e037a43512e1b6647ce525304ae2f1c6dd1615d412964897f3775df973b266b4352bbfdf8be1aeb669f660414f66845925d668a635195dd7e1a SHA512 2d75bec8c2ab6f2727c43711c256322f352c603a4dd5021bc3627a7c19b67dc3e3d8a7cc74466e8ab8160c938e486c13a163eea5c0e160d7395b23ba67efb378
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
 AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91
@@ -15,7 +16,10 @@ DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 6cb2ab5913d382b11d24b46154dc325035505
 DIST libvirt-7.10.0.tar.xz.asc 833 BLAKE2B b9e129dcce43a87320b7284264c0689ce45742c0038a68c86fe7a0b789ddc2a49794fe89ae30d4d3675e884891a3b335b61beeb7ff0c5291fbc763ca6629de40 SHA512 41ef8e5fe9a8d1d6ba1c4fa8bd8204b0be83b50d3c936765d7ad005e75600287de0f13e0b14fab4d94d2d4b8bf8916fbe869cbfccf6293cc61c854513a0ef0c3
 DIST libvirt-7.7.0.tar.xz 8670212 BLAKE2B 93c72117941b0a74484c7510c8437054e66fc3ad20c02cead3ce917a38868da2acff9b1e70bbb823122ba647763a3682aaa0da04d82fa75e1acc67449301ae8c SHA512 a0d585c9ac46be08d2865d66456d681b7233291d17f6e0ed2564d0f29dc38ea7afc846ab382f58a193d3cd9acaf25fcc526feb3c98e12a6b4b8ae5aa4aec2f3e
 DIST libvirt-7.7.0.tar.xz.asc 833 BLAKE2B 86a77bf461e353776d79f31f1d0c82fa13e28348bd9c6ae7cb653b98886c7e070d67ed0db55f5e1f3b5e5bd2a3861a5cb08dbf95799b14df1037139f8001b030 SHA512 d5f8cd6accd3bfaebfb7c8761e321aaa9a090c7705256785c5507aa88d985f78a788047dc881f37ea6f64a4634c65c9718d8b1ee0a24744acc3ad5ed6e517bdf
+DIST libvirt-8.0.0.tar.xz 8860124 BLAKE2B 4669ae8f4de6379c3f94d3b6875ccc8eb435fbbf96aac26642fc593bc1921e9189decd9d366f5ca9e3e0fd8392ce840dce9e50ae048a5a2b72c465fd514eaf73 SHA512 e84cf2753d3c57cfe5aadbb6601fa76e0ba750471c1c24631720fe64376c3599ea252863ec671a50527e4fb380ffe0c2f02f07705b4b87d373ccf3e516ff4b1c
+DIST libvirt-8.0.0.tar.xz.asc 833 BLAKE2B 2571ee10d433630ddd79761b1a50948aed33f61ef11e793a7e563e37c28e48bc856139aa1cc62bf50852b056de14f36bb75fa97155b31bfa97c8af2ef55ba4dc SHA512 ce1252a034723774542ab00e782c24b7ef243b5ca302033e45993f90273c697cdb82e9a126b729557a6c90b5f407f0f06b78c0affb6eefe60c364fa979831f8b
 EBUILD libvirt-7.10.0-r2.ebuild 8760 BLAKE2B 8d17808556c7264c235f4a7eafe265b014024fa341ecb95914a24babb4a52cebc81d4492416e328a6055c8b3624c2fa9ab40a296376c1a08bb4a4d60d8c901f0 SHA512 a396e7ea2679050aac232de23743dbc6b2515f297c4c9ec049ae4525d8875834058bffce4aab2024aca5fcc20ab29d9124fe4de4e4a7d23cb439d0a323882bfc
 EBUILD libvirt-7.7.0-r1.ebuild 8673 BLAKE2B 3e71c52e01b9d6b10a7b217f3f7d42d1c54796a1debd8395a7c553957a30f3b825977e2d374fefa29e80ffb7210632e1caffda266cf0024ca41213f011826239 SHA512 ae21fdae32ed57611cce38c4b3fb21480c5dec566dea21e39e0419eb721e15da9879cf02f4a7509a0ccceeba9f233d1b340b21c25c012fbf87be3b72342cbcab
-EBUILD libvirt-9999.ebuild 8669 BLAKE2B 94bba93077decd2dea2fc89c1deca184ab4dde2af530e56ea5fd2a14dfa85b8981779a651c3b6cb04c8d1109b6a1ad5ee85660c539731ef71691a08b6085e072 SHA512 85d21d931a7d8550c13f1a751a71f210d34dda5729b777994e040ff49d2444a7767b9c289fb88e890be7b69fae1602b2a6133a0741c8bea33d1f0e3463c7e69c
+EBUILD libvirt-8.0.0.ebuild 8669 BLAKE2B 0a50f23a2607bcaa7d71222e628ef3ef2286a9307284dfaf32bc23da323989b6924f9e71040f1b321081b66bfe15aa7c1d050bf73b79b1c8136537de7493f793 SHA512 5bac7de3f2346d297dbe5d48a0beafdc641b6e7c8b1ea2a0f8189affb91b927b2aa8cbacea9929846fc8759002ad81eb67db233a7255225f488e0d24a10a3e83
+EBUILD libvirt-9999.ebuild 8669 BLAKE2B 86cfb6ae7a00d5951256906b996aa88a30684ee248a19c103b8a3c598e714ba91f5832c355974498cc42f0f84cf9425802489bb170e1d580ce8f2be6866d1246 SHA512 a024841e081416515f605994c40d9e96030ea66647b3abb87c79d1ffb87d61c4d0e1dadc2852f8cb1d11ac715d39f334492c582347af3386ebbae89bee80a620
 MISC metadata.xml 3328 BLAKE2B e7fa41cec946e6bb6888e335b463719b82a0ee9fe320eb48c03d400812d11c18ac94e9332f895c504563ad36dbb561e8ad165332433c02df6aef68957ea282f1 SHA512 1d68aaf6ea120da3407cf287f4cf6bc3eb091a155c78b4d6a731232e6f4d18238dfdbf1d7c4134a5641a3ee5f8ebaf3541b7a992ea61e5c1512dc7135a5bb02d
diff --git a/app-emulation/libvirt/files/libvirt-8.1.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-8.1.0-do-not-use-sysconfig.patch
new file mode 100644
index 000000000000..ec957cf51784
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-8.1.0-do-not-use-sysconfig.patch
@@ -0,0 +1,208 @@
+From e669d8bdc18a04154b10f0a21ee3f7c4141d2a42 Mon Sep 17 00:00:00 2001
+Message-Id: <e669d8bdc18a04154b10f0a21ee3f7c4141d2a42.1642669122.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 20 Jan 2022 09:39:58 +0100
+Subject: [PATCH] do not use sysconfig
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/interface/virtinterfaced.service.in | 1 -
+ src/libxl/virtxend.service.in           | 1 -
+ src/locking/virtlockd.service.in        | 1 -
+ src/logging/virtlogd.service.in         | 1 -
+ src/lxc/virtlxcd.service.in             | 1 -
+ src/network/virtnetworkd.service.in     | 1 -
+ src/node_device/virtnodedevd.service.in | 1 -
+ src/nwfilter/virtnwfilterd.service.in   | 1 -
+ src/qemu/virtqemud.service.in           | 1 -
+ src/remote/libvirtd.service.in          | 1 -
+ src/remote/virtproxyd.service.in        | 1 -
+ src/secret/virtsecretd.service.in       | 1 -
+ src/storage/virtstoraged.service.in     | 1 -
+ src/vbox/virtvboxd.service.in           | 1 -
+ tools/libvirt-guests.service.in         | 1 -
+ 15 files changed, 15 deletions(-)
+
+diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in
+index 3d944e17a9..1d94f3c943 100644
+--- a/src/interface/virtinterfaced.service.in
++++ b/src/interface/virtinterfaced.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTINTERFACED_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
+ ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
+index 2b5163e179..4edfdeb719 100644
+--- a/src/libxl/virtxend.service.in
++++ b/src/libxl/virtxend.service.in
+@@ -19,7 +19,6 @@ ConditionPathExists=/proc/xen/capabilities
+ [Service]
+ Type=notify
+ Environment=VIRTXEND_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
+ ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 19271d1e7d..87193952cb 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -8,7 +8,6 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Environment=VIRTLOCKD_ARGS=
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
+ ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Losing the locks is a really bad thing that will
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index 8ab5478517..a734e0ef9d 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -7,7 +7,6 @@ Documentation=man:virtlogd(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
+ ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Losing the logs is a really bad thing that will
+diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
+index d58bde9f5d..c5c2bb31e4 100644
+--- a/src/lxc/virtlxcd.service.in
++++ b/src/lxc/virtlxcd.service.in
+@@ -19,7 +19,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTLXCD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
+ ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in
+index 3decfbbf1d..c7c57fdd44 100644
+--- a/src/network/virtnetworkd.service.in
++++ b/src/network/virtnetworkd.service.in
+@@ -17,7 +17,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTNETWORKD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
+ ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in
+index 688cf89822..41c7a0f0f0 100644
+--- a/src/node_device/virtnodedevd.service.in
++++ b/src/node_device/virtnodedevd.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTNODEDEVD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
+ ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in
+index 36d00b58f0..d422bfeca1 100644
+--- a/src/nwfilter/virtnwfilterd.service.in
++++ b/src/nwfilter/virtnwfilterd.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTNWFILTERD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
+ ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
+index 551eb4d405..4c0344aad2 100644
+--- a/src/qemu/virtqemud.service.in
++++ b/src/qemu/virtqemud.service.in
+@@ -21,7 +21,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTQEMUD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
+ ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
+index 5d4d412fcc..27cfc34b90 100644
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -29,7 +29,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=LIBVIRTD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
+ ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in
+index 10e8cf7263..5fc887fe4a 100644
+--- a/src/remote/virtproxyd.service.in
++++ b/src/remote/virtproxyd.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTPROXYD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
+ ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in
+index cbd63fe0b2..bdf96ea0b1 100644
+--- a/src/secret/virtsecretd.service.in
++++ b/src/secret/virtsecretd.service.in
+@@ -14,7 +14,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTSECRETD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
+ ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in
+index f72f8426fd..6e865e53e7 100644
+--- a/src/storage/virtstoraged.service.in
++++ b/src/storage/virtstoraged.service.in
+@@ -16,7 +16,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTSTORAGED_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
+ ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in
+index cfdafc39d2..a1108e60f8 100644
+--- a/src/vbox/virtvboxd.service.in
++++ b/src/vbox/virtvboxd.service.in
+@@ -15,7 +15,6 @@ Documentation=https://libvirt.org
+ [Service]
+ Type=notify
+ Environment=VIRTVBOXD_ARGS="--timeout 120"
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
+ ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index 1a9b233e11..765b777536 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -10,7 +10,6 @@ Documentation=man:libvirt-guests(8)
+ Documentation=https://libvirt.org
+ 
+ [Service]
+-EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+-- 
+2.34.1
+
diff --git a/app-emulation/libvirt/libvirt-8.0.0.ebuild b/app-emulation/libvirt/libvirt-8.0.0.ebuild
new file mode 100644
index 000000000000..db6e3e909b5e
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-8.0.0.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+	SRC_URI=""
+	SLOT="0"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+	parted pcap policykit +qemu rbd sasl selinux +udev
+	virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.48.0
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:0= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-2.11
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6,script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index fa0d16f6ac3b..904ba0e4292c 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -132,8 +132,8 @@ DEPEND="${BDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-8.1.0-do-not-use-sysconfig.patch
 )
 
 pkg_setup() {
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index a109837351cc..499e397cb2a3 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,6 +1,6 @@
 AUX protontricks-1.5.0_no-setuptools-scm.patch 1321 BLAKE2B d96472bf9b0827cbc6bb9debf6c8da9f27773da4587d5b5c663180913ef4595fe21c5edd4798a8e98ee0a00dad75acec41dd0776e3dfaa6ff0aa186167e70c6b SHA512 9fce0b3ddd34801b7af8adcce2990c875ce68ed9289717f08f1f1653d447887b67b65d5c35de14a126dfbd4d1143fdef8fb8399f55aa59c498a68b0bc0480bad
 DIST protontricks-1.6.0.tar.gz 61220 BLAKE2B 8a9af6f8cc134ad0e74b4c5e6c35bc8344687e65cc9811ca54402b16f723264cef8def6e733a532fd412db51d0ec63533baec52699ae994a97ecad0a25ebe847 SHA512 7276d7de1f0c18afc5c67552290888e3851bd5f073bbbf684000be66c2e65abac84b079373b120ff0ab6e4f4919caf8ee1288a2320de6c37629cb1185dfbea29
-DIST protontricks-1.6.2.tar.gz 137643 BLAKE2B 09e6c37291eb47224d8f7cfcb5e864c86f6ea7ddcbbd11d1d64fbd24b2eed35aacfacad72e8481d7a3c76a915727e7dd8a58e80af9d208892a434dafb4098c17 SHA512 d0acf685c0f4480360bdf9c4e6444d51262316710d1dc6b0ca612da26a56efca647e9cdc030639bcaaa929077062cfa04a024b657a9456677d751758fe7d8552
+DIST protontricks-1.7.0.tar.gz 139203 BLAKE2B d93bbb672286d32743da1473e132508084bae527159911367c51e88686c38d3bad0a2f72a2c0f0feb09412e31e6d5bb20dfe113b9e71e4e655693bfbe663a968 SHA512 c12f211051bc23c8eb03c5385e8245361d72dcce1e641a7da1f87f344db5fdc7d698bd7691e0855ae025c1d94944db89b380805664d87123b6252d06259480ff
 EBUILD protontricks-1.6.0.ebuild 1443 BLAKE2B 5f85c7b2f5a01e6a59fb8cb91ae9c894f10176066daa8cdf23e1ad52e9a86d54f2df79c27dddfd4017f982f6c471b89882ecc86d6bbf253274ed3410dfa5c9a5 SHA512 cdf43dc566f66b85282f44b51153e5c9991f7a9b6efb0935edd0f15ef1857055dab2abfc9b9bb632deb6e2b5f2277bdd162476f86913cd35f51db1d1a3cf80d6
-EBUILD protontricks-1.6.2-r1.ebuild 1521 BLAKE2B f6bf285bfed16e28f14b88c993f4f6ed10b8acd73989947924da84ebe2e879b2f3fc0ed843862fa8887c2feeef2ffaa22a5591f72d7c2e3d17484aba16f8a4e7 SHA512 5641837bf5b8df2664f0c97928140435657b16d1d5c459846ea760f1ec4eca0655dd7c10f09e6be6037a033bdec00b7b04c1ae2a5a8d5df949daa5f30ab5593d
+EBUILD protontricks-1.7.0.ebuild 1562 BLAKE2B 2d1f12f2aaf762aa6ce807a25cda700ae81bf886ee18aff7c510e4caddb284403d16a94468e0288ab20e487363c69c276143e6b64569ea8128d1c3d5cfe96358 SHA512 a8603cb1daca3d04f068b66794c8bfb7fb50536dcb59d82422b47293ce13332ed04efc409c13fbd5044084f503455d793d968dbaf68cd883ceec2e0f162082fc
 MISC metadata.xml 809 BLAKE2B dc0506e6f3224adc867438699359c4eafc389041846c644818732036e04bcb9c789e358a08effdb4b9ff4430521f7fe8ff6800b75aa93d6313e3d85395467741 SHA512 351bb79dc7921e6c62100b3354546185d31578b044393ea5e5b5fea089eb47164882ff4ede30d8a575dea31ec9d0927793f8109d9e63ca4ad6954c1affdbe6f4
diff --git a/app-emulation/protontricks/protontricks-1.6.2-r1.ebuild b/app-emulation/protontricks/protontricks-1.7.0.ebuild
index 8ff35081420b..cfb253df8379 100644
--- a/app-emulation/protontricks/protontricks-1.6.2-r1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.7.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 xdg-utils
 
@@ -20,6 +20,7 @@ IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
 	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/vdf[${PYTHON_USEDEP}]
 	')
 	gui? ( gnome-extra/zenity
diff --git a/app-emulation/qemu-riscv64-bin/Manifest b/app-emulation/qemu-riscv64-bin/Manifest
deleted file mode 100644
index 6128a8cdb88e..000000000000
--- a/app-emulation/qemu-riscv64-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qemu-riscv64-bin-5.0.0.tar.xz 922240 BLAKE2B d4ff41c8e45ca99bc1b9e795d9e218b05be283b32d179e8ab88d07bd333a52fce7893739e6572219083d5d56a7abb7cc1870df7c585ca41af15b56a5dc30369d SHA512 1ba28679ce4bf1f11b77059dae8cb76f0095cc4427159d769947b8a1b1212c9de0a25a236c69ff9780dd111a22fa6e01519a3017b0b0a5d29069575501552f40
-EBUILD qemu-riscv64-bin-5.0.0.ebuild 489 BLAKE2B c8c05afb49827fc776fc4569f51fbcc18a43519241dc580afc58b6e8cac09e31e3a82224fc6ebce7beef913a3794da1a9f9ddb86b2b01c4c5a8254f2e07e9ecb SHA512 a93aadc16237a744e0edd22ba11787b3867a25a402b560ea5ed5ec6e5104d9e1f88c66ce3b562fb936f416bd4088e4e74d687b418e40377cc8485a341e09dba1
-MISC metadata.xml 480 BLAKE2B b5cae93d33c4a545ec372fdeafb4506c29ae4af108a383c999eae12114c64be3ff6fea10b249b8424c87e4e2b8019baae2b7dfc00324d3e999df883ef6486ff0 SHA512 8c6802738ce515e3a5ba3bbbcc4a4a2e038f7805853a34e9d8dfb17fef781bbe7d90a5ce9c234e94e6f9041d26933117df3ce5ff8e3bebd754b3455348e7ca18
diff --git a/app-emulation/qemu-riscv64-bin/metadata.xml b/app-emulation/qemu-riscv64-bin/metadata.xml
deleted file mode 100644
index 13c97c61bed6..000000000000
--- a/app-emulation/qemu-riscv64-bin/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>riscv@gentoo.org</email>
-		<name>RISC-V</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>virtualization@gentoo.org</email>
-		<name>Gentoo Virtualization Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
deleted file mode 100644
index 650e2af57e19..000000000000
--- a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator"
-
-HOMEPAGE="http://www.qemu.org"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}.tar.xz"
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!app-emulation/qemu[qemu_user_targets_riscv64]"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-src_install() {
-	dobin qemu-riscv64
-}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 4707f2661144..0c56b9748538 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,7 +9,7 @@ AUX qemu-6.2.0-user-SLIC-crash.patch 6998 BLAKE2B ae8bcd4d729f9a60e9c2680f7c04fe
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-6.2.0.tar.xz 115667324 BLAKE2B 3f2f02e5c36113df6231a9474c6d5db774e541312173813c28f578d669a51f391695d364dc806f5906d9e3c2796bb20b2606fcd46a247eb751ea517de9d7ce15 SHA512 e9f8231c9e1cfcc41cb47f10a55d63f6b8aee307af00cf6acf64acb7aa4f49fa7e9d6330703a2abea15d8b7bbaba7d3cb08c83edd98d82642367b527df730817
-EBUILD qemu-6.2.0-r3.ebuild 26060 BLAKE2B ad3291ea714270a3ac6d7d52bb8721536cd0a131ecfce763a46a6dcdbed1ec5f1d4a207e29968f2435ca9ef6499cc8696a0e89948d0568d55ad4695bed7e622d SHA512 941ffdb8b38badfe4f5716ae5e465e59312186b4bf6bce99ad2fbc8903beaf7ddae293f80295559a5b3736c844d9c48803ca3e873015ad94fbadab2bd2f79054
+EBUILD qemu-6.2.0-r3.ebuild 26067 BLAKE2B 19d97fea36a482c5d1976288958cf41108db9c78172995e7b6a47c2c04373be91b07ca5c63ba60278917c6f720548d31266af07c77483f50fe72ad6b85446532 SHA512 a9c6a7f1fb46556403230b7679bf05f25cb8600e8fc98ef15c422ede739c1a60d7439cef2639ada2a299fdfb426286ef10cdaf741d05ccd560e699695a9c1c3d
 EBUILD qemu-6.2.0.ebuild 25693 BLAKE2B 3cf29a95b24e1a1c777605d793caa8c9bc684e1ef37ce9fe8f55988fa5aa29ea140343a405755a07cb313f9a7e3dac42d10543797b41f70b8711cefc02b0e501 SHA512 d2243ffaeeb92d02717863b1dc09db06eaefdca17a934914b5f2d00fa3429f2ac52a154661ac7937cf0703f4392fb19eb1cde9402a88a5d79c5e9d89463199a4
 EBUILD qemu-9999.ebuild 26006 BLAKE2B 294a7f2f8b40867a589572646fad3e3e2f61f1ea704ffae14c36e619df180a261f8448a986c974f80ea1d00807be52103c7add6882c43742382e2a38e13ee310 SHA512 bffea46b6aecbd1eceb5e1a638c8bf36587859066d08270afe6189745debe9188bbc9721176e3c44d4ffdaefbca04d32594f9a9a581bf18234d21309616413c0
 MISC metadata.xml 4590 BLAKE2B 420dff5c9595ed662f5c5963543d63e768b4db9b77518a1d84dca09daef2b6b2c5c089955804af9277cd26533eac8148b93c9d1c2c9cc4285d141a321af2b6e1 SHA512 9c85bf9834eaf1b450807931c05a32c843a247b614ecb26e82151828a5c4be2d95510119b7431c563d3ac5d48126ffc99e9cb654d94f361e4c2d2c7fc6347dcc
diff --git a/app-emulation/qemu/qemu-6.2.0-r3.ebuild b/app-emulation/qemu/qemu-6.2.0-r3.ebuild
index b7b5af92737a..7c6d561d686e 100644
--- a/app-emulation/qemu/qemu-6.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-6.2.0-r3.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index 2c9ede9335b9..1a9269d7a6ed 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -6,9 +6,11 @@ DIST alsa-0.5.0.crate 63941 BLAKE2B 155fc6b3d06b1d84f9cc1031c6b0ecbd82d5afac770b
 DIST alsa-sys-0.3.1.crate 32748 BLAKE2B 0c4da9c343d622ddd521fe9332acf97c1ee4a202a909c7a0014a507148ab6ff82d5098660dcba847d938b296adde416ae420d454d6982c33a0456f37840d716b SHA512 6523d909c500fee433f934eedfdc200cfc52e1b55be09434665210c16bb9af3593d8b1346ace184b171c7135a7aa65fdac5ca8c68e64f9d20436e1d8fac961fe
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST approx-0.5.0.crate 14359 BLAKE2B d1811157cb560d24b559b5f4954654dcfe4d1d418f90ed98536c0f8c72584b9cc10c93c4e89fa376f96be043338964d07bc722ef16ebf3041e8c7eb755f2941e SHA512 4c7ef7d54b6a9fac11587fd16638d36d8738e5156f5abf77cd994056377427f12170b61c03d1acf591dbb897911babc852c2a4a12b3c5277e1065d952c9e7dc6
+DIST approx-0.5.1.crate 15100 BLAKE2B 8fe84d52263521c0b72a1d1e82ed283828f680b8b56f532df2c14ea86ca09e793686d823c5d58ecfd7a829948543bb375e85223c866cf036e9432be5d6aa7399 SHA512 c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST ash-0.33.3+1.2.191.crate 359980 BLAKE2B c94767e6c3a37ce55134b7cc96ca415276d9630dcf21b76bea165b525f1bd052cbf8a51710a93264404ee9ba936a2d69468a946741696c76fb06721b71fa0570 SHA512 693f633d82eb0bf388d68c58a672e43588b36ebb382ea79dc1ce9d17f83cbaf52d4ebb905a7f8b3fb92d5427977ef27cc02a5233dcd54d11c9427f6c15fa05b8
+DIST ash-0.34.0+1.2.203.crate 372762 BLAKE2B f30311989488bf0c1d127edd6b2ce53f9bd6a4b8dc967753b9fe25a48e8f24c1257b209bb08f678befcd5595c2883d82c4b7c8de8628b4d28a657bd092811f19 SHA512 4c9f551a78829973591ac4392f211b2ee9184d5b89625cff6e5f84f9d08aaf15f302b450b1a60f906e15eeaea7d640b1d071ac357fe411d68c98767b13583102
 DIST async-channel-1.6.1.crate 12574 BLAKE2B 5c5c8f1cf1458d952637a439a1534e68bcb4a1cf478cec6b6d224387f56c59dc6cffd2e3621dc24e03e20df3fdbda5b8855fccfbbc26a2aa03656aff3a17d02f SHA512 797b1f5b4c07853f78670e62b67fb787c329ffa2c89475a3767a963d524a69dce082cc7f3a2878d9c990f00ae2d9cd7e0d21743fc4186769c238467bdb20c65e
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@@ -41,6 +43,7 @@ DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clang-sys-1.3.0.crate 37713 BLAKE2B ca7ee0771a970ed67b02d55d9027bab061c52d624540894cd00d09d847f6f35c58e76a1a6153309f8af709474df64b46f4764c2036883a688ffb8154d77ed123 SHA512 80c78c53a877cd8208730885214c135dd65a208cfd047dba7595283bbeec266f4d39cd1e0b3c2c69a474569ba68e4db93636e31a77c350d7bb2337e06ee7cb74
 DIST clap-3.0.1.crate 189189 BLAKE2B fb70451d86d02437b14f564a3ce302727b480b518bae78596adb2d3a74aa8ea0ea678116764d23c0041852f305359285d172163c25947a12641243e37711c9d8 SHA512 a3a745487ef73ddfa3554f3ddf4c9a5c54cde6beefc2c3e7ca9cf54b301b9eb1ebf20a5592a1018651c79c6844553cdab0f67ff9347e0f7e6facc48652f872af
+DIST clap-3.0.6.crate 190343 BLAKE2B ce5f6aac91246fbe68f46ac830c30b3ad0cd01fd45c65c05bcbdaeac0cafff313c4fc976ea2fd00bce911e7b047b38a010f81a83844cac572a66874280096b6d SHA512 48ca76721769336ac178c990c1ccfe95e88a3dce9d3ecadf67b46c89561a2e65b7b68f4c88d30df22d9afbc85b3f317ef8cb6ef771e037de83e721f1b707689d
 DIST clap_derive-3.0.0.crate 24684 BLAKE2B dc56ba1b2d5dff063d19a1ed5d9188cd3cbb3fd65e11060b471cd842752d53a022b94f9acca0ad9c104d1b149667997433b7374991d3173c2ed87c372adb0bfd SHA512 4974f5df83fc27ffb132ad5247a3a368b8a3919f313d7e0477e3422640d1c6f19a30b11027ebedbab1a168e56a35e61474641741ec1dc75ca0ab3555a78d25fe
 DIST clipboard-0.5.0.crate 10009 BLAKE2B 17aaafeb92be0dfb4ccfdb80a3d909e57491cc0adceedf378196f7bbd006d245adfdd9b2d2e075c2c041aa57eb1a0e6e306032966c30e63f94d86b0f9f7a11ce SHA512 a02994e68bb4ecdb1ba3db05e095474e67df4d73f69c92ab096913f4bd0f47ec6b62c8f0210fd67bb466e293c765888c315770e447f5c6e9b2e5c69f71d3e48a
 DIST clipboard-win-2.2.0.crate 11079 BLAKE2B 5713e17a93eac4a1d299d42a6abe5db1eadbc90bf5e7c99e84b6b5febfc817bbc1c478533af8cbec7a8e58ebbc1a8f3d83bf351d105b55017cebab8048009390 SHA512 f869775bb2e6d84096034c26c888c9f671272232af74c02bda2a6c8f0d600652af581c0e94d875d8746b986314f61168bf7539042a65cb2ccbbf858141fa42e0
@@ -70,6 +73,7 @@ DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114
 DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
 DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
+DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
 DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
@@ -111,7 +115,9 @@ DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bde
 DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6
 DIST encoding_rs-0.8.30.crate 1370089 BLAKE2B dae26cea51a7814536d1fba835f36cf7b0d536be0f26390fc4c1785720521a37651bc33acd9f7692f4967a3658d056da11a870aea071f53e803a71036d42448c SHA512 0addba12c6021a1211639cf80a956b50a5fc8bda90f127f73920941980d11a265e43de83e91f9ab423ec520ab11f6111c0d982da2d73e640128bb12aab1083f3
 DIST enum-map-1.1.1.crate 10082 BLAKE2B c0ba5cb3ed4005984810e620f966990175c0a03e5f0661ec1ecef056fbe4841159398472552fcd19e3420645073ab3875526f1519294dc8fda6f8020abc35f84 SHA512 9face5238401d3dd893813fdd66b78d88ac6a4f47294d9f43b091194366fd535da79577c9d79c0a0a2dc2bbe1019bf1880e2b47830e476abbb181a09beb1ea99
+DIST enum-map-2.0.0.crate 11005 BLAKE2B b4c688f196b13eceeb9b86f314beea53208c6fef0f9fc3e266d689a99515f6ccbd012fad1fc911c4343ed6e7763775aa0bb524d9eb8fc06567357fb10954e7c2 SHA512 935bd8477da2b92a9a32a29825c39cbe07849f71c843c69dcce5b3e11c00d5d06a2ca7042932a28b21097eacb6a4377fd5213604f1bf258cc461e87769443472
 DIST enum-map-derive-0.6.0.crate 2012 BLAKE2B 69cb6a57de56822d1c4618a99c2b49bbac466f25061b28072b77071c96e2d1526adfa1e57c66566642789b2298dda0466aab7ff3e897f112974a5dff28c89b00 SHA512 2caa293b3820572fd697686bb6a6b4faaeea64277363d02075501ae54287eafa4b7b409cd851f09f8333e12e8a47e78ef11f9262e27da1720bb274061eb89ed0
+DIST enum-map-derive-0.7.0.crate 3588 BLAKE2B 293006fee9ea06989a28f93720935d742a274e11d2da9cd00d0656ecf21c46f73fb43f07d555a5e65ef1148bcc49b20f765d3b96dc72047ae2d680af181381a0 SHA512 07b8f2e9c97a81dde558b3961cc4988d21568233c08bdb65e4ba3530e7d08609aa0f9581fd9b5f944bed619109ea3f8613bae2c7334fc1ddfa678f50784fa2b2
 DIST enumset-1.0.8.crate 17434 BLAKE2B c7837a75b9f686eaa6a594c1dde8afa2f02b4291da6abd58775758c79ebfa667d9d6b3b52f67e02cd10a6f0dfad103d6164ab38a27a3ffa0b5a4c4baacae417d SHA512 55be419de116a2fc3374a5d7455239d7945b4e900b8958266155724bfc8fc1410166c5c8da3ac8d779459a4753cee1dc359e4f5b3091bfd55364c551b44e3683
 DIST enumset_derive-0.5.5.crate 10295 BLAKE2B 89366859e97130f96019daf2c33347ea08315f673141acc547ac56ee248f1df89290323c875c8fac660b46e0260344aac592431e3b9078b9dc4a461806802fd6 SHA512 0b9ba46cf72fd7408c416eb615bc77df0eefe287e0acf6083f83c26286f5b0456fc36e7589b7417285dc35549affafabce8c369afe88678d6032aead5a0fdb49
 DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566
@@ -143,10 +149,12 @@ DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927
 DIST gif-0.11.3.crate 36151 BLAKE2B f90cbde636ff16ccaa0e83e31936d7d926aca06dc6e42c726e1caeb9655f3aa8b062a1997bc0a7280a276b836a24c2de6b2dc0493cfa937db892453573612405 SHA512 e581ce1e9099a7ebc913e20ace1cacb2c87a7fba178bce43bf7285fc1dc9b9eda55848204923cd18eaab9012a814232f9e587e4c0db6bad89cb91bf197591e46
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST glow-0.11.0.crate 140599 BLAKE2B b02c6d1a03940849c3ef4dd05c2e1a2330dce582f34e02774382197155fb9cedd19103030b921bc8a71b71802c40aee5e652a5a56b2234fb2d763c263f732c8b SHA512 79177394b86cb8faae82a8aed13747b924b28e65b70335834a2cb289a39f3c65912e154ef5d1678679f2a2a3f0861d4117106d0ff40745f37100625ad795a256
+DIST glow-0.11.2.crate 142135 BLAKE2B 3c4ca1960aca248f7814f0dacb53317bd217cc11a7e944e8113658d13bc5e307b989f6e97948c2ce9bc5dde5129c09d476c9a4bfc12463861f1fb8b99e866e99 SHA512 b9f9f284649996c3e1e43829f75c1c0cc10702a0efcf91c685466a919cb7819a8ac496f707096198a060ddd5fb34cc853e563ef676007dcb59ae57f03c8f3531
 DIST gpu-alloc-0.5.2.crate 17477 BLAKE2B 562601cc90eb3bff0a15aa0c2bc234a3806b3237de109b7f151203f0210de7d0e1c4da8d73e2f380217be28fec4fff9154942b1ae42e659b8595c896057ae8c4 SHA512 14c7fedf4fe457bd2155682f33ea7c002d7e5e36f1e38fe2843f02aa9961d058ec74624600797e5446c8873a535131392b8d4da0f0a69992939742795587d5ec
 DIST gpu-alloc-types-0.2.0.crate 3073 BLAKE2B 4010628ba21cab23dd8e23ebe38dafbf3ef072d686a67bdfc04ef3818d2341ea15bbec9be428ed638e57974c17db36614f9c9126faaeafeb4973fef0b8f95adb SHA512 37659361281d4e2a0785fbdf065c42d6e7922def36d225e1af78b392986647b904737f0f862c57ae0be28df24429ca999ac7a72b42d125a6f22564a92e80459e
 DIST gpu-descriptor-0.2.2.crate 5890 BLAKE2B 06b7466dadc43dcf27b82c913e10d4750e069fa8a02a7d98074bbf388ba33048157a11ba858fd966ec21d11ac690d6d99350552bd259771c029fb2df98b1f2b7 SHA512 6cd9a05181f0c7bf241ddbe1ab173eac3fa93cce1c56aa50e405b8fbe7467d12c71a2f8fafabb634d97c6f0cb71d25237617ee52c2510c09d78b5d1d52ad6e93
 DIST gpu-descriptor-types-0.1.1.crate 1956 BLAKE2B 70789874373f3e98b5659b59a71dbbf71260f331c2811b759fab8db91f15aa4b484b9d0554aa54c80e4dbd4bc308ae7b636b4e1a59dd35d0a1428e1a8bf88711 SHA512 e313ccd74ac4a7c97bf0ec85ba65d84635d7aeaeedb8764496dd5ba332e4797f7305505babb5663b5413646a0c964bf1780c93942850a8930edc1d3b400ebcd2
+DIST h263-rs-023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz 83430 BLAKE2B 8128496cf5a64edfa7d9264b9f8bf791dd0877faf60b97dc33a94c49f610bcbabfe2d6b50426460edfc4836f0602955ff70c415268c375fcd88cd030f356a4ba SHA512 2226b8ab4327d6f4f2763b3ece3958bfb604542d3db8c3df4a348edaf8cd9f2ecb6f21a965117b23ec3d331787a998a791eceb5a2f28611208d6550279224136
 DIST h263-rs-b810e8c3fdb8ea5df0b7808891076e774bee40a9.tar.gz 83412 BLAKE2B 05e4a085084dad8ebc2343f909add41fba74b168b1b075efaaa76eedf44cd4ff5bc332a520418bfeb5c65d44b7f3aff2c99d7303c1b0e2139fc77d6a4c038ca8 SHA512 cedf5764255a3ff769bffc2902b3721d1e699efe4376d88dd3310b8a1cfeb2d41e7fbd1312aa8c79660d0342d428297eed6680186d411f3e2df1e4d163994a29
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
@@ -158,6 +166,7 @@ DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786b
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST image-0.23.14.crate 226804 BLAKE2B 0debec9484b54cb56eedbf07c246b80afc6de99b03e5f41b5cb9aa29ad2269cb7e9891b7377ef7ff53200959317bd38b24e823ebe5c2125677ef2588eec81ae8 SHA512 4eb07fd698c2d902979ab06ae0baef4a53db74da78493c45f0c32d5903c5399cb8a1a25a2e89bf504ffb612e8153eaba4ae41df3d17f02c27e7991fdca518f63
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
+DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
 DIST indicatif-0.16.2.crate 35057 BLAKE2B c2f3beb7ac4450c5aace863f33de7a4b474e93c5d34fa55acacf971c5e0918b4b72c1a970f15395a8256fdf8bbb78edc8f2a6fb85be4aa7dbcd13d1fc30ff55a SHA512 5f60358f1fe3ffc0ec97d1d8922a7a2645d7dc0affed1d49a9205becdb36756d6a03482ef00fc918231770f967f7fc523f7b8c3bf4c06f71a0a93549c46fdacd
 DIST inplace_it-0.3.3.crate 13145 BLAKE2B eedb3d8ce0dec3f10f0d6abf13083247035faedfd660bd97863763deeb3b6a0e3f9b6321cc43d5985c0744da93a86a4e6c2f562451197c8a03ed9aebbc374c0c SHA512 2cc8b4a1dfb44bcf5e425f047b9c7df60a57bd160e95ed5fad1c25ab591208050f1e0aab531a2dab3798ac2889d4d3e854c6acc7d87b38a2e54d2440e9c090e0
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
@@ -204,6 +213,7 @@ DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c6
 DIST mio-0.8.0.crate 82954 BLAKE2B c88da4c6681cfc518707e421251ccca176b12762e8d5d8fe2e71a89746eae94f3b3d1ccba3e7a32ac68928b81718552f6faec267e79a889d858e0c215cd1b2a7 SHA512 b7db8f400c46937302a091a90ef05b501aaaf8cbd9b5d8a4415e140e5ad54fe745ac3248b49a6ab42399d145c01fbbdf0a69defc379caaa67f64e8b7cf160b07
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST naga-0.7.2.crate 358297 BLAKE2B c85a2fd317a5529b94c98b6380da10a478ad264b63f6ac892f106ac1e7670efb486a0925c2259ab05e86f54600054c8632d3a72778143b74b6d451b4341cb749 SHA512 4f052f3e086fc82de4f8b9f9c05df7990867704faab09c7f44813a86ac31d201502421dd85e9dcef5674205254125f7e29ddaea832500fc6f8559f0d72ae10c2
+DIST naga-0.8.1.crate 374337 BLAKE2B d8a74737ffef43bb0af5751782ca3b0a121c4f2483066f64bb643e58c5aa10bb7a1aa6cceceec6def9340cd52369b788448fb3f2eee223801c8a2dd3f93d40e6 SHA512 83b628393fcec47160c9278f66c3cd03875f9cfc132961a33b9fddbad79a52b7ad6ce81aff7a3a216074edc79d1e3bf5833f6c75012ddbc3312985c7bf2ca5ed
 DIST ndk-0.3.0.crate 39011 BLAKE2B 3a0eddb4d086b23fd9452cdb4207aa9ca78627169ade437e0d6d0def493cc6860624393e77a6568bb5487c87f55e6ffd08425777eb4a332058b7e8af468a84b9 SHA512 f0c1a517da1f8ab3a9f8b402610a721c591059da7500aaf66a021daf55c065a237a3d5c5855432cd46823f29b048ccb9b1c360f39fc76186a4b92a413e93e49c
 DIST ndk-0.4.0.crate 39223 BLAKE2B 4e6ed8138af45a9e6f9d11de5f310df249d29634c91965444e0103064d402f1177214758cd3eea519460ac163804eaae1a7a31811da729a020206982c8b48d25 SHA512 bf5fbee7d553b4ecbb6e9b90480be5e4d00848a7b24773227deb2718240edb5e5c239bcbd02162acc3f9e2a02d23f33bdca038cffe5f493df6c35f56886ef9b7
 DIST ndk-0.5.0.crate 39766 BLAKE2B 787a2c053e81732c2e57bf3cc944978c9168c116689a812056597ffc203b13da6ee7677bc788d924b3cda8dbaf35e8ff7cf6e4f53c53138ad78758982fd12081 SHA512 4d61aeed68f6b309c92801bfd844abf0ca15ce1c54adeeb28792010cdf1c71ef3d9f4df36c9460eb614c8568647695dc70c4d5feac55babe1c309b65db023946
@@ -285,7 +295,9 @@ DIST regress-0.4.1.crate 99620 BLAKE2B 9141cad8f53e2a8e3ea3d746737ab5b8c75ed345f
 DIST renderdoc-sys-0.7.1.crate 4592 BLAKE2B d5c543119a498bf295bf506b164945a3de6c48358891170278baea05db0f67813d9bd232cc52593fa02095d04cbb163fdfc9ef2c121eb1155ca761b89350cc15 SHA512 5ef5596705e4d9b752e132571960e4518b96e47b65ea799dc4fc87cc4abcf769e05dafd3a7cf78df4957ed32d42f714f9d78b2f3614597cd5a45352a3f509dab
 DIST rle-decode-fast-1.0.1.crate 62490 BLAKE2B 34370186c8875c91b8d353b372518bc039c58061e0e0377c7596a9e100b047550e800c431f2b4a59556fc266eefcbc7846b53d5a4e10360fcbe435acf63249b2 SHA512 38b3565279b134dcb3bcba001b081ada73f36e4107bdee935036631b740b6e1d1f767e3965ad414e38c8606abc1733f898062bce01b8c19234f204adcbe05a4a
 DIST ron-0.6.6.crate 45107 BLAKE2B 96fde52fa2c073cce3a7d10ffea7d9156b71c3d801fe822be702a3d1cbcfab61d87024ab98dd2458fa05fdb7ffadd9eb0cae36ad87b02504e8585e1909bf4894 SHA512 06a2a1c4760bfd6c5b6743fbdb533cab6955e68ad6f60a47077d3ee359e2ed1b2d448eeae45af15e8b40f63076806fa7c56c1b803d3d339c4713a15f6b7a5040
+DIST ron-0.7.0.crate 45492 BLAKE2B adff53e8db8fc8c2288c0803b22cf064334596697a8278e51a5f0d1d2e48e69e02e377a735b30dec78a0b896ff55dffd8b4748cb305f06b08a64ddd2e319e8dc SHA512 1d690def70a47df838c69c042fd183037ca1b6becf2e013d9c30944e2d77b89249c22fdcb286a720c0ee181051b8ea19f62971ef3762f63fc121570d8fdd7fbf
 DIST ruffle-nightly-2022-01-08.tar.gz 7210511 BLAKE2B eb74d9be32f7169adc59d26eec1d7fb5459563c2266a6362b5044b89964febcacda97c06fba289e9e3071e2d43c4f6424962d6fae20a9aed7e3df4bbbad269da SHA512 5938d12fd728f5f1eb39b4df7c4214a4f71307a6a34200d5d4ba08e1ec6c718636d4d2972cccfbeced3c20fee519b079b4aeaec44991fba1dc6e64d0187d67e4
+DIST ruffle-nightly-2022-01-27.tar.gz 7170855 BLAKE2B 6a73753e78b16e4605b5d57b4bf1ff96a8f363346d7a60185247e33df20b8f2fdb7c52205854379d2f6b40f78b807796f97d763515211746172b193dc59a10ed SHA512 66d9e7fab98e85aaf3da872c37d34123ec067590eccc8db6f6820e42df00a3c29e8b8454c4eae1999c72d50626fa6f2352ff911a8526c6f77bb5419c71ab4889
 DIST rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz 676612 BLAKE2B 3c2ff3edef1aad8e6276758fd3bac85106fa9a445180c9c7d954d5b4e469751b9a14e1cc8c3bc4736a410f5e1478eb821395b8f0a1acb0e5dca1082155b0690f SHA512 6f668066999d3454d255d227167ef92e8fcf5755017617439fc227d53c5b8169a7c585857bed4879991e8cab0a6efb4ee04eca3e1b7e01bfaaa4cab70af30d3a
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustdct-0.6.0.crate 38905 BLAKE2B e55c9fc53b50865d434759600214ef14b0a4d06f224806d3f89f55b111848f4addb44419bad93cc5262e2eb8dc87dceb8b4920c63ce36b1cd227179e76b7a93d SHA512 87101defd1419596bf447e3acfe0dcc2f1667427117f148c01f755afc1898aecf0e38f7826687a5b9359da331820df633acd3fe0d0a0e87ff80e00c389c383b9
@@ -301,6 +313,7 @@ DIST serde-1.0.133.crate 75566 BLAKE2B c6f9334c6a3f722fc3f8b75a031f3c34acf81de14
 DIST serde_derive-1.0.133.crate 54726 BLAKE2B c59d71b857513be8b7377b4b9182b7f60e441f7fa5428939ff8a25567ab645eab8ed54178dbb4b41967b7b9073b51cdae68f5a910c91a26cfc2baad0c0344b9a SHA512 d8c18ab50c1b500dc49eed1b5ea26bb46b9adf98b3b3c6c97f9c5d11324368342188ffbfef4c8a092c69577622ec85e672341a49853a957b10bf8dcbc6c0f441
 DIST serde_json-1.0.72.crate 115888 BLAKE2B 0770707160014ef19f54ab6acb6bf8cad8ae65ab47c184912aa534b927c0743e66273e93c7e3190102428bc71914ab4648bfe0c2cae9416afe6ea1d7da217996 SHA512 e48129cb5c36b4999751302fcee811b80f2113780c12e122b13d9fc7a31af7452183ff89de1793994edfdcae61a80db37aa492250a0d69e9180659418a10063b
 DIST sha2-0.10.0.crate 20037 BLAKE2B 44e176709b94dab3f28d21013faf0f3151b0fb29b02b76aaeea260b28090e07dc7767e354981acf76880d195fbcb4c315fdac401e1d1898a8bbb4289c4d2982b SHA512 d193e2bfe200c2e39a5d8c3381d4730bfc5da9ce112d23040cb7ce395003349b6177542bad0c18e6b3dec156f444b48a843765410064ebc42922a5b26cc6f0c5
+DIST sha2-0.10.1.crate 20128 BLAKE2B 9eb517cfb31928a7a157a79bebf5e0a5afba618d196d8b04a5537fd9f4758c46dac51b57db9f37ec9921058526747ef87e3c6a0b641cfea2e4982ebc1f451457 SHA512 775cc22edd350145e83be362b4fb4910c1fa50d413ce5496777a2aa3f049df4a8d5d5556147d132189fe3bec91528a52ead8283fcc6f00556280cab8375f1b20
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST sid-0.6.1.crate 7966 BLAKE2B 2e899a8846074122dd8cd9c15333771481b74e4b9427b9282efd78901e40936cabae6995c7a3279b604fb7ef388a7cd2586082ad56933d616878f6ed0c9be123 SHA512 528e36c206fe025145942fe99fddea70035c4600f3b0be4ea83361ba28e2b777859fcf0bdfb99b51611c0fc733f3ed0c36e72ae8cff24c7cc49fe3091390c49d
 DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca
@@ -322,6 +335,7 @@ DIST symphonia-bundle-mp3-0.4.0.crate 49852 BLAKE2B 79185d456b469ebb75e85f7fe929
 DIST symphonia-core-0.4.0.crate 91015 BLAKE2B ed7edc77bdbe2ed0f676ce4570e40e4b3479162a94f0d909dc3b8737dd961f0a4aed9b15b968233a6bb79de515caa1b392801c99039c2ff0d8160f68a5ff7d5d SHA512 673b67c18a045e070979784fe4d9b343ffd543635881b89fd5c45b3b248fc0ae442ee451f669f495a10abee74a0dfa2849f3d49c1f1a7f8be0cc88f8f8f89504
 DIST symphonia-metadata-0.4.0.crate 20555 BLAKE2B a75bf705ad923dfc4c7dcd1cbb82f0548b3002d2c75a7fb0ace8c37191c3ed74c9a351ef355f06b648fb932825fd7c751ac0c75478c8521be7794fcc94cda99c SHA512 82a0af7b0795ebd28e1ec54ea39a6b2e63f77f65dc6a9fd436f08128d3b863a1ff8c71ec3674445ce41b012af4e0a369196c7284e30745e1be28ab7e726e5a87
 DIST syn-1.0.84.crate 235025 BLAKE2B 98fb0ff91c6b103588a12b718445d9cfefced59b2e66fbfff75d44b65f8c411cebb70eaa1bb0e19fbae076c87f179e8ba6231f696ad97a687b58b394c2eaca7c SHA512 c1bfbe6896e8b7e414b2241462aefe9552a5292ba58214e5ee3c70ea54f9cb5d4c77dfc3ebf3b2809bf6fbf297222b4570f2e6e3eb91931cc686d28a58c7dffb
+DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
@@ -332,6 +346,7 @@ DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e
 DIST tiff-0.6.1.crate 1399263 BLAKE2B 4a0bec5d2f2d254505c3492e519c584e2f80f77a6429f44da36862b5d9fc1ef9f7396689005b136c92f6786ac64f9418ca7bbf49f36afdf3f10e8d2c77cf0f51 SHA512 ece5aaef610e0a7bcdea8c40571d497cd3ec79931e25129060b4f51cb40a28ef03fc131494bc841fa5b08eaa49a5acbc9332553cbc542019f1ec5eb5945d3538
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyfiledialogs-3.8.3.crate 46124 BLAKE2B ba2334541f89a97a7b73c62030ab5dd0c0a43e3e430563a6b4dc44926626cc9b844724cffe4da132b00c803c49c2be587c64b493259030e383d3f6a3efe5dd82 SHA512 96f83a3a9b6b63d1733beef9c7758f6c8d2699cf50e7b643003a310f9a69e5904eb0eb7da56e26f6d3a2bba7c40dedf446709357d9625ef5bddf2ec7e4f40f63
+DIST tinyfiledialogs-3.9.0.crate 48418 BLAKE2B f2a52619deb15aa9bc58e936ba90209f8efcb16d94f125900f97d5ab68507f797feef47f85d254ad355bfe40a4fea4861891555432596b00ed9c0af6df65e298 SHA512 93fd365f363023efda6bec2886f5664a192251375c9bd5d322e21d7c8075d34d5f1932281431a324e584e7324137bfad1304deeb8c08a4535494c46884ba273c
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
@@ -372,9 +387,13 @@ DIST webbrowser-0.5.5.crate 11194 BLAKE2B de9e7afab8606cecf9c39d84c743ef7e78a81d
 DIST weezl-0.1.5.crate 34944 BLAKE2B 57db23ed5d92b658a3ace462194763756a3ec3caa530296efc3255ae1d14f36ccfb4841d2417028ef57f093eadfa19b157f9cdc29d37b2f72fb661578cc7e907 SHA512 1fe4352dc8c773ac1297ba23ca3236dece6cec44887116afb1b3760dd0cf3ffcf5faae3aa98814775fddc38032c97c26a14684b47e7aa9deaecafe8c908e0735
 DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
 DIST wgpu-0.11.1.crate 127556 BLAKE2B 1d4e030fd30ca27e092951f0785ff7d0cc2b79529ce51dfe024f60ea0b0c2a2e335636123de32754aa20a20c6156014dc400ae0d8fb4fef62d0c5a1582c42e4a SHA512 eaff914ce4aea628487986c06858f3533ac4c1150bbbc54b025298579dcdd06c0224a9ff0bfd3cda3d1639da16d7601a5ef62e669972e26d262a3ba0a59544fa
+DIST wgpu-0.12.0.crate 129003 BLAKE2B ccc71e96fa9fef85ae20159711afd113af52b0141bbf53f4396bddfe53b66683ba72d0939a06b574026c4cdab090587f157391068f23130a9b6ad947351faf46 SHA512 b0a8eba0bb75aa8b42d169db5d2f647400a6ac8e7db89e67bcb447dd3325bd0b97b2bcf2633085c9434dd7b92d3c7ad6414c6b30f9a41f7749e5a72414261786
 DIST wgpu-core-0.11.3.crate 145810 BLAKE2B aa933787da1aee6dd8a5ef2dbabdc7d463d7a61977b44e88bae709868adbbc05cab6aacda756578a7f7c110df716f8947242abd5b17d2980715d664412522487 SHA512 4877ad5b7bbe6c7497eba4d10288dcfca46f65c63ae9811f2195e3cf817b628a1c8e5978beacdf7c19e42ed9192ed0576445788f06085b25ea00b98c9d7b4d54
+DIST wgpu-core-0.12.2.crate 161787 BLAKE2B 34b00a16eb8da84c20f8ac3b412f6bb07d7a526aaf6374be794f15eb03afce318464ca2fd0185912de0c3736b7ed0ea2a77ea0a722581089c5c84a0242029940 SHA512 ba987de6aa833ac1a9f9fe704de52a2ccbcb9e0f5fc05ef7b5510836d028a93888f4ad1df4b0d142d4231d83558ae3d5aea1d02045ba5669e9806ad84848453d
 DIST wgpu-hal-0.11.5.crate 191366 BLAKE2B 549fb7895ce6e46ec934a4bd98108b8e252121485e91481c9096149d2c06947785fdb4aa4661aa05f54cf99f6f5a443cf84274f0d2071cbf9b1ad1bda0770a39 SHA512 622245e2378bc4cd536c2fa4e08fb8203202e39836df6ca3e0ca990b5977c13b1d5cc6495abb7578d90a6a3877b881c870fd07403a45900de4c4da4be1823469
+DIST wgpu-hal-0.12.2.crate 193327 BLAKE2B d2e3383bd04844a1ac69e59bb825c475269d4ef4b02a4f16d866a2fcb9511529ed545099fcc1cf487589b97db4af68a20078a9d2cd0281bab591ce3b4892bc2f SHA512 02dc6309c922dcbe1e38995aaea221761070c05b9c4a0a8039f666ac56c7c161aa53515663e62d1805d25318fe77d4aac41fc36abcb54a43211ce2e6fc79911f
 DIST wgpu-types-0.11.0.crate 28990 BLAKE2B b19672a4f294d4e1127d32e8aff5ed2b114a23eb5e726833a7ea642a7f0ca646e688ccb98ac4f0a520fb8187a2592bf527fdb5fc90a739a8daaeb5ad035b2c6f SHA512 b5b8d6265b29899b4994deb1be3f19d5f3d7592dd56e04e4b38f4e9a2c2e9b356dbcc10ab429802a411ba4435ec4f2fcccc28cf607ff0ae4fb0daef8182c949f
+DIST wgpu-types-0.12.0.crate 30107 BLAKE2B 0fa233c2acb9ec804ad2e34a4138a3285e7245ef28b0715de4974c6c31b4d37c643cf5b1cca7e7f4bf0e3186849b525b1265c6894568ab05d6576d9c2b76d7cc SHA512 457ce8228e80e1f2687424032c7eb4b3884f228fddcdf5fb9bed59f877cbf07a069321beed70e0f54bced6170a91116ebc5ea49ed817ff72777ff3d19015f0ab
 DIST wide-0.7.3.crate 69975 BLAKE2B d211bdd0b1c2f2fcbf94e0e883971df78c9bcab9bc90162b867378cb315c12ca35e2156801e8ff352b85f9a2d36fcc6162032103ed5fa7fb20243ce214854de4 SHA512 ad70b5ff9d83e8ae70c0c1a47b06ab88bcca5c3c3054d2e0969375f35438236ce95c24f14a29daef304bb6629d708689e6822b18842de067a540e4940b852cb2
 DIST widestring-0.4.3.crate 26215 BLAKE2B 7e5cdbb58a23004bb76cc12d451fd891ef08c05f730b059eb62a0f5e9482dde58c4059f9c0892fb1ebebbc8ee85dd20ece3ebf12c48790dca5eaeeb20b81dc34 SHA512 48561bd8a3b589f2a0328d1286177fbc6c5bc534756898912cbaab81d742b64ef898eed75073484d5e30762ceda9d2e88710074e7e9ce1a7dd43b5d871de3860
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -382,6 +401,7 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST winit-0.26.0.crate 333610 BLAKE2B a02eda0f434f81488912264549013a566714460a52717dad3d334bdfeb118b189bcbe332bb43ae7f7649577bd38148446c6720c44622f36362ae9511d375cc4f SHA512 a1947241410b4f3420c85042160dc232348692ae19662a804e87122c509af6833339a0ee00bd1b04424a40dae5c126ff2381302859543dcfcd29cf0ccfa5cfc5
+DIST winit-0.26.1.crate 333842 BLAKE2B 6eb454288c278be0817484fb5558e0463b4e31f76f7de73dfbb0295c369d6f2d4f1b8b111a620f30597803f6511d8dcf9b8ab29f1377fd798d662511b8013ea2 SHA512 1d9052c301263e5895dde17783600116cc88d972cf505fcfde838f13a93bc61c552b24feccbd0e4c30b64d186c817d21f9ccbb5bb48adebdd18d286bec9bf9ae
 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
 DIST x11-clipboard-0.3.3.crate 7357 BLAKE2B c75868fb79574334e581a2d0e278900843471d7287a31455774fe0741b4cced5d48f0630a8f041c5d88619f79f6bf447d228402bf040733f60b368de3e663f85 SHA512 b45283bb897f3fe1a3d16d12a962376a26c2c26e37140b32c064f9a768454dffb584af2f24e13adf00dbc5e0095aacfe40b27fabc7745598037ddbebaed688e3
@@ -390,5 +410,6 @@ DIST xcb-0.8.2.crate 129071 BLAKE2B 83596850decb752c8fca84c383986e3cf1ca0708a682
 DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f490edcdd824661288eae98f2bf2c4d7da7079bffda0fbfed0409a7ddb329d855deb784fc952d1c2f2d5dbdd1 SHA512 229ea7516d8a07c3fac46b70329e89c19fcf282134b5063b8302a64f8723d31b52b4fcf23c49aecd3a3a0a736ba4a52cd033f8c3db21a775084c6c0a0e1f6c1e
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 EBUILD ruffle-0_p20220108.ebuild 10732 BLAKE2B ed328f24767490906674b49b5f0ddc55da4e06aeeadc6bc39a55d065a92fc528506c0802ee7ede6fd3b35b1f53d73a4a57bd968861dd5ba86f5d520752619f3f SHA512 79d1088d648d4ea66f9b31010e6f17ea20ff9bcbcefcbfe11e1ae43a28ac56fa6ca1e3cbe4df761595aa4ae63591c6b826cff4e989a69f0fa44a369fb603d858
+EBUILD ruffle-0_p20220127.ebuild 10707 BLAKE2B 66fcf87b16ee1e410f224330bea5c9e21821ac4325e34752011b75b9bd9ea359e40f5d007724719b78c2ed95993fe8c564ebd2b8ede1c73576db01a55bff003d SHA512 7bae5761af7914f70d3fbdecc3b035e0843167aed4bf99aebc3b1b273fe7105776c7650348df6219e8bf5eb6a034b668c62c6386b483aaa2e70a8924e222f920
 EBUILD ruffle-9999.ebuild 1613 BLAKE2B da4d49a9e469399303b0d80288716e7b93bbea742db4babac4abec7d02d3115f442f5ff76435c9268d19e201a7ed543a8907ae6cf78bf4f6ae644aea92c2cd69 SHA512 4bf061a0b45616292dd777bb198331fe92fe3ea60b89ef3b15bb6be3a8f6edc5c3554b95dc20d514e353b96736b64fcd21e3318de6a12e99c2fe84db11c3474d
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20220127.ebuild b/app-emulation/ruffle/ruffle-0_p20220127.ebuild
new file mode 100644
index 000000000000..5f62fa5501da
--- /dev/null
+++ b/app-emulation/ruffle/ruffle-0_p20220127.ebuild
@@ -0,0 +1,504 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	adler32-1.2.0
+	ahash-0.7.6
+	aho-corasick-0.7.18
+	alsa-0.5.0
+	alsa-sys-0.3.1
+	ansi_term-0.12.1
+	approx-0.5.1
+	arrayvec-0.5.2
+	arrayvec-0.7.2
+	ash-0.34.0+1.2.203
+	async-channel-1.6.1
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bindgen-0.56.0
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bitflags-1.3.2
+	bitflags_serde_shim-0.2.2
+	bitstream-io-1.2.0
+	bitvec-0.19.6
+	block-0.1.6
+	block-buffer-0.10.0
+	bstr-0.2.17
+	build_const-0.2.2
+	bumpalo-3.8.0
+	bytemuck-1.7.3
+	bytemuck_derive-1.0.1
+	byteorder-1.4.3
+	bytes-1.1.0
+	cache-padded-1.1.1
+	calloop-0.9.1
+	castaway-0.1.1
+	cc-1.0.72
+	cesu8-1.1.0
+	cexpr-0.4.0
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	cfg_aliases-0.1.1
+	chrono-0.4.19
+	clang-sys-1.3.0
+	clap-3.0.6
+	clap_derive-3.0.0
+	clipboard-0.5.0
+	clipboard-win-2.2.0
+	cocoa-0.24.0
+	cocoa-foundation-0.1.0
+	codespan-reporting-0.11.1
+	color_quant-1.1.0
+	combine-4.6.2
+	concurrent-queue-1.2.2
+	console-0.15.0
+	console_error_panic_hook-0.1.7
+	console_log-0.2.0
+	cookie-factory-0.3.2
+	copyless-0.1.5
+	core-foundation-0.7.0
+	core-foundation-0.9.2
+	core-foundation-sys-0.7.0
+	core-foundation-sys-0.8.3
+	core-graphics-0.19.2
+	core-graphics-0.22.3
+	core-graphics-types-0.1.1
+	core-video-sys-0.1.4
+	coreaudio-rs-0.10.0
+	coreaudio-sys-0.2.8
+	cpal-0.13.4
+	cpufeatures-0.2.1
+	crc-1.8.1
+	crc32fast-1.3.0
+	crossbeam-channel-0.5.2
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.5
+	crossbeam-utils-0.8.5
+	crypto-common-0.1.0
+	csv-1.1.6
+	csv-core-0.1.10
+	ctor-0.1.21
+	cty-0.2.2
+	curl-0.4.41
+	curl-sys-0.4.51+curl-7.80.0
+	d3d12-0.4.1
+	darling-0.10.2
+	darling-0.13.0
+	darling_core-0.10.2
+	darling_core-0.13.0
+	darling_macro-0.10.2
+	darling_macro-0.13.0
+	deflate-0.8.6
+	deflate-0.9.1
+	derivative-2.2.0
+	derive-try-from-primitive-1.0.0
+	diff-0.1.12
+	digest-0.10.0
+	dirs-4.0.0
+	dirs-sys-0.3.6
+	dispatch-0.2.0
+	dlib-0.5.0
+	downcast-rs-1.2.0
+	either-1.6.1
+	embed-resource-1.6.5
+	encode_unicode-0.3.6
+	encoding-0.2.33
+	encoding-index-japanese-1.20141219.5
+	encoding-index-korean-1.20141219.5
+	encoding-index-simpchinese-1.20141219.5
+	encoding-index-singlebyte-1.20141219.5
+	encoding-index-tradchinese-1.20141219.5
+	encoding_index_tests-0.1.4
+	encoding_rs-0.8.30
+	enum-map-2.0.0
+	enum-map-derive-0.7.0
+	enumset-1.0.8
+	enumset_derive-0.5.5
+	env_logger-0.9.0
+	euclid-0.22.6
+	event-listener-2.5.1
+	fastrand-1.5.0
+	flate2-1.0.22
+	float_next_after-0.1.5
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	funty-1.1.0
+	futures-0.3.19
+	futures-channel-0.3.19
+	futures-core-0.3.19
+	futures-executor-0.3.19
+	futures-io-0.3.19
+	futures-lite-1.12.0
+	futures-macro-0.3.19
+	futures-sink-0.3.19
+	futures-task-0.3.19
+	futures-util-0.3.19
+	fxhash-0.2.1
+	generational-arena-0.2.8
+	generic-array-0.14.4
+	getrandom-0.2.3
+	gif-0.11.3
+	glob-0.3.0
+	glow-0.11.2
+	gpu-alloc-0.5.2
+	gpu-alloc-types-0.2.0
+	gpu-descriptor-0.2.2
+	gpu-descriptor-types-0.1.1
+	hashbrown-0.11.2
+	heck-0.3.3
+	hermit-abi-0.1.19
+	hexf-parse-0.2.1
+	http-0.2.5
+	humantime-2.1.0
+	ident_case-1.0.1
+	idna-0.2.3
+	image-0.23.14
+	indexmap-1.8.0
+	indicatif-0.16.2
+	inplace_it-0.3.3
+	instant-0.1.12
+	isahc-1.6.0
+	itoa-0.4.8
+	jni-0.19.0
+	jni-sys-0.3.0
+	jobserver-0.1.24
+	jpeg-decoder-0.1.22
+	jpeg-decoder-0.2.1
+	js-sys-0.3.55
+	json-0.12.4
+	khronos-egl-4.1.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	lexical-core-0.7.6
+	libc-0.2.109
+	libflate-1.1.1
+	libflate_lz77-1.1.0
+	libloading-0.7.2
+	libnghttp2-sys-0.1.7+1.45.0
+	libz-sys-1.1.3
+	lock_api-0.4.5
+	log-0.4.14
+	lyon-0.17.10
+	lyon_algorithms-0.17.7
+	lyon_geom-0.17.6
+	lyon_path-0.17.7
+	lyon_tessellation-0.17.10
+	lzma-rs-0.2.0
+	mach-0.3.2
+	malloc_buf-0.0.6
+	matches-0.1.9
+	memchr-2.4.1
+	memmap2-0.3.1
+	memoffset-0.6.5
+	metal-0.23.1
+	mime-0.3.16
+	minimal-lexical-0.2.1
+	minimp3-0.5.1
+	minimp3-sys-0.3.2
+	miniz_oxide-0.3.7
+	miniz_oxide-0.4.4
+	mio-0.8.0
+	miow-0.3.7
+	naga-0.8.1
+	ndk-0.3.0
+	ndk-0.4.0
+	ndk-0.5.0
+	ndk-glue-0.3.0
+	ndk-glue-0.4.0
+	ndk-glue-0.5.0
+	ndk-macro-0.2.0
+	ndk-macro-0.3.0
+	ndk-sys-0.2.2
+	nix-0.20.0
+	nix-0.22.0
+	nom-5.1.2
+	nom-6.1.2
+	nom-7.1.0
+	ntapi-0.3.6
+	num-complex-0.3.1
+	num-derive-0.3.3
+	num-integer-0.1.44
+	num-iter-0.1.42
+	num-rational-0.3.2
+	num-traits-0.2.14
+	num_cpus-1.13.0
+	num_enum-0.5.4
+	num_enum_derive-0.5.4
+	number_prefix-0.4.0
+	objc-0.2.7
+	objc-foundation-0.1.1
+	objc_exception-0.1.2
+	objc_id-0.1.1
+	oboe-0.4.4
+	oboe-sys-0.4.4
+	once_cell-1.8.0
+	openssl-probe-0.1.4
+	openssl-sys-0.9.71
+	os_str_bytes-6.0.0
+	output_vt100-0.1.2
+	parking-2.0.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	path-slash-0.1.4
+	peeking_take_while-0.1.2
+	percent-encoding-2.1.0
+	pin-project-1.0.8
+	pin-project-internal-1.0.8
+	pin-project-lite-0.2.7
+	pin-utils-0.1.0
+	pkg-config-0.3.22
+	png-0.16.8
+	png-0.17.2
+	polling-2.2.0
+	ppv-lite86-0.2.15
+	pretty_assertions-1.0.0
+	primal-check-0.3.1
+	proc-macro-crate-0.1.5
+	proc-macro-crate-1.1.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.36
+	profiling-1.0.4
+	quote-1.0.14
+	radium-0.5.3
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	range-alloc-0.1.2
+	raw-window-handle-0.4.2
+	rayon-1.5.1
+	rayon-core-1.9.1
+	redox_syscall-0.2.10
+	redox_users-0.4.0
+	regex-1.5.4
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	regress-0.4.1
+	renderdoc-sys-0.7.1
+	rle-decode-fast-1.0.1
+	ron-0.7.0
+	rustc-hash-1.1.0
+	rustdct-0.6.0
+	rustfft-5.1.1
+	ryu-1.0.6
+	safe_arch-0.6.0
+	same-file-1.0.6
+	schannel-0.1.19
+	scoped-tls-1.0.0
+	scoped_threadpool-0.1.9
+	scopeguard-1.1.0
+	serde-1.0.133
+	serde_derive-1.0.133
+	serde_json-1.0.72
+	sha2-0.10.1
+	shlex-0.1.1
+	sid-0.6.1
+	slab-0.4.5
+	slice-deque-0.3.0
+	slotmap-1.0.6
+	sluice-0.5.5
+	smallvec-1.7.0
+	smithay-client-toolkit-0.15.2
+	socket2-0.4.2
+	spirv-0.2.0+1.5.4
+	static_assertions-1.1.0
+	stdweb-0.1.3
+	strength_reduce-0.2.3
+	strsim-0.10.0
+	strsim-0.9.3
+	svg-0.10.0
+	symphonia-0.4.0
+	symphonia-bundle-mp3-0.4.0
+	symphonia-core-0.4.0
+	symphonia-metadata-0.4.0
+	syn-1.0.85
+	synstructure-0.12.6
+	tap-1.0.1
+	termcolor-1.1.2
+	terminal_size-0.1.17
+	textwrap-0.14.2
+	thiserror-1.0.30
+	thiserror-impl-1.0.30
+	tiff-0.6.1
+	time-0.1.43
+	tinyfiledialogs-3.9.0
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	tracing-0.1.29
+	tracing-attributes-0.1.18
+	tracing-core-0.1.21
+	tracing-futures-0.2.5
+	transpose-0.2.1
+	typenum-1.14.0
+	unicode-bidi-0.3.7
+	unicode-normalization-0.1.19
+	unicode-segmentation-1.8.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	url-2.2.2
+	vcpkg-0.2.15
+	version_check-0.9.3
+	vswhom-0.1.0
+	vswhom-sys-0.1.0
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.78
+	wasm-bindgen-backend-0.2.78
+	wasm-bindgen-futures-0.4.28
+	wasm-bindgen-macro-0.2.78
+	wasm-bindgen-macro-support-0.2.78
+	wasm-bindgen-shared-0.2.78
+	wayland-client-0.29.1
+	wayland-commons-0.29.1
+	wayland-cursor-0.29.1
+	wayland-protocols-0.29.1
+	wayland-scanner-0.29.1
+	wayland-sys-0.29.1
+	weak-table-0.3.2
+	web-sys-0.3.55
+	webbrowser-0.5.5
+	weezl-0.1.5
+	wepoll-ffi-0.1.2
+	wgpu-0.12.0
+	wgpu-core-0.12.2
+	wgpu-hal-0.12.2
+	wgpu-types-0.12.0
+	wide-0.7.3
+	widestring-0.4.3
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	winit-0.26.1
+	winreg-0.10.1
+	wyz-0.2.0
+	x11-clipboard-0.3.3
+	x11-dl-2.19.1
+	xcb-0.8.2
+	xcursor-0.3.4
+	xml-rs-0.8.4"
+# python is needed by xcb-0.8.2 until update to >=0.10
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+inherit cargo desktop flag-o-matic python-any-r1 xdg
+
+# 0(github) 1(repo) 2(commit hash) 3(crate:workspace,...) [see core/Cargo.toml]
+RUFFLE_GIT=(
+	"RustAudio dasp f05a703d247bb504d7e812b51e95f3765d9c5e94 dasp"
+	"ruffle-rs gc-arena 4931b3bc25b2b74174ff5eb9c34ae0dda732778b gc-arena:src/gc-arena"
+	"ruffle-rs h263-rs 023e14c73e565c4c778d41f66cfbac5ece6419b2 h263-rs:h263,h263-rs-yuv:yuv"
+	"ruffle-rs nellymoser 77000f763b58021295429ca5740e3dc3b5228cbd nellymoser-rs:."
+	"ruffle-rs nihav-vp6 9416fcc9fc8aab8f4681aa9093b42922214abbd3 nihav_codec_support:nihav-codec-support,nihav_core:nihav-core,nihav_duck:nihav-duck"
+	"ruffle-rs quick-xml 8496365ec1412eb5ba5de350937b6bce352fa0ba quick-xml:."
+	"ruffle-rs rust-flash-lso 19fecd07b9888c4bdaa66771c468095783b52bed flash-lso"
+)
+ruffle_uris() {
+	cargo_crate_uris
+
+	local g
+	for g in "${RUFFLE_GIT[@]}"; do
+		g=(${g})
+		echo "https://github.com/${g[0]}/${g[1]}/archive/${g[2]}.tar.gz -> ${g[1]}-${g[2]}.tar.gz"
+	done
+}
+
+# using _pYYYYMMDD over YYYY.MM.DD given ruffle has an underlaying version
+# (0.1.0) which could get a non-nightly release eventually (YYYY. > 0.1.0)
+MY_PV="nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Flash Player emulator written in Rust"
+HOMEPAGE="https://ruffle.rs/"
+SRC_URI="
+	https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+	$(ruffle_uris)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 ZLIB curl zlib-acknowledgement"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+DEPEND="
+	dev-libs/openssl:=
+	media-libs/alsa-lib
+	sys-libs/zlib:=
+	x11-libs/libxcb:="
+RDEPEND="
+	${DEPEND}
+	gui? (
+		|| (
+			gnome-extra/zenity
+			kde-apps/kdialog
+		)
+	)"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=virtual/rust-1.56"
+
+QA_FLAGS_IGNORED="
+	usr/bin/${PN}
+	usr/bin/${PN}_exporter
+	usr/bin/${PN}_scanner"
+
+src_prepare() {
+	default
+
+	# use [patch] directive to register git snapshots of needed crates
+	local crate g
+	for g in "${RUFFLE_GIT[@]}"; do
+		g=(${g})
+		echo "[patch.\"https://github.com/${g[0]}/${g[1]}\"]"
+		for crate in ${g[3]//,/ }; do
+			echo "${crate%:*} = { path = \"../${g[1]}-${g[2]}/${crate#*:}\" }"
+		done
+	done >> Cargo.toml || die
+}
+
+src_compile() {
+	filter-flags '-flto*' # undefined references with tinyfiledialogs and more
+
+	cargo_src_compile --bins # note: configure --bins would skip tests
+}
+
+src_install() {
+	dodoc README.md
+
+	# does not have a real GUI yet, flag is used to ensure there is a
+	# way for messages and file picker to be displayed with .desktop
+	# (many options, but zenity and kdialog currently seem to work better)
+	if use gui; then
+		newicon web/packages/extension/assets/images/icon180.png ${PN}.png
+		make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
+			"MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
+	fi
+
+	cd target/$(usex debug{,} release) || die
+
+	newbin ${PN}_desktop ${PN}
+	newbin exporter ${PN}_exporter
+	dobin ${PN}_scanner
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "${PN} is experimental software that is still under heavy development"
+		elog "and only receiving nightly releases. Plans in Gentoo is to update"
+		elog "roughly every two weeks if no known major regressions."
+		elog
+		elog "There is currently no plans to support wasm builds / browser"
+		elog "extensions, this provides the desktop viewer and other tools."
+	fi
+}
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index 1752507c5b34..2a7ffdc8c015 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -7,6 +7,6 @@ DIST spice-0.14.3.tar.bz2 1504304 BLAKE2B be655e1d4c48dae29903ab8e0dc52da63723e3
 DIST spice-0.15.0-pthread-c5fe3df1.patch.bz2 7605 BLAKE2B 86b8094a22a02080db038ef98972bf09f391d5344fee8df2aa7d2def0b50a581353cb0e3dd97f99bbd58b88a13ceac4b54be8086a9f4274f38d132b27b62e84d SHA512 5075bd260b33c2dad8c3ce641372383871f7d69190a4f4697bd5e12af1bf5429310c592961de001d36c19a9cdd91143b8d6e8be0e08b3850b9700c2aef2ddd78
 DIST spice-0.15.0.tar.bz2 1537970 BLAKE2B 98e8f55de81a86c6370e4a74c0fd90db78a9a8e8e3af536bccd6a2a75185194ac7b87521163090c4312e392d2ee10036c0283171c7796aea630e1307128a2d55 SHA512 0a776d191c395ce1f7ebbbac47956a00a2765327d3127aeca6e232bd56fd4ccd28750ae1599eb6eb2909ac909cda517d5511faa631166db16b8b75bd4e7b86d9
 EBUILD spice-0.14.3-r1.ebuild 2621 BLAKE2B fb7b7b353150b930c483319ce63cd2eed08802862568e4a27c2bbd890893c2abe8a10322643d322f34c8762369d014c3ef16c8e5da279e53d96b824bc4ab081c SHA512 ae8142fc96cc2cb997a58b4fcc37395edd7d83e87a7abaa051a02d5aab0cfffbd8b4e02f5dfe6fb46c0d320a9370bc27efa9d7b0bcd54d7745f4d64d4faf86c3
-EBUILD spice-0.15.0.ebuild 2570 BLAKE2B 59a21e001226cb887b76e8d1e52dad5a14a3461ef835fcd4fb84d219853203f8fdc1164f93c65de71e2f84189c5e7e1a5774938f7ba02ef25d7cc6afbb3f943e SHA512 72293b3de1f844a993702b06ecd3d5ac88a2f0e97b34294db018cfe848362290068109a51b3b48eb0b33dbe1a31510bb8eb20c7ba019f49c672bacd5107869f2
+EBUILD spice-0.15.0.ebuild 2577 BLAKE2B 658ba9350441709221824f402c5648cd9cb5f3adaa4927bac70abe3b5f88d47b65efb7078f0458825f288a03c06ae59e113852390f5efd53eca7c8cd631c10b0 SHA512 34ae0ee46adbaee352636b5fed6e81f12b018fd073903fd189781b3c8f052f70b565b98eb3d5e9c4336ad44af2a455412e2761def6aba05a095931a34321eec8
 EBUILD spice-9999.ebuild 2300 BLAKE2B 5239901e616adf6152dcdf0f34c198e4af70a4e0f01a066108f6c5e58f1c3aa6b7dd4e9946b73fdd25acf66e0012f0e0d7816100fcf12c5242ae1ce39e2c8782 SHA512 6cde87ba911257c9745c7413df3ac44021ae848c1676a3802cb176e5fa06249801e329a5e55d902e0cc56845e132a82c1ece7cbdc19fcdc681e960f2badf846a
 MISC metadata.xml 386 BLAKE2B 0f119a27a56d18c4229d807d0a8ed56816ff5d85ff3366b763f25ded218cfabd823cb7ca7fb695cf1c079d75bc0e02df13daef5186c61937db8a572489a4a055 SHA512 b977a2ffba331a37f0c26e01558b8d12beb586f24904cc5f26687973547021caf6c377479de86bc27405346f4dcd49130c5281d7c9d1b37b7809a70354eac37f
diff --git a/app-emulation/spice/spice-0.15.0.ebuild b/app-emulation/spice/spice-0.15.0.ebuild
index f4ddca794fbc..5a175e06383d 100644
--- a/app-emulation/spice/spice-0.15.0.ebuild
+++ b/app-emulation/spice/spice-0.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-pthread-
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="lz4 sasl smartcard static-libs gstreamer test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-emulation/uade/Manifest b/app-emulation/uade/Manifest
index 7afb523e64d3..98d3c19fe925 100644
--- a/app-emulation/uade/Manifest
+++ b/app-emulation/uade/Manifest
@@ -1,4 +1,4 @@
 AUX uade-2.13-configure.patch 620 BLAKE2B 4266246e968f5bcbfee755896047c5c0587a5199d8fc7882b4f9665175865a94491d6bfceaf3549b6f825e46688ab2f6164f6b4111101212f907d9bdec3f2b28 SHA512 08d5caa315054553414961cd44149f949099341f9c91b4dd7ee957649fa029b9c1927f583bd581e6b213f381b3eb43fe5097a87747ce7e36e94487fafdc96c76
 DIST uade-2.13.tar.bz2 2897931 BLAKE2B 7d5ba128fc53bb683a6a21616e3c9c2a7376361086f3d91a59026ac89eb48d9520f89342914078ccb4614a16826a8c90f86a6052caffc9d5cc4e1e0ab6b092f0 SHA512 675c3369ed55a314cab81ae7ba8a09b277ab1cfe2354eac92194f746803ec2464b7603d665cf30da41caef5997c21515e69f0313d8d2b079c242a08fef786183
-EBUILD uade-2.13-r2.ebuild 1094 BLAKE2B 5190440d95bdf09b30a86213a2c606711c54fa8b42cc56aaacd9fbad66e13f326d5644654ceba1dae7a81ff22673166cdcd2cd12b376d622f476755290ff8605 SHA512 0d880e1cf49d0911861454c7bd2adfcabfa4a22ae0abac0b912bbb3c9800338471d860782dac2e4c17288087d5308296f80fc7924329c3c9088bea2e1640c768
+EBUILD uade-2.13-r2.ebuild 1101 BLAKE2B adf0578a3de6d08b16768ea1ef84aa5ef5dbbfd4ed3024adff30adcaa5c3ae9fcfa423d07ffecfc13c5e153db02279964a96e849718dbf50a88e9a5350c291d2 SHA512 ead0dc19c88425209c5dd4a07500b5f8706e03b94f214074a3efbc22bd4838c1a6036c6244fd5a6f268aefc2275a65f708d060514c543467b13e22834a3a8695
 MISC metadata.xml 459 BLAKE2B 70b1874ea35e9bf14d7259c488d30ddbbbc31905a015a54f0da15bbff245205f8d1e587d0982b6fa7b412e13f2405f73ecd7555b970167096bd19eb06fe5d438 SHA512 261a535b27a246cf808aca95fc354d87595abd7d2604b0cdab88a15f3e02a87842376b45e49f548be9bcc5dc1c121ea2e381d57bd35c4ae0620f0395908748fd
diff --git a/app-emulation/uade/uade-2.13-r2.ebuild b/app-emulation/uade/uade-2.13-r2.ebuild
index 262a54d90331..2c10c1574b37 100644
--- a/app-emulation/uade/uade-2.13-r2.ebuild
+++ b/app-emulation/uade/uade-2.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="fuse"
 
 RDEPEND="
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 6b9e380c5bf1..ac314b79fb2e 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,5 +1,7 @@
 DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
+DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2 SHA512 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
 DIST vice-3.6.tar.gz 11389599 BLAKE2B 6ebf0a235f059cd4b4a6408e32657babfb1d8bd15c101764ea05224830caf1f53807434b7556ea2aa494e7fcc8f8f19b44e9202572679e76f0a147f52941575a SHA512 4e17ccf6b57a26cb439549fe0e9097045aaf78b3a291df8b47e16bf54c585194d38961a7d17d0c1c9e76e6e2aea7aa6e513cfcdbe9802363f2d885e9fb50bee9
 EBUILD vice-3.5-r1.ebuild 4077 BLAKE2B cf446708e7d2b3b84db74d7e59557a9cd078ea28cc3e3f3ec2024a14865f0ed5b8157a968bf9a53cb08c1c88c7ca1bb4937ec4b3c568fe70e9107619a5dd4942 SHA512 e207be81ee7ecd8f4049e69befd6171bcae1758538a34704e538d7903141c28b7a179c9ab2b3afddfeaabb3d410f31261f1cd525113a612d90e736c8f8f027ae
-EBUILD vice-3.6.ebuild 4618 BLAKE2B bbc19cb818f22d329c60c0559197d8daa5868bfbf1a280d5ce680d88f96baba3ca6af41d19aca21f8bd3497be83d6c557a9ecf53ce9e57da7120ef2520d82757 SHA512 30154367e690ec507f1ffbb33ac3dd1c80416fc90515563c4cdad44d0a8d6a7ed8eaed20524762ac1f77839aaab9af0a18d6a43c51d12efb3f989d12b40cb187
+EBUILD vice-3.6.1.ebuild 4596 BLAKE2B 85b4ab455a964b7e92be8e34f53133d7f99e20f5784ef9a417a76fc18bfa39f6dda11c5f7e35f23015b31bb3dfcde80264a1efdf3dee2618f92838142c2256fb SHA512 31a0cc37291452d66f141b7cef1f6628571857f199f54b075d6078254caf5bf9dcd3928e021c8dbd990ae4ece46a12bbf4071fd322634c814e293fffbd4aca97
+EBUILD vice-3.6.ebuild 4616 BLAKE2B a86fa3ebe80cbc1d1302a2135a26220f2778bae1171a9938161024cbe59cdaadd9730db517c8ec2cba44d11c78b47e70afee7458989390d0305fc699808ceb81 SHA512 ee6094534c36135415bc67cbb9de92b14ce8a179826ed875e813d3ae4256f082e1a6aca87cb216ac8aaecc979784a5a61b6bee3a6d2385e37fc7feca748c350d
 MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283
diff --git a/app-emulation/vice/vice-3.6.1.ebuild b/app-emulation/vice/vice-3.6.1.ebuild
new file mode 100644
index 000000000000..f5a55faac561
--- /dev/null
+++ b/app-emulation/vice/vice-3.6.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# --enable-static-lame triggers bug #814380 with EAPI-8, could work
+# around but staying EAPI-7 for now unless there's some urgency
+EAPI=7
+
+inherit multibuild toolchain-funcs xdg
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
+	lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
+REQUIRED_USE="
+	|| ( gtk headless sdl )
+	gtk? ( zlib )"
+
+# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
+RDEPEND="
+	virtual/libintl
+	alsa? ( media-libs/alsa-lib )
+	ethernet? (
+		net-libs/libpcap
+		sys-libs/libcap
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	gif? ( media-libs/giflib:= )
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib:2
+		media-libs/fontconfig:1.0
+		media-libs/glew:0=
+		sys-libs/readline:=
+		virtual/opengl
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	jpeg? ( virtual/jpeg )
+	lame? ( media-sound/lame )
+	mpg123? ( media-sound/mpg123 )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	parport? ( sys-libs/libieee1284 )
+	pci? ( sys-apps/pciutils )
+	png? ( media-libs/libpng:= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/sdl2-image
+		sys-libs/readline:=
+	)
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-arch/unzip
+	app-text/dos2unix
+	dev-embedded/xa
+	dev-lang/perl
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/yacc
+	doc? ( virtual/texi2dvi )
+	gtk? ( x11-misc/xdg-utils )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# Strip the predefined C(XX)FLAGS.
+	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
+
+	MULTIBUILD_VARIANTS=(
+		$(usev gtk)
+		$(usev headless)
+		$(usev sdl)
+	)
+
+	# Debug build currently broken without copy sources.
+	multibuild_copy_sources
+}
+
+src_configure() {
+	tc-export AR
+
+	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
+}
+
+multibuild_src_configure() {
+	# Append ".variant" to x* programs if building multiple variants.
+	local xform
+	(( ${#MULTIBUILD_VARIANTS[@]} > 1 )) &&
+		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
+
+	vice-multi_enable() {
+		if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
+			echo --enable-${2}
+		else
+			echo --disable-${2}
+		fi
+	}
+
+	local econfargs=(
+		--program-transform-name="${xform}"
+		$(vice-multi_enable gtk desktop-files)
+		$(vice-multi_enable gtk native-gtk3ui)
+		$(vice-multi_enable headless headlessui)
+		$(vice-multi_enable sdl sdlui2)
+		$(usex debug $(vice-multi_enable gtk debug-gtk3ui) --disable-debug-gtk3ui)
+		$(use_enable cpuhistory)
+		$(use_enable debug)
+		$(use_enable doc pdf-docs)
+		$(use_enable ethernet)
+		$(use_enable ffmpeg external-ffmpeg)
+		$(use_enable lame)
+		$(use_enable openmp)
+		$(use_enable parport libieee1284)
+		$(use_enable portaudio)
+		$(use_with alsa)
+		$(use_with flac)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mpg123)
+		$(use_with ogg vorbis)
+		$(use_with oss)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with zlib)
+		$(usex alsa --enable-midi $(use_enable oss midi))
+		$(usex pci '' ac_cv_header_pci_pci_h=no)
+		--disable-arch
+		--disable-sdlui
+		ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif
+
+		# $(use_with curl libcurl) # new in 3.6 but is a unused placeholder
+		# --enable-io-simulation # likewise
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir emake
+}
+
+src_install() {
+	# Get xdg-desktop-menu to play nicely while doing the install.
+	dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
+
+	XDG_UTILS_INSTALL_MODE=system \
+	XDG_DATA_DIRS="${ED}"/usr/share \
+	XDG_CONFIG_DIRS="${ED}"/etc/xdg \
+		multibuild_foreach_variant run_in_build_dir default
+
+	rm -f "${ED}"/usr/share/applications/*.cache || die
+
+	vice-install_extras() {
+		docinto html
+		dodoc doc/html/*.{html,css}
+		dodoc -r doc/html/images
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins doc/vim/ftdetect/*.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins doc/vim/syntax/*.vim
+	}
+	multibuild_for_best_variant run_in_build_dir vice-install_extras
+}
diff --git a/app-emulation/vice/vice-3.6.ebuild b/app-emulation/vice/vice-3.6.ebuild
index d438d6439750..bd83effcd4fd 100644
--- a/app-emulation/vice/vice-3.6.ebuild
+++ b/app-emulation/vice/vice-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # --enable-static-lame triggers bug #814380 with EAPI-8, could work
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}.0"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="
 	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
 	lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 30fdc3242e36..ba9f5b78e628 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -3,6 +3,7 @@ DIST virt-manager-3.1.0.tar.gz 2848420 BLAKE2B 729a16ee419cfc9f118e4a59336e961f1
 DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec
 EBUILD virt-manager-2.2.1-r3.ebuild 2341 BLAKE2B a50426622743d3e21508c2dcebdd769e82bde419ca62a307951b106bc2fddd2a5fc9ba17e008909df90b91a4cd790f20791288865f4002ac54d17a6b6ee6c747 SHA512 b885bf0ff82234b087289dab5bf9131cef3300f02419f6683a622a765d311b4448170d7935cdc8c20b9de9d7aec0cf104202a858b63b08f250c78744fb8066c4
 EBUILD virt-manager-3.1.0.ebuild 2394 BLAKE2B 464dad98c7445fdbf6f57733a022d04064959ffd75a1f937f221f299638ca71cd360ea4451ca2e9186498d2dbab0e38d09255f74ca17cfd84fce131b5d45547e SHA512 e422eaeeba7cbcbabed620fbce812ea9101a48f5de7590f410d9897e220aa8d98e35f224bd8df9da57f67cf672651d3b45098d70e0022b0e3784f6a94d640c03
+EBUILD virt-manager-3.2.0-r1.ebuild 2568 BLAKE2B b0280a5538d50aa43d555a1452332bd4149c7b9590fd31f48c641431623ec7a9b74e432191413557e161f94e19d2c85e4d288b5324a654178e972793215267fd SHA512 6558a5da9539bd22657d24d9606b9e554cbcba2f7ce9289b2ce79ae3b45c23376222f7c76ebe15ea33c6d0827d508166630e93651763ff6f19642bda517f37a9
 EBUILD virt-manager-3.2.0.ebuild 2381 BLAKE2B 3aab7c01a1f2733f8b2b7f04922d0fa29daca8caf78dbd3b848a518bee41f9a8c974cbf3e93ef3e83001541d316194a820220915154dd17dea9c79c9fa4cda72 SHA512 8e4fe3b74e75317f39aeda0d63e4678b17bf3b5437c47cd0df6d9b45991440e1af0084c2f3ae80605fa82705300e417419472e0e3c3f58f385dc0371dac9e908
-EBUILD virt-manager-9999.ebuild 2413 BLAKE2B 71db00fe93d06c737ac248c1157d75963184833df76c017c0f75b250fbf9b980e764aa4195ee5364611ca7ce95e6ced627bc34b4f8cef47003b5ad6295f7a370 SHA512 4e8b1c4409703d8a942fed65784378bf7de0cb28e952d569a78e87a60de596e4b2183aca0c72757b4d75f3c96b3e407c6cac418a10a950dfc8a569d70119c925
+EBUILD virt-manager-9999.ebuild 2590 BLAKE2B 246c472ea77bb6d838d0dd843bbc595348f595c9a066f87b140ea0332682948f5b88b83636ee565546e3d066c9b498ef83e912470cc32d181ee1a4a457078ca5 SHA512 0bf4bc5c207180e193a9be5b1e0cbf20cb94e542995dfdf22735503df5bed018cb6f3b55ad6c6ed9fe9b577b4238d2bc8f20e6325b87ab92c0aad5caaa2ee28c
 MISC metadata.xml 663 BLAKE2B a8a1b7a90bab2c9ea216c0acf8fc26ee70626dcfe6f171c878edc711f6134911f74282fe7f1feb7725ddcd9cf4d650d145cdfe4143d1e844f380ab9d516178c9 SHA512 f1144dba3cc161096d5564da8264c04552b733085d12a9ccce5f4d74c0a73fb528fe89cc4e709539300151b60e70d1e8a318f15b8474982a32da9360a98c520d
diff --git a/app-emulation/virt-manager/virt-manager-3.2.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..1bf166e0e62b
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-3.2.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_SINGLE_IMPL=1
+
+DISTUTILS_USE_SETUPTOOLS=no
+inherit gnome2 distutils-r1 optfeature
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gtk policykit sasl"
+
+RDEPEND="${PYTHON_DEPS}
+	app-cdr/cdrtools
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	>=sys-libs/libosinfo-0.2.10[introspection]
+	gtk? (
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/gtksourceview:4[introspection]
+		x11-libs/vte:2.91[introspection]
+		policykit? ( sys-auth/polkit[introspection] )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/docutils
+	dev-util/intltool"
+
+DOCS=( README.md NEWS.md )
+
+# Doesn't seem to play nicely in a sandboxed environment.
+RESTRICT="test"
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	esetup.py configure --default-graphics=spice
+}
+
+python_install() {
+	esetup.py install
+}
+
+src_install() {
+	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+	distutils-r1_src_install
+
+	python_fix_shebang "${ED}"/usr/share/virt-manager
+}
+
+pkg_preinst() {
+	if use gtk; then
+		gnome2_pkg_preinst
+
+		cd "${ED}" || die
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null || die)
+	else
+		rm -r "${ED}/usr/share/virt-manager/ui/" || die
+		rm -r "${ED}/usr/share/virt-manager/icons/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm -r "${ED}/usr/share/applications/virt-manager.desktop" || die
+		rm -r "${ED}/usr/bin/virt-manager" || die
+	fi
+}
+
+pkg_postinst() {
+	use gtk && gnome2_pkg_postinst
+	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 40577b554f57..2b7f150c0d93 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
 
 DISTUTILS_USE_SETUPTOOLS=no
-inherit gnome2 distutils-r1
+inherit gnome2 distutils-r1 optfeature
 
 DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
+HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -42,17 +42,14 @@ RDEPEND="${PYTHON_DEPS}
 		gnome-base/dconf
 		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
-		net-misc/x11-ssh-askpass
 		x11-libs/gtk+:3[introspection]
 		x11-libs/gtksourceview:4[introspection]
 		x11-libs/vte:2.91[introspection]
 		policykit? ( sys-auth/polkit[introspection] )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	dev-util/intltool
-"
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/docutils
+	dev-util/intltool"
 
 distutils_enable_tests pytest
 
@@ -63,8 +60,7 @@ src_prepare() {
 }
 
 python_configure() {
-	esetup.py configure \
-		--default-graphics=spice
+	esetup.py configure --default-graphics=spice
 }
 
 python_install() {
@@ -96,4 +92,5 @@ pkg_preinst() {
 
 pkg_postinst() {
 	use gtk && gnome2_pkg_postinst
+	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
 }
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 5d820f400774..bf0b0feeb0bb 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,10 +1,11 @@
+AUX virt-viewer-10.0_p20210730-meson-0.61.patch 1022 BLAKE2B b4ff7ec6d33da1e73b7dac2fc2960890a447670b83f67f27fbc24b99a95d75e850de74cd75fd5d4f3ce2b32e458e2e0a6e26128f47a77e0da9aaf62a9622c02a SHA512 2ac3f31e9184dd7a0aa596458c991b573fac3073b0b4b04895082c720a3c7da189bde9099c8f530320d34c5fbc51f522096af2186b589879e372e17115ba78fb
 DIST virt-viewer-10.0.tar.xz 256372 BLAKE2B 3368164c2f770f8aa963e0fb93e713249b05d31600747b68197864a40bf6fdb221ad44abb8ea5465706543241bd5898353cadf2a3e0917455383283722fdfd4f SHA512 82ed552337c3d71d762aed14e6fb20a123448fd5cf8c51f8f942ddd226ee2a4fa3ab8b9b893bbdde16628fb03363f2455e1d895074237d40ff567d642d216fd3
 DIST virt-viewer-10.0_p20210730.tar.bz2 271223 BLAKE2B d66e915eccdea6eadc7d93309c66d648828da65e76e4884bd2a98a645db328296d0013955fe94df45bac5d21079230218de7e09909d29f63568d2fc32b4fe762 SHA512 58d49eb67e1bbeb73fd7672871348911ef8eaab95b0f90dd3ae2564cc2321d620eec703fe8520748a96c80429ecbdcd13ba4a7c31b249fd347a935c9b9c02531
 DIST virt-viewer-7.0.tar.gz 924475 BLAKE2B 003efaf88445ec6f523e678459ed1e11562d0cd87fb4811105df9ac1e3129f4a97170c5b783f1d504d157055ae51ac8dc23ffa8f3f79dd6cd55707d962e1d9ad SHA512 e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904
 DIST virt-viewer-8.0.tar.gz 937457 BLAKE2B 107a5f77d0e272665561e22c950416275c939d000fbb522401a954e6836bbd9e9399e768bc4363a1ea3110dd3229fe33738560563271774c3054278b2399cab8 SHA512 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918
 DIST virt-viewer-9.0.tar.gz 1176991 BLAKE2B bc4df73575195888b769dddd8de5c0eda9daa257902f3f3ce8099f9096d0cd9be28547c8671decb70e83e5f0de71633793886bfe78bd9ab5f360dc9759afcc5b SHA512 a5901d76c3e144fa3d6e640de93ed7f1e7cbeb075c04cdbe4a8c9c09bce96104ea552484df5e84c7a69af8dddd1177123ddb81b2dac775a98ac312f3102daae2
 EBUILD virt-viewer-10.0.ebuild 1056 BLAKE2B be70282a9c98d2b5f9c82a7e16f5e08de95d0e02eb58f66ec9b9b50434499fb15377eb3913f6026eb060a2a738aff5dcb02470c253a29abfaeb894fd4516c303 SHA512 cd7f098f5aa49a10fc4e246f4fb64605113e4f83211c54671f6868983709a2407d96df917473fcf15b4c92c0978472bf5d36b709149d708626643a991c83f4e5
-EBUILD virt-viewer-10.0_p20210730.ebuild 1401 BLAKE2B 43c9a972ec6e1650bc37c953c53e781e94988f38d04bdc2980c10d64fbe26ac8cd4c651b2ded4eafe4e1b3a5f274d05b90b9f7c3e3fd62b35237bd4d080e40ce SHA512 8122f460d5a9095fc9afd176f5bdae7e27b804e10202f5ade77b7c004eb3970d8612dbce6b9b521bfc4db7f4f6c38803d315c353ad37491c9468b2bc313d2602
+EBUILD virt-viewer-10.0_p20210730.ebuild 1467 BLAKE2B fc230ac06fc351a70dcbd715977db405cfc80b26df3a22c35f51b3425dd16e8c7d4a2a72a145524364fece9178694a7654bf562ac56e4493aa9badf397e5d3b3 SHA512 a7c733db46addd0492753d2470f19d940960a6cb63930695bbb9e7d58aa5ea3513723fc85a6d2ad1f8186d0dd9f2bd93764ca9b9265e1afced792122f25507e0
 EBUILD virt-viewer-7.0.ebuild 913 BLAKE2B 0b6dfcfe940c93c9d1cb2feaa5b2b67b710fe35b75dde82066b4f133ce060933742aea8dc437f394a1492d1ff579ad13f0f45acfebb5db80ed665aafdc050be1 SHA512 3d219e4c9aab912f6fdd0fe4b0fce8d7959d103305069629ce95a5baea8209b707e5bb51eeb87e2fc6f85178acdb8bc811baa9293bb6a256ac6ce8a4d9b4d47c
 EBUILD virt-viewer-8.0.ebuild 965 BLAKE2B fe006b764e6e1abfc9bcc915d92d9dc91d037e4b2a1dcf5dfc618a62fd65061445227da84aca0f8ab84ca28a1528fe063c37b39c5a4840b99532898f54f239a9 SHA512 4997e3c64b34953399b1369758741ff69cab3874b4a07f1378ec2ed7d2ee8439af45b614c073adf438b25e35ea9b1a388d222da54a803b6af49f533cc7de99b8
 EBUILD virt-viewer-9.0.ebuild 967 BLAKE2B c59e0871ce13171ab889f9950cdba14516163c22ae2fbf26f8e4fd16e07d320244c043070bb43f165b17e9f3f75f6e35adadf1c51339d1d560aa7bcd0fcf1de9 SHA512 1c87a447c14f88d73b50ef2614a4b95d417b7af4053de7b67511e6b439d15eda63955d61cf83618fc85efa5613740cae5c8eda2fe48efb5cb60dadc84ce30b49
diff --git a/app-emulation/virt-viewer/files/virt-viewer-10.0_p20210730-meson-0.61.patch b/app-emulation/virt-viewer/files/virt-viewer-10.0_p20210730-meson-0.61.patch
new file mode 100644
index 000000000000..46c708b9d342
--- /dev/null
+++ b/app-emulation/virt-viewer/files/virt-viewer-10.0_p20210730-meson-0.61.patch
@@ -0,0 +1,36 @@
+https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117.patch
+https://bugs.gentoo.org/831963
+
+From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:28:20 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
+   desktop = 'remote-viewer.desktop'
+ 
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
+   mimetypes = 'virt-viewer-mime.xml'
+ 
+   i18n.merge_file (
+-    mimetypes,
+     type: 'xml',
+     input: mimetypes + '.in',
+     output: mimetypes,
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
+   metainfo = 'remote-viewer.appdata.xml'
+ 
+   i18n.merge_file (
+-    metainfo,
+     type: 'xml',
+     input: metainfo + '.in',
+     output: metainfo,
+GitLab
diff --git a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
index 628627555ce9..cf637aba0caa 100644
--- a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,6 +38,10 @@ BDEPEND="${PYTHON_DEPS}
 
 REQUIRED_USE="|| ( spice vnc )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0_p20210730-meson-0.61.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index 256a29c60b22..427d1990630f 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -1,3 +1,3 @@
 DIST virt-what-1.21.tar.gz 478767 BLAKE2B 7c48b84d9f1fe5f734921f68848b84beee2e5687a6ebfbc422a1349063e6a83c932a89cb2936239da6be033b72e6010694314cf106486cd6c54cd02652bc61a6 SHA512 14ace184c4aee5a09b855c1f5acaa619057aed1b9bf03c91ed1003e6a39ea69162c9fe452ea8162c7fe29825e0e2202cfc7d76e82f0cecea3e32405e5eb9f717
-EBUILD virt-what-1.21.ebuild 607 BLAKE2B c1b875e443bb23ab8496320f5513ee0b0591dda4b33978ffcf0a8a70524c0ec11e8be248d937b11e82e80f44aba547ad4026550231dd5c465196fc543c88855d SHA512 22befae978503d1a5a2dce707de283e8dd95f189bd6fd5af9b644e7063bd1039284ba1543c6f17ed1be2dd3d657c5c89975042f98111d141fe17091c44a8e8c9
+EBUILD virt-what-1.21.ebuild 614 BLAKE2B 452cd1c1a9fb1b7f0ba3d3ea248bcc14d155f8bc1d7ee55eab8a1d3f4a28ca0eedce26c756aa97c1c561343cbe52f32d85b0495c10afc3ddd88166fc899a3b14 SHA512 964e5f0bee8cb16a1f8fe159a9c42db90386e09a4597ce351b04ee2727a679c4e6dfe5656f489a28ca966334fcf451ef0582d9c91bb3d6c96263563e65ad789e
 MISC metadata.xml 352 BLAKE2B 92128dbde8c4210379e7eee058e5621ec0b49c427585b09c130ae99494bf6922120029fa3c7c68414e84281a4a1aea0018bc7b3ec23189f97d6de9dae88a234b SHA512 4a5d1cbc2aaaf055bcca21bd542514a7bd45f36c78d2029438b191919fb4e139d9716036b58e13b4901e4702fb4ecf8d471686a1dec7402a973ca65c43f90e8b
diff --git a/app-emulation/virt-what/virt-what-1.21.ebuild b/app-emulation/virt-what/virt-what-1.21.ebuild
index 1f1574cf272c..b25b28a6932e 100644
--- a/app-emulation/virt-what/virt-what-1.21.ebuild
+++ b/app-emulation/virt-what/virt-what-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="dmi"
 
 DEPEND="dev-lang/perl"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index fa705e76e8a3..d62b9e387bd7 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,7 +1,9 @@
 DIST VBoxGuestAdditions_6.1.24.iso 61081600 BLAKE2B 66427a961c83f2de1a0b8671066154133795e8e4f50ac82e927e82e05594c520b155f29f7f19373e5846c36a1e3f6e5d2f5d17db1cebc1996c4d1737d5b45862 SHA512 8753558fcf467805bff801be43281597ef6738f90f8f7a62f6acbba2753e57f44bc72cb66411f0a0f413135026ddf683b0330b49ccad77676ec67b7bf3faf06e
 DIST VBoxGuestAdditions_6.1.28.iso 62226432 BLAKE2B 0f2d4076476945466cd5d3c5e3064c0f23e511596933d29cd7bab275ee1a21ac5fb81a4723c342f79946000e97681a5e9875cba006bdee6ec684169abd5e04d9 SHA512 2801c78909bdd38b623e958ce61154da7aa2ababf6e7723baf50e958afd1a8d4b0930800fe5549f728a7ac7979d8fa1597c969bf28743d7266b16ccc1b5960bb
 DIST VBoxGuestAdditions_6.1.30.iso 62238720 BLAKE2B 1459548ad7d4c7ed79a44793d11fc4071a8b043dc0cb9b113775688c254cdfa8f658dcf33fa666c5d4c000357f8a1f8ef0f43268af8f84bd6833e16381e276d1 SHA512 0729275f46b486872f665b264c6ad83a0d42bb2a35ff5e96d9a8449bc9042328219f7533e6ef6ded0351e1fa73024755b32560af13606e808910262c3b133726
+DIST VBoxGuestAdditions_6.1.32.iso 62388224 BLAKE2B e8e4addf5d3a61ff193fcccf185353aa4325ed3747f1bc9afb376276cd38857cc2a087e8c6872cef083ea4eeda20a0c29bac62263c378b6c608e5fb6424623a0 SHA512 268526eec6d07e69e3ab583a11211331c103db87162be045e0068ebd6beeda491e215ea6de6ca2aed10e4312dd9b2904ab315f05bad7041ba6787bfa61aeb6e9
 EBUILD virtualbox-additions-6.1.24.ebuild 777 BLAKE2B 839d72d0dce7bc4a40bcc15cb80d1247399f09b20cc2aaa3029759ccf3c5e5e93b184e4fa2928cc503735dcdfa64f583b5b25ef90504354097c5dfa310aaff54 SHA512 ceaa16e9b2905b8174d156433c4709b09cc52dd1ce2f8607fb855ab6ba776e93faf0cf7341cfb7799553c51cfd1b9c8cbe9d57f5d242d4c8a9333ff1e6e44ef8
 EBUILD virtualbox-additions-6.1.28.ebuild 772 BLAKE2B f5d898abeeb1285c219e798b62468df428036ccd98836b71e4872baa524af377254cae237d134ca2543deb3109af0b06d3694ecdbf1c8b4fdf3d001894eaa628 SHA512 87618228a4f69bda61aff52fc2c504dbfcf61dde35e923ade17d4243503aadb39c4ce24fb45d27ffb2e981293b7e9209977a64a0bb0490268faae5b0477846dd
 EBUILD virtualbox-additions-6.1.30.ebuild 773 BLAKE2B ec536183e374156adace80364b1b41a176a6906634168e87a9de31b57a2dfa131e6acfbffe0cb8397ba1c86108c197783a0a1b2a2bec06a1b358ad61c313ed9b SHA512 f43aba9da3873e6382a9580e2ac13754c582a52fb461b714eab134117ca8a849d205307b5045bf0d65604d0b4163584fd50c4ad5120b6f5cfcedbc0889dda78f
+EBUILD virtualbox-additions-6.1.32.ebuild 773 BLAKE2B 386bffc4f43e6f15abdf3530403e6c8ae4919b6c9bd298edbb6350b1e2455920923cf78e7abe3027ead58aa8a6b87e5787126cb1d8342e734bd690f9e5f34181 SHA512 3a3defd6e7062c93e66987940f83ae9f19109d9182cee7bdb84bdf93162a838b6068454be9267fb4ba52e032d5e68ed26138699713f6354d8b84984ac99e1517
 MISC metadata.xml 260 BLAKE2B 4ce222a9e0137a4b97dc321ce99b3e9ef20450e4568d4db28d02050cb3a6e7780dc9d6bcbcbb225bed2d82a18294cdfb3d497fdec008c82c34d9a6a655bbdf0d SHA512 f6ba7c58d992fb2f14fedc3ce6a1de848bd56e3718022f225c1a2847893214dcac142c63587427a2db5e895b4b1e37828a4356deb761bd50b98f5a632fd138b4
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.32.ebuild
new file mode 100644
index 000000000000..dee7c12719a6
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.32.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index be56efbed9cd..f50f421fa6f4 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,7 +1,9 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.24.tar.gz 11135003 BLAKE2B 53bb6dc35eb8ab1a58492ca3b67b63885ffa1ad3ed3a51a9e7e8c522845b082c420fb39a31a379ee56b45c9b02452acc5be4d72c5a5d9bddaa428bf7c9a3a086 SHA512 e2af2213e99c8c35a3090f5e36d05b1ef27c920cd31a2bf97b0368a89f27a5e2d0e0e0dced5e4e7bacda50fe4b57738924f13a933f5307ff2c8c4015ecc030ae
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.28.tar.gz 11136237 BLAKE2B 66f09d39a60277358b08f073e3d5836bdb4acddfacc0c5321b19f876d4c5407ed1039b65e22e188690cb6c034aacca2be8d60a52acb8467a6c6319f46c15bb61 SHA512 7e352889469ad678e93d042a5a240820753918cd191c9e164678b84947fba5ae0616fda7f8e6385b2ba525e51948e4860ca91cdd62a2eb503f79acadcb367f2e
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.30.tar.gz 11136343 BLAKE2B c3db50c02da2a9a6ba766bf24103f0f45f073ea65954352fe3a3f01c25974374f6c7f7851e933ce4e5a082ec3944f1c521d74f51e10db5708454bd8817d8f23d SHA512 c525743b2304fe39c66f56147d85a92d4fc884cae007c8b801519e0b5bcbf08c7656ba66befbac63b03ba4d20034899ae4438c263de0bae7a3fd36af1608ea75
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.32.tar.gz 11137804 BLAKE2B 376274d56ce61a9da785be0a3de63566bc39e9c7a2915a33ff7792173f7625c21d345da757e9963d9b1833124c3430523bc89ba0a0ed27b66a6d87a07d6d6602 SHA512 e7297a9fccd6c74a7986496da71bd6a0970bc53c49845b9bc44714ab04e90e9a4c427f1491f6ec287cdba87a93733de7849f5e78ab7f3ee1a127e8ac4ea20861
 EBUILD virtualbox-extpack-oracle-6.1.24.ebuild 1069 BLAKE2B 46bf0d096f1aa85748656eb44fd646d357c1621272791b343472c3bf6ad5ec87bec0ff9bcbf9b4f692501eb6382a75ff68acdb2fc3c1a2828651dd42dc4190db SHA512 ee701af686a5f260a93699cf4dbb030edbaa8a0dda9479c3d3af977abcb27d033a745dcb16139f1ef1ef7e6cfc20f9e479d08b173ddb340ff3334cacb8813d4a
 EBUILD virtualbox-extpack-oracle-6.1.28.ebuild 1064 BLAKE2B e01f5010d90e67a21a66c1a87ddbcb56398932106eda833e936b011007f32e57ca1ae190d95b7a1de21fb5eec8c468aa8e6c2a7bf10918b4e73b1788aeb643c2 SHA512 355321c4374bb4be19c9aa34285ad1151621e67f383577df68c5d778b28ecabc1798acdb96c5f63569b48dd6bd9019d46df57f573a7db92bb979cbd806d60963
 EBUILD virtualbox-extpack-oracle-6.1.30.ebuild 1065 BLAKE2B 6728457bdc028b46b989d9d22f557fe7c026f6c2e89628defd10f98552f998e3a3952a5c4f0b259189d9b06cd2a6784fc1552aa14b0661f1ee5567b4231c5ff7 SHA512 7d5e08213780896e7162775760270df178838cfc0bbee7b49449263c94ee0bb504e6bec413c2cff4f185f2ed0f7097112e55e795dbe5d5dc290790685d6e9ed5
+EBUILD virtualbox-extpack-oracle-6.1.32.ebuild 1065 BLAKE2B 692e1eef70426e91903205198e6a46e90a8dc39e34ec7d5a095a98edb47419f71b7e35de75023bb3d9b5dd0b0e101b8bbb833bf2c895e5a35fd438b7230449e0 SHA512 242d3b0bd1ed0d988825acee325c36f2b1754a4281efcb8f6d0d026da8c69815a2d4e561b08558b5df352982ac1f52de9e566f05f381031a426876d3ee77c992
 MISC metadata.xml 260 BLAKE2B 4ce222a9e0137a4b97dc321ce99b3e9ef20450e4568d4db28d02050cb3a6e7780dc9d6bcbcbb225bed2d82a18294cdfb3d497fdec008c82c34d9a6a655bbdf0d SHA512 f6ba7c58d992fb2f14fedc3ce6a1de848bd56e3718022f225c1a2847893214dcac142c63587427a2db5e895b4b1e37828a4356deb761bd50b98f5a632fd138b4
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.32.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.32.ebuild
new file mode 100644
index 000000000000..10b24ce1fc11
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.32.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+#VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}" #-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 2c30785eb0e3..3aef910e696f 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -8,8 +8,10 @@ AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038bab
 DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd59893e2f4b701cbdb31f4c45e2b7389f85f59d8a78ce1e03c83734a49b76fa61f56ea083a588874fa4023b723694f75ee8fb SHA512 cf2c5f58d2f160f8a22d94b7e30bcdaabd907661e05a72341bee93f5092b96c0c84d2291005f433040235227e3d6595ce0e66759c44c24eaedc6c9614646b3d6
 DIST VirtualBox-6.1.28.tar.bz2 165774255 BLAKE2B fe66ab411ef8fd78ca7b5deb151b2bfc11f3625d54629e6768da9040297cea999c53873c94437f2a57b245e71db0e28bd2ad94ed557f8a1c1c674f477301e192 SHA512 d0eb49a82ec6ddb7ce7da362faf86254d324e73522001c44ab0f26a09ead3d9a800ce0d4ad3698853d4f9a4e9803ceb21f3bf50388a1855edcb2a42ce51f3a96
 DIST VirtualBox-6.1.30.tar.bz2 165769447 BLAKE2B e15a8370c7cd83b547012639c3361da1b2ee40e8b094f11c22fadb95c9ddaae4791ee7cab16cb2eb23c6da4fc383f89f629335d577fa834fa1a979e19b9701bb SHA512 fab5b8327d9ad4186e584e90d1aca461d95731d0935509301e8adfe28d0737fb3ded5ac1d97e4cd1edc12c79bebb75cc675289762f9e918106f34bf6e8d363d4
+DIST VirtualBox-6.1.32.tar.bz2 165758238 BLAKE2B 24873d7cc8bd306ea3552fe75379fbe7be767c85406042344eb047ed31184c3357aea07dda5e15c275f5036ae63106ef1d2e6524b143bc645a6b5ba0016f1391 SHA512 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-guest-additions-6.1.24.ebuild 6205 BLAKE2B d1171f7d2e7f363eec0376812cfd34ac725f24083a4acc3ca4ca5346f84cbbeea1414a4c93915b5f82f323f641d78e0967a02f5f0853cd5c57b1b10fa5b0e455 SHA512 4cea83e923f2037bc3058bf349f640e46be929f5c5425d353923bf7ce6cb17ed2a53fe986f5e24fdc6a05f8c7f1a679356a71b6bc84c5eda74cdec7430afffd3
 EBUILD virtualbox-guest-additions-6.1.28.ebuild 6200 BLAKE2B 447dfb378cce00b3b60ad957e48c8b22d44bb29a1b29a7ec95c342d887c85de68eba41ee23c9c042913f7e3257fa4fb97c844f4cbce062c288cad565cef20a3c SHA512 e943f7037de2f823b73741615d2682a470450db37385c96d2c35e5ce1bbfc40cc9d38f8dc0f66bd17d7eafe8e54b267004dc0b816298de6a5f5e46696d8508d3
 EBUILD virtualbox-guest-additions-6.1.30.ebuild 6202 BLAKE2B 641664ed30c93f0e23ee6dd992b1851f19c9731a319f92623da31dfd6470ff168a369dc176f497a1a91346beda9e11037e7ea921d67b18f87e52f7949f563d82 SHA512 db330f5dec72d25937e4d3d014e6d8999b460d9241d71ef1a99f32389864b2bc0dad408bde877d7a0848150e4ed8be41469681ea27dda57f3d38f5bb38670f10
+EBUILD virtualbox-guest-additions-6.1.32.ebuild 6202 BLAKE2B d73e5d1674e63f2dfe82978363a7ae1011462cfcc5f6280b186a8aa16af8dfcf5981bf5fcd5e78d586b013f0963c09436008114b841fe3197235c1aea43fe62d SHA512 cf4405c73f8040269204d8124ed9b9d96cbf52d15ed3e8a10c1692b171d75197a02032c31dd1d93bc1f7df12e0f6376c7d8a4238ab396613f456dbbc6c9cb0c4
 MISC metadata.xml 260 BLAKE2B 4ce222a9e0137a4b97dc321ce99b3e9ef20450e4568d4db28d02050cb3a6e7780dc9d6bcbcbb225bed2d82a18294cdfb3d497fdec008c82c34d9a6a655bbdf0d SHA512 f6ba7c58d992fb2f14fedc3ce6a1de848bd56e3718022f225c1a2847893214dcac142c63587427a2db5e895b4b1e37828a4356deb761bd50b98f5a632fd138b4
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32.ebuild
new file mode 100644
index 000000000000..9610a3230f06
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32.ebuild
@@ -0,0 +1,221 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd toolchain-funcs
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
+VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
+
+pkg_setup() {
+	export DISTCC_DISABLE=1 #674256
+	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
+		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
+	eend
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" emake \
+	VBOX_BUILD_PUBLISHER=_Gentoo \
+	TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
+	TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
+	TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 086d887b61fb..24f847885a76 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -5,7 +5,10 @@ AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636
 DIST vbox-kernel-module-src-6.1.24.tar.xz 674584 BLAKE2B 3a20f615426a7b788bc4bce00e416fa3822cbec3f00691651acd53b7c7bda8b43d3669195cececa83f1fc50a792e417adcd709d859497da143c4d93a2b414912 SHA512 220d57ab33a41464cd9e506d38390e60b9e67ca8262b1a13732f3d40820e038365c129eb7144f1932b8c2d3fdcea828de3070dd927788015301bf4aa59c1cc48
 DIST vbox-kernel-module-src-6.1.28.tar.xz 674924 BLAKE2B 4a262a1609df493df8ba5b78d2daa225aed41fe51d54648633393dcb24ec648ae95f2fcb003f9a7ceb1a2a2ea99bc113d54db6621523ddfc3819e729c46f42c8 SHA512 b0fc1a1a821c93aa7dadd3a064d87938d31cf6ce37ab55d960fba104df4f28ab48797dc254e246af7bf1d5df913a9f329035941555fc9f165f02abea4448f684
 DIST vbox-kernel-module-src-6.1.30.tar.xz 675180 BLAKE2B 7df02a4b94dd30d211538cffe7e08aa590f78fea79add4105ecaa2e6d0ac2b495d950bab4950f301100b189a58dd29d1fd42c97c12e4458a5953cb5a2ed7c44e SHA512 19f080bea53bc11eeb67bb894fdce3ee6cfc0e9bcd0e697baad86b4f49ac331b0dfcca9b043def8ef8a9d40d3b867f09e14ffafb4eef47418184cbfd0e9acc03
+DIST vbox-kernel-module-src-6.1.32.tar.xz 675300 BLAKE2B fc843779ae9348203f2528009880e2d2dde65102c8be1837eb3a362e2703f9ecf54f7a10939318cbecbb41b4790a8b7d56c98ad82a4e83592b4c5491af0772b5 SHA512 e1c00be4fe2a0447c30ae0d380fc7a78fec1c3f52fb0cf0d20ccefcd174bf11097a91aa862ef8753be012e546a31555f5be9c1136cbaefc2240708b3adde7e5b
 EBUILD virtualbox-modules-6.1.24.ebuild 1433 BLAKE2B c37f4ebb63aed96ba78b0135688f576a703fd2dcf2b677c64ead9b89dd1b0c4e40bff9076f433034c1330739c295c015a61e949118410c0c59ec609155d8f535 SHA512 31ab9638f1a2c89b9abf6cab996a345ffd9b72a57ed95046cea436aea25e12709018f1d3504cb4b0d1254a4ec8f2756612c682d5d84b2630dff9301bec24ef90
 EBUILD virtualbox-modules-6.1.28.ebuild 1428 BLAKE2B 48089df7c194c139d8a655bf780c57db1b456a59fe51e3bd47b6d356d118ea00425f621e5a3d68a5f00bce850020f155a33afcfb2b7d662a6bb62ad6736f658e SHA512 93af76762acad86863a0e097695123f0ee04d44a1485d9b1ab334920aa748f14d64fcf8cd221ca68a2d546600000c18b168d47acc739efbaa878746fcdb53cb4
+EBUILD virtualbox-modules-6.1.30-r1.ebuild 1889 BLAKE2B bb1c6c675d3c84ab6e10f4c677323129bf2af8672754360c416af6e681cf97c518029592ab3b848edb8136a23cd3b954b2d5f02ebb0971661721ef0a049b95e3 SHA512 831fb644b60cda2988d1857eeb575d4a2e36e8b9e89cb08fcefe3d737804471525532dbf495c29dc379fd8758006311d55dc13c27b9df429ada0c26cbdd64477
 EBUILD virtualbox-modules-6.1.30.ebuild 1431 BLAKE2B 3c716f116f8a09b77c2d4ac77ea5c7874a0a4acf7838ad8f7f9e52077cf5f2268495405f2989d20e8241c34ecbc3e00fc30b783ead07d31d05e67a09727e777e SHA512 7441895b632c9e33a872db3df031c358a58f03503d5f867e58d7bbae3f3a7f4655fad995e57f9003a9b0dafee04d0b267857437b3b0931eef5a521e13404443f
+EBUILD virtualbox-modules-6.1.32.ebuild 1889 BLAKE2B d0ae0dddcfacb32293984fa649808c143c6aac283ef44ef0a106649b8a00a5679abbb23fa8c25f31e894e0bd613aed61f5a257b60690523bcc44fc7ddd7a800b SHA512 119354f55f03d4e6db6cc2307ec7718a212473b3b41a8a41f9779add1358d292d1259ed89740ddfa1846bdd9bf25a1d52290849806cf5f079ba7d12f7002bb6f
 MISC metadata.xml 353 BLAKE2B c6ea2895b404cd2f054212c19ca957db4a6786eab728721b51141798890b6b8ab27380befc334de9a9b4b4ddcc42926bb2d45da4bfd81e364d79cade7d58a42f SHA512 73cb5cca92831d8c26a10a73a4eb6a6b2a050e2ee68675b1e781ee6dfb96baf0bcf8031ed646883fcbbf88d888c52c6aec2e52fd62f383e7e533386bce8d54f7
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.30-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.30-r1.ebuild
new file mode 100644
index 000000000000..4d10ad7544b5
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.30-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="pax-kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+
+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"
+	if linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
+
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+	# Remove vboxpci.ko from current running kernel
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.32.ebuild
new file mode 100644
index 000000000000..a218e2492188
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.32.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="pax-kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+
+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"
+	if linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
+
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+	# Remove vboxpci.ko from current running kernel
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 6fad7d931c66..b674ca6a4a87 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -11,8 +11,10 @@ AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553
 DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd59893e2f4b701cbdb31f4c45e2b7389f85f59d8a78ce1e03c83734a49b76fa61f56ea083a588874fa4023b723694f75ee8fb SHA512 cf2c5f58d2f160f8a22d94b7e30bcdaabd907661e05a72341bee93f5092b96c0c84d2291005f433040235227e3d6595ce0e66759c44c24eaedc6c9614646b3d6
 DIST VirtualBox-6.1.28.tar.bz2 165774255 BLAKE2B fe66ab411ef8fd78ca7b5deb151b2bfc11f3625d54629e6768da9040297cea999c53873c94437f2a57b245e71db0e28bd2ad94ed557f8a1c1c674f477301e192 SHA512 d0eb49a82ec6ddb7ce7da362faf86254d324e73522001c44ab0f26a09ead3d9a800ce0d4ad3698853d4f9a4e9803ceb21f3bf50388a1855edcb2a42ce51f3a96
 DIST VirtualBox-6.1.30.tar.bz2 165769447 BLAKE2B e15a8370c7cd83b547012639c3361da1b2ee40e8b094f11c22fadb95c9ddaae4791ee7cab16cb2eb23c6da4fc383f89f629335d577fa834fa1a979e19b9701bb SHA512 fab5b8327d9ad4186e584e90d1aca461d95731d0935509301e8adfe28d0737fb3ded5ac1d97e4cd1edc12c79bebb75cc675289762f9e918106f34bf6e8d363d4
+DIST VirtualBox-6.1.32.tar.bz2 165758238 BLAKE2B 24873d7cc8bd306ea3552fe75379fbe7be767c85406042344eb047ed31184c3357aea07dda5e15c275f5036ae63106ef1d2e6524b143bc645a6b5ba0016f1391 SHA512 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-6.1.24-r1.ebuild 14485 BLAKE2B 08984c3f8af5b6d291badde1cff833baf0cee7e8cc2e207a7d87e6dd6a0cc2eebe5a58ac787fbc500639e756f0d433c27b70c5ee1f85880ccc581618684fcf01 SHA512 efaab6378ad1ffb03592edf57b0f561d1d7b360b458867b340d440238687bb19f2a61ded43b4dadafdc7468c073e09cdd05d1cc1b92bdefc18cd1dd5bded35c1
-EBUILD virtualbox-6.1.28-r1.ebuild 14576 BLAKE2B 4488d8f2834a926eda7bf7e065817be14debb7166c266af06d7ea1ae0fffb6ca826e7c04dc8429167e5e1f4c0fb11c5a19a6e117b36c90fcaa3abb2ac4a32220 SHA512 8028deada0bb4d649be01bbe9e93167855814b418767c2d79793ce526f4f3bd11c1e611fca9ca28af464278f37d61afa5bd6c91f0a3ac2541b7c0a6fc1f55404
-EBUILD virtualbox-6.1.30.ebuild 14577 BLAKE2B 390cf2379997aca1c4a3d8e90f7300a37074085ea42bdeb8fcdb0db1e57415f1670d9f613d511f80e386a58ace54d17d10b24aeb830dacc89489a083204d4710 SHA512 9a6f6daf40809efef71248f8a546fb4e695e071915bd94a87463451f120f5798f41eb54a8dc9264fc2e03d1bf3c36cbf9d189d75baeba5eb5e69c73f4ac98971
+EBUILD virtualbox-6.1.24-r2.ebuild 14505 BLAKE2B 3ecb4e9c508a1c50bb51662865d1a7b074d65980a503d412f4a9bfa3ea9fc0e4983f557fbd5e68162a0c9ef551cdf7bf7585f69f6eb9edb9b4d394b149905f45 SHA512 d8fec80d9b2fcab3bdcf50f44fbe3d3bfbbbfe278bbe480fd41318b530a5c0f19cbfc860d1f1c350fb0f2b1dff60aa94a1d3737ee11fca69110b700358695052
+EBUILD virtualbox-6.1.28-r2.ebuild 14596 BLAKE2B 1dbe67d27194660b74a42e13d03a7e93705d1d91b2fc560436eb908c07f82deae6375f30d9988bf9c002550195d011a636cd2f7be301a8d816e8a39bf0dbf8a0 SHA512 7a84f084ab51ed0bed4dfb374c5d54de56c9b0915c48a191477ec3397102d1b1a769cd12b48880b138efeacb56d2c5460226805a2abadc286675b932e95829dd
+EBUILD virtualbox-6.1.30-r1.ebuild 14606 BLAKE2B 6168a207992c458d0b3b0cca0a26dda315fa302c63598a771bbe7ea01150706a10a9ae171795fa2df9171b43325cb0ed8c26c1fe2d1130b79fa24443b387c066 SHA512 31dcf55cc8cb6d6c0b3981c9376af1c6dec3b9b59c39d15ec2146e9de1bc18deafedde1ad948c6d4e22ed07becd08efaa521a7e0cb5979408640d5d223368fd5
+EBUILD virtualbox-6.1.32-r1.ebuild 14606 BLAKE2B 6168a207992c458d0b3b0cca0a26dda315fa302c63598a771bbe7ea01150706a10a9ae171795fa2df9171b43325cb0ed8c26c1fe2d1130b79fa24443b387c066 SHA512 31dcf55cc8cb6d6c0b3981c9376af1c6dec3b9b59c39d15ec2146e9de1bc18deafedde1ad948c6d4e22ed07becd08efaa521a7e0cb5979408640d5d223368fd5
 MISC metadata.xml 774 BLAKE2B 5052aaa17c815e63ef8cd450e09f220a71e8a59df1ab79ad7dd713780dd0c62ae5bc453012b35d8e37a7b0dc9b1287c3a8119f0324c4a5e8ba6211b20f5350e7 SHA512 2b0515ae0e5a280dc40b6ecdaaa9165f90b6e276e01323896509b9a2ecc01a34d4e2542788ba3166d56a242c8ed65ef1f2df6e2de62b95d11700d28036f616fa
diff --git a/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.24-r2.ebuild
index 9452a3fe11ba..9f636b136138 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.24-r2.ebuild
@@ -43,7 +43,10 @@ CDEPEND="
 		x11-libs/libXext
 		x11-libs/libXmu
 		x11-libs/libXt
-		opengl? ( media-libs/libglvnd[X] )
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
 		qt5? (
 			dev-qt/qtcore:5
 			dev-qt/qtgui:5
diff --git a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.28-r2.ebuild
index c68f8924cbf5..856204577ade 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.28-r2.ebuild
@@ -43,7 +43,10 @@ COMMON_DEPEND="
 		x11-libs/libXext
 		x11-libs/libXmu
 		x11-libs/libXt
-		opengl? ( media-libs/libglvnd[X] )
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
 		qt5? (
 			dev-qt/qtcore:5
 			dev-qt/qtgui:5
diff --git a/app-emulation/virtualbox/virtualbox-6.1.30.ebuild b/app-emulation/virtualbox/virtualbox-6.1.30-r1.ebuild
index de42d1ff09e7..f7c71b5e2f38 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.30.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.30-r1.ebuild
@@ -43,7 +43,10 @@ COMMON_DEPEND="
 		x11-libs/libXext
 		x11-libs/libXmu
 		x11-libs/libXt
-		opengl? ( media-libs/libglvnd[X] )
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
 		qt5? (
 			dev-qt/qtcore:5
 			dev-qt/qtgui:5
@@ -181,7 +184,8 @@ src_prepare() {
 
 	if ! use pch ; then
 		# bug #753323
-		echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
 	fi
 
 	# Respect LDFLAGS
diff --git a/app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild
new file mode 100644
index 000000000000..f7c71b5e2f38
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild
@@ -0,0 +1,514 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}-${MY_PV}
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	!app-emulation/virtualbox-bin
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jdk-1.8 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.6 )
+"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch ; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	eapply "${FILESDIR}/${PN}-6.1.26-configure-include-qt5-path.patch" #805365
+
+	eapply "${WORKDIR}/patches"
+
+	default
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	doecho ./configure ${myconf[@]}
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
+		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		VBOX_WITH_VBOXIMGMOUNT=1 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index dec8024e93e9..0b3f1f70f718 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,16 +1,15 @@
-DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
 DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
-DIST wine-6.20.tar.xz 26921644 BLAKE2B 2db2bdd0b0c65855d96bc407ea54aa289dd0324715eb7fc068dd57b6b90ee7b331997fd9f68942f02ef45ef9f6eb10e7efaad79d0f97721626fc50ef2e47cc49 SHA512 dc0c29194ffd0ddcc2e34d8f7ac236f039e21cdde8cb959ddf16b4b67eb1d6332c9d1a780d0872669a1083db55e105eebaf3d7a6cc5aa749e91efab88bd1f958
-DIST wine-6.21.tar.xz 26973172 BLAKE2B 7e73e04419d50b12269c281b68b002fb7ef29519c63e6c45074fa919b067ee145d328aad6507578db84940c3ac379c0469758d1a211d7d213d1833ee8c15c096 SHA512 2c6d58c8c5c37497b2b3935f71afd636c274d1d4ad3f9ca2fd9982a9ed5910888cc20841bd9175446aab2fef7813d7700458edbaad6028ad34e7444a887a9220
 DIST wine-6.22.tar.xz 27031604 BLAKE2B ed1cf0499f8f827e88a1a899db3c5243d016696fdb1189b321cac398749f9360956f0cd473b2ee04052f0db750550a983b089c4f151edac535b7d440c9a2e048 SHA512 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5
 DIST wine-6.23.tar.xz 27057236 BLAKE2B 9e438a1f2200c59517b05eb4ea6d6c26594b3fd442caa11d9ccabd8e0c016d1a721f2579c36fcfb18bb1185edfb11480d65d732d435d44f5dea0bcb345fa1476 SHA512 3e459b305f472ece00cbf467e14e6cfa7422381cb9242d05e9624487d559f438039aa8c780986469591c9d0f05e384380133dc6fb4ed694355ae42744a78d9b7
-DIST wine-staging-6.20.tar.gz 9643278 BLAKE2B b5f0a74c575541303eaf12e9706f8917b795fc0d5f065e7292329cec7da145f9c7db25bebfcf4d703bf561206f22c9a49a95e8471629009dac4679c6f028b918 SHA512 9b5650d065976ab5b0bcb2f65895bf7b6bf139d376fc5cff421d493a6f6a849cb57e33243d1fad9ca1943cfbfdee8d8a3a4d530722163b15a0830d616f06e1e3
-DIST wine-staging-6.21.tar.gz 9627829 BLAKE2B b743b67c6f26871894b16d8cd9e7ed39a1d1dd6204516453628435ee23df7644433508edc7c7dd2881686926427e683c36a29acdc744c89d2c2bd4c5f50a13ea SHA512 b74ad7f96f2831b2635557c16cb616754e31c490b5b935d1d197d6cc8e61ca75805f801e22223b936a3794af57be94344d3a06dcfce92db7e036b6c3751ef294
+DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
+DIST wine-7.1.tar.xz 27149156 BLAKE2B a97b408a73b5cee52ac5e91b03a0e1850f5567e818d0383e4a546482b5f383eb185ed3ee2cf26377600d6963736b27180d2a87d79c58c053d37ead8d488e5268 SHA512 4b226ecab92a0462fb579602549cb4b96e0baa353fd320a0bc8d1ce134eff5a434600fcf748e93ecde06624f78b8c0d70b39737d97a7e2327a61df9750ae30b5
 DIST wine-staging-6.22.tar.gz 9608891 BLAKE2B b1fb62e82ea746a4872c4dcb8e243a44248732e4d3512e8c489e230422fc51861b5a8f1996ae12e432c5ef7eeb8cae693f9afe862d2bde150f1d6eab46534f6a SHA512 3839cdcd7ffead2cf933b59eb038856eccde7b28e599b61e10e2745ff4d2bfeefcc43262bbc96c97510560584de759ef0616b0f5e391de608fb08176502cb830
 DIST wine-staging-6.23.tar.gz 9609149 BLAKE2B abc9f4134293c91759311fbc91230f3a7f41455cc35a70bda4bf61f088520cb520b139b1c92bf2f18c6f885caf9397835a01f6bfa9d46c1d1bd49a4918ba330d SHA512 32bee187b9c7bdd026e64263083f3d92eb01c72f2d29a7d006616fb0713a0668c3d5ce3b5d523e09b650cfe77c1080e0478113afabd02352d66af53e60e0b31e
-EBUILD wine-staging-6.20.ebuild 21326 BLAKE2B aeb40c04ceab39e4e92ab277fb7d2f58f5a9a81a8582d73ccea42d9959f3bbc37e001eb70ecc6b6e006bedb1b2e770422d72eea97aa0ea86ae055135be6dd22f SHA512 f2b329fc5b03c560ed65662ee4f263fa29893b684cc34d2376e01579399e6d6874e3e1c39c39a1a34162c4581a517fb5bde92f47f0ea2b545a3a2aff2956c4ab
-EBUILD wine-staging-6.21.ebuild 20408 BLAKE2B 9e14f93ce1771a3b319f3e78ed0ade9b6e541f4197315dcbe3bdc608307010d5621466f378df64bc29f4d89d601c2a19273454747a1c07d8d6308a1d9338b788 SHA512 73ba4f111fa2d05d945239a45f5df37e93bcbd623e4c41a54620d62d1dd9e13eb1fe8cd43b0655621229e20b18f86ff10fbeebf128a412785acd9008543e6488
+DIST wine-staging-7.0.tar.gz 9614226 BLAKE2B f1263abde0fcb83f1784805df13e32db18758167f58e2370f3bbc16fdd6c0ad9b158c6e106e75183a42e42c29ef2971f2f297b2a733090727c1249a4914b45af SHA512 fbec2de7a13c7e59a041d8102d69b803d4475b743068d215cce510af905b81903aa028604068af0d309fe1708eb1ab62aad42887ac079af5206635bee0045952
+DIST wine-staging-7.1.tar.gz 9623294 BLAKE2B a76aae22b93d8e56000998dcd4300af5a60d4648a459ca21da5bc122d0c8c0d57c2e7140c01c1eea4c0c8a808e7a98db72fa91c58663ec3fd60a1c7cc8504ddc SHA512 cae234a3874c8bd3a4514c81ee311871c79c6c631145497e279ae86ceb6fef8e324d622d8b9974dbe7cbffacef09d8a6cb47a042096bf1a5ba737fed017e4038
 EBUILD wine-staging-6.22.ebuild 20314 BLAKE2B 65273e30e5ae144c745a839db2ddfb4e5c0919198f7e4ae119ebc80d68ccfa191eface4630b275491aa39d35cc94489805633d37c9cb1b62fe4afdfd59a18ed6 SHA512 8074760ebff6bc898b15b14a937c539800d770376432fe20b6bcb23e4e48a894c2578aacdd989a154a3d0aa2d6a92b4d6d86d7c4bcdaf2139b6cd0a90a14ba47
 EBUILD wine-staging-6.23.ebuild 20314 BLAKE2B 65273e30e5ae144c745a839db2ddfb4e5c0919198f7e4ae119ebc80d68ccfa191eface4630b275491aa39d35cc94489805633d37c9cb1b62fe4afdfd59a18ed6 SHA512 8074760ebff6bc898b15b14a937c539800d770376432fe20b6bcb23e4e48a894c2578aacdd989a154a3d0aa2d6a92b4d6d86d7c4bcdaf2139b6cd0a90a14ba47
+EBUILD wine-staging-7.0.ebuild 20346 BLAKE2B 3ebf236ca04d21591f290ff178ba18803da78e582a6b91765d1d885ee3ff0716b986d6af35e3ac48157ee6febc5c41305bf24b4ecc0621556281e6ce30c2058d SHA512 ef335a584fb27ccd07349c1bedb26fd48ca1a9ec3ceae09215e1cee253387c8cc9e10cc60904e4cb9a1ae57495c56a580c9552aacbb2ddc33b18c52819c8cea3
+EBUILD wine-staging-7.1.ebuild 20346 BLAKE2B 3ebf236ca04d21591f290ff178ba18803da78e582a6b91765d1d885ee3ff0716b986d6af35e3ac48157ee6febc5c41305bf24b4ecc0621556281e6ce30c2058d SHA512 ef335a584fb27ccd07349c1bedb26fd48ca1a9ec3ceae09215e1cee253387c8cc9e10cc60904e4cb9a1ae57495c56a580c9552aacbb2ddc33b18c52819c8cea3
 EBUILD wine-staging-9999.ebuild 20314 BLAKE2B 65273e30e5ae144c745a839db2ddfb4e5c0919198f7e4ae119ebc80d68ccfa191eface4630b275491aa39d35cc94489805633d37c9cb1b62fe4afdfd59a18ed6 SHA512 8074760ebff6bc898b15b14a937c539800d770376432fe20b6bcb23e4e48a894c2578aacdd989a154a3d0aa2d6a92b4d6d86d7c4bcdaf2139b6cd0a90a14ba47
-MISC metadata.xml 3967 BLAKE2B bc3c9d997d843fea2119ca489dcc61624e29d86d83ed0cd2934a0f15137037b4625be02ad0e04088cf6658318a6256d6e27e91b0b64b8d1c905aa20366598185 SHA512 2106df5a805fc9800a51c0a511f9f2fc283283f1e927ae0ac904976222e97f878f874a8b9e0b00af05f8d3a59e8e367bcf451338144169f478354cace01d1c83
+MISC metadata.xml 3680 BLAKE2B 08f0d9f91f9859453c41f7c56efd465ffb322277d68784cc0e9ca9e65b3cb650dd46079aed1ca14f43e727342c44b84ed2cd411d56b7df077ccd11c6002df66e SHA512 1510d593b339f5310b0bb85011c4e074997523412d77604cfb4afa0bb9336857a9d557c875335f463538d71aa0d6ebd16b0c8e37cc99ee9d94a9b3a3b3e7de58
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index 4504cc77dc88..fed93400772b 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -20,8 +20,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 		<flag name="capi">Enable ISDN support via CAPI</flag>
 		<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
 		<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
-		<flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag>
-		<flag name="gcrypt">Add support for the Diffie-Hellman key exchanges using dev-libs/libgcrypt</flag>
 		<flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
 		<flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag>
 		<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag>
@@ -43,7 +41,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 						(these pages are not currently in the updated WineHQ Wiki).</flag>
 		<flag name="sdl">Add support for gamepad detection using SDL</flag>
 		<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
-		<flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag>		
 		<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag>
 		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag>
 		<flag name="usb">Use <pkg>virtual/libusb</pkg> to provide USB support</flag>
diff --git a/app-emulation/wine-staging/wine-staging-6.21.ebuild b/app-emulation/wine-staging/wine-staging-7.0.ebuild
index c6fe8ec19ef7..4a96ff084ab7 100644
--- a/app-emulation/wine-staging/wine-staging-6.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.0.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${MY_PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -48,7 +48,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -117,7 +117,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -151,10 +151,9 @@ 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}-6.22-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=()
 
@@ -277,8 +276,8 @@ pkg_pretend() {
 		# Verify OSS support
 		if use oss; then
 			if ! has_version ">=media-sound/oss-4"; then
-				eerror "You cannot build wine with USE=oss without having support from"
-				eerror ">=media-sound/oss-4 (only available through external repos)"
+				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
diff --git a/app-emulation/wine-staging/wine-staging-6.20.ebuild b/app-emulation/wine-staging/wine-staging-7.1.ebuild
index 2ea6388aea6d..4a96ff084ab7 100644
--- a/app-emulation/wine-staging/wine-staging-6.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.1.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${MY_PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -48,15 +48,13 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
 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
@@ -75,21 +73,18 @@ COMMON_DEPEND="
 	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}] )
+	gphoto2? (
+		media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${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}] )
 	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -100,32 +95,21 @@ COMMON_DEPEND="
 	)
 	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}] )
 	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}] )
 	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}]
-	)"
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
 
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/wine-desktop-common
@@ -133,7 +117,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -167,10 +151,9 @@ 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}-6.22-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=()
 
@@ -293,8 +276,8 @@ pkg_pretend() {
 		# Verify OSS support
 		if use oss; then
 			if ! has_version ">=media-sound/oss-4"; then
-				eerror "You cannot build wine with USE=oss without having support from"
-				eerror ">=media-sound/oss-4 (only available through external repos)"
+				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
@@ -472,26 +455,20 @@ multilib_src_configure() {
 		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
-		$(use_with lcms cms)
 		$(use_with cups)
 		$(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)
 		# TODO: Will bug 685172 still need special handling?
 		$(use_with mingw)
 		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
 		$(use_with netapi)
 		$(use_with nls gettext)
 		$(use_with openal)
@@ -500,7 +477,6 @@ multilib_src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with pcap)
-		$(use_with png)
 		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
@@ -517,14 +493,10 @@ multilib_src_configure() {
 		$(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
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 93529ed6e51b..6683681eead8 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,15 +1,14 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
 DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
 DIST wine-6.0.2.tar.xz 24217772 BLAKE2B 176614736055892b7203313edc52e2926807c93b0bb97d59f65fbf284fd9cb138e4555fb7cd5a6c7c867367fdc50c89f12d7360ca0db947a7f04594f35f14775 SHA512 6cf002c6a06161665614c9f977dfa402bae8e657c0744dd824575066cdeb676bb9d61ebfc3c4b6f76486077a7457fe91cbe5bbadb467279a61e5a320da587696
-DIST wine-6.20.tar.xz 26921644 BLAKE2B 2db2bdd0b0c65855d96bc407ea54aa289dd0324715eb7fc068dd57b6b90ee7b331997fd9f68942f02ef45ef9f6eb10e7efaad79d0f97721626fc50ef2e47cc49 SHA512 dc0c29194ffd0ddcc2e34d8f7ac236f039e21cdde8cb959ddf16b4b67eb1d6332c9d1a780d0872669a1083db55e105eebaf3d7a6cc5aa749e91efab88bd1f958
-DIST wine-6.21.tar.xz 26973172 BLAKE2B 7e73e04419d50b12269c281b68b002fb7ef29519c63e6c45074fa919b067ee145d328aad6507578db84940c3ac379c0469758d1a211d7d213d1833ee8c15c096 SHA512 2c6d58c8c5c37497b2b3935f71afd636c274d1d4ad3f9ca2fd9982a9ed5910888cc20841bd9175446aab2fef7813d7700458edbaad6028ad34e7444a887a9220
 DIST wine-6.22.tar.xz 27031604 BLAKE2B ed1cf0499f8f827e88a1a899db3c5243d016696fdb1189b321cac398749f9360956f0cd473b2ee04052f0db750550a983b089c4f151edac535b7d440c9a2e048 SHA512 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5
 DIST wine-6.23.tar.xz 27057236 BLAKE2B 9e438a1f2200c59517b05eb4ea6d6c26594b3fd442caa11d9ccabd8e0c016d1a721f2579c36fcfb18bb1185edfb11480d65d732d435d44f5dea0bcb345fa1476 SHA512 3e459b305f472ece00cbf467e14e6cfa7422381cb9242d05e9624487d559f438039aa8c780986469591c9d0f05e384380133dc6fb4ed694355ae42744a78d9b7
+DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
+DIST wine-7.1.tar.xz 27149156 BLAKE2B a97b408a73b5cee52ac5e91b03a0e1850f5567e818d0383e4a546482b5f383eb185ed3ee2cf26377600d6963736b27180d2a87d79c58c053d37ead8d488e5268 SHA512 4b226ecab92a0462fb579602549cb4b96e0baa353fd320a0bc8d1ce134eff5a434600fcf748e93ecde06624f78b8c0d70b39737d97a7e2327a61df9750ae30b5
 EBUILD wine-vanilla-6.0.2.ebuild 18855 BLAKE2B b1aba61b9ef0f5feb3ef0ff433eabcb299417497c3e9808b4b31d1945e6270fdb4cedb54f8cf3828d82417c9fba7c715b4c5756d4f5c473ed0d318ef3212daf3 SHA512 48686b58dd63f5b262136c1bb641cf635b3aa6e5fcf015f40d9026fb14043d58ac6ca05abe02b5fb6cb592054bbcfe04d213cf074a2de26abd5653c30c45bc95
-EBUILD wine-vanilla-6.20.ebuild 18297 BLAKE2B 6fb4fa0492407ee8cc588673b0f71810a1499eb44308e4c521fffd45f798395c33d61da1f992ea59e74c4eecc0c44487bd343906c300b8323a3656a4fd88b1ac SHA512 0ad8c7f3e1a109cc90822551f29f3e6635f24be4ec3061692595a617499dd0ee238d02a31daa8733fc2d01f0052b95be39257d95ffe723fc75b6272b7056fc0f
-EBUILD wine-vanilla-6.21.ebuild 17741 BLAKE2B 726ac353af3fe47a9e15e5cf12ba747c057af807860432ec8d0b7f26d31da7542e741b11fe21b2f14b1debc45ebdd10c9ef7144a1cb92f131c5ef730fa0bb058 SHA512 a87bc042be3e7f800237b899e689918cdddb0fd9af6465325c3e983956fd02e71894d42f386790acef92653d4a2ec73a8c263693cfa6af1a5be5c65b5370793c
 EBUILD wine-vanilla-6.22.ebuild 17647 BLAKE2B ece269d6f0bf17677b60ac2091388ad6ee85dc14518e28781d1e87936cc59f5b53787b0c0f51fd743e9a9f2b1990b9f4b82520e55ec04bcecf202a2038a784d8 SHA512 f1c9f68c238c412d9571420b367376cbb15bbda001d83b848ea8f9431032ef01333874d5c25a196279163d9e08227162208b65560a5095522047a558f05fc0a2
 EBUILD wine-vanilla-6.23.ebuild 17647 BLAKE2B ece269d6f0bf17677b60ac2091388ad6ee85dc14518e28781d1e87936cc59f5b53787b0c0f51fd743e9a9f2b1990b9f4b82520e55ec04bcecf202a2038a784d8 SHA512 f1c9f68c238c412d9571420b367376cbb15bbda001d83b848ea8f9431032ef01333874d5c25a196279163d9e08227162208b65560a5095522047a558f05fc0a2
+EBUILD wine-vanilla-7.0.ebuild 17679 BLAKE2B 675a03ce288d07a3aed8a39200ce0e292e2c2b5ef7b28e3115f3d15049b6bd9cbaaf18c6fcf4f21f9a5ce711c6758a767642db4531ef72726fc40f6f2823dc98 SHA512 f876640ac6b9327c04c3e2e62ce5c8e288e68743a37165870480d1ac68ba4ea31b33d8ace294b7784f998a8f0631e79a783330d9a943bc27860aa1710e3d3e6e
+EBUILD wine-vanilla-7.1.ebuild 17679 BLAKE2B 1aef250cfcb538015d8035616a7eee9aa33c3150a0ff217825d5ca49ac095d9ad2dfa4242a14d3d266255e508e71f0436ad1fb8216b3cd5768e946ab0ee806e5 SHA512 4f9d8de7eac7d5334b9f33731ae4d93d6e202c2c03293b14e554f343d646946162f2607c09e32075ffc3c5dee6a3ded843b7faf340f43f8d9389c00cd7801724
 EBUILD wine-vanilla-9999.ebuild 17647 BLAKE2B ece269d6f0bf17677b60ac2091388ad6ee85dc14518e28781d1e87936cc59f5b53787b0c0f51fd743e9a9f2b1990b9f4b82520e55ec04bcecf202a2038a784d8 SHA512 f1c9f68c238c412d9571420b367376cbb15bbda001d83b848ea8f9431032ef01333874d5c25a196279163d9e08227162208b65560a5095522047a558f05fc0a2
 MISC metadata.xml 3494 BLAKE2B 0543d2465381f5dee52e2080ad8bf639a26f45d402ee646c5e815b5de93db4e64c1271e8daa464e30936eca3e11db96699ee382299df90992b39bc2fb3c32cbc SHA512 cf6a81b5a9fc7ad4b3fb35e57e64f6651becab199b2dd60016b74127b385a2da172e826d963e3c3aacefc0382b928b69a0ecaab922cac94c766eb7fa4fed1295
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild
index bfa8c53b67f5..341e462b9afd 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild
@@ -19,12 +19,12 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -35,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 +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos +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"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -59,20 +59,18 @@ COMMON_DEPEND="
 	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}] )
+	gphoto2? (
+		media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${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}] )
 	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -83,7 +81,6 @@ COMMON_DEPEND="
 	)
 	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}] )
@@ -97,11 +94,7 @@ COMMON_DEPEND="
 	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}]
-	)"
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
 
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/wine-desktop-common
@@ -109,7 +102,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -139,10 +132,9 @@ 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}-6.22-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=()
 
@@ -252,8 +244,8 @@ pkg_pretend() {
 	# Verify OSS support
 	if use oss; then
 		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from"
-			eerror ">=media-sound/oss-4 (only available through external repos)"
+			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
@@ -400,25 +392,20 @@ multilib_src_configure() {
 		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
-		$(use_with lcms cms)
 		$(use_with cups)
 		$(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)
 		# TODO: Will bug 685172 still need special handling?
 		$(use_with mingw)
 		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
 		$(use_with netapi)
 		$(use_with nls gettext)
 		$(use_with openal)
@@ -427,7 +414,6 @@ multilib_src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with pcap)
-		$(use_with png)
 		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
@@ -444,8 +430,6 @@ multilib_src_configure() {
 		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
 	)
 
 	local PKG_CONFIG
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.1.ebuild
index f5e1631ff840..7dcbefa4df13 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.1.ebuild
@@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -35,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 +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -102,7 +102,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -132,10 +132,9 @@ 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}-6.22-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=()
 
@@ -245,8 +244,8 @@ pkg_pretend() {
 	# Verify OSS support
 	if use oss; then
 		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from"
-			eerror ">=media-sound/oss-4 (only available through external repos)"
+			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
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /app-emulation
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)