Sync with portage [Tue Nov 15 00:23:14 MSK 2022].

1 year ago · c08b599cbd
parent c9fed05e4f
commit c08b599cbd
2492 changed files with 20224 additions and 27175 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29589 BLAKE2B cdb4bde6c2bc41aeeec409fcf6aa61bdede1892a95e1c6b0d27f2f77ee90dc46476b1004fd1246267a60160a95cde8ed79c5b9607482e2a197bda08fa15d4bab SHA512 a41cb1ba545fc77fb0bd721df298853fa3e2d91725993a0cedabecebdaa188bc03040536030421a1218c5d8bb17a66cf44b23069ce2cf057bd567f096f22e7e7
-TIMESTAMP 2022-11-12T07:09:44Z
+MANIFEST Manifest.files.gz 29617 BLAKE2B fa68185a697b562cd18202468c6ab2ffba981919df2b752c2cf6c309a23ce1a92ec9661d7300bd35702fdf73d3cbf3e0cb8e37b937eb695fc3d3a8ee9ff11233 SHA512 611c0437be2a110f97bd5c48f5ba4a6828f77a035cf567064ba9f3ca4033f30111f6b709051001a4f389a08b44bd23c27d872546d055b135601df3334937a3c6
+TIMESTAMP 2022-11-14T20:39:48Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNvRrhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNyp5RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klArthAAp2r2U41OXZy7WjsB2xynMmheIuPdZHu0rStUqK773FfgOWpdagsuRRV+
-1+OZFllVt+SpmgjTmF6hYo0Ou5SD0JzkQ8vgrt2nVnKqk3qDi0lk5b5RSYxlQ1RS
-6uc4rRG9VJo8yUQjC7zdVOdVgIbonVD0er2n6T6NPL7HvDjjkLot2V0GGvRCr/0y
-jJroUmrcner41HISn6U6Y1oUCTvT+3hvPoAnPLVohYh1nTgqaGqJTpb1m5muGQgg
-F8ddHkbak84AgFC8nQf2Cf1tNQyauKblB67GQlCuhxxn4jAojdhJrdjnWxq7d/GD
-LnpEZXesMXms+jegXXfSe5kEjbtKkRtqJHPhaLEwe9NqfsnnUv02X35Kvf1vta/p
-cnMw52Srj9urMxQCKjdcXTt+OcexF5YyvBRZHb6cRgPy2GyO0EdO10+oqCPpBmmo
-QZ17sUETDhKh4YiIZdV7zIzacptwSNFT9BnWyt5ByHC03y6cnqez5/Pp8JjChUSC
-nW8HSEssxbW/phF8MDhHiZWlwEy09+Q2rgXO9xmuAzTM5WeTfLADEZKKSF2Uk43B
-W3k8OvZRaun6p41PXM+W3rhxlINrHSWvpjyF0y+ZZRYWrvPJL7GhZLGN8M80U/UD
-va1z9j0xIv4dM6BDWtXZ+COeB4Q9ncgtbhBLxjCJ3nETSNQrd1M=
-=Y6qQ
+klCu3xAApuG7sTe5UX+p/p/hunVc2j7J5Q5D453Fa42qsLOlwtpWtjeB3JFSuzoC
+vlX/ubLIEWGJZi3fNMOVR7Swn30bjGVovUrnvFZ3vRbiuMJkFBFQW2h/nLXzq10v
+7Ke3scwrTchpT3NdctomYG87JFMu838NL0XyVWewBznvVsA3X+Dw/icGlfIt43LV
+P5NvIdmjX5OOJ+i8vnlGKb+M+Yq6mdUmox55NpH+hxOLGPftUd+DBQjfLU1XqMuv
+N6LLf3B6vY3w66cDXhRQvPPzWk5eGf3QW9hZSoh0T7BlV2XD9H58pc2conmA1qI6
+7XjrjP6bd/EDep6qwNIP85elVqLZsa+AhnV/h8CBsIzLwN2ZaiGqrwAF6HPwBuHJ
+6SsMzqXzbSXs4Vpzyh2rXHc5VuPXQgW+6/DokxvQ6Hc3SfstGfupTd43zuV7sWQn
+pqrfHE8gs3WMIXkHQOTVOR/ujVv9xjbHNEwcwfdektvwPtzquJyw+++Qja2jYaUq
+zEykk8vkiAP5BzAY+DwkBZ/4WTS6/l/HLJDy5Jxl5A4UvRS0EPKX2cZBtOg7Grzb
+92lb/o2L8+PgTdNf3e8ie8QyQII5+7HmQOizR2SlJo9Q3zCF1VT40vkaL9gHUZcj
+wuJHQMlWYJhNJTI+KAFKbMxKO/VjyCrUmr0izcvzMC09Dx9arJ0=
+=ylFG
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@ -1,15 +1,11 @@
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
 DIST ansible-core-2.12.10.tar.gz 7762154 BLAKE2B deffcc42c124a40ce34ce9a26a0c400b1199018cb05478ea8860500e1a507f9f604c1f40f0d006682fc14ad8f0cc3d035b8ffb1307ee37d26191be3c68e33253 SHA512 8b4eb0e923f976680e81ffbe942c4ddc7ddaaaffe83d14c20f78f7c6ab4f548f21920cdfa57b48de2bc24683028e744a92ac4ca45fecc459ea2b042de8c40737
-DIST ansible-core-2.12.9.tar.gz 7758384 BLAKE2B ed32d1ae9b82e96fe9a2ba2175e2a90961d3a6bb20baecd405e6c0bd1384ac61b9a1f1a1b7bd9f290d89d89c4451129f9049dd9c1dd7897a6d96f1730de4e423 SHA512 da88489c81293e8361067a17891f9330582b3d21c88584e3268f84511811364ce93c4e1b88b3796faea11274c76c64aa8af74608fce9a074fcc8fc3760d2b90b
-DIST ansible-core-2.13.4.tar.gz 13929408 BLAKE2B 17e27afebf9ce47d49fe9d171549cc46eca13604474545feb1c6e30432334d38a50e76a2fed71e978ebf44dad925ea66d63142599e07f78cbae8a2d25e923d02 SHA512 62678ad80b2073552070f154c55707c1b89bcb9d2d56235d76bb4701344e387d250590a931340cb676a605677cf69ab56b1b15b30d75859de4b294662dc50ee0
 DIST ansible-core-2.13.5.tar.gz 13934317 BLAKE2B 27ac2040f3626d645e57fab4df9b1b6a349fb81bec4cc8bb87b4dd16351f43d71a6210e32e2906346500742be2bf94512a1b05ba95b7ac0dfeac89696dfc9760 SHA512 e57dca7d457cfbf8a805442dd274499e3a6e4652303dc9e838b46c7dba9a36f2262e548bf9b6ff66f4e4bed5fa648abf9bb9a881047d4c6c0d6efbc91269eca2
 DIST ansible-core-2.13.6.tar.gz 13938462 BLAKE2B bf7bbeb5d5f7e27a2d72a61223559f79971aeb86d91688907c629388cf4c2578c88694f6ca23b22b6f8fe50cdaa909b34c05e9756258a062156a1e5d2bcea3b4 SHA512 2a91916e94bf65f76c450e548c6464660ef0e1a62e17f889785cb94c735c2bf153a2d8eff7a0dac90836a523f5768453bf18c4bdf3cbee0f8916d6cd0b11a902
 DIST ansible-core-2.14.0.tar.gz 13988948 BLAKE2B 7b68d72c292d8f3e8fb2d0d66fce0eca1de1b74ec1dc3ecaa2c4b37177d693567272260b3e98c9d81f7ff5e5cc4972dfa1f24c9f5e0119bb1da528388081d5fb SHA512 09e5b45608f7e1f341100dd89a6277a71a5ff0a45244cd6862a10d0f35a993c3cf649a5f9936ac726f7e903269f98a975804418516e602b8dd983bfca23c66cb
 EBUILD ansible-core-2.11.7.ebuild 1565 BLAKE2B 5d203f0e9ab504055997f86ef7b74139d2e667c937d33c6e50bf9a9b807ca509f3c3238f77b75cb95c22a806be53e947f2dcaebdc1f2427219a427916580301c SHA512 c0ee9fa9ddf8a6986c70ca68fd098df44fe82dc9cfe1529b18ca147f823a0f0bb882a852c80de7477d3591993fa43af94a8803b8a5c0f9591f18654cde3c2175
-EBUILD ansible-core-2.12.10.ebuild 1569 BLAKE2B daa7b9387359441b0770cf939eb3095df57e9261b968ccd69405404aa93eda83a73abb94880bfb648421aac0eb24eb79f5315f4c5ebaeaa3e13e03cab4655874 SHA512 e16750ec37ef00b05e6bebc31d31253ab78fb6dc2e60945bc29ef8c648693be8955308b706cac72c053eaf2136643f863cae141df9d261751c3b8f9d4ca86753
-EBUILD ansible-core-2.12.9.ebuild 1566 BLAKE2B 4b333bc88f164266edcd445d164e6922391ead51481dff3bc2513c573dd5abda37ebf6fc10cca09252b596aa67b617c8ef39b5e7e2fdda4349a85eb4d6014a58 SHA512 1182c8ae87094dea4aace7814de9f81829c65368b14ef1adcbf302190a65d2c1b7569b29a96b2ee402cbf11d833e2c59c4368206cfb7503193e6aece3be54b02
-EBUILD ansible-core-2.13.4.ebuild 1324 BLAKE2B 75ffcc424dd800cf57842aa168964ece11f7e59082aebee9e9a99af47d143266f859d1dad5b7b3be3f46a3eceae6af20911c7917aaaddbc8b249761e1c4b31d1 SHA512 913588fe37a8cebb0b8eb2bc395f2bd8e4e203893a2c232070e1a8f034c0c5f698355de982e01199a58461325dad6e596904ed122e3ea6a15d4f8b37659a296a
-EBUILD ansible-core-2.13.5.ebuild 1327 BLAKE2B 4d44adf3a972103182afd5b227ccbd839b79a2f40f911c0c724b925c0051f2b99bcf0781d9f1f46f621b37639d91d69869bb4b38c42499b3fdaac6a02bafa2af SHA512 cbb0678d3bbbf7cd7a0040bd2836a948bc076bc460bcee5ee01286e89b3512f80f5bfad8280ace7732ddc0a215db5a9baee9a96d192adb43a538a26a22faacf6
+EBUILD ansible-core-2.12.10.ebuild 1566 BLAKE2B 4b333bc88f164266edcd445d164e6922391ead51481dff3bc2513c573dd5abda37ebf6fc10cca09252b596aa67b617c8ef39b5e7e2fdda4349a85eb4d6014a58 SHA512 1182c8ae87094dea4aace7814de9f81829c65368b14ef1adcbf302190a65d2c1b7569b29a96b2ee402cbf11d833e2c59c4368206cfb7503193e6aece3be54b02
+EBUILD ansible-core-2.13.5.ebuild 1324 BLAKE2B 75ffcc424dd800cf57842aa168964ece11f7e59082aebee9e9a99af47d143266f859d1dad5b7b3be3f46a3eceae6af20911c7917aaaddbc8b249761e1c4b31d1 SHA512 913588fe37a8cebb0b8eb2bc395f2bd8e4e203893a2c232070e1a8f034c0c5f698355de982e01199a58461325dad6e596904ed122e3ea6a15d4f8b37659a296a
 EBUILD ansible-core-2.13.6.ebuild 1327 BLAKE2B 4d44adf3a972103182afd5b227ccbd839b79a2f40f911c0c724b925c0051f2b99bcf0781d9f1f46f621b37639d91d69869bb4b38c42499b3fdaac6a02bafa2af SHA512 cbb0678d3bbbf7cd7a0040bd2836a948bc076bc460bcee5ee01286e89b3512f80f5bfad8280ace7732ddc0a215db5a9baee9a96d192adb43a538a26a22faacf6
 EBUILD ansible-core-2.14.0.ebuild 1327 BLAKE2B 4d44adf3a972103182afd5b227ccbd839b79a2f40f911c0c724b925c0051f2b99bcf0781d9f1f46f621b37639d91d69869bb4b38c42499b3fdaac6a02bafa2af SHA512 cbb0678d3bbbf7cd7a0040bd2836a948bc076bc460bcee5ee01286e89b3512f80f5bfad8280ace7732ddc0a215db5a9baee9a96d192adb43a538a26a22faacf6
 EBUILD ansible-core-9999.ebuild 1569 BLAKE2B daa7b9387359441b0770cf939eb3095df57e9261b968ccd69405404aa93eda83a73abb94880bfb648421aac0eb24eb79f5315f4c5ebaeaa3e13e03cab4655874 SHA512 e16750ec37ef00b05e6bebc31d31253ab78fb6dc2e60945bc29ef8c648693be8955308b706cac72c053eaf2136643f863cae141df9d261751c3b8f9d4ca86753
--- a/app-admin/ansible-core/ansible-core-2.12.10.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.10.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi

 LICENSE="GPL-3"
--- a/app-admin/ansible-core/ansible-core-2.12.9.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.12.9.ebuild
@ -1,61 +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} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
--- a/app-admin/ansible-core/ansible-core-2.13.4.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.4.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/botocore[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
--- a/app-admin/ansible-core/ansible-core-2.13.5.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.5.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi

 LICENSE="GPL-3"
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,11 +1,9 @@
 DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
 DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385
-DIST ansible-6.3.0.tar.gz 35480527 BLAKE2B ddc064f6dc4b1fe820f375d150cc5f50875de4bf721eb31e88d0c279e91e96a6fd4d7981e0110f4fc7d424eeb4c44637c611442b4586d756106c437e240f3118 SHA512 3832159065d6400caade84de1ff5f31d64d7b5d9c3a61ae9bb2ad207e410166dac3537c68d0ec3df7c4b8aec61ee48cc4b690e3117a987efa9306c6cbee534e0
 DIST ansible-6.5.0.tar.gz 38275680 BLAKE2B 5d17ba2b8b3a0ccb1ea9873c0d500ca7984d2d3db19d062807004da5c001ee44d33cd6707226887bef8f6bae0ea9584f8c2c63a8cb176a2244b3b2ad92e13454 SHA512 ddb77304c6a9617186fa0252a0da91632ffc21f910e02fc68e340ed37de0806586a2543700e996db7fb0bb9240a2ee20b7a462f005de200028748b38fbb2e293
 DIST ansible-6.6.0.tar.gz 35620748 BLAKE2B 1e36ff72669902629cf1f373e9816b9d0a3136cb205867a24d67efc27b0ca3f2d361f3017fb1543c46da8693bb165ee6b354388611ab3e3186098513bd49f41d SHA512 51d06386dfb14ef826562dd4991556805d3e6014173965f0541e97b905984208a95889392dd3bb22027060ac767a354d53dfb9de774d5b461b15b236395d6fd1
 EBUILD ansible-4.6.0.ebuild 701 BLAKE2B d484948763f9511dd75724514873b3b0823855ce3c05e136ebe72d0dbdda4297faff6f8c1c4be0219b373683cc0e208413888b29469daf018e94730cca7bfa4c SHA512 6f5d5560e0fa042bf889ca44a59346184a11e44c7488ff73d04f4c71f7b95e35a5032732fc08ea9b1e0c76f0ed68a2c844fd00a994d4712369e9afcda415e3ec
 EBUILD ansible-5.10.0.ebuild 702 BLAKE2B 3d91e2541f6063cb2e6df89ecfec63e64609eaf9e3fc9fb08e0076d73899551734a05a64ca04234caa4bacf2ca95e3c766a2af5005c79c496af2a46020c7110e SHA512 5236c7ab0cce12706e5346084ba71e2fbf49d8be58b6164ed9b7312dcf1027826b6ceafcc22f380b08c4f180df2eb93a2f84d734af92272b2b246111cf1fe507
-EBUILD ansible-6.3.0.ebuild 702 BLAKE2B ea065c0134168d49da5ffe6c4eab27377d788a172ad26ddcfa811f4ffa1c88889e0e0fcebe2ba3f26536bc4a47b2d07c1c7711d946073caeb55b1f37c2725049 SHA512 b4cd181d78b5dfbc02dc499956bb0693447786f878b3d9efdcde61dde6cf6e44a1cf7b63ca9217fbd0ea1d742b0695f16ae50816220bad24094f70f3ba44acf7
-EBUILD ansible-6.5.0.ebuild 705 BLAKE2B c01b5eecd57078d7c34c1992a5ade3d72f941bc14ee3bb1a88d3731f72aba08643bb53df826cc6c184100d404d2331f136d52a0299c1df7b1bce7cc692ef6842 SHA512 813a49b0388a0560e828a1bf26d9093dafaa5faf71317b0f60dfe1f044ff96b0acaedfbe086bb017b0199b0f1770a2f9d307a212633524ab6f17d00c02f84ea4
+EBUILD ansible-6.5.0.ebuild 702 BLAKE2B ea065c0134168d49da5ffe6c4eab27377d788a172ad26ddcfa811f4ffa1c88889e0e0fcebe2ba3f26536bc4a47b2d07c1c7711d946073caeb55b1f37c2725049 SHA512 b4cd181d78b5dfbc02dc499956bb0693447786f878b3d9efdcde61dde6cf6e44a1cf7b63ca9217fbd0ea1d742b0695f16ae50816220bad24094f70f3ba44acf7
 EBUILD ansible-6.6.0.ebuild 705 BLAKE2B c01b5eecd57078d7c34c1992a5ade3d72f941bc14ee3bb1a88d3731f72aba08643bb53df826cc6c184100d404d2331f136d52a0299c1df7b1bce7cc692ef6842 SHA512 813a49b0388a0560e828a1bf26d9093dafaa5faf71317b0f60dfe1f044ff96b0acaedfbe086bb017b0199b0f1770a2f9d307a212633524ab6f17d00c02f84ea4
 MISC metadata.xml 731 BLAKE2B 26c756a1f3d67f68ba824b56b8a7a48f13e6586c761da02d61852c7669c419ecab686ed1bb59ac7e229038413fdf9c0521b11d005e8250b63380c1b5282586d2 SHA512 e6d8bf5b9748c6aaccae0fdeb3f187be80d5a956dbc57578f6fa344a667624a0a4ffbaba689d2f7bc812dd91fb3b959b3293260729ce7c995a20fe47b2cdf097
--- a/app-admin/ansible/ansible-6.3.0.ebuild
+++ b/app-admin/ansible/ansible-6.3.0.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-core-2.13.0
-	<app-admin/ansible-core-2.14"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
--- a/app-admin/ansible/ansible-6.5.0.ebuild
+++ b/app-admin/ansible/ansible-6.5.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"

 RDEPEND=">=app-admin/ansible-core-2.13.0
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -13,6 +13,7 @@ DIST aws-cli-1.27.3.gh.tar.gz 2295495 BLAKE2B cd396d324f2a7c81df2488e61cd021819d
 DIST aws-cli-1.27.4.gh.tar.gz 2296705 BLAKE2B 604306821f91decf0fb6f88d1115000164f393c8a878b5990ca25a2f8d36972a88832079844656e26f084c729aa0e05014e9ff9ca95d1e820346214f5d1bfde1 SHA512 0753e78e43e3d26fcb906c068e78e23ca3ecfbd4607d1f9d8487922d6a1e6b5598b80b9d2cae6236f6b4724e1667b51132c90b66eec7c427ca35aa6f7b3c5f24
 DIST aws-cli-1.27.5.gh.tar.gz 2298711 BLAKE2B 190b2483cf09d4eff2848cc0933a957ae0f6e8fc88a24bc5a0bc637d6c659427fa4145a5509a6fea731fc0f5e09979d8714bdbb0627c0257db4ceb6bd5e09eb9 SHA512 b147660b72604ed29bff27d76ead2018c3c924339472a6499b4553cbb439d239bef11c6ab24a34303b01407da94e79fb5e3729576492340cf097399a637713c0
 DIST aws-cli-1.27.7.gh.tar.gz 2299694 BLAKE2B 9a68f642120506d1b7f002a261961f40c0b91c43a10e2522f9162ad53ad70a0b8054d9c2accc7d6267c1ff3460970b05c90d0e21a7590a084e82df553a478a9b SHA512 067d7d0491ff9f83be84e709570a9e6ed8e6cdbe47698c0924c2c776fa6b682cf130e7e0b0569e68b94a92e5fee84c60cdd02ad570e262dca81cf644a168e6ac
+DIST aws-cli-1.27.8.gh.tar.gz 2301766 BLAKE2B 1873d92b8d2f6d3f29a65b4177927a1a14034da71dbc95ff6abf3f49df6cf3ee192412eeea15be14c8cf9fca0a5603f2c76b80b280f4feb95e661055abcd8b60 SHA512 e53828cac1b3e10e2ddd45312d71cdb748216dbc37c3e9833e7a1320b236c3bef6a13204a38b946d9182430f169fca1ddc77d3d06c1c2c6e05978dc61f675168
 EBUILD awscli-1.25.89.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
 EBUILD awscli-1.25.97.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.26.0.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
@ -28,4 +29,5 @@ EBUILD awscli-1.27.3.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231b
 EBUILD awscli-1.27.4.ebuild 1844 BLAKE2B 7f8265feaccca47c18e706c8f216be88116d7bb0e406e5dbaf1a4d92826de02fb80b522daebbadca297d26fb5e84a9d2739c998ddf8ae736c304c4b046df7b87 SHA512 17fbf378dd5bf9afe1fdb2d6d7e22d610eaf863063d751a68c76bc1cf9e3c2896ba6b4c44a15e5d2aebb5e0881553d2031e378e9026bb517921cef677e917066
 EBUILD awscli-1.27.5.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.7.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
+EBUILD awscli-1.27.8.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.27.8.ebuild
+++ b/app-admin/awscli/awscli-1.27.8.ebuild
@ -0,0 +1,80 @@
+# 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_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@ -1,3 +1,5 @@
 DIST hcloud-1.30.3.tar.xz 1690980 BLAKE2B 115a6769d5bd5e6a10d812502506f9921a7659a262eea7088c88205e9fc748a570c1c9830e5061923f1be18a64d96104e6e930c9edc3316645e5d86450fbf69c SHA512 64bc692b8d098149815ba63aec8346a7f4f2ff7461fac3369343595a733a5c727b41ec8341e4eee1a98804b14bfc5a94ff9fc0621abb798d381d9bc802818b77
+DIST hcloud-1.30.4.tar.xz 1725492 BLAKE2B 25af9abb1bcc3e7dce880774716c1abe8e4c7da52e5ae7e7bf1c872e50ee0f66358b981df3401cb97ede1b6c6950b97751b8200a72713d9dcf557891b3e7d81e SHA512 d3572be3ebce21d3dece129d391261fd1ff8a769660509cd67946815d1782d5dcf003b2539b3eb9a9b6e40bfd9b452e438fc7b0ff2805a7808ad8ad9f32c3ed0
 EBUILD hcloud-1.30.3.ebuild 725 BLAKE2B edcbd89bab62c808b5d21c0df6e3a5e2420163bc955ead8cfb156a693f84ecf6ab7bb6f1f546bd9b3bc95ea43536ccd9ace2e6fb22f15edd067e6ec84a362e6d SHA512 e32ce446972a048443945716eba008cefbd43e0d08ffbf381a20213675485472e5b6576677764a5aea9cac2ee096ad6990bbfd0f763849ceec508ebf1c577497
+EBUILD hcloud-1.30.4.ebuild 726 BLAKE2B 7d96a9012f4b897b54576a5dbedb9419e0fcaa34476e68d252b907132efe6bc638ad9598a034160bcff3dca5b86dfe3a9cc9b4380b8606db71c889bcbafa2e2d SHA512 78a825e2b55f7ffbf6c5e7e8096f788b26d9fc4205edf5dc05286d8bf9da17d5f17d266f6c990bb07154edd7ba635a4c332241ac225e6b3ab02ab9a9f82f68d3
 MISC metadata.xml 338 BLAKE2B 6ba2cbe509581ac35dabd93abe166f960d69d1f14336779848483386d28e22dd06e5d196061312827b7a945369f05a466417a1636b607e138515957a75db6f84 SHA512 cc69ce0ab7ba3a9af94ef1918738074cdd725bef2ff70d6c19e46d07bb9514d05ef6415c7ba5b372e7a98902a8440cdb9f7b14a848c3ff2f054863356971ddde
--- a/app-admin/hcloud/hcloud-1.30.4.ebuild
+++ b/app-admin/hcloud/hcloud-1.30.4.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_test() {
+	# For upstream a simple test is run 'hcloud version'
+	./hcloud version
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -1,11 +1,8 @@
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
-DIST puppet-agent_7.18.0-1focal_amd64.deb 33767214 BLAKE2B def38171c1e0cad50cdffc8aada569af0996b1b7e3f788ffa3c5e3b05d0456d2776f2d12a4cf2f8a9227ebf3c1c13b52fa28f210249b04a54de1fbbc19f26c30 SHA512 387d3e1ca3a05c107411dc7a126b2984e8dacf3580823022c0010f33b08305b6722d8a1babee7825b8f60769589b1f166991931f66a484d94a17ac7d437141e1
-DIST puppet-agent_7.18.0-1focal_arm64.deb 33559710 BLAKE2B af2a4657c95dc7208b5c2f7494b9cec03f1c9ed0e73c06c150f492fa474d5620f5a58b23b7d928d4117a9b2b8c6384514b7f7000e7a6639582ebe97ab82571a7 SHA512 fafabbd00c4ef03b3bd6d9680bc78ada42ffefa8bc8186f24203be277e01267363f0ff35f176f3f04057c46ff437bbb957d4416ce5b6ffc1b3e1f79492c2ce7b
 DIST puppet-agent_7.19.0-1focal_amd64.deb 33779898 BLAKE2B 40ced6309bc82a2a917572b35d2e6271f53c1b56721cf5d389b7a297774c08fb430915880279a11c1b4d803582793340127b21283202b527e2ecf826176c314d SHA512 2d8658a0f1b684ae07b2a8a87e130d210283bdc78b1a10750605e970cc9a2310967c85bc054c9e018d38fbc955708d6ebdb205b5562df6ea475386be9ea02581
 DIST puppet-agent_7.19.0-1focal_arm64.deb 33570768 BLAKE2B 21f7c6c8a42a14156f209313f0dce40336a53fdb097abe620edcb92b2cceaa20e08adec8fc22241886eac3ad0a7ba94d805dc1e2d9bbd37853ff037a49f004fd SHA512 306236a7543f01b3fb95edbe3b442717a64aeb22d696c9961a770e9da40b2bb58835c6d9488b03109b81f8b748106189c361d5f047e9202700e0801486d18206
 DIST puppet-agent_7.20.0-1focal_amd64.deb 33766302 BLAKE2B 665f4d4d8c3b096ec5f270428d0b865dc10b77c51113f65f9e66ab6bb72c3b21a07acd9433f2cc1e4e05c0fb30a11884f0bfe7a5a8a9a1d882bdd049a5490b84 SHA512 91b7eef80bc5e288f8a59a52d41340d1bc921e0754151952a3921575787e4cec1f101039c75a01ca6e7e4a5512224922be0c5be7a676d92bb19d3de291a7ab8c
 DIST puppet-agent_7.20.0-1focal_arm64.deb 33547934 BLAKE2B 323d76ac12af0c97cf38b8a78454be89c900eebcc9b1517c716700badf8845c062d2c4eb2f633ed1b6ffc36cb42e7e16a3e4e815637e92c209bc6f3c40cfd525 SHA512 a04727c71cf241e352d14bcc09eb340199a7e42b18be574d822a793ff9d91ff1e1879d67724dbf2133a6a3842fa86ed45b048845c73a5669fab45dacea3e616a
-EBUILD puppet-agent-7.18.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
 EBUILD puppet-agent-7.19.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
-EBUILD puppet-agent-7.20.0.ebuild 2594 BLAKE2B 50cf4300e0420105383d9ce375f643b6122562bb5cf6841db7b8009107bc752827be49288a30c9ccce030b854c3dcbedde3d86bf64e9af37cef7cf5b2e521faa SHA512 9c4e4599785c65a32bdf31a7257862c953bd3c7ee1b7db2279bd1bceb9082ec20dd3f020a3592f5bd211e27b55fa8a5ed7b116c67d11c73151015f326a66bb81
+EBUILD puppet-agent-7.20.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
--- a/app-admin/puppet-agent/puppet-agent-7.18.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.18.0.ebuild
@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd unpacker tmpfiles
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
-arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-# virtual/libcrypt:= is in here despite being a pre-built package
-# to ensure that the has_version logic for the symlink doesn't become stale
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet
-	virtual/libcrypt:="
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt[compat]
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	keepdir var/log/puppetlabs/puppet/
-	chmod 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd2" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-
-	# Handling of the path to the crypt library during the ongoing migration
-	# from glibc[crypt] to libxcrypt
-	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
-	if has_version "sys-libs/glibc[crypt]"; then
-		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
-	else
-		local crypt_target='../../../../usr/lib/libcrypt.so.1'
-	fi
-	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet-agent.conf
-}
--- a/app-admin/puppet-agent/puppet-agent-7.20.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.20.0.ebuild
@ -11,7 +11,7 @@ arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"

--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -4,11 +4,9 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-7.18.0.tar.gz 2816776 BLAKE2B 7c653744a9aa694c6e7558295d33fa8de1958f333cb274a51119ce543846ce649755d5c37ba677d1cdcf2417b237611073ef523aa7a109a3e3dc0e75bd986614 SHA512 428268c9d8333c0624023a3d4b55b5dddfaa890eb6d88a31486c8de5112db4d1dce7553050de81c4b5ffd0fec74c5d10f3c09c3fb1826ffc196808f2b45495d4
 DIST puppet-7.19.0.tar.gz 2817098 BLAKE2B d2d756aa236461963ac260167f9500693ea94f1b2ce7b6f881c55712f78668ce5935528a74d3a77e5b02123aeb4404c1bbfc91237622dcb68e686e920302acb9 SHA512 952ae1e77e9d9aaa0a0a731f408550fd3bf483dda9bbb12845e534e6208321db774325da8621f36535d7601bd7b8611098e486ef733428b7108f613f5dade4e0
 DIST puppet-7.20.0.tar.gz 2817232 BLAKE2B 479c4e162230371bd69509844fcd97d0d3392eb2e66578b38e6dc120dd3dd15804d73f70c1b29f1f3d9e57af539f82e605a86c9afff15e78ff48ddf482432c4d SHA512 6774bf03ad0ee80c0fd2cd8ebad60da56df7ed9818a526084fc2cf1ba2fecc81555fff200f5feef2b5d7a2275d90f44b24160de7221d682de470b511a7051f7f
 EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
-EBUILD puppet-7.18.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
 EBUILD puppet-7.19.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
-EBUILD puppet-7.20.0.ebuild 3466 BLAKE2B ce3608883ebacb011f099fdedccc247e5d81d4e6e3956ffb1bb25ca4e201fd50fc180a7314fc8c8254ede8a841da3ace83253257449fd3a1d6cba70342baaed6 SHA512 0eee8a3d323b5d4f004fbfe55d8e4387dfa8c13e8f49b34304850b3854e72b3639f505e8ef14ddb14c126f52589cf04f16d0bf55de807aca496af9f4a89d69fb
+EBUILD puppet-7.20.0.ebuild 3464 BLAKE2B 6886a93d04137efbf35c6893c705b161ddd3146a7cbeb1189ce85f0475ddf44ad8287971a69163a7d766c2789c722241a7606777b34fa9eacfa5754401931c2f SHA512 6dad2155b69165abf08c886ac634153602bf651c6a59d73ef79089f2baf8def0e75d6fe719b4b6011a296f88eb6d13c5bc25fcbc56c56d4699a227861765a682
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
--- a/app-admin/puppet/puppet-7.18.0.ebuild
+++ b/app-admin/puppet/puppet-7.18.0.ebuild
@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem systemd tmpfiles
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"
-		dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet.conf
-
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
--- a/app-admin/puppet/puppet-7.20.0.ebuild
+++ b/app-admin/puppet/puppet-7.20.0.ebuild
@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"

 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"

--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@ -1,7 +1,5 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-7.11.0.tar.gz 49070151 BLAKE2B ec59603b5fa2fe38a1d848e5e4e9926bb9e9c53bfda55c5093d6ede3ef0ee2cdd2cffe8f6fa8599d4b1a533b251c13871453cf7bc378edeecff69364579db650 SHA512 160123cea5af42c6196893a3993c4fdcf3c6690e43f56d2e01342b9fd5facd8777d3eee5c7ec658535f222cf1a6e52b3ec955e4b1ddff4c3346b363be36420a5
 DIST puppetdb-7.11.1.tar.gz 49075994 BLAKE2B deb1a031999f18988c44b1439670ebb370d654a7dd99f20f44cdce027fa48088eadc96adca4fc8efe298c4dcc9b62d0d607262d8a5de4d07de0f2405a0f05a36 SHA512 98238e61ae7798912e345d69ff321bd7236dea6d5230a1f9ae37c533993d29611890522dde085e18e83b87bccb5a53e49e4ad38b930bb09ce7e9f22d45776a60
-EBUILD puppetdb-7.11.0.ebuild 2705 BLAKE2B 94ce5edddaedf43f4d7b43f29ab965c89ff8f19ce24f5b22dfd287aaae6d66c4a14166a75688cec6846071f19051ad8c860296f95cd5b24fbd3cb27854282b1d SHA512 8a3197584c151e7b69491fe3e7797bb13eeebea9fd8255fc6778f7995aa3f476d840b877a7099c93c642235e787611e6a811c8dde0b019bafdf8f60a1ee5d4a6
 EBUILD puppetdb-7.11.1.ebuild 2705 BLAKE2B 94ce5edddaedf43f4d7b43f29ab965c89ff8f19ce24f5b22dfd287aaae6d66c4a14166a75688cec6846071f19051ad8c860296f95cd5b24fbd3cb27854282b1d SHA512 8a3197584c151e7b69491fe3e7797bb13eeebea9fd8255fc6778f7995aa3f476d840b877a7099c93c642235e787611e6a811c8dde0b019bafdf8f60a1ee5d4a6
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
--- a/app-admin/puppetdb/puppetdb-7.11.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.11.0.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles
-
-DESCRIPTION="PuppetDB collects data generated by Puppet"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-	acct-group/puppetdb"
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	doins ext/config/conf.d/auth.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	tmpfiles_process puppetdb.conf
-
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@ -1,9 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-7.9.0.tar.gz 66386534 BLAKE2B 8aac7501c9923eb67bd06e965dd766ddce290b2eaaa8c752f6c7124a13d24364ede22847fdd1171d0e71b45bae191bc3c9b0c89cc5ebf9ed78d5230b8e28bfcf SHA512 6f0acabbf332072306386b4d942532270e202801bf98dcd436884c85b969437ca51adefb51a0f99556432c4c204e03ee8d3fecdecadf5e046b037ce06619a27c
 DIST puppetserver-7.9.1.tar.gz 66383400 BLAKE2B 1804191a5453ebe55c5744687cce2f6d062e397be7b29a44d2749d0880ea20995ddbd9efdc9ddcde17021c011ff5b665f3e215e49143424f7fe470d915c3b6d1 SHA512 2b8e43220480cad0d1140fdc08491bf7296b72c2eb228da56d5b569f6b39dad1c3968af1942d3a1d1b34a57d994aaa2b91edff20f1d54905477a77f3062b580c
 DIST puppetserver-7.9.2.tar.gz 59729859 BLAKE2B 15f9261ae81f280735080a75e083b4bbc5d4b9404bd52f02180173b6cab2ebfe20e38950dd6c94c5167478293056ac562994ff27a7ad955c69621c13ffa808e1 SHA512 0c047554e10ecf36d000c9f702b759e27b8168f1f2207d9b8e904c9579d8e37d8540327d898b0a9e1812ca3223aa15b7cf4da46d7a4247e5d4b8f1596f9d5f26
-EBUILD puppetserver-7.9.0.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
 EBUILD puppetserver-7.9.1.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
-EBUILD puppetserver-7.9.2.ebuild 5356 BLAKE2B d16d614eafd7c9770b1c1b01afa58f7aa51bc5de6055144736a1bce4931f2752861c6e1ab0b0f17a477406b9384e3b492fc4a86d4bdf45ddbba50eda36496c55 SHA512 01ea3ed8ea76519754a51921c9c58aec187192915b3fd92be92df0db6fce8caf78bbeca6af12715581495f85d65c147e6bccdc9b90e3292aad18621e4ce0d4e3
+EBUILD puppetserver-7.9.2.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
--- a/app-admin/puppetserver/puppetserver-7.9.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.9.0.ebuild
@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="amd64"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	keepdir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process puppetserver.conf
-
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
--- a/app-admin/puppetserver/puppetserver-7.9.2.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.9.2.ebuild
@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="~amd64"
+KEYWORDS="amd64"

 RDEPEND+="
 		>=virtual/jdk-1.8.0
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,5 +1,3 @@
-AUX sudo-1.9.12-CVE-2022-43995.patch 2162 BLAKE2B c7de0e562aebe7dbb92e793cab7527a43ae6125fd48cffa776a5bb0da57d80d5dff1c7d26c23bc5f647b578c5fe5959913c23f7f9ec84f7a5f887bcb47aa8b2c SHA512 d3e3b74a98a42cd3c55cf0ed5da43dcd5158ec54e614bc41eb8e63b77fbb1a11991cf9d7f705f077b8c474331cd8762bfef717d4c32771eb44789123ffa87714
-AUX sudo-1.9.12-mips-build.patch 1148 BLAKE2B 6c31a0095b7d615b0f8001f2484e2df5aa975b025bb4747344e1b9d55a0544f3e89f02cd7ebfd5a4cdf1712e1887b97ff3443a98ec6884724f70f3505c7ef05d SHA512 da98b5a163f8e843a8aed7736b84c50985180910a3d78a5014c91e958d0d8571f374d8b98803733864b6cbf3c8a938f8655063f491b55411c03f2c34352f505f
 DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
 DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
 DIST sudo-1.9.12p1.tar.gz 4908060 BLAKE2B 976d00fb16b0d26b2714a188e379ccba102e0fa67b8ec6278e5435728af0cc9ba23d63db64a87d4e14d59cd52d3f62401943eb7c0f9c33317179ff764a9f950c SHA512 6f564112aa1e0e9cd223adb280bd430d513109c031e52deca308501234dedc0d7418f13cbb9b4249ac58d997cfdae1908c280c26733acbc55dbf9db45dff239a
--- a/app-admin/sudo/files/sudo-1.9.12-CVE-2022-43995.patch
+++ b/app-admin/sudo/files/sudo-1.9.12-CVE-2022-43995.patch
@ -1,53 +0,0 @@
-Bug: https://bugs.gentoo.org/879209
-Upstream: https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050
-
-From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001
-From: "Todd C. Miller" <Todd.Miller@sudo.ws>
-Date: Fri, 28 Oct 2022 07:29:55 -0600
-Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8
- characters. Starting with sudo 1.8.0 the plaintext password buffer is
- dynamically sized so it is not safe to assume that it is at least 9 bytes in
- size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz.
-
---
- plugins/sudoers/auth/passwd.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c
-index b2046eca2..0416861e9 100644
--- a/plugins/sudoers/auth/passwd.c
-+++ b/plugins/sudoers/auth/passwd.c
-@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth)
- int
- sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback)
- {
-    char sav, *epass;
-+    char des_pass[9], *epass;
-     char *pw_epasswd = auth->data;
-     size_t pw_len;
-     int matched = 0;
-@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c
- 
-     /*
-      * Truncate to 8 chars if standard DES since not all crypt()'s do this.
-     * If this turns out not to be safe we will have to use OS #ifdef's (sigh).
-      */
-    sav = pass[8];
-     pw_len = strlen(pw_epasswd);
-    if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len))
-	pass[8] = '\0';
-+    if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) {
-+	strlcpy(des_pass, pass, sizeof(des_pass));
-+	pass = des_pass;
-+    }
- 
-     /*
-      * Normal UN*X password check.
-@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c
-      * only compare the first DESLEN characters in that case.
-      */
-     epass = (char *) crypt(pass, pw_epasswd);
-    pass[8] = sav;
-     if (epass != NULL) {
- 	if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN)
- 	    matched = !strncmp(pw_epasswd, epass, DESLEN);
--- a/app-admin/sudo/files/sudo-1.9.12-mips-build.patch
+++ b/app-admin/sudo/files/sudo-1.9.12-mips-build.patch
@ -1,33 +0,0 @@
-https://github.com/sudo-project/sudo/commit/7944494196d4a9b33e0ae64a7e20f86e19c336d3
-https://bugs.gentoo.org/878401
-
-From 7944494196d4a9b33e0ae64a7e20f86e19c336d3 Mon Sep 17 00:00:00 2001
-From: "Todd C. Miller" <Todd.Miller@sudo.ws>
-Date: Wed, 26 Oct 2022 16:35:30 -0600
-Subject: [PATCH] Fix compilation error on Linux/mips.
-
--- a/src/exec_ptrace.c
-+++ b/src/exec_ptrace.c
-@@ -282,16 +282,17 @@ set_sc_arg4(struct sudo_ptrace_regs *regs, unsigned long addr)
- static bool
- ptrace_getregs(int pid, struct sudo_ptrace_regs *regs, int compat)
- {
-+    struct iovec iov;
-     debug_decl(ptrace_getregs, SUDO_DEBUG_EXEC);
- 
-+    iov.iov_base = &regs->u;
-+    iov.iov_len = sizeof(regs->u);
-+
- # ifdef __mips__
-     /* PTRACE_GETREGSET has bugs with the MIPS o32 ABI at least. */
-    if (ptrace(PTRACE_GETREGS, pid, NULL, &regs->u) == -1)
-+    if (ptrace(PTRACE_GETREGS, pid, NULL, iov.iov_base) == -1)
- 	debug_return_bool(false);
- # else
-    struct iovec iov;
-    iov.iov_base = &regs->u;
-    iov.iov_len = sizeof(regs->u);
-     if (ptrace(PTRACE_GETREGSET, pid, (void *)NT_PRSTATUS, &iov) == -1)
- 	debug_return_bool(false);
- # endif /* __mips__ */
-
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@ -1,8 +1,11 @@
 DIST xz-5.2.7.tar.gz 2105803 BLAKE2B 5363c5d0403e041c6d2e35b5d3321feeb8e63b8556496373c820975850b50e28e0da903446a49ba516fd9f40e0101dd39cfa9a9b8dd143c9849c84a715bb5d7b SHA512 06329fdbd1d897aa99dc96900c6246457288c586d02bb4869a92dd2f97973f95acb3a2fa9598a20613ea029f816836a8e3b65e36fec2b807b5e7553141429ab9
 DIST xz-5.2.7.tar.gz.sig 566 BLAKE2B 00702dff24d655ebf30f2bf8bee94406e002164408b9eabb4f461a789482584c2b9c90675b8d1d5e030913e674946aa7392b73fcedf6ac62e3b1e3bc05bf92e6 SHA512 556e05107437fae2c75cc1a93465fce04426707e979403f41c6ee5b748fe7c3f985812a4e3b07785a84f68ef9d9f362ded470af1cceb9f4e8c80620a2699163f
+DIST xz-5.2.8.tar.gz 2118089 BLAKE2B 28d4ede071ebd04fe6ce6b9ba88245aca432c7b3077a4857a14310001cbd1230026888d1813b5c163b86de3ec78c92418d9cb35f867f1a8ea65e5de593091676 SHA512 aaba9e4dfabc1ccb66b92f5930ca07219089c7c02396be80bd727073f90c824d2698f7aaaf156b881fdc6750da993e8a6289929d71225df8327bc3beed5cdee1
+DIST xz-5.2.8.tar.gz.sig 566 BLAKE2B c3f20d6fabd42839c0265b9c5a308b43392705f4923f83e9aba808d5d2b03814b1af566c1ff078dc0a69143420a47e5ee0a0f8dcc6773595d1ee2a8e3922a88a SHA512 253c0877357cd7305f4c852cc2b946b196a4007b48b58824446729f8f2390f6465d6d2bb9087d1147a40a707940142a5eb7ada91f0323b95482b92eff05904f2
 DIST xz-5.3.3alpha.tar.gz 2119150 BLAKE2B 031e1a1556cbbd49565c2b72676e46a22c00e0e25bca2938c21d56f2d7f585c294d2a3a5712a3ae5d62fe8fef6e7b2f411fcc3c0ccac4714786209599b599d25 SHA512 c780c6854cb7599ed97629dbf923f5c6802b48e12aa25638c863e2403e56557abffb2b501823d4d53c852b7d09360b9ede355989756fef1daa1fa8cd9395da8d
 DIST xz-5.3.3alpha.tar.gz.sig 566 BLAKE2B 2a02fd8a84c27967384021aa879efdf598b40ca9ff552080be2d057f402b3aace13bb0d98574e0185edd6ee3084793767f9941d4c1f21f5c5d55f886025cb845 SHA512 e6a849f2dd6f67ad3d51f50fe5f3e7f2a57e97e9d89499e2f88b94ab9716f1db5de34c3bb6f17b6fd55498ee5f4653d3d25e1a495b9c682b3200b2603a85479f
 EBUILD xz-utils-5.2.7.ebuild 2847 BLAKE2B f7e07afe31018ac1aaa06ce82467d8fb119abb0185a6415fb6d63586f9c924d85b21279cb845b8b8da3db8a6927c7cc27b6f056b1b7669a9b6661f8a824fe258 SHA512 79c90863cae998c4393da6bb1d877b15248ad81ecdbdde77ab0bdde1222933abf725c7c5b42142e0698bf293cedf14b66dea251d62fa5cef3815026611e27294
+EBUILD xz-utils-5.2.8.ebuild 2855 BLAKE2B 2c19431300aaa009d555ed79110b8d72468514508c665743ccb90704b372a742397b07f6ca0500fc0c2941a0cbb93d8478dcae65adbc0b2ce25edaefd12baacd SHA512 e80b77aea4996a5671b7cf07e74923013a2e8a45fa9848409d6b8eb123cd713d4b40ab98cdf2757fb470f74d00e8067bc557af42568b358caf7d41336645938c
 EBUILD xz-utils-5.3.3_alpha.ebuild 2885 BLAKE2B 00cedd70d450943dd489e6b9e05ce1d7a0f5f4472b501f4587cf482c2294fcd7f86d5811a7325b6812f468738a0144838291033eb83afb79aaaba640b34800d1 SHA512 8172456c5fcfd424a4f2bf7e6993fc67b782dc8a7fc3c4c433610cae31252acb2a022cde8a128d5e20d5842ceee4a3b5eeeff9f8a4e9c0f667505d7397a37398
 EBUILD xz-utils-9999.ebuild 2761 BLAKE2B 909cd4550713dd2eaae9f242ec5c45e5aedcaa78748569bfcaeac3c867638bfe2f0e8ecc0a7dbd0b1220f7a2860cfe1430545e272c0a97cbf9877ebc5190cc27 SHA512 88b9523cb3c31be766d78198716489fc9b26ac39897b20ded7c775c9c74969028a84241af1ee688149442ab9c333f1ec25f7d134a8182bfd4396c8f17995b3ad
 MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7
--- a/app-arch/xz-utils/xz-utils-5.2.8.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.8.ebuild
@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	inherit verify-sig
+
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="+extra-filters nls static-libs"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+fi
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-threads
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/daa2iso/Manifest
+++ b/app-cdr/daa2iso/Manifest
@ -1,4 +1,4 @@
 AUX daa2iso-0.1.7e-buildsystem.patch 342 BLAKE2B 45c7b8c8820f85524b47763fdc5d0eab4c91b89927a68d6d5c1f951c255e3140d596c129ac0dd55efcca498d72c21011326fc2c0887cb5e25a9808d2433390c7 SHA512 44ef91a071fa7723699e185a2c63ca7bcf893df08a94ba0daa6c1803b993558c1d33898818cf73b709d635dc922e32a963491c23985a2f650ea78eaa8687ef75
 DIST daa2iso-0.1.7e.zip 49862 BLAKE2B 701e8e853589e5d0fa1b2b5f80fefde0e61b32dcd40b2b326423e457510b2464fa64f1797e56d46341c13cfd938191a470e04252fd9bf0f39b76a29048a8e378 SHA512 dce00d3bfa4f4e60fd1cfa3ea606bdc8b9fdfc9ce14192ec0204a6da749dc2fb3a0f1de600c19f251e165c7b1f6b66fc14edcd97a38cfa4e163746cc8db5b38c
-EBUILD daa2iso-0.1.7e-r1.ebuild 547 BLAKE2B 477f926b9bc169c9845852982831cd2de0ae5572ade84a6bffe11a9d0e1fb4efbee93ee51a5dfff38d6ca6c94be59e6d061956c8b21c5902c76f7217184cce41 SHA512 5be51a509cfd4ab3847842acd6a357a18e4ff17b0e21b1908acdf93f70d904df3f58eadeac0be930b28e31a9e3c911803789bf05bb1d080045ba606a695e6f20
+EBUILD daa2iso-0.1.7e-r1.ebuild 550 BLAKE2B aa720d53b0fc3733d74ec3c29538b38dede1dd05269250e2198fa62f30d4cc222e5d3d699c80d24f8c9319b35b96cda0a182c6d847736a5b4a6e247599300b46 SHA512 326cc9874eccfc733cb52d06256fa8346a59184d2b2b5912e3cc6981aa82d63a809d5c53aea48e77adca7fa33fa33edf31769cf01d5bf513366c75c891708e96
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
--- a/app-cdr/daa2iso/daa2iso-0.1.7e-r1.ebuild
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e-r1.ebuild
@ -6,11 +6,11 @@ EAPI=8
 inherit toolchain-funcs

 DESCRIPTION="Program for converting the DAA and GBI files to ISO"
-HOMEPAGE="http://aluigi.org/mytoolz.htm"
-SRC_URI="http://aluigi.org/mytoolz/${PN}.zip -> ${P}.zip"
+HOMEPAGE="https://aluigi.org/mytoolz.htm"
+SRC_URI="https://aluigi.org/mytoolz/${PN}.zip -> ${P}.zip"
 S="${WORKDIR}/src"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"

--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@ -6,5 +6,4 @@ AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c29
 DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e SHA512 b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
 DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12 SHA512 bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294
 EBUILD lxd-5.0.1-r1.ebuild 5266 BLAKE2B 2f20d02ee22f269ed7deeeeb32e22de091831d43c477e436636b6eeb46a95e75fea03286dc40924d254a3aa94b71e8a1671d7af7b92d87d6b8a1e05a28480433 SHA512 79f983eac69484eedaaf855ceff6bf52588a00821034de5faaa582e0883af7ba56e64b53bea9f0b74678d055ff87ec33c2940e9b86f5f755ccf90f74bb4b3971
-EBUILD lxd-5.0.1.ebuild 5274 BLAKE2B 0c2fdc04e0175dbb5f82926f6fb88c8a0c8e4b7419b8ea90d2f6ae4b338b2bcebe681b1fb969d28bd5db7affcf487b76e5cae7421c5639fd58f44a955e414d9a SHA512 f29e380da1bd39d68e9126980bb9d35022b055259510ff8363a8093e81ed45be05a3652dde184e0f4be7d1337a7945803bf6a1c3f5cf03ac57149b02a256b876
 MISC metadata.xml 1403 BLAKE2B 4bff140bc9282b41631293b9cc28a5f85bec2b0f923c762c6572e75b752aba113632747142bd3b3a87322ce8d2ba10fd15afe3f1a7c1384e49c408ca176f267d SHA512 38fb2faa661a8473d0221117299baea01c06f46e5fbf5bd7e32f26b7d0a433ab35c5e0e5dde42c7478b7118489d619fdacca29b3a9b0e89cf432c5bccd3ffba3
--- a/app-containers/lxd/lxd-5.0.1.ebuild
+++ b/app-containers/lxd/lxd-5.0.1.ebuild
@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="acct-group/lxd
-	app-arch/xz-utils
-	>=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	dev-libs/dqlite
-	dev-libs/lzo
-	dev-libs/raft[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6(+)?]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6(+)?]
-	sys-apps/iproute2[ipv6(+)?]
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND="dev-lang/go
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-migrate
-	/usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-		doc/environment.md \
-		lxd/apparmor/instance.go \
-		lxd/apparmor/instance_qemu.go \
-		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/lxd.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${S}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-	local bindir="_dist/bin"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-4.0.9.initd lxd
-
-	systemd_dounit "${T}"/lxd.service
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog "For virtual machine support, see:"
-	elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines"
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the lxd group."
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && has_version app-emulation/qemu[spice,usbredir,virtfs]; then
-		ewarn ""
-		ewarn "You're updating from <5.0.1. Due to incompatible API updates in the lxd-agent"
-		ewarn "product, you'll have to restart any running virtual machines before they work"
-		ewarn "properly."
-		ewarn ""
-		ewarn "Run: 'lxc restart your-vm' after the update for your vm's managed by lxd."
-		ewarn ""
-	fi
-}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@ -1,3 +1,3 @@
 DIST acme-tiny-5.0.1.tar.gz 21036 BLAKE2B a09c16ca19570b48d34c919e2a361e3be5d66ed8fc0ccff7af74e4018d294f2940a552906dee45bac27a16e7b039a3567dc35e201b058015c5123baa2cbb01c1 SHA512 6e0619917b31a5795c2c7d8aa811b46231b81fc6b57227f611f7f4b9f73eb3de669676482563c33d935a4a0812498677bcbe974663a561af61abb441a880947e
-EBUILD acme-tiny-5.0.1.ebuild 1180 BLAKE2B 265f9fdb693adc02aec85ebc4b38a77969fc0492fd7f437acaa6f65495374080875d70b8a8b7727a68a0dd087da20fa72312a5d0272bb85f277351d8d1ac2fe8 SHA512 8b7b059d7768f416b30b1c0123a6c5b4f658c166d730122559ee5e25ad712c203b916dd69ef69d0c255a991c95589bef9bf60979fbf3bd121dae684a5d5a1c75
+EBUILD acme-tiny-5.0.1.ebuild 1181 BLAKE2B 1aa4ffda1cc4bc59f40b8edefb91034eeacb3bdfb9ac0a7e59dca07e125ad9c213997193669e81f471a7f926d234a9e4fc88a6e0eff655ac6eb5f08f1655572d SHA512 bb9c442c300b7d20b565f81bf769213044a2b00fc08fe8c014f49490f7aeb12f542ef101609043e5c195384c6aed5f555b3a1a62a7c549824610188e58361dd4
 MISC metadata.xml 308 BLAKE2B 5ec953d075608413e620d96e62dda71733f4d3f802ccc765785dfee72c5d7230ed75bebeddb4ca94859533f48bb3edf6cc995796427c796fcd676cbb2ff2a584 SHA512 e5e7ec53d4c40904b2df23401805ff9d76d80f8943f85c28707b969077340eab8aa0b5348d0ce3c4c6a2e01d6e9055e84ab2031fa92360c57e5e1fba1adb7dcc
--- a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10,3_11} )
 inherit distutils-r1

 if [[ ${PV} == 9999 ]]; then
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1,7 +1,5 @@
-DIST certbot-1.30.0.tar.gz 1370072 BLAKE2B c9286bc6dfee59c5a7b458430b08ee273615b42e40d2355b41c5d58a0b8757d83551e947058660e4abda88d7f11c16184a248c313b4d01e145df0e39b717bf86 SHA512 15727a7a38a9cbe4890a347c0cc2a795be19502ece28034400d41cf96a6d4bef197890bd85cd02ecc6a792e3502ae8aa663aad45e980047567f0d3b161cbe3df
 DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052
 DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
-EBUILD acme-1.30.0.ebuild 1140 BLAKE2B 109016a04482351c3df89e09489f246b7dcd91473521f1e40a9f0788cdab5c49d662d08d32f359ddd563b9f04a86e3f6d365ccee387756bc25a7a59d973d102d SHA512 696444b8ca4de37ff8eead63b5ce500e80ce0315184a28edb21d39988353a252a285f01dc6a57ff6919d0d12352a1ac5f32747c2271d7b447fc814e0427b2c62
 EBUILD acme-1.31.0.ebuild 1140 BLAKE2B 109016a04482351c3df89e09489f246b7dcd91473521f1e40a9f0788cdab5c49d662d08d32f359ddd563b9f04a86e3f6d365ccee387756bc25a7a59d973d102d SHA512 696444b8ca4de37ff8eead63b5ce500e80ce0315184a28edb21d39988353a252a285f01dc6a57ff6919d0d12352a1ac5f32747c2271d7b447fc814e0427b2c62
 EBUILD acme-1.32.0.ebuild 1142 BLAKE2B 3149eedb71a5e80bf3ec01b5e7bb678aba01f63f01e7179c1cb913e14baa1fbdddff209e92db0bad53c31f3aea9fd9d22e74e986d000b851d7531a66d5c73a61 SHA512 83c207826a400e854d8523412a07e40b7c1e5d4b33c7ab17227a0f8515d9241b443b58c76e991f5f9735ff206a08dac662715055f7ec2d45bd5166f9ca26c44d
 EBUILD acme-9999.ebuild 1142 BLAKE2B 3149eedb71a5e80bf3ec01b5e7bb678aba01f63f01e7179c1cb913e14baa1fbdddff209e92db0bad53c31f3aea9fd9d22e74e986d000b851d7531a66d5c73a61 SHA512 83c207826a400e854d8523412a07e40b7c1e5d4b33c7ab17227a0f8515d9241b443b58c76e991f5f9735ff206a08dac662715055f7ec2d45bd5166f9ca26c44d
--- a/app-crypt/acme/acme-1.30.0.ebuild
+++ b/app-crypt/acme/acme-1.30.0.ebuild
@ -1,39 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,7 +1,5 @@
-DIST certbot-1.30.0.tar.gz 1370072 BLAKE2B c9286bc6dfee59c5a7b458430b08ee273615b42e40d2355b41c5d58a0b8757d83551e947058660e4abda88d7f11c16184a248c313b4d01e145df0e39b717bf86 SHA512 15727a7a38a9cbe4890a347c0cc2a795be19502ece28034400d41cf96a6d4bef197890bd85cd02ecc6a792e3502ae8aa663aad45e980047567f0d3b161cbe3df
 DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052
 DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
-EBUILD certbot-apache-1.30.0.ebuild 945 BLAKE2B 7a7d3e1c404a796a529707becaf6e166b33aa7afe568d91cdfcd7656b19f61ee712ca2d65055445762931917e680c67f20cda811123b733bcf9a40260970c3c7 SHA512 23dddc9757ee6eab0a131a3a84c441680678bfd27548c2651665cd25a1aade2387f405281eafba2304cec0fea0a71065d1b2b12c3f58dc6fbfc7df0fef2e3264
 EBUILD certbot-apache-1.31.0.ebuild 945 BLAKE2B 7a7d3e1c404a796a529707becaf6e166b33aa7afe568d91cdfcd7656b19f61ee712ca2d65055445762931917e680c67f20cda811123b733bcf9a40260970c3c7 SHA512 23dddc9757ee6eab0a131a3a84c441680678bfd27548c2651665cd25a1aade2387f405281eafba2304cec0fea0a71065d1b2b12c3f58dc6fbfc7df0fef2e3264
 EBUILD certbot-apache-1.32.0.ebuild 947 BLAKE2B a48f898df86410229175cb4cc86735136be08f8e163ccd184a7a598d0bbc88c556f243bce3f6ba354cbb0ddcdccaee6903142b8bdb382b61c7326bffa0a99cf0 SHA512 1d2ee7ad9c9a1dcc7955fdf0a2295812abcc934c8853a7406d4bc219ea851bcdeb189330e3b9b5aef486c5494d98e66a512f2c4cb631109f5136cb283a83355c
 EBUILD certbot-apache-9999.ebuild 947 BLAKE2B a48f898df86410229175cb4cc86735136be08f8e163ccd184a7a598d0bbc88c556f243bce3f6ba354cbb0ddcdccaee6903142b8bdb382b61c7326bffa0a99cf0 SHA512 1d2ee7ad9c9a1dcc7955fdf0a2295812abcc934c8853a7406d4bc219ea851bcdeb189330e3b9b5aef486c5494d98e66a512f2c4cb631109f5136cb283a83355c
--- a/app-crypt/certbot-apache/certbot-apache-1.30.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.30.0.ebuild
@ -1,33 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,7 +1,5 @@
-DIST certbot-1.30.0.tar.gz 1370072 BLAKE2B c9286bc6dfee59c5a7b458430b08ee273615b42e40d2355b41c5d58a0b8757d83551e947058660e4abda88d7f11c16184a248c313b4d01e145df0e39b717bf86 SHA512 15727a7a38a9cbe4890a347c0cc2a795be19502ece28034400d41cf96a6d4bef197890bd85cd02ecc6a792e3502ae8aa663aad45e980047567f0d3b161cbe3df
 DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052
 DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
-EBUILD certbot-nginx-1.30.0.ebuild 963 BLAKE2B b4235fd8c9bbedeafaf2581fe0abb669d46e915ba7f5b9cee9943c1ecd2278859db1347a43159334df1b0054f0019066565d39c16ffc8b37a484c4de180f4c7f SHA512 38d4c236961c139664cfb7005691695968bb3213c615ff2fea37dd09067eca9d89611f25af8946c434fd7134157f7e593b043833ee0bfe3d4d061448d8caa669
 EBUILD certbot-nginx-1.31.0.ebuild 963 BLAKE2B b4235fd8c9bbedeafaf2581fe0abb669d46e915ba7f5b9cee9943c1ecd2278859db1347a43159334df1b0054f0019066565d39c16ffc8b37a484c4de180f4c7f SHA512 38d4c236961c139664cfb7005691695968bb3213c615ff2fea37dd09067eca9d89611f25af8946c434fd7134157f7e593b043833ee0bfe3d4d061448d8caa669
 EBUILD certbot-nginx-1.32.0.ebuild 965 BLAKE2B 572c3235f9726d67f618f282b7f78dd20ce21068fd710492ab568d706cb8db81a4d9d921fe496fd23d08589c3bc19f8b46556b4674f264d0ba297d1fe05bb5c7 SHA512 e52b1a0cfddd8d17fcfcd34505652e68e174af8990d8b84b677c3b699712a7d90059655efaa056e15cebecf874fb87fcb395adb9cf46d977bb6bc90ae98875ab
 EBUILD certbot-nginx-9999.ebuild 965 BLAKE2B 572c3235f9726d67f618f282b7f78dd20ce21068fd710492ab568d706cb8db81a4d9d921fe496fd23d08589c3bc19f8b46556b4674f264d0ba297d1fe05bb5c7 SHA512 e52b1a0cfddd8d17fcfcd34505652e68e174af8990d8b84b677c3b699712a7d90059655efaa056e15cebecf874fb87fcb395adb9cf46d977bb6bc90ae98875ab
--- a/app-crypt/certbot-nginx/certbot-nginx-1.30.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.30.0.ebuild
@ -1,35 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,7 +1,5 @@
-DIST certbot-1.30.0.tar.gz 1370072 BLAKE2B c9286bc6dfee59c5a7b458430b08ee273615b42e40d2355b41c5d58a0b8757d83551e947058660e4abda88d7f11c16184a248c313b4d01e145df0e39b717bf86 SHA512 15727a7a38a9cbe4890a347c0cc2a795be19502ece28034400d41cf96a6d4bef197890bd85cd02ecc6a792e3502ae8aa663aad45e980047567f0d3b161cbe3df
 DIST certbot-1.31.0.tar.gz 1371459 BLAKE2B 95fc9f29b1e91f5bc12a9b7146d00f4f3b4647eeda8e866c46c17d8d8a2443bd46cfa04758e8571e84b2bbf70bd68943c47ceaf6d830d3e5121e41d9548da051 SHA512 a2f6d7714bfc8e2c400e69be038404da138b53f0dc09e071048d560ba9e9527cc0b786b8d210b62c3d07c3aeadaee12dc0d060d144af4b5c3178576fde65b052
 DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
-EBUILD certbot-1.30.0.ebuild 1256 BLAKE2B 5fe946cfd4172ae554cc5f1d47460c957c92171a86af42ec567ded30ee0fd45c42ef6629077d372e062f46525f5e8229149d2c3e1d24b2e5824f0306134b9ca5 SHA512 1145bf5344bd778950e0a75496b05b3190729f830d7b9b872a2f3676355c873be39db236ed4fb39f8d454588cee3cdde900321903b444423fdc43e171de6b5c0
 EBUILD certbot-1.31.0.ebuild 1256 BLAKE2B 5fe946cfd4172ae554cc5f1d47460c957c92171a86af42ec567ded30ee0fd45c42ef6629077d372e062f46525f5e8229149d2c3e1d24b2e5824f0306134b9ca5 SHA512 1145bf5344bd778950e0a75496b05b3190729f830d7b9b872a2f3676355c873be39db236ed4fb39f8d454588cee3cdde900321903b444423fdc43e171de6b5c0
 EBUILD certbot-1.32.0.ebuild 1258 BLAKE2B 2eb9240732ce68f2e81c9df527b2d9f58af94043a22c3c1dbc0d6ea5141f91866d40ca0eb35306657d5bb2bae07199ffbecd4510f5877ac3a844f67079accc20 SHA512 43de46e0b64a794b40ab7b05392442ee8e0f7187a6f89bc4ced6bc509e585946ce90d77799f48d9be522e69155cbb0e29da64f3c824f89998764888a75620941
 EBUILD certbot-9999.ebuild 1258 BLAKE2B 2eb9240732ce68f2e81c9df527b2d9f58af94043a22c3c1dbc0d6ea5141f91866d40ca0eb35306657d5bb2bae07199ffbecd4510f5877ac3a844f67079accc20 SHA512 43de46e0b64a794b40ab7b05392442ee8e0f7187a6f89bc4ced6bc509e585946ce90d77799f48d9be522e69155cbb0e29da64f3c824f89998764888a75620941
--- a/app-crypt/certbot/certbot-1.30.0.ebuild
+++ b/app-crypt/certbot/certbot-1.30.0.ebuild
@ -1,42 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="selinux"
-
-RDEPEND="
-	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	selinux? ( sec-policy/selinux-certbot )"
-
-distutils_enable_tests pytest
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@ -8,5 +8,5 @@ AUX mhash-0.9.9.9-force64bit-tiger.patch 372 BLAKE2B cdce999eba8fea0ebb47b29297b
 AUX mhash-0.9.9.9-no-malloc-check.patch 776 BLAKE2B 956fc4dae9fd3ee0416b086c781882be8e97042db99e002d0e9e759db560bcc24228363499664034ee92ffc566b734add957c1614ce835be7627946ab06cdfc2 SHA512 7c891822e2a5dd52610219dbb7e6a2a5eb9064842b73365cf2b10ef1b6bf951108220b9840a1fe61a5b001261288f8ec9dd7b0c7926b1d8cbce724bb14b0397a
 AUX mhash-0.9.9.9-remove_premature_free.patch 285 BLAKE2B 7245b1241bbb0001ac588554a3069b6665eeb424c2420dbb6948c68278036e0dec7c16f6a0bec059b54cadd617362e8086b918673d3063aa42598fba952aab26 SHA512 66dcdbfcbd298cde83ab026ff075a09b91662a17f48f9e6c41284513e7ccb398d34f3bef3b72c684a52b9bab43f0fe3d6a751403dc412e66814e5d6ae3160b31
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1487 BLAKE2B 8284526248ab69de513812f23769f77f0dd87c6cf1422c38663242795f6644b478bc24b061df31041f3e5894b1c027042c0247a2d82dd4d28c2966a1de7a045b SHA512 379ce08a958a72af2731062f79064febff8629722b5802a26bee5cc569672c7851d8c8f1e911ae8e579e2585d8e94379cf894c6644d04e33b41e393a1395d022
+EBUILD mhash-0.9.9.9-r2.ebuild 1489 BLAKE2B 6b7ea2e33b1a4f02c623dc4b6bb383525452304a39d19353ad87e1134bac669387d702c312c53843e6f28075b04f96b7251a32693c50190b6ed34f55107f8974 SHA512 eaca9c4af5a3b1bb5327520c5b55ff606bab93683a32a11b0ea3889110eca35692167679e1166e5678a33697ff3ba3e0f0b3bdc83747aee083c5370147d7df77
 MISC metadata.xml 241 BLAKE2B 9e6338d5689848848afe75bcea7eb95e20272b1329d098877fb319a5daac513b5fdddb9e99bc0021a44a0213a199735397009ae61f9424dd0e46c6af96578f13 SHA512 8f3610b6cadf7220e44b905b767c36ee00cdc4a50b3d1a94a4da1df1962b6663bda6134cbf4d1f52e7339e6745d3bb8e520dc51c1dfc817bb8e87d5a21fc28b8
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@ -6,10 +6,10 @@ EAPI=7
 inherit autotools

 DESCRIPTION="Library providing a uniform interface to a large number of hash algorithms"
-HOMEPAGE="http://mhash.sourceforge.net/"
+HOMEPAGE="https://mhash.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@ -1,7 +1,5 @@
 AUX sbsigntools-0.9.4-no-werror.patch 483 BLAKE2B 9a25f9a4057bf8738ad3b32542c990376ee723fca383177fdcebc9cb708816877d320b4584b5adf916217e7026d9746fd39fbb7fd975ebce8b5fdfe60675341b SHA512 e20a4a8b6b5372471a33e25c0c241cb6aff731a7c781aaff8c1d52c7fa06c158438049643ffd9ba8c49c2e5003798dba18371c2294061e594e4c1ed062f5dbfd
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
-DIST sbsigntools-0.9.2.tar.gz 56525 BLAKE2B 0bce1f534aa960672eab6a415e287b79ff9f18eb947e2217ad4533081f8b854e160b57828afbb56423b2dcab723d3a8aacb2e6affeb2057d17ce3c1761d96b11 SHA512 060753ed9c8db794e4755cc66c1940a2ccc89f4ddf0e825da1f1e6eaa75fc67c21060ee4b5dfb0c757b69e6f5959bfa68156d9f95a945cf63c6a20f1414a2c27
 DIST sbsigntools-0.9.4.tar.gz 57714 BLAKE2B 94797af6c98a9c13cb71e52ba6f7ff07de70660af2194b14061e0cb618d6effff52ef7a4dd2fd4e44e75f022b979442d4290b1d65d63017b2fbebdca5951c5c9 SHA512 953d3d9a7f92b837da966eabe3572163a29c5292e792d5ef17cf842d7373ffaa901377cb4ec68006a6ef2f9c97d48db8ffdd3a6d2853be67016d3484a118bba9
-EBUILD sbsigntools-0.9.2.ebuild 1247 BLAKE2B 5f6f3cfcdfeca22a27b8811032fe4233f2e19939d764f2207064094056446d4e0011e992287c08b2b7a7f09ad16fd7ba562c41ca1eef3cc8a72c029883b1ddc5 SHA512 ea07d500700cdf6083ae6fa381b792ef8b8c6418e1339abc1ed1782172caa050954e2953e641d4c6bd84efb1783230a506b6dfec7df8bf0efc8be7ebfa5368c3
-EBUILD sbsigntools-0.9.4.ebuild 1336 BLAKE2B 4db0e165371def13952e90af25d48f62f5bce166ff6f15bba0cc486649378ce476f934401e95a7559b19da1cc41216d81593f240dabfaf46575a6d18fcd97727 SHA512 ba87618623fc4a3d8c6a9944937d561526a7f7d82965f0104de98ab1c2d88cfdb3c1b29b96206ade6fb9789d75952012dc51d7034f5ae214ac13670d01915158
+EBUILD sbsigntools-0.9.4.ebuild 1335 BLAKE2B 91f1b7173cae871d44706b1ed8038386a09233ee2dd648c8bd698066af2ed686f628900b3d9a3e27d3ff657a53c22034f4b482f68458b682bffab5081634aed1 SHA512 73aa0460dac41c479678e90d9f3ad073360385183b33222c5f95521f9cd2a4a8c375ee36ed2f4dccef3ac7e5eed7682977c6f1faba757a3e5b643dfd1a72b792
 MISC metadata.xml 292 BLAKE2B 590a17ca49fb39917074648d0b2439e707a49055f7b65cc923500cfe354b51aa020c3899b14d7de263c97f281aad36c19695f54747c7652bf46ce26d7a14b5d7 SHA512 230e2b4d2b6858ab067cb5ffe9e59b93fa22abe34bbebe74f0eca9a1f96fcfb9bbe536ed34c1bf8d977e8dfc7b46a6d44feb541d3426e6ada42f35f92ac7c896
--- a/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="${PN::-1}"
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot/${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${MY_PN}-0.8-ccan.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	sys-libs/binutils-libs
-	virtual/pkgconfig"
-
-src_prepare() {
-	mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
-	rmdir "${WORKDIR}"/lib || die "rmdir failed"
-
-	local iarch
-	case ${ARCH} in
-		amd64) iarch=x86_64 ;;
-		arm64) iarch=aarch64 ;;
-		ia64)  iarch=ia64 ;;
-		x86)   iarch=ia32 ;;
-		*)     die "unsupported architecture: ${ARCH}" ;;
-	esac
-	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure.ac || die
-	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.am || die
-	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
-
-	default
-	eautoreconf
-}
--- a/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot

 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""

 RDEPEND="
--- a/app-crypt/yubioath-desktop/Manifest
+++ b/app-crypt/yubioath-desktop/Manifest
@ -1,5 +1,5 @@
 AUX yubioath-desktop-5.1.0-bin-installdir.patch 548 BLAKE2B 3ba3286ace20e64dd543f377631dcbc30e2e83c52a9e62954518ab06cbef1609d559092f49fefaa4f37316bab793511712e52817107d1e98b66843cd2cb88038 SHA512 d570d4484ea394413fa365a5a2e29a32a54adf703f83ca918ec0eef474adda9e95f7ab0048e2977f11066bd6884567e50c3787ddb1d3c356df6eeee8d9fafd17
 AUX yubioath-desktop-5.1.0-qtquickcontrols1.patch 263 BLAKE2B cbb8ff839df0ff5a821a47fe0d27c2e2e8d0ce55a137e36ba270242bbfc79d0190cdd4bbcf6b20bc0a3a5170ab790a172871c41b635300721209b50a0a9826b4 SHA512 5c51737ddb2c59e01212418035cedcf1df17fa065a11b38a9a6a32b5bc5e3fb04ac99eb8a9128c9e258d39f3974ca0cff4276c59bc49d531b4a40b5acd3afdd1
 DIST yubioath-desktop-5.1.0.tar.gz 6322224 BLAKE2B e1fc93bd38af3c6937f390c738248e43dbd17052df5103a0e25547adf7b34eca60ed8b45c9681568202d01802a5d8503cf2a5bf53d57c7c18ee2ee53cecd8d51 SHA512 152e27fca3c082c996c96fb05ed66781a52a47f30d8c5649d43937cf87c566f09c1fcb6afd65402b5f7fbe2a1f71872f10c8b456bd8a9b240c360018defd48c9
-EBUILD yubioath-desktop-5.1.0-r2.ebuild 1339 BLAKE2B f2d440fc4a2ef2836d9a0752096ef2fbb779c49e2cf7dd848fa7c0c28682abfa56a26e0a63d710a5094d76add0a35a3a521c70a8ca8f043359e4456b03219b16 SHA512 2746531fe17606114d7f3bb99a8b1dfcff25e0cf81b788863de3e712ae7587af601650e1c0027dfcf0a6c27f172a4639a8366cd5ebd8238be23fb8a58c5792b8
+EBUILD yubioath-desktop-5.1.0-r3.ebuild 1397 BLAKE2B 39602f3d549133710dc3f224f4f70fa24c9e83221e0bb149d04be52dd18320a06a43e82541dd2a43c55affd10a9cf801523d60fbce1976fc017a086821b890ac SHA512 bba5d8a185e637fd8aefe69dfebf94b9d68a3547eb522819e8d59bf78b85bc09d6af1b4c2c01661164e86315ed948bade6d110841c7aa0b54f700eb5b5b61cad
 MISC metadata.xml 351 BLAKE2B ab6920491637edc42b25934202cf24529718ef72b907364a09939a6c73b2667872698da96534a624db98ac33bb9c7933413067c9eb0ff79563e289e73aa4587a SHA512 ce8b9a953eb1d0c88eb2b6dcc54a28e7e6df5ca3f9dada0619ea7d10ae4d2d5ac0717b7a0158331475c5e7cbeb576ed9ae177941892549be687c17340f3af88f
--- a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild
+++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild
@ -31,7 +31,10 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	x11-libs/libdrm"
 RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep '
+		>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
+		<app-crypt/yubikey-manager-5.0.0[${PYTHON_USEDEP}]
+	')
 	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]"

 PATCHES=(
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@ -1,11 +1,7 @@
 DIST dict-en-20210601.oxt 6104083 BLAKE2B 192252e85918d3d47167ff9243f70178bc548de3e93152c4139e64ffb013e147fda1fa9c7741ce7bf74b149ec0ab6e001760990cd1ee33dad06fd5e3813ef591 SHA512 c9d791a12aa97d6c2a0928f9f500b22492208b415f877d6b5bd192b5da4c243c32b8d0b7af6b3f5cbfefe6b1c695626db204fc29a922dc4b083538ed144cb472
-DIST dict-en-20220701_lo.oxt 6124450 BLAKE2B 0fcd479efcbe9cbf6d2e7d479cb070b32bcf62d6ab6154e64c27d155dbc6d9e7521aee4a76e08288b77b583a7f3273f7817694a3b7fe194861ac64b785188ce8 SHA512 3df04d9ff2edf12d1d717a6b95893cf69e394fe2cbdcba77d0c804b37500feeaf42379d743f3c21cb9c8f8ae17ad2eb990806ea3f9fc8af954bd7b89f3253a4d
-DIST dict-en-20220801_lo.oxt 6098496 BLAKE2B 38d216627665aac750528f29eef09baee43bc4cddfe931f8b6a4fa69442fa0489dc89a996850d93a4fc955953e6d33f7950f2efa2549932dbdb862bb07505ac1 SHA512 4ec52df3fafe6432b522f0b2912b3c046820518fd11079ae46506fc120943c31df46820164c7a786881797ae3508263d34e26c6226d23b861097926d7dd396e4
-DIST dict-en-20220901_lo.oxt 6098929 BLAKE2B 61b5e20b567561b7418ad9a932bf14dcd2048a874330faa86e10ae456b360ba287030a7c33146447134e20c10084e5f77d986e8bce87f215447a06cd492e8fc2 SHA512 d3f6decbd55956176651813dd8a9364bb8c8b296645c215deebf556f0ddf0e6a61da306c12d01943a8dddf2f765b577d40d55d24e1bbdf08803ac501814364b2
 DIST dict-en-20221001_lo.oxt 6099681 BLAKE2B 206380ca9da3198cc057a43f71b9bc1bcbf2c2794f4bcff8893b86bacb2201f7709a645e98b131072a92df5dc5a95127807e2f5726d1224fe3fa75e11bd93b50 SHA512 d08f66829f3d5f03c1cfcefb4981af016f1f7127fbccfbe76cf40cbcdf70ad4c5d612517fe6beb4d0457e5cdd4e779b5816d9685468e5b3cb0c8058efa064c74
+DIST dict-en-20221101_lo.oxt 6099028 BLAKE2B 0a8e967670de07a62c2b0d1b39878eea02eae8371eccfeab967ddf1059b9f9866202dddeaebf017c9035153753d8dcafb92eca2868103ec8754396fafe736db4 SHA512 51ea769a87b70e22c84101a131d111db2f9c186707a4fac361378965dce11f03ecd1d1c5c6908bc1199e709870e2b38c1c675ab4d0d8393022e522d765a948c1
 EBUILD myspell-en-20210601-r2.ebuild 1429 BLAKE2B 5b654120f1f628ca0229f282cf613bf310830e411591ade2e5e31619e310c8ef133f6a6b0494b724747634f90ea96e42193976d2a4b844f5fcde4244f7874347 SHA512 843d033ac853bb550c66765308ba496025324de03672646e739d5823a6578b5ba37185439bafdc78452c77a28998bacf259f6aa638f27c3e3978832dd7168072
-EBUILD myspell-en-20220701.ebuild 1450 BLAKE2B 76118715d711c875072ba3e25ca5618f541327d86f4db829d9eb4b077cb47416ac67367750968856282c8544792eea0739044a0ba90ba0c6ae1367bfe57475a1 SHA512 edb283647733f7ff88d9b22fe58269ed555b0875a8545c69b52e7b088b2c4c770670b0e01dc19521c58f958504907b23c6589de1bcdff58108b09669d9797563
-EBUILD myspell-en-20220801.ebuild 1450 BLAKE2B db8e88e09edf216cfe547d9244727969d089d3eb147ae22943e2b8637c7f07f9a4cce05ac85fc9398664ab58762ca19637692b46b0df08eec46038944a2accd5 SHA512 5be0c0c5b46e93c98b050f566abf56ba39613b95d9aefe528b9191e8ef4f7705f99ebcdc97e79f797a8a9ca67572de834b840312ae572abd424ee23b2edbfe2f
-EBUILD myspell-en-20220901.ebuild 1453 BLAKE2B 80c6c2a0db86cde44f1301a2e92bd06c6b87204de10e494dc4f77d087dcbb197bb1a444b27d216749b9d1eb8248093f3151611d5473c1a269a2248004a30ddc2 SHA512 cda4b416615ccd7fbae13bd2e3132150bb80aafa9ef9906bec224a3f01418803522d4511c73ab8050287de60fcf36ff4e73cd47e6e78d83035b6003f601061ad
 EBUILD myspell-en-20221001.ebuild 1453 BLAKE2B da23a1861c63a271a9bb64e842f76bb00dc8b7409afebfa21a30149366896a4b23a826d89e13bbbfe79ffa87caf8de7577419b40f717d6d1277cac922dd88a67 SHA512 daaa075c915235050ec2fde31cbd43beb91de4c3ab31c5faff2ff76a5e67a43c8fdff0ce6c125d60c0b18e859a12337bde2d69dff89ebb1ac742a309fb1155eb
+EBUILD myspell-en-20221101.ebuild 1453 BLAKE2B 57e593d9b6cbd5d5c9e18869d5959324e1400f638145eee3d11ca40653db0b19941aacb8b3f6398563419ff21eda3d7c88514c5f1d989c9bdf637166c998a902 SHA512 5d89f6300ea60e9a6b26d0a3f6c842b3760c81dea1b4d04b5c5acb640cbec6c9da8222c788e2c59114fd84e99ff287cb24ea9be0355e0ecd48d92c07b1642d3b
 MISC metadata.xml 422 BLAKE2B 2a08cd9598f852c8ef8a83649d7ac8c8617eb2d5dbe160c5bc21457c412b51ff8fe0c7413238252333e9622e0bc367b9e5b33d5d8051bed9c53a1287296f8385 SHA512 ebc962ac0a2aa0cda987269d52b5dd9607e59aecc73ec265dc6f0b4469827502482dc5c18f5b9122831ed554b852a823c7fb31d58beb5b2a8e14cd16ee12c474
--- a/app-dicts/myspell-en/myspell-en-20220701.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20220701.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1656659156/dict-en-${PV}_lo.oxt"
-
-LICENSE="BSD MIT LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
-IUSE+="${PLOCALES[@]/#/l10n_}"
-REQUIRED_USE="|| ( ${IUSE[@]} )"
-
-src_prepare() {
-	if use l10n_en-GB || use l10n_en; then
-		MYSPELL_HYPH+=( "hyph_en_GB.dic" )
-	fi
-	if use l10n_en-US || use l10n_en; then
-		MYSPELL_THES+=(
-			"th_en_US_v2.dat"
-			"th_en_US_v2.idx"
-		)
-		MYSPELL_HYPH+=( "hyph_en_US.dic" )
-	fi
-
-	MYSPELL_DICT=( )
-	for lang in "${PLOCALES[@]}"; do
-		if [[ "${lang}" == "en" ]]; then
-			continue
-		fi
-		local mylinguas="${lang//-/_}"
-		if use "l10n_${lang}" || use l10n_en; then
-			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
-		else
-			rm "README_${mylinguas}.txt" || die
-			if [[ ${lang} == "en-US" ]]; then
-				rm "README_hyph_en_US.txt" || die
-			fi
-			if [[ ${lang} == "en-GB" ]]; then
-				rm "README_hyph_en_GB.txt" || die
-				rm "README_en_GB_thes.txt" || die
-			fi
-		fi
-	done
-
-	default
-}
--- a/app-dicts/myspell-en/myspell-en-20220801.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20220801.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1659325608/dict-en-${PV}_lo.oxt"
-
-LICENSE="BSD MIT LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
-IUSE+="${PLOCALES[@]/#/l10n_}"
-REQUIRED_USE="|| ( ${IUSE[@]} )"
-
-src_prepare() {
-	if use l10n_en-GB || use l10n_en; then
-		MYSPELL_HYPH+=( "hyph_en_GB.dic" )
-	fi
-	if use l10n_en-US || use l10n_en; then
-		MYSPELL_THES+=(
-			"th_en_US_v2.dat"
-			"th_en_US_v2.idx"
-		)
-		MYSPELL_HYPH+=( "hyph_en_US.dic" )
-	fi
-
-	MYSPELL_DICT=( )
-	for lang in "${PLOCALES[@]}"; do
-		if [[ "${lang}" == "en" ]]; then
-			continue
-		fi
-		local mylinguas="${lang//-/_}"
-		if use "l10n_${lang}" || use l10n_en; then
-			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
-		else
-			rm "README_${mylinguas}.txt" || die
-			if [[ ${lang} == "en-US" ]]; then
-				rm "README_hyph_en_US.txt" || die
-			fi
-			if [[ ${lang} == "en-GB" ]]; then
-				rm "README_hyph_en_GB.txt" || die
-				rm "README_en_GB_thes.txt" || die
-			fi
-		fi
-	done
-
-	default
-}
--- a/app-dicts/myspell-en/myspell-en-20221101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20221101.ebuild
@ -7,7 +7,7 @@ inherit myspell-r2

 DESCRIPTION="English dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1662008134/dict-en-20220901_lo.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1667030586/dict-en-20221101_lo.oxt"

 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@ -1,5 +1,5 @@
 DIST ghostwriter-2.1.4.tar.gz 7725770 BLAKE2B aebc00d4b30790241715383e00348d89137276637e1cc728aa0fb093886d832c8b33477e0923c90acb9d12ff82bf87fffff26f8c27cb2088c6d12da18777eb7d SHA512 bb6039fea415ab9d4807d81947cd914b961bc6ee249f630ae58ffa764fdb46adfa87f1f41c5f6d6b7736ecc1d7561da5df6f142b25075093abb2341251da9596
 DIST ghostwriter-2.1.6.tar.gz 7757010 BLAKE2B a450093b1f072aeea7e6a6e27abbdb2c427387eb70b5ed2a5e49ea1f33fd9c4e4014742cc7905e644ab39838c488d9eddb79e0d3c87bde7ce6528cd810b02e15 SHA512 10ee557a07f468cc12391c2b5f77a6667aef76429b58bfdc03df32dd1cd8c44a61fe77da5318d5b23758ede40a5f8ab89cf4573a09708a6abc2d12ec5ceb71ad
 EBUILD ghostwriter-2.1.4.ebuild 873 BLAKE2B 109c46c5fcb6adff17c03bf330c987910d46543e4561b5ddfa5e680567e8fc604c40dba3d25eadf19b88b0c2bf59fd8018bfa7094192dcb5095c83fe9e576023 SHA512 99b6ab668973db7f1745b3cd16a77ecdb4d0165530926724d454ced636cca8ccfd6ffbdc7b265fd780ac77a84a9cc1235eb2856dc8da1f526787995d801c3bfc
-EBUILD ghostwriter-2.1.6.ebuild 875 BLAKE2B a1c8f1bdddd51f7bbfc2e42e0ca16df365e3a8faa8a1c53bc4925e80bf8c45cd43b4f9d444890b09ea041e6fd26640612557724df1b958a4bd7af0b9f758af72 SHA512 65754af8280fb663605e67cfe3b82f5e2e869e155dc5ca04c6be61d5d3d0ebb14257ec3da6df791b567194a8f6c0567dd5368484cb059762212d30f11c0307b9
+EBUILD ghostwriter-2.1.6.ebuild 873 BLAKE2B 109c46c5fcb6adff17c03bf330c987910d46543e4561b5ddfa5e680567e8fc604c40dba3d25eadf19b88b0c2bf59fd8018bfa7094192dcb5095c83fe9e576023 SHA512 99b6ab668973db7f1745b3cd16a77ecdb4d0165530926724d454ced636cca8ccfd6ffbdc7b265fd780ac77a84a9cc1235eb2856dc8da1f526787995d801c3bfc
 MISC metadata.xml 608 BLAKE2B 9ed4995ed4884fb0bed607208afdd5122bd86f08aa1c5a94f3dad2f7c111e54e94413f1f1a298aa974f6626026e8cfb42789b4f0992690ee769ecce8630f6e72 SHA512 082f086394ef9a7a37162852090ff0e022f87bcbd18991a2ba6fb862d8690a23fc5d1a2cee090a1401a530bd3580fdc126a04c61ed7e627f6d558f8e6a1f49d6
--- a/app-editors/ghostwriter/ghostwriter-2.1.6.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-2.1.6.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/wereturtle/ghostwriter/archive/refs/tags/${PV}.tar.g

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"

 BDEPEND="dev-qt/linguist-tools:5"
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@ -1,5 +1,4 @@
 AUX kakoune-2021.11.08-gcc12.patch 1543 BLAKE2B 5ddac65c8143ea581e30df3f7d5685dc0319a683d1b64d4ab5c538a79d8ab404ee3ce82aaa8cab8b8f53c854d2727a8568c2616914ab14f46dd2aa9b4b9fec6c SHA512 4c09b60141dc47fedebe1040fee888bd594f964df08040b0edfa27448cd1219078e50618ba6c9538a48cd5acbd0d7ad08968c1649d2b97447bf4fb332df0181b
-DIST kakoune-2021.11.08.tar.bz2 538466 BLAKE2B 30cb80c971c065610a8b40d9df0af2d3c1650baa065f14c22557b3c22e3cd2832e227a3a167d10d3892579eee30a70b5e3b62ad502dac7bdbb1c252b71c66e99 SHA512 429e11ff51fce18394e0a8fc55cd58a346b91dbe41b842b96c31a984bc92ea67b186c9f819d2d3ee88422ba453347281b0416a5bc4b1e7816240b9aba688a7e5
-EBUILD kakoune-2021.11.08-r1.ebuild 814 BLAKE2B dda37f636a19dc45d4fa25076679e70afdde5c7d1d65b339baff06a99a66a73fc4c03457d31df1f509d829cd21b9185b2ffedf85a91d304f3a97e125fa8e40b5 SHA512 c4d1ee2d54551dd37a66f5cc7cd897c261e1a5ec8205ebe7e50810fed1ccf910051ffbe43f6b139b17ed24cf5029ebb43ce0acbf860702aa78183b1402254ef4
-EBUILD kakoune-2021.11.08.ebuild 769 BLAKE2B 4df909a0a7ededeee6bde50cd7402758959926c686225ba3729bd244549b1e411849867ab2609a0d59223ead319202fb66c813d37eb191312092ee4ce690e0e5 SHA512 68a63728ef642e07549e8ddc94a7ff054d29b5130155ec8ab3582452dee8cbc2c9ffc3a2cadc78b82a9ae1595d5a2f08f91192e74275dcfebdd06375b2fd1033
+DIST kakoune-2022.10.31.tar.bz2 556473 BLAKE2B 36489de5e4fa4406a847f43bf0f966c082e5c4a97e3c31d04c61fb8c4137fed4b6d1ce96ac921a85dc03fe7b90d8de172b6720ac32846507a3d0c996fe01191c SHA512 9a02a1a6bbb0b71a579b0286b4dfb6359b856183862b3e17354d2685b8215fa24c196b570a21dfd627e3d5a5b91e20ce0b74caff19e5772ab911cc42677bf720
+EBUILD kakoune-2022.10.31.ebuild 769 BLAKE2B a0ab51637696a5ee9c0bec3427766866b3e51274acada61ccf5f9d49fa183d59977decb242bdb262aa91378ce0b7dad634c8f180271f1bb77ec94c2db4dbe0ef SHA512 6675ff7a2549b54908cdb4a50d5fa4c97c92aaa738cb1e9f86f492e31074b3f3da17d37c3efca273804a049be8a974646bcb0f88eb0002dfc37f927f8f8319c0
 MISC metadata.xml 512 BLAKE2B afa8631f092bca6c3307dcd610340b39e41da979781f0f1ac391e873ae063088599cfc96c99bc81cca0c1244905ced51e3736b1fc387d0d9fdb8233be2810427 SHA512 a7e4da11480bc3f8bd09253901d9528235ce9a4f00a418cd5f58c898244850cafe944d6a828e1b871a2d98faba179fd9f4ddab99695a6762a4a7a290f1311a2f
--- a/app-editors/kakoune/kakoune-2021.11.08-r1.ebuild
+++ b/app-editors/kakoune/kakoune-2021.11.08-r1.ebuild
@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Modal editor inspired by vim"
-HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/kakoune/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc12.patch
-)
-
-src_prepare() {
-	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	emake -C src all
-}
-
-src_test() {
-	emake -C src test
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
-
-	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
-	doman doc/kak.1
-}
--- a/app-editors/kakoune/kakoune-2022.10.31.ebuild
+++ b/app-editors/kakoune/kakoune-2022.10.31.ebuild
@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@ -1,5 +1,5 @@
-DIST mg-20220212.tar.gz 157828 BLAKE2B e3219efffef9c4da05965a0ed7a0f0bfdf5c34d607d25102a4d2ee9de6f9b9fd2da59050c6e56d1712875b2d129408200dde4c7305ffb2208c11b5d722b87270 SHA512 093736521e4bcaeff049594793474b9710e4cfe6db151032dc4413614566afce80db5b794dcf10082020dbb73f25742a0c7d49f45b6b4d2caa6865b20a9e574b
 DIST mg-20220614.tar.gz 157904 BLAKE2B 88141274b379c6117158f85d91d0d643709437f0292fe2f82569c33d85694b39f957e279e262839ef0ba2a7e81e8a9ad6512c621e68f42b0929805028898637a SHA512 bed455cda856e54fae28592ac0a520841d5d542880a7405dadf702d7407ac33ae7fb7b63880805a7e166e0e0a87c76b9fca1700c444f1b999a5af66732c69b65
-EBUILD mg-20220212.ebuild 1041 BLAKE2B 094d5fe311dc0f70b7c8263392e65ec43dbad838807eaf0c6675f789689d542da20831fb15a6a4575881cfc244f57f0eb0804096f322efb1a456fa9be0eb2e84 SHA512 2362878519045fb10dbeeeb6bdc27451e7173958b9cf22c9fcb9c4418fbd96eb6e0b53410f1a9cbe9f316c28906294bf17af9f0ced31f4cc1b2e152da508b0a9
+DIST mg-20221112.tar.gz 158666 BLAKE2B b32f957a4491901c0926668fb74df450de679d95d1ca2352f7eab0be0e6fa06b703551c3f9be6bed80918daec9096fbbc8f774f3e0255c668a8ebe0c0bcf99a6 SHA512 7d2d08d7015357ceece4eeaf876a3c0a8e27554aed224854efb831c23c78157a104df724b9ac3ad9f74efce6b066c94616fadf8979906f453469a03bc5d005b8
 EBUILD mg-20220614.ebuild 1041 BLAKE2B 094d5fe311dc0f70b7c8263392e65ec43dbad838807eaf0c6675f789689d542da20831fb15a6a4575881cfc244f57f0eb0804096f322efb1a456fa9be0eb2e84 SHA512 2362878519045fb10dbeeeb6bdc27451e7173958b9cf22c9fcb9c4418fbd96eb6e0b53410f1a9cbe9f316c28906294bf17af9f0ced31f4cc1b2e152da508b0a9
+EBUILD mg-20221112.ebuild 1046 BLAKE2B 7af22f31ef51d1e69849a3b1717ca175ab5230442b5d28dfd591015cef13d22ddc5ed32b64395c9c85fbc1efc2f2e40c68d77ebd7f0af50b29f5727bef5e5ec6 SHA512 98863e7332a0d568c0b777ef38d8aeba989280c59c15bc9a66635722637d50cfc250b6e1bc3d5d5f1be158cc74dfdf4d931a7b51e29b0f934594e36c472e1564
 MISC metadata.xml 692 BLAKE2B 773199bfa6d52ed22a9c6567296e65e53263602562ae26d5ab33ab3f201edd8c4606d4bde7377b599a911f3f3b4dd2c9a5fbed9c5e499256d78ea7e89ff8d5c6 SHA512 1543f3ae91a1e2fb85e7b2e637ed886bcd5a62c4594d403ca79202eab594aff3c94e3d06117cca5cccbe828ff01bdce1683b96e76ecae084db8fa4547232ad9a
--- a/app-editors/mg/mg-20221112.ebuild
+++ b/app-editors/mg/mg-20221112.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="livecd"

 RDEPEND="
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@ -3,5 +3,5 @@ DIST scite-5.2.4.tgz 3440615 BLAKE2B a98028774837f7c19a73d3ceef0e7cf945674b0b0d2
 DIST scite-5.3.0.tgz 3499449 BLAKE2B b54a4eb5c9d669f840efa782d0b02e1b087b386aabbf58dcd37bdc314f42ff6597bf674329c64bbf40befecbc3d3d00aaf13bd03d0f18a28ab6a050049b25336 SHA512 3401ea04019f4fbbd15118a6b2aeffaaeff91382e742cff4df2dcd83ea59e4d43600b288869db9dbe44609fcfad979d29659edbd200b6b0edfa56eac5a9f577d
 EBUILD scite-5.1.3.ebuild 2399 BLAKE2B aa552326db18257573410f3759bec58c93fa6b331997c0475f459c698f41f685cde2d05e5c9ba88e70998566a45b6a18a52a128dc5d3ad00b429d9f7e9043221 SHA512 777e8ec73b35e14962728cbfa6ca7dbe1170ccab75c2abe0cb184580a9fffb2192df27fe853fd0f65018c9991dd33dfca059b086a64f85be4f2a7044fc024bd8
 EBUILD scite-5.2.4.ebuild 2406 BLAKE2B 6792a9a78a9fd9968dacd4360bcecb0b3570950d46767bb03a6ed69ebe24ae1de1f9963e1cf4f0f8adafc255d7f372fbbffece45db92799b54a85d68b874514e SHA512 f73769262346f62af1962d2e97e1f5a81d22901ee1adb92eaee774d1572fb6c46b8147ea9bcbae3829bc9ebd278d8ab0557c8b154b2b277bb56583e50be08e29
-EBUILD scite-5.3.0.ebuild 2409 BLAKE2B fe5bf289bfdaea39bc730b7162004f7e328761a05ad3032545ee91945c720a7319ac70ecf7a655add1fe9619224c326c3af5dbc9b1ef4a2236c729b25fe7fb1c SHA512 4b9634f47ee3c9a09e1757a8ab48f2a34a0b9af3a5490f895fe99d3b0089f407b8c005d9e72d5110fc690c39c8f56de197ba273cbbaccc9cc8500bf1435bf051
+EBUILD scite-5.3.0.ebuild 2407 BLAKE2B 4f4152a5c86023389166cadd2ca4f2070e3c7135919bacc6fb069bac1ce50339eb5d024d17ab35058e3bdd4e17f86d6b11b4ada869dfcb09d21b8d6777693bc5 SHA512 89c31d5f67001812f5bed6eec6c4495e2b03c33d00798057e5f9823a95929b6fdb9b769eb6f75e7bba7e433358c85126e23e07f541a6a2a1ab1a336633869b07
 MISC metadata.xml 477 BLAKE2B 6b4ee233530c91bd81cb7aaec6533f9d4f917765d372e8e84bed225da07b0db5e94f00d34644d9496a3d7321c8a16dc6e65b993263901ab8e58b65664f50458c SHA512 b7329399a31e6e514cebc509b048943a4cce7fca1affc7ac9f401420e885d51a7af6f60d61bc5405326c54a2d1207583f066e3b77ab4b08d00333b6ec43cdc0d
--- a/app-editors/scite/scite-5.3.0.ebuild
+++ b/app-editors/scite/scite-5.3.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"

 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"

 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@ -2,13 +2,9 @@ AUX sublime-text-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch 97
 AUX sublime-text-4_p4107-set-explicit-startupwmclass-in-launcher.patch 800 BLAKE2B 45d22985df0232a6065917be5a7352732273b6b48e5f3de015039bd3214ac1491fd07035ab7eabff30182c8796ec4f34a799a2a38011a5bf31bc4f78de27bb54 SHA512 d03f679f8d20f26575f6568b8652cc6316d1ddc5ee4e5c2ce6ae1dffddaeb4476c48d88e5162c165707e7bf699fda8e61d73bea83171d0fa66e5434deef85a48
 DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6fbfe27a3d657ff80ef46ae91967fa384cfc84bfdc2b5952aea8dbfd9ff015f669b148c1a302cbe01521a72b584abccd51efdab51ac0d8 SHA512 4d19947459046407316382d187ea6fa4cff9b7d3e7ae3c46667d691b6ca425a1f1dfc8599a26cf61b970290a58924a3b605e111ff2802ed124683872c1802803
 DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
-DIST sublime_text_build_4107_x64.tar.xz 17096632 BLAKE2B 37c1839ef1edecb1f3017e4d99d2b8b0bf5c0aa1490495fe19a48cf38bb436e94913572a4dd5ad5f84e6b5445b6a9a2df35fec607beb0b520471b2dde7ef63fd SHA512 552051b34c612aa6ff53ef6275488467061221715de054dc1e657519c82899e24df1a9f8000086b68c5c1c6e0c98341c641f19a2d97c880efb25aa93ad82f8aa
-DIST sublime_text_build_4113_x64.tar.xz 17105200 BLAKE2B 6a23e9eb7ec5b7b5dfef2ef496e0b7fcf053be3349c8318e85373bc9c3d4d69da3e4e94971ae83832aa254c175a58062a33ffb14d2103c1cdb6888c1223f28ed SHA512 f0e5e8e28754c21bf5c9fc3e50502d22d72fec4819c68d8444cb341aa7ee4d6bc43edfda594fba3c446c2b252bd7a65340dd7a407d81f875971c219bb2236479
-DIST sublime_text_build_4121_x64.tar.xz 17181776 BLAKE2B a8404a15af67934ba5c2c038d2259e454a505592f53007f665a596554dd13e5c09729577520052290df7bf393ddbcb33321d1624679c4af3bcf5a07ac038f6a5 SHA512 809ef4acabe1e52918b2e7c6057623380b1c7ba5bf0298aa59ec06b49d258fe37fd7177a79bdc840cbc4228a7944cfa67847c3bf3b1b26b3c171815f80c59103
 DIST sublime_text_build_4126_x64.tar.xz 17313756 BLAKE2B 16a036e15b920f72b47a6425540efcbc5ac5c44d3f3c79fa0a106128857f6fa6775a244d6497c814448a3f42cfe1515546b372475b22b47364a759ad0412bfdc SHA512 1f7a1543e68e67bd507f2f4b65f53085c96796287521878011e183df26579cd593c333d53b5ee9bc5adb41dd5344c62875fea869d11962ba80a39dfb63a80652
+DIST sublime_text_build_4143_x64.tar.xz 17480384 BLAKE2B 37617568f9ff0090a8f4f66c34f07d997c1f3405d31554ebb0d7c5791209713d236ee329714b452d69e474bda13f2ad7fb0c4b9abb2a5112ed36acffdee51371 SHA512 5aba1d587b2f61cc7aa6aa7b1eb37990a2385d51fac92945aa3e991616617c73f6fbe71af3a06a219323ff4656f78c2d27f582e60ea97171b88c0197899845f1
 EBUILD sublime-text-3_p3211-r1.ebuild 1645 BLAKE2B 5bdf8d1fdae1df2bc59937e2bd2382385aad77fb60a99e3ea4830239adc027f2c09663c9bec3b795d5f633d3625b2ff5a17b328b46986968e99e45ceeb71e515 SHA512 339364d412f075d97ae576e75dfc50a021fdbf2953a0a6de78f45b97d1db21f335a43a2373631b2a42becd8877b4003fc06b4669f3b092f86df0ff09b3c11f2d
-EBUILD sublime-text-4_p4107.ebuild 2055 BLAKE2B 71fc79523f06b4e66ad3469bd9b62aadc13f2ad66eb2028d80fd69ac358df2a303d71375d0cd406ef3460a299b9f467cbf4917a54a3c58c1a859b656d31408d0 SHA512 b871dbe20734510f84b2b0c421c27552f33786ef1e7f8715ba9bc34ec0eb20a02456f2d668b458cf591ff86f24c91f256c5aff0165a2be94549c749fcdf0d90c
-EBUILD sublime-text-4_p4113.ebuild 1944 BLAKE2B 6ea2f6b0705c7a0f3ae083deb217c7421b75f809f34051e04807f235f2c41cb5f7acbc0e1b7f5859cdacd5fefc3e78b447861456b1a57f796518f9e8ca250634 SHA512 ac4e7c50496ee6e67366f83e6fadb78c8284cb1db640258f9249db0e108fe50eda02081c63e08488548d75ca12882646594f5515c35e30fbe9888e74c6b18426
-EBUILD sublime-text-4_p4121.ebuild 1944 BLAKE2B 0171c665702901ba22d1dc536a55157d4112cdfcb04fdffa561298e0fb75850a847b54387966e9910d5fa3a2da42b22c8caf5a55d1794fb88ac5eb6eaa59d71c SHA512 56ac4d5d09d1100557a170266ac42cf3603f122d709b58fb200a397d171c5222cd6d73271d72f4c24ca664e3a5966743faff56fb6d5f1a5984472023d12e5147
 EBUILD sublime-text-4_p4126.ebuild 1944 BLAKE2B 0171c665702901ba22d1dc536a55157d4112cdfcb04fdffa561298e0fb75850a847b54387966e9910d5fa3a2da42b22c8caf5a55d1794fb88ac5eb6eaa59d71c SHA512 56ac4d5d09d1100557a170266ac42cf3603f122d709b58fb200a397d171c5222cd6d73271d72f4c24ca664e3a5966743faff56fb6d5f1a5984472023d12e5147
+EBUILD sublime-text-4_p4143.ebuild 1944 BLAKE2B 597b3f43caf3fc80ac1b71445551231814ed1ee63ad9de444c6e411e940c018b6173bce9f020c7130a7c2053cb1f1fa9c87d23e75d77c27cd2da46eda2567159 SHA512 2c42213ee11068eef0404b30790fe74f0e5d9d7bffac8587def243f57f51c4f72adc0282469eefa3de5537242f0d94aa847991a3fc2b581ed74f56627f3b4fa6
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
--- a/app-editors/sublime-text/sublime-text-4_p4107.ebuild
+++ b/app-editors/sublime-text/sublime-text-4_p4107.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils wrapper
-
-# get the major version from PV
-MY_PV=$(ver_cut 3)
-MY_PN=${PN/-/_}
-
-DESCRIPTION="Sophisticated text editor for code, markup and prose"
-HOMEPAGE="https://www.sublimetext.com"
-SRC_URI="
-	amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )"
-
-LICENSE="Sublime"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
-	"${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch
-)
-
-QA_PREBUILT="*"
-S="${WORKDIR}/${MY_PN}"
-
-# Sublime bundles the kitchen sink, which includes python and other assorted
-# modules. Do not try to unbundle these because you are guaranteed to fail.
-
-src_install() {
-	insinto /opt/${MY_PN}
-	doins -r Packages Lib Icon # /Icon is used at runtime by the application
-	doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 sublime_text.desktop
-
-	# sublime_merge looks for /opt/sublime_text/sublime_text
-	exeinto /opt/${MY_PN}
-	doexe crash_reporter plugin_host-3.3 plugin_host-3.8 sublime_text
-
-	# sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is
-	# used instead of a symlink to preserve a consistent WM_CLASS regardless of
-	# how the application is launched. This causes the WM_CLASS to be
-	# "sublime_text" which matches the .desktop entry.
-	make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\""
-	domenu sublime_text.desktop
-
-	local size
-	for size in 16 32 48 128 256; do
-		doicon --size "${size}" Icon/${size}x${size}/${PN}.png
-	done
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to'
-	elog 'WM_CLASS="sublime_text" matching other distributions.'
-}
--- a/app-editors/sublime-text/sublime-text-4_p4113.ebuild
+++ b/app-editors/sublime-text/sublime-text-4_p4113.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper xdg
-
-# get the major version from PV
-MY_PV=$(ver_cut 3)
-MY_PN=${PN/-/_}
-
-DESCRIPTION="Sophisticated text editor for code, markup and prose"
-HOMEPAGE="https://www.sublimetext.com"
-SRC_URI="
-	amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )"
-S="${WORKDIR}/${MY_PN}"
-
-LICENSE="Sublime"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch
-	"${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch
-)
-
-QA_PREBUILT="*"
-
-# Sublime bundles the kitchen sink, which includes python and other assorted
-# modules. Do not try to unbundle these because you are guaranteed to fail.
-
-src_install() {
-	insinto /opt/${MY_PN}
-	doins -r Packages Lib Icon # /Icon is used at runtime by the application
-	doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 sublime_text.desktop
-
-	# sublime_merge looks for /opt/sublime_text/sublime_text
-	exeinto /opt/${MY_PN}
-	doexe crash_reporter plugin_host-3.3 plugin_host-3.8 sublime_text
-
-	# sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is
-	# used instead of a symlink to preserve a consistent WM_CLASS regardless of
-	# how the application is launched. This causes the WM_CLASS to be
-	# "sublime_text" which matches the .desktop entry.
-	make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\""
-	domenu sublime_text.desktop
-
-	local size
-	for size in 16 32 48 128 256; do
-		doicon --size ${size} Icon/${size}x${size}/${PN}.png
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to'
-	elog 'WM_CLASS="sublime_text" matching other distributions.'
-}
--- a/app-editors/sublime-text/sublime-text-4_p4143.ebuild
+++ b/app-editors/sublime-text/sublime-text-4_p4143.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/apheleia/Manifest
+++ b/app-emacs/apheleia/Manifest
@ -1,4 +1,6 @@
 AUX 50apheleia-gentoo.el 387 BLAKE2B a9cc757f9c846a50dad3a4ba7383e5203dd158a6233cd7d9039e2f8bdbf31dd950577244a87165c7965c96bffd442b883b3a8e3e55be560332eeb749d413f4a6 SHA512 72ca9116df3e5e363977fc8d0b559a80fa055ce4ceb8d85b912f67eb705f5fd278454f692d2979ad371a047ba604a67de8aebb16c26871a59cf108a68e67f8b3
 DIST apheleia-3.0.tar.gz 36988 BLAKE2B 49e9231e1cddd73ff353512ac29e6b1491bc2cad0985a12677743acb1514b827c8462e6b40912367472adf9d0be12150541162d3106e8e510650c3d70b0bf598 SHA512 19304feda4d3570e68184639a3969f2102765836324db9e1de958e63cf49614a62672df83c21420df92671217ee05630e0c0e0d57cd5ff75eba50a080f0dfde9
+DIST apheleia-3.1.tar.gz 42110 BLAKE2B 2731a0d5a37ce43f422d3cc94d1daef9fdc3147abd09c3878f28caae21e4e34320af2d6b1c929c9824de36bba3dadc40325c1fcc40d095b9e5bbc87dc0db9018 SHA512 1e6159c35016526f1af3cf1c14c6a41ec9f155948a107c858049056dc073327ffa84feeb669982ce0b9ec1c50312e9f1cf3bf7bfdd2f1cc4c7318aeff86e86f4
 EBUILD apheleia-3.0.ebuild 466 BLAKE2B 1ff54b6155620e1768e9aa8325c1a77f61519a0886fe527a6a2fb1c7c58633fe31cf224240f94fb109bd18070d08c18abe2e0ab1fb6a3d5a3619071d84c078ef SHA512 5b6fcebdc72fb903256fc9b033f44613917ca2ef8af5afe2a68361f0f87149a58a664ef177c6c7266f2b607353caefef4ca4c760f55d0f7549fd4563ca1efe3b
+EBUILD apheleia-3.1.ebuild 466 BLAKE2B 1ff54b6155620e1768e9aa8325c1a77f61519a0886fe527a6a2fb1c7c58633fe31cf224240f94fb109bd18070d08c18abe2e0ab1fb6a3d5a3619071d84c078ef SHA512 5b6fcebdc72fb903256fc9b033f44613917ca2ef8af5afe2a68361f0f87149a58a664ef177c6c7266f2b607353caefef4ca4c760f55d0f7549fd4563ca1efe3b
 MISC metadata.xml 870 BLAKE2B 9eefb192026bcc6839477e5199ff99071952a22f40c6ed6903cadedc585b4f4e1dd05c0da5fe49eab97160838277a071876fdeba23c78f11c8379f1a8a4c5bd0 SHA512 bcfbda9b31eb9826943119405ca2553fe99578e985d4b4c3397955b14cad7613e7115c69ca6dd4cbc3751574c36d46e1c6409f7482d8406ca7b896ece89f04d1
--- a/app-emacs/apheleia/apheleia-3.1.ebuild
+++ b/app-emacs/apheleia/apheleia-3.1.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="Reformat GNU Emacs buffers stably without moving point"
+HOMEPAGE="https://github.com/radian-software/apheleia/"
+SRC_URI="https://github.com/radian-software/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md CHANGELOG.md )
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@ -5,8 +5,10 @@ DIST helm-3.8.5.tar.gz 2349290 BLAKE2B 84f0c15c2a9f492246defdf9496e8dcc5265b0c60
 DIST helm-3.8.6.tar.gz 2356253 BLAKE2B 62b9af26888526f54726468e04677c401c5e828e588cb6f2c005b9ce9d84935c184b536a97a82e4e6c08c3523a10a32f9348d243d2545c17c9480ad004d92d10 SHA512 71342f347aa5cf8bd3e1990c8633d908e6a5fe66e051554aa2f554fba5d63b2623fe2b6b07540473b481986b1d5d27cb2d8b06f127e727aa8d373bc045d0a602
 DIST helm-3.8.7.tar.gz 2358726 BLAKE2B a76c7c6658997f4d5114e383e1ca728df923b0216c66c9d4c2f9d1d656d06990299ebc79f4ad9c50da1dd133f8111c947e6f238324fbe91c5af5a1ab02aa1c7f SHA512 d7356e407d1ef463e62e7d0f2c3b0f90d150744fa020638740226a3e04e043be0e551effd2c17cd2e8c0d82d70351cb5268a89eca2c9ef6355fcce65a445f9bc
 DIST helm-3.8.8.tar.gz 2362007 BLAKE2B 80f854bc38e51de62aa6d9a35cdeff4ac4c193908dc19361ad10ad419585d30a2fd94be1d4d410b69634012e4c01045d4dd2f55c5b4ac8da960d7f7b8d4eed08 SHA512 a1fca373d2c64771aabb3ba396e0d65b3434f0a413bab1e61761c16e9dcf274ceb94e258ef90f4ddd2b150a09606255ea61186d2e4e69ad2600fc40369c693c7
+DIST helm-3.9.0.tar.gz 2366592 BLAKE2B 8aeaecf444127dc9758c1116c2f2b6d6a11515b7a549444ba13cc2e6cb48c301ff76343220af2328af89050e210ceed00b5c45e9dee0c0546c40066b5c0bde0a SHA512 bf3917fb06e7d841fddb0b7a0f493dd18ea73568e84c2a535f3fffa1582efb65268a668f23871f66d221caa8be166b667e43095adb59342e3b2a130c5a59d708
 EBUILD helm-3.8.5.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
 EBUILD helm-3.8.6.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
 EBUILD helm-3.8.7.ebuild 663 BLAKE2B 82c07fd093da57f0646b344c3611bc4cf5685eb16608a5b3c37abdd3c0fc57d506872399d1fad844fac9e4d8eee570a3fdc537ce5a09835501f9214e19494b0b SHA512 8ca81540d374fc09a2d5804779ac0fae248669d8960042113871578560da3f29a07b0231a21945358964333c522b0efef31d8a705559799cef336cb8b4afdb07
 EBUILD helm-3.8.8.ebuild 719 BLAKE2B 07f927291083758443650942b14f84106fd02907e436dea648cfe7c2cfd70a6bf24ecdfc9e1940044b67fde2590d6369e7b2584f00726c0f07c2e60b0cdfe384 SHA512 3dc932a7e136c9f888dd780380bf65a45434018491a45b551c01611b237032bb9cd83196c93e4d2b820706b352360f15ee96ad0960c83dbcb4c5eba7563ad579
+EBUILD helm-3.9.0.ebuild 726 BLAKE2B 0e55fbf08d88a05fa30277e5af78d6507e37887f7f7c103695a2c49cf0512022267610fc54cf538095e96dfe9eea2d90718b430f8b40b2d242b6bb00ad1377b3 SHA512 af3cdbef618ebc7789a9c01e7ff8efb2a408ae1079b9f63bc45add32095881f0c8e5772f3688f88fa6cb3b07852b09396a4f696006fca354f2e3fc461345ee8e
 MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a
--- a/app-emacs/helm/helm-3.9.0.ebuild
+++ b/app-emacs/helm/helm-3.9.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Emacs incremental completion and selection narrowing framework"
+HOMEPAGE="https://emacs-helm.github.io/helm/
+	https://github.com/emacs-helm/helm/"
+SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-emacs/async
+	app-emacs/popup
+"
+BDEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.8.8-no-autoload-check.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile *.el
+	elisp-make-autoload-file
+}
+
+src_install() {
+	elisp_src_install
+
+	exeinto /usr/bin/
+	doexe emacs-helm.sh
+}
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@ -2,6 +2,8 @@ AUX 50mmm-mode-gentoo.el 58 BLAKE2B 0114bc73a9125264dd76189479ec708455f88c2d5076
 AUX mmm-mode-0.5.7-texinfo-encoding.patch 224 BLAKE2B c81ec6ca4cbaef71abe743d488a8605b94444f058d6207123f44bb9d1e87bfb2be5c84781c0ff5da1202775042e84cd63b4597e3020950cd412c98aa0ad4a62c SHA512 cbda4268f6e560056abf2618e2a90b1c330a9788e90b77d6353bb0b040d3330a6b4613cf221bdc3fa080d0b3fc362fd67323798ada757d06e8f72ada73f897f4
 DIST mmm-mode-0.5.7.tar.gz 176034 BLAKE2B 23fed0f260c9f46134d83d29e96b96ff331aa0fbe8d121663b74de944489d1a51948f6fba729129e47a34e1ef48cfb0f8bbc45f6ab8f548001bbe0e88a61aeca SHA512 3afb77b3351c8ea5844cd57bb873e6ebe91ce1e268d0d585581482f5039c64ea80fc7aa620e45330eca0eb7839223764164ccc09e932b54f23f3f37c9953cb39
 DIST mmm-mode-0.5.8.tar.gz 176287 BLAKE2B 8dbcf1c1eda543ae52947c220d9adcfc497b060b0a2010e8e0f71d7ee0bfa9bacc2c6eae0c5b2a3260a7492e034bf4f63b24f8bcb00b05d16cc4293f8a49594f SHA512 f27d4dcd46b9db282184252287ab68b7f7fdae5d2522da5c369850ef30f741bac2323ca1a2cc1414aed013202397a6362b31f488e06b0c3de33324514b9e9161
+DIST mmm-mode-0.5.9.tar.gz 110564 BLAKE2B cafcd254489b1b494ddb236d4478f3c44845b1e91571c3c72e89568a15953558c8d341ceddbae111a4f9ee07844762883aa8e3b4d9c7838391bde97d3851cac3 SHA512 77a3ead553cec13537f5fbae15e04295b93f30d2e8e59eebb27820cb164204e35264a066bbd3cb0e86eaeb09c8574fd47c8164fae04b4e9e50786bdba119ab65
 EBUILD mmm-mode-0.5.7.ebuild 630 BLAKE2B 0f141a88344af6583ec398deb7ac5e08cfd3546e2137f2f456e56c802c7483a4da07e9585694aa0851370d74fad2350a1496a10e90dd5047289747434b16b068 SHA512 c00f0dca6afbcab6f2a4011fccfe4024128f8ba20b2be79c54c994c56f7524f3575c93230b4e76506a3a3b031d2dee25dd6972fe42bf54db74cb5dfa9420cead
 EBUILD mmm-mode-0.5.8.ebuild 578 BLAKE2B fd78560d596db952bed1915e51709cbfc921b2558b18327d8e7951fc4db0ba16e7300519780ea39bb428ff8ade26f827d4f1952885ff344b9240861f57bed958 SHA512 f231b03f7adb3d38315b97e70dc2ccd2a508dae6686dc3ce148d522d0a65f76fca9ed2888015799c3d3d92f497f993d59920dbb0e8ab381b0f5604d0244f6bb5
+EBUILD mmm-mode-0.5.9.ebuild 617 BLAKE2B f17b202315f18fd5fc779148334079bba16d8a8c3625b7bb44883c6ea973236eccaac47bf10fc1ebe8168fb202eccce05a4ef21089533ea72d0377b01db3decc SHA512 fd337647d7ded97a1eb446fd93ee60f3866881e11450b1ca1663768d90f11925404ee767ce897007fe7989413b6c67cb7bf5b767e327fcc03cf7a0d9db8a7879
 MISC metadata.xml 415 BLAKE2B ade4957533ff05ccf267e0b9ddc30949c8cb9dd06c9cd673fba932acbb932765bcabaa7ea9cadbb9bba64eea23b4d6df6be624d6a387a261bc678a89e86f76f7 SHA512 2ab1401a418ffd9682d350a90933983e9bd168422731f14faaa2ca96d51277048d5c86ac7d482beeb9c6af73746a22cde32280391311c64bbce366ef1df8d7ce
--- a/app-emacs/mmm-mode/mmm-mode-0.5.9.ebuild
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.9.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
+HOMEPAGE="http://mmm-mode.sourceforge.net/
+	https://github.com/dgutov/mmm-mode/"
+SRC_URI="https://github.com/dgutov/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="mmm.texi"
+DOCS=( AUTHORS FAQ NEWS README README.Mason TODO )
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/plus42/Manifest
+++ b/app-emulation/plus42/Manifest
@ -3,8 +3,10 @@ AUX plus42-1.0.4-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5
 AUX plus42-1.0.9-fix-makefile.patch 713 BLAKE2B fb8ca302a324122cee89d7f3ddab2a0521c8dee1e910ae50efe7ee74ed3781ac7e3c017cc7afbd601cf41527afd61d979396400a5e6dc8e1714ff853ba25a4eb SHA512 532c8b2d88324e3b38ab568beb1ed9b7fce6e91c894c6438657a800ccd32759c82ce9bcbea3828a04985eef18c278004e0a068b88695da5f0e75bd996c6d2fd3
 DIST plus42-upstream-1.0.10.tgz 7585424 BLAKE2B c27f5e653e07986a092efc34ed6aaf7de2b1e6c20db3300fc6bd35337032a57b4623cf9d5ecb1b0e56e1a7b6d92a4b5d04be0b9dea9fade9d0e7efe86901ca8d SHA512 d504988c5bfcf1e554ee7478c5c6d0cc7472e3ba9904fb45d2ea77bf05307e0def79002785551b6a876d714d5d4279728b329c63c7108a935b06967c65441083
 DIST plus42-upstream-1.0.12.tgz 7587652 BLAKE2B 22238d0e0b315f682063803d01cc2c1e943b152d8dd37998fbf81827d311f13b43e7529bf9fc229697b865dfe630ff1024052e119b5753386ac9a06db0f2c0e4 SHA512 31e380ab45d11a2e1a02ade6b9ce61aa756ee20ad8424eb404986ff536be8e91dea63b00baea607d7f0e41e0406d2bbab9f91123a637a2c87bbfe25bcabbbaa7
+DIST plus42-upstream-1.0.13.tgz 7587720 BLAKE2B 101e6b58a5421e42340b63f521b3a68766dd2f5ddb73d88c6417bd71f79afc0f20403f7e9c134ff3a8f97259a09e7b67dd47d8f349b8c233c12bf707a5ec7175 SHA512 5e184c2737da8aeb702b8d73af810ae5ab633490470918e3e9bb467ac01cfb912a25ae7ba00cb311fafe7250fc28b474958d55c19e1ec9b3c2280c33b97ae865
 DIST plus42-upstream-1.0.9.tgz 7585218 BLAKE2B e6c09c985fcf3f037a0c1dc1f4f445ef18c4f73962ffbf46939b91d5a96c9f079bd36b328b30fcae42f0bc13ebee7a1f56e51762f225f41fb715ab88e8b93d56 SHA512 77c06cf33d375f513c6806910f6b8bdda865853e7890922174364a7d2a07e35a6bbae2e62800c7658be01fe8b3aafbfc7f53a19451475b411865fe69bef090d8
 EBUILD plus42-1.0.10.ebuild 972 BLAKE2B 03c21304c358e2ff239fce280bfa8d594a4e6f65031df09f9a360841d4f37abd784c1d6e502d42c95069bbef30e254513660524022bac7c8768a27f617b929d7 SHA512 fa349ee9772897a65465e67af8baf88683ef35658316259a40260f69111afa81b513f9c92191cba3c82da36e3fc0de9179c188179a42e2ee0ecaa92cd6f83df8
 EBUILD plus42-1.0.12.ebuild 1019 BLAKE2B d2a70ceae0aa4dbb5bce9b9d2ecf6defecb41cb9e90061ab7fe58961cd2c038ef296c0ab833e3436e3ff1bfdba79957aa5439af9cd8dff09e38e7d9aa198233b SHA512 2c28f7becef6e0e5c971549487d759eb4703c4343e134fa0a04be4bb735f8a0fc5090779c4fe0c8cdf638882143e6e903b8a467e0f0a54927647fb6b6cbcb1c9
+EBUILD plus42-1.0.13.ebuild 1019 BLAKE2B d2a70ceae0aa4dbb5bce9b9d2ecf6defecb41cb9e90061ab7fe58961cd2c038ef296c0ab833e3436e3ff1bfdba79957aa5439af9cd8dff09e38e7d9aa198233b SHA512 2c28f7becef6e0e5c971549487d759eb4703c4343e134fa0a04be4bb735f8a0fc5090779c4fe0c8cdf638882143e6e903b8a467e0f0a54927647fb6b6cbcb1c9
 EBUILD plus42-1.0.9.ebuild 1000 BLAKE2B 92d6952d31fff32a1c02616a44fc1cc78b8de1ce0d7d47d95a869514a395f46529a6c835ebab86dc22b81f33293f7e699d839291b478504a78a90c364a1096dd SHA512 50a4568e937b5f3be015d71f40b3ade6327f1f1debc2857d6726e473931ac485005943a2307a7cfb9efeef1f35d03194aadcf5363efcd713f0457e80e1467aa6
 MISC metadata.xml 353 BLAKE2B 62d2057ed40527ddee3b747c7d702009bba223521e3264af5905506515fc67a6baf27938ae03d664eeb713aaeac898b7a1eee0682b69f3659b4dbc6e7eddaef8 SHA512 9633917e4a226c142672cd8bb91d3ca5ec40a2b4600bc8ba60ea959dc871f54881dc331ca5ed0030a4afcbad426c7528667b61289e4ed77e19aa3e9d1c816ce2
--- a/app-emulation/plus42/plus42-1.0.13.ebuild
+++ b/app-emulation/plus42/plus42-1.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}-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="app-accessibility/at-spi2-core
+	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.12-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
+}
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -11,6 +11,9 @@ AUX qemu-7.0.0-pci-overflow-fortify-source-3.patch 3939 BLAKE2B 02909d525e2ff2bc
 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-capstone-include-path.patch 1076 BLAKE2B cb595acb50ff2a64d0b879d5d8439d89b0d6295434ae09d1c45c01d3b18f547dcac201e79140eb9dc376d2d8c1d1b72a5adfe7ac477da61c86da148ed486ff2b SHA512 857504916325984150f8e0869aa44b158ed829b53d2bcb7f7012390d2d404ae1553af50184be6e2d8f91ffedfc5c061b7f64b9f28feb38bf18379dee56704732
+AUX qemu-7.1.0-faccessat2.patch 2862 BLAKE2B 08daf0fa043b900bd503f07c1ee4c1a2e40195cd0862c2cd41536b45f6f22d5927d5f8cded7648c0bc6e42ec1ca17a788efdade8b9749637c2ee62994a459196 SHA512 5ae3d23192aa382ae1d7e41ecd42265f47d8b864db53980ba2b4636ee5b777e0a33bfc4437924ab7866ba758af888a497eeefadc63a7dc7e00dcef206dcee31c
+AUX qemu-7.1.0-loong-stat.patch 2978 BLAKE2B e4c233fa9b561278c7df8dcc19c19868b96698f19b0d881c40e8d961c8721fc5cfad0c50e309ae92b009b6d1e2b01c5cf5ec4fbf644058e13e6d57bb00ebd8af SHA512 6e2f7b5a16d981bb21a0acc1ffe8ff6c05fe64152f93d50a0274b8d5c1635a8af1bec38e71c3350c4643582bdb0a30dda8793e9a67bd20046cee9528198da6dd
+AUX qemu-7.1.0-mips-n32-syscalls.patch 4010 BLAKE2B 8ef814ed186ca1863bbdf2e88d76af18146c50581de45406eb2e1d91f72feda34d2516a81c6cfce24843a9eb30bffc91072ec3b6bdc43a2f5dead03283fef2d1 SHA512 0146fb659762eec9fe236ea3cf0382e75b79c2d9bdf5065f0f5b3904b961f76e1b877589d95de1de09d009d9364bdeb077c6a06efb78ab91f5971f91b2bf588e
 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
@ -19,6 +22,7 @@ DIST qemu-7.0.0.tar.xz 125117636 BLAKE2B ceda6d9f1a585298bd49fed61e8bb35f0064ad8
 DIST qemu-7.1.0-docs.tar.xz 2016780 BLAKE2B 1b84361fe58d504ab740a0b805a25d02f497ca776e7251a99f0e98e3720d1a2029b7a171f9d79dd128ba17a82c72d497e09baa1a4b2f192ba390f0f3b1950792 SHA512 7a328303b8af0ab63aa1f0fe07a121d3ca459d00fca817412e645416af795930dbea0a3e60f4ca006a74d1672e84fa4e626e4d83918e0b685b601043d0d8159e
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
 EBUILD qemu-7.0.0-r3.ebuild 27290 BLAKE2B 985947dc90817bed2c5e0878158604577b6ac3f7f605fd6372aa5b480851a6c94ea44e73aa301b7c1a5b8fa59f2281e57f99a84e5b10bc07beff0a3096b48a22 SHA512 8cc6ae4e2bde1b458d1682624fb46a56c1837592545638e63907c4067e67c39a609e85941381a33a80013d5e82c202644c6a9c5202091e344eabe3f8f6eb0c5b
+EBUILD qemu-7.1.0-r1.ebuild 28536 BLAKE2B fe9b134589949df5fe24c9a699d9a466f4d895d0377bc10d6d90a5a6d1184d70cc6bf1400d9a6901810f1f197507c63cf76ef8691515b2863bb5a28225671b16 SHA512 dd436ce43810347df1d15f145069f9e3af149a084b776b779873c65d17785115397a0c72b136338dad76c98df855d7ec6cd9619b502e3bad69b9a0cd10fad2ad
 EBUILD qemu-7.1.0.ebuild 28397 BLAKE2B d9348f01501bd60b1dd11a87ec52214a29c2e0fac5e815b3820f12a97390434509537b850646fe62c002aa259d9fa5c802659be430df2e556998b658dd05117c SHA512 a7113edecc8c9fd0d46faff044bb498deb700c1eb8da9b8d38cfcc742fcb9e04e35f5db8b89234cedf93560bd2c5b40229f09440c544f21547caf7931c875ea7
 EBUILD qemu-9999.ebuild 28060 BLAKE2B 14535cb78c758a130e8148b941bdccd552cee354f652504f4f8c641c7cd8c8fc3e3b847801c6caf315ac090d910135a0a04d091ffb7d43ed2e89b520aa20f211 SHA512 5f495ca835ec867a5b6e7891038c3e93292b0ee321857f8524b89edc6e64d1c8d7fdbc5b1cc202aa620ec3c7fb0efa4a843f1caa1c1b37bd3e251a2ed18c4940
-MISC metadata.xml 4672 BLAKE2B ea2319ecc6717e4f10667f70928eac2b59eb27bb117957c266984a4d5bdf84604128086956a651c1880d314efde56ce81a67c364f7944f5342b6a322b5e3e73e SHA512 27f357299abc6a82112dab17c81b825459ce4c7afd96381b4cba13d79861f80e7d452d574795cab240e7ca56154128a2597ac9957aa24ef81d7dc9092312ac79
+MISC metadata.xml 4787 BLAKE2B 587c653d3989f07a476e95210ab5f878387f830dba00fde02840aace8b9f4288189ca2ef4226fefa088a355aa714d244ea5a8e5f24f6d038a35ad54e9d8ee147 SHA512 7395730466501bb707983248b10ab9930b8016cc8ff193ab4d532996faf59d8e4ec79ecf675ec650082d47dc86a81b5eea941dccdb70c1de39fbf1ea65838620
--- a/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch
+++ b/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch
@ -0,0 +1,78 @@
+From 35a2c85f7d691db7aa2c47181902ac87478eef7a Mon Sep 17 00:00:00 2001
+From: WANG Xuerui <xen0n@gentoo.org>
+Date: Sun, 9 Oct 2022 14:08:13 +0800
+Subject: [PATCH] linux-user: Implement faccessat2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+User space has been preferring this syscall for a while, due to its
+closer match with C semantics, and newer platforms such as LoongArch
+apparently have libc implementations that don't fallback to faccessat
+so normal access checks are failing without the emulation in place.
+
+Tested by successfully emerging several packages within a Gentoo loong
+stage3 chroot, emulated on amd64 with help of static qemu-loongarch64.
+
+Reported-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
+Message-Id: <20221009060813.2289077-1-xen0n@gentoo.org>
+[lv: removing defined(__NR_faccessat2) in syscall.c,
+     adding defined(TARGET_NR_faccessat2) on print_faccessat()]
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+---
+ linux-user/strace.c    | 2 +-
+ linux-user/strace.list | 3 +++
+ linux-user/syscall.c   | 9 +++++++++
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/linux-user/strace.c b/linux-user/strace.c
+index 86c081c83f..9ae5a812cd 100644
+--- a/linux-user/strace.c
+++ b/linux-user/strace.c
+@@ -1969,7 +1969,7 @@ print_execv(CPUArchState *cpu_env, const struct syscallname *name,
+ }
+ #endif
+ 
+-#ifdef TARGET_NR_faccessat
+#if defined(TARGET_NR_faccessat) || defined(TARGET_NR_faccessat2)
+ static void
+ print_faccessat(CPUArchState *cpu_env, const struct syscallname *name,
+                 abi_long arg0, abi_long arg1, abi_long arg2,
+diff --git a/linux-user/strace.list b/linux-user/strace.list
+index a87415bf3d..3df2184580 100644
+--- a/linux-user/strace.list
+++ b/linux-user/strace.list
+@@ -178,6 +178,9 @@
+ #ifdef TARGET_NR_faccessat
+ { TARGET_NR_faccessat, "faccessat" , NULL, print_faccessat, NULL },
+ #endif
+#ifdef TARGET_NR_faccessat2
+{ TARGET_NR_faccessat2, "faccessat2" , NULL, print_faccessat, NULL },
+#endif
+ #ifdef TARGET_NR_fadvise64
+ { TARGET_NR_fadvise64, "fadvise64" , NULL, NULL, NULL },
+ #endif
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index d499cac1d5..e985ad167f 100644
+--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
+@@ -9143,6 +9143,15 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+         unlock_user(p, arg2, 0);
+         return ret;
+ #endif
+#if defined(TARGET_NR_faccessat2)
+    case TARGET_NR_faccessat2:
+        if (!(p = lock_user_string(arg2))) {
+            return -TARGET_EFAULT;
+        }
+        ret = get_errno(faccessat(arg1, p, arg3, arg4));
+        unlock_user(p, arg2, 0);
+        return ret;
+#endif
+ #ifdef TARGET_NR_nice /* not on alpha */
+     case TARGET_NR_nice:
+         return get_errno(nice(arg1));
+-- 
+2.37.4
+
--- a/app-emulation/qemu/files/qemu-7.1.0-loong-stat.patch
+++ b/app-emulation/qemu/files/qemu-7.1.0-loong-stat.patch
@ -0,0 +1,98 @@
+From xen0n@gentoo.org Thu Oct 06 10:07:10 2022
+Return-Path: <xen0n@gentoo.org>
+X-Original-To: dilfridge@gentoo.org
+Delivered-To: dilfridge@gentoo.org
+From: WANG Xuerui <xen0n@gentoo.org>
+To: qemu-devel@nongnu.org
+Cc: Richard Henderson <richard.henderson@linaro.org>,
+	=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>,
+	WANG Xuerui <xen0n@gentoo.org>,
+	Song Gao <gaosong@loongson.cn>,
+	Xiaojuan Yang <yangxiaojuan@loongson.cn>,
+	=?UTF-8?q?Andreas=20K=20=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Subject: [PATCH RESEND] linux-user: Fix struct statfs ABI on loongarch64
+Date: Thu,  6 Oct 2022 18:07:10 +0800
+Message-Id: <20221006100710.427252-1-xen0n@gentoo.org>
+X-Mailer: git-send-email 2.38.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Previously the 32-bit version was incorrectly chosen, leading to funny
+but incorrect output from e.g. df(1). Simply select the version
+corresponding to the 64-bit asm-generic definition.
+
+For reference, this program should produce the same output no matter
+natively compiled or not, for loongarch64 or not:
+
+```c
+#include <stdio.h>
+#include <sys/statfs.h>
+
+int main(int argc, const char *argv[])
+{
+  struct statfs b;
+  if (statfs(argv[0], &b))
+    return 1;
+
+  printf("f_type = 0x%lx\n", b.f_type);
+  printf("f_bsize = %ld\n", b.f_bsize);
+  printf("f_blocks = %ld\n", b.f_blocks);
+  printf("f_bfree = %ld\n", b.f_bfree);
+  printf("f_bavail = %ld\n", b.f_bavail);
+
+  return 0;
+}
+
+// Example output on my amd64 box, with the test binary residing on a
+// btrfs partition.
+
+// Native and emulated output after the fix:
+//
+// f_type = 0x9123683e
+// f_bsize = 4096
+// f_blocks = 268435456
+// f_bfree = 168406890
+// f_bavail = 168355058
+
+// Output before the fix, note the messed layout:
+//
+// f_type = 0x10009123683e
+// f_bsize = 723302085239504896
+// f_blocks = 168355058
+// f_bfree = 2250817541779750912
+// f_bavail = 1099229433104
+```
+
+Fixes: 1f63019632 ("linux-user: Add LoongArch syscall support")
+Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
+Cc: Song Gao <gaosong@loongson.cn>
+Cc: Xiaojuan Yang <yangxiaojuan@loongson.cn>
+Cc: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+
+Resend with amended commit message to 100% clarify the example output
+are generated on my box and will differ for everyone else. Sorry for
+the noise.
+
+ linux-user/syscall_defs.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
+index 01ee10a88f..77864de57f 100644
+--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
+@@ -2262,7 +2262,8 @@ struct target_statfs64 {
+ };
+ #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \
+        defined(TARGET_SPARC64) || defined(TARGET_AARCH64) || \
+-       defined(TARGET_RISCV)) && !defined(TARGET_ABI32)
+       defined(TARGET_RISCV) || defined(TARGET_LOONGARCH64)) && \
+       !defined(TARGET_ABI32)
+ struct target_statfs {
+ 	abi_long f_type;
+ 	abi_long f_bsize;
+-- 
+2.38.0
+
+
--- a/app-emulation/qemu/files/qemu-7.1.0-mips-n32-syscalls.patch
+++ b/app-emulation/qemu/files/qemu-7.1.0-mips-n32-syscalls.patch
@ -0,0 +1,94 @@
+From xen0n@gentoo.org Thu Oct 06 08:55:00 2022
+Return-Path: <xen0n@gentoo.org>
+X-Original-To: dilfridge@gentoo.org
+Delivered-To: dilfridge@gentoo.org
+From: WANG Xuerui <xen0n@gentoo.org>
+To: qemu-devel@nongnu.org
+Cc: WANG Xuerui <xen0n@gentoo.org>,
+	=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>,
+	Jiaxun Yang <jiaxun.yang@flygoat.com>,
+	=?UTF-8?q?Andreas=20K=20=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>,
+	Joshua Kinard <kumba@gentoo.org>
+Subject: [PATCH] linux-user: Fix more MIPS n32 syscall ABI issues
+Date: Thu,  6 Oct 2022 16:55:00 +0800
+Message-Id: <20221006085500.290341-1-xen0n@gentoo.org>
+X-Mailer: git-send-email 2.38.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In commit 80f0fe3a85 ("linux-user: Fix syscall parameter handling for
+MIPS n32") the ABI problem regarding offset64 on MIPS n32 was fixed,
+but still some cases remain where the n32 is incorrectly treated as any
+other 32-bit ABI that passes 64-bit arguments in pairs of GPRs. Fix by
+excluding TARGET_ABI_MIPSN32 from various TARGET_ABI_BITS == 32 checks.
+
+Closes: https://gitlab.com/qemu-project/qemu/-/issues/1238
+Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
+Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
+Cc: Andreas K. Hüttel <dilfridge@gentoo.org>
+Cc: Joshua Kinard <kumba@gentoo.org>
+---
+
+Note: I can't reproduce the crash with neither MIPS n32 sysroot at my hand
+(a self-built one for Loongson-2F, and stage3-mips64_n32-openrc-20221001T170527Z),
+so I can only verify by looking at the (host and qemu) strace outputs, and
+would have to ask you to review/test this harder. Thanks.
+
+ linux-user/syscall.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 2e954d8dbd..8b2d39fe73 100644
+--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
+@@ -11793,7 +11793,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+         return -host_to_target_errno(ret);
+ #endif
+ 
+-#if TARGET_ABI_BITS == 32
+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32)
+ 
+ #ifdef TARGET_NR_fadvise64_64
+     case TARGET_NR_fadvise64_64:
+@@ -11920,7 +11920,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+         return get_errno(sys_gettid());
+ #ifdef TARGET_NR_readahead
+     case TARGET_NR_readahead:
+-#if TARGET_ABI_BITS == 32
+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32)
+         if (regpairs_aligned(cpu_env, num)) {
+             arg2 = arg3;
+             arg3 = arg4;
+@@ -12612,7 +12612,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+ #endif /* CONFIG_EVENTFD  */
+ #if defined(CONFIG_FALLOCATE) && defined(TARGET_NR_fallocate)
+     case TARGET_NR_fallocate:
+-#if TARGET_ABI_BITS == 32
+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32)
+         ret = get_errno(fallocate(arg1, arg2, target_offset64(arg3, arg4),
+                                   target_offset64(arg5, arg6)));
+ #else
+@@ -12623,7 +12623,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+ #if defined(CONFIG_SYNC_FILE_RANGE)
+ #if defined(TARGET_NR_sync_file_range)
+     case TARGET_NR_sync_file_range:
+-#if TARGET_ABI_BITS == 32
+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32)
+ #if defined(TARGET_MIPS)
+         ret = get_errno(sync_file_range(arg1, target_offset64(arg3, arg4),
+                                         target_offset64(arg5, arg6), arg7));
+@@ -12645,7 +12645,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+     case TARGET_NR_arm_sync_file_range:
+ #endif
+         /* This is like sync_file_range but the arguments are reordered */
+-#if TARGET_ABI_BITS == 32
+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32)
+         ret = get_errno(sync_file_range(arg1, target_offset64(arg3, arg4),
+                                         target_offset64(arg5, arg6), arg2));
+ #else
+-- 
+2.38.0
+
+
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@ -13,6 +13,10 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Hüttel</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
--- a/app-emulation/qemu/qemu-7.1.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-7.1.0-r1.ebuild
@ -0,0 +1,988 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="${PV}"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.1.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+		pax-utils xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	QEMU_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
+	EGIT_SUBMODULES=(
+		tests/fp/berkeley-softfloat-3
+		tests/fp/berkeley-testfloat-3
+		ui/keycodemapdb
+	)
+	inherit git-r3
+	SRC_URI=""
+else
+	MY_P="${PN}-${PV/_rc/-rc}"
+	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
+
+	if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_USEFLAG}
+	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+	jack jemalloc +jpeg
+	lzo multipath
+	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
+	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	+slirp
+	smartcard snappy spice ssh static static-user systemtap test udev usb
+	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
+	zstd"
+
+COMMON_TARGETS="
+	aarch64
+	alpha
+	arm
+	cris
+	hppa
+	i386
+	loongarch64
+	m68k
+	microblaze
+	microblazeel
+	mips
+	mips64
+	mips64el
+	mipsel
+	nios2
+	or1k
+	ppc
+	ppc64
+	riscv32
+	riscv64
+	s390x
+	sh4
+	sh4eb
+	sparc
+	sparc64
+	x86_64
+	xtensa
+	xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+	${COMMON_TARGETS}
+	avr
+	rx
+	tricore
+"
+IUSE_USER_TARGETS="
+	${COMMON_TARGETS}
+	aarch64_be
+	armeb
+	hexagon
+	mipsn32
+	mipsn32el
+	ppc64le
+	sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_riscv32? ( fdt )
+	qemu_softmmu_targets_riscv64? ( fdt )
+	qemu_softmmu_targets_x86_64? ( fdt )
+	sdl-image? ( sdl )
+	static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
+	static-user? ( !plugins )
+	vhost-user-fs? ( caps seccomp )
+	virgl? ( opengl )
+	virtfs? ( caps xattr )
+	vnc? ( gnutls )
+	vte? ( gtk )
+	multipath? ( udev )
+	plugins? ( !static !static-user )
+"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bpf? ( dev-libs/libbpf:= )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	capstone? ( dev-libs/capstone:= )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
+	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		vte? ( x11-libs/vte:2.91 )
+	)
+	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	multipath? ( sys-fs/multipath-tools )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)]
+		sys-libs/ncurses:=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl(+),gbm(+)]
+	)
+	pam? ( sys-libs/pam )
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/libsdl2[static-libs(+)]
+	)
+	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	slirp? ( net-libs/libslirp[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:= )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+	udev? ( virtual/libudev:= )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
+"
+
+EDK2_OVMF_VERSION="202202"
+SEABIOS_VERSION="1.16.0"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		~sys-firmware/ipxe-1.21.1[binary,qemu]
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		~sys-firmware/sgabios-0.1_pre10[binary]
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
+			>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
+		)
+		sys-firmware/ipxe[qemu]
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+		sys-firmware/sgabios
+	)"
+PPC_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-bin-${SEABIOS_VERSION}
+	)
+	!pin-upstream-blobs? (
+		|| (
+			>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
+			>=sys-firmware/seabios-bin-${SEABIOS_VERSION}
+		)
+	)
+"
+
+BDEPEND="
+	$(python_gen_impl_dep)
+	dev-lang/perl
+	dev-util/meson
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	gtk? ( nls? ( sys-devel/gettext ) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)
+"
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+	acct-group/kvm
+	selinux? (
+		sec-policy/selinux-qemu
+		sys-libs/libselinux
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-6.0.0-make.patch
+	"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
+	"${FILESDIR}"/${PN}-7.1.0-strings.patch
+	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
+	"${FILESDIR}"/${PN}-7.1.0-mips-n32-syscalls.patch
+	"${FILESDIR}"/${PN}-7.1.0-loong-stat.patch
+	"${FILESDIR}"/${PN}-7.1.0-faccessat2.patch
+)
+
+QA_PREBUILT="
+	usr/share/qemu/hppa-firmware.img
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
+	usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/configs/targets/ >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	default
+
+	# Use correct toolchain to fix cross-compiling
+	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
+	export WINDRES=${CHOST}-windres
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# We already force -D_FORTIFY_SOURCE=2 (or 3) in our toolchain, but
+	# this setting (-U then -D..=2) will prevent us from trying out 3, so
+	# drop it. No change to level of protection b/c we patch our toolchain.
+	sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die
+
+	# Remove bundled modules
+	rm -r dtc meson roms/*/ slirp || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}" || die
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--bindir=/usr/bin
+		--libdir=/usr/$(get_libdir)
+		--datadir=/usr/share
+		--docdir=/usr/share/doc/${PF}/html
+		--mandir=/usr/share/man
+		--localstatedir=/var
+		--disable-bsd-user
+		--disable-containers # bug #732972
+		--disable-guest-agent
+		--disable-strip
+		--with-git-submodules=ignore
+
+		# bug #746752: TCG interpreter has a few limitations:
+		# - it does not support FPU
+		# - it's generally slower on non-self-modifying code
+		# It's advantage is support for host architectures
+		# where native codegeneration is not implemented.
+		# Gentoo has qemu keyworded only on targets with
+		# native code generation available. Avoid the interpreter.
+		--disable-tcg-interpreter
+
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+
+		$(use_enable alsa)
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		$(use_enable jack)
+		$(use_enable nls gettext)
+		$(use_enable oss)
+		$(use_enable plugins)
+		$(use_enable pulseaudio pa)
+		$(use_enable selinux)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	# Enable option only for softmmu build, but not 'user' or 'tools'
+	conf_softmmu() {
+		if [[ ${buildtype} == "softmmu" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Enable option only for tools build, but not 'user' or 'softmmu'
+	conf_tools() {
+		if [[ ${buildtype} == "tools" ]] ; then
+			use_enable "$@"
+		else
+			echo "--disable-${2:-$1}"
+		fi
+	}
+	# Special case for the malloc flag, because the --disable flag does
+	# not exist and trying like above will break configuring.
+	conf_malloc() {
+		if [[ ! ${buildtype} == "user" ]] ; then
+			usex "${1}" "--enable-malloc=${1}" ""
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_softmmu bpf)
+		$(conf_notuser bzip2)
+		$(conf_notuser capstone)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_tools doc docs)
+		$(conf_notuser fdt)
+		$(conf_notuser fuse)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser io-uring linux-io-uring)
+		$(conf_malloc jemalloc)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser multipath mpath)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser pam auth-pam)
+		$(conf_notuser png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_softmmu sdl-image)
+		$(conf_notuser seccomp)
+		$(conf_notuser slirp slirp system)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh)
+		$(conf_notuser udev libudev)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_softmmu virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		# use prebuilt keymaps, bug #759604
+		--disable-xkbcommon
+		$(conf_notuser zstd)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts=(
+			# Note: backend order matters here: #716202
+			# We iterate from higher-level to lower level.
+			$(usex pulseaudio pa "")
+			$(usev jack)
+			$(usev sdl)
+			$(usev alsa)
+			$(usev oss)
+		)
+		conf_opts+=(
+			--audio-drv-list=$(IFS=,; echo "${audio_opts[*]}")
+		)
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+
+		for target in ${IUSE_SOFTMMU_TARGETS}; do
+			if use "qemu_softmmu_targets_${target}"; then
+				conf_opts+=(
+					# For some reason, adding this with the setting set
+					# to on *or* off makes the build always fail.
+					# --with-devices-${target}=gentoo
+				)
+			fi
+		done
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	# Meson will not use a cross-file unless cross_prefix is set.
+	tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
+	# Plumb through equivalent of EXTRA_ECONF to allow experiments
+	# like bug #747928.
+	conf_opts+=( ${EXTRA_CONF_QEMU} )
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+
+			# Needed to rework vhost-user-fs handling thanks to https://gitlab.com/qemu-project/qemu/-/commit/5166dab
+			# The option was converted into being configurable by
+			# Kconfig's. So, to enable it, we insert the necessary
+			# options into each arch's softmmu target gentoo.mak file,
+			# then configure with --with-devices-${target}=gentoo.
+			if use vhost-user-fs; then
+				echo "CONFIG_VHOST_USER_FS=y for ${target}-softmmu" || die
+				echo "CONFIG_VIRTIO=y" >> "configs/devices/${target}-softmmu/gentoo.mak" || die
+				echo "CONFIG_VHOST_USER_FS=y" >> "configs/devices/${target}-softmmu/gentoo.mak" || die
+			else
+				echo "CONFIG_VHOST_USER_FS=n for ${target}-softmmu" || die
+				echo "CONFIG_VIRTIO=n" >> "configs/devices/${target}-softmmu/gentoo.mak" || die
+				echo "CONFIG_VHOST_USER_FS=n" >> "configs/devices/${target}-softmmu/gentoo.mak" || die
+			fi
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build" || die
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		default
+	fi
+
+	cd "${S}/tools-build" || die
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build" || die
+		pax-mark m */qemu-system-* #515550
+		emake check
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/python/qemu"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		# we use 'printf' here to be portable across 'sh'
+		# implementations: #679168
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dodoc check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build" || die
+	emake DESTDIR="${ED}" install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8]
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null || die
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null || die
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}" || die
+	dodoc MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	# Disallow stripping of prebuilt firmware files.
+	dostrip -x ${QA_PREBUILT}
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+
+		# PPC/PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	xdg_icon_cache_update
+
+	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+		fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+
+		if has_version 'sys-firmware/edk2-ovmf-bin'; then
+			ewarn "	$(best_version sys-firmware/edk2-ovmf-bin)"
+		else
+			ewarn " $(best_version sys-firmware/edk2-ovmf)"
+		fi
+
+		if has_version 'sys-firmware/seabios-bin'; then
+			ewarn "	$(best_version sys-firmware/seabios-bin)"
+		else
+			ewarn " $(best_version sys-firmware/seabios)"
+		fi
+
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+
+	if has_version 'sys-firmware/edk2-ovmf-bin'; then
+		echo "  $(best_version sys-firmware/edk2-ovmf-bin)"
+	else
+		echo "  $(best_version sys-firmware/edk2-ovmf)"
+	fi
+
+	if has_version 'sys-firmware/seabios-bin'; then
+		echo "  $(best_version sys-firmware/seabios-bin)"
+	else
+		echo "  $(best_version sys-firmware/seabios)"
+	fi
+
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	udev_reload
+}
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@ -8,6 +8,7 @@ DIST alsa-0.6.0.crate 68171 BLAKE2B b692d929e49765c59ae2fae7bbe8bef4393c393e384c
 DIST alsa-sys-0.3.1.crate 32748 BLAKE2B 0c4da9c343d622ddd521fe9332acf97c1ee4a202a909c7a0014a507148ab6ff82d5098660dcba847d938b296adde416ae420d454d6982c33a0456f37840d716b SHA512 6523d909c500fee433f934eedfdc200cfc52e1b55be09434665210c16bb9af3593d8b1346ace184b171c7135a7aa65fdac5ca8c68e64f9d20436e1d8fac961fe
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
 DIST anyhow-1.0.65.crate 43585 BLAKE2B 4a808e60ffed900ef37d8fbf7ae97caec6fb81d23a8a5411c5c0143636652c41a9579b156ead5eab66d57c53be2bbc336cbd5f7b60c6c20cad389d45861d82f8 SHA512 86b83c88fbc343f4ff1bfba5bf91f3c5133fbed8276e78f4222b28e38ada79c4245e2780934897525b41cbd4b8a9d0bc9cbd8b6c2dd32544ba124d458f5a490c
+DIST anyhow-1.0.66.crate 43770 BLAKE2B 8d74397c47bd64c00f015cf7ee279fa020ea39191440208d77e4a5fdb35fca531e8bb9b765be223b24050d0fd1db76fa5b516146f450937f84a5c113c9eca997 SHA512 7b4078906df2805d491dc2f29c4eec85a9f43078c0dcd9c05261c2706ed655953b693c4f59fda62547681b29cda9ac7a0789f1359bb18110403cfe34e9fb0dc3
 DIST approx-0.5.1.crate 15100 BLAKE2B 8fe84d52263521c0b72a1d1e82ed283828f680b8b56f532df2c14ea86ca09e793686d823c5d58ecfd7a829948543bb375e85223c866cf036e9432be5d6aa7399 SHA512 c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
@ -17,7 +18,9 @@ DIST async-channel-1.7.1.crate 12855 BLAKE2B f7762c5d3fa880da7e31f176fc28d9997fc
 DIST atk-sys-0.15.1.crate 22726 BLAKE2B 8ba96f5eb203085b09201f47589b84a874bf9b9bbec4b2947b67f9614c55e3048f91da9fe5fbbc9a2016d6bb24f885ef92aee9182c63ca74bad3faec259a43bc SHA512 b1be38a2d9eda4a43fb493fbbad5505d9af4cdf5033b7d921c04c03cd7b014dad5ddc7664ff872ed381579fa15536c6a11ceeb6c2c0145a08703775109f74923
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST base-x-0.2.11.crate 10755 BLAKE2B 0029779ba8f8802bda969949bd94168131b34ee5d26a4b97bd277b4723f284fd392b2d93b12ab618262ea2288821b3e8be01a97ba2939957ed5d6e74ddb4eda9 SHA512 4e623b05b9450d8c3613da857a144cba2ee724584b0baa6df2209750da1c6e66756b88b787e8d8764c72a3e9dcb411316ff6a70afdd6f80d59b4224209c277f1
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
+DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST bindgen-0.59.2.crate 206267 BLAKE2B de66347fcf2d538879e49c85d2db80e86a70e27d3c84464b52a840476a31edae0cfa3e1afaba33ef0b7abadcb1e23a2fe1420e3254e0de1f6848b575a9c96620 SHA512 14c49879c7443191b877957a4fd405c7f10a1e8b70016d91bf5fe33861fc5d71982a1c685c190e4f7922cedb6c8aefadac3b0b68cbe5578da791a8da6bfedf44
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
@ -31,7 +34,9 @@ DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST build_const-0.2.2.crate 4511 BLAKE2B 44316d3b468e73fbeedbaa1ae35705196f787707ea861355d926e7fbc97f759bc7fe0bf88d2e97fb9b981fc7347fe0e849ce2094f50ab53075b4dfe7522089f0 SHA512 47a9949b7196791af2507d6e3a28843da67621e5b56177d3b13477e070487cdd1059207588a55bf1a393df9118e71e3024b439a3c6281b6c12b5bdee66b237a6
 DIST bumpalo-3.11.0.crate 80945 BLAKE2B a740a674d0922794cc71b87a8bd686f677f8d0b38d88cc43467b7f8f6d1368ef5cff99bf10867d3c8af9b79b71deca7e5bfe78670b7890b04e468359780d8c76 SHA512 f747b5743bd2825c62c363ec49f1eccc492d7cf8cca8101aa9733f32489685c1777344dc6183f83c772f1067f9648b953d3ae1034976a14295f252f1ee7788fa
+DIST bumpalo-3.11.1.crate 81207 BLAKE2B ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292 SHA512 70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc
 DIST bytemuck-1.12.1.crate 38293 BLAKE2B f714ba0b4b0d693c5b26a3bcbe9de8c1496851a298bb70770e6284ed68caea61d7b8c14d67ed0e8b6d9146e76f791192fcfe11e897146203d5acf536b9721e67 SHA512 50626367364cf0cb33658f6cbb99675f1191ed3e7ad447bd7d2c24f360bd3524ebe1b2d1fcc7d78d1a0692408da8d95795b54efee91a87c55e8b54711a968790
+DIST bytemuck-1.12.3.crate 39835 BLAKE2B 70bb0459b80fceec7f3c16c70a251f3d0e77069d77468e80c8ab2c3fcb7596dfd072c2214008d78ed1bd1a19332ed312b50a77b9f57c4230f2815768497fabcd SHA512 4bd87ace983d659877792e4f463d7ccf16e5a524f2c9698728bd688bf9d0cc5651cf641f4d6d987c8c26be5e56d11d22537389ac76a8d49b4d6e25b6a2284c1e
 DIST bytemuck_derive-1.2.1.crate 13615 BLAKE2B d9c5be9fd2ddfb48316aa36e55d37deecf19a37981600351557c561576584b56902e73970cecc8a41d1592912a03821dc43770c2fba54f594dd2cac1a163bbfd SHA512 753ce9d718523e26e2464135040f0c6f82c24578d7fffa7352aea57707cd982795024773054392cff668a727d696d2b90f27147065ea80962254a7a76ab24c5a
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.2.1.crate 54857 BLAKE2B fae7e7b0e8023e4b5a9b7d5a390035dc5ee2b19f1fca03d885ad27611d45bd276c837bb63e9498e3f6d2f00d5573fd01f20115da21ccdf8606ce8d8bf5bd1b7f SHA512 39c19594f52af24b04eab319ab329e8ecb5732e4531184eb376677f57c8a6402c15bd171282498e69a4a472d82e308d0dc8140df0b7d923dca588aec90c4fd31
@ -40,21 +45,27 @@ DIST cairo-sys-rs-0.15.1.crate 11280 BLAKE2B 382b488bccd8c01a0020f1b43462161092a
 DIST calloop-0.10.1.crate 53614 BLAKE2B bfcf7c4e4784af20e94391fb4622f8c5f9b2581c03635fd9000a65fe6d7ea54352f2a92cbf2f0a2e326efd79b614f01473e59ea691e0d1414261652341e5df0d SHA512 f6626ff055f81472040cc756d43018264337a33ff22a8584a110a189371df2b507f918b49c9a2f5b7b880f00dac4e72e13612a5e8aa5b16cdffce2796de2630d
 DIST castaway-0.1.2.crate 7124 BLAKE2B 43b5cc2106028b9d69a79235e9b1431fb76de1c2c881a26c158be66f79dadbe67b03c4718a439bd0b48d9de70424872c890956bd6774dd7af88375b0807137be SHA512 548c192c8e746107e4aee4b1e392425a024ea6dac53468cfd399c7dfba01e26a1c2e4a6bb824846d57cd940b6b72e26b66525ddbb14a6e3fcf5fea8659ba88a5
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
+DIST cc-1.0.74.crate 59410 BLAKE2B e53e0992395e6ae54a732ece8af7a7713afeec3488a303c545b4ec50459d049609cebe8652ed595bf86d4f3c23a16d7a19c7f73e6f6f42b13b1567cb34ea6078 SHA512 0cea38466818473b0c3b3c304eda797b018dbf644c084cdf07539c63557be4c38346fd10afc20fa65a099aa83fdb423972c987a080c68205abd9ef04166a8d3b
 DIST cesu8-1.1.0.crate 10555 BLAKE2B 4fe369d1247c3b30ff9beb644dbe2a517d78632191f3216bb83d632bc8857f9541a1b60d0bb583cf3fc0ae974f7c9d2b07fca5efe2057d9ef281de76fe810a49 SHA512 2d902b624c7ccfe3633c7bcf99b833b120c0ed7760ea825bfb2fa03ae90df543e637efd46e0743782b81e468e0fd3b534956ffca81f9bdfbf742ff3beae8f8b8
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
 DIST cfg-expr-0.10.3.crate 39502 BLAKE2B 8945634ccd463a54991a8f8f7249a0ebce6e0a915a75d7dbee814b8914b1f323858a991cb346eac73707ad717a786bb9321427f03202d025722c8120aa782608 SHA512 9397c13b4f5bed2e287a4d18b0d8775ea328f97465059911746f0d47976fef3648b6729ebf4e07edad4a0b3592bdb41f437c942fb340563d747abc4e8895c9a5
+DIST cfg-expr-0.11.0.crate 39821 BLAKE2B 19a9c100105026ddb7e415f31f0d2ee20c431df02b155fc9e1975d586e4d1cc6f34a135a6962cdd6b95d7b5a56cad0a051bc5c3de9b5bd81b6ebbacbdb2c49c0 SHA512 92ef9c4f1ab0788295efe75cdced1a2a63503892fee1b63f8ddd5a6fc125b6046e17950f2ce060133a763640b992988a6899b15d397d3892f7a3298b3a3130d7
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
 DIST chrono-0.4.22.crate 185570 BLAKE2B 10dfae2fe871a9910bf885b78aaf3e9ed1bcb87a40962d781c8ea407a945b837c665c2bb4e3d0562ac63d9e7bd5012804434642ee6f5c80e22bc816d4331f1b0 SHA512 de856679ec16afe035176b22125a00ced532d49c8babac0a88fa5f6e4a3d9e526a34ee8bf51639653fc313a5703a202b1be013aa16fdd72a505151d7aafa7c44
 DIST clang-sys-1.4.0.crate 38679 BLAKE2B d15bdae2142ed26b4f6bd037bd2062e8c4b7b87fc5b749b872a95ff1952d000066c255aa0984e5f9c4a5c88066db4a20cfd048db4ba5a59b331d5ffa5e9a281d SHA512 062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a
 DIST clap-4.0.15.crate 204761 BLAKE2B fb8d3f5640c8699616466d80178ec12d94ee941ba7d9939b16d06aa6393be36707a56b9a16d326afff26e9268af48857be75b4e59de117b5882771d242769f04 SHA512 d0622b6200fc45e4998100158005d73ee325e48682f26e07b096f914205e5abe0cbb3c7472e04aab76f44a345fa8b8f5c213327375c6b8ef2f643b8b43d126d2
+DIST clap-4.0.22.crate 205175 BLAKE2B a0d0284c00b5011b8ce24a290444947970c784d13ad2273227a4d619d14bac7bcf9336911df5d49748b38ca29dcca211596630b5ed121a058492ff4e0463b616 SHA512 d6b54e31c4780be7d712bed266b2cee4ad1454c75d9dc542fac301156e1724ca07422228632d901b4e7590eda13ec2c8349ba59c5da12ac1991e9fac540d0c55
 DIST clap_derive-4.0.13.crate 27324 BLAKE2B 6e50a355491364edea17a4fff13e1a48ceaa7ef3f1922709cf379e963fae5a3f1c0e9884fde65ec7f115fa6939d41aac9b45cd1ba7fb6dd2d79eea68ca9b9ca2 SHA512 2bdfe728e61786350dbca12b9d6f3e4067e21e8595734218f8d6b7d01b44e538c8ebb3762bee87d4705fb26d1e39977b3857066127569c85d72f92e564185e5b
+DIST clap_derive-4.0.21.crate 27567 BLAKE2B cbef7e547b0d0a145ee7696a773e1dce541866dd4878797e9b810b7506dd11d75ae9cd2547b4c3330569390568a1039588406ee614b9eaa2b1a619951b0e67e5 SHA512 95bbddfd09de9dc1c64266743e9877aaed086be56f7e0f6e933dc5245724fead7163316a7bb4a744bc81597e4d079fb0abfea891766a17e0b1aafba011dd74df
 DIST clap_lex-0.3.0.crate 9671 BLAKE2B 4422495226da19cb7a793d364ba5539ec77f9d327e2f1627e4b547fee0625162b57ddc6bc50585f520d31ec289a53065a2b6e0ba66111959390f756143cd5fb7 SHA512 5e601d540e46e527f6a2ea1959fa5aa035ad823008806f3a5adb4785f1928de4c9fe04e61680c64bcb87ed32b2e991951ec27c5cc5acdcfae51cdc61767ff100
 DIST clipboard-0.5.0.crate 10009 BLAKE2B 17aaafeb92be0dfb4ccfdb80a3d909e57491cc0adceedf378196f7bbd006d245adfdd9b2d2e075c2c041aa57eb1a0e6e306032966c30e63f94d86b0f9f7a11ce SHA512 a02994e68bb4ecdb1ba3db05e095474e67df4d73f69c92ab096913f4bd0f47ec6b62c8f0210fd67bb466e293c765888c315770e447f5c6e9b2e5c69f71d3e48a
 DIST clipboard-win-2.2.0.crate 11079 BLAKE2B 5713e17a93eac4a1d299d42a6abe5db1eadbc90bf5e7c99e84b6b5febfc817bbc1c478533af8cbec7a8e58ebbc1a8f3d83bf351d105b55017cebab8048009390 SHA512 f869775bb2e6d84096034c26c888c9f671272232af74c02bda2a6c8f0d600652af581c0e94d875d8746b986314f61168bf7539042a65cb2ccbbf858141fa42e0
 DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
+DIST cmake-0.1.49.crate 16717 BLAKE2B 4a2dfdbfe38c481715054db4bf3ade6339b033180e4e1560edd820b1d44a66cdb23e042db772ef28283dd4d9e73423d64c9bed791742f706771c309c1b542007 SHA512 ba8d65a757734d72c8c7c7f532adbe563b5caedb67140d100cde404d4bd206e227a9d408f122975b737d44cc76a9deebbf0b4a492d1bf03e3d5f1ce8a6d50fc2
 DIST cocoa-0.24.0.crate 39235 BLAKE2B 01078c3d96e88e0cac773f238d3d3144324594fd75cda87d18bc98d73f0a1acab4cd795471f4789d38b017e6cc90c0713bb33b0fdbdff36abcdc1cbae767da86 SHA512 accae0f676caa23c8d3fbc2e49365118a366c50a698ee9dce4ef194f1d391b3633cb789d65d5c2d1e43afdea5d7a82161f7e7042a9dab32747ecac29d1b1b20c
+DIST cocoa-0.24.1.crate 40445 BLAKE2B bb89242b81151d350a95832dfb1faef1c439f92803dd75e259e3b9b4568e5a8884c043d417fe9af4f0c552e6c52de9980046c6cc25f26d388455a8bf9946ba4a SHA512 ce69c3445652dc866c5078ed47129b191bf322355a3303acbb0a475ed7efd502dfd518338569e69c9b44d9ee77b6fb46307dda582fe6c2327dc691f32b85b6a2
 DIST cocoa-foundation-0.1.0.crate 10645 BLAKE2B 8ea7db02939a5cf1785b2770743d609e28da415fdf49b881b620e0ae289976a5a737056976afa7e616fc49c15ce535304d70ce91e79bd61c39ed024078012e61 SHA512 cf0e8188bd4d0310716aad9f1e2cc77e4098e85306bd2098bdcfd9720782bc558f503033074e0f076748074a9067a4dfea263ee5356074207739d81c4a052ba6
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
 DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
@ -74,6 +85,7 @@ DIST core-text-19.2.0.crate 18446 BLAKE2B ea2d6e2adca87a9b7febd66230dbb49ef07758
 DIST coreaudio-rs-0.10.0.crate 34487 BLAKE2B 30c2273082266de0e4fe7f7f6ea56673d954efed518e522a4ea73ffec12781cdfc92df3b98e836f407ead18cae441c37f2a32d30f585ef066acee3314965eb84 SHA512 efcf47cb4337b8b17c12419be9b024687da129b24320c7da7c4875279543a622855ea100797818065710017a2f195db817f3ba1cdd4826ed70315a50244abc1e
 DIST coreaudio-sys-0.2.10.crate 5434 BLAKE2B e572ef0723e86cc21d0a8ead3131537bd4a9ae0bbb2873885ed77f81ebcc3f307229b014cb6b73a3dd2a4b36928c86ca29ca1fc933e8e6d91a2a6f2caa2ac40f SHA512 3e1e61e9376a5cd9d99ef575fc0ed1c55314ec7ef8188189132751b9d9e093fc01f1cdf497a68519350a26466a9d9c08565d8a326a546e87053d15ff7c1e6d35
 DIST cpal-0.14.0.crate 95570 BLAKE2B 698104ff797e8428e467293e31061564720776f1669092df2b299f843cf22537f4786115eb5b8f3ea332cd2a24726092df44b336bc3a9d3ce9fe602f35126c8c SHA512 c0bf746555ebca000b59c5f758e413f554f22a2e6595729f51d65edbdb9bf385b213cdf03ae7b673563f7a40de9b690321e45c1b7086f2e24a28e6774cbe9d40
+DIST cpal-0.14.1.crate 96633 BLAKE2B bf0cab48f5c67b236d921b2fc486e23c7a477d6a57ecafa3dd1e360a693844ffd1d74843bf8b574833d871be99033969de08b4a5938cac3397d80e5cde0201df SHA512 696033b1a36c7f2ecb3bcee2cb692044e528611aba1d00a6c67e2b7808005d81d88aea78bc6c252122f448b9b37a4660ca5c08f97242b085d331ea2b0ee73eb3
 DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
 DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
@ -82,37 +94,49 @@ DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84
 DIST crossbeam-epoch-0.9.11.crate 47900 BLAKE2B 2deb54409587df48e0686731dded6600816e4c2b82369c47fd2e00ecd59f29935cb3e7f9bf3457b99831bea088830a625370c4c07ce56cb78ccdc62a6ad7715c SHA512 3fff7ebe038993af5117460e0ff89318541afea8d16f3bb991cd37f9fabff58f1cf122a8163af03c275af4ba6802b264f516fbf12f9a9f8ec978f0f8024187a8
 DIST crossbeam-utils-0.8.12.crate 41785 BLAKE2B 486aaa80eb0fff5740690d8a63c7b41dd06c19cd141f4e12c8f133f5ffa93a121d4e24e19390851051ef07ba63480d9ce3bf751621ada3a420ab6982a0445e28 SHA512 0e1f17887615b1883c3a0c4f0fb908999d550bd0041e8333eebbe43a964838d948fc1e5892e4ebd31e59ad53e5fbb5ebf6741dc1dd8b61907429f691c84de2d2
 DIST crossfont-0.5.0.crate 31937 BLAKE2B 732e9dfc3a678416e0efa15b4914c95a4f9f250bad91c66476ecd19ca2d46cee50a89f6ee3f87f73f6f89d4c921c70e1ad4b430f4b8ba1084f462bcf339b0553 SHA512 f98af27674ca16622cf2c3a716f30e9aaa7090a2b463654f75273bb312e1ac0583b73a5385fe195ad6eebc909f0aec0f857e44832ecef964ead3f125c077bdec
+DIST crossfont-0.5.1.crate 31985 BLAKE2B 0442725c3cb06b24b7922ae38d50b07bd9f4566bbb8d6b16d26c80ec680cf887320b64c127b73ffd6ad79240ab654e78c21c7cb453eb061a01f59ea1275e6873 SHA512 0dbf63cbe316ab79f86186157994a1ba4dc6bb484a71ba9379db15280bd5899826b1fd2077513b3bd3427eb5ff54b0b445038c5fdf346047cbee7d8f6155140d
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST ctor-0.1.23.crate 10581 BLAKE2B 2b513672e4dd7310b5636fe29bdbc1978a4130c0e590829193a42397bd467ae119534375060d15b5d73e4a5f66a31ad34650faca6a3c190f6c0e9502aeea77db SHA512 fdbf3e6300d8a0cd33d1938804bea8b7eebfa8226767a7ebc9a824127aa3c0ce469913a63843b8d2043de3705b8e1fb5f4dc1db4ec387356b0a2b38f07cec224
+DIST ctor-0.1.26.crate 10803 BLAKE2B 93627949b92651243b7a763d3d45a22fafcf2147a30661c4cc017e222bfc2bc12b4071054e3079adc431fc8a5dd8b86a8d11c53c401be6db846a3d0d2076b9b5 SHA512 3a3d60c976ec02a9edfe04470af4b04b02601c48e2a007393cedfef5c13e22bca58630e9e885e635a71aabc3e0ad8fb70995876551cdbc6a31029d8d2bc2e86d
 DIST cty-0.2.2.crate 7230 BLAKE2B f8fc087e6a990a354a1de9a8d0c078757a512e13fb7ca0e337949a22c3af158111b0c1edb50857c0e97db5417943165e695b4f41c328948cb344614f922f214b SHA512 1b6fb2cac48ab796ddae5c51dd27c41ff584b2503ee15f1fdecf29ca92086826efca33d2467b5721dc1dc13b5103a76c0a320f416747230bb48d1b2c4ac784b8
 DIST curl-0.4.44.crate 91415 BLAKE2B 0193d51d0ebca5a9ac87a3a2537d573a15d8f0c47e0dba5ad3c0401dfe4a96e63c43a1be054433eb782f90ec61dbc60a12ba035e4fdb033eefe53860d41c3494 SHA512 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5
 DIST curl-sys-0.4.56+curl-7.83.1.crate 2954260 BLAKE2B 866e72ac131bdc9fcdcd294d065dcf295f6748d3823498d731ab47c8d2c4fd7d67bf76f65ba8091105da27ae03fbc08099b53b0d59bfd23d21be51639c6eb675 SHA512 631de8e5740d076599d33723656129c3790e170ac108c91f2b9d7e4a954ece205685e0339fbb87ae3416156d3089d6fff8d514096f213b99fa43d14750b69c08
+DIST curl-sys-0.4.59+curl-7.86.0.crate 2996584 BLAKE2B dd06c7cdf7740049558b8296d16e2485ee1b83692a94bdd2a037ecd45c0ec88c32bf48a26ea985c8de2de84296edf3f52092bfd3ab8338e10066e0a8defdc33d SHA512 048c5dbc3e1870c9b205c107e006c7112d01f4f7f03eb301ad9ca06ef29d03b08a840717ccc45883f19f1f6734958301375365653ccc6e45ff99151bd5e03b3f
 DIST cxx-1.0.78.crate 196217 BLAKE2B 4bce83b4d60df55da251ad66d22b4ba69c3a28d98cae1c0d069cd0b80434487407384f10a6499f343bec26be65026a487d2797b1b3396f5f43badb502321387d SHA512 3e8cbcf116aa1ea70f195256a787df4c6cabd73d4ecc3a6dd794e737805cb9e8c8c1731c57a25f1ba3ee9de3b132a5ff6b2e502b190abdc1a87a016955a3a1b7
+DIST cxx-1.0.80.crate 196811 BLAKE2B 5b48be59cc9a499bedbb3aada42bf7032c963c4ee8dfa670714f2c7d36cb3ae5c555c5936bc464a8c03e6433e274af6cf8ba05d5628f105464c475d1cac21b18 SHA512 f7054fe143fef4e32771e802bb547cd8e8a2f55e5035c3a84af4bf81b4ae4499d6737fef057667102cc9a6d683e681a0008ea1228d5948ee74a64563ece9b566
 DIST cxx-build-1.0.78.crate 83931 BLAKE2B 9b0a7a4a462c0cf0dcfc27934e7e8cb9f000edcc66710bbd87bf1621639a6f7a1cca34205dc1c4461f4ae99dbe2f2cd71538fe14bde12b613120310d400be706 SHA512 e4876022b69e0b18e0ab2c4c1e9c6205240d0e0229f243dea3e489796401aeec7237711cbf8e5e91ebea58283d5fd44dc28cd599a120bd3134c1743d312623c2
+DIST cxx-build-1.0.80.crate 83905 BLAKE2B 1e66b0a971da73eb9a48b5e1482f5fb96ac8ebc6a78a1e1a1b0e84631a7dd9422979fe4497491b0a935f5491ad3eead572b51c6724096bc4bcea62bc9d111a2c SHA512 634fc50dea8bdf70afb5b28648725b8f6a9aad88805182a27f83a475ff64fecfe8e6aba2d749daa1270b407d1fd0ab7062e5b05e20d96b9818a4b45c365142f7
 DIST cxxbridge-flags-1.0.78.crate 5634 BLAKE2B 363eb2f5458a2c2c0dd54fcb6cb52678cc0f2f70e2d1b1dc8376ddb006c80bc63fb87fbc42db9b8ee79807a2be3b5efdf0e80574179db79e89d2790932f2c7de SHA512 abfc71bbcc14a7ae4a9a84d7aea0852304e86f3c145cf6e53b7163da5fb7d4530cc0682676b64053c764f28eadcc7fa912737bdf6b9fd78cda30441cf907b6e8
+DIST cxxbridge-flags-1.0.80.crate 5634 BLAKE2B 474065d153068c1073ef7ae6f29eadfc61e4268cb5ddd68cb6d042a65db4bbd3d5fdd8fead37687d349134e4aa2bca78b969af1f9117b7c181b0848f133eb474 SHA512 20234f2e5892b0b39bcae8c0d0c45d41040c293b7477039b139b503a121c46dc2dd8ab522584794f0f41710173d601f34c5a49aa90ea7618046613b961ff1ed6
 DIST cxxbridge-macro-1.0.78.crate 59632 BLAKE2B fc0c187a21b6f9c90ea68a922b2f21f8e7df804bf85b5756d20ac9648f36799b529524adf318b63dcc7997f9d67843f6bea9cdbced7ef88246d0be6bcc38beea SHA512 7aa23bf027aff7f352fbf4e43dc2c0a6be38208f8447deb6fa0f6eaaa42c00b67282b716bd4ad847b388587eb0d5aa826deab8a6f661043b57ced6d406fd92d8
+DIST cxxbridge-macro-1.0.80.crate 59671 BLAKE2B f1784f21ea41d953de7eaeb3ac8095d92be35a99d12d861379dbf46395efb9fc1a1b9d61c1b750aa18c796d0757b800c7bb1fee8c1e7f78cdd1c02f8f493cd2e SHA512 a0a5cb2a2ca144295f287285ef5c7bf42f136500436cb4ccfc5fd9137e5ab60921a7dbeec9279e342a76c7204b70f45dddaccb9ad7c8ded0a108cfdb99273376
 DIST d3d12-0.5.0.crate 17059 BLAKE2B 7b3d2ac8a00fa8e68463aaee1a6307284b518fedaf98f1d85d579c1b9d0c947f1d6d72bcd14312d22c96d4a44e179b7202290fc56219669845e886e7e8804703 SHA512 b7d7cc195ebd6169a86270ebc729fd68bab23ad7220bf172e7a08e4b5e82b7ba5388c0c233d066687af8cfb00193c3d25da977f3ff796b1cf4368be68062cab3
 DIST darling-0.13.4.crate 20895 BLAKE2B 76675c20937450c47c1bda80170140930fc626d27d58b7dad3db33dce2e69457e2262189853141bdabeabf257d05d954f7dc1dbfa344276e05ee6dedfc8a2dab SHA512 7392896b97b80ad24d76a985f4b950668ba351498f48ef0722c783c28d43c4a4828f5f6eba7e754ca554b6662fc419e73bcb65d4b20037285a16e345fec9ef75
 DIST darling-0.14.1.crate 21844 BLAKE2B fb1fe8f63524f944acb0471ea4658fca55edb7aa4d7443739e5d7d16e917909d34cea6985f1d45429616a929839452cdd7b16b635d81c7ae6b4110bccad31d80 SHA512 2b2bfded33f23d042805e15f28befe6bf1329ed8984513a71ecd57a1d443414afb2ec4f9f92037a352fc358bf5aa02df33c21081e44bf5e8a2c62bd425bf703a
+DIST darling-0.14.2.crate 22141 BLAKE2B 63ec931ab42453ba0133c0b8a1f9d3bdab2638a9db2dc4329034b96632c8e580204fe12d426384c63c8523418725253f5f59e9193a94dd6f6d28e2dc50f4cb0c SHA512 7e2555a5a57b436651d5165868a93f318192226b487cd74d3feda5b472d9be4cf900cf46999b25ee8da4cba8df68f3f1c54b4a363eb66e69c73f25e73c62bfed
 DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589c869ffc974427924605b92436ef06f21c7ea748e97d9b719aa7156b3024e788968ac0cc6144d58eeace658b62a08f SHA512 96d431ebfb9d13aaff2c50f7ad7d5ac5e95813fac851e3e1d7739d1fd5b366fda32172829af88cabadb475f83b4500199167ede54bc802ca1e52137cf6c16c0f
 DIST darling_core-0.14.1.crate 53655 BLAKE2B fa48d25bc37e7630ed9abbe7c2df16e45e249fe388396e113882f699d53eabe49ca368011afdfc9a9eb34465f35a1de315937cf544b90c41ef265b884118fdb5 SHA512 e4f8d9bbac9d7be9e11d01cd965c0c398b68987572255761ae52eef7a5047ead452d880f1f6a4b4a7af014b819ecd88cba667cd169a802ff5fa9b61735c4f567
+DIST darling_core-0.14.2.crate 53924 BLAKE2B a10be266569d478eb73fe62d56ed94b9956a13fdd4f73c9d2253bd95fdbadcd1e0ee4b5ed2b00bd58c400c61ecdcf2601d8325017df32961bb30e602b8117b0b SHA512 33612950c7688b5ce102ab5aba0dee5470435f0491e4be5f9d862b70ef6f6034a08ec64a29553e0530f9b8f2f3cd540d26f32e49297a599c255668fb750ab621
 DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555eb4c0ac7f1000fdc8f8e9d1bc0ecfeb65b78f81438b097946aed8e37835f82028c1b16c1d466a124998139ae854df1 SHA512 908ea6459110da16e4ec6ac843659664ed4fa3fb2ea9b92274a738ff5994cf81fbb48403db609b9a70f39c3e288da4358ce369c66821122e3a6a0940473da94c
 DIST darling_macro-0.14.1.crate 1911 BLAKE2B c22bf421f89f4159a3df4245e050e58e01c22404c0bb9a7ceccdb47a0ff2abb02b6900d20744d6626ecb4bacd442c0915bcdf5678eb33890382390316a6e26b2 SHA512 450dcafc222f611902526e9d269224c5a5374b8e3f510c2b103fa6eeca240977d8dc53926c09d77245e041f140b9d1546ea840b19688e14d3ee53ccec8ae2d02
+DIST darling_macro-0.14.2.crate 1896 BLAKE2B b095af14bd90877101444983889fa3683ed7fd6fd8f6ed229c17840c840f26b9a74c5336358a6ecdaad364cc5f3ac123587dae79ff61ceea4270fa536a441fc1 SHA512 0dcf34807d2a6999d69d8176f70b2a7c2b31b03ad350bee7455a0711dd57c775ece9559376a36b07d986556e5d9512ba04aa3ce66298f82ecb3115bd6e38d258
 DIST dasp-f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz 621307 BLAKE2B 9f82ca484fb6c6f79e4c9ba3e9e3fef44410e95b138202d65cf0dbedfbdb21b93080c0d816626d624b4cb7f4f0431fdb350fc843cd3a6706672989f660225759 SHA512 da0bbfa6e9561182ca5e896d7d6266c2205ce7757215f0dd0a5044fad7f8d4589d68ffb7b4e8f37800a966bcab21750d9db27baeb5607dfd467375803f7f7b43
 DIST derive-try-from-primitive-1.0.0.crate 3267 BLAKE2B 89982f76ca79b1697f9538a4bc84b71b8e2fecfbdfcc9af2c1dc7566cb676dafe9dbd9c59ffd414ded35adf0ac23e1303634ce340a6353b3c04df238253de8ed SHA512 d7a8bf4d1e3e4117e831b70610e1906c78a07c6f3cd029b5a1e38b43c53aa0bb6ce31bc827ef154a9c0efa4f61aab15e627986212437d31b06b2ed7e35e0832d
 DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
 DIST digest-0.10.5.crate 19503 BLAKE2B a73ef5f7b85869f8f6e2bd1c83f88f155ffab8ae1c687018ddd12f5806385a2664c163101aec84d4c20647a8bfd04095aa997e088a3f56e2664adabff1c5614f SHA512 3542fc0322a8b10dbc229ae83475a0df5f9beee4f879eacab1fda53a7b61136df2961265472ae66d896681bd17f8a68148b25827733bd782c6bae05d2f307951
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
+DIST discard-1.0.4.crate 4700 BLAKE2B 423cb655d6d58b4ac68269a63332f4828a3f6a4823f6f98f83d748bd16afb7ae68d2bfe5852fbd86c10b79713576d6e16425bd2541451f715a7e9e3a9f2d2927 SHA512 51e0335509a16c73d2620ff83de4b73506a45b36e306dd0eedefcfe89c6054eb5abcfed0ff5b3868c3b17a1c6d82d958d7899f25aba50709c5dd486fdfd0dd6e
 DIST dispatch-0.2.0.crate 10229 BLAKE2B 3a3f011bbd994f6620619d5bd26d95eda7ba21f1a4874b69e3a654e04611ec7af7257300a669ee95ae04ce35a91e033dddddb4a14da48036a5d19c4bad721386 SHA512 cf2b4c624f92808e43a0a4828ee1085e115540d5df5a0ad6a3593c9e5109951b26e8afbabcfb0a1fde41207d5c060566bf9260bf4c2a95907e3a822d84364b3d
 DIST dlib-0.5.0.crate 5788 BLAKE2B 0c1bafa05ace4a51fa7f5d8db9cc46773c1da9948e6a3f7e531c60953e554798d562546b50ddbfdbc266da8cbb988c59d57a95e7c3ad6e6d84f9b4888180f264 SHA512 1f828bc845570d8d6a6fb6c4f9bacd7d4f50bf800a68fbce2e0b8f8bf1eeee7e7260fc95fc49a14a3f7e2a4264368c80d8328d408b2a6544f4f796c48a4fbf76
 DIST downcast-rs-1.2.0.crate 11670 BLAKE2B 7d44d708c1ac068a02ea5d72dd3caa8a7f6d18b7ee653d520600acc9c52365824f5b8d3c68143d1d13aa438a18b16ff9975e15131cac7ec48b2d995184673d37 SHA512 b80b72f30b42c5e6b2bd33287f2dd22be5673b2fa5c1a8c75c5de224fc7eca46a55f2fce63c02d225dfbc94ac3462b4b2fec53d63331c70da6307ebcdcc6cb14
 DIST dwrote-0.11.0.crate 21715 BLAKE2B 8ef802f393939f95ba750e941fb5b6f908a2cdca41d3eba5a405214ab56b2fdba148106c0537034316d1d594fcd86a13774de1853c2dad2f27d0ef87ba21bf86 SHA512 b319820cffacbd55f27d74d4d8e7ae3f15d758f718611c354551ba526614f5221357269734840706170e26446efb8d504035859f47c68eb0a7a89444d08ffecc
 DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
 DIST embed-resource-1.7.2.crate 13583 BLAKE2B 7776da8219ec73bb4ba890722ca87c92c0b07f0c64198f4b701d9815f8b6e04c0e05f22af25fa26fad325c7f9b60d0447ee6285b892c79396ac6c421246b8348 SHA512 db2d7eb090967edfde1053b245be75576ace1e8f52633bfe242f2cc95c64ba4f1b3f9f43cc86ce7e69f17321f57dfb87e7d64e641ac649e424aa4e346b7077d9
+DIST embed-resource-1.7.4.crate 13662 BLAKE2B 49692d914a5ee7a0861c9d0fda311733728da868fea03935d521123b44016ea37406d01883b9a82eed362c159259c9509ad887314b2868046212eae7fd1e12e2 SHA512 8de5347a1f619fd07c057d9d6b82b6829db0272f2d9f9eb12d32918a125bd4f11fe440086249bb170ad5c135dd05a90d348abaf29261d5e170a730558593ce67
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
 DIST enum-map-2.4.1.crate 12203 BLAKE2B 6a1f36169a5a31cef903100b9031bca2f03c79acdfe44da3d9a0bb326c2e510a7c51112ff5aa2874df3dab97996dc69e618551240a57c1eb8574b1b1fb01497d SHA512 ce801ae7863d4a9c3bab00a811eccc5f68eb11b89c50aefe872f3402dfb22ac80ed7f208e2f002adc505887d0d4d5411c82c9a80b6f33f0e2399c5994c45f27d
@ -120,6 +144,7 @@ DIST enum-map-derive-0.10.0.crate 3824 BLAKE2B 41e42f5ee9a3e95682f03bef63a99e9f0
 DIST enumset-1.0.12.crate 20341 BLAKE2B 2b787736e344e893940dc91cc1f9fb6465622caff9dc02ece44cf527ab632cc2fb981243e109e9969ed1a2b7df93d894d6be94f525b691a17ba8333a192905eb SHA512 1e03a918150546c203b1afaf34cd345f655d23753d828fbb0fe588570bf4cf74f500b1ffcc69199c60683797f9986443b999fa229fac50e0d290b2ac14fb0507
 DIST enumset_derive-0.6.1.crate 10713 BLAKE2B ea434d030f7b75ee2326cbf92b2275f8a3d9efba58c779bd02d538339a27b3321f79f5461386fa4aecaf4c1dfe3f70b75bbb90888ba997526be7c9c8b4d57550 SHA512 89c8d21e7ccb87fc2cc76e0447a00461b5669e3e29823cb4eb0e3671bce73ea0b6ba90ec58efa9d9ea536f4165a313fcc0d0bf4864b0987f31c42e8b4cce93ab
 DIST env_logger-0.9.1.crate 33425 BLAKE2B 86caabde93af971864275d97d80c14c195e0277d474fd3e93d5e1a510063def2e18680aa8ad1f934bb404fde55a5fe23170a3851e53d04a6925b9a8e19db5d62 SHA512 f97b63eb00e8565d8c6aabb306ed8a91ee4241ba35dd9b6e08e0029daf7fa5a54425553d4c0839e369e55fda2c85c9704f658fbb760a093f55c38429f6705d65
+DIST env_logger-0.9.3.crate 33291 BLAKE2B ab0f0f85771bbdc6c7709f7cd4c86d9eaf436b073ce614f9297f60e95b6c9e6141d8810d1dccc575893c796358ab65ba56a281630ab75350e8f421167e5d9c52 SHA512 a3ee86e77d980c2eefe4be32d75422aa0f9a60a43fd11bafaa3c9e556584cf65c36976a6aa650f87426edfd82de0cbb919e0906cdba6db8b486b4dd4b2583bbe
 DIST euclid-0.22.7.crate 75976 BLAKE2B a2f6c1627eeeeca9686b0bc520e08a69be403836c57a6926df04a717995828209c00164c216388a4fe25200dbed5931b0813400d1a42ea9398ac135a4824de59 SHA512 44c8be57191f6e88c2123210df474a70cdaab1b527a0b171a217cc5c791ea654643c2fd127fa6b13e20bffea494a10be73c767e8aa44f38060cd44d64618efb2
 DIST event-listener-2.5.3.crate 15392 BLAKE2B c56ed5eafa64014141e869dcf952e86f755eb35ed1722f8139260cb502ba226351ed1bea301618e94c9ca7f3309747057eb5f7d7986cfcdb7f6b79d13d52b439 SHA512 ddd67c1139ffe2aba95d763b73db0e2a9985dd2e57cf8f72030047d53d46d833df4b4192730cf0af4e060ce52e4f2df23aab6509abb94a6cd02e0d8cc3559d22
 DIST expat-sys-2.1.6.crate 518887 BLAKE2B 12e06f38859124c8da67aaf41477e0c94e9b2421a17c93666f019fd17de3579d52c66403ff95c6fdf27ec1e4db0652bc611e2b426705a177e615b5064d15adc1 SHA512 35d0c405a164e685972ea11df718e50a32a90b730332c3ccad74055544e750423ce2cd76edfd5de2810167cdc8ab6103db82bc4e2710a8e298ac0dd9e81648f8
@ -139,15 +164,24 @@ DIST freetype-rs-0.26.0.crate 105825 BLAKE2B cca261fa4406b316135140d4ec47fc0a70b
 DIST freetype-sys-0.13.1.crate 1917785 BLAKE2B e44b8ac0b8ff4b50db4bf995fd44238aea2946c47625a400937fba251fda27e38fc4bc03860a6e03ef328ced14bdf18b586c2f9fec89ada264b88d4f32aa8cf8 SHA512 098ed11f9ab9f2762bf003d81543f73d290bcce94e66ac147677ac80c369231a549104312331f4dd43e9483e63621514bf8c4e30d2db035e7689f65e5478e230
 DIST funty-1.1.0.crate 11631 BLAKE2B 37b246ed78132b52461dda9f3c1b52feafac998f6cd0ebc62408b90e5f826def1456ce820adc745aa1ccf07b281fde3df65af84eea561eeaf1ecedaebfab24b7 SHA512 771f42f601a0349a8e9344c8df552491c64af350b18eacc99463e972335d4a4c95416704ebf49e904503fb2d6f78bf201c8cb82fa20bfbf460ab1e7ed9f94a9e
 DIST futures-0.3.24.crate 51399 BLAKE2B 03eb55cdcadb6646d01a485efc9ca0c679d8a71186d1dd97b078772ca298939e147537692216e2601b7d42cebe0c961b3a6693d7059c7ca735efa28fac8be07f SHA512 91f3f1b121923c239b1e3042048fd420a35506b4c1ed6527bcff0fffa8153049a384c4e0b21d59944327552c094db8de8977036c61127b27948979e0da6df949
+DIST futures-0.3.25.crate 51664 BLAKE2B 8324abc819143df0f11e76ec19a50a9d6df87dd243610ca756d54f519058ddc25ce72a7652698dd3dbd00631eb50f05c7b4567cd87a65858fcb4ed89e2d51fe6 SHA512 1b41edee2927cc68da7101fd9ce8616a61b4102bc378429b8b53adbabda584a5e1df98bcdb2b0ec73466c5a51e996dead7b2d286c7025fcafaffe5e64d715997
 DIST futures-channel-0.3.24.crate 31963 BLAKE2B 2abaeb5249ce94271588cce9c6af9c96ba52d5a8900c69b5232e0e144e5e218bcd57788a3592e5b95aea84d73714552db131524d82de3655886f136789529c36 SHA512 2145a54fa7b89763c7c6352818b3e3b581190e131a3d3e7bf7b745a8e04ae6ecd9f5f1cc78ee65f7aabf1f786a25cae6b37d358cbbef34c494c34e217b84d7ac
+DIST futures-channel-0.3.25.crate 31974 BLAKE2B b0c8f2b3ac8b0b010aab83c6e8d2d7329d49b1c9727393f81f9af8c80b232508ff475fea86448540d2e9016d645ad8afb5bbf746e618078db78631a9b3616481 SHA512 1275e91c90a060a01922747d160435c04bba4686990912e5ba0a4fbbd91ebdbf4f5abbf3530e5f842445f7482e60afdcdbd836586b42f0277e5fdb1a2fcb7239
 DIST futures-core-0.3.24.crate 14618 BLAKE2B 381b5f9dd5249550a859ef83987121c1574c91a2498e0e96ccdc5657cdcadc770319a4b50200cf3138bd504fe537ab2d5c701bd97d3e0e39f4a9e75d4a7459db SHA512 d39b19f0c2109d7937d8dd7f6ee45144ca3662746189a5856e0f9a29bb255bc915214c008e97475046703fa90ea28343984575fba394a93dd782b95f09963e67
+DIST futures-core-0.3.25.crate 14623 BLAKE2B efc97e52dd0aeee34402018897a276a68cf94bf13fe37b4c0e4d971cc2dbc8cdf54d0744f0846049ff75192c0fcba906b3556f000fa8657f89a54d9356f8f578 SHA512 3b3c758c493255024df26a763023a5d403fcf1a9fd105b08c518bdd5891ada4fddfcbfc8cde6101157a209ab6d1555831bfeb49372b17e902b4fdd8a83cded4b
 DIST futures-executor-0.3.24.crate 17745 BLAKE2B 835a8f835c319e513443c0c947bae83c4a4d1656acf17af333063e33f96eafc76105d45798ccfff3ac2fc362bd54b785bcd2bd406a4830962e75ecb63d710c82 SHA512 fa6385534511ddfe73e4bc80081879b0a425041557d83b1d59f3e44f86ec279327532d732ed4daa4b13e74a11460fa7a99713b00563cdad153ea13c0dade234c
+DIST futures-executor-0.3.25.crate 17744 BLAKE2B 3ae27b7f4cca071c7f411e783781f2ba774da2d6ecfc9b8b9ae7cd9a4d81a58be3e9c967c1dfd24ab339b09d8d0f8cb10e5c3a7e34b5d1e9a96e28d2bc575869 SHA512 66b9bdce86c41d5574734a6878562fee45182a3a6ad3b5cf57895aabafa5ae610f440dd226887e547c3aabee792628a5f7b4406c4ddd909501afb66dcb26b64b
 DIST futures-io-0.3.24.crate 8910 BLAKE2B 67de3c0fbb671897b7ed64967e057b03a9b018b5dcb3d78af4945d4415cceb6a866bc04de2910d124452cc3175a6cc5651af979f8fbe6343f9b96e174cb31279 SHA512 63257cf13e99b8968a797dcce9d572722858c7c91c212a52d05badcf10440824ce9c450bfe5eaeef5528369339a14144a8e94d7e8b2fc717de26fa21a16f2848
+DIST futures-io-0.3.25.crate 8911 BLAKE2B 4100c46b7ac6908e849d3c50bce6d563419a2eea7d05d27844408287cd41bc29310754012031e3068c0d6b90307c9de36261400d438046af74d6a86b0e60f31f SHA512 ad19dc9de5e3559ac453478aa5d154c28a174a9d6492c028cf4d7c6d9e2ec1ce3ba80aa79c0035f82a1bbf86e55e4a65c9eae488bc5dabd399419cfa8cf652e0
 DIST futures-lite-1.12.0.crate 36032 BLAKE2B 16cd92362ddb217fd3c316f1104635b086abbf3b482b3381d62e3b5ddbd20122d1dadb48c83d3022db080d05352ee5a40f33978529bac3eb182b875f45cd132d SHA512 3d26148ed1c87926de51412a8d08e0619c64b85b610a74d6f61fcc1972dc0cbedb04c5824fcb4ef0a920c557ac81a0b2b4403ddb1c01e11648694ae56c28d72a
 DIST futures-macro-0.3.24.crate 11252 BLAKE2B 397a7675d735c9be21bdbb1f540445197f6cdf8c595c952483268cc19a9a06e673338f5713cc378b66f4a93bf5a8ba0d2edcce01390ffb9f0ec9337fd3b527d6 SHA512 05cdf441404a7656a092a0b9a9a2800412a8671e2d28b8b68b26e4b9121256acdf911851ea566847462e981ab4a2bbed3bba5500cf9560f3f61e6ce536afec81
+DIST futures-macro-0.3.25.crate 11256 BLAKE2B 310fe02b66c014c00dac0c4795ced9ca9bf46dc48f964f50d6300009df2db8505987849823faaa3a0dc312cac7cedfea0cb892d2b0f2c4445bbdd5471953115f SHA512 603863a3249df6dea4ed249b71236526ad506faa5cdc430b3a0c96845e21ffcf800407eb31ca7f0cd45c989bdc1ea68884233ab0fd0abd1d61700830293e968e
 DIST futures-sink-0.3.24.crate 7854 BLAKE2B c0cac5188d84de0ebdbe13419c30dcc38594b8edf9952468eb1e04dacbb2d7f754f5b555a1aed5fba9704978a294974c25cceee27a9e4ec6d90b031f324a3ac3 SHA512 4da560975ea2ce2d6cf01042f9a3a16401d769a34e2d8bfe2b0fffc818ac0c729464efa0c2d45ecd280aa7b74d7bab1d17a5670db3d2f4904e4b0a5f4cc463eb
+DIST futures-sink-0.3.25.crate 7854 BLAKE2B af109917de26c608b21d2fd1be304428a6d78095168a0b14eb709136789acda0a6bee4332802c3fa3f1e65ad9057e765b43728b8aa6ebd6bebeb2f25d5f96adc SHA512 fc318461bcec3344c0658135944ce7ebf6756c9d1950c2c5e3ab3ddc7d4ef5b0f0858d09f14d7bbc9a9fec7da19236a10dec0e125e5550c965bae95255eb0089
 DIST futures-task-0.3.24.crate 11836 BLAKE2B 1f697816b721f4a51150dc38909974c6c765231c451e0884ae41e1ca16df9b93a8890e1df3a5083330de73ffccc3cfeeb976644504e45306ac5ee99ef4cd87ad SHA512 a78a739176c20afac835ed7b1fec04772aee1f2127bf4a4d0e54bf1e78079e854794fb3cff5858108168d8d1bfef7da99221599c9c533bc3c3059ef07286d54c
+DIST futures-task-0.3.25.crate 11844 BLAKE2B 60635ba309e978f1b4ba72b29b9d5cce1d870d8398986eb1845d8194080ffd9845d8d2cde19ad0333843bc642cd08a8e5aa44b8c85763ef459c39de4a5cd5042 SHA512 d2278d52397390d7cc1028bcccf1aec009b16ffc33873b8a96cc4f456d7cf501b86660507489d8b284e0798e7fe68c04796471050b6fd2d0529c761d89f9efed
 DIST futures-util-0.3.24.crate 155823 BLAKE2B 6fd86340f0fb96240e28f3e3885be9e555675b879e844643352241de81b55cc67023746b4c3fd941b2b38cddebcef41efbf72581d41cd30e7aba8f0330ad503e SHA512 30cfa53bc58101948ca6e828839186575cd8b092a629bf59a7e4df205309f82d0cd4ec70340f5e98c76fecf604934e553562f7c79ef382ac8451c640bd95c5be
+DIST futures-util-0.3.25.crate 155866 BLAKE2B 574e7cddaae172827179c1d012c8088ea84141d453b154b4358350f53f94d13b776339b0fe16b6e18429e2f83cf5fa35bd5079537a044f240c1471014e3b6a2a SHA512 3e233a3093f3889af6bb5adf661c1cc32f821b00975bea05eee14c2b38e25974b65c10234eb060c52dea4c665ebd09895df666f8583559b7f7d7636070ea51a8
 DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
 DIST gc-arena-081b6883a522b38030b13744c80c84efbfcbae1f.tar.gz 26707 BLAKE2B be7546151f82c783663653c1dbf4b1c745d2a7e431223fc41151f992d849c96f6d357f0b2af329a4404f9eee4cff2afff79d35937fb57f5c9bfca9cca821ef58 SHA512 5a4c15d73deff8a55f125f00b89774ae306f760383d89fe011e05fd68e342bf5c127050e5059a119af7132298225de02dd665e82701b7da87620297a2478ad39
 DIST gdk-pixbuf-sys-0.15.10.crate 9891 BLAKE2B 383e3cbed76a961218bec9d328460d6204fe87cf0bb7b8aa15b270b30d513289e57325a3b469c137af61b5aeb9ba58e9082e95425eff879a8ee3b241e51eb9b9 SHA512 bc2c948758240a0dc195d5b39d159ea55b4a717026b3a4d729e92b736418e0a953b841e62e14059a6c67d257adaa5cd0bfff28de9e2ded03cbd82fe45488d8cd
@ -155,6 +189,7 @@ 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.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20
 DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
+DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST gif-0.11.4.crate 634244 BLAKE2B 537a21ed947889acde0c9b8a42a7d0308f2d9017e59145924e735aa046cc494b60b97cdf3b24d62d24159a47bd4b6bd2aa009f2871c0b4f6fecec020f8041398 SHA512 3de0534b35bd783b54715e7f8a92f2d8a22934949627716cc3ade3c8036489d2b9604292eeeeced820b149865bc44a5de9d05700ebace073b48737759b5296b9
 DIST gio-sys-0.15.10.crate 79552 BLAKE2B a2a0e6a809ffe57bb2d1f6deb072f0b4086ecf833b2e9b1d6e2c010445135918840522f57177d30487c1d19a27161aa37f2eee611b8bd9af4e41e021c425f2a1 SHA512 9a5f37afc4ee4fea2a9fb87005c2c51b1f22ba98c9ad88bcedf89b90bd1e3d6393ecea8b726b596dc298c5a4e7db1eb0503f0872db54c19c29069f5a2b1b30ff
 DIST glib-sys-0.15.10.crate 59966 BLAKE2B 6896cab768c10992b751d454f9221125d7170dfc0d453244e90d67702b7111048fa5b7c87e94cac119a54e0af13f641db84c50ce0947aa751e716ec556d0001f SHA512 b83d67d775f70d6a08b9a6a9e24b575f110a93e5dcc8c53c03015842bac2617d13ded014f46820f8b05b08e7a34aa4841923847869af26689251497daf0b69ec
@ -175,20 +210,25 @@ DIST hexf-parse-0.2.1.crate 4662 BLAKE2B e1b6bfef243b07305d7a8f08c8dbdafb67dc50c
 DIST http-0.2.8.crate 105591 BLAKE2B 254dff38c4d7dff28e4ddee0769a2f5e2e9e4abc6aab38e965cb7efa4069d1b59d422f30fdc73b5db5bb6c3fd02633dbfdbefd59bfd6ba352c3e5c9241d39d97 SHA512 8e8d01803552299807b07a9fddb45d92af089e43344eecacf2bee07b0e745f33558d26a5cde987ac0dd50f939fdac2de6855c8b44f7362e86d05efdde8a7d956
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST iana-time-zone-0.1.51.crate 19397 BLAKE2B 9e29f255039c03361f9d0e1be83c71b984c4a3e980110ddae770381cb9a78f0ed6f90cccc2f8bd9553bc68e5f65d4d9194c8766fdd9da46c68172c78ddbcad8f SHA512 512606edca10e0489df59f25773edf68da63bf3295d4ab5f0313ae01ef21c3b21f867884dece838bbd75fe909155e90916f61ba9837f8131f0a610d6b21396de
+DIST iana-time-zone-0.1.53.crate 20176 BLAKE2B 842c3c2a9f5b753363668af5162edb6f2734a51fa6c6fc8bafc3981f5f287451258f5ab31d5ea6c2a1df75934233849bba8dde4ee5aa9fcc456fbafa93d8b51b SHA512 a3f899fe9ebc7501bd22e75b2df34c3b26ad5a53afbff4fa552672d0185d8a291736c48ac2fa76dab36a6621e689b5584a2d7bd0334055994bb21077765aa7cb
 DIST iana-time-zone-haiku-0.1.0.crate 6640 BLAKE2B 482f69182d7e835dc0f80ab2aeb0472ce8e8720b1f819f851dd888b6593ec68cc92bdd3901b6d6915be825e783780147d2f4f390a12e42be6ce259a8329681f1 SHA512 10028f4cc16f15456d1323bd72c1f60ab36b6928b3fd23de6074fc2fccdf570679e918163bac30371c14896416ac0cfbe51a32a3f8fc77298fcd8cbe828b7d7d
+DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
 DIST image-0.24.4.crate 268603 BLAKE2B 37d5054c8987f513d6b3af98d6f3f0e326735926892dc9d912a90940af0947cab57b8ece62f8f74801c45263f49e8f841c4ca0ec209f02902b365cb120e21b18 SHA512 e064b2205f2a4aea4e56271e488c805d8ccb4c2099bcb8a6f226e47b6bc4f1e2851ae4b47d134fe40a2db01a9e23c20f7b3a0ef3926b7cf2ba9063a582b7fa1e
 DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST indicatif-0.17.1.crate 54474 BLAKE2B 1880648c3ce4801534995f6e88de1a74cb0cb8794f877c73262ec0b3e002ad346f0a2f6d1296ce22109582fd815d995bb503033c8349174cdc65da051159fa6c SHA512 b9002c8140d8444a53501cd740ca1c8d8e9862989f275705e798f89494a1e5a3736dcc5d6769f09d1d2e4fa869de11f4e308ddfeb215ca43ab9340b61c816a21
+DIST insta-1.21.0.crate 534893 BLAKE2B 7da6df0ec782d6aad13e112486abdf6492f5b299b700de42a9af4d82aa175f045c161691d16042ce09e5525cd61ddc055a354df711a07fc7ce616e19a102dae4 SHA512 795d13130a75899a6437f1fcda2c1e7e70489c3e11a289fb8410da2c38bdd0ded9c54336b4458163c4deadfb317ed9914e2f6e87eb11c983f52f22cd327930d6
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST isahc-1.7.2.crate 203314 BLAKE2B 60b4b7112581740cad3321a647b71e1ff10c1a7386ae8e9c95012c0a77bb05115f9f09d451db87ad2a19820e0e985748e42898c3e856b47739103d93178ce163 SHA512 c58dac9bf57f6019a215b0d38ba97eb3042933dc327e260c007531a7afe64cb778c27b5f0fbb761ef0794833f8ad049564c3f2268850f949e9697ded61477c7b
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d26ccb3bdd798ac0e04d9a6a9307927c17558f1284fa5491464cfceba2f0b880d00673449b94c0fb783150 SHA512 a70bb6fbdbcab27fbb5a84041bcbad8e0c8fda58d55ca7ac757f7be5cd373101be40df99e9acd6ae49e637e40de037c6bc59560f96c9adeccb2b2e0bf6531e42
 DIST jni-0.19.0.crate 65890 BLAKE2B 78f93688f80f123027a5b800b0c3e8fa714a1a06b59ab36de73ab2d02f1f9ae3ceb2d3d4fd19c8d6d951394eb85f986f303987ad1e23b2fc451a237a04a9ef4e SHA512 75b48cd05ffbfa6e220dc4ffce3f37eb89105d42b0ac4e108930ed81c3525c4ee3d1c069342cee203c401c9f2e9bb2c53382fb61155da922ea9585d4fff9b212
+DIST jni-0.20.0.crate 69054 BLAKE2B 171a8592ee150c1022753b44e36d6addcf2b697b118ee3c55e3e3741400f92ca3a909d5f67da09242a32730aece6f1ca6f72917dd004eec95613321d4f6ac287 SHA512 08e4f2b072148e558b79dc4c92fe2e113962bfa02a16d0adbbbf43058b708ec844414db57f9d8c325a0a50d651a4e82f3ce78c8ca35fc157d1122812c0e928c2
 DIST jni-sys-0.3.0.crate 10232 BLAKE2B dd6334daa6db9fae6cf1b31b9c13f09f9dc3f6a0e227bf6779880a6e197189d91583cd463b9876125cf892ffa5f8417dcc51aa010cdb8c99bb4f969990e969b1 SHA512 1e47582ed4dcf608ffd218549f1eef5ee3c87a89e28c65eeb5bba801edd6cabc0f095e213e8df606e050a57608653a59ced6f01a8bc76a5eb32ba1a337a63321
 DIST jobserver-0.1.25.crate 21888 BLAKE2B 2ecd417446f9eb975119af4ec74c9b3463d061f5348ebca380f0ab9963ccce6dcea8c1671c7701f3f867c7e49d0ec130809a37bff466261a2fc75e80cc01d15c SHA512 0c014e7c72a070e3332463cfa6e9c9095d542a68f8631150bad0efa3706a2d6de0347bf7d1221cc3bc0f3d5f9840fe7188aad949559375403b929d43b4a524b7
 DIST jpeg-decoder-0.2.6.crate 741477 BLAKE2B 22efe7b937b4643427013350d6bdfff7254139bfd4c730d43fb6e592a6d437d5c80dec258784fcbe54ea28ed1802354e207a555afd8171dac84ccf8ae0c2f96a SHA512 f96c95729357d87a3c1e78dd873e81346b8e98f0e9e4a161b54e2f5bcc7abb54c37de37eb032be647fcefb1e36a6343444c795ad5d37043f5e958dda71a34abe
+DIST jpeg-decoder-0.3.0.crate 742671 BLAKE2B ea2226b1475a488c9c1d767145d021de87feabe993eef5b6534c91ec35176eda74881af667b2833d0610db04f4bed0456d803af92d4fab6d472db606633e3f2c SHA512 68611f52ce1b9999736711daf17d9fac8286179e5f937f04f90d79f1a4d9f7cfd9cfbba9ba2bc52b107392939d57f4a37e8ebc409878d7e9838d5fbddd8bf5bd
 DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665
 DIST khronos-egl-4.1.0.crate 27810 BLAKE2B b3f77b9ca325ce8daec5b4ac4cd8b964577c8bc94daeb30a718c04eb0cb21ce4d5f864c594e0095b56218233129b364387dc580d5f3951252272ec61f997d9cd SHA512 c0f0d0ed6d32419e77fa721f1c1164d600808fcf180560aa5d5a6ad2e56630104d108fbb109ef6660e282b7933bcf462402dbabb8d852e0cd1a28c2b2c55786a
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
@ -196,19 +236,27 @@ DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc524
 DIST lebe-0.5.2.crate 8422 BLAKE2B afa49a1945d623b34139e31406f4780a5ab7b3d34648caf5f73b1504dbec4c4c02fc3aad3fdcdf85509eb8ba733a131a96478d6b9494cc9f69048f9ae28eb880 SHA512 ae8fce41c9a934999dad672ad74acabac9d7998aac4f1d03b54910d4b941375b9e9721cb1bfc8cd7cfcc4206fc0b18d725b0ea256a3a10a125a8d5848ed761ae
 DIST lexical-core-0.7.6.crate 494385 BLAKE2B 417644e5e33a70aa4165cba77bad45c540aaf7bb2037a5461c691b646a5470c7ad68a60029ac50f1cf25de3b6928b3f491e9b7ef5cf5a7d3281d83fd33a173f2 SHA512 fcd7e4e073e6440183284f20a6305bbe4aafb5513a20b8ed793439e4b5a5519532a0605f31e42539f3e6236003254812b459a9b9c47b3c449f5c582dd62c3172
 DIST libc-0.2.135.crate 604591 BLAKE2B 195f342d1136f63c308371f001c9fc270e151fbda7b316321d319b57bcd46f206bb8b06196f5e9cf8a35b0c397d909f370aef8b119f4bc0eb75b9e245d8e7b4a SHA512 dc8e8fc918c5184de6ae7414b523b06ae91cde252e837e863f8477e9722ccb206a0b27762ac204830e8d09071413029c03802a3ed93bff274c33b2a4055e7806
+DIST libc-0.2.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b92987f9de2d3dda06c9cd49124c9fa43a9b39e84d78c03d217ed8ffd30e0dc55a4eb31970413d56fd58ea00adb SHA512 1ef979dc59a7ec4aad7229ec5b40be0ec9a8496c7a2177d325db62f3eab00d72c8d2277d517c0093e0750de12fbb4e45b67133604afeef9153b8e1d4aa0baac4
 DIST libflate-1.2.0.crate 40864 BLAKE2B 295fdee2e332552cfbac2ccd382552dc879fb441517a49083b8574868b28ffb7f8428b94b6cbca9b673cb8bf5e0cc4b22c0e10d2efe1d94fdb93d68dcf3eb287 SHA512 a5e0448e56ab5a219952a4b4efc3407c8419d8d9a255670f42b8f1bca7f7fe5774c2711025b18285c4f1310d26d0347ab2090b0f734bae43b569a0879f67d1f2
 DIST libflate_lz77-1.1.0.crate 5729 BLAKE2B 6e8bad43512e90544e3429fbbc707ee2a532a9d5451dd6c394278069d0f17ecc7711007dbb8a4c0afae3ecea2d872c677f21732d6d509d94ce485b188b05976f SHA512 ab0cba9d324d2f7bf2a741e8ef8b0ee7bfa85ab6ee63b9ccf6ff912461ca854d6b7467e527d74ee93a219d6dec5bcecc3e61eea83d4cf5b2452f9a0aa97cd95c
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
+DIST libm-0.2.5.crate 113322 BLAKE2B 1893273dda30ca8eb6f614992069893dca39288fd4a2f3c49827dd3ffc64030f1729a9761f01f5fe649db64c6ed15a8ba47d93ed9484de1c19bd3de57700f567 SHA512 4d56501fdc86011f1b707b349c409564c85c2484b185adf9dc5d5a8a8fcca8c0e172c95ee5dbfb428b7b13d8cfb1e23c596d3ae3bfa878f2019fabd3258c7863
 DIST libnghttp2-sys-0.1.7+1.45.0.crate 4527090 BLAKE2B 29fa3021361656826d523cfb0312e35980199611887cbc43721a2276ecb3f663ac1283629552721754e256124340650e907293ab43b96e043c7aa87bae979ec4 SHA512 5d7a1e262fc91b654678cef4026886ccf1f55b8238164583ef46de58fbc46034288b198843e2483b1d8fa9070cf6640d83d140c53d780b38527ce68222c94376
 DIST libz-sys-1.1.8.crate 2481844 BLAKE2B e890a3850aed5348afe7558168c7571564687d6a7d3567a4d53ffdf79444d38c4d70d35891e16f496f31169bf73b669534f5fc584f9ec520b518dda05e80b882 SHA512 0766ab72cc1414160ccefe4812e6204cbed1341607e5d17607f24fd4ff81dca68d8f2cf43e1d27f332a508d602bff0ad340c4c647a5d5f85acc120c19cfb4100
 DIST link-cplusplus-1.0.7.crate 7576 BLAKE2B 9e8fc7f4b149a778c732469c6ef4663ad01aa49d6dae747b4368f827a41c62cd2f38cbd7e1efff45d8bf0ccafbff305b8ff5503f25028bef12400343b427e278 SHA512 c8fdf9ffb29cd0f8824bb4416d28f6f4fd7a024ce5056acbe63a680f975f50fc0cb408c0d0af04a37b6985bf15f78e7e7d1fc20a9c0f8b729e7ea696460d8c75
+DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST lyon-1.0.0.crate 3875 BLAKE2B 7ecebc2120e4e51a7a9bd8b5cbdad6c6dfc938e083380d42833538e2293469d5e0dbac049d07e9d4604dc84e82cf5c691a742f0d5024274b0109dee5ebc468ee SHA512 bd5fb89152966eb9bb300859671412f89047bf504e542140bfcb1e7dc3c389be78a1d45369a018274aed2150f6def0d6d1676644a6936d824b9e0d1e174d68b8
+DIST lyon-1.0.1.crate 3837 BLAKE2B b7a5a2be4e96ddd974974495a61e50e782f7d3c08d8b5e14b86a2e02c55a6a3848e332405ab61d2f7523eee2291e42869814f208d41efa28050f2ed79e2c8e95 SHA512 f9dbad320ccbcd33d692af4c8d7998745ab8d86d307058ce132432eacc9215c8cfe3c42a6d5edffa7942ef892199625be5a55bbfd13ce383c3e9f1465ae81ae5
 DIST lyon_algorithms-1.0.1.crate 29736 BLAKE2B 33a039797cd622089cdf5b717430bae8a48c4f7b0ad49e93f864fcbeb85abcf5fc92e3386b55dcd406c030f6285dee128288cf1c7dbf87d69dfb22ee4abbb681 SHA512 b259c0ddb48b42e01d246ce2114ee6fdf4f5ef6e3e5ef9c39e618ec096f7e0ecd4e11966ab14aefe24e4250514103d9fdcc5abec6d599f26c298c42c1d157799
+DIST lyon_algorithms-1.0.2.crate 31962 BLAKE2B 8a385e69051f74c9071b634aab8029e50a5fb5af353a84f4d233e922d8c9c8b2572d7c5bf49c8749b8d022d7c3c23799a8e54ecda3576de33839ca2805ba516a SHA512 1be59a72c53fcf43f6b086e9c044962dfdc5bdf347cf99bdf0f46a4a62453bfdccfbdd9482de5ffeb1c7547eb52534f24e8f08de9c3b56ebc569a50f64d54c48
 DIST lyon_geom-1.0.1.crate 52183 BLAKE2B 84b9bd6e0f3f79283205b699ef9097a5e10b99d4b3e3d9cfe5b4ddf0319a52db22ff4c748472b16e539da15582461598ae499153121171c1515885ee3edee037 SHA512 69c1c1d4a6e81dfcd6061654f9adb3fac3903f77d12cd0f071695f18de770e805c75148e8f8352ca6fa18615b04544246fc0105af71cac170aa5a7fb1d08917d
+DIST lyon_geom-1.0.3.crate 52205 BLAKE2B d2d133daa4e155a56f124d774f4c9b127383f3bd9d958c12befda785a44623589fcec22866d5fd1534683395cdbc7546aafb7d5af46a6aad994e5c777023a7f5 SHA512 dd64c4a3e8482be777d1e40723b717644d14b977931b049949832969eac6d09c7c8e8142eac2d17c8194d95567e6655df621e3d480641908805bac69065ee5a8
 DIST lyon_path-1.0.1.crate 35082 BLAKE2B 147a2a650cad9b35ff89cfea5082ed5a8c14fac515cfb48542b6ea6c1a806f7c33fb58f2222d3cc34e3b400421bfdff429a37eb9e01c5d776be2bdc97190d62f SHA512 88525db4fb68e55d12678bab753de8c59c8a25e0028242866c6d729ae343ecaf79a803a6438f4288aebec32e01e71fc45fa6fbe37038affca8fd0935f4f50c39
+DIST lyon_path-1.0.2.crate 35298 BLAKE2B d9456fb2a0a17eeb4a6a93ed3563608b7386352308146f05ca0a5c80ff46519f5adecd35872ddbfb7307cf5a7339f8c4d22accbe582b923092859ac6a644ea69 SHA512 58a645b44b219bca8df049e2d69544cddd90e4f36f0de9f6f17e829e14319bd1bf1c686f165266e05d88f7e4eafee0a036554fd570bfaa7effca7e27fb6716a3
 DIST lyon_tessellation-1.0.4.crate 181917 BLAKE2B 94e7fcb44d97d2456e5ee87cc158830900b37c8950978188f55d9b36a4af2ca88d4b5e6d0db593d8a1fb85bb6a8d8e2be416e798673ca233ac6398c4c1f79d58 SHA512 4eb2423f87c7703b234e99909cfb5e17df9c5cd0a636b86cd6a21734faac99aaabde260309cbe674c95a95cadf058ac3fcf9df9b76559481b27811afef45cb18
+DIST lyon_tessellation-1.0.5.crate 181901 BLAKE2B 2ee511ad1a580916c155539db7cc8689727a1e07334b27d8c7c82498dee53cb3ce950891788d9946f003d677d830a087fecf178dab82a970a72818f3326fae6b SHA512 228f73ce98e892e169d0c21875e8d9f527dbcedc6d245a3cb75a596f26821142dbdc531433002a59c2c5e467d3e3f5960de041bd9e5e220a313769a716371a3a
 DIST lzma-rs-0.2.0.crate 26439 BLAKE2B 448c25d1348054efbb879d278a8c15e9a3d6848b02752895908a0165114af39e09468ae190a935f9f59247f09bd12db9e74eaa6ec86821f53f377623bab90742 SHA512 74a00d76da2322d7e72a3a9cf9900a5fe861292f9afa4a363b2a9c6820801d504f1ab0a0e618a95e0b5b9d4933c8b060c125e061307601c6f62cada561edf8f5
 DIST mach-0.3.2.crate 19611 BLAKE2B 683aba7d140a3697933835efe4e2e5a6a107f0a6122ce4533bd9079c0de4346dd1a817abeca4372a44a85406a424af9deff87496e79359df4c8d9ff89daab7e9 SHA512 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
@ -223,6 +271,7 @@ DIST minimp3-sys-0.3.2.crate 57182 BLAKE2B d84cf4833e7c37213450fd152d3e06916964c
 DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
 DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
 DIST mio-0.8.4.crate 93013 BLAKE2B bc9722d2211195dcfaf574d83b2967d299eb02ff40b4fb4df2eb6b08d78e018ae1a9e198f43268ab2d38733feaa8298e9736dec9fb9add66c401d57406fd1292 SHA512 b44675c90daa37336a25e7eef53cdc664e6f52590ed4955bac82641baf8099d3d94850da79d985255eb74b61a499b1ea4a9d7309f6ea4c41454b3dbb090b70ee
+DIST mio-0.8.5.crate 93993 BLAKE2B 6c20d66c3b5753234c0ab0461642b63e84383128db775c6e01d50bade5a69081f7da1626f87244c2c45c2451690e8cdca02e2d1ca20f279ba6f8401fb006c7cc SHA512 e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede
 DIST naga-0.10.0.crate 447756 BLAKE2B 9232058317542c010e88133a973e3c0279526dee57750e572c72da498f0318966c4ba0ea7e1f6d6ddd641cfab1cc1e1059dfdef9377b199415e00eca359df342 SHA512 8bb20a742bd3a20694aefb0f9c20c911184aff3b38e230f6f6f88243e6bf1cf115e3c8d86165dfb7cf0bb61fcfff956064fec91fe202ee5040002b22b9ad1d35
 DIST nanorand-0.7.0.crate 18437 BLAKE2B f4aaf18b7cf32b385d97842cee234f0781bc2e55ca5662031204b999293d417e0ab2726eacff084dc6681ea5e46ce01335a1a5cfaa5e8bc6e602aacb1fd25252 SHA512 3ac650451d629852236eeb45dfee808acbea616036025676b47310100982d7e8317df647fe8649e7753dd0f57c501dcb3f7401c3d804af52ff2a2f50ace8cc69
 DIST ndk-0.6.0.crate 39828 BLAKE2B cf59da1e11fed905b245520c7fb00012c194379aad9a8d75e39e771e3df629824c17bc04121b4899bd7f13e9546cde3877593f0b4f3e66d6876f9ee6625285fb SHA512 62af40a702784a35bd3517131aa5c5fe22da81091e45a8c8639fa8f1f8b3fed117991db9518dcf55878cbd6222f696d09e0bfb28e161aa47d77b2825ad2e1fbb
@ -236,6 +285,7 @@ DIST nellymoser-4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz 5970 BLAKE2B 70d
 DIST nihav-vp6-9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz 37411 BLAKE2B 96ab391a6e9f7031506089d8e3d18bbb699c21a7d1b8e3f5ee2fa38463c8b922add2ca5e576b75a582251ecd35cc95db4a8b73654ca947bbff19e64bfd754e97 SHA512 45d8066743dad45b90d7e320d71f1328753c8a7bc1b8dc3a93a11be885a8ee6dc0702f32dc438877f3fc50011f8532da3bf70625475a691298571f33d1afaaa5
 DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
 DIST nix-0.24.2.crate 264176 BLAKE2B 2da44a51beba8549a558730567f6ea36ab0da81053dac10db637beb3901ce7c32b6efebba519af37068fa32270186d733ef55661b58621eb7e946fb16690cd6c SHA512 9502f899868466165d898b1dee676188e9761cbf7ad7be21e231d6d5c993f109b48edf06b659f547712ccec2d648dcdb689626845ecce22965aad2dfd7ed75ff
+DIST nix-0.25.0.crate 269825 BLAKE2B 48d673485e302feece1f82df603fc44d4aa91cf650ad2fbe3c7b2b28b1199f38be2869cbf935a6ac361210ab506bd67f12806b2043b66c27cdd28f26ae15be13 SHA512 1a244469068946ac04e0dc83b8f6a578ebe70e969f232263736e4e9ec0d94fcbb54772c4dd570c4b0d1c2c7395af64b9e9a8a6f7eb7b97592b4a91ff948ac38c
 DIST nom-6.1.2.crate 147539 BLAKE2B fbee4797e91662a8c255ff80598fd50f62fbdacb3b734ef6a54ea115e6411ca73002c2766deb88ac8ccb698c481763594472204871e7096613137582afc9740e SHA512 f9a12a6c523c1c3202f3c45a514d02c40c600c835b83a1f94fd8e51ab462fdb89de3b32ad11630813d8e3cf4c8bc76acc620781568dbf2eb12469dcd9d3d0b19
 DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
 DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
@ -256,9 +306,12 @@ DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355
 DIST oboe-0.4.6.crate 24067 BLAKE2B a3e1c3ba6534fdc2159ead7a301c6b54718b19ce2e3357ce3bcb58b31c1ee3b86b427f4470564b2e8a3e8b0120b33c25ac069bca922dfdd0a1478ece5b398f40 SHA512 bfd792bb8cf2254030e2750b09a87da70defc4fc65882d94ca70469b175e04175787bd89707cd4dee876dba127b8f3b8ad9c5eee32ef5ff0cad49b046b29a793
 DIST oboe-sys-0.4.5.crate 140656 BLAKE2B 26fdb4ea66dbf2f74ccf38beb280262715642ef22b87076d16f0b8e7f7b8d284714d8c7207567e51cbc421d22224b664f0b1051a0eed3c78c16d825ccc8a1d1e SHA512 b8e31b5cfcba10d43b9e373793427341175b7e84f8805fd18a8be387bae407801a0f196d0910103175c23e41b193c4eded2a4597b958128c29e401a27d9b4474
 DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e
+DIST once_cell-1.16.0.crate 32120 BLAKE2B 59bfc8a44f1fec72442e3d34bf4be3a5af073f854f07b3618b2857c759dca4a0fa6ba358514ae28c25d745b01bb7b390ffe9ed6e296d163fd3dd67e49092b87a SHA512 bc199570ee43bde9245a2c4637ae738e370ce9988635c8342349ceb6fb158f376247b69f9ec4ea0e6d76b934decdc77a524299ebde96c0a2c2d29d9501b9a568
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-sys-0.9.76.crate 60561 BLAKE2B eb8926707891a864b11cc1338c316b8d1a97c48985f56cc4bec78a88c3439e6cffb23541d95e50270aac70f9468e9aa876cde08916b9061c963ae01d0dddbe97 SHA512 97be18c56c37484e77f4638454cfb396dc7aaba6c8c710c882dc13b0ae36e44617e6cdddcf8f6a3fca8a5aed28ff9528c59c01f5a48064790491ff985de5e649
+DIST openssl-sys-0.9.77.crate 60799 BLAKE2B 8a2344c7a579c568a420959eb2710a012af0819c054b190cd2de688defa804bbc735efdfec1a537462feaf9cc1d891c4b53be1910713e06786e811e66c6b1488 SHA512 a31256943e739a4ee500a1080d105d8380a65ff43b88ef5bbdcc164cf97a133ab2926b5f4ab3010bca3c14a09edc7570a2edfcb745fc21169408aadc0eef0fff
 DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
+DIST os_str_bytes-6.3.1.crate 22934 BLAKE2B 2b2794218aefb43884d3c4c9c32568734e3f5587145c1d52f34f72bc60fe010f493acabd98ea20965e48197ae493e02c09b8b0b3518b5dcb32074467ce32929b SHA512 39ce351af00046c709b9d279c8d9013f8539ecb046cf1d5992c470547395905755723838b1e7f1b81a54a193e78dd6ae4b09fc799f3b463d016790fa3d8b173e
 DIST ouroboros-0.15.5.crate 11252 BLAKE2B 0a692641892669294642faca8b8aeef91a156627712f375ef31648c505fcf82b9a17da916761f186db12440547eeb5bc568c75236d042856d0d99c0f3c2142a8 SHA512 ba0680b720d0e889afaa5ad0cd30e48e4bf88ab8cb31070fcf22457c8a87c57406bcf4a63b18e2b735de35967c34b1390c35e68e97216f63a5c26071c1d8a9f4
 DIST ouroboros_macro-0.15.5.crate 20731 BLAKE2B 4de7233f7ea20b71974b1a163071b3c9da070af78e1cf39dade2cdd35bdb117b060b08c590a8350f51dda93bc9e536d67c27aec233e20dc2128acddb154eb328 SHA512 117b6cb2b33ddee68d17834926d80d3da360f41a13d552f6d41bb0691e738675afb580b8e26e03861105777c990e2ed92abd1ea9275b367ff11a73af6b7c0fac
 DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d70376be6e438ee1a4de83a8c3c535d4cc866849aed91df74aa9b22d41d428b1142cefe035dab7404ec89af9efaa832 SHA512 ccca3b4c582e860b0643dea78302fbcb96f8f86b356041ae9c685e7c48f1721fd3366dd1bea39afc1bcef03b298d0f6c87918a1ba92a56e6b06bc8b4123c0d89
@ -266,6 +319,7 @@ DIST pango-sys-0.15.10.crate 24729 BLAKE2B fde83347113361c5bd5e0b6be729036cbdc39
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
+DIST parking_lot_core-0.9.4.crate 32359 BLAKE2B 98629cee7346434103d0e9776d89d1c875c023c3fe91d47beae2f3029fe8bdcbe7dedadd262012ad9d1a1e624ffbebe6d3a9165623e40077ab9d0fa4b768cea7 SHA512 6dae00356b759ad1dd08c1edbcc3ffcc86ad412af98a5e4cdf4fc622d0feb79bdb3900c4f72e76cce803c667a6d8581b44264980816ebdc85d59ddaa881a2990
 DIST path-slash-0.2.1.crate 8821 BLAKE2B b3564d0f689ad1b943d132fd95adf2ff654b61f182082bd22f7b8f11dc9024cae8e1b9f3551c4424509db17aef899efd3df96a67e1cd588ffe0fe385c957b361 SHA512 c046707586f25f13d2f9fa452ea340198f6d2e6333ca3af806b9d2d1a61d46b033fffad60d1632ec16062fa79a3710d695b923b831a7db52602b728ed31fc3ab
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
@ -274,8 +328,11 @@ DIST pin-project-internal-1.0.12.crate 27956 BLAKE2B ac5cf33b5981e32ecf802a9de15
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
+DIST pkg-config-0.3.26.crate 18662 BLAKE2B 2ad92dfdc8ac0414b12a61dd30ea4ac5f142bbb55d0555ecfa3a53e750367e1b11766a693ef11f8cbe5a2ddb978327632458b2bcf75be7aa8f973262033349ee SHA512 509c4d1494cccc20de6a62d9d037c63ff77ebee8d907747c57ba0926d177b08fcac0231ccdda14511b453deb0b76ddd10f8fbdf63ff94257d72a12a889546435
 DIST png-0.17.6.crate 80695 BLAKE2B 2fd956ff04d32a386aec4210939cb9cec5dfca4b72c98dfe49aefa130a229414e6e1692ed55fe9704dd56ef11851b61c3fe0fc50a9207192407432c1332c3f15 SHA512 16a3c657efb1a23b47b2bd51f635ef35338c3b9920b604f216dd6d0ac3a8b21e12e854591739bded2947036f4fc1abde0604d9a8ae5a6639562a46e98d29ee9e
+DIST png-0.17.7.crate 80979 BLAKE2B 37628fa2282c7195f983a95939eda1c73745f89d772904173775d7e1906b71615e45de8f59489d6842450ed6f7c7b809b28881c84d5a3399da38013fc3062c79 SHA512 f8009925a6948d8b9c82007f31eefd18d2173274816c0329673e48ef725aec52ca3aab2b91e8fc4f776c8f7f17475a3e065835e578a632445e1bd70794b18270
 DIST polling-2.3.0.crate 21678 BLAKE2B c30866c2f50c7be9343854ae266f948c10dc2a799182c2b19474ce104d49a5f777e948557647668cf6397711a4f73d19dfaec2b2513c7d992f41ebc7dcc9a319 SHA512 2f3352c0cddd06fb85b2cb5967ced2f3e18ab9dc6b66d08155038b7398443c797bc74a88983bb999a9c87a7c47a1170e34b920b18dc0485901def84c2ac1db35
+DIST polling-2.4.0.crate 21678 BLAKE2B 55d3f39649c3ea370fe6f96a7a3b13b7dfcc38b6ba2bae012b5485bfdcf629c303cbd942b964d2eb575d7a90eacaaaa74c6ea74c07dd0df86edb623140d64843 SHA512 876f9fc145e444df490fd21ce49b3ad175253c845771de32e446809cbcf45e8e44ee735eb26812e0402348263aef1b770c769bcbe7bf1968955de1a837da087e
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST pretty_assertions-1.3.0.crate 79441 BLAKE2B e9d29267ee77532de9432f075daab704e8d80a3d5fd5515a7d3c1c9a58dd98ef0190a592e7fe4d8c22a149beec15fc346a68620a3835c1269f72e563d2a5fb89 SHA512 40a56ae7287552cb66e1066cfb89b26af621f894036b9a0cd49889ec5b25831d52cc07f9e117d905766701fa71786a45955186849d36e00cbdb5f884763efcd3
 DIST primal-check-0.3.3.crate 8720 BLAKE2B 9c7b5273a5df414c57b4104b9bf795b853b433da3a5d91a1b878ef9b7cdb6a810572dfb8fae11543a106760e449b886f6e10a12347f043171f5d7947b30f2b20 SHA512 d56fcee65802b1ca272515589574786dfd066099c55a536cb1076193242859074918651c4fa3c1a7dab4fd13ba91c8f6a2a5b0789a6cd24faffc092edf27d75e
@ -283,6 +340,7 @@ DIST proc-macro-crate-1.2.1.crate 9161 BLAKE2B 4c498132d80ee3de239991e2c631ba219
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.46.crate 41954 BLAKE2B 3bdc274c8ada8bf1a84d4480b25e0348f4ec5bfacebb74da144a36d4dc0efeb341fa24525e7e8408c3589013a048563a46f1e094944afc1726e594534e2455fa SHA512 1c2ae8dc4bebeeaa4af02f8edce18b3d159109a1639d8e9f26be2b7023ade9d09824ee0f2a60ae034967d982158196826fdb989d23a4b3bc81188a9a63e18cb9
+DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931
 DIST profiling-1.0.7.crate 29551 BLAKE2B f29e0640ddee82245290c4029e6f2b4d2470159f7cab6651bb2f1daf46b19a14aa9958efdf278b807ea4ef908ec62a6d443c162ae39d55da699af49430561ead SHA512 29741582c1a9aeacf180cb7695f15f5e11edac9ed1e6618fbdd226099f319143a05b15c94e291d6c9e8b3d2002e1d91b31f4ad04519fc75545b552622278be19
 DIST quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz 133091 BLAKE2B a6e703f72432fc29bce310307c933698e566ba93ae10048fcdac95abb93ef217002bed452dfcaa64a7ec86396f9eacb4e8650252618abfed0fcb0f11313d5ba7 SHA512 74b4f12120abfc29322faa185ac83f0a7a0cad7b9488978e1f9fcebc3930b0e2dec97dab8b87f9ccef1066908677f20b4a32978edc4bb9c39b3dcd7a92892436
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
@ -298,6 +356,7 @@ DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
+DIST regex-1.7.0.crate 239421 BLAKE2B 6e9434bb9835bd8e15c81e817aa64e8443c4188219caf46579078c6b7cbd98ee588af0f526e0fd5a01814762dfaa113ca3d15f7cfa14e969d5acda3a631e9560 SHA512 974c15a593d86c33e0bb34f7a67957fe96dec07b3752f2b6b968d657845f5d2342a5ee9ec1359109c43e4f46c9b2b2b678d59f7b752455a0ab1435c1fa56ca3c
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST regress-0.4.1.crate 99620 BLAKE2B 9141cad8f53e2a8e3ea3d746737ab5b8c75ed345f09350b6c337310255969c033a28591909f5914661414ab69caefb0d4e26c00442b40a97d8f2c2937dea5765 SHA512 05edd8e4d3a6bd8f75f4f75e79275591a3be5d481921a921c09a32053bacef8aec6104219c809d76d79784466f71f7de193305f48ce1dacc1708d50452c62a17
@ -306,8 +365,10 @@ DIST rfd-0.10.0.crate 38170 BLAKE2B 90930add671b87f1af618ba93b809dbb37e4273d1fdf
 DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a
 DIST ron-0.8.0.crate 57013 BLAKE2B c9a74f29ea33a8ee5ecfdee7dc8f56af17c293d4d15ec9be320ab45f75ab6d6b87a7b1f8f44a40e9548c957a2790b157799649c383f1621cbe0957455e000778 SHA512 689aba27920e5d4fd2c9c38e3bf3eb490ea810170bdd6c04ea270a1e57dda0955768a61344a21decb30ab73c460436e90879b4b66de3e62ac7ec27bf4ca8718f
 DIST ruffle-nightly-2022-10-15.tar.gz 12291558 BLAKE2B 6a8cfb7119c4101ff8d2cbb187000ab1407894603ed2b1924420348c0e11c60549efbd99b55d7944a04c5b5ceb351a9b7da9900139201ec765af828d65310f29 SHA512 a79a6495021634be499f1ac8a1331f052eab6145bc3c9085facee2e755d3b16e7c05fcb16e8f80c4c686d875cb6cad36b295e3557bc1d4d3a86cdebc2f02ebc1
+DIST ruffle-nightly-2022-11-12.tar.gz 12374342 BLAKE2B 76e1d179ddcace2ae51bb3f0609aca5e38b96545e57fd0034fa2035148ce7ca4c74409750b54e7da5e7d34b59ff03dbfc8da972d16a54ba83b0350f0addc0c07 SHA512 bb5b48f0cedc3a972fc02f8796e97762f853b9e4e3221f009b503aa5f75e18c168da88597426ce2a47786c46216d9f4d7f51c06128d187395e160f140d4b5d60
 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.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustdct-0.7.0.crate 41385 BLAKE2B 414a5903b64b1093277e2db12ff70fbde963a79cb22a48b54376ea05cee6d46d08eba24cb5ae0b6cf2a49a54a21593dfa5ac0bb64cd30eb5394ada29bbc6aef6 SHA512 b575c4f35cdd55bcd1bc95f33aaea9600d3774a1ebe4a37e2824a9a9c81925315cb04c4b7753e64eae1e4a401657f2be572b72dfc7a2c695c1c016a5d663ac13
 DIST rustfft-6.0.1.crate 220147 BLAKE2B 82018bb93297c2b0f1e2bd5f6b132e9b14b2ba7735694e22773a82fddc6e3fe9fd201daa064d12a337ff418547628fa2f77088dbff1c085eddaf48b61cafcd0c SHA512 b09aeb27c7736bd40978cd3be1340a4a4d0d408348de87f342b5d406ac8e90e9a8ec1669c773e5b64251ebc5742ed35863d6756b8deab4dc82a7ed61ca24e252
@ -318,20 +379,30 @@ DIST safe_arch-0.6.0.crate 72016 BLAKE2B cf58644922728b0d20ccbd7045d95093013d250
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
+DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scratch-1.0.2.crate 8152 BLAKE2B d38df70a8067ab6a411798b64e4e9679b554aa66886c824e410d50ed805555716e96c54872186617f2963526119ba81c20ce237d4a0b1ce754d7d28696c9b742 SHA512 c3863dff0c67184605b356d6cc57db2bdf26cad9e0357ce6cbf7d3f23d913fa8917966a8c93b3084a3c9c900e357c6ca4bc2bc5ae5db3bb6feb5ee1ea5c61521
 DIST sctk-adwaita-0.4.2.crate 21047 BLAKE2B 406e4f2681b86f2a0c839638580477e716f3eae4150e0b6da0459e15a2026d337748e03b81265cc09deb538a9e9b18ac220992ccee5018583b5d9f9b37e23411 SHA512 63e2dbceebec13b08fe52f3bfb25e34d68de91912d2fa31cd008db7c52d068506a2008703baa5367f22c7063be8289dbac3d2b9f5109415ed12bfe1d8067f4e0
+DIST sctk-adwaita-0.4.3.crate 21316 BLAKE2B 4f607cdd38eb7ba5b0bf3e0b568629ca98aacbbf9adcc33b84a2a4565ec516327036a8a2da2d9157ceafe5714fb95de9c00e065e5664e1da2cdf8bbfc431e97e SHA512 7ed24fab4f87bdaddde197d871949c0718fa6cd5ca6e0184ad163218e72c6a6587170d35eb10a014601de419775f0a901f9a46246645019cabc80553aa0149a4
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.145.crate 76568 BLAKE2B 2d38e4ced18d204d8c36122ad09fc00f0378c7e9014d3bc67fb7c3e5ab0f923aeabb6a5fefc8699e80e220b12601d01dbe3ae5267a124164bee2e4d9897aa0fd SHA512 8146c39249ad54028717bcfd916fa5abd8b1ddaec54c4d0de485bf10cb6a85676a53068a07b9563e1717fedb4746ef672ae0c285a8998543cf92d7a157f2d442
+DIST serde-1.0.147.crate 76697 BLAKE2B 90fb2df19ad225c96a30cf88dea82a5785bb110f256b882cadef8d1e09f91dd610637a104c2e7629847a14d4a422f89f7ae324c29845788aefb0a6bb51503886 SHA512 d993bd86c61bba602faf7286ff21d36c5d8c83176c5bbb203cb284a3f89dbc8a1ca893a09eb2657f9e98ccb5c5287f44aac06d2e60db96e78d99ee40bd1fe1b0
 DIST serde-wasm-bindgen-0.4.5.crate 17012 BLAKE2B 9f8d4a098a80b25491fb265ce6d776788d22b1587309d3deb5a9d33466e8d6dacff96e6917ff4a7e6616c9ff9c06c28a44706a043c810047e8f39cc52eb3f4dc SHA512 d4f959589b6500e73df9f5b86b633311fe5a8edf3a4cd5880547138f38a4b6dd898812fe4c5d6314c8a5c78b1bf79a79f358663aad732c4abf280cfaa3d7eb85
 DIST serde-xml-rs-0.6.0.crate 20677 BLAKE2B 84e497670bc661b3dff37f081b40679cf1c019e82eb4dc491f78665b46be20b54e826171f51dc03959b1792f4b416b007e9726e41b59074e420bc81416eb47f3 SHA512 a5096bfa71c1e02f3593ef26ee0375ef1bf5d31e42eba76938c51ec9bb507f8f1f20d325a48375b1fd688ee8b79197025ea5d49c537321cdb67ffd16fd53bbd8
 DIST serde_derive-1.0.145.crate 54860 BLAKE2B 0c80f1b8844e044bce28c3fd8e46ac732de21736622fd7b2235c41d9a909d7ad224e8e7ba5fa3e5de2cfba5e48a4116f97e9b7eb31b0201c01bc98d40a78d16d SHA512 267389f8cd6d3a7b7d4a4d3226346999294e2fbef7446ff1cd1183dfb4fd17409f5891f6c2cae113b79cffdaca07f2037fd2f4108f93723e6baa5153bb9a61c6
+DIST serde_derive-1.0.147.crate 54861 BLAKE2B c758a3c854f1474dd3fadd66d60a59408e30d5b658cde4c7ceb10c8d4b4210c8069cc13618f83f1faf36de928feeeb82b2f7011b457e8b9003a15177714f9c0f SHA512 434d65dc0d78c7c1c3f8832221389dc4b0c5d74d605ce1d2d660c2df9a92f5e5d0c6d543763e1462c58d6ea18001c823ca594e3dac92a47d8fe48319a5c52e59
 DIST serde_json-1.0.86.crate 144680 BLAKE2B 666aa0fd8956966aa4bdbfcd88699ae3ab31ec4ad3041c4c3c7b66a86b79829c17d937b0d558a0c34754e10b15cc2100c10e5479302b4af3efda73df73287845 SHA512 86922c40ce32f03c5128e899ce161e186dc35decd3e0672ed347a82f59452f2a3ba0284c342548b17e4b8dba7b13a3d98749ae8981c725ee853537f6e6b40092
+DIST serde_json-1.0.87.crate 144383 BLAKE2B 357ee30245611b15bf98ba719266dedc75211a80a660105756b20d52f50bf4032385b366c3272cfc1c7f34022e818cb6a6af799faf76f8d5969c256a02f9187c SHA512 77b90340aaaa0fb477b33e6628ed2ea0fb53cff1e2b5724a3474e24b2bfc9bff077633d9581e41dd96b2a0e167549e992d238bb09c627fb5680996b39583c4cc
 DIST servo-fontconfig-0.5.1.crate 9738 BLAKE2B 427324bb5c44a5d254000b86e21b2a52ccc41eb40f0492b54cda09c02f4e66da2242d2af662adff1c55098dc46b776d92fd3259aa34cea1d76beb18fe62d2c0a SHA512 7b76733b15e083d2edf2c90b56ada7442898508f992bd91e94f751c21cd42168fc28ad70743e03ea01d99b0f79b2608f126b5241c864c25a21eacb820d9c2de3
 DIST servo-fontconfig-sys-5.1.0.crate 1790708 BLAKE2B 558927804da2698ea6538ace2732912da54216634f4b6f2578d64c4b7da78dd62339a771ed56a57bc66ec48d6f194916057d6753bd25f1d9d93bdf398d365f43 SHA512 7c73c1c3b6fe3bac24d373998e14ac875990434395e543a241f53287297ebcab4b90e0e2a32ddc6a24e1eafcc095cc5cef91f0370959249d08c6994e1c4933c7
+DIST sha1-0.6.1.crate 2931 BLAKE2B 84e0a0472edb73fa732240d75bb6c80ccf1467ec2e70ea89e9eb7c30ae89e778c59ee3aaa1a19a07d4e40d6a87e41d943d32661834cfb988b1cb329063445226 SHA512 8eeb9a5d2c202a181390e25c743da6f8e4f451c1d7d51a3fad0dfd5ba285dd0c7eb851b26eb197a550eabb3aa357f0ebb6f84f588ea2d36cc3c70e62e871812b
+DIST sha1_smol-1.0.0.crate 9782 BLAKE2B 214b58f6a8681399b9c925815f4ff48974466b399e96e372c9592cb139ba9306ba162b3b426dc12b585ea15b616fb58a60d253b4d928dde46217de6ddf7d0437 SHA512 75d6809a2aafd47cd5f5888f42283985895a9c82b53ead7529a23cd6f2484f32654094dda7a9e5d93e82afc9d0049938def1bdc28803502d140d06a3496adea7
 DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c
 DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
+DIST similar-2.2.0.crate 50996 BLAKE2B 3b518e7603d1776e7b1964f2107a8ddfa70f408d54cba84500aee91c1a2539646c2817541ef830236d7525b2ba509ad56aa58b2dafebebdf493b2ec40d6d1fbc SHA512 54d74e9003014683da0cc2b64788c5ac93d3d7ead418484ee5fab9d65395c8665336fd30cd4c9491fddc4e747959e1fd661862624e9b9c955b44de6e3bda7937
 DIST simple_asn1-0.6.2.crate 15992 BLAKE2B 3abf422412f51d0f8d3440c245792b817eb3333d58f27146109f11278b8eac4b49898264e266de3d00816319aaa822eeb0d1115e46f96f2c9a971b41a3edce0c SHA512 b2ad0042a4492f8cfdbf475b52c87431dccb91444ba3ed026adc488c844d1182a6ec88fc833b5dc0c2ebfdd6194c5b49289af71c151822228b8ecf89251ee9ae
 DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
 DIST slice-deque-0.3.0.crate 56827 BLAKE2B 62971bffbb7ea9f9de069ea6af1d1f41e5288a0bf9c80e0d7d86818d75dc969058dfac6c379cf1dff2f4ef6f48e263b9c7af5f41b377305a2ca59eb9cb1e66c8 SHA512 77928a2e7289935ea5cec5fdd497b383b54a7e97042de74ea109e957d61f8d99d182c58f0d1ffa148385849b7bdd9105b6378acdcb1e406b761de7b9f5bfc2bb
@ -344,6 +415,10 @@ DIST spin-0.9.4.crate 30180 BLAKE2B 24dfdab3e643abe5cd9ecdc14c07bafe7424ef19979b
 DIST spirv-0.2.0+1.5.4.crate 30491 BLAKE2B adc19c32ceafee6eddde0e92fff3b995fa062877f653efe60bcf4a73b86da4e00f77c5922ee36b239e10e4d942a12724130b726eeacca6a60ddbe2c0a87d204b SHA512 a0725df0ae9ce0ebd0b3037a740ce82c565c21a0ee343408291b30a2aebd3ced236d1df511a73abf5480ab3d23e83a88b237ee172adf5832ea7014355a3733f3
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST stdweb-0.1.3.crate 90221 BLAKE2B b8072c7be865327b47facaeac68373ce3085474d7a694f2e7f371024b5c4c0c616b8215a75e71b72b0e7aa534c9f8172593c7ec648c32049288ddfac1b0764cc SHA512 d7119427aae5d37336b8cf0002bae9c0d76a87a6865dbc9cc4c1f9abe64efe8d861c149b3975c6b3481a804e20be4fa28619257c233d3ea3d550ebd550ca5fa6
+DIST stdweb-0.4.20.crate 194102 BLAKE2B 68a34d4729ded806846a82f0453cd8a82e7a2bf5e7761725af4fdb70be2c9d9c0022c64c5d11a23c8f449d8da7b707e285a8a994b6f027500c4d11da8458d280 SHA512 d6e608e4124e92c94f22172ad1e985dfd9a8a5182f123abf2d837680ad7f791120774f9a483ae5f8d2066fc6e658045c1ad3ee8791a19caf1884970e5882f7ce
+DIST stdweb-derive-0.5.3.crate 3894 BLAKE2B 922b52eebb5e21f1f3f58866dee0db28506e37a716f8d58924cba568783098fd236954b52f432434c28f0439e9b6153468c5c3e32f4feb3748a56a49162c9b43 SHA512 d47048f9b1a84d3201ff6189873606df678e22216a7b3e26d23b5708b4115564262aa8ab51151e2ea61b4fdb633ccd5e0af73e62548fb653c30545ea4800834c
+DIST stdweb-internal-macros-0.2.9.crate 11828 BLAKE2B 6343aa183e07df93082845b10b564d17af8e65aed6d938054020519a8a96af21838c19a04f6f20d0c1e7ad511d9798f85ab780ffb4dadd049a7bfa19583aa7a3 SHA512 05aee9e19565abd18f781cd6b7e60a5d7fa576ed37724265eb4808b37d9241d89d0eca1aadeed7f3be5237859cd3d905b8e3ce5001a3f1d68ff002bedb7513ea
+DIST stdweb-internal-runtime-0.1.5.crate 5445 BLAKE2B 6684fb69a8add47cdfebf7d85c784b3a8f9431ee43d8033d67781dee1eaa6cac71a5330c5eb1a12f5f3d73b863caec31d33985ad8a93d32088c506f70839970d SHA512 9a73f8007d6fa52031ac19f3a2adbe49c0690cec856c484cd81d534ad5b7e4002af0e6615cc9bc8d6753d0d3c1cd5a009ea3ca3750ab518b7aedfbe39b3ae11b
 DIST strength_reduce-0.2.3.crate 13283 BLAKE2B 8120efb6ebf74865c0bf70477a91a4e73536efe674fbfe90814c68f8653686c4cb83dfff7b4e841f689e9b0f31523a56deac863758a10dd80281632cba5f5f90 SHA512 c452e395b907b04c16f6e59a3e3ace00dda1f308d8d515800738674c97f79257b864460b4adaa376b88a3f424787791215886337d0b68b91493d85ab183a7e9b
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST symphonia-0.5.1.crate 10348 BLAKE2B bef16d5ac4560b2953ae0b5a91d6aeb14c8db67a950bdc819f8206d2d18ece16e68d9d22d177902801001b1652e52c42debf01a2559c562c305d9ace976ce97b SHA512 661262f643d9bc2207a2edb92c9d7d30e7d3f678c1c7adbce006b2b027b98038d6b25b98e5e96d5ed426dcdccf2b1077a487c6d3fadf35ae8be1313da7da3043
@ -351,8 +426,10 @@ DIST symphonia-bundle-mp3-0.5.1.crate 52668 BLAKE2B a20d6d6b6402a4bc89647f89dfdb
 DIST symphonia-core-0.5.1.crate 95813 BLAKE2B 01103c863c45d70a86441308b8e6aa011ce1f2838bd918ac7cca149306c9a31add12f613360cb8dafbce0bb8416c511170e0ed524503b4a4068ff4f158c56378 SHA512 12ea4ef40454db3e44ccbc74743f70580785e54c2c204cafece5c41817ba80676f465718379b4f938a0face40a699c9d6484151c21f4d6b317ca0e1f00476e5b
 DIST symphonia-metadata-0.5.1.crate 21087 BLAKE2B 30749e7547ffde2e98419773ee5ef5e7a5272e3723632a814ad6c5b2fc7c3d9f0c716f26bf59384a4b2331fa4708a13114e3fbc8c229627d21ff471b80093f4d SHA512 2f0507e482cfbea869c5a0cd47d1fff36c4b23e3dc1ab45fee138223406d7836fea5a663aa9f4f2da95e8634f460c38465edade9ef41ce52350f4b68dc6f0ef5
 DIST syn-1.0.102.crate 235699 BLAKE2B b29d1b0ab878eda45c486bce03e1b341eb2c69718201e662d81c131ead2bb5c5abffad848d9cd8d2e45a995dbb4d6a185173b5680973971e0c33bdd9fe43dfe8 SHA512 c9a2b2cf216c3d821decd488ebb49743f2f43940a879856e3a15d2352843c405e6f164c11225e904d18b32a5cd2bd7fcdfa74df40ec5567faeedffe5f523989c
+DIST syn-1.0.103.crate 236495 BLAKE2B fd139b1a8b4449e9be6eddf0036c19b93b876182a03f36954f79eaf79abd5e53667a8a9fcb5c872c96639779307fa293f597831ff838a41d90e1ea201f8a4797 SHA512 3dc0f564ac1a4ce85060926c0897158da0baa127a46bb318506f4fdc79e53d9439295e8ed6a2d5ffcf15d9f6651081b7602cc2a091538e8df061b545f7e3bfe7
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 DIST system-deps-6.0.2.crate 22869 BLAKE2B 0e5412b140cb4c667dd3e98a8b3c9bfae07c1df71abfde009dfe494bd11f3043cc3c7bb2c825b46caa8f47414b7c4076e131c47d3135c60678a2a826cc21899f SHA512 5ab193ff8ef680aafe89e6920b90d07349809018a27d962c6abf0ed6920d8a7541d6af03600c7b5e328425add04305743183e072491eacf973e6e96e6590b33d
+DIST system-deps-6.0.3.crate 22890 BLAKE2B 8d893b58159445fddf285653eae6eefa3f00cfe6834fb95fad3d1a9babd9b1da9dc29d413793d3efdd7d823e54a43cd619e472bc2ecece311c7fa627c7bec344 SHA512 12915d4e43c2c65f1c43c738ecb5f3ecfc817e6eb68989e34b2a8a42c10cc146da9a3b60a4d149215565e77918cc9afd991776da219863536616096ab140bfde
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
@ -360,13 +437,18 @@ DIST thiserror-1.0.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e
 DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
 DIST tiff-0.7.3.crate 1417896 BLAKE2B f718ec0bcfb4917d15189c6b4c37df643f43e2d6042639d123c678e11dead387b5823eecd6715f3d3678bf508d8cb53795b9d05e3cdf261badac5cef42738fe5 SHA512 fb5248ae56320ec0ed98c85b545996461924c422b2b1d916b46a2fc04394ee12e111132fea6cda27c53cdf492285797fe46bd4a403a1a598bd8c8dd327814356
+DIST tiff-0.7.4.crate 1418164 BLAKE2B 5d8246d281d66255b5cf44f416c794f84323908f8f881d3beece4ee54c2afe9f2f9b1dfdf462fbba30689192c1f5d277e659d464c5385dc18c7806e904dd805e SHA512 760609a910bb75a10fdee3c68316e8d9ec7185cb55867bbef40449cdb5a283e3d6e084d0a69ddcf9873bf6fe799c0b67cddacabe6b48cbf74d91df3e6d262761
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST time-0.3.15.crate 93589 BLAKE2B d83c9be58d950631b35ddecf44a28c2708978a922010baa54157b950f1c03c41327258e78701c9bcb93937ffda67303fb1ee0c647afae6597a23a67dc4992623 SHA512 8783fe9cd6aa94cf6588ca1a734d0fa11c9e20e0d99b46b218db95bc185aee8a4324b2ece1a535b4378e87151f9837cd41f663c542f561019be99e3ed5f55325
+DIST time-0.3.16.crate 92945 BLAKE2B 742e49c3fb7f43851cde22ae1c0496061247f59f8c0c80bf39edbd969e04dc4a84719553ac6d03634826d2ea6f46225b9ca2528c433a4352622d8edc99eb507b SHA512 e6117d9ecc9e5bdc6f116f64a881b68ae88077221735282faad843af4238a7a7272a6e95985f38bbb8bdff39a51d2dc371691b487ce09f101b954cba6e92bb61
+DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c576553b202d178a64d46396958745b00c9f2aa60a6eb609d663e48b1f9bd1f7ebe58ff6e22540e96b2b1c7f2 SHA512 f7e181a40a0052d7aedf78219a46f8876618342c710e819748a87a5bc0728e5b2fc7ba08e38ebfa6a17d6fb60382003bb35745ff1eabac1c8f8b47d186a383db
 DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
+DIST time-macros-0.2.5.crate 19015 BLAKE2B 0de97fd1cf467694dfa0fd7db44d161ff6c5eff442cfd816c5f5b2f2af3c7d515a5a63361a8cc4385c7eb1a75f028175cc40e500a59d1e8b245f16abe48b67ee SHA512 f3e28042ca1cff44bc43bec32dbeb92b227d05bcd218cdda5d1145b269f43a6e862254fd3d92ff180fd2146963c94a061b74cec077c37ebcd69f76e525d95b65
 DIST tiny-skia-0.7.0.crate 178703 BLAKE2B 00fe443b5c2eaed33eb1ac1d0915311ddb2c0c2e4eab25fc4dba7991e78d1dfc5e91fed5ba0d1233274ab52b08838632a310cb99cbfcdeb815ab3067de047995 SHA512 5cdebef37b91e0928e9248d95b2acdc47cad931bc9aea89b4f8527984e4d4aef5de86ac674472d630bc47cf3b12fad0c8e41691be10d760cc2d2284c326bd9b5
 DIST tiny-skia-path-0.7.0.crate 47384 BLAKE2B 485defb120103c9d8b88eb4402e210bd8d43d3ccd253ce55051ab6456ccc09cf0acf35fa9dde85157595f11cf8202f45c78a65109489e497e0a78cb0438729ec SHA512 4ade9260fdb1bfee3feef7bd3059c1ff00e80240349d6879669164954b7ecf5539296aa7289436f16ce6cd8e6733e265a5ff375b23c2a286b65d4ad74d924e30
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
 DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75
 DIST tracing-attributes-0.1.23.crate 30450 BLAKE2B fa21c4074eefbc1110268cfc79291c909503428b26560cf68cf04640a6387d04c29e22b8f86fd48cc1b8c0fd4bb67fca428c9f8009b3c99879352b9d9f68c5ea SHA512 55e92b4e0410805f8cf9eb8ee50cabcf08d1f6c6b4b38c5a51c70f59d06c82096af1f3b9b7dd4267945cf631fa8d99f78ae9b3d0760f9c7ed4d6da6e5e6ff3cb
@ -407,12 +489,15 @@ DIST wayland-sys-0.29.5.crate 7926 BLAKE2B bf09b522dc69b2a49493e769696196e18bfed
 DIST weak-table-0.3.2.crate 23989 BLAKE2B f5b12d62704a86f77fabaac918d084a4f7471b52994307da20376d48264b811eaeffe2cae2f28ebeeefa4338c758516bcdba5d138cd7ac12ebfccc697009e167 SHA512 78936f2afca36575d3faa823ef4e621d7dea9e3eb4c8c3e1d66af296951fc25476dc8cbadae184322f6e1e8166410df617fe74794b2d3696d599bb2406499562
 DIST web-sys-0.3.60.crate 700485 BLAKE2B 13942a583dd8462b0591a19759a41f41fb17d2356b3bcd78402e420fdf5726782e5b4ed211c3716a81c1cdf64ce9b8adecaa3fa22756a3ec84eb7c3e12e3018c SHA512 d883363f99300e2d50bc5bf198f0fb8d6c53e5a778217e340573560ac07db26a71c98419fa2ced32820472126d6f97ad5773ad082521be0a1c9a374af9d61df9
 DIST webbrowser-0.8.0.crate 26406 BLAKE2B 6f764de667344b4d578d30cc40fca859fec4b21509b6e654a2dc236f82b0af22d829d4e5b58d5548fe789b1b8f72162206d71dd1b1d65d84a03da22b95a311bf SHA512 a40e98042d81165510e154c60a3124ca0b46b0c2a2e4e6df77738dc282ac62e1d692d281f80858aef7fdce3496c9bc4bb753fccaedecd25924c1b3c2241db249
+DIST webbrowser-0.8.1.crate 26553 BLAKE2B 7af01e67da16050f0c6698dc15ea3fc30330d9e1000a6f09a46dfbc38f49eaad1eb71ac612ef061ef451aa766ac6ddc4ab2e47b468a87120c2babe3084a36534 SHA512 8d2ddf613bd909e6bd58638bb750a5c24a4a8351d2e2d66c005a1b2138b2dad48896bbcda0c3d11fd105e40a0c91f3f3a1b325abfe98abef787dcd8c46e7de31
 DIST weezl-0.1.7.crate 42166 BLAKE2B a3a2a48dbb444b2bd910e1470507209f3d0acc75d88e22bcb42b5ca7ab8edbc41fc9e49cb6a2e18cf5e470d7bd26f4e4d9e30ea01c3eb543f171289a86927fdf SHA512 3fd8cb01dde494371df57001c97be90418b642ba88b0945cd98f973a4498743b83d383bcdfc8884db1da75271aeef4ce3b418e425f23690f12a5cc645c418e90
 DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
 DIST wgpu-0.14.0.crate 141335 BLAKE2B 9f7dff89f6f16260690f997f4a9bc014e4847b01f16ab365114c4aafbefe1244c282c2611a691a514c715b889b698f7b2201b4812bfa0c74c66c8308aeb7f1fe SHA512 89e46b56f8c5c0c6157ba067d12d23868de7016c9c1a5d596a9981039a9da809f4bfa385ac974dbc32ad7715fd5d83d206e487d7642029bdbe00f71d7998d990
 DIST wgpu-core-0.14.0.crate 203248 BLAKE2B 38b081a6f6c2f2943ed469d97e626817c4cac7bbb02e04e75d62ee47f3dd8e95c6729d095978b51095459fc01bf7164c3f4ddda54cd2b8d852c4880645927bb8 SHA512 04e0fd9d0b6fd4a22a30be0e41106462f20f1870a1f091143204cc705152fe7e69c7d21c3438a02481bf71cc516d99715594193b3195e09771f8257140865a24
 DIST wgpu-hal-0.14.0.crate 222732 BLAKE2B 58365d7ac79097ca5c0c03bb53193ab0f6adf448bef1cbbb35f1d7ba10bf94a5501b2f69fbaf9d63094774f44c514eaf43d457a68e642cf6f1836bfd3c3758c9 SHA512 34d67142a052ce71ee4234aa0295e386fe30dc678772cb5849a6918eaa4eb18de9deca55e7f4064da4b7af63d4e3eafcafe70ff992bdc98b8cdf42b27f079997
+DIST wgpu-hal-0.14.1.crate 220634 BLAKE2B 3fd79e4dfe1d8332283c8217733ca1a8d01deed1f7a0caeb23f2db85d014843be6445bc0789545150950bc07d117c07e0d919d0b83648d1c83567545c40b6a75 SHA512 4ef7d50dcf8b9e48ea7c8bf4292e86649920505c0925da0f8a356185581bfff51c4ea32f78d832af36be2bac235a1ef41ef7f95c9ae2714046908878eeb809c1
 DIST wgpu-types-0.14.0.crate 43156 BLAKE2B 180b2a7fe44faa0be1d5cc74f17d296de649dadbbf20e86096d26921f013eaf19bb29e72198083b793824b5b4c1bd45b7126ca18080411a400330e585fe60779 SHA512 f9107ccaf4d6d42d9a5dd7771aba818ad5fb806d909fbe2bd976d0b39336475212ce3033dea4d2ebd2184ca1dbc6b1a5a02896a1742fb0b6255b4d5daf93e587
+DIST wgpu-types-0.14.1.crate 39502 BLAKE2B d65d932df63cf0fc647f600e9a0979e8659d45d0f45f4d1010233d7f9a3cf861c154369713457d7c03a6fc358861b153c82e29f1bd297a8d55f996e6cdd93676 SHA512 4c670c0dd5b94b123083aaf8037f5f72c160e9a3370a2c6017a724b76e0c0b94cc1bcdabe587c13051a2d968ac39bd4fc39be43bb0dde379fbe154561bc67aae
 DIST wide-0.7.5.crate 70547 BLAKE2B 2733b50ff16b87bd2b232bacb4722a188dcfc703615da23dd0c884b7b70e9876fa705493bfdf04d868d761d9f10e211bc9378d14cc67b3cd3994614e90d0db8d SHA512 8f83aef8ad2c6539e4ed1478ef818ef9b4d83fc2417037fe633749f75e23a5b4b373fa6527ddd9cc1eb1fc864f5eeda960dc6e9b5310204d08c2140530a48d4a
 DIST widestring-1.0.2.crate 79706 BLAKE2B 64423d0c485d1596015e9fcee691222a2a69b85a1b13a91651c50c1e3c5ec61c5105232904c6239bb442a2b3f2e808379d802856b93bb62ec8779cbf3db77655 SHA512 cbebac37d87808e791d7839ad69e0b86af49b0e8a354a22e11797915c719937ed5b0cb638e5afc9d710cd1e073eaa9f7db76cd3ca1ec35a71b565f0b8f55407b
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@ -421,17 +506,26 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST windows-0.37.0.crate 14060820 BLAKE2B 4993494caf29e403e275964a80ce64469e6ec3a688ba31c7a3d0e261c160f6baf3cd84754bd8661ed38e593f2f8dca80afd0b426104a9249cbdf5cd96391d59e SHA512 d10347d7cbede894f7acdc988e197d76b8b35f09272a1f525f0307b2c5005ea36b106b99efb2f06fa4109fed8c95257c420cc54dcb79f302d1e98438c823e223
 DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
+DIST windows_aarch64_gnullvm-0.42.0.crate 357917 BLAKE2B 58da715a46692ed786fa554338d446eaaa50c63ec1d4090cf0690a9211c0221034479e9066cad1c98234410519833826ae3163bf6724c3b06097d5b84d7b9fcf SHA512 8bd60142e8982ddb14dde4e93b9753f9ac34830c05c2a1dd4568377f9a928651bf9f026a0080e5bc7dfa62a45942376736954e3ac800855d00eef0c72929f338
 DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
 DIST windows_aarch64_msvc-0.37.0.crate 661960 BLAKE2B ae184d78d8663ac491090210eaddcabc29da3ed2bc9b551bf705196f3323063c1e07f011d77760d0682347843428789a23802fd4889c01c99ad0e7308799abf7 SHA512 3d249b39a2aa329d56965ed56b171fe0996f8078c0fe49537d746b62fddce37e90d68f2a31e51022d9a6b693db7e2e35ada399fc8a125903f4f9d7af7b651d8e
+DIST windows_aarch64_msvc-0.42.0.crate 659424 BLAKE2B a8c9a288767756f2086bd0706774cdcce5c8639431ad76ed122d4b6d13c936ca8fb1a463d34835b3a2728f4444e2f4b91ee772f00c54f348094da69c05ce6b93 SHA512 20c0840adec84dde03b143e5b82bb0003fee675310487f0071a81ed7f40ee647c4018ccb9ebdbc4aeada717ec8600a30dfb15510c6b336f07becdb7167668fd0
 DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
 DIST windows_i686_gnu-0.37.0.crate 818111 BLAKE2B bba5bfc3e85dc38fef52ae7d00919262a971ecb381e6236056c29586335efc69f4a6e020c91d59f85760191ad7626a3cb2283872b009788046dea6cf7aa38fd9 SHA512 7f3aaf30530d13d9a9c6f20df4abee8ca6ddda25de289551b7223a7092277d5ec4764c048bcf566ce49b085b78d567f3a6e7c62d6d5fbe79b671dbb2d9526aef
+DIST windows_i686_gnu-0.42.0.crate 728570 BLAKE2B b72079610b5c4fc798a79fa757b19f8c8baceaf7f4ce824193a65fadaac988ebdff1719a74d676b7dd017e11ceb029402bbac4e55c35206172e15a9bef422f78 SHA512 a24dd1ba5eb7d5231853bebadfde0575ae9071a565868d2f3d1bc6ec0a87380c569a621f0cba2552af7a1e46ac62f09f87cfbce3f674be06be1a7c1d3f421474
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_i686_msvc-0.37.0.crate 724577 BLAKE2B c83f437526293ae1326f4ed7598c66b0b0ce71ffc85b24807203b732fa9745a12ef1b339c28b0fb51614408503562991bdd611ab3721c1b37d83841121569c4b SHA512 b95650193a0a6f71cc8b66ca380d4e931d1c4a7a1e38a0b8222efc164c0e8c8c3cd21f26cb0e503c64e08d28e2922be5fce05302f2552086585bbb56073f077c
+DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb56848106d6de0e1f8030e6bd5e1e174bd9a46737db54fbd61de99054e5e8c5263eaef0508c440f43c39dca82baa77792ff2743 SHA512 740400e2b11c1d177f7f37f844cd2a0f84b97a5adb03a7656661deb026b593a799ace8da1f9013ba9f74446fc43260d01dff7d4be607129ec7d602f341b2b4d1
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_gnu-0.37.0.crate 790933 BLAKE2B ddf80027c50c150ffb542b864f4c2ce62511195db59956bfd7ced85afaefa3a53a4eb67f5c6a72a1571e8b28848846d2a199e4c9ab2b8714190952d2a8993944 SHA512 c528d0e7fa1a3e600d9adf055fc42bd19e6871feb99cb1fc1631a9a078824a9328439db17e3222c76dc8730951251478939033215a32b240058423a145877fe1
+DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae
+DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST windows_x86_64_msvc-0.37.0.crate 661993 BLAKE2B ec6509a2e07ae8f94c5cb0cd6eb507b504782702698c93ec86af66c9bf3587d2dcc7b7f5a5da95ce92df42091633378374f101d64685cbdc8ef55d49523c41bc SHA512 ccfb98753311f32a591b94391dc4a8d9ffb5bdbb09e83f082b8dde6077e5ec710dc380a2a6cad90a00da5570eacd74dae810108943801a0615abf53c35ff7da6
+DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
 DIST winit-0.27.4.crate 370023 BLAKE2B de04a0be0e9641b9132039a29b2452af8e9b10bc8811c3095844ed8ab31d949626238d6fd1d399d28152bf7387df59564c391bc667277f8f730dee5bb256bf18 SHA512 e5c17a80ebfd140c48715b42b4ef1345e216614321ff31cd2cb9595d07f7a817dbbd81b66d6d1b5c0196ccaa9f477b7e031043a75d07a7034e24ed46bf9121d2
+DIST winit-0.27.5.crate 370578 BLAKE2B 7e8c52606d18fb04fa301a08d8cdb4d32b62bba66be13545e7eb4a94f47726cf0e48688625702f5b9c50f05aa57ce813c3af027da404dea48304c85d76dfe8ca SHA512 1fba987f18e1437285e19b9fce4d060fbf0b92339bbe3f8c0107222103b35654bc1a3be8654d0aa6cedd6ec339e62a430b1655e6c6933e057b122785432f1e63
 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST wio-0.2.2.crate 11214 BLAKE2B 7356229f90aa50d6ac8a7651637967de3e06755a7a45eab2a144e13c876058553c22129abffb07717b1715233f6cfc1efe90ff60c1877f4291fabaa4b5ea283d SHA512 13838de6e01b20de8996c7aa9efbaca5bcd9e4551614cfc10bee45ecca4bcc70b953b2c59fe460d1a054b3ecac13445b020aa244ea70686fd19be8d65c539b0e
 DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
@ -440,7 +534,9 @@ DIST x11-dl-2.20.0.crate 66836 BLAKE2B 9f8049bb9ed2dc2cbfa76b969ddd4f209bc5bf408
 DIST xcb-0.8.2.crate 129071 BLAKE2B 83596850decb752c8fca84c383986e3cf1ca0708a682c083aee5e1d40d7ede2758e1a209d45745685a625d98d9438927e8f68de762bc01e843e91d9cddd16101 SHA512 276df8c84e5a416470ea5d7d29065acfa0f3b1c2f6f987242e30ceed746ee7c004257a26d01dba4f2366a76c5878b154242ed4f4cbe5b7df1b2c9c40c4d60c46
 DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f490edcdd824661288eae98f2bf2c4d7da7079bffda0fbfed0409a7ddb329d855deb784fc952d1c2f2d5dbdd1 SHA512 229ea7516d8a07c3fac46b70329e89c19fcf282134b5063b8302a64f8723d31b52b4fcf23c49aecd3a3a0a736ba4a52cd033f8c3db21a775084c6c0a0e1f6c1e
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
+DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 EBUILD ruffle-0_p20221015.ebuild 11589 BLAKE2B 6fb69693a65cb828bc21b80254baa9190c979939bd4bc568ae220c775109bb2c1df46ac83f1f31384343ee7a6ff6f7c1addace644dcb762af33b571f62dc7eb9 SHA512 d0a2bfd096cbc82057c7ac84cc6c35ba2a381a7a6815739f91d95df7baa894a6f3a6b3c58325245eda9398bb0a426d8f1e4cca3ea07ec7f4cabda794d127d448
+EBUILD ruffle-0_p20221112.ebuild 12147 BLAKE2B 677f59ccc9738c7552a82b13fa2970b62d788f99ce62bb9364d62f187016d664ed6689389faf35e30008151ccbefc38444d5775e26c790e498e7c477ea34538b SHA512 4ca457f3dd8222ec6738e7bf9245bd1624551406c863842f3b9d113dec91cbfc6afd9c6511f411b99f063cfb3a3e205acd08df47bb82771899fdd64d29b7d485
 EBUILD ruffle-9999.ebuild 1452 BLAKE2B abd4cc978b403a2a3ce822bdab0d677bf1ad9bad1930631040eab02f315184182ec581c0b01cb100b01a06926b8c5158153c3bf97fef789b6b898889ad9216ce SHA512 777abded8310d1b745f78a140860b420ece95b72f776a75d00ec015075d2890fad0defb2dbf79f5dc19ccde211c63ebcff6e8045f1d795b44455ef828c728867
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
--- a/app-emulation/ruffle/ruffle-0_p20221112.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20221112.ebuild
@ -0,0 +1,577 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	Inflector-0.11.4
+	adler-1.0.2
+	adler32-1.2.0
+	ahash-0.7.6
+	aho-corasick-0.7.19
+	aliasable-0.1.3
+	alsa-0.6.0
+	alsa-sys-0.3.1
+	android_system_properties-0.1.5
+	anyhow-1.0.66
+	approx-0.5.1
+	arrayref-0.3.6
+	arrayvec-0.5.2
+	arrayvec-0.7.2
+	ash-0.37.0+1.3.209
+	async-channel-1.7.1
+	atk-sys-0.15.1
+	atty-0.2.14
+	autocfg-1.1.0
+	base-x-0.2.11
+	base64-0.13.1
+	bindgen-0.59.2
+	bit-set-0.5.3
+	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.3
+	bstr-0.2.17
+	build_const-0.2.2
+	bumpalo-3.11.1
+	bytemuck-1.12.3
+	bytemuck_derive-1.2.1
+	byteorder-1.4.3
+	bytes-1.2.1
+	cache-padded-1.2.0
+	cairo-sys-rs-0.15.1
+	calloop-0.10.1
+	castaway-0.1.2
+	cc-1.0.74
+	cesu8-1.1.0
+	cexpr-0.6.0
+	cfg-expr-0.11.0
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	cfg_aliases-0.1.1
+	chrono-0.4.22
+	clang-sys-1.4.0
+	clap-4.0.22
+	clap_derive-4.0.21
+	clap_lex-0.3.0
+	clipboard-0.5.0
+	clipboard-win-2.2.0
+	cmake-0.1.49
+	cocoa-0.24.1
+	cocoa-foundation-0.1.0
+	codespan-reporting-0.11.1
+	color_quant-1.1.0
+	colored-2.0.0
+	combine-4.6.6
+	concurrent-queue-1.2.4
+	console-0.15.2
+	console_error_panic_hook-0.1.7
+	console_log-0.2.0
+	convert_case-0.6.0
+	cookie-factory-0.3.2
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	core-graphics-0.22.3
+	core-graphics-types-0.1.1
+	core-text-19.2.0
+	coreaudio-rs-0.10.0
+	coreaudio-sys-0.2.10
+	cpal-0.14.1
+	cpufeatures-0.2.5
+	crc-1.8.1
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.6
+	crossbeam-deque-0.8.2
+	crossbeam-epoch-0.9.11
+	crossbeam-utils-0.8.12
+	crossfont-0.5.1
+	crunchy-0.2.2
+	crypto-common-0.1.6
+	csv-1.1.6
+	csv-core-0.1.10
+	ctor-0.1.26
+	cty-0.2.2
+	curl-0.4.44
+	curl-sys-0.4.59+curl-7.86.0
+	cxx-1.0.80
+	cxx-build-1.0.80
+	cxxbridge-flags-1.0.80
+	cxxbridge-macro-1.0.80
+	d3d12-0.5.0
+	darling-0.13.4
+	darling-0.14.2
+	darling_core-0.13.4
+	darling_core-0.14.2
+	darling_macro-0.13.4
+	darling_macro-0.14.2
+	derive-try-from-primitive-1.0.0
+	diff-0.1.13
+	digest-0.10.5
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	discard-1.0.4
+	dispatch-0.2.0
+	dlib-0.5.0
+	downcast-rs-1.2.0
+	dwrote-0.11.0
+	either-1.8.0
+	embed-resource-1.7.4
+	encode_unicode-0.3.6
+	encoding_rs-0.8.31
+	enum-map-2.4.1
+	enum-map-derive-0.10.0
+	enumset-1.0.12
+	enumset_derive-0.6.1
+	env_logger-0.9.3
+	euclid-0.22.7
+	event-listener-2.5.3
+	expat-sys-2.1.6
+	exr-1.5.2
+	fastrand-1.8.0
+	flate2-1.0.24
+	float_next_after-0.1.5
+	flume-0.10.14
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-0.5.0
+	foreign-types-macros-0.2.2
+	foreign-types-shared-0.1.1
+	foreign-types-shared-0.3.1
+	form_urlencoded-1.1.0
+	freetype-rs-0.26.0
+	freetype-sys-0.13.1
+	funty-1.1.0
+	futures-0.3.25
+	futures-channel-0.3.25
+	futures-core-0.3.25
+	futures-executor-0.3.25
+	futures-io-0.3.25
+	futures-lite-1.12.0
+	futures-macro-0.3.25
+	futures-sink-0.3.25
+	futures-task-0.3.25
+	futures-util-0.3.25
+	fxhash-0.2.1
+	gdk-pixbuf-sys-0.15.10
+	gdk-sys-0.15.1
+	generational-arena-0.2.8
+	generic-array-0.14.6
+	getrandom-0.2.8
+	gif-0.11.4
+	gio-sys-0.15.10
+	glib-sys-0.15.10
+	glob-0.3.0
+	glow-0.11.2
+	gobject-sys-0.15.10
+	gpu-alloc-0.5.3
+	gpu-alloc-types-0.2.0
+	gpu-descriptor-0.2.3
+	gpu-descriptor-types-0.1.1
+	gtk-sys-0.15.3
+	half-2.1.0
+	hashbrown-0.12.3
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hexf-parse-0.2.1
+	http-0.2.8
+	humantime-2.1.0
+	iana-time-zone-0.1.53
+	iana-time-zone-haiku-0.1.1
+	ident_case-1.0.1
+	idna-0.3.0
+	image-0.24.4
+	indexmap-1.9.1
+	indicatif-0.17.1
+	insta-1.21.0
+	instant-0.1.12
+	isahc-1.7.2
+	itoa-0.4.8
+	itoa-1.0.4
+	jni-0.19.0
+	jni-0.20.0
+	jni-sys-0.3.0
+	jobserver-0.1.25
+	jpeg-decoder-0.2.6
+	jpeg-decoder-0.3.0
+	js-sys-0.3.60
+	khronos-egl-4.1.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	lebe-0.5.2
+	lexical-core-0.7.6
+	libc-0.2.137
+	libflate-1.2.0
+	libflate_lz77-1.1.0
+	libloading-0.7.3
+	libm-0.2.5
+	libnghttp2-sys-0.1.7+1.45.0
+	libz-sys-1.1.8
+	link-cplusplus-1.0.7
+	linked-hash-map-0.5.6
+	lock_api-0.4.9
+	log-0.4.17
+	lyon-1.0.1
+	lyon_algorithms-1.0.2
+	lyon_geom-1.0.3
+	lyon_path-1.0.2
+	lyon_tessellation-1.0.5
+	lzma-rs-0.2.0
+	mach-0.3.2
+	malloc_buf-0.0.6
+	memchr-2.5.0
+	memmap2-0.5.7
+	memoffset-0.6.5
+	metal-0.24.0
+	mime-0.3.16
+	minimal-lexical-0.2.1
+	minimp3-0.5.1
+	minimp3-sys-0.3.2
+	miniz_oxide-0.5.4
+	miniz_oxide-0.6.2
+	mio-0.8.5
+	naga-0.10.0
+	nanorand-0.7.0
+	ndk-0.6.0
+	ndk-0.7.0
+	ndk-context-0.1.1
+	ndk-glue-0.7.0
+	ndk-macro-0.3.0
+	ndk-sys-0.3.0
+	ndk-sys-0.4.0
+	nix-0.23.1
+	nix-0.24.2
+	nix-0.25.0
+	nom-6.1.2
+	nom-7.1.1
+	num-bigint-0.4.3
+	num-complex-0.4.2
+	num-derive-0.3.3
+	num-integer-0.1.45
+	num-rational-0.4.1
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_enum-0.5.7
+	num_enum_derive-0.5.7
+	num_threads-0.1.6
+	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.6
+	oboe-sys-0.4.5
+	once_cell-1.16.0
+	openssl-probe-0.1.5
+	openssl-sys-0.9.77
+	os_str_bytes-6.3.1
+	ouroboros-0.15.5
+	ouroboros_macro-0.15.5
+	output_vt100-0.1.3
+	pango-sys-0.15.10
+	parking-2.0.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.4
+	path-slash-0.2.1
+	peeking_take_while-0.1.2
+	percent-encoding-2.2.0
+	pin-project-1.0.12
+	pin-project-internal-1.0.12
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	pkg-config-0.3.26
+	png-0.17.7
+	polling-2.4.0
+	ppv-lite86-0.2.16
+	pretty_assertions-1.3.0
+	primal-check-0.3.3
+	proc-macro-crate-1.2.1
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.47
+	profiling-1.0.7
+	quote-1.0.21
+	radium-0.5.3
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.4
+	range-alloc-0.1.2
+	raw-window-handle-0.4.3
+	raw-window-handle-0.5.0
+	rayon-1.5.3
+	rayon-core-1.9.3
+	redox_syscall-0.2.16
+	redox_users-0.4.3
+	regex-1.7.0
+	regex-automata-0.1.10
+	regex-syntax-0.6.27
+	regress-0.4.1
+	renderdoc-sys-0.7.1
+	rfd-0.10.0
+	rle-decode-fast-1.0.3
+	ron-0.8.0
+	rustc-hash-1.1.0
+	rustc_version-0.2.3
+	rustc_version-0.4.0
+	rustdct-0.7.0
+	rustfft-6.0.1
+	rustversion-1.0.9
+	ryu-1.0.11
+	safe_arch-0.5.2
+	safe_arch-0.6.0
+	same-file-1.0.6
+	schannel-0.1.20
+	scoped-tls-1.0.1
+	scoped_threadpool-0.1.9
+	scopeguard-1.1.0
+	scratch-1.0.2
+	sctk-adwaita-0.4.3
+	semver-0.9.0
+	semver-1.0.14
+	semver-parser-0.7.0
+	serde-1.0.147
+	serde-wasm-bindgen-0.4.5
+	serde-xml-rs-0.6.0
+	serde_derive-1.0.147
+	serde_json-1.0.87
+	servo-fontconfig-0.5.1
+	servo-fontconfig-sys-5.1.0
+	sha1-0.6.1
+	sha1_smol-1.0.0
+	sha2-0.10.6
+	shlex-1.1.0
+	similar-2.2.0
+	simple_asn1-0.6.2
+	slab-0.4.7
+	slice-deque-0.3.0
+	slotmap-1.0.6
+	sluice-0.5.5
+	smallvec-1.10.0
+	smithay-client-toolkit-0.16.0
+	socket2-0.4.7
+	spin-0.9.4
+	spirv-0.2.0+1.5.4
+	static_assertions-1.1.0
+	stdweb-0.4.20
+	stdweb-derive-0.5.3
+	stdweb-internal-macros-0.2.9
+	stdweb-internal-runtime-0.1.5
+	strength_reduce-0.2.3
+	strsim-0.10.0
+	symphonia-0.5.1
+	symphonia-bundle-mp3-0.5.1
+	symphonia-core-0.5.1
+	symphonia-metadata-0.5.1
+	syn-1.0.103
+	synstructure-0.12.6
+	system-deps-6.0.3
+	tap-1.0.1
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	thiserror-1.0.37
+	thiserror-impl-1.0.37
+	threadpool-1.8.1
+	tiff-0.7.4
+	time-0.1.44
+	time-0.3.16
+	time-core-0.1.0
+	time-macros-0.2.5
+	tiny-skia-0.7.0
+	tiny-skia-path-0.7.0
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	tracing-0.1.37
+	tracing-attributes-0.1.23
+	tracing-core-0.1.30
+	tracing-futures-0.2.5
+	transpose-0.2.1
+	typed-arena-2.0.1
+	typenum-1.15.0
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.5
+	unicode-normalization-0.1.22
+	unicode-segmentation-1.10.0
+	unicode-width-0.1.10
+	unicode-xid-0.2.4
+	url-2.3.1
+	vcpkg-0.2.15
+	vec_map-0.8.2
+	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.10.0+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.83
+	wasm-bindgen-backend-0.2.83
+	wasm-bindgen-futures-0.4.33
+	wasm-bindgen-macro-0.2.83
+	wasm-bindgen-macro-support-0.2.83
+	wasm-bindgen-shared-0.2.83
+	wayland-client-0.29.5
+	wayland-commons-0.29.5
+	wayland-cursor-0.29.5
+	wayland-protocols-0.29.5
+	wayland-scanner-0.29.5
+	wayland-sys-0.29.5
+	weak-table-0.3.2
+	web-sys-0.3.60
+	webbrowser-0.8.1
+	weezl-0.1.7
+	wepoll-ffi-0.1.2
+	wgpu-0.14.0
+	wgpu-core-0.14.0
+	wgpu-hal-0.14.1
+	wgpu-types-0.14.1
+	wide-0.7.5
+	widestring-1.0.2
+	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-sys-0.36.1
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.0
+	windows_aarch64_msvc-0.36.1
+	windows_aarch64_msvc-0.37.0
+	windows_aarch64_msvc-0.42.0
+	windows_i686_gnu-0.36.1
+	windows_i686_gnu-0.37.0
+	windows_i686_gnu-0.42.0
+	windows_i686_msvc-0.36.1
+	windows_i686_msvc-0.37.0
+	windows_i686_msvc-0.42.0
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_gnu-0.37.0
+	windows_x86_64_gnu-0.42.0
+	windows_x86_64_gnullvm-0.42.0
+	windows_x86_64_msvc-0.36.1
+	windows_x86_64_msvc-0.37.0
+	windows_x86_64_msvc-0.42.0
+	winit-0.27.5
+	winreg-0.10.1
+	wio-0.2.2
+	wyz-0.2.0
+	x11-clipboard-0.3.3
+	x11-dl-2.20.0
+	xcb-0.8.2
+	xcursor-0.3.4
+	xml-rs-0.8.4
+	yaml-rust-0.4.5
+	yansi-0.5.1"
+# 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 081b6883a522b38030b13744c80c84efbfcbae1f 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 Unicode-DFS-2016 ZLIB curl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/openssl:=
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+	x11-libs/libxcb:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/jre:*
+	virtual/pkgconfig
+	>=virtual/rust-1.64"
+
+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 # does not play well with C code in crates
+
+	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 months if no known major regressions (feel free to"
+		elog "report if you feel a newer nightly is needed ahead of time)."
+		elog
+		elog "There is currently no plans to support wasm builds / browser"
+		elog "extensions, this provides the desktop viewer and other tools."
+	fi
+}
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@ -1,17 +1,21 @@
 AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e3703c50669ba9abf088dac0dd7aa8d6e59fcdd6656f5ad6955e4ef87c25d6f4082d83af71a09b2928934222b25847b8b2b5089f SHA512 43fc5c50c33e09f028c2369a660499fbb6c240931c6b7d44c4e838deee1df0390706967b375d36ee8eea339e86a5af1c7a49a76d884860c045c3476d8c8d2a5f
 AUX wine-staging-7.17-unwind.patch 1694 BLAKE2B ad8ba23e07a846152bd93e76a0b226869c8a9a28f197321b0faec3ad3721d05b892c69829d89933f245a7b6e0c8070db0e7dfef7d4b9bb047052d57f5ba7067b SHA512 80c3a1f347e7250cb1d7ab958507987b2aaeaf660c4ffb95c19118011ee61957629a9e28f2600fdafb384b61c26f50bcdaebab1fcbe30a9553c63cbed664c817
 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce
+AUX wine-staging-7.21-crossflags.patch 876 BLAKE2B 84dc39960e40c94f6e0bce4c8206b6d276e4d916f4b98d0f83a40ac0a7349f59b68010eb6bd4ba2b0ca854abb74a2faf58f54258e86cd1c800e849410d0570a9 SHA512 ee53bb03ce6ec181d2d87c63659802c4b68941c55264c8700e13ae83c0f9913a7ff8f45a5c42d40e302d7731535ba673a7fe669d0bebbfa35555e1f6187ab31b
 DIST wine-7.17.tar.xz 28379876 BLAKE2B 536af8f1ac9c4dd8bae2d16cba226c99c45cd64f0a9a2569022baefee61556801d3ee15f480fd18445baecb6c78dd7950f98542dc88a3282ee5d457d0e4ddfb1 SHA512 fd8017e6174db0047a3957db3045b2ad9024e07b1e2f81800521f0b7e7f7660add6a08e09bc60e3d140816cec70aae8324fe15643bd05e541f22f66ffda52508
 DIST wine-7.18.tar.xz 28412876 BLAKE2B 1f25c8669a2afbead142923a39913b3f21df641e446a6136e7ecd282f6c31bc70578036e83f3dd28d22516d987ddca179198f76effb5c9aca089f4755ffa873e SHA512 e651b18cef73b4619e953b746d0c207c0220279003560aaf195c2569a22308af129e1460651a246e6a87dcfbcfcff08f52f970734035eb55ab45d8970fd56a02
 DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
 DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea5576b03dedb7ee066f74f8c675193450cdd45bf5e0224bd588a890138e47a15f513edbfde1eabf1b65c9abe31 SHA512 6e2e65fba2336985df93165050f0f46b752d6aa94fc1581451c58969e2003748378be4b9e16b647ca2922fbdff77920311b12a17bda630a7bccfc7ee8f03b453
+DIST wine-7.21.tar.xz 28703308 BLAKE2B 8902ded32b9e635f8ccf659ca4055e9ad45d3659f3ad48d0c218dc5a7a334df456ea0e9441dcaff58e8cac0bbd65140b20e61180acaa06230bc70e28a8382c7e SHA512 15c0c9efda972b84890886fd4b1fb18dd462373ba490f5e607004a5436caba9823f643369ceb5abbc2d2d0e26d7ce002e00136299d9984c0a27f729f3ac129c1
 DIST wine-staging-7.17.tar.gz 9558133 BLAKE2B ef56bae5168da021688766e1cfbc8bd510a18b0de670b0baab631389665d52230e4f9ecda2edff1f50cbd444098d33236fd0f685183e9074efc6d048665c6931 SHA512 2e9c260b56293d86a54833d128d98b2408f61a5601f0ef58db6ff02a9c5cb091d3e9acf7f6a616d7d065d9c02127936da6bdc30e6ee11b116d24aab579f512fb
 DIST wine-staging-7.18.tar.gz 9535819 BLAKE2B b7157493c8362bce4683f0cd8847e41b812fa4150cee476a5598bd5b42a95686de0a25073082f513c42d618e53538e14cb5a8ce982c731f3880fb3356f4656f0 SHA512 fce34941f53f649035b9581f3612f0e47bcbb7e52d2edd33deba9123870cf69c237d10c820c8cbe1b9a784fe6e688af8690cc9ea6d71d4fc596f94ebd1a932a9
 DIST wine-staging-7.19.tar.gz 9523048 BLAKE2B e53fd47af493cbdc4542f908a39557324d70ad67ff2e06c80296c006a63518e43988750cab2f4d3d9197fc9c8a1e61ed4d96bcc310b82b6cfc8ec12b941f1c5c SHA512 c51cb18c4ae00eccf414f5edda18ebf363674ba7cfa95da135b3a43b7c012c086d454d6ac32b22d98e611bb87e55c3e1ee95571a4a0c9713028b5ac38e8aed3f
 DIST wine-staging-7.20.tar.gz 9521481 BLAKE2B 5a264460e72ac96d50d23492100c465eeb0b933306200710aa085bd37bb79df3c6ef03aeb5ba2c4c196befb231938457aa9584b9edf938edfd754d06e7cdb574 SHA512 538bf60e760254f3130fe8b6bf07598287e567c0f34d6be2ed04fde10007283d4c675a6f27a0a13d3ce77e833559d5ef853a89f2f96dc5f8cc818bdc3570474a
+DIST wine-staging-7.21.tar.gz 9530737 BLAKE2B a80476dbc957a9cda1554262777c63276f9b66a5ccd1389a006327810b0b960a600f78dfabc0d8df4ce816cdd7c4c3c29c26bea9b63219fa90dff60142d41da1 SHA512 1261267fe82a25d74dbf3f8cd1926339356eac3cd432667517c2ca65656c1b733c2866a48c1e4ad116ac8094d9079366a07f6a7814b8bde27246d654a792e9ec
 EBUILD wine-staging-7.17.ebuild 11195 BLAKE2B 96902242f3a26b3b6629247f89d4673ede219737d0a879825b33c069b3ab8c539ada527252581727cf04554a0339cb16b4aa70616c7142863833179898ae1204 SHA512 d3f357c9b204ed852160bf51a1a23700db6ac8bc383dbfce40564e4b2ff92677d991ba343d25be02be61b4d8447fee26137ccc636f171a7a856206d97f2a7080
 EBUILD wine-staging-7.18.ebuild 11195 BLAKE2B 96902242f3a26b3b6629247f89d4673ede219737d0a879825b33c069b3ab8c539ada527252581727cf04554a0339cb16b4aa70616c7142863833179898ae1204 SHA512 d3f357c9b204ed852160bf51a1a23700db6ac8bc383dbfce40564e4b2ff92677d991ba343d25be02be61b4d8447fee26137ccc636f171a7a856206d97f2a7080
 EBUILD wine-staging-7.19.ebuild 11123 BLAKE2B c5de757465bb7033ebc20796b6a4319eb115bc60f6c1512f3b9eaf3e9cc2a23e63900a4aafb379fb27f30642c698902759808aea9c76883c05f7bc30ff723912 SHA512 43321290cc12244b7a917885d9f3574362864d34f1360a500e17de15bc0a6cba34493fb986aff9168abb91d0cc1d57ded684b92bd31ae9a9b3ed6fa10ff8ad92
 EBUILD wine-staging-7.20.ebuild 11123 BLAKE2B 269c3156f5b190e358a498830930c6a26c09c6a5be5a7db899572496a95e739f8508115c007832ff568a31b984a66584149b408c8d38552931fb9e04e2136be8 SHA512 3b1fb7c272f27b4cced6112655f38270c95ed95fa844bc861489413070e8921438be57afe6138a8674ca67c97ef09a92d4d1ba8ebcaa26069b4857b2b7b60de3
-EBUILD wine-staging-9999.ebuild 11123 BLAKE2B 269c3156f5b190e358a498830930c6a26c09c6a5be5a7db899572496a95e739f8508115c007832ff568a31b984a66584149b408c8d38552931fb9e04e2136be8 SHA512 3b1fb7c272f27b4cced6112655f38270c95ed95fa844bc861489413070e8921438be57afe6138a8674ca67c97ef09a92d4d1ba8ebcaa26069b4857b2b7b60de3
+EBUILD wine-staging-7.21.ebuild 11224 BLAKE2B bf13e52b8c69cce318a89c8d2e88a3a52131fc7b56147206c4ffd04457af17c7f8f4574334eff2067115787d94adeea5d656a68640dc4ecc8ca185176da1c11c SHA512 6814a3750f3b58ac7c894c14113cd2f9520094e2c7f788270b5a432ffacbd985e8001a12f9fad6e6d28cd467de608c5e80561b2984865b67a674078d1e30d670
+EBUILD wine-staging-9999.ebuild 11224 BLAKE2B bf13e52b8c69cce318a89c8d2e88a3a52131fc7b56147206c4ffd04457af17c7f8f4574334eff2067115787d94adeea5d656a68640dc4ecc8ca185176da1c11c SHA512 6814a3750f3b58ac7c894c14113cd2f9520094e2c7f788270b5a432ffacbd985e8001a12f9fad6e6d28cd467de608c5e80561b2984865b67a674078d1e30d670
 MISC metadata.xml 2352 BLAKE2B c3bc247559ce143b4c8497b17dbeccf283ecb70463ca8230ba46d949c0def97f15c0b676149524111f7d151722d7c6343dc16dddaba5093fba60c62389da778d SHA512 a05a2b4bdaa01b7f097cf824f2b949b2e5ece864c7307dfca42a384711c9db09f486c3d398c9c1f187daadfcc646bb14fe7c488140fea2a3f7092a5e3a8011d1
--- a/app-emulation/wine-staging/files/wine-staging-7.21-crossflags.patch
+++ b/app-emulation/wine-staging/files/wine-staging-7.21-crossflags.patch
@ -0,0 +1,29 @@
+Restore CROSSLDFLAGS and ensure tested flags are saved in
+{arch}_*FLAGS (e.g. -fno-strict-aliasing)
+
+quickfix, odds are this will be revamped upstream
+--- a/configure.ac
+++ b/configure.ac
+@@ -919,9 +919,9 @@
+     saved_CC=$CC
+     saved_CFLAGS=$CFLAGS
+    saved_LDFLAGS=$LDFLAGS
+ 
+     CFLAGS=${CROSSCFLAGS:-"-g -O2"}
+    LDFLAGS=${CROSSLDFLAGS:-}
+     AS_VAR_COPY([CC],[${wine_arch}_CC])
+-    AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])
+-    AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])
+     AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"])
+ 
+@@ -1052,6 +1052,10 @@
+                                           AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -Wl,--build-id"])])
+ 
+    AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])
+    AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])
+
+     CC=$saved_CC
+     CFLAGS=$saved_CFLAGS
+    LDFLAGS=$saved_LDFLAGS
+ done
+ 
--- a/app-emulation/wine-staging/wine-staging-7.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.21.ebuild
@ -0,0 +1,360 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="
+		https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-${PV}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+	+gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl
+	+opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux
+	+ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite
+	xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? ( games-emulation/dosbox )
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
+	nls? ( sys-devel/gettext )"
+IDEPEND="app-eselect/eselect-wine"
+
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-7.21-crossflags.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+		git-r3_src_unpack
+
+		EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
+		EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+		EGIT_CHECKOUT_DIR=${S}
+		einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	local staging=(
+		./patchinstall.sh DESTDIR="${S}"
+		--all
+		--backend=eapply
+		--no-autoconf
+		-W winemenubuilder-Desktop_Icon_Path #652176
+		${MY_WINE_STAGING_CONF}
+	)
+
+	# source patcher in a subshell so can use eapply as a backend
+	ebegin "Running ${staging[*]}"
+	( cd ../${P}/patches && . "${staging[@]}" )
+	eend ${?} || die "Failed to apply the patchset"
+
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	tc-ld-force-bfd #867097
+	use custom-cflags || strip-flags # can break in obscure ways, also no lto
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# use *FLAGS for mingw, but strip unsupported
+			: "${CROSSCFLAGS:=$(
+				filter-flags '-fstack-clash-protection' #758914
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{C,LD}FLAGS
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	if use mingw; then
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+		use debug ||
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+wine-eselect() {
+	ebegin "${1^}ing ${P} using eselect-wine"
+	eselect wine ${1} ${P} &&
+		eselect wine ${1} --${PN#wine-} ${P} &&
+		eselect wine update --if-unset &&
+		eselect wine update --${PN#wine-} --if-unset
+	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
+}
+
+pkg_postinst() {
+	wine-eselect register
+}
+
+pkg_prerm() {
+	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
+		nonfatal wine-eselect deregister
+	fi
+}
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@ -30,10 +30,10 @@ SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
 	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
-	opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
-	selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan
-	+xcomposite xinerama"
+	+gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl
+	+opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux
+	+ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite
+	xinerama"
 REQUIRED_USE="
 	X? ( truetype )
 	crossdev-mingw? ( mingw )" # bug #551124 for truetype
@ -84,7 +84,6 @@ WINE_COMMON_DEPEND="
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 	)
 	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
@ -118,7 +117,9 @@ BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
 	nls? ( sys-devel/gettext )"
 IDEPEND="app-eselect/eselect-wine"

@ -127,6 +128,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-7.21-crossflags.patch
 )

 pkg_pretend() {
@ -223,7 +225,6 @@ src_configure() {
 		$(use_with mingw)
 		$(use_with netapi)
 		$(use_with nls gettext)
-		$(use_with openal)
 		$(use_with opencl)
 		$(use_with opengl)
 		$(use_with osmesa)
@ -259,8 +260,9 @@ src_configure() {
 		mkdir ../build${bits} || die
 		cd ../build${bits} || die

-		# CROSSCC_amd64/x86 are unused by Wine, but recognized here for users
+		pe_arch=i386
 		if (( bits == 64 )); then
+			pe_arch=x86_64
 			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
 			conf+=( --enable-win64 )
 		elif use amd64; then
@ -273,8 +275,12 @@ src_configure() {
 		fi
 		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"

-		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
 		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# use *FLAGS for mingw, but strip unsupported
 			: "${CROSSCFLAGS:=$(
 				filter-flags '-fstack-clash-protection' #758914
 				filter-flags '-fstack-protector*' #870136
@ -283,7 +289,7 @@ src_configure() {
 			: "${CROSSLDFLAGS:=$(
 				filter-flags '-fuse-ld=*'
 				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
-			export CROSS{CC,{C,LD}FLAGS}
+			export CROSS{C,LD}FLAGS
 		fi

 		ECONF_SOURCE=${S} econf "${conf[@]}"
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@ -1,17 +1,20 @@
 AUX wine-vanilla-7.0-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f1d3288f7edca75ddd7c9f02bfd06e9f63fac37bd59ea8aa891e13ab77bac35b369825d5490a9175ed9a7736e523b61d8944 SHA512 4ba3677042b693e513fc7a133c76a509f63d0ca20633d1e8d448bca9534c0d1a0fc58e77fa9b28fd8d936393605e97ee6e3bb5fac00872d6ac5808b7712586e3
 AUX wine-vanilla-7.0-unwind.patch 1694 BLAKE2B 017c7b761d692f8e8d23f52e51529880f95bddf5fee4309ab97bee951527bd427924dbb335e4bf57a27405e3d2440666f774c6859b81933d3007247e1cbf4898 SHA512 5d20960a8eda2d80097d6db81287c9d05ed4ea50df974c93391a427b743383a6806f24bc552c18a9336e7aea0ceb801972865ff470bde8ea7fd9423f57eb09ae
 AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3e4d8c0278d51c0a193fb9e460cf088b315503bd08bd904e8d28f72f40ab3df90f83f2542b991888a2f504cc7d2adad4d SHA512 a6c4672a44c1220d5b1efabeca535a4a3510fe92aac73c38f65a09bfbd271af8b8b1bfe2c408ba5356806cb71252a6956b8130fcd06a475037b9e51d28c2a156
+AUX wine-vanilla-7.21-crossflags.patch 876 BLAKE2B fa0bfd1f5fba242a8a99bf94e5ebb2c9cc07bb452d84d542f64a7f73795646af91283ac98dc2a78199ad6d0652544d7768a602539bd7c083ac5b9cf9fd4472ae SHA512 fe5160233246ac2335bb7f38daa761978544a935238d7b99cccf36fe09efa171bc4addbdeedbb457c28ea3a85377f4615ba68d04544ff887c94ff8341e3a8178
 DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944
 DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
 DIST wine-7.17.tar.xz 28379876 BLAKE2B 536af8f1ac9c4dd8bae2d16cba226c99c45cd64f0a9a2569022baefee61556801d3ee15f480fd18445baecb6c78dd7950f98542dc88a3282ee5d457d0e4ddfb1 SHA512 fd8017e6174db0047a3957db3045b2ad9024e07b1e2f81800521f0b7e7f7660add6a08e09bc60e3d140816cec70aae8324fe15643bd05e541f22f66ffda52508
 DIST wine-7.18.tar.xz 28412876 BLAKE2B 1f25c8669a2afbead142923a39913b3f21df641e446a6136e7ecd282f6c31bc70578036e83f3dd28d22516d987ddca179198f76effb5c9aca089f4755ffa873e SHA512 e651b18cef73b4619e953b746d0c207c0220279003560aaf195c2569a22308af129e1460651a246e6a87dcfbcfcff08f52f970734035eb55ab45d8970fd56a02
 DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
 DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea5576b03dedb7ee066f74f8c675193450cdd45bf5e0224bd588a890138e47a15f513edbfde1eabf1b65c9abe31 SHA512 6e2e65fba2336985df93165050f0f46b752d6aa94fc1581451c58969e2003748378be4b9e16b647ca2922fbdff77920311b12a17bda630a7bccfc7ee8f03b453
+DIST wine-7.21.tar.xz 28703308 BLAKE2B 8902ded32b9e635f8ccf659ca4055e9ad45d3659f3ad48d0c218dc5a7a334df456ea0e9441dcaff58e8cac0bbd65140b20e61180acaa06230bc70e28a8382c7e SHA512 15c0c9efda972b84890886fd4b1fb18dd462373ba490f5e607004a5436caba9823f643369ceb5abbc2d2d0e26d7ce002e00136299d9984c0a27f729f3ac129c1
 EBUILD wine-vanilla-7.0-r3.ebuild 10315 BLAKE2B f0b32f2d1b7033451e7b34ff77fefd868e3c6e8e70274f8c1c50933e46c94f2371a009d0147d7355e0810fb1eb0ba2db59d2793ad5d4c68114f8944c55f5ed6c SHA512 78ec137805d817d64a84898f19894c3a0220fafd56679cd29f056a7cc16ada4a3ca08a9b1d8ef21adf78399094d0f747a98df3fc6216e45fbc0037dcb72196f3
 EBUILD wine-vanilla-7.0.1.ebuild 10317 BLAKE2B 7a6ca6cbe6c4a2013b513d703d23821e8415f3b757ee2552d85de15e480084fd9e0e9030d18b2c938f2edaa6c3d950b0fa6e2a22898d7fd95e6ec3e357924d59 SHA512 5e9311158340a607bf6acb99eecdce893d6bd8772bd271da379e8192fc17dcdffec7af1399f61828c1909d315d2e0360b0372ceafce5e2fc5365a5d25d21534f
 EBUILD wine-vanilla-7.17.ebuild 10232 BLAKE2B e8c105a4b6a3d40bc162311d1c31c16d77ab04868b744d3681e8ccaee4191581920d59df57ee96d50959d75f7cb57ae98584cfa84ba30264e744e613bc88fe64 SHA512 a257e4eb3e0456a95c9b9305b9ba4af1f875300a69df57ba4fba11db9c4c170b9d12569c2cfd3555259225e250cb8409b5fbee9b199d218e45601ba7572e3a75
 EBUILD wine-vanilla-7.18.ebuild 10232 BLAKE2B e8c105a4b6a3d40bc162311d1c31c16d77ab04868b744d3681e8ccaee4191581920d59df57ee96d50959d75f7cb57ae98584cfa84ba30264e744e613bc88fe64 SHA512 a257e4eb3e0456a95c9b9305b9ba4af1f875300a69df57ba4fba11db9c4c170b9d12569c2cfd3555259225e250cb8409b5fbee9b199d218e45601ba7572e3a75
 EBUILD wine-vanilla-7.19.ebuild 10232 BLAKE2B e8c105a4b6a3d40bc162311d1c31c16d77ab04868b744d3681e8ccaee4191581920d59df57ee96d50959d75f7cb57ae98584cfa84ba30264e744e613bc88fe64 SHA512 a257e4eb3e0456a95c9b9305b9ba4af1f875300a69df57ba4fba11db9c4c170b9d12569c2cfd3555259225e250cb8409b5fbee9b199d218e45601ba7572e3a75
 EBUILD wine-vanilla-7.20.ebuild 10233 BLAKE2B 6013fb4f81e9dfd926ae56846f651d6f784e76e7011d84d08e7d6334304868d627ec95f956a5521432de50fc97e3329a497a1d9e73cc5d6814e72edd2e66f248 SHA512 2b253e06a33470d544f1fac9568e7117eb3688e712dc6d0315e182116cb07b699eafdbffb9c37d85d902457b25a1c10db60aca517a81de1f1bd2cd06ed57a184
-EBUILD wine-vanilla-9999.ebuild 10233 BLAKE2B 6013fb4f81e9dfd926ae56846f651d6f784e76e7011d84d08e7d6334304868d627ec95f956a5521432de50fc97e3329a497a1d9e73cc5d6814e72edd2e66f248 SHA512 2b253e06a33470d544f1fac9568e7117eb3688e712dc6d0315e182116cb07b699eafdbffb9c37d85d902457b25a1c10db60aca517a81de1f1bd2cd06ed57a184
+EBUILD wine-vanilla-7.21.ebuild 10334 BLAKE2B 9b731f7b9b1802f94c5c06b374eae9d6f3867d407d9ceacec19b52ab5b23e26f8569d475aa10d961b948742094940336109c5664398f6ff0e82851d1c6fec7af SHA512 2d3ea9a457d650260fdb19e186327c5b78ce5fad178d5155813a83707548cc582905837ada8a34cd07f22afa39661f77c622a7ca3c861c91b3ba3b668fecc274
+EBUILD wine-vanilla-9999.ebuild 10334 BLAKE2B 9b731f7b9b1802f94c5c06b374eae9d6f3867d407d9ceacec19b52ab5b23e26f8569d475aa10d961b948742094940336109c5664398f6ff0e82851d1c6fec7af SHA512 2d3ea9a457d650260fdb19e186327c5b78ce5fad178d5155813a83707548cc582905837ada8a34cd07f22afa39661f77c622a7ca3c861c91b3ba3b668fecc274
 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
--- a/app-emulation/wine-vanilla/files/wine-vanilla-7.21-crossflags.patch
+++ b/app-emulation/wine-vanilla/files/wine-vanilla-7.21-crossflags.patch
@ -0,0 +1,29 @@
+Restore CROSSLDFLAGS and ensure tested flags are saved in
+{arch}_*FLAGS (e.g. -fno-strict-aliasing)
+
+quickfix, odds are this will be revamped upstream
+--- a/configure.ac
+++ b/configure.ac
+@@ -911,9 +911,9 @@
+     saved_CC=$CC
+     saved_CFLAGS=$CFLAGS
+    saved_LDFLAGS=$LDFLAGS
+ 
+     CFLAGS=${CROSSCFLAGS:-"-g -O2"}
+    LDFLAGS=${CROSSLDFLAGS:-}
+     AS_VAR_COPY([CC],[${wine_arch}_CC])
+-    AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])
+-    AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])
+     AS_VAR_SET([${wine_arch}_EXTRACFLAGS],["-D__WINE_PE_BUILD -Wall"])
+ 
+@@ -1044,6 +1044,10 @@
+                                           AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -Wl,--build-id"])])
+ 
+    AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS])
+    AS_VAR_COPY([${wine_arch}_LDFLAGS],[LDFLAGS])
+
+     CC=$saved_CC
+     CFLAGS=$saved_CFLAGS
+    LDFLAGS=$saved_LDFLAGS
+ done
+ 
--- a/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.21.ebuild
@ -0,0 +1,328 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+	+gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl
+	+opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux
+	+ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite
+	xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? ( games-emulation/dosbox )
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
+	nls? ( sys-devel/gettext )"
+IDEPEND="app-eselect/eselect-wine"
+
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-7.21-crossflags.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	tc-ld-force-bfd #867097
+	use custom-cflags || strip-flags # can break in obscure ways, also no lto
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# use *FLAGS for mingw, but strip unsupported
+			: "${CROSSCFLAGS:=$(
+				filter-flags '-fstack-clash-protection' #758914
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{C,LD}FLAGS
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	if use mingw; then
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+		use debug ||
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+wine-eselect() {
+	ebegin "${1^}ing ${P} using eselect-wine"
+	eselect wine ${1} ${P} &&
+		eselect wine ${1} --${PN#wine-} ${P} &&
+		eselect wine update --if-unset &&
+		eselect wine update --${PN#wine-} --if-unset
+	eend ${?} || die -n "eselect failed, may need to manually handle ${P}"
+}
+
+pkg_postinst() {
+	wine-eselect register
+}
+
+pkg_prerm() {
+	if [[ ${REPLACED_BY_VERSION%-r*} != ${PV} ]]; then #881035
+		nonfatal wine-eselect deregister
+	fi
+}
--- a/Show More
+++ b/Show More