Sync with portage [Wed Aug 24 16:38:14 MSK 2022].

2 years ago · cf2ceee113
parent 441039e608
commit cf2ceee113
13703 changed files with 70703 additions and 60905 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29631 BLAKE2B 5795c993060d4fadcf45edd86ed02a02a695b7dd2a3ee04a99c578e2bfd95b839e53d9632987001053ffffd6a40abbd1da4d74633b413e75a12993858c29fe5c SHA512 ca3c49e4c3367b82c74595c8c00b7a0cb860c2d1c125a53a400e0b89f7fc40a637a3770708f1500268165a05300f865a0365491e386ca9a1035d668f2c0a4404
-TIMESTAMP 2022-08-21T17:39:50Z
+MANIFEST Manifest.files.gz 29579 BLAKE2B cda7567b66f9e8d89d9a62d6866e638c523872f15794127b4c02ef5cdfdfe0ac96e2d3fb28ad9948beb27a5fed80f240f25bc2edd91e06555620896fd9083fd6 SHA512 c121fbdd408f68e6c049c115ef6ea7a446ce83539623d3defdb4a664331679bc371a89c3bd9d23ca8464134bc1f39925660a2f223704f9d061b687f6486ccd8d
+TIMESTAMP 2022-08-24T13:09:55Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMCbeZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMGIyNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDq6xAAtw+rwXhBfCVTq6zJrN7ioU16yWYQEFNSJZCBfJefy7UT+18Ylvq7ybrN
-8T2KHCLsAbICUYx0AgLUZh+dcAsujUEl5aeEJdHVDRte7huRm/fTCaHsxBBMWYnC
-/nnRH8OkFOD4gqVV5LQS6uywEQRe+B5xO7qtdyBb24fCa/lAt6FEFmO5Scz8zTEL
-fUqPoZi4pEw/uwCXbSdvsOc0+Ij6pZN2DNoKDq6TU/FpD9Os7Z0HuHHRODiNQyD7
-+GWZ0e9gi+xrDW8mqncuoqx99uljXuVen56in3+mXcYhYDpm/JC+DjB96Ril+SfG
-zQkNB7KGEJPfnF68p9EtGEb2CLVy0arD+YT/LZoveT8bJh0uz/sZx27ni+5+6aQj
-40zxo9iQr0BogxnbXeaw/NQk6DTEa0N9qfJsCujGKAwXnj5XH44q7dA26wWSPqiq
-6TE9a3216XkFWj02XTLP86YNYsXfxJnnRjrQ0MJC385tgIHymztscikp8SW0czOd
-NBcFK8CSJj+2R73oi5lU2F9iL6PGuwe7xvWMhJn6h/eJJdlSk+GKeEYlRjtxxD4e
-+upB4MW/bFopekXacy9sydNbBUHtl82WDjKD7V3991hmDeR+GWWH8Fmsvye082uN
-6YQPgZjNa3/E+PLAdIlxBaL+HKCyxuK0jmEqnguS0/Y4Qr9IuMk=
-=ccZD
+klCc9w/+LBiE5ABkN/JxemkJDk7emolE4YVa/GMZ8ScOAHxph1yDBQOCkgf1VucL
+Uf1KkgL7tIxrGf+HuEnuXruTHGEh5TITeHNm4uZJ4EZa8ywP6UJJDIyqgwOGro5P
+rUJvC23nXsD0leuM1DblwMmnZpK3UKrxlRePpI9OZUniZeTOzpGkUQFIu8N4mIvk
+5tBKp+fHPrRtx86CQFwSmOh/zI2LYlO+vO/MXSpF7Ox8zY8I8tGN0vd/nPBp4abR
+bZK8yiqMs0JaMtRwbqWLg+j7cud200zlmlOrJfU7inVYY7ZeHineDWeGEio37DHY
+9wvRQyasJcDdntyJJCbAkQ/dtWgnFDSztENmME26lkn8BdZDrSXZvbK60XNlAvSw
+5441zzAgLXt4w8YiQZoHLOoIrvNaBIvMpnvTkjTd88fAL/pKAlNt4OchpdvYLwck
+S3xmkRyRV2RKezOZr/bGNDd+BhO6FIJ5p3ULvxGIpvwl4z8soIlmqqjxMm9XGc66
+FM3craI+5BNMZpoYpoQ89Rit4or90ZibUa/6KhSu8x2X8F6dFMzdUWnvDDEx9gre
+yCa1hM4d/GBjaExbYqCz80ek2fQScRmbDlFc2mrBFf1NqHH/7Yw+09KdRHC49Pmn
+vXXhgUVDm7S2gDIAydLWEBGg7yuKVhXX8zVC0MFyk0D4irsCJQk=
+=A9+B
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@ -1,3 +1,5 @@
 DIST kontrast-22.04.3.tar.xz 125860 BLAKE2B 78b87ebfb0958ce7bf2abf7a70ada000f959aa2cd648ebaf70ffef5500458bf1f9c42433176caa1ac29ab5b0ed51452092c796f679d7c56e4188e2a746169a05 SHA512 e77b2b129f115d2cf319a2a5f6b56bc576c00c506b542cc6239098245da17b966a71caf05f0868af7d5f3807be033bfc552b9fd1856046889363d1012bf13efe
+DIST kontrast-22.08.0.tar.xz 127248 BLAKE2B c052c8b011eca195af78b9d58ee654a5655e85b7b3e79c36b53d2065ee318724b1cc4d3cca20a8f39f2fa0c08025e9421f480f79d1e010452c858943aa32fe12 SHA512 d433f1ad0c8fad901352cdf5552304106f8dab033c012bbed95e7f9badda7deb3772fc941d771097508a090af8224a2521a81b3fb9b8e20e348c748de4a45802
 EBUILD kontrast-22.04.3.ebuild 759 BLAKE2B 5e70eafefd14497c535c3849785872c5c1ee073f7b61cdcae91f6b193ea5fff68b2c45521f66dfe5def1eaa00e7c28d39f9c48b3ee19c4868903c396f275ee86 SHA512 7a87d833edc3df966fd44552ab5c25f5589ffd27e11180af8f4750bac84658c69fa906d5699c3f0b2c9bd9e46738a6744c41e3a10800b89f0387167dbead6928
+EBUILD kontrast-22.08.0.ebuild 762 BLAKE2B 376cfb5e4bf71527539072b10e92e6d3f85bca4e54a69fa786c1abe561218d7896f1a837244d3560c0bae3b7843aba05eeb7fcaf7e2a7c8914dd63db4e3e2aa0 SHA512 df1a4a83b58625e7714d59be1b22818568f842f6e3ea94d503de5be47e09a3a74bcac55313434c6ec3700c97f5281f7163f06dee10e14082e9897420374296e3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
--- a/app-accessibility/kontrast/kontrast-22.08.0.ebuild
+++ b/app-accessibility/kontrast/kontrast-22.08.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
+HOMEPAGE="https://apps.kde.org/kontrast/"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	kde-plasma/xdg-desktop-portal-kde
+"
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -10,6 +10,7 @@ DIST aws-cli-1.25.53.gh.tar.gz 2242474 BLAKE2B 000bb154882210f52f8fe5c40e56d4352
 DIST aws-cli-1.25.54.gh.tar.gz 2252442 BLAKE2B 7f3f55af39f52be60daa039c42cd494a806998bbf0e27d5218949f0b6b8de29d85fc515697b76fa163e93e051405ac69a4df82322ac573fd124117d548040cc8 SHA512 bae88f022cfc8d596569412dfacddeed626ac88019632fc846a8351447ff02ae07dd481962e9a1495897896bb2f8b96186f8e3572bcb4fbd37d82b016afb8e33
 DIST aws-cli-1.25.55.gh.tar.gz 2250376 BLAKE2B 21a61086d4eb737229990fbcacdde652e8bd94e146a027dbdcc8fcc8ab005f6dcd4525625276df196408da3d11e0c215c602df4cf298fea3f12f6bd923f7f191 SHA512 e53997ae7475fb125e08bab90ac63b49723abd7ff66312d15145ca452c806986237f8e20fc6cb467d4654087a288b0835fcec48f7be6ec8795e90345a0983ef5
 DIST aws-cli-1.25.56.gh.tar.gz 2252989 BLAKE2B a082d42bd9ebaa858a3464bf885ba86a6f0f1b75d6ec89f9d6f1ab04dc753cf13cc6f7ced64cca35f8ddc460d589b44caa483c9d94bccb5b028c921fe7b970c0 SHA512 3a0fcd505b8a0c4fb322d2d39cc0ec3add977eb7ede14d7ff9fa3dd25b92e0e0d97128b73b6c32588d7e48344283c8c3eac293ea6cd470ea4feda1d1bf124e1b
+DIST aws-cli-1.25.57.gh.tar.gz 2255779 BLAKE2B dddfd580d8af048111001151f3a28470d41026e21d4e9d3ec04972cc2d865c1670e306070114017911949ee8044a2a7840aa25374992721fc77fb045eb2cb9b0 SHA512 2b477f760ddba30a1d0f40dfc289ed84a96cf25a989cf5bc06a6e6432399f202f4418d8554f5892123e2b8a406f99ed2a5137204ba5f65d438a451badf0188be
 EBUILD awscli-1.25.36.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.46.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
@ -22,4 +23,5 @@ EBUILD awscli-1.25.53.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77
 EBUILD awscli-1.25.54.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.55.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.56.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.57.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.25.57.ebuild
+++ b/app-admin/awscli/awscli-1.25.57.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit 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 ~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() {
+	# 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/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@ -1,5 +1,3 @@
-DIST kpcli-3.7.pl 241191 BLAKE2B a3a851ab9d5244dc2c17c084f116fd8b7adc6770715011c119e8238a7f5ecc0fd894d98c47c4762413dadfff83798f1a134a21d9e156d12ae76aac51259ee58b SHA512 2f66686e6f563e9ef5a2ae1fe23085c2563455e6041ce60eaedbb87492ae517a19163393e640e58b3a8d761cefd924bad605762ad6ba045de8f45fad4fb90abc
 DIST kpcli-3.8.1.pl 263292 BLAKE2B 70e9e4ca56466e51314e891de2282f9124c7eedd0f7aea7abfc4ad94a1f4ebcc4d65dc09573560e4cc90be4a2f4a3156d6d4e57f3cb5a27de297fca137fc9cbb SHA512 5d4ba12112b6b82dc150193f6c2210c868c6582726cf157f05d2ad74224ac6f637d09075ae410ce91481b222cc1f40c3fb2f6267923a04a06211929d92a05097
-EBUILD kpcli-3.7.ebuild 1138 BLAKE2B 3fdeda69e6b6b7db117b7a56121d91ee8b268405c3aeb6235a2b503189e874ae676c668f57387a1e6e051fae93c57d971c02eabd486a0aa921bde329944fdb8d SHA512 704b56af22ec2e26192014441b1c3a602941a84a94f3ef504dacff297a8475e1ad9a6110bb37dfdc9215773fbd11aa94a46d62da639e3d98af187235089c6cba
-EBUILD kpcli-3.8.1.ebuild 1140 BLAKE2B 2aa2929b849dfcd48557ef007b65ea70f219f048f98d524134702a5bfedacfb49202b5d3ab0a5e0a005fd05868bf0e29c27e4a7ff0069b2b22eacd9c9dfc55e8 SHA512 a25709df01dc4535e392b242d123b3e13b27da4983f96001e89eabd22f6fe2c36d325818b1b5b2b18caac95e54cfc08435a74bef980a9d7084754998c4eef3d6
+EBUILD kpcli-3.8.1.ebuild 1138 BLAKE2B 1fb46410902bbb51d391d884e98cfa2240cb1c3cff142cbb38c78c9dee9081fe1a1730a9a6532f0bb75fbeb72c6dcbc68fbcac52217e079b9b60992c40da5791 SHA512 5b07e0a25f0faae5d452200002f99d1b9cc5a2d93f6b1543026769bed9ff498dc3293ff9f73629ff1e5616007e2d425396717d18a309575f8530ce04147f8bfb
 MISC metadata.xml 359 BLAKE2B dc783d1efcb74e863350aba643a9f89a52db9ff75cc0f6a03c2aa8c39a1a65c904ca792342127e724a01f024e90e25d63bb427de649636707d5618ed106f7eca SHA512 aad13874ed832d9c9bf03204b2782060d080f2ee2b4e11eb5955bfb4632d2aa84db02eedb428648f1a777ae98c5a0369256faf00ebdd1d4ef816b4f5b59fc450
--- a/app-admin/kpcli/kpcli-3.7.ebuild
+++ b/app-admin/kpcli/kpcli-3.7.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="A command line interface to KeePass database files"
-HOMEPAGE="http://kpcli.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-perl/Clone
-	dev-perl/Crypt-Rijndael
-	dev-perl/File-KeePass
-	dev-perl/Math-Random-ISAAC
-	dev-perl/Sort-Naturally
-	dev-perl/Sub-Install
-	dev-perl/TermReadKey
-	dev-perl/Term-ReadLine-Gnu
-	dev-perl/Term-ShellUI"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin kpcli
-}
-
-pkg_postinst() {
-	optfeature "time-based-one-time-only password support" "dev-perl/Authen-OATH dev-perl/Convert-Base32"
-	optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
-	optfeature "password quality check" dev-perl/Data-Password
-	optfeature "better password quality check" dev-perl/Data-Password-passwdqc
-	optfeature "importing Password Safe v3 databases" dev-perl/Crypt-PWSafe3
-}
--- a/app-admin/kpcli/kpcli-3.8.1.ebuild
+++ b/app-admin/kpcli/kpcli-3.8.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"

 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 RDEPEND="dev-perl/Clone
 	dev-perl/Crypt-Rijndael
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@ -1,5 +1,5 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
-EBUILD pwgen-2.08-r1.ebuild 612 BLAKE2B bc9ad3416a7b2ad64f5bda2427536939c8b61d7b64ce5bd5878cccaf3fd97633a15a305d2eae3fd26ca86fdc3fe05653e35d4d1f0dfe1e0977fc840a5fa26726 SHA512 f1d870471410c64541a639bf2013b5640304718a66aed9b3e7234898cc08773f5e28a25e0f9c58618d7699cc6e55053b1731042709a92db1b4a69b0882885530
+EBUILD pwgen-2.08-r1.ebuild 605 BLAKE2B dfe73f7019eced27b88b3b6af4f4a15436ca0b56bfe7ab3079b9aae6d98a9bafb55ed6db73cf9bdf0db0345cebd83705826ca44d0a8f196a3b457b18dfd05602 SHA512 ce2bd5050c8baa2f96e0f3d0051bf216102c03c9f2342cd045041d77c2b627fc9a8fa7132393c4380b9bf7399d5aeceb0ed6670aa9f407a3c7a701ade6605055
 EBUILD pwgen-2.08.ebuild 597 BLAKE2B 3ddd679af075d48ad52db3c370fc3dbe33cc45f5d315bc803ad860c921ef231d7279e399d257b391baea63d0351cb787d2ee5ba5c6ae55b85d90c184be521431 SHA512 d9edc8ecc0873444a53632d1faf7cda6e72661f91a8eedbda33253a172cb0f180548664d3e236a82c302cae6317c7f081ad81fa42a91fdc6bb684bd6e583ce5a
 MISC metadata.xml 801 BLAKE2B dd9ac9712fcbfc2a681587ca84aa40ac7e2c96474dd6b89ba4f16b40be44c7ea441bf44dd4008397aa99ad08ae2ab07a535ce5375940b6f3991dc6e8e9f5f75a SHA512 15ab62126db1bb0211d39963ff8102e31cfb8791a496c660d6a63666c0c440ab1d6f04ad490e0455aa39f9c69bb69035e0c33c02107b9940e45a0a788b2f9ce9
--- a/app-admin/pwgen/pwgen-2.08-r1.ebuild
+++ b/app-admin/pwgen/pwgen-2.08-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="livecd"

 src_configure() {
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -23,5 +23,5 @@ EBUILD rsyslog-8.2110.0-r1.ebuild 12990 BLAKE2B 556a0641ea0dc1bf634a3e2eb67bf4ad
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
 EBUILD rsyslog-8.2204.0-r1.ebuild 12922 BLAKE2B 7190afdac273d3d1be851dafb59e4a0dcebe368eff979340cd48b177ad8d896467b84b6ec33aa3e20c1310af2242b6b00d5bf2f66f5a3a20e4017486a136ff9e SHA512 730f72c6bc668aa550851dac2e7954cc35e21180adf212cdc5cbbabe367093f15e5946985ed8ad98dea456c708314eac8b966108411e99905359813129543511
 EBUILD rsyslog-8.2206.0.ebuild 12923 BLAKE2B c11a103ea1cd9f10a1ec0cc55dca9fbcfe4eff0712e4e9fddb2a9f3f513b10d39352c1b72e051f91579dd7d59627f10b59fc4cc2f529e04772d19afd633b0ea8 SHA512 8c4bde5bbf9ac2097cd7a1071d4397a5a1e68b88fd1fabca30347b5e0feae50592554c6c54cd25daedee370fdf56e862401422ba42cd1b3bf94610535a6f3b8d
-EBUILD rsyslog-8.2208.0.ebuild 13008 BLAKE2B f503fbad2ab404cab93e957078eb8f00c63c35ccd44fa4e4beb5ee61fb5648e7df6f6a2c47a187b44c4673c4dbc07958fba28e81ee6a65e8c9dd96a561d32d7e SHA512 bd8ef69ecc3c3bf12c01e42b591afcef75073d8204bf3c0f33b8f7f3e7aeca308d497958da3469865ad6c7a597420079f9219edfa836a9aaf99118dfe0d511b7
+EBUILD rsyslog-8.2208.0.ebuild 13015 BLAKE2B a6737af28ffcbe3033efb4cc59ac89b77734c74bfa97bf6a4497efe4561be79d36c3145d9fb6215754b251bb76d774c01aa49d1af6c33bd6edb76c0bbe39e06d SHA512 dd2c7daf41aff6902d8fb4a05d34b7fe4a1a89874e41a2241a501804fe3396eeb5e0523dca7de800b23dab3735529c225c5578866c9d08b76b1fe28f12f97e51
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
--- a/app-admin/rsyslog/rsyslog-8.2208.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2208.0.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then

 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"

 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@ -1,4 +1,4 @@
 AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
-EBUILD alien-8.95-r2.ebuild 637 BLAKE2B b453d9c09e96bebf790197d839d3c10b5b34d14042e7156086137399710a2ea3ee86f62cb1520e489e3f805271bede70976eaba64e2619aed88cfd216b24234f SHA512 aa316887c5f44e4fb12de1cc46dfe1a174ecdebca122e7aa3c5aee381c98b4e9b0925df4c4f255c901dd411bf47c09d4a868d380f0a71b0437ba31b6a93a2557
+EBUILD alien-8.95-r2.ebuild 644 BLAKE2B f561334d659dcb77306df0dd6d0fdc4821c6feb2bb7e74662ec7226bfb4d9fce94d86e26f4b0e617306558e80373f975858db0e590ffff4a19184bdb85e1dd6f SHA512 2c2356fd40f5555addd43e93ba5a1f34e9c32bced938ae95e53ed59a532941b2d14d2dbd0dca018e2ca98b9c51468385d527d545ae8f671e6be81cb88c67ff30
 MISC metadata.xml 377 BLAKE2B f1fe8bdabc2983493e25a54b9d414e1452ea6b433cea8eba2663c86edd35f4c1c97b48d997a271e6291610e6e69c24d0ac873839c3e672dd2df274d2d4cf9506 SHA512 244e58580d59f2d089190d950de8c803c2b883a0b88eb8e70ec1ab3dd30647f1b8a3853f5d0f93f86ba18a2ce5b50ef97164da55a24ee9a8e8826299c26a5897
--- a/app-arch/alien/alien-8.95-r2.ebuild
+++ b/app-arch/alien/alien-8.95-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="+bzip2"

 RDEPEND="
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@ -3,5 +3,5 @@ AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685
 AUX arc-5.21o-interix.patch 216 BLAKE2B 650a4b2bc908c8c09f9d325a5d43c580de42b3209642042729e7895608d6d38f0f807d0de8173ece6fbbbdaadc70a6601b3f2797753401a4aee82c860fa5d287 SHA512 c6c01f2c6a91807f71825c07bc27d7223870e4b29fa59233edb0c40e6e8cb549fd796d7c2bdf53d7a595c60f04ee2762b9fac3eeec5b640f4f9045897a402ed2
 AUX arc-5.21p-fno-common.patch 934 BLAKE2B dc9c058a2e0053dacae271c599333cf02a262857c619c214c02e4c189a2e5f7491cea04f67950c16f840bbbb94149a15aa5417e33ab698dd983c9dc10ab349da SHA512 4f79298bc9ccc8ebf8cff50ef5d943841afb3d1281bf35581f1fe0bdf512bd8ac7edf04a0149d9d30df8a2c02e45828c38f2f97d5a918de9e6f1a1f50f245058
 DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
-EBUILD arc-5.21p.ebuild 870 BLAKE2B e8098d98d354e592fefb616ec49b6d8366787587130c6060457a64b5038a64c84736f667f8c998651d0ded3c8675fdfac4f78f14b747fb5da3b1483baf349016 SHA512 72ef8104d3465406f231d62c05650585cae96ca630729f8ddf31599604b147fbe023e9573eb418793e6c3d21a602a6e63d5391eab54dd57aebc056d0e10ff25d
+EBUILD arc-5.21p.ebuild 877 BLAKE2B 972b06941787200e3822603d861b786dfff5eb15c30f41e9ecce9d5968c59dfba4f3d1d52a7c65c985b6e3ca546dfa7cc5d570bac82602e0415f7766f3ce193f SHA512 39b6301c9aaf8bb2b88145aebb4bda1b83713f36eeb3d4f8445ceb4c4d0309666f67d59ac81817cd03eabbbcd555263723a5ead64c9cff702e87bc4683361430
 MISC metadata.xml 246 BLAKE2B df27ac714b4e0372fc1c80a0c1fa1ebc69d5317b24a065765e2ce9096d170255e82650d14e93fd7a314c62cb86b60ca832c4a6dddea1bd452a83a786784da717 SHA512 ba7d31c6594e588d7ff707efa455755f1eb5bdbfccb4312368f5eb43b475c9ec422a580196ba61e0ad8504bf48979bc1277988b1c5fe84b880845e17f53eac89
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"

 PATCHES=(
 	"${FILESDIR}"/${PN}-5.21m-darwin.patch
--- a/app-arch/atool/Manifest
+++ b/app-arch/atool/Manifest
@ -1,4 +1,4 @@
 AUX atool-0.39.0-configure-bashism.patch 365 BLAKE2B 677ab0da286c462adf41b8b58d007dee8e3fe874a7ff34a652e1c16160186c9e633d77901d943f18edaec23ec92356c4b09eca41f0e0d7eb9f92055e580d3400 SHA512 f99d333339f605a3c6f0373984b107925b764ff6843d2b8b9c96e50bb3b368812acaf9a56d1f3db2dcdfff0b3ba2d9a9301312d3e4dd0a2dc3ffec3086b1b9e0
 DIST atool-0.39.0.tar.gz 119307 BLAKE2B 770da3764a75d29472ce052c568ff534b88a394ef022c91678693e2eeaad1613343dcbda907346e2ac83eb4e6c164bc8e7a07b3edbad919e7cacb3846221eb90 SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3
-EBUILD atool-0.39.0-r1.ebuild 562 BLAKE2B f0b74c192049c117224667c1731b33842c1218d51cd32d9a28ca9f777c5738fe2ddff2b149837307c291e46caa5fa35f7170856f99145813105a6e4692c1d480 SHA512 654849d6ec65eb78bd9962123a8f67675009379f1593f2d79cab7e373c533727edc724a3352d5aa28deeadd8e5ba7dce6fc2bee22f73f8b3f26b4f877dd429a0
+EBUILD atool-0.39.0-r1.ebuild 569 BLAKE2B 446e7a8a193169f4c03ce032bd04b3a17341b40f9934b11f1f3374a588f536beaef6f4bc544cfa1018e41eece3a6c78367658373f9a446c87db965c487b8cee4 SHA512 372ee32965984c9dbdbab6bf0617ca959c96970bde3f4b80e2e147a7487fc9758e0bd2874b7dcd0a9f0654038d3f69653c2370e8df35fa4c8d79b3a64dfe057c
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
--- a/app-arch/atool/atool-0.39.0-r1.ebuild
+++ b/app-arch/atool/atool-0.39.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"

 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@ -4,5 +4,5 @@ AUX dpkg-1.20.5-dpkg_buildpackage-test.patch 209 BLAKE2B d15000423abe8259e7bdd92
 DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
 DIST dpkg_1.21.1.tar.xz 4986936 BLAKE2B f5b0f9fe7ac5fe7ba47191a9e467356e748418846ce0fc9f3c61d731e035eb096932848b15e6a85a15938d3bbd6fa069c786ab0e89c77119958fe632a91c309f SHA512 3f3f263e1300f3e4b55e84521847703dcfe465aa54829a69c31c174a2ad5e8b6a8a251da7c6020d31a38e9e6744113924a71e9579469e32289328e91a48db07f
 EBUILD dpkg-1.20.9.ebuild 1999 BLAKE2B 8c4eb6fde703797505d357ae6ba5f70ca15a514f60699a25eccc2896aad1daa10662da0f80ff1ef0ea6d94ca0381280f3c57f38df4340ac86098c65a91043313 SHA512 b50c6ac21dc86e8ca91d6cfd87855935c6aaa3ece8bc6cca6ebd53b46b7fa54e5b39b24edf8d81c6dac423c531b13379e17fda0d8946f4248b518a13c613eccd
-EBUILD dpkg-1.21.1.ebuild 1983 BLAKE2B 4d398a338bdf3af6ae3fa3d88af680363d72cb670b1b40e637e877e23c4caeb3c25cee5d7ecf432d622e17c3d11914289cc989d94e8302a5b716ee3e3099efdf SHA512 13aa5c69e986c6302e46f05d2080d773f4264387bcdc1b855bfbb38901af56a44b2d119fb3bf8efec32b3c035a9e4134d4f0c16231ed29260ba5cbeab9ed10ce
+EBUILD dpkg-1.21.1.ebuild 1990 BLAKE2B 3aff143bc3013658754a67e43ca6f9aacd43372cf32ac3821321c1ff454d30a08c62edafc9eafd6444de9c39d082f625fc73df86c89ef142ec5b7d8535ace1b4 SHA512 c47497584a0ab84311361eab048da24c23ba422478210f366e7f8a0f8223fb498e930fedaa0b72e4a0ef2062f67f338b681501c0eafa05d36be3759884f7579b
 MISC metadata.xml 433 BLAKE2B fe1e0ca0c96628891b711ca120d5c119f8effe66ce43198ebb2a16fce1cea23b7ab6ab88d807a71645298e2311bc3044dca4989fe83cf99e54a9e97f66835c69 SHA512 2882194685980d67acc10913c8863b55dc0a9215558db2e3cf33f0489d91e5477bf2ac0c0fc5b4a134f45593f6f5d3fde5e09493d20ca45224645b8c1c597fef
--- a/app-arch/dpkg/dpkg-1.21.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.21.1.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"

--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@ -2,5 +2,5 @@ AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b6
 AUX sharutils-4.15.2-gcc-10.patch 1048 BLAKE2B 4148ca1ffd1fd5469234a0af1efefa38f179a19527fc18b4df638d63a3d128f4f2f3934b94e3c862a515555199d16da4d59a508cc4aab1d097aa6e390967be2a SHA512 75fcd9ea81d1d8c63eee8525aac8eeeaa4c8caebf223670951489f0869dc50f0af84b647443df60927f184a89659c44c91c6f6a7ce12b874821037322ce079ae
 AUX sharutils-4.15.2-glibc228.patch 3807 BLAKE2B 644163c477f51b407211e8c9e6d3120ae38307753666fffb7aecbc758793b0b897920246b1f070e727e28728d76eb3283b80ababb881f39f909f9aa96b6e1ace SHA512 179272ae9b528719700bac5b06e4c70116d3d8a06973a69069617fc8dc0fa095227f7ab703b4c5b2beed649d5ffdc661d1d7ad7885185cb6ba6c62fce020e1cf
 DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
-EBUILD sharutils-4.15.2-r2.ebuild 1078 BLAKE2B 5e5de6f2c0fcfadb2a8d98f515b5715f1ab27fef9df42f60c516c1b80ac9fecb914d540afd0d2b375d9c9fd749be48ec3f01389a2d3e55f9b13d97ed2e649ac7 SHA512 9adbb1b1b47da119c7aba1d98f45bd80e7e847fddf58b7ba3db875c36af5b2d1096a2406bcf8f570d2e7c84bd8763e8e68e815a2bf3008a36d526e833d922420
+EBUILD sharutils-4.15.2-r2.ebuild 1085 BLAKE2B b43828b6a60f29bc159189d91164704757e5ebb44b6ba9fdae410ede3239f72980862e11ab5585e4661e61e7cbbc960a80f9bd0248e1a5e948f70fabe4e202c7 SHA512 532077ebbb097c87a9683fdbd7cf0e195329e00babb44552a06aa36049da14a0b830a031cf5e65e8696b36735975aad67e0918366d9da078a36b7bc25cea321b
 MISC metadata.xml 336 BLAKE2B 699d6360af88762e2cc3bdb5ccacb288fc8554a6aa6e4b23e859bddaac9c7e0bf9a6e579f592c526fd5dff3a91c406cece8a24ce151cca4217b194aa63950ae4 SHA512 3204f56ca18f6569bed0b607a352157fc966e014f743a5d4966bd986bff4352ef36da01b6c85ff7a1e9817878f154a5b6401f4481f0cf97ea7b3abc1434e9977
--- a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r2.ebuild
@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"

 DEPEND="app-arch/xz-utils
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@ -3,7 +3,10 @@ DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d933
 DIST xz-5.2.5.tar.gz.sig 566 BLAKE2B 8b40d8d7913eaebe2595ea41a735d972d1969d8b58f42b2bee6591b51e2e626473fc85d64f1bbbff3cba6b0e1b4423556d6ddaf16f646ccc18ba1bad5cf45d83 SHA512 3aa21484bef0282ed0b83e3fcd5cf3d87bf51fa68e24d55bb11f91bc96f0ac29f468949bc4c8cc20fbd6ad12f5735686fe09ee42efe2b8d728010da9668aa5a9
 DIST xz-5.2.6.tar.gz 2069602 BLAKE2B 3cc160dc76944ad2a181fbfb23ce386dbbd04e75bbeb0b159aaaf82e2e8157ea8b2bb80b216d79a7c25339bfbd13bd9d8c261789829cc7c3cb86fc893a7b4b94 SHA512 090958dd6c202c989746686094c86707ad4ae835026640080fc0a9d0fad699821b7d5cb3a67e6700661a0938818ba153662366f89ab8ec47e0bae4a3fe9b1961
 DIST xz-5.2.6.tar.gz.sig 566 BLAKE2B 7c6114d93b4e3c8553108da3985029fc4585bfea5d72fc5028024221e91cc43c3b6cd3b7d169e4c8afed445a6beef7c255ef8420c5266a22ee9449a57cacec5d SHA512 50a1ac0f8f87f8c04c25c69870ba054094abf20b668bdecd42ed247a2eff24b8e52178b6442da84c125a9401a6f98d40ca76b27453833a30807c83128ab70eee
+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.5-r2.ebuild 2980 BLAKE2B a84114ae0f3f8c76822059aed6880073befa57f27f2384410316063094da31372dbe7ef3c0086ac53ba678566d32b12421a8fa7702ebc30d65b519ffbf3d5732 SHA512 eeba7fd7474a0a868d3579fb472172834c9ccf8c7fcf33e47b6130526dc17cd53251864c19beb06bb4fa94cb8fb79958225e79957d5ec1bcea1a9594125c992b
 EBUILD xz-utils-5.2.6.ebuild 2959 BLAKE2B 79badd2e1bdc64213623152970dedad6c567a07d1a660935dfc93d72e2bc092077cea34ce77fe9b66e3587ce645dea53ef7e00532ea3b149a19df7b732d055fd SHA512 61181718d8c3f45179380e6055090e167ed86f67e4df33391f56f116025f347b4e75b0dd431633595264d8ec448d8033ddc75388270834c2690a6b4aca206fc2
+EBUILD xz-utils-5.3.3_alpha.ebuild 2989 BLAKE2B 230eedf551bdf5859ab6698e7aab2235cdaf3d334bde4d69ef22865b0c7121e59edfaaf095f60a3d567aa786d37909180fc6ace4a66822fa4e1feb0aa298181b SHA512 d4be8929d9c1479f7eb5d73dabd2831608cbcc8227669eb8c4cd453a5a83e7d9ff539db39be39b36c649db4e64ebc908a821f11671cc4e404e5a04f906f7a3e9
 EBUILD xz-utils-9999.ebuild 2959 BLAKE2B 79badd2e1bdc64213623152970dedad6c567a07d1a660935dfc93d72e2bc092077cea34ce77fe9b66e3587ce645dea53ef7e00532ea3b149a19df7b732d055fd SHA512 61181718d8c3f45179380e6055090e167ed86f67e4df33391f56f116025f347b4e75b0dd431633595264d8ec448d8033ddc75388270834c2690a6b4aca206fc2
 MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7
--- a/app-arch/xz-utils/xz-utils-5.3.3_alpha.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.3.3_alpha.ebuild
@ -0,0 +1,118 @@
+# 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
+
+QA_PKGCONFIG_VERSION=${PV/_/}
+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"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!<app-arch/p7zip-4.57
+	!<app-i18n/man-pages-de-2.16"
+DEPEND="${RDEPEND}"
+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-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@ -1,6 +1,8 @@
 DIST borgbackup-1.1.17.tar.gz 3781411 BLAKE2B 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 SHA512 6170680efcca35341031a8fcfd9434d2dca530bb6f7fcabbf452e6af6a8df5a825b4991d342f3c97bd7378d56b9ee86e6118f9281a31ba51235f49818852f4bb
 DIST borgbackup-1.2.1.tar.gz 4017050 BLAKE2B 2841f3c02b6af76aba61064513ebd9039367be868a5f0dad2e10cbf3243236a5d29609bee63b79056f2a553052d3dc415178dbabd5c1e5af9c43111286942869 SHA512 47e95960c9ce7715897834f400ee1a3dcbbbd9aa1e4b69dc93618ade24caf6c046b844c9f3edd10e090795d06bed0136fbd42d6e679f0639f221b83d82545d43
+DIST borgbackup-1.2.2.tar.gz 4042984 BLAKE2B c5c7bacd543e97af5bb1a42dd4a37900b9570328addd33e2ee83347ca631eaf172d8349b4a462bcc871da9f3c1b4e6efeb16da20893e8d58bb0655ed73ceea5b SHA512 9ba040dc659b123e09d1814ea158eb06bd802dbb4961e258910a586f88c5e92e8f32a72c1858f7a8d9d79c3e985b12cf0245436f46a474f627cfd70a59a7e29d
 EBUILD borgbackup-1.1.17-r1.ebuild 938 BLAKE2B 9e1165ef693d028e2936f22ba5bf0af42bbd7a83d1df32f667bd79269cea3d39ee90cbfe9b9718d8e650cb0ab33d6de5d909a78274897ca1ebefd918538db2eb SHA512 04fdb94a90a9a0bc36de20029c03d73625bae7f1ae099f96ce225e778cc60a00e60fea2ebe5cb40b35c2fb8af46fd0cade56a359e2a2d9eeef99e5581c560dd0
 EBUILD borgbackup-1.2.1-r2.ebuild 1124 BLAKE2B d49e5eff5669dff8eef72e21659a3a0926d683c65af581233bf53aedf57b3c5cba5972f97976ce806d993859439d916c01562f9229aef60b2e4d6a06daf873da SHA512 72f78973bcc85b372109b3c7fd45eb96d14cbccb083304e8f63b9a20c01557d8e3dee0f2dd5a526878ee399baee8e512e75628a971f2c52229fc220212d422d8
+EBUILD borgbackup-1.2.2.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
 EBUILD borgbackup-9999.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
 MISC metadata.xml 494 BLAKE2B 885fa002bca2ba16e31bc66dde9d21aea8eb5a3ab5522cab3e824a9cde1d87f8819eb028eb21a9382d23622fe0a699a481e7cb7cd50fba897e59490ba0734d39 SHA512 bddc0ca7934315439e4a23b43fbd42d538c1570b43b0401efa9641c2854e5633d727db4bda82a34fe88ad2c1b512df47b6654b50f85a0501f0ef8405d7f8a667
--- a/app-backup/borgbackup/borgbackup-1.2.2.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.2.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+# borgbackup is *very* picky about which msgpack it work with,
+# check setup.py on bumps.
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	virtual/acl
+	dev-python/pyfuse3[${PYTHON_USEDEP}]
+	~dev-python/msgpack-1.0.4[${PYTHON_USEDEP}]
+	dev-libs/openssl:0=
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@ -4,11 +4,13 @@ DIST btrbk-0.32.0.tar.xz 110408 BLAKE2B d9627d0f0a258bba9412b37707c3e79ca8a65870
 DIST btrbk-0.32.1.tar.xz 110364 BLAKE2B 5d2860e182701ba6c407b9d0f41e476442bdf0ebc8491c3fa944860228d087d6bbe13084a4e950a24fc6ea1e251e2c4c6cbf17e9e3a4cb4f3f9b7ea9b85b2c11 SHA512 a44c1a50696793661fa6a06fafc6a7682ba5db57b511666a9b77d2df79b724855e91187e4d13e1dfe340077f550b0aced8923c6dec955d25ce46f7644ed802f3
 DIST btrbk-0.32.2.tar.xz 111044 BLAKE2B f06e563d0a3f6a7096426b205c56446c8cba34767a0a2cd092f1d0d2661c1a38d88adfae0cd2046d2f43623fb236e9a2d7ef7281938a37b410f2cf842f5df83c SHA512 204bd48605b369909b1cb586bfa75dda5ee57b833c71a9d39699020f05f7305e2bc932c76face5aa0e435c1df46e13a566cbb2042c86975f6f8cd65c82ddcccf
 DIST btrbk-0.32.3.tar.xz 110724 BLAKE2B f0e389891bfdfa961187505548ec5139aa8967932d2fcca43c151c8ca25664c30af96f0f52531507e7c838ca3df16f371f7419df226283734fee23f6af56b3cf SHA512 8503ddb47a54b02abc03b160c296f9e5d2d71cc9705f4891f99732c36a62bb0bf81caa5cbe793d7e070c68ab461de995b442aa3a140d6aa68fe2a3b8a9cafb20
+DIST btrbk-0.32.4.tar.xz 110736 BLAKE2B e76a0b6ed8d54f97fa0ac2dad139891ae0f9450095e08d560f5a62ad28e3cc2e39da0a3a094ca841c5debbe9d34ca1cb3930cb3a16877b1547fb81f9c5e7e244 SHA512 495ec786c94f76c590f8e84cc9aa6be7b9a4807c11d501360bbdf171e0f0598fe6498b0d5b8aa8030af8d957aa8cebdff903876473f5111a9100032c16995373
 EBUILD btrbk-0.31.2.ebuild 2381 BLAKE2B dead45950b470fbd2303425a522186e5ac553711583ea1406112260a05484a7420884a3023dbc4314121f7ef28f4b473b78082a9a77ee9c6ab6c1afcb4a693e5 SHA512 6fb46ea01bb0f105ac50d28fb0c830b70934d8660ab24bc89c1f72eea2c5c1b6b150fab1eba9ade528a6e7b9cb514fe6f5255523ef455e23a634ae29a116c6f9
 EBUILD btrbk-0.31.3.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 EBUILD btrbk-0.32.0.ebuild 2385 BLAKE2B f1ce5388d83881455a946299992622f44ff958cd8ef57e6d8f0ead9c8e490b784b3ac02da587119cf6415feae772d5fa4c449c9d2ba218fb9c780e94f15e98cd SHA512 b1b25893f4ded6f719b36216006de236210a3ca1b39d5c6b7d2468d4ffcff867b590be40a2e47415fdf3672873321bcf06e4393a89cce44098f7a71f83cb7f97
 EBUILD btrbk-0.32.1.ebuild 2385 BLAKE2B f1ce5388d83881455a946299992622f44ff958cd8ef57e6d8f0ead9c8e490b784b3ac02da587119cf6415feae772d5fa4c449c9d2ba218fb9c780e94f15e98cd SHA512 b1b25893f4ded6f719b36216006de236210a3ca1b39d5c6b7d2468d4ffcff867b590be40a2e47415fdf3672873321bcf06e4393a89cce44098f7a71f83cb7f97
 EBUILD btrbk-0.32.2.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
 EBUILD btrbk-0.32.3.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
+EBUILD btrbk-0.32.4.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
 EBUILD btrbk-9999.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
 MISC metadata.xml 1064 BLAKE2B e3267b1898185ceaed7098002d2cf08b58c4a68bb60ab245bed3796551c070f84721fb009e5c0b28181103b531160a647948e3c10bfa0f0156eb397765c312f4 SHA512 f166f4be76557a8b398a47874410fd436ce17eea543ec6752aa64282d7b29afcce04e341e9884a3a1ed18ea48005069f83fb68bda2bb694d997851b6e138c353
--- a/app-backup/btrbk/btrbk-0.32.4.ebuild
+++ b/app-backup/btrbk/btrbk-0.32.4.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+mbuffer +doc +lsbtr"
+
+DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	mbuffer? ( >=sys-block/mbuffer-20180505 )
+	>=sys-fs/btrfs-progs-4.12"
+
+src_compile() {
+	emake clean
+	use doc && emake -C doc
+}
+src_install() {
+	local targets="install-bin install-etc install-share install-systemd"
+	use doc && targets="${targets} install-man install-doc"
+	use lsbtr && targets="${targets} install-bin-links"
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}" \
+		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
+		${targets}
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
+		upgrade_0_27_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
+		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
+		ewarn 'monthly/yearly backups could get deleted when upgrading to'
+		ewarn 'btrbk-0.27.0.'
+		ewarn ''
+		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
+		ewarn 'or systemd timers calling btrbk.'
+		ewarn ''
+		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
+		ewarn 'check if any snapshots/backups would get deleted. If you want to'
+		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
+		ewarn ''
+		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
+		ewarn ''
+		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
+		ewarn '(".keep_forever" suffix in the example above).'
+		ewarn ''
+		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
+		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
+	fi
+}
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@ -1,3 +1,5 @@
 DIST dolphin-plugins-22.04.3.tar.xz 257356 BLAKE2B e3d084e628920a08c9e1173c754002f6b0ecfad07bd4d89a64f5b29a7e93362a814ead6aeff80412b01e7198adce78c36f36428560a1ea9e555027113f7d8e6f SHA512 1b96511fbf8ec93b03a5f204c2e4cff232ca0d09e4d1599c89d4d514deb3fb889dfd3050a5cabe4e35b6e65a5283ad09635a13931c8484eebc98a22ba9057b42
+DIST dolphin-plugins-22.08.0.tar.xz 257872 BLAKE2B 9108b5ac5051b822d8fedac83dab967bd2a344f7d8d3ca8da9a544e40a186ae65a2f6470efce1fe091111392b7a998a8912842c0c31caf64a3e23b7e629ba184 SHA512 047997fa948d4a335495723946855964f6a652f9acf3ffd6f08f78dbfcb8c96a127861164f04f15de963e00295af226041ced7cdb25bd982a6a9f87c7c600855
 EBUILD dolphin-plugins-mountiso-22.04.3.ebuild 1501 BLAKE2B feb1c5d9b6fef64ce4823b82e4737116415df23190a74479ddb02892a32bcaf57801aaf3da1535f97845b7254c38e5719320024ecb514abed30cfe24e3651a40 SHA512 6b533059b383784ea61f667d90fe78b0491a504a77c945aaba3a096fd6f459d617530a51ccdadce44d637c9dcbca818abbf0d10831f7c7accdb0599e92c4cd9f
+EBUILD dolphin-plugins-mountiso-22.08.0.ebuild 1504 BLAKE2B 09e38970395842613544c0ff6bbf04993094e4f7f0d0e0643380c92774368ec32cc2edd56801240f62debdfea2948bb3d8263ad6178afc939a37a9148571dcf1 SHA512 9f624d5be0e0596d68d9b75d513af498d70826a3f6823df1df96805fc9a384d6f1ae6d8ebf700f2ce91e0658bda27e3637d929442170c396461475fecf4c2b84
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.08.0.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-22.08.0.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="false"
+KDE_ORG_CATEGORY="sdk"
+KDE_ORG_NAME="dolphin-plugins"
+MY_PLUGIN_NAME="mountiso"
+KFMIN=5.96.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
+HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/dolphin-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	ecm_punt_qt_module Network
+	ecm_punt_kf_module XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_svn=OFF
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@ -1,6 +1,8 @@
 AUX 00_gentoo.sh 115 BLAKE2B f24fe757e45d9af58adb9417ef6dbd36c5db85bdc50af1403048a01625dac68e649fee2913ed2c9f199ec285666cb4b9100650b3b1b54929005260c2182adb49 SHA512 2092f8bffbc6b34fa806276194873fed42146d8c8a434bb68088e03ec9eb0a2e0c1862a9ade67d56a6bd553119cd00f8815353b71345e451039254708430e52b
 AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2c3b647a642bfca14f6b05161d13266983bf5672787c7fc5c44e55d953ebebf346259 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6
+AUX cron-r1 72 BLAKE2B dcdbf92a1c0bc66684df095c4bff4e2688550e89368af18d6e84732e3f8e8d62d0ddc3ee1a231122a2758d94d72e1c5e41d4fdde5f5287332b7f8f34b0b18d39 SHA512 bb81518b8de629340dc00e4f4d0b73eba7f322aa9e7f7b8d43ab653991dffa8e417ad058522b49b9bbcb5e8a92359f6d27175893a00134ba90729069b26d54b1
 AUX dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch 1179 BLAKE2B d4925675e868e24e2bd38aa0444e9b934e351fb706be5b66e71315d213186719260c20ebb976c160b1458eed1f14416ed6d27dad79a6b39b08cca50285802cb9 SHA512 2f18fa75ea6674b9b8746645395317046012f01032e35736580d87ac9a410ec4641e81c5f307d31bb238a53886b30820cde778bf83e3d04083ae1b6323777307
 DIST dehydrated-0.7.0.tar.gz 86574 BLAKE2B 35a3b0b7592126ca65003a6c9eb8934a76584710d028057e5add7f77bb2fa3799e89a060306da3b98a62d291229a2a78f23e0f95f19e033796aee31e97b94488 SHA512 47740d2d31ca73482a4fc5ed0dfce986af907dd5449cb3a5230bf9683845686c8122fc32e6219a4439574ef11d6fb104ee09591c5ff667927a2c9c13ba005511
+EBUILD dehydrated-0.7.0-r1.ebuild 1272 BLAKE2B 7dc51c40c5afe3dc5bfce788030c6498ac05a559606b214bd99458788f0bdfc765517bb415680cb1620e758fb0a96b1e2bf8e464079b77a514ba18a9f281cfe8 SHA512 749e99b41529a81df1e80b06615033d0b0eb8ed553940da9e1ed1c40c76b64b4f6522da71b36ae3fc891e955ea4d2c6796f71638eb275e28473448e8113ca63c
 EBUILD dehydrated-0.7.0.ebuild 1269 BLAKE2B 466d00372626e0daa4df3df82e2dd18845a2f5358cdd24a5f2fc23efbaf82a43fb50a378bd75cdb99a5ec08f1d87bf2e5fa549c476fd535616e614def2263247 SHA512 91d218b7e5515c5567200f0e13003197ac9838797464ea7559e7d166795a425d0f2cc7d300a3316ea36ded3c37cc4fe1543cce0b75c50279ed0d34995e4b820a
 MISC metadata.xml 444 BLAKE2B 05cdd8b05987524fd177cb35227291039e57b4272498ecadabb6f0497d4695e752eb68f764790504d79e1b3e5b9e63fd24af331df161fdad41e130ea168be317 SHA512 e265142fd3a2a11ccadc497e1dc400d81e2b3f04c0f42c5fb9f00c1b2c1cd298f917b5185a3fd0aac2a608a1905984f31fbf2ab52b25b20258f5324fd5aa3d24
--- a/app-crypt/dehydrated/dehydrated-0.7.0-r1.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.7.0-r1.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="A client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+IUSE="+cron"
+
+RDEPEND="acct-group/dehydrated
+	acct-user/dehydrated
+	app-shells/bash
+	net-misc/curl
+	cron? ( virtual/cron )"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-CN-extraction-for-older-openssl-versions.patch )
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/${PN}
+	doins docs/examples/{config,domains.txt,hook.sh}
+	fperms u+x /etc/${PN}/hook.sh
+	dodoc docs/*.md
+
+	insinto /etc/${PN}/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	if use cron ; then
+		insinto /etc/cron.d
+		newins "${FILESDIR}"/cron-r1 ${PN}
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		einfo "See /etc/dehydrated/config for configuration."
+
+		use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+	fi
+}
--- a/app-crypt/dehydrated/files/cron-r1
+++ b/app-crypt/dehydrated/files/cron-r1
@ -0,0 +1,2 @@
+# dehydrated cron job
+#27 2 * * * dehydrated /usr/bin/dehydrated --cron
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@ -9,6 +9,6 @@ DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b
 EBUILD gvim-8.2.4586.ebuild 10692 BLAKE2B 6cfe421fbb3cd2ea0132f8d1b2f6bcccdf575eb6527dc056c8a35549ed4bcdb06056188c383186d0a41bf375dab44cc35f9ee97f156b1ac4fa245a54c892a60f SHA512 6e134cdca1e03729cfc4400850ce8c74ad3bc9ccb08f8afaf48f7998fe238098993c6f18fe26e553d0930c4507e5ad6f3c52df1b17e580f24a7c59df698ca767
 EBUILD gvim-8.2.5066.ebuild 10752 BLAKE2B 03bffa111a79f704377ca932f852a887244f2d0177a159cafc03d77fc0c687e513555d0d88b041f27a8fafb612bdf54bdf7730b84f93d0f3e12f7b4a94091e8e SHA512 1b5185359767eb6a792fd68ebe3ab37ba7a9a681a19811259f0058078fd81e44a056ab23b1768d48a2a43ebd3438fa223e8505a682480ee98842824b1f60ba99
 EBUILD gvim-9.0.0049.ebuild 10603 BLAKE2B d49a0bf661f62bb0748bdcdca8491e93dfa0f5e860279109a693cad52c4e58145cf20d1156adfe975d45778a36bbbf9dc3cf636437ee662345efe835ee155742 SHA512 770deaed448b51e6c4a19cdfd9c07f2514fbaa23254cdcb3fbbb9d2c2eb5466ac117579f21d2cc362036c51af41e61ad28c93f962ecb3ef1c8c037f49ca0f6c2
-EBUILD gvim-9.0.0099.ebuild 9872 BLAKE2B 4a4b96aa0a8264367717ec6cd8b3035d9ae3df7510ff0efbfeee59b9d8f49144456992c4e65ded2c7e1653f6ef7c5679c57674aad0f308b968e20b60f501c22f SHA512 94d9e81a9046daa3fcea6c53862a37841ebbfa7b1704fb376db3e9b8e63af21564e1a6837506691da8c57273523eee01ee2557e06022e6a4bf6edb2955c9c488
+EBUILD gvim-9.0.0099.ebuild 10084 BLAKE2B 7258a09cd50dab5137fe3c67167907954f161ddddfa8565ad1288955662358cd437f096a715e001fdbe540b297b61c57cf2e6677fb123d91da160aeee46bd64e SHA512 ee59efb9193ae2af7252e50e2c3663765ff34fb62121459b7a382f73ee0b54387c7cdd73e0783bb0db9858a514bb761262958c8ae7337f9743938beffa9e560e
 EBUILD gvim-9999.ebuild 9879 BLAKE2B 3458c0050993bdcc8f45161b51e09607da93fe58977f508608e94a050f9f5f32abaaf0ae9d678cea8828ca53e38df802a1feb0ab0bba66494c9cffa957969606 SHA512 b75b0b4c62cf08055e88e545f611ef0853d95fc0976ac951155bd1d8c61915ccf27e62f39ab3007e054960e5eb72a4c308cf8603d9894dde8a619fc658feb163
 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
--- a/app-editors/gvim/gvim-9.0.0099.ebuild
+++ b/app-editors/gvim/gvim-9.0.0099.ebuild
@ -247,6 +247,14 @@ src_configure() {
 		export ac_cv_func_sigaction=no
 	fi

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--with-vim-name=gvim \
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@ -1,6 +1,6 @@
 DIST ReText-7.2.2.tar.gz 522652 BLAKE2B f9b19f985c1381eade324758c4dc6bf2e5f74bc3f5bfc27afa10462b7387f64a3e72edd5875aabf1831f1f0a942f395e43b124c172cac8cec4b9f19334661484 SHA512 68345b57b2c5446158ed3a6f97b5ead103ef1c99a3aea9cbc69ef7d0807fb64546f38ebde2969b94429eeed6450abb345fecc566dcf6e0767fe84c4e27348e53
 DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da
 EBUILD retext-7.2.2.ebuild 1976 BLAKE2B e50052619b4664d384b13993041fa78b0eeca5f2fc084662c42f3912249863c5e079a8d4041f4f44e4913d1b9c2f06653d589600837cb934c116529fa562c58c SHA512 df0c32f8d6afcef5207ce9edba6ad2008078f1556f370d7708e41980f00dddd148aa867747b632bf96cb9494521474a6639d708570c269faa0379423e6846dc4
-EBUILD retext-7.2.3.ebuild 2021 BLAKE2B 353e22f58be9fa226ddf1d4c3e37698e08b21fecfb49c56ed21c44100a898a7d055400d7d4bd514756b5a25ddee9ec860a88bcf887759c28d270f08170d9cd2f SHA512 cbfe7cc9d5f167677155db5e4366ebe0b5763e4dcc0826fbc158bbb5a108a9d73285fb19bcf847677eaff076195939d7ba1ccbbdc1e40f3955e9158ef6a51e38
+EBUILD retext-7.2.3.ebuild 2020 BLAKE2B ae8a0a904936fc59cc95e3432a24d2a391157a19eeefebc905d53ed00dc93779e960ef8086e617d8f7c428a5b6730a441045f77612a6de89638a5f177cbad199 SHA512 32857cd0cac5560fcc601b15f90ce32e803a95bd4fb949c69a411417b3c484c597d686f9c0b7d68dc4486d40bb4ae6eb63ce97266ed1aa8d00ddedf5a7393733
 EBUILD retext-9999.ebuild 2022 BLAKE2B 47b58eb7b230911f3daa28ad9240a750aef63710560eaf6ef4dd9c3f3f0cea01d9a5f62ae745cd4d36564e3ef0ddd3d9ebe071ada2ef52f5759cb424b5fe9c97 SHA512 e1043f16a139a9eaf93b32fcf08538a2280a7091b91dabbe76b944382bf5006f09befdf8655f7d58871073ddb28b763ac789319b42e7d4f18ed4469be222718a
 MISC metadata.xml 298 BLAKE2B 82f3b1a76b71a731c76a61612a0e3a31634b08ab73d1ff9d57c9c68fdd68b0acf9387a5024772c9fe80d4f54d2134c591b17bc4c519d06b50491671042f4c635 SHA512 5e439ee1dae76ef108f8a5f28a5e4305181eacab14c9b239d5f3d4a6b25a25a59617eaa5d2df13b5fba8362d6b8f3af43af8fa9df22715867e170d29cf649c5c
--- a/app-editors/retext/retext-7.2.3.ebuild
+++ b/app-editors/retext/retext-7.2.3.ebuild
@ -23,7 +23,7 @@ else
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"

-	KEYWORDS="amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi

 LICENSE="GPL-2+"
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@ -1,5 +1,7 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
 DIST vile-9.8v.tgz 2405398 BLAKE2B cd8753c57ff95c9b420026128fd19b7c689c99500da7cae91d3160dded46aa101b0cae32daeaf0377d4d72a5e526e8e4f25422bbbff2cc5ecdef10b7f04c8b39 SHA512 b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2
+DIST vile-9.8w.tgz 2407322 BLAKE2B 824142c2d081db7c74ab4ce36db63e2d26e82954b32d274477f920b3519c75a249745365f7fb4f117f613c04fddd468394b4636d5f84d9f024eee3cb9c8332ba SHA512 54a96b400f479c633b917691fdab5ec5098ff1d6a6f5390c085635b4449ee7f02988e52c6b442918917455d02d5d74781ed57e4f944422576cf6532caaa446af
 EBUILD vile-9.8t-r2.ebuild 950 BLAKE2B 5d082c434b62bab766ee593d91ba0ce24e7752aef614200961574124805d762b40f6ccba501146a761a5c51f76af02604bbec7e8d9d28b63c6d71d18f82350ba SHA512 96666520c3e73d5af37a75cd448a49f87c17191746e89007e26605568b296c7b167b372f0d5545f7e9c6f23b436eae96a3f637e034c4ab1a485ec5f8e285dd9c
 EBUILD vile-9.8v.ebuild 1114 BLAKE2B 68a2af209f156fef9008379068fa5e8bfb606704ec0624a5367ead7c6a1c98faca8df7138d23f2d7e981487b3031e0894e39ab516e6352dcc2109e06525f503d SHA512 51183d1418065aa77c408cdfadbc3b42573a2ac093dde690256fd936e028fd121345e0482c27c39673eb4675423a9a7cc07ffed84868571d140b4124aac98730
+EBUILD vile-9.8w.ebuild 1114 BLAKE2B 68a2af209f156fef9008379068fa5e8bfb606704ec0624a5367ead7c6a1c98faca8df7138d23f2d7e981487b3031e0894e39ab516e6352dcc2109e06525f503d SHA512 51183d1418065aa77c408cdfadbc3b42573a2ac093dde690256fd936e028fd121345e0482c27c39673eb4675423a9a7cc07ffed84868571d140b4124aac98730
 MISC metadata.xml 414 BLAKE2B 93e7e4e15eed1c018ddb60017fb36c7c13fb0b1a5282da5b831c33de07ee9bb9d585ab98da43e6206b06eb309909a8cc52a1b1bdaa7c28b355dbb61c9e8add5e SHA512 e77d586873f04527576c5d4f2a967280708a77b68456188660bc25c57eb47502b3b111383e9c705aef1c2da58b4622b770916753e01caf9c94cb3b27002419ca
--- a/app-editors/vile/vile-9.8w.ebuild
+++ b/app-editors/vile/vile-9.8w.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with app-editors/xvile
+
+DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
+HOMEPAGE="https://invisible-island.net/vile/"
+SRC_URI="https://invisible-island.net/archives/vile/current/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="perl iconv"
+
+RDEPEND=">=sys-libs/ncurses-5.2:=
+	virtual/libcrypt:=
+	iconv? ( virtual/libiconv )
+	perl? ( dev-lang/perl:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex
+	virtual/pkgconfig"
+IDEPEND="app-eselect/eselect-vi"
+
+src_configure() {
+	econf \
+		--disable-stripping \
+		--with-ncurses \
+		--with-pkg-config \
+		$(use_with iconv) \
+		$(use_with perl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc CHANGES* README doc/*.doc
+	docinto html
+	dodoc doc/*.html
+}
+
+pkg_postinst() {
+	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
+	eselect vi update --if-unset
+}
+
+pkg_postrm() {
+	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
+	eselect vi update --if-unset
+}
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@ -12,6 +12,6 @@ DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b
 EBUILD vim-core-8.2.4586-r1.ebuild 6932 BLAKE2B c68dabf5622f757054b43501f5f01610a237736fb29d26c65f79e2e2edbb45e08651114c2f1563ac91e80d26edded1d33e139dfb9b31dca5a5550d8b14bb391b SHA512 ec8ec83e16c023db06a0f8e33e4cda656c10da8c475fc316f175c18dc26d70066e74e1e9dc9ed7ca68112ee6e82c7c3acdccbe50e7287cbcf23aa1ad1c410d67
 EBUILD vim-core-8.2.5066-r3.ebuild 7002 BLAKE2B 853cfa96f312cbabb2513f4dece34987af22d6ddcea6a41f47aa5ee37798dfd6c00dc97d26dc5729ee546dff2b287081ee885cfa6aa556f6c20962dfb4196210 SHA512 f21c04836f1664602c529c84507d24776b833baff0c224abf237b7a1505424a2ebf2d23dcd7cf56a4534204df85dd058271f0c2d0e89d6f3be0e83cb1c3a5b52
 EBUILD vim-core-9.0.0049-r2.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
-EBUILD vim-core-9.0.0099.ebuild 6990 BLAKE2B 886453393183dac68f063714f279cfdfe09e12f63a9ffdfec8c9f37639b74805e8eac08d71f103b9e9aa77dc889cded7ca63f36614d70c13e32aca6595893b32 SHA512 692cea9a03b9c0b840d3f18416ce72b2c6e2a890afe86d65084f9d917b534d638c98a76434ca95364b406eafab205059d97d7a6723f9de202ab870e902f0f5be
+EBUILD vim-core-9.0.0099.ebuild 7202 BLAKE2B 44899b3bd01f06331ea1e7896e0d3d24934c23daf2f3a488dd7342e485cbf2b08d85a229b094ce0262212f6bb6ad3eb2b4790907c76abdd3e93a0a948c04278e SHA512 29fba21130ab8e49914bfc48886534d28a142509c177dc01e76cf644224aacfcbc80f70fa8266aa0d4953240bd34024d22db99c99fb6b9cdc5e6319680ef020a
 EBUILD vim-core-9999.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
--- a/app-editors/vim-core/vim-core-9.0.0099.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0099.ebuild
@ -148,6 +148,14 @@ src_configure() {
 	# Keep Gentoo Prefix env contained within the EPREFIX
 	use prefix && myconf+=( --without-local-dir )

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf "${myconf[@]}"
 }

--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -10,6 +10,6 @@ DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b
 EBUILD vim-8.2.4586.ebuild 10091 BLAKE2B 9073b2cdbd5e910154e4f5ecf845d46b10407e1b363a05d98dd0e688071abfe5d67209efece7997f48197de5951f8a1369ca3b424cb44d69a1d532ff7167ee2b SHA512 3907db9b383f43378ce0c87c8abcbf64aa64212462be5873595a796a562af34e8875a5f38b9bc55363c94d0a9eae9ed9f58f386062ab2a73e1fa7dcee5479478
 EBUILD vim-8.2.5066-r1.ebuild 10420 BLAKE2B 04e5471f93e5883fb3d6a4177b1a09937ce247bf227c71f0056d912554aa64676e66e86aee044cd2f31c90b0544b1033988e159811b3188a41a05537084878f3 SHA512 78aaecc2b156e8fbe304a3d3af5bcbf4b5d8806b199d12221bf2203035cfbdb0d2c497f9c28ea7d2f5100c58f2d5e205c1bd2990aa4aeee955ba662d6c80f07e
 EBUILD vim-9.0.0049.ebuild 10353 BLAKE2B 7059398f1b56f583c33f7c21cb31f1945f8a142495797d1eadca674b7f334c97cea66314d353c0d73bca9059217053cb6c4db51bba5da3d4035c378cfd1cf9b9 SHA512 00e87fad939f0ffb63d278272558f149def771c4b6ed276cbaa38a79201cf7483b4b109a573b7b07fd5be8168da91845ea4375daeafe7182826cdd2e7ffea8db
-EBUILD vim-9.0.0099.ebuild 10476 BLAKE2B 705b086194c5700176fe2b2feba9da480754e268d7318c8f6ba91694e3ddc33e9ab61e741d18128ca37fffa172d22319f818612cdf686ce598d48cc0908cf2d4 SHA512 8365a8226c702d97f3160511424708cdc278ff5a058ba5d15d622e8f533aca9658fd05ae79d4026bf942ab2107d146432d73894b7a8faf026d6de956c8111e86
+EBUILD vim-9.0.0099.ebuild 10688 BLAKE2B a45df345dcbfc0040e4a3dc023b2ae87c1490e8c76e39ac8582723b3c14714968c4c950c05342cfbf523121b17049e088beba8af893b444f38ecc398f8bff6eb SHA512 9c3a488457b02de7168ebad38dccca9c3fe8ef7e57c79d57e7c83b304f30d2d8d77342f5fe1aa80814bd6c0cccbc863594901d7916e80c22f56d06cde7476320
 EBUILD vim-9999.ebuild 10411 BLAKE2B ff294afd79025204f7c827bfa4240ce6d419f45e17b476605af4e887294e3ce8ace027bcdccc117c1e2b95176deb2ac15705f160e23cfd9fbc0174684a6e96d6 SHA512 a3f9eda3ad0d62cc090d0e8a9c781977aeed9af7bfb41723919ddcc878b7d9113a45e732282714959fcc4c5d3a16624ea8d8d8b327e7bec596a1a61cee414b29
 MISC metadata.xml 891 BLAKE2B 00a55660fecbeca3df9b50e7400510fb92bbcdd42ba588725580c153d74a4731b31dd0ebaade4f60a4db88c695a7f60663773d63046c1b38aab0363520b8858d SHA512 76eebfe4d34eb609b29946b724ae450916eeab2573edf0f5aa87325f1e9abc8a2ca45d7abe3bfa9d996670d90e7cde17cb84662f69502a4b4a5b44b14b4c8890
--- a/app-editors/vim/vim-9.0.0099.ebuild
+++ b/app-editors/vim/vim-9.0.0099.ebuild
@ -247,6 +247,14 @@ src_configure() {
 	# keep prefix env contained within the EPREFIX
 	use prefix && myconf+=( --without-local-dir )

+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		"${myconf[@]}"
--- a/app-editors/xvile/Manifest
+++ b/app-editors/xvile/Manifest
@ -1,5 +1,7 @@
 DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
 DIST vile-9.8v.tgz 2405398 BLAKE2B cd8753c57ff95c9b420026128fd19b7c689c99500da7cae91d3160dded46aa101b0cae32daeaf0377d4d72a5e526e8e4f25422bbbff2cc5ecdef10b7f04c8b39 SHA512 b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2
+DIST vile-9.8w.tgz 2407322 BLAKE2B 824142c2d081db7c74ab4ce36db63e2d26e82954b32d274477f920b3519c75a249745365f7fb4f117f613c04fddd468394b4636d5f84d9f024eee3cb9c8332ba SHA512 54a96b400f479c633b917691fdab5ec5098ff1d6a6f5390c085635b4449ee7f02988e52c6b442918917455d02d5d74781ed57e4f944422576cf6532caaa446af
 EBUILD xvile-9.8t-r2.ebuild 891 BLAKE2B a76858f6c81c1071ffde27f70c634bfdda2700571cedd1b1a34480b03147fc2ca2e5f3bd1e5c13c83c74a1249592910643f9c90806f37ffb9db3bd32147fcdc0 SHA512 dc36fe03386f3f270152f671e68ade17c16d327a6ab558a44c706255be7fa7b12761d47df0d6be34082377865522d2795775a455e3f3b911756218db1eb03a46
 EBUILD xvile-9.8v.ebuild 1008 BLAKE2B d3e6e51e1436faf9dde210e90a96aaeec2270a97b5cc5913914397d594355654a0a62fb6c2ba82b67152d20e2cc139ff9c4f343bd4b276d44b79c460eed09c07 SHA512 017e1b87c2f1924d075e6baf0a04d56c27f154aea126b0081efcb0caff8dc80782002552c4a7497da093a3305c7626c98b268edae83a3197b84b102248972ae4
+EBUILD xvile-9.8w.ebuild 1008 BLAKE2B d3e6e51e1436faf9dde210e90a96aaeec2270a97b5cc5913914397d594355654a0a62fb6c2ba82b67152d20e2cc139ff9c4f343bd4b276d44b79c460eed09c07 SHA512 017e1b87c2f1924d075e6baf0a04d56c27f154aea126b0081efcb0caff8dc80782002552c4a7497da093a3305c7626c98b268edae83a3197b84b102248972ae4
 MISC metadata.xml 347 BLAKE2B 5546714e3c87c1f8380e655e16cf7915878127cbf23ba125010a023056f73e20acb3a268aec33c1829244b7d637f62c47003d98ce90ac127035853b8f2c68ca5 SHA512 a0f8b7dd3327440537748c2e2faaf268efd46b20cbddfb9cbb1ced71b04ed37fd7b65ab3d317d1bc260fdad7497f60e32d29d9313764cdb0896f7137c39fa2e5
--- a/app-editors/xvile/xvile-9.8w.ebuild
+++ b/app-editors/xvile/xvile-9.8w.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with app-editors/vile
+
+MY_P="${PN/x/}-${PV}"
+DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
+HOMEPAGE="https://invisible-island.net/vile/"
+SRC_URI="https://invisible-island.net/archives/vile/current/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86"
+IUSE="perl"
+
+RDEPEND="~app-editors/vile-${PV}
+	virtual/libcrypt:=
+	>=x11-libs/libX11-1.0.0
+	>=x11-libs/libXt-1.0.0
+	>=x11-libs/libICE-1.0.0
+	>=x11-libs/libSM-1.0.0
+	>=x11-libs/libXaw-1.0.1
+	>=x11-libs/libXpm-3.5.4.2
+	perl? ( dev-lang/perl:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	sys-devel/flex"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	econf \
+		--disable-stripping \
+		--with-ncurses \
+		--with-pkg-config \
+		--with-x \
+		$(use_with perl)
+}
+
+src_install() {
+	dobin xvile
+	dodoc CHANGES* README doc/*.doc
+	docinto html
+	dodoc doc/*.html
+}
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/geiser/Manifest
+++ b/app-emacs/geiser/Manifest
@ -1,4 +1,6 @@
 AUX 50geiser-gentoo.el 295 BLAKE2B 5dfbb043d11f242fae453719c85c7b5dd6abfa16e390de35c390d4dec9f80e512039e5d7dd6d79986df9e8d0822c12562d32001ad6bc6a33ab8c168299548044 SHA512 1a7ebc8f2b2e95ee5b1e7c81d498d6239fa88110165f54e6926bedcee4d1ba64c11e6946d8129d0a6958b0ecb280011af3c64c283279d183dc843b0328aa178c
 DIST geiser-0.23.2.tar.gz 653228 BLAKE2B ef0ce0a925a9d5df32a2b67b216dc46da535d68d70b706ffc9dd4d3bb01af879c9533337b2e8293c7bed8d3cdebeecd3f4443b3071f865cf1b7280347b202298 SHA512 dd6852d95296aaef44ad0e9a6723986372d58f9beab20bd45330aeffae590fbd5ea45822032fb9cc2712756e3b13ba5c829fbefeead4e5f41c94400bf059110e
+DIST geiser-0.25.1.tar.gz 652262 BLAKE2B 8c5a323bedd869c98bf500c861c7731a0b1dd9833f78bf348a2e29d26039c674a00b51529d77b56b213ccc1351b73388010847551b3cd829fb265cffb733864a SHA512 93a8d7e096a24759f5e8c9dbdd2d4ad31caf185c6a970ff1b4364c4492e5f2e0925cc59e97546f9c40dd5913fb2b38e7ade7599ef791c6e198ad0af966030f16
 EBUILD geiser-0.23.2.ebuild 834 BLAKE2B b90c8a5c14b9f2dd9f8f69e1c5a93fd7b365c526df5c092b8a3569495326bb93fd4021520626a55b8b84d56f790c80287609f4a6c3ef17253e61dffc86b75095 SHA512 9e9d190d12434c0a657261b3de77d74796d183002243762c1b4ab98a94374bce1abaa12ea4c89f508041c49afbf89f090d53766edd4fbc7200c33d5e349f88dc
+EBUILD geiser-0.25.1.ebuild 804 BLAKE2B 4a20fad9c4b842d3e314738bd8a2e8ed83881f8ad9bc9a41f65392af7aeee25598634dec6e03ea948f36de139777df25e30281837b42be40288979ee92006b10 SHA512 6f8db059104559efcc4e82a2785ea2922da8bcb9ced667d7d1dd7477d11db9974c12e9d562899d49afa3a41c590751c981989b2bd272476016e4d78f469ef905
 MISC metadata.xml 551 BLAKE2B 2aedbc78837b20f258a94790c4a84f8bfab77f4d71e65354ea6439122c4d84378776c7f9c9a7649c0aadc68df9f33eeca482712961eb8b3af0dffde4d1769ded SHA512 aa663549e7f0710b8629889dd57bb99cc2ec2f2ea93c86d6b75dd85fe4a8467abb4688b38a38b8051655fc0705b8f1e0a7c71c6159abc7170e0bb1b9a0c7c112
--- a/app-emacs/geiser/geiser-0.25.1.ebuild
+++ b/app-emacs/geiser/geiser-0.25.1.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Generic interaction mode between Emacs and different Scheme implementations"
+HOMEPAGE="https://gitlab.com/emacs-geiser/geiser/"
+SRC_URI="https://gitlab.com/emacs-geiser/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/transient"
+BDEPEND="
+	${RDEPEND}
+	app-text/texi2html
+	sys-apps/texinfo
+"
+
+DOCS=( readme.org news.org doc/html )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	BYTECOMPFLAGS="-L elisp" elisp-compile elisp/*.el
+
+	emake -C doc info web
+}
+
+src_install() {
+	elisp-install ${PN} elisp/*.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	doinfo doc/*.info
+	einstalldocs
+}
--- a/app-emacs/jq-mode/Manifest
+++ b/app-emacs/jq-mode/Manifest
@ -0,0 +1,4 @@
+AUX 50jq-mode-gentoo.el 161 BLAKE2B 9e19d27d960ac67dd09449270d4aecf6f51991be6b7c9f43bba1245745feef3ec8b10ca34f0de24d0c6c4436ae92c4c1c007c54344e128f19fa309ad6d934508 SHA512 4f8061ee39fb090f7fba459639008e3a3f96472151c6a2c91daaf95cbec64acab9929eb289c73dd232153946b5b751d671b01db7d59138483f59c141dc638f17
+DIST jq-mode-0.5.0_p20220610.tar.gz 18987 BLAKE2B 28ec0b7133de36d6422c60de8b0f7d75f71c1bcef959734f02914ac8dc2c822d1d616e6bc7007fd7ea86efd038b6411640cc4d558024b5000798afd1b49fd790 SHA512 10ad3fd0c02531171d95a6724a4e635b7e2b2b3e49f87ce0323ca7b67653c614ed5e3588216b1374d9e9c67cca5d64df91f44feef3532e5e1ada68050764a6a4
+EBUILD jq-mode-0.5.0_p20220610.ebuild 580 BLAKE2B bf58bf9c1a2ed22bf22b49e581e5adf1eb5df72c71575d6e66d9f8b6bfdb1a4d77046874dc64d72fb2c0ece4259b5d270a7232f9c52789fa5dacb10f14e19a0c SHA512 1629c7747c58e65fa11949bb4de501fa23501db881528836d4227d60707c5e9543392d591f84770322632902f28d16acffeec06813021d5020aff84865776105
+MISC metadata.xml 413 BLAKE2B 2ece6ba655bc5d5b1a8f7b5beab371662463c39565261f6dc7dab8fcf0ffa177d42eaf5f58952019cb44cd686318ee8230c7cb54df254a46631b6e8d008449ef SHA512 fdc9ad17e067d7d711351f472a4add20d16403c364c516f25de78b2b7b835d9f2215c1ef7cd79c1ebd26b640f7b901b43d645342cd952dd7ec0d694e63ce786a
--- a/app-emacs/jq-mode/files/50jq-mode-gentoo.el
+++ b/app-emacs/jq-mode/files/50jq-mode-gentoo.el
@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'jq-mode "jq-mode"
+  "Major mode for editing jq files" t)
+(add-to-list 'auto-mode-alist '("\\.jq\\'" . jq-mode))
--- a/app-emacs/jq-mode/jq-mode-0.5.0_p20220610.ebuild
+++ b/app-emacs/jq-mode/jq-mode-0.5.0_p20220610.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=071c1c29bac30351ad338136f2b625e5601365cd
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing jq queries"
+HOMEPAGE="https://github.com/ljos/jq-mode/"
+SRC_URI="https://github.com/ljos/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # tests fail, also they only test the ob integration
+
+RDEPEND="app-misc/jq"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/jq-mode/metadata.xml
+++ b/app-emacs/jq-mode/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/ljos/jq-mode/issues/</bugs-to>
+    <remote-id type="github">ljos/jq-mode</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-emacs/restclient/Manifest
+++ b/app-emacs/restclient/Manifest
@ -0,0 +1,4 @@
+AUX 50restclient-gentoo.el 183 BLAKE2B 0748b61a111491ee3b320d2d85f1d5970232c8a87f51af7ee5bebda186a0dac6176313bd086255048540a038bc8a56b3981227242584007e8b110d0cb5b0f94e SHA512 e2f481e3e93ddc434ac1ee9019cbb6d03b0a112dea5caaf41c10b2b174fa814d452a8ee16d1be55f584ec63f3addbd3999fbec122336f34930b313cb81fde735
+DIST restclient-0_p20220426.tar.gz 14762 BLAKE2B ff11d592cd81fa3bf59b577c18f2060a098a446ca1d103df746a1c1f46b4eb950cfad296cae2219c58bc59c52e287b7f7bc2d28264288cff8fdee5be0a2b868c SHA512 343e1b8761842b85e790a42367bc12e302ccbe2953fd0008c2a20d96444038fdabfdd0fca2e8b664c9d0e835ced252afa35ac67cfc992add47bec131c6badd1c
+EBUILD restclient-0_p20220426.ebuild 583 BLAKE2B 4216efa9c57244fd308259f8d5bbc8b730bd55a705bfcb9379382243602bf2dff35776f75f25ab1749491e5e0857a9a491e6118cf20665a9ee968db2cb7cab6d SHA512 24f90a6925b35117d7f8a2806133ae416b842b0e96e210a0d856d9c76fec441887fd0ff9c8f79894b46427abc98d93479747b0b830eb1a767bc8dc4de6c01c14
+MISC metadata.xml 657 BLAKE2B 8dd19b7dbc114935399302e6eaf7ff1ddc893dacf84dd7e93a827b5451263d9e06bcd068c4ef85fa1114a470387fc16ceb55a7437fcc0629f05c4e3f6accdefa SHA512 fb17a56cb944ee4f1c503b9eed55086e171fd31dbac36da95ce6559ac4ca50106287a49511d797f533c831eb12d60fdb0da09292716d21f76b5e67daf0fd0a8a
--- a/app-emacs/restclient/files/50restclient-gentoo.el
+++ b/app-emacs/restclient/files/50restclient-gentoo.el
@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'restclient-mode "restclient"
+  "Turn on restclient mode." t)
+(autoload 'helm-restclient "restclient-helm"
+  "Helm for Restclient." t)
--- a/app-emacs/restclient/metadata.xml
+++ b/app-emacs/restclient/metadata.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This is a tool to manually explore and test HTTP REST webservices. Runs
+    queries from a plain-text query sheet, displays results as a pretty-printed
+    XML, JSON and even images.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/pashky/restclient.el/issues/</bugs-to>
+    <remote-id type="github">pashky/restclient.el</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-emacs/restclient/restclient-0_p20220426.ebuild
+++ b/app-emacs/restclient/restclient-0_p20220426.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=ae79e7dd283890072da69b8f48aeec1afd0d9442
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="HTTP REST client tool for GNU Emacs"
+HOMEPAGE="https://github.com/pashky/restclient.el/"
+SRC_URI="https://github.com/pashky/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-emacs/helm
+	app-emacs/jq-mode
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md examples )
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@ -1,6 +1,8 @@
 DIST diskimage-builder-3.22.0.tar.gz 507997 BLAKE2B 559203fb5e92ff6b32e3cda6e977c46ea247f47f0d41d72db5f4e6fa6957c599814fa65f24b3d0783fbf95fa72efb52db2bfa30f608b08955bc64bc8c4943d59 SHA512 1a2c4f6301eb90268cc4cc47e600e2de404336f871606beaebadb367ab8976cf6618da3a9ed594682f53b84e70c2b658d519732031c9b3423a906876ba3b03a4
 DIST diskimage-builder-3.23.0.tar.gz 509773 BLAKE2B 5896571442b5e359cbae10df3c504c2a3df48ace6ec52294afbad6c03baf300336d955b0180a174395cad118da42dbacfb395df9b32a85976982ff5194ec9e18 SHA512 080bca891890a02a7a0c6910668ccc966a8f2282f62a8b89cd01d5165b4cb52e4bd198b7a2ff431d86a75acae86e7490389f7053f197947c820925d540a3c934
+DIST diskimage-builder-3.23.1.tar.gz 509516 BLAKE2B 05d0484b33bf965f6f534445a13be3771a486b586d36f13905d351e434a6d04732195b484ec29f5c5792e8343bbd56dffb7393641d3d2902e5bfadb2759d3a4b SHA512 0f881dba486f057e18ce81eeb3eca91fa421e6ad6fe59d5e7c4eda11721fde243e0e233863545d16010386defc23aebf195364615324296393a77bab1ce60359
 EBUILD diskimage-builder-3.22.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c
 EBUILD diskimage-builder-3.23.0.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
+EBUILD diskimage-builder-3.23.1.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
 EBUILD diskimage-builder-9999.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
 MISC metadata.xml 719 BLAKE2B 872a4d37e8ddb2a28eb85d18cd88990934327bc23194f3be9e5dea03627a6169987b246a93b50754cbe5e331f8c854a808bf307b70521c481d83b846f7385606 SHA512 d151fd95659211b2057ef0a61a6020e2f9efebebf3d7c5e1392ddb9954e3627e1040f2a9fe84ea4caeb65a745411fefebf2d896bbddbe0ddbb56acf42d2fedc3
--- a/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder"
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -20,10 +20,10 @@ DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92
 DIST VirtualBox-6.1.36.tar.bz2 165685382 BLAKE2B 98dbb06450b9df650cb72493bcdea4b88fa9dd21f76d723fdc0bb2c1ab8266f67e972a7222dc9b5bd0d43754911710664bddace753995be025cf6bcc05a24ae5 SHA512 cc3b984a7da40c9bf14831808a2bc2bf7bf6821e53c25fa11cb4b4275feb1d4b0cb4a47d8a360b90c89e5a4038481efe8fe28ee22996dbefb6446761e88a8dec
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
-EBUILD virtualbox-6.1.32-r2.ebuild 14607 BLAKE2B 864c1c66961c1b04296580e87e62ec5d18f556f71857d120ebb6db5ce4d33005ab9769f698a902b6fb1028702ae686380337aed2500dedbd5ec3dabec8ea82ca SHA512 a65ad608a408c1ba38f0ae11f91167f0376c0777483f0bd4dc882e2da9144f2ac48f6a4f225eb8bb67bb369df5be38ffaa694e4e0a028bccaf26f7c92e6df887
+EBUILD virtualbox-6.1.32-r3.ebuild 14683 BLAKE2B de3ccf98d3f66d8e0e5774e8c1c14dea44150767b0bbbd07cfb401bc7e77f0a0742bf0f305549090e567dd263ee5b1518b518cded46d4ac282cc20d0d9da109e SHA512 4fb28372e47f941254ea947347f1b9f15f23030a629aa7300375efcb516f936db713ebcc7e8a1ae697cccbbe8deab0823c4f2f69cc126917f617357004c6f708
 EBUILD virtualbox-6.1.34-r1.ebuild 13699 BLAKE2B 01a96acd3f1e734536372baa60f0adca25d0153e5c7dc986ac51fa1bbd67a4e3e6fbf71a0b5865a5ab92f236e598c86dd4755c72e1a83ee95a44f714d6e0c877 SHA512 d647990d450c92d8eba46250e7a9f058c1f887fd0b0bc9b6223197973561a60bbef6f7e8133352baae034ae4014040bd325747644bc2eec286e56f71363ccab3
 EBUILD virtualbox-6.1.34-r3.ebuild 14573 BLAKE2B 110221a46466f9f053b231424840c73a00b665ced4d597fa7807500d65e18b189a8b8336e827d3caf40af251c60ad8b379578a978b7f5cb3c3d81c0cb8ae4da4 SHA512 3bbfd336e3b6306b04137314df32767dead2ba4f1821f1213ea32e5b00ce80e5e4d83df5b2647d846d5f91f9ee1efd2678dd4bd1767adfc7edba2cee856ba0c5
-EBUILD virtualbox-6.1.34-r6.ebuild 17645 BLAKE2B 5c76995ef49c60af3dcba9442aa84e8033244d7bd8235327513347457273015faec675ab317139871fabf6b6eeb0956edfac899edd8647c8d06c0e328ae49594 SHA512 341406607d99696423881f88c885087e170130645d7151ef5b622c63c010d7da52bdaf4cf9945158b8f78bb3662ad078bbeaaa4683b760c2a11aec7311b30bfb
-EBUILD virtualbox-6.1.36-r1.ebuild 18027 BLAKE2B de8e5abac4857365383f2190f63d09f026bc631df70f3023c14165c961e498d6f908b8af57ce780f5967c2f1515232fffe2ba1754ef495348eeb46b05618afff SHA512 7316888f34eb3dada895214b193d6b98d22d1426cce967077846381a0384fa7b74b783407403642ca9f618ae01e03e29b59607c4e768b683aea285b403c0a239
-EBUILD virtualbox-6.1.36.ebuild 17819 BLAKE2B 839fd78c73e4e483036fa98010b9013ee3ba4aaada77301f213df40266db9df8b34ad69ba3ddbfe75a6b858c022da269ca30037afb94cb275898bf0974012639 SHA512 3cb3e5ec9b0e1f6a744079cb18401f73b51e62f1c82b88615c66d34ae56735713feb20afa6f64a8b2386c580c4bdcb45da2fc0637ccb18ad82ca81fb2e532022
+EBUILD virtualbox-6.1.34-r7.ebuild 17721 BLAKE2B 3ce2d1a5b9dc0f221d8d72ac7dbb56014bbc6ed40abfac3d2f72f03d475a62153e2f18be57e52b76196b87f6d0e36277d328f876ae7f9d1b3e5ab8d376d629d1 SHA512 917ea6bb8a4052d1be1b4b1d3516a4266fa4e3080ea410eeda7f0f3710707d4d6ec95e88bce7ad6e970af5711b467f51dc77fcb505476d0e446b7296c28763dc
+EBUILD virtualbox-6.1.36-r2.ebuild 18103 BLAKE2B f7ade966b4e5cb888614a7a6ed3f14d7ee0ae0c6a3175ab626e347f58feba7e2256146351d415516decd8e727900f5b3526fe969634056f19e864a34fe7a59bb SHA512 f3b466a3632555454a50308aa45d8a84a5feec5055768de9888b5a0fdd90533cb9e84efc363781ef32700feb7faba0cf108715e25f48ab8a9a102bdf9280bba3
+EBUILD virtualbox-6.1.36.ebuild 17895 BLAKE2B 0e39abc0e54b2b2cc0583c20dc80edcf9498f84137659857344fb94293ad963412a200c4af09d14222221bc8bfcfc2ee78e2e5918a83a2b06317942ebe3381d7 SHA512 d173fdc24864ee3a805b620342bd49b7023639387e8fef09824b9f63195093df9c1e26037397dcdb719c8ffecd0eab35a69bc999054cfbd6b59cbe9c71c5f1bc
 MISC metadata.xml 931 BLAKE2B bda8433410b0bf400bee4795ce53cd85554463417beec3d7f60fe5fe090317b2d75671a2c091718d4d57c5cc8c2961e0e93fbf9f6d70c652f812317ce4fc1b20 SHA512 0d7e309078a5b5c5cf891da6e8581fce8563e9014e822e9c99d6c7c62a88173b2536fe2554ea22f93965dfccd505543fe2022e6c064acc8d836ced0150fe491f
--- a/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.32-r2.ebuild
@ -1,514 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	!app-emulation/virtualbox-bin
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? (
-			media-libs/libglvnd[X]
-			virtual/glu
-		)
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		opengl? ( virtual/opengl )
-	)
-	pam? ( sys-libs/pam )
-	pax-kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jdk-1.8 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.6 )
-"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch ; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax-kernel
-	if use pax-kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${FILESDIR}/${PN}-6.1.26-configure-include-qt5-path.patch" #805365
-
-	eapply "${WORKDIR}/patches"
-
-	default
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	doecho ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		VBOX_WITH_VBOXIMGMOUNT=1 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
--- a/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.32-r3.ebuild
@ -0,0 +1,517 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}-${MY_PV}
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="amd64"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	!app-emulation/virtualbox-bin
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		sdl? ( media-libs/libsdl:0[X,video] )
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jdk-1.8 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.6 )
+"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch ; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	eapply "${FILESDIR}/${PN}-6.1.26-configure-include-qt5-path.patch" #805365
+
+	eapply "${WORKDIR}/patches"
+
+	default
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex sdl '' --disable-sdl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	doecho ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
+		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		VBOX_WITH_VBOXIMGMOUNT=1 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		if use sdl ; then
+			vbox_inst VBoxSDL 4750
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r6.ebuild
@ -1,633 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit desktop edo java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ ${PV} == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="amd64"
-fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	!app-emulation/virtualbox-bin
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? (
-			media-libs/libglvnd[X]
-			virtual/glu
-		)
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #832166.
-DEPEND="
-	${COMMON_DEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		opengl? ( virtual/opengl )
-	)
-	java? ( virtual/jdk:1.8 )
-	pam? ( sys-libs/pam )
-	pax-kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( virtual/jdk:1.8 )
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( virtual/jre:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-vboxr0.patch
-
-	# Upstream patch for USE=-pam
-	# bug #843437
-	"${FILESDIR}"/${PN}-6.1.34-no-pam.patch
-
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
-
-	# This patch is needed to avoid automagic detection based on a hardcoded
-	# list of Pythons in configure. It's necessary but not sufficient
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
-	"${FILESDIR}"/${PN}-6.1.34-r3-python3.10.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/patches
-)
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Only add paxmark patch when we're on pax-kernel
-	if use pax-kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something more sensible.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch ; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-}
-
-src_configure() {
-	tc-ld-disable-gold # bug #488176
-
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-dbus
-		--disable-kmods
-
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	cat >> AutoConfig.kmk <<-EOF || die
-		VBOX_WITH_PYTHON=$(usev python 1)
-		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-		VBOX_LIB_PYTHON=$(python_get_library_path)
-	EOF
-
-	if use python ; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile ; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	if use python ; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/./_}"
-
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
-		if [[ ! -x "${python_path_ext}" ]] ; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udevadm control --reload-rules
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev ; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r7.ebuild
@ -0,0 +1,636 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop edo java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}-${MY_PV}
+[[ ${PV} == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="amd64"
+fi
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	!app-emulation/virtualbox-bin
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		sdl? ( media-libs/libsdl:0[X,video] )
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #832166.
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	java? ( virtual/jdk:1.8 )
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( virtual/jdk:1.8 )
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( virtual/jre:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-vboxr0.patch
+
+	# Upstream patch for USE=-pam
+	# bug #843437
+	"${FILESDIR}"/${PN}-6.1.34-no-pam.patch
+
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
+	"${FILESDIR}"/${PN}-6.1.34-r3-python3.10.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/patches
+)
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something more sensible.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch ; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-dbus
+		--disable-kmods
+
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex sdl '' --disable-sdl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile ; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		if use sdl ; then
+			vbox_inst VBoxSDL 4750
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/./_}"
+
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
+		if [[ ! -x "${python_path_ext}" ]] ; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udevadm control --reload-rules
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev ; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
--- a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
@ -1,651 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ ${PV} == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${MY_PV}.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64"
-fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? (
-			media-libs/libglvnd[X]
-			virtual/glu
-		)
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #832166.
-DEPEND="
-	${COMMON_DEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		opengl? ( virtual/opengl )
-	)
-	java? ( virtual/jdk:1.8 )
-	pam? ( sys-libs/pam )
-	pax-kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( virtual/jdk:1.8 )
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( virtual/jre:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
-
-	# This patch is needed to avoid automagic detection based on a hardcoded
-	# list of Pythons in configure. It's necessary but not sufficient
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
-	"${FILESDIR}"/${PN}-6.1.36-python3.10.patch
-
-	# 865361
-	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-${MY_PV}/patches
-)
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Only add paxmark patch when we're on pax-kernel
-	if use pax-kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something more sensible.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch ; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-}
-
-src_configure() {
-	tc-ld-disable-gold # bug #488176
-
-	#856811 #864274
-	# cannot filter out only one flag, some combinations of these flags produce buggy executables
-	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
-		append-cflags $(test-flags-CC -mno-$i)
-		append-cxxflags $(test-flags-CXX -mno-$i)
-	done
-
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-dbus
-		--disable-kmods
-
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	cat >> AutoConfig.kmk <<-EOF || die
-		VBOX_WITH_PYTHON=$(usev python 1)
-		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-		VBOX_LIB_PYTHON=$(python_get_library_path)
-	EOF
-
-	if use python ; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile ; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	if use python ; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/./_}"
-
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
-		if [[ ! -x "${python_path_ext}" ]] ; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev ; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
--- a/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
@ -0,0 +1,654 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}-${MY_PV}
+[[ ${PV} == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${MY_PV}.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64"
+fi
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		sdl? ( media-libs/libsdl:0[X,video] )
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #832166.
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	java? ( virtual/jdk:1.8 )
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( virtual/jdk:1.8 )
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( virtual/jre:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
+	"${FILESDIR}"/${PN}-6.1.36-python3.10.patch
+
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-${MY_PV}/patches
+)
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something more sensible.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch ; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-dbus
+		--disable-kmods
+
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+			$(usex sdl '' --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile ; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		if use sdl ; then
+			vbox_inst VBoxSDL 4750
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/./_}"
+
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
+		if [[ ! -x "${python_path_ext}" ]] ; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev ; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
--- a/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36.ebuild
@ -36,7 +36,7 @@ SLOT="0/$(ver_cut 1-2)"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
 	KEYWORDS="~amd64"
 fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"

 unset WATCOM #856769

@ -52,7 +52,7 @@ COMMON_DEPEND="
 	media-libs/libvpx:0=
 	sys-libs/zlib:=
 	!headless? (
-		media-libs/libsdl:0[X,video]
+		sdl? ( media-libs/libsdl:0[X,video] )
 		x11-libs/libX11
 		x11-libs/libxcb:=
 		x11-libs/libXcursor
@ -285,6 +285,7 @@ src_configure() {
 	if ! use headless ; then
 		myconf+=(
 			$(usex opengl '' --disable-opengl)
+			$(usex sdl '' --disable-sdl)
 			$(usex qt5 '' --disable-qt)
 		)
 	else
@ -480,12 +481,14 @@ src_install() {

 	if ! use headless ; then
 		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+		if use sdl ; then
+			vbox_inst VBoxSDL 4750
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL

-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi

 		if use qt5 ; then
 			vbox_inst VirtualBox
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@ -1,8 +1,6 @@
 AUX yara-4.2-test.patch 450 BLAKE2B b15319c9921e88504057deead820a884b963e2c240c5486fcfbaf51d7139932bd220de65f8f476f8a264529ac08fbec5ad9e40565d50a3157bb3b3ca783ff26e SHA512 36604637a5de0d6a9553b92b6f6e732cce312b7fe65dcdf70ea70e0a552251f2dd2b5916cad8c78138b946ee4b0bf558324cf944eff519e37af3c83efe61177a
-DIST yara-4.2.0.tar.gz 1284059 BLAKE2B 735d161fde5f84199315f1ce6d31f1ad79488312bede85d2941a03cb97fe75c3c4db0b3cba75782d338a462d87e9d9ed57b393bbdb68decfb350a1bbd096258b SHA512 24ca707015c77d87126bcaac0991997f6b09403024765d615a06db47191a3f0177e1c1eb4a917ec8412876b61d28f4a708f36999ddd9214c3967968c71ae3b7c
-DIST yara-4.2.1.tar.gz 1285173 BLAKE2B dc290bf7fe85d468fd519e68a12d88097d817ca064a665397ba64768078a2d572b46e488eb48747ea1904207598b41a72a510b4b8e4e8601cf518cb6ab98c322 SHA512 036a35d713647b23998135da0d27c13a8876aa44e18e3c9dc99fa425273d7c4a953cbdc78f413f29e8bf818d84b340d0719e241d2a83b7165a16d97e952c45b0
 DIST yara-4.2.2.tar.gz 1287486 BLAKE2B 956a9ed4dab64d24cff680248b4f95b06287e96d27b3f94ff80e97641b3dc4581eaee59cf0d19dfffa9f90a6f0a56f95d3f90f9e9472b65e133bf4aac3e42da3 SHA512 6eb42e63eff93ce636e1d2ae84e30621eeea0d91e1d72bb2cbe826aca6af306bb3564ac2314bc090fb59c9aca5436e72d33658009722ce0cfbaae7ef87cc894e
-EBUILD yara-4.2.0-r1.ebuild 1235 BLAKE2B fb9a2aadf66a8e0d31d4be0028c3d1c6d300fb9c211aaf2c1cb0944836105a0e7ad8e2dad93427464a0fb595473efcd3bb4ec9fb5718e280b2b0ee1dfd503e45 SHA512 20261ad386daae1b9de122eef6794099a661134c6efbcdaf84f64c687465040743187ebbcad5f7b8c56543db6a41cbf442a63c71ddf608112c1504a7f2f9c75a
-EBUILD yara-4.2.1.ebuild 1233 BLAKE2B aa908f1492fd17c96c5a8a2e6cc392873557ccb81e74e52cbdb1996fb82b842da003780359a18233a259b7cedb31c03acd2910d64a79d2b46b4ee9806a94a777 SHA512 a53cf98779c89ee447fbc7ae4254a055ece4ea8da4b6731a798d03fd27b72605b30b5a68e2fc3526ea8167dec12971e98a152af38f19e1eecf7488e5938a2c8f
+DIST yara-4.2.3.tar.gz 1288334 BLAKE2B 4e92570e4dced5c1aa114065d791fc6780ea1281919eb1e908d4181fb5a966137c58d82ae09e8ba18edc69a25d542e3820d8e8de4ac62c0636e273e158086954 SHA512 1df23837d14d3f9f72db901190e7412241514a8914d72b753df32ad8a44c7a49ad8f14941a95de83754e4d1dd0f23d712d8e6a43916343341b92cb1bc66f3c09
 EBUILD yara-4.2.2.ebuild 1240 BLAKE2B 4235ee311bb9f895a9ac4b8739bb74d5596bcf90e84b62c59c9e7ef7387bf2f85d5613fbaed7da418626148aff89eeecf482b49c0a998e2797ff26359262ed6f SHA512 8ec8cad2ae58afae46b1e08d226d13707b8931cee6dae1c30412551ac0a8ba9c04403522a867db6e852606518b8561c8b4ff525eea7206f965636399cf3d886f
-MISC metadata.xml 1151 BLAKE2B a2f641c9c0f851884cc6482248446d7b509e4ca2c5cec26159063a0fec025b8928955cfefbdf87e26ace0d06a01a2cec7d1f3d10b09b99b1cf1040c09519adfa SHA512 5001e3a14dc458a6b27f69226fb346dc8bf07058270e20b81f325c0742300ccb6e241b3d3dc6f55eccc43b68f0fea74977d33d8bcca6d0612057f6015f857500
+EBUILD yara-4.2.3.ebuild 1243 BLAKE2B 96dca52274ed6a7a0afc7132c66686854cdf98e17373a3e6b4aed4ddb6cca71f83bd125b9a3dd7b1ec2122e7a6825374fe72796355550590dab91b98cee93550 SHA512 a0d46ee508eea25ad5323cea28eadc95adb10a766501fd0561d5758fe81e1f677d57f7cffbb371a8a88b506c03b960eac98394d9754af82e041808b76f932d35
+MISC metadata.xml 1284 BLAKE2B 5e8b7f95170b97d4d55fda012f1108acfb0cae362d4da0f3559375d529194b5e4f9644d8ca3d0fc7e438b873f3827aec307dc664808a56561153679fc0bd5729 SHA512 64048379eb1d51afeee050ea906a8fa7bda9d5bdc78807d04c1f5f5b5a425b512de5facb6b79f23ed8d5517caf779ef327d7eb148ae2a32407904db05efb337f
--- a/app-forensics/yara/metadata.xml
+++ b/app-forensics/yara/metadata.xml
@ -9,6 +9,10 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		YARA is a tool aimed at (but not limited to) helping malware
 		researchers to identify and classify malware samples. With YARA you can
--- a/app-forensics/yara/yara-4.2.0-r1.ebuild
+++ b/app-forensics/yara/yara-4.2.0-r1.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A malware identification and classification tool"
-HOMEPAGE="http://virustotal.github.io/yara/"
-SRC_URI="https://github.com/virustotal/yara/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-LICENSE="Apache-2.0"
-SLOT="0/8"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="+dex +dotnet +cuckoo +macho +magic profiling python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/openssl:=
-	cuckoo? ( dev-libs/jansson:= )
-	magic? ( sys-apps/file:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
-
-PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-test.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable profiling) \
-		$(use_enable cuckoo) \
-		$(use_enable magic) \
-		$(use_enable dotnet) \
-		$(use_enable macho) \
-		$(use_enable dex) \
-		$(use_enable test static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	# TODO: Allow tests to work against dyn. lib rather than building
-	# statically just for tests.
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
--- a/app-forensics/yara/yara-4.2.1.ebuild
+++ b/app-forensics/yara/yara-4.2.1.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A malware identification and classification tool"
-HOMEPAGE="http://virustotal.github.io/yara/"
-SRC_URI="https://github.com/virustotal/yara/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-LICENSE="Apache-2.0"
-SLOT="0/8"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="amd64 x86"
-fi
-IUSE="+dex +dotnet +cuckoo +macho +magic profiling python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/openssl:=
-	cuckoo? ( dev-libs/jansson:= )
-	magic? ( sys-apps/file:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
-
-PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-test.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable profiling) \
-		$(use_enable cuckoo) \
-		$(use_enable magic) \
-		$(use_enable dotnet) \
-		$(use_enable macho) \
-		$(use_enable dex) \
-		$(use_enable test static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	# TODO: Allow tests to work against dyn. lib rather than building
-	# statically just for tests.
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
--- a/app-forensics/yara/yara-4.2.3.ebuild
+++ b/app-forensics/yara/yara-4.2.3.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A malware identification and classification tool"
+HOMEPAGE="https://virustotal.github.io/yara/"
+SRC_URI="https://github.com/virustotal/yara/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+LICENSE="Apache-2.0"
+SLOT="0/8"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+IUSE="+dex +dotnet +cuckoo +macho +magic profiling python test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:=
+	cuckoo? ( dev-libs/jansson:= )
+	magic? ( sys-apps/file:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
+
+PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-test.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable profiling) \
+		$(use_enable cuckoo) \
+		$(use_enable magic) \
+		$(use_enable dotnet) \
+		$(use_enable macho) \
+		$(use_enable dex) \
+		$(use_enable test static)
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	# TODO: Allow tests to work against dyn. lib rather than building
+	# statically just for tests.
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/kalendar/Manifest
+++ b/app-office/kalendar/Manifest
@ -1,3 +1,5 @@
 DIST kalendar-22.04.3.tar.xz 259068 BLAKE2B 34d1bd2c0d8a4f45518387586bbda74a850034c6bf1efe20fde991ef3c6a5681931e5501cb38a5a8cb6c9a3fb354167fee0d389331691c67f7ca82a7cb492097 SHA512 d8f9c0c5b4ac1047f21312f61123d1f54b71e3cf7711526fbc38591ba425ed1f76e5c5a715515216059d868fa82f8097b77afe74ee12a30ff7a6fa5c2873908f
+DIST kalendar-22.08.0.tar.xz 459956 BLAKE2B 4c432245bb5b3de46091b204b6941989defb50aca5b0be6a8fe24db9a589c0d8fb549f261aa9374affb87e7a4835e2cb6b5c6fbe652e33feccc47e3658ea58f2 SHA512 2115947e9a5b97290ca3a28fa795ea23a4bcd1454a35bed6ec46074f22e36486fd9ff1470739a25b600e016fd746911d1a9afd68ba7ff47fa8413cd5592f2e9a
 EBUILD kalendar-22.04.3.ebuild 1457 BLAKE2B 750c915d5e2fd6fb1851e7abc1977bd3f3ae28dbd7c07894f2c6b89a2a955d00caabe3b15d5f194d85cce1143f12281a11935a59b0db4d3768f94b0fd8a5e979 SHA512 a7343a44769a9364a819f762b3740d118f5bd88a5c0109c86f4b72b984ca6d0cad9c4f8a4d5bbd5172fb74aedc136c508f26a72b2d62a142c822ec15871f5523
+EBUILD kalendar-22.08.0.ebuild 1460 BLAKE2B f668088b51153b3ac1c4615d74f25c48547794b398938f335f6bd56b802bec2aa88bc586551964e677daeb33b9e62f905ef1de3d291d4b77e8ce0282bc710956 SHA512 b2e3b114b78dbd74ee459093ae934723901d31b32e7e68ef70223527a9e22bbfcb74a8e6956a8d270ca2e02af2171b0a3703fe97065c991e1c51c70a6679e291
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
--- a/app-office/kalendar/kalendar-22.08.0.ebuild
+++ b/app-office/kalendar/kalendar-22.08.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="pim"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Calendar application using Akonadi"
+HOMEPAGE="https://apps.kde.org/kalendar/"
+
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# All of the tests involve interacting with akonadi right now (as of 22.04)
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+# qtlocation is needed at runtime only or fails to start
+RDEPEND="${DEPEND}
+	>=dev-qt/qtlocation-${QTMIN}:5
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+"
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -28,6 +28,7 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
 DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
 DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
+DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
 DIST libreoffice-7.3.5.2.tar.xz 256607688 BLAKE2B 82d9b1407e42e844214ab323a202beaa964857cf77279e199e2730adb6d86ff79acec197bc0ae9969b429894bf0ed7a50dbda8fe8c29472b16d88e1eab6d7a57 SHA512 00d381e97c0bc6f97d4e770b7037f08fc659e58e792d47b539ecd0b3fb4e3e9b570769e9b3eb26522d951fa14926f71bef8567756b8b8b8c4777a00e48ee030c
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
@ -37,7 +38,7 @@ DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.3.2-r3.ebuild 20228 BLAKE2B cb29a34f5c74e4edd871f36b469242de2bfe4b29c31eb61248855cf29925c5d2303e9fa0bc6e64d09833f9a44e70ebc9c140fe60b0bf33e25a815365d4fdb9be SHA512 b0ea4d4225cf32915a6c57a9644439b841b3c171680dbe187592cd9c12522e98c085f23e3594a37b5d18afe118b0137c68e66790408a1fadaedeb30a0ae552b8
 EBUILD libreoffice-7.3.4.2-r1.ebuild 19845 BLAKE2B 3bfd2994d25e0be0e751ac273b311cc6172cd117526acbb149dde34c114767c8860d79f1f4616d60256e4052d69f80779dc9607ef77fe08ab9ed3b75f047216a SHA512 2902c88f6dad6b37e8de0770d556cd6c55e04431f85daf6a889c3b4a9d6d282882da48670a951cd2500f7cd5ddf6de1da0aee77e8cb389d497c4353cea7d4006
-EBUILD libreoffice-7.3.5.2.ebuild 19558 BLAKE2B 905f222b9f98240dab53a97f133be46a85633f9a6e58e761d4249027061fa0dcfc63a533736b2f1ef779398f3091fa7384456f72ef02a9b284c6825e8c8a7952 SHA512 c63e0ba7d53a4ac3dbd37fa8f62f1d2cab777cb4c3c942a95a1565636c8ccd33549fe3997babdc38fa575b6d64243e55c07b695da58771fa9426688883fda10d
+EBUILD libreoffice-7.3.5.2.ebuild 19583 BLAKE2B a7759e72c84d0dc68e8d7f479de6d88ba72e4abac35cd01de742877038f0b3ec2867ced7986220f24dee2988a80a6fd6be8961263fa850242c45b1c0acbdf79c SHA512 44323e404bb8ef58a3f48834a0a16a6e5c370d80ba337f939511b37cf7d54104c37fa8ffd8135a771f34616b0b95a0b74a68f7a154605654f1b3b8929f845bfb
 EBUILD libreoffice-7.3.9999.ebuild 19558 BLAKE2B 905f222b9f98240dab53a97f133be46a85633f9a6e58e761d4249027061fa0dcfc63a533736b2f1ef779398f3091fa7384456f72ef02a9b284c6825e8c8a7952 SHA512 c63e0ba7d53a4ac3dbd37fa8f62f1d2cab777cb4c3c942a95a1565636c8ccd33549fe3997babdc38fa575b6d64243e55c07b695da58771fa9426688883fda10d
 EBUILD libreoffice-9999.ebuild 19561 BLAKE2B 4c82edf0dccb6b79c51befce0f1b7cb6d87062f50af856214335d8515315c2cee595ffa60b0d0f77405eb97e3796d9a19b952747b0a389d92382de619846605c SHA512 777bc54200ffc6aaac80b72f56902b5c09101bbd00d62508e3b6b11f701aed4c541252926b90c4f91e6c0f58ec32796d4e48e1d7004ba34797648c5b5db3b37c
 MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@ -18,7 +18,7 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/"

 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"

 [[ ${MY_PV} == *9999* ]] && inherit git-r3
 inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
@ -26,7 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult
 DESCRIPTION="A full office productivity suite"
 HOMEPAGE="https://www.libreoffice.org"
 SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"

 # Split modules following git/tarballs; Core MUST be first!
 # Help is used for the image generator
@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"

 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"

 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@ -287,7 +287,7 @@ else
 fi

 PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}

 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,5 +1,7 @@
 DIST eix-0.36.3.tar.xz 639864 BLAKE2B f74b7c4087e5145f3a2e6ee8b0034e5104de8ef81ec810f2d9fc75d161181f71396f27dc635466685650182473fdfb542f4cec6509ddee0a3bb0d7d620b7d42d SHA512 9fd7c64df6acf27e9ed07ee77ee7f209fb0fb2db9a3dbbc78c1f5b25e6d4786dffeea64bf8ddee3bfe4fe35445c8173103428e184c966964b2973d5737152679
 DIST eix-0.36.4.tar.xz 640776 BLAKE2B 32486b6ce5e5d2a32bb6fc8581bbc37da6cef9cac0cecbd3d0cc6db8bf5b6bcb3c0a31e28df462edcf06056d279a88e64b4c526b430ce40a0614c0367710243c SHA512 5b716cbd688bb5d8efadc7d47de9fb3238776ff10b11165abe02623421be82d17f2d51596d3f263219461188aa08974af1b559b4e43c31d9ee0682f21febb049
+DIST eix-0.36.5.tar.xz 640132 BLAKE2B b997be82e21e3316abc6f06bd120434f2a027d62a3bd97e54e7c6298ee201d9998fb0fda91955f88b1b9bbf15b3c6c0c1d821280508215131cde16d1eef621e7 SHA512 fb86367f34ae30dac10f0ba68a649c8e737f0f66fefb2933e100c63c57b778567753759f28a6b4afd0155430b050ff59297821c7b54fa73c6cd65b0231806d89
 EBUILD eix-0.36.3.ebuild 2552 BLAKE2B e94b7a44857440c2a9f2423c1e27cfe8eb020ae89f9be58291f03769a4716f3c0787c3caad72742ea835c7977cc9d94c9473e09811c3a8cd52f52f9f3e1dee45 SHA512 e1862471ad658e566c031ae219011eb53c190666289707965f2ca9ddaca0315a89002b0f4cb0a1e756ab51962ffc2104f9ca6fae9b25f0e428bbc3713b971a40
 EBUILD eix-0.36.4.ebuild 2560 BLAKE2B 9ec9b14ee4636a8602cc07e12be34948d654aa75ed707b09d3e63f24f4aa8d68c3dfbce9d308b999e630f4b3ecf59a345896d28111b880cea41d7e455c4896ce SHA512 d833759655bfe420cb2b3f94a30c2bc2f77108c3816afa602306326268c44a7e418c89abb675ed9891aa95e9c6bbcf9a73bcb96c852904f702ebec5d7fc1e31e
+EBUILD eix-0.36.5.ebuild 2560 BLAKE2B 9ec9b14ee4636a8602cc07e12be34948d654aa75ed707b09d3e63f24f4aa8d68c3dfbce9d308b999e630f4b3ecf59a345896d28111b880cea41d7e455c4896ce SHA512 d833759655bfe420cb2b3f94a30c2bc2f77108c3816afa602306326268c44a7e418c89abb675ed9891aa95e9c6bbcf9a73bcb96c852904f702ebec5d7fc1e31e
 MISC metadata.xml 1066 BLAKE2B d86d5ac2b57cb98b85fb31719d76cfa74d8ca4e18473d4bea8c4c9c63ce35e6b1e1c0e41b3a6dc20f5ba464e3273f51035929ae1d37d36d0da8a3e8a30ca7a68 SHA512 c161c1e63cc7e9ca25bea3902f5c5806e6cde1253d74b8f2fbb876667b9fb8502edc81a309b0bde4a5de033594927da6b12254784fceb8e9a7452ae914ee5373
--- a/app-portage/eix/eix-0.36.5.ebuild
+++ b/app-portage/eix/eix-0.36.5.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/starship/Manifest
+++ b/app-shells/starship/Manifest
@ -1,8 +1,12 @@
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
+DIST android_system_properties-0.1.4.crate 4637 BLAKE2B a8d1768a924fc04ea27f4606b21cc3ee657b2ced18a267974b2eacfa73c895719ed56fc508beaa20997fe1848c23d40b5438400d6390a15950fafe57fb96d3f3 SHA512 6580064f046352d2ecc205f78fbac64f36e85a10d15c2c046cd7037ab2505d0d95ad785a4b1e276708116088a0d0ff5e7f89a0d26f498f0dfa038c8cf8d0dd2a
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
 DIST anyhow-1.0.58.crate 43137 BLAKE2B 8e797dfab555d7076128851203ec1c6cb3c448bad52fe28c82b10518549971e6daaaca52d4a0dbb126549fd819706d6788e5322c6433ed71836c7f6051230b7a SHA512 78b21c51efd37e2be8f5672dc57f23ecd222d910604276da094754e06b86eb5a899d7ca7fb9f92566a13f70c116b05fed93d68a06320894d76a14a31e6c557b7
+DIST arc-swap-1.5.1.crate 66157 BLAKE2B 9060ef4f9d699fadc03be1a116d9301f6308fbb7f8bcad6f01926d584386d26d03f9dd2ea35b6771a6725ee7819e028d0e1b256e8b5f3b812cbd388e757491fb SHA512 8636149e92c068d5ff5352a19c9973e7bf2aba68b9363c783178903a8665f6edabbd30c25ad7992646635efe5830d67c958f8d41b44a4ed1fe5698628b41c074
+DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
 DIST async-broadcast-0.3.4.crate 18539 BLAKE2B fdde29219480ff23cb1b8374ce97f9b1b878c9792e20bd4c4db5784797b0eaf1f5bc114675956c2c6d0ba8fda1c071b6d9c3dfe57e30a24338759c57ba2cad1b SHA512 2081f37699bcde02ec9ae0cb3a2727a0277ed498abaf1949c0b49894cb6570939d835df4c547fe64d0956f979cd744a7425cc6f6f37a001bc887bb098ec2e43d
 DIST async-broadcast-0.4.0.crate 19657 BLAKE2B ec7c50cd2fb8e8268b98e72a5a785d388bc28f6d33179157101ba778783b46b17276f5d9381e2e43892fbb7bbe18df15f6c9e16375f5baf67df1750e24363eb1 SHA512 bbc72a254c115781f1a291a8aa562ab4354b7f7762a13ca280a68d6fdb0e23e09f23b75e7ef555141ae3f4f00835299d9b2ed632060c33e9412f4ea07b94252f
 DIST async-channel-1.6.1.crate 12574 BLAKE2B 5c5c8f1cf1458d952637a439a1534e68bcb4a1cf478cec6b6d224387f56c59dc6cffd2e3621dc24e03e20df3fdbda5b8855fccfbbc26a2aa03656aff3a17d02f SHA512 797b1f5b4c07853f78670e62b67fb787c329ffa2c89475a3767a963d524a69dce082cc7f3a2878d9c990f00ae2d9cd7e0d21743fc4186769c238467bdb20c65e
@ -15,6 +19,7 @@ DIST async-task-4.2.0.crate 28496 BLAKE2B 327895275248fb0d405a85e603d26cc4a9dd0d
 DIST async-trait-0.1.52.crate 25913 BLAKE2B fed6b6688cf10c712597dd612d505aabca0953c825b45e2a63cdb0fdee231e70436b3a7a02a56eca34ef7c11951f52eb2d67740c5c7226ed4417df55745714c6 SHA512 1a17e3771d0f8ded921a561ce052f397e997c99599fbcd741a69b7f43ebc10476d412dd9cc18a096c791717ada71e8439ce38d0312d6aa59dd4c0c34b5465696
 DIST async-trait-0.1.53.crate 26210 BLAKE2B b48cd91fd63579c7e0317a72befec93168bf067ca08cb4e51f1121ccd5bbe3e3ac03d343a97c57e19571af31636901ba335f4296b0cdba997dd3630e176a25d2 SHA512 33fac59f2329997b3b17b076f816e32cd667f3317b324b74e1bf4ea28ef1d3ed53572316f9e034d1149cb8456dcb29e78474426aa04c42fa8bcb0dcf1da53763
 DIST async-trait-0.1.56.crate 27425 BLAKE2B e7eb838dfcc4e37a687ab6be4bf92a4a6a450d1420d19f7fb4fc3b3dadda8b277c57585e00aef655b1bb6453fbcd59901ae0f47fa92b5b23dafed8f485ef2813 SHA512 30b942255858d404b9f8830260496a4199678fb1a94f08a6f6581189aed0c70a9759c54b8d3bee310b41a724dd5ac0a96815e6e1259c864c379eb3145946066a
+DIST atoi-1.0.0.crate 7768 BLAKE2B d7505c494a249e83eb7f5fb52815f29382d1c44a56938afe510ee7a23684fa7c19fc96347390c3f32a13e0a45993d705e3d3e85e51d9c4fbc7615c17493b28af SHA512 25c0aa22ec31d8c8a254dd9403eb08b719ecc1101df48ba1a39b273a53e95f2e4f224ead0465a7fdaec910497a485863674da7e8b68081de4b991c4196af2a23
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
@ -24,37 +29,52 @@ DIST block-buffer-0.10.2.crate 10258 BLAKE2B d3ad2f9f0379e04320e954e1a2226949d83
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
+DIST btoi-0.4.2.crate 9580 BLAKE2B 2aa71f0bacd1e09476de4d9148fd3e1613896d3afa5db3182f14d7847411b71ea4426bc1313d94693851345d82db297c118a8e1cf196c16e1605f701d93f8f88 SHA512 dd250b2e41728c4bd7c41a973b5701ab0e599470030cf88a13713c3262cd454d2515336f49cd6dcbe8b928eb38a053778fb578d11b693ee2d1aa4af07d40b6cf
+DIST bumpalo-3.10.0.crate 78915 BLAKE2B 94515190837765b47feaf94946c7e4da5b84e6faf7975bd5452bd9388d34e51c84315b80bc15b37c7f4ea8b4aaa0112707cdfc82d0651eeb8b63d2e7bd247660 SHA512 60c686534588524250ea7cb43510dba69d24999769b719127ee07f6015530ac2c5778d9b93477ab075bfc15c13e3ef9adc29ac24059067ac32e109347cd509f8
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byte-unit-4.0.14.crate 10805 BLAKE2B 671ffbbb7b092d8c7962586bacc52595ec00dbe50dc321f2ab1708ff729283773e48c7773d5ab7ede2a99005eee9964456c8e4bec67a9d04cb825794f6744ab6 SHA512 0f551029a1750b3576d2518f7198176bfc6bd0a98955af6935f6bc4144397b3ffabe22f39d56ab882f33997d907f135d9633c19ef8f29bf17517751fe2eefd34
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
 DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25be78935d08637351ade725e86e00e07e62868e76a1a2db894f223e1f8309f8b362a46405ec6c06f6e421a96 SHA512 36f35cf53c468cf011b231d3fc5d00c5224fa3d917854e347daeaaae53ae7ee36c4d8ba26788460d56c922c9ffb0eeebc60655fef7366ae42e221950d03f6715
 DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
+DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d515fd1efe39a12588e24fe07480738daba008e414a95e72af10d5ea29702425e5b91ebb277fe346ff74bc43b SHA512 dbce2a61a429eda7a8f21b4a35dced729267298be9793310afaff58843211a7177a9bb932a4bd9dfcedaaf1a2570b90261d4c1047c62474450ea835dcfc325a4
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 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 chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST chrono-0.4.22.crate 185570 BLAKE2B 10dfae2fe871a9910bf885b78aaf3e9ed1bcb87a40962d781c8ea407a945b837c665c2bb4e3d0562ac63d9e7bd5012804434642ee6f5c80e22bc816d4331f1b0 SHA512 de856679ec16afe035176b22125a00ced532d49c8babac0a88fa5f6e4a3d9e526a34ee8bf51639653fc313a5703a202b1be013aa16fdd72a505151d7aafa7c44
 DIST clap-3.1.12.crate 206752 BLAKE2B 84cda0e8b864526fd7a3ab43f0f2b7cc3017054bb4010143b2cc719eb297da4f79029d5e50652a44acf0d71281367bd630fe0e5c54fd5a8b8668c594389fd75f SHA512 94a594886d4fcc3ef745cea1f98202765aaeaac816d9271f132d4f8c90e6679fd56077e11c621222bac9200552839297f98c7788462d015334090e8772715cb5
 DIST clap-3.1.6.crate 202211 BLAKE2B 9fbd6d5ad8442118716e01c10ec9388644ef6e5621019a1245ae937324265b96d50aa70777d149daeea6f812ee05414623f938a056c38a201d9f6ee0b98bded5 SHA512 397c277eeb9acafc1098f6b6aa7e428cf7c7016356a99139dbff66dd6c6e12434b14a457679fd99ea50c1fb0b54b9b96bad65f1198025986835810484e542824
+DIST clap-3.2.17.crate 213699 BLAKE2B d18204da5583f67b29646ee40f2784eb51e216eb750e24dbb4cf52421668a42e655443cf3e02cb18030422718aca73c6c0d577ca05a2c8ff1693bf5dfe85affc SHA512 e1b19b1c5f862883e2e1cdab14d7ed74c2d0a6b91aafa5b227426a004ef91a8b6c4749e023554ef64c0636f02cff1530d321f934b708168ecf5e7dbad68d08c5
 DIST clap-3.2.6.crate 208469 BLAKE2B c3e3fab5db9f2e80dec9f298dc859d600c794e60bb597c4bf1f6afa1baf3e88c7972c110eb32eaf9678e4a9f10f0ef903c83c11889885ac30b344fa862673178 SHA512 6cc1b975a9f5e4995392231fbc8db066794d8d7c1ebb133aa65f4ee3dbae4ec258577c8d655bb6b981ea67fc694b693fb77ea960d19f68595a8ca509d811a753
 DIST clap_complete-3.1.1.crate 22432 BLAKE2B 8eb0696e76f3e82a8e4efa644e35d97276bd60c49d8d38b2844b4f47abf4346911bfa11bb54681eb07cc552f97b0959ab6857b2f6dba279e81eebd10fd2c10cd SHA512 73ccd96b2116e756b6d4e00b28720e1e66984cd0efde5f2ec80a8a4c00737a9a096472f96ac6430c7ab586de57e38639ab15484ea6b088ddafc9f021b4680c8f
 DIST clap_complete-3.1.2.crate 23138 BLAKE2B db3741e86ed29b52c7dec82c4d957265bf2d7f10b641f579336d2893f5355233507bf4b2385cbbff1a6ed25fb7a3855e2c0b889257679aaa997be351d3bf3fd4 SHA512 94b176115fa0edf12f1af62388c8f175074fca980f4006f9bb755e9be773785bca80b3b11821bdc8498b06f5d3aaae169f7daceda5a352eb39312f48b255ebc5
 DIST clap_complete-3.2.2.crate 31472 BLAKE2B e69214c173b3ea4991dc1c98268aa31280d54b95202d2d43c56801323d9025013f0c5de47093c9a99318b8a8228f67af108907c561c23a5c20b9f1549ea55356 SHA512 52be6c35a692b2335e831d7de810dc78d56081662dcc580e49b63c5559b1b6140abdb31148d623be3ab666e56053eb8818e6d10d452d27ee7d7cca8cb501e24c
+DIST clap_complete-3.2.4.crate 31618 BLAKE2B f494ee6d1610b7ced42c5d3f5895c17a061522777573f43be525f362bc0398adf95b124130301972b0c4f366f55a9e07c41073405ae654862597a2ec63f07c08 SHA512 97382739fbf801193ec80762ed712d4642f2f6484ab3d8c6f773865d0914f9e43da4312693fa269c0fe055c2a4ec6f40ebd91e9f6f899859dfda30a13d02f31a
 DIST clap_derive-3.1.4.crate 25358 BLAKE2B 05f5d65b6ae800ca6172d659d57e08e8dfa0ee741b41f285efc5aac71e0517b302a5573fce4cb9143c02257002a46c6855d9a45eb62b7b400a7ce855ecdb1640 SHA512 f55dbe26eb049610896ef31a3562c4229d5602df5ba7d4c061f13d613c58edeae8f7a183741d1d0496d0453ddfa18507495b26f4a8f98d2d4284556f5ced3cfb
 DIST clap_derive-3.1.7.crate 25363 BLAKE2B d9c92e19357988e850ade69d8350f4a0cf0f9d8cc8ee6b52014eafdf8b105f6f81e43b920896bbddd95a209e874729e104119f9561fdac86f03707096f241985 SHA512 7f34c1b7c67bddbdbc1b159fcde366babe37f355637cc1f12748a51d0ecf89ce3e6aaf5ed140aae6539f12182ac8e2ca93c2790ea2dc84657487066c9d77a869
+DIST clap_derive-3.2.17.crate 28217 BLAKE2B dd98874a39aeda5bef134043547295e370478511539ada89830077f3457a853305f48c75a9eaec24e81f5bbc4e5f9f9881beb355508f961673cb1cfced7cfb4b SHA512 c51682d2b5837502211388efb3e45cad67400314d43e0492b4d52f72acae5ed0b86bce870aafef52e97c0c84c6174318d759cb21ab32caecdeac6c1dd0c2a356
 DIST clap_derive-3.2.6.crate 27639 BLAKE2B d75b4923817d8bfc924394079c507f43fa1f1755f75844bf85d8b848265da3a42f9828ecf6257dcace838e7d8db40733ca9185f7a8d32135f7416502799d01ce SHA512 d6023028dcb86e68158b6692eb6627205ec55116f62c5410f489d6274ae89db9b2f9066a0b9d1997f0d80a774f826966ba416bc28bb72aacfc3332b66228bf73
 DIST clap_lex-0.1.1.crate 9603 BLAKE2B fa128dbc85152ef312373283fdd84db5b9f9c519d6382a737de2ac9ba8df16e74afafc0c1602a2ae31cc62e8d83232899b1c4eff41be6e7e5f286513f83785f8 SHA512 4d7667fb4cc86fd820262c4642c37a073e558ac5c05e1a8efc2813f54c364e2c4e980a8ddd81e72b11b02f494b20ad89c77e9649d1a6c0ed418194db808f1383
 DIST clap_lex-0.2.3.crate 9638 BLAKE2B aa771b07e7c94617d9692aee2721b20d371824d5744fee1aee606665d828803719cd91fa009d73a4155e0dfe82465761f3b0d1e76320f50328a67c8f58cc3c62 SHA512 64fecf3e2d1be78e68e04b61fa64137ab49ea9be17164eaa7f40079b53209a957b029bfd23d3a62f11a8d6a6e6f524af1019ccb2fb4b46e5c6394ef74470fc59
+DIST clru-0.5.0.crate 16147 BLAKE2B 82a580cd6a849922fe56be7b1eb25d4aba65e65e8a10f6e6de15f71e153324bdb79e8b58153edb2767e4c52cf515224ce09d8ab674044daa2bc5714e52b41ec8 SHA512 2ed3ab93850b032c1ef708f9d9b1c85b451a7032b6218e0a45b3376fe78d9a494308b87447a29cef994cdfec3a2f5efc24b804b3142067bc9450824f16d6aac7
+DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
 DIST combine-4.6.3.crate 132015 BLAKE2B f15e0781bf64a6c88373ecac53dbbc8b50252078adc405a15b64c0d259a0b69f906c57a569e0f8d0338cb9a12b2cde2ce068330202fec60a7daaafc2049b9e57 SHA512 495f9703efc2b9271dad2fdd2626aa9a1843fd3e10e63d0c8b9e42d4c7e3137a4740aa476c0206ad8dbf2683d0eeafde36f70581bdeb30299fa08e077f9183f3
 DIST combine-4.6.4.crate 132144 BLAKE2B 9d6b513adc63b49888dc33444e3db2c0c4b950a6c4e30ff17e0bbf4b3bb39fbd679cd31ce7e584a1bedca69868606a13c0e3bd0a136a1fca1dbcdb516452d34e SHA512 2550aba009b8ab66230e7b21fd1cb5085c92bc280e31f35c9b02dc78fa138ef9b9ece0d7801473b88d11866b013c6fa3bb6e9611bdc1a7b85144e50a49829774
+DIST compact_str-0.4.1.crate 34227 BLAKE2B 84f9c660a79b97db9aea6566fc0e793c1cfff379c021172a96cebd0316a882bd56ad06d254662cfff749e355d10e982040e339e6265fa2f70319ad489d5f8709 SHA512 f9d9650368c0bc485ebe6d600fc465646cc2ee6b003e992d24a395d22576d16b60bbcb0e59b5f0cc2c5f26b2b394244c9f1456def1f9b380891bb6fa6cdf9f4f
 DIST concurrent-queue-1.2.2.crate 15859 BLAKE2B 97eb49d7f6270999f24d37e7a3967c0abcbf584637388c4507f89fd5284120759c9845219c463cf066f6568191b874fefddd7edee9292ed02183123161074514 SHA512 84e348dc3d40c73c11c54ecd0f1e6cf7fd6c7033f4723a428ed1c09bc9548cf317a0d8182144b689cb9781190b9c8ce4374717012eccee54a11ed0869dee10fc
+DIST const_fn-0.4.9.crate 12624 BLAKE2B 8a3e7b0d9be4802646e5e0a8a6bc817e8c8b3c9382d2d4e261180430dde49f3ad9fdb82847b3165e751f41a7475c6316a24de4adc96181e3a7f787da2a71c634 SHA512 223829b2fef82f736e0045b46ed93df01be19faecd5cd64453c8902cf6e62d81eed4b6ef0842b243c5a334d0af852efffb571c98ccf1905f81d4c8330c6499d3
 DIST const_format-0.2.22.crate 72234 BLAKE2B 89d6f58458777d10e21bcf960e57d24069bf2325fd63904dddef10b6186570bf937fb1dc99d5302a1184d2946c35175d92970db583288bf5af45139aa8ac6e7f SHA512 3ed65106b3fa49fe7cbc0592a8a5b0fc9b99d9d44cb51c1fbdb2fb2eb916d801aa19d9ec568560d6df33373324ea226de3db6e82cbeb9a850426589472a1ec9c
 DIST const_format-0.2.25.crate 75351 BLAKE2B d96e11e12fbf2aef33a01f27375a1991db6345bd348a458b3dc504b8bf7ac947e73ffba4ba7e389dff7b6426c29716c891f1f3da2beb17d48fa4ef3bd28923dc SHA512 fdb2e58d6d34c5910b64eb4ffcb617d3e3b85f43eed30fc233fb4b5246d6cc51dd3765eb0e9e796e3542716900cb0964d78cb945946d3967e9093ba6f3924bd0
 DIST const_format_proc_macros-0.2.22.crate 24274 BLAKE2B 61a41f89bb1302cd8a9b2b5b2bb6a90eea2aa6e331840c2b0033acdaef5ddb9cb7a63df028db9e6065a4883aa53002330c6af0bc0b8b3479ef8260c5d088cd71 SHA512 a0382a50502cff46c966fca1518ae1102cc749a9fff142a7fc29c3f3dce4b947ef05576e27248ed682aa9db2e1c0af149f41981d02d8415b63734a0ceccb68f4
 DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
 DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
+DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
 DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
+DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST crossbeam-0.8.2.crate 10502 BLAKE2B 487a7a5f197898ebea0fd41a413647db0fc3380790cfdfc6cb7cf3caef48197bb7c2498579ce676d3c5796480a8541ae37ae03f009d768a6157246b1f7d63a33 SHA512 bd2e54372595daeaddcaa26802780959465bd571cac64f23256b7ecc68ff5c0161a36740a51386ee54abe7c509ad1ff870b6f6877a7921f4335661f2c554c3a0
 DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-channel-0.5.5.crate 90326 BLAKE2B 0dfbb516facd1b8b7ad7259a434839a4fc279f61389edbbd4241aab771f03daea6a897f9ed039d43b65f736400b160b6c053cb01544f5636ae2260eb96f3802c SHA512 c38bfc10bb1fcfaf067679165eb31b54b4ef05bf6e8e3465f856e3fc717d4f521b2eb98bd441a738eb7fac34472b7b9a030873c3595a267f19b26908713e2218
@ -62,10 +82,12 @@ DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee
 DIST crossbeam-epoch-0.9.7.crate 46089 BLAKE2B f0e38a9e0d4c6b4a3b81507dc9c89fad9b17fe55894c92c6355fc14898afd40af0747802a9c34a21f5250660acc444b5d2a3958d4a08fd25fc52b87f78b39e51 SHA512 f6afc55b8624fd3d4f8b0fa5f949360b7e205f7f5be92c248acc102d761e8cd1facac0e40be2f507379c824ce2bfefbf6aea6e8a87eb2ba1c20f928bb9dcc0a9
 DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
 DIST crossbeam-epoch-0.9.9.crate 46185 BLAKE2B 1baff196581d02bd7adb32a7e05976dc2c2ab1a289a59d0b0050a22c010e73e6fb01a0005f837c5b7b4836896584fe83587ce39fc6918f6659c1256c5ce3a5d8 SHA512 d32003cf7bac8690c3d8a2cd9393bf06f2a5da8b6371aff68de28be379a86b5b183b67fa6cf397b1a164379e0b095f4c9e6bc7803e229b3867d2c69cdc235085
+DIST crossbeam-queue-0.3.6.crate 16372 BLAKE2B cb1c579f0965f8496d0b475d971954a291fe69e0610a0320b6bd4875ad450d66e01f7fd666b9e6fb8630d0755fc4f5fbe03761515ee0612f0c7d86cbf6886905 SHA512 9973919d3cbc28267fb0ea79345dd301163f3578fb8f8f76186f55418e85709b13d65be121a6d8988f7c1ea7baf8d4d7aad0f20ce0a8ca0af19806d0f115de3e
 DIST crossbeam-utils-0.8.10.crate 40672 BLAKE2B fbc65ab8a68d66f27cfc8495652ec5ff31a3b8c4de41464bf3a9f673249c2fd5ba4bff7ec8c7b838d5903328346214f91fe075bbe7a05a9b11055b7b17376ac6 SHA512 e0ac772262677e7228e4f2e06099ca788f4906f40fe5dbfb0891431c993c7e4d755d3ad93f55570ae06c1f06df14801edb3ba4f28271c4e83c80dbba2fffe24c
 DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f
+DIST dashmap-5.3.4.crate 22826 BLAKE2B 65932f6ff7a60ae1eb309b8e75f31c4ec8beba09ccd2345b0c133237e3504833efa66d9f811aee123681034360112686c04dd47766537ffe300c0dd8ab86263b SHA512 95310bc2b9e4ab46acc056ed0be8e75bb6e27e6bdb2bf2e0917482cdc86e64e5fb9159307016895f25282771fe3a367731d0e2c68c6aa5435154945cda52b6df
 DIST deelevate-0.2.0.crate 24396 BLAKE2B 0f83f6967423c52e21a01079ed4757655c12c3dd22d7da61da9fed981f112d2e4fc71e1e77edde541579f3c32bed6edd39c7871c08a2bc3d7f69114737d34d14 SHA512 92a7ef7761f945dd8fd8ead263dad088c233cab3a5769448f0c0124955c147dc94167ff06583694feb8532ec858e0a56c6f51b079e28d9d1526e176e1dac2349
 DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
@ -95,6 +117,8 @@ DIST event-listener-2.5.2.crate 15225 BLAKE2B 3a8b8fbc6b938fd6c2882dabc1bc23eefb
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
+DIST filetime-0.2.17.crate 14484 BLAKE2B c181cf4c3ddc5831c006917e7432620a62a0ca7aa379ea7f1aab9b99a8cf725055e8510f7f63ae5add770dc8f91c824d3b4e9e86ec0f3e7faa4e9a647c431a8b SHA512 3f7cc4e64381f4076ae04bbc0adbe2ecb024719f1f2fcc2ef537b0285261e03b8af7655d2db72358185dcce109df060d4a4a4015b3168fae0f6a952878860087
+DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
@ -114,9 +138,37 @@ DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a2
 DIST getrandom-0.2.5.crate 27719 BLAKE2B 881c4d498cecb55b2d89b1b382dc26e9f2f26df487460bf923b250e8d3131cac56fad42a35ffd4349cfc33cf8d890112578cab1ee6865a9e89090b35dc14c0c2 SHA512 4ae1e046a143c4ab818d130bb86c9fdd51dc55b70ad3e8a0378359341402636f69df27f7480f9c0caa26ac98b45ec88aea47b66ff000e2dd22e1ce52ba99e644
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
+DIST git-actor-0.11.1.crate 4058 BLAKE2B 688427a8dc5d6a1edadea948e4efdd815226453b0528265da455f1f0ff9efdeb4fb001592572bb4d732d7bdc845c743a553997f2373b2553fc4b7ce2ad6f4991 SHA512 a50b8e15296d8ec2dbdd5a7cd71fd7e648e6aca91deb19d78ad6192dfa9710eccf76e0afb2f0d3cadf788b14f7fbb6f909ad82d24e9924613945c237d523a435
+DIST git-attributes-0.3.1.crate 15306 BLAKE2B edfedcebf56a4e0d8ff050ae863b8283395d3b22ae1800d005713bb805c85cfa1275aa9010b7a308ecc5b557633229057db519582bd3771931fb889fba0a558b SHA512 ffe1c44b97386e496f521ebe1929b59decd448b342949012e5cbb625cfc96cb2567e80a0a33a5568cd1689eb08ad195a66ad51abe87a4ab97ef7b74dbf4f5353
+DIST git-bitmap-0.1.1.crate 5025 BLAKE2B b72a6dd54820796e094311ebf5af04603e852c5a752246738b731d18384133b8984bafc3daa4d8a1f6a3e45adabcbff982d7be3a5bb73a55ec0828592159df66 SHA512 d278a044b0bbcc27a16c3ec2d61cf535379c041262c15f8167d97def24d1a91f7e78cf4b430cbcd24d23370a2b436a97e088852e6c7b890988abe89dfa80f9d3
+DIST git-chunk-0.3.0.crate 8083 BLAKE2B e4926e033b188c2d5885abcfd44077ae593784e0854f41d32456bca0fe5323e65c060982d73e52d6ccfbc2e53e1bcf4e5cfe96a1cda6bc6872e2379b514b164b SHA512 2f0d0bcdb9cdce9ede7ec111df6a5ddad47626eed8e4c7dba8a192a47bcb522a35e5f1b004b356e1c8c8799d17a7f8de695d9da818aa6c5b840d747159eed18c
+DIST git-config-0.6.1.crate 107140 BLAKE2B bc6e52eab3496a9cb82926f09b98dac88c595b62a4dc6e89f1442a0a0b217acd077907a1da49d7b95810acaaa9a538750498952247d69c7cd9a643929058767b SHA512 982524463466ebff6842f2fcffd582214416fd8f5adebdad9ee2ba8c97b9756f2c78ba5dec1e651ce2e96c1c342da5480ddf5edc1904a7ed9236dad3e0d4bde5
+DIST git-date-0.0.3.crate 6752 BLAKE2B 9be1f19ce4b3dbba0c76527da4e48e3862fdf814d74b59391b680f93ecd95413b00703393c5af74ecfd799e8c7f090715da132e54da1feeec362bec9f020b8e5 SHA512 20cb73b93191f1a1151c780e069c8d7d60f09683be301126e7bbbec349aa3b390f895e99109f611b1d4ac3fcf09a322bc06c9670c5b9ef4ee6d7cd74c241e631
+DIST git-diff-0.17.1.crate 5897 BLAKE2B cdcf9882d07ed8c85a04f1aaf82a2242fd930693a0f10113d169bc63c4f92f536e282da13b552325d8e4b4537c38b4a6b870f4afee82fb75112b4df80ffd43f4 SHA512 90fe87ee99b37ffaeceba0a1c215fef71361ee7e98700ed42a693332756b5ab5745f941675519b9cd94256621cbc56440a95e9146b586232a3c786fe58cd0e90
+DIST git-discover-0.4.0.crate 17451 BLAKE2B 8b903ef3be550c5e0a606d625223650b22bc1dd453ac9bdcd7228f92dbaeec2a3df832ec031291b910f411f7484a09b129690272a8dda243222c6298b61104e6 SHA512 f4624c036e88c34aafcc8a6b54b1e0b07d2e43f486cfd516c28897e98f4206155566f7d858a24fa1455801240770d2fb595b67e7ee6ef29760ef5735f04c0014
+DIST git-features-0.22.1.crate 47243 BLAKE2B 9e140d43bc1e8378ad7dbb4123029b63d2aec20132ab270a8dac0056e0a2e7eeb89d62b71a5a8a4c69cadb3606643cdf890893468ca4f6bc105d9de996e26b56 SHA512 e6d118aad6bf67a8de988970731f2842358648b0f62040cfbe5e7299a60302247ee3dd43bbe63de9485a9ba6658182c5ace58253fa1ba24fc999abc31e28b54a
+DIST git-glob-0.3.1.crate 32448 BLAKE2B f5eece0719f46bc72a2398e4683eae020fd097690f04e07cb4b5367c41dd8fdc15f1d13458f5a918fce5aaa4496fc2cf020e49f9bc9d03f9331e5a4bec29bccd SHA512 b9b9409fc6e33e7d02a1db1f4a699c1cea05a88f5c05ee59686c1fb5faa2ab4bc7db8a1671f7ef45091583c72457bf816c58a993b4fa4a99710c25a6e6f5d18c
+DIST git-hash-0.9.7.crate 17770 BLAKE2B f087bb11d50f3b58c762d8f27320b324b965340acc17e45bc54c9c23f6854e9adba88f6fa2deb981468ee8a23a1fd903dfe8849ce8a407fdcc2de392ca5829b2 SHA512 eb88a1f25535918ada89d44bd8d3f5967c1a6b04b5e64150b17b03b4dddcecee119c6f40a5e99fc6e2662ee86e063eac59fbc2951c8fc45aa0561fe1ccff47cc
+DIST git-index-0.4.1.crate 36185 BLAKE2B e97702d494cd3f676ccba90977076748f6da40e96ad5fbd39456cdcf62d825895a5e795bc22b0de43bf739d6b4dccaef02e245ce66578d982c88f95a4e0d43ed SHA512 1630d6b0e5b841edd28edbd8ef9ca1a1c06ce3778a68351540fd0a27631c03db529aee77e608216a21e0aa1c5149cf2b4d2301d5ee53a4e301b88bc1cf85889a
+DIST git-lock-2.1.0.crate 15360 BLAKE2B 7ec2a69a061dd771e05e4e2915a6297dfa0331fb1910b100eb92305c18643bb1700e6f0099f217697b7cc7bcc4fa1d358c1d9f567d084472b58cc3061bc8cfaf SHA512 7fe6868f77c0acf3d09e31750a6d01b24b5993d36639aecfa1d55d98bda31a36e8dc55f9604a8dde5d06ed2b880fa77212cd850999eff2ee3b693e9c8c78e272
+DIST git-object-0.20.1.crate 23380 BLAKE2B 097223829e919aa844079da7a266d27f4091415b1fb100f52ce97f2e91d79e744b826acda94e74b0214511c6eeefb3ce36a9ea2e7dff12fde0feea17009e66b4 SHA512 984a8fc0066c3ecd699f81278d2a44fb0d4e46284a32a6250f8fe5fed31453a4adfa30bd9454b800a133c8c04642219cf4a1599a2d5df49f66237d6d6c82fbae
+DIST git-odb-0.31.1.crate 115404 BLAKE2B da48b740e72deddb6d640f609eb1466cbce2e697078977b976cd461f83bd57a90e5bcded1509c5b07e0d1f1bd6705171fbffdae15c52f6862faa778222520e67 SHA512 1bfd41abf47e646981ba05115ba459aa9d43a784a55b32408fa562c400b9ae7a544be2d38c12422d13c36a4f1be2cd6a549d5bc12c7e211bee10aae31cd89828
+DIST git-pack-0.21.1.crate 113315 BLAKE2B cc7b3f8cc1beb0c8a9f6905c5a92afdcb48542bccb55e6e2ae6101a1061ba6b3a9a39abb7df8a615bd229636cfe1cd0d7a6e55fa2830fee6b1145f527805742f SHA512 6f7dc1aaf70c2abcb5fb01f4529530d10d03e8f4d3d3a59dcfa0674f928fddb96374f83753c51498ed20992ebda26ca0b4c6a44db4b399ffa83bf328152abb42
+DIST git-path-0.4.0.crate 12514 BLAKE2B 5993c1d70fbbed73a8173e391512bcab8b8d741a987808b06ea3a310d97d977710cf1cb15312756cb1b046b7e66ea85253d3f2dee062a84869a8da2cd272699f SHA512 8558ec4d758ef010bbc2199adfa1c44524961cfea69c6baef74a80bc443510670bea076dc4e20327226e625d80db03c73d80cc2780b84a7a1ea334ae8be85c2b
+DIST git-quote-0.2.0.crate 4025 BLAKE2B 73aae6753fc200be2cf6226e546f9e21cdcfb4d5675a298506a4ddf507d6d0ef065beb16e8f1ba9c72565a9dd4288845967e3a936681d210a991917a29e491ad SHA512 a4212d87752acfa92a6cd06ba55b532fc09f58f5665b8f429bc760d0ce9952a2b29ac958d0789936e2537b8523dfb2e759e57967256e8b7e8bd2deab791f3125
+DIST git-ref-0.15.1.crate 49249 BLAKE2B e021b848b6cae4ee1be29831de0617261f165f987d4a307e57883c83cdbd41c938d51dd2749a950600c83de74f2bbd10f676fe3653fc53ec924fb56e7e0d41d9 SHA512 3512737733e5a3f18417bd8404c143b116e73b591f9c373abaed8f0c904640add631ac2264ce5f05a33a50e94a5b4b7419b3354b6e013b71942c1e83effd6de0
+DIST git-repository-0.21.0.crate 147531 BLAKE2B 07a32fddb38f2447b22ca4b3334a358f262afb673efdba1d01b59eecda489eb62135767e1401ce82eac306e00fc2d647004829042d698019ae407795756b4795 SHA512 62a900c88b4628ed2f2576748cf239fda6ae908bf41924ee5818ce36a4ce1cf12b21ded0e5e4d24f857d1ee01aaf5138d6a1741c6f7292a002193cc12640bf88
+DIST git-revision-0.4.0.crate 26075 BLAKE2B 65c03418f3cfe17bc27e08f71bbb487930a0c78c198ab1b76a2b04920a704ce5f35163213a7323de9a9e47540b75df1f9eef5a30bd317a20e376d132611742c9 SHA512 8e36f530c19e18fe1f5fc30af199c16d51ff6c5e44e06bce53d7e380c4ede05ed2c39e336feea01d9454ad199fb81a8b72bef58a906814b2147de968b2639039
+DIST git-sec-0.3.0.crate 9999 BLAKE2B 363dc484542b10498c06faf3a1b3443c26abc52d88ca3b0c5bbdcff4623342e467457ef5c03aab35a909b7e4339a63134ff4f469e64137a9ca4d0724ffed8a50 SHA512 a6cb2cd178e108b07ac809a7a9c6e1fbbae56159ed9cb87487d98dbbec7419925c86c43d5649ac596bdf82fec311bf35c8f53fba2939412dcbd7e1f3fc5176a6
+DIST git-tempfile-2.0.2.crate 27065 BLAKE2B 0bf0ea15e31b876082816ff43691c9e6853c0fe73ef12a30dae65b467e9235e0a4c13dca63b2d02a82a69545ecb1962eb1dae7912923ce172d9be608bc434eee SHA512 2287691ea16482eed81fcfc2d28b44c657b8688364888ca5e11665ff9887558aa9ba75fd32cbe9ac23cb30582df7406690df53d993a8a22b186af945e00cb43e
+DIST git-traverse-0.16.1.crate 6363 BLAKE2B 1dd2620215fc410112a0cc805dfd6136c021f7969174fa148aa89c27628b1765b1c421aea739f84d55cde4531ae8a87c9ef83044b14b10ebe7604b0436a41af1 SHA512 36132516acade393efa4586868eb41b752a98f509c8cfaddbb9b70cc3bf9909089171b3e4f0f857c78816deadaea965f35619196c16fc3b146852c952028efdd
+DIST git-url-0.7.1.crate 12455 BLAKE2B c27fd032c10163987f21cdafe3b1f0cc649d62e9356d5db5eb5e4c322e8c0a6357cc882c68762123ce3dac4b195e02ad9c1aa3ed60e070b032110c118e86c547 SHA512 93f5f2bb4dde8b328e5661cfe5f1a6dd89c96663d23d69e0c792a912677cbee923176ed086e30db585c26d2803e18c4312f3aa2a6c72afcce945d45842a24d1e
+DIST git-validate-0.5.4.crate 2609 BLAKE2B 5de62dba7ec9f88415f21e16c23eb9f96d8d47f48bd3ccc9e5103ad2f994b79dff0d53d66b6330e8110c3689fa4cfafea839ddff2e33d4dd1f6c7882ecf3245f SHA512 8b5653b18dcfea7a554b36d8d89b049c8be880e13ad49fad328e4ad7e2505350276f47ebd96ab133dce99f4fce6c83a47b8a4ae4acd58cde7e79c2d03df142d4
+DIST git-worktree-0.4.1.crate 28076 BLAKE2B a80e6c97e43360dfbc073c2bbfcf8f875980eb7e30237e6b3b1dbb78a8695df8597025757f54e9580c7398517312f7cb8ca92d3272f4b8cf93a6478b26e70cc7 SHA512 fc7e5810c72aa14f6ee180832c9f9bc82873eca14d63cc051628721f905d118f3eca7bd4aaff04a6d17a2aaa0c8dc6a0c7c3e2badd0a75b239a847256ba1b094
 DIST git2-0.14.2.crate 196856 BLAKE2B 09ed89e5eaf632b1bd9c33ff7afff78808599823804668cb6f85925a8d61359300b460db8b34e6562b8289b79b53094df4c184e013a8d4d4b58c510447fd0ec8 SHA512 7e4c0660fb7f48fda3ed73bcd577e2a40eb44005bd1130f9fbc0c515bfd155ec75a2efabdde99661a7c4590e52a749be4342397b79a47bbfe8f4fb8fe160dd22
 DIST git2-0.14.4.crate 196849 BLAKE2B 020e8c87fedb49fcf38727a8c0abc975dce2b70dfcb1db996e526967bd71455be8f81ed7d7e58d56e584f34adcfa2aaad7765d262b2d4899370ed9e0a7e2175d SHA512 05a5894eb90e5371525222f69321c2376f6b8e0306a04ff05a9917005ca77a86b6100ec19338e47265599f3a61603511991ea8664e7c64702a580841ef98963a
 DIST guess_host_triple-0.1.3.crate 13984 BLAKE2B 27ff34cbf44172f606bf8cd9ed614e60fd018fb7cbe0a1b3cb2ef93f311049dda88d5190f6b39c05575ae40145477dcbed7c878a23bd15c291a92017653c6623 SHA512 6cfba546aef4d2ef4f3da9097e11085cc48d92a80b5d76990a20f794613281d766c6cf37c3b845f71653342b6d6a0873cdba9d2dffad806185e911360488bc6e
+DIST hash_hasher-2.0.3.crate 11057 BLAKE2B cb4bc67a258ed3c340dfff78481ae085391d44a45383f2976287a08b505c014f826d7b3f5d87c832b97af976bfd6b77ef4eff498f806649222f365e8a72d2ee5 SHA512 de542ae43796fdafb843c9552d812e325cd8e8ca66f74c463ccca730ac556bb210885c16cce1620fead52737825b754d152abc333d8caa05d9be59e540015895
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.12.0.crate 90663 BLAKE2B 6cfdd2de3f1dfd89ad5819f4a9a33227c25fca2d9b892ec852635e5f3d4469acede1e7ddccb914d9b90432e03adc254ed2d1a630f47a845f7580723944116a41 SHA512 11497d1278af7f758d76daeb7fac83ddfb4ef8307c9d9db03ca73f10885a074d1567c3d9fb2a233aed68a0fcc77a75ddbb579734248ce5da61b240468f419dce
 DIST hashbrown-0.12.1.crate 90855 BLAKE2B 0d38ca94f1a7b750b31bc5469ffc1fbdb79a789d0410dc51583f0319569c94ed03b7a8b5f02972cd370a48ad8252eaa6ecc6eca4cb92911ae7366992b9b43cba SHA512 a037554dda19d8c1d79e74fe59f0297855173a1bd0b119c8fbe724b18a07ec7c2475162213d2502483279712a46ff1247f1681aceb97f67c2e7a53b60779b418
@ -125,27 +177,36 @@ DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
+DIST human_format-1.0.3.crate 6718 BLAKE2B 4e8c43738c2820990925b8385072df14cd66d5a569e530f9b3a3a5132f0a3b4a8f3d760a48e50515ed934df6a91d945f3eaeded5561683b5cb4e1ff297c0890f SHA512 a91357f791c136db826fc4704266b20d7acbbf681cf4b4c7e43ef3ae33f22a31bbbda13feccdddeb33619ceab61ff593ae431ad2816645e8a4d6c6d7b48dde77
+DIST iana-time-zone-0.1.44.crate 14640 BLAKE2B 657838c5c0f7dda845f0e384c733a4a225608fdffcc612469c6fe7e3f19e0d8968e9e4e3b3bbadaf9f8e4eaf903d4711273b6636a983e5762c31cb978db60f97 SHA512 11ece1549198d8b97c1922bdda7ecede811d59ae8e627da128108521eb9cd2b78a9eced3e2d619f542ac12db2e60804e46b116e813581886b15d8501441030d3
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indexmap-1.8.0.crate 52583 BLAKE2B fce94d24af0ae74f8173dcdfd35bcc51a23451cdeebbcb10c92dda74312c1ec980e925020ba7bdfa9e4a54b72a619068ca7ae133eea66a4df8775595a3a3551a SHA512 6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43
 DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
 DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
+DIST io-close-0.3.7.crate 8025 BLAKE2B 3ae34374d194407200f327695e7525268d03e5c2e8a051c99aecd1d395407197f9e6ba39339f67ad4ac249b8be63e4595993e6cfefb2f0b421bfaf8d655099bc SHA512 0cc06245da4ad9f8708ab03619734dda41d1cbb2777a7944df10e2efb0ed0a6d34aab3ee55210b05eb4507c802d01a301b6718ddd6cb8e2b4abdd2e1be11303b
+DIST io-lifetimes-0.7.2.crate 40632 BLAKE2B a8a48c9783bb1fc12de785008ea0843b48e6ca6e1cd014e66df54af4e03de1151a929f320381107a75b375aad59c3b476872a4db47e3402afa672e87836f5db0 SHA512 56b4776909ef9986e4aa343391bb839861e0486f8bcb6307dd68cfd39d186ce70c3da669ebf324f5a0d07e720f8cc87f7c4f7e15a0e7440db712b3029c80fb01
 DIST is_debug-1.0.1.crate 1897 BLAKE2B 870200e87f264b1e3b886b9a103853de480ec6d5fb4f7bfe4943f06d445d7c7c5725cdbb230acdc62c8520834c4fbba2145c7589a63443c56a11d7d9d2504ff4 SHA512 08eac6f8ae7eb63a9c90430572c3e76159bce772d78eb892bd93cc53fe05d4706a72fc9408c72daf6f0a0287cc100dc201b1a197de4d7b66ef4e8e42f43ef594
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
+DIST itoa-1.0.3.crate 10481 BLAKE2B aa516e8b2fdea4e4e1260a0783fb7aa2672c1bccdf519c45c608fe3f3fd4fe652d7f56f0cd6eeb6a56bc324c68ff241f601660a0dc3c5ffdf7fa239f470078ec SHA512 1290c027ec8a13d2d15ace2b58a1d1a3a18730cd5fb55bc995826b8f4d04ede650b8315a8905f6737c4c4988690ae03bf32c86ab3a31ae068a67d5be04cd618b
 DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
+DIST js-sys-0.3.58.crate 78794 BLAKE2B d664fda1e19a7ebb621596cd4773e7ebe86b3749ec8e0e45477d170aa472a80a75bd0ca7f6ca47c9aace5e3962451039b1bf44615ac77ee4db21f46d673943e5 SHA512 74656493c36d9110aae99f58cf1f72a1c89bd971c574ceef8194f68387bcefaa5e93aee736b41a1de1c192113257bd544948dd79a227b5451d13ba2319b58a15
+DIST jwalk-0.6.0.crate 27419 BLAKE2B 72ab6e324d0c87d2b8f557ced51577da4671c41e3a48354a753e88a8834e166ee0c13bc180a4215644ac8dc2852b26bb0f478a10ec00776117dfc3fa755f2c47 SHA512 c39bec3bd93b001db7f32a3195f18c51838102ab697bf132c3d5851b9a347401cb103f4872fb5c8cba0817fc5367e78cf44e530e986e4ebf0a0fea4298848791
 DIST kstring-1.0.6.crate 20728 BLAKE2B 28d5fc4553d44658bcc0eb06e79ac08aa3b2e86971e354ea50e51f349d8e5e74edda491c5c3cfadf9111dbcd19ecc42d73a44f7f3fe0590225342f8f4517ff84 SHA512 e1920ab6da39e414e0f89e0728a1993a516d201149a922e58a326c5392891919746891a61847f0c56b67d9ef5d3bc346cb00b2da1325191dff7d9661a5a12ba4
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.121.crate 574702 BLAKE2B bae9215a7318e5b5b6d821d2320ce28e883d04af0bca40ede49b9c5d575d28307b07077b3d59be28347bffc4c69d6c9dd334733f0c519c16de704360f6fa8738 SHA512 aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953
 DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
+DIST libc-0.2.131.crate 595288 BLAKE2B d6377d0c4248068825d9cb78858e8204fe16fdfc9de81600a0312edd7479c73f61fdadeed214c11a67c4eebf242056ec1394b0d9e5226f63324228843e913837 SHA512 8f73e01e3f6d2283917e5fc01bf7b3fd69035e533fd6320b55e46fa7961ba36cd8e0613d6cb652ee9fe6a535b8d7f3b065844eea376c060cbc192af237398aef
 DIST libgit2-sys-0.13.2+1.4.2.crate 1492799 BLAKE2B 9ac165dff195d4ed18677f9cc9f85e79a219c60c3477880a35340d5bcd0308c7aca4015fa3c213ce56fc20a237c5f1d506ae936335db4eddf06617c6072146ab SHA512 54d7c11d930554dd10b112d878dc7ea473c7d45e74d394e21e99f5d4632741f49aa31746bf2594705d337b5b64e6b877e510938ceb2117837c9a6f685ef8824f
 DIST libgit2-sys-0.13.4+1.4.2.crate 1506315 BLAKE2B 87199812e8dd5475c3c659e11bde4a294951685880e9fc8771b3a075d351d02a1eecb5d4ea039466af6b9d90b5374d3d1369195a442ba60c596669aa2e25af59 SHA512 71e3f4ed8a123109ae1f0cfaad90092bbea25658356e6eaee3135d4576ffcfadd83ada28367459dd70903ddce716bed6278388e294e13712dcbcf8202e884548
 DIST libz-sys-1.1.5.crate 1494933 BLAKE2B b53e39d2a1f0db29edde3f03cab97e1970f9903222777e2a5c55b265a5873a0fae3927724d592fe754e04861aa999e0b9b22122ee09f836ece8d7a0fcfe20e3f SHA512 51ac64c26df57d91f4b7e089600e283354ebf636d8a50ff530ddb031ad0eb74601aca687a087f9e7f51f2b00187d8daa03ca2999ea48ea274c87ad8c7ba8d9ac
 DIST libz-sys-1.1.8.crate 2481844 BLAKE2B e890a3850aed5348afe7558168c7571564687d6a7d3567a4d53ffdf79444d38c4d70d35891e16f496f31169bf73b669534f5fc584f9ec520b518dda05e80b882 SHA512 0766ab72cc1414160ccefe4812e6204cbed1341607e5d17607f24fd4ff81dca68d8f2cf43e1d27f332a508d602bff0ad340c4c647a5d5f85acc120c19cfb4100
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
+DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f8bb21109962273689b284cb4d6756e6399010983da813f6f58664d6191b392b70ecd161518e8ca0fb46992bc3d23adf SHA512 b821ab53d9a885b9dfef6eb3d36a422525cf35d797fe32fee3abf9bb5463712af57febf684c9ab41b5de40c9b0e73d9e369599497f7a7f1314ff455795d32b39
 DIST local_ipaddress-0.1.3.crate 2255 BLAKE2B 332fd0ac07f026df27d072bdd52385de99f342d6d457b3d5a69d1c8e5603a4d966a1f3c214aec715fca2a5ef943100a707cee8a449a3c205b6e56b814966b866 SHA512 b63dac8a36821c1eceebfd05019f277c29e40c0bd06f7cf4ea275b5b34710ca9c15b36cb47c02b02e49621d6de813849f6acc104e0ac24acbcefd89b290b8869
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
@ -159,15 +220,20 @@ DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b62
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
+DIST memmap2-0.5.5.crate 25900 BLAKE2B cc19e65f1eaeb3beb5376be21063d760017fdc2d3949a705477b067b839b85c5bf4df21216bf8a26f2fb7063cf642c7a68fc2fab1f3b8fffec43c602fadbf203 SHA512 a7fe5b5987805025e0ab5289b6888395fc4d6463ee61d0cb665344f35e6aeb1ded8595a847b2829c132ae91c88358174414bc93070652c63bc3cd221425fab95
 DIST memmem-0.1.1.crate 10665 BLAKE2B 430da33ee602a8aefb0a827afd288cbf0ec16f1d5377f38d17e44dd1d4cf5847b2123f50385c911423ad4b72721fa5b244e4bf093fb2fb1d3ceb53a3782a6152 SHA512 f4ee8123e0263c30898ff1e397bb3daf4e027aadf520977ccaf5bfc4ec8158b398a19bae6d48a85a084e43d80d5ddcbb3cbfdf986080041ce958d2c8f5eb897a
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
+DIST miniz_oxide-0.5.3.crate 53452 BLAKE2B ae99baa01c493b5eb779595be0d77a064c4624397676d3a023cc2a54941b0b3e7c80492ac47c8a28d78ec36e2f04aebe5af79f0e714380061c5e0139b9dfd9fb SHA512 cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5
 DIST mockall-0.11.0.crate 21958 BLAKE2B 48116ecaf91215a834ba7d1d5d133606df65d84ee1acf6dfefbc5470055cc5bb2fa0e40877b0a0ba47df516b6154e207305bdd69218980bb024b39b22c38771e SHA512 bc90c254a5eeecc71745c4bc3f63beb4884d3a281df2119809ce0d7e01aff9051c9d5e301fd1aa6db08272b4beb509bf19e052f75b4e8d3110d9402ffb7fb302
 DIST mockall-0.11.1.crate 22030 BLAKE2B 04137c18a567d6fbd0172a31be1cd493020342a7165078ebbbc5bf4f431c66698e5f81f7e6bc8ef34b3f88953198e730861c7bd047cd9617c05a7748a6e390c6 SHA512 18f421d03378331634d2bba55d9fb18ff4a9a3cb20d910b56679a5fbcbcc05da9f7da2f768113437a06ad7e829447dd7ec61d896ba550399053a0169888b285d
+DIST mockall-0.11.2.crate 22161 BLAKE2B e617f14e5be4f327cd01d1eb588f22892c0eaf53e95120fe49f61123e75130e4355298e30f036458ff0b854a58eccade60a40a4208a570c0f4dba99025fbebd2 SHA512 dcd93dc26f80209e13be528c254e1cbbb99151bb570215e2042c42beda1b23fe9a696038e901e13cc6c7f70c9d1cb5d41b77c0789729aaf0a2466e6dfdcfa11a
 DIST mockall_derive-0.11.0.crate 43270 BLAKE2B f3418a596fd7cc63f8a167b6f885572a37783c727705d218fe349259609238a44381260639ea553ba803f4980d667d2bbcafea6cb97db64a6b9b448c7e458ef4 SHA512 9220a4a309b88b4ac927b277126435f6118a4be743b0ba87d37bff5047a994831e7b55eebcd9a5a9991d35ae64f83cf59dc4f15d4834292bc64919b90e57d10b
 DIST mockall_derive-0.11.1.crate 43547 BLAKE2B d2759a242a44eb0705b207a8d6cd546d7e8941ed64f37c09287ac5143c6239d61e1e3efb96461214b3c13050662e8106b97adae26b2eb84a71f95e4db9ab6d28 SHA512 f1d9939c530efe96153d68cd141ea4e3dda8c656e5105a9664cf4f09f7cad6b98eed6c3cad287e1f4566523415068316bf8faa66fdc632da3270598f10c7519c
+DIST mockall_derive-0.11.2.crate 43715 BLAKE2B 0d6114f03ff8f78da62826826d59d14d90697d2182ea2fd9eba057b4942b5a114132dcbf74adf456a5a01558db8d4183e3c78a01e4cbd228a7ee034924e8fccd SHA512 4ab0df145a0b0dd2e89e458a35dffe9361cebc6b9aa2f4cb145e4ec281a1d39e105e7ad3907ef673bf98c532c02eb8700f852b32ce844f7f7198f997dc6788e9
 DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
 DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
+DIST nix-0.25.0.crate 269825 BLAKE2B 48d673485e302feece1f82df603fc44d4aa91cf650ad2fbe3c7b2b28b1199f38be2869cbf935a6ac361210ab506bd67f12806b2043b66c27cdd28f26ae15be13 SHA512 1a244469068946ac04e0dc83b8f6a578ebe70e969f232263736e4e9ec0d94fcbb54772c4dd570c4b0d1c2c7395af64b9e9a8a6f7eb7b97592b4a91ff948ac38c
 DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
 DIST nom-7.1.0.crate 115647 BLAKE2B 5adbe8250d168379aa7051a4fad7fce3cee74820043ba8233f1016417f91ecff64887c3bec1dd6bf4cc6b3b3803a2c19a44513f1affc635d8be6212bdc8ee47d SHA512 aacf14e84be17edced412e3d256734508426a8acb8352e83a5d9d4f26d640f60a881d8f70fbc6edf1843173af63ec05be7694fcd6c6287d871e40518e2ed04ee
 DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
@ -187,32 +253,44 @@ DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
+DIST once_cell-1.13.1.crate 31335 BLAKE2B f8455c5aa78073289669b8f277490ac9bfeafca3249bd54af91a51709262562f07e3154287f7a7db1711d0884fa2804aa82df5d7efb90b8ce5b2380c851be23c SHA512 492831607d12846923107b464a70de62f5997845faaae1625f3e54e2610e96b0355ce9e554051c2fae28f7e6e558ed456a6fc0b3c6a71b26f7443ede5eff5b32
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST open-2.1.1.crate 13687 BLAKE2B be1d10d6d43b6f79332aba5c44aeececa32122914313996652c06589072ea154a782ce291a09a025a731ea90ae4e1987e62ceb07071549f886415ed1bf6de20f SHA512 8de337ec58f9037e1635e1efb8b383355da96355c189b90f9940ed251ba9f8f22d50b4077cfecae88f1d00db8ec172efe27b5605273750d728c86314c807095a
 DIST open-3.0.1.crate 14954 BLAKE2B b59df22c52879bd6a212c0d299120e7a62fd717a24a543b0e909021bc135d62de8fd52f5958ce1ace62ccb62ee73b8c98e26a05156bb6a6485a6ddc106659d99 SHA512 6ad3ed2d0f5a82a7ef78fbbe7e3f1e4b744bfa46b0321f21382e9c5b36076b03c1c36e267fa72db691f63214056e9b2e3146ec0f61075a77235871014e9dbe11
+DIST open-3.0.2.crate 15275 BLAKE2B 6e9ade8694766829fcd6ba048dd59ce7da2ca7cda58247c223c0f445295371bb9ea9ac18b928da8dd63c8624c218430c8c73f751f5683815d50e03cbec4c6c1a SHA512 4b5b94a34e80e9f329a8064347dd6b6580dd49a7d9555092ae8697af00ac71fedc49cf5604d973cf2b50c8ab009018001a7dc382e89c4726ffc08e3a56251336
 DIST ordered-float-2.10.0.crate 15589 BLAKE2B 76561b2ab32b61ae69bef039f5f4636a05533cb8002b894ea18ce776ada1b5911c3067af2318126f359a305d7a9d3844053be62af1cbd2c3c9c1f45443a1cc9c SHA512 cb883ddd723d1bedfe13d16c9546dcb84d17d4fb1c6dc6d632a0c385d80b0b881694b3364a406e5d7f073c5a7e9e80810f343dd1d6f22df6188322b3e89cf77f
 DIST ordered-multimap-0.4.2.crate 19623 BLAKE2B eb9d667c1272697188b126e13513b731e9ea4cda37ea221b6b8e457d669275d0508625af9170f6c8d53d186f5655498bd95a056c85cb2f5a31b1c4fe18b0b779 SHA512 594de14ec90ab595a6a7fc724cc6f8b476fd0b01a4024448967f7f47f1e8287cacd129f4f9547049ea9fb4f37fb8ef9cf88d0f6223b6ea5d547508108772e5fc
 DIST ordered-multimap-0.4.3.crate 19599 BLAKE2B 1287938e6bcb26c3e377fff6c492adfff7ca05fcdb5881d76edcf08aa89160180e6a2c2ad40b162e75997bc9fe36204c50d839d4305911de231bfd408345975a SHA512 92d02f260d912c70bc51a4e943ecf7be7e8211ff515dd6aa6029fbb0d0f67b8c689966b23e32520fc5b437caebab650e18a16cdd8b2a036edc91645faa9e47e8
 DIST ordered-stream-0.0.1.crate 9081 BLAKE2B af4a20ee320b7317bd4e10996f5996279673e99c6fab81c7d9970dc5b540eecf6616de2b3abe90eff99287bb5dc6b338a57e15d346aaf960b92a075af63ab957 SHA512 00b535b795d134aac6a1ea5f9e387a75d3e42b5ea9b91f49c810fc0c8e49a56c2d363fa8af0ac2bb19bb65187f154ced9efdedac28e7f29970a61b3341bb1092
 DIST os_info-3.2.0.crate 20477 BLAKE2B 371fd4c342bc96f0b52e6e7957976d95be29811c4b0da8ced05363653e05886edf58006e788f77d93d0aebb324e32cf5c01b1a64f36f800316f097d7a6e81ef4 SHA512 a0e0771b12fcfc36dd06753245945723684aa3c96e2491fd95eba93e9f4c753f73fbf4d3e988e5ed8b9d7f98279c66752e3bc138d04c224e6b66b333fcc91409
 DIST os_info-3.4.0.crate 21316 BLAKE2B 5bc4df84b238bda3a7440588dbeacd8ed490169f5efef8623ad0342e977b230afa07ec91637ea9472d213a48a583a92da46a8aa0cfaa931d3ecc314d275b1358 SHA512 17c398759d8cca08b4042f1ff0af243912921668e94bf45061d2a054df2c77010cd952f971ce20fbb5de2d2c3882b0edae868e71f5f1dd1393cb254050e7c254
+DIST os_info-3.5.0.crate 22485 BLAKE2B ec794874df1f927736f1fdff95b82a60e96fc670dbd59b8cf9de1a0648c25fb4f013aad07c35257aa599a8c05c11d36d4286ec75ff6cd136f626475336d38388 SHA512 d3f4c0251a3547547d80153ed2dfa581b40919c524062835e6e9d6b7754540913a1e785a3465c4ef09a1f925b82e074267e6ddbd10e116ec602860fef32773d5
 DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
+DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
 DIST path-slash-0.1.4.crate 5771 BLAKE2B cb4ef02743efb500d37669eaf83b276c9b47d79d460366d8a210fa89e15a145e36aa3a7892ace4093730e3e56e7fdc744b6f0928395ba0054f9f3530b09225ea SHA512 c0d14ce827e80c4efbfcf1abd67459c3327686b2c8644b0af16909bbb9a8952c14e91c1b68b988396f99c85edb4bb57dff9bed1d3a4f53e77edd9bf3d80284f3
+DIST path-slash-0.2.1.crate 8821 BLAKE2B b3564d0f689ad1b943d132fd95adf2ff654b61f182082bd22f7b8f11dc9024cae8e1b9f3551c4424509db17aef899efd3df96a67e1cd588ffe0fe385c957b361 SHA512 c046707586f25f13d2f9fa452ea340198f6d2e6333ca3af806b9d2d1a61d46b033fffad60d1632ec16062fa79a3710d695b923b831a7db52602b728ed31fc3ab
 DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
 DIST pathsearch-0.2.0.crate 3463 BLAKE2B 6e1ce6e06e12249be3e03096aea7adbe27ad1b34a1f8921da9b287cd5a64d092dd8347fa582da05f069191e1c370d28ebbf875be7d44f5e544f1be8da75c1de0 SHA512 22b0da34d88d264cd920959202053fcb9384160d7ac241c2bfa27386fe5827889a0daca06b8883fb0d6ea38caffe5192f482c1521b4002d09d8e719a3ce4574f
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
+DIST pest-2.2.1.crate 83657 BLAKE2B 726b4ce875c7c724f785e50fe941e9d73972d338a3ae1309f0a186906f3072019afb1ea43ead43354fa296a6eb63750bb72b9051078832748ec0a945d4f0c47c SHA512 f3d93f48d787bcb66c74fe8677683e735d92d42af70937ed699d5451283af6333ca871f3d807f29d514fa5f2dca8608a138beff7f4d30ff4f216807641a9c400
 DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
+DIST pest_derive-2.2.1.crate 14146 BLAKE2B de6a1980535c6233521787ad781d186f92dcd2d96b62b0435acddb47bb8a8a0e3f64b10686e81edacc96e63eb043863a0cb04b8cfea71c413e0cf15b807b20a2 SHA512 770e52c7f34196572951041212f889128dd647160681f7c7389d23cf42b9a1055de12662c4b6f3998f97a7afdbab3f124e76cc81dc986587ba928cdf8a35fcbd
 DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
+DIST pest_generator-2.2.1.crate 14252 BLAKE2B 68b785eb09b155e5b4ea618d46f17f9ce80f489554a3ff28f31e7ee45219e14f3910139bfa68e891fcb41bfdbc7624b7b9552c0d62b163223ae6f6acaa1e6206 SHA512 d3da685318e5a8c0dcff7c2c5089a8729452d5226daf09f8e43f7baa1cf7327ed03767b05a9cc02614de79c8368edbfd736563f158488c0db7236e3ef59ac95a
 DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
+DIST pest_meta-2.2.1.crate 28303 BLAKE2B 0298a7e038e8d93afd68102b7b7c0d40329e444bbe220669364794f876ebc8517929772c223fb653955e4348ca5ffc94ffc691646cb29ded79ebed7a73d1ed23 SHA512 b719463cc2db2a015de5268ec7a33bfae448bc46f9ec60b0c879b5a894595bdb16ccc60b35675227182eb971b627c3f7c4e1157ab1dc54ac1f17f9f638d858b2
+DIST phf-0.11.1.crate 17232 BLAKE2B ca7932652a154bdff90b0260439c74da70e5c01c69f8ce2f0f88fb95247236f3a9d9e509f5deb36b4c3e9c23294bcc30ad415f4be5cf6e36bd09c31b961eda24 SHA512 d4b020ad259889828cf224a1d70fe0f78498c4d40c375a1c437a60d9c9a1a9c623737da54d197c358e0557e6f0c5a35a9d64198df90dc104d11f5eb7a17315a6
 DIST phf-0.8.0.crate 3902 BLAKE2B 3f1d4f9c23cfa2a3a0b7e4f809ff00783d71bb4839b27246d5244e5aee61a211498715ed576f00749e8132a6af1cdf50b2eb27d2f49896f006212981886a0e44 SHA512 a3013c4106ba72aa3cf22bd3f903eeacc24ac7cc47aad791bc5e9a63e1aff928a537399b6a86b0346c5eb37979ec01b404807e622e79a0a70a0e01e63c07a47f
 DIST phf_codegen-0.8.0.crate 3192 BLAKE2B 65c733fb896fa034c97482d122a2ed4c39d763cbb65ee48a229cdb320910aefeef125674bb1305a4a12f5fccefd71f859e33cb26c3e6be09ed8f776f9ff9b463 SHA512 6649779b50683b1b83c89da921ee52963fd517660540148e9ba4b59f9639c705e08400c4da972880ed161564816c7ad45704d6bd51d1429717137de8f46cb941
 DIST phf_generator-0.8.0.crate 7604 BLAKE2B 936c9ad95d2d5b6b4bc97dac9bcf99813462950f6280d9cbb8c8ae9253d3197f25b8173c202cdd51c4a2d3f422ca1d6f5c9055e7a87e45b2dc5fbe5aa6aa45ce SHA512 de045f47567defd43fe32fc62191a9a892e5a478e1a84b853cff3005e94967ded68e5770eacb43f2e97e58b8f4283327a38a3bdbd55e1d5c708dab601ea66270
+DIST phf_shared-0.11.1.crate 10320 BLAKE2B 9a511bdaf3c74c48da231effcf7e65935e7b0ceb9271a3d66f5b15fe13e801b8a7eb10ad5fe1a07913294cd070ee9f9ef942843ddc1a29f51c76e7baa62f8eda SHA512 0e6968aded0535c3430474c49378420fe64809ad436cd39e331c8dcfb1759605df12a9fe78db75bf0761bfbe8beacae4faad2209923327cb41f015f048fd74d1
 DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
 DIST pin-project-lite-0.2.8.crate 27847 BLAKE2B a9f192e644ee443904becb1ff5cc2179c7c9a6aba5b64d2e9998f9b4b8f8e95f5d54b46963910756832d0ab1b55bbc66cf85edc94b0d04e9a8b3f4ecd4719602 SHA512 9ecb86d550f4440e19eb16c6a9a418b5c4ad859ed2449b02f77d4b07b1e3e3e6b6b7ffba44a358958679342eb21222992fe6fdfe6d9bcb7a699a3e5816f1bfa8
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
@ -232,6 +310,8 @@ DIST proc-macro2-1.0.40.crate 40559 BLAKE2B d83cf7283393a82ca65263afc375d123bd2f
 DIST process_control-3.3.0.crate 16041 BLAKE2B f2dff984c7de4c34b5a7f021aa336949da1ce6b0a15b70eb654ee544a8f3696fc96268c1e07e4065682c273dfd46a7b2e624cc50d7bf3de31dd83d768c262265 SHA512 77788920ed27e3694d9c55cf861882daa4af38c0bb5d342ce4c5614c1bcf06ca8bc1a074587d77082e8be35a7fc96786b8923d87a67b6090b856def2e82a0833
 DIST process_control-3.4.0.crate 17333 BLAKE2B 33608003c55e6adb12ed8d1c8a429ef9d0492c215cf70f192fce2681eb31b1c4c69cfcd2f6aca7d55aca9d3745689d1db5fcba863c6ed64df5b0b74d8c152807 SHA512 c672d33c0648c42454d7f735da9c60b828f9b5e6c6f23caf6e3347d69f3f0e012cf1867d431d4a784df578f1fb064ddb22c7d50a68e9a5b4f0fcd77d633236b2
 DIST process_control-3.5.1.crate 19014 BLAKE2B a6eb37e17609b196a9c19e98c33b718b1b1d592877f27b30b3cc71fd7023d76de9199943757ad6dd293fde9ad46f65213197a87f97fad5e553ae2f56f4e1d770 SHA512 1402c33b20a757b7cf966ad69f3d4e0722a8d0b70948bd2c91e87d95a6efdeefacdf2bfe929845ea17ab310fa1949ca9abe4e1e2b423a5aa48e7e9594262e001
+DIST prodash-19.0.1.crate 80118 BLAKE2B 8254f50cd9ab27a8fdcec4bec2810920746dd97c278967dcc16fce103d68b0a7220fafa300a999620239d9e76832ae261e64a13e070a378950111a9ea0c6b63f SHA512 a419547de806ddbc3a7ebff7c2b38ca0b337305e61a855a811c6f0016adfdb334d89e1dbdba9430d3be5da73e32c3d89c0f49c468f7fd2a3cd4da3a150d27b3f
+DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
 DIST quick-xml-0.22.0.crate 132066 BLAKE2B 1c1d71fdaa022e430e6265530f3e40924c13457fe422e4355eedfcb5ebe8c75d0205f73ffea0968d8196d74804d7d0fbf61954852c98831d510af6c45dcf6923 SHA512 15e56fafc84e62b219977c5ab0f07a021bb71216d7cbb673a7ffec4ec6bda36f97d7b7034751b0b7d745df7c17c1a591a281cf2c97aa4fada7327979711ae3dd
 DIST quick-xml-0.23.0.crate 160655 BLAKE2B 0968988e58f0d6d37fdf73c9684ced8abf6a3aaf2f0941eacc96876237575358567c51b4ccb8a0d4864c6af02d59ea87c2e70b4ed201a537d3d634783c6b1f18 SHA512 9f2cea83e81e7f5de8a5ccd883c9d83cebf9169ffeba5a7355aca9925c7d2bb2216f0803203b91709dea292f89111bfe1e9ae6d34e84741473df5b00a3b21340
 DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
@ -257,12 +337,18 @@ DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
+DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
+DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-ini-0.18.0.crate 15439 BLAKE2B e225973af6e7d8a8ebf0d37efa913f5eacf8beb42d30f759135b18ae6fed091537466afc7e2aacfe1d00514a76eb4a8bd99ff281859ca0f7c7e0db3c6d6fb1a9 SHA512 2907d0891ff2164deacb2f217b4b8484bee9b2c2d32c354518e9b4d74069639bab55190d0d8ca6fb0751180cf2be1477ed9b100e3a5cc9f02af52ea26f32ccf4
+DIST rustix-0.35.7.crate 299025 BLAKE2B 04c52f7ac6e8aba747908c21f51ad72c2f2d0402d1746b8e5de479ebd55937cbe83086ac8b11c23e60e0683219595dc83cf5fe696f021e5c96af76a97e6435d0 SHA512 051507cf32747c62a73a9deb15633dcfd6f6002d2c9808984de9607aac946ce0810db74d541f264fcb57688e943cbfbb5394c5398f8739e10d235988aa9d5261
+DIST rustversion-1.0.8.crate 17351 BLAKE2B c3da61be9dfefb7da5c70b434070358ae89d6d36007de0779e8dc8560e6f97a5a180451735de15b3b2a2260d489d0c93919e94112592a46549676ec039d03f00 SHA512 5424e1ea0ced9bfd2e2732b087779cc04ade70bd5e62e996937470e2d103a3360aecebb16ff7a06c00eb901b162b55aee13aea77e73d5b430be8bfd341489f59
 DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schemars-0.8.10.crate 54189 BLAKE2B 346e2cae0a5a51a931d3bbf78efec81d5c3740ca86450ee153aca3554f97600d0d9034fb047897880a49f8c2da05948476ae67d2bc4690c533032df70df853d4 SHA512 7d7617741757ee4143565f235a837684b13ba916ad93662e7e6189da01fca41b66f1591637b34ba9f524c8f4cac6bdd074b8b208d5926c83f8e6201694b732e6
 DIST schemars-0.8.8.crate 54271 BLAKE2B 060336e06e4f749619e5d15e9da3c503a980eb1d9dcbc142d6ce2c8e7130101238dd968720b63d76c4779bb199c181b1b64da8ed44f0aed6d8a58492241c4bcb SHA512 3fe2ed6baf6416ff65b3b9e10ddb0345ef4d08a911075f0ed72795d8008ccb4f77879dc0f0c6eaa1f7a2f4481fface7f7c898d03fdb0bd30841ea52229ee1b39
 DIST schemars_derive-0.8.10.crate 17832 BLAKE2B 0d0557ad8021b0e7291b0472b20d52754846e8b663ff4ee1b9f7d15af3829db7b3712dd836a8aceb1d136d5fecf1ebcac4ea61690dadb6e8d8d42ffc0a48e3e5 SHA512 a70689a1290f03775395a5611d5e2723853ff1ffc7d1d33ac5fae2197884cf9124ef717e9a5758a2fe0399169ad8558cf80d0bdd111ab9986f4e9353a2ec5364
@ -270,25 +356,31 @@ DIST schemars_derive-0.8.8.crate 17213 BLAKE2B f7d23ebde35d32f91da08ff4e021af2b0
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-1.0.10.crate 30912 BLAKE2B e0addb727cfec75ac00d0941bec66433f549c5e731a86cf19954c1c402cb5a6721f20af11f1da87370791fd71f95b1febc1b9c90acba8d5416987fe97502cd5f SHA512 92f01a95f6d20bca1e9101f17cd7a7be7e002d55a0ad792c0a1b6b47c510c8e902a8dc33f683ac35800e39020453b0300b79a41fc32f29c8eda9a9d57d456fbc
+DIST semver-1.0.13.crate 29653 BLAKE2B 382a1fd00b20e55d5c5f8bf536ee012f8bc4c21633f47fc7f39efa46a547b720a349f0c6ff22dcb9faa3acd82022a5f82f182824fa262d96687866da0125aa73 SHA512 c4c1e5c5118f99de10fa2800a057e1eeb4cb5267752ed2093f57dc1d03e9817a42d6a34ea6165132e0bc84bcc573b93d608668d3681216e28da9fa8da49860b3
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
+DIST serde-1.0.143.crate 76400 BLAKE2B 119b6150d650306fad5e6b18ddce2d5dc0f3c1c0b7f2c602827b22243573fb1d606dc6d465f334a94640bb3c7a1b763d28c5c050f70067297c4d5e9eb2ac6792 SHA512 934f74aad56f3bd4f39be2e15a0f7afa718647df640166752b7417399354ba3e2584cbaeb54ef4accc9214fa936e584de657aa056dae0fd7cfe7676f1dd37df1
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
+DIST serde_derive-1.0.143.crate 54877 BLAKE2B 50b51622da22f8c9dec26803ee12cc590b00e266344dd1610aa5ea5c3f5442f5256cc31efb15ef4f633a7d9d6996bcaa2a679c210b00b9379457d10c15fd2f8f SHA512 ddbd58ebaf94dd2f534195dbb738bd88da5d10bba7c3a88e73207ec2b6dd78765649edf0a2632cfd43b7237929d3a93fab7838fe73dedd0c74310d4330776959
 DIST serde_derive_internals-0.25.0.crate 22803 BLAKE2B 0cfc682b5a43ab6cd8c41702504902ee7d874872afc95c9f1cbd303e267c8c05cb8cc14a67dd60c7cd106a50a56a693541dccd46b5987e671fb2aed848f26af4 SHA512 3799cfdb1b5d57655820f2615c490ebe5e123094a564184a50e5bcfcd100cc4661daa5c753f12b3c78ca216a8071d20cd9d0735cb603ebd624800706db642fda
 DIST serde_derive_internals-0.26.0.crate 25382 BLAKE2B 7829d9f7efe64b057efea96d60e4a53623757a58fe7fdd53c1225c0a1f1c80338aec9e2a8c4033a1e90f9e18940796601a2ef62f9a423fc39adc00a8b9b6e065 SHA512 acf635d10b41400e2c10d326fc7ca60dbe9094c2d1d94f4f34905e6978b155e014aebe29e0cc2b00587c97751360ab0dfa71b5c6901629bda9322754e2f07890
 DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
 DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
+DIST serde_json-1.0.83.crate 144566 BLAKE2B bb6f33e663dcfabc6d2bcf3341b4fe01e32d3bdcd9aa53abb21735b16955c927e0b0f5efc75351c72a364dbdd0dd22a7f0dd62170be85713b32130b62ed0e047 SHA512 e2694df141fe840eeba839de404c8a8f6becaa819012754d89a83653e19650c11e92d396a647d8a704dce8580d206cd2697dc2c12ce91de68627a576d9e0352f
 DIST serde_repr-0.1.7.crate 10173 BLAKE2B 30bca6a616e55f44def56ab1f85cbb141727a872466f161f562798db005473d520e6a4dba89b631cfe11f1a38cbc1db2fb0ef921f0245e0990a6744f9987e95a SHA512 4e3e87b1c97ee587e88be56d67f287e43252de474a3becdefb4b768eda661db5d78f665d7d93720a40d9f5bd27fd9ab6213d66713ec89bcc2063092b16625a18
 DIST serde_repr-0.1.8.crate 10327 BLAKE2B 2df93b708e840c7cf4528a9d15c13ae94a9b3660c5937cf405fc3ae3a1c32fc2c2c743503e7a63e27a999b5a7d550cfee182dc4c7db77377ce91f131a71f601d SHA512 6554814bc6cac332c8d5cc94241c224d8ca532719703b1fad19963db5f4793db7e2a5d195df6a1a534d1edafbb4223a63bae55dc928cafb3fbe69dce76d8547e
 DIST sha-1-0.10.0.crate 12239 BLAKE2B ddb515d3ec52871a22fcb1ac76f5b16dd8d785194131e57a26ec24f94a8b7fb84478ad3ce45f5f2e5496d674c08ad91324d14eabb17ee047d9167ff13137d76c SHA512 5f202e74a5323ccd12bb2fa57f6357eb8d12d5702fe9fda745aaed70725a5c9c78dd6f8aa734b350948fe8155cb36d8bbfe16615f0335f0502827ad26ea387ac
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
 DIST sha1-0.6.1.crate 2931 BLAKE2B 84e0a0472edb73fa732240d75bb6c80ccf1467ec2e70ea89e9eb7c30ae89e778c59ee3aaa1a19a07d4e40d6a87e41d943d32661834cfb988b1cb329063445226 SHA512 8eeb9a5d2c202a181390e25c743da6f8e4f451c1d7d51a3fad0dfd5ba285dd0c7eb851b26eb197a550eabb3aa357f0ebb6f84f588ea2d36cc3c70e62e871812b
+DIST sha1-asm-0.5.1.crate 5570 BLAKE2B 06124c7c942d115bc151afa3d89ea7b822af5935c6d750b696d9322af0fba296d1c0de94db86cb5b9a7042d46fa8ef6e7b30e67a4152a58ddb4d859152bcf74c SHA512 354eccc701693a8afbb864c0e4e4c9edb4b17a88260459d5f796b200787db0d2ed87e5dc7edd7fc2ebafa74284399da190692a919df4d6cc39bbd843082338ad
 DIST sha1_smol-1.0.0.crate 9782 BLAKE2B 214b58f6a8681399b9c925815f4ff48974466b399e96e372c9592cb139ba9306ba162b3b426dc12b585ea15b616fb58a60d253b4d928dde46217de6ddf7d0437 SHA512 75d6809a2aafd47cd5f5888f42283985895a9c82b53ead7529a23cd6f2484f32654094dda7a9e5d93e82afc9d0049938def1bdc28803502d140d06a3496adea7
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
 DIST shadow-rs-0.11.0.crate 20168 BLAKE2B 4829c1b391f26e1bfe3de82e3be2e33c55e7f95ef8ce6852ecf9c0ec5554f4d704ff52c535a02f0b6eaa95eb08d0491182bdb5b174ff406f89ece99eeda6f1d4 SHA512 deb494dc2eb5fc344008d9e3e49cf2f2e8ac856e44f5587ea22f2f66b4b6366f2a5b884cb6d4ced8ac2d668e4529921e72f0f14aec3d95d70614d556ff26f8fb
+DIST shadow-rs-0.16.2.crate 23890 BLAKE2B ee0f90576859f44e94f297e62b4e8fb4d0d3727791d225b87941f13025350f77e7e3ee8a911cf2b2f0b04bdfc5b61725d0e9b208d26c8cb37da9bd4c68174862 SHA512 7779e458f53327edf2b9a7a004598e1826c7fd82b8a90d41589b0c4906f2bd67d05b044bfe66692f928404cfab427df91b3b10b3d9e9107c08eca26a258599b8
 DIST shared_library-0.1.9.crate 10566 BLAKE2B be5497dd6ed880d33f7b4d3721d3747794e29715fae352fdcc5d153cc9512da2c2f4b21804ce68077654eb3ce989dbd1fb688120516783dd78db7f48afc8ea0e SHA512 8696f5d9ae976b04ac3f559ff1c4945c5554fc741bd9e62207a475a331f8c90fa8c2d583ac9cf96dd18fd543b65fc469aa76dad2f526c00c68182130d4396462
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
@ -298,7 +390,9 @@ DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd4
 DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca
 DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
 DIST smallvec-1.8.1.crate 28295 BLAKE2B c776b37e8cda81fe1df6ace794739b7e0cb1e3c5d5c1ffa57656ef0c0d0aec354c2c93ae23ff895996ab50a26ced28b913fab89ced27cb2f1d15568ab45957c7 SHA512 e93cbce48b81fe1a26d6016ad15b27ede8ae7162933e8923d3eb9c93f61910fee177c1aff16a1dd60c9917e41f8b7e474601a60c6d6d6867ef33c6d2e5fdf688
+DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
+DIST starship-1.10.2.tar.gz 7120188 BLAKE2B 02c70ef3190042354467c82eb812985e05adfc8adf5aa4999ea544ad0cb35a936a337b2e920fa1e7fb6a3ccae58b6195d1f004db96545c0be9bf7e958c58886f SHA512 f620a4271449d79fa4a05235cc3304814b94f0563fb3feb9852e9bab310af569b4a54c7db5505f45fcc79910444317cb0ba0474da2af7c10df02654a72004dfe
 DIST starship-1.5.4.crate 190821 BLAKE2B 16bec12eeeacb1be397060bc409c2895eed58276764a4656229e7d336ca15edac40dd454296c99dffc50bc5b302499e508e38b49629af956a9140cbfa10d619d SHA512 3f52d756f3f9f85d43a1e628e5d425baa0e2ce0d943d40c7949764acc6280e9b63b977e6fd012a59a6b078d856aa9cb97d179778d8d2f75b36c2cdb1254e4e2c
 DIST starship-1.6.3.crate 211436 BLAKE2B 81d9d55a39828ace64f9d82280b6100825c958a99011e3177ffa323e4237c33409ef864be6586cb46b9b9de39037844f8c34634a9ba8d104902e6b920a338001 SHA512 5617b28d504c26d63ee22a2e0fb975fe16b70277d1e7b4450ecb8054f17dfb8db666ae19dca9150cdb11dcda817abaa419be4bc662a099e416dd4b4e7ae8554e
 DIST starship-1.9.1.tar.gz 7080555 BLAKE2B 8702751016982d9e73acdc20b0ec3ecf776b4118eb6668622faf644e658f3f4fd87972a3f3576382e558e6dc04f2b92944042712ddddb696dacd78f5268f043d SHA512 b5f0ddbe08ff563368c30c6f2b9b9451b7f424d009362a2cb1cf2d4552b51a0937a914e9e39f1e734594aea092afea15322039ad951a3ad3cc05eac7afad769a
@ -316,6 +410,7 @@ DIST systemstat-0.1.11.crate 32028 BLAKE2B c5c2ede5b4df3b2e6cd3c550b99c3e15325a0
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
+DIST terminal_size-0.2.1.crate 9694 BLAKE2B 5020da319ef89a0e5bf4cad1b4e7b4a8f096b578f393a8e65b3415e5ec6d456941d0f1c2c433c15c4339fbd3007ab2bc53274f04bf6826c44f694d82e829e1dc SHA512 8e50a43609ca10b95ce49b36eac17e25043325988c17a39d892aa57ecabaff988b9e24a4b7a105f9e45c3ca18f5e79485252a38d3bb9eb3c33c668a69d119501
 DIST terminfo-0.7.3.crate 48821 BLAKE2B 73c01dc5104a1df1a48ae7c407da7a5600598b86a9df82beb7da3d484c97d8bda3d18789dac558d64f27cb30de4a8d381f6632a09d4982731830b1d16aabb4ee SHA512 9382e8846401b9717dd6fd8ea223ce46a3534466a21ded2325b2d7525a685e6bb588e1110ca421b63982e1881ee3be94b89e594b56e24977e1a185fc361ac735
 DIST termios-0.3.3.crate 17103 BLAKE2B 855b1115d02dcb275ea772dec3db383f9a6f84c14876ac037a5e3bbd1e71e26d3adc64e41521145093256acbea56c28b6c14f7e3e2bc9fda37e7cea113abe214 SHA512 3d4cacdaa8bbbd9083a050e723c93510829210f5ca8eb806e661a3a1e3c8aee33565142c5df34fca74aad0d26319525ee70ca6faf3f55a29427423d37fda43ff
 DIST termtree-0.2.4.crate 4416 BLAKE2B 994134f7af962123b19984aa32b30c19c6f77202067a90ddb3aa4414ec8dc541f5d8be9282244cdbb1eb16686c11750393325fc7f7005de0bec38d6a9219e015 SHA512 afe4e94bd57c9917ba48be4b3a22ff2b9b8a6c764c86871a3be9087ae0c65326fadb466e285a129082e4243ba6bca933d89ea01aa9188222c055f0c2b308cdf3
@ -323,12 +418,15 @@ DIST termwiz-0.15.0.crate 213726 BLAKE2B 72b9e8574b4f2fb9e4aa7f6a9ae203dd024ac11
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
+DIST thiserror-1.0.32.crate 17241 BLAKE2B 70a1fa10c54078a49cc167c2792fd54bbff17543966c221d1648a80f08da2fb880ae64f0d08984b7e0ffd6a79cac4c31c04a1c0bdea5b26d18e4a8c7d83dfe1f SHA512 cb1839b2687e228ea43838a8a2d55a04f5f3bd8c2972df0ff6a703560454abf9b838558c16095cc9b030b6b13e9d715e2b4741de6af9d5decdfeaaa508481138
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
+DIST thiserror-impl-1.0.32.crate 15347 BLAKE2B 174ea820965b3de4d35b394e875e0dab51559bed098d5a3037fc09c80326c5fe87c4e79358d6f49524a5f246ac5c51995ab47e6c967947d48d2194057c8a6e66 SHA512 7dc5e842880f4ee6b3c85264048975c027e9b80834618f6abab618fa653b9ed34b887a1d72112fffaa0560b7e90fa456e241ac08e6fdcd4b3be6e39946e92d2b
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST time-0.3.11.crate 91807 BLAKE2B d5b80416590bf48c8f403cc0e2ad735b95d98048dc335737fe509c44f805cc911fa55d6af611d3a05150b2a9ebedf005e8903a4daf66e245a5d5f290ed661c46 SHA512 214bb8c5573d3ee405a923f55e22ac3d659c30ba413f5e960e17d8f226d094133e2b52084e34efc6ece2311e13a862f2fcded9783937d69709d11144a8d6b48d
 DIST time-0.3.7.crate 76358 BLAKE2B 4cd8baca0e59a494bb2b6d5929d6ab606272dc06686e17ddf2f984528cd38f1b28142b8672569db928168272a8b6e15edf247042a173e6aeceaab83da2be63c0 SHA512 88479430d9e9dd206b41aee1c35cb28334b1a76fc6bfaa5e3586b2d9d2b4466e2e510bd00d165755fc9ef00e5b7e3fd558c7e7caf09638372ab11293ed6932b4
 DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
+DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
@ -341,11 +439,15 @@ DIST tracing-0.1.35.crate 72680 BLAKE2B e3f07d2c7bdc72b6845be0a18473a3a24ec0d521
 DIST tracing-attributes-0.1.21.crate 27552 BLAKE2B 999e6e257c8778f01cf43365db21d97b9f055019bebba5462968a806e173fc7effc35cacbb60696e3db45d3487627ec3858c282458b38fad74f2f49bdcaa75c0 SHA512 a48da3338cd86e7d9a196e06505d53a6d60278bcd3b709e175219c8d1cbd9c0191af07c335b6401a157563e22d75dd13d5be664c02913c289079bfa667f99e65
 DIST tracing-core-0.1.28.crate 57723 BLAKE2B 718974afb0412e93f60fd8795fce82f13953c2cedd753236945504f8342521d047f8ce517d24aa610f67127be8d59657a5405ce85025655c562bbf4e7be70bb9 SHA512 d48ac579f01123296eab18478888b916cdb64f1d8942e06e08984a77927ff5cac4328b1586800252c16472947f1b3c53c9a30c8b59a4a905210c54429b7d4b60
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
+DIST tz-rs-0.6.12.crate 45464 BLAKE2B 0faa6d91855a7f43e2aef8d361223afbdf46468e5ab745ddd23b79960a4e2ca2cca8bd3d788facc661793a58c9daddbae88330f2f721ea3ba333ad751533292f SHA512 58fc6e3a178c43080163029bd99c86ea54a033a2a7fa72d194746afe7a035db0cd584e8ea8e75054f9abd2160302b91821c40be67a40b44045f1d30a1124679e
+DIST tzdb-0.4.3.crate 283437 BLAKE2B ea07ff2cb0e53cad2d535d3dd10acc244e4ed708fca09af23ab448cd483b165e9da55ccfd356ecad3715f4d924749a1a9bd87531a62958b7a54dd58b07487e47 SHA512 cfd198d76a8860625df93ddb7d0499bb98d68d0a0e366712a1e4721a25487652457f6d831ce255972e30f1cb4f618d940096b49e31ae1dd64e3e62e1cfe65e37
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST uds_windows-1.0.2.crate 16206 BLAKE2B e895e97b5610c1402023b2b86daa5b248c4528f06fcbdb900cc996ff1f62a8234cbd6d8cfae84008345399f73363f9cdf62b1def60b782e06514b9d215236a30 SHA512 a58806bb9673f583d58ba2088c0dcb03808752bea6c0a502b717a541cb54c1b4cf70af8c8f3ae48437069c9017012c6e880a1e7c3c754835193e581849f28587
+DIST uluru-3.0.0.crate 9864 BLAKE2B 724abaebc88f3c228cc816599e0b248a91c32bfdfdcdfd00113ace0a59de98c109b21b0467fd72abdb331c70749d57f271be36c722ce690ec161c47627e17037 SHA512 f7bea4a92ff58dff7c33ee549082b28dc4638c100c330806b43d11fd384f24cd95d213e690d0797b697609dc9a01f8245667341467fd39027416be8f1c09ba04
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
 DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
+DIST unicode-bom-1.1.4.crate 10221 BLAKE2B d175111edf436f96d6265b413c8f70b0796e8b0a0fe5bee90a459063dc82dad9837b0d32b00927aa173205b6b32dfedde08c583953b47d332d677ec99fce184d SHA512 c10c42a23822763f1327518d43237b9e2b2d2c9cfd4839d990beb8c85be7cb1cbc528514ec5f4428bd486bd59ce9036a7f980f2aa76c1a28aed2f3a57dcc7343
 DIST unicode-ident-1.0.1.crate 33770 BLAKE2B e028e9f1d6c01a7a37c8f9ecd6b1d99041b45674bc7699066bb7479822cb8d5a1b4083db1117d9d44ab05096d8a37a9bd5d93dfe8cc5db6bb58950b4f5d5c8e8 SHA512 505650712a51c6f309c97bf72029de1eede33c71b84de9733f5f987859a61225e3d07d369b85a89797d870ea436f30b5b5046306f3d5fd672551a4b30c43e428
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-normalization-0.1.20.crate 120408 BLAKE2B 7ff6fc1d717e0e8e13cb548d544bbd730b230a509f81b8634765d702ef2520137454a0875b8600c3bcd59c248af28a3be2d0b69de7a0054cc50731365e670a18 SHA512 2376ef6b27679fceaa62f96cdd153de0901f125b7e6e92b42f90edfd77444b6489962a4214ef0cdd1ac2a6c9ce516301eec83da6c920d46ed312e6b377793e24
@ -356,6 +458,7 @@ DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca5
 DIST uom-0.30.0.crate 113626 BLAKE2B f06527a2edb61773a3247d419c8e6b8a299b427310466480878e800ee2681d0deeec1c9d3dbb35127c92adb5bda9c95ba94a6829a4f9a5be6c6af0d66a2da668 SHA512 ca8a4428ca0f8af0e911f8169897849dd8daf99d87cc68847f35a5af6190dc96d532c0159d6f34033e61a5a8ece1584edaa0bced647ac19984f843ccb20553cd
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST urlencoding-2.1.0.crate 6151 BLAKE2B c5badd3d5fe92080ce290cf4840fee6f3fe2a333c97fbfb0d3cd1f4c35b2482e9763da3aee4b354cd248cb74eabf1e97808ba12db4f90dc9fe8652f9e64533f4 SHA512 1eb1a6de1962d1e9c34b3f8708434ba7a1c111ccfac598ab58bc7da3571c571618925adb5048d9f909e7a10b8b16e7a18ffe018bd9844cb7f2ca2c5d31fec94b
+DIST utcnow-0.2.0.crate 20240 BLAKE2B 150d72b429cf735df73fe7bbeb3caca998e957a5e4e8056dd00251032382d9b29615d0239729467cca13fca3f261a86ec99903db584c3a2344237fef586651b1 SHA512 4d89b3e0c823532a85a645603754f8135f82e96141f355c38230ce4e27af290953cd107098671807c7112593dce2dc95a2d912e4346246b11adc9bae7e9553e7
 DIST utf8-width-0.1.5.crate 2941 BLAKE2B 3203d11eda41fc8f4eb4f7ccce6ff3cdc8fde5c36d04887b92f3569ce269cee44b3cd9dce0d5901c022dca26d6d021fce03f5f5c53f3e65c991506d8f47a8b08 SHA512 9491b21ae7d516afc6015ce06fba94ba2916c4811bdb58b91b1d531603e978985473651abd56777285c58b8b0c7ed650a68fdab20423b623e0140aeab1bf3f6e
 DIST utf8-width-0.1.6.crate 2935 BLAKE2B 819dffbf5203508fa3c30d8904295cc550cb7569d11346d8066061763982c7c78f3a0a7d6733c8e9ed38f943625b3c50f84da87b6f7a1d042db9a34cb57ebdd3 SHA512 2c51e38c7fa2a2c113ff74164067e49e2e615048144f3065c228a965804029447f7a1e65d926facccb8332a2ab2be02fffb7413d8eee6f883d941909b350844c
 DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
@ -365,9 +468,15 @@ DIST versions-4.0.0.crate 15385 BLAKE2B df71b090fb2abb0c50814e2e0122cb2c60e3d062
 DIST versions-4.1.0.crate 15700 BLAKE2B be803a01b3c7f1f0e51c26ee631d3162fc82846ed68d5f542bdd68d0bc98e7c73db104ba47b7fbcd25f03866972de5ed244c9d458bb8d286bef4de053a917ef8 SHA512 e8a1dfa590a3bcb083fa70dbb32401e7bb8f478e01b9a9e19f4ee902d8088fd083464820caf52fb736f799060abb4e8119da457c84c4360daa03b634b395b333
 DIST vtparse-0.6.1.crate 11265 BLAKE2B 5b8ba29f864d6c9382db31742d616fa0b8212a449e81f7d28964c4b6959b62ccc97273cfb6e80a77754aec5d01277a48f3657e9ba0c8f3986a329878ed4d6197 SHA512 23742a30bd921ae12e491fe82684d620ff07a44aba62e89ad6f99ff195ae21e3042f49573a8e8510b1bd03da194f37de1168590580cac314b4174fcab43c177a
 DIST waker-fn-1.1.0.crate 7114 BLAKE2B e510eec0490f0caca3930000cecccde209ad387d1657c380f95122c68ccc15fcbe0684315d0aea28f094f2c65f7b7b08ae62f6ec95e0d67fc47e6af0ba4589e9 SHA512 80f612597534d9f8bdcd5e6bdff740805efe28242822bc6db360e114a23cb47ff88c74b8ab855bc764f0a73545e85a69d76bce1441e5899a36e41ca270695dc5
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST wasm-bindgen-0.2.81.crate 165467 BLAKE2B 4b02ad703362d89c280bff92552a632b6cc50a586db4a476fa4f476118b94a89707712c1f6ff65c49a4d6001e9c9e16922a35e36b315b8f544e261ceb43dd5a4 SHA512 dd9a9902789dc8c7c3a8107c52018783b505efcc534c94c95ce55ad735c51489c928f767c319d97f78868a58d4aff7a71b2d1513350c30adb9122401b493906b
+DIST wasm-bindgen-backend-0.2.81.crate 25737 BLAKE2B dbfbd09a4d5a1c585fbd8cf8a29dd375c887e77fb5759c74bfbf0dbf012a0340df06f063e1a4908a80a2ff8298689cfb92ef67707e5d2e163abe155523c2029c SHA512 0d3b14b530adb2a32ad3ea169f0555973a25232613ff4269600dc1e86a6d75e4717be2388f132b6bab9a12625f645f644f59dc30a0b4ff3f20c20106083bcfa3
+DIST wasm-bindgen-macro-0.2.81.crate 11796 BLAKE2B 3fb6a60ca59279d3921dd65f7e7d4d91a457e31524671d465c5ce8fb31db7f28f49d80fc0161c2faa9f5a7dbad4c44584f0fed6177e8908de2a421951c62479d SHA512 f1164f7a4413685ec34e22c462b4a4cbaa79eba47079d90b7e15304db222afcc8e966f3bc994a231f21e29ba68a844b3e6622f840e0c335d09201c1dfa046ea3
+DIST wasm-bindgen-macro-support-0.2.81.crate 17855 BLAKE2B 2afb7807913ba01d99ea93030461842b7eeb405f4be0f0d671e1d430b6cc0aa111518c9549b71c8a94dda418c149050fc9d0613e10cdc7fd0dce354d87b8c4c0 SHA512 1fac5ac8b546e4fe55484649d7e2a39537b49797e20a2859a17ac98cc8c25cb3d91dca09e94c33651b9963efed6045ddd79bf646489bbd11065c62e66a59cda4
+DIST wasm-bindgen-shared-0.2.81.crate 7194 BLAKE2B bc31b0e75cafc2dcd207ffcf44b9ae84de4e5bebebe471404736352e9aaa1c2da45e22892a548c05cda24750be028dcaf66e6529d1ff2f833986ab2085b74fb9 SHA512 5ca631a720623e42caf737d3f8faa4961a051eb71b6b0854e4f697f753889cd58df980962d39650acce7712449ae50cf86effa542bd85e451cdb86767aa7ab34
 DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
 DIST which-4.2.5.crate 9326 BLAKE2B 8aea79157007f2326d21083e1eba387611233a19f39368904cf2b0e9b6f09b4fdf6dc469cff83373912bec6e2aeec191d217b0b1e720ee0db1848b6f64d37054 SHA512 2b2b44773b568946799035e5b90c1f0c304b399f4d330c1e063323f631f56ddc6c5d8a9d026d987cb39c801ccbfb614450064030fc19e1de34ab6a495f053395
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@ -376,34 +485,46 @@ 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.24.0.crate 12674875 BLAKE2B 9ea8d14f49181ef8deb4ec37eccb3a4f622c6f5dcb1ce605981d5954060029e6be28344f7fe3d122af15b2df6547c721d29c2f799747cfc55112d7fb67350d2f SHA512 8b6dddb7ff21b288d1be7c7ba85d74a52181189898a3ce0be627ca16d1837fae00e51bf784964783159df2aeeb4255fa594e0c56eea024cbfcd42be75c0d5410
 DIST windows-0.35.0.crate 13993813 BLAKE2B 5f4df3db3e89e41c7ff6ee258bc1b10147c84685ced799dc88c70417bb49f517cceeeba0c20e2038f56659ee065a1785fb8c835a53ea154b020e10ded01cc793 SHA512 71ca88af44817e1ca35d39dd138f7a3819067ba30c6d154cd1528d810f5e2accf0f7b3545ba8178cd70bab379eba3820862044d7871a8249e84d25b06693bfb9
+DIST windows-0.37.0.crate 14060820 BLAKE2B 4993494caf29e403e275964a80ce64469e6ec3a688ba31c7a3d0e261c160f6baf3cd84754bd8661ed38e593f2f8dca80afd0b426104a9249cbdf5cd96391d59e SHA512 d10347d7cbede894f7acdc988e197d76b8b35f09272a1f525f0307b2c5005ea36b106b99efb2f06fa4109fed8c95257c420cc54dcb79f302d1e98438c823e223
 DIST windows-0.38.0.crate 13195763 BLAKE2B bcbda559cbed47048f44e23f3ec3457205fe71d16b246ec2895e51eb5571b56f66afa3ea05f9ac4208414c90bc8a1dff47499972c7b440b5235b6ba691974135 SHA512 3284659cf2cac43c04f6c8ddf63c37dd8b24ef0fba91a10f654ca270e4f4a18bcec8d240798d8d2930f1057b1781aeedeb9bf6247598172170a851bd1b5b12e7
+DIST windows-0.39.0.crate 12776691 BLAKE2B f9d774a0f131f6ab45a8edfa2e093cd6b43d754a933c11693048964e4e2b01e650be6a583a9d927cdcbb895cf206482d2209a395eaa6315eee8ce49a1b44431b SHA512 e2f69a1010c518056b253075b6e10b63e034374a416fb9e0fbf926bd992daefcf4c5a02208641f5bd961b8a0d946fcce226a01c6fca48606a3a25f570d8932dd
 DIST windows-sys-0.33.0.crate 3355291 BLAKE2B 21a1c42a98e3af42ac417484b808268eee1868741b0fb25f97fd0db75f6236b6825194f01ced35bb3ed765c1e5c1a70eb5d7c16ff7d61853c32354f5b10083e7 SHA512 dcc1750b8db7ab550b213eebe4cdfdbe25eb8a2e8663d9461461e84e4da0082ba1b81e8f697ad2879a8b6839525af616fbb2ba0abaf919edfcdf7229a8cd4f16
 DIST windows-sys-0.35.0.crate 3360659 BLAKE2B 5215618f2a9ef51ab33ae61c47bb134ec471de159132000fde9947df9581423dd5d537339ef9eb9060f50c45770e088d6bfe2acb368fdf03deb947bd1da110a8 SHA512 5ad6f9eb3bab272021f8aba45fd5825693086eab305c82d41b9ee4babbb23d469f4466214f1d9d93eeab9139717a205c6d7569545731cb3f3507c6c2a3cd3b4a
 DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
 DIST windows_aarch64_msvc-0.33.0.crate 674447 BLAKE2B bf7136ff87aa2e140572f5dae7d3f5d03974f9bfbff318f08e1178604298265a08991f782c49477a8ff48ab95121234bc682deb1a9a4f41e67da44b14850175a SHA512 f25bc6cd0c56d3843c1f27eb567194b732598e977eb139a1520446481092109fb29dce3298f9c88632a7191793b5308c5995f547a1dd818fb0b06329c59c9afe
 DIST windows_aarch64_msvc-0.35.0.crate 660555 BLAKE2B 11300d85bae4afca31ccb1e44c55d5e1b4b2839f38765c40dd7e372c331025bcf59da0c8555dada2d26dc40b263676fed345d00b3634392d7b2d25ed526b141a SHA512 1945a17bd015cdea474c7eba95140d6dbd3160d4fbf72b9d3efeb2bd9d4bf37220f31a133bb5dcd4cdb36cc42cd40be9fbdd7fbea4e83a61ea99eb24165af522
 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.38.0.crate 661956 BLAKE2B d8afd66e9409d27b67d35440727f5c9ccc2e275063960d9eb7a67ecbd9efd1def5bd7ab1338027501fb12e99ae3f41cbdc678122388faa3eb5779d0fd3d746f9 SHA512 53606e6d1f7c90647034cb2e9d3cba229344192f8abaa5a40676e5b8a5f06e77a2ab61f6f1fae448fd2578e857562d081b2f93411d17229c6afe673bbd6ca5e6
+DIST windows_aarch64_msvc-0.39.0.crate 661960 BLAKE2B 2a8ac8e92c1c22c9a7f5126b895776d4d4660049cf7beaa230758b6f944eeffdbaed7b99438f2cb3862b298d2ff4fad7c5cc91d69cd9ffc33120909d951e2299 SHA512 fc2cd225f8c45e62456d93d7acd14914e573a3c23446f52830af754cdc9951dc1eef978f2ffa1b4dd7eff847a2385869a687324ba17131c3a39d63db0cf6c783
 DIST windows_i686_gnu-0.24.0.crate 774447 BLAKE2B 02e0ae648f75eeaeb56735daf579e7cbb13f7b6d32c4ebe4d7b5f77f26576ec25849bea2f5a34fc8e5b68019dc9cf92f87423e3730cd5dfa12e48cbab2ba6556 SHA512 c6596d546db46198027d654d9986656da09c98150d7fa068773fc39bc85d6c20497278797153153c65f348432e99862ee216a766defa6ef41ccdda6540b73dac
 DIST windows_i686_gnu-0.33.0.crate 772346 BLAKE2B af6d9b52440904dfa080f12ad77567bdb10364ee178772394f7e36e7296a8953e3ef2400a1bcde9c9f893d3c8397ab78167434e1a341cd5b69d9915ec654bdec SHA512 c1597a25667085225cadf447c3e3d453c7a4b12b2c0c27ddf4ef706e097f05cfb955ff454befc9fdcefc1b55ae47579bcdfaff83c2f04c71b15c47adab02708e
 DIST windows_i686_gnu-0.35.0.crate 816952 BLAKE2B ad2ed36df1c7934392af62494f040c93e75ad8359190f63f88eb1687530b21152ff0f50cfea08657c98c9e6fac02570efb169e497d11d86ca3011bc31f9d5f99 SHA512 d937d99225ab9465690466c0944c4a480bafe341ca582ee4dbfbcb31193342c489a48c2c78d8673aafa66e3018530d49ba29fcee29395f9a8f85a6dfd4147215
 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.38.0.crate 818110 BLAKE2B 9034e2734421b3061042d270c11bacb617b57826ed3c2f8dfc55f63711c6dcdf18ed484e313c3aef02ba4fb8c44765a0b7ca38982e6c0c05de849a432820e59d SHA512 3871758332d6410f86a55b734a971d44c7f87c75e1fea43ca4ca2432372776faf4a13856848fc0d83209244341ff1dda90d3fc1f4f7fc22d654ae99ddacf668a
+DIST windows_i686_gnu-0.39.0.crate 818115 BLAKE2B 6ecbdb41b48a56ceafd55cbf124023fdc0351aa8ddb24a70b7d685faca6a19049a2206df102297949c005741aaaf440e43669de044e67c9f900cc985a225fbff SHA512 8df620a25ffefeebd93c5d672e55175f480aaf5144ceff89e07c34f079e3206021022ee7c2f75e7d9b9c1aaad6d4e5a3d3425111e661c222f0dc7030a6211fec
 DIST windows_i686_msvc-0.24.0.crate 732279 BLAKE2B c1f8e257288d46a858d41481d04432a671cf8267f47cd7daf64a5690be3f000c126429c9954587a5d5399c85ce88fa1ebc79f338418b9110a76597bbe59f49f7 SHA512 bd75573e84e42e2252bcd1cbbd576aa67b8159940a726f805e7a33891cf768457263aad1102d0c7d360f80718f331516952a34f2de9f1bfa11918e7e363a0cbb
 DIST windows_i686_msvc-0.33.0.crate 733499 BLAKE2B ffbb05f6eba95edaee79a3fd72cb828761319c71eba73204a539c1acef21cbe9dff87b0839c24718466db65fda2dc7e73411d92fd32cc62fd2ca9f3256eb21aa SHA512 b54c64fdaf92ee7d0169c86de37ec40a6533a5d231c0429cb4f63b18d5261c93fd5dca6851640e764f3a331504afb4e8a0ee6f00752d8771de4c74e435a43937
 DIST windows_i686_msvc-0.35.0.crate 722696 BLAKE2B f8809e20af402159b793d103abc785063eeaac68ba2404300ca0e8083e46db9ed26ae21c4ba56a40c4ac82020ad8b36a710fdd5d5a05b9741858b732f4cccf30 SHA512 331220a08e55a0464f6c52239cab564bf37bcbb526a18f58ee657069a83f91fc7f06e65d5d35573662b588cf389e9a1da784794b2abe96d3b033005f2ce72b34
 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.38.0.crate 724576 BLAKE2B 702f5aa84cdb8fd1917d241848bf0a855ee0b705e9b0ecdc3b27d4d1f04134e383893de0425e05d863422405fc32554dad2bd4c9f9faf5ef61099c3101e7d413 SHA512 3e8401049e15562271ef47c8b78c99a4bba213bc9bdfaf10a77dd273f45a7024dd3bf693f775b9e463c3c47be0b0eab8c48a98db2b33a2be7cb43e3277f0ee20
+DIST windows_i686_msvc-0.39.0.crate 724575 BLAKE2B 30f5c2303fadcb4c47f39ba7081c12a03c4e63d08b30a2cb09926488055246329df91a2b96c948725c76c70b49e23d3211197fe49ce667dd2cfd899fabbd41e4 SHA512 625352d966bbbfaa3cad22fd1b4aa0f379a698b1ab8dc2e3f7ee7b836066adb3604c2d99e38ab641684413e755ace906cab6b2ccd894808abd9d98bf296a4343
 DIST windows_x86_64_gnu-0.24.0.crate 743223 BLAKE2B bbfc934bb2ebc2ccad4ffa01bb0f874e9de5b2892fdf2864dec3afbce82904dc1990812299ca93cd0ae63e87bffbc5558e216a6ac611d94df03a9d2f33306ca5 SHA512 4fbe999d1f89f1f691f786a752742c49b3e9fb57ae19dca54ecb1dd391fc733727455e5fe362d160d2ab4d230de370f4a6ba83045c0c4bfd1a99c9758598953a
 DIST windows_x86_64_gnu-0.33.0.crate 744302 BLAKE2B 7aa9f813745ccd30c689b755b6178360d303b5fd5323374abcafed8c308308d68ae8eb33a9b57c372518e9575f95fd23c671fc9ec9fe3bc7612baa68e4c99a90 SHA512 a6dcef198c3ac355740129e1f153a804d10b8394b0f4a3d6105d60b0a78237177a6f5bdc823d69e59be576566e2eea6ca6ddc6a42a32ccd34e78b9ef78f95454
 DIST windows_x86_64_gnu-0.35.0.crate 789684 BLAKE2B 8e6abb3f23cb4ab64a3aedae842b8e3c7bdfa9d3bf80332e7eca758e1a05db3d9574a726d515c044bde705fbb538add11f8174b992ae15f08522d7d53ca3f9bf SHA512 c5ff2d5ca56e905ba7c5bd347e8a6c6675a4c289484c7b13962089faa0e3407c1c5b1c2f289d98b7e40172a868be9d089a384e73df197e6339f64900109313c7
 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.38.0.crate 790933 BLAKE2B f62165a3738f25259a28d3def4a176da5aa1667a84282f76f577f2aeb12da563c09b6c967a66510ea30fb19e2d1352cd21046c92479418d2dc5fd24883dbd81c SHA512 77f0c778a4c46eff9b0c343adbe686724c06c4f336d1fbd37b2201f4a54956e570d7a5b789e6519975ea531fbba599a0d2d5c51d32890ec7664cffa9ea19935f
+DIST windows_x86_64_gnu-0.39.0.crate 790933 BLAKE2B 60e1c2a704399408215dd76a699f7fda34e4b1dbad613cc7c51ccfc5494ac4087965f07a9ed05d3814d16b1e8b0c8799234199d0b01c9816db52152aaa6db94d SHA512 ececdb1c82892911e73b3abe946d9c75016b4180b85bd4ed6d5069399bb30bb2b75b67238ce8e333f264b58d47b4e628c9413e7ad4c0febae3873aa1fcd51e7a
 DIST windows_x86_64_msvc-0.24.0.crate 668947 BLAKE2B a92da07f76275a318043a2266f54e0ccf703ed79a47564d1d069d8f3ffb097c6550cb3a7d4eb07efc1ef623c15b6b91c5046270641329f407be20214a8fff08a SHA512 d9393a55f2fe4bad0b2af356d153b5a75479f9a536231bd6124dad48a03fb78e7c96b7843548dfda779957593e63072eab0374dc62133f8e25139b859ed621bf
 DIST windows_x86_64_msvc-0.33.0.crate 669901 BLAKE2B da1da6fa0da6f51a7ec109afaf9575c41cd8a42879933037b9105874e3ca6c425c4c9f28f354159d14dd43bf98015d724c691b4c6b8bdbd0451f2dbde473d52e SHA512 65397cdb95ac5a22d07f565422a7a2b5b207da8d8681b74b1b06f71d7e658cb6cc98217e98bb0b4cd32a5029ab06ba9722d8e6f623e20877d77e0bbe48e0d7aa
 DIST windows_x86_64_msvc-0.35.0.crate 660523 BLAKE2B 5bcc93b38b15c67d62bf259f8a4d111767f7934c0d20a39cb9a51c4ff2139cb6b96a1b76e4dd9e814038ec0c7d6193b0da72645a72b54fe9085c084b5fdbd629 SHA512 8fbf319038441b8b86b0cf5875a454f23de1b14b7d9e14dcbd379d9bf78ce0a88afb1fd5361c87d65f3f0b77d05a0a73e38cbce1dcbe358f3436d69a7a0964b9
 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.38.0.crate 661999 BLAKE2B 04c0023a442dc5a86464cca44436c0682560198f899b21fee264f380cc36da7d0d03be2471452981fb701f0f26e968fa269c2aedbacf7935ed9a9ad49c726b5f SHA512 4607762b202a57c1807f090b2a404f917739a5117804ecd9ff580b5d8847a4cc0a9188c3b07b31bc6dcf1b3560ccc2655e8e548ed382a70e6c8d6f9fdb1a7090
+DIST windows_x86_64_msvc-0.39.0.crate 662005 BLAKE2B 6a4a0bdd75a3946fa86ecc296999b2a265a29e242550cbf9111ffe2510c237452630c818c026476135156a4963cf8b4acc763fa17d051531c4ef1664accad873 SHA512 5009450b2fe34ea2bed3305af85efc018489976ab275c0e3b7e621c95eb1a05ebd1c56d805f0f2f353649a7df89dc344d22aa9037bfb461062051972135d016a
 DIST winres-0.1.12.crate 19772 BLAKE2B 645fc16e49061cd98c77217b991cb774151f7f8bd6df44cee622bcba121d2645aaf775d56c3e85de6278b193ea6a36256821799c33ba081f931d87ffa0e038f1 SHA512 9f61edafb4a262b56d130e48ac6bba94f5a432bf0a8c20243e6c8fa98c3f9e0d2ab00a77b35a2e49dd63585a272af597e236e089641b5f488760ac42d22f5a67
 DIST winrt-notification-0.5.1.crate 34163 BLAKE2B 84cd3ab2a25223557e8bf25096d60ab9b2aaeb927d4ff19bb928a22341036e116a3d306548fe385e3a79457c60efedec33637f276daa06822ddbdb64da2f7cdf SHA512 29096d190d361e7d73a29ef05b95a2b2095ce1aeb106bb16b99856cb02246a9731dde3327db70dd71c13c53378fa2257fbbfa3282516ed4eb1c5d58fa24b20cc
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
@ -417,6 +538,7 @@ DIST zvariant-3.1.2.crate 64127 BLAKE2B 42fcd570a3b599126a1b61e708e2785529d95939
 DIST zvariant-3.4.1.crate 67944 BLAKE2B c3dc50f9b4d033e895fbd6dda625cabf36310cc0574fbbf00b42aa0f59f1485cfb344af8e5f49f2f240e3219d83cb2419c631f54364e3b9cf88a05cb7b0842c0 SHA512 8e07153505854292e904e8280c9737359f5e549e4aef444a0c8c7a1c870865dfeb221937d153f18ce66ea8626a5aa694610c38d311a180d99d02b659c94fd742
 DIST zvariant_derive-3.1.2.crate 10123 BLAKE2B ff3efe92c18652d479740de238621801fc95fa90283282089cc3149fbec6b6256fb66c2ab1e39b37df8fc34adda7c0cf0e1599745c1bad51e8de00d9022a99b9 SHA512 6e0349429dd1272726440dcaa4298f9dc8b9e840299291fe23874309d8861d1f77549a9cd7fd4b6c440c8aaa73020a5ff5b5b1cc6efdde24fdd430a1c3e87514
 DIST zvariant_derive-3.4.1.crate 10938 BLAKE2B 971977459df2890d2148cb2a3677fdf2618a5fcc89f22f6c8807ed1c18469846b36a9414717c61ba2492d7a2d56da711456b983c945d6568d31650693e0c371f SHA512 491fdd47cffdf452b32bf81c650ce402c6e63af1040a0cd6ab02b0831400925ecef4dd7041f4b45be54efb84aa81975fd46d8b4bbfd02b45544406de55f8a7bf
+EBUILD starship-1.10.2.ebuild 7921 BLAKE2B 32797e6dec94432c9ac22ca3941473559c1b842d3fcda7647fc66d3b208833ced4b654c05792ba42267c53af3f77451fc18ebed0d781200689122385578dea72 SHA512 5e40bb80475c3f6846e97548b4f3d7132cdf8eb0af4106b518c0a46b71f2991d3b56beb0fb5a05b7173bdeb39787f7ac1de985bee3a6aeadd82ba615729c62c6
 EBUILD starship-1.5.4.ebuild 5270 BLAKE2B f5472ac3eeb614b238cf2a44010cd69951b34076f09587b709f119c0d8f0d917802f8f9c1b082c2c2e6dca20af4f6998b2760d18df73061b4e4ab399f24b1361 SHA512 f7d6fd6538afe3c0c76ad7d345ccbce74d283497066baf01b866cae3502b0b6ef96c00679071cd597c9e01b586801f683ea4487de9797e4f4b9d0454aa9c3d90
 EBUILD starship-1.6.3.ebuild 6054 BLAKE2B 8d2259d06fed9c425185a709f6d5312c8263ada2e2868e54b0baf142bf0f95ce888d37c6fb7822770e9c9d1bf893dce236894c24c403396bc4f7669ed098a44a SHA512 ab6092104fee2de4424b418ef26a5077095f090ceeb0cc4042c6497fef5cee5768410fea4ed13fbff3f33cdf4e973bdafbb36ce7a108143045f1172be2c2d9a4
 EBUILD starship-1.9.1.ebuild 6574 BLAKE2B d72399d591cd69e21a3def2e973a985334428745ce2d51f197f30d70890a423ba72ed94c98e67477154e6909e74b70b1194b9933953bc9374f8b9e6fbf7a52a4 SHA512 9e0b248d1f25fb0e3b358c5ca22362e80a34a94e4277aa47eab3ca68c8c28e41e6691ecfad67e6acc63c31c3c3c5dbdb59bf1a320d2fcea503cdc482a022d0dc
--- a/app-shells/starship/starship-1.10.2.ebuild
+++ b/app-shells/starship/starship-1.10.2.ebuild
@ -0,0 +1,419 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	ahash-0.7.6
+	aho-corasick-0.7.18
+	android_system_properties-0.1.4
+	ansi_term-0.12.1
+	anyhow-1.0.58
+	arc-swap-1.5.1
+	arrayvec-0.7.2
+	async-broadcast-0.4.0
+	async-channel-1.6.1
+	async-executor-1.4.1
+	async-io-1.7.0
+	async-lock-2.5.0
+	async-recursion-0.3.2
+	async-task-4.2.0
+	async-trait-0.1.56
+	atoi-1.0.0
+	atty-0.2.14
+	autocfg-1.1.0
+	base64-0.13.0
+	bitflags-1.3.2
+	block-0.1.6
+	block-buffer-0.9.0
+	block-buffer-0.10.2
+	bstr-0.2.17
+	btoi-0.4.2
+	bumpalo-3.10.0
+	byte-unit-4.0.14
+	byteorder-1.4.3
+	bytes-1.1.0
+	bytesize-1.1.0
+	cache-padded-1.2.0
+	castaway-0.2.2
+	cc-1.0.73
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.22
+	clap-3.2.17
+	clap_complete-3.2.4
+	clap_derive-3.2.17
+	clap_lex-0.2.3
+	clru-0.5.0
+	cmake-0.1.48
+	combine-4.6.4
+	compact_str-0.4.1
+	concurrent-queue-1.2.2
+	const_fn-0.4.9
+	const_format-0.2.25
+	const_format_proc_macros-0.2.22
+	core-foundation-0.7.0
+	core-foundation-sys-0.7.0
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.2
+	crc32fast-1.3.2
+	crossbeam-0.8.2
+	crossbeam-channel-0.5.5
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.9
+	crossbeam-queue-0.3.6
+	crossbeam-utils-0.8.10
+	crypto-common-0.1.3
+	dashmap-5.3.4
+	deelevate-0.2.0
+	derivative-2.2.0
+	difflib-0.4.0
+	digest-0.9.0
+	digest-0.10.3
+	dirs-2.0.2
+	dirs-4.0.0
+	dirs-next-2.0.0
+	dirs-sys-0.3.7
+	dirs-sys-next-0.1.2
+	dlv-list-0.3.0
+	downcast-0.11.0
+	dunce-1.0.2
+	dyn-clone-1.0.6
+	easy-parallel-3.2.0
+	either-1.6.1
+	enumflags2-0.7.5
+	enumflags2_derive-0.7.4
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	event-listener-2.5.2
+	fastrand-1.7.0
+	filedescriptor-0.8.2
+	filetime-0.2.17
+	flate2-1.0.24
+	float-cmp-0.9.0
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	fragile-1.2.1
+	futures-core-0.3.21
+	futures-io-0.3.21
+	futures-lite-1.12.0
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	generic-array-0.14.5
+	gethostname-0.2.3
+	getrandom-0.1.16
+	getrandom-0.2.7
+	git-actor-0.11.1
+	git-attributes-0.3.1
+	git-bitmap-0.1.1
+	git-chunk-0.3.0
+	git-config-0.6.1
+	git-date-0.0.3
+	git-diff-0.17.1
+	git-discover-0.4.0
+	git-features-0.22.1
+	git-glob-0.3.1
+	git-hash-0.9.7
+	git-index-0.4.1
+	git-lock-2.1.0
+	git-object-0.20.1
+	git-odb-0.31.1
+	git-pack-0.21.1
+	git-path-0.4.0
+	git-quote-0.2.0
+	git-ref-0.15.1
+	git-repository-0.21.0
+	git-revision-0.4.0
+	git-sec-0.3.0
+	git-tempfile-2.0.2
+	git-traverse-0.16.1
+	git-url-0.7.1
+	git-validate-0.5.4
+	git-worktree-0.4.1
+	guess_host_triple-0.1.3
+	hash_hasher-2.0.3
+	hashbrown-0.12.1
+	heck-0.3.3
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hex-0.4.3
+	home-0.5.3
+	human_format-1.0.3
+	iana-time-zone-0.1.44
+	idna-0.2.3
+	indexmap-1.9.1
+	instant-0.1.12
+	io-close-0.3.7
+	io-lifetimes-0.7.2
+	is_debug-1.0.1
+	itertools-0.10.3
+	itoa-1.0.3
+	js-sys-0.3.58
+	jwalk-0.6.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.131
+	libz-sys-1.1.8
+	linked-hash-map-0.5.6
+	linux-raw-sys-0.0.46
+	local_ipaddress-0.1.3
+	lock_api-0.4.7
+	log-0.4.17
+	mac-notification-sys-0.5.2
+	mach-0.3.2
+	malloc_buf-0.0.6
+	matches-0.1.9
+	memchr-2.5.0
+	memmap2-0.5.5
+	memmem-0.1.1
+	memoffset-0.6.5
+	minimal-lexical-0.2.1
+	miniz_oxide-0.5.3
+	mockall-0.11.2
+	mockall_derive-0.11.2
+	nix-0.23.1
+	nix-0.25.0
+	nom-5.1.2
+	nom-7.1.1
+	normalize-line-endings-0.3.0
+	notify-rust-4.5.8
+	num-derive-0.3.3
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_threads-0.1.6
+	objc-0.2.7
+	objc-foundation-0.1.1
+	objc_id-0.1.1
+	once_cell-1.13.1
+	opaque-debug-0.3.0
+	open-3.0.2
+	ordered-float-2.10.0
+	ordered-multimap-0.4.3
+	ordered-stream-0.0.1
+	os_info-3.5.0
+	os_str_bytes-6.1.0
+	parking-2.0.0
+	parking_lot-0.11.2
+	parking_lot-0.12.1
+	parking_lot_core-0.8.5
+	parking_lot_core-0.9.3
+	path-slash-0.2.1
+	pathdiff-0.2.1
+	pathsearch-0.2.0
+	percent-encoding-2.1.0
+	pest-2.2.1
+	pest_derive-2.2.1
+	pest_generator-2.2.1
+	pest_meta-2.2.1
+	phf-0.8.0
+	phf-0.11.1
+	phf_codegen-0.8.0
+	phf_generator-0.8.0
+	phf_shared-0.8.0
+	phf_shared-0.11.1
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	pkg-config-0.3.25
+	polling-2.2.0
+	ppv-lite86-0.2.16
+	predicates-2.1.1
+	predicates-core-1.0.3
+	predicates-tree-1.0.5
+	proc-macro-crate-1.1.3
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.40
+	process_control-3.5.1
+	prodash-19.0.1
+	quick-error-2.0.1
+	quick-xml-0.23.0
+	quote-1.0.20
+	rand-0.7.3
+	rand-0.8.5
+	rand_chacha-0.2.2
+	rand_chacha-0.3.1
+	rand_core-0.5.1
+	rand_core-0.6.3
+	rand_hc-0.2.0
+	rand_pcg-0.2.1
+	rayon-1.5.3
+	rayon-core-1.9.3
+	redox_syscall-0.2.13
+	redox_users-0.4.3
+	regex-1.6.0
+	regex-automata-0.1.10
+	regex-syntax-0.6.27
+	remove_dir_all-0.5.3
+	rust-ini-0.18.0
+	rustix-0.35.7
+	rustversion-1.0.8
+	ryu-1.0.10
+	same-file-1.0.6
+	schemars-0.8.10
+	schemars_derive-0.8.10
+	scopeguard-1.1.0
+	semver-0.11.0
+	semver-1.0.13
+	semver-parser-0.10.2
+	serde-1.0.143
+	serde_derive-1.0.143
+	serde_derive_internals-0.26.0
+	serde_json-1.0.83
+	serde_repr-0.1.8
+	sha-1-0.10.0
+	sha1-0.6.1
+	sha1-asm-0.5.1
+	sha1_smol-1.0.0
+	sha2-0.9.9
+	shadow-rs-0.16.2
+	shared_library-0.1.9
+	shell-words-1.1.0
+	signal-hook-0.1.17
+	signal-hook-0.3.14
+	signal-hook-registry-1.4.0
+	siphasher-0.3.10
+	slab-0.4.6
+	smallvec-1.9.0
+	socket2-0.4.4
+	starship-battery-0.7.9
+	static_assertions-1.1.0
+	strsim-0.10.0
+	strum-0.22.0
+	strum_macros-0.22.0
+	syn-1.0.98
+	systemstat-0.1.11
+	tempfile-3.3.0
+	termcolor-1.1.3
+	terminal_size-0.2.1
+	terminfo-0.7.3
+	termios-0.3.3
+	termtree-0.2.4
+	termwiz-0.15.0
+	textwrap-0.15.0
+	thiserror-1.0.32
+	thiserror-impl-1.0.32
+	time-0.1.44
+	time-0.3.11
+	time-macros-0.2.4
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	toml-0.5.9
+	toml_edit-0.14.4
+	tracing-0.1.35
+	tracing-attributes-0.1.21
+	tracing-core-0.1.28
+	typenum-1.15.0
+	tz-rs-0.6.12
+	tzdb-0.4.3
+	ucd-trie-0.1.3
+	uds_windows-1.0.2
+	uluru-3.0.0
+	unicase-2.6.0
+	unicode-bidi-0.3.8
+	unicode-bom-1.1.4
+	unicode-ident-1.0.1
+	unicode-normalization-0.1.20
+	unicode-segmentation-1.9.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
+	uom-0.30.0
+	url-2.2.2
+	urlencoding-2.1.0
+	utcnow-0.2.0
+	utf8-width-0.1.6
+	utf8parse-0.2.0
+	vcpkg-0.2.15
+	version_check-0.9.4
+	versions-4.1.0
+	vtparse-0.6.1
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.81
+	wasm-bindgen-backend-0.2.81
+	wasm-bindgen-macro-0.2.81
+	wasm-bindgen-macro-support-0.2.81
+	wasm-bindgen-shared-0.2.81
+	wepoll-ffi-0.1.2
+	which-4.2.5
+	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.24.0
+	windows-0.37.0
+	windows-0.39.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_aarch64_msvc-0.37.0
+	windows_aarch64_msvc-0.39.0
+	windows_i686_gnu-0.24.0
+	windows_i686_gnu-0.36.1
+	windows_i686_gnu-0.37.0
+	windows_i686_gnu-0.39.0
+	windows_i686_msvc-0.24.0
+	windows_i686_msvc-0.36.1
+	windows_i686_msvc-0.37.0
+	windows_i686_msvc-0.39.0
+	windows_x86_64_gnu-0.24.0
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_gnu-0.37.0
+	windows_x86_64_gnu-0.39.0
+	windows_x86_64_msvc-0.24.0
+	windows_x86_64_msvc-0.36.1
+	windows_x86_64_msvc-0.37.0
+	windows_x86_64_msvc-0.39.0
+	winres-0.1.12
+	winrt-notification-0.5.1
+	xml-rs-0.8.4
+	yaml-rust-0.4.5
+	zbus-2.3.2
+	zbus_macros-2.3.2
+	zbus_names-2.1.0
+	zvariant-3.4.1
+	zvariant_derive-3.4.1
+"
+
+inherit cargo
+
+DESCRIPTION="The minimal, blazing-fast, and infinitely customizable prompt for any shell"
+HOMEPAGE="https://starship.rs/"
+SRC_URI="
+	https://github.com/starship/starship/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND=">=virtual/rust-1.59"
+
+QA_FLAGS_IGNORED="usr/bin/starship"
+
+src_configure() {
+	export PKG_CONFIG_ALLOW_CROSS=1
+	export OPENSSL_NO_VENDOR=true
+
+	cargo_src_configure
+}
+
+src_install() {
+	cargo_src_install
+	dodoc README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt "1.9.0"; then
+			einfo "Note that vicmd_symbol config option was renamed to vimcmd_symbol in version 1.9"
+		fi
+	done
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@ -1,7 +1,4 @@
 AUX convmv-2.05-manpage_nocompress.patch 495 BLAKE2B e1f3b981d99cbd44aca2cac0d18165caf8be9771ba99acd3edb349225c05a7fa56e40707b234cdd1ffa0a82b5d05ed2191df00dcf7c12b45c19bcf0810fa8b4d SHA512 b57ede3b3b8982630d66ab5d21fce22b975e75941d9c2c5e4d33fd1c5ad8f9acfc893605d89bd7f11706d11f0afb3f6eb40d923fd5818a0bbbf8b93dcaccfc1a
-DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
 DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
-EBUILD convmv-2.04.ebuild 697 BLAKE2B 6c6c08b7b1bdf528c13ed5c2d540496f1ef75819741558773e50b42dc43397d8e2a4963e2a090be49e05a010c7395be21ad13a5ea80ee9a66a1f8f8fb00eceeb SHA512 473e677f1ec5af80737d13ff7cbb0d38356aabf3ca3305385de87840406453fc9aed83fae879d254c4740b7425c72d452ab70e66d77e0039a9ece2c3bcc4c23d
-EBUILD convmv-2.05-r1.ebuild 808 BLAKE2B f047ed37c8b98470f34b2960e0e0a9dd1fe45ef59920e5a4648ad41d49d947ce1be2eaec77fec003f9bdf12ceffd2c1894eb80effdd79b1fca908ce2ff4fbd85 SHA512 1f52846d6ff72002b7442c356f610ecf7c66f60620fe26e0f2627b81889a42423ce1c70c338f77ae556c32d4e563ad311dffd8bfb60b987c69f81029e5fa44d5
-EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
+EBUILD convmv-2.05-r1.ebuild 803 BLAKE2B c8e0783cb71d1c05af59145803cf4299c12a24d41abc5c590295657077d6aeeb37e8529dc12566041ca67a9680b97ff022c29c819c7a592cf40b9f10ecef050f SHA512 13f2e9c8d7c6110e4c5854886d605d46bd377d3b0371c428368b3a16b5615e75a4206939043d52e8cec40c27587d651ef1e785614d5b65023dba3c5fa37c8203
 MISC metadata.xml 259 BLAKE2B b686159b165bb65001fec330015f34ab32825ba2b95bda35f433702b2a1b687120ce9de3a181683886cbb3ec13863099e02593f009eee89b0bb1125dae93bcbd SHA512 191845ae8df52119a9934c6fd23f5b9ce8d2c77df29c750790d3ea8b6af37355b69b5b24fdeae3bffe7f5ce4f8997e7211008dd1f36e7de0ebda3a87353c0dd6
--- a/app-text/convmv/convmv-2.04.ebuild
+++ b/app-text/convmv/convmv-2.04.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="https://www.j3e.de/linux/convmv/"
-SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-
-	cd "${S}"/suite
-	./dotests.sh || die "Tests failed"
-}
--- a/app-text/convmv/convmv-2.05-r1.ebuild
+++ b/app-text/convmv/convmv-2.05-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -9,7 +9,7 @@ SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""

 DEPEND="dev-lang/perl"
--- a/app-text/convmv/convmv-2.05.ebuild
+++ b/app-text/convmv/convmv-2.05.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="https://www.j3e.de/linux/convmv/"
-SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-
-	cd "${S}"/suite || die
-	./dotests.sh || die "Tests failed"
-}
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@ -2,5 +2,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 565 BLAKE2B c68fca7e9f273a6d32b9689
 AUX docbook-utils-0.6.14-elinks.patch 239 BLAKE2B 3f2b99e9afe33849af50428053cd057e96420f9a2e004b4193afd8ca5b43b7795ec852cfd5e511b5c2aff8013092c805b0c46b3d334148eb915fab2b2793c315 SHA512 d8848ff585a3db20b95d58f6eb249dcbea039e303f21ae047946e809e734824227a2fab8ff5d5366bba4a66650ccc7f1a0e3b3e11fa1f8b8173c2ae308844b5a
 AUX docbook-utils-0.6.14-prefix.patch 2810 BLAKE2B 1dcb7b40cabc930f96d2caa3c541dba42c7ab380a08cbaf6bf87b9c84dbb13f976c7f1dc05883c308b789c5295fd5ec97c2ef2aa8cf5046c9f302e3d8c873fe8 SHA512 c0fcd0575b031c9dba6ca42cac7e46bfeb687279006b69ba931dbbd546234309f9667e9a6bdd355bd518d8346589a68e1c453b36239fcb158899693819c41f70
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r5.ebuild 1839 BLAKE2B 24e3f741edbfca5af82de161c83054a97780a14372ac9a64bc82d4d9186bdf6d583dfe29320ee80db3c808421f81a7c29531889931c0f0ac09a255b4d4d9da74 SHA512 00cd791261201d544022c1da618e385ab6f123815bc2cdab17d099f637d1a1278214748bd9872ff28300feec31acaad2f7345f543214f24f2774a3b93f9edaf4
+EBUILD docbook-sgml-utils-0.6.14-r5.ebuild 1846 BLAKE2B 2fffe430f77d53e64a8b4d3ae6f71b72ad784bb04d30b7e0e495da02d8cfe3776849d9bdc17e1cc44e0432381ead780454bb840eadedee3a6c289b0d05300fa3 SHA512 f4be6d25f722c5b4a15f1c096101fb657443526502ecb4cedbb925ebb40ced90896f17f9bcec5d2c20abfe3910bfd4c96a500f0827852a84d2890ef2db4c8612
 MISC metadata.xml 376 BLAKE2B 41601b1cfab5c502384fe8f8d13e1404d91434eb58573a527d6999d82c26761bce727f42e467f6336c41220d1dc4446b4ff020f3fa66b7ff1c968bf3f688717b SHA512 750848b4e8edd39b3032e4c10f0c3bcb1d5e2251c2faab08cea9effd19ae67263d956dfae37677770fc1a6cce434b3d89b209f78fc164ed48b3fb86968eda59f
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jadetex"

 DEPEND=">=dev-lang/perl-5
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@ -2,5 +2,7 @@ AUX hunspell-1.7.0-CVE-2019-16707.patch 811 BLAKE2B 5adc2e6009a0381bbe6ea10a64fb
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
 AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
+DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808
 EBUILD hunspell-1.7.0-r2.ebuild 2316 BLAKE2B f470ea41b0e9c2993eb68bc8351ca737e209d44db4f5af1f712980d7806238abe1172ed5d12c92b316be77ea67f52824df76d801b2af7dea056a83287cec0427 SHA512 08f2bf11f5e6130e476cf05429d59615aae37c726aa2033a2da13c6b9a7ce13436dce070025fe73e44f2f5b1e996b66e4475f6ade2c3f6b66225a5da18bfe52a
+EBUILD hunspell-1.7.1.ebuild 2272 BLAKE2B 5806405bc5a10fac6267ee5932daf4fce35518e26b7a194bfaf5eb7681d97d34eb2266676720bd6a13ca2e374f32cf42760fb5cd389d4b137c8ddbc0748ee5f3 SHA512 3fff22c1f38645c6880632904abdf1c7b1b1439162439877eda0cabeb4fd23b2c0349cff563bd70a21511fc18df343b70fb95edda1030dc215f05642ed61406c
 MISC metadata.xml 301 BLAKE2B b51f61b0ee48d57bc3cb55e7b82b28395877d7c5b4b715f1e79330da95cf6874c1361341a0ac85ab0ecdc1420b2046d278913571ed69604142cf0cd73181099b SHA512 c83f8543e28a964670c59474527d3866c941e211c60c14b23a2c950ac8b9fad35983af5303820ad96920931ddcc676c0d7201ede9fc56f1b41e7c63e15b8a261
--- a/Show More
+++ b/Show More