gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /app-emulation
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
51 files changed, 4254 insertions, 642 deletions
diff --git a/app-emulation/86Box/86Box-3.5.ebuild b/app-emulation/86Box/86Box-3.6.ebuild
index 83e0de773c6f..83e0de773c6f 100644
--- a/app-emulation/86Box/86Box-3.5.ebuild
+++ b/app-emulation/86Box/86Box-3.6.ebuild
diff --git a/app-emulation/86Box/Manifest b/app-emulation/86Box/Manifest
index 0f7548d5cb4f..c825adf8788b 100644
--- a/app-emulation/86Box/Manifest
+++ b/app-emulation/86Box/Manifest
@@ -1,3 +1,3 @@
-DIST 86Box-3.5.tar.gz 4260258 BLAKE2B 080f4b3f4937633cb60a9bba5ac9b70756ffd5096843158033c30ee648fa78d40b539a08383bd5d96e3208ad73ad811c21a24cda08d7ad54188b62753ef2ec2f SHA512 8f40d918e0fbae388a4aa4f037adaa7fa1920cafd5c0493f1f052ee59c677a898226ab7958b8f22899e3983664c2e63c9bcbaf82e27b42efebfb22bdcf4717dc
-EBUILD 86Box-3.5.ebuild 1531 BLAKE2B ab2dbd5177a1e03b3cc6dc674cdb2926e8d6a8b710f0ad0b78843fcd399f8cac5c268b6fea894526e601602ed7e822175437cb2bda64606719555eb1359bc3a5 SHA512 adc8e79d5f31ccc9b660e3dfcab4ff7e60eb998f88cb7a3e6b493c5a913ba046bb5aac69c6244ab2b2e2b23b4bed5a6e7786422ac47e1e3f31072ec4fcbb6689
+DIST 86Box-3.6.tar.gz 5158884 BLAKE2B 7483b39ac377dba0f65680d40c88944bec5a77b64abeb859da586e6fecf2706f0803bbd18f443e4b6bdb3cfb03e50f3bdc264a586f629d3db62c5c965eb76ed5 SHA512 08f281f70afce47f8e483c0b16dc99b3704beb89c8ad007a6d1814f8cd3716d5bedc4ca4444cbd61c79960e89152b24cfa34c53d51a10f99c811ca3d3290225d
+EBUILD 86Box-3.6.ebuild 1531 BLAKE2B ab2dbd5177a1e03b3cc6dc674cdb2926e8d6a8b710f0ad0b78843fcd399f8cac5c268b6fea894526e601602ed7e822175437cb2bda64606719555eb1359bc3a5 SHA512 adc8e79d5f31ccc9b660e3dfcab4ff7e60eb998f88cb7a3e6b493c5a913ba046bb5aac69c6244ab2b2e2b23b4bed5a6e7786422ac47e1e3f31072ec4fcbb6689
 MISC metadata.xml 1266 BLAKE2B 45b789d3b456cf4fd28ab8ef5ab32bd8ef02c2da36f157a405ca2a90154d882f8c37a28dfa16cd6ea1e3d45d30ebd4130b37699792e0b1d0daf7ae32592e99a3 SHA512 8da4ab4b5d57caf7adc895d186ab3086857f196d2bc66513266305ace183f26f3b3304bbc861b7a31a95046d67bc7f008aa14d28c9848db9e09fae25724636f2
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 65beb1e0a916..b09200cf1ae9 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 109e68414e37..c1424523de45 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -6,14 +6,7 @@ AUX 22.1-fix-update_package_sources-function.patch 714 BLAKE2B 361ce316d4c499da4
 AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7
 AUX cloud-init-20.4-gentoo-support-upstream-templates.patch 3467 BLAKE2B 0d6185373ef7de03de60f3ae277a808a8457c8bbce23ab5a10ff3382c0ace244fe5d054285d2eeeb99956863156f3ff0000b7f6f84b706489d19c29cb1dbeadf SHA512 d5209c78ede276b6d614baad2ff586008694e4533114394207f377a67cbb8cd9a73547c8e0a9daa55051fa56ccb099b3a0f2bcf824cda0cbef0de858332c95f8
 AUX cloud-init-21.2-gentoo-support-upstream-templates.patch 3793 BLAKE2B 4e5cbc9fa872cc1d148861be1d1fb0615a68e69c6acbec8173580590c8d2c5e50df44e067d3b8ea77dd0b23ef658837a2a317c98712f8b42e9a14398d4cfe996 SHA512 9d436f223dacfd018df4caf407b0da3de5e9cc1932d3aad56f455c664d2b9f3dc8ab40d8607f9ef4481ee778ae897717161d3cb1a7d4d99041585a00a97d8774
-DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b SHA512 da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
-DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc SHA512 8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d
-DIST cloud-init-22.1.tar.gz 1313034 BLAKE2B ca55378db822cdf58808de1bd2b519861c50ad8b08ed699212827833e0134fdc0968b76a4c2a13f39eae1d20ef8b22a99ff99b85ef77e496fd41593f4e2f2d55 SHA512 485e358777379a22dd2b0f6aa7afb1751eb44831c6e03ecbbd9c6823eaa20535e6e83fc245818ce1bb207425976839b356dadcfa3cfe62385b9d340b08ff21ab
-DIST cloud-init-22.2.tar.gz 1348736 BLAKE2B ae95bf04a0229ed0c7bbf6dc6889793eb020ffe6e6223b02f4003b3f38253781a1ed22a41f535b5064a8ba4bde20b197d58eb5d55789d4decd9b39aabd46d1c3 SHA512 07fec2f1d6eab20a1161672bb339a0c6b2826540bcb03936f95458b179fcb1b3142773c9a4038fe02b30bb05a5ca48a4153b6b0f59015b43bd6c6602832f9d6f
-EBUILD cloud-init-20.4.ebuild 2570 BLAKE2B fd761ab40065f361beba0ddca7c907b314f7149de664de99b5c8033df856dbad88cf51a296b8ed4b118a1d97efd0792f4f0d15348962597ecbe6de25646501d3 SHA512 d42a26022cbaa3fad576c236a17cc6b35c91a232eb12bc4326975bf5d17b11cf51f4626d5e11c266313a7989140cd8816c2132b46ceb25eee935dad7b8a1c1ef
-EBUILD cloud-init-21.2.ebuild 2583 BLAKE2B 3495a3365d0e27de5d9a86208bc94f3745a98ad7505d1930ad48a4f4e68657a044174532399a72110f19be5f6e6c1f853229781cbde4c0abbe1c7cb4e852e271 SHA512 917ab440ff35629309c3db1e336506e1e97801746c5800e8a9f87654ca87644fb0631b5c8a5c58ff2a1bed6def3fae77a6664ea38a71a53e7811382a414580b9
-EBUILD cloud-init-22.1-r1.ebuild 2282 BLAKE2B d296a08408c38573c43aa1de8b6a6dc284b748ef8648a9e9cbd1d71832e7d78f173d5e2c8ef645950af66c5c48b7a43119a4f81e7f49270207b2af877fbbf977 SHA512 c0908a439be3706e4a64aec63a9dc991319578ad42fab390a6af88e437f2e29430d5eba8b5a469aced142c207bd34e3da83a8827e872849dca9e245dee11c131
-EBUILD cloud-init-22.2-r1.ebuild 2303 BLAKE2B dd14192049501a05542cd32c78833b0757e9c250a527081b6923743fda766873eda41a7e97aaf407921d7081b1499b67e528b5e5fd70f08b3523568480969132 SHA512 e90ee7bdf5df9a42deecfa6e5f004cc4752437e6807cf4ebb87be72a32b489f5d26a58612f6168653e0619ae6d463a3a36723371761a7cca7a54b50e87238c12
-EBUILD cloud-init-22.2.ebuild 2122 BLAKE2B 41b3e880dd26fa79cc901a251361b74183af6f21967dac2b7415369c5c71daef9260dd6cb47d12cecefe523f01cd3c6efc2de493c22a79279e5676b879b392c4 SHA512 121a59058035cd53c1a32f7698509bbfe9d09c2e5207e445aabea9c0baa5a54415cc5656b8e610c171d3b4e057f78376b9affd44b3b8d481676b10786eb1af08
+DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae SHA512 18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf
+EBUILD cloud-init-22.2.2.ebuild 2303 BLAKE2B dd14192049501a05542cd32c78833b0757e9c250a527081b6923743fda766873eda41a7e97aaf407921d7081b1499b67e528b5e5fd70f08b3523568480969132 SHA512 e90ee7bdf5df9a42deecfa6e5f004cc4752437e6807cf4ebb87be72a32b489f5d26a58612f6168653e0619ae6d463a3a36723371761a7cca7a54b50e87238c12
 EBUILD cloud-init-9999.ebuild 2262 BLAKE2B d9e5722888f36579fed20e1adcb91e36a465395a19f5cf958cd85f8c25c229ee33515bc0a2d98f85f1f470b3bad53c20e7906551778237dfeaea97b062e3c282 SHA512 12ffc5dbdffce1927ff142e7e0a5be049543661b7aeb6643b3b6c7b65c462acc7969f31bcc120d2975e0b39624e89952adc17d2fc89f55878a2fb1350376985a
 MISC metadata.xml 652 BLAKE2B 3cdf1331c7ae5065c1cbe4211acb44ed5b633a97add66b70e26fcebef19461fb6bddf06c455369f03b45d3a12a4214b02aa60463c39c38b527db634e883872a5 SHA512 ff07770f741ea072d1e0007856ed7af1a55f2e6e879cf8ba39039ef0dd148c078438d87e0ae14acc4b8a1fb42429abaaf53a7467473aca587dc5ee6b1b266af5
diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild b/app-emulation/cloud-init/cloud-init-20.4.ebuild
deleted file mode 100644
index 31a7326ac086..000000000000
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
-else
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${CDEPEND}
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	net-analyzer/macchanger
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-"
-
-PATCHES=(
-	# Fix Gentoo support
-	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
-	"${FILESDIR}/${PN}-18.4-fix-packages-module.patch"
-	"${FILESDIR}/${PN}-20.4-gentoo-support-upstream-templates.patch"
-	"${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
-	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
-	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
-)
-
-python_prepare_all() {
-	# Fix location of documentation installation
-	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
-	sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Do not use Makefile target as it does not setup environment correctly
-	esetup.py pytest -v cloudinit/ tests/unittests || die
-}
-
-python_install() {
-	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	# installs as non-executable
-	chmod +x "${D}"/etc/init.d/*
-}
-
-pkg_postinst() {
-	elog "cloud-init-local needs to be run in the boot runlevel because it"
-	elog "modifies services in the default runlevel.  When a runlevel is started"
-	elog "it is cached, so modifications that happen to the current runlevel"
-	elog "while you are in it are not acted upon."
-}
diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild b/app-emulation/cloud-init/cloud-init-21.2.ebuild
deleted file mode 100644
index f99af619353e..000000000000
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
-else
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-DEPEND="
-		${CDEPEND}
-	test? (
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	net-analyzer/macchanger
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-"
-
-PATCHES=(
-	# Fix Gentoo support
-	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
-	"${FILESDIR}/${PN}-18.4-fix-packages-module.patch"
-	"${FILESDIR}/${PN}-21.2-gentoo-support-upstream-templates.patch"
-	"${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
-	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
-	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
-)
-
-python_prepare_all() {
-	# Fix location of documentation installation
-	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
-	sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Do not use Makefile target as it does not setup environment correctly
-	esetup.py pytest -v cloudinit tests/unittests || die
-}
-
-python_install() {
-	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	# installs as non-executable
-	chmod +x "${D}"/etc/init.d/*
-}
-
-pkg_postinst() {
-	elog "cloud-init-local needs to be run in the boot runlevel because it"
-	elog "modifies services in the default runlevel.  When a runlevel is started"
-	elog "it is cached, so modifications that happen to the current runlevel"
-	elog "while you are in it are not acted upon."
-}
diff --git a/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild b/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild
deleted file mode 100644
index 667839f99352..000000000000
--- a/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
-else
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	net-analyzer/macchanger
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-"
-
-PATCHES=(
-	# Fix Gentoo support
-	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
-	"${FILESDIR}"/22.1-fix-update_package_sources-function.patch
-	"${FILESDIR}"/22.1-add-support-for-package_upgrade.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Fix location of documentation installation
-	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
-	sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	# installs as non-executable
-	chmod +x "${D}"/etc/init.d/*
-}
-
-pkg_postinst() {
-	elog "cloud-init-local needs to be run in the boot runlevel because it"
-	elog "modifies services in the default runlevel.  When a runlevel is started"
-	elog "it is cached, so modifications that happen to the current runlevel"
-	elog "while you are in it are not acted upon."
-}
diff --git a/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
index 082f34e59987..082f34e59987 100644
--- a/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
diff --git a/app-emulation/cloud-init/cloud-init-22.2.ebuild b/app-emulation/cloud-init/cloud-init-22.2.ebuild
deleted file mode 100644
index 071baaffc9f0..000000000000
--- a/app-emulation/cloud-init/cloud-init-22.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
-else
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	net-analyzer/macchanger
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Fix location of documentation installation
-	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
-	sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	# installs as non-executable
-	chmod +x "${D}"/etc/init.d/*
-}
-
-pkg_postinst() {
-	elog "cloud-init-local needs to be run in the boot runlevel because it"
-	elog "modifies services in the default runlevel.  When a runlevel is started"
-	elog "it is cached, so modifications that happen to the current runlevel"
-	elog "while you are in it are not acted upon."
-}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 600117781a1a..0d64ed4e03c9 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,6 @@
 DIST diskimage-builder-3.21.1.tar.gz 506309 BLAKE2B 5a5a08c90449742e9ba1664043cdeaed3c38f9efeb722f99fdb1fa98ea48a2a18bddd4bee189e983d8dcc4b43151c61d92320e703fead8f52eb81c49c2f225d3 SHA512 fb63dfcfb93ddbaa98b1231684892ecc1b28802e805902d613a41692f0b91a68b583efb45e6bb608c6333ac90e5de95e75b18f711cdca683014623287037a952
+DIST diskimage-builder-3.22.0.tar.gz 507997 BLAKE2B 559203fb5e92ff6b32e3cda6e977c46ea247f47f0d41d72db5f4e6fa6957c599814fa65f24b3d0783fbf95fa72efb52db2bfa30f608b08955bc64bc8c4943d59 SHA512 1a2c4f6301eb90268cc4cc47e600e2de404336f871606beaebadb367ab8976cf6618da3a9ed594682f53b84e70c2b658d519732031c9b3423a906876ba3b03a4
 EBUILD diskimage-builder-3.21.1.ebuild 1125 BLAKE2B 253a05db3774b34379cb0c5757cc1623a27261c8e0b2ae867236f01441b051da7f6f20f662ee160dd240879b1ce4b6d268cbffa64b407ef49f3bd6ecbe04272a SHA512 40e1df990864113fab12fe55f86b6c0a1049c4d1f3ce24e0ee87667a076c3a08fb611ce0e4fe22188039bc976a7cc85ca6f6b9444a5f086e81410ef702617184
+EBUILD diskimage-builder-3.22.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c
 EBUILD diskimage-builder-9999.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
 MISC metadata.xml 719 BLAKE2B 872a4d37e8ddb2a28eb85d18cd88990934327bc23194f3be9e5dea03627a6169987b246a93b50754cbe5e331f8c854a808bf307b70521c481d83b846f7385606 SHA512 d151fd95659211b2057ef0a61a6020e2f9efebebf3d7c5e1392ddb9954e3627e1040f2a9fe84ea4caeb65a745411fefebf2d896bbddbe0ddbb56acf42d2fedc3
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.22.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.22.0.ebuild
new file mode 100644
index 000000000000..cfd2e2377172
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.22.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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/free42/Manifest b/app-emulation/free42/Manifest
index 937d9fc49dae..4182aea1d89a 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -3,7 +3,9 @@ AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5
 DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b
 DIST free42-nologo-3.0.10.tgz 7455117 BLAKE2B 9e1e1e0e9f5a05be936440305f0301c2faa3e4e59cc30afed25a59aacb2215265a214043a6114e0d4d854cdffceaf2a422025a1cad41eb715c2e39eebeef2f2e SHA512 dde1f71f2a64a670a40782b2144192292a3086bac297625eb7e1cbec9cad09433b5d0dc56efbfd0d567a9d533442f249166f73bc89cbb595085db3002f4b23c7
 DIST free42-nologo-3.0.11a.tgz 7457251 BLAKE2B 22be3d7d84d30ae347d7c24eba1339217cb7ebeae94454b35acdc0c4f6e1c0557858bf866e90bb4008ef78a88c34b2226312ea0ed3a3cadb2c07bb42cc0d5ea9 SHA512 8cac8fb23c26f5dcc7951e875931340eedc4cc63614ea8413d1ca75f1c2a8133f9c18ea4e837fbc9771f127563ae01e6f011e6b4c0d97b4c8b8738c924be8762
+DIST free42-nologo-3.0.13.tgz 7458844 BLAKE2B 3b09aaf0dc177ddc9db49a0f09c91f7c6a3346303266ed280fa57403e6864a4d88471dcab8c0e1ddf1b96653d4609f83f4102fc169902a70098b3260f48d9099 SHA512 6037e86962157a2293915d2bd9343f7ddcddcbb346e98fe339a7ef1784c98249fb55c69c0cf6370a79db4628197ac851d4c4c05ec610a2911fa9c3b00a6d077d
 EBUILD free42-2.5.24.ebuild 988 BLAKE2B 018e42a0d178fddad32220fb80a8052b883341ed595aeacb8c62189167b92354df147821701c496010a2d41d4492b9c8f9591e3dc3726277fca9032f22877b7b SHA512 558ca798068bb404d040e4f95ef2a404f8184d23f1b91c03801dd29599b2615f8bbaef509edac11d958a641ba103e2871cc7d5e4f1e2b7be47f6cfdc22d3cdac
 EBUILD free42-3.0.10.ebuild 990 BLAKE2B 64c512256d8e4b36f8735dd444afd04e0768d1f9fae4a95eb6d56e3ab4276f2beea2ac449b6e920b9e4f523ce8b6b089c5eaa9455e791f4ebb7205b8c0a0a21f SHA512 18d13159a1f2b9dd77fd38bd8151dcc0115efe2af8d4ed74ee3759223e8d746fe6cc1a6e73449a8c8b4dd3b546dacedf2b670dd0a9b4a645604bb767e0a6e1d8
 EBUILD free42-3.0.11a.ebuild 990 BLAKE2B 272954164a32219cc4981af05e4be9ea10d5e547fb252c42c910314b5c0a57441d9814a1b925fc9a00e90b1a2f35b3fa9a9b0c1583f2a5db002d3ad0e9d2397d SHA512 614a36b142db2bd2d20da52f492a8e015bf3ad0b04e0611a7aed3606cd5cc6bf5679ed5946b030e5ae96788ef695d39e7fc7bff25d5f4446c7be146db2c55f68
+EBUILD free42-3.0.13.ebuild 990 BLAKE2B 272954164a32219cc4981af05e4be9ea10d5e547fb252c42c910314b5c0a57441d9814a1b925fc9a00e90b1a2f35b3fa9a9b0c1583f2a5db002d3ad0e9d2397d SHA512 614a36b142db2bd2d20da52f492a8e015bf3ad0b04e0611a7aed3606cd5cc6bf5679ed5946b030e5ae96788ef695d39e7fc7bff25d5f4446c7be146db2c55f68
 MISC metadata.xml 346 BLAKE2B e7d31b887aade448cfdd31d3221c1d01f13ae1ad9097c4b18fa39b927401d7aa1c0b0b4bad4c36251b74f976ae79899e1b64b6086656cfbbee2036e1cf85946d SHA512 a848ab39ebadfe8b2c866cec845b16c1a0d92070a8e4365bc576a3d4287078594d0eb41f704f5a2f9b35618e24d91de99f6760ced7d39d9a4f706ca6f5c5480b
diff --git a/app-emulation/free42/free42-3.0.13.ebuild b/app-emulation/free42/free42-3.0.13.ebuild
new file mode 100644
index 000000000000..1163a40ac12c
--- /dev/null
+++ b/app-emulation/free42/free42-3.0.13.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/grub-xen-host/Manifest b/app-emulation/grub-xen-host/Manifest
index 4f31f647f9ee..b2c0d928151f 100644
--- a/app-emulation/grub-xen-host/Manifest
+++ b/app-emulation/grub-xen-host/Manifest
@@ -1,3 +1,3 @@
 EBUILD grub-xen-host-1.0-r1.ebuild 2007 BLAKE2B 6c4bb9ac18792b9c7253dbc9136c1c724600371abe9249df4c7aa0fc14b7d6d19e683586f1ee0c60621a256395c31e02a71a344feeaea0a0465e778c5674b4e7 SHA512 0f146b3e7a2602f0e9d3ece86448e86104797bec9ab8d7de8b604a29fd51d94b4b3539c49f09b3ce622382125a322b04a617e62c137eebc2b1333e6a57eb0a9e
-EBUILD grub-xen-host-1.0-r2.ebuild 2003 BLAKE2B 43fbe98a81240348d3e49fdb3c64e29104fd88a1bc8d987e9201c9d1f850f69c0dd2cebb60b8bf79cc5725e231e12799798e1bda3240646defb4911c7e9692e4 SHA512 3432eb6db0a73be2c785d2aae2bc9b6d5e42bba717760e072c812729cd3c57bc162d77596b8994a779b9dce65f0c384c17a73665fafe2232aa3b889f5bed9acb
+EBUILD grub-xen-host-1.0-r2.ebuild 2002 BLAKE2B 0b5362fa1470fa1e50944010ce7f6e4f7127204d0333f3824829170fba45568412641b5805ea6601392b945b0314b4ad0d5ea227b4a91c1b22862f195714f7bc SHA512 4a594e83d82a27b3231d413735cfe301ddb72a959e2f9c5e7de0f07f69d18fea907edb5a2a3b7458a3d3e8b09064d29183765b6f7f83dece7735e7d04b035cee
 MISC metadata.xml 516 BLAKE2B f9183f3e1f7b6de089e478a77b9ff6282cdffc9cad59ed045488025ea05a12997ac18506f089396e99320d98159d8c1631d5ee8a81debc0647b24b66f253e9d3 SHA512 495b6a380e366760ce97f8d865c2ae118ed6a7c189983d871c6517b08e1a86e8d6a47fb43b85c2f175a10a234e1895fbabc98c4806eb79aade14955841a90813
diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
index b8d6cc67d3e4..502d03bee2b3 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.xenproject.org/wiki/PvGrub2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pvh"
 
 DEPEND="
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 6c8f815c4180..f20eb11ee895 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -30,6 +30,8 @@ DIST libvirt-8.3.0.tar.xz 8829288 BLAKE2B 37890dac8f46e14c5f0329f7f3318b611bfe3b
 DIST libvirt-8.3.0.tar.xz.asc 833 BLAKE2B d1faf041532fc4c33641cab0510401db2fb1c45004f2615df6807729d7a83a8a28bd2410eb5478e479e7cd1b28272ee92885b30ecdccb8a9390536df51377d5e SHA512 5c32087769aba0d2a245a4ce317e1428842a682cf71e03e5f33fc4476309f40c08118241b1ad2b4be14933971431960b89960858a1f841ab1b7c9bda9f571d52
 DIST libvirt-8.4.0.tar.xz 8846528 BLAKE2B 479d7d47a9d711e0240da09eb295f1a644bc4cfddbe544908f2011eb45dff9cf9ffdfff87ba63ded96f5b69024c65832326f9fb0837c5338114ad5dbbada7af1 SHA512 e9dcaa489f162e3a26fe1ca7bb83a22e3f1952594c3541ddd2a7f8e8a0e6ad37e193fb89421df1efe3d2a4d9bb7cf5455c7b7a0b59e133eb6c0ff3cbbd8403b6
 DIST libvirt-8.4.0.tar.xz.asc 833 BLAKE2B 7bfbfc05ce7d95018c07e92d475bc0fddbb0b396132c12defd0205638d22534ba83fea8180345635b9f59b8a10fd3177b1a84ad748f1ddb9e533e11700bd4cbd SHA512 5d85ce4764dc36d940033c5feda59b9cff64844a52e3a25b1b8d0278adbc2378978a7dbe6f577f82bc760d617edc75c4a6ab8e1325a38847e1d40e3bf7c9684b
+DIST libvirt-8.5.0.tar.xz 8886088 BLAKE2B a789b5d4d4f3d359403b53b1b6bdc31ddd8938d12fce3c77e953a30be359a3f75071c385bc8ce3df11ccc7ad682e433c067781948cf107abef84e54d5aadd0d9 SHA512 62b05c5cd58eab0ab2d945b832fd85807aea9b5f12a7ef5d1205fe0edac8d361ba3a9245f60f200a8548c96f718943d4502d87fff87c4495bd1e2637f14aaccf
+DIST libvirt-8.5.0.tar.xz.asc 833 BLAKE2B 2e4ee3309e409fa700b0e09c067d2d7978f5033bc947108012582a9ba4b6a5438a2f419375e10b342dd0082560768eab1913aea86558293abc9a51bdb87111eb SHA512 d05482a7d0ef5649428368553e7a9c49a116435b273179c13248081711ecc2d8fa1f6ad82a3d5ce43efc2afee51718bc3362e483463c61ebd10dbcc41875749e
 EBUILD libvirt-7.10.0-r3.ebuild 8817 BLAKE2B 4d17950d3395ded22cd9046f41748ef2bf5cb392b63051a1558ed205b9e24b1107d888dc0393c4f53a9620b9e625bdfeb263d0c79ddd317943d14f2b324d677b SHA512 5f8d9301c0311e8f2702a5171c7c1b72c91cd821b7c51396481f0db0bee77d38b8941016c4813cba231c1c0d75d40a5a2f2001a15bbe9b7ffc1af43fe4f8e1d8
 EBUILD libvirt-7.7.0-r2.ebuild 8730 BLAKE2B 177f5c41fac1d9fc6a7e7c6d992975593aca9aef3d4b327b98278801e30a506c28747dbb96795bf3045a7c195f8d8ec0c7a5f6223be8f3e59ba6d44d69a65d40 SHA512 e7f8060e14246c469723fb4cb78d77de257b5b39af21190855e1efcfaae3654503b28b2b4d965b8fdb04f33f0877436b5ff1845060f0f18ca6a407ecd6780a5d
 EBUILD libvirt-8.0.0-r2.ebuild 8802 BLAKE2B 473763cf6d30b1d9f7132e0430c9af615dd2b8356cc329c5d79ca3afd370f708ec4c1b69f45503d30ccf3582610c2a8ae602128e48082e109cc63bb123bb546f SHA512 e37ec22bf9e856161f51e7492f47c20409c3eb7a184a066fca83c92ee2d17016c1d4d56f2f88feebbcd3228f5ffd14a556728ad9b5ad77adb212c14607da2f86
@@ -37,5 +39,6 @@ EBUILD libvirt-8.1.0.ebuild 8787 BLAKE2B c131f96900497a858c4f15ab9352f4ea339074a
 EBUILD libvirt-8.2.0.ebuild 8817 BLAKE2B 1f849e58e6fb66c5b732b16b4df83fb73ec36c75857803ebec17a23489f247ea61fa30fe3afc10b6ce22040ed5916e5f6106205c9c0d4fdce35a1305aa5ec30e SHA512 431c2a164bc956cb9b468aaa35534a1b4c532537340274d963bb4cd555288ccdca4369a3001133e87dd2d20eb6a93e9b14c9c34ecf3f0ea80ceadeb2211984d6
 EBUILD libvirt-8.3.0.ebuild 8948 BLAKE2B 4dffb4d34aafa8a4998ddc3ef9e26b18e5188f1c836ca75d68b75909bae70a9c52a9e03311b08e8e39ee498e243d2557e37f4024e376fc40565f55f778f3c3e7 SHA512 39568ef7a362fa13e7e9958246d02a919174f07381b44fe44134ecc6ef00a1ee81e836e3e12be391bba7e0510aa4651a6816aaaf2f5340f398dea54656e5b248
 EBUILD libvirt-8.4.0.ebuild 8953 BLAKE2B afa854c0c31cf705e401fb5733d52c3ac720c52c62dd7517ef79d791c8e93a71b5f2c1628a49ab9d6e314bdf343304aaf9cb79ec56a5b2cb99309055e7a785f8 SHA512 77c6cac11ece2fd8a01193ab1da4cfaa7ac6f7addc4500054f93a649faac4f119400056c79a835f56e29417fbaa683e7f4dc8b73d03585dadcf8926b6be22ade
+EBUILD libvirt-8.5.0.ebuild 8953 BLAKE2B afa854c0c31cf705e401fb5733d52c3ac720c52c62dd7517ef79d791c8e93a71b5f2c1628a49ab9d6e314bdf343304aaf9cb79ec56a5b2cb99309055e7a785f8 SHA512 77c6cac11ece2fd8a01193ab1da4cfaa7ac6f7addc4500054f93a649faac4f119400056c79a835f56e29417fbaa683e7f4dc8b73d03585dadcf8926b6be22ade
 EBUILD libvirt-9999.ebuild 8948 BLAKE2B 4dffb4d34aafa8a4998ddc3ef9e26b18e5188f1c836ca75d68b75909bae70a9c52a9e03311b08e8e39ee498e243d2557e37f4024e376fc40565f55f778f3c3e7 SHA512 39568ef7a362fa13e7e9958246d02a919174f07381b44fe44134ecc6ef00a1ee81e836e3e12be391bba7e0510aa4651a6816aaaf2f5340f398dea54656e5b248
 MISC metadata.xml 3612 BLAKE2B ddfb61f1cf36a2761040cc9f51c6bb1ffe2697b3d7b4bb5859c9db37da1e4402bae12a26e7ce591e4f68da6d026b9e36a7b8926801d122ac3982a74ae90c0e2b SHA512 ec7ceff58d0a7542d0c8d07ce3905a98390347e5a0966373d6cbe496b51fe52851dcf62f9fbd25fea669114bb4013b52bd09e38c52a1742fa3d157690b3a560c
diff --git a/app-emulation/libvirt/libvirt-8.5.0.ebuild b/app-emulation/libvirt/libvirt-8.5.0.ebuild
new file mode 100644
index 000000000000..1ac6f7431bdb
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-8.5.0.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+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"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 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
+	net-libs/rpcsvc-proto
+	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.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	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:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.7:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	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.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-2.11
+		>=dev-libs/yajl-2.0.3:=
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	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-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-8.2.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 libssh2)
+		$(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/plus42/Manifest b/app-emulation/plus42/Manifest
index 3df687f262f3..6485ecfee130 100644
--- a/app-emulation/plus42/Manifest
+++ b/app-emulation/plus42/Manifest
@@ -1,7 +1,10 @@
 AUX plus42-1.0.4-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
 AUX plus42-1.0.4-fix-makefile.patch 1127 BLAKE2B 09d8835127583a24f34138f70662f2d629c3f8a754558b5b29898892a644e5d63d920009b5062a650fa178097d0ecd9a80b5cae740e54a40758fe5dd9a9abacb SHA512 de695e593836d12702eb56319b3c2ab8acd30daa020568a8d64cf1f73b43547e7aea5dc48f4148500309db4e4bfa4fda359e989eb322e032721c281bcb5a97ea
+AUX plus42-1.0.9-fix-makefile.patch 713 BLAKE2B fb8ca302a324122cee89d7f3ddab2a0521c8dee1e910ae50efe7ee74ed3781ac7e3c017cc7afbd601cf41527afd61d979396400a5e6dc8e1714ff853ba25a4eb SHA512 532c8b2d88324e3b38ab568beb1ed9b7fce6e91c894c6438657a800ccd32759c82ce9bcbea3828a04985eef18c278004e0a068b88695da5f0e75bd996c6d2fd3
 DIST plus42-upstream-1.0.4.tgz 7583399 BLAKE2B 801c125e8b320a2ae2220595aa6244451f55938db644beb5e619c7789b506ada86b4f22e62c724af19da1240aa6c0fad791e2d6176eb4787435f16c1a44aaccc SHA512 a9c23b582047767fe0c57f35fdb4dfb72d7fdf480106a64f1d1151541c5d08e8a1a973156b0e2e5e9ca2f4f74acfbde2a1d69590c02f480d52dec20981be6c6e
 DIST plus42-upstream-1.0.6.tgz 7583604 BLAKE2B 3cfdf41ee3ba627cfe5191cf9c0e452917b8511931206fd46df8516a225c7e0e447d8410348d9ab324269a3182dd9c4708ac881f46ae5058fdd4784acec82e2d SHA512 9f4573de916ba20fae4400f50cbf64b9bfbc452b4b51e4c674cffd5129cac9c9828eee33ab613abed6d94c5863797c17e3bd78b0df50bbaa8e0f9594450713ab
+DIST plus42-upstream-1.0.9.tgz 7585218 BLAKE2B e6c09c985fcf3f037a0c1dc1f4f445ef18c4f73962ffbf46939b91d5a96c9f079bd36b328b30fcae42f0bc13ebee7a1f56e51762f225f41fb715ab88e8b93d56 SHA512 77c06cf33d375f513c6806910f6b8bdda865853e7890922174364a7d2a07e35a6bbae2e62800c7658be01fe8b3aafbfc7f53a19451475b411865fe69bef090d8
 EBUILD plus42-1.0.4.ebuild 1000 BLAKE2B a78dc6655b48c8a0ae3c71044dbeaa446049f75c98a2083438911c2ad9ca033316739a2dd06abd68e248b77aaeb5784bd475480b3ba32946fe850f50e696213f SHA512 891c87820a5f89907aa66e5ad6a848f832f1cd80d8457403572f9f65a24bc078add1c90a8791676d6bd59304bcfb238bd8cfc41620fdde79542903cfdced70dc
 EBUILD plus42-1.0.6.ebuild 1000 BLAKE2B a78dc6655b48c8a0ae3c71044dbeaa446049f75c98a2083438911c2ad9ca033316739a2dd06abd68e248b77aaeb5784bd475480b3ba32946fe850f50e696213f SHA512 891c87820a5f89907aa66e5ad6a848f832f1cd80d8457403572f9f65a24bc078add1c90a8791676d6bd59304bcfb238bd8cfc41620fdde79542903cfdced70dc
+EBUILD plus42-1.0.9.ebuild 1000 BLAKE2B 92d6952d31fff32a1c02616a44fc1cc78b8de1ce0d7d47d95a869514a395f46529a6c835ebab86dc22b81f33293f7e699d839291b478504a78a90c364a1096dd SHA512 50a4568e937b5f3be015d71f40b3ade6327f1f1debc2857d6726e473931ac485005943a2307a7cfb9efeef1f35d03194aadcf5363efcd713f0457e80e1467aa6
 MISC metadata.xml 353 BLAKE2B 62d2057ed40527ddee3b747c7d702009bba223521e3264af5905506515fc67a6baf27938ae03d664eeb713aaeac898b7a1eee0682b69f3659b4dbc6e7eddaef8 SHA512 9633917e4a226c142672cd8bb91d3ca5ec40a2b4600bc8ba60ea959dc871f54881dc331ca5ed0030a4afcbad426c7528667b61289e4ed77e19aa3e9d1c816ce2
diff --git a/app-emulation/plus42/files/plus42-1.0.9-fix-makefile.patch b/app-emulation/plus42/files/plus42-1.0.9-fix-makefile.patch
new file mode 100644
index 000000000000..b66c15b89b5a
--- /dev/null
+++ b/app-emulation/plus42/files/plus42-1.0.9-fix-makefile.patch
@@ -0,0 +1,25 @@
+diff -Naur plus42-upstream-1.0.9.orig/gtk/Makefile plus42-upstream-1.0.9/gtk/Makefile
+--- plus42-upstream-1.0.9.orig/gtk/Makefile	2022-06-19 14:44:32.000000000 +0200
++++ plus42-upstream-1.0.9/gtk/Makefile	2022-07-04 19:37:35.533799322 +0200
+@@ -40,9 +40,10 @@
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+ 	 -fno-rtti \
+-	 -D_WCHAR_T_DEFINED
++	 -D_WCHAR_T_DEFINED \
++	 ${CXXFLAGS}
+ 
+ LIBS = gcc111libbid.a $(shell $(PKG_CONFIG) --libs gtk+-3.0)
+ 
+@@ -121,7 +122,7 @@
+ 	./keymap2cc
+ 
+ gcc111libbid.a:
+-	sh ./build-intel-lib.sh
++	+sh ./build-intel-lib.sh
+ 	ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
+ 
+ symlinks:
diff --git a/app-emulation/plus42/plus42-1.0.9.ebuild b/app-emulation/plus42/plus42-1.0.9.ebuild
new file mode 100644
index 000000000000..b73a2da34bf8
--- /dev/null
+++ b/app-emulation/plus42/plus42-1.0.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-upstream-${PV}"
+
+DESCRIPTION="An Enhanced HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/plus42/"
+SRC_URI="https://thomasokken.com/plus42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-fix-makefile.patch"
+	"${FILESDIR}/${PN}-1.0.4-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/plus42bin gtk/plus42dec
+}
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 2c07486e0ac2..e5da7072c0c9 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,7 +1,3 @@
-DIST protontricks-1.7.0.tar.gz 139203 BLAKE2B d93bbb672286d32743da1473e132508084bae527159911367c51e88686c38d3bad0a2f72a2c0f0feb09412e31e6d5bb20dfe113b9e71e4e655693bfbe663a968 SHA512 c12f211051bc23c8eb03c5385e8245361d72dcce1e641a7da1f87f344db5fdc7d698bd7691e0855ae025c1d94944db89b380805664d87123b6252d06259480ff
-DIST protontricks-1.8.1.tar.gz 151972 BLAKE2B 1e7b600bfc22c46e879c5684229e374699548bc96d172c23d4b3c7c08871c0baf629436e81ad35d0d5e93e11515c8a20d4365658d10610cd60b04d6982b83b7c SHA512 246e65f61ef4fd6825e426aa2b4ed3df26ad1443fabca079194890a8115805ff2f51be96ce410854407b61451dafbec6abd1e26f029c1e442af10a209c75377a
 DIST protontricks-1.8.2.tar.gz 153142 BLAKE2B c0757973f7e1c442ab0bba27c2c739a7b24d45bab31ec308ec195290e35392d222369dbfe64f558e21ed1b61d13bdae629c0ba8b2f81b9af2b4f2f94c30ba9ea SHA512 9b83c34847e8ea8ae86f77330f626748a8ef5682c99619d90fea0c52de3ccd5b4285e5dfc676b8c046b9deec996847dbb0586596428507e162e255a852b28cd1
-EBUILD protontricks-1.7.0.ebuild 1561 BLAKE2B e9d4a3c2b48ce79f6639d2c6efc146797fdfee1ce6d0dd68d61381e19c9ef3c6643b0737f0b982e5f2e395ef8668c01e49e5cb4de22c77e646caeac9fe9e2966 SHA512 5fbd53dd0a4ddcc4ef760225231fecd12603135aa4a4fda2cf5ae7f956bbb849c6fa2e4747fd4d1153a5c9772dd64f90b4b065b05361b49e9ba82f81842e7da6
-EBUILD protontricks-1.8.1.ebuild 1562 BLAKE2B 2d1f12f2aaf762aa6ce807a25cda700ae81bf886ee18aff7c510e4caddb284403d16a94468e0288ab20e487363c69c276143e6b64569ea8128d1c3d5cfe96358 SHA512 a8603cb1daca3d04f068b66794c8bfb7fb50536dcb59d82422b47293ce13332ed04efc409c13fbd5044084f503455d793d968dbaf68cd883ceec2e0f162082fc
-EBUILD protontricks-1.8.2.ebuild 1562 BLAKE2B 301f4eb1b8aa3ca6801a560614f1eaee2f917791a74eeaf173a1f3373a9768c87d2308bd8089dcd7448c3658f580476063dbffc637a2b9aac82dadb2d55f761b SHA512 5152a113f79b6788996dceebe23a64ee3ff8db232c6d89fa02500e4f18013c96079e2aa58a441636d4286232a581744504a0c08e3b9338fac3fb7b7b590e4cb2
+EBUILD protontricks-1.8.2.ebuild 1561 BLAKE2B 8e363eb3c10b00c76e33654b1435d0e94d27941d53f17666dfa8450e9bf9a40f913fa9c66bd7d1f9d8f35e625c46ab0c50b20953734c370dfd770004c7a2c4d8 SHA512 dc3a8f17876d26da53bb9a8018aa6b754e503782bdde6b464e3353ba67ea51c9405f1b93c3d3f63f9aaa91cb7bf6542318ed3eba7bd111cd54ea58108d88882e
 MISC metadata.xml 809 BLAKE2B dc0506e6f3224adc867438699359c4eafc389041846c644818732036e04bcb9c789e358a08effdb4b9ff4430521f7fe8ff6800b75aa93d6313e3d85395467741 SHA512 351bb79dc7921e6c62100b3354546185d31578b044393ea5e5b5fea089eb47164882ff4ede30d8a575dea31ec9d0927793f8109d9e63ca4ad6954c1affdbe6f4
diff --git a/app-emulation/protontricks/protontricks-1.7.0.ebuild b/app-emulation/protontricks/protontricks-1.7.0.ebuild
deleted file mode 100644
index de3ff69eee31..000000000000
--- a/app-emulation/protontricks/protontricks-1.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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_PEP517=setuptools
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-BDEPEND="$(python_gen_cond_dep '
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-')"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/protontricks/protontricks-1.8.1.ebuild b/app-emulation/protontricks/protontricks-1.8.1.ebuild
deleted file mode 100644
index cfb253df8379..000000000000
--- a/app-emulation/protontricks/protontricks-1.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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_PEP517=setuptools
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-BDEPEND="$(python_gen_cond_dep '
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-')"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/protontricks/protontricks-1.8.2.ebuild b/app-emulation/protontricks/protontricks-1.8.2.ebuild
index d33c17e8e46a..78ec733bccc6 100644
--- a/app-emulation/protontricks/protontricks-1.8.2.ebuild
+++ b/app-emulation/protontricks/protontricks-1.8.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 74383dcbd983..b98991555a03 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -7,10 +7,12 @@ AUX qemu-6.1.0-strings.patch 882 BLAKE2B 9c35aca28371c15e037af5e9deaa90edcad769b
 AUX qemu-7.0.0-also-build-virtfs-proxy-helper.patch 1168 BLAKE2B c85204a90c5af17675c1d2d09ce884acddd0cabb6816d10baafc299a924f86c94fb66b9c58160fe0e4b5d56c049f249c01390d45bebca42aaf941bdc6f04fe81 SHA512 b5a884545bbc82fe2318f18f4de103e61db6d22fce433f4ed4e175310f329fe110627640c6127df0dd2312dcba05bce342ff08166feb565b9adbea23086f1677
 AUX qemu-7.0.0-pci-overflow-fortify-source-3.patch 3939 BLAKE2B 02909d525e2ff2bc79a763117ccad7fd46eb23ba731ca37d6d6b6d2edcc9aaf02f37d2e13996f1648e9befd13fa50cb14c0d04565196d9ead2ceadcba2610b8b SHA512 0ca086aa4781066133a9a2d0307d6843e0062b17443abffca87af8291569ac2c44ab29408cce5e7a9d05e75ff277f1778347f9ce155e91ea7c6d0eb1d8a2388d
 AUX qemu-7.0.0-virtio-scsi-fixes.patch 7117 BLAKE2B 47f2c2a2783579bccdf0aa509051324a2c269eb9bdad1cad489e40724035cad6958559b46533c9601ffb7bfd2f9fde16117097fd470a3a6fe9b9cf5a0a9f95a8 SHA512 e15418a83b43e9313199d2198ba0434c7130b4c0561a57a244ae783803c8505defdb68ec680e03acaaa0feba3e778d7e6efd4ccec58fa2c49208e4095efe6c31
+AUX qemu-7.1.0-also-build-virtfs-proxy-helper.patch 1167 BLAKE2B dee6c98a547a510827f422a5d2b03edd6d467e4713f357a5841e01d632578891a0e2e715c57153c7842b51f5199cea70d8e76ff31f0372308e26202e1587af62 SHA512 d2fb9db139588961434663910dc7151c91b82c1820f62ed5ae690e4f868f1957d8ad2dc1b812813a2081ce6bbdd0f8e59cddd9459de6ef493df02b5a4478de63
+AUX qemu-7.1.0-strings.patch 868 BLAKE2B 89f17618de07b0f025d8702b73590aa91f890ab1e7f2a1592146eacf6378ecd940ff1ee07519da2b0a8c26b11fdd0f11808ebfb69d518eeffe5f557d157c7177 SHA512 c0f26e5b68aaf97b54248cf2e5e8900f215a1cda297422a4d8564e5c38fb026d9834918b95e66ac307db94576c165485d381ca404c388e7655cbf32fe974a49d
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-7.0.0.tar.xz 125117636 BLAKE2B ceda6d9f1a585298bd49fed61e8bb35f0064ad8388a9f979c8bd68a38bfe1a47c5bb055e5f74f970c2c440957042b9de4a861524120040c56e4cd8b56c5cfb68 SHA512 44ecd10c018a3763e1bc87d1d35b98890d0d5636acd69fe9b5cadf5024d5af6a31684d60cbe1c3370e02986434c1fb0ad99224e0e6f6fe7eda169992508157b1
 EBUILD qemu-7.0.0-r1.ebuild 25838 BLAKE2B 875e737a2d9c56343df88972d479ca661d9cef981d44c8b176e9aa6cee06d578cbf57aa4bd8e5b6396134a91b56de5f6a1f29b6a1903d4ce90f4426b438d8a6b SHA512 f52a03cf93d1faae0fd6363f5797ada9c63138c4adaea5245ccb15d86a997aba1707107c2cda97e4f36b22733bfeb0fe46767b7886c2ec81b275755c95dd1b3a
 EBUILD qemu-7.0.0-r2.ebuild 26304 BLAKE2B 478452308df45bf5f466e644cb732b592e10d9c0d66500b64bf8dd33e3471a3663b774824be2169fa65c4c50dbbd721940753d2fe1c4b65afd413231bc73ff24 SHA512 e7400db9efa895d59b5ecb9df59627439dd9a949c893aaf4d28abb6b69247b79115172f377319cca054b5f068fc1ace20d6666b78a14f786e6dcf444568df16d
-EBUILD qemu-9999.ebuild 26204 BLAKE2B 16dffb0cd5a4b1d29e0dd15d2ec98c37428af53eaef2b5f48e0c225765ea7ea0531f320bf004a2f581e2bac7457d6d60bd51202f5574d34af29bd56415910a8b SHA512 a8131ca6a6c5ba90f61ae1991c02e831704fc87dbaafc202095e64ed9b677f4925281c96500be13880bf8f5fd9dffa9ce628b5b20c9799ca7c5430f23cf35e40
+EBUILD qemu-9999.ebuild 26209 BLAKE2B 6d781d2914787412fa6e0bfbbaa14487b56ea9648e9eae9c58a0b323cd5acf6085008cf967f0face286f5a07373887ef05b1da6c57465fd5a59d480116c5e0e6 SHA512 b3745a77abf18f6a69e1eff8cb0e9407e33f963f101c0afeadd16d1d0d4aa329d455d821f07c6df6a1c6118bdd8d7d613e2399b61c6aee0c3b0a1c712cd3c2a5
 MISC metadata.xml 4590 BLAKE2B c1216d0bb21573782c9c438a6e9429bb4395aff086c86f1ebc4048bde4e27198d8c975275088c1e1f9c20c22a3cf28c51c3ee4c6bf4c7444b075e8646ef6d88a SHA512 86e0fd933a720ef5559dcfe400fcf32a495b89867b8d018c5a2cba431c2f0ed1ddad3e4e79814e733386f3221b46b811246a6533833986aa1890f2fa33a76420
diff --git a/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch
new file mode 100644
index 000000000000..b6f3078a6906
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.1.0-also-build-virtfs-proxy-helper.patch
@@ -0,0 +1,32 @@
+From d02ea89239768c93651a161d057f2bf04d56a024 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Mon, 4 Apr 2022 12:56:59 +0200
+Subject: [PATCH] also build virtfs-proxy-helper
+
+The Gentoo ebuild splits the qemu build into a softmmu, user and tool
+phase in order to be able to build and link some of the qemu emulators
+statically. This unfortunately has the consequence that we never
+configure with "have_virtfs" and "have_tools" at the same time.
+
+As a workaround, simply build the virtfs userland unconditionally. After
+all, it is a tiny executable
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 65a885ea69..29ce7a5a8e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1684,7 +1684,7 @@ have_virtfs = get_option('virtfs') \
+     .disable_auto_if(not have_tools and not have_system) \
+     .allowed()
+ 
+-have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools
++have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found()
+ 
+ if get_option('block_drv_ro_whitelist') == ''
+   config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '')
+-- 
+2.35.1
+
diff --git a/app-emulation/qemu/files/qemu-7.1.0-strings.patch b/app-emulation/qemu/files/qemu-7.1.0-strings.patch
new file mode 100644
index 000000000000..01f235b9a33c
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.1.0-strings.patch
@@ -0,0 +1,26 @@
+Forward-ported from original patch for 5.2.0.
+
+diff --git a/configure b/configure
+index da2501489f..4660ee3ee5 100755
+--- a/configure
++++ b/configure
+@@ -400,6 +400,7 @@ ld="${LD-${cross_prefix}ld}"
+ nm="${NM-${cross_prefix}nm}"
+ smbd="$SMBD"
+ strip="${STRIP-${cross_prefix}strip}"
++strings="${STRINGS-${cross_prefix}strings}"
+ widl="${WIDL-${cross_prefix}widl}"
+ windres="${WINDRES-${cross_prefix}windres}"
+ pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
+@@ -1466,9 +1467,9 @@ int main(int argc, char *argv[])
+ EOF
+ 
+ if compile_prog ; then
+-    if strings -a $TMPE | grep -q BiGeNdIaN ; then
++    if $strings -a $TMPE | grep -q BiGeNdIaN ; then
+         bigendian="yes"
+-    elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then
++    elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then
+         bigendian="no"
+     else
+         echo big/little test failed
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index b9d896ec56bc..336c80bd859c 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -52,6 +52,7 @@ COMMON_TARGETS="
 	cris
 	hppa
 	i386
+	loongarch64
 	m68k
 	microblaze
 	microblazeel
@@ -277,8 +278,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
 	"${FILESDIR}"/${PN}-6.0.0-make.patch
-	"${FILESDIR}"/${PN}-6.1.0-strings.patch
-	"${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch
+	"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
+	"${FILESDIR}"/${PN}-7.1.0-strings.patch
 )
 
 QA_PREBUILT="
@@ -546,7 +547,7 @@ qemu_src_configure() {
 		$(conf_notuser numa)
 		$(conf_notuser opengl)
 		$(conf_notuser pam auth-pam)
-		$(conf_notuser png vnc-png)
+		$(conf_notuser png)
 		$(conf_notuser rbd)
 		$(conf_notuser sasl vnc-sasl)
 		$(conf_notuser sdl)
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index cfd05336d1c6..73c57a645dea 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -47,9 +47,12 @@ DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5
 DIST clang-sys-1.3.1.crate 37840 BLAKE2B 4c925a684d66fddb5f3953fff6b96fa56b0b996eed227e17873ccd5555baf4ca77964a38ff279999533e7409e2b1d355c13470a6c461fb4b0e11807bc948dbe4 SHA512 aeea37957f7e9a7ecc862f56c6492b68b57217d1a893d3978f5d48d5ef9f80cefa8c52604d7201b9c96402d87ca43ba694890b0bc849d4d623f74ea009ce45bb
 DIST clap-3.1.17.crate 209176 BLAKE2B 6c6647666ee7c13b49e998c1cf22eb410441d3c99d35a2714a4085d7f8fba01605ff88f036ee290c76e3eb37cca8cb2bbdeb2cd394928f9fa36ea92b4935a9e9 SHA512 c80c96a0de1e5f5bf0eddf72ed265560fadcc893f4683bfec814ed3da9281546960d345317ba7ee28a46794a99de02f3fbb8966cf7103d244665d26427ae147d
 DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
+DIST clap-3.2.2.crate 207758 BLAKE2B 06cbd1db5cce99d244706bde1ec2c39a423f714daff4a56fa229b213162398ea1bb7865f1fb9211793a90ded07cf9de952543124b052751e9ddffaf955550367 SHA512 3e397a640942c9be2f40a4ca722ce5ed3082c21534b596d652ce1e994664a10873de725b688ba3350e5a1773d7482d262088076e1bb2eea85a9005f7a8247f06
 DIST clap_derive-3.1.18.crate 25521 BLAKE2B 4c46e0793bc945d9ebfd7ba104264a8cd7c92782c24a9116a8cbf92696476adbe6d5059ee0c220bf71c297bd66f976b91ab95ca75d4ba56714a2824ca7e1af7b SHA512 9bf92e45de15bdfe1ca9a1363f1d243b8df1e5e7d957d6240fa351387b362ef91dc9acffea7256c2161ae8472e35ee2cd678c0bee1f9a27771ae9f4f3f71b351
 DIST clap_derive-3.1.7.crate 25363 BLAKE2B d9c92e19357988e850ade69d8350f4a0cf0f9d8cc8ee6b52014eafdf8b105f6f81e43b920896bbddd95a209e874729e104119f9561fdac86f03707096f241985 SHA512 7f34c1b7c67bddbdbc1b159fcde366babe37f355637cc1f12748a51d0ecf89ce3e6aaf5ed140aae6539f12182ac8e2ca93c2790ea2dc84657487066c9d77a869
+DIST clap_derive-3.2.2.crate 27252 BLAKE2B acd4ee6de9e9b59bd4fbff884af3feac3d6146b04f3df375066b554ebf1a77eaba3aae9feb31e887f29d8223061cbbda371b1ba0e2d422b7120f28c722cc2fb0 SHA512 ec07d2b7e4171a5b61392e9a0563ea79d7da6c70d3c829a08f9aa7e7df3dccad66b0c1856d549237e74edf62ba5126c5447198f502da1fecfdf31bbf9653d109
 DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
+DIST clap_lex-0.2.2.crate 9657 BLAKE2B 74f6ed5c674664f0b81eb6d61427c0bd4bb2a2e7159aa00c2839a32e360f41fdf388c1455b52658a97900bb1b8d729bdd4f00cc5313e3115234e65a0704ed3fd SHA512 ea1d37bfb29412409db06c1991413dfbb83e393d74c3cdeca80ff317a423f41891510f6ed471f7cb7dd97288393726b14645287ae59cdf7be41f3a1bc9a3991e
 DIST clipboard-0.5.0.crate 10009 BLAKE2B 17aaafeb92be0dfb4ccfdb80a3d909e57491cc0adceedf378196f7bbd006d245adfdd9b2d2e075c2c041aa57eb1a0e6e306032966c30e63f94d86b0f9f7a11ce SHA512 a02994e68bb4ecdb1ba3db05e095474e67df4d73f69c92ab096913f4bd0f47ec6b62c8f0210fd67bb466e293c765888c315770e447f5c6e9b2e5c69f71d3e48a
 DIST clipboard-win-2.2.0.crate 11079 BLAKE2B 5713e17a93eac4a1d299d42a6abe5db1eadbc90bf5e7c99e84b6b5febfc817bbc1c478533af8cbec7a8e58ebbc1a8f3d83bf351d105b55017cebab8048009390 SHA512 f869775bb2e6d84096034c26c888c9f671272232af74c02bda2a6c8f0d600652af581c0e94d875d8746b986314f61168bf7539042a65cb2ccbbf858141fa42e0
 DIST cocoa-0.24.0.crate 39235 BLAKE2B 01078c3d96e88e0cac773f238d3d3144324594fd75cda87d18bc98d73f0a1acab4cd795471f4789d38b017e6cc90c0713bb33b0fdbdff36abcdc1cbae767da86 SHA512 accae0f676caa23c8d3fbc2e49365118a366c50a698ee9dce4ef194f1d391b3633cb789d65d5c2d1e43afdea5d7a82161f7e7042a9dab32747ecac29d1b1b20c
@@ -78,6 +81,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.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
+DIST crossbeam-channel-0.5.5.crate 90326 BLAKE2B 0dfbb516facd1b8b7ad7259a434839a4fc279f61389edbbd4241aab771f03daea6a897f9ed039d43b65f736400b160b6c053cb01544f5636ae2260eb96f3802c SHA512 c38bfc10bb1fcfaf067679165eb31b54b4ef05bf6e8e3465f856e3fc717d4f521b2eb98bd441a738eb7fac34472b7b9a030873c3595a267f19b26908713e2218
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
 DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
@@ -109,6 +113,7 @@ DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5
 DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
 DIST enum-map-2.1.0.crate 11758 BLAKE2B 2da8246a216776ab174f3ee6e87edaee78533c736acf0cca67507c306f03eaa25bd0c66e2e29d140421397cb1a33006faf11cf2308b43f909aa42da94bb9bcfe SHA512 c232328d773c1ced0928396092d5f2df39a48580e54a03a498491f6607a8ffa9e2413ce6a1c6d399fdfcc9da725d2390279e7f443acd2ba043602e77a6807bf5
 DIST enum-map-2.3.0.crate 12053 BLAKE2B 825f0327417b58b1f06c19f991e45d3538faa27d6e5a1e115be8e720f4223bd947393c339d3c07ebbec6baa208c3b1b0ed95dc73f8a53274ab66a689b7361e4d SHA512 55288b6e857ddaa7c474bfdce1329ca9c57cb4945ba15bcf73ba98a08489b7d693eb919b10d11747c28ac8dfd183828042cf4c2df99e07583a2965729f1c8529
+DIST enum-map-2.4.0.crate 12220 BLAKE2B bf5bb7665e4844bf0529f22bdd74f03986664bf5cf81cab9f5365b192f5db90d03d0a2edc002c49426ae533ddfb4240b98327e84855948eadd13e1669b243238 SHA512 d6df2b34c5090165d1af391a621933fffd7f3f07f923232647140d80ebc97a553c317a076ce05b86755d05914c2cdc21bafc59e2b3aef818bc62dd127195f57c
 DIST enum-map-derive-0.8.0.crate 3672 BLAKE2B 8f16aab9a5926f2853afbdb0d8c2caa4ff3e9469c6151f1ea3de79219a91573fe7f0c4ab5b4621278518d0c0e4949323a46ad5a0b401f01470664089d8aa847a SHA512 a93318482072e1db9f6a567e02e1a78f3a872cd84e04f2158e783f9779b67766135bf3d5512a7b1cbf1ed1c31fd9cef7585345ca6ce7f8ff52afe9b4ac78029e
 DIST enum-map-derive-0.9.0.crate 3809 BLAKE2B bd353d5753ee5cd07d6986346bf6170bdf7c4bbee52f24cce980e6b2e4bb1bb78491b6731a1304f44dc90e4d6943398997c5d1aa669489fe0a71b00c228f6261 SHA512 b143cfca863934de7d1a79c40da4e5eb1d14bbbb2c61c15ee5b71ddbc143410e68a603a6e1d5b6285466b0c89f690b4cedf93c65ef424bab95615fb97c76e0d1
 DIST enumset-1.0.8.crate 17434 BLAKE2B c7837a75b9f686eaa6a594c1dde8afa2f02b4291da6abd58775758c79ebfa667d9d6b3b52f67e02cd10a6f0dfad103d6164ab38a27a3ffa0b5a4c4baacae417d SHA512 55be419de116a2fc3374a5d7455239d7945b4e900b8958266155724bfc8fc1410166c5c8da3ac8d779459a4753cee1dc359e4f5b3091bfd55364c551b44e3683
@@ -144,7 +149,9 @@ DIST gdk-sys-0.15.1.crate 73599 BLAKE2B becfd7c8e2525ae90402be8db2d59b9d4a7d5271
 DIST generational-arena-0.2.8.crate 20899 BLAKE2B 73cccc9e3b836ddd37e7f64b6389c7bec6763ac9c390a5a9b4adc9b35200e7d26d21ba0748fc808aafac52087f552a4c56e8e10ebf8d016507e1781c579f1e73 SHA512 a5e073a8d26aa32b617fb4130d2b9401c3a3d9ff51a2910f2de4de019ddfd2e5077f2489acb40330e640c573139c1c911ce59a36011bd439c011a3af922bdc1d
 DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
+DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
 DIST gif-0.11.3.crate 36151 BLAKE2B f90cbde636ff16ccaa0e83e31936d7d926aca06dc6e42c726e1caeb9655f3aa8b062a1997bc0a7280a276b836a24c2de6b2dc0493cfa937db892453573612405 SHA512 e581ce1e9099a7ebc913e20ace1cacb2c87a7fba178bce43bf7285fc1dc9b9eda55848204923cd18eaab9012a814232f9e587e4c0db6bad89cb91bf197591e46
+DIST gif-0.11.4.crate 634244 BLAKE2B 537a21ed947889acde0c9b8a42a7d0308f2d9017e59145924e735aa046cc494b60b97cdf3b24d62d24159a47bd4b6bd2aa009f2871c0b4f6fecec020f8041398 SHA512 3de0534b35bd783b54715e7f8a92f2d8a22934949627716cc3ade3c8036489d2b9604292eeeeced820b149865bc44a5de9d05700ebace073b48737759b5296b9
 DIST gio-sys-0.15.7.crate 79630 BLAKE2B 08d45323513acedd0b50ab907883167a7d6e07d7faaa9c3c602eac451f0cf080cdfd8ef9a819efaf717cc9600c9af3d3c2692d742bf67d4a64612d4522df155b SHA512 a083661d48c4d9431186c07d3e74188cb4d65759f9f542c5e76263959d71726604c95c750352a243b06c74deba3e6dc93540dff301e985bed564d261978d7aa0
 DIST glib-sys-0.15.7.crate 59950 BLAKE2B 8b9a8cdc27245468cc2f7aa9cb5faa15d9ceff360cdd090eec843c4b6656dcc0601001563cbf70bf839454e266af82036228ed6236243a556e88c4989178717b SHA512 10c276f6a7d00e544f7a1a6d27220637d7ffc2fccd2e85c118c99ebf6cf3076107aec19e794f60f2a2fea328a77bd3796dc146b487fdc4e8fedb0c4e8e7fb95a
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
@@ -158,6 +165,7 @@ DIST gtk-sys-0.15.3.crate 138220 BLAKE2B 91a057f5a16b105872e78c684a739d17e866be4
 DIST h263-rs-023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz 83430 BLAKE2B 8128496cf5a64edfa7d9264b9f8bf791dd0877faf60b97dc33a94c49f610bcbabfe2d6b50426460edfc4836f0602955ff70c415268c375fcd88cd030f356a4ba SHA512 2226b8ab4327d6f4f2763b3ece3958bfb604542d3db8c3df4a348edaf8cd9f2ecb6f21a965117b23ec3d331787a998a791eceb5a2f28611208d6550279224136
 DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST hashbrown-0.12.1.crate 90855 BLAKE2B 0d38ca94f1a7b750b31bc5469ffc1fbdb79a789d0410dc51583f0319569c94ed03b7a8b5f02972cd370a48ad8252eaa6ecc6eca4cb92911ae7366992b9b43cba SHA512 a037554dda19d8c1d79e74fe59f0297855173a1bd0b119c8fbe724b18a07ec7c2475162213d2502483279712a46ff1247f1681aceb97f67c2e7a53b60779b418
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
@@ -168,6 +176,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.24.2.crate 264112 BLAKE2B 243e543ea3b6a70b1c93f10525d7efa041c25882ed85abed522315e843daed1afe9fc93777bef90b96155d9ed53414a88f08e6692c8a997a28479600cee5fa2d SHA512 979a46689d976b125e16db9722238ab4629bab0eedfc5406cffed13118ada3cc73154c67e53a4c1cc18f454e029f54d4e89986b5a1091bb2fce2ab4354dedd47
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
+DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST indicatif-0.16.2.crate 35057 BLAKE2B c2f3beb7ac4450c5aace863f33de7a4b474e93c5d34fa55acacf971c5e0918b4b72c1a970f15395a8256fdf8bbb78edc8f2a6fb85be4aa7dbcd13d1fc30ff55a SHA512 5f60358f1fe3ffc0ec97d1d8922a7a2645d7dc0affed1d49a9205becdb36756d6a03482ef00fc918231770f967f7fc523f7b8c3bf4c06f71a0a93549c46fdacd
 DIST inflate-0.4.5.crate 17715 BLAKE2B c46dd3e4d064c135921670b940a3cd3ae152c5cadc67e00f6e4a350e7d22efc66807dc64b6e5943af30f1b985b2cea2dc42e7d923a05bcc268deec22a0a7de17 SHA512 1392402f72a8463dc5cdaf815d8933e8dfcc914fb3a91e69c38e54deb7d55b5211e157b640b7cfa999400fb4d2e233a4a1a678147594dfa0be300894126d17f2
 DIST inplace_it-0.3.3.crate 13145 BLAKE2B eedb3d8ce0dec3f10f0d6abf13083247035faedfd660bd97863763deeb3b6a0e3f9b6321cc43d5985c0744da93a86a4e6c2f562451197c8a03ed9aebbc374c0c SHA512 2cc8b4a1dfb44bcf5e425f047b9c7df60a57bd160e95ed5fad1c25ab591208050f1e0aab531a2dab3798ac2889d4d3e854c6acc7d87b38a2e54d2440e9c090e0
@@ -276,9 +285,11 @@ DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
+DIST proc-macro2-1.0.40.crate 40559 BLAKE2B d83cf7283393a82ca65263afc375d123bd2f48b719c9eab6859c52dc0c2b9b4b5af3090a0ebd0fedf0e1095f0bafbc443016f751a0485dc654bcd80a6f71e326 SHA512 bb179524bd41e36735010a7ec53e096359ffc3688ab97806a45ed9cfb17e8688ce352bbb8cd3bd4e15a4299e8500603c86591b17cfa31bca03f299f6f6347992
 DIST profiling-1.0.5.crate 1688338 BLAKE2B 0ad80cb2940fd9b90bdb9f9e6080f6938f66e031cd1a7d6776d4f82f1b83cb032e93cbe29fad52b3ba329dbe78d371077613e05b91ea070a095e82d70cc07e9c SHA512 8dc80a5120f7af8bcd49bba79ed7fadb1898c8791766f92ed4c809cf75bdc06f4c07852bf368a24a6773ea0dbd1cec1409198be86d368e7fab1521602ceb6ae4
 DIST quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz 133091 BLAKE2B a6e703f72432fc29bce310307c933698e566ba93ae10048fcdac95abb93ef217002bed452dfcaa64a7ec86396f9eacb4e8650252618abfed0fcb0f11313d5ba7 SHA512 74b4f12120abfc29322faa185ac83f0a7a0cad7b9488978e1f9fcebc3930b0e2dec97dab8b87f9ccef1066908677f20b4a32978edc4bb9c39b3dcd7a92892436
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
+DIST quote-1.0.20.crate 28160 BLAKE2B db257025f64817b1b58eecb8e64e63f1782d8a7fcb42ed6c3364254ec5a26705e49ce0637c880b0355b99a77473ce3083caae2cfabbd1a1a7e4fc826bae2cb7c SHA512 d12f4a425273b99ae655da11fcf5dad2609e20ad3e7d85cde08c7d09f444a5c7a3505470bad2d48b1ba8ea59ebf38ab87aa1052e47ec414acfc05dcb07d438be
 DIST radium-0.5.3.crate 7588 BLAKE2B ce39c4472bfa731745a0b78179e00b83116d729326d7a25dc629278949095ecc24a1eb13d4d39981e95536cad3f3fe2ac77ef9da27b8d462ed720bfc7624fbc5 SHA512 f4af86cddec991b11d86b1d976e212bb19da8d7e5ae1d40ee812391c21d3fc855bdb2770395baf7efcfdb5b2029a99c9038702a28f8c9e925e1b23f03c0e717a
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
@@ -297,10 +308,12 @@ DIST regress-0.4.1.crate 99620 BLAKE2B 9141cad8f53e2a8e3ea3d746737ab5b8c75ed345f
 DIST renderdoc-sys-0.7.1.crate 4592 BLAKE2B d5c543119a498bf295bf506b164945a3de6c48358891170278baea05db0f67813d9bd232cc52593fa02095d04cbb163fdfc9ef2c121eb1155ca761b89350cc15 SHA512 5ef5596705e4d9b752e132571960e4518b96e47b65ea799dc4fc87cc4abcf769e05dafd3a7cf78df4957ed32d42f714f9d78b2f3614597cd5a45352a3f509dab
 DIST rfd-0.8.2.crate 34788 BLAKE2B d74f02185a730ff0447956fc88b9616c66c75fff1b9f313e122f542a0fe377f4c4d4dd6ae03e77e8163cdbaeae76fe9744b9b79c85cf59340acbb6901fa9d9e7 SHA512 ac56eda9ee57ad33cfc7d73e31f4b57578846a4b1fd22306f5af7f60e80a6f675e20c79a45eb46b133be0212ac6d23013adb30f43ffe33adb779a66efe8f2afc
 DIST rfd-0.8.4.crate 34945 BLAKE2B b404294e1175a62a3db4a28808ce541b64df085788fb50b0162d1d55c630f2a3c91abaefe006559a37259e949628b89c9538c6b7618baa6e783852523cb1203b SHA512 75e54164b673a026b0969f02bdc5498db57c64e0b424b0e813824a5a23ce5d8a3b35558749a55b31001189d4ef91d09f7ee4d062e33f4a5413957877d58913ab
+DIST rfd-0.9.1.crate 37569 BLAKE2B 5bf6f5f4ac833fc4113fbc218c16e1bfab31320c830979e0746ae1e7d102501a51c975e91a76f750f702432a827b217b23c39f89ecd8d3b9b315888ebdf55607 SHA512 eb2ac3fd41d2509ea44924674a73f4dbf9168e40c00cfc7e9c2e28903e9255054104b484744d741e560f7fc82b445446b9f9f3b8d774c89b2ea8d41e4003b812
 DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a
 DIST ron-0.7.0.crate 45492 BLAKE2B adff53e8db8fc8c2288c0803b22cf064334596697a8278e51a5f0d1d2e48e69e02e377a735b30dec78a0b896ff55dffd8b4748cb305f06b08a64ddd2e319e8dc SHA512 1d690def70a47df838c69c042fd183037ca1b6becf2e013d9c30944e2d77b89249c22fdcb286a720c0ee181051b8ea19f62971ef3762f63fc121570d8fdd7fbf
 DIST ruffle-nightly-2022-05-16.tar.gz 8422146 BLAKE2B 045084aa8fa6c67084b54712e82c82505533b1ffacefd8c000208a3cd8ea2869d070f1baa68079e72a2e6f13c56a11fee4449755a75021690f424a2a3ebe2a2c SHA512 8b50325a7f0fbe8546e10abef1d802f75ef0328699e2112b59c11f42642f3f596a0e4278f9a749170998ec194c45f61d5f48d8237def05820bf70df445a3b544
 DIST ruffle-nightly-2022-06-14.tar.gz 8436466 BLAKE2B a0ec1c80757f591270b1d4bea74c8af7d5ec955fe669f7295726486f5fec719a18973643c4cbdee2a82d24822d3e1adbd64886873b9db4db96b9b231ce597f81 SHA512 22d4d2edfaacb48d15bbfd08d82a3c411219bc074a87302f1a3189f66cd0b38e835351189476a86aec59ef59b280e28f562628e3b61bdeef79bb5bfba1dc664c
+DIST ruffle-nightly-2022-06-30.tar.gz 9700086 BLAKE2B 9817be087c9cc48045748b7cc5730a0d142e0e179eb1aad488bc05d86b868690781a6cac2744c44a8994dfce89ea71b2f20392209310d3e501ee91faeea52723 SHA512 988995852946cc3cc6b0832083ea2007f6debbb50bce161491ff7bc8993c78d0b3027c1acce5cfd9c92cd0d3ac2e33f37708737727a6b0726104831d0bd9958a
 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 rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
@@ -325,6 +338,7 @@ DIST slice-deque-0.3.0.crate 56827 BLAKE2B 62971bffbb7ea9f9de069ea6af1d1f41e5288
 DIST slotmap-1.0.6.crate 58954 BLAKE2B b00f328a8ac4738bfa4f0bc25ac7ef91fba9d5006d4806a351d21119f23c98d39c5120c2fee0a622b8229abea6dd9a08a3ebd7a34a8a64ba172c2d6f9c53b2cc SHA512 1e0fad77d39cf937fbbf32913595e836b9d8067a81e8ad9a6653cdea023f2c8ce511c0216a1222c056e57419cdfd56977af7a6e83a9cc8b5708310a17353b145
 DIST sluice-0.5.5.crate 6960 BLAKE2B 0a1ed02c2e0f3f8a90afa1e851cbd6e352881ba00fd4ef824b0768b6ec19a9eca959fa7c215ad4d6ebc8f103f5508766648004bbd897706bb44b98884627af4a SHA512 d0a85db370a921f0591d63a5a78fffedc4c97e5a68915c86753dfb7798cf120542b1fc3193e093655442b34502ce6cadc799b25e39e26c122683e26ebd0383b3
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
+DIST smallvec-1.8.1.crate 28295 BLAKE2B c776b37e8cda81fe1df6ace794739b7e0cb1e3c5d5c1ffa57656ef0c0d0aec354c2c93ae23ff895996ab50a26ced28b913fab89ced27cb2f1d15568ab45957c7 SHA512 e93cbce48b81fe1a26d6016ad15b27ede8ae7162933e8923d3eb9c93f61910fee177c1aff16a1dd60c9917e41f8b7e474601a60c6d6d6867ef33c6d2e5fdf688
 DIST smithay-client-toolkit-0.15.3.crate 129366 BLAKE2B ba3930acdb67116aa2c4027d16cf58ef34852a9452e40a240ee30033a02172d21e9355ba7cc678220f24da7c653daffe8cdbb700fce8c1f82b404dfccc610548 SHA512 9c58ecf3421d6d93d6674397bf5d5cfa5cfc1a2670d2ff97d7cdf7c197deae825402b22b72a78c23af6cc26d7ede0256dc594e395e2903bc2b09263bb302769a
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
 DIST spin-0.9.2.crate 28755 BLAKE2B 0ae0cc2fa0bd2ea93ab4041fdc76e9a80fae804f855b2d8d0b7167c105ae4697f3c4e9150c4ce1f2c6c2af0c3ef76202d7f3281d1dd12e3c0033bf282a0b75f4 SHA512 f6d112567df533063b1571e140929505f5c519479ac27fc8c1d02e3fe36176af86d12db15dcf1ff9376b251a20d4e991ea57d6cbe8533c62810c9f67d7471fd7
@@ -340,6 +354,7 @@ DIST symphonia-core-0.5.0.crate 95475 BLAKE2B af3a0bd7ee11d5026cc51fe5940337ffe7
 DIST symphonia-metadata-0.5.0.crate 20888 BLAKE2B 5c677c4479d556c3ab99044cea6d290cdc1a5859c7cae85368bb59329ee648bc32e785cf93f5743ef06393184ee77d3fa187809ac1feb2b2c332212ed4c20277 SHA512 ba3961a80ef8638417083bb8f7031b228355f2878d9d5baa50fadf86c10bd3fd84ebdbe1e59f5f584f96773c4f48fd31b717489986fa6adbb72e1efac71f4025
 DIST syn-1.0.92.crate 236605 BLAKE2B 3d23ad321e639ff45c169197cfe2fc09c23772a745fde4a8b72dbfbabc7e93f822eb127cbb42762d1e6a05e22eb5b40f3457d779530f466e7265f6a99e34714d SHA512 1884dd85a13bd0dd84f3599de428304f90b9bad91d8e51f23523fb75aab950df017ea85dc5efb99f793a37769bf2a1b972580ed5b14500b2706c45336a9068b7
 DIST syn-1.0.96.crate 236896 BLAKE2B 57445f4925169212c3b794312f388c2829bc343fd60f37f60d46bc944c946c02476b1ec64f17ec8b91e84c112dbbf04bf64feba9a3fd3512dad0d4b3376f4869 SHA512 f53b9e97b6b19d18a35d13aaa9c58b8fdd0da96443aaad76ed027e9ac7d438b574ae052b02b9bef410f25fbab851a5af3cc64fafaefffe47932827e6ca02209c
+DIST syn-1.0.98.crate 235451 BLAKE2B 0667c24d7f6b9bf4c0a5f45fb51c903303a87c72d445ad824e05ab98a158f9beda0d00721144c486335b6a830db47fe57a34831cff6995f478c969c4d0a039dc SHA512 fe5dda742e085e14b6aea5617d3f9dd19ffd46009f34b119c0d74ec693042f641e594f75ff027dbfa38f3d5149a94eb6187248ee9d09d41dab9cc2cfc18fab18
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 DIST system-deps-6.0.2.crate 22869 BLAKE2B 0e5412b140cb4c667dd3e98a8b3c9bfae07c1df71abfde009dfe494bd11f3043cc3c7bb2c825b46caa8f47414b7c4076e131c47d3135c60678a2a826cc21899f SHA512 5ab193ff8ef680aafe89e6920b90d07349809018a27d962c6abf0ed6920d8a7541d6af03600c7b5e328425add04305743183e072491eacf973e6e96e6590b33d
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
@@ -424,5 +439,6 @@ DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f49
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 EBUILD ruffle-0_p20220516.ebuild 10559 BLAKE2B b5a442ec09a9a309de4dc22cc7ff5ff69c4f3507c04a6c3b29cabe7ec4292f2f95db68f3f50f7be1ae7800ac0726b35393d9fb5a1edc13999ffca7c713abd621 SHA512 8949f7bd996fc0e58ee54656d8b9da16f07e0a45eb40c5f6520f3e3659cd341ddc0d26da85dc8add628d5bda2d605f90d281b052bb65dd7f5ed3b1e492182c87
 EBUILD ruffle-0_p20220614.ebuild 10569 BLAKE2B 754f9a9fe4847a80c0a46c78d70ef90e406731c239e6e46a1f6e794ae1d3ad65f746614783ee6d06d06cdaf3f65ec750775d2568b2a25ad6cf1291138134762e SHA512 b25a9c86f99aa7141104c8dc749aa7c763d36dd03197183b047483f074d0bcd087ac574636ea7996612de7b9c6de960d3d916721b64d58ac7299fe8c5fd312ed
-EBUILD ruffle-9999.ebuild 1381 BLAKE2B fc4aa754dd08bdc972262930be9ae3cbe3b8dae23b5adfc26846d6fcfd122e22128b37dd8fcfb0052c3e722f4216a734ea08b6fbff9be96c676cf81cc855fbcb SHA512 cf80954f30edc74b548f9c7e60abdf0fdc41fa9def556a3c8d5cc0f2dc824e117510be9305209918130bd2ea4259dd133ab67636a80999ea415c0ba934f22a22
+EBUILD ruffle-0_p20220630.ebuild 10547 BLAKE2B 5aa43b0f04d3a80b85cf6b10e0c2cc00a208590f1f7d95ddfcbe57d999430ba3f3c3c5aba9b287bb6f9cc2e3b2ef546e7e82345ab8f744c49538269bebf50c95 SHA512 ea43d8cdda9d9f85aa1d9a9129234d5e52bf90078d748253cd48daf8586db096bb19be387735697f2a65972c49ae6d9ec2431ed41671e895d136e0a727654a06
+EBUILD ruffle-9999.ebuild 1396 BLAKE2B 0bba3ae179f5bd99e03d43074c4f041e97acf6655f9a7265e61181154243d9e3da35bcb6d04243fc67866741432d09c96f4e2e9bbecc055d3cf0fb6b8775f59b SHA512 d2a3122397aff59e51e1b97f528201f89b86978f83830bdaf164aa09626ad04d94dcb51d3ec48c720b59d05fc119eee4ca2e8c339a7588eba08a20bc7427789f
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20220630.ebuild b/app-emulation/ruffle/ruffle-0_p20220630.ebuild
new file mode 100644
index 000000000000..40f746467190
--- /dev/null
+++ b/app-emulation/ruffle/ruffle-0_p20220630.ebuild
@@ -0,0 +1,507 @@
+# Copyright 2021-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.6.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
+	atk-sys-0.15.1
+	atty-0.2.14
+	autocfg-1.1.0
+	base64-0.13.0
+	bindgen-0.56.0
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bit_field-0.10.1
+	bitflags-1.3.2
+	bitflags_serde_shim-0.2.2
+	bitstream-io-1.5.0
+	bitvec-0.19.6
+	block-0.1.6
+	block-buffer-0.10.2
+	bstr-0.2.17
+	build_const-0.2.2
+	bumpalo-3.9.1
+	bytemuck-1.9.1
+	bytemuck_derive-1.1.0
+	byteorder-1.4.3
+	bytes-1.1.0
+	cache-padded-1.2.0
+	cairo-sys-rs-0.15.1
+	calloop-0.9.3
+	castaway-0.1.2
+	cc-1.0.73
+	cesu8-1.1.0
+	cexpr-0.4.0
+	cfg-expr-0.10.2
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	cfg_aliases-0.1.1
+	chrono-0.4.19
+	clang-sys-1.3.1
+	clap-3.2.2
+	clap_derive-3.2.2
+	clap_lex-0.2.2
+	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.3
+	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.3
+	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.9
+	cpal-0.13.5
+	cpufeatures-0.2.1
+	crc-1.8.1
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.5
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crypto-common-0.1.3
+	csv-1.1.6
+	csv-core-0.1.10
+	ctor-0.1.21
+	cty-0.2.2
+	curl-0.4.43
+	curl-sys-0.4.55+curl-7.83.1
+	d3d12-0.4.1
+	darling-0.13.1
+	darling_core-0.13.1
+	darling_macro-0.13.1
+	deflate-1.0.0
+	derive-try-from-primitive-1.0.0
+	diff-0.1.12
+	digest-0.10.3
+	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.7.2
+	encode_unicode-0.3.6
+	encoding_rs-0.8.31
+	enum-map-2.4.0
+	enum-map-derive-0.9.0
+	enumset-1.0.8
+	enumset_derive-0.5.5
+	env_logger-0.9.0
+	euclid-0.22.6
+	event-listener-2.5.2
+	exr-1.4.2
+	fastrand-1.7.0
+	flate2-1.0.24
+	float_next_after-0.1.5
+	flume-0.10.12
+	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.21
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-executor-0.3.21
+	futures-io-0.3.21
+	futures-lite-1.12.0
+	futures-macro-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	fxhash-0.2.1
+	gdk-pixbuf-sys-0.15.1
+	gdk-sys-0.15.1
+	generational-arena-0.2.8
+	generic-array-0.14.5
+	getrandom-0.2.7
+	gif-0.11.4
+	gio-sys-0.15.7
+	glib-sys-0.15.7
+	glob-0.3.0
+	glow-0.11.2
+	gobject-sys-0.15.9
+	gpu-alloc-0.5.3
+	gpu-alloc-types-0.2.0
+	gpu-descriptor-0.2.2
+	gpu-descriptor-types-0.1.1
+	gtk-sys-0.15.3
+	half-1.8.2
+	hashbrown-0.11.2
+	hashbrown-0.12.1
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hexf-parse-0.2.1
+	http-0.2.6
+	humantime-2.1.0
+	ident_case-1.0.1
+	idna-0.2.3
+	image-0.24.2
+	indexmap-1.9.1
+	indicatif-0.16.2
+	inflate-0.4.5
+	inplace_it-0.3.3
+	instant-0.1.12
+	isahc-1.7.2
+	itoa-0.4.8
+	itoa-1.0.1
+	jni-0.19.0
+	jni-sys-0.3.0
+	jobserver-0.1.24
+	jpeg-decoder-0.1.22
+	jpeg-decoder-0.2.6
+	js-sys-0.3.57
+	khronos-egl-4.1.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	lebe-0.5.1
+	lexical-core-0.7.6
+	libc-0.2.120
+	libflate-1.2.0
+	libflate_lz77-1.1.0
+	libloading-0.7.3
+	libnghttp2-sys-0.1.7+1.45.0
+	libz-sys-1.1.5
+	lock_api-0.4.6
+	log-0.4.17
+	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.5.1
+	mio-0.8.1
+	miow-0.3.7
+	naga-0.8.5
+	nanorand-0.7.0
+	ndk-0.5.0
+	ndk-0.6.0
+	ndk-context-0.1.0
+	ndk-glue-0.5.1
+	ndk-glue-0.6.1
+	ndk-macro-0.3.0
+	ndk-sys-0.2.2
+	ndk-sys-0.3.0
+	nix-0.22.3
+	nix-0.23.1
+	nom-5.1.2
+	nom-6.1.2
+	nom-7.1.1
+	ntapi-0.3.7
+	num-complex-0.4.0
+	num-derive-0.3.3
+	num-integer-0.1.44
+	num-iter-0.1.42
+	num-rational-0.4.0
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_enum-0.5.7
+	num_enum_derive-0.5.7
+	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.5
+	oboe-sys-0.4.5
+	once_cell-1.10.0
+	openssl-probe-0.1.5
+	openssl-sys-0.9.72
+	os_str_bytes-6.0.0
+	output_vt100-0.1.3
+	pango-sys-0.15.1
+	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.10
+	pin-project-internal-1.0.10
+	pin-project-lite-0.2.8
+	pin-utils-0.1.0
+	pkg-config-0.3.24
+	png-0.17.5
+	polling-2.2.0
+	ppv-lite86-0.2.16
+	pretty_assertions-1.2.1
+	primal-check-0.3.1
+	proc-macro-crate-1.1.3
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.40
+	profiling-1.0.5
+	quote-1.0.20
+	radium-0.5.3
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	range-alloc-0.1.2
+	raw-window-handle-0.4.2
+	rayon-1.5.3
+	rayon-core-1.9.2
+	redox_syscall-0.2.11
+	redox_users-0.4.0
+	regex-1.5.5
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	regress-0.4.1
+	renderdoc-sys-0.7.1
+	rfd-0.9.1
+	rle-decode-fast-1.0.3
+	ron-0.7.0
+	rustc-hash-1.1.0
+	rustc_version-0.4.0
+	rustdct-0.7.0
+	rustfft-6.0.1
+	ryu-1.0.9
+	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
+	semver-1.0.6
+	serde-1.0.137
+	serde_derive-1.0.137
+	serde_json-1.0.81
+	sha2-0.10.2
+	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.8.1
+	smithay-client-toolkit-0.15.3
+	socket2-0.4.4
+	spin-0.9.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
+	symphonia-0.5.0
+	symphonia-bundle-mp3-0.5.0
+	symphonia-core-0.5.0
+	symphonia-metadata-0.5.0
+	syn-1.0.98
+	synstructure-0.12.6
+	system-deps-6.0.2
+	tap-1.0.1
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.15.0
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
+	threadpool-1.8.1
+	tiff-0.7.1
+	time-0.1.43
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	tracing-0.1.32
+	tracing-attributes-0.1.20
+	tracing-core-0.1.23
+	tracing-futures-0.2.5
+	transpose-0.2.1
+	typenum-1.15.0
+	unicode-bidi-0.3.7
+	unicode-ident-1.0.0
+	unicode-normalization-0.1.19
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	url-2.2.2
+	vcpkg-0.2.15
+	version-compare-0.1.0
+	version_check-0.9.4
+	vswhom-0.1.0
+	vswhom-sys-0.1.1
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.80
+	wasm-bindgen-backend-0.2.80
+	wasm-bindgen-futures-0.4.30
+	wasm-bindgen-macro-0.2.80
+	wasm-bindgen-macro-support-0.2.80
+	wasm-bindgen-shared-0.2.80
+	wayland-client-0.29.4
+	wayland-commons-0.29.4
+	wayland-cursor-0.29.4
+	wayland-protocols-0.29.4
+	wayland-scanner-0.29.4
+	wayland-sys-0.29.4
+	weak-table-0.3.2
+	web-sys-0.3.57
+	webbrowser-0.7.1
+	weezl-0.1.5
+	wepoll-ffi-0.1.2
+	wgpu-0.12.0
+	wgpu-core-0.12.2
+	wgpu-hal-0.12.4
+	wgpu-types-0.12.0
+	wide-0.7.4
+	widestring-0.5.1
+	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
+	windows-0.37.0
+	windows_aarch64_msvc-0.37.0
+	windows_i686_gnu-0.37.0
+	windows_i686_msvc-0.37.0
+	windows_x86_64_gnu-0.37.0
+	windows_x86_64_msvc-0.37.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..11} )
+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 4a33521c29a918950df8ae9fe07e527ac65553f5 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"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/openssl:=
+	media-libs/alsa-lib
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+	x11-libs/libxcb:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/jre:*
+	virtual/pkgconfig
+	>=virtual/rust-1.61"
+
+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-lto # undefined references with ring crate and more
+
+	cargo_src_compile --bins # note: configure --bins would skip tests
+}
+
+src_install() {
+	dodoc README.md
+
+	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;"
+
+	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/ruffle/ruffle-9999.ebuild b/app-emulation/ruffle/ruffle-9999.ebuild
index 5acd85833586..f9d65a9786dc 100644
--- a/app-emulation/ruffle/ruffle-9999.ebuild
+++ b/app-emulation/ruffle/ruffle-9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
+	virtual/jre:*
 	virtual/pkgconfig
 	>=virtual/rust-1.61"
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 697617795228..d88c2be6e127 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -10,4 +10,5 @@ DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-guest-additions-6.1.32-r1.ebuild 6280 BLAKE2B 68ef78d95ffbc6847b3a7d948848741e714c57788535c9ecd639b3969bdb28048b4075aef131d5614a3da51d1b603a30d6c9b7b289fd6ea8c912ed52de0613f4 SHA512 7a91705459852d2d53debaeaec17027ee12138926395c46181ffc603232775e16986a35a9e3d287b889e262f4ed7b115251f4e00b01677da51f9b1a325081ad9
 EBUILD virtualbox-guest-additions-6.1.34-r1.ebuild 6282 BLAKE2B 696de6d8cf22409ddae78794d4d3d12f3d8cea49884d6317420baefceb3554354d63234fda6b20027293939aa4629e9d84cc241a343f0bb08a84c7a78d8db696 SHA512 37b29dedd36f3bc43753f910ba2dd57c36f84be2c097ca56c6c1b5b52523645d4a0ceff537716fbf673726009c5e2e40884023458275cc0ee3b2c5c9c00e1419
+EBUILD virtualbox-guest-additions-6.1.34-r2.ebuild 7469 BLAKE2B affb2aeb74ed6ca588418c23ab2febb374ad7ecc532e056c12c6636f4d433e2eb3e59727a2b1cc6c57f0dea0dcbfa20e67260b95b44bc98c9c0cf5903eac93c4 SHA512 8154a867db0bf5da50f66dd4ba53af4586f3e8a90ba5c693c046bf38b2201082a518deb532947b0abcfe70420273bb5eed8c88657d4c6587580108836c22c57b
 MISC metadata.xml 171 BLAKE2B 589206ffd9c243712f27e366177e5448ebcf58bf71e2e0f49a3f0c5292e1341ccd68238b36065d2349be51ef530c8ee2634a260f077826c6ebcc0f7e665e98d9 SHA512 67c15eac3c1637b76d429a0c96476ce57a9c38a608e7ae0829489d4802e9f3b5effdeb375b4a7ba19a5c794b3d990c8f09fabbac2462b1aa08f3c72651f0c8f8
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r2.ebuild
new file mode 100644
index 000000000000..76a478a3ee24
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod systemd toolchain-funcs udev
+
+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
+	eend $? || die
+	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
+
+	# 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
+
+	eapply "${WORKDIR}/patches"
+	eapply_user
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+
+	# Build the user-space tools, warnings are harmless
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+	EOF
+
+	edo ./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}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_ONLY_ADDITIONS=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LD="$(tc-getCC)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_CXX="$(tc-getCXX)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+		TOOL_YASM_AS=yasm
+	)
+
+	MAKE="kmk" emake "${myemakeargs[@]}"
+
+	# 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
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
+
+		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
+	udev_reload
+	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/Manifest b/app-emulation/virtualbox/Manifest
index d0f932855b44..4bf0ddb70f1b 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -6,7 +6,10 @@ AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d87760215
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
 AUX virtualbox-6.1.26-configure-include-qt5-path.patch 717 BLAKE2B d6d9f1b0d30602e18b245e25bf1c5e2f4a33e308956fa946f913cf054173aa337708923ef92355f171f5b53a1b1ed58089f1a5146d8cd40a049fdfef874c5194 SHA512 bd07544302db16c291c21ef548455590079307fac2e11c3508019a6fb38a47db6a130c4ba265f9f47dead82d1684226542f21ff2da889ece51cba4b0744d109c
+AUX virtualbox-6.1.34-no-pam.patch 728 BLAKE2B 13a822fbc6d88cdb3b627925f2e23e20ffc4a4332f7a0b78dfcf7dd2a9325feac1a959aa89705cba791b61ce8576c6187221b58bfb9540bb30bed3740a957303 SHA512 4cd320a259723770745cdd1833eee400aaf4ed15fe431c4e3738a904cb93994ce57d0fbd047401a9648606d0a4e768db078e3ec920c59b204743dd8d2bb6fd75
 AUX virtualbox-6.1.34-python3.10.patch 686 BLAKE2B 708c4b70c50024dbbd200bdd2af51600ee1cf4abf74fc15fe8cb340f77a58d7714315d887370893a21b10e3c20eb2ee97503558da6df0cb53ec083f32b0456a3 SHA512 58910df546ea27e4f568823a0d4c44d98c1833678dd7b47de4593e7b481f428123358dcdeb9ae5cab803d0167359f0e31e611f8359a1b59beeb71d1bce4f1004
+AUX virtualbox-6.1.34-r3-python.patch 343 BLAKE2B 6eb68ba31ab57a1f2065a7d48ef75175f5c3ba45ff9514c1f1ece8f6f54c1d8fe907ca3a10e411bc6b4474cddb39224d54b4bf4cd7b57522b2ca499ce85061c8 SHA512 a22f46e82f163676a5c07b8010160444cc621f9d12ec1226a304ebdf0800f8f24174dec2fb5e8999ba51f574cd2d290af1c7b94b54ca8c2cd6abdad9025e7fea
+AUX virtualbox-6.1.34-r3-python3.10.patch 4187 BLAKE2B ccacd5649bccd0ed7810a411b55c19565387b0fa4dc32c7c416c8f080ff45fd4cb6fd6cc16f88b7198350a166ae1948b247b7546731842c7e69578c2aaf1b04b SHA512 eb8b38375bf7464656e09635f341a03aae6648bede0d95f93b0d9a579421165568dd2be667cca05e7a3eca8695f8ae4ee91e3f7f4ce5f0c28c2e828e29581902
 AUX virtualbox-6.1.34-vboxr0.patch 1565 BLAKE2B ec47a42b7574def3ac3ca482db14cca96af855652b0ff11e4ef49cbc7ea2bec4e134b57e18df85b07d8a8f3efcd1d0fa69380cf32bf544781c6e14437f124a11 SHA512 3feb258993509e2bd3c13130fb227883960e6e3b3e14d146d04cb222c7323689902fcf581ff207ef70a985eaced02e303a6d93e55261db499f5c54eb3e007f57
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
@@ -15,4 +18,6 @@ DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-6.1.32-r2.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5d18f556f71857d120ebb6db5ce4d33005ab9769f698a902b6fb1028702ae686380337aed2500dedbd5ec3dabec8ea82ca SHA512 a65ad608a408c1ba38f0ae11f91167f0376c0777483f0bd4dc882e2da9144f2ac48f6a4f225eb8bb67bb369df5be38ffaa694e4e0a028bccaf26f7c92e6df887
 EBUILD virtualbox-6.1.34-r1.ebuild 13699 BLAKE2B 01a96acd3f1e734536372baa60f0adca25d0153e5c7dc986ac51fa1bbd67a4e3e6fbf71a0b5865a5ab92f236e598c86dd4755c72e1a83ee95a44f714d6e0c877 SHA512 d647990d450c92d8eba46250e7a9f058c1f887fd0b0bc9b6223197973561a60bbef6f7e8133352baae034ae4014040bd325747644bc2eec286e56f71363ccab3
+EBUILD virtualbox-6.1.34-r3.ebuild 14573 BLAKE2B 110221a46466f9f053b231424840c73a00b665ced4d597fa7807500d65e18b189a8b8336e827d3caf40af251c60ad8b379578a978b7f5cb3c3d81c0cb8ae4da4 SHA512 3bbfd336e3b6306b04137314df32767dead2ba4f1821f1213ea32e5b00ce80e5e4d83df5b2647d846d5f91f9ee1efd2678dd4bd1767adfc7edba2cee856ba0c5
+EBUILD virtualbox-6.1.34-r5.ebuild 17748 BLAKE2B 99456e7c844bfa1bc600c9d57648f2bdcfb23ed2c75a7d54cd09c46d7a125ca76e2f3e8db0be91cd7ad6b086de1c1dc888f7eec40f6b35bbfec6b4c623ceacc6 SHA512 08a3599a5ba66d61a78eb5fca668cc313a8a79895f72dc532e3aa9408bd353875a5a0339cc55a6fbaf3f1ed0e680f8cc9937517b4e0bb378914763ec932e362d
 MISC metadata.xml 685 BLAKE2B e277707b89a7b08922f18461e551e875ee9d4dd6a6159aa38cb3840ab242360b93e0724efe7fad0ab685d9ec4e119ec606d72cfac5b0417de7c01cc45c97be22 SHA512 9d9a2a3467a39b21475d8728e218878614a700ee8c98cb6554ca4ca2913812ef5c6740737e8716a76a6fbc13d0d42b04339ea27e7c2ea1a346387c9df139a783
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.34-no-pam.patch b/app-emulation/virtualbox/files/virtualbox-6.1.34-no-pam.patch
new file mode 100644
index 000000000000..9266cece55bd
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.34-no-pam.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/843437
+https://www.virtualbox.org/changeset/94406/vbox
+
+--- a/src/VBox/Runtime/Makefile.kmk
++++ b/src/VBox/Runtime/Makefile.kmk
+@@ -324,4 +324,7 @@
+ ifdef IPRT_WITH_FUTEX_BASED_SEMS
+  RuntimeR3_DEFS.linux  += IPRT_WITH_FUTEX_BASED_SEMS
++endif
++ifdef IPRT_WITHOUT_PAM
++ RuntimeR3_DEFS        += IPRT_WITHOUT_PAM
+ endif
+ RuntimeR3_INCS         = \
+--- a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
++++ b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
+@@ -86,4 +86,5 @@
+ 
+ #if !defined(IPRT_USE_PAM) \
++ && !defined(IPRT_WITHOUT_PAM) \
+  && ( defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_NETBSD) || defined(RT_OS_OPENBSD) )
+ # define IPRT_USE_PAM
+
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python.patch b/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python.patch
new file mode 100644
index 000000000000..3a6da1f681c1
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure
+index fd2e296..695f6a7 100755
+--- a/configure
++++ b/configure
+@@ -1987,6 +1987,9 @@ check_python()
+ {
+   test_header "Python support"
+ 
++  # We force the right implementation in the ebuild instead
++  return
++
+   # On darwin this is a on/off decision only
+   if [ "$OS" = "darwin" ]; then
+     echo "enabled"
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python3.10.patch b/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python3.10.patch
new file mode 100644
index 000000000000..e06e86910103
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.34-r3-python3.10.patch
@@ -0,0 +1,122 @@
+https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/002-python310.patch
+https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/003-pyunicode.patch
+
+https://www.virtualbox.org/changeset/90537/vbox
+https://www.virtualbox.org/changeset/86623/vbox
+--- a/src/libs/xpcom18a4/python/src/module/_xpcom.cpp
++++ b/src/libs/xpcom18a4/python/src/module/_xpcom.cpp
+@@ -84,7 +84,11 @@
+ #  define MANGLE_MODULE_INIT(a_Name)    RT_CONCAT(a_Name, MODULE_NAME_SUFFIX)
+ # endif
+ # ifdef VBOX_PYXPCOM_VERSIONED
+-#  if   PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000
++#  if   PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000
++#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython3_10")
++#   define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10)
++
++#  elif   PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x030a0000
+ #   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython3_9")
+ #   define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9)
+ 
+--- a/src/libs/xpcom18a4/python/Makefile.kmk
++++ b/src/libs/xpcom18a4/python/Makefile.kmk
+@@ -4,7 +4,7 @@
+ #
+ 
+ #
+-# Copyright (C) 2009-2017 Oracle Corporation
++# Copyright (C) 2009-2021 Oracle Corporation
+ #
+ # This file is part of VirtualBox Open Source Edition (OSE), as
+ # available from http://www.virtualbox.org. This file is free software;
+@@ -20,7 +20,7 @@
+ 
+ #
+ # List of supported Python versions, defining a number of
+-# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables
++# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB] variables
+ # which get picked up below.
+ #
+ ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
+@@ -646,6 +646,52 @@
+  endif
+ endif
+ 
++ifdef VBOX_PYTHON310_INC
++#
++# Python 3.10 version
++#
++DLLS += VBoxPython3_10
++VBoxPython3_10_EXTENDS    = VBoxPythonBase
++VBoxPython3_10_EXTENDS_BY = appending
++VBoxPython3_10_TEMPLATE   = XPCOM
++VBoxPython3_10_INCS       = $(VBOX_PYTHON310_INC)
++VBoxPython3_10_LIBS       = $(VBOX_PYTHON310_LIB)
++
++ ifdef VBOX_WITH_32_ON_64_MAIN_API
++  ifdef VBOX_PYTHON310_LIB_X86
++DLLS += VBoxPython3_10_x86
++VBoxPython3_10_x86_EXTENDS    = VBoxPythonBase_x86
++VBoxPython3_10_x86_EXTENDS_BY = appending
++VBoxPython3_10_x86_TEMPLATE   = XPCOM
++VBoxPython3_10_x86_INCS       = $(VBOX_PYTHON310_INC)
++VBoxPython3_10_x86_LIBS       = $(VBOX_PYTHON310_LIB_X86)
++  endif
++ endif
++endif
++
++ifdef VBOX_PYTHON310M_INC
++#
++# Python 3.10 version with pymalloc
++#
++DLLS += VBoxPython3_10m
++VBoxPython3_10m_EXTENDS    = VBoxPythonBase_m
++VBoxPython3_10m_EXTENDS_BY = appending
++VBoxPython3_10m_TEMPLATE   = XPCOM
++VBoxPython3_10m_INCS       = $(VBOX_PYTHON310M_INC)
++VBoxPython3_10m_LIBS       = $(VBOX_PYTHON310M_LIB)
++
++ ifdef VBOX_WITH_32_ON_64_MAIN_API
++  ifdef VBOX_PYTHON310M_LIB_X86
++DLLS += VBoxPython3_10m_x86
++VBoxPython3_10m_x86_EXTENDS    = VBoxPythonBase_x86_m
++VBoxPython3_10m_x86_EXTENDS_BY = appending
++VBoxPython3_10m_x86_TEMPLATE_  = XPCOM
++VBoxPython3_10m_x86_INCS       = $(VBOX_PYTHON310M_INC)
++VBoxPython3_10m_x86_LIBS       = $(VBOX_PYTHON310M_LIB_X86)
++  endif
++ endif
++endif
++
+ ifdef VBOX_PYTHONDEF_INC
+ #
+ # Python without versioning
+@@ -730,4 +776,3 @@
+ 
+ 
+ include $(FILE_KBUILD_SUB_FOOTER)
+-
+
+--- a/src/libs/xpcom18a4/python/src/PyXPCOM.h
++++ b/src/libs/xpcom18a4/python/src/PyXPCOM.h
+@@ -137,12 +137,14 @@
+ #  define PyInt_Check(o) PyLong_Check(o)
+ #  define PyInt_AsLong(o) PyLong_AsLong(o)
+ #  define PyNumber_Int(o) PyNumber_Long(o)
+-#  ifndef PyUnicode_AsUTF8
+-#   define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
++#  if !defined(Py_LIMITED_API) && PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
++#   ifndef PyUnicode_AsUTF8
++#    define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
++#   endif
++#   ifndef PyUnicode_AsUTF8AndSize
++#    define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s)
++#   endif
+ #  endif
+-#  ifndef PyUnicode_AsUTF8AndSize
+-#   define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s)
+-#  endif
+ typedef struct PyMethodChain
+ {
+     PyMethodDef *methods;
+
diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild
new file mode 100644
index 000000000000..1475e06f6fa0
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild
@@ -0,0 +1,535 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This absolutely doesn't work with Python 3.10 yet as of 6.1.34.
+# Two problems:
+# 1. The build system (not just in configure, but in src/libs/xpcom18a4/python/Makefile.kmk)
+# insists on trying to detect various Python paths without giving choice of which is used;
+#
+# 2. None of that machinery mentioned in #1. is rigged up for Python 3.10+, and
+# the homebrew Makefile/kbuild stuff is a pain to understand.
+#
+# bug #785835, bug #856121
+PYTHON_COMPAT=( python3_{8,9} )
+inherit desktop edo java-pkg-opt-2 linux-info multilib optfeature 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"
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64"
+fi
+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 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now. See bug #832166.
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	java? ( virtual/jdk:1.8 )
+	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.8 )
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-vboxr0.patch
+	"${FILESDIR}"/${PN}-6.1.34-python3.10.patch # bug #852152
+	"${FILESDIR}"/${PN}-6.1.34-no-pam.patch # bug #843437
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+	"${WORKDIR}"/patches
+)
+
+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
+}
+
+src_prepare() {
+	default
+
+	# 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
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something more sensible.
+	# 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
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	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
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+	EOF
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Try to force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usex python 1 0)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+}
+
+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)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	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 "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev ; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r5.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r5.ebuild
new file mode 100644
index 000000000000..428e491497ba
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r5.ebuild
@@ -0,0 +1,640 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop edo java-pkg-opt-2 linux-info multilib optfeature 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"
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64"
+fi
+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 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #832166.
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	java? ( virtual/jdk:1.8 )
+	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-apps/which
+	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.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-vboxr0.patch
+
+	# Upstream patch for USE=-pam
+	# bug #843437
+	"${FILESDIR}"/${PN}-6.1.34-no-pam.patch
+
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
+	"${FILESDIR}"/${PN}-6.1.34-r3-python3.10.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/patches
+)
+
+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
+}
+
+src_prepare() {
+	default
+
+	# 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
+
+	# Remove shipped binaries (kBuild, yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something more sensible.
+	# 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
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	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
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+	EOF
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+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}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile ; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" 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)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	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
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/./_}"
+
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
+		if [[ ! -x "${python_path_ext}" ]] ; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+	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 "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev ; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index a8ad0f266f53..78989eab65d6 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
 DIST wine-7.10.tar.xz 27915328 BLAKE2B fc778285cce52317d77461f0bce11d6e3214a536ecd42364d6cd31f609a23116fa582a7cb85873a99c61eb5cf5e1e3036e4d4d1887b87f75f501109ac3eb4625 SHA512 be460be6c3f6f54c20220287a7c4c9d41d27bd14fabb97b1f9824a4be361e38b2e2e51a621e0332d6c48934b1af425efaec92132f73e6d1270337ffbfcac2576
 DIST wine-7.11.tar.xz 27975308 BLAKE2B 7031c950de4ee6d00c1006841a2d6fe55cebce644d354eb05cb963207b491a717c6ba7ce8f19c337167ec8bd6c1480427112a32b4363db745e99461be5917c77 SHA512 aff6a5996ba7336d97c59a1402688b109e6cca123c60fa6f03813d81ad6478f4ed4a62fb7813dc6952cca7ec1250182730873f3ac17f0855bbf000bf3c1d86fe
-DIST wine-7.8.tar.xz 27728116 BLAKE2B 3c878de8377906a687026bf1d5f9167bdce6b13a3d750d2a92fdcf70aed8e3da01560d26e4b075b6564b741996fc2168bb98c409f95618ab9fbb8e8b583a5384 SHA512 5e63edabc7dcdce62a1ce683c9ef387a2d801af3a0f99c32daacfea566a3813086f4f5977279c7b7526574f5cd95d052805bd5c145b82221d321d8aa638bfe1d
+DIST wine-7.12.tar.xz 28221024 BLAKE2B 551f37360a6dd2c535b5b1a9896cd9c9c091d56c4d2f3d2988092d48d54aa447fc0dad18034bad7b7beaa9c6587071e8d32bd08092a9ba93acb39dac9ddfc391 SHA512 4746fb1c3d0ec7f20e22d821f8e88e5415b85cb60f53e9ad61b89e8321b6a6b2999eb2b70c7ac46477f633bccb6c2aba49ce2655c380cb85cd5c71dbe4af50b4
 DIST wine-7.9.tar.xz 27783272 BLAKE2B 3265402b90913670b6a81a1f0d91d84d536734883749d31af572953e3b244ba721c15bb851e0e0e868c402d9add2e2007e49225bdaaa02a8dedee575d4e69602 SHA512 47ecbb8bc31a06d0f40a63469ffe3df4a1e05c9476a8926ec7f20c2230de8afecb5e0df9f3c5dd238ce3d0323d7cf9c9f48c41ef6ca149822458a4e605a2e029
 DIST wine-staging-7.10.tar.gz 9646352 BLAKE2B acb68df0b79c5912ecfc400ac7b40fd0205908ce7edb06f69fa4c8e7a3c94d33551b98c7ae2aadded65c012aaf1b7990ac7aeefb37e7c07779aaeceb7d74397e SHA512 7c2aa5ec78f12ef3415f7e3615775f8a0a727f6e5bb0173f5746934166dbec5d4edfaa572d3fe26ef62fe933772346495a6c618d58ee0a6374028a158beb05c8
 DIST wine-staging-7.11.tar.gz 9643832 BLAKE2B d215353a0163011b964d24d6e0cb3011286ce8d9ad6b42ad2bd389cb65c214db01a67a6f37db3eedd36d34995d7423112bbddbd06abbcbc5bb5f0d565d06a157 SHA512 5985f7536f7d0a8bedcfcdf095861a06589ea6ad9896c87043ca88f9ef3c4bc9854931b51b64471e361378f332cea70adc58ef9303e9e5d1a6dcc9789761c187
-DIST wine-staging-7.8.tar.gz 9658435 BLAKE2B 0c089cd1498a5d8d90bbcabf8c3b55552176bc1f0c4717c6f7d1f6dcadfdaa0d52b0fdfd3c150de0da3626085e05fdb49343739950558bf47eff96f77f6a1464 SHA512 86f514a60d6f7ed612189a6834a18265a7551f3358903a3d67413d81d134c98f2aa7e4f79682be1a75d7bec194c4ca0bbf5d10c6e10277d451cd4aa332cc20ed
+DIST wine-staging-7.12.tar.gz 9644343 BLAKE2B 760b34abf245b8d2e5baed13db57a841bba73f9dd6652f958428fec3617000cdc00d6f3ac305f4b580cf462938a56ef9a6f0c6931306c25ce82b7fe4da314d9f SHA512 0cf7554011835052b75a836fca89c6cf9b5fa1653c96a82b0dcd3cf40147602eebaf81aa6b94348432371bef9550c8dc21c9cf7d78b49a422bd113e8a6a8e3b0
 DIST wine-staging-7.9.tar.gz 9657482 BLAKE2B 2b7f30fde6a73d1012f31e83ca9fd7bd20d87a0edcf1f175115139e47d8aecdfeea5e432cd8cc4253773755856fff00e36aab25098a9a59ed44a2f0c572e7ba5 SHA512 6c856eeaa18bad56b5302939968995221277f80eb380510762535063929b7d95e58df11ad01459ab4e6a7f97efada8c09034457a58ad637620d3a296c93ace6d
 EBUILD wine-staging-7.10.ebuild 16988 BLAKE2B e8c363f35b8bd578dda2d1d79f31d93d845bddcf35c8ab977479ddd0ef3da83303a3772b37c183d61f3c3be5272d992ac6e069cd79fec965e33db19de7dff0f6 SHA512 6e952e136e8872c95fdf6478e40c5bff53f93a02f859696febddbc1f7279a0ec498eb98d3e15d713c20d3392332ba5c4413d25c56c0e05024c979ba38a8814ab
 EBUILD wine-staging-7.11.ebuild 16988 BLAKE2B e8c363f35b8bd578dda2d1d79f31d93d845bddcf35c8ab977479ddd0ef3da83303a3772b37c183d61f3c3be5272d992ac6e069cd79fec965e33db19de7dff0f6 SHA512 6e952e136e8872c95fdf6478e40c5bff53f93a02f859696febddbc1f7279a0ec498eb98d3e15d713c20d3392332ba5c4413d25c56c0e05024c979ba38a8814ab
-EBUILD wine-staging-7.8.ebuild 16986 BLAKE2B 96ddbfe126315deca01943943eaaaa8d6bb99ace3bf7ee1f4591ea1c5f22edd989ea135b1f6f04f1c7359fa473b96dca4e8b6d9c715fde5a2efceb6d67e080d0 SHA512 d7fb6d6c173e462930b0d4ccf54e9e880da210669356cba8c7629766b0121c7a28dbc0f0ab83c18f502cf62d732cfacf3aa61e966547d4403b617b83a2641dee
+EBUILD wine-staging-7.12.ebuild 16988 BLAKE2B e8c363f35b8bd578dda2d1d79f31d93d845bddcf35c8ab977479ddd0ef3da83303a3772b37c183d61f3c3be5272d992ac6e069cd79fec965e33db19de7dff0f6 SHA512 6e952e136e8872c95fdf6478e40c5bff53f93a02f859696febddbc1f7279a0ec498eb98d3e15d713c20d3392332ba5c4413d25c56c0e05024c979ba38a8814ab
 EBUILD wine-staging-7.9.ebuild 16986 BLAKE2B 96ddbfe126315deca01943943eaaaa8d6bb99ace3bf7ee1f4591ea1c5f22edd989ea135b1f6f04f1c7359fa473b96dca4e8b6d9c715fde5a2efceb6d67e080d0 SHA512 d7fb6d6c173e462930b0d4ccf54e9e880da210669356cba8c7629766b0121c7a28dbc0f0ab83c18f502cf62d732cfacf3aa61e966547d4403b617b83a2641dee
 EBUILD wine-staging-9999.ebuild 16988 BLAKE2B e8c363f35b8bd578dda2d1d79f31d93d845bddcf35c8ab977479ddd0ef3da83303a3772b37c183d61f3c3be5272d992ac6e069cd79fec965e33db19de7dff0f6 SHA512 6e952e136e8872c95fdf6478e40c5bff53f93a02f859696febddbc1f7279a0ec498eb98d3e15d713c20d3392332ba5c4413d25c56c0e05024c979ba38a8814ab
 MISC metadata.xml 3391 BLAKE2B d6da53830248d3f66ba4cc850f7d879f2d7ba636f51a657ff8078349ca5bbb0e1f20693792f56fdb2739e0d4cd85345f7ee7da06d11c4e573767dd2fb508a0c1 SHA512 e344bd026808190ffab209cc7deeeb32659be30a41a5f81ddbf23e95773ffa831c0534b7184bd6e9cee0d8ea79ec7985188d1ca066d9af493f9ec3da461d81e7
diff --git a/app-emulation/wine-staging/wine-staging-7.8.ebuild b/app-emulation/wine-staging/wine-staging-7.12.ebuild
index f4c0f73c2350..9d69fea688ff 100644
--- a/app-emulation/wine-staging/wine-staging-7.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.12.ebuild
@@ -120,7 +120,7 @@ RDEPEND="${COMMON_DEPEND}
 	>app-eselect/eselect-wine-0.3
 	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:7.2.0 )
+	mono? ( app-emulation/wine-mono:7.3.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -355,7 +355,7 @@ src_configure() {
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
 	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+		use crossdev-mingw || PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
 
 		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
 		local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc}
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index ab9f9a5a5c2e..8c7a07b05d07 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,12 +2,12 @@ DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76
 DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
 DIST wine-7.10.tar.xz 27915328 BLAKE2B fc778285cce52317d77461f0bce11d6e3214a536ecd42364d6cd31f609a23116fa582a7cb85873a99c61eb5cf5e1e3036e4d4d1887b87f75f501109ac3eb4625 SHA512 be460be6c3f6f54c20220287a7c4c9d41d27bd14fabb97b1f9824a4be361e38b2e2e51a621e0332d6c48934b1af425efaec92132f73e6d1270337ffbfcac2576
 DIST wine-7.11.tar.xz 27975308 BLAKE2B 7031c950de4ee6d00c1006841a2d6fe55cebce644d354eb05cb963207b491a717c6ba7ce8f19c337167ec8bd6c1480427112a32b4363db745e99461be5917c77 SHA512 aff6a5996ba7336d97c59a1402688b109e6cca123c60fa6f03813d81ad6478f4ed4a62fb7813dc6952cca7ec1250182730873f3ac17f0855bbf000bf3c1d86fe
-DIST wine-7.8.tar.xz 27728116 BLAKE2B 3c878de8377906a687026bf1d5f9167bdce6b13a3d750d2a92fdcf70aed8e3da01560d26e4b075b6564b741996fc2168bb98c409f95618ab9fbb8e8b583a5384 SHA512 5e63edabc7dcdce62a1ce683c9ef387a2d801af3a0f99c32daacfea566a3813086f4f5977279c7b7526574f5cd95d052805bd5c145b82221d321d8aa638bfe1d
+DIST wine-7.12.tar.xz 28221024 BLAKE2B 551f37360a6dd2c535b5b1a9896cd9c9c091d56c4d2f3d2988092d48d54aa447fc0dad18034bad7b7beaa9c6587071e8d32bd08092a9ba93acb39dac9ddfc391 SHA512 4746fb1c3d0ec7f20e22d821f8e88e5415b85cb60f53e9ad61b89e8321b6a6b2999eb2b70c7ac46477f633bccb6c2aba49ce2655c380cb85cd5c71dbe4af50b4
 DIST wine-7.9.tar.xz 27783272 BLAKE2B 3265402b90913670b6a81a1f0d91d84d536734883749d31af572953e3b244ba721c15bb851e0e0e868c402d9add2e2007e49225bdaaa02a8dedee575d4e69602 SHA512 47ecbb8bc31a06d0f40a63469ffe3df4a1e05c9476a8926ec7f20c2230de8afecb5e0df9f3c5dd238ce3d0323d7cf9c9f48c41ef6ca149822458a4e605a2e029
 EBUILD wine-vanilla-7.0-r2.ebuild 14434 BLAKE2B d5f378b0f37905e445051e5c83c3cf6e937f91e0f318db1a92af72467ca3f7d7b4003599b1a7b3a75ac318e5aadedf0c4f9cfbadf4f4527ed6aeb7792d2371a9 SHA512 75ce6722360213790f45fb9c0b80258e78c1796cb6453ef8155d7a32684db7bfdac3244b0ba23326aa638e3d9f327c34c88d659a5849469a4e2dd34d957c6c6a
 EBUILD wine-vanilla-7.10.ebuild 14334 BLAKE2B b5cd7e04c62012fd1bc06ef036a14e01a5c8c85d722c73c2f40a1b548f62459a3b5112eed029c694f5807a31f5a9bc0d9080499acd585d67437ca7940bd41f28 SHA512 42e1daef8b69a06db92ec00248acb1ee451a15588b3c183873cfd947d47ff7c8b73457aa5564408482967296ad4a6374f91faa155fa87847fddf7917f68ba39e
 EBUILD wine-vanilla-7.11.ebuild 14334 BLAKE2B b5cd7e04c62012fd1bc06ef036a14e01a5c8c85d722c73c2f40a1b548f62459a3b5112eed029c694f5807a31f5a9bc0d9080499acd585d67437ca7940bd41f28 SHA512 42e1daef8b69a06db92ec00248acb1ee451a15588b3c183873cfd947d47ff7c8b73457aa5564408482967296ad4a6374f91faa155fa87847fddf7917f68ba39e
-EBUILD wine-vanilla-7.8.ebuild 14332 BLAKE2B bf877a16df4ece5bcdad1bea5d16484fec9762d8aa37af41585ad728f934066a595bb2b498c2595c70379a18f073d08b3380347cad8033baf4923bc264ad701d SHA512 aedb7a9b772368f7b39e524aa9beae3bd24f90609e5dbc0835690db89189c41085785a1c099d227ec452af8a552b209bc55d6576a24fe9f39c7bbc2a049d1f5a
+EBUILD wine-vanilla-7.12.ebuild 14334 BLAKE2B b5cd7e04c62012fd1bc06ef036a14e01a5c8c85d722c73c2f40a1b548f62459a3b5112eed029c694f5807a31f5a9bc0d9080499acd585d67437ca7940bd41f28 SHA512 42e1daef8b69a06db92ec00248acb1ee451a15588b3c183873cfd947d47ff7c8b73457aa5564408482967296ad4a6374f91faa155fa87847fddf7917f68ba39e
 EBUILD wine-vanilla-7.9.ebuild 14332 BLAKE2B bf877a16df4ece5bcdad1bea5d16484fec9762d8aa37af41585ad728f934066a595bb2b498c2595c70379a18f073d08b3380347cad8033baf4923bc264ad701d SHA512 aedb7a9b772368f7b39e524aa9beae3bd24f90609e5dbc0835690db89189c41085785a1c099d227ec452af8a552b209bc55d6576a24fe9f39c7bbc2a049d1f5a
 EBUILD wine-vanilla-9999.ebuild 14334 BLAKE2B b5cd7e04c62012fd1bc06ef036a14e01a5c8c85d722c73c2f40a1b548f62459a3b5112eed029c694f5807a31f5a9bc0d9080499acd585d67437ca7940bd41f28 SHA512 42e1daef8b69a06db92ec00248acb1ee451a15588b3c183873cfd947d47ff7c8b73457aa5564408482967296ad4a6374f91faa155fa87847fddf7917f68ba39e
 MISC metadata.xml 3197 BLAKE2B 97ffc90d829a9275b64d02e3428118ff3c65d415ec0ef03995a0170cf428d20cfa010d324421fa119007c033ca78c9008fae6b9b088c7c1deaf87082a6a4c3eb SHA512 82b59cb9e82c585c2c1232f49ca706dcdf270d223863f35d46af678ceb30f40cbbadef519c71ce80418934b2e4ffc5e96a37d1db0c3fb22ab6c119593e3be761
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.12.ebuild
index 40974d38a1ce..2fb6362afb24 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.12.ebuild
@@ -105,7 +105,7 @@ RDEPEND="${COMMON_DEPEND}
 	>app-eselect/eselect-wine-0.3
 	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:7.2.0 )
+	mono? ( app-emulation/wine-mono:7.3.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -292,7 +292,7 @@ src_configure() {
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
 	if use mingw; then
-		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+		use crossdev-mingw || PATH="${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}"
 
 		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
 		local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 163326511033..df3917f21eae 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -27,10 +27,15 @@ DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
 DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 5b01953ba93551830e533cf7e9e8675a44ed6c2ad3da152e0b5feeb3782b9bc3a1a0a7c0a84ac1de8ed7146fcf364db7604ea269ee243438df34c91b4b6acc5b SHA512 c2f585223d3d9e08d08b295c0f35e4856e4801d214cf0a1f925585c28a7a25cb3b82a5f5e7d41d35b2c746d5a307cd5b5a369d5342f35681e227d8ce91e741c2
 DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
-DIST xen-4.16.0-upstream-patches-2.tar.xz 111668 BLAKE2B e8bbedb7cc50f7a6cb1a3869f0165cce3d02c33f04b935384e770aa5206e6aa6cb51329c5d69375391a8781ba23f20c35e06406d5164720d253b405a77f5aee9 SHA512 6b6770117e81ae407e3ded0e366b14f3fa2411cc93a95187db27548c3dd17a1f85e60fc3971b008693297ad97aa0c5fa7b4d88e01d67a972f39e51bf0a2cf39d
-DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
+DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3
+DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
-DIST xen-gentoo-patches-24.tar.xz 20952 BLAKE2B 292ea384f007a9615ca840068c45cd0e37a63a59e596c9c87a278a0136805327c85f5e5576eac751e40bda616559e413b396d313d43f2d36d904f09a41b0d302 SHA512 26b7344cea40ef44d1eaec330465071c96ee27a5b0ca91f787fc80c6801abed47cab9050a40ef80f20471a7cd9ee0dc7aaa46b16e5af7d0e50643ccc7d3a828b
+DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104 SHA512 8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae
+DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7 SHA512 59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65
+DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
+DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
 EBUILD xen-tools-4.15.2-r2.ebuild 17828 BLAKE2B dd49a8492b9b2b27eaea3702aba04d663a8f4eb052e4d92f34b8ffd3165ef23d6d20b024a5894ac5ff9555cecb0efacb785d6a70a9393c564862e1e8a3b7e267 SHA512 1955d40d91295250d173568c80dea737c082e17c4e90e5c980158fea90384b6705cca5911207d23da67b9eed6779f8a558e848322b495dbb42e1b0ae890f9884
-EBUILD xen-tools-4.16.0-r4.ebuild 17932 BLAKE2B b156f94b22aeb6b1ef05a92d7c4b2b1ab219b86fb7f8f573dbfee8ef98169bda1adf67deed8692197659f81238f7588c0b0e7f3202794412e411e415edb39712 SHA512 b6e376a749b1893c71b047962e496f5c7556149f1a3509fdfe625ecba9e85bfcd432ca85ddf401fe27bb48cb356691ea3ffc9c9779f79efb1b3c586c80931865
+EBUILD xen-tools-4.15.3.ebuild 16675 BLAKE2B 0343e102f9531f96a245c5de0d3cdcc611c77994f4749b43552ebdc439f798f457e02e36096ef6839618985cb5dcd743aac5a8a825e856b7bd0fd71da21708bd SHA512 297941822cb2b439366a076f013a0fd261d8e0ee5f3db14cb667d9f911f7bb8ff80f6bf1202b6e0c4dbdfba89ee3341bddef3dbaa22bf95370a4085d6fa08e24
+EBUILD xen-tools-4.16.1.ebuild 16548 BLAKE2B e16e6217d6573365bac929c0c796232876ff480bb53d46bea52e707158f582566543ee1688b161f1c95e9a45818c30d82e98b0fb003acb1239440d1b5dd3e984 SHA512 83dc4460ede881c701641d700dbd938d42f7b6bec2e9c2674e4d925ffbd61d25f7a1e3ef11a17547101011f293c9bd1da97514b6bc16f31cd57141593519832e
+EBUILD xen-tools-4.16.2_pre1.ebuild 16785 BLAKE2B fcb88e3b26c6fab27fa3f82c4f5684044087cb1479e470bdc5ed1985016cb3cf44c41733b7eb06f5bb9648d2c46dcbd456f0938439ab3eac357281c7e6dc66f9 SHA512 911c6e0731ddc7b6bc7a567e25155ab0d05ad537e970cdda961f3904b9ca73696698c7b5c9ae7d4669cd2e4fab8e9b40f2e7f22c85eae6e77c7e49c20fb2afca
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
new file mode 100644
index 000000000000..60ce532a0998
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+	SEABIOS_VER="1.14.0"
+	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
+	EDK2_OPENSSL_VERSION="1_1_1j"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
+
+	XEN_PRE_PATCHSET_NUM=
+	XEN_GENTOO_PATCHSET_NUM=2
+	XEN_PRE_VERSION_BASE=
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="
+	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+	)
+	"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="${PV}-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://xenproject.org"
+DOCS=( README )
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	lzma? ( app-arch/xz-utils )
+	qemu? (
+		dev-libs/glib:2
+		sys-libs/pam
+	)
+	app-arch/bzip2
+	dev-libs/libnl:3
+	dev-libs/lzo:2
+	dev-libs/yajl
+	sys-apps/util-linux
+	sys-fs/e2fsprogs
+	sys-libs/ncurses
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	selinux? ( sec-policy/selinux-xen )"
+
+DEPEND="${COMMON_DEPEND}
+	app-misc/pax-utils
+	>=sys-kernel/linux-headers-4.11
+	x11-libs/pixman
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	arm64? ( sys-power/iasl
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		dev-util/meson
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		dev-lang/ocaml[ocamlopt] )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+BDEPEND="dev-lang/perl
+	sys-devel/bison
+	sys-devel/gettext"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_EXECSTACK="
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-storage-daemon
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/libexec/xen/libexec/qemu-pr-helper
+	usr/libexec/xen/libexec/virtfs-proxy-helper
+	usr/libexec/xen/libexec/virtiofsd
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
+	# collisions with app-emulation/qemu.
+	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
+		tools/qemu-xen/include/net/net.h \
+		tools/qemu-xen/Makefile \
+		tools/qemu-xen/qemu-bridge-helper.c \
+		tools/qemu-xen/qemu-options.hx \
+		|| die
+
+	if use ovmf; then
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+
+		# Bug #816987
+		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
+
+		# gcc 11
+		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
+		-i config/Paths.mk.in || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	# disable jpeg automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
+		-i tools/Makefile || die
+
+	# disable png automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
+		-i tools/Makefile || die
+
+	# disable docker (Bug #732970)
+	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
+		-i tools/Makefile || die
+
+	# disable abi-dumper (Bug #791172)
+	sed -e 's/$(ABI_DUMPER) /echo /g' \
+		-i tools/libs/libs.mk || die
+
+	# Remove -Werror
+	find . -type f \( -name Makefile -o -name "*.mk" \) \
+		 -exec sed -i \
+		 -e 's/-Werror //g' \
+		 -e '/^CFLAGS *+= -Werror$/d' \
+		 -e 's/, "-Werror"//' \
+		 {} + || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libexecdir="${EPREFIX}/usr/libexec"
+		--localstatedir="${EPREFIX}/var"
+		--disable-golang
+		--disable-werror
+		--disable-xen
+		--enable-tools
+		--enable-docs
+		$(use_enable api xenapi)
+		$(use_enable ipxe)
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
+		$(use_enable ocaml ocamltools)
+		$(use_enable ovmf)
+		$(use_enable rombios)
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
+	)
+
+	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
+	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
+	use amd64 && myconf+=( $(use_enable qemu-traditional) )
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	# bug #845099
+	if use ipxe; then
+		local -x NO_WERROR=1
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.16.0-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.16.1.ebuild
index 60c3e719f0c0..dc73508d5fc5 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.0-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.1.ebuild
@@ -8,8 +8,6 @@ PYTHON_REQ_USE='ncurses,xml,threads(+)'
 
 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
 
-MY_PV=${PV/_/-}
-
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	REPO="xen.git"
@@ -17,14 +15,6 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=2
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=24
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
 
 	SEABIOS_VER="1.14.0"
 	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
@@ -33,37 +23,46 @@ else
 	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
 	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
 
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	XEN_PRE_PATCHSET_NUM=
+	XEN_GENTOO_PATCHSET_NUM=0
+	XEN_PRE_VERSION_BASE=
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="
+	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
 	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
 	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
 	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
 		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
 		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
 		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
+	)
+	"
 
-	S="${WORKDIR}/xen-${MY_PV}"
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
 fi
 
 DESCRIPTION="Xen tools including QEMU and xl"
 HOMEPAGE="https://xenproject.org"
 DOCS=( README )
 
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
@@ -228,68 +227,21 @@ pkg_setup() {
 }
 
 src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
 	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
 	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
 	pushd tools/firmware/ > /dev/null
 	ln -s seabios-dir-remote seabios-dir || die
 	popd > /dev/null
 
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
 	fi
 
-	# Ovmf's patchset
 	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
 		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
 		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
 		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
@@ -316,7 +268,7 @@ src_prepare() {
 		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
 
 		# gcc 11
-		cp "${WORKDIR}/patches-gentoo/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
 		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
 	fi
 
@@ -464,6 +416,11 @@ src_compile() {
 		append-flags -fno-strict-overflow
 	fi
 
+	# bug #845099
+	if use ipxe; then
+		local -x NO_WERROR=1
+	fi
+
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
 
 	if use doc; then
diff --git a/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
new file mode 100644
index 000000000000..1aa03defc2a3
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
@@ -0,0 +1,534 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+	SEABIOS_VER="1.14.0"
+	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
+	EDK2_OPENSSL_VERSION="1_1_1j"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
+
+	XEN_PRE_PATCHSET_NUM=0
+	XEN_GENTOO_PATCHSET_NUM=1
+	XEN_PRE_VERSION_BASE=4.16.1
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="
+	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+	)
+	"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://xenproject.org"
+DOCS=( README )
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	lzma? ( app-arch/xz-utils )
+	qemu? (
+		dev-libs/glib:2
+		sys-libs/pam
+	)
+	zstd? ( app-arch/zstd )
+	app-arch/bzip2
+	app-arch/zstd
+	dev-libs/libnl:3
+	dev-libs/lzo:2
+	dev-libs/yajl
+	sys-apps/util-linux
+	sys-fs/e2fsprogs
+	sys-libs/ncurses
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	selinux? ( sec-policy/selinux-xen )"
+
+DEPEND="${COMMON_DEPEND}
+	app-misc/pax-utils
+	>=sys-kernel/linux-headers-4.11
+	x11-libs/pixman
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	arm64? ( sys-power/iasl
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		dev-util/meson
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		dev-lang/ocaml[ocamlopt] )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+BDEPEND="dev-lang/perl
+	sys-devel/bison
+	sys-devel/gettext"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_EXECSTACK="
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-storage-daemon
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/boot/ovmf.bin
+	usr/libexec/xen/boot/xen-shim
+	usr/libexec/xen/libexec/qemu-pr-helper
+	usr/libexec/xen/libexec/virtfs-proxy-helper
+	usr/libexec/xen/libexec/virtiofsd
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
+	# collisions with app-emulation/qemu.
+	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
+		tools/qemu-xen/include/net/net.h \
+		tools/qemu-xen/meson.build \
+		tools/qemu-xen/qemu-bridge-helper.c \
+		tools/qemu-xen/qemu-options.hx \
+		|| die
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	if use ovmf; then
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+
+		# Bug #816987
+		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
+
+		# gcc 11
+		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
+		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
+		-i config/Paths.mk.in || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	# disable jpeg automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
+		-i tools/Makefile || die
+
+	# disable png automagic
+	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
+		-i tools/Makefile || die
+
+	# disable docker (Bug #732970)
+	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
+		-i tools/Makefile || die
+
+	# disable abi-dumper (Bug #791172)
+	sed -e 's/$(ABI_DUMPER) /echo /g' \
+		-i tools/libs/libs.mk || die
+
+	# Remove -Werror
+	find . -type f \( -name Makefile -o -name "*.mk" \) \
+		 -exec sed -i \
+		 -e 's/-Werror //g' \
+		 -e '/^CFLAGS *+= -Werror$/d' \
+		 -e 's/, "-Werror"//' \
+		 {} + || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--libexecdir="${EPREFIX}/usr/libexec"
+		--localstatedir="${EPREFIX}/var"
+		--disable-golang
+		--disable-werror
+		--disable-xen
+		--enable-tools
+		--enable-docs
+		$(use_enable api xenapi)
+		$(use_enable ipxe)
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
+		$(use_enable ocaml ocamltools)
+		$(use_enable ovmf)
+		$(use_enable rombios)
+		$(use_enable systemd)
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
+	)
+
+	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
+	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
+	use amd64 && myconf+=( $(use_enable qemu-traditional) )
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	# bug #845099
+	if use ipxe; then
+		local -x NO_WERROR=1
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 208535f5abb1..303d453b62ed 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -4,8 +4,13 @@ AUX xen-4.16-efi.patch 696 BLAKE2B 2bc3db7286d7ea24c762e914012c71d3fe6dc4d8c4755
 AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95ae7f805c4bfa0e5a357342b845f6f260915f9eac46573bd9813fa602702df6254ad4b946fccb32cfea7514cc86b3 SHA512 0d1a8c8dbfdd57dac6d9732afcf4d0da1746ecbfa06689eb343b3d54167a784c9b9b65555f4cabd8f30a97692c511ee16c7787cdc3d335f7e39c2e3f8fc86ccf
 DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 5b01953ba93551830e533cf7e9e8675a44ed6c2ad3da152e0b5feeb3782b9bc3a1a0a7c0a84ac1de8ed7146fcf364db7604ea269ee243438df34c91b4b6acc5b SHA512 c2f585223d3d9e08d08b295c0f35e4856e4801d214cf0a1f925585c28a7a25cb3b82a5f5e7d41d35b2c746d5a307cd5b5a369d5342f35681e227d8ce91e741c2
 DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
-DIST xen-4.16.0-upstream-patches-2.tar.xz 111668 BLAKE2B e8bbedb7cc50f7a6cb1a3869f0165cce3d02c33f04b935384e770aa5206e6aa6cb51329c5d69375391a8781ba23f20c35e06406d5164720d253b405a77f5aee9 SHA512 6b6770117e81ae407e3ded0e366b14f3fa2411cc93a95187db27548c3dd17a1f85e60fc3971b008693297ad97aa0c5fa7b4d88e01d67a972f39e51bf0a2cf39d
-DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
+DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3
+DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a
+DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7 SHA512 59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65
+DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B 1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758 SHA512 8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
+DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B 198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584 SHA512 d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
 EBUILD xen-4.15.2-r2.ebuild 4405 BLAKE2B 0090bf96c539f0ec10bdded08f4a67d5413bfed25e9f85b68c65e7c49bd4c220d493b45800b3515c81c8bde3670a29cc34a6d079b9429ade6ed69e0ee47ad0c8 SHA512 355a160d6326367eb12ca7c0492b324e35d8b635e295e5a8b0c431ca44bdded9e7c2160592fdc4327ad1473a593d03f9e6d71e80ddc2734aa9ed87b6319da6d3
-EBUILD xen-4.16.0-r7.ebuild 4813 BLAKE2B dc3dc467d2a41c3fb5a353c4727a40e2213871aa93391453d3eeda82ed86ecfc15a10bcecdf9bd355494f1dbb1853643120c31ed0b9dc423efc1561b66ee5c6f SHA512 591cbf54d0261347f373c9c0b1de743cc17199ef2cdb236f62f1d7ef5653593e4a5f443144b0a3379e2dc2d6499fd90db990133e973d63d96c7aaf052fa64730
+EBUILD xen-4.15.3.ebuild 4725 BLAKE2B d0438340e0d61dcb8cafa07346e2fd361159e837e5fc1bd03b4f883c4078a26cdbc26c513e5e8300df0b836792572933e934ac0c6631861bc1985e44a794e43f SHA512 af40801d682f55e21d0a17b4c9fa5a2f947104a04d4ca9b393fe6244effecda2eb94112e3708fdc89ddd0f34e0d5bede582063e0593ee40b262f83af3da7a2e7
+EBUILD xen-4.16.1.ebuild 4832 BLAKE2B 2a9fc53ee631e5ccd502f419ea1437dc1988b801812a83a21f1ff04a2b71e85046c24030843c77d580e5cdf6dc4edf6961678ce33b77495ead4e3e51c4aa5c59 SHA512 fb7dec4bbc69f85e8824f984a6acb49b94be2192403ef8ea57dc3b13868e61044a274045ceeb2c0ded3e09d0776bc7c30cbb448359e9af35ad777079d93de533
+EBUILD xen-4.16.2_pre1.ebuild 4761 BLAKE2B fe2c436fca2d516c4ee588c265898b62278636609119768d7ec4319ad2a011cd91c8224d289384ea9fc2f38006437134a96b028d78846488badfea0a2313efe7 SHA512 600b693dd83b464fe57229b3ba3bd9acb42c88ea9b207f78694bf31d61e59ce407c675dd968e2222ffdfc7f8227f8a58a65be951dcb321481eb49eabd7818e75
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.15.3.ebuild b/app-emulation/xen/xen-4.15.3.ebuild
new file mode 100644
index 000000000000..be0c811dcf7f
--- /dev/null
+++ b/app-emulation/xen/xen-4.15.3.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+
+	XEN_PRE_PATCHSET_NUM=
+	XEN_GENTOO_PATCHSET_NUM=
+	XEN_PRE_VERSION_BASE=
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="4.16.1-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://xenproject.org"
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+REQUIRED_USE="arm? ( debug )"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )
+	flask? ( sys-apps/checkpolicy )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-4.15-efi.patch
+
+	# Enable XSM-FLASK
+	use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch
+
+	# Workaround new gcc-11 options
+	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+xen_make() {
+	# Setting clang to either 'y' or 'n' tells Xen's build system
+	# whether or not clang is used.
+	local clang=n
+	if tc-is-clang; then
+		clang=y
+	fi
+
+	# Send raw LDFLAGS so that --as-needed works
+	emake \
+		V=1 \
+		LDFLAGS="$(raw-ldflags)" \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		HOSTCXX="$(tc-getBUILD_CXX)" \
+		clang="${clang}" \
+		"$@"
+}
+
+src_configure() {
+	cd xen || die
+
+	touch gentoo-config || die
+	if use arm; then
+	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
+	fi
+	if use debug; then
+		cat <<-EOF >> gentoo-config || die
+		CONFIG_DEBUG=y
+		CONFIG_CRASH_DEBUG=y
+EOF
+	fi
+	if use flask; then
+		echo "CONFIG_XSM=y" >> gentoo-config || die
+	fi
+
+	# remove flags
+	unset CFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+
+	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
+}
+
+src_compile() {
+	xen_make -C xen
+}
+
+src_install() {
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	xen_make DESTDIR="${D}" -C xen install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.16.1.ebuild b/app-emulation/xen/xen-4.16.1.ebuild
new file mode 100644
index 000000000000..e4073b7cad14
--- /dev/null
+++ b/app-emulation/xen/xen-4.16.1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+
+	XEN_PRE_PATCHSET_NUM=
+	XEN_GENTOO_PATCHSET_NUM=0
+	XEN_PRE_VERSION_BASE=
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://xenproject.org"
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+boot-symlinks debug efi flask"
+REQUIRED_USE="arm? ( debug )"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )
+	flask? ( sys-apps/checkpolicy )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-4.16-efi.patch
+
+	# Symlinks do not work on fat32 volumes # 829765
+	if ! use boot-symlinks || use efi; then
+		eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch
+	fi
+
+	# Workaround new gcc-11 options
+	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+xen_make() {
+	# Setting clang to either 'y' or 'n' tells Xen's build system
+	# whether or not clang is used.
+	local clang=n
+	if tc-is-clang; then
+		clang=y
+	fi
+
+	# Send raw LDFLAGS so that --as-needed works
+	emake \
+		V=1 \
+		LDFLAGS="$(raw-ldflags)" \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		HOSTCXX="$(tc-getBUILD_CXX)" \
+		clang="${clang}" \
+		"$@"
+}
+
+src_configure() {
+	cd xen || die
+
+	touch gentoo-config || die
+	if use arm; then
+	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
+	fi
+	if use debug; then
+		cat <<-EOF >> gentoo-config || die
+		CONFIG_DEBUG=y
+		CONFIG_CRASH_DEBUG=y
+EOF
+	fi
+	if use flask; then
+		echo "CONFIG_XSM=y" >> gentoo-config || die
+	fi
+
+	# remove flags
+	unset CFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+
+	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
+}
+
+src_compile() {
+	xen_make -C xen
+}
+
+src_install() {
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	xen_make DESTDIR="${D}" -C xen install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.16.0-r7.ebuild b/app-emulation/xen/xen-4.16.2_pre1.ebuild
index 07e9855fc988..933fd041febc 100644
--- a/app-emulation/xen/xen-4.16.0-r7.ebuild
+++ b/app-emulation/xen/xen-4.16.2_pre1.ebuild
@@ -7,34 +7,43 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
 
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=2
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
+
+	XEN_PRE_PATCHSET_NUM=0
+	XEN_GENTOO_PATCHSET_NUM=1
+	XEN_PRE_VERSION_BASE=4.16.1
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_BASE_PV})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
 fi
 
 DESCRIPTION="The Xen virtual machine monitor"
 HOMEPAGE="https://xenproject.org"
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+boot-symlinks debug efi flask"
@@ -55,8 +64,6 @@ RESTRICT="test splitdebug strip"
 # Approved by QA team in bug #144032
 QA_WX_LOAD="boot/xen-syms-${PV}"
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_setup() {
 	python-any-r1_pkg_setup
 	if [[ -z ${XEN_TARGET_ARCH} ]]; then
@@ -73,25 +80,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
 	fi
 
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
 
 	eapply "${FILESDIR}"/${PN}-4.16-efi.patch
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /app-emulation
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)