gentoo auto-resync : 26:02:2023 - 09:56:20

author: V3n3RiX <venerix@koprulu.sector> 2023-02-26 09:56:20 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-02-26 09:56:20 +0000
commit: 9b55c1bd600df28af7b9f6ee044b714873e19b49 (patch)
tree: 9c6d86e5e38b0aed45d07dc73907e9f818783a4d
parent: 61044571b76d87a2eec42d36c9b7addf3e66e000 (diff)
153 files changed, 2974 insertions, 564 deletions
diff --git a/Manifest b/Manifest
index 0510c3545eb6..2eb22d3396dc 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29454 BLAKE2B fa0b2286c8704236b2f5afc27e02711cc62477337a2545802a284a6de880802b24b09f7b36149fdef9cdad21ff8ed88fca4016d32ad6ccf9ae7193217e62f873 SHA512 34cad4a109d16e7f1e97cb31371674612e0dbed1ccda3128eacf926ea5476d1f3b0bf501335cec2a68cadfeca8074e23b2046968830bc4ab13f15c0f690775f2
-TIMESTAMP 2023-02-26T03:09:58Z
+MANIFEST Manifest.files.gz 29464 BLAKE2B f54d846007ddac29bfcf54d05088bd3b33854e9ba9d43a9e79a02da34e6b5e4c388a44bcddd3807dcf076ae2e1d0a24e73eddbb1c19f2d4c2e8a198361c66c65 SHA512 4d62ff5c52d95fd59d3d4c28109828e4d7efe8584ed8936d63a62a0ab44434f0cc283d367ea57c008b1afe0bdc2318b208044411b7a90d7364b88e8dea6b6668
+TIMESTAMP 2023-02-26T09:09:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP6zYZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP7IedfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAFuw/+LYwX/c3uVyPPNBz2uJG55EyP/xRckqFKkuvtzof1vPlImKwkEy2byTQR
-qK0EK2dMXFCu0ALNJKaKVkjLstV9BHoGagM0bRrNf8A7YQ927b1gcNWbqW5dl9iO
-Bz23pyHnsP4gmcyrmzK82pew81Le6ibvK/HFBHyQJkk1PYXZtxTgzLhUoZijdgtM
-aFLuzbys7qmcrHov6pMpMHkEk8wKDPb8dcXUr3efcSWug5tlnoAjpiA1BJk3d0KW
-Ss/fGrJIuyUaMpQ3xW1TaEvwYfSxy4l5iOBrMUSwJ4yCfLGCTbZYbdKPRUc7+32m
-OlQgFmewES8rk7VEh0oD7TS+whL/wwzPOAh4GOxaSsGrkBvSRdC6S/3rNxqoK2ZI
-WolRv7Nn4C0sie9WT1C2h9oqX9SaOQBb53R0ikZUOcYTEz7ObRF7ONfpNnJ9DcOG
-ICT0rHslGjoMe1SKjzJpkF0Ck6U6oTgTXtTuiV7FEgtLjAYJUACqLSpyYnpoWoDt
-yslLDSTTQGhY0DLh8+tkyUMob7ArT/Fl2x/BzbHx0DMEEhtNnxE+B1voMHV5Uv5W
-2AsH5EuGwA/zHpn5r2PRgMPOQbHkF3gmlruE4+60lFAdcRY/UzYm++8ZfPnoAQff
-d7Bw4oyoaOOELXzsyYMJUm6sie4FnBsYWKhhRLA00gyVe/CQXFg=
-=MtRp
+klC6mhAAlHPcWpQtIzTo8oA0AmiZMr9Yr1Q/DXbWojyvHLv2HLrmJJ++w6u4yQve
+8N3WV7hvxJ5pckc8LEureawfBw3TK8VZpPnNiixHLuRHn/Cisk3xMY5OSlga4nDA
+UaR/UYOP7cGKWqR4hljM59zErnr7nxI2w3e3/HaKawv21UXO2hM9vQQjT2rRdJtA
+tltTYWDps2dOZQ5zBOeNI2lyBbPG61M+d9GaOFzrMMnRrxm/6ydXdS0HVFqPuaRW
+hEl/3EsDH2fQJYXICwdol418BYCBSCSCRZ43WssdNlxo0TuDadwGLkL9BEAYN17Z
+oa8jcTRZzmT69pt4Nc/lgCprSI0cQxSvzrs12wNd4/RfW+7ghMb3nDpPWwMxV6tA
++/C52sheYNpaMD635/YjY7vVTkA1B0zIwwOETcWvKfGHE8nQF9jrrdg6r9a/b57v
+lqYs4ECmc9FJsr1ebKRqTICrfX9S6pNgcTkKX9dLqz9OWQXvKRGxT+siIkwjnpn6
+DX0LPWDt25bPWDDNzDfPychHMsnsElutU0Gh7DUVwXCQILrf3w5cvFeWSJEFJTNS
+9Sc0PlCPTvlEktCwsmDXOy+3Pkt6Tt9eqQNw/7iho7QRwh0p4Ywn5Q9bZuuITcJA
+OpvKtfRcbsSGLeDAfUz9Eq2Ayps5FRxwbYhkoIk2NJRGwjWFeZ0=
+=81Ap
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 871823646a36..616b822d8897 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0e4ca27ca6ca..1e65cb886396 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 0e96aba12908..a0d8e371afdd 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,4 @@
 DIST genymotion-3.3.2-linux_x64.bin 66085990 BLAKE2B d2d11eaa00e387749e3257a90f3bbe30d586f1ec178d97e5f4537f331451b1161806fcf05d1c84b10b5116247023bd338ac4440e568d7e58d249055aed2f3597 SHA512 ae3bfd2c4eefceb04cd67256b291e3c7bee3c3d0e212add92086709e5fd60bee4789d2ea80732bacbcad880be472e507470afd635cb766903664ea0815ed0205
+EBUILD genymotion-bin-3.3.2-r1.ebuild 4325 BLAKE2B 97582bcd6530867b070f39a60fac41507ad7ec3c2d47904c95321034d2da8365a4c62d445dc68b93e38eadd2af543b0ee1d46c3e9a7f5120fc5d2c74e3a6cb16 SHA512 6d6a73f531cbccf74a7945ba2f47e0105e1ec4ac488ef562434b3fc13876082f575afa3db9419f6e2e988e1fdb2070ce115bc6ee9de250835ab13a3e6eed14c7
 EBUILD genymotion-bin-3.3.2.ebuild 3687 BLAKE2B 4df2fb86a01bf24d91981547a3bf6e02b04e6e75a8fbdec4c93f17c468405db874ba53aac3464c5e1f62dba06dc4055ce3d378ab8478e57ac418a4db1ca78015 SHA512 bc3ee073b66fb077a97be2fa10f1a8aaef48931c44c0338e941093d326f897fbde207eadfd984b00f7fc3f998049f7e219b46f6c551483f44c23ea2c7baef028
 MISC metadata.xml 402 BLAKE2B ab9053ca959660812f1e1bc536950c0278d23c2906ff0a82483241f16960d2ae6ecd3eff091666df8fef38fdb073a6e3d0a5c8a7c7926426fead769365df49a5 SHA512 785e5acc8811d310b7cd5dc52fe3de6a22d7a92fa81a12db8a16b1df75a83f47ffea4e2fe21a712dabc5c1fff8da4d6f2e49ae0597373fd6e106aa13e81323d3
diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.3.2-r1.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..1e6e015e81da
--- /dev/null
+++ b/app-emulation/genymotion-bin/genymotion-bin-3.3.2-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 desktop pax-utils
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+BIN_ARCHIVE="${MY_P}-linux_x64.bin"
+
+DESCRIPTION="Complete set of tools that provide a virtual environment for Android"
+HOMEPAGE="https://genymotion.com"
+SRC_URI="${BIN_ARCHIVE}"
+
+LICENSE="genymotion"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="app-arch/lz4
+	app-crypt/mit-krb5
+	|| (
+		app-emulation/qemu[qemu_softmmu_targets_x86_64]
+		app-emulation/virtualbox
+	)
+	|| (
+		dev-libs/openssl-compat:1.1.0
+		=dev-libs/openssl-1.1*:0
+	)
+	dev-libs/glib:2
+	=dev-libs/hiredis-1.0*
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpulse
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXmu
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+"
+BDEPEND="x11-misc/xdg-utils"
+
+RESTRICT="bindist fetch"
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/${MY_PN}/*.so*
+	opt/${MY_PN}/imageformats/*.so
+	opt/${MY_PN}/plugins/*.so*
+	opt/${MY_PN}/${MY_PN}
+	opt/${MY_PN}/genyshell
+	opt/${MY_PN}/player
+	opt/${MY_PN}/${MY_PN}adbtunneld
+	opt/${MY_PN}/gmtool
+	opt/${MY_PN}/tools/*
+"
+
+pkg_nofetch() {
+	einfo
+	einfo "Please visit"
+	einfo
+	einfo "  https://www.genymotion.com/download/"
+	einfo
+	einfo "and download "
+	einfo
+	einfo "  ${BIN_ARCHIVE}"
+	einfo
+	einfo "which must be placed in DISTDIR directory."
+	einfo
+}
+
+src_unpack() {
+	cp "${DISTDIR}/${BIN_ARCHIVE}" "${WORKDIR}" || die "cp failed"
+}
+
+src_prepare() {
+	default
+
+	chmod +x ${BIN_ARCHIVE} || die "chmod failed"
+	yes | ./${BIN_ARCHIVE} > /dev/null || die "unpack failed"
+
+	# removed windows line for bashcompletion
+	sed -i "/complete -F _gmtool gmtool.exe/d" "${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
+
+	# copy .desktop file in S directory
+	sed -i -e "s:Icon.*:Icon=/opt/${MY_PN}/icons/genymotion-logo.png:" \
+		-e "s:Exec.*:Exec=/opt/${MY_PN}/genymotion:" \
+		"${HOME}"/.local/share/applications/genymobile-genymotion.desktop || die "sed failed"
+	cp "${HOME}"/.local/share/applications/genymobile-genymotion.desktop "${S}" || die "copy .desktop file"
+}
+
+src_install() {
+	insinto /opt/"${MY_PN}"
+	exeinto /opt/"${MY_PN}"
+
+	# Use qt bundled
+	doins -r "${MY_PN}"/{audio,geoservices,Qt,QtGraphicalEffects,QtLocation,QtPositioning,QtQuick,QtQuick.2}
+	doins -r "${MY_PN}"/{icons,imageformats,mediaservice,platforms,plugins,sqldrivers,translations,xcbglintegrations}
+	doins "${MY_PN}"/libQt*
+	doins "${MY_PN}"/qt.conf
+	doins "${MY_PN}"/libicu*
+
+	doexe "${MY_PN}"/{libcom,librendering,libshadertranslator,libswscale,libavutil}.so*
+	# android library
+	doexe "${MY_PN}"/{libOpenglRender,libemugl_logger,libemugl_common}.so*
+
+	find "${ED}/opt/${MY_PN}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed"
+
+	doexe "${MY_PN}"/{genymotion,genyshell,player,gmtool}
+
+	# the android-sdk-update-manager have some bugs and lacks maintenance
+	# so installs bundled version
+	exeinto /opt/"${MY_PN}"/tools
+	doexe "${MY_PN}"/tools/{aapt,adb,glewinfo}
+	exeinto /opt/"${MY_PN}"/tools/lib64
+	doexe "${MY_PN}"/tools/lib64/libc++.so
+
+	pax-mark -m "${ED}/opt/${MY_PN}/genymotion"
+	pax-mark -m "${ED}/opt/${MY_PN}/gmtool"
+
+	dosym -r /opt/"${MY_PN}"/genyshell /opt/bin/genyshell
+	dosym -r /opt/"${MY_PN}"/genymotion /opt/bin/genymotion
+	dosym -r /opt/"${MY_PN}"/gmtool /opt/bin/gmtool
+
+	newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
+
+	insinto /usr/share/zsh/site-functions
+	doins "${MY_PN}/completion/zsh/_gmtool"
+
+	if has_version app-emulation/qemu ; then
+		dodir /opt/"${MY_PN}"/qemu/bin
+		dosym  -r /usr/bin/qemu-system-x86_64 /opt/"${MY_PN}"/qemu/bin/qemu-system-x86_64
+		dosym -r /usr/bin/qemu-img /opt/"${MY_PN}"/qemu/bin/qemu-img
+	fi
+
+	domenu genymobile-genymotion.desktop
+}
+
+pkg_postinst() {
+	if has_version app-emulation/qemu && ! has_version app-emulation/virtualbox ; then
+		ewarn "By default Genymotion is configured to work with VirtualBox hypervisor."
+		ewarn "So you should run command:"
+		ewarn ""
+		ewarn "  gmtool config --hypervisor qemu"
+		ewarn ""
+		ewarn "to change hypervisor to QEMU."
+	fi
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index c082889074c8..9f73e2d75d3a 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index a41c8eccd6cd..065c62b7114d 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,7 +1,7 @@
-DIST transifex-client-1.4.1-deps.tar.bz 241665608 BLAKE2B 88fcdf188c0086c3a8438cee0408e1df8ea17fa7c5724347d8af9b3f94fd843e8a3d68e988c33ceb55f6f8723d6a97fb189027d36fe9f443cbfd39d6f6ddf257 SHA512 a7f6a8e04211756761b2b1295c3cc1ae0c2a3b6486607f0514c38f9314678f48d2f743f681bf1f990310ef89345f02cc06f15908db3df5c4a1c0c7d0fa7601a3
-DIST transifex-client-1.4.1.tar.gz 91054 BLAKE2B 55bde1faf526a633923691cd3dc14d9d481cd4eec040e95eae385c63593545dc2158e0d3518c53a08db70661abf4fb864157d5e7e1fdab403ef02e47d83665fe SHA512 66ad08c9a22e09dbb5690c4da830924e0bd76c9ecf73dbeadc849c7b1911b4439a456c478a5688883278e90903015b0968220f36f7cd951650f364857ac0e08e
 DIST transifex-client-1.6.4-deps.tar.bz 241683180 BLAKE2B 395caf5b5db1ea93363a7f6efc4d2b8ff9e5e8040b04fd8e78ccfbc4b6239c809e348de9d4f8e494d34a2fc6564a70df448961d62a2949c9e2a326cb5f873fcf SHA512 0463cc7ead2c111f4d3889f3f29aa1c729554af0d0934a51aebd691e1f621f9bc61b5b3a90166ee0c947187aa5b489dc6b1bbd438193d6009afdc1a040db1270
 DIST transifex-client-1.6.4.tar.gz 94703 BLAKE2B b51e29aadab41c23b95efc86c334876094772e9d4f4f0cdaa41a5d016e710597da631953446d20689b0028e34bb4cc31ab0bdc1d3107dbc3a4abd6ba9279698e SHA512 d8e6b18d30b9d225c6ed84c9cc699743c289ccfc151c1aa74411989f965f554e651ece3e36a033dc8fc77bc3bb5502b02b2d04b1affe96811195b74edadf128c
-EBUILD transifex-client-1.4.1.ebuild 826 BLAKE2B 039e9a694cdbb1486dd998a9458f795721a0a30160874a4b66f6e9b687a9a60419d27e5bfadd2c9782a59c14da619ab0fa6a6225c03e0733aa4b28927d3e5555 SHA512 b5a3e37c0c407277983fe034b66bcd17546759431eae69a301974dc2871426338cb53d21fae5eb1819d87df359362d7a3b81e52b0600f695e8e4426003f417d2
+DIST transifex-client-1.6.5-deps.tar.bz 241689777 BLAKE2B 55ca6f8c39e08887ddad1fa27fa5065cdeaa193d470be846b60ad0350578e64d10f9ea63a6d9bd744b048e0db164591d07a069e2deab55e75ecb1e78efc44c19 SHA512 72b5702b31121e42b6b107b3addecd9ac6010042f94b2116e08b18e50264d6a6bb7010e0bef6dead599d96de390390f624b413ff042cc4293538fabbf904bc19
+DIST transifex-client-1.6.5.tar.gz 94921 BLAKE2B 1d1e00c62754765e1bf51165e7fcfa2f7352d3d2033b7f8f5916c89e571dbcd2d421038e44382b490aa91013213fe89232cd5337678c265c6bf32734786737ce SHA512 212d6d008eb0f7b83483c4dfd3b3f1caf6a18cb136e8a814b6395d7baee4097c902280a93e358f1a9ccaf43e668e3dcc372e0c67765624610506012328f89f3d
 EBUILD transifex-client-1.6.4.ebuild 826 BLAKE2B 529022bb0db9b0ce06f9c893bb1f630cb5540e10acf6e69b38a499573626882ca0ce62e41e72083eb6096eeb82a0cfaee68306ac68dbcd8f430dae149a25afc3 SHA512 44d1f3de4650b476bad13f02732608f084168ed06fb594088714bacd1623d4327f7cf047bfabd743c79277f2003ad9ff2fd91509c2d1a355b088d8602d630e87
+EBUILD transifex-client-1.6.5.ebuild 828 BLAKE2B 712d28a7197d5befea627351f32ba0a9f842adccaffd16084cf93b5bdd95cedbb40904e826e8fdfa36b552f3dd54d5a32a0399bacfdf1d1eff6f66d440bccda0 SHA512 6be1279a4ad5b66e0e6480da1792af5494006fe0fe2791f1fbf3cb8cbe11ecadb9b51e1ccd01fd43ed18900638a56b746e41845628cd66fc406e299df669b34e
 MISC metadata.xml 542 BLAKE2B c848737ba110443b53155e2e499f0b55f25fe1f6eb0fe35009eac80a42e34b45a00e56d40d9eea42e94129ef87ba446dbf19a1a3469a46801ab0c5c981c05c2d SHA512 a19b2e39fb736dca1c05c21097e9e75baad16ce4632767582dc634f41280fc9b41ee1ed3beca01f6992a1217b3abe63f36ac638dcb29e06ee8b2b76de338b7c9
diff --git a/app-i18n/transifex-client/transifex-client-1.4.1.ebuild b/app-i18n/transifex-client/transifex-client-1.6.5.ebuild
index f6cb75a144ce..4c2ef37584ef 100644
--- a/app-i18n/transifex-client/transifex-client-1.4.1.ebuild
+++ b/app-i18n/transifex-client/transifex-client-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}"/cli-${PV}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 src_compile() {
 	emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2140838d7df4..9f82e5111319 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index e1dca52b3867..46c765dd33c4 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -7,6 +7,7 @@ AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a7
 AUX mupdf-1.20.0-lcms2.patch 2512 BLAKE2B b641519f069c43ef2e9efdf0e18418e663e3fa39d1fb2a0a4b759f8af0412e3a63f212961d80430de86a8ea3d8228ece07e2a04cbe08ccbe330afcbad18e3527 SHA512 d25a843286f9376f17cc73dd974835eaa7be7a0a7b26fab338ae5b3cf54588f476538c73e3053edc2367bd5856eb1af0ebbffce426f7da287784dcb0ee3fc684
 AUX mupdf-1.21.0-add-desktop-pc-files.patch 845 BLAKE2B 8fa08810dd0b797af517c7932a2b81c080721155f607970664ca68a8eb4ec53bcfdda417790bf002aff1b1e1e8257d67c3a2e6bf6d500ee50cc03a7f440b60c6 SHA512 96835698141898a9509321c6125d5bfce1b31d3a0329d3c2be55d9026cff65204112a8ac0774ece1ac1ca7a1ce3dc534437aca1a76eb7716317b2c7e648e549f
 AUX mupdf-1.21.1-fix-aliasing-violation.patch 2651 BLAKE2B 649b9cde7eefdf16ba5a57e40128dc57710d63a04281bae4f26f2ee9dc19933628826d52ff4aee95fd7e6141b35c59efe883439b852758bc5075e30a89507564 SHA512 deccc9193d9266a9add6e1d80eb289f4576e12703d8a0af640ebdbfc698cbb3a15ac9da3b752b1f6beb4ad901aa3bfd43d08d34738b5c7545182bf20200ecaac
+AUX mupdf-1.21.1-fix-url-processing.patch 823 BLAKE2B e813dddb4691429f382010a71aefe648b094896290295d8f6366832db1044f2cd0813096dcf0096fe9a05f3dbf8009745118455638d7d8db2c11d65721d14029 SHA512 dcdadf8134fa27e7b089ccd26da3cb43856ec6aa0a30828b5e6f7cd76909ff30028a31877e77ba67f59060b0c648a8842daf295d2eae855e2876372c41210c03
 AUX mupdf-1.21.1-no-drm.patch 586 BLAKE2B dad2f0544153830cd8fff32a667edc229e5f149f4a474af065bb3e4b47d0508125077810a652b63837cafa5c441223eb2993a51c8be25809793aa2c098018947 SHA512 6149a8527a3025cb3b9ddc97db8d2638a4f0653b55fd78a86a97aefd2bf44d8b35c42e31c79558d8e8ec396427577ddb792e85e4055b4e4c8d704ba510378579
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
 DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
@@ -17,5 +18,6 @@ EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f
 EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 7f6c496689aa27a9652b025f06825a7acfe7f642265f479fcf49aa1a4b71bcf4056ec24bbb642d4a667c13686a89a0eeab619fe7881fb9ad50391b4600add06f SHA512 50d58af35937363f58d129931374e4b17ca0864ea9064a14e09ebe40122aba5eb999d139b824440e082f8420181108e641c90eccb0fd1da97946ec7a52489e80
 EBUILD mupdf-1.20.3.ebuild 4780 BLAKE2B eb2f4aaf2aa01d067ecc81bc71a4ddb97addf585fa79fca9e49f10d7070c83f2755be77cca15fa81cc71e386670077fb9dc431872b76cc114453084444e22d5e SHA512 d37b11930ab067bb85604cb11c87eda4cca371368b286f49beb5d551d0808677eeb5208ed17b77bc3401ac6c648e5eee4c070d8dc9288acfaf9ea3d869b27053
 EBUILD mupdf-1.21.0.ebuild 4744 BLAKE2B 1eedbb5b4aeecd9718c820e40ec40aa517d08b29d7cdca2c7a397824ecbf21a3dfe70cd6aff0afec2a1b5beb4baa7f4eb1703d1ab193be1430e3a226329ddbd6 SHA512 253804764cb8465bfa0b5f534d53e9e561e5ea5c2205cb5b05a1e401d412a05eb12ae0920de348677ad00c73194e372204e5b586d53c92ced42065477bc5e8bf
+EBUILD mupdf-1.21.1-r1.ebuild 4987 BLAKE2B 2af1aa2bbd8d3ff5635fe6d1fda63a3ea2ac8ec8b184781ee77adbd8520c296b52af06b9d3d03cf01727171bf8b52884112598a9135f46cb2b605696454813e1 SHA512 d42b54f055ff0e8fb68ff69174eed381873c48fe0eea43e2835b749ff5c511f125992842527ef6f0ef856943f427f013e13975f49b8924c6e2b85d95cccf73ca
 EBUILD mupdf-1.21.1.ebuild 4891 BLAKE2B e3bd33a65d8d488e0b074e0858840bb22f932f51a1da55db4207a85c4af64ca349fac9ff0e5c0fc48d4adae87d98c04213ea623413e983cbd869d04d2764b5f1 SHA512 b244163c4d284b19a60975ed1dd12e9c15124c5ca6f000fdc9fa2474d4a8f8e14e2953938046b93c0fa7728bb08f4f4765153b037f04e25a77b9296167f49b02
 MISC metadata.xml 497 BLAKE2B 35e16ef688aa8b046f3e8ceaa7399da31379ba50b2cbc36d842696d1589aeea5a55eede13d79188f08ae8ff411c16385128633a1fbdaba04ee115158ac7e529b SHA512 225727e22fe2756480f3d502f49a62abbd0fe09d6266c1e00c09b04c2b5da181fc46bb06b19020290fa857b1feb0d557e6a77084f6269b5e0fdfec593cd46709
diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch
new file mode 100644
index 000000000000..bebdf3909e81
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.1-fix-url-processing.patch
@@ -0,0 +1,25 @@
+From 37757db262425d793b17b63821d9014d3655e50a Mon Sep 17 00:00:00 2001
+From: Sebastian Rasmussen <sebras@gmail.com>
+Date: Thu, 1 Dec 2022 00:04:40 +0100
+Subject: [PATCH] gl: Use posix_spawnp() in order to search PATH for binaries.
+
+---
+ platform/gl/gl-main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c
+index d5ae69c95..271ac43a6 100644
+--- a/platform/gl/gl-main.c
++++ b/platform/gl/gl-main.c
+@@ -122,7 +122,7 @@ static void open_browser(const char *uri)
+ 	argv[0] = (char*) browser;
+ 	argv[1] = (char*) uri;
+ 	argv[2] = NULL;
+-	err = posix_spawn(&pid, browser, NULL, NULL, argv, environ);
++	err = posix_spawnp(&pid, browser, NULL, NULL, argv, environ);
+ 	if (err)
+ 		fz_warn(ctx, "cannot spawn browser '%s': %s", browser, strerror(err));
+ 
+-- 
+2.39.1
+
diff --git a/app-text/mupdf/mupdf-1.21.1-r1.ebuild b/app-text/mupdf/mupdf-1.21.1-r1.ebuild
new file mode 100644
index 000000000000..590791e7653f
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.21.1-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="+drm +javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+	dev-libs/gumbo
+	media-libs/freetype:2
+	media-libs/harfbuzz:=[truetype]
+	media-libs/jbig2dec:=
+	media-libs/libpng:0=
+	>=media-libs/openjpeg-2.1:2=
+	>=media-libs/libjpeg-turbo-1.5.3-r2:0=
+	javascript? ( >=dev-lang/mujs-1.2.0:= )
+	opengl? ( >=media-libs/freeglut-3.0.0 )
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( x11-base/xorg-proto )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+	"${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
+	"${FILESDIR}"/${PN}-1.19.0-darwin.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+	# General cross fixes from Debian (refreshed)
+	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+	"${FILESDIR}"/${P}-no-drm.patch
+	"${FILESDIR}"/${P}-fix-aliasing-violation.patch
+	# See bug 893604
+	# Fixed in upcoming release
+	"${FILESDIR}"/${P}-fix-url-processing.patch
+)
+
+src_prepare() {
+	default
+
+	use hppa && append-cflags -ffunction-sections
+
+	use drm && append-cflags -DGENTOO_MUPDF_DRM
+
+	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iCXX = $(tc-getCXX)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+	# Adjust MuPDF version in .pc file created by the
+	# mupdf-1.10a-add-desktop-pc-xpm-files.patch file
+	sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+		-i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	#
+	# Bundled libs
+	# * General
+	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+	# recommendations. It does not mean "always use system libs".
+	# See [0] below for what it means in a specific version.
+	#
+	# * freeglut
+	# We don't use system's freeglut because upstream has a special modified
+	# version of it that gives mupdf clipboard support. See bug #653298
+	#
+	# * mujs
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We then went back to using the bundled version of it.
+	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+	# when bumping and check!
+	# See bug #685244
+	#
+	# * lmms2
+	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+	# It is therefore not appropriate for us to unbundle it at this time.
+	#
+	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+	local myemakeargs=(
+		GENTOO_PV=${PV}
+		HAVE_GLUT=$(usex opengl)
+		HAVE_LIBCRYPTO=$(usex ssl)
+		HAVE_X11=$(usex X)
+		USE_SYSTEM_LIBS=yes
+		USE_SYSTEM_MUJS=$(usex javascript)
+		USE_SYSTEM_GLUT=no
+		HAVE_OBJCOPY=no
+		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	_emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+	if use opengl || use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon -s scalable docs/logo/new-${PN}-icon.svg
+	else
+		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+	fi
+
+	sed -i \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+
+	# Respect libdir (bug #734898)
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc \
+		|| die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 34baef84ed81..212833038bd6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jakarta-xml-soap-api/Manifest b/dev-java/jakarta-xml-soap-api/Manifest
index 446c8a9ad5c4..e009b57a75db 100644
--- a/dev-java/jakarta-xml-soap-api/Manifest
+++ b/dev-java/jakarta-xml-soap-api/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-xml-soap-api-1.4.2.tar.gz 107226 BLAKE2B 4de5b994505d1964b6804010191b7b623322005d7bac6e9295062e821b5e0994a02d04f72d7f1bba9a8bf835ce42f455678af35c8cdf3e9e7208a2fde4151927 SHA512 9df8bb191fee0f6afa46f2d0c4bd5d1760324220be6862ff17df77d0dd4c9341360f18dd935233fdf6d9656d511c5378bd557e3dadd6570dfd3c9d7981179516
-EBUILD jakarta-xml-soap-api-1.4.2-r1.ebuild 1405 BLAKE2B 7dcd1daa61b9b90cc09376eaadf078e42d287e490a5c33cff7f9065511f6e4288fc375a22e5c622e1069b490e682968534c90b831ad314348ac47ec0c3c78c3c SHA512 aa650a8565aaa5037ff91af2f4049ac43282ed6e5e27d223a83817438ac4abb39da85d6235b7d5d12f71001628a8afa952927a813838d8e0f6cbc9b1da427d02
-MISC metadata.xml 323 BLAKE2B 4344e9fa5329a4353e4d1c824a0b64b4bcc4c9a59a9e085e2d4d4e075206b8137f36ec01673684881a93da8c4a4fca7f53770d9d0012e347a32e316582e4a709 SHA512 19672c91b0f5da04ad8d44d477a6192a010b57651eda3e6e4e68c0020ace835132a18a519015e49ab06fa4091a8fdb67a3cdeaee1058602c5009df086796a16e
+EBUILD jakarta-xml-soap-api-1.4.2-r1.ebuild 1334 BLAKE2B 2ec9f622ebafe937540b106455afb9cd10e9fce01e687f9b8a61de22cd27d395e5d3f528de9bab64de82039dd8049c3f384b1325db94254e9d464ef39943b9b0 SHA512 4006bc79149a43f317538507e55ff5c81f6ed2d4ded3792d6327173c9e0ddb12a2aa8b22800e7ac6c22c72357511bbf90071a4a3272ce474b0e9947de296757d
+MISC metadata.xml 320 BLAKE2B fd847b8fbad4684553ca9dc3132b0ebd523f9664cce8e635f38b3804c35c0aad29a331c117910210996fdb4eb309e1e9e2c9625aefec6bc1a36d113a768a0677 SHA512 7137cc73a561da78fa9ce53b07737636fc6144495ca67fac5b6e5a63d41e74bc45ffcc04b459d2018a744f78e5b0ab4f44e944f1ed9a1b672f2efd344f6b212e
diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
index be69299aa916..3186460aa436 100644
--- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
+++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild
@@ -1,19 +1,17 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-# This version provides module java.xml.soap and package javax.xml.soap
-MAVEN_ID="jakarta.xml.soap:jakarta.xml.soap-api:1.4.2"
-
 JAVA_PKG_IUSE="doc source test"
 JAVA_TESTING_FRAMEWORKS="junit-4"
+MAVEN_ID="jakarta.xml.soap:jakarta.xml.soap-api:1.4.2"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)"
 HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws"
-SRC_URI="https://github.com/eclipse-ee4j/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jakartaee/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 # EDL-1.0 equivalent to BSD
 # - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers
diff --git a/dev-java/jakarta-xml-soap-api/metadata.xml b/dev-java/jakarta-xml-soap-api/metadata.xml
index 24700dcb8731..cceeb17a326d 100644
--- a/dev-java/jakarta-xml-soap-api/metadata.xml
+++ b/dev-java/jakarta-xml-soap-api/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/saaj-api</remote-id>
+		<remote-id type="github">jakartaee/saaj-api</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jax-rpc-api/Manifest b/dev-java/jax-rpc-api/Manifest
new file mode 100644
index 000000000000..30086bf4b7e0
--- /dev/null
+++ b/dev-java/jax-rpc-api/Manifest
@@ -0,0 +1,3 @@
+DIST jax-rpc-api-1.1.4.tar.gz 91556 BLAKE2B a8d830a34fcd829bd44b66aadd473d25bcff788d01822b50b4eafafa3cc4ee002118904d79a38054f716bfd1fe68bd49dc7e74ae2f7ab8f9249277ddc863934d SHA512 4b2a15050d989754f93f7771622e5df286de633f4bcdeb750dbf3df6aa1115cf8de5fe84b809c15b9ccb85bd14283696df76cbe619b06ca48ce048b728525496
+EBUILD jax-rpc-api-1.1.4.ebuild 859 BLAKE2B 463e6201e071e2f10c2d5e5473c9c712ce20796354e75677ddb2ad5d47d1b3a1ad3fb25dd21cf8c3ced072daf5a7d372a9ea6580f0861cf9a2fbd04208dc35fd SHA512 3f50da58f97d580db7bea51d79c0e96c80e2193c7369d4e84711f66b4a572c0d83bf9d34770de15e8e930a5cc0e8b620c7a2682f2405ebe20b1a445c5c32e049
+MISC metadata.xml 306 BLAKE2B 9284206a01e5a936fe8c3d20acad6df47c7ea88f892f7b64afb3ea47c8ead66c97af1052da3181997612f1b50b0b5e01d8221bcc94ba9a696f5e1366886eb164 SHA512 95b6459d848292e713acff6ae30ce1ad68cbc0308b5991f88c3c124186137c14b493f1fadd6267897a3162a853205b71e7e8092da617200c00d36e9072889e8d
diff --git a/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild
new file mode 100644
index 000000000000..64da18d9673c
--- /dev/null
+++ b/dev-java/jax-rpc-api/jax-rpc-api-1.1.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.xml.rpc:jakarta.xml.rpc-api:1.1.4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Eclipse Project for Stable EE4J APIs"
+HOMEPAGE="https://github.com/eclipse-ee4j/jax-rpc-api"
+SRC_URI="https://github.com/eclipse-ee4j/jax-rpc-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: api/pom.xml
+# jakarta.servlet:jakarta.servlet-api:4.0.3 -> >=dev-java/jakarta-servlet-api-4.0.4:4
+
+CP_DEPEND="
+	dev-java/jakarta-servlet-api:4
+	dev-java/jakarta-xml-soap-api:1
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/jax-rpc-api/metadata.xml b/dev-java/jax-rpc-api/metadata.xml
new file mode 100644
index 000000000000..4f37e2c488cf
--- /dev/null
+++ b/dev-java/jax-rpc-api/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/jax-rpc-api</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 994d06d1ac39..14a2cbb86420 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 1d152350834f..6706993abe17 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,5 +1,5 @@
 AUX ispc-1.18.0-curses-cmake.patch 597 BLAKE2B 083a949e99a00819b1eed3ecb4276c7018f914a4902ea4c41dbd2a10c934d908ef2bc29a45e869ce290d5e787a7642de1ed630bc697b02e07267bb4e848fa1fc SHA512 6ba529e8dd4ce1483149e51a9a8ed28b476f604fcec263f806be7f9ec1b55decf8603126ea70600dce3d6947a328d907d046d25cc401847f6701cc9741d6cd14
 AUX ispc-1.18.0-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440
 DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06
-EBUILD ispc-1.18.0.ebuild 1759 BLAKE2B 7464b2b45781585e1b985bd47be67688b0757535e9f3b28fdbdfb85a7f331c2403cc6e0bcbc53e7b5b6798b5ea1dd056dccd04250e49fde1149df3028982c02f SHA512 2c0358dbfa198df04286c623fa7696b3914cda377ef207c32a39307d24cd18b76c239c5972b7e1fa23e90c81f2ba9aae67cb616a77064338c89b4476de46f7c9
+EBUILD ispc-1.18.0.ebuild 1759 BLAKE2B 6a8c572061acc62023cbd76517b2ef1d1f0cc21319bb713462fd3973786ea6f42b45d88136a0c3380b664732aed2d35dceb545ebd682620c9e8838bd5acb0ff7 SHA512 7d877d6b15709c755f28cd339769962bde33958ff071db9ac0533771b118c2de316fba78ae7a494adec983a1a823c81f82fcb98cb65cc781e35ce75a5a814434
 MISC metadata.xml 242 BLAKE2B ec655bbb26e5d545a7b25a9906e315b54a18cca56613207ce76c9e002fb8968e269627e75639053d7da3c46d8ba34296129458adcad9a561414628e8957d2d9e SHA512 7702a5b2bfe0d81904e069fa097af3c739a21ffad9b03cf9931e398dc904d10501854cc2605fb34415f3f13e58a990b7ff8c3aa803f981889c53b25cc23c6115
diff --git a/dev-lang/ispc/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild
index 6f2ee56c5a5e..a343a4857794 100644
--- a/dev-lang/ispc/ispc-1.18.0.ebuild
+++ b/dev-lang/ispc/ispc-1.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 LLVM_MAX_SLOT=14
 inherit cmake python-any-r1 llvm
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 46fcdf4e320f..73ae6a1c023f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index f0eb9fe0f47d..2c91bc7c7ae0 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,7 @@
 DIST libgit2-1.5.1.tar.gz 5895483 BLAKE2B 4df80216523f4065e46c1ce99fd0747d2f8516571691c8c2b5638e32c805f5ce08d3add769e6d5ce29ac69b35419db82ce56c6b3019e70573c4ad63aca2e440d SHA512 04cf389e30cd9fb787704e3c8997acaaeea5c13e1e2f9eaf9f5598d35c2e85f3cf04b47312cae9e7278236ecb089c2d33addd852e38d3c7d2daa87929b077f39
+DIST libgit2-1.5.2.tar.gz 5896845 BLAKE2B b89c48c953d8804c1ea1997e0c81f45aeb66f87a7cad100069dc3a8364e0658f6d6e41e49adf123cc950b2da46f805aa05f07af234990f62aa78d38d5e8e78d5 SHA512 0de5e82953482bf57e9cd221406581a12c6acfbeeea0cebbb9b701d288804ec085b7c0902ba1f04ad7cdaaead9d472be21ffe8d730050db5c77101a93448fb3a
+DIST libgit2-1.6.1.tar.gz 6666523 BLAKE2B cf80f64bdb069f16cd39855b6ff0afa9c601e489c59da60fc7a72b447263f731db806b7df60c289f2b94ee3d26ef182a33395528962d4bfca87db8e99da1cf86 SHA512 9288e6a0129020458a3ef6a7af2074e1a4577cf0be9adbab9316f5fae149861a4f39dd1dc104030e7fe849bb95d0ef12ffac4c728c5f13da4b5f66c7e6f9af7a
 EBUILD libgit2-1.5.1.ebuild 1686 BLAKE2B 4ae895e2af20af5b8af29d7b62f2638ef4a804254d185e1416b9661593e97922d1c92e39de13f1c1e48be244b1603092251d4924004a91fce75c88250763aede SHA512 3bc83d51903b44085685b6c284c44d8c0590eb71db919f1bdb8b7f41daba68a56e8978c51e5b2b861d51df84f603a366526abf7127fb05b14c4ab50c6745b7e9
+EBUILD libgit2-1.5.2.ebuild 1693 BLAKE2B a69495e5cd140062bf2017408bef133926cdab66debe8e31f94c4a72076582ac6f334e67e31b450b152f433abfc13f2a4d916706ef9e7f63ee7b76c29e8b5d12 SHA512 359e355243406050ae03c33f043b2b942ee2a19789232219c613af3eb99061d8ee6831603ffbae2395328e999fb613213abf6efe0a12ed4b093ecdd8cf0747a1
+EBUILD libgit2-1.6.1.ebuild 1535 BLAKE2B 41ea8db929386e36d01cd2b493770c5cf588b8130dc268303176ebf5329e9903d371cfa53987548eb9305ba0b5be86e8fd7a5cb2da8e172a1d1b9d1458e5bb17 SHA512 4355568edf69097b6f359798e653ee2f502f3f89e764e34c719d4256da9a413c5c7b0091e3939d00a067cdfe5c7415c030fb6691f0d950fb3ca087ed8baddcea
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.5.2.ebuild b/dev-libs/libgit2/libgit2-1.5.2.ebuild
new file mode 100644
index 000000000000..2769e48033fe
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.5.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' \
+		tests/libgit2/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre2
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-1.6.1.ebuild b/dev-libs/libgit2/libgit2-1.6.1.ebuild
new file mode 100644
index 000000000000..1335a2335a3c
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.6.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DEXPERIMENTAL_SHA256=ON
+		-DUSE_SSH=$(usex ssh)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre2
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libxlsxwriter/Manifest b/dev-libs/libxlsxwriter/Manifest
index da770adbb770..f68cff99342c 100644
--- a/dev-libs/libxlsxwriter/Manifest
+++ b/dev-libs/libxlsxwriter/Manifest
@@ -1,4 +1,6 @@
 AUX libxlsxwriter-1.1.4-fix-pkgconfig-version.patch 675 BLAKE2B 19771b0b921a613191695ab0dfc65dabf3941678df01e7241cc37b5dcb9544c59f917d9d0090781e525708b4e1fa314cd49b6887c9915e809f4111b3fe0d2831 SHA512 dd43e9b8738298dbf568f9fe7cc518ff44ecd352a01554af776506be6c815e51c954195f4bcd046dfeb35ced4d590824f4dc26881f03a70639486f8fee768797
 DIST libxlsxwriter-1.1.4.tar.gz 20442200 BLAKE2B 38308dd8e954820b6debf15bc884effd583c0e0fa1667ed4451085ff8cf1bf4101807110873a501617785763886c107c19ab30c16390b5fb608f52b2736465be SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5
+DIST libxlsxwriter-1.1.5.tar.gz 21541446 BLAKE2B f9e2fde83bde852b4568b8ce82a28ad75e6e8d1ca6f3683ac2308d28707e7e4874facf8eac2ce9b4b9fdcc96d8b775dd69eefb2f976f564323a278a3dad032d0 SHA512 bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6
 EBUILD libxlsxwriter-1.1.4-r1.ebuild 1120 BLAKE2B 94d3b6183729c5bc3d102c956df3877842cdcccba24276e586a816baedd095c8777846aaeef564ddfeb30c8a6ec460502d226d3c62a6b9716d18af41f7f388df SHA512 fa2d658213383d9de5657c3462f18642ccb44c57edf270edd5aaa1224cf2e5bce6f9d84b34d1643e5e3d6895ff2d6d003aab900e88b438b7fa2b233f5f157d80
+EBUILD libxlsxwriter-1.1.5.ebuild 1084 BLAKE2B 32bad02714cb16b3906e9abfa00d58de193afbf3855e95d59f81eae78ae73945332d47d15ecd0e9966cc1cb9bd3569f85afc9c0d2772abbbb6741a34763015b1 SHA512 e2771d4613f70b7777823e3f1a20beee36893309fd211813b5123e7708f8da2267054aa6706d251b1a2ce2f1f09237ce3757e9adaec848e8d2df99a029d46232
 MISC metadata.xml 579 BLAKE2B 0c3294a1f69d9cc7e3e95a37f2708ce4672cc931f28cdded82aadc9cdffb323ac4bd7518c61fee57ad30022617acb572625f3b6b0972fd903a1ae3afcf98aee1 SHA512 83d288575e27337692c3cd94bad56d8e2882240343b739eeed72742bd82e9177c45a81ef94ebab9e035b99431ecc2cf21723e408a90fa6b5f551e8a7f1f17a0d
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.5.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.5.ebuild
new file mode 100644
index 000000000000..241cd4e4d6be
--- /dev/null
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake plocale
+
+DESCRIPTION="C library for creating Excel XLSX files"
+HOMEPAGE="https://libxlsxwriter.github.io/ https://github.com/jmcnamara/libxlsxwriter"
+SRC_URI="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-RELEASE_${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="openssl"
+
+DEPEND="
+	sys-libs/zlib[minizip]
+	openssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	DOUBLEFUNCTION=OFF
+	for x in $(plocale_get_locales); do
+		if ! [[ "${x}" =~ ^en* ]]; then
+			#non-english locale detected; apply double function fix
+			DOUBLEFUNCTION=ON
+			break
+		fi
+	done
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DUSE_OPENSSL_MD5="$(usex openssl)"
+		-DUSE_SYSTEM_MINIZIP="ON"
+		-DUSE_DTOA_LIBRARY=${DOUBLEFUNCTION}
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CONTRIBUTING.md License.txt Readme.md Changes.txt
+	dodoc -r docs examples
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6802808201d6..7934eb3cb14b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cloudscraper/Manifest b/dev-python/cloudscraper/Manifest
index 4a80db91bb81..eb8f41de353b 100644
--- a/dev-python/cloudscraper/Manifest
+++ b/dev-python/cloudscraper/Manifest
@@ -1,3 +1,5 @@
 DIST cloudscraper-1.2.68.gh.tar.gz 111952 BLAKE2B 69e896ad704ce776594fb89714bb75316ebff1b03387cba8575be6d60b496d18556690cfad109c2fa55c72ce3d91dcd21a21467a2d9820c579fea7482b688800 SHA512 42fa90127c6348c52a8327728683719966ae69c7b945cb9b485907e89e3b29b8053d31cd9cd4326e71ffd4c33e0fce20dd3d0e046fab62d89110eb4510535ad9
+DIST cloudscraper-1.2.69.gh.tar.gz 112198 BLAKE2B ea7325353aa9c4bfaca1834a1f9fdb2201cee1946a990d059540500e58322899469a48d847b6d7688b8f671bf4bbe762d1f61ed080587f3a553771ba8e9c2a93 SHA512 9da8d3d42117768a0a38843448248e3a124c864aaa76d62125d3a1dad8ea4f1921954e6efaa2eb9b40c283d6889c15c0c33378db7008155e46ccb5ae219c11d6
 EBUILD cloudscraper-1.2.68.ebuild 1522 BLAKE2B 6114fc4c60872d61d24cf1822f900df5c6c0997572e0489a4edf8748bff71317b264846c8d7ae520fc5798571b79e4b691aace0389d06084fceb8c7f3620615c SHA512 6047e438a99db7e0e6df3301db05644f6f2405898cf81223f57c557f9f018389f7e9c1c260ffcda770e391f81baff9b89fd3f6f78b18cd12446fcb6a0b047bcb
+EBUILD cloudscraper-1.2.69.ebuild 1522 BLAKE2B 6114fc4c60872d61d24cf1822f900df5c6c0997572e0489a4edf8748bff71317b264846c8d7ae520fc5798571b79e4b691aace0389d06084fceb8c7f3620615c SHA512 6047e438a99db7e0e6df3301db05644f6f2405898cf81223f57c557f9f018389f7e9c1c260ffcda770e391f81baff9b89fd3f6f78b18cd12446fcb6a0b047bcb
 MISC metadata.xml 749 BLAKE2B dd73d528bd6b2fd50230028ca8877783b315c9f3327ca3173b75a32ca7d1dc6135aa86e765f6d7b9929e6a84e5ce7f99a9c2a0ee4972c01e818f27b83719b5b8 SHA512 b36231ae7509d4ee146c4b0ba97aef6d9ee67db44741ba9f53e201f5f6b0392eaee3ce6e41c988ef9938c5e4b6dbe1fea10505319d40916e6b0bce5597dd790c
diff --git a/dev-python/cloudscraper/cloudscraper-1.2.69.ebuild b/dev-python/cloudscraper/cloudscraper-1.2.69.ebuild
new file mode 100644
index 000000000000..de0d08b51d59
--- /dev/null
+++ b/dev-python/cloudscraper/cloudscraper-1.2.69.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A Python module to bypass Cloudflare's anti-bot page"
+HOMEPAGE="
+	https://github.com/VeNoMouS/cloudscraper/
+	https://pypi.org/project/cloudscraper/
+"
+SRC_URI="
+	https://github.com/VeNoMouS/cloudscraper/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/js2py[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		net-libs/nodejs
+	)
+"
+
+# These tests fail for no understanadble reason
+EPYTEST_DESELECT=(
+	"tests/test_cloudscraper.py::TestCloudScraper::test_bad_interpreter_js_challenge1_16_05_2020"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_bad_solve_js_challenge1_16_05_2020"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_Captcha_challenge_12_12_2019"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_reCaptcha_providers"
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "brotli decompresssion support" "dev-python/brotlipy"
+
+	optfeature "js2py interpreter support" "dev-python/js2py"
+	optfeature "node.js interpreter support" "net-libs/nodejs"
+}
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index 73c3a480a2f8..4d9853ef7ca6 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,3 +1,5 @@
 DIST django-cors-headers-3.13.0.gh.tar.gz 27361 BLAKE2B 2d0729ae6f0e0ff7c572c5f25482fd88dfa03e8f03a7f640ba32f56208fccb91712cd3067bc3376428469cc7f03dd8003069b79e98dd438fad9e5f4b15cd9c71 SHA512 153ae0d2e0b1e390c72993ca629f7ed521fd907481bb2944ee2f805c0081a1db334fd72f0b3fdb77cbb57b3392691f32564bb646bfb8e388a942a8a3da138a8e
+DIST django-cors-headers-3.14.0.gh.tar.gz 29634 BLAKE2B 08ec6811b8608feecbdaadcc6ce220b1574a4bf16823f939f93eda4ece9df0430b015edc1d0909b980996ff143e036858ca81f524e8d270846881a9c0af25fac SHA512 5ff390bd2fba1b3dff3cea08b10021d0fd100497000b2eaef788fe32c1b8584f1954e470f4aa15cbcf9e4342265633a658b8736de08962bfe0ea9e2068521379
 EBUILD django-cors-headers-3.13.0.ebuild 709 BLAKE2B b583921f76ce1276a4f42bf5e55a10098811467e03df4729af9b1c727e01ef3bbdaefffe812643a947bcb3cf5012a53e7da153f83560368b69e70c34d520b503 SHA512 ee8081744c9632cc66112e1b266dd1babb14a312fe709371b913fa090cec7017d08350211c5fd01138e5e56f78754846175c9f45d368d6bc360ae56ec582401b
+EBUILD django-cors-headers-3.14.0.ebuild 709 BLAKE2B 27cff0452ff6c9ca21044ec70208bb7b2d182a9c3201737f82fa461861691df8e3ec08817e1587226d7b2183c33511e0abd221c01b9ce30743c04c84f2c21e03 SHA512 aa3a488d3bacec0d498f6ced40fbf7f909cea05751293c7e31d6ddf9b26db46c67b29cbae56e90f5ed0b2b2eb2c69833c0513733f6f6c57657d805c82a650eb1
 MISC metadata.xml 393 BLAKE2B bfe5bf69a5cdf23648e6058016fa53d402db8141ebf97a8471b3335f13eb0adb3ac328c2a013bea02529ee012b00e77fbf43284500cc9e58937fae16d3a2d743 SHA512 b028f371bae9e3bb8e0e94890ee2a5a8c2d93a774eac7cccd6a1ff91886a82ed52ae4fb93442de89034cdbf4ca9d4186dad29b014b989690020db00c492fed04
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.14.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.14.0.ebuild
new file mode 100644
index 000000000000..2f86005be6e8
--- /dev/null
+++ b/dev-python/django-cors-headers/django-cors-headers-3.14.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
+HOMEPAGE="
+	https://github.com/adamchainz/django-cors-headers/
+	https://pypi.org/project/django-cors-headers/
+"
+SRC_URI="
+	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index d2ae9d28b408..42f68a962730 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,3 +1,5 @@
 DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
+DIST dkimpy-1.1.0.tar.gz 66326 BLAKE2B 3af2ab63351c117b7fa0fd2c7a2f2a98b2177511af61734d171fb69e25c5a3d629d95f8ba2832b66f57607ff447a4093ab8ebd58c931975e9ca0c1bab9469590 SHA512 d8c656d1adabbf8ef2121a36a848818ee9ce5ac9fe42c4b16ef50588870478989159f4ff3aa422ba0556a82763a9e78fde5e19195fe0b95176f2f4ff1d60c70e
 EBUILD dkimpy-1.0.5-r1.ebuild 764 BLAKE2B 685f28d69261fddddc280e1cfd415006b4922c0a5d98693db4da248c875af4786aad094cbfad8268d732004b4eff003efadc654b871e5bcc572a54c33d0a09d2 SHA512 c612ba54b0e88755784ccfeaa77a1dddd07a4c97aaa7987133ff42ea482c53a9ee22fea0dbf6c62316df29b7dbcaf819cd15f36dffe252dda67089ac7e4daecf
+EBUILD dkimpy-1.1.0.ebuild 767 BLAKE2B 8960217a56f673459968760888226b9b4f6f98db17d268ce589e578661fa4ac2612fa1acb617d2c44f33bdaea5c2305392decb213fa1dab7281814c6020bf7c5 SHA512 ce8c5728bf2076458fbcc7270de55a43695899c5db046d3984e707c5da687a54a5fdfaeed394adbefa02ac26b51dc31015fc3c9071e8153faffcdf1125c681db
 MISC metadata.xml 538 BLAKE2B c0b9cb73f84e5f3e6cb6653b0983a0ef5002ad9c1a201b36f6ccbfb150d15990820562b18eef385e571f024b4e44f8572b30eaea57e93df44bbb6105df7abd11 SHA512 1c650532a9c9152eef0803c1c29781095390aca93c036cc097dcf6b16ad0d5ff9938ed48cb12ab092d0df777fbb6f7ca6626be7dc10935ac2563332869e6d511
diff --git a/dev-python/dkimpy/dkimpy-1.1.0.ebuild b/dev-python/dkimpy/dkimpy-1.1.0.ebuild
new file mode 100644
index 000000000000..7a71236ad9dd
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="
+	https://launchpad.net/dkimpy/
+	https://pypi.org/project/dkimpy/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/authres[${PYTHON_USEDEP}]
+		dev-python/pynacl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "ARC support" dev-python/authres
+	optfeature "ed25519 capability" dev-python/pynacl
+	optfeature "asyncio support" dev-python/aiodns
+}
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index ac5bf21785ae..18a8f37b8e28 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,3 +1,5 @@
+DIST doit-py-0.5.0.gh.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
 DIST doit-py-0.5.0.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
+EBUILD doit-py-0.5.0-r1.ebuild 712 BLAKE2B b7083088c5f14b67209105ae1627e8d6deba1e8f5cb97d01b0af8f6af52ace7145032d380dd041b499ad9970ca951a7f1ee444fa1865aa37653b49df079cde74 SHA512 50ca2723b8cddac91303beec3d8416f594d33945bbbf911cbacd951f6d422d291785cb3015237a0fcd9ae579eeaa0a7468c5a57bf7c9693b8f6755735f0bdd52
 EBUILD doit-py-0.5.0.ebuild 627 BLAKE2B 299979c34032fafc87b10da64ff8d490d218050df93f584a461bdf7f006d4900c45bb192b52461b746e2f7e1c86af951fda41fda9415bd27b2c0d271885eb8c3 SHA512 5d48d286aad08b02dc4ba560c06b91305a26737b3c79973eda167a85f40751ae742086995fc2ea4c41f9b424246c55eddcff6fffca8f17e912f7fb83267204b7
 MISC metadata.xml 574 BLAKE2B 7a0bbe729e4c116efeed154754527f4a2c8ce3f25aa0f0e7cddd9377ddd58032d49bd01583693014fd7006516d947f85976774da86ef2b952e14e06b4a81bc08 SHA512 e0f4d58ca417e125ace7705e1d326edad58ec391ef555f43ba3e34ee42007df84ee61f7234f98367f0410f4fa980c6a19e2493d3ae840c751687018919032294
diff --git a/dev-python/doit-py/doit-py-0.5.0-r1.ebuild b/dev-python/doit-py/doit-py-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..f4b939016f26
--- /dev/null
+++ b/dev-python/doit-py/doit-py-0.5.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="doit tasks for python stuff"
+HOMEPAGE="
+	https://pythonhosted.org/doit-py/
+	https://github.com/pydoit/doit-py/
+	https://pypi.org/project/doit-py/
+"
+SRC_URI="
+	https://github.com/pydoit/doit-py/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/configclass[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-text/hunspell[l10n_en]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 3243a737840a..89be338f1f42 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1,4 @@
 DIST doit-0.36.0.tar.gz 1448096 BLAKE2B 15558a39ccac031ddf3a429aa585bc6e1d49c2e7572df29979ca66d1025fa5d7a917f6cc5bcfd21f2749e4ed7e7885b0865ec67b6fa32817e1518d47da9ead97 SHA512 d4caa31701755c7f59213dde0f89fd3616c0c01b7f06245cbfd9f1a315d503e62f3556c3b86685cd0ebfcffcc9cae0987ca150f037aa7b3cd960439a1191be42
+EBUILD doit-0.36.0-r1.ebuild 1501 BLAKE2B c2e4086ae31308e2ad97a88ab783151c439203413b2574713c05a63f12c02f233f997f5c74a804314ae302239ce0316651e72fb44b906fb370ee5858b606213c SHA512 bd6c9269e4945441e65d0e8011af597c0439642f723c0775453e99712d38f3ea0ed065cdeba2eb2ec4ddb94064bd209549a7d5b8d483a4c22002e6d037ae6554
 EBUILD doit-0.36.0.ebuild 1537 BLAKE2B cd68c7e7e47f205e37a62a8852e17f75b77db6ef49e1d9f4f8f5d815ff77dfba55ede7e6a70d39cf998f96b0b4f3e9f8747031641d0968f700d2f37e76e637b4 SHA512 c90d5d2ce66900b16377715f77bcbfc3270b8fd12c935a8b714451498ee450a14766fba7889bee8c68de80c201b4619ac50c322dd0182f7586fc0755df1c6b6f
 MISC metadata.xml 568 BLAKE2B add52a6e7986bb88b9dc87d2f03c4ec3716ae7d5e2402556b7a3137b8267ca2cad0ae3324d628f3127afde36513414029c0f567a9683dd9b11b1a287ff5e3a7d SHA512 e772c9ccd8133fd73dcf04733facf60ef7c2f1559b83e5024faeea4d5fd7799c42a28be6c9b8676ea9b6d68969ca5be633320e8cb7dd8d1f0dca35e819eaebc7
diff --git a/dev-python/doit/doit-0.36.0-r1.ebuild b/dev-python/doit/doit-0.36.0-r1.ebuild
new file mode 100644
index 000000000000..21d211e22506
--- /dev/null
+++ b/dev-python/doit/doit-0.36.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 distutils-r1 pypi
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="
+	https://pydoit.org/
+	https://github.com/pydoit/doit/
+	https://pypi.org/project/doit/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	|| (
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/doit-py-0.4.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+
+EPYTEST_DESELECT=(
+	# test failing due to impact on PATH run in a sandbox
+	tests/test_cmd_strace.py::TestCmdStrace::test_dep # #836164
+	tests/test_cmd_strace.py::TestCmdStrace::test_target
+)
+
+src_prepare() {
+	# Replace custom theme with builtin for documentation
+	sed -e '/html_theme/s/press/sphinx_rtd_theme/' -i doc/conf.py || die
+	# Remove non-exist modules for doc generation (#832754)
+	sed \
+		-e '/sphinx_sitemap/d' \
+		-e '/sphinx_reredirects/d' \
+		-i doc/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp bash_completion_doit ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins zsh_completion_doit _${PN}
+}
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index e7c6a659f6cf..23763b28dadc 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,3 +1,5 @@
 DIST python-fastjsonschema-2.16.2.gh.tar.gz 391619 BLAKE2B ea8da31d16ec7c9a897de0b2a91832ce26798d2dc048e70e862ce7a4e75787cd25ee4b9e14fac9f85599e050338b6306a2549a0a8bab9abcbfbd12c246d10697 SHA512 17fce033e6d334e82813af7366006ade29433efe291a1567ae494c2273b9ab87b8fa4ccf1bae0b7062f9f70fe492449c87a5d07075d79037ac2c755ed9278a23
+DIST python-fastjsonschema-2.16.3.gh.tar.gz 392011 BLAKE2B 04990592a2bf6e1309bf725361ef7c2e253c4765c5b9d60805c5e6189f14885a3b0bae98945c2fe228adc335ca8c8c0a243b283b24fa447238d6415d439288e2 SHA512 2e26f31f9c6966e77f70b8ca584e672d554219b6bbb4811e3ac8dff1c693b2638ef08b8b9011e0db6f739be02e2f41a35d15bcfc42a9cb06ddb4521e51f37d8a
 EBUILD fastjsonschema-2.16.2.ebuild 735 BLAKE2B 94bcee2f1a4811ab16315197b74e60bcc5232848006a58e442f4105441c1e1552a8d4b8904b605762e32e22717cdb0620b53ea5ab3d1cc13734324dbd8de0d55 SHA512 1eb0f21c326f933c4a61fa576036e81b0ee8b37c2a81eaaba59b282bf3aada26f11e1b16a814bcd195631ad65117b780404e249c4698359e039a54a0298b912f
-MISC metadata.xml 320 BLAKE2B 6a243ee36316e1c8db01ec6da04593ee4edb8cf479e829291e74c5672b5dd419cf9a3528c13dbd540342377186130a49be652e3f8c1cf78feafd310dbbd3bc88 SHA512 0c0dff7e564b1c1176e05a49c0c028ce181497bd734a1c19e24d8af7169c16d8b5dccc73cc31379c28ce0e58d1eb142d131969719b1c8fe6df3b76c59b4f3a3e
+EBUILD fastjsonschema-2.16.3.ebuild 743 BLAKE2B 577283d575d6632fea86d4d12e4ee72633d21958a104d9cdff35bed327512d5720c6b400a2b6c395b2c73a377624153e0f49fd573a94458e6ce08dc44df16c92 SHA512 b7378494fa66d7168967e2087ad4c3b5baa729d26e53eb4d46ecdadb4a7f752e5a8740a40fadd2ae11410edd3f6ea99d6aa3c6790579662d9ea702fc4d4416a8
+MISC metadata.xml 390 BLAKE2B d29071ddcb0aea8db343c2924de51e8fdbf9295898c687ca0f474e007007407c9a402cd2fa74f0f2142dfb2f14a2cfd0c51c05f5fad6891734328a003283821f SHA512 db3339aaba0218ebea0ea4cd5b950dbf74572b18341f595fbbbe1f67c0c9c23413f4a98aeec5b49b036533cfea46e8f2a74f5f999c3b4c472a66297346139b05
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
new file mode 100644
index 000000000000..453a2cbc2332
--- /dev/null
+++ b/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Fast JSON schema validator for Python"
+HOMEPAGE="
+	https://github.com/horejsek/python-fastjsonschema/
+	https://pypi.org/project/fastjsonschema/
+"
+SRC_URI="
+	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm -r tests/benchmarks || die
+}
diff --git a/dev-python/fastjsonschema/metadata.xml b/dev-python/fastjsonschema/metadata.xml
index 7e60f3e6248a..1a957a0ba04f 100644
--- a/dev-python/fastjsonschema/metadata.xml
+++ b/dev-python/fastjsonschema/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">horejsek/python-fastjsonschema</remote-id>
 		<remote-id type="pypi">fastjsonschema</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyrate-limiter/Manifest b/dev-python/pyrate-limiter/Manifest
index 1b36027d3fa8..bd6df17c8196 100644
--- a/dev-python/pyrate-limiter/Manifest
+++ b/dev-python/pyrate-limiter/Manifest
@@ -1,3 +1,5 @@
 DIST pyrate-limiter-2.8.2.gh.tar.gz 51233 BLAKE2B a9a8bbf123596c7c64f60ae2c9d4e23a394dae6d18a8d09c0ec0b289bbbfce9dacee523726b906a30cf17fd7243b3fa1d1f2dc60af1bec67dc242d944535a5fd SHA512 3ff703347a86f6a91cf6b9c8edce3017cf88f2373961ba235c2f521d0112b0116951be7314b95d737ef0bec5cb6bae9908874fafe4060eb773cf0577e2ddbdb3
+DIST pyrate-limiter-2.9.1.gh.tar.gz 71544 BLAKE2B 2f87f998abdb891673931f91a9980f5876f58a2225ca41af6ec390e59bd326e8614162549946552b22fea093f89f5c2a219eaa9223719dd4db9023944f040da2 SHA512 461b1627574ce09817b434ce0d47e3bbcb549fcd8176623b87640089c1dd9bb45030ae1c944ffd7906b04f9b1ba2977c841c1da9483619bc092570b86a49bcd6
 EBUILD pyrate-limiter-2.8.2.ebuild 1610 BLAKE2B 513df54bd30e8ebd64b58ca7d997a05a122606535f4b6d188a21d2b5e30380cccac7c435b017a0211eb9fc97af17d822d0e1cc1d66a20244ac9d666fbf5ada8f SHA512 ef0281396688a2985620780e736ddd2056db16b7d6be6eb11e32c381a7440dd992f639d6ea3e31479b3a1850c486e1d984e89bdf880919fb14fd9262c4d2a43d
+EBUILD pyrate-limiter-2.9.1.ebuild 1610 BLAKE2B 513df54bd30e8ebd64b58ca7d997a05a122606535f4b6d188a21d2b5e30380cccac7c435b017a0211eb9fc97af17d822d0e1cc1d66a20244ac9d666fbf5ada8f SHA512 ef0281396688a2985620780e736ddd2056db16b7d6be6eb11e32c381a7440dd992f639d6ea3e31479b3a1850c486e1d984e89bdf880919fb14fd9262c4d2a43d
 MISC metadata.xml 525 BLAKE2B 8daa0c59b247c8ec215a3868315f383614b24bf36a80950f3a94968856a27ee2eb90cedba36784355926c509a26b530f3de44be729beeee0f22595cc0b9467b5 SHA512 429e23f33cd2889a7e989333a03ee374cbec2e264d354bf1c299263f2c9167059eb17f1c975b67cd4af7011843c3478d5296033666566bca97749ca85dfcab44
diff --git a/dev-python/pyrate-limiter/pyrate-limiter-2.9.1.ebuild b/dev-python/pyrate-limiter/pyrate-limiter-2.9.1.ebuild
new file mode 100644
index 000000000000..b8c9c6a33c68
--- /dev/null
+++ b/dev-python/pyrate-limiter/pyrate-limiter-2.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Rate-Limiter using Leaky-Bucket Algorimth Family"
+HOMEPAGE="
+	https://github.com/vutran1710/PyrateLimiter/
+	https://pypi.org/project/pyrate-limiter/
+"
+SRC_URI="
+	https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/PyrateLimiter-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/redis[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/django-redis[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Optional dependency redis-py-cluster not packaged
+	"tests/test_02.py::test_redis_cluster"
+	# Python 3.11 is slightly faster, leading to a non-critical failure here
+	"tests/test_concurrency.py::test_concurrency[ProcessPoolExecutor-SQLiteBucket]"
+)
+
+# TODO: package sphinx-copybutton
+# distutils_enable_sphinx docs \
+# 	dev-python/sphinx-autodoc-typehints \
+# 	dev-python/furo \
+# 	dev-python/myst_parser \
+# 	dev-python/sphinxcontrib-apidoc
+distutils_enable_tests pytest
+
+src_prepare() {
+	# workaround installing LICENSE into site-packages
+	sed -i -e 's:^include:exclude:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d1dbdccdd235..b255e76fa317 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 379447637827..48f43377a9f8 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -11,11 +11,11 @@ DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAK
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
-EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
+EBUILD lldb-16.0.0.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 EBUILD lldb-16.0.0_rc2.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-16.0.0_rc3.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
-EBUILD lldb-17.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
+EBUILD lldb-17.0.0.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 EBUILD lldb-17.0.0_pre20230211.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0_pre20230218.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
-EBUILD lldb-17.0.0_pre20230225.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
+EBUILD lldb-17.0.0_pre20230225.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-16.0.0.9999.ebuild b/dev-util/lldb/lldb-16.0.0.9999.ebuild
index 985e9ba9d42f..1d8c4b56e83c 100644
--- a/dev-util/lldb/lldb-16.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-16.0.0.9999.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 		-DLLDB_ENABLE_LUA=OFF
 		-DLLDB_ENABLE_LZMA=$(usex lzma)
 		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
 
 		-DLLDB_INCLUDE_TESTS=$(usex test)
diff --git a/dev-util/lldb/lldb-17.0.0.9999.ebuild b/dev-util/lldb/lldb-17.0.0.9999.ebuild
index 985e9ba9d42f..1d8c4b56e83c 100644
--- a/dev-util/lldb/lldb-17.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-17.0.0.9999.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 		-DLLDB_ENABLE_LUA=OFF
 		-DLLDB_ENABLE_LZMA=$(usex lzma)
 		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
 
 		-DLLDB_INCLUDE_TESTS=$(usex test)
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
index 985e9ba9d42f..1d8c4b56e83c 100644
--- a/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
+++ b/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 		-DLLDB_ENABLE_LUA=OFF
 		-DLLDB_ENABLE_LZMA=$(usex lzma)
 		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
 
 		-DLLDB_INCLUDE_TESTS=$(usex test)
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 739378bbb71d..70ae825a0f95 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 220a84356ba9..e5371993e51d 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,9 +1,10 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-515.tar.gz 41096030 BLAKE2B 47f09ef0b0a0c83960f7feadac28d14a051235a3f4601d6a0518b05c7c62ba4b0ec0093a474b232cc2bbca77c21579a69d963eb8372d7bab3d8ddd67a6067f1b SHA512 b8d330b546de1f8b4aa319783893d3fdfda7926faa05fd9494713e0a9f975b507eb1e42d56917a71721836162929f9bab78579f291aa72150f6e124c63bc259d
+DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051
 DIST hydrus-516.tar.gz 41098992 BLAKE2B 4195ade87f9f42f5aaf592ae502e49404d3fb188f7921c137973e7df31af8bb346c243a375e99014cfa9e3d6821a187b254cfe79f88c470cf54aa45e50e9bb22 SHA512 941cb81fba305708a1c33250aae366ae3bf8ba83d9aab90475bec09109608c86b68fdcc84d18a4fe324f57b2b91b8531887d9792b9d9130c5234f9cfa96e106f
-EBUILD hydrus-515.ebuild 4504 BLAKE2B c8660a2692d3537ea6cbc336b7b1b565fab71b02c600e32c59988e8bc30fe62d8b8e54f07c70ee382ece1f0faaf9093c6f74161553f3d344aba1ee81e2bcca5a SHA512 36a37a1ec4646142ece09d2113dab26c1e78d6c584d3e30a6d0351673dd7888c34c46124f56110fddacaddfc2c0ec364b357c70d30d68b68e0ace60885507bd5
+DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2
 EBUILD hydrus-516.ebuild 4504 BLAKE2B c8660a2692d3537ea6cbc336b7b1b565fab71b02c600e32c59988e8bc30fe62d8b8e54f07c70ee382ece1f0faaf9093c6f74161553f3d344aba1ee81e2bcca5a SHA512 36a37a1ec4646142ece09d2113dab26c1e78d6c584d3e30a6d0351673dd7888c34c46124f56110fddacaddfc2c0ec364b357c70d30d68b68e0ace60885507bd5
-EBUILD hydrus-9999.ebuild 4547 BLAKE2B 99069804b75ef0efae630d91e7ed502a738a6d5c4c96ab4579be1721b750f735a8469f460018118d93a5df07ee5984570d6be93fb2f030805ac8f42e335432e7 SHA512 f0b9a90b433e5deb934f3172dd1f85e8df3c8b43ebec78457b75a9eb622f918428ffe5fcec5fd592229c31566ab5ca30b175ab1db65e5fba978f33120af74312
+EBUILD hydrus-518.ebuild 4800 BLAKE2B 3a573ba85b4fc71b38c2b60b42501e131a364e425221911c53b083a9ba6f9482a769a4d18e2bd58b7983dd3f1936aeed9766ea6ef62af61ed5ecbd9587f4482c SHA512 2520868ad133903ed058470c8508c777b9735e9a2772d5a5933064dd51b90f9935c2aacedd036f28fa8596bba35176da5d2d3d2ab8a588db96a5bbd6ddfb1df6
+EBUILD hydrus-9999.ebuild 4800 BLAKE2B 3a573ba85b4fc71b38c2b60b42501e131a364e425221911c53b083a9ba6f9482a769a4d18e2bd58b7983dd3f1936aeed9766ea6ef62af61ed5ecbd9587f4482c SHA512 2520868ad133903ed058470c8508c777b9735e9a2772d5a5933064dd51b90f9935c2aacedd036f28fa8596bba35176da5d2d3d2ab8a588db96a5bbd6ddfb1df6
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-515.ebuild b/media-gfx/hydrus/hydrus-518.ebuild
index 6036cc0f1d38..072c47dfe381 100644
--- a/media-gfx/hydrus/hydrus-515.ebuild
+++ b/media-gfx/hydrus/hydrus-518.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
@@ -18,8 +18,12 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+	SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch"
 else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch
+	"
 
 	KEYWORDS="~amd64"
 fi
@@ -75,6 +79,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/userpath-in-local-share.patch"
+	"${DISTDIR}/${PN}-3.11-test-fixes.patch"
 )
 
 src_prepare() {
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index e447f565f37b..072c47dfe381 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite"
 
 DOCS_BUILDER=mkdocs
@@ -18,8 +18,12 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+	SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch"
 else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch
+	"
 
 	KEYWORDS="~amd64"
 fi
@@ -58,7 +62,6 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
 		media-video/ffmpeg
-		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
@@ -76,6 +79,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/userpath-in-local-share.patch"
+	"${DISTDIR}/${PN}-3.11-test-fixes.patch"
 )
 
 src_prepare() {
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1aa2360c3992..9d3c1e33c99c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index 93f2225bdfb1..304713caf5cb 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -1,4 +1,7 @@
+AUX zita-resampler-1.10.1-makefile.patch 2756 BLAKE2B 55acc601fe6683036179001206786d5a899fe8ed2b1c115bfbf819f5bc0f8d5d6196f49168baf08cae6fe5eeb34e0b7e1b11990e6e292fb2df32f411fbd47197 SHA512 e592b1634891eb514ca2f3759187a7f78414b27cf2c956959a8edf1a6915d767327ec8ce5e3fb98f1e389296d6e57531e786c58b24e643b7c65aff5f5cf97012
 AUX zita-resampler-1.8.0-makefile.patch 3222 BLAKE2B d13a3e6b2beeb6eb4b440f68431d7956cf66774e50549f8a7e8d6351d370778b5c3b75c98880a1260f2ac98b812f1fc51cf97f7f86d38ebf7f147714cd3e7b1d SHA512 4487230e87df2b165abb6e59fad6929fecc72c44509a60162976d5d1b54a2a584f04713c7f8cf77e9792213495656eeb45606c330d3c16be05084d4429cc9f84
+DIST zita-resampler-1.10.1.tar.xz 118800 BLAKE2B b8871899b7e6cac9b46df3c45c5bb1d8e9c9edd41bcbc5944098d9c4eee2ff4e4d216f97b3bfa96ac43082b5333de26201d6cba9eaa152efd20e8c5017478391 SHA512 ba95286b0744df393194f4f94a8aad62f6c088cf80f6be71482ed55beef6503a9bab6644f2565b69002247611fcf0fb6561fc0072578466a0133311721b43cf5
 DIST zita-resampler-1.8.0.tar.bz2 131161 BLAKE2B 1ba5d255fff9c66e18e6177bc7e48a4710fdf54f58c07f162f8c8801f4f449b22dea9922645e7e33b70e07739c2b381176714e704f9840305f194f3c23d66de2 SHA512 adf1f465ac09104be5a02c1cf0f052a44b4c1a448312f3aca016a889e98cfcdebfded38f60300ad85d18ae03eadca7e8e95efb2875267bc36435ccfac881a8e7
+EBUILD zita-resampler-1.10.1.ebuild 1025 BLAKE2B af1359819ca767c9884ec3a5ce46e630faed13782ab57943c6a44dbb6dec1b3692fbe564ee77fef4e464b5f1812e7ca9c21ed191a4aa73dace7fd1c1ebf982c5 SHA512 0d52665527d1ca06fcc313a14523f8df5c67f1980fea08260c1bd58b48451c57388ccefd03511ff876fd0c6aadfe65cbe442f05e526cbce63447f844e5c4f574
 EBUILD zita-resampler-1.8.0.ebuild 1018 BLAKE2B 881c46d599d4bb9ea758679d4b1eed290831f8ea0d1106171ab324f61349439dd473721ece5dcef400831bc1bd8fc2482f1d03d918b3acb15c9e808bb82bdb44 SHA512 fad9b80ef572da4550353a0dda708d5883d79a85998bf985191c84b0839d40a820d873c93ddac4e47175aead0b229b6eaf606164d6b2c051213177e0c25edbc0
 MISC metadata.xml 723 BLAKE2B cda1bf2299fd0da9f05d2d71309a48f50ce45347c7665f390da134e1a406bb4f0bcb241105e590f4274bde1e416b320b841eea3733296ff13bda4b15cd7e58f1 SHA512 3f6939e3e6b3c66e1951dd1ce01b448dafc5528466a9cd1d51f5d12c3508c86ceb0c0960fea031e2e2ed839ddabb260dc2ae2b4921f7b17914edc930708f1a78
diff --git a/media-libs/zita-resampler/files/zita-resampler-1.10.1-makefile.patch b/media-libs/zita-resampler/files/zita-resampler-1.10.1-makefile.patch
new file mode 100644
index 000000000000..45859759c445
--- /dev/null
+++ b/media-libs/zita-resampler/files/zita-resampler-1.10.1-makefile.patch
@@ -0,0 +1,79 @@
+diff -urpN zita-resampler-1.10.1.orig/apps/Makefile zita-resampler-1.10.1/apps/Makefile
+--- zita-resampler-1.10.1.orig/apps/Makefile	2023-02-17 12:27:32.000000000 +0300
++++ zita-resampler-1.10.1/apps/Makefile	2023-02-19 15:19:08.513618954 +0300
+@@ -23,18 +23,17 @@ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= /usr/share/man/man1
+ 
+ VERSION = 1.10.1
+-CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2  -ffast-math -Wall
+-CXXFLAGS += -march=native
++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I ../source
++CXXFLAGS += -ffast-math -Wall
+ 
+ 
+-all:	zresample zretune zresample.1.gz zretune.1.gz
++all:	zresample zretune
+ 
+ 
+ ZRESAMPLE_O = zresample.o audiofile.o dither.o
+ zresample:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zresample:	$(ZRESAMPLE_O)
+-	$(CXX) $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
++	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
+ $(ZRESAMPLE_O):
+ -include $(ZRESAMPLE_O:%.o=%.d)
+ 
+@@ -42,31 +41,24 @@ $(ZRESAMPLE_O):
+ ZRETUNE_O = zretune.o audiofile.o dither.o
+ zretune:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zretune:	$(ZRETUNE_O)
+-	$(CXX) $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
++	$(CXX) -L ../source $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS)
+ $(ZRETUNE_O):
+ -include $(ZRETUNE_O:%.o=%.d)
+ 
+ 
+-zresample.1.gz:	zresample.1
+-	gzip -c zresample.1 > zresample.1.gz
+-
+-zretune.1.gz:	zretune.1
+-	gzip -c zretune.1 > zretune.1.gz
+-
+-
+ install:	all
+ 	install -d $(DESTDIR)$(BINDIR)
+ 	install -d $(DESTDIR)$(MANDIR)
+ 	install -m 755 zresample $(DESTDIR)$(BINDIR)
+ 	install -m 755 zretune $(DESTDIR)$(BINDIR)
+-	install -m 644 zresample.1.gz $(DESTDIR)$(MANDIR)
+-	install -m 644 zretune.1.gz $(DESTDIR)$(MANDIR)
++	install -m 644 zresample.1 $(DESTDIR)$(MANDIR)
++	install -m 644 zretune.1 $(DESTDIR)$(MANDIR)
+ 
+ uninstall: 
+ 	/bin/rm -f $(DESTDIR)$(BINDIR)/zresample
+ 	/bin/rm -f $(DESTDIR)$(BINDIR)/zretune
+-	/bin/rm -f $(DESTDIR)$(MANDIR)/zresample.1.gz
+-	/bin/rm -f $(DESTDIR)$(MANDIR)/zretune.1.gz
++	/bin/rm -f $(DESTDIR)$(MANDIR)/zresample.1
++	/bin/rm -f $(DESTDIR)$(MANDIR)/zretune.1
+ 
+ clean:
+ 	/bin/rm -f *~ *.o *.a *.d *.so *.gz zresample zretune
+diff -urpN zita-resampler-1.10.1.orig/source/Makefile zita-resampler-1.10.1/source/Makefile
+--- zita-resampler-1.10.1.orig/source/Makefile	2023-02-17 12:27:32.000000000 +0300
++++ zita-resampler-1.10.1/source/Makefile	2023-02-19 15:07:48.327102241 +0300
+@@ -31,11 +31,9 @@ VERSION = $(MAJVERS).$(MINVERS)
+ DISTDIR = zita-resampler-$(VERSION)
+ 
+ CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CPPFLAGS += -DENABLE_SSE2
+ CPPFLAGS += -DZITA_RESAMPLER_MAJOR_VERSION=$(MAJVERS)
+ CPPFLAGS += -DZITA_RESAMPLER_MINOR_VERSION=$(MINVERS)
+-CXXFLAGS += -Wall -fPIC -O2 -ffast-math
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC -ffast-math
+ LDFLAGS += 
+ LDLIBS +=
+ 
diff --git a/media-libs/zita-resampler/zita-resampler-1.10.1.ebuild b/media-libs/zita-resampler/zita-resampler-1.10.1.ebuild
new file mode 100644
index 000000000000..cfb0bb30df59
--- /dev/null
+++ b/media-libs/zita-resampler/zita-resampler-1.10.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="C++ library for real-time resampling of audio signals"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 tools"
+
+RDEPEND="tools? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+HTML_DOCS="docs/."
+
+PATCHES=( "${FILESDIR}"/${PN}-1.10.1-makefile.patch )
+
+src_compile() {
+	tc-export CXX
+	if use cpu_flags_x86_sse2 ; then
+		append-cppflags "-DENABLE_SSE2"
+	fi
+
+	emake -C source
+	if use tools; then
+		emake -C apps
+	fi
+}
+
+src_install() {
+	emake -C source DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install
+	if use tools; then
+		emake -C apps DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	fi
+
+	einstalldocs
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 91379268b7e3..5eda823a6864 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 0b21c3bf647d..9f375e099a03 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,6 +1,8 @@
 AUX flacon-9.0.0-no-man-compress.patch 1425 BLAKE2B 9f21a5b8a8b2ec0986b0d5902b15ecfa5214ce1471f4a851e88feb07ef80e8d89617173c587128b6340d349afa087c46e6b787f6cc297a7c594d787b19a060f0 SHA512 7b80c99514bdd540737a773182e9213ef4027c529a6fdd3808c4d35baeec9c5ebb67d15f550cb8a38e37764f19e2a4b7d1cfba0cc0c3872dc4658b7158c9239a
+DIST flacon-10.0.0.tar.gz 3802889 BLAKE2B e99be9ad2da98e84455426df853bb38cecb91a6c66cb3f532459637adee97078fb034d3c5b5cc905b74756adbf6c11276f589d450c1506fba2dace264efe8b9c SHA512 55744b3ef46f298e8082ab172b8e0b5ad428ec3c965ae69befe7f9abb4e87417cf2373385240000471c92391d243ef3b33f25ae565c8e9497021d3b619a5ac1a
 DIST flacon-9.1.0.tar.gz 3769110 BLAKE2B 9e0c4aaef3f6019a8c8196a204e8281ca4250df441ea14127d9347f26557091e87019388bd2942afc39e45a7864d653e2ae887f665ce190f18e646448c3f8e3e SHA512 be35c61e082be7d05bebee5f99192201f91e90f3a80827ac5808e6798f7ed0ada28ab7c2456702c443be51356ec192cd059408c2c3feb5b48b5bab048d0efb00
 DIST flacon-9.4.0.tar.gz 3772714 BLAKE2B b45d6f934e80ae1d3546c1c54fdab22dac38d7ccf01b903a8c820145465c5732d34d6118bafcbbb4bde8c5bb528a707ebbee8b6a53ab5a1c29f1562a52c61382 SHA512 9dfd4ce558c4e3ce902c3b2e43b3c3fb94606f68dd550f774e3704d19ce6a28e887a7410054d6becfe3d20166aa687b7689821d6ee095e4efdc30e35a85e70ad
+EBUILD flacon-10.0.0.ebuild 1970 BLAKE2B 69a914c145eddf893b5515265c566369c410dc0922468a6d248749063873ce443978ad212c313f2028ddfa5a63faa4e081a8c71c112893b5a27d0a2954c08e15 SHA512 9f1c8233913a2570b1a9ecb3ec077a145a35948c46345dc80e9b320c822aa9230ce21f12d6e09a46aeb8e8b890647c5282eea651fb098208e8015ce896b7b7d5
 EBUILD flacon-9.1.0.ebuild 1976 BLAKE2B 0f6ec4c849a6e153628d3df0dcb151f348b053f9eb51107e356739ececa758d3b1045cd6dddc8c82a5888bb4896571c5aef632fdc6b5dc2acb22f090dd8dc957 SHA512 541ad3c226597af60122fd717dd310003df537217d13d9c70f4ee96bc604dbf21993cec2b4f81cfdb6ca687d6e565fb6823c3b018adfa6985fdee073a6fe25e4
-EBUILD flacon-9.4.0.ebuild 1978 BLAKE2B c0355823960886f5e54cdfcc19fd195945ac4e283a930e3c56d13dec9c8407695e9b4a83ee9045c8dac02fd538d8c3f7c165b369f806fb43272f54b27bc0a872 SHA512 62f15742aad48e162630e3380b50e06ac6f32267d6dbf7b177caf6ffa1706c788e4f849c4f80993916b7b5c698881ec6a9f95028efeeb53ecafbdf0dcc9c0e27
+EBUILD flacon-9.4.0.ebuild 2092 BLAKE2B af314a66df665f96ee620336e7bc12dda786adc3ab7d8af5f725f82f259b44796353ac0c23e2125a1d07d27f26cc6fddde401283581f042e2e8c45cff09dae6b SHA512 d7556b382ddec4a37208219737d9859f0c7674ca19904c66ef8b341cf030a74aa01a1864bc7817dd9bb9384302a7c6786f47d58dc8f587de8da1ab5e11d6e7a5
 MISC metadata.xml 483 BLAKE2B 795d557d1298374afb1a7b7e944258091e5a1a33cbba44ffb89d2b41545a13bc079ea406012351256e9aa3be08aa0277adb6757e68ac5d55e3fd636bce5efca9 SHA512 3d744c253befad102285251d40d891aef8ddab615f095a717951706fd64ac12f4fc7191d1b5ce0c4e9c3870eec5b427fcf5158771349a4a8c5219f7b797386ac
diff --git a/media-sound/flacon/flacon-10.0.0.ebuild b/media-sound/flacon/flacon-10.0.0.ebuild
new file mode 100644
index 000000000000..5ae4223ddc54
--- /dev/null
+++ b/media-sound/flacon/flacon-10.0.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests require lots of disk space
+CHECKREQS_DISK_BUILD=10G
+inherit check-reqs cmake optfeature virtualx xdg-utils
+
+DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-i18n/uchardet
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? (
+		dev-qt/qttest:5
+		media-libs/flac
+		media-sound/mac
+		media-sound/shntool
+		media-sound/ttaenc
+		media-sound/wavpack
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.0.0-no-man-compress.patch
+)
+
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# All tests fail with enabled sandbox
+	# TODO: Get all tests to pass
+	# See bug: #831592
+	local -x SANDBOX_ON=0
+
+	virtx "${BUILD_DIR}/tests/${PN}_test" || die
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} optionally supports formats listed below."
+	optfeature 'FLAC input and output support' media-libs/flac
+	optfeature 'WavPack input and output support' media-sound/wavpack
+	optfeature 'APE input support' media-sound/mac
+	optfeature 'ALAC output support' media-sound/alac_decoder
+	optfeature 'TTA input support' media-sound/ttaenc
+	optfeature 'AAC output support' media-libs/faac
+	optfeature 'MP3 output support' media-sound/lame
+	optfeature 'Vorbis output support' media-sound/vorbis-tools
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/flacon/flacon-9.4.0.ebuild b/media-sound/flacon/flacon-9.4.0.ebuild
index 6de27bcb88a1..74f7a97e458b 100644
--- a/media-sound/flacon/flacon-9.4.0.ebuild
+++ b/media-sound/flacon/flacon-9.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -62,6 +62,11 @@ src_configure() {
 }
 
 src_test() {
+	# All tests fail with enabled sandbox
+	# TODO: Get all tests to pass
+	# See bug: #831592
+	local -x SANDBOX_ON=0
+
 	virtx "${BUILD_DIR}/tests/${PN}_test" || die
 }
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5f7045f490d5..66dc81931c92 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 718b33739fba..b47f5407da1e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Feb 2023 03:09:53 +0000
+Sun, 26 Feb 2023 09:09:56 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 4cb684b57aa6..28cc00a25571 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-26T03:09:57Z
+TIMESTAMP 2023-02-26T09:09:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP6zYVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP7IedfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCLyw//SIG0bsU9wZFoxgoJu4L4j4gIJbVGk0DOMc1YqUPPnrR47cYXb1ytEoAk
-tHS0NE0Cz5hIaXz6zWZXS/Ij2qhgbU7bil7fqho1plMI7M9jdZDM5zH0LsoNow8e
-bhLy1t/7w0TAHKfBKMBG/RJ7KjG0RydKCJwAmFpXgFTKBZWC8Uru+3xj+DsuMSKk
-Sc6gnCTUa6kubgB05v+0LYHqUkgUu8DQddT/o3lKmFXk/LH0E5nVGtZ2NXsMVtEA
-GAWMGmRW67koH1QrxbgaD6djSiYogy7nUlL2T1/5YN8ILz51WFwezDLw1UzE2UI9
-INlguo6CrEh82hx/Tvvf/Co5/oX9wCaInp1n9lvBSId/BF2fhnyy9Wqi6gCryViq
-+pey6ufEGhaXF+83THI02q30yDVz6fXd5WHQhHYhYpgho2BLl/21gXhtYwwKktr9
-sn9eItr8Sc59YIUvsp+7Jm5mTpNmVwOCfZ7OOmw23iJjwwSFNXImYVDU1/TfCGlM
-dVVVIJcbDCoC2g/7KCs6f+mjqmOoq1WMKl8oFXfBeiZ4qQBrrjZOq0THE6KVxbGk
-mNveep2J7vszDPWrgaAvyDP2uCLoN7XGRGpT4xA8BzthkrPlwV6IaMkfuFGzQFWF
-hQQgM213z00AWS+YUmKPySPRlE08IgfS3TRQIpJCc4MY37NzyWY=
-=N9m9
+klCBBRAArlpm59CUyYoP4axiMxMe+yVuebFZ4za+jHiQBeTHwtTdtrGB3aa53kr3
+WbisFcoLiBvOiHBBf3CaXB9lADFMQ7d7i6QINzH0s08ZnQqbxwjlUlkOYuORGvQd
++iigsdmBnoHXmNI9hdpee/nz3zEjHg1N5M1t5m65BXsAID2p0k2Dj7KcU+nTesw8
+6E8FJ+P027akew949c1/NCFyK2hiolVoJW9iSbSIE5kQRX6mU7Frg4UAF9Tn4ZO7
+7T1HqmKFiLjxkbCO4TSdP1UUGXp+oY7EIEh8be2b00N+SYPLuq/7Scl0B/Iz23IS
+kDL+sjpLGfmpPPuyNVlqKlfYp5Hf6xE0/WMMbD18xkqRSmHrvsuFPoqXMQ+h21eN
+UrFS27AM9f7CSmELctjxvnXzKysqouyEiyhq48c5bgddSuICVr3mccg94rm08ePZ
+1TmDX4DrpFZLgFwVdLWlph5P19JtFa9uzWNw9dVBd40nFwkHLFhxuVwLBq0u/SA4
+UrGV+7LopGIEtgm3N8Sk6WW8KQdaclUTBIweRqgvlvRJApMKAiW7BDyibejiGgL4
++FK+gL06D5QPN+SY50C4X05vYeJ0WjgHCxWl/ilLL00fC6/+4EbP+bhfssvyV74b
+sINt2aguLBcjVtr6T3CwC4hXxiNquDFHCDGhFfvTErRQU0Qwj9M=
+=TZf8
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 718b33739fba..b47f5407da1e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Feb 2023 03:09:53 +0000
+Sun, 26 Feb 2023 09:09:56 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f8372de8e17c..f30dc7be6db9 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index dc7afb7d0984..1d2b521e3035 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/genymotion-bin-3.3.2-r1 b/metadata/md5-cache/app-emulation/genymotion-bin-3.3.2-r1
new file mode 100644
index 000000000000..570a195da13f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/genymotion-bin-3.3.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=x11-misc/xdg-utils
+DEFINED_PHASES=install nofetch postinst prepare unpack
+DESCRIPTION=Complete set of tools that provide a virtual environment for Android
+EAPI=8
+HOMEPAGE=https://genymotion.com
+INHERIT=bash-completion-r1 desktop pax-utils
+KEYWORDS=-* ~amd64
+LICENSE=genymotion
+RDEPEND=app-arch/lz4 app-crypt/mit-krb5 || ( app-emulation/qemu[qemu_softmmu_targets_x86_64] app-emulation/virtualbox ) || ( dev-libs/openssl-compat:1.1.0 =dev-libs/openssl-1.1*:0 ) dev-libs/glib:2 =dev-libs/hiredis-1.0* media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/libpulse media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 sys-apps/dbus sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi x11-libs/libxkbcommon[X] x11-libs/libXmu x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=genymotion-3.3.2-linux_x64.bin
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=11bc8896cec45a9d90f935b8d0daaf0f
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 7d0d143fc446..3ce3aaa57566 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/transifex-client-1.4.1 b/metadata/md5-cache/app-i18n/transifex-client-1.6.5
index 4125fa985b1f..0139e8a9e14d 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-1.4.1
+++ b/metadata/md5-cache/app-i18n/transifex-client-1.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=The Transifex command-line client
 EAPI=8
 HOMEPAGE=https://github.com/transifex/cli
 INHERIT=go-module
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.4.1.tar.gz -> transifex-client-1.4.1.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.4.1/transifex-client-1.4.1-deps.tar.bz
+SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.6.5.tar.gz -> transifex-client-1.6.5.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.6.5/transifex-client-1.6.5-deps.tar.bz
 _eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=75516e541eb38644d83e4a478816b72d
+_md5_=ec5f57229aa72ae92573874b583f04e8
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 76b8973714f6..76fd3c57331a 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/mupdf-1.21.1-r1 b/metadata/md5-cache/app-text/mupdf-1.21.1-r1
new file mode 100644
index 000000000000..137a3de4485e
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.21.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=X? ( x11-base/xorg-proto ) virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-libs/gumbo media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext )
+DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
+EAPI=8
+HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop flag-o-matic toolchain-funcs xdg
+IUSE=+drm +javascript opengl ssl X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-libs/gumbo media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext )
+REQUIRED_USE=opengl? ( javascript )
+SLOT=0/1.21.1
+SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.21.1-source.tar.gz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4dfbb7a419a082bb4e3d2997ce68c0ad
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 260eec3a2f24..c5cacbef644d 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1 b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
index de9fb05fa1cb..9320e6337b9b 100644
--- a/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/jakarta-activation-api-1.2.2-r1:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
-SRC_URI=https://github.com/eclipse-ee4j/saaj-api/archive/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
+SRC_URI=https://github.com/jakartaee/saaj-api/archive/1.4.2.tar.gz -> jakarta-xml-soap-api-1.4.2.tar.gz
 _eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=59335730ce52755d0fd0bcfb5957b2a4
+_md5_=8212132e29f76e010a845b20bd15d1a2
diff --git a/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4 b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
new file mode 100644
index 000000000000..85528cf72f96
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jax-rpc-api-1.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/jakarta-servlet-api:4 dev-java/jakarta-xml-soap-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Eclipse Project for Stable EE4J APIs
+EAPI=8
+HOMEPAGE=https://github.com/eclipse-ee4j/jax-rpc-api
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~x86
+LICENSE=EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-servlet-api:4 dev-java/jakarta-xml-soap-api:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/eclipse-ee4j/jax-rpc-api/archive/1.1.4.tar.gz -> jax-rpc-api-1.1.4.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=93115b51d085b42fa985f8bdd47e9f96
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8ee1098f64e7..b2413bde4007 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ispc-1.18.0 b/metadata/md5-cache/dev-lang/ispc-1.18.0
index 1841adfa2052..bd13bb92b9cf 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.18.0
+++ b/metadata/md5-cache/dev-lang/ispc-1.18.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=<sys-devel/clang-15:= !!sys-devel/llvm:0
 DESCRIPTION=Intel SPMD Program Compiler
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.18.0.tar.gz -> ispc-1.18.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=06e2185f7e89031d2c2103b9cb3eba15
+_md5_=bcdec94289b3583214cceda9d1e8901c
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 60fddd588eb6..ce220866031c 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.5.2 b/metadata/md5-cache/dev-libs/libgit2-1.5.2
new file mode 100644
index 000000000000..837a47dd405d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-1.5.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+DESCRIPTION=A linkable library for Git
+EAPI=8
+HOMEPAGE=https://libgit2.org/
+INHERIT=cmake python-any-r1
+IUSE=examples gssapi +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/1.5
+SRC_URI=https://github.com/libgit2/libgit2/archive/v1.5.2.tar.gz -> libgit2-1.5.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8e90a01e4bfc95123ab630ed1e24fc65
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.6.1 b/metadata/md5-cache/dev-libs/libgit2-1.6.1
new file mode 100644
index 000000000000..5382f890978b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-1.6.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+DESCRIPTION=A linkable library for Git
+EAPI=8
+HOMEPAGE=https://libgit2.org/
+INHERIT=cmake python-any-r1
+IUSE=examples gssapi +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/1.6
+SRC_URI=https://github.com/libgit2/libgit2/archive/v1.6.1.tar.gz -> libgit2-1.6.1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=802fa8e35eea7396ab7798f30ed7375d
diff --git a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5 b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5
new file mode 100644
index 000000000000..e945598d8e22
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.5
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
+DESCRIPTION=C library for creating Excel XLSX files
+EAPI=8
+HOMEPAGE=https://libxlsxwriter.github.io/ https://github.com/jmcnamara/libxlsxwriter
+INHERIT=cmake plocale
+IUSE=openssl
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.1.5.tar.gz -> libxlsxwriter-1.1.5.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ffde8b14cd751a9e4fd3f8a245736576
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 48e8d2f8ac68..d16c48511bf4 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/cloudscraper-1.2.69 b/metadata/md5-cache/dev-python/cloudscraper-1.2.69
new file mode 100644
index 000000000000..b1956003aba1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cloudscraper-1.2.69
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/js2py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs ) test? ( dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-toolbelt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A Python module to bypass Cloudflare's anti-bot page
+EAPI=8
+HOMEPAGE=https://github.com/VeNoMouS/cloudscraper/ https://pypi.org/project/cloudscraper/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=AGPL-3
+RDEPEND=dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-toolbelt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/VeNoMouS/cloudscraper/archive/1.2.69.tar.gz -> cloudscraper-1.2.69.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=58d94a346bfce95d78762f16599b5816
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.14.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.14.0
new file mode 100644
index 000000000000..f1b02f6bb379
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-cors-headers-3.14.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/django-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses
+EAPI=8
+HOMEPAGE=https://github.com/adamchainz/django-cors-headers/ https://pypi.org/project/django-cors-headers/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/django-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/adamchainz/django-cors-headers/archive/3.14.0.tar.gz -> django-cors-headers-3.14.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=93dfd388bd007ed1a388aa6cd9fcd374
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.1.0 b/metadata/md5-cache/dev-python/dkimpy-1.1.0
new file mode 100644
index 000000000000..6214eaf93d1b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dkimpy-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/authres[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=DKIM and ARC email signing and verification library
+EAPI=8
+HOMEPAGE=https://launchpad.net/dkimpy/ https://pypi.org/project/dkimpy/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/dkimpy/dkimpy-1.1.0.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6b89f978ca6a356632b87d86983cfab0
diff --git a/metadata/md5-cache/dev-python/doit-0.36.0-r1 b/metadata/md5-cache/dev-python/doit-0.36.0-r1
new file mode 100644
index 000000000000..2a77d79eb4b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doit-0.36.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) dev-python/pyflakes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyinotify[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automation tool
+EAPI=8
+HOMEPAGE=https://pydoit.org/ https://github.com/pydoit/doit/ https://pypi.org/project/doit/
+INHERIT=bash-completion-r1 distutils-r1 pypi
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/doit-py-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=dev-python/cloudpickle[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyinotify[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/doit/doit-0.36.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9acb4adff763fda3670724c3b9f3ab69
diff --git a/metadata/md5-cache/dev-python/doit-py-0.5.0-r1 b/metadata/md5-cache/dev-python/doit-py-0.5.0-r1
new file mode 100644
index 000000000000..f350f2861ea0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doit-py-0.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/hunspell[l10n_en] dev-python/pyflakes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( dev-python/configclass[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=doit tasks for python stuff
+EAPI=8
+HOMEPAGE=https://pythonhosted.org/doit-py/ https://github.com/pydoit/doit-py/ https://pypi.org/project/doit-py/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/configclass[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pydoit/doit-py/archive/0.5.0.tar.gz -> doit-py-0.5.0.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=11af806475efeb421ec461bbc8d912f1
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.16.3 b/metadata/md5-cache/dev-python/fastjsonschema-2.16.3
new file mode 100644
index 000000000000..d69fd8c9dcb6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.16.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fast JSON schema validator for Python
+EAPI=8
+HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/ https://pypi.org/project/fastjsonschema/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/horejsek/python-fastjsonschema/archive/v2.16.3.tar.gz -> python-fastjsonschema-2.16.3.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6220e29f6f8bcaa44377ec06d1eecfeb
diff --git a/metadata/md5-cache/dev-python/pyrate-limiter-2.9.1 b/metadata/md5-cache/dev-python/pyrate-limiter-2.9.1
new file mode 100644
index 000000000000..6a8c109a21cb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyrate-limiter-2.9.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django-redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python Rate-Limiter using Leaky-Bucket Algorimth Family
+EAPI=8
+HOMEPAGE=https://github.com/vutran1710/PyrateLimiter/ https://pypi.org/project/pyrate-limiter/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/redis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/vutran1710/PyrateLimiter/archive/refs/tags/v2.9.1.tar.gz -> pyrate-limiter-2.9.1.gh.tar.gz
+_eclasses_=distutils-r1	b69cca67d4bf504984c07366f8d3cac4	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=353ea2627a4ad223d6dadbc660e5823b
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 04c65e87c277..db9432388f13 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0.9999 b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
index 4ba7ca8eed67..eb564980bef2 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
+_md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0.9999 b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
index f2cc623fe2ad..4a7acaaee1f9 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
+_md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
index bea3bff80cb5..f5ef4590a802 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230225
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5795c5827165d54a45c38e3127f00947
+_md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index adb0692c6fb4..304857d59b8e 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/hydrus-515 b/metadata/md5-cache/media-gfx/hydrus-515
deleted file mode 100644
index b2adfb98b4bf..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-515
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=8
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-INHERIT=python-single-r1 desktop docs optfeature
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 doc
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v515.tar.gz -> hydrus-515.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	docs	314e509c51630fb75f120d62a77d008c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=93c5665efa1b2f181b9924f9c365d9dd
diff --git a/metadata/md5-cache/media-gfx/hydrus-518 b/metadata/md5-cache/media-gfx/hydrus-518
new file mode 100644
index 000000000000..bbacfadac701
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-518
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyside2[widgets,gui,python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service_identity[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/httmock[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=8
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+INHERIT=python-single-r1 desktop docs optfeature
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 doc
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyside2[widgets,gui,python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service_identity[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v518.tar.gz -> hydrus-518.tar.gz https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> hydrus-3.11-test-fixes.patch
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	docs	314e509c51630fb75f120d62a77d008c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8d7d700602c38db5e531be51b69a2517
diff --git a/metadata/md5-cache/media-gfx/hydrus-9999 b/metadata/md5-cache/media-gfx/hydrus-9999
index cae38920874b..c8fa01ce4781 100644
--- a/metadata/md5-cache/media-gfx/hydrus-9999
+++ b/metadata/md5-cache/media-gfx/hydrus-9999
@@ -1,15 +1,16 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_10(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyside2[widgets,gui,python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service_identity[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/httmock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( test? ( dev-python/httmock[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) ) doc? ( python_single_target_python3_9? ( dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare setup test unpack
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=8
 HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
 INHERIT=python-single-r1 desktop docs optfeature git-r3
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 doc
+IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 doc
 LICENSE=WTFPL-2 CC-BY-2.5
 PROPERTIES=live
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_10(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/cbor2[python_targets_python3_9(-)] dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),lcms] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cbor2[python_targets_python3_10(-)] dev-python/chardet[python_targets_python3_10(-)] dev-python/cloudscraper[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),lcms] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyside2[widgets,gui,python_targets_python3_10(-)] dev-python/python-mpv[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_10(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cbor2[python_targets_python3_11(-)] dev-python/chardet[python_targets_python3_11(-)] dev-python/cloudscraper[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-),lcms] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyside2[widgets,gui,python_targets_python3_11(-)] dev-python/python-mpv[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] dev-python/service_identity[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/twisted[python_targets_python3_11(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_11(-)] media-video/ffmpeg >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_11(-)] dev-python/beautifulsoup4[python_targets_python3_11(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
+SRC_URI=https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> hydrus-3.11-test-fixes.patch
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	docs	314e509c51630fb75f120d62a77d008c	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=24bce584ed7abbeb82e75d857bc590e3
+_md5_=8d7d700602c38db5e531be51b69a2517
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fd092154a5d0..0ef855d7ebf9 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/zita-resampler-1.10.1 b/metadata/md5-cache/media-libs/zita-resampler-1.10.1
new file mode 100644
index 000000000000..5ee7cb961342
--- /dev/null
+++ b/metadata/md5-cache/media-libs/zita-resampler-1.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=tools? ( media-libs/libsndfile )
+DESCRIPTION=C++ library for real-time resampling of audio signals
+EAPI=8
+HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=cpu_flags_x86_sse2 tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=tools? ( media-libs/libsndfile )
+SLOT=0/1
+SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-resampler-1.10.1.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=05a4fe24a8e2908ddd0754fdd9dc7d24
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d108bf4b4a57..f12c81154bda 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/flacon-10.0.0 b/metadata/md5-cache/media-sound/flacon-10.0.0
new file mode 100644
index 000000000000..f58246e9fa42
--- /dev/null
+++ b/metadata/md5-cache/media-sound/flacon-10.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/taglib dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 media-libs/flac media-sound/mac media-sound/shntool media-sound/ttaenc media-sound/wavpack )
+DESCRIPTION=Extracts audio tracks from an audio CD image to separate tracks
+EAPI=8
+HOMEPAGE=https://flacon.github.io/
+INHERIT=check-reqs cmake optfeature virtualx xdg-utils
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/taglib
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/flacon/flacon/archive/v10.0.0.tar.gz -> flacon-10.0.0.tar.gz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e6e27d770ecb00c95dbf4736753684db
diff --git a/metadata/md5-cache/media-sound/flacon-9.4.0 b/metadata/md5-cache/media-sound/flacon-9.4.0
index 60d63e789906..a8e2993a70d6 100644
--- a/metadata/md5-cache/media-sound/flacon-9.4.0
+++ b/metadata/md5-cache/media-sound/flacon-9.4.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v9.4.0.tar.gz -> flacon-9.4.0.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0ed82f01650284142fbf84059007eeda
+_md5_=caef3114bfe4f2f6b03ac28bf3f15a86
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 3197ec01611c..4c31bbe28273 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-4.6.5 b/metadata/md5-cache/net-im/telegram-desktop-bin-4.6.5
new file mode 100644
index 000000000000..b4aa9e6e7da8
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-4.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=8
+HOMEPAGE=https://desktop.telegram.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop optfeature xdg
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=!net-im/telegram-desktop sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v4.6.5.tar.gz -> tdesktop-4.6.5.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.4.6.5.tar.xz )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	1a2157392a869265b2afcb63a26c12ac	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=22974026f47f127f70904d69fdf4c339
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 49889d9d995e..723addea31cf 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.4.7 b/metadata/md5-cache/net-wireless/blueberry-1.4.7
deleted file mode 100644
index b4a226cac909..000000000000
--- a/metadata/md5-cache/net-wireless/blueberry-1.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/python3-xapp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/python3-xapp[python_targets_python3_10(-)] ) >=net-wireless/gnome-bluetooth-3.14:2[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
-DESCRIPTION=A Bluetooth configuration tool
-EAPI=8
-HOMEPAGE=https://github.com/linuxmint/blueberry
-INHERIT=gnome2-utils python-single-r1 xdg-utils
-IUSE=python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/python3-xapp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/python3-xapp[python_targets_python3_10(-)] ) >=net-wireless/gnome-bluetooth-3.14:2[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/blueberry/archive/1.4.7.tar.gz -> blueberry-1.4.7.tar.gz
-_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dabe5af7999466bb50bba8a64d46bbcc
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.4.8 b/metadata/md5-cache/net-wireless/blueberry-1.4.8
new file mode 100644
index 000000000000..6663fc98eb1e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/blueberry-1.4.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/python3-xapp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/python3-xapp[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] dev-python/python3-xapp[python_targets_python3_11(-)] ) >=net-wireless/gnome-bluetooth-3.14:2[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools >=sys-apps/util-linux-2.31_rc1 x11-libs/libnotify[introspection] x11-misc/wmctrl
+DESCRIPTION=A Bluetooth configuration tool
+EAPI=8
+HOMEPAGE=https://github.com/linuxmint/blueberry
+INHERIT=gnome2-utils python-single-r1 xdg-utils
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/python3-xapp[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] dev-python/python3-xapp[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] dev-python/python3-xapp[python_targets_python3_11(-)] ) >=net-wireless/gnome-bluetooth-3.14:2[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools >=sys-apps/util-linux-2.31_rc1 x11-libs/libnotify[introspection] x11-misc/wmctrl
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/blueberry/archive/1.4.8.tar.gz -> blueberry-1.4.8.tar.gz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=216dc3050da3a0f26f99fac003251d10
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 2614a17705a8..2aec973b5c26 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.6 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.6
new file mode 100644
index 000000000000..fe7f0ce01f89
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.6
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=10.1.6
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.6/KEYS -> openpgp-keys-apache-tomcat-10.1.6-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.86 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.86
new file mode 100644
index 000000000000..ddd6a185f15d
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.86
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-80.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=8.5.86
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.86/KEYS -> openpgp-keys-apache-tomcat-8.5.86-KEYS.asc
+_md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.72 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.72
new file mode 100644
index 000000000000..8a5e5ee70eae
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.72
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=9.0.72
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.72/KEYS -> openpgp-keys-apache-tomcat-9.0.72-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index e011e2219856..002558523620 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lxcfs-5.0.2-r2 b/metadata/md5-cache/sys-fs/lxcfs-5.0.2-r2
deleted file mode 100644
index 06ce2f180660..000000000000
--- a/metadata/md5-cache/sys-fs/lxcfs-5.0.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ) doc? ( sys-apps/help2man ) verify-sig? ( sec-keys/openpgp-keys-linuxcontainers ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-fs/fuse:3
-DESCRIPTION=FUSE filesystem for LXC
-EAPI=8
-HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
-INHERIT=cmake meson python-any-r1 systemd verify-sig
-IUSE=doc test verify-sig
-KEYWORDS=amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0 LGPL-2+
-RDEPEND=sys-fs/fuse:3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.2.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.2.tar.gz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=14daa9229c9b267ee450fb58d0f0c374
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index d0d82ba63caa..577bd2bf5bb7 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/bottom-0.6.8 b/metadata/md5-cache/sys-process/bottom-0.6.8
deleted file mode 100644
index 565e18988e1a..000000000000
--- a/metadata/md5-cache/sys-process/bottom-0.6.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=A graphical process/system monitor with a customizable interface
-EAPI=8
-HOMEPAGE=https://github.com/ClementTsang/bottom
-INHERIT=bash-completion-r1 cargo
-IUSE=+battery debug
-KEYWORDS=amd64 arm64 ppc64
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/addr2line/0.16.0/download -> addr2line-0.16.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.44/download -> anyhow-1.0.44.crate https://crates.io/api/v1/crates/assert_cmd/1.0.8/download -> assert_cmd-1.0.8.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-fs/1.5.0/download -> async-fs-1.5.0.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/async-lock/2.4.0/download -> async-lock-2.4.0.crate https://crates.io/api/v1/crates/async-net/1.6.1/download -> async-net-1.6.1.crate https://crates.io/api/v1/crates/async-process/1.2.0/download -> async-process-1.2.0.crate https://crates.io/api/v1/crates/async-task/4.0.3/download -> async-task-4.0.3.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.61/download -> backtrace-0.3.61.crate https://crates.io/api/v1/crates/battery/0.7.8/download -> battery-0.7.8.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blocking/1.0.2/download -> blocking-1.0.2.crate https://crates.io/api/v1/crates/bottom/0.6.8/download -> bottom-0.6.8.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.71/download -> cc-1.0.71.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.2/download -> core-foundation-0.9.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.18.2/download -> crossterm-0.18.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.6.2/download -> crossterm_winapi-0.6.2.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.1.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/event-listener/2.5.1/download -> event-listener-2.5.1.crate https://crates.io/api/v1/crates/fastrand/1.5.0/download -> fastrand-1.5.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/futures/0.3.17/download -> futures-0.3.17.crate https://crates.io/api/v1/crates/futures-channel/0.3.17/download -> futures-channel-0.3.17.crate https://crates.io/api/v1/crates/futures-core/0.3.17/download -> futures-core-0.3.17.crate https://crates.io/api/v1/crates/futures-executor/0.3.17/download -> futures-executor-0.3.17.crate https://crates.io/api/v1/crates/futures-io/0.3.17/download -> futures-io-0.3.17.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.17/download -> futures-macro-0.3.17.crate https://crates.io/api/v1/crates/futures-sink/0.3.17/download -> futures-sink-0.3.17.crate https://crates.io/api/v1/crates/futures-task/0.3.17/download -> futures-task-0.3.17.crate https://crates.io/api/v1/crates/futures-timer/3.0.2/download -> futures-timer-3.0.2.crate https://crates.io/api/v1/crates/futures-util/0.3.17/download -> futures-util-0.3.17.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.25.0/download -> gimli-0.25.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heim/0.1.0-rc.1/download -> heim-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-common/0.1.0-rc.1/download -> heim-common-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-cpu/0.1.0-rc.1/download -> heim-cpu-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-disk/0.1.0-rc.1/download -> heim-disk-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-memory/0.1.0-rc.1/download -> heim-memory-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-net/0.1.0-rc.1/download -> heim-net-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-runtime/0.1.0-rc.1/download -> heim-runtime-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-sensors/0.1.0-rc.1/download -> heim-sensors-0.1.0-rc.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/instant/0.1.11/download -> instant-0.1.11.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.112/download -> libc-0.2.112.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/macaddr/1.0.1/download -> macaddr-1.0.1.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.14/download -> mio-0.7.14.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/nix/0.23.0/download -> nix-0.23.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.26.2/download -> object-0.26.2.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/polling/2.1.0/download -> polling-2.1.0.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates/2.0.3/download -> predicates-2.0.3.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.4/download -> predicates-tree-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.30/download -> proc-macro2-1.0.30.crate https://crates.io/api/v1/crates/procfs/0.11.0/download -> procfs-0.11.0.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.10/download -> signal-hook-0.3.10.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/smol/1.2.5/download -> smol-1.2.5.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.80/download -> syn-1.0.80.crate https://crates.io/api/v1/crates/sysinfo/0.23.0/download -> sysinfo-0.23.0.crate https://crates.io/api/v1/crates/termtree/0.2.1/download -> termtree-0.2.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.3.5/download -> time-0.3.5.crate https://crates.io/api/v1/crates/time-macros/0.2.3/download -> time-macros-0.2.3.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tui/0.14.0/download -> tui-0.14.0.crate https://crates.io/api/v1/crates/typed-builder/0.9.1/download -> typed-builder-0.9.1.crate https://crates.io/api/v1/crates/typenum/1.14.0/download -> typenum-1.14.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/uom/0.30.0/download -> uom-0.30.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0e312af1efa4a4a3b6a4c9b4a09ede3f
diff --git a/metadata/md5-cache/sys-process/bottom-0.8.0 b/metadata/md5-cache/sys-process/bottom-0.8.0
new file mode 100644
index 000000000000..c0c2660a0b4c
--- /dev/null
+++ b/metadata/md5-cache/sys-process/bottom-0.8.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A graphical process/system monitor with a customizable interface
+EAPI=8
+HOMEPAGE=https://github.com/ClementTsang/bottom
+INHERIT=bash-completion-r1 cargo
+IUSE=+battery debug
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense ZLIB
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/addr2line/0.19.0/download -> addr2line-0.19.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-fs/1.5.0/download -> async-fs-1.5.0.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/async-lock/2.5.0/download -> async-lock-2.5.0.crate https://crates.io/api/v1/crates/async-net/1.6.1/download -> async-net-1.6.1.crate https://crates.io/api/v1/crates/async-process/1.3.0/download -> async-process-1.3.0.crate https://crates.io/api/v1/crates/async-task/4.2.0/download -> async-task-4.2.0.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.67/download -> backtrace-0.3.67.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blocking/1.2.0/download -> blocking-1.2.0.crate https://crates.io/api/v1/crates/bottom/0.8.0/download -> bottom-0.8.0.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.1.12/download -> clap-3.1.12.crate https://crates.io/api/v1/crates/clap_complete/3.1.2/download -> clap_complete-3.1.2.crate https://crates.io/api/v1/crates/clap_lex/0.1.1/download -> clap_lex-0.1.1.crate https://crates.io/api/v1/crates/clap_mangen/0.1.6/download -> clap_mangen-0.1.6.crate https://crates.io/api/v1/crates/concat-string/1.0.1/download -> concat-string-1.0.1.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/const_format/0.2.30/download -> const_format-0.2.30.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.29/download -> const_format_proc_macros-0.2.29.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crossterm/0.25.0/download -> crossterm-0.25.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/ctrlc/3.2.4/download -> ctrlc-3.2.4.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fern/0.6.1/download -> fern-0.6.1.crate https://crates.io/api/v1/crates/filedescriptor/0.8.2/download -> filedescriptor-0.8.2.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/futures/0.3.25/download -> futures-0.3.25.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-executor/0.3.25/download -> futures-executor-0.3.25.crate https://crates.io/api/v1/crates/futures-io/0.3.25/download -> futures-io-0.3.25.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-timer/3.0.2/download -> futures-timer-3.0.2.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gimli/0.27.0/download -> gimli-0.27.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heim/0.1.0-rc.1/download -> heim-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-common/0.1.0-rc.1/download -> heim-common-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-cpu/0.1.0-rc.1/download -> heim-cpu-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-disk/0.1.0-rc.1/download -> heim-disk-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-memory/0.1.0-rc.1/download -> heim-memory-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-net/0.1.0-rc.1/download -> heim-net-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-runtime/0.1.0-rc.1/download -> heim-runtime-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-sensors/0.1.0-rc.1/download -> heim-sensors-0.1.0-rc.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/kstring/2.0.0/download -> kstring-2.0.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/macaddr/1.0.1/download -> macaddr-1.0.1.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/mach2/0.4.1/download -> mach2-0.4.1.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nix/0.26.1/download -> nix-0.26.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.4.0/download -> ntapi-0.4.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.5/download -> num_threads-0.1.5.crate https://crates.io/api/v1/crates/nvml-wrapper/0.8.0/download -> nvml-wrapper-0.8.0.crate https://crates.io/api/v1/crates/nvml-wrapper-sys/0.6.0/download -> nvml-wrapper-sys-0.6.0.crate https://crates.io/api/v1/crates/object/0.30.2/download -> object-0.30.2.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.3/download -> predicates-core-1.0.3.crate https://crates.io/api/v1/crates/predicates-tree/1.0.5/download -> predicates-tree-1.0.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.49/download -> proc-macro2-1.0.49.crate https://crates.io/api/v1/crates/procfs/0.14.2/download -> procfs-0.14.2.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/rayon/1.5.2/download -> rayon-1.5.2.crate https://crates.io/api/v1/crates/rayon-core/1.9.2/download -> rayon-core-1.9.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/roff/0.2.1/download -> roff-0.2.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustix/0.36.6/download -> rustix-0.36.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.82/download -> serde_json-1.0.82.crate https://crates.io/api/v1/crates/signal-hook/0.3.13/download -> signal-hook-0.3.13.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smol/1.2.5/download -> smol-1.2.5.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/starship-battery/0.7.9/download -> starship-battery-0.7.9.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/sysctl/0.5.2/download -> sysctl-0.5.2.crate https://crates.io/api/v1/crates/sysinfo/0.26.7/download -> sysinfo-0.26.7.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/toml/0.5.10/download -> toml-0.5.10.crate https://crates.io/api/v1/crates/tui/0.19.0/download -> tui-0.19.0.crate https://crates.io/api/v1/crates/typed-builder/0.10.0/download -> typed-builder-0.10.0.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.0/download -> unicode-segmentation-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/uom/0.30.0/download -> uom-0.30.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.44.0/download -> windows-0.44.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/wrapcenum-derive/0.4.0/download -> wrapcenum-derive-0.4.0.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=87310603f8f5f4c8c1955bf66e40731a
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index c961c9caa453..4aca9454995e 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.6 b/metadata/md5-cache/www-servers/tomcat-10.1.6
new file mode 100644
index 000000000000..1f859fc0a2a7
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.6
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.6:10.1.6 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.6/src/apache-tomcat-10.1.6-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.6/src/apache-tomcat-10.1.6-src.tar.gz.asc )
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=e91c4d3e4e6684d3549025c602d4258c
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.86 b/metadata/md5-cache/www-servers/tomcat-8.5.86
new file mode 100644
index 000000000000..da390eea3610
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.86
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.86:8.5.86 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.86/src/apache-tomcat-8.5.86-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.86/src/apache-tomcat-8.5.86-src.tar.gz.asc )
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=ed7c6e6000a402477e1db78346fad3f4
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.72 b/metadata/md5-cache/www-servers/tomcat-9.0.72
new file mode 100644
index 000000000000..81023424d412
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.72
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.72:9.0.72 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.72/src/apache-tomcat-9.0.72-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.72/src/apache-tomcat-9.0.72-src.tar.gz.asc )
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_md5_=ac98482c27318a2166fc19b2fd274756
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ecba6c5cd1db..05a96fabc5cb 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-02-26T03:09:57Z
+TIMESTAMP 2023-02-26T09:09:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP6zYVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP7IedfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBSfhAAh3rOCz8LztDmuLP2p7E4fVZAcvzrvYjhHQBzGpleRyWYekEy131J4X6y
-YH5SWzR92xwHDclfK739DLJ3hgA59DM/m0SI1T5MqiPqmvs8w/7cUT2pGOvWtmov
-6WC53rOgblKBf4XH+dtxab0AfRHR+E3yv657nyI67hCUy1s2eT9+wTpEfrWF5zgu
-80VTvE1WrCvlLpyrDKx1qwYt2B28WW2rRzyrU/EyjjjhgUJj9tIIXtNfh2ZGlNb8
-qUfv0yWY73ZU1ojzSW1KUkrbZZRiV7xh8IwwJuE4imW4diEdx54Zdb7JzOXqf0sl
-1Wu85xvYmfLUfJs/u/375c57j+tle4aiTpBPidXNqLYAJM5sKGPpwDYzOzp+mpUv
-IoqdSdIYEGbd4LaqkH+YXryn0sECcjJ9/28qXok1VucHEiKSBku8S8usgdqcBk21
-vA/3B/NSLW/Bsv4Yu1rePFyCCdczXyRV3/k1BDONst3nmzbAHUoJ1fpuRUKkHL2z
-00l75cJn0tCy+zZB90Spsf+GOFQ3qwZiDRQGMlPeALwWhL3disbJ2mlZlFcre0qh
-4J4ua2406XFoF1/MEbeIDEsI/0UYFFvfjo2Z8JyQCQeKufGq9jxiqZsh/tToGCZd
-/Br7N5ebEK7pV5o3e0ak4r9NozWJ8idEHTKZ8cjll+pC89h7+Kc=
-=Wkt+
+klBhShAAtNMWZlDFwkoIvI9O6AOZraaph3U8pZa5TnLeZptYTpx1HZIs5YBMKhSL
+5cszKruI2TyHWsjjPUKk/c80KDIkKVZKxEzex8kJGHzlhRSwOha/RN66Wve3SIkZ
+AX9Km2Lw30dteYCNG5Kliw34LsXIyxhzA3yYurPi0GCXV7o6+/+28jB+6v5xiMEp
+eoKUVH40CCZ/6ihSa65nso2W3lEBkpvaHXNmoysaaDKNjzAJThoPOAQpp3r7oy3D
+iiQ3LdNToxLSJqN1rYzX7uBT9a5kJ+8xU80EarPQG8SAsB3dZcjLxx8zo6sXRFYd
+ZcaubTG6FTkUjH+77/i2VBbEYOG1OranT675ez6eis2+IpMPcI/wkS7IcTSfWvce
+DU+hIEk3WU5tIidrlg3NgXH1D0O88TUSva/8QuM+l4uw8sEcyEUn8RN7edwxK6/h
+l3iDt+vQbx3hzmXx6MIg8W9WBnxEpmjkie5hvouAgYF0tBNwZoxnGdyuEjOD0CLD
+GbN3iqZNCKjseLa4paSwG+LVSKTlJcA+Utfmo5lr1jxoJ9ihf5EWJKEAbnYbpC2Z
+Ac9NjzJ9lxCBROSfSo/jGpn/ghs2ZyJu8w6j4cP0WaT3cmOTzhQg/q4K2a8ufcuR
+qnC9IKvlhkUxfnkQNnadWHO8STmF8c56YSskqnZD1mk7NTDpQHc=
+=upSs
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 718b33739fba..b47f5407da1e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Feb 2023 03:09:53 +0000
+Sun, 26 Feb 2023 09:09:56 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ae1ccc4cd372..c79f91071580 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Feb 26 03:09:53 AM UTC 2023
+Sun Feb 26 09:09:56 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7c919c03026e..fe886d7335ce 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Feb 2023 03:15:01 +0000
+Sun, 26 Feb 2023 09:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 96e78ff766e8..369555c9578f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f19dee95b1668c234d8c4866c11791604471b8b8 1677374389 2023-02-26T01:19:49+00:00
+1bb646dc54faf059b710fe1d67959bbf24fe5a18 1677400026 2023-02-26T08:27:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7838a2865879..9df3ff601ffa 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1677381001 Sun 26 Feb 2023 03:10:01 AM UTC
+1677402601 Sun 26 Feb 2023 09:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 718b33739fba..b47f5407da1e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 26 Feb 2023 03:09:53 +0000
+Sun, 26 Feb 2023 09:09:56 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7c98222d4763..0bfc6674dd63 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 5fa8fa5b3ebc..989cfe47ef9f 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,13 @@
 DIST tdesktop-4.4.1.tar.gz 17238891 BLAKE2B da7620a5d5ee28dfbbcba098cd4493c346a0c4a558d64835337d2ca722a91e9385e5d42a3b99b24f8aaf5b97291e3432b73e2880162c539bc6424de6e3e00b9a SHA512 f45cc3b788fdd50f8caf9aff43dccfd250c0586cae5c54e27e943c24b472f059cea8017ecf9a7b0061fd02d49113ab33b5288daeaa6b40fb7282b8b09abd0459
 DIST tdesktop-4.5.3.tar.gz 17292564 BLAKE2B d8fd0a4aea06ec2141bc9e8561f83116a692353297e41a07202aba6a5eff33c46572c6c2c1b0765cd9d2447cb318aed983dfd03c58137cc374db63db8578980f SHA512 869c55ec21e5ebcb3e8d08ccbd8154510523aea93f9f7fc127ad1918109f3856c32413277dc4b32f7007c92b8f560665484ba47d39490f57047c6baf2b1466e8
 DIST tdesktop-4.6.0.tar.gz 17368321 BLAKE2B 511071683c2f9a43b077f5cd84f67137e86c8483d69d9fd53238b3ce1ef0be045fb81fed37be1b78b0df06f25ac4e0f592b9047ca33f8d97bf98b69809a4c3b2 SHA512 0a6ade8f2e9f74cedbae20410b607a61c20e6349b77a064b7f8eae8f4bbbdfd3b58e0d6353a74ebf0a135af3bfa34e2af9232bfb1278b57bc2c73c571a633842
+DIST tdesktop-4.6.5.tar.gz 17391978 BLAKE2B 6c3b576e1f88eaea1a3e36c2c545c9b1ed11db8e857bb4fd880a21ee7b139daececda867a9244610290ea36e788e0167b39c9aa989b0b0761f3cd07bb8679998 SHA512 28a46fe759bf26f2eb590a9f8cec548c2e242f00d8f90a2fb73dbda2f4956fd0afaecc3f5eec638af82272a072955b547404e98113df56700b9d4f02f49c1950
 DIST tsetup.4.4.1.tar.xz 50194196 BLAKE2B 05ff4bc66b77e4b26a802c766f65b7f1690376371681f0ed474d5b8edd0bdc0eae04e78c7539b05f9e7ea3a37dc4250c3761bf0ef23386b5033ce0a52caea5ec SHA512 d13892b0923b4dc9c565002ff54f41382aaba75de532b25b940c1e0cbff49784e15ff9aba5dfdf7b86c996c7502c44c7cfe9df865095d513277a5b553d4e00ea
 DIST tsetup.4.5.3.tar.xz 50285164 BLAKE2B 77e386803e9972f0ca8d1478ccbfb7c34b633b6184799f49e2cb2d2276bb623767997965442a0c0d45d8fbc08d24033d86b3456ef786cd64a789addd5513c6c3 SHA512 3c7d607e04991336008269b136953bb4bf40b2976ab5f3afb84761857c9340606e22e284ac1a419f717342e4083769463ba611fe5d2ab1aaeb145a0ae7949d6c
 DIST tsetup.4.6.0.tar.xz 50550076 BLAKE2B e96f34ce72559244430f4316b214d12f2bda7c990e6205e26c5be296a3043ae2a2948974eea7d2fe6c449b3c6bdd9b78dc83509a32f32c44e55aa2d17a9504e4 SHA512 036aec474c359a7d2d714a505835a4a6bbb3204e94294532f39574f4c12551b158fe6022fe5455da910e7686a27c7eaf9d83f8231efbedb8e639a0e8f9f2ee49
+DIST tsetup.4.6.5.tar.xz 50721036 BLAKE2B 8b26f63e73493aff0d312b0bd2cc160b595b0f8c0899a2dd22ededa22ab5b761d81b4ed4ef097c86bafc436a9f5f31982d6b25550794500f8bfd7342751c49c2 SHA512 d8cdbc18d93bfd9ff35f1268bc8933e4ab658ead632bfd3b5d712cbd11795922b247bb6063f16ec66d6b6c83703f6c377d25521c7ce9f06cbb2888a913f711e7
 EBUILD telegram-desktop-bin-4.4.1.ebuild 1392 BLAKE2B 658ad26aa2f1e4bd809da9acd1e76c5b268df18e5b65e0a6f10e08191d58b2dca75eeb35ab988789432055e1e12751b6955d17b258714e3823488c2463dd3498 SHA512 b792ce955053d55c8c46fc8459c2f00794aa7725d274a4232b81fca9852026dc1790ebeea877b22dd494780b934c41183fe922f8ccfbbe5d552b2a044a02ea66
 EBUILD telegram-desktop-bin-4.5.3.ebuild 1392 BLAKE2B c66621ac1d61a68c9a890b46dff8826f844136c8eee9af57f54f79017aa67a2cb12dcd5a1914c024ed85cdaf4478ec35704c7458504ab9af3735489c84a24233 SHA512 6ac63f198d358d0f170b9994ab5be64c2eb6b00144bd2cb39b739190718954f1aa96d88a21232c0569e2761e0f9cd51edd8286c5502d9dce6d136c2ce412a594
 EBUILD telegram-desktop-bin-4.6.0.ebuild 1392 BLAKE2B c66621ac1d61a68c9a890b46dff8826f844136c8eee9af57f54f79017aa67a2cb12dcd5a1914c024ed85cdaf4478ec35704c7458504ab9af3735489c84a24233 SHA512 6ac63f198d358d0f170b9994ab5be64c2eb6b00144bd2cb39b739190718954f1aa96d88a21232c0569e2761e0f9cd51edd8286c5502d9dce6d136c2ce412a594
+EBUILD telegram-desktop-bin-4.6.5.ebuild 1392 BLAKE2B c66621ac1d61a68c9a890b46dff8826f844136c8eee9af57f54f79017aa67a2cb12dcd5a1914c024ed85cdaf4478ec35704c7458504ab9af3735489c84a24233 SHA512 6ac63f198d358d0f170b9994ab5be64c2eb6b00144bd2cb39b739190718954f1aa96d88a21232c0569e2761e0f9cd51edd8286c5502d9dce6d136c2ce412a594
 MISC metadata.xml 501 BLAKE2B 94aa66404772e94f51d8c59e36d19e6454f37173aaac352fe3539bcc09e72c267e69001c41f8356f19ca2830107164144d907865ad7fb3ad1def8771f5ef6d9a SHA512 3cd8e818062cd40787f12c9530ed202ea23c3f60a70f1ab50c95a7b3310197590be5a75378c598dabe5a1fce310fa8acf409a36e7446b66c2046a109d59a5ff8
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.6.5.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.6.5.ebuild
new file mode 100644
index 000000000000..0fe79450766d
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.6.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	!net-im/telegram-desktop
+	sys-libs/glibc
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10
+"
+
+S="${WORKDIR}/Telegram"
+
+src_prepare() {
+	default
+	sed -i -e 's/@CMAKE_INSTALL_FULL_BINDIR@\///g' "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop || die
+}
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /etc/tdesktop
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 40fcf972ff90..9638204e3e29 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index dec1426ace5c..442436d6c7bd 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
-DIST blueberry-1.4.7.tar.gz 1415642 BLAKE2B 59b419d73416105d3d853cc8c5f6cba3f1171f441478ec7f3bdfaaeea22ce07afef3da372a1f993345a7fb38621d0d163ebb4a4d9e8b9e919d71af47e79dfb98 SHA512 2562017da0a102d5fde2905aa4d76cbcd761eeb5e17b137bb6a0bd22d518dfb677bb6ce1e05eb109a1b8ae35588f56f0d42b56f455aaec174155614966551eee
-EBUILD blueberry-1.4.7.ebuild 1281 BLAKE2B 86ef6a1d55f7049e4399a25a24bc83d94db01ffe5ec69be69c7e33e6f657f9b4490a4081d9fb937f986f8e52134d9df2bb43b231fd02577df018625047adbd2c SHA512 f8ee157dfc1eb418a4a917b9ddd41e7d3b93532c99a298a531634498fcfde99ae3bad5ab261cfac01b00ee402cd1e30f7e65f63cd76448b2a0a269d857400ecb
+DIST blueberry-1.4.8.tar.gz 1416910 BLAKE2B ef122021709443fa7a06e6759450ca8b3bc2c21ee930b0bc532454001addb49df1320a177f8b2e217b59e4a931f1634eea642c1d625ba255ecffff573d60cc34 SHA512 32dbc4fa91321eb1401afa4ac4cc42794ef8cac9ed63ad19c3fd34d88e0eb6c7aa51d3aa3a2f8017a9f6135ab16ca154a929ce5ff592f5157bb3f799a9ef8891
+EBUILD blueberry-1.4.8.ebuild 1245 BLAKE2B 334e06606d3e047c67b623b1d49150604d2720f07806e8b58fd6efbaa866a0134db5d8d1cf3842d7d476c101d3cc8acea5f81b2d82677312550d9fdde95b410b SHA512 6fa21c62217ada4184358fad604715cd16e336a63b36aeb744eb2dab1627f856b0ef327aeed251295cf68ff780103bb24e6ef8cb331f9ab6e1c6a95c0fa1fc78
 MISC metadata.xml 494 BLAKE2B a25e54118f511c2d8d7077d2f6f7a21f5bf7a7edf03cde26561a147136868e3dbcbce27fe6628cb5637dbb728762dec841bfe0fa21e03adc34b49eb8c64722fa SHA512 9b9f58c5a954d69028c79611e11670e205366505626236895dae550faf672868ac6c778a7bd6f864ee20a29fc2f9c192065871ad28bcf2e3a7e16cb0d6cb39cf
diff --git a/net-wireless/blueberry/blueberry-1.4.7.ebuild b/net-wireless/blueberry/blueberry-1.4.8.ebuild
index 88c8874d7a8e..ed92957c3cf4 100644
--- a/net-wireless/blueberry/blueberry-1.4.7.ebuild
+++ b/net-wireless/blueberry/blueberry-1.4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit gnome2-utils python-single-r1 xdg-utils
 
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -27,12 +27,10 @@ RDEPEND="${PYTHON_DEPS}
 	>=net-wireless/gnome-bluetooth-3.14:2[introspection]
 	net-wireless/bluez[obex]
 	net-wireless/bluez-tools
-	|| (
-		>=sys-apps/util-linux-2.31_rc1
-		net-wireless/rfkill
-	)
+	>=sys-apps/util-linux-2.31_rc1
 	x11-libs/libnotify[introspection]
-	x11-misc/wmctrl"
+	x11-misc/wmctrl
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 5cc802a383f7..2e86b8f7617c 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index f24f8cc73f8c..0a738e5eb16b 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,7 +1,13 @@
 DIST openpgp-keys-apache-tomcat-10.1.5-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
+DIST openpgp-keys-apache-tomcat-10.1.6-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-8.5.85-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
+DIST openpgp-keys-apache-tomcat-8.5.86-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.71-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+DIST openpgp-keys-apache-tomcat-9.0.72-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.5.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-10.1.6.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-8.5.85.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
+EBUILD openpgp-keys-apache-tomcat-8.5.86.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-9.0.71.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-9.0.72.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.6.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.6.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.86.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.86.ebuild
new file mode 100644
index 000000000000..f17ae55806f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.86.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-80.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.72.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.72.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.72.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 52da9cb92ef7..0fc471e9ef61 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 554ac1ac11c7..0446bac253bd 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,10 +1,7 @@
 AUX lxcfs-5.0.2.confd 249 BLAKE2B c29c8fceafe435d2e3b064ba0cd372f99b00c89d123d38ed72a45f747377756bc5a7b90c0e71536d7a5fc9e938385ee762f1d0f7b04e967d6a9cd5841db93d90 SHA512 882e3241b402e84537efb841bde13a6efed5244598e3069af2c5e7f93caf6e32da292cd7f087dc364143e59c837d6983397ea27b6709ed0cee9e200d4c833ee4
 AUX lxcfs-5.0.2.initd 576 BLAKE2B 5bda6d018dfb49d167d3fee09f3449e5aba6c0493aff5dec9dabd7a71f0267fb905daeea5734f3ebf2a3280c9f3ef14d046bac1586345de43da4460411e20048 SHA512 3467842276fc574695ca7c87666b6ba4c08a84e2287678e748494416f849646825cebedd5456bc6af9be3aea8e62806d6c135af6a116f089d2391f510c191e6b
 AUX lxcfs-5.0.2.service 428 BLAKE2B effef16bfac727f703b9adfdaa5faf2ce76ac7efef6127873730f2f6482f0b886d96ab9cd0a9589db5b98744ede6b0b89804ad99cd12e0a4b20510eb2d29a097 SHA512 f22242d41cea1f1ea111641e4120d58c321056a49222694d6a15019de3241384f132be114d62df15bc7b0b8ca9a54b4a0daa48a345f1c707dee734ebc59e3967
-DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407
-DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676
 DIST lxcfs-5.0.3.tar.gz 103697 BLAKE2B bdea820f1a5b799309b3d5c8ea439477e6eeda2d9600a348a92b203f2f8a6e0e686d0bf56d8f6b5bbfeb4837dd5737626d7d0610157211f0f189711e9e45a048 SHA512 967e60bd7ea545f1fcdd805adc0083e39684013c18f42a51753b5be8cdabfb86a652d02471a1f71c7b4fa756da09b72d324b724d68091d539edd10ea63add1fd
 DIST lxcfs-5.0.3.tar.gz.asc 833 BLAKE2B 2dc139639431d9430149369b0a28b6debef0de9f5f69854070d8f2e47718bcc130a869683dfa2b0002c6a54978b0550303adbd5a7fa5ef565eb6bc6bbfcde9e0 SHA512 0207c110553b9d62cf88ec70ed4472b9696d74b277af1e53df6d1145228b76d06695fd28bf20c8428bee5b6ff617c617fbf063c1c8ff0bcc44be2e3439c76a64
-EBUILD lxcfs-5.0.2-r2.ebuild 1883 BLAKE2B ce355c1d384153984e9d6c4f2ba78b02c03d478a45615ba76c6b402d9c601791690868322ea1493856bb4fd15ca4e5360f0d2c560e80e51565e5ca8c65c81e50 SHA512 c4a285df9b934d4c339b84f8b483992f5c53a5d9a42eb1e73b1ef4bdccfdebdaf4dd73a2f7435e8fa0ab68a559a49187d5b6cf821cd024fe86204c5f351a3745
 EBUILD lxcfs-5.0.3.ebuild 1888 BLAKE2B 43db5456d78b318aed8c2b7ba5c43c546db0e88e06c76c67a4fc5ce4a86023f0bc6654b814c501adcfc211de8d0442cdd337931d83d6215bc27e03789b242c3d SHA512 e62ccd706013a0abdcc2cc434d8a44f08928e75c981187876ee8657966b6815de7aa7cbb4dd50745ab13507777dc08a1c63c0f10e89d93fb2ecf03aa098be7e5
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
diff --git a/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild b/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild
deleted file mode 100644
index 551954d58b74..000000000000
--- a/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake meson python-any-r1 systemd verify-sig
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0 LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="doc test"
-
-DEPEND="sys-fs/fuse:3"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')
-	doc? ( sys-apps/help2man )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-# Needs some black magic to work inside container/chroot.
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-python_check_deps() {
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix python shebangs for python-exec[-native-symlinks], #851480
-	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
-	python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-
-		$(meson_use doc docs)
-		$(meson_use test tests)
-
-		-Dfuse-version=3
-		-Dinit-script=""
-		-Dwith-init-script=""
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
-	./main.sh || die
-}
-
-src_install() {
-	meson_src_install
-
-	newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs
-
-	# Provide our own service file (copy of upstream) due to paths being different from upstream,
-	# #728470
-	systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 056beab34cf7..91e7b15d8f06 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/bottom/Manifest b/sys-process/bottom/Manifest
index 6215a328abd1..d3c501d1bd26 100644
--- a/sys-process/bottom/Manifest
+++ b/sys-process/bottom/Manifest
@@ -1,45 +1,33 @@
-DIST addr2line-0.16.0.crate 33440 BLAKE2B b59a006ba732935d408d0574799037ef0a424ad3c27b894fbd7a9c91664460972a8c464aaad4e9b82b94e4cc35ee9016490bd469fa21358e11e6d78126378038 SHA512 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c
 DIST addr2line-0.17.0.crate 32260 BLAKE2B 23c3715820a04260460a41695d535da3565f76519b7313d0ed684352b339de2ea668c44fe8ca58fc1a5b9f84cc5e9d04d889440abb5985bdc04b267dbdad9d9c SHA512 ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
+DIST addr2line-0.19.0.crate 33210 BLAKE2B a6b393dcddfa0f858297efb6b261d3a23f118be45a3211ee15f6c58808f241dbcf5282f4a86be579360513f23ac4035819e923f2587b7499110af42e9ac3ab88 SHA512 18da72e412bb89028e2ccb838192330535e45300f6fd8edc7d1d64397792a3db12418aa24a3312730c5414e2a1b1d65e6b9d5691ba234c9142b5d885523a5e94
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
 DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
-DIST assert_cmd-1.0.8.crate 27830 BLAKE2B 68fc42953decc5a39a2a850750348da087a2df29e9e15dcb3f0319088ba8ca399f8db05cda3de693925dcbf147b2a031b0e0ddb6993f25b8b96f464f792cc499 SHA512 78c5aa45289f1f69891001b73f7da32ef61a371a2fa9abe15822406abe4a8df48004b475a00aacd36c2e808539041fc0d3034c367a27de6b539c72e929e42e4d
 DIST assert_cmd-2.0.4.crate 22581 BLAKE2B 7fc9fe4577e486f26d07b2b4419c331022ca61923d0664f4e8a25abbe6d6305600b47c739f9f065ef778bdeb59b6309ab73df2be11e5f8387cac2e7e8c70a4a2 SHA512 c389e0210153e9a6ccbba4dbc6a6c7a23533e5fe76e717dbc36415be2adbabfbc0de33a2e6d05e3d70779b7a278580edba400c688c9a6b446403b59a78d93720
 DIST async-channel-1.6.1.crate 12574 BLAKE2B 5c5c8f1cf1458d952637a439a1534e68bcb4a1cf478cec6b6d224387f56c59dc6cffd2e3621dc24e03e20df3fdbda5b8855fccfbbc26a2aa03656aff3a17d02f SHA512 797b1f5b4c07853f78670e62b67fb787c329ffa2c89475a3767a963d524a69dce082cc7f3a2878d9c990f00ae2d9cd7e0d21743fc4186769c238467bdb20c65e
 DIST async-executor-1.4.1.crate 15490 BLAKE2B 2d85825f9deec4a89eae4be6c2899d22bd96f095413598abe2a58ca07e6b8745ee02a6e1db6a3be034159c7844e55009d6da9845116647c0b021dca115acf6be SHA512 24f8403f7cf7639a9477c0a4ee6fba8ebf73fc64b5c896ff07b5b9ea787ca65fa2e642e46a0ba3796e76774d46373e6ea6a20309feaf1f801281aea20cf82578
 DIST async-fs-1.5.0.crate 16921 BLAKE2B 3758ac4c3fd52d8e40777a30dbf136f2bc869cc167414a01bf09466d6e8f95daefcaba3d89017aee2aead8a0074b2e8f701031aba133efbb5b364dd7c1e15606 SHA512 f23835f24b87fe9e5a86b0600784660c5ac7fe4670cc9f37cb75946ff00f2a8e032fa4a225d6315f6416e40b02fef39c72f0f5513a8314d6b2254160d8db4ac7
 DIST async-io-1.6.0.crate 32282 BLAKE2B fdd46328b23d58058d4501f6a30e396302c36f9a8f91276e6b50b9ddd628a63b8af22e35b5efb4c7cd91cc6c823ffa2ecc492da525c1139f30c02004f0a5b0a7 SHA512 0451c6d53da593bc1753ab56c043d855d2642de5679265970ade0c63cef09268ac5b133100230637bf16506f475e322ffea2c85f8eaa3788a0bbe24ff7e671f5
-DIST async-lock-2.4.0.crate 16144 BLAKE2B 0f1f798409576d079d8c41aadc74f7671d9a94454cfdef15e341004f13e529c08c15aafae003a80972115b6420d87a2efbcb1a82fca0756d51f072e4130d152b SHA512 c3eade585da23e3aca17be6110290461bc2cb39b9fcca9c35d8ce71669883d8d1ca42fdca64686126dbf063f289b0142c508b7eb852babd702f2cebc4c4290da
 DIST async-lock-2.5.0.crate 15656 BLAKE2B ba9bdebf220cb53638d8d000b5eb49ff9871c2cc35fa9117280b6ce4aee8c0c296975f315487b5f1fbdf42057e12cc90a72e9f5acd7aa90d3bc3bac580e0be17 SHA512 4b0a834b9f1b841421cf9af0d0f6826a7fcf91b5be208e3f3b923839475d866d9113b37011a9abe0daa5762f5b684b37db062360baf094810a219103fffbe62c
 DIST async-net-1.6.1.crate 17913 BLAKE2B f87069d9109558fcc071ab7d317b1a5613cacee627f41b870fefa4db4eca6aaefc11239085199a1becfd9a75d290f15f6ee4a6cda18e4312f2cf27c023becdb3 SHA512 5ac322945dc81eaf4b222590de1d660d27a1654deba3d9500446551921e80cfef0a370e6bdafc118344fe5bacf4f814132f2020ca6e5e24de8f653accdfdcf9c
-DIST async-process-1.2.0.crate 17014 BLAKE2B d37e587b6cc0bc1617c772e11807ce1e93859a4e0f8b8d0ed319c8107e00f9048fb87fa8f3d19bc70f119df5cf2bb9035de3fd4b1b194dacb4db65c561a44449 SHA512 8e074851f13f451912baaef9217a745a431ed0e5654847c51466ea95dc4457735dc663bc9cf863da2dc05c2661bb741be5d5cab82bcdb4f9400eb9572aa2608f
 DIST async-process-1.3.0.crate 17199 BLAKE2B 26d365c73e55129b3496fe6a1bb55f5c15c46ff20b608b900363d0e5795968bddcfbf0b2487463431aad6bde5f0a861b83c1504a72a51aa96743f86dc7e5e08d SHA512 da151b84b0986b3e6d42e2be71c6931daae98c27b4a8f712e5174eafae4d0ca739bbdaa09065815799a65b5553e8cfdd71be021ec32d630d664c0e1b4e47f6e2
-DIST async-task-4.0.3.crate 28770 BLAKE2B 66186991db90632ffb43c1e6a46a3a6c44fbee1e021b9af7999fe6400477e482d00e79bc8e299e4ed0b05d8d70ebe9a2b824c081e90a79544c53cdcc423527ec SHA512 cbd625c6bb72cb9af3b4a7ba168130125ec180952a55828fff2998b40d341ee1b1b5a0eae07944e9dbaa6a4acb19a1f96200721b6abd61594ffd88c6e4e1a904
 DIST async-task-4.2.0.crate 28496 BLAKE2B 327895275248fb0d405a85e603d26cc4a9dd0dea73c9d1d7f7a56de716010c08636a87a224431b8c4bb7c2efc2254631cea176dfa7cd20867c4e67da6c893200 SHA512 fc52d82da34e84611012cc4cff9624481402ab0ce56d7dae99ddcb5a59eb31a264e5e2597db6ec7595b681c0bea1f159e1f7bcb3e033ba5740b9b11c080c4259
 DIST atomic-waker-1.0.0.crate 11771 BLAKE2B 4e94bf07e1df3b605bd0f8e8f8750323a5fa7a4d9c703b2183323aea8293021ac3028c6b03482941330c598db78aca0af4df06d346dbf581f617c2c333a997cd SHA512 cbc3e12c10f20e1b6d9a03097159a098c5e3a50a941b742891bd39bf0f7310986bda3e1e4c2ea0dfc82a70d9d57342889c46c11fe0d328372a6b3abecf7fa9a6
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST backtrace-0.3.61.crate 74284 BLAKE2B 3e66726d5ed8130963a988dbb751828447073467bb6ab4bfa1c385d74f991b52a0f3ccf00823b74a48de3d043e6dfcb474644f7a81ea9cca7242b272cf715aca SHA512 209105f135720b54d584c7ccecdb16b49381cc7531c94b81ff7279a44752ee11075cd85960f86f809a22ecb3dac6728afa05903c1d355df3ad8abf4503eec861
 DIST backtrace-0.3.65.crate 74129 BLAKE2B b10a78685e7e90ab7e02b769d5445ee24753fd30212bb7204ab720fedb1df64259bae44500d9162c1c001d2e9d70ff5d698e02e5ac51e5734dbb7c601e602b3f SHA512 9cf3cda1d86deb6b7f3cada0ed7a9e6e54e2d323533e385222a260b2f667bd1989a552cc35806a1579c1493ee1177e474b1d42b29480c09a2735251586740321
-DIST battery-0.7.8.crate 40344 BLAKE2B 588d36a7f3050e07ccbeada47a328a474dcd647cea7d2d2f254585d0ed115d1655f04118aa7e8b1e9b4758e171f1a3374b7c163aca9652e3125f5494529e7aad SHA512 7cc556753c4367f325e3aee2ae5dc35f7340badccd8b45d0be066e861c60603854e13e7ecb896dd979d9cc1886fc4c4f15ae43b0745739817baf24533084acd7
+DIST backtrace-0.3.67.crate 78564 BLAKE2B 8c77d3d182c7e1ec3840fd6c7f4214322e473ba79a71b2d11d98696f8ae4440350f3c84a891b2ec79fffde107fb2ebb99fffca202d6ed235d3abd68215a1089b SHA512 8603a3b63f4f08be315176908134243680bf1a4b0e6cb26ed81f5fc1060279126ca0ef28f209a10289e1a85214b35db6b496affd71ad21524094f3ee3acd31b6
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST blocking-1.0.2.crate 18571 BLAKE2B 30e69dce433ba3c0d153275b5a56407237de93a50d7a3f9b97505b17899400f8cc8c3dede3f63fca26d5d49e88c3c9ee7ba91401061dedc41358efe24a9bf2b9 SHA512 f9048544161cb3098ec7362487c8df4ece972445dfc94196cc2cbe7faa2b6f3f3e5abe56310675c798636148b0b709d864fb94959d36976043886feb149adb66
 DIST blocking-1.2.0.crate 18494 BLAKE2B 252a17536290d3898015b6eb844225c7fb78cd84424fda2459331d5eda56d19efff48c670b692288d32d870f62a539449a9b3ad7aef947de50f8862d44fbd9a7 SHA512 aa5cc62a340fb94859e90bd54b9e61d897026ee66570f15f94a0be287b470f5222233dbf30cdf1b0860c4a24abdb0c40f925d9ccbabfbf38fa27b5b17917aa33
-DIST bottom-0.6.8.crate 7810579 BLAKE2B d868b1a59d08e22f09e66f4fd78e7f741d3272630c6ab7906dc3fb0038378ec67b96a9f6ad4ed22e5d20d0b0b881912956d0b96f31a871b5a2175fad1cf57227 SHA512 2d86f5ddcc47e688910aaf31798090ea15470b5df9f75de3f9ce3d251b9fa9feb46305f2eb450f1bcda63a5e96d06a18a095a3ca991ef7a316342681b56b5f63
 DIST bottom-0.7.1.crate 178930 BLAKE2B 3684870ac6b0a8792a90f6400bb55743c34fe37e87c30d8f473d09071ded3c3f671cb5ad86df02115d9b2dc1d905fa9b98d9448ef95d9e3ee414995dddfc3b67 SHA512 da2094fb46a6e3e55e16d2404f89de11147defd03c52b1e26fd55637b710cff6b2312818513c68fc01c9df79df2bedf17c85f4a4373084001eebed1393e4ded3
+DIST bottom-0.8.0.crate 179574 BLAKE2B 5d860baea5c2390a99e5189180b76e1e961c89a380d1af8551d407c88939cdf0e44779da39bcb0f04c2de735b3ef6b3bc2cca6d4a79568dcd249490bc758cb2d SHA512 df2b1c4c4d88a107cb050513e8c8507c0de8e10f844622e85c1d08c531fd09298b952708076a724ec011d470483fd9697d609bc8d2a61087ecd93e62246f0fb2
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
-DIST cache-padded-1.1.1.crate 8798 BLAKE2B 3f2b16f0fefcc5acf692684329e38ff59492d4c299413d25e1634ab27a59512b7453cad28b26f34f2b66db3d3c0b4b26f41df042305b7db2b8ca79d36704e8a4 SHA512 72c36ef2f66a097cf2fcbc06b82fa3d5451ecf2de1ee1513fbeb34c6752436109f9e453bec3aab7e1f89723c24f7c230cf4bff6caa09855402c8f92c1ccf49b5
 DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
 DIST cargo-husky-1.5.0.crate 4526 BLAKE2B e772a2b62036adbb8a15333cbc63a2a27739909a507c8a9bd466f93f86370b364d992395c172a750704ae8e5b2ff8590367bfb2e170ff68071c6b3e4d920fe18 SHA512 5aee16b1bc677504dd087a2b0e71e542b4a33b8ba23238409d26d7748497eb3e91a498d4c7331f312137323bdcf52b406a18f53e157e7d525aa762953c2ac2b1
 DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8
-DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clap-3.1.12.crate 206752 BLAKE2B 84cda0e8b864526fd7a3ab43f0f2b7cc3017054bb4010143b2cc719eb297da4f79029d5e50652a44acf0d71281367bd630fe0e5c54fd5a8b8668c594389fd75f SHA512 94a594886d4fcc3ef745cea1f98202765aaeaac816d9271f132d4f8c90e6679fd56077e11c621222bac9200552839297f98c7788462d015334090e8772715cb5
 DIST clap_complete-3.1.2.crate 23138 BLAKE2B db3741e86ed29b52c7dec82c4d957265bf2d7f10b641f579336d2893f5355233507bf4b2385cbbff1a6ed25fb7a3855e2c0b889257679aaa997be351d3bf3fd4 SHA512 94b176115fa0edf12f1af62388c8f175074fca980f4006f9bb755e9be773785bca80b3b11821bdc8498b06f5d3aaae169f7daceda5a352eb39312f48b255ebc5
 DIST clap_lex-0.1.1.crate 9603 BLAKE2B fa128dbc85152ef312373283fdd84db5b9f9c519d6382a737de2ac9ba8df16e74afafc0c1602a2ae31cc62e8d83232899b1c4eff41be6e7e5f286513f83785f8 SHA512 4d7667fb4cc86fd820262c4642c37a073e558ac5c05e1a8efc2813f54c364e2c4e980a8ddd81e72b11b02f494b20ad89c77e9649d1a6c0ed418194db808f1383
@@ -49,75 +37,60 @@ DIST concurrent-queue-1.2.2.crate 15859 BLAKE2B 97eb49d7f6270999f24d37e7a3967c0a
 DIST const_format-0.2.30.crate 77876 BLAKE2B ed3a6020d62461abf2a918d971d462731a399bb0432a70f94e3332f513286af9ba951300104cf538011d99d9e810eeaa91dc3678217f43026e137de40bf22b18 SHA512 3fd0e555765c3cbf282a93a8f97338b332047f543ab9b9e35295e919c474444052dfb611f3db4e457c368bf90552dc9b0e571969ce199d918d893f8f673e920d
 DIST const_format_proc_macros-0.2.29.crate 24380 BLAKE2B 8c648b02740b1935ded19a3c30caf3f11e44315ebfd964189920349b658801ef5f2358a98dc0641092aa85ad25abb30a0e76a253dc71a464fd4b15ebaa224c3a SHA512 0554fc4b008ffa2e38119dfd3563ae871626340f7aadb7d3033fb8938bd3e60ab0ead5eff04cd5b9316e0e7a4325163236c28b060b68994bfd4711fa55657f10
 DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
-DIST core-foundation-0.9.2.crate 26857 BLAKE2B 9090a489f2d3cf8cbe59472530470dea0ae9e1a0838207424953be812586aae013f9f6cafc4ecbe68be302f4ca208d8c892c87b5736dadddffd6d739e6427934 SHA512 9f68929963fdeb16954e6642f27173fa5d08d39e835d74f03e18d7cb23e9077572d712e7c9afc8ab0be377fd1d845625986d0a905eb6d55331027be2a25d4f9a
 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 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 crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
-DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
-DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
 DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
-DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
-DIST crossterm-0.18.2.crate 108404 BLAKE2B ba276975b3440f4d976c4f66aca2f46f2b8cc4715610e4fc6d3e1de2c98570639b68e4464393fbcb575091e3e8bc3af2ce567775b31a1bb9532cd8a42ef8c15a SHA512 21673eb1efa4b353b48c4d2e4780505fb1deb5ab5767787acf5f7133ef45e83176ad8d020804052e6b283135e72e1fa623b8e37417f805102a39d98cd72a4f18
 DIST crossterm-0.25.0.crate 116533 BLAKE2B d39cdd1f4df716974cd0929ca40073ac6e17b2dd73f27b48c7b2bcd7cb4545bce544b2e8459812b866936c03a27162b309848e6a92290960619c4efe2a1e0502 SHA512 fdf2b5b4bdcbc8c7dc4e8c5e0cdf68cacdb97886b52087dde1f1be9b869c00965c0cf9db64b700801b0d1274b913703ade66a92d47aa8da604121693b8701201
-DIST crossterm_winapi-0.6.2.crate 14962 BLAKE2B eddfed3ac40885c230c75d56c16ab447de950a8cdd2f003e65e2331712401f7ba2e228134fc1012d7a09d7fe080ca279fca6f4fe9c4d611c6a3a485eedd6565d SHA512 39e1c184b921f8cf69d6d7419fa93be2a6f4d3b5ca2461b9f9025133789d813ab37d2c4f4782ff48d466b2644a4d7b341fe1004520b6b4e6f4c7c7d5d4837124
 DIST crossterm_winapi-0.9.0.crate 15561 BLAKE2B f84604f1da9cfdd0fc69742eef8088e7d0959073c6f7f37507b065b8537faa20bea8e349bcb1d6836be97f06b4a2c55c4dc63f50eb2f2aba1f34df9b8c9abf1a SHA512 b8c32a82cc83244e8991931e3fe0d85527ee2cc5e6b4a0839d633448dfa8a137c87684e8e079f44edf5a994355e0106bb573b36b57c7420ac5cb6fb0ce20ce8d
-DIST ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
 DIST ctrlc-3.2.2.crate 12699 BLAKE2B 39d2e05a943280f3a62f3464bd77cad5f606ebf912c6430f4b49ec07a3cf2b1fb19ef5be5d589e931b9d79c5af882d51782b580d1a89a48bee221585c1212b1c SHA512 9536489c3b871685f20eabe7b8fa4a1a4db8e362e8e83b4b2fe244d98eb4da8f84737d26854505cbb53a311e6aab6327b0644689206a19dc5f7d3b88bac580d9
+DIST ctrlc-3.2.4.crate 13207 BLAKE2B 74158a7322b8f0131c7c1259b844e07eab208e0273b45ca4e839174424280cb6d84c5f363a99da8f6a315034afedce99ce176c74782ab7f813393456cad20a73 SHA512 cc945d6092f8eed3e2a50fac82e54b132dd661d58819b9326dd23592c3848c919caa6c2490cda269154b8ddd0cdd47144df025461c72885b4fd6f5d33cdab242
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
-DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
-DIST dirs-3.0.2.crate 12184 BLAKE2B 414fa4734fd9e108dbc887210e71c8be9834c1764ca35af66781a8108af9fc704f4e7d420ffbb2adeb2a14ca5658e53cb5da4b486e093b3de010c542f7ce7c7a SHA512 97dc343d580ecda68aebe87bcbe8c13a00078943771e3f1dc3101d8d450d2ccdd0d74283870eac1d88255a99e887166d42533ba8e70d15b9cdaddb57e3a27c55
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
-DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
-DIST event-listener-2.5.1.crate 16237 BLAKE2B e1b2c4415cc155aec0ee2187250820d98640d4b4966b8703366bf98d3652d03faf627f0d20adf2feed946d68ef273cc12a87a7ea0fdb9bd8075123c52896b343 SHA512 c7762f9b7814d6172940310cc2a52567741affa34b894877ac0577c902057f26f228c185a66a31bd6fc0b2f0d50b2c8cddaa2748c8983ebfb59aaf23324811a2
 DIST event-listener-2.5.2.crate 15225 BLAKE2B 3a8b8fbc6b938fd6c2882dabc1bc23eefbaff2c1a931972bdae6866d9d03cbf3e03f49b4d57a98104b311e1bff38f83715c1e3494197d9283f494678168692ea SHA512 65a9c5669799dfad5a1dab9a500244f444693e9728b14a70aa72967f90cec6e9de06311966d85f8408950bc94e24697d9d4eaf253754a19232bb52347ba989ef
-DIST fastrand-1.5.0.crate 11100 BLAKE2B 3dc6bcea36656fe801d2c577d34bc3564be13eb7a3b50efd6c3fdcefa8a308fb9e9289ec8def656abe83d40299a2853f9365a32201130388714927db69005b18 SHA512 22b8cd9f143f208d1fbe24ba8be342c465da6ce7d96429ef64f18f57c5443ad242858f859c5444103315e2ac3710fc5ab72da78fe1c6c67dd75a829c6356caf1
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
-DIST fern-0.6.0.crate 299856 BLAKE2B e7adf3beaa2f5fc029acc8d87411c5ef8d3288100b5521d0c1379db6868bcaae73e197f456509bf29f52429ec72bc6e5ef297e971ce9cf6d7cc6232b5d9813fd SHA512 d0524c272cba970b5193d845d4e84698d64bc28c75b38dd2f265f1a132e1c9ea177ebdc38741614f6a6f3d106c7c50565b8562378a50d59ed093e00aee8ca382
 DIST fern-0.6.1.crate 300402 BLAKE2B 70ddb9f8cf605471594d961fd8dafa20100a7eb9b58bfd17caba63b60fef35d5c96e642c03c5b302c314361b695d4f3b4cc10f6f5cc78e6ee13e97eb94f6b73a SHA512 f33d3e03c8f4248b046bc84c83d0de9be77b895e79ebc1ab943c50d7ebae021477749376daa14763709aaafa69d414a8ea774bb009a10737d1de57c7cb6d7fbc
 DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
-DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
-DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST futures-0.3.17.crate 47388 BLAKE2B aef48709c0fd15e33308ccea3adfd2966335de4c4ea24d04306e6e8d724bc6bd3355c8fc3d0392d4a26dbe85e99769267569c1ddc96ffbcdb972c2fbdcaa9149 SHA512 c2099288119c37130692cb747c7db16cb3139ac5db8fbec9754dd373eded0593f9444b8d0b003ad3fd138086959c1b74e105f2105311eeed5a65367d9ce795ac
 DIST futures-0.3.21.crate 49935 BLAKE2B 290dee4f7662a473d82350092c0b12a8270f6d6f5eae9e4f7e06a6abf59e2d9f2d33e5e62e2682fcf6e109d62f651cb37cc467cff2b20f909c72b5fee2cb7683 SHA512 723fc190e4480fd812a852656fa6509a188f0d06adaa1c22ef24ec4afa7688a1c5d3961e5747f0812d073fc672b0e084af6ad5e5c3fac3ea5829466f993ad865
-DIST futures-channel-0.3.17.crate 31765 BLAKE2B a1055de0a6b8812546442acd8acf8251168015b5f6be7bb7e223b7c61841a1a15ec1fbca3e4d40e0a552d5c3fc89ed2306a29c9ef33b1665f828ab9c8c0aa142 SHA512 884fed34839c9f73551a90fdbcdc542f88623c0d74d506febd6fb0308429e0d7df879f378b6d0bc818ce8c948da495a9dc210ca55331f4760273d51f627cc416
+DIST futures-0.3.25.crate 51664 BLAKE2B 8324abc819143df0f11e76ec19a50a9d6df87dd243610ca756d54f519058ddc25ce72a7652698dd3dbd00631eb50f05c7b4567cd87a65858fcb4ed89e2d51fe6 SHA512 1b41edee2927cc68da7101fd9ce8616a61b4102bc378429b8b53adbabda584a5e1df98bcdb2b0ec73466c5a51e996dead7b2d286c7025fcafaffe5e64d715997
 DIST futures-channel-0.3.21.crate 31961 BLAKE2B e99f37cdeac080c8bad2203fd24b48eb62918166104ad6cc531c8f69d3e0c3a5898ca27f19693e2c143c9049a7d244f9af49c16fecba12233f9ff3f1d01e35b0 SHA512 1c10398657949b53b6df196cc44d8e4b3acf53b4d216be6f5f631d8d4b500f5c344e2cc7d5a5642ced6c5480511884611be6d429f56a0ede4a716b9c5770cb76
-DIST futures-core-0.3.17.crate 14478 BLAKE2B bad5d1fccef7e823d52eff0db7522545c6dcc6ba94bc0cad33c013b6abe624ebc6c8ddc6a6f5a4ede5982e175eeac48113ef929cc6633a22a18bbbd4cb1cb114 SHA512 6f290620b5051a3f3a317acade5a077f502fa3ab7fdb230b6ecd4d007c63685bf343ddcb8b8d1170b5ebeb94fbf1c495dab36918490b14885361d6e53c45bf22
+DIST futures-channel-0.3.25.crate 31974 BLAKE2B b0c8f2b3ac8b0b010aab83c6e8d2d7329d49b1c9727393f81f9af8c80b232508ff475fea86448540d2e9016d645ad8afb5bbf746e618078db78631a9b3616481 SHA512 1275e91c90a060a01922747d160435c04bba4686990912e5ba0a4fbbd91ebdbf4f5abbf3530e5f842445f7482e60afdcdbd836586b42f0277e5fdb1a2fcb7239
 DIST futures-core-0.3.21.crate 14601 BLAKE2B 73cf4c422202a34cc9916509939fab35c79093a6c1aeb99e35763727ebf7d3a06ae203684d75cc74183126f0cd95dec1530f136ffa2a0e69354c554883e3af1f SHA512 b60e7892436ae28fd2240f17816f934f6caeac663d67b8efc7d519ebb4b0bd921f0b732b6176bd4b472d2fbe346d39a37ba394401e15afa93af8294ceea90976
-DIST futures-executor-0.3.17.crate 17102 BLAKE2B 9e9864d7fd3a38a800e3b07c22f834575f92704ea88bf0f295a95d1b52b41ed698d4e7fd89c5dbf503a99676c6ad036d9f96dd3e85bfd49c26d1127d55a6a4df SHA512 e3ac739e58dbda88dd536382c603014c56b7ebbda529c81afd0d91c16770719902fb4883a7a0dd0375e7910fc03605887058ebd30824d01ca20e2daf93f3d94a
+DIST futures-core-0.3.25.crate 14623 BLAKE2B efc97e52dd0aeee34402018897a276a68cf94bf13fe37b4c0e4d971cc2dbc8cdf54d0744f0846049ff75192c0fcba906b3556f000fa8657f89a54d9356f8f578 SHA512 3b3c758c493255024df26a763023a5d403fcf1a9fd105b08c518bdd5891ada4fddfcbfc8cde6101157a209ab6d1555831bfeb49372b17e902b4fdd8a83cded4b
 DIST futures-executor-0.3.21.crate 17306 BLAKE2B fd20c7f0b4996cc10e3b3d30c33630a42eb363ac7893af4ae5c476775f8e4f3724ac110648252b6cfb3d652d352fbb5833f2647d262a4c9ae999de1fa69340a3 SHA512 597732f96b45ce21f7a0b149f62cbdc54a80010bfa5421ab0ef7345c501c197e1c8fe109fa2d1c813d5c2e872b4670e0fbd96e2572cc3e9d2646b68f41c78147
-DIST futures-io-0.3.17.crate 9050 BLAKE2B 729fd0c2bbf5a665640fe9e8dbb9d803474cbbf4385188d1cd906f526a2b75cecfe55f75aeb0a491057af319a19fb0117420af75425375af41622c8c68567cc4 SHA512 a2b65e07bfea15b78e988c5a9d330ef51a396cd22475f171b342cc8a6520749335af851ae11d44c91f54ab06f425b0dbfb716a959c625d3c52db5765d0407e0d
+DIST futures-executor-0.3.25.crate 17744 BLAKE2B 3ae27b7f4cca071c7f411e783781f2ba774da2d6ecfc9b8b9ae7cd9a4d81a58be3e9c967c1dfd24ab339b09d8d0f8cb10e5c3a7e34b5d1e9a96e28d2bc575869 SHA512 66b9bdce86c41d5574734a6878562fee45182a3a6ad3b5cf57895aabafa5ae610f440dd226887e547c3aabee792628a5f7b4406c4ddd909501afb66dcb26b64b
 DIST futures-io-0.3.21.crate 8902 BLAKE2B e673342d3fae38e5a6a20c426cb1127353b4f15459b4c27965566f7f2f13f0773ac6ec850b0d679bea37d68219edf6cdf9d1d0eed37665f4ff51c6060b81466c SHA512 dde0b79c4ba208b4c92c699457efbd515d331ab612e7b7df735b3b8f2ab79c012b1ba329ddaf488d68c69dbd119aa231b833b81cbcc0cc2f55c656f68dc22bd8
+DIST futures-io-0.3.25.crate 8911 BLAKE2B 4100c46b7ac6908e849d3c50bce6d563419a2eea7d05d27844408287cd41bc29310754012031e3068c0d6b90307c9de36261400d438046af74d6a86b0e60f31f SHA512 ad19dc9de5e3559ac453478aa5d154c28a174a9d6492c028cf4d7c6d9e2ec1ce3ba80aa79c0035f82a1bbf86e55e4a65c9eae488bc5dabd399419cfa8cf652e0
 DIST futures-lite-1.12.0.crate 36032 BLAKE2B 16cd92362ddb217fd3c316f1104635b086abbf3b482b3381d62e3b5ddbd20122d1dadb48c83d3022db080d05352ee5a40f33978529bac3eb182b875f45cd132d SHA512 3d26148ed1c87926de51412a8d08e0619c64b85b610a74d6f61fcc1972dc0cbedb04c5824fcb4ef0a920c557ac81a0b2b4403ddb1c01e11648694ae56c28d72a
-DIST futures-macro-0.3.17.crate 11830 BLAKE2B bca68c3c1ddca764ff86d36667c3da3805b8aa730b300f97d5e77dfc695d33484b4b8ee7d3b415479852e02a126c14f092ee9724d3d91a8793bc91a165dd5381 SHA512 518969498808bcb63cc797934ed7d699f776588dd7fc9f9c41c63874a05d03781b5c0241ce20cfffc8db569f01fc82da433b7ea7772f24dfc2df5eca35b5146a
 DIST futures-macro-0.3.21.crate 11250 BLAKE2B c981e6d56971871102591b6f14b13f0ed75499627036a90cb71a3e11336db408d11ea0feced484d9ea454f47db74951cdfc61377af267359f46cb6462cc3fc0c SHA512 a79d4d3e487d05554e05e04f3a631fc9f0b5c525126eed550ee30eed16d4c457dc39274efac53558a3e33a119b8ff9d3552ce367359eec9d05105b278f7677c0
-DIST futures-sink-0.3.17.crate 7663 BLAKE2B 598e864fb6f2f34cd72c67e5ced93d0e54d2e508319ba191a2779377d9565799226783b2009190cd6eea63c75562e209a526c724ea8616d22a1c7b4ae543ddd7 SHA512 39996fd6bf1fb5ebb0dbd5c0d18f9a34f21e65dfe998237c2e047d836a380ebfb9a2fea05a2c11e447e9a27dff0bffe4a9762e83df2f17aa90a717fc98ba5803
+DIST futures-macro-0.3.25.crate 11256 BLAKE2B 310fe02b66c014c00dac0c4795ced9ca9bf46dc48f964f50d6300009df2db8505987849823faaa3a0dc312cac7cedfea0cb892d2b0f2c4445bbdd5471953115f SHA512 603863a3249df6dea4ed249b71236526ad506faa5cdc430b3a0c96845e21ffcf800407eb31ca7f0cd45c989bdc1ea68884233ab0fd0abd1d61700830293e968e
 DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f96d4f0df0cb035ce964b91e97f88c7a1a4942ec4010cb4da5f4a3552487eac048a6bfcef637bf1f83398d7f38758e SHA512 9bc0198495b5a1b3ed25fcf7b053a235bba0a43a4226bf085d9027537a57add1686ef61179bf2a2d4189945cb5a05a8d64ba6e6e647c56245666d51e138d113f
-DIST futures-task-0.3.17.crate 11712 BLAKE2B ca42fc54c3a3795e59b423fbd1235b10b4ae1903256fa61e80dc9318f35fb59fbc15ca8a3be3fed67e17809ed2d5f594f939d3f51d0d718b0dff5be069200361 SHA512 2f12d8d9d404f147b601ddc6fb9b6869e2e68a4bc55cd3851cb9f7aa8ebe6519c5cd0fa14da92e564d2003ded2ac2202f5e09e1a83e81129d1600d01ecf86844
+DIST futures-sink-0.3.25.crate 7854 BLAKE2B af109917de26c608b21d2fd1be304428a6d78095168a0b14eb709136789acda0a6bee4332802c3fa3f1e65ad9057e765b43728b8aa6ebd6bebeb2f25d5f96adc SHA512 fc318461bcec3344c0658135944ce7ebf6756c9d1950c2c5e3ab3ddc7d4ef5b0f0858d09f14d7bbc9a9fec7da19236a10dec0e125e5550c965bae95255eb0089
 DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099c22c0024669906036504d0e70998cb9cb5fd4074928d21847334611ccfcbe6d3e2f686c4d4d7d4436f1e7f501b8fb SHA512 8f3b27865d8c7a290471903297e3c0b52caebfaa55550a4738d7915008b893fce67c7d9ae5c5bd03f2a42ee72a96aa0245c4bee70fc06977b3493eb81bca2033
+DIST futures-task-0.3.25.crate 11844 BLAKE2B 60635ba309e978f1b4ba72b29b9d5cce1d870d8398986eb1845d8194080ffd9845d8d2cde19ad0333843bc642cd08a8e5aa44b8c85763ef459c39de4a5cd5042 SHA512 d2278d52397390d7cc1028bcccf1aec009b16ffc33873b8a96cc4f456d7cf501b86660507489d8b284e0798e7fe68c04796471050b6fd2d0529c761d89f9efed
 DIST futures-timer-3.0.2.crate 19879 BLAKE2B 4e25777e567f390799b4b01186d59977f1591f9f8425b6951679226375cf90764bc157dd2271614f16b7b13d3aea67509da0355f3c4de3d323b1bdc668bc7525 SHA512 47cc68f9f134e557d66a003d942d8a4201b1db56f1ed2ae276a2fe6f56b24c06ccd108d9852f9fd9db7d254bf8aefafa56cc0410bea41c3805d7e4bc3dc4d73c
-DIST futures-util-0.3.17.crate 147679 BLAKE2B e29d07117a7285fc52a390821299f55da901573a5d3df6a1845b852488f98b359ef35de0aa3fe05e613dc662247318cf3df5aebcb00149012c6a3ff24c171a57 SHA512 6a87b0510c3f8214ce14b7f333d212558647c523b5eb7da36dfe4f694e0ca4be3cbf97fdd7bfff5e0c7015644742d74d6184221482d644653a106d5564722fba
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
+DIST futures-util-0.3.25.crate 155866 BLAKE2B 574e7cddaae172827179c1d012c8088ea84141d453b154b4358350f53f94d13b776339b0fe16b6e18429e2f83cf5fa35bd5079537a044f240c1471014e3b6a2a SHA512 3e233a3093f3889af6bb5adf661c1cc32f821b00975bea05eee14c2b38e25974b65c10234eb060c52dea4c665ebd09895df666f8583559b7f7d7636070ea51a8
 DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
-DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
-DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa5464e6da8daeb31486d8066443eeeb693b1e84d49f390a0c33f24fd3c0332aec01986127ffe26f7e770a94614 SHA512 f4e90703b8b7d83c36a63ca7a3d4ee48eec2b0762419780670558c4496ee840489b6a275eb2b635676ba25a010c0e378bae429b54aa4591b9d9868b48e0f0beb
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
+DIST gimli-0.27.0.crate 720457 BLAKE2B 0a4fdb66844f3370203dc696a2f826135630b29d3aa78f378a162f5c74763565792c900174d859f4e15b32c951333fc35e46ae7c2fa293a70e3bcfde4cbb6183 SHA512 71563f0b086ec7e22475db77b4f18f05c706dd39dee37fd5df47e636e010c6ab1dae0f6759c6b90a0b2d7937a85878d9b8d62bbf7b5b7e2390335895c6ef2905
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST heim-0.1.0-rc.1.crate 8778 BLAKE2B 266210250ee4933ed5c3ed66b9f26f3046fd3a2a5859e6f56102e50d83f8f75cabc7aa314576c0880fde965c93b778a198e4847a98f67801b9f9f82eb85117c7 SHA512 2c456cb9ef544c848e88a72952287ed66af7c10b465385c06cfe13f3b2e4fd0aa5d0647de58ad7895755345fbb29c17230b1cb58139fec3b9c2bc3e1cd3015eb
 DIST heim-common-0.1.0-rc.1.crate 16305 BLAKE2B c622705a4497972e5ad2032aceefc1d9821cb2b3e3b1a1ed3cf61904725b34c84f24721567c7c13de548ed6f5c778217047db1d075dd5dfd21145f07a64ebe18 SHA512 ba8ecd8ba367536b6f52d2b9677715d4b61fa1b5ca93ee20195a7687e99c8c4e01c62951085af45880a12ab86b311743466d5898665053fdefcb44067ac01bb6
 DIST heim-cpu-0.1.0-rc.1.crate 21134 BLAKE2B 3f752d3ab580f818c5c9d1ed0aa9f58a68ddeb183e3b82843c9f1fdab257d65bc560cdf24a4158b28683fdba9d055edb9a7e4da2c3e55770f2f086633e7025b6 SHA512 6975c77588bbfbc26536bd3ab5b4e0a0aa4db3fda51b75c94dca64aa928c19bb371ab7d27ca8498feabb6f92d4d598669041b38d443808577d957e2b8ffbb2b9
@@ -131,155 +104,122 @@ DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
-DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
-DIST instant-0.1.11.crate 5408 BLAKE2B ea26c11694002f667b5c42a93feb9acacaf7824a7f618809c56d0916dd8f9b045a544fdb793aa5a64b1cef00a648bbf71e6addaff69829563bf09a7525c62bf2 SHA512 659eefd86f9aae74c96bb3f1359b92052c43a4d589b3a591d76c0d4298adb53a013a0a811b0fb5caf588aa093a51589aa63bcfb7450b8cd6edc0d73a4ed169b3
+DIST indexmap-1.9.2.crate 54627 BLAKE2B dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285 SHA512 946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST io-lifetimes-0.7.5.crate 36261 BLAKE2B 4d6692d2bd5f65fbb2893bdf248b27324deb143c19414f8997cc502ce13216a0852772d44241cdb71020e4de00c5d500c1d513a3cd85e6e434c235fcb7b036ee SHA512 d4580859378a20e9a5c496f8bcaa2d26d3f4fcfde3d6608c9081193b55d53d1c393f32a0a40c089a64f6f4705e184c44e7724cb8bb5f80eb64e53762396f77e7
-DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
+DIST io-lifetimes-1.0.4.crate 35815 BLAKE2B 82485bfd13189e0762f7ee501626df0dc741e152ceed875b91a3eed6608686b6d454939d557a0bc29d6bf210dfbe56d35131beb141fc95250544ab8ea992482b SHA512 1b2b151561dc79d1467b699590b2cb5d4acb39f75f38c05a94edb6d1543acca541b5a083fe7b606bc37cb2812692b7acb46996d0b096b96b0b085d31b1336775
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
-DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
+DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST kstring-2.0.0.crate 22063 BLAKE2B 71e58489a167d57326ce974c8e05dd4d2e18f7fa142249aea86594b56b83d566e14fdd79b7202a20ca9dc9e0911f7f873454925fed642d51241e6fc920775831 SHA512 17cf8f86f0a1df9de75ded552c4bfb9f7f0567802c83c0a8fa71625aa33cc537b498c3a247716a7b91b01c609a3722233d6316322210aa44850fd564ca16f624
 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.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b92987f9de2d3dda06c9cd49124c9fa43a9b39e84d78c03d217ed8ffd30e0dc55a4eb31970413d56fd58ea00adb SHA512 1ef979dc59a7ec4aad7229ec5b40be0ec9a8496c7a2177d325db62f3eab00d72c8d2277d517c0093e0750de12fbb4e45b67133604afeef9153b8e1d4aa0baac4
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f8bb21109962273689b284cb4d6756e6399010983da813f6f58664d6191b392b70ecd161518e8ca0fb46992bc3d23adf SHA512 b821ab53d9a885b9dfef6eb3d36a422525cf35d797fe32fee3abf9bb5463712af57febf684c9ab41b5de40c9b0e73d9e369599497f7a7f1314ff455795d32b39
-DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
+DIST linux-raw-sys-0.1.4.crate 878981 BLAKE2B b8708b06e48ef4e32d820b5a0e25ce12d3d985d729a2d7fef46d0b3b4518b4ad40d037d4689fb2270f9c2583dc031d0f4daa26500197e6c32bffd1400357934c SHA512 ee6d5a7a08b183681ae00890784c9e6b72e4c987b2ce2d7de6e7308b7a10d4a2b532db3d5121523bf5d4a262407f3033af4f4c1fd9f09be091523366fa30d768
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST macaddr-1.0.1.crate 11162 BLAKE2B 7c3af87c657999f1f34974b9393391779f85e2ad778117ec33c11d116d83103fee965a72ef655b70d4c9ce8e21f3d76a2b44a961adbe7c0061d879b1105ead54 SHA512 268dce94149b78d3ca7988fea8906589c4f5c5cd7209b9c3b5e7850028296b70a959df0ebfc082476552f82b21c81e187e984aec545599e347dc7bc86c911e75
 DIST mach-0.3.2.crate 19611 BLAKE2B 683aba7d140a3697933835efe4e2e5a6a107f0a6122ce4533bd9079c0de4346dd1a817abeca4372a44a85406a424af9deff87496e79359df4c8d9ff89daab7e9 SHA512 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26
 DIST mach2-0.4.1.crate 19723 BLAKE2B 8212c6e85c0ab8a6dde8f1a3776e8250bcce79cd525eb4ae00db926afdedeff6d84ff687156bf481460d56aec62c818feb7e3940c7ccf428bdcc7d216f6914d9 SHA512 eacdaa1f04602c9c0b6107a8c0493b597a81802c52a14ac66a0a46db172b3da40733af8637e8221608f62e160ced0e877906d9a79e56c586d5e0dc47f60a8c51
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
-DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
-DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
-DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
+DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
 DIST mio-0.8.5.crate 93993 BLAKE2B 6c20d66c3b5753234c0ab0461642b63e84383128db775c6e01d50bade5a69081f7da1626f87244c2c45c2451690e8cdca02e2d1ca20f279ba6f8401fb006c7cc SHA512 e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede
-DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST nix-0.19.1.crate 213462 BLAKE2B 6abc355e7635272adf3933ec5835704a1b1b13b2d2a0e1a4d93280d91093184c7a0a115b75aecd44420b5f4f8e766fa0a86ae3cb96f71ab91bcbd0455a2bcc09 SHA512 0ac549babd0ea438825ad875dbaa4563d8eb90d83160dde429c0a97bb77d4ed3f19f1ad17437c61da69aed3f23382d464e99bbed0199678f7de41cd38953b51c
-DIST nix-0.23.0.crate 185348 BLAKE2B 3b5acd0972755d7e3f724d2429b801d5952f2410d91240f9410a8fcc724421beb8c85c9df35b7b877036bf7bb83977e579293ca473efbf9a34cfaa07ad174fe6 SHA512 0aa28f348b67eb79f6f36410e0be4a888294312350b67717ef462905fddb7cba4d81fc0748515629cfd617535c2244e651b05cb0600a054fdc40ec60346a8c8c
 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.26.1.crate 277805 BLAKE2B 7ba6efa24a5ab399184623fd019643a132a803cf72a9b8b4d0070caf839e123fb4394773e0b816c0d024494d657eae9b05b56b0b4cc6ace6d07db03a3d1c461b SHA512 4d75ccc1a8c4627dc14b4a2080aeda721d22dd6d7c78e448131f7589d0ddb58fd5649eedd80816153a978571fc843f078256a6c09ceaf34b95fd3caa3e6b73e4
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
 DIST ntapi-0.4.0.crate 126602 BLAKE2B fb6ce09970a93eb45ce0e72d6c79474094aa5cd49feba3d780a00e756a2abc2e57bbf35f9683d09b8be979a6241daa1a84ed8b766c192670e0135438fb05eda5 SHA512 481833f9abebe412912c1228a81f733c64758860a71d300424ed3fbb6863d74af4e3538c14f67b411d4398ab9ef5d549dfcc0ca22b1c49b0a696d1eb4d233703
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST num_threads-0.1.5.crate 7109 BLAKE2B b5a1055937a87c3f3b758ad527fce0a14c812b40c3bbda530bfc0e03f43dd3155c17e1eaa210c512a98919da802d9d48fec4e3c8464072fe4d309b9a402d9b61 SHA512 3ad2234945ea20f47efdd8381de2f0f05790163bb1e4b28d9e630a2da4d86c99e596558ed231e2e9d62d84ae85f8f5422dc11c323ba899e37ad1e654e3c4fdd1
 DIST nvml-wrapper-0.8.0.crate 70859 BLAKE2B e0dd26261ab1f66de7ef0a963fcb6e682016eede3e77f0ddd1df8363932911aeb0346f4b4a908a6ff8b81d599a0075915f71dd990df9869bb32663da6c2d000f SHA512 e4c20fa52dc490332ba3fe1ddcab8c0fb9eeaa52c9e24e1a5ecb9f06ca6efd736b3856c5ffd48a7c9b04bb21fa08c4d4e1563b797042e116555497678b4e4aa2
 DIST nvml-wrapper-sys-0.6.0.crate 28405 BLAKE2B b1859f26c5d7758addbf18475f3c87cfdd506dd66b9d530ac1e18f97b9d820308834b80165d3e8fc523e896fa7c3d2324422106abdf5aed500ca5eed6df7edb4 SHA512 c987c86ff6e1c4eaeb0ab28e2d997e4a8a9c0a3d0a211119d70b7cfd8ec837f3a532484f4d37a64a4d55f1bb3326b93f293f7779dedf9680924e7009d0c31801
-DIST object-0.26.2.crate 238067 BLAKE2B d7731f530dbbbfebc506dcd12bcf33e1421785d9711864d6d824360aa249b85985f4db69ad4036bd7f8fa22d5909f973a0f58a03021289a611ed5290d2fa68b6 SHA512 42882e3b1063ad8326bedd3f402831d6206603f8736c5aecc3c16d296007d25360ce9143bb3f859a6d52f1a530809df1f1117d321f0d22f0b43c1831366eec6d
 DIST object-0.28.3.crate 233545 BLAKE2B 241e399112a4962c034f1aed3c651eb810c1cead10c7c6b1d6ad4bd8bd61412794f18827979c477005ed8ec4e2fb2b2e7ffdab118083143e20862f1d3425cc03 SHA512 40dfafba5105a270be3c8378df9000efde2f6bb149b1012da50ded7415c43143f2718431b516cef1b14c739b73e1915e9a1bd4a38141db2c24008fd1d8e1f8ba
+DIST object-0.30.2.crate 258743 BLAKE2B 1826b2bc4f2196337c71859df0ec0f7b08f877955c40a507a5f6d7712b3a1d251e2552e1768a99d057f49766c01bdb1b983d4d86487a7577d606b15b659a4f5e SHA512 a9ffd2667bd6239d130619d4984fa28a719b857f6dc72a987536b5097e574e7847b6f376e568bc30606c1376a484a060418ab69a06ba7acf9ac8deb4409ef637
 DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 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.4.crate 32359 BLAKE2B 98629cee7346434103d0e9776d89d1c875c023c3fe91d47beae2f3029fe8bdcbe7dedadd262012ad9d1a1e624ffbebe6d3a9165623e40077ab9d0fa4b768cea7 SHA512 6dae00356b759ad1dd08c1edbcc3ffcc86ad412af98a5e4cdf4fc622d0feb79bdb3900c4f72e76cce803c667a6d8581b44264980816ebdc85d59ddaa881a2990
-DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
-DIST polling-2.1.0.crate 17682 BLAKE2B fbde845d616fd812f22c68fb2a5723cbce54bd5a7ef74dce038962becd7f1353d2e11181c26cf7e3a169b563b7c71da3d20150e504ae57dab50a3e6631cfa6de SHA512 0c468735d4369b99b702ac10acdf54fe0052165f7a805efc4258b46a752247545a9df7b295db81430444f8b34bb73eea4aefb2ab6f8c8af38f7adb513eb55b3c
 DIST polling-2.2.0.crate 21616 BLAKE2B b431e4d31a677ee3d0d36710b27fe98b5df11bd37ac1dfdc464b8a0864dee56985125be388afe9f4c5f8e8c556f668578b2566a6de85f0797d6ecce285d42953 SHA512 6592682d6abf61341e18e5b7e6aedccc31de36016c323ee4e01ca4247d5a40be14f9f60e0602f828ce6ed55e29daa3e601e62a1d472a7ab3a75d760fb1fbd99b
-DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
-DIST predicates-2.0.3.crate 29239 BLAKE2B f99835f75d16eaecc0a472015d07510623e87e694833c81b78eb6b4da9eca2b205ca596a873e49b15ce5972fb45cc9def664fbe2d9a9697adf0e0f2b3aa74713 SHA512 d77fd2a112b2ba558e78538e766ef551485938a15e32ff03fd8bb1a5448d03b41d8790ad88d6650386970028915cd8bc99a26cc1ece21d1bea05f4fc85d16991
 DIST predicates-2.1.1.crate 23150 BLAKE2B fa8b250752f8a5d6ec30ab3aec3aca2b48e903fd8d182817180633f9f2a55e4632b1e1912c9edac453ebcded9f6624c42b38dda70ef36fd710e1dce1f1ce6346 SHA512 c850fa2541265aeb23d5c19dac6c7654dc434f1239ecc8b1cfaea89bd120112e2c45f127b491fbfba1c053db8413e8b561896729a56b6588142dd9ba9a33988b
-DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-core-1.0.3.crate 7757 BLAKE2B 91b3d1596ddfce6e58c33970ecbca94acabca660109f888f32aa73352e157d78afcf879afcb7eec61694f89445c42d355eac46a3ce3cd6163f8e53265e0554b6 SHA512 76d056f0acdb2d9c5cd44828b8da8722899438fe7e11ce6c96d3ce2bc8c267508e1010e2ac2c7bedd3281fb29856a3cf29f93de51b0ee349a5ef51466ace799a
-DIST predicates-tree-1.0.4.crate 7682 BLAKE2B 10e32e4d316bd3bb7015a6ef6d8391381d441acdce0b54a7da2ae4f741175dad7bf92c2488809e233da45360388908f200c2a2756f17210641b0e503728cf150 SHA512 f4d4f3d58c13c9b0344832709709a677d0d1f32e80a2c1e7f38a6f214efaabfc2b8e12d4bb4ac8f0c57def9a44cfe94ce9144132cacc2b6f84002a57aeb4ae5e
 DIST predicates-tree-1.0.5.crate 8126 BLAKE2B d63d2fe2bf9c61e703f11b8d3f8a8434179b8de1f45a52dc6266e79972e0abbefbefb0d57359005bb0daf06ff17276c858481be8382a7383058ff25e72dbb3dd SHA512 950f9191f44da894feb209110488de3da0e36cc86ef366ad2749a66bba0053e23c39fadb67fc5a4f5db3adccecd414619f9f805c2913733df96254913c360bfa
-DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
-DIST proc-macro2-1.0.30.crate 39155 BLAKE2B dd0ec47a3a54fed6cb3b03e5edb5c3e065e5644f631560595eaca028926f283ae20b3e9fe699b0b968e00d3bec6ec95437be2693ccdf22f1524dd5e4ba3f7886 SHA512 d07ddc18dcfcc163bd243c22ffa4735bc300f304c7e70bfa7caba91047b1313bfe1f18aa4707a65a40fa18115c4b32c57b23699f9a4d9b4a09fec3c8aafb1d34
 DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
-DIST procfs-0.11.0.crate 100054 BLAKE2B ca57a32ed43aadfb3a20fac202bbf98ef2204bf27829e7677cee03e789dbc7bc7d9bdd78d3049ff0f2246b34836abe5e639efcdf4028882976525526de024631 SHA512 840c32d96411184f81698269add90071fb4f2bcd8b1821923aa2f82a8c9c29e6efa512e7d4575ca8d0b67c07820539abea11b693343fb3b4bbf5dfb938a40dad
+DIST proc-macro2-1.0.49.crate 41977 BLAKE2B e31c81d3b836404bd2c28363eb0cf2637cb7fb1ff5fb39333158be2b40b15f6f8f582edaec51cabd32d7b215df39c08a9632208fe4da36fc435dc32a48483a6b SHA512 b490d5cbaa790163aaa49c1595e694dfaded61c59fc23f9b6d359f4b774ee6eb20ae8efc5f5ebd59c8ca75da85baad61c065451c1cde03b3b6148e2aaa2c9e1b
 DIST procfs-0.14.1.crate 113661 BLAKE2B 1327f4f8b618d04bc964a2e9b4609cf60f1a61f0735ff62f48f5f72131434a06742247e9a94f15883c27570f0eac05458234c6e795f9079eb8d3dac1a370daa9 SHA512 736fb1da5d90205e97077180ac589a7557527d5ccdcf699d8e6efeaded31946ab6578f69de1284102cb41e60919aa03c65cec25671d943d57eb47c4cd2b99e04
-DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST procfs-0.14.2.crate 116068 BLAKE2B 86099545f027e8bfd78200e1048c711b05f4009250861a31e5b02f5b14348b3acfcf048bdf17516a7d785d027a9347c9af0bb2e1a4c5ae8d50d386e7167cba99 SHA512 70473fd8c6309507cf3451ed13d014b03e3bbc77bf50425849788e93cbe1082ed74780315a11f84def39f4dabf165df09a6faeaf9ebc14e2ecd57876c61de4c3
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
-DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-1.5.2.crate 165456 BLAKE2B 0a08064df966422d32f582f44570504bb405c59f35f20fcd792f4aa980b62fbd8797e8e01f01a9c3ec4f87eb3a1557f485a16ca2191749759beb31f4d704f082 SHA512 3c11bd89692af7e245be2c0b26d96e864a6353eb901706fe6394e3ff8bba13a829609d2a086aa69fbf716ca4286a1977123a950080d673814edf6bd55d29d459
-DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 DIST rayon-core-1.9.2.crate 65221 BLAKE2B 44b1bcf748e0bf19e7341c032eed6ea348f284ff9f834af628baa2484d3b468d6c8c31ed0309e226def441ee7a94e2ad0b9a2adf107493bef1ae27882d93a7ed SHA512 83c17e71e3da636d97ad77b64d988bfaa78addfd0c512f0fc09b1755614dab2a35532a4dcb126fa15da4e62461e59f5683b922a1fb4a5381a629992617d0383f
-DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
-DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.7.1.crate 239648 BLAKE2B d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29b2c1700e06ffb541c073ecc054dfc76aba8f55ac0630b191d4136805bd04c7d1b9f6cbb1ca2437668ab244 SHA512 ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f
 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.28.crate 299288 BLAKE2B 8554370e269e888e603c403089aa6eb4a087ae65fec016a428e424289990a07826e37a2e51cd353c7d530d5b3421e2db6a8f9d50e62379867bb5b6cbc57f2436 SHA512 ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85
 DIST roff-0.2.1.crate 10605 BLAKE2B 34d66bc4f4eb828523c464cd75632171277f6b1901916f2337013f8daf39915e1b7ee9154e18413145c9ae103917e0f34c2b6261ba16b3e969a2cd078a372c61 SHA512 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustix-0.35.13.crate 270275 BLAKE2B 842344c8ecbaa8205bed0d3bdba91752e12dc0e10b36008defef340caf76182254e756d8c8c20f96b8b393c4dbcc72ebed84f253e20967e6ed5656385aa39bcf SHA512 382b79ed52779e5fdeb25ae27bfe7cf2bfff0ee1a75231a620dc459b1c259ae43e9d9d473e21c682498927908a2660b231eaef473f9656cf1f6f7008e8d9a2a1
+DIST rustix-0.36.6.crate 288718 BLAKE2B 5b1a09f8af9bc4b7ae045d038734f3568896c75ac0e77d9d1d74aef63e461f14a2934129cce36bb2d450fa94046770f6d394b0469b072b16f82977de92fa1e50 SHA512 d18e44d7546024d96a0ab6256c0913d9647a3290a60a5c8ed66611ab5983e7e22e05bddd61b12cd5b3d864ab9f1a2ed604e48a1336aea9e95907c2fc0cbfc4c4
 DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
-DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
+DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
+DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
 DIST serde_json-1.0.82.crate 144514 BLAKE2B dd4b5ee1b93f04be09b1c204f8484091d608acc3966ed4c8252a1d46003dd154666e2731e761828dda4123da5c45bda653f453454c5c7c11977aef05bd0e9e9a SHA512 39e4cb0d8b22c9beae6decb87b9692581698c6309b2e9fd78e5e199a200da563e7459d34435b7890e274e13357195392cab69d73d3ee2ff537c1667de32f92c3
-DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
-DIST signal-hook-0.3.10.crate 48491 BLAKE2B bd962fd39589084ffdd05701340674b7d4519c6ba1a90d61f07e50d5eac6bdd1ca5b5e278c7f76f1e62139e8d13af29aaf9f377e84e53684091c23c2356388ea SHA512 3b6949f4cad0a77e6cfba2fb16d7edaf52737419ebd525d5d1905152cc1c73e81d4adb676077b9b6c144b0812ac5059a0f1032fe2c5ed450be2c451b7cf32e9b
 DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
-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.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smol-1.2.5.crate 43577 BLAKE2B 6392f08d9c4559c4f2a7fbac79b342cc58e7835a274b045490e43f325ae53e81ad20ec651a53e479f0ff920d8a4af79be431abf6f6b45789a79193b5b999c2a0 SHA512 68ebf8e943a2b12452f487d15520fdc49a102467ec9d7c25aee7c275f1207db48e78ef994c86da57562abcecce3c337ffa9fe8104f5c2a9c3a5c8cb8f9d319f5
-DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
 DIST starship-battery-0.7.9.crate 37685 BLAKE2B 8292250cd4bfb94cd88f3233a87c91aa37822b0fd4996eee0c27ebde9ed09c1e0e0e41c2600ac4349057d326d4bb861c1120f13f40341c49d4c51955fae0c504 SHA512 da68cb1e638d0e9fd3b68de031f16c5389ca5d303481cbacbb378d82ce4404a380726c758f41109916eb798a690bf2bf6d485ad758d2cac638567e3f3d4a9d7f
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
-DIST syn-1.0.80.crate 234102 BLAKE2B 97e13bdf99f9d50b352eaf87ceb1cf27f74e59df7e40ef28508cc387f78c8472111aaeb5902e1e577e157cd16c7f431c2faf461cdf2554876a3d0ad7662d34f9 SHA512 3eb437757f25c1a10db8f9b10f21cc4de77be1aabd910f1618edd43ad309ef9142ef08def4cf6b2d7470165a7dd0783b28da54847678e22f2b2dcb2b4dad3c2d
+DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
 DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST sysctl-0.5.2.crate 18036 BLAKE2B d52521fa9d7e224abff7f437f362db8af1fa11c5c3e85aa2e370dd3514588249c5c204c58b0ad94a12781d3a41581ae887427c927e034476314ff28b76e5d9cc SHA512 0c42a7a4e29109b120b0f24da2d54779e640d2b38b1e1d203a6d3c92d0b4453c13c4e2db5c7c4d31e0fa2b81f05e1849f4899dd2993ab1ddf3be7c13c337a966
-DIST sysinfo-0.23.0.crate 118866 BLAKE2B efb09381becc0e13ec993d79635ba58252915e8044dcc28179b692f99bd96326a87368f98d34d670a4dbda2717567b165ef86f5cdeb9cfe8fd65eee6f382bc14 SHA512 e5dc81ab1d0cf37797a3c50da99ccd21b2e1f28ca8cd76fb1f4983ec16bd231fead8ba99a00b6ccf25e5b2f871a07116b6ba37c3c98ad8e3bcd3ab88ead7a002
 DIST sysinfo-0.26.7.crate 136535 BLAKE2B 8c6170d02511ebc58b2443e7121b54a06ec17e117e9b690df3da6f2258c7f3cf27ad6b0a65696473a64f50c458cc7173805ed133fe8fc952677e12f754e55d77 SHA512 91ffbca4243fab711664e0adcfac311abb9a9609dd1f36d4d11cf2e6027a4e59ed2c865c9ea27be0fc783cff007a9fba77ea5859f7958b5c984190c419b4a5fd
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
-DIST termtree-0.2.1.crate 6375 BLAKE2B dc668ef88ec67f42bd0bbe3ff0bb0c48ed436b1e727c0f5c04fc839c3849efe4ad80148488bc926b9017bd9548c60c56f74ed3e692735fcf773744b22f25d494 SHA512 a958c250849a1c8a181a70d644ad93f323991ab4778bbe537ac18c3b41687107a15a1f30a5d32f6cc665db67e6db21346033039f662a2af5f599dd4a0da62519
 DIST termtree-0.2.4.crate 4416 BLAKE2B 994134f7af962123b19984aa32b30c19c6f77202067a90ddb3aa4414ec8dc541f5d8be9282244cdbb1eb16686c11750393325fc7f7005de0bec38d6a9219e015 SHA512 afe4e94bd57c9917ba48be4b3a22ff2b9b8a6c764c86871a3be9087ae0c65326fadb466e285a129082e4243ba6bca933d89ea01aa9188222c055f0c2b308cdf3
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 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.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e4dfc0608bea49bda1bde5b6acb13da24feaabf4467b8aeace9b6d90a97e2202f7d24bfb753cc4019c2243bda25 SHA512 07f0cf9da1bf1029d70c1b6f0c54bc41ed759214683f35cf6b321ec2d69173e3da0abf80a692115a1e4630400b1fbf462878053853fdc6026edb40f7e13be72e
-DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
+DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
 DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952
-DIST time-0.3.5.crate 72732 BLAKE2B 7e7e90cdaca05f60e79b0858826fc59ea6a6e3113051c0a2cb7e0b7e7963e6c410595c8c524a97281f754008f5ad3090c7cb2a5098b00b922c0e898441f02171 SHA512 751afd33abf9879b7bc524b50c63ca4722aa39d5bef3ddb371ec4d6efc9acbee9033c5813ec7d31e5e627e3c7fcd491ad4e7016130b7b09f931023e2bf395574
+DIST thiserror-impl-1.0.38.crate 15429 BLAKE2B 96202c256e970fe23f07b461d71430889e36d9f0e83608d001c6feb4e86f4a34047ce93617b27f89c6e2a5d6ad8702b9f64ac7e59bfee221677261fdfcb06e69 SHA512 628aa28404a181b384ac6a11a433829a5481d97face5bc1704349414f36e93440738122fca716fdf878719870d10e0cf8d495df6b1d40913e985c2824cbc3aba
 DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
-DIST time-macros-0.2.3.crate 16838 BLAKE2B 34340d9700dc3303bbef72ec25f8cff9734ba881cf8aca263c6a63a0bb2d4d4e4f3800d0ffcf79c800d9e42a1a7cfc5167ba7d26142fb52986f10809c4a2de8a SHA512 07f19f3660de094fd49404c730ba08023d0801098178760a0f24663d4e4128a93838933b8d110d77aa5fd4a3585ce2ec1b0dabcf1e1d569dc9f4d0a3c6e101d8
 DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
-DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
+DIST toml-0.5.10.crate 55193 BLAKE2B e718f93b865c4e8d17e625a753776bc62a50f98d6f83e4323268d65547b6bedaa90bdfef8b0ab9ce42df62c5552939ff020402bee9aeeb7d883caf583438995a SHA512 0d438b1752b815445db647d7bceb620ba7e393a29dd5154f4f20e0357e7744c69e72ea3a797f8190bdbb72f413053621de7c8de88d30926a489526de440af2df
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
-DIST tui-0.14.0.crate 140336 BLAKE2B bffb807b11d6b7863676d4d46d115ce64666931520d4e2544d4e655b2d51f8b9335e66993d35609e4f9b1fdd7c5a0eb04f6e523b45a49aeab7dca4358baed1f7 SHA512 d333c5368ad51a9a3d6bfdf23bbbc636bfc4518238b7e2bf4983ff7ad765c5d3c6f016a00ebc6ecaf7aea79bef54e4e7acf88d5e18cde50fd3f7d0fe8df2c1ee
 DIST tui-0.19.0.crate 141279 BLAKE2B 55eb71dc524f45c3154f8af4024ccce33816d0c30aa28b3708a4991602892e5980df7f59b47d6c2cfe39fc90d07d7a0409693c37564b5d0d2f2f3a48e9e17c91 SHA512 b90497d06181ca74ad0a976ed57bfd6e6495e6fc96651ee96fe9e326ebf773b6627d87cae07aec26d17800a4274624ad3e835a86c37258c51077c86e667078a8
 DIST typed-builder-0.10.0.crate 24713 BLAKE2B 9afecd9b5ece2068f49b28966d30e5c6105a8c6b6fced1062c9942e17b2ce32eb523de292b83c3128739bdbde1fa0d40463696ce6c732a01eab79c5bba14e89f SHA512 620d5b86b944b00988127748b981fb8083041be072c029659e0916b491a3bd493b185ffef8c724a4a235e1c8d0909c899557a9a4a4fc0c83a8e5be7b58f61005
-DIST typed-builder-0.9.1.crate 24279 BLAKE2B ffaf624382955ed85221ac7749f68d30550c13f08cc19e3848d3d61fb9237306791d14a8c504503bb5feb44302b02309f81733f79083c7795365cfe08551caa3 SHA512 60ed20cd4810246f75b9fc7c9ab8e1879af5aa89022efb31a4c66b4dfe966b33a4fa58d9b2f6ea8dc369c7713626640335e5369ef3b7b17060ac16502290fada
-DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
-DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
+DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
+DIST unicode-segmentation-1.10.0.crate 93893 BLAKE2B f0604ca03586726b878f7884a639554037816ae01965fbb97b4998fbbd12e614f2af50065a59c834448413418a56b198b016e685ef9509513e8994a5c063da40 SHA512 e6a1baacb557a5a7ed7ff780c542c5947eb473763eb2a6018cb1e0a1abb9f4bf3f8073610e4897393f15df076f6657a0f162a5c5bb7ed5f3b3fd832e533a522c
 DIST unicode-segmentation-1.9.0.crate 93241 BLAKE2B 359904bcaadfd161128d40a896a2d10e5dfdb4098de245c949ae3fffecce9b4b6b999bbc2c6ca522944733ab0074e50fe829690183639c312bba8f8d0ad24456 SHA512 7d0ea37bfb24a1a803b1cd40b7b0c0e6e44ebf9a474fdedf0dcca1ead25662e19f44af29b87de1b000c3cc75fec93320938bb3ab9d9e82298eda324bb97e7294
+DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST uom-0.30.0.crate 113626 BLAKE2B f06527a2edb61773a3247d419c8e6b8a299b427310466480878e800ee2681d0deeec1c9d3dbb35127c92adb5bda9c95ba94a6829a4f9a5be6c6af0d66a2da668 SHA512 ca8a4428ca0f8af0e911f8169897849dd8daf99d87cc68847f35a5af6190dc96d532c0159d6f34033e61a5a8ece1584edaa0bced647ac19984f843ccb20553cd
-DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST waker-fn-1.1.0.crate 7114 BLAKE2B e510eec0490f0caca3930000cecccde209ad387d1657c380f95122c68ccc15fcbe0684315d0aea28f094f2c65f7b7b08ae62f6ec95e0d67fc47e6af0ba4589e9 SHA512 80f612597534d9f8bdcd5e6bdff740805efe28242822bc6db360e114a23cb47ff88c74b8ab855bc764f0a73545e85a69d76bce1441e5899a36e41ca270695dc5
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
@@ -291,15 +231,24 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-0.44.0.crate 11502336 BLAKE2B 4b0ea7db7cf38938edbbd7597b5f355a94ce1a39f58c9d51f280628b787b4f6da98fc6d14379b6cf6ce735e88704b0ee4b78b5e5f7ee90d3ba47fe58980f8e72 SHA512 846d870eafb43997bcc546eeb2859d1a53eb3a2e3b0a5bd21f33e9880a786fc6790912cc0eb0d121e18a8f80fc90b8670f022d18aca47b3407377a4bcccfbd2b
 DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
+DIST windows-targets-0.42.1.crate 5524 BLAKE2B 755cb6184733417763bb650fb0bd84bc757503aacbf0d91b811d42e9e8efda05434bbe5518006a88937a82a2a607605a9b609df4f34eb58674d09564667d95f3 SHA512 940c85f6214aa4da17787d3bbfe8d6107a9a7fe4f2e2fcf2b1634facf4619620ac2a7a835ebdd0f57970c992c459ba0a780e64e89945005b240c92563c42711a
 DIST windows_aarch64_gnullvm-0.42.0.crate 357917 BLAKE2B 58da715a46692ed786fa554338d446eaaa50c63ec1d4090cf0690a9211c0221034479e9066cad1c98234410519833826ae3163bf6724c3b06097d5b84d7b9fcf SHA512 8bd60142e8982ddb14dde4e93b9753f9ac34830c05c2a1dd4568377f9a928651bf9f026a0080e5bc7dfa62a45942376736954e3ac800855d00eef0c72929f338
+DIST windows_aarch64_gnullvm-0.42.1.crate 362795 BLAKE2B 722b45789bcd1d973803b327d44072fbf9c904d448e29ae9e56d2f9d1a3e9b64e06883e4bf5ebf141f1e924235858fd1472e07a744cc5b16a0a3a4fc8ec8f6d4 SHA512 51eb9fa7ea441a9fef590c12576a8bbef74932d40fafde8f9e3a28f2734ce5aee6dd5fa478fb3847443241c8c392bb4abbc6014c71260bf924431779f7184f73
 DIST windows_aarch64_msvc-0.42.0.crate 659424 BLAKE2B a8c9a288767756f2086bd0706774cdcce5c8639431ad76ed122d4b6d13c936ca8fb1a463d34835b3a2728f4444e2f4b91ee772f00c54f348094da69c05ce6b93 SHA512 20c0840adec84dde03b143e5b82bb0003fee675310487f0071a81ed7f40ee647c4018ccb9ebdbc4aeada717ec8600a30dfb15510c6b336f07becdb7167668fd0
+DIST windows_aarch64_msvc-0.42.1.crate 664655 BLAKE2B f4a060b802016a6d77a8ea6ac44c35dfec384acef9c45f932e2b6aca9d3ac48ae031f99e5b58f270d6020b8796e9dd06f7e8ffa7cc5610ea3f69181c2be7adc8 SHA512 f6412bae4b041201ef94e5a159ce90fd6b09816350204d4f573c1afdfb0a6d62d7887fbc2e416b40ec1d4478db521be492edf4703d87482d6d0006a51b827538
 DIST windows_i686_gnu-0.42.0.crate 728570 BLAKE2B b72079610b5c4fc798a79fa757b19f8c8baceaf7f4ce824193a65fadaac988ebdff1719a74d676b7dd017e11ceb029402bbac4e55c35206172e15a9bef422f78 SHA512 a24dd1ba5eb7d5231853bebadfde0575ae9071a565868d2f3d1bc6ec0a87380c569a621f0cba2552af7a1e46ac62f09f87cfbce3f674be06be1a7c1d3f421474
+DIST windows_i686_gnu-0.42.1.crate 733428 BLAKE2B c1ca24973aca06b255d9317735cca7a13f7f69293da52dad41df43a5cdf48aac3d40d8b6765cf564905fb71cb548308d757f01167efe7a61da7bd2e2a7080f0a SHA512 61c3271b07df1d4585c875d27cf1686c8f595dcbb79626e8d15ff47228f7b7a4556d3d994566ccceee0d6795a4c76767f85f4579282fc9eed731e04c7e193a57
 DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb56848106d6de0e1f8030e6bd5e1e174bd9a46737db54fbd61de99054e5e8c5263eaef0508c440f43c39dca82baa77792ff2743 SHA512 740400e2b11c1d177f7f37f844cd2a0f84b97a5adb03a7656661deb026b593a799ace8da1f9013ba9f74446fc43260d01dff7d4be607129ec7d602f341b2b4d1
+DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360dab647a1fe525f0ae4b44e6842d93c5674d9f202e8bbca99a0d30ecf7d138af0c48eec8e69e08bf285db51e32bcf83a2c54 SHA512 8afa4f92cb7bd96d4fdbefbd8e7bcaa37dee52224d5d8b950c5a537d3bb805bf9781097b8bd44d96e8b62b1290e3a3020557502fa3b357a53df6fea36b318932
 DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae
+DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
 DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
+DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
+DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
 DIST wrapcenum-derive-0.4.0.crate 7281 BLAKE2B fd5c935f64c6bb7d1e7e4fbe38b6550ac1cbea7d0817204e5c0d73c6711028e472f323563ff52e329f9cbadf5d45d547e3468a8b97f3d5577514cdc705714edd SHA512 85b8a9ec70ef30c2de04ad766694a5b29ea97d0cefab0708421976f1b5168761f8af652851155e06b5eb39fce32e3c9ceb4ff440f8ef687aa2b03c7017f1de0d
-EBUILD bottom-0.6.8.ebuild 4387 BLAKE2B 9d86c25a588dcf4c2e07357b324ac252a3cba84639e784d8018c57c77bc0374626c4cb14ea05b2a5899cf9526dd59c5f05edd0c739940d63967794b17830827b SHA512 edc60e9742f0c5cb82c9a1b723c4ad99dfe7b387b84c2a1db6adb88a5fa1c0f858aa7946669325a7f98fa3fdb2bc522190f728c4b8c58e1305c700fc173f3b79
 EBUILD bottom-0.7.1.ebuild 5316 BLAKE2B 485e919b579d613fdd14dd290aa64d71e5c2e630246168e220d7a8067c733d7c60c27d080ffe88c2325ad42db85389ddd431fc9af48614033b72e973f46a58a3 SHA512 885c7192fc27b8ea5fc51410e6613999730a2a037226a179bc6523d6355e608604051535b389917af6b6ba094326b8904358f8f0fbfafcc9b72d9823452db6fb
+EBUILD bottom-0.8.0.ebuild 5589 BLAKE2B 95d496ab0d0c041c5ea49059c542377a2d92d9e8f888fa403ab26e8d8fb7440cf57a40db71bf2832ab97c288f8b4f7fe29d84b5db04a33e898f46c7dac7d36ef SHA512 2094785f4249facabd07e4f5dbbd45f379d13db66393a73a7786ffad49376e972818cc6cb36628742ab172b6e54404df4bae71767cb6a8696ceaf28a1c594fd3
 MISC metadata.xml 797 BLAKE2B 444693b0becb99edaa93f5623dfa48058648852e0d328802001df5de7661ca8a5f07e920f75aaa06ad7287cbbb46e47f24e5f9897d626574ade3d6270f8eea6f SHA512 e209429c2824e3248c7c2e89b121c6665f80d3a410038709c19fbc9a30b118edd317b8f0b1dab8059aa8c74a3b72d8086f35cd19f7c722d106e0aba5c2586c3d
diff --git a/sys-process/bottom/bottom-0.6.8.ebuild b/sys-process/bottom/bottom-0.6.8.ebuild
deleted file mode 100644
index 1652bacbd252..000000000000
--- a/sys-process/bottom/bottom-0.6.8.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.16.0
-	adler-1.0.2
-	aho-corasick-0.7.18
-	ansi_term-0.11.0
-	anyhow-1.0.44
-	assert_cmd-1.0.8
-	async-channel-1.6.1
-	async-executor-1.4.1
-	async-fs-1.5.0
-	async-io-1.6.0
-	async-lock-2.4.0
-	async-net-1.6.1
-	async-process-1.2.0
-	async-task-4.0.3
-	atomic-waker-1.0.0
-	atty-0.2.14
-	autocfg-1.0.1
-	backtrace-0.3.61
-	battery-0.7.8
-	bitflags-1.3.2
-	blocking-1.0.2
-	bottom-0.6.8
-	bstr-0.2.17
-	byteorder-1.4.3
-	cache-padded-1.1.1
-	cargo-husky-1.5.0
-	cassowary-0.3.0
-	cc-1.0.71
-	cfg-if-1.0.0
-	clap-2.33.3
-	concurrent-queue-1.2.2
-	core-foundation-0.7.0
-	core-foundation-0.9.2
-	core-foundation-sys-0.7.0
-	core-foundation-sys-0.8.3
-	crc32fast-1.2.1
-	crossbeam-channel-0.5.1
-	crossbeam-deque-0.8.1
-	crossbeam-epoch-0.9.5
-	crossbeam-utils-0.8.5
-	crossterm-0.18.2
-	crossterm_winapi-0.6.2
-	ctrlc-3.2.1
-	difference-2.0.0
-	difflib-0.4.0
-	dirs-3.0.2
-	dirs-sys-0.3.6
-	doc-comment-0.3.3
-	either-1.6.1
-	event-listener-2.5.1
-	fastrand-1.5.0
-	fern-0.6.0
-	flate2-1.0.22
-	float-cmp-0.8.0
-	futures-0.3.17
-	futures-channel-0.3.17
-	futures-core-0.3.17
-	futures-executor-0.3.17
-	futures-io-0.3.17
-	futures-lite-1.12.0
-	futures-macro-0.3.17
-	futures-sink-0.3.17
-	futures-task-0.3.17
-	futures-timer-3.0.2
-	futures-util-0.3.17
-	fxhash-0.2.1
-	getrandom-0.2.3
-	gimli-0.25.0
-	glob-0.3.0
-	hashbrown-0.11.2
-	heim-0.1.0-rc.1
-	heim-common-0.1.0-rc.1
-	heim-cpu-0.1.0-rc.1
-	heim-disk-0.1.0-rc.1
-	heim-memory-0.1.0-rc.1
-	heim-net-0.1.0-rc.1
-	heim-runtime-0.1.0-rc.1
-	heim-sensors-0.1.0-rc.1
-	hermit-abi-0.1.19
-	hex-0.4.3
-	indexmap-1.7.0
-	instant-0.1.11
-	itertools-0.10.1
-	itoa-0.4.8
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.112
-	lock_api-0.4.5
-	log-0.4.14
-	macaddr-1.0.1
-	mach-0.3.2
-	memchr-2.4.1
-	memoffset-0.6.4
-	miniz_oxide-0.4.4
-	mio-0.7.14
-	miow-0.3.7
-	nix-0.19.1
-	nix-0.23.0
-	normalize-line-endings-0.3.0
-	ntapi-0.3.6
-	num-integer-0.1.44
-	num-rational-0.3.2
-	num-traits-0.2.14
-	num_cpus-1.13.0
-	object-0.26.2
-	once_cell-1.5.2
-	parking-2.0.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	pin-project-lite-0.2.7
-	pin-utils-0.1.0
-	polling-2.1.0
-	predicates-1.0.8
-	predicates-2.0.3
-	predicates-core-1.0.2
-	predicates-tree-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro-nested-0.1.7
-	proc-macro2-1.0.30
-	procfs-0.11.0
-	quote-1.0.10
-	rayon-1.5.1
-	rayon-core-1.9.1
-	redox_syscall-0.2.10
-	redox_users-0.4.0
-	regex-1.5.4
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	rustc-demangle-0.1.21
-	scopeguard-1.1.0
-	serde-1.0.130
-	serde_derive-1.0.130
-	signal-hook-0.1.17
-	signal-hook-0.3.10
-	signal-hook-registry-1.4.0
-	slab-0.4.5
-	smallvec-1.7.0
-	smol-1.2.5
-	socket2-0.4.2
-	strsim-0.8.0
-	syn-1.0.80
-	sysinfo-0.23.0
-	termtree-0.2.1
-	textwrap-0.11.0
-	thiserror-1.0.30
-	thiserror-impl-1.0.30
-	time-0.3.5
-	time-macros-0.2.3
-	toml-0.5.8
-	tui-0.14.0
-	typed-builder-0.9.1
-	typenum-1.14.0
-	unicode-segmentation-1.8.0
-	unicode-width-0.1.9
-	unicode-xid-0.2.2
-	uom-0.30.0
-	vec_map-0.8.2
-	wait-timeout-0.2.0
-	waker-fn-1.1.0
-	wasi-0.10.2+wasi-snapshot-preview1
-	wepoll-ffi-0.1.2
-	widestring-0.4.3
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A graphical process/system monitor with a customizable interface"
-HOMEPAGE="https://github.com/ClementTsang/bottom"
-SRC_URI="$(cargo_crate_uris)"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-IUSE="+battery"
-
-# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
-QA_FLAGS_IGNORED="usr/bin/btm"
-
-src_configure() {
-	myfeatures=(
-		$(usev battery)
-	)
-
-	# https://github.com/ClementTsang/bottom/blob/bacaca5548c2b23d261ef961ee6584b609529567/Cargo.toml#L63
-	# fern and log features are for debugging only, so disable default features
-	cargo_src_configure $(usev !debug --no-default-features)
-}
-
-src_install() {
-	cargo_src_install
-
-	# Find generated shell completion files. btm.bash can be present in multiple dirs if we build
-	# additional features, so grab the first match only.
-	local BUILD_DIR="$(dirname $(find target -name btm.bash -print -quit))"
-
-	newbashcomp "${BUILD_DIR}"/btm.bash btm
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${BUILD_DIR}"/btm.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins "${BUILD_DIR}"/_btm
-
-	local DOCS=( CHANGELOG.md README.md )
-	einstalldocs
-}
diff --git a/sys-process/bottom/bottom-0.8.0.ebuild b/sys-process/bottom/bottom-0.8.0.ebuild
new file mode 100644
index 000000000000..ca32d135cf54
--- /dev/null
+++ b/sys-process/bottom/bottom-0.8.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.19.0
+	adler-1.0.2
+	aho-corasick-0.7.18
+	anyhow-1.0.57
+	assert_cmd-2.0.4
+	async-channel-1.6.1
+	async-executor-1.4.1
+	async-fs-1.5.0
+	async-io-1.6.0
+	async-lock-2.5.0
+	async-net-1.6.1
+	async-process-1.3.0
+	async-task-4.2.0
+	atomic-waker-1.0.0
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.67
+	bitflags-1.3.2
+	blocking-1.2.0
+	bottom-0.8.0
+	bstr-0.2.17
+	byteorder-1.4.3
+	cache-padded-1.2.0
+	cargo-husky-1.5.0
+	cassowary-0.3.0
+	cc-1.0.73
+	cfg-if-1.0.0
+	clap-3.1.12
+	clap_complete-3.1.2
+	clap_lex-0.1.1
+	clap_mangen-0.1.6
+	concat-string-1.0.1
+	concurrent-queue-1.2.2
+	const_format-0.2.30
+	const_format_proc_macros-0.2.29
+	core-foundation-0.7.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.7.0
+	core-foundation-sys-0.8.3
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crossterm-0.25.0
+	crossterm_winapi-0.9.0
+	ctrlc-3.2.4
+	darling-0.10.2
+	darling_core-0.10.2
+	darling_macro-0.10.2
+	difflib-0.4.0
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	doc-comment-0.3.3
+	either-1.6.1
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	event-listener-2.5.2
+	fastrand-1.7.0
+	fern-0.6.1
+	filedescriptor-0.8.2
+	float-cmp-0.9.0
+	fnv-1.0.7
+	futures-0.3.25
+	futures-channel-0.3.25
+	futures-core-0.3.25
+	futures-executor-0.3.25
+	futures-io-0.3.25
+	futures-lite-1.12.0
+	futures-macro-0.3.25
+	futures-sink-0.3.25
+	futures-task-0.3.25
+	futures-timer-3.0.2
+	futures-util-0.3.25
+	fxhash-0.2.1
+	getrandom-0.2.6
+	gimli-0.27.0
+	glob-0.3.0
+	hashbrown-0.12.3
+	heim-0.1.0-rc.1
+	heim-common-0.1.0-rc.1
+	heim-cpu-0.1.0-rc.1
+	heim-disk-0.1.0-rc.1
+	heim-memory-0.1.0-rc.1
+	heim-net-0.1.0-rc.1
+	heim-runtime-0.1.0-rc.1
+	heim-sensors-0.1.0-rc.1
+	hermit-abi-0.1.19
+	hex-0.4.3
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	ident_case-1.0.1
+	indexmap-1.9.2
+	instant-0.1.12
+	io-lifetimes-1.0.4
+	itertools-0.10.5
+	itoa-1.0.1
+	kstring-2.0.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.137
+	libloading-0.7.3
+	linux-raw-sys-0.1.4
+	lock_api-0.4.7
+	log-0.4.17
+	macaddr-1.0.1
+	mach-0.3.2
+	mach2-0.4.1
+	memchr-2.4.1
+	memoffset-0.6.5
+	miniz_oxide-0.6.2
+	mio-0.8.5
+	nix-0.19.1
+	nix-0.23.1
+	nix-0.26.1
+	normalize-line-endings-0.3.0
+	ntapi-0.3.7
+	ntapi-0.4.0
+	num-integer-0.1.44
+	num-rational-0.3.2
+	num-traits-0.2.14
+	num_cpus-1.13.1
+	num_threads-0.1.5
+	nvml-wrapper-0.8.0
+	nvml-wrapper-sys-0.6.0
+	object-0.30.2
+	once_cell-1.5.2
+	os_str_bytes-6.0.0
+	parking-2.0.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.4
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	polling-2.2.0
+	predicates-2.1.1
+	predicates-core-1.0.3
+	predicates-tree-1.0.5
+	proc-macro2-1.0.49
+	procfs-0.14.2
+	quote-1.0.18
+	rayon-1.5.2
+	rayon-core-1.9.2
+	redox_syscall-0.2.13
+	redox_users-0.4.3
+	regex-1.7.1
+	regex-automata-0.1.10
+	regex-syntax-0.6.28
+	roff-0.2.1
+	rustc-demangle-0.1.21
+	rustix-0.36.6
+	ryu-1.0.10
+	same-file-1.0.6
+	scopeguard-1.1.0
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.82
+	signal-hook-0.3.13
+	signal-hook-mio-0.2.3
+	signal-hook-registry-1.4.0
+	slab-0.4.6
+	smallvec-1.8.0
+	smol-1.2.5
+	socket2-0.4.4
+	starship-battery-0.7.9
+	static_assertions-1.1.0
+	strsim-0.9.3
+	strsim-0.10.0
+	syn-1.0.107
+	sysctl-0.5.2
+	sysinfo-0.26.7
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	termtree-0.2.4
+	textwrap-0.15.0
+	thiserror-1.0.38
+	thiserror-impl-1.0.38
+	time-0.3.9
+	time-macros-0.2.4
+	toml-0.5.10
+	tui-0.19.0
+	typed-builder-0.10.0
+	typenum-1.15.0
+	unicode-ident-1.0.6
+	unicode-segmentation-1.10.0
+	unicode-width-0.1.10
+	unicode-xid-0.2.2
+	uom-0.30.0
+	wait-timeout-0.2.0
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wepoll-ffi-0.1.2
+	widestring-0.4.3
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-0.44.0
+	windows-sys-0.42.0
+	windows-targets-0.42.1
+	windows_aarch64_gnullvm-0.42.1
+	windows_aarch64_msvc-0.42.1
+	windows_i686_gnu-0.42.1
+	windows_i686_msvc-0.42.1
+	windows_x86_64_gnu-0.42.1
+	windows_x86_64_gnullvm-0.42.1
+	windows_x86_64_msvc-0.42.1
+	wrapcenum-derive-0.4.0
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A graphical process/system monitor with a customizable interface"
+HOMEPAGE="https://github.com/ClementTsang/bottom"
+SRC_URI="$(cargo_crate_uris)"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="+battery"
+
+# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
+QA_FLAGS_IGNORED="usr/bin/btm"
+
+src_prepare() {
+	# Stripping symbols should be the choice of the user.
+	sed -i '/strip = "symbols"/d' Cargo.toml || die "Unable to patch out symbol stripping"
+
+	eapply_user
+}
+
+src_configure() {
+	myfeatures=(
+		$(usev battery)
+	)
+
+	# This will turn on generation of shell completion scripts
+	export BTM_GENERATE=true
+
+	# https://github.com/ClementTsang/bottom/blob/bacaca5548c2b23d261ef961ee6584b609529567/Cargo.toml#L63
+	# fern and log features are for debugging only, so disable default features
+	cargo_src_configure $(usev !debug --no-default-features)
+}
+
+src_install() {
+	cargo_src_install
+
+	# Find generated shell completion files. btm.bash can be present in multiple dirs if we build
+	# additional features, so grab the first match only.
+	local BUILD_DIR="$(dirname $(find target -name btm.bash -print -quit || die) || die)"
+
+	newbashcomp "${BUILD_DIR}"/btm.bash btm
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${BUILD_DIR}"/btm.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins "${BUILD_DIR}"/_btm
+
+	local DOCS=( README.md )
+	einstalldocs
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index eb04a9d7820e..5b857f176bf5 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ba54c33ff777..95bdd8dff848 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,20 +1,34 @@
 AUX tomcat-10.1.0-build.xml.patch 13790 BLAKE2B f84bfdd9da38d738cc8fbd91bc4bf29b76feb82bb7b562e90aa9fbaa55009e482260c39958210912c0fa9936b29e7a479951765d99f49c8d70fe2190aa50cabe SHA512 c30fba95c36190dd1d0b61497536c5b8880c3e2ef629e697509c343a34be24a4848d84279ad9881196752b40d5d9b1d496840ffc317f4f9e668290f52ebc48a8
+AUX tomcat-10.1.6-build.xml.patch 4921 BLAKE2B 3413bbab4324c0741c780db57e190446b2cdf6d3327802d6ba127481b80fcf369560dccbc969613497ae005410cedaef367c7a8ef06d00033cb750b130856fc9 SHA512 01581bff021cdcf87fa3d96818e27e41a719c8bd999134a05341fc7cb310408ccead01849158d2a27c738446f5a68b5c0e3504043b381067c37abf57834cd2f6
 AUX tomcat-8.5.66-build.xml.patch 10850 BLAKE2B 69353bcf5697e6ae0b930c71fbb870401e822340f0eb0b8a6283e0d8cd1388d1d22a12190d089f7001a06e2491bb2309aab8c93b8f2a79e8439571fed8d0aebb SHA512 498c2ac8ab49cd83151ddfc6b47bd3a7a7148096e331ae55c7fe3da90007c19387208de64f5b3e796ec54b4b8534b11f906940fcf49343157acc862fcf06f5c7
+AUX tomcat-8.5.86-build.xml.patch 4229 BLAKE2B 5ddcbd0ead6c3d4fb8306a9311efaa94c6f336f77c26e79ef6b5d570f5abe38aa3bca0be82972fe9f90313b382fee1fb82ad62c3b4f1694bda8283b8faed9190 SHA512 adcba3a3e37176708851b62ed49bffc205f4b6a4a581210ab38ec43f8083310e387394e519a8c3ed38569f81e6a58dd282e79201a8499556bec48822c8238231
 AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
 AUX tomcat-9.0.50-insufficient-ecj.patch 2890 BLAKE2B 586fed374f9da437d441d59272faaadf898b684375edd999f7ea50c81a5fe1ffe98e89037ee64997e583fa835f32598a7b16f0595be75fbf947264d84eea4379 SHA512 3d31beab19f79b8bd477d06e2b0ff7575e8c5cfb6c056da6fb1c19e2a1efebe9151c9b698baa1e4168006a9c28974eb49924bf52c89795ba227111d678e38439
 AUX tomcat-9.0.62-build.xml.patch 12687 BLAKE2B 55b0c142875581231ca65e9198d5da116f01e1b9d4b16d50cd79300e9fd49c5d9f79341f34a0285af8683e14bb51d1c4fa2bb91e893591c114692021608ffedf SHA512 0c82adb799539eeb4691f86e2e2815feefbefce579576a3419bd3b5efbaf7e6d24c03862b70d514424cfa74abb217e214a9005390b73ecf9836721c7b289a802
+AUX tomcat-9.0.72-build.xml.patch 3859 BLAKE2B 5d59c5d8bd831a5992d1b73529193b941fb6260c1948a3d10dc3fc6f705f863ec81fd01017896df48b6f734f49385f63cdbcec2235d3ffc559ee88210b4ec2f7 SHA512 9dedf92cdf82d65c72fb24206dc2edfcde754d5fda4e1d86c77737251a524e64a0aec2faff47181052e90f53e6ba643be5914c7ca2aa47bd2c4cc92ac7acf9b0
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
+DIST apache-tomcat-10.1.6-src.tar.gz 6073924 BLAKE2B debc363395becd96a856a03ffd5846e786c27781318b9c08c428498a010dc77e334e6fd15ffea1545dc15b1c226fdd73f24d15f70361b39d37316c48a0c5e66e SHA512 54df5784fbbe9c29b5569783c836e1490a6c08610ffe3c98123cc8bee8b483fcb73f46a15487dc5a6c9c7926ba63bab79e1794b07c00c22798ea0984e56f12f5
+DIST apache-tomcat-10.1.6-src.tar.gz.asc 849 BLAKE2B 71f512c0def69b9c23d4440a988f1f889c57c55e731fc00080a6c919c13360ad2b8a7bbdc65b0e632b5e4b66eb96e58301d720fb433b3b3b50e107de17fd6fe6 SHA512 51d560236ebdc9f9c6e77e6ac98306ec8e9e3079efda7f0a2b6cb0cc3256571881acd891668d606d873d0b5a1be3ba3cd5a095d44cba6e852f1cd5fd8e1e9d41
 DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
 DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
+DIST apache-tomcat-8.5.86-src.tar.gz 6038952 BLAKE2B b57a203fb2e215f0a07485d5ae70398e0e2d56b37cd7172f33680c8b57faa97929904349ee93b3d975cb24ac2c9e2d15240d59d4a3295d0a7deb96b8069269ef SHA512 fbc57d314fb8885e9986a26515b6536f2bffdb3476af71417eb9dab1623f36ea80da431bc1dc8874aa99dd6575919a0d3a828d84a87404a73ed22de601097e12
+DIST apache-tomcat-8.5.86-src.tar.gz.asc 849 BLAKE2B ff388f97a189c9b45eaac42a1e670c8cddf52903421f053ec1df0518937f3c8b0bc650009cc93bb0a7440aa0607f955bbc219d80a34ab050851554b5736f3235 SHA512 85e961b6569e6c8421b83246653c86a53843232dc7a3eb5d466e6f11fb4b4f1a5dcee43403a43c8950774395acf7f576f7184c7dfa84084f08ff9a203b6104fd
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
+DIST apache-tomcat-9.0.72-src.tar.gz 6227773 BLAKE2B f784df0dd40539f38343942d818f3735521fbd3c978a3fa9c1c4cb7a4a46b71a23bdd55530b2ba6ae4a6ae89bf651a1c73fea0380e485097eb77cc75ac4d7075 SHA512 5dfcf1b4ce90b41164170eada109ccccb9c4357ca979f88dc89548284164b482c5d87788d93188de20b68ae346e870ab01525a980be3f8ee72af27e83f82d3a1
+DIST apache-tomcat-9.0.72-src.tar.gz.asc 833 BLAKE2B f79bd955a01d846427a454d9a50f9a614e16757edf79beeeef7b9498e79356944085b0f39bd8e1a1181e7152e042a06ce310ccf7da3549b8b16acee2eaf4ba56 SHA512 4e8afa0ae0d7eded96f33d2391c018bac7dbf44754cbf98bc965fd0d3c2c3fbbac9c68304066e93cb4e9e36bc8bcf2f8378f5b357df360582df0aae239b61585
 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
+DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
+DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
 EBUILD tomcat-10.1.5.ebuild 6535 BLAKE2B 5af622a02ce2b9efcbba0949dd617ae1c2b53155765d164f26a6172097f1b67f9605132804f4370788e4a8ea39f6b9e5e8d03956bc0a14fb4ff263bbb41f333a SHA512 f64bd088116ce2ffe04b3c53f98872ce5cf580b90351272b4751be52658c9995c2be636497e2a54c8f77ac15d2341ce1fcedf245e6a66bf42e323af20bd90f71
+EBUILD tomcat-10.1.6.ebuild 5997 BLAKE2B 3d68d914a6c12a8afb35d9149a18362a8debfda62e58a25948c7b0f587234a861e3a7ee6c299db584b0560926810aee8290c850d849967b9fc5c959b2fcbc990 SHA512 ba2735e47cfcd2a32d6232508b5528eccf481e83e0075bd322d40dd52ab68dd7e73e25cfcc75864c4c6177187769ab488439e2a11aa2bafcfe8f19691041c196
 EBUILD tomcat-8.5.85.ebuild 5433 BLAKE2B 23d065fe01d845eea65eb05b826d84423e9e90fe9bc19077f0fe84765e3bf37ca0b1996276effdc701a8b7a87f23fadb322eb93d26cd65112128499172d48918 SHA512 d3e1cd656754f5e2bd02fba376c08ad2fdcae4aea6235c973cf525a59fe0436c2e20e47bf10503898ae3e1cd16f1673e310739d40af155ff5393d93cdc36f601
+EBUILD tomcat-8.5.86.ebuild 4860 BLAKE2B 7d9e8e0616f278c7e5762b39086ef36a5bd82ee5727365dabe67193c3af47d6880299aee84bb0ec0ee6d962476129db5177dcce7f6644e772afe4607abb9b259 SHA512 37a26b05fb65ad6d84dda6271e426f8a4ff1fffb1d2a9be4699854af487427351152059d68caded087988db1899bc9b5e93ff09aa25402f337d6fe0062abefe1
 EBUILD tomcat-9.0.71-r1.ebuild 6424 BLAKE2B 2189fb588d1e9d65c7ba6e00acc2db9bf747af77693011e9333be410a217c4c6aea6836e168f3b2929edbd63d32d5d45ed443f4e950702ee8b80482f9409ddff SHA512 64bd43df27bad8e5119e1e42d5af81a9a8381a108be27dcb3f143ad4755215aeab7424acf3a389a237cc139603a8c38603dda81f961e34c1a509e3d136bd2766
+EBUILD tomcat-9.0.72.ebuild 5888 BLAKE2B cd6ebe4480aacfdda23c5391abe147bc12b797cc20845c0b41e96763b8c893fbb3665afa4d16b1c359caab0cb4e29a4a99bc6a02bfaea3b9bd5b8df28d5459b9 SHA512 e8a806bc68cebded48e0837d03a136a4e6df369cb2fa1dd83beaf40bffc86485775cc775520afaeaa0d358594642f455d349c63aa720d0e355f192d120534cce
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
new file mode 100644
index 000000000000..341813c73123
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-10.1.6-build.xml.patch
@@ -0,0 +1,122 @@
+diff --git a/build.xml b/build.xml
+index bea41a8..08ef1db 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1457,9 +1457,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!-- not needed for us
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1519,8 +1519,9 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!-- we provide jdt jar externally
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+     <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one -->
+     <local name="migration.jar.filename" />
+     <basename property="migration.jar.filename" file="${migration-lib.jar}"/>
+@@ -1530,8 +1531,9 @@
+         <exclude name="${migration-lib.jar.filename}"/>
+       </fileset>
+     </delete>
++<!-- we provide migration tool externally
+     <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+     <!-- Delete all other versions of OpenSSL support for Tomcat and copy the current one -->
+     <!-- After module release
+     <local name="openssl-lib.jar.filename" />
+@@ -2213,11 +2215,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!-- we provide tomcat native as another package and we don't need commons-daemon
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2378,8 +2381,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!-- net is not accessed from emerge
+       <link href="https://docs.oracle.com/en/java/javase/11/docs/api/"/>
+       <link href="https://jakarta.ee/specifications/platform/10/apidocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -3300,6 +3305,7 @@ asf.ldap.username=${release.asfusername}
+           depends="setup-bnd">
+ 
+     <!-- Download Commons Daemon -->
++<!-- not needed
+     <antcall target="downloadgz-2">
+       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
+       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
+@@ -3308,8 +3314,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
+       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download JDT (Eclipse compiler) -->
++<!-- we provide JDT
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${jdt.loc.1}"/>
+       <param name="sourcefile.2" value="${jdt.loc.2}"/>
+@@ -3319,8 +3326,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jdt.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download WS API -->
++<!-- we provide jaxrpc
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+       <param name="destfile" value="${jaxrpc-lib.jar}"/>
+@@ -3329,6 +3337,8 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
+     </antcall>
++-->
++<!-- we provide wsdl4j
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+       <param name="destfile" value="${wsdl4j-lib.jar}"/>
+@@ -3337,8 +3347,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Tomcat Migration Tool for Jakarta EE -->
++<!-- we provide migration tool
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${migration-lib.loc}"/>
+       <param name="destfile" value="${migration-lib.jar}"/>
+@@ -3347,7 +3358,7 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${migration-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${migration-lib.checksum.value}"/>
+     </antcall>
+-
++-->
+   </target>
+ 
+   <target name="download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
new file mode 100644
index 000000000000..8888e3589ce3
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
@@ -0,0 +1,113 @@
+diff --git a/build.xml b/build.xml
+index d407be0..7c69a1b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1148,9 +1148,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!-- not needed for us
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1210,7 +1210,9 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!-- we provide jdt jar externally
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++-->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1719,7 +1721,7 @@
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+           description="Prepare to build web services extras package">
+-
++<!-- we provide jaxrpc
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+       <param name="destfile" value="${jaxrpc-lib.jar}"/>
+@@ -1728,7 +1730,8 @@
+       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
+     </antcall>
+-
++-->
++<!-- we provide wsdl4j
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+       <param name="destfile" value="${wsdl4j-lib.jar}"/>
+@@ -1737,11 +1740,13 @@
+       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
+     </antcall>
+-
++-->
++<!-- ignored above
+     <copy file="${jaxrpc-lib.jar}"
+           tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
+     <copy file="${wsdl4j-lib.jar}"
+           tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
++-->
+   </target>
+ 
+   <target name="extras-webservices"
+@@ -1850,11 +1855,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!-- we provide tomcat native as another package and we don't need commons-daemon
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2020,8 +2026,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!-- net is not accessed from emerge
+       <link href="https://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="https://docs.oracle.com/javaee/7/api/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -2933,6 +2941,7 @@ asf.ldap.username=${release.asfusername}
+           description="Download components necessary to compile" >
+ 
+     <!-- Download Commons Daemon -->
++<!-- not needed
+     <antcall target="downloadgz-2">
+       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
+       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
+@@ -2941,8 +2950,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
+       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download JDT (Eclipse compiler) -->
++<!-- we provide JDT
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${jdt.loc.1}"/>
+       <param name="sourcefile.2" value="${jdt.loc.2}"/>
+@@ -2952,7 +2962,7 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jdt.checksum.value}"/>
+     </antcall>
+-
++-->
+   </target>
+ 
+   <target name="download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
new file mode 100644
index 000000000000..985d5d4f94fb
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch
@@ -0,0 +1,99 @@
+diff --git a/build.xml b/build.xml
+index b420c2a..abecfde 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1436,9 +1436,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!-- not needed for us
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1498,7 +1498,9 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!-- we provide jdt jar externally
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++-->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -2154,11 +2156,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!-- we provide tomcat native as another package and we don't need commons-daemon
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2319,8 +2322,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!-- net is not accessed from emerge
+       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+       <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -3234,6 +3239,7 @@ asf.ldap.username=${release.asfusername}
+           depends="setup-bnd">
+ 
+     <!-- Download Commons Daemon -->
++<!-- not needed
+     <antcall target="downloadgz-2">
+       <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
+       <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
+@@ -3242,8 +3248,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
+       <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download JDT (Eclipse compiler) -->
++<!-- we provide JDT
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${jdt.loc.1}"/>
+       <param name="sourcefile.2" value="${jdt.loc.2}"/>
+@@ -3253,8 +3260,9 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jdt.checksum.value}"/>
+     </antcall>
+-
++-->
+     <!-- Download WS API -->
++<!-- we provide jaxrpc
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+       <param name="destfile" value="${jaxrpc-lib.jar}"/>
+@@ -3263,6 +3271,8 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
+     </antcall>
++-->
++<!-- we provide wsdl4j
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
+       <param name="destfile" value="${wsdl4j-lib.jar}"/>
+@@ -3271,7 +3281,7 @@ asf.ldap.username=${release.asfusername}
+       <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
+       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
+     </antcall>
+-
++-->
+   </target>
+ 
+   <target name="download-test-compile"
diff --git a/www-servers/tomcat/tomcat-10.1.6.ebuild b/www-servers/tomcat/tomcat-10.1.6.ebuild
new file mode 100644
index 000000000000..9c25e9b767b7
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.6.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.5:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	eapply "${FILESDIR}/${PN}-10.1.6-build.xml.patch"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.86.ebuild b/www-servers/tomcat/tomcat-8.5.86.ebuild
new file mode 100644
index 000000000000..717b0f622eb2
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.86.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+
+# we don't use ~ for el and jsp because the same implementation
+# is also present in tomcat 9 and it would be impossible to install
+# both tomcat 8.5 and 9 at the same time
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	doc? (
+		dev-java/jax-rpc-api:0
+		dev-java/wsdl4j:0
+	)
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	eapply "${FILESDIR}/${PN}-8.5.86-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.72.ebuild b/www-servers/tomcat/tomcat-9.0.72.ebuild
new file mode 100644
index 000000000000..77edaf178766
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.72.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-core-1.9.13
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	eapply "${FILESDIR}/${PN}-9.0.72-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "Ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-02-26 09:56:20 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-02-26 09:56:20 +0000
commit	9b55c1bd600df28af7b9f6ee044b714873e19b49 (patch)
tree	9c6d86e5e38b0aed45d07dc73907e9f818783a4d
parent	61044571b76d87a2eec42d36c9b7addf3e66e000 (diff)