gentoo auto-resync : 28:10:2022 - 03:58:39

author: V3n3RiX <venerix@koprulu.sector> 2022-10-28 03:58:39 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-28 03:58:39 +0100
commit: e5985b8e66b3b43c34328efb47b9b12e8ce5a690 (patch)
tree: a6dfa5de0a8939409fa203b13d2b292e6bf5e1bf
parent: 62082029157d2ef97a43e34ce34a55877afa8a58 (diff)
195 files changed, 580 insertions, 2417 deletions
diff --git a/Manifest b/Manifest
index 0065180c2805..ae5c53fdf46b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29666 BLAKE2B fa3baa5d74062e0ab1adc20fb049214ab8735f1e3196967fce76a80283dd7f2060b87b06831586d5d33ef4602ea303bbda02958130478b512871ee1863d1223e SHA512 8e540e229ec313c08370075bb111fe3bb226a610566c962b75782383f3c9924c0c50befd99c13d08c9b65b30322bc1acb0ef92e5ef0a856540f3f675e34ab0dc
-TIMESTAMP 2022-10-27T20:09:55Z
+MANIFEST Manifest.files.gz 29661 BLAKE2B b96e1c4dcf2c61da241256629872ac88bcc3466c553ad8f776a5778c66ff5af054901d18c7e96aa835c9865ffb2db6788f904e0193b0e35d019520ae092a34de SHA512 5fc95d5bc0b70d40994642a45b78a9f38d0d98e6c07b6b9f191544f91685c00bcfa16c02ef4eb279768b100764c689181fb831c651bf973d07e8292ec1f1b044
+TIMESTAMP 2022-10-28T02:10:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNa5ZNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNbOitfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDGvg//U/1O+PzdpEwQi26O6HMveykKYXiJsbGEEDIZCyw/l5L2Zostt+WElASn
-nSROO2TL8HA5dyeq2Rqak8QrNbBEBg5IoFpBfMgyRl2FEn2g1NrBYlY+XmoIWY5p
-nCOmuaHvHRSD3+A65rl0366A8ccOP2dR4+CwNu5g2I7m0Dz+5aze1O16amVIgjMb
-SqRYxOxpnNc8pZHN072fy9iWiWg5OHvpJ3pSK9Bo05gvoDFDosX44+UElvDPxO7X
-yjiMBi3RrZaS2cijVsmnYSS2cvPoaxZBuu0bmB2063hIXUH51BblIbYFoh0QEwq4
-rl3RqmoyQwxYcRP5f9CF9hVTDjeOzW6uJgUi+GiBCk/rku0mdv8FxbGkzdjQCVMD
-1tCzl/27FSlPtjnX095In3WWtHh3ZPlP1JlMoK1KFE8Pzt3YevfZcm26DYgh/bZi
-Ehl8w85iaZBYnIzeu9WOftB78ofbK65Mc1lGx9v/Fvvf4/8gvc9Olgk0peqtZ5ub
-2dxgshOpkJ8kBkRAewLfNxXbEO6U5nEH+IVtqBRvZcx7T1DjnqfFHdiXlZG26PXK
-+XKTHKskJHX+BZQVaycHALPNN8gYJ+y9p5bm8vIVYlHWKRJdd8MDK63bDib9pu3O
-dpEyHMHYkZr+0cKZLO2c9piYm102gZlR1MxQeJr83yMebqyBSoU=
-=OzAh
+klCujA//ZNWCdLPfLwJ7qJksuyr7T7AROJwlkLyWM+zk/macxkMb90tlVkmLpNT1
+x8CTQ8I9hCDiMdBXr6ihiw+zeggQNnN3YaIuUtAOfAVKk/ag/siaImcvyx9tfwU3
+m1kwsS4WSS2+755ZD8g5saxjNvPxXtbLvfi2RHASsiqOEdDeLPQerh0OFKl99pe5
+IUyojMWat/Q1lT0jPmm6C/4nlbT1NgZC1Ty0WQlRcKGO5k/PVXE1v0WOVfz1uuIK
+QIr2bHX9uS1b60lT/KijcirkVkZWhoJu3CjFdfx0UkuDrkENhU0loB4NAN8jrFnA
+jlV4OXRoVtwfBBoxuPMY6x579szPxvlWWOQVqeSBN5u+ODeU8FLGuBeAd9jsSvj+
+flil2HYWH6R6crdAHULXgwxLmErT4FbkxnVR1lGTXgzBk6L36fy8QcgPaZajP7Sq
+l7l9hZSHB1EgyqK+Jjg/ujiw58TLFpErUY8iFtMM4l5EWdx2Bo1Tl4IMJakAXx3p
+TGAs1Rb/a0Q+kc5juIhgg77K450UQbMeHwwzqJ//Gh/E55BH29kjk/G4CXvzMlPU
+hFTxTmXNWFDqLwwuw9bRD8Kz+6O6tFLDvHFbSMnp6Zxz/SJZYn1g5WT5E6QbJglN
+DXLJWPMhR3xfpq70AHUn/c2Brjzn36u3Q/8LkMwP4NSC/pB61gU=
+=SGxU
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8e19f814d384..d0c4329f6d3e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ba16469880fc..cde138b8f9ae 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/tarlz/Manifest b/app-arch/tarlz/Manifest
index b709cded7cbf..0fc49672d5d5 100644
--- a/app-arch/tarlz/Manifest
+++ b/app-arch/tarlz/Manifest
@@ -1,5 +1,3 @@
-DIST tarlz-0.22.tar.lz 105724 BLAKE2B 7921f7085d63f553f745cf8b7fee43ece32346a0804e41227806efae0ab338c48ee1830a8b087f03000a27fcf44338b3dba6d52d37f4de790d8b7bc5f0234ade SHA512 4e241ea0571e421c93fbeeb54a20e73fd4a7e9c85dc3b24295caec1a52e156cdcf5e85f4ee41f5dfae712b851d17fe0e96955380bb86306d8002f4187d0c60ec
 DIST tarlz-0.23.tar.lz 112276 BLAKE2B 87153b1e843ed74b5efd339d29e79ddef2bbd11ff951898383ae4c6c099f4e97ef58b8bd2f14ff5bff2cfd6baccb433ab55b9b9b78d0893caef5bd1f4d07a36e SHA512 623407142d03e0ddae3dbb057b8ef5f1aea850418dbb47c6278affa42c88bc1786cd3249d1e8c018643f41516787225cb2ed3aca2fc02ba8e65dfe4744f965d8
-EBUILD tarlz-0.22.ebuild 596 BLAKE2B ce0e0f5cf2fabde971a2980f5ebc5cb152e130501d0ea254e19a86c10bb08078bc6efab9f702eb35df1ba3ddbe036c3b589f37ecf16a46631b68635b9eb2967c SHA512 ca3e78d6d30428f9108ea9af965314525816c83647bd2938d49d0f141cc24a978c00f252731a7821edd714a8772c08eb6686e5e2813b7eed4edb9e35ae244d5a
-EBUILD tarlz-0.23.ebuild 605 BLAKE2B 0f5ffef5a03986e0b04bbcceb79cb5dc97698d8c474f7342525bb6173a84ba79085d61bb23b3644a2d7931fe511aaa231c10d94eb83836997d9b951544298d5f SHA512 fc9e09435ec1e25dbcf4c3a9b7b4fe806c2cea94f49c23a5d4acf6c2deefe304d82b1a9a9ab5162a59815017c30dc0ab3a38c1228c8f535f515b65becf38ef83
+EBUILD tarlz-0.23.ebuild 604 BLAKE2B 2c85673c45730ff37832e0543231ada768b747d9df453538f120f07c6d2ff7e3b3130a2b2691eb0dd64d2f5f1d6d96a5921620a4b2650f80bdb2504aac554166 SHA512 40f93fc0f73b51916d0718913150b09441644313eacab6389fba414badcb82cbe9ab6b4475724d51272f6f0af61f09c684535beacff872eac33300f3cd0ee0fe
 MISC metadata.xml 355 BLAKE2B 395fec08847b666d16f1b38e094844c5821076bb58688ce21277c2a798a7ffc1f029cb6e92a6dcd92f71f35715f7a55638c6d34224055df275970b1c06acd6e0 SHA512 8a88a29f6ed88692e554ef13820e1ab95f1da4854d13832cc839b29b3e3278cc479412fc22e021b4de696d92cf726181b8434eb19d479d9be36b621a69040ff6
diff --git a/app-arch/tarlz/tarlz-0.22.ebuild b/app-arch/tarlz/tarlz-0.22.ebuild
deleted file mode 100644
index 8c9cc43c7abc..000000000000
--- a/app-arch/tarlz/tarlz-0.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs unpacker
-
-DESCRIPTION="A parallel archiver combining tar and lzip"
-HOMEPAGE="https://www.nongnu.org/lzip/tarlz.html"
-SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.lz"
-LICENSE="GPL-2+"
-
-SLOT="0"
-
-KEYWORDS="amd64"
-
-RDEPEND=">=app-arch/lzlib-1.12"
-DEPEND="${RDEPEND}"
-BDEPEND="$(unpacker_src_uri_depends)"
-
-src_configure() {
-	econf \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
diff --git a/app-arch/tarlz/tarlz-0.23.ebuild b/app-arch/tarlz/tarlz-0.23.ebuild
index ac8108f138ea..173f51872685 100644
--- a/app-arch/tarlz/tarlz-0.23.ebuild
+++ b/app-arch/tarlz/tarlz-0.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=app-arch/lzlib-1.12
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 976728752881..1307db7e5dfa 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,15 +1,11 @@
-AUX xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch 3383 BLAKE2B c244f412f6d2bea84c5ef41b9f08d0f7be73cb9af1097e58169c9d9061b8eeff274903fbbc4b4639d06344bf9691f0d289671c4d07a4c5073efe9bc536e31a5a SHA512 97ba1bbe9fec7602d77e53961b94691d6551813ed9de5b6fde71f3724205848d2865c6085ace75b7df963d43b99c55c539547f028dd8d86da911aaa2b6a433cd
-DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
-DIST xz-5.2.5.tar.gz.sig 566 BLAKE2B 8b40d8d7913eaebe2595ea41a735d972d1969d8b58f42b2bee6591b51e2e626473fc85d64f1bbbff3cba6b0e1b4423556d6ddaf16f646ccc18ba1bad5cf45d83 SHA512 3aa21484bef0282ed0b83e3fcd5cf3d87bf51fa68e24d55bb11f91bc96f0ac29f468949bc4c8cc20fbd6ad12f5735686fe09ee42efe2b8d728010da9668aa5a9
 DIST xz-5.2.6.tar.gz 2069602 BLAKE2B 3cc160dc76944ad2a181fbfb23ce386dbbd04e75bbeb0b159aaaf82e2e8157ea8b2bb80b216d79a7c25339bfbd13bd9d8c261789829cc7c3cb86fc893a7b4b94 SHA512 090958dd6c202c989746686094c86707ad4ae835026640080fc0a9d0fad699821b7d5cb3a67e6700661a0938818ba153662366f89ab8ec47e0bae4a3fe9b1961
 DIST xz-5.2.6.tar.gz.sig 566 BLAKE2B 7c6114d93b4e3c8553108da3985029fc4585bfea5d72fc5028024221e91cc43c3b6cd3b7d169e4c8afed445a6beef7c255ef8420c5266a22ee9449a57cacec5d SHA512 50a1ac0f8f87f8c04c25c69870ba054094abf20b668bdecd42ed247a2eff24b8e52178b6442da84c125a9401a6f98d40ca76b27453833a30807c83128ab70eee
 DIST xz-5.2.7.tar.gz 2105803 BLAKE2B 5363c5d0403e041c6d2e35b5d3321feeb8e63b8556496373c820975850b50e28e0da903446a49ba516fd9f40e0101dd39cfa9a9b8dd143c9849c84a715bb5d7b SHA512 06329fdbd1d897aa99dc96900c6246457288c586d02bb4869a92dd2f97973f95acb3a2fa9598a20613ea029f816836a8e3b65e36fec2b807b5e7553141429ab9
 DIST xz-5.2.7.tar.gz.sig 566 BLAKE2B 00702dff24d655ebf30f2bf8bee94406e002164408b9eabb4f461a789482584c2b9c90675b8d1d5e030913e674946aa7392b73fcedf6ac62e3b1e3bc05bf92e6 SHA512 556e05107437fae2c75cc1a93465fce04426707e979403f41c6ee5b748fe7c3f985812a4e3b07785a84f68ef9d9f362ded470af1cceb9f4e8c80620a2699163f
 DIST xz-5.3.3alpha.tar.gz 2119150 BLAKE2B 031e1a1556cbbd49565c2b72676e46a22c00e0e25bca2938c21d56f2d7f585c294d2a3a5712a3ae5d62fe8fef6e7b2f411fcc3c0ccac4714786209599b599d25 SHA512 c780c6854cb7599ed97629dbf923f5c6802b48e12aa25638c863e2403e56557abffb2b501823d4d53c852b7d09360b9ede355989756fef1daa1fa8cd9395da8d
 DIST xz-5.3.3alpha.tar.gz.sig 566 BLAKE2B 2a02fd8a84c27967384021aa879efdf598b40ca9ff552080be2d057f402b3aace13bb0d98574e0185edd6ee3084793767f9941d4c1f21f5c5d55f886025cb845 SHA512 e6a849f2dd6f67ad3d51f50fe5f3e7f2a57e97e9d89499e2f88b94ab9716f1db5de34c3bb6f17b6fd55498ee5f4653d3d25e1a495b9c682b3200b2603a85479f
-EBUILD xz-utils-5.2.5-r2.ebuild 2980 BLAKE2B a84114ae0f3f8c76822059aed6880073befa57f27f2384410316063094da31372dbe7ef3c0086ac53ba678566d32b12421a8fa7702ebc30d65b519ffbf3d5732 SHA512 eeba7fd7474a0a868d3579fb472172834c9ccf8c7fcf33e47b6130526dc17cd53251864c19beb06bb4fa94cb8fb79958225e79957d5ec1bcea1a9594125c992b
 EBUILD xz-utils-5.2.6.ebuild 2951 BLAKE2B fe70288d4b6b9582600339ef3800546aacb734665593cafa8ece0cc2781262906ad8dffaeabe5610e2769d7a006bc08763634822c6d9f978ac3463ddd460a1d8 SHA512 caddd665690b8acb03c3697566a9e977eed8a003e3f56bf25dc77ab74877994bfec86965334ce6683f582e07e4c6d53b6bab10f3322880b6d6342a92ad726f94
 EBUILD xz-utils-5.2.7.ebuild 2855 BLAKE2B 2c19431300aaa009d555ed79110b8d72468514508c665743ccb90704b372a742397b07f6ca0500fc0c2941a0cbb93d8478dcae65adbc0b2ce25edaefd12baacd SHA512 e80b77aea4996a5671b7cf07e74923013a2e8a45fa9848409d6b8eb123cd713d4b40ab98cdf2757fb470f74d00e8067bc557af42568b358caf7d41336645938c
 EBUILD xz-utils-5.3.3_alpha.ebuild 2885 BLAKE2B 00cedd70d450943dd489e6b9e05ce1d7a0f5f4472b501f4587cf482c2294fcd7f86d5811a7325b6812f468738a0144838291033eb83afb79aaaba640b34800d1 SHA512 8172456c5fcfd424a4f2bf7e6993fc67b782dc8a7fc3c4c433610cae31252acb2a022cde8a128d5e20d5842ceee4a3b5eeeff9f8a4e9c0f667505d7397a37398
-EBUILD xz-utils-9999.ebuild 2855 BLAKE2B 2c19431300aaa009d555ed79110b8d72468514508c665743ccb90704b372a742397b07f6ca0500fc0c2941a0cbb93d8478dcae65adbc0b2ce25edaefd12baacd SHA512 e80b77aea4996a5671b7cf07e74923013a2e8a45fa9848409d6b8eb123cd713d4b40ab98cdf2757fb470f74d00e8067bc557af42568b358caf7d41336645938c
+EBUILD xz-utils-9999.ebuild 2761 BLAKE2B 909cd4550713dd2eaae9f242ec5c45e5aedcaa78748569bfcaeac3c867638bfe2f0e8ecc0a7dbd0b1220f7a2860cfe1430545e272c0a97cbf9877ebc5190cc27 SHA512 88b9523cb3c31be766d78198716489fc9b26ac39897b20ded7c775c9c74969028a84241af1ee688149442ab9c333f1ec25f7d134a8182bfd4396c8f17995b3ad
 MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7
diff --git a/app-arch/xz-utils/files/xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch b/app-arch/xz-utils/files/xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch
deleted file mode 100644
index 7293a982c269..000000000000
--- a/app-arch/xz-utils/files/xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-https://bugs.gentoo.org/837155
-https://git.tukaani.org/?p=xz.git;a=commitdiff;h=69d1b3fc29677af8ade8dc15dba83f0589cb63d6;hp=bd93b776c1bd15e90661033c918cdeb354dbcc38
-
-From: Lasse Collin <lasse.collin@tukaani.org>
-Date: Tue, 29 Mar 2022 19:19:12 +0300
-Subject: [PATCH 1/1] xzgrep: Fix escaping of malicious filenames
- (ZDI-CAN-16587).
-
-Malicious filenames can make xzgrep to write to arbitrary files
-or (with a GNU sed extension) lead to arbitrary code execution.
-
-xzgrep from XZ Utils versions up to and including 5.2.5 are
-affected. 5.3.1alpha and 5.3.2alpha are affected as well.
-This patch works for all of them.
-
-This bug was inherited from gzip's zgrep. gzip 1.12 includes
-a fix for zgrep.
-
-The issue with the old sed script is that with multiple newlines,
-the N-command will read the second line of input, then the
-s-commands will be skipped because it's not the end of the
-file yet, then a new sed cycle starts and the pattern space
-is printed and emptied. So only the last line or two get escaped.
-
-One way to fix this would be to read all lines into the pattern
-space first. However, the included fix is even simpler: All lines
-except the last line get a backslash appended at the end. To ensure
-that shell command substitution doesn't eat a possible trailing
-newline, a colon is appended to the filename before escaping.
-The colon is later used to separate the filename from the grep
-output so it is fine to add it here instead of a few lines later.
-
-The old code also wasn't POSIX compliant as it used \n in the
-replacement section of the s-command. Using \<newline> is the
-POSIX compatible method.
-
-LC_ALL=C was added to the two critical sed commands. POSIX sed
-manual recommends it when using sed to manipulate pathnames
-because in other locales invalid multibyte sequences might
-cause issues with some sed implementations. In case of GNU sed,
-these particular sed scripts wouldn't have such problems but some
-other scripts could have, see:
-
-    info '(sed)Locale Considerations'
-
-This vulnerability was discovered by:
-cleemy desu wayo working with Trend Micro Zero Day Initiative
-
-Thanks to Jim Meyering and Paul Eggert discussing the different
-ways to fix this and for coordinating the patch release schedule
-with gzip.
---- a/src/scripts/xzgrep.in
-+++ b/src/scripts/xzgrep.in
-@@ -180,22 +180,26 @@ for i; do
-          { test $# -eq 1 || test $no_filename -eq 1; }; then
-       eval "$grep"
-     else
-+      # Append a colon so that the last character will never be a newline
-+      # which would otherwise get lost in shell command substitution.
-+      i="$i:"
-+
-+      # Escape & \ | and newlines only if such characters are present
-+      # (speed optimization).
-       case $i in
-       (*'
- '* | *'&'* | *'\'* | *'|'*)
--        i=$(printf '%s\n' "$i" |
--            sed '
--              $!N
--              $s/[&\|]/\\&/g
--              $s/\n/\\n/g
--            ');;
-+        i=$(printf '%s\n' "$i" | LC_ALL=C sed 's/[&\|]/\\&/g; $!s/$/\\/');;
-       esac
--      sed_script="s|^|$i:|"
-+
-+      # $i already ends with a colon so don't add it here.
-+      sed_script="s|^|$i|"
- 
-       # Fail if grep or sed fails.
-       r=$(
-         exec 4>&1
--        (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
-+        (eval "$grep" 4>&-; echo $? >&4) 3>&- |
-+            LC_ALL=C sed "$sed_script" >&3 4>&-
-       ) || r=2
-       exit $r
-     fi >&3 5>&-
diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
deleted file mode 100644
index 752953853e1d..000000000000
--- a/app-arch/xz-utils/xz-utils-5.2.5-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 autotools
-
-	# bug #272880 and bug #286068
-	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
-	inherit verify-sig
-
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	fi
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="+extra-filters nls static-libs"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!<app-arch/p7zip-4.57
-	!<app-i18n/man-pages-de-2.16"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-xzgrep-ZDI-CAN-16587.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		# Allow building shared libs on Solaris/x64
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-threads
-		$(use_enable nls)
-		$(use_enable static-libs static)
-	)
-
-	if ! multilib_is_native_abi ; then
-		myconf+=(
-			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
-		)
-	fi
-
-	if ! use extra-filters ; then
-		myconf+=(
-			# LZMA1 + LZMA2 for standard .lzma & .xz files
-			--enable-encoders=lzma1,lzma2
-			--enable-decoders=lzma1,lzma2
-
-			# those are used by default, depending on preset
-			--enable-match-finders=hc3,hc4,bt4
-
-			# CRC64 is used by default, though some (old?) files use CRC32
-			--enable-checks=crc32,crc64
-		)
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
-
-		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
-		myconf+=( --disable-path-for-script )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index fd6c0d611f7d..650633ad355b 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -41,9 +41,6 @@ if [[ ${PV} != 9999 ]] ; then
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
 fi
 
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
 src_prepare() {
 	default
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index cb3b7dfdd188..86f17b47f0f9 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index abe867a3bde2..cfc43125ddd7 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -7,5 +7,5 @@ AUX mhash-0.9.9.9-alignment.patch 412 BLAKE2B a08862c748f2b8591696481984e6cbcc3f
 AUX mhash-0.9.9.9-force64bit-tiger.patch 372 BLAKE2B cdce999eba8fea0ebb47b29297b71d014377db53c1cdf88c15f2075e6279e8e42031f94ce9f1987ed5c6b8cf4067f485b5ea298145961f06e4cb09ef8ec9a961 SHA512 cf31ca18afce576dcaa5b7a2a20567dc73ef750a193dfa35265508974bc17c54e967a02fb575047edcc190178a7533971d7f4980cd605714e9c0cefb4aa33186
 AUX mhash-0.9.9.9-remove_premature_free.patch 285 BLAKE2B 7245b1241bbb0001ac588554a3069b6665eeb424c2420dbb6948c68278036e0dec7c16f6a0bec059b54cadd617362e8086b918673d3063aa42598fba952aab26 SHA512 66dcdbfcbd298cde83ab026ff075a09b91662a17f48f9e6c41284513e7ccb398d34f3bef3b72c684a52b9bab43f0fe3d6a751403dc412e66814e5d6ae3160b31
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1533 BLAKE2B 54b60c70e5a7b00e8affb138cf86c74272f1daa9d1dc498391570b8a3d5219e9be2d6db5a90b45b05de18f88429f67404f4a38e6cb56172cc320e048280f71ad SHA512 dfc3b92c35f8b14c2ec28c77467c3dd1fb43bc6c9df0693276426d3592cbcaac466e72cf83c9a7bc7ee3bf8c1c00cd9ac7ee0e7521be75c243d899c68ad2cb7a
+EBUILD mhash-0.9.9.9-r2.ebuild 1487 BLAKE2B 8284526248ab69de513812f23769f77f0dd87c6cf1422c38663242795f6644b478bc24b061df31041f3e5894b1c027042c0247a2d82dd4d28c2966a1de7a045b SHA512 379ce08a958a72af2731062f79064febff8629722b5802a26bee5cc569672c7851d8c8f1e911ae8e579e2585d8e94379cf894c6644d04e33b41e393a1395d022
 MISC metadata.xml 241 BLAKE2B 9e6338d5689848848afe75bcea7eb95e20272b1329d098877fb319a5daac513b5fdddb9e99bc0021a44a0213a199735397009ae61f9424dd0e46c6af96578f13 SHA512 8f3610b6cadf7220e44b905b767c36ee00cdc4a50b3d1a94a4da1df1962b6663bda6134cbf4d1f52e7339e6745d3bb8e520dc51c1dfc817bb8e87d5a21fc28b8
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index 348dd9535bec..a2383e956b83 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-force64bit-tiger.patch
 	"${FILESDIR}"/${P}-align.patch
 	"${FILESDIR}"/${P}-alignment.patch
+	"${FILESDIR}"/${P}-no-malloc-check.patch
 )
 
 DOCS=( doc/example.c doc/skid2-authentication )
@@ -45,9 +46,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# https://sourceforge.net/p/mhash/patches/11/
-	export ac_cv_func_malloc_0_nonnull=yes
-
 	econf $(use_enable static-libs static)
 }
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index f901a4697e9f..b17cfac329fd 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 12510f09c331..21140d70c721 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,6 +1,6 @@
 DIST iwdevtools-0.11.9.tar.gz 86756 BLAKE2B 8c9e25dd273af9a6e10e4a0a4dff1f82889176dbc730981c3ce84a2b1ef5d7138d45bf86430d77c670fed2e9c7f4345758a5fc572f0522c2087f2daaa1ff80c5 SHA512 c9583fed736e670cc9af820c8ba314b771ae3eafd36323d473cb76de0edf8e57c89a52e16e4c7b2985c78d4e43b8cb5b34aabb0bd1951a15e5aad56eef860fad
 DIST iwdevtools-0.12.0.tar.gz 88411 BLAKE2B 9220d59ee9ec7305925798d8beafec49ef35d8e39a428b62df3b3ed3832da1e42aff5e94ab8c5cfd85272d21cbb13c856408cf665523f8b1de85818ba08aebc4 SHA512 b69face29355df2443e75101b81c477dfdb1f54aad14f0d6275c399bd97cd654c4819f5621177d7ef75ecc4540e923ee5cd42f806240ed346ab469959f6a38d9
 EBUILD iwdevtools-0.11.9.ebuild 1907 BLAKE2B 5cce7273be85fbd5ff5b3aa468086c23612e40e54ff7acf456311e07aa4ab39e597424f23b94c6b56912c9b1252e72cd7c12e8d14f654f91eb636bb63909177a SHA512 698c0530e9dcdac227d14000ebf845f9c1919a0801aee12818ea5588e30276ad57fb8480a920976c91b020cbd80cefcb143ff8446454f18222dfeed46bd5b6f4
-EBUILD iwdevtools-0.12.0.ebuild 1915 BLAKE2B a98ac7ead6f494052f08e6dbd20f34866bfe2481d252c43cc94d31f75fb0b4bf24c6f6f1d73a2b5dcc4c76e2fb1e1b5d14b0b58af4162c1f27183b73ba8daa66 SHA512 6da66aa4d2ea4d6e040636a8b189f8d3fc83662a4a042472a8bbad9202fb8849595cae99a41a55a924c8a094e1bdc0392050d40f294b398a4139fd149c33c5e4
+EBUILD iwdevtools-0.12.0.ebuild 1907 BLAKE2B 5cce7273be85fbd5ff5b3aa468086c23612e40e54ff7acf456311e07aa4ab39e597424f23b94c6b56912c9b1252e72cd7c12e8d14f654f91eb636bb63909177a SHA512 698c0530e9dcdac227d14000ebf845f9c1919a0801aee12818ea5588e30276ad57fb8480a920976c91b020cbd80cefcb143ff8446454f18222dfeed46bd5b6f4
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild
index f618116f15e0..25527bd89228 100644
--- a/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1be0744a02b0..50524e1dd08a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 0fc7b0edfff2..10cd2d8d8477 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,6 +1,6 @@
 DIST pdftk-v3.3.2.tar.gz 2343475 BLAKE2B cfa3cac4b78695d757e9cd3ba02f2a3e304343c481a44b0b6165e239d90e5ef72be3385faa1a72cd36194844f441fd1e93194e8d815807d2d0b364d0421553d2 SHA512 44056737e3b9b3cb988f46e96a0f3ec13193cfc662946f6def93add0ed56608fc026181254165440f1172e9fdda00771c3c018c20bf20ce87dad322fc1394893
 DIST pdftk-v3.3.3.tar.gz 2380289 BLAKE2B b370777f5b87706ed811e424214db23b5622ef4e2420fe00c7e5e7d03fb51314589e7a1588d911c0734c075612adab9af17a1ad4ddcaac7a5dfc407c1aa28392 SHA512 2fd8dce8787856955984d6396ccb9a57d4e7a255cd74f10b31a7d87c84fac80143c0067d76bf6d8c0ec1a55dfb7d1e90f4898706e8ae26ccdf657b38d88e6cd6
 EBUILD pdftk-3.3.2-r1.ebuild 1893 BLAKE2B ca3c168e1a446049c2430e71ec61530141e1a6a310a464efec1fe49a20a6fb048fcebbb2efe81e4593865dc7de97807ef34a2b3e9b0e8afa6246fcf49924879a SHA512 91a7dec0d586ee3863a936ca46bd54167bc875343dfe0caf3c4d7725b0c78b6ab846e0bf2cc8e41986b3f240f7ef1c9e056eb55e525ce81ffb5bb866a53c5d4a
-EBUILD pdftk-3.3.3.ebuild 1927 BLAKE2B 260a9db34f2373d0472ee336a5c49580ebe01aed757e178f4c3966c3f0535b2bca53713b4244d2a1ba05c5e962a1f1b1b8a7951d1b29f7dc50dd8d9ab0c13f68 SHA512 abd2bb9b19767d1ef131548a8326f3a4b96b76e9314368abd64aff5b8a3ca3ee52d4ed9e7369f0fd0f4452f09916c38c21a9556c9d7fdb84fc362b7c9acc1409
+EBUILD pdftk-3.3.3.ebuild 1926 BLAKE2B 6ba722118bc28b42436039d270844002fa75aad0bb927b22fefa683818a35b7dffc0c55d31fe23cb442cdf06085576d2ab743a0180f0d41e289c00a8dae41369 SHA512 4abc5b436f94a182b8a5d5c14377fe3fc314ec6c04845030b367596fa92328104543128c58134ca8baf6552e514f3e7676296f1786fc4cf96a2a924c0dd576c3
 EBUILD pdftk-9999.ebuild 906 BLAKE2B bbc5a168431ff4f4f8a51ee581c1dde06c3044212be071360168a7f192cf7f257fa3b0bf966cc66532763b3cbe5ac74fca56de276f8afbf17cfe49fa7a837a5a SHA512 312c2f2bfb40abc41c2b67f96ecb54b1cdaeeb083dffb2d395e5fb757e56b7b1d128850f64c6427a4066734a2cf33d29ebbf3841497cbc8a106edb1c305de55a
 MISC metadata.xml 349 BLAKE2B 3fd6e82540ef8da6c46195a90af4638d914e5f3f6a1e6f3e3dbf0bfb940f23ed7b26578185219ef1fd00f069bb38a308056a39edea7661e263ac523c3bd40a2e SHA512 364f75cc6a80de2e1d517b094c1073fab7fc10738182d1fb37f0723fdcfc5238704f905a0f6ec8e373e1a91f2a7ad0990891beb26f94010eab13e8f688d230ad
diff --git a/app-text/pdftk/pdftk-3.3.3.ebuild b/app-text/pdftk/pdftk-3.3.3.ebuild
index 111d9d3dc1fd..842fda08ceb1 100644
--- a/app-text/pdftk/pdftk-3.3.3.ebuild
+++ b/app-text/pdftk/pdftk-3.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/bcprov:0
diff --git a/dev-games/KXL/Manifest b/dev-games/KXL/Manifest
index 2504a8fdb333..19748c5b3c8d 100644
--- a/dev-games/KXL/Manifest
+++ b/dev-games/KXL/Manifest
@@ -1,8 +1,6 @@
-AUX KXL-1.1.7-amd64.patch 2919 BLAKE2B ec36f0f9baea78190f352400fdd2e6f0e2b146e9ecd84e5fc3681ed365e33f819b611eac90c9fe133403910b814eca6a62935d85c66e3b2997a0750f70717772 SHA512 540e56fdb5d1e2bd9f57d8b80ee79fc332a2439addccafd1c59ffcfd42f34718cf5c792c7255cd499ceeccc88e7149ee8960442310f59b02c07e84536533118b
 AUX KXL-1.1.7-as-needed.patch 232 BLAKE2B dad2a56c93247bdaa43aca7ad0484a6f24df59538b2edcf1cc67ddf639c20f86ed437c281a3e62da8322160633d5780b3cadfb7c8e016809e9b668322a3d7f7a SHA512 507c90c292b9b3c53316be03cb6a4f1c3d7ab749382ae6daa463672fc98ce0b54cba4e5595821f259fbb94e243d35bb54205a32eb41595f89b4810b4edea42dd
 AUX KXL-1.1.7-implicit-function-declarations.patch 389 BLAKE2B 586bfeb70cf1c60475f664a6e765fc85d299533576ae6c6c2a5da1213e3d15642677cb4814b8a0ea9f0ec5099ea8802efabf432a2174de7b4816a46e4bea8615 SHA512 8c207d5322d0d6026fc422e93228d1074cfb3b50fe7f23902617a6f5d2d649c6f2fc19ba5f6256827a5349b491787dfc99627e9d083064148f2e5e1abcdfcc06
 AUX KXL-1.1.7-ldflags.patch 162 BLAKE2B 61c7bd89e29c84ff9739dace1e6e8fa8c30b6cd3cf2f9e0fc1e1c9fdc86013aea28333a4ba343441e171e293603f351dbdc7e50e881b45428c98b27b1cc74127 SHA512 97a738ffe3a970b39172202f6d4f301fcc3705760b1cb1491484a95722edec88a7e7304cb9b17b34519bb56cab0881357d7783a02cc04a7ce823c995d07fa387
-AUX KXL-1.1.7-m4.patch 205 BLAKE2B a4ff3c1c5ab2fc159924248eb7c564b3b0c579ce03831d4b7601bf89b8d8205aa308d479d847fa4e66f3c025a8a182dfb4e4e1d224c42ab16bc763f30fbb6d9f SHA512 4c80ef4624ae37e3f8ddcef16ab7f84d2edb5ae0722b8737a08420ef718027dfa83c6b0c46333d7ebf1280fbcffc2e9a9b0161e71432b8fe8e545fc0c551c54b
 DIST KXL-1.1.7.tar.gz 192070 BLAKE2B 7f5256afaffe94cd5f6551d8f53b43e2d9512cf94dfaebb123205b55d83d4645e226bbed62bf5f0da909104d4e33d1da60c7e08c0ee527087a4793c79c117df2 SHA512 f3a9051b0e8916745725a2809097df07c59f8811f336574def7e479c992175d0bd49661817f9da35d122d291aff0bde5d4c27e5b17a3f09878e71b2c7a709adb
 DIST kxl_1.1.7-17.debian.tar.xz 178364 BLAKE2B 067f73a23b3bfd3c2fbdeb6c032d56444a3db68190a1a23cbe88f39767cea4ad1f16c641d24d12cccd6f3c480134105e85384d2f34b9bc0f4487d71faa975fc2 SHA512 ac2b8e919dcf3e1449df393aad9daf282b9954da6c2f43ff4cbb7bc073fd9ad660413ea09ea8cac480593fd2ea63ec2d176b338fa8f8a24b128636d5e3376495
 EBUILD KXL-1.1.7_p17.ebuild 1147 BLAKE2B f74095dd0b0e11137383e4de1b3a0af5c8290c5d06e57bb4e5281e36e88edfe2fbc1f5e8ac6866e25c1d75ed724398a4295ea2ffb78240f6e7f3b62bbdcd47ee SHA512 b16291671cb1e7fc2d2f686df757edd1b960dcdcb308a998e5c28b142526fc5066348136f0e658ed7428a8b9667934cd4021103de06e27c6aca22bb8fcfdd37d
diff --git a/dev-games/KXL/files/KXL-1.1.7-amd64.patch b/dev-games/KXL/files/KXL-1.1.7-amd64.patch
deleted file mode 100644
index 245e714abb07..000000000000
--- a/dev-games/KXL/files/KXL-1.1.7-amd64.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/src/KXLsound.c
-+++ b/src/KXLsound.c
-@@ -4,6 +4,9 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <linux/soundcard.h>
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <string.h>
- #include "KXL.h"
- 
- #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-@@ -22,7 +24,7 @@
- struct {
-   Uint16           ListCnt;
-   Sint32           ID;
--  Sint32           Pipe[2];
-+  int              Pipe[2];
-   Sint32           Device;
-   Uint16           PlayCnt;
-   KXL_SoundControl PlaySound[MAX_SOUNDS_PLAYING];
-@@ -242,11 +244,19 @@
-   KXL_SoundOk = False;
- 
-   KXL_LoadSoundData(path, fname);
--  // device check
--  if ((KXL_SoundData.Device = open("/dev/dsp", O_WRONLY)) == -1) {
--    fprintf(stderr, "KXL error message\nnot found sound card\n");
-+  // Open the sound device in non-blocking mode, because ALSA's OSS
-+  // emulation and some broken OSS drivers would make a blocking call
-+  // wait forever until the device is available. Since this breaks the
-+  // OSS spec, we immediately put it back to blocking mode if the
-+  // operation was successful.
-+  KXL_SoundData.Device = open("/dev/dsp", O_WRONLY|O_NDELAY);
-+  if (KXL_SoundData.Device < 0) {
-+    fprintf(stderr, "KXL error message\ncould not open sound card (%s)\n",
-+    strerror(errno));
-     return;
-   }
-+  fcntl( KXL_SoundData.Device, F_SETFL,
-+         fcntl( KXL_SoundData.Device, F_GETFL ) &~ FNDELAY );
-   // create pipe
-   if (pipe(KXL_SoundData.Pipe) < 0) {
-     fprintf(stderr, "KXL error message\npipe error\n");
---- a/src/KXL.h
-+++ b/src/KXL.h
-@@ -205,6 +205,7 @@
-   KXL_Frame   *Frame;    // Pointer of frame structure
-   GC           FontGC;   // GC of font
-   XFontStruct *WinFont;  // Pointer of font structrue
-+  Bool         DetectAutoRepeat; // Does the server have detectable auto repeat
- } KXL_Window;
- // RGBE palette
- typedef struct {
---- a/src/KXLimage.c
-+++ b/src/KXLimage.c
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include "KXL.h"
- 
- extern KXL_Window *KXL_Root;
---- a/src/KXLvisual.c
-+++ b/src/KXLvisual.c
-@@ -1,4 +1,6 @@
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "KXL.h"
- 
- //================================================================
-@@ -364,7 +366,11 @@
-   KXL_ReSizeFrame(w, h);
-   KXL_Clear_Frame(0, 0, w, h);
-   // Auto repeat off
--  XAutoRepeatOff(KXL_Root->Display);
-+  XkbSetDetectableAutoRepeat(KXL_Root->Display, True,
-+                             &KXL_Root->DetectAutoRepeat);
-+  if(!KXL_Root->DetectAutoRepeat) {
-+    XAutoRepeatOff(KXL_Root->Display);
-+  }
- }
- 
- //==============================================================
-@@ -377,7 +383,9 @@
-   XFreeGC(KXL_Root->Display, KXL_Root->Frame->Gc);
-   KXL_Free(KXL_Root->Frame);
-   // Auto repeat on
--  XAutoRepeatOn(KXL_Root->Display);
-+  if(!KXL_Root->DetectAutoRepeat) {
-+    XAutoRepeatOn(KXL_Root->Display);
-+  }
-   // Delete font
-   XFreeGC(KXL_Root->Display, KXL_Root->FontGC);
-   // Delete window
diff --git a/dev-games/KXL/files/KXL-1.1.7-m4.patch b/dev-games/KXL/files/KXL-1.1.7-m4.patch
deleted file mode 100644
index 40b2147a49df..000000000000
--- a/dev-games/KXL/files/KXL-1.1.7-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Get rid of aclocal warning:
-/usr/share/aclocal/KXL.m4:6: warning: underquoted definition of AM_PATH_KXL
---- a/KXL.m4
-+++ b/KXL.m4
-@@ -5,3 +5,3 @@
- dnl
--AC_DEFUN(AM_PATH_KXL,
-+AC_DEFUN([AM_PATH_KXL],
- [dnl
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 2e38399aa167..020ac00907c9 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7b80d5f4c52c..a4e7c6a9c5b0 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/fishbowl/Manifest b/dev-java/fishbowl/Manifest
index 5852f0efe5c4..fc98290d7c17 100644
--- a/dev-java/fishbowl/Manifest
+++ b/dev-java/fishbowl/Manifest
@@ -1,3 +1,3 @@
 DIST fishbowl-1.4.1.tar.gz 54572 BLAKE2B 75adfbbdf8c2d48ba6ca52d223f87d840e938514183f01bdb6b505a9cfd3485414d32d63f8f1cfc303c3a431c32e1accc9d319003f82b84016a621c8324f70b8 SHA512 9040bc8bad19457a828a88cdbe448ecbb6af6af279db58a4447670cd8a32cacf30d01ea0bc6614f75e3bfd6bf73e0bce06f33014d22e9963fd9e46fbcd2c94c9
-EBUILD fishbowl-1.4.1.ebuild 2044 BLAKE2B 244c9e6b05f7849d3bf829dbaa1c2e981f08703690fb39de134a37d255609a2c6a43a1a4561f10e388343e828ed3f90e631fc3b3c03470a53b5eed93a86fc22e SHA512 0ed60447289399c0fdd1eef9e9cd9980e6bc6832d953cb287178e323a932853c1d5e5f8581249d1709e130e570d3c5aab0344d299088f65818db51eeb6cfc47f
+EBUILD fishbowl-1.4.1.ebuild 2048 BLAKE2B 99535d76b15a4d5caca179706e417c75c553de1fe249bf1b2fe75b5c8c95b89ae9811b289a8f902803ff21ae45d0c3e329f6bd7bff0dc37f479feeb6b248f36e SHA512 c30517402403c024dd6e591986629b137a570c0adea08108f1d132fc8beead7d310593621786245ca2fa0092f23efef63dc7c72ec445d96cc434a8bdae631c7a
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/fishbowl/fishbowl-1.4.1.ebuild b/dev-java/fishbowl/fishbowl-1.4.1.ebuild
index 69802cb81f42..a00f47a95146 100644
--- a/dev-java/fishbowl/fishbowl-1.4.1.ebuild
+++ b/dev-java/fishbowl/fishbowl-1.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/stefanbirkner/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/logback-core/Manifest b/dev-java/logback-core/Manifest
index 67d890b848a0..ec4ac7b676e9 100644
--- a/dev-java/logback-core/Manifest
+++ b/dev-java/logback-core/Manifest
@@ -1,5 +1,5 @@
 AUX logback-core-1.2.11-Ignore-test-failing-under-Java-16.patch 799 BLAKE2B 5ed73567f9ef6f6fb08c1f9d6fff43e71a22760a31bddcc454a75c62d26b50bad46510f6c748c019ab90e69e6e6007ee3de2507104f956b4c24b658716a6b6ed SHA512 5214fab891a28e02b6748a307e1741207c16dbf0f9fbfcef86f1303c2ab15714348a1f1750965ee928ed422ffa7261f0bc7340756805ba196fe86dce66039ae5
 DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
-EBUILD logback-core-1.2.11-r1.ebuild 3484 BLAKE2B 70c1f1dffb64becdbd358f31f62d7b06043eab4a026c75dc321ad5940602ee18ba824d78f35656a0ad204c36afa78f0aac1aa7a9d75ae44e0956a06e2a8b5e78 SHA512 d60bd3576fb3978facf4e5eed7d98e85f9beccb551c97e095e1c93040b31fbafbffb2bf09e7c02af39d97160513caf5f9f12e440bae3f7f6041b7e702b8eaa6a
+EBUILD logback-core-1.2.11-r1.ebuild 3482 BLAKE2B 40590d0ec60cf62a6a4c64e34c68c84077a0917d18aa944dcdb835b97a585d2fc6cc30e80bf8966fb2e046baa1d4172b02576e8d610edf58f1e75a0dbee7e9ae SHA512 8e6a348b53c6b2ae9230dd8958b68f57e8a3dc7f05903f75b0c407c6b700b2e437ac925ef515d35963b33f99d5c1f0ecf576a745cc65ff456a096277276b08f4
 EBUILD logback-core-1.2.11.ebuild 3571 BLAKE2B 1a57d13feba258d96db96f632056abe972f464cf2194a996b8550681a7b09896c8e80ddec34b660cd9239809567a360b53b6ebc7d6e7ef284785a673dff364af SHA512 f45a45c16eb7297b9f15bd68233715c36ec4c683e672d8c74ce3ff2c9457a1aacef857661506e60752cf6dde6ad35156684b5483c5b679ff89238b9ec4e52b2c
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
index a1ee6e640a7e..db5f39ce5ef6 100644
--- a/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
+++ b/dev-java/logback-core/logback-core-1.2.11-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 503c37e50609..6e915a0a9bd6 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,10 +1,6 @@
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
-DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4
-DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c
-DIST protobuf-3.21.8.tar.gz 5113425 BLAKE2B 35bea4b6dfa8fbad543989e91834dc58045307ade30d9427749bb95fefe2b05fa687d898500af1eba951bb9684d6ec93ded4ef721d5d46278ad09013d9475210 SHA512 a9e3ff6fd4b5f4bf86ac58c9b0a35010e7069def08783c0aecc05cc0d6e38f04a1af6b6ad61191c3d3348c1e5e44062f63ce1377141ebbd10f122101ef089088
+DIST protobuf-3.21.9.tar.gz 5112917 BLAKE2B 1788652e89ccb77feeaf2a3f4ce8e8554b29c1bccf3f58d79c66f3e5f080659a9b7eb4f2b4a07ce640549749f376deaf725d20e19674348b5bce9168aad5d095 SHA512 d54843a4ed66edf6cab7262849216b909313d70e9758aa7f00d02902c576396f0a77bb224fe2ce408da37aefaf7da9f568dea7bda4e397fc1e3666c8aaf9cb0f
 EBUILD protobuf-java-3.19.3.ebuild 1451 BLAKE2B c0bad09302e1e52cff018223c055939e2d4335874f2be95e913705368926106c6967b5a98d7f0a392037060c040fd3116210f0d1de567dc17e66bfc252202e4b SHA512 a74e044d91db564a682f8d9b82fa73608fc10f2b0a917b1eb696375f5993e62cf03289a31b7e28aa27cbfdf027bf62160083ff39186d1f8333b52633ba5ed0fb
-EBUILD protobuf-java-3.19.6.ebuild 2852 BLAKE2B b131c6753d9af1c5038d449e40476455256905f323cad1eaa9c0378e5b0aaf132e11dec4e2622e5f51edc2952e1ab6de2de25cd0b8d5e5d205b7be9ae3c56a75 SHA512 2b5c46eab2b9b9fa398cdfbb4a2bb12a7f0dcdce4a977b9bc63a955a54283da548f8921231349a89442d7222708afb803335518bafe2ddd6f424e7fe5866dc2a
-EBUILD protobuf-java-3.20.3.ebuild 2852 BLAKE2B c214278702be2c18ff5637fcc80171f34b8993a0369e6d01a142c365b53f281a81cdfbe4b834f7a58a1502608fc0a3b672a4c975d73be7a24b999d7ff56bb878 SHA512 ea67fa3fc66d97bcd6e95621c79ba7747a396d48d68689715a23c1dbcd03d71e4e2897a4d7418b49152af94c43f69876ce31b2e866647b037faa1e7dbeeb75e1
-EBUILD protobuf-java-3.21.8-r1.ebuild 2121 BLAKE2B af50f4473ace2e4aedda37ff86c86efb831774ee51edeab55b6dbcfa105d8c7944f3e25ac7eb6aa751737d52eaccfd6cdc807a81fc94378f83c0cea2e5c7b02e SHA512 d8a272f5ea23648b61145a93716c59d6ba3eafa6b30d6ee02e75a64c382462f98276062ff37ed1f8901a0e6a4a3d794d98f9b9aff4936c1a7ff4c9fa278a1438
+EBUILD protobuf-java-3.21.9.ebuild 2121 BLAKE2B 8aeb2736d4c6792c9d1501a5eca3109c0c52ead3d23b91bf1ca2ed2418b879e0161f6602e4847bd28d6c7b3264e0835897f146dbf51234275145264906a8d74b SHA512 c98b04131dce5437c0b3e258046141266a0f4d6852e018adde7494adef0973d7466208cbfbc8895a53cfce595cf45620d8f62155454e0aff6735e21a0c5afed4
 EBUILD protobuf-java-9999.ebuild 2995 BLAKE2B e1538e1a635ba897a9c2f75db235384cb4122c4390ed8bab3a9f46c57f74b1db58ef54e6df65e328df6458067e6b671b3dda4a08226c94e9929388aaa8efe386 SHA512 94b01edfaee931cc4a5944940429e89cf8837f74c25efe026c3ad7fb3a637da21f794b68d7fda90e9bbef58251bab3f3b0271fc4a50ea29c4389578fa3597e16
 MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild
deleted file mode 100644
index 6adff3a717e4..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:${PN}:${PV}"
-# Tests not enabled, depend on com.google.truth which is not packaged
-# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/pom.xml#L35-L40
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-PARENT_PN="${PN/-java/}"
-PARENT_PV="${PV}"
-PARENT_P="${PARENT_PN}-${PARENT_PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
-			-> ${PARENT_P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="
-	https://developers.google.com/protocol-buffers/
-"
-
-LICENSE="BSD"
-SLOT="0/30"
-
-S="${WORKDIR}/${PARENT_P}/java"
-
-BDEPEND="
-	dev-libs/protobuf:${SLOT}
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="core/src/main/resources"
-JAVA_SRC_DIR="core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_RESOURCE_DIRS="../src"
-JAVA_TEST_SRC_DIR="core/src/test/java"
-
-# Same than PATCHES but from repository's root directory,
-# please see function `src_prepare` below.
-# Simplier for users IMHO.
-PARENT_PATCHES=(
-)
-
-# Here for patches within "java/" subdirectory.
-PATCHES=(
-)
-
-src_prepare() {
-	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
-	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
-	eapply_user
-	popd > /dev/null || die
-
-	# Remove bundled jars
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-
-	# There is also compiler/plugin, but not in this list because in a subdirectory
-	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
-
-	# Copy resources from ../src/google/protobuf according to
-	# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/pom.xml#L45-L61
-	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
-	cp "../src/google/protobuf/${core_protos[@]}.proto" \
-		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
-	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
-
-	# Generate 146 .java files according to
-	# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/generate-sources-build.xml
-	for proto in "${core_protos[@]}" compiler/plugin; do
-		"${BROOT}/usr/bin/protoc" \
-			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
-	done
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild
deleted file mode 100644
index 2e58b824d118..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:${PN}:${PV}"
-# Tests not enabled, depend on com.google.truth which is not packaged
-# https://github.com/protocolbuffers/protobuf/blob/v3.20.3/java/core/pom.xml#L35-L40
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-PARENT_PN="${PN/-java/}"
-PARENT_PV="${PV}"
-PARENT_P="${PARENT_PN}-${PARENT_PV}"
-
-if [[ "${PV}" == *9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
-	EGIT_SUBMODULES=()
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
-else
-	SRC_URI="
-		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
-			-> ${PARENT_P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="
-	https://developers.google.com/protocol-buffers/
-"
-
-LICENSE="BSD"
-SLOT="0/31"
-
-S="${WORKDIR}/${PARENT_P}/java"
-
-BDEPEND="
-	dev-libs/protobuf:${SLOT}
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="core/src/main/resources"
-JAVA_SRC_DIR="core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_RESOURCE_DIRS="../src"
-JAVA_TEST_SRC_DIR="core/src/test/java"
-
-# Same than PATCHES but from repository's root directory,
-# please see function `src_prepare` below.
-# Simplier for users IMHO.
-PARENT_PATCHES=(
-)
-
-# Here for patches within "java/" subdirectory.
-PATCHES=(
-)
-
-src_prepare() {
-	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
-	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
-	eapply_user
-	popd > /dev/null || die
-
-	# Remove bundled jars
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-
-	# There is also compiler/plugin, but not in this list because in a subdirectory
-	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
-
-	# Copy resources from ../src/google/protobuf according to
-	# https://github.com/protocolbuffers/protobuf/blob/v3.20.2/java/core/pom.xml#L45-L61
-	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
-	cp "../src/google/protobuf/${core_protos[@]}.proto" \
-		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
-	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
-
-	# Generate 146 .java files according to
-	# https://github.com/protocolbuffers/protobuf/blob/v3.20.3/java/core/generate-sources-build.xml
-	for proto in "${core_protos[@]}" compiler/plugin; do
-		"${BROOT}/usr/bin/protoc" \
-			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
-	done
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.8-r1.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
index ca47eee3e7e2..96fc4a9564e1 100644
--- a/dev-java/protobuf-java/protobuf-java-3.21.8-r1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.21.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:3.21.8"
+MAVEN_ID="com.google.protobuf:protobuf-java:3.21.9"
 # Tests not enabled, depend on com.google.truth which is not packaged
 # https://github.com/protocolbuffers/protobuf/blob/v3.21.6/java/core/pom.xml#L35-L39"
 # JAVA_TESTING_FRAMEWORKS="junit-4"
diff --git a/dev-java/system-rules/Manifest b/dev-java/system-rules/Manifest
index de5a219362f2..1e61c95c1ba2 100644
--- a/dev-java/system-rules/Manifest
+++ b/dev-java/system-rules/Manifest
@@ -1,3 +1,3 @@
 DIST system-rules-1.19.0.tar.gz 76900 BLAKE2B a9f9be08b930632a72af0ee851f17da875d42a08c3187b435c06dd5553afb629e41d06d87c423fecd7ea665197be19a53955e9880617aff7175310bcc2b2735d SHA512 6238a9673456977f6a2bc129f30849460954816bb4e1927f37b9c5b01f322d966c77d5a4eda9e1f0f24e51879d1946d0e121e5432b809793a9b95cb49ee35bdb
-EBUILD system-rules-1.19.0.ebuild 1720 BLAKE2B 3a6f8a289dcb1bf68f223fb44b69c74f9b2d274677f3f163425982edcd2d6d0e6d704897b891d24a2ebf3ad492106f629c7f895759cdf9c30afa3653288520d9 SHA512 0de6e10b5278cda33bc1fc0c21a8080c4670eb4a6a82dd28b552620ce409ff8d18fd96240d3f96cc399e509b1726eccfedb12ced3e724590d88423fd3e2f88e6
+EBUILD system-rules-1.19.0.ebuild 1724 BLAKE2B b65be3de14ac544948cbd9db3723cacf5526d31a108f96d3c3e16d6c0d4939d9fe923659f5fc30a72ca3ec39fd68845afbcf56c2979f84e8dbaf37d5a9bc0e08 SHA512 bd84983110430dadc48b36fd65509e6dc0663b062ab837beafb7551ac0305ada6e5bb4c2bd8b2c1163263414b02fd1386ebed9dbf301c9f8981d061b0bf12260
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/system-rules/system-rules-1.19.0.ebuild b/dev-java/system-rules/system-rules-1.19.0.ebuild
index ba6453642e38..c87c5005b7ab 100644
--- a/dev-java/system-rules/system-rules-1.19.0.ebuild
+++ b/dev-java/system-rules/system-rules-1.19.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/stefanbirkner/${PN}/archive/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 451a7a996231..17cae0c5002a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -27,6 +27,6 @@ EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf
 EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
 EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1328 BLAKE2B 385d32707719ae49dff0255a2a5a432adfdd02ab57467c2b71e7edf70bcd6f502c30707e3a02ae80d243fa9453bcd4b6da0345a1f462b28a40c58aa3097607bc SHA512 4b22424585b88d442cf0441a810752d1dc8243d23cac139ab5259393a522a342d340b376e0adab288e6520732bad221950063c0b76eff7b165387b08c62ab254
 EBUILD tomcat-servlet-api-9.0.65.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.67.ebuild 3011 BLAKE2B 9477cbd5985e55341e649f23edb358ade6923649c3eb59977243bf940f002065e3d40fb1ca3c5af092aa031157fa36fc2536d1053d56201d69e372c69beb908e SHA512 757721976e9795a360b2516e04a70a0280faa2595a43a63817ed3aed20932d1fefddf63648debf717a37cd79e7fe85a73fb626da2435e276c856a6a9001aa688
+EBUILD tomcat-servlet-api-9.0.67.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
 EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1168 BLAKE2B 772b7aa6f72ba5aa6534e8e866c167864415c780e431c3304413abdfb0f568630108c8ab2bbd388edcc4e88ed816de8992d341bd7a42823ca311ff43761c9fc1 SHA512 070aedbac428440cfe68810109c5a598fcb9ccc8a6a3cdf205f15e5769f91809c75a2ab6c3cb50214dcf6289b4a5b9f0bcfccb5901ba5d6684771caf2e5e8c79
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
index c53c20eb8511..f1c865a27bec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8008e8e1efe7..2c4f84579f82 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 1f820394dd49..68e9407a9fc7 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,5 +1,6 @@
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
 DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b SHA512 00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8
 DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23 SHA512 faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab
+EBUILD libpcre2-10.40-r1.ebuild 3018 BLAKE2B a665bd650956f6fc81932f9cda52796832db7fead4fd1ff1c0be900898af573a1eaa7b8305600e2aa27d019c4c13b34b6c306e47d63136f55d53b9ed206bcf89 SHA512 43c58d18ab5e4762ca0124acf45a70a8d04b2ad9d57259043950915cdef04e21568c5b32c167c63cf6a808d4b1b15ff72263e5d89c80d3e5fef7b704a1915789
 EBUILD libpcre2-10.40.ebuild 2978 BLAKE2B 689d60aabd0b0278816571add95ddfe47b914d1bf7d55736ae8d0db8a46d7db788c3c61df5eae827f1eaec54389cb5d6dd0ff6e0bd2941f4a2405cb76b422cc4 SHA512 375fca4b0b11d8aba628e0ce86d87c3f7bb3b99faf63b63364eb9efc6a04910db2f11b216368456aaeb0143f0fbd64ea1e59f8061e12dfd53260172f9f6b169d
 MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460
diff --git a/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
new file mode 100644
index 000000000000..552ef634d931
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/philiphazel.asc
+inherit flag-o-matic libtool multilib-minimal usr-ldscript verify-sig
+
+PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
+MY_P="pcre2-${PV/_rc/-RC}"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+		verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )"
+else
+	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+if [[ -n "${PATCH_SET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:= )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-philiphazel )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	if [[ -d "${WORKDIR}/patches" ]] ; then
+		rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die
+		eapply "${WORKDIR}"/patches
+	fi
+
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_test() {
+	emake check VERBOSE=yes
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 42fa37bc5702..289c7277c8a1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 5e51b575d429..53052eb8929c 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -5,5 +5,5 @@ DIST uvloop-0.17.0.tar.gz 2279973 BLAKE2B 7ccbf3b8e723e36c1010a70e256de0ad1a9728
 EBUILD uvloop-0.15.3-r1.ebuild 1393 BLAKE2B 025fce332c25bb7e1fb1188ad9257a8d807da11c71a3b6bcf02b3bcdb54b22b0522cbe0ebf3ee7a2bacc90342d6820ea6952473e45baf9dd92e7638dc1a545ae SHA512 b6e13f27b6b06046c133c0af0d55a03a211c5a56cbf8eb37fe8f6b33b4e8a3440f2353f50485dfe415145f0c17b1b6f24329d5fa16524d86baae68cba3ab4a64
 EBUILD uvloop-0.15.3.ebuild 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
 EBUILD uvloop-0.16.0.ebuild 1418 BLAKE2B 5ee1d50ac599e891886a6a2b9e72a93a2e0da3d327cb6d645e01b0ee02ddf05c5ca3a941144a5b98af6618c313dae561a5903f2099be11de8b82044d7d386014 SHA512 9ca8fadb5a77f5888479828f225b378c9f501e2fa520a646cfa46c7b44cba8981f846d9862c983fffadb0db7e7f2f7d33656a665d95ee8fff1e391e8c73266cb
-EBUILD uvloop-0.17.0.ebuild 1843 BLAKE2B e5c5f751d69dbd6e65896956d924fc76ab82f6ef2d0646867bcefbbf6f08ce9805381fcfe1e83668525c3deded1e1488d56219132465d5e20b2e311ccfe1ce81 SHA512 f31a077473e6f9da18b0e69bafb1c8a7b4cd832151ff0c37df14552e6781dc50e9dc41edcc3fa444610617a1ab2159f542a0f04d192783b3fa198c3392c11a47
+EBUILD uvloop-0.17.0.ebuild 1842 BLAKE2B adcf5bcefe09bccca8d35adda876393d3068c20e9b51a0f9bc21fc4ac2d1cef753bba15dba5bcf785b95754d53205f0701d4e821d0bc9fbde500b7d54a12632c SHA512 6e5eedc5495201f54250e44ac80d61589cc9f828df8b97f8234a42e2a7a0cb9a19c72c22279aba8bc57b5088add1f99f2c4ce153c36321d21ac516a63f1d7810
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/uvloop-0.17.0.ebuild b/dev-python/uvloop/uvloop-0.17.0.ebuild
index 8435741ffde1..8efb2708540f 100644
--- a/dev-python/uvloop/uvloop-0.17.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.17.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm arm64 ppc ppc64 -riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 -riscv sparc x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index de47d6703f7d..1c5cf5238111 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 6455d539617d..f50197b8fc1f 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,12 +1,5 @@
 AUX android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch 5109 BLAKE2B 4deee34669ce000050d04cf01040920a22ca0caafca006ff2651198a60936dce9e8f783263b05beb91bef8c015e14362725aa4dc23c32be30c6796ad20e69ad7 SHA512 4b8afcf5290be113d98572a9a1ad5309c8bf75f0c17aed2f698d3302f796f8fb7ead3422d649c4909019cf766ae16fc0d75401fb15eb42130e58b451d628af21
-DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27e2995a11b27e2e1501c5e881d694c5477a216cb910bf1c9c1bf9f9fedffa864748ea4df668a1008124501f7815997304bc355e4ee105bf9b61f75f SHA512 db626d3680ec9f18be394bb2720c8bc7e380aac227ae6f1058476edb83784343f653afc583b06e7a2acd3f2ff500fa37d613d5efca4a9a24daedbf61b5b84015
-DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
-DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
-DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71
-EBUILD android-tools-31.0.3.ebuild 2207 BLAKE2B 075ba2bcbf2f30b9c3804be39c3b67397634e69baf1572096f32a3f0d927fd35526246ef2e4590dddf92f71350bc172bf58c1e70107cfbde015588ada9f90509 SHA512 57d1e597562ab7688f5715635b6c4f86e7dd5b8b00fc120793fd7a047924f647f9f4725e86b93afb0648c8c8c086cca5a7eeea56a90a2636d23fcf571daccde7
-EBUILD android-tools-31.0.3_p2.ebuild 2157 BLAKE2B 3f7738ccabc27a7b54f30f533613aca897efb4a70cae04a999a586320d42711329cb4521f5da8f19a6b091c72104aace5993fe74b04057f8a00e3f8269ed9436 SHA512 4b6621928d031ee07f0517b882cdd8f37a833aa5f2b398f7a40df6e4ba13b9c030c300f620daef43143f0573aff0ba955d8f59a5ca3d8475395118592add7fbd
 EBUILD android-tools-33.0.3-r1.ebuild 2318 BLAKE2B 1d6f81a308ff293f657f9cf6234762ddf738089a0bf0241b5611c1b7b5fa974b5fdd63a5ccc493327c9783a3844735425cac43c70ff56e4cf271d59f742100ac SHA512 21c63781748f517abd7ab6fe638f96197aedb658cd48241145ffd730c6ba5f4b96e6cac04b626101270af18bf26df54560f3a5244023bd7d416d32ab85c2c2ea
-EBUILD android-tools-33.0.3.ebuild 2159 BLAKE2B 8adf5dfb99fd6d2c68d6073cbd8021829212540520226aa8070cbad13aa5d5ce18d1c0cd37b36b4fa835a5988800fc39c453e114cf5c73e031e2647f826edf98 SHA512 d55b55fe5b07e2b758c29d06c25236a3ef2922397ee87bd509b9ad4c5e1f7d5818ff4f2620dfd2fd095e6cf64ad2a87b763b1efa0f13e1d24f1bf0ef5b0e4914
 MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75
diff --git a/dev-util/android-tools/android-tools-31.0.3.ebuild b/dev-util/android-tools/android-tools-31.0.3.ebuild
deleted file mode 100644
index bb938d9eeee1..000000000000
--- a/dev-util/android-tools/android-tools-31.0.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://dev.gentoo.org/~zmedico/dist/${P}-no-gtest.patch
-	https://dev.gentoo.org/~zmedico/dist/${P}-install-e2fsdroid-ext2simg.patch
-	https://dev.gentoo.org/~zmedico/dist/${P}-disable-werror-boringssl.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
-	app-arch/brotli:=
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libpcre2:=
-	>=dev-libs/protobuf-3.0.0:=
-	sys-libs/zlib:=
-	virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
-	eapply "${DISTDIR}/${P}-no-gtest.patch"
-	cd "${S}/vendor/core" || die
-	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}/vendor/libziparchive" || die
-	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}"
-	eapply "${DISTDIR}/${P}-install-e2fsdroid-ext2simg.patch"
-	eapply "${DISTDIR}/${P}-disable-werror-boringssl.patch"
-	cd "${S}/vendor/boringssl" || die
-	eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
-	cd "${S}"
-	rm -r patches || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Statically link the bundled boringssl
-		-DBUILD_SHARED_LIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	export GOCACHE="${T}/go-build"
-	export GOFLAGS="-mod=vendor"
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
-	docinto adb
-	dodoc vendor/adb/*.{txt,TXT}
-	docinto fastboot
-	dodoc vendor/core/fastboot/README.md
-}
diff --git a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
deleted file mode 100644
index a67df1447ce7..000000000000
--- a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..11} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
-	app-arch/brotli:=
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libpcre2:=
-	>=dev-libs/protobuf-3.0.0:=
-	sys-libs/zlib:=
-	virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
-	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
-	cd "${S}/vendor/core" || die
-	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}/vendor/libziparchive" || die
-	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}"
-	rm -r patches || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Statically link the bundled boringssl
-		-DBUILD_SHARED_LIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	export GOCACHE="${T}/go-build"
-	export GOFLAGS="-mod=vendor"
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	rm "${ED}/usr/bin/mkbootimg" || die
-	rm "${ED}/usr/bin/unpack_bootimg" || die
-	rm "${ED}/usr/bin/repack_bootimg" || die
-	if use python; then
-		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
-		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
-		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
-	fi
-	docinto adb
-	dodoc vendor/adb/*.{txt,TXT}
-	docinto fastboot
-	dodoc vendor/core/fastboot/README.md
-}
diff --git a/dev-util/android-tools/android-tools-33.0.3.ebuild b/dev-util/android-tools/android-tools-33.0.3.ebuild
deleted file mode 100644
index 412e78a5f808..000000000000
--- a/dev-util/android-tools/android-tools-33.0.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
-	app-arch/brotli:=
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libpcre2:=
-	>=dev-libs/protobuf-3.0.0:=
-	sys-libs/zlib:=
-	virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
-	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
-	cd "${S}/vendor/core" || die
-	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}/vendor/libziparchive" || die
-	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}"
-	rm -r patches || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Statically link the bundled boringssl
-		-DBUILD_SHARED_LIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	export GOCACHE="${T}/go-build"
-	export GOFLAGS="-mod=vendor"
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	rm "${ED}/usr/bin/mkbootimg" || die
-	rm "${ED}/usr/bin/unpack_bootimg" || die
-	rm "${ED}/usr/bin/repack_bootimg" || die
-	if use python; then
-		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
-		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
-		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
-	fi
-	docinto adb
-	dodoc vendor/adb/*.{txt,TXT}
-	docinto fastboot
-	dodoc vendor/core/fastboot/README.md
-}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index b93e52726c08..8e50ce57847b 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -27,7 +27,6 @@ DIST camino-1.1.1.crate 30737 BLAKE2B f2403e2f3c4c66f14c298faf582d5ce4f3071be62e
 DIST cargo-options-0.3.1.crate 6294 BLAKE2B c5d0c10450bee5bcb1ce40b998150572a27ed70076870a5beca7471b3a728426a2a28ef8de4aa472103df80cadd43e0edd567c1e2268b656468f5f4b59b7c7c9 SHA512 8e710ccd23bcc3570bf05f7234eb76f8cbd5241b3a53daaa2634f2d56ae5e25488b4807d06ca65822f7fd368171eb83a8e005c396b817bf9330892be8a65d6e9
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo-xwin-0.10.2.crate 24964 BLAKE2B b499bfd7c269f96b72c63d6b809df2bfab1df5375f36274b6d82a0b74e2e85fe7272ae208cba23f6d668cbf74ca5f5ba2670e421f37b58f5dc9c8afea0e1dd85 SHA512 f8e3c9aab75f96e63460710165bc8c7f4c01c7efa13288967a54057c940937f62715e709222d39823530944f785e9fb7291e3a060d591c6635d7bfdd6c2ba164
-DIST cargo-xwin-0.10.4.crate 25079 BLAKE2B 3265f3de465775abdfda124a1677956b1db4f94f1c7fd082d2e0d470d3621e41f79647788cf2a9fea6c12bc08e95759c2f889d4bece38c86c0771a238c0d58b9 SHA512 838aafdf4bd40d37d8e6f55a9fc8c737ee3c6e5be12d9d1320d8e0fedb5acbe762bd9eea16e854ed6d1b1dccc1de2f2be339f7ff683ffc2db37ee347c0e1f5af
 DIST cargo-zigbuild-0.12.3.crate 25984 BLAKE2B 4b73ada9094cb7facdd28fb7a5cb54ce17b74090c984e410be6b0a8120397049049a62818c9fa94d3d38057ac70ee65052b3edcb5b4e0cd76b0c2e9fde1f0972 SHA512 8ac0d21017024133ba53dd839471cf15de671215c5eb5bdc99863dbf6ee08c0a6c49cb843e57fcd392e84da3a854ac4953136d360fa2e0b3eb4ff47a2c25dd57
 DIST cargo_metadata-0.15.0.crate 17634 BLAKE2B cb6dceaaaf4f4a4bd339b429c4e45730ee018f947a560a468682bd4e9a09949a625b96f713d5b2270a6609622c1992def8145850a7d82619cc5120c3be304f5d SHA512 cbeddbccc8f7578b34976ead3076c8db66d20d5681affa81ed583ad8c84ebb5d6a3b8a40e3c42fd1667aacc9d0829f928e210f3f451e636a2b5732cae17cae1b
 DIST cbindgen-0.24.3.crate 195698 BLAKE2B f5c65e9c77a7c2f98a44382a6e4b852071b70bd832a3da3220bb8a7c4729a44b5964e651cd63577f555c5bf4e6594b1148a5afd96dc1d3f599b2fd1d523b54d4 SHA512 3a39be67a87aa7a4dd9baaf6b803215f4587bd7925c4315c5ec93954e021471919fa977ad2084f099c606daa392350de3557bba56cef77806def99c40318ef05
@@ -37,7 +36,6 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b
 DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb662275799f34159dff9c22ca61a71d722f199ed36b2fadebde30b5763cc01d87bd6f27e70ff8ad357df10d6ddb652a8 SHA512 61166acd4fba3330c4c71e101e1993717baa448d91dd9773f7d58ac504fa4025322560ce82bd7de1b5935443f96ba84691658e5c982192196b325f52dc48f4b1
 DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
 DIST cipher-0.3.0.crate 12756 BLAKE2B a572b0140512b7512d496f2706cdfaedb680d47a283e3db8b4be97418585ed988929a3beed44012e8a9d9728cbc21f00b78bcbe376bbf57614d54ea07e4daf4c SHA512 8f0094c7786160730825cff21ca838f52801783f1f4f66755b0771595963b8b99fc926265ff502c66b94a2e6703d592d42bbed96ebf8d3a690bd5e731f0f5c4f
-DIST clap-3.2.21.crate 218792 BLAKE2B 73ba5a9581329fee3fc8d68ccde39d64cf2f7da99a03cfdcb7b66e4350c819632deb7773dd383318749d7e5d18de408fef915a866d8ed1ef37b61dac8d92e51a SHA512 425bfd4bb4893f1d6ec031acb53edb9da5884742262e368d88fc536bad7d315b780c71565fae31f0b96b90366836d64eb1f89a20f763d6b400a7b7cb4d7d8e80
 DIST clap-3.2.22.crate 219438 BLAKE2B 32e256ba1a4257f5b49681ed5b71f0c79b6fe0c5f6eed72497050368a010a91b4d618ab529cafad54b0e78a6628c6dc5bb61d0baf59c4508557e5d8395f0032e SHA512 fe067057753c351ae5c2fbe78ca83588642faf2eea8d30c08f9d7b5bdc4f3c732349f1b6e1b0de88932049d1c8644771a09d9e592827b297c75de8061268a241
 DIST clap_complete-3.2.5.crate 31625 BLAKE2B c76baef63d773b81eb4d8d953da4a94769b618da45fb0f13fb9d6c6738b67ccdbd58ad2b5361bae99705fd2b7aadb520d6e7f4d258d872971e0e308a36900965 SHA512 c26d6c15a0ab44720cd7a5979dd4c66a9171082b99c04cda10fe4f6dd9a1405f8ca9022c344d03d7d2af7788bc28be033c9e2311f6879993901773176783f61e
 DIST clap_complete_fig-3.2.4.crate 10205 BLAKE2B 372d1a26d4535efbe7e1d7e39f43938a742f2d88213c01e73098eaf5a35a91e58748b491b4a566bca76f2dbbd983f489f774f67961496932c50c26570ca6651a SHA512 ca5e00895e334e447a12c66108b284fe835eab101ca7c3b014d827247c7ab1d56ca06de3bf82a3cf9213b3011786dd97fbea31ef23772041d2d53ad3ab2375aa
@@ -47,7 +45,6 @@ DIST cli-table-0.4.7.crate 13195 BLAKE2B 498e7434639a4bf21f4b793def59e2f045f8353
 DIST combine-4.6.6.crate 132428 BLAKE2B fb52e724a52f1a551255591fedc134178080ea5efc0c488efbc369e6272f7f2b87dd7d0ce63361754d8ff0cf1b0a59bbc7b0396c50c53210f3e2c28ac965e0e6 SHA512 ff9ef9329de2cfc103271a25ad1fcb7e478f3328843bd8a65653e80b74112728ad4a33326a58ed7ef8cf39eec7c3b797fc287295ba149ee0dccb1de9721b5819
 DIST concurrent-queue-1.2.4.crate 15375 BLAKE2B d65f379ab2cf8e75bdcedc0a8def45624c8eec73e92f8b559481695ffefbb715fb608985f204ecb964e547cbebb62a024cee210a03ebbb216e018a5ad951870e SHA512 4c0c81f02bc10b1ac25880f7a9647d787742f694a8cbc6aa921cb76c5416bae7ad94eab857e48d56a42243a96cc86bb0b7e18651021d281cca90d77a644d941a
 DIST configparser-3.0.2.crate 22545 BLAKE2B f03f85d109c6d7781340f4514667740c664feb38fb597262d2531f978a04c53f284de7c5671243c77c9db8d7202429f56030a67d76382406ee07e44fbf15b5e3 SHA512 ffa9055a736a93dd062b92ab1345a29565804021268787ab6dd314c00ccec4d2dd94562b1576ac356692011ae67ddc86ae8965e217b1607b680f0669eb4ea9ec
-DIST console-0.15.1.crate 31674 BLAKE2B 4dedaa4c2bf5b533e4f1fb007d7fd1a2b7e37e901f09e1d8d43d0ca79c95eaecb1d238597b338a8da9a1de78efc4ed830a0e55e7e59f4066ff7494ecbb0d6eb6 SHA512 af00a4c8c7ffdd4e6f6c638b52dd4e829b90235b63256215ce04ffc9e3fec8384a032ca664fc4f00a912ce6b5db04990cdf7f60873fe657bf99e811525acc8c2
 DIST console-0.15.2.crate 31576 BLAKE2B 279bb6cfbcc172bb672688422bc669768cf8085acf3c80b283270a12f8e53393ae5133d8b8025e16176fa030a8c4e42afd73cf952385a96392f6519f3cc99894 SHA512 0eb0ffe95cdc2e6f43d116f346241755dbfc8d451c9e69dc950a5c6c94b10b1be4218fa14bd0da32f5cd9779e38e79dcd9b584a6448c7f0b30316948e7ee9ebe
 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
@@ -55,9 +52,7 @@ DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450d
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a
 DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3
-DIST crossbeam-epoch-0.9.10.crate 46918 BLAKE2B 86f33064dde615408435cd4cd8ffc878ccd7aca997440eb85705aaf71209288f2d7cd4a8a2ee8261d30d5d4e10addad1852ecce32826850fbca883430f4f0e26 SHA512 c8e103daf27a06798e4cc89c6263c08117ba7cef322421b7f91e6a96137c2fa2371ce9cf31e8d1a752be85f4feea90d4da21f1921a0a0c618c1f66ef67a5bf03
 DIST crossbeam-epoch-0.9.11.crate 47900 BLAKE2B 2deb54409587df48e0686731dded6600816e4c2b82369c47fd2e00ecd59f29935cb3e7f9bf3457b99831bea088830a625370c4c07ce56cb78ccdc62a6ad7715c SHA512 3fff7ebe038993af5117460e0ff89318541afea8d16f3bb991cd37f9fabff58f1cf122a8163af03c275af4ba6802b264f516fbf12f9a9f8ec978f0f8024187a8
-DIST crossbeam-utils-0.8.11.crate 40887 BLAKE2B 6cf3c4e28243515f06193ef746b18129f62832abde8153503571052f4965b38ce510b09d18e51e0f563bfc14818af13463d1e2d63716b98a91b55461f5186b25 SHA512 eeb19480ca1860953507606f6649756974f65a05883c695fa371ff6d80a9fd0b94872aad5168955b4771b38f50314364236cb39363bcafe9750b687ff92a5ed5
 DIST crossbeam-utils-0.8.12.crate 41785 BLAKE2B 486aaa80eb0fff5740690d8a63c7b41dd06c19cd141f4e12c8f133f5ffa93a121d4e24e19390851051ef07ba63480d9ce3bf751621ada3a420ab6982a0445e28 SHA512 0e1f17887615b1883c3a0c4f0fb908999d550bd0041e8333eebbe43a964838d948fc1e5892e4ebd31e59ad53e5fbb5ebf6741dc1dd8b61907429f691c84de2d2
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST crypto-mac-0.11.1.crate 9551 BLAKE2B 81140107f394d969d85b77050447e7d4dbfe7b2df8164293fe9a2cca04c1ed3cd245988482a232103c2ed9d35601ec6332669bd8598d903d305935dfc09af887 SHA512 3090a7a3fdb7d94b2b14841e37733d863f2e4d24d7da3c63df1726612abdd1c1df7179bba4e344eb63a94053e59a93b0988ecd1e2e5a5db0e18a4b602be4aaa9
@@ -66,12 +61,10 @@ DIST data-encoding-2.3.2.crate 19159 BLAKE2B 43208abc26b243537e9a2556bc3ec5db53f
 DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
 DIST dialoguer-0.10.2.crate 25304 BLAKE2B 12e7d1e1af1f97358c6abd8b27827ab6b528d3a5b3d7e49bb968ae59493a6a7c68e921589e41b50967ed2a09c691205bec957ef55a0591c33d7bc4ed26d5357a SHA512 e9297f78b0697aad45e8ab8b76ca4a9bf07dc2a8a699b0e49eed45ee1f55300cfd67fc884406cf48ef73bde39b5235a90555d3053075a8cc04c43c7c3ffe5f1f
 DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
-DIST digest-0.10.3.crate 18990 BLAKE2B 871a9939e5a4352781dfcb1bef82aba66ddc32e77a2db5e43488302ac3836adfc87869921e95a2af63e46699419e20d526453ee31f3d7b2171198dc23922dec2 SHA512 bfc9b24e4a6e3df91669a36f8ddcdcfb643e22b3102a200d56bbe88d94e8f1f1e52f5ac29f06253913fbd977b149a3e775c95175b93950340946152f6525803e
 DIST digest-0.10.5.crate 19503 BLAKE2B a73ef5f7b85869f8f6e2bd1c83f88f155ffab8ae1c687018ddd12f5806385a2664c163101aec84d4c20647a8bfd04095aa997e088a3f56e2664adabff1c5614f SHA512 3542fc0322a8b10dbc229ae83475a0df5f9beee4f879eacab1fda53a7b61136df2961265472ae66d896681bd17f8a68148b25827733bd782c6bae05d2f307951
 DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
-DIST dunce-1.0.2.crate 7953 BLAKE2B 5572521dd8b85419561ad0af2abc47f3b60b1142c1966b89f678bcce500a38b88b3986523bb6c29b38205440ed110ad5dda3ec7170c476c5614054b36b691acf SHA512 9d1a5d449985913d1cecf2249f3c14001361faf98a0ffa2cb682b4ee4dbde906302355632033484640373587c78c0345c1c7e267c354018cb070cbc46517ba86
 DIST dunce-1.0.3.crate 8035 BLAKE2B 77e560f0b9d28dd51865b8a49fea832e0b530724c6f6fce9ac981240ab247c8fc564d951cfc236ae68b04daa966e59f23208fc1c768d5c42afbc5cec0bf4dbd6 SHA512 3d775fd99d74462d5bd7dbec65c196868c20befb52f04c37ea93f3f67d33cee6062534342abe20c01577a517ad4b16bf15b08a09bbb2d310fdb731db5b1511dd
 DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
@@ -85,7 +78,6 @@ DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e680
 DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
 DIST enumflags2-0.6.4.crate 10713 BLAKE2B 86219df31b9c8a60470f676a365f0f0890892baa7c9e3101a385d9475f9398ff8b62ce3295ca318a266f551c85048e02f26fa67ea9ac689e94a5ccafcb8f5ea3 SHA512 5814f58a8d22f093b94eb71611b9a5c8bf2145db9544397255d93126fdae220c261010d1dd2a278475e7e3c76bb9e67bd671c44f1edddc620924fd6fdc7dc03b
 DIST enumflags2_derive-0.6.4.crate 3659 BLAKE2B b49a73fe2977e8f62af37c367f1452979cdc0575b532d086e612b84495113041221bd508cbf2b72e3179d929a2eabad59b9913db98b21491186a1f1bcf571a9a SHA512 a8a166ed48c77a3d23c1b1afe4dec1812c2a440736cb6c6059e46b90a0a216c81cb45ae6e439ed5b3dcd656faf1bb6dace4e46b908dd02321b4a59351240911b
-DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
 DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
@@ -119,19 +111,15 @@ DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b6
 DIST hkdf-0.11.0.crate 171707 BLAKE2B f9494dc22784324952e79f65fe697b313820bb982a7fac7a8ec9998136571cc9b3ce08aef3d2551a4ffd637526f2613f8e39a771a327f440492088879fb5dca2 SHA512 54255df9d478422d090103b6d66a31280a4c99025834e7930c21bfc7772f713015304f288de16ba3b91628714cde94b552eb1086724bc45e163c74fefa1393bf
 DIST hmac-0.11.0.crate 11385 BLAKE2B 850527040c0fef278175f35a0c8bf77bc005708539af8ec5a85111f83e9c94a912741a2b24965c026fd75db6c58fc82a46a9c5de9454540400c9f19341561b4c SHA512 82d83071d1cea14603b1f1a85d564c78e28d982025a029779d8d83522fd5c56583303dd3a902d8023b5e9df2ddb5c5d9a5fc88000d41dba45dc026239ec81d0d
 DIST human-panic-1.0.3.crate 18064 BLAKE2B 5dbf7c696da12f912a86ff886dbbd6801320520450a8c735da9f99166a4e534aa79e51f6a498626d40ec4309c1676b20b1e7881f341070522c3dc37cb7ead030 SHA512 3de653521aa3ba9180768e04dee8be4f0f52849f1051e8bfd21c80361836603bcf7a5292fe325e2f556446cb176a5bf0eaed1e7bb218cc1fe6c7258cb3f92497
-DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
 DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
 DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
 DIST indicatif-0.17.0-rc.6.crate 44795 BLAKE2B 985be7b0b8a2bad4856428b3b9a287832894b10b28fd84e45460eaee20cf1bfc78b52e6b37c57909bea19d686a70e8a0e21b8b718b84c03a46fd457f012101aa SHA512 225c0f1fe4cb81010c6d1a7dda88f90b0ff524dc2eafc758ef109e8f0648fb68bdf43ac06279b9fae66c32ad6f469bf20a623594565cd11e3b4a4c89454c5ed6
-DIST indicatif-0.17.1.crate 54474 BLAKE2B 1880648c3ce4801534995f6e88de1a74cb0cb8794f877c73262ec0b3e002ad346f0a2f6d1296ce22109582fd815d995bb503033c8349174cdc65da051159fa6c SHA512 b9002c8140d8444a53501cd740ca1c8d8e9862989f275705e798f89494a1e5a3736dcc5d6769f09d1d2e4fa869de11f4e308ddfeb215ca43ab9340b61c816a21
 DIST indoc-1.0.6.crate 14312 BLAKE2B e4757497450f9c5e854f472e576c0df49f1aecb10e3ae77ca56b436dbefc5c75fd9b83093f9bb485b697d32c454af5d70d72da27e231124f7af20d3dc6e320e2 SHA512 798d36767d29ac5170a9de498ebee1056a6658e74b94310d589d429471ae059f974bd83eaa823c99a637c16758b3fdaaeaaaf7b21a2a35cbcbf345840b5f23cf
 DIST indoc-1.0.7.crate 13716 BLAKE2B fe515fcf534a552feba188aea5d5da0febc123db24485eb887a3431592780fd468f6409167457c68a7ef6368fcad71c14fcd7922bf2de29794a341d7d4cbbf0b SHA512 b60e534953d600bc2de3d6951f9da67ca3ab3c78fdce3e9c5f91e544ca848aef0c22c35a26fe7a39c07bd916a79fdf496269fecfa5491a58e178f37b2965b348
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST io-lifetimes-0.7.3.crate 35680 BLAKE2B 03e209f6b5f991f5b629fd76e275cc2d4e5370b14d754ae981a6259a003a53c2c401cf11c42705ec5eace19f79b46311a6e7c0899af208335a1f537f48b05e5d SHA512 b4bf1d74fb3a6fe579c5e68fc44d3f24b749ad381d992f232d2ba6a380643226a0d9d8a48d777224974bf48c8cfa053c9e7c698b28d8297b0eff20717b7487ab
-DIST itertools-0.10.4.crate 120812 BLAKE2B 3526710312764aeb38ffde45758476895e765cc15a2c956628638d396fab9271ef07e3b432f5225899ed170dbe54ebde5fdf7d061f38f49942017e0ec315c5f4 SHA512 e5ba8c5a9087296f417f9eafab5b85c2d55f751ae8e789ee23621ea42ed123827138a9c5cd3fabde0365b8fd00b2f01d4d248d3f7f7b537f3499c8e8b32f6901
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
-DIST itoa-1.0.3.crate 10481 BLAKE2B aa516e8b2fdea4e4e1260a0783fb7aa2672c1bccdf519c45c608fe3f3fd4fe652d7f56f0cd6eeb6a56bc324c68ff241f601660a0dc3c5ffdf7fa239f470078ec SHA512 1290c027ec8a13d2d15ace2b58a1d1a3a18730cd5fb55bc995826b8f4d04ede650b8315a8905f6737c4c4988690ae03bf32c86ab3a31ae068a67d5be04cd618b
 DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d26ccb3bdd798ac0e04d9a6a9307927c17558f1284fa5491464cfceba2f0b880d00673449b94c0fb783150 SHA512 a70bb6fbdbcab27fbb5a84041bcbad8e0c8fda58d55ca7ac757f7be5cd373101be40df99e9acd6ae49e637e40de037c6bc59560f96c9adeccb2b2e0bf6531e42
 DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665
 DIST keyring-1.2.0.crate 31708 BLAKE2B 428f1913b8e7c6a5d823ee5151061eb2667e973a03de0e6ee451ef5311d22c916512de822db2c7bb8caa85f5e8497eb73f53c74429ceef42d7021cbd3e4c1531 SHA512 7e60985ec62959d74cee0a0d7f4b641d73145fa51353d11bcf577a25cad96b4dfa07c6f3f0466e2fd6a5445037a1b805a3062e78cf1d165be93478c697776e2b
@@ -140,17 +128,14 @@ DIST lddtree-0.3.1.crate 11349 BLAKE2B bd51c2cf6eac43bbd44f11c9c21f8e17033c4ce1c
 DIST libc-0.2.119.crate 575749 BLAKE2B 5fa2bf66a4d642e1380335fde0fd190d5168dca58376379caeb52171a3382e5342c727eb4d92f1e27adde58a24d00352896a73c45309d947f56787a99f2753f8 SHA512 a43f8d1cac7a0d8c1bf6f2125695c03d91243498d2dea19a3a674ccb2c64fd00bac4040c42130a1a096b2148451f62e1292c5c71f424f51f888d6a37c7db0bcd
 DIST libc-0.2.125.crate 589236 BLAKE2B 57ca3aa19687b5c5702b66ad690a86ec7639dca41c5846c7cc3500f2d0fffcfee95a2def7695652174862fb6b8d211e7564fef6bef6d1197c481b5b8f18a9c74 SHA512 64ea5bb20120b9893bf5a3648f28da07384972e3cbad13da40c3ecc501efe1bff0bd6b71f52d5f253f00d7a97c2f69d86fba490955e8d70ca1360b8db1e431cf
 DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
-DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
 DIST libc-0.2.134.crate 603330 BLAKE2B afca337bf7120e933c56745a51261156f4af7cc58427f623b9cdf1b2d5fc67fb2bc7c078ccab3cf232024e5013e8edcbbb0baab6a8a3762f9b20d975ed92411d SHA512 fcc142061df7b363b2dacec5fb3c9a19e63addd8210678117f681b8e1b62e5784cb78067639df464f32e22c9ab4d0932bbe1c01cc992348cc0fad4a46cc7b1c3
 DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f8bb21109962273689b284cb4d6756e6399010983da813f6f58664d6191b392b70ecd161518e8ca0fb46992bc3d23adf SHA512 b821ab53d9a885b9dfef6eb3d36a422525cf35d797fe32fee3abf9bb5463712af57febf684c9ab41b5de40c9b0e73d9e369599497f7a7f1314ff455795d32b39
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
-DIST lock_api-0.4.8.crate 25677 BLAKE2B 2d7fd36e83dbd345889d043e4566b35737b6929092a7ad313b2e09b606b2b4a562ad6b8e1fb5371c086c3d226ca585f08dc34e6205b402a1b96569348ae1e96f SHA512 2dd90be33a732cb8111b522cf65fbf37926ab3121c4dba20dbf66403805575ee597d90d776807c13be1a48ddc5920a691ef78dce734adc6a26b52d4ad44b9785
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST lzxd-0.1.4.crate 21891 BLAKE2B 8271b79bdf6c65a17b5fe77a4d8b7d3a96ccf1752d211770dcccbd0912b0113740f5175b6d587ef5f5768b7ecd073488fca4f49e5c4bb3ec4cc9e5055e471b99 SHA512 f4fc473056dc793ee938943646416c3a93c748104093b8932c0a603a5f25820b49632f703ea4bc248b8bd612ef51dce4f5798f1f46782466c38aa69d016c2c57
 DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b5494ba582c333e09de6263769869b5a4903ec2d62cab7a032635fa5d28f00f3f80337b968221e386e252f842cf36 SHA512 c7557f741c170c421d5ccef8cb771fce544b3f3da0475b170f82116c00cdd7522fe29fc8bb4dfa20735345b2c72e12af0bcc4317d9ada412b59f9ff4266e14ac
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
-DIST maturin-0.13.3.gh.tar.gz 326485 BLAKE2B 6e6ac88a59b66698a28d01cf485e761e39499abd93f7456b5dce41f444c50eeec9f154268b1e9c092077833259b0141aed7a70829200e7e4390a69675bb805a2 SHA512 8a187c126f80137e23e5950dcfde981ce4ab961f838f505b9f038e18bd841324ccdf557a377f39ceed1df7e5934751cc4de3cf36148534fceeee917496a4fb71
 DIST maturin-0.13.6.gh.tar.gz 335471 BLAKE2B d761632cf761e688d4807e38de1879023c113701add7ca3474a7791d7c1194b52c4a8163d32961602f42505c94de64ec8633c400ce1e5350f151f14a07a90977 SHA512 bf5d2b9de8671d540ef02ab63bb76ade143a5b75fd93f492cdf21aa7f4e9ac53c3e027f74c75f674d35dd8fe3a21d3f1cd6ff857227664d30a9ad3b336b10761
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
@@ -178,19 +163,15 @@ DIST object-0.29.0.crate 237723 BLAKE2B fd579be961df0d3185682348f1d9cc0fb4dde3da
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.11.0.crate 31121 BLAKE2B 02ff93cd8845bbc3f7741d0e05fee11df5e1c35961b505b2717e697b9c503891a89e15b2c71b76a66f5f239c5ee650f2ed6105b445a4f977578a4243b4dac96e SHA512 3769223beed1a7c8c5625e18dc000b3ab296c7c3af21bb6cb563ad9d130bbbcd447d420d0ec591e6366652727de11dc76dc8f7720110de50be7cbf177587cb15
 DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
-DIST once_cell-1.14.0.crate 31614 BLAKE2B b9ac8f889c86d4160ee026fca20b5135aa7bd60e8bfaf23946d003bcf0b666929a4da5859d874449d15b6ba0ec4c26e98273d020be50184b9d44ae90b8608175 SHA512 81531f06f32854e1794555e10ccd6ee2b6913bfefdd9eed52dd44a02e799fa6371cdf102cc67bc70d581a0cc4abb7dd16c9c12ede6df4ff38b20dc5908bad186
 DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
-DIST openssl-0.10.41.crate 219460 BLAKE2B 363832d3d358514d6d5c97d6e7f7d56b84b33655c3df318b38e0ebaa3e19b84f94aa600347a8cd8f1682accf24a6de342c585e3449f8f8889fe5ac40cc4a5441 SHA512 2ac24fb9b29f8ec3f54944277df924925a0b9a9e4f8a604f8efb0039794520e99520bc28d53355ba4224e69484dfd93265cd174c6463159837f316aae5a9789d
 DIST openssl-0.10.42.crate 225875 BLAKE2B f271b1f2976249354a3fb485635d3c05c4095cea497cde36a88145b33530436cbe60aafb6b8edd0eb48cfaf8668ea65cf6d01c71c3ed1b343449744b8124c329 SHA512 2f23f460518ab2efca867a38b51bb56a87dbd8abd99075eb0d08a82e23d3ebed337c2214eec28636c5c94800532a6a404186889b500f95bf7cb5babf18da2b0d
 DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-src-111.22.0+1.1.1q.crate 5103224 BLAKE2B 3d437377cc0a320e852721af6baf119b8e9bb3f461b7fca45e510e2b8e76086a52809c359e2bb2ceeab789c44d8d8ee7a8eef9b521202fb96704e90c5a291e03 SHA512 edecb0d0115b8db74447bab4c347761c2ce88436fa2d17ffce938258f7d4d6533995f2029f5466ea730d833dd3ac86e637ed846736184584846411b36f7f242b
-DIST openssl-sys-0.9.75.crate 60028 BLAKE2B 1e4b3733d3309a1157c16a236728aeaf48b1b0ea448643416747343fbb96af86c8035ae0cf4170038b4521c88842f42a2379fd733f92fc9742e7c2d837eccecc SHA512 14985af6224bf1b6aae0fbd22c09e6b8ce7b9a6ace0970b1b45fc0e8c700e6a4bcb6b1883e3c78dbeafa02a18d4a84f537a952460d3f0baac3135d1f994af13a
 DIST openssl-sys-0.9.76.crate 60561 BLAKE2B eb8926707891a864b11cc1338c316b8d1a97c48985f56cc4bec78a88c3439e6cffb23541d95e50270aac70f9468e9aa876cde08916b9061c963ae01d0dddbe97 SHA512 97be18c56c37484e77f4638454cfb396dc7aaba6c8c710c882dc13b0ae36e44617e6cdddcf8f6a3fca8a5aed28ff9528c59c01f5a48064790491ff985de5e649
 DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
-DIST os_type-2.4.0.crate 8022 BLAKE2B f37d9f43bfb242f1df0f2a5928923265a3ee44b29ffb119475098fcc7ff46340ba70bbc51e00b6e0b29c4f63aa50531f3f825db82ada46b19c429b3aaa52c7fe SHA512 2860d1798e146e4e476c2bd76085e031cd999188a42519ce86ca7bd168a2eb1907d690e15176beff21966135e68ef0cb45b05ee143e74240c2f8d3c1a5c35bf8
 DIST os_type-2.6.0.crate 8456 BLAKE2B 96df4b0121628e2a75c543bd004bef54577fb67408c9b549d8cd3e2eea688d7bfbf8a6ce185a508507d8fe10aec70e7bcb9bbaf48875b44fe77b56a3e3473368 SHA512 5c8c082c778947a2ca8be47a18ca3e229417ed17d9159f10c536931315923070b6885d28798302f4cd445d86fa0c7eeaab3da8f8bbb84e807d4cb2c8f0a1a5f0
 DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d70376be6e438ee1a4de83a8c3c535d4cc866849aed91df74aa9b22d41d428b1142cefe035dab7404ec89af9efaa832 SHA512 ccca3b4c582e860b0643dea78302fbcb96f8f86b356041ae9c685e7c48f1721fd3366dd1bea39afc1bcef03b298d0f6c87918a1ba92a56e6b06bc8b4123c0d89
 DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
@@ -209,14 +190,12 @@ DIST platform-info-1.0.0.crate 10585 BLAKE2B b5fd7bf80179a4196d1db5a08a7b0a1f908
 DIST polling-2.3.0.crate 21678 BLAKE2B c30866c2f50c7be9343854ae266f948c10dc2a799182c2b19474ce104d49a5f777e948557647668cf6397711a4f73d19dfaec2b2513c7d992f41ebc7dcc9a319 SHA512 2f3352c0cddd06fb85b2cb5967ced2f3e18ab9dc6b66d08155038b7398443c797bc74a88983bb999a9c87a7c47a1170e34b920b18dc0485901def84c2ac1db35
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST pretty_assertions-1.3.0.crate 79441 BLAKE2B e9d29267ee77532de9432f075daab704e8d80a3d5fd5515a7d3c1c9a58dd98ef0190a592e7fe4d8c22a149beec15fc346a68620a3835c1269f72e563d2a5fb89 SHA512 40a56ae7287552cb66e1066cfb89b26af621f894036b9a0cd49889ec5b25831d52cc07f9e117d905766701fa71786a45955186849d36e00cbdb5f884763efcd3
-DIST pretty_env_logger-0.4.0.crate 8690 BLAKE2B bd6cff07f3a9ad860378cd0bc7d44c1fe9ea346aba2970adfc1f23e6fbd3613f11cf8fb19a401f006ea69e8f05f687636d0ef870c25ccdc97c8b60505e2e0447 SHA512 770de8e256cedfb21fc89cc1ecc564ae1a8e67263705b4234b91867996c4db77ec703b70a46aef6b018c6ce09aab6a232fd1eedf8324c39f119a6807daa534f9
 DIST proc-macro-crate-0.1.5.crate 8096 BLAKE2B 0a992f7aecf05335008731adc40e8ce6c4ef5e114228b51ea856112f850a24e995e4682c8d2ffbc703b9b5cfddad68342cc9d0f7d13b13a96961287bdc22c4a0 SHA512 b2922ea8beb762f42f7646398eff9d03a5fe3d942f1d0cce564eff8af41ed14f175986d07ac5bab75e7634f964b8ad24a6f05f597c90b83761bb4c1d2b2fed59
 DIST proc-macro-crate-1.2.1.crate 9161 BLAKE2B 4c498132d80ee3de239991e2c631ba219accccf093460b2e3f22ab364207336f575692ceecd92be9735713b0c999578f13e9a3a6bcdb26024914450f9bc3711c SHA512 94e39efafb9afd36996b4b03f23398c2b01e3da3f029d868e7cc9c114dee4263628460037f194b3e31580c931ee7842882633fec3f39d344c71f961e4deed0a7
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.38.crate 41687 BLAKE2B 226f76a1c264d6e74b72fe1f1a10fa8ab1405b618d0412863cc7e04509f682435dcc2703bf196e4fb1628219630d882d2be64926da19903b36d052113dfa60d8 SHA512 f360b00b4b1e05df52ca1714df34c719778f7bb6ed54fab04a84811acd0a29f7c4d4871fad7d988f0c042fe0fc326d7b1fedc731c55fd32c7257dd1895203080
 DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
-DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
 DIST proc-macro2-1.0.46.crate 41954 BLAKE2B 3bdc274c8ada8bf1a84d4480b25e0348f4ec5bfacebb74da144a36d4dc0efeb341fa24525e7e8408c3589013a048563a46f1e094944afc1726e594534e2455fa SHA512 1c2ae8dc4bebeeaa4af02f8edce18b3d159109a1639d8e9f26be2b7023ade9d09824ee0f2a60ae034967d982158196826fdb989d23a4b3bc81188a9a63e18cb9
 DIST pyo3-0.16.5.crate 363266 BLAKE2B 3162d9a3da37b5579a91dbd42d3e200c480b5e3fb3a2ec208735045cb78a8418f6810a72ec24452f24d00961c72a58ccac4f5ca9a567c92c0a82ca37173de442 SHA512 068019c76b1fc3de2e100c6cdf084df24587094aac3479cb1d906f7fc95ab6296cfe4d0d211a1c5696261be5e0e0e96776f5bc5535faf8243432f93e4d2537f9
 DIST pyo3-build-config-0.16.0.crate 23471 BLAKE2B 4c5cfc692ec3851d74e6d25ff3e18248f96c03731cbdfc1d7661a56dc9394802c16a3a16a2142b91758c91d1bd66550765061f7994accd73835a1703a8105c2c SHA512 b60fcc760d5ee5468b4d308106ac6be105c34b23612b2db5e95f0da50fdbae253cee2dfe185e0bfe8c25c2469e9ec6bd31823731ddd67004423652585c5b25ac
@@ -228,13 +207,11 @@ DIST pyo3-macros-backend-0.16.5.crate 49221 BLAKE2B 690f5e90074f44478b7701203b8a
 DIST pyproject-toml-0.3.1.crate 4536 BLAKE2B a51454289467647437738c2a46a6d166f18c8025a62d7da744f48f7fa7ba395b4b01a9e030eaf9116e0f10af8e3d0afe699a393acfbc8db92cdc3fc3c08c56e4 SHA512 ee2cfe91d4204f97c17243f278dd2b05de6c8fba962dadaafdf47d7f5401845018df3625b7b7e80c2be32b6917c6b244b2705e9d44c5f0030d65ada87cabb2c0
 DIST python-pkginfo-0.5.4.crate 199520 BLAKE2B 4e6a23dfdde6d51ad9a81732f02a42c2c9aea56b36518e140cfa42c78e0c534b0f62a7da32965f18aaef1f416226f94df352e6f9c3cdfd95521debe7d9510b09 SHA512 7afbdfb4f2e06b4e76726c371dc6bc8904e3a7259cd455bac27172dc10abf6295c37eb6ba91c90be4347aaceaf211ca312b011568ce4d779286c5af016448aa2
 DIST python3-dll-a-0.2.3.crate 52115 BLAKE2B ac0d8aa5f1b9bf955067d59ef75e0c32fa2fa6da99ac2b1c02940c0c25c0f4099f3f2eb00ac37a3190cea9df79e3b797edc3ec228273c9cf54303576465adccf SHA512 56a5de431aa12506ab668166e39408441bb452071726cfb67ae542a14c8ba32e960ca20262b955d85749e6c3f54cecc088cc715fc6a3ce082a37e65e58e18b64
-DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST quoted_printable-0.4.5.crate 6237 BLAKE2B d1f9e7ab512948454c7aaac1fb05f1514a0bea17bb3455fb092500a84baef1c469fe468663875b3962aaf6032bffd61f15aaa744afe22497727da0bf8b718e15 SHA512 e3b165705bf0861be724d0655ed7c9fc735dee335b7c641d301c9c1b4c45a8f1218dccb0d43874a4a40cc4dbe62195e9bdf9cfc17bbcd795b88792b918306a18
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
-DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
 DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
@@ -265,20 +242,16 @@ DIST secret-service-2.0.2.crate 26687 BLAKE2B d813dd84ed60ca57f6fc8193756cebe8a4
 DIST security-framework-2.7.0.crate 72601 BLAKE2B 593b08ee9c393d49e7ba9264705d91f969f006a944a855995761c7e00d0c97b3653350f9165649b774bc3c9f9f564307298951cc1b03ff47aa4d0fae501eb513 SHA512 7bbc52a951b328ac25a65dd5d69d173b566f18ee62158a98e2d2d4fb8c51c8dc9930bd78f9cc2ad4eb2fffa1bbb4eda3941a37ef1b545b78f3a39bc480056307
 DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
-DIST serde-1.0.144.crate 76387 BLAKE2B 7e66355c24e1116eec4a3ba4f9164570b6d4ab57196d39d19a0bca912c9d2acfb33d8e17e09bc07903984dad154034187d0ffcc8f9073b36336ac2b38ea012cf SHA512 d7388a40e4a5e0a65ec7b49193f2d53d758adcf26b98ca3bc6270351c7553add2f38a8434223a95826994c6d039dd91fc4f4020ce191410fe57bebd29e4938de
 DIST serde-1.0.145.crate 76568 BLAKE2B 2d38e4ced18d204d8c36122ad09fc00f0378c7e9014d3bc67fb7c3e5ab0f923aeabb6a5fefc8699e80e220b12601d01dbe3ae5267a124164bee2e4d9897aa0fd SHA512 8146c39249ad54028717bcfd916fa5abd8b1ddaec54c4d0de485bf10cb6a85676a53068a07b9563e1717fedb4746ef672ae0c285a8998543cf92d7a157f2d442
-DIST serde_derive-1.0.144.crate 54867 BLAKE2B d1eabf53f4efdf95c3c12a907090617e0aa02661fa0e3cc51bf0ef8dcdbf45f0382a57588565ce26ef7baca330c19ad216a8a0975247bc02af37c4440bdd6859 SHA512 d41208452b36b8d3f0644e58164c9c4e75f8cab2d8be09cfd1b38bdfc690e880a062e0eafe46dd4400d01f541b34c9acd3574504c4aa856afb00cfc2e9617a0a
 DIST serde_derive-1.0.145.crate 54860 BLAKE2B 0c80f1b8844e044bce28c3fd8e46ac732de21736622fd7b2235c41d9a909d7ad224e8e7ba5fa3e5de2cfba5e48a4116f97e9b7eb31b0201c01bc98d40a78d16d SHA512 267389f8cd6d3a7b7d4a4d3226346999294e2fbef7446ff1cd1183dfb4fd17409f5891f6c2cae113b79cffdaca07f2037fd2f4108f93723e6baa5153bb9a61c6
 DIST serde_json-1.0.85.crate 144635 BLAKE2B 03d2de5563c8b8e9150b656b62329a87a5dc42c1fe389e40291a3b2a7232e2342b6e52f6625ecfaa8cde4420017a0db82b2ef332f82f2fc1caa50b98e544031b SHA512 b9ba5c8f5e5c977d31c720995317c99486897a064993784e8abd4e35e0c9ccf20d421552b4436cd88420b5e6fe1d7ebc411bbc2e803cf1732e133c29365834bc
 DIST serde_repr-0.1.9.crate 9695 BLAKE2B ae28d645e12998ce971bface40e7bac688d0f6347149e7be7e7ea40e46b1bee5b6f28b592f981138ac1ddef02c6c62856b98f9aa2f126848307b57e5a2ae8977 SHA512 987d197c4e8326853281f4f8e3f1831c4591d0687429fc08191a1d39edf88261668047100156fe08b2beddc3b01fdcaba5a2a4e45eddffd19fe5cf3e6052f2bc
-DIST sha2-0.10.5.crate 20325 BLAKE2B 5f64e296c52c7ff793674a97562d178bce84bc0a154a596a62a63229da5473d5d04e646529ebdbe1695c38081aae5d2d7c6f9e5db91831b0b895c42c05336ad4 SHA512 d7d4d645912a884b502cb46cf19e2cd9e8484a96d3405744ec794997ac147d60ace5e0130599aee208fbd182828791bf0c42a0673cdbcccce408f935b6e3c192
 DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
 DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
-DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST socket2-0.4.7.crate 44619 BLAKE2B 9bf2560812db2c91498d12274e02d17c279efe5817d882faabc465de71b1cb8045f6eab3c8e6031f6fd18e0e77913f42daab07f01e8d83bfa5ea44cc6966466f SHA512 44487f2de30cd327cad1af31ad36aaaa0bf10c33b5c23b024ada8d7e41d064fb2adbc9edb14aa8aa1eba679d8530c373c7187fc68d9709ae736a5c1a2cf37088
 DIST socks-0.3.4.crate 13172 BLAKE2B 02fa5e950aae0ae6fadb11f27c455da2ca3ce5db3b63f27ea720bb748e03652038a599c036941240edba0286b61a35699bef8db07716ada851c1077b0592b7dc SHA512 531ab43f277e2dfc6aaefcb584c5fdf910cba51cc5fee73256ef00dae714ace844251cb53ca090fd3e8258115cebbcf65843476913fadba8535cb44166294eb8
@@ -289,7 +262,6 @@ DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1
 DIST syn-1.0.102.crate 235699 BLAKE2B b29d1b0ab878eda45c486bce03e1b341eb2c69718201e662d81c131ead2bb5c5abffad848d9cd8d2e45a995dbb4d6a185173b5680973971e0c33bdd9fe43dfe8 SHA512 c9a2b2cf216c3d821decd488ebb49743f2f43940a879856e3a15d2352843c405e6f164c11225e904d18b32a5cd2bd7fcdfa74df40ec5567faeedffe5f523989c
 DIST syn-1.0.94.crate 236697 BLAKE2B e3e37de7ed5fe8ec78e3e65de9e64e7328769c5352e4db9c92d00095607fbdfec0a662deba507afeeee5a173c3c1b99d101268c4692752100198cfaffdda1a64 SHA512 2bdde4584b9d95f93f629083fbedc4a7148aab702775513a602ba2d122ae57a84e6d42c38da820b15ff66743dc49624287daa0c9b6d1fcaeee102b2879ac7a1b
 DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
-DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
 DIST tar-0.4.38.crate 49158 BLAKE2B a344a65951c5c39212ffa3cfdc7dc68c40a85dbc5e4aa08cfe7cf22f0216443fa081ddba5e8fadc48968cc8e70e08d23391a6caefdf359310e5880741c9d6730 SHA512 4b6458734811e1913cb7e348f32db16f9402fd0e0027ae867db81aecac250b35d07d9478cdae4e27a609ce0f29c9d61683934296cfc3b371119df9f2c380a84f
 DIST target-lexicon-0.12.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
@@ -297,29 +269,21 @@ DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d67
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST terminal_size-0.2.1.crate 9694 BLAKE2B 5020da319ef89a0e5bf4cad1b4e7b4a8f096b578f393a8e65b3415e5ec6d456941d0f1c2c433c15c4339fbd3007ab2bc53274f04bf6826c44f694d82e829e1dc SHA512 8e50a43609ca10b95ce49b36eac17e25043325988c17a39d892aa57ecabaff988b9e24a4b7a105f9e45c3ca18f5e79485252a38d3bb9eb3c33c668a69d119501
-DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST textwrap-0.15.1.crate 55940 BLAKE2B 5db6b617e3d2546a74c240cc405568226dea66947fd8c79e9b8655e4292b39d3a7964688e97b1bd82e924a125b1271a7e4ee5cef9d01b6f6e659f6865ceb9c96 SHA512 dd710f1c36354243d09d1c5e4d217cf66c5a86df7e87d6dfe86cc26b3055cb456041f057cad78063a2ac17d4439f5abe7effb42cfad580aa82398d3fbbd09b12
-DIST thiserror-1.0.35.crate 18451 BLAKE2B 5ffe5fba8734291cd5304285ef327e4af2f2e2d9c7272d878ac2d3235761deeb789cfe55752b5876bb7949b02f2483ddc8749ce85f2241385249b5a4c479cf79 SHA512 2a55a0cb831cbec2529132a4d230360ba8f89f55b46d1116bb7a3461e92141d58935ff83b6d6e3c8eb99b690752f9aad2281c99dc9b3a242b3cf349d32d61912
 DIST thiserror-1.0.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e4dfc0608bea49bda1bde5b6acb13da24feaabf4467b8aeace9b6d90a97e2202f7d24bfb753cc4019c2243bda25 SHA512 07f0cf9da1bf1029d70c1b6f0c54bc41ed759214683f35cf6b321ec2d69173e3da0abf80a692115a1e4630400b1fbf462878053853fdc6026edb40f7e13be72e
-DIST thiserror-impl-1.0.35.crate 15433 BLAKE2B af40ee4a29ae92c02bd7681ff9c3f434462056a7386b3b8d7b370d1fff2235f0b674ed9c282daf48cab760cd6232962593ddd1afdb6de2f40092a42e0fd9ff0f SHA512 8669781bc8165126274813653ec9ccbce2df18f6549415571e5db28f64b7715e11ac3f87128769e14b6b49535aaf6964db6a382e0ac482c35fe983b88f9fb1cc
 DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
-DIST time-0.3.14.crate 93111 BLAKE2B cfa2943bb23c191ffc65cf9ceadc0bbc7af7b6f5e1bbe78fd1c0f65e7787e4ee2a9166d32d5632e13facb65bffd87cbf746dd50198768de9104502f9b1ef4f88 SHA512 7655bad4d95f3533dde6017aa2e41b7760406d38b2ef66e84195133fa33d74b78f27d943ae5054e032e45d6f03cfcb4a14601db381b13129b6c1a1a0298c8a3d
 DIST time-0.3.15.crate 93589 BLAKE2B d83c9be58d950631b35ddecf44a28c2708978a922010baa54157b950f1c03c41327258e78701c9bcb93937ffda67303fb1ee0c647afae6597a23a67dc4992623 SHA512 8783fe9cd6aa94cf6588ca1a734d0fa11c9e20e0d99b46b218db95bc185aee8a4324b2ece1a535b4378e87151f9837cd41f663c542f561019be99e3ed5f55325
 DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
 DIST toml_edit-0.14.4.crate 105387 BLAKE2B 63b364d812969fb206ec8ec38e8c0264bdea3a3e7482e2f253c8b0c4e9903bb5becbea6ec03f38d9236be7cbe8111a437e667b901ed75fe32d6de3f94d3a2790 SHA512 613aefe6b648eb202002d447a63cec1b83aaf6ba04e964491069198a0fc39ad11268509a2ebaddd68ee3253bc28df2a0e771cc2876c57136e517850a3926fa4d
-DIST tracing-0.1.36.crate 73238 BLAKE2B 7af6fdb9030bda4bd43e500f7aa1077c819317c96c0f2ae41942488e683bd819182aa160adfe3193770f27b0b9bd57f412e1c9e1ea62d21da0c5822b0b6f27a5 SHA512 fc38e37b9ef2b969df4813def9392ee1b3f0f53d602be1a61c671cbc61bab201055947cb3dbe5653e5bc09d886b49c5d5c9a82ab58b974f6f459885f5f1068cf
 DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75
-DIST tracing-attributes-0.1.22.crate 28199 BLAKE2B 4599e970387f385152d9fd6e354f9b9389b41c737580d0e69c642fc5e53a34201519afb9d9be6e7fe8d37b6cd7d10cc75003f936827c164993a554cc04490858 SHA512 2f13d35116a2580e8a6b43f2ebd27d9f685204c1a99d383cba2480c2f35e635b4658c2b7c75b487194424237a4a6b48b52f404ec6e11fecbb0c106448ebd81c4
 DIST tracing-attributes-0.1.23.crate 30450 BLAKE2B fa21c4074eefbc1110268cfc79291c909503428b26560cf68cf04640a6387d04c29e22b8f86fd48cc1b8c0fd4bb67fca428c9f8009b3c99879352b9d9f68c5ea SHA512 55e92b4e0410805f8cf9eb8ee50cabcf08d1f6c6b4b38c5a51c70f59d06c82096af1f3b9b7dd4267945cf631fa8d99f78ae9b3d0760f9c7ed4d6da6e5e6ff3cb
-DIST tracing-core-0.1.29.crate 58969 BLAKE2B 08b10bdbefa45beb9405b4874fc22386d0aa1d2f5715c79ce64b3f3f7b841b0d606fcd626ba97f1691413f77d610a31615d8486839f7c584f4cc394bba8e3100 SHA512 47d07572dbe72b342baf7bf8ccd41ba870f277db24f4eba0e225f94746a5f2fe76ea340bc6e95a882168718ac4f1afdf4ee01bc57645a0ce3a5798374d175919
 DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65
 DIST tracing-log-0.1.3.crate 20549 BLAKE2B 1e2b5f1d96983b0dcf3e61f71132536e21dc19af0d532dcff7cc91db45e60cbdc1f8b5b7a7b2c13214dda4e3becd4f3d62262def1b608a99fa330ccf1d716323 SHA512 440cb8ddd5823cd0d86b68bbbf29f6886d5800f95d0aaa9477f98f188013fd009c2b9bc982b17efd08abd071bc70ca511f988b9db8c21d8e3d323fb67614d289
 DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a2511340cf2ebb060fb31bc0b5d81dcbbaa299daef3cddc3647625afd124b9c83efc1ef104f55dc6d4cd4d91e0e667c160 SHA512 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b
-DIST tracing-subscriber-0.3.15.crate 187713 BLAKE2B 981e45c25d93c9cb5e5deee33d88216fdc0c6466d713552bff8679793b3d3caa6d0720c21ee4b66582ec5006a356ba39d287703d7debddf191cb6c577f39ee18 SHA512 69953ebad629f3a2175d6cb0bf4c607f299b6188d9e58e9556583eec1044dbf8b8f9010a18dcc5e26eb10cd86e242fa8a0aee33d6913dd64f05cc6077a3e8479
 DIST tracing-subscriber-0.3.16.crate 193572 BLAKE2B 55e582a5989b68ba9fd44defda52a8ec6e85322cb6d629b35c20e75b0852252f97bd21ea5d7587a1712b02e795e534948549e867277caef28592d0e6a50e9aed SHA512 e7e2c00c027cf36e3e97a6779a2ce97bc8b094eed608e940fa0b994188103632c75e565c76944d5f6ddfa2fc6e3b44049c10d35d9e3f3a639eb5249d675e4c45
 DIST twox-hash-1.6.3.crate 21842 BLAKE2B 67c261b2b0a93293717a4e2e07dc11df2abde09da6fe713b9d04917ace73de1b59b8d4fd9449ab46cb7cf496fad1e440effdfa1fae6f5cae4ca78af8cd019c42 SHA512 f7ce63e6e5ca79ce9330caf40b32578a5d2088c5d8ed371604268760d6e212d447d9e3a95378378a283024155bccdaea47597902c488a94c5d5f79770baec8fc
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
@@ -327,9 +291,7 @@ DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4
 DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
 DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
 DIST unicode-ident-1.0.4.crate 35491 BLAKE2B b92d4f09ec86fe1e0b403b8cb0787989c313f29e6b24961fc2ca046ee5e3b50f43f49469a290880412dd37fc1b46cbeb9123e9636e1f39e425f722a5aa44ad08 SHA512 db41d5c3f72cfaf654b4c250e18ac0ac077a816fd582f1548ed384653f467c15f85fcfbbb4ed2f9e8182587181abf1db14059d50f3e43b60434ddf38c8f65d89
-DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 DIST unicode-linebreak-0.1.4.crate 74962 BLAKE2B 2b6b1f262da1100a06552ae24588a6a1f6d34cd9cf398ff182da48116644807cdfbd703770659d70a375102f9526c77ea3e7fc80e7fe5405ccf93bd8153af518 SHA512 4c4a1cb4d8d9563740a6a5bc8ea5db8bab88b1cfbd751fdf33dbdb3923478a4bb716e3ce7441aca0d84426894834959cbc845f3cc2bc1379c5935019dc3f703d
-DIST unicode-normalization-0.1.21.crate 121745 BLAKE2B e67a472d39b72be66f5f8e5b924157232dcd73edb2ecc1bf4f1aa078ea3b9860838afcb1710297367fd8c95f3c1331c91a520ac46c39b94f58a633919f124c95 SHA512 2994104d3393a117cf3eafc147ec9599c870b3bd4fbd096980534c8aeb48c6ba05bcf3f9804e3f2a0148940186dfb27871b23a991360bf8253a5a644f3cdcb12
 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
 DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
 DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
@@ -338,7 +300,6 @@ DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa028
 DIST ureq-2.5.0.crate 98026 BLAKE2B 040f787676193282122a937543cf494099506dbf8be15d9cb8bc8052f1cd3369f50c25263f3e67ee9174d610f01bf2fc48c34f771161d433ffb18f7ae83745cb SHA512 dafeb7118eea167f525dc217d270cb39b2bead5e4bc73f244272fe7aa72d8a7fd0dcf800494765dd368d5e00fcbc8dd1efa08de359aebd1f09b948889b9f87b7
 DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
 DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
-DIST uuid-1.1.2.crate 49511 BLAKE2B ea25eeae5181b977fcf9a462cbfd4fc5175b0dd16dc19aaf0d6c250a7eec312a6c617aa320c4ec9f452c200ca3aa803146a45cbb91053f500b100eeb14d8c7bc SHA512 de1d1019d224c248e19cbf8a8539dc55937b23f74c5a8b11a445f8b7c155d35caa2001d6c710f4a4a8c034446162ef32c0e3be9f3d43631477c6f3d350acf7d0
 DIST uuid-1.2.0.crate 53767 BLAKE2B 1b26af2748836931a77849e9e19daba791c1358104a01e55d090be9514042ed57ecab40e86af36ec58a996dbd10be20c0a65f1fac8d22b55a239f7c88489420e SHA512 123e7987c6847e14c001a92d92e1f49ab7961130edf66c0db9aed94e20e3146fb01111414abcd627688de7b01618d399f0ffaf97781aa183f60c8e75fa6cf4e0
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
@@ -353,7 +314,6 @@ DIST wasm-bindgen-macro-support-0.2.83.crate 18530 BLAKE2B f305c9fc1f7bba5bee65a
 DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 4dd1cffea1edc98dcd4993bf6fdde8100fe00d1e97322ce8bc0bdefd0c659047c8c726e5da27b59fd7a6621c1e5385c18204e834c6c6fd1fb9de52f95b40e40d SHA512 2bfc1a068fa41a9ecacce7bda494fc0485c57ccb102c1d76c87a42e00ad30b944b0cb788642e8339d050a0e831ce8306844a77292ab9f79ed765b65cdb4765e7
 DIST web-sys-0.3.60.crate 700485 BLAKE2B 13942a583dd8462b0591a19759a41f41fb17d2356b3bcd78402e420fdf5726782e5b4ed211c3716a81c1cdf64ce9b8adecaa3fa22756a3ec84eb7c3e12e3018c SHA512 d883363f99300e2d50bc5bf198f0fb8d6c53e5a778217e340573560ac07db26a71c98419fa2ced32820472126d6f97ad5773ad082521be0a1c9a374af9d61df9
 DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
-DIST webpki-roots-0.22.4.crate 250591 BLAKE2B 2fa664941519531df1f5fc1f51fa8224085d3a6f8e11b551bb66088a7e82445914aff1bbc9924f7abc9da87619349620c0189353296ca2012c1c0ccefd6ba086 SHA512 d6a07d073f21284e6fa42e164f41edca352acfb2ef93a1c663d8b18c8b80e1d013d7ef524755bb02e6d3d5177ce6e22a8bfb76be306fe70c7c4875e82ac46e00
 DIST webpki-roots-0.22.5.crate 251914 BLAKE2B 7d13f89fae84be067dd7c324276366282628ba72af560a201b0f5b2d2da1b22b2c4346af7b0650f6f0f4d3c7c23edfee34cd37ac296f91204f1f9bee3d7fc189 SHA512 08be83e80bb1014d091b5c51e9133a5e8f40dae91acd675a5c84cdb99438cc8e54d4861fb4d1b9e5c369479d81dc5ee6f714b63d96c981f09c3d1c2244f23dc3
 DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
 DIST which-4.3.0.crate 9635 BLAKE2B 36556a9eca6d8702c0e3634abc458f7ff831aec28a7117f21f812c6f46cccd8db0e6ce7cc76f8033ba89d51858411251e5fecb0883542669269cade9c1a5aadb SHA512 cad05bd43dfcf9e50fd6e3b9dcd5d9a987175a0f44adbf204079117b70d0b42e6483e635287924698c51d0452f168e48e041453f18ff5720c0e2ec4c734d2578
@@ -369,13 +329,11 @@ DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca2
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST xattr-0.2.3.crate 11959 BLAKE2B e67cc186c3a86c3019cb5832aa515267671b8f11f88ba6253a3217eaf06d70b72a0367e9c8fb42a584b5b57113f8788c67f4e3d70db6427dd4e4a6efff59ac44 SHA512 55b99a9a9440463050b672dcacb7e1d1cc78f2b6f40ea7bff2134ee3a1c787d64972a1e00d2e06cf5a341bf76eff32f68e17a0c939a23f2c9a892715722afcac
 DIST xwin-0.2.5.crate 216810 BLAKE2B f35cb34ae86ac7f4ec4fab386843be91d77fd47afea6d5ac15dc95c1a7b920d1b5dbc86640a96cb4a05b8064c986585478d06c2ea0893ea7b6bd32be4d07fdd5 SHA512 f578898976c2bba1d7738606bcdd22edcb6746b4866622bdb4aabf8e60a1221d88caf3269a4e0646336f0e84aabf6088dfc26df7b82a8d3badf1d9268bce8e21
-DIST xwin-0.2.8.crate 217755 BLAKE2B 9f15d14adbc9f932e8f52afdf6bd992a89a5dd2b2198ec8857cd77e659987bf88aae4427509632517dcd5fd3453b7ba7aa002cd1c89a8187b5b70dfc46decc98 SHA512 6ff2b554a3ff78405472a773792b896f961a9b22189aa5b49eb39d135f7cd76b71a2e7481c5f9e3dfedc788fe3fdfa7cfa7a71c29d4e445acc8c4099bb5028b8
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 DIST zbus-1.9.3.crate 62957 BLAKE2B b7011d1c78e5b8a23a93b0d88ef5d13164b964d046f65917c45544b0a85fd013f375aecb49b957a519d128cdd2e23c52672e3746418f06ac6eac29a8cf155ca8 SHA512 b5d471d5d962a46c02380c91374ff4e9379a0ad436665c540a9ccca3fe45355872b3add3d18759bb271d30cf218c8b25f169c515953bdd6ce9a8ce81905a6865
 DIST zbus_macros-1.9.3.crate 14794 BLAKE2B 7ae5cc45f8d7c9eae4d282f3c4884abfedf91ff14b48f09f21a3a7e5d80100b001f2e7a7b3dc24bbb35b65f7c6ce615a80869c5d81336bf5c12fea99802b0925 SHA512 1b22cf49dc10d9854f9f4150e52307e98dff1f6d3102c5e5af4bfb305cf3509d5b8f07ed6ae43f8b4f03c4e22d11648ccb49f5f3f7731400a34cceea7ee19677
 DIST zip-0.6.2.crate 60077 BLAKE2B 3353cb0b8557ad1f16f3a3964a5c6d992bd044eebe3857e42ee235bd479875811619001ad54378fa7bcacce8acbe7dca30199eaf88ddc47a91e47f15e0396e22 SHA512 a044090643e22d792a83600631d2828b3fffdc25260bfd7de703d20871c23deb6cfb121dbee9cdd5540125c96d113a9516f26b9f07cbf6f260725627166f130f
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
-EBUILD maturin-0.13.3.ebuild 9006 BLAKE2B bf70fa8e65ae0c883e14fc703942197df86aa0a5a422e0d3dc4baec7011dd74228aa79d19ca8d2bc99c8ec175a264d1ff26cb973d03d7c94062b1ffa634ffc74 SHA512 1a0c24877b38599dfbb3bbb42c937a73b7a095af6b8c36a38bb4a172384cdc34eaa7c3fd4597ed2af6b0168f0547fc57038ff0dde97b2a7bd82b0f74d77d3c41
 EBUILD maturin-0.13.6.ebuild 9115 BLAKE2B 4716856de5d2a6390d2709ad652acfbdbdfdcee1b1c34e9905b83e3a0c67ef713856805a854af0ee6016ed7639a39d86a978cc4b34c632f33c637f27fa35189b SHA512 8a2fc07d362adf4af82ffff8a77ddb856f0214787524e9f4a6df590ca00f8391c371d5d1d6cf40cd41a3ab37b4025bff288910bd345ff162823382bc5dee9269
 MISC metadata.xml 581 BLAKE2B 9fd4c9b9ef68199ef36af2d3799e3c16f819e89a2858bbfefbedb35575f5018c44ccf6b851f1bd367adefec1e8e6dc4a817bd431037b2ee8d1c01e3638d81541 SHA512 93e477343b707475d8b5bd043575a047e7247998e62daaed232216a9a3bfaa9dcae0ac02ec8489e847018495b31f9ef1811d528498e0e129dde99b06712ef7f7
diff --git a/dev-util/maturin/maturin-0.13.3.ebuild b/dev-util/maturin/maturin-0.13.3.ebuild
deleted file mode 100644
index 2463eb5e7566..000000000000
--- a/dev-util/maturin/maturin-0.13.3.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.17.0
-	adler-1.0.2
-	aes-0.7.5
-	aho-corasick-0.7.19
-	anyhow-1.0.65
-	async-io-1.9.0
-	atty-0.2.14
-	autocfg-1.1.0
-	backtrace-0.3.66
-	base64-0.13.0
-	bitflags-1.3.2
-	block-buffer-0.10.3
-	block-buffer-0.9.0
-	block-modes-0.8.1
-	block-padding-0.2.1
-	bstr-0.2.17
-	bumpalo-3.11.0
-	byteorder-1.4.3
-	bytes-1.2.1
-	bytesize-1.1.0
-	bzip2-0.4.3
-	bzip2-sys-0.1.11+1.0.8
-	cab-0.4.1
-	cache-padded-1.2.0
-	camino-1.1.1
-	cargo-options-0.3.1
-	cargo-platform-0.1.2
-	cargo-xwin-0.10.4
-	cargo-zigbuild-0.12.3
-	cargo_metadata-0.15.0
-	cbindgen-0.24.3
-	cc-1.0.73
-	cfb-0.7.3
-	cfg-if-1.0.0
-	charset-0.1.3
-	chunked_transfer-1.4.0
-	cipher-0.3.0
-	clap-3.2.21
-	clap_complete-3.2.5
-	clap_complete_fig-3.2.4
-	clap_derive-3.2.18
-	clap_lex-0.2.4
-	cli-table-0.4.7
-	combine-4.6.6
-	concurrent-queue-1.2.4
-	configparser-3.0.2
-	console-0.15.1
-	core-foundation-0.9.3
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.10
-	crossbeam-utils-0.8.11
-	crypto-common-0.1.6
-	crypto-mac-0.11.1
-	ctor-0.1.23
-	data-encoding-2.3.2
-	derivative-2.2.0
-	dialoguer-0.10.2
-	diff-0.1.13
-	digest-0.10.3
-	digest-0.9.0
-	dirs-4.0.0
-	dirs-sys-0.3.7
-	dunce-1.0.2
-	either-1.8.0
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding-index-tradchinese-1.20141219.5
-	encoding_index_tests-0.1.4
-	encoding_rs-0.8.31
-	enumflags2-0.6.4
-	enumflags2_derive-0.6.4
-	env_logger-0.7.1
-	fastrand-1.8.0
-	fat-macho-0.4.5
-	filetime-0.2.17
-	flate2-1.0.24
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	form_urlencoded-1.1.0
-	fs-err-2.8.1
-	futures-0.3.24
-	futures-channel-0.3.24
-	futures-core-0.3.24
-	futures-executor-0.3.24
-	futures-io-0.3.24
-	futures-lite-1.12.0
-	futures-macro-0.3.24
-	futures-sink-0.3.24
-	futures-task-0.3.24
-	futures-util-0.3.24
-	generic-array-0.14.6
-	getrandom-0.2.7
-	gimli-0.26.2
-	glob-0.3.0
-	globset-0.4.9
-	goblin-0.5.4
-	hashbrown-0.12.3
-	heck-0.4.0
-	hermit-abi-0.1.19
-	hkdf-0.11.0
-	hmac-0.11.0
-	human-panic-1.0.3
-	humantime-1.3.0
-	idna-0.3.0
-	ignore-0.4.18
-	indexmap-1.9.1
-	indicatif-0.17.1
-	indoc-1.0.7
-	instant-0.1.12
-	itertools-0.10.4
-	itoa-1.0.3
-	js-sys-0.3.60
-	keyring-1.2.0
-	lazy_static-1.4.0
-	lddtree-0.3.1
-	libc-0.2.132
-	lock_api-0.4.8
-	log-0.4.17
-	lzxd-0.1.4
-	mailparse-0.13.8
-	matchers-0.1.0
-	memchr-2.5.0
-	memoffset-0.6.5
-	mime-0.3.16
-	mime_guess-2.0.4
-	minijinja-0.20.0
-	miniz_oxide-0.5.4
-	msi-0.5.0
-	multipart-0.18.0
-	native-tls-0.2.10
-	nb-connect-1.2.0
-	nix-0.22.3
-	num-0.4.0
-	num-bigint-0.4.3
-	num-complex-0.4.2
-	num-integer-0.1.45
-	num-iter-0.1.43
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.13.1
-	num_threads-0.1.6
-	number_prefix-0.4.0
-	object-0.29.0
-	once_cell-1.14.0
-	opaque-debug-0.3.0
-	openssl-0.10.41
-	openssl-macros-0.1.0
-	openssl-probe-0.1.5
-	openssl-src-111.22.0+1.1.1q
-	openssl-sys-0.9.75
-	os_str_bytes-6.3.0
-	os_type-2.4.0
-	output_vt100-0.1.3
-	parking-2.0.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	path-slash-0.2.1
-	pep440-0.2.0
-	percent-encoding-2.2.0
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	pkg-config-0.3.25
-	plain-0.2.3
-	platform-info-1.0.0
-	polling-2.3.0
-	ppv-lite86-0.2.16
-	pretty_assertions-1.3.0
-	pretty_env_logger-0.4.0
-	proc-macro-crate-0.1.5
-	proc-macro-crate-1.2.1
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.43
-	pyproject-toml-0.3.1
-	python-pkginfo-0.5.4
-	quick-error-1.2.3
-	quote-1.0.21
-	quoted_printable-0.4.5
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	rayon-1.5.3
-	rayon-core-1.9.3
-	redox_syscall-0.2.16
-	redox_users-0.4.3
-	regex-1.6.0
-	regex-automata-0.1.10
-	regex-syntax-0.6.27
-	remove_dir_all-0.5.3
-	rfc2047-decoder-0.1.2
-	ring-0.16.20
-	rpassword-6.0.1
-	rustc-demangle-0.1.21
-	rustc_version-0.4.0
-	rustls-0.20.6
-	ryu-1.0.11
-	same-file-1.0.6
-	schannel-0.1.20
-	scoped-tls-1.0.0
-	scopeguard-1.1.0
-	scroll-0.11.0
-	scroll_derive-0.11.0
-	sct-0.7.0
-	secret-service-2.0.2
-	security-framework-2.7.0
-	security-framework-sys-2.6.1
-	semver-1.0.14
-	serde-1.0.144
-	serde_derive-1.0.144
-	serde_json-1.0.85
-	serde_repr-0.1.9
-	sha2-0.10.5
-	sha2-0.9.9
-	sharded-slab-0.1.4
-	slab-0.4.7
-	smallvec-1.9.0
-	smawk-0.3.1
-	socket2-0.4.7
-	socks-0.3.4
-	spin-0.5.2
-	static_assertions-1.1.0
-	strsim-0.10.0
-	subtle-2.4.1
-	syn-1.0.99
-	tar-0.4.38
-	target-lexicon-0.12.4
-	tempfile-3.3.0
-	termcolor-1.1.3
-	terminal_size-0.1.17
-	textwrap-0.15.0
-	thiserror-1.0.35
-	thiserror-impl-1.0.35
-	thread_local-1.1.4
-	time-0.3.14
-	time-macros-0.2.4
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	toml-0.5.9
-	toml_edit-0.14.4
-	tracing-0.1.36
-	tracing-attributes-0.1.22
-	tracing-core-0.1.29
-	tracing-serde-0.1.3
-	tracing-subscriber-0.3.15
-	twox-hash-1.6.3
-	typenum-1.15.0
-	unicase-2.6.0
-	unicode-bidi-0.3.8
-	unicode-ident-1.0.4
-	unicode-linebreak-0.1.2
-	unicode-normalization-0.1.21
-	unicode-width-0.1.10
-	untrusted-0.7.1
-	ureq-2.5.0
-	url-2.3.1
-	uuid-0.8.2
-	uuid-1.1.2
-	valuable-0.1.0
-	vcpkg-0.2.15
-	version_check-0.9.4
-	waker-fn-1.1.0
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.83
-	wasm-bindgen-backend-0.2.83
-	wasm-bindgen-macro-0.2.83
-	wasm-bindgen-macro-support-0.2.83
-	wasm-bindgen-shared-0.2.83
-	web-sys-0.3.60
-	webpki-0.22.0
-	webpki-roots-0.22.4
-	wepoll-ffi-0.1.2
-	which-4.3.0
-	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-sys-0.36.1
-	windows_aarch64_msvc-0.36.1
-	windows_i686_gnu-0.36.1
-	windows_i686_msvc-0.36.1
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_msvc-0.36.1
-	xattr-0.2.3
-	xwin-0.2.8
-	yansi-0.5.1
-	zbus-1.9.3
-	zbus_macros-1.9.3
-	zip-0.6.2
-	zvariant-2.10.0
-	zvariant_derive-2.10.0"
-CRATES_TEST="
-	indoc-1.0.6
-	libc-0.2.119
-	libc-0.2.125
-	libc-0.2.126
-	lock_api-0.4.7
-	once_cell-1.10.0
-	once_cell-1.11.0
-	once_cell-1.12.0
-	once_cell-1.9.0
-	parking_lot-0.12.0
-	proc-macro2-1.0.38
-	proc-macro2-1.0.39
-	pyo3-0.16.5
-	pyo3-build-config-0.16.0
-	pyo3-build-config-0.16.5
-	pyo3-ffi-0.16.0
-	pyo3-ffi-0.16.5
-	pyo3-macros-0.16.5
-	pyo3-macros-backend-0.16.5
-	python3-dll-a-0.2.3
-	quote-1.0.18
-	redox_syscall-0.2.13
-	smallvec-1.8.0
-	syn-1.0.94
-	syn-1.0.95
-	target-lexicon-0.12.3
-	unicode-ident-1.0.0
-	unicode-xid-0.2.3
-	unindent-0.1.9"
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-inherit cargo distutils-r1 flag-o-matic
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://maturin.rs/"
-SRC_URI="
-	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD
-	CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 openssl
-	doc? ( CC-BY-4.0 OFL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10} pypy3)"
-BDEPEND="
-	>=dev-python/setuptools-rust-1.4[${PYTHON_USEDEP}]
-	doc? ( app-text/mdbook )
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/boltons[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# used to prevent use of network during tests
-	cat > "${T}"/pip.conf <<-EOF || die
-		[install]
-		no-index = yes
-		no-dependencies = yes
-	EOF
-
-	# TODO: package-agnostic way to handle IUSE=debug with setuptools-rust?
-	use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die
-
-	# setup.py handles most for non-tests, but ensure disabled rustls on arches
-	# where ring crate is problematic -- keep in sync below (bug #859577)
-	if use mips || use ppc || use ppc64 || use riscv || use s390 || use sparc; then
-		sed -i '/^if platform.machine/s/^if/if True or/' setup.py || die
-	fi
-}
-
-src_configure() {
-	filter-lto # undefined references with ring crate
-
-	if use mips || use ppc || use ppc64 || use riscv || use s390 || use sparc; then
-		local myfeatures=( upload log human-panic )
-		cargo_src_configure --no-default-features
-	fi
-}
-
-python_compile_all() {
-	use !doc || mdbook build -d html guide || die
-}
-
-src_test() {
-	mv test-crates{,.orig} || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PIP_CONFIG_FILE=${T}/pip.conf
-	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
-	local skip=(
-		--skip locked_doesnt_build_without_cargo_lock
-		# fragile depending on rust version, also wants libpypy*-c.so for pypy
-		--skip pyo3_no_extension_module
-	)
-	[[ ${EPYTHON} == pypy3 ]] && skip+=(
-		# test enables pyo3's auto-initialize that is incompatible with pypy
-		--skip integration_pyo3_bin
-		--skip integration_pyo3_ffi_pure
-		--skip integration_pyo3_pure
-	)
-
-	cp -r test-crates{.orig,} || die
-	cargo_src_test -- "${skip[@]}"
-	rm -r test-crates || die
-}
-
-python_install_all() {
-	dodoc Changelog.md Readme.md
-	use doc && dodoc -r guide/html
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 57dab69ce3d4..df0c9b985be1 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 52b250aba42f..aa0bc2077413 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -4,19 +4,15 @@ AUX pcsx2-1.7.0-crcs.patch 1456 BLAKE2B e4dc096bf863d5067816b2755ba84a6f7e6d9163
 AUX pcsx2-1.7.3329-lto.patch 516 BLAKE2B 84af170687a279a2f78188cff30ecc7ad68c11f4d5300b20fb06ac745770869c2c70f7ff43a069d225520ae56fe9d960706dc53f03890caeb46ce0efddea312e SHA512 c94a7b4c52ac9a4a7918f275dc7083b63c0a3992aa86d7ca424a229400893b1234381a3111249e3d5e88de9486e784d0a7e8977bbf853b215e2f6a4fc8bcb822
 AUX pcsx2-1.7.3329-musl.patch 292 BLAKE2B 02717d90a08caddc6c0df32137fc73fc4426f9df1b123cfc7dee051e918b23d1659278d7ab14823d7208b487486deed949ab2e3c93046980e5dbd7369cd4accf SHA512 5a28effab686c38e8d12d53244074736595a3f2cf6b4ac9997289b695642094e50d20558427c4108c5b0fd782ca4a91401099ab5c04778d30b4cba31aae29923
 AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fbccdddadd3d5941057f163c064a1e3d81daff1a90c689fe1d4bb1e645081be9dae2aa63a88caa9b2b83b13cebf SHA512 65f3f241ccda684cee1d382a973ffbda09b290a4878f7c0b3aed279b2fa5aa1f188b7a5bf26a584d2aa4ed12aa9c1c5e15ecebb2c2bb6ae83a7622deba26bdd4
-AUX pcsx2-1.7.3329-unbundle.patch 1493 BLAKE2B 9d37c36773d594bfc045ecf50680a422e597c96ce76e934a4ed7cc91c6ee2a1f3bb162eeb04a4437fbd5be1e064dff295702b4bcb1352a0064ba7fa697114175 SHA512 b142b2fa1aaf68437f47bd33d30e474543fea05794c67321b3b19746d95ceb7f02196ff8518bb2cc85fd52d43a4233955a31842edf38e9560e3f32204d2fd9d4
-AUX pcsx2-1.7.3329-wx-vs-sdl.patch 350 BLAKE2B 17e54fd9150ad7d8d3545e474b5579ae8b8e1df1b38b510931dee73e566903b6f9397d2dec537f6d6425d61a966f71169f84a863c0e0a82203ce21ab3f514fef SHA512 9240e808886b746d74828405a931c6dc4d093f3ab22619b2a5d349f737a241c2b7545771931a4b77385d6cb6583124a01ba24faf74f43914fdc62c6f33dd39b1
 AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d536b9ef420032d766ef4e41b7953c329f70d2040ae6a99142e0bc307fa9a534bd5db4e363e4e64a4291dc7a5760149b9 SHA512 7068a214cae03579e83ce14a5b953807a4f536be93946e15b58a33ede2497a128508ac2727fd1f602444906bc1497182a3740a1613d39300c403e387adbaa332
 AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
 DIST pcsx2-1.7.3468.tar.gz 19926257 BLAKE2B d276d7640c46c6fbad28c87b46e367c6dbfc8b3f6732f34dce49736772224dada6b4d5bc5947db2fe757b465e0d9fc0821eaf6f79987daf6df1734c8c9d34c52 SHA512 e96c1d8e733e3df8666e4eb7ebf3be47c7c65d948b4d4fc0818f90af60dfe15e928a5f93bfe0791444b3529f9b0a3789853c2b53845437507f97eda0c2bc2646
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
-EBUILD pcsx2-1.7.3329.ebuild 5684 BLAKE2B af44f3fe3968440f88f2506f4e23d1361f2ab5a556d0095b55dc9fe883ab1fe75de5736c22b6e5855c1d49a4e0c2eb783666b0c21f825cecc0381aecdc0d51f1 SHA512 af6169cfa2f69125abce4d08a9bcf5c1919611fdda8a00ffcf66f61bcf06f4c3dc531bdfb5042d4b605eccac11214e1904aba8626b1987b3a69ab71807ff9ac1
 EBUILD pcsx2-1.7.3468.ebuild 7180 BLAKE2B f8ea7f06b934f87f2ee869ae08167078e7eaca8b9601e34d7ed586aec4ab0ce10790db81b3c6d2620be7c9606f25eefed6505c51b9d8a5621639347c73d83d00 SHA512 2cf088951ea0f2f542c0ce158bccf462f2cdd7d2f8150e4135fffa8ecfaf1ee7895eb739cb6e283b058bded6de605b89bc9aabd8112965c0b73b1357e5c2e81a
 EBUILD pcsx2-9999.ebuild 7180 BLAKE2B f8ea7f06b934f87f2ee869ae08167078e7eaca8b9601e34d7ed586aec4ab0ce10790db81b3c6d2620be7c9606f25eefed6505c51b9d8a5621639347c73d83d00 SHA512 2cf088951ea0f2f542c0ce158bccf462f2cdd7d2f8150e4135fffa8ecfaf1ee7895eb739cb6e283b058bded6de605b89bc9aabd8112965c0b73b1357e5c2e81a
 MISC metadata.xml 805 BLAKE2B eb7ce944f7dc5b1889cc2b59f389eafabe9d5e44c4a730fa1352b0a00aec0f97d607204c440a9ce014e02f5b1a73c6ccd294074e7ce41f563c6c3643614ac9f6 SHA512 e8d939f76830204283557319961b4e3aab557e1c3e36fbfc98d4605b0728adb42d0731a05da998eb099f6b0df837eef7616cddb1e62b006979fb9262c172d961
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
deleted file mode 100644
index 450329522183..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Adjust to unbundle a few extras.
-
-zstd changes only needed because of https://bugs.gentoo.org/872254
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,3 +54,4 @@
- 	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
--	add_subdirectory(3rdparty/gtest EXCLUDE_FROM_ALL)
-+	find_package(GTest REQUIRED)
-+	alias_library(gtest_main GTest::gtest_main)
- 	add_subdirectory(tests/ctest)
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -177,3 +177,3 @@
- set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS})
--if(ENABLE_TESTS)
-+if(0)
- 	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
-@@ -210,7 +210,4 @@
- find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0)
--find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
--if (${zstd_TYPE} STREQUAL System)
--	alias_library(Zstd::Zstd zstd::libzstd_shared)
--	alias_library(pcsx2-zstd zstd::libzstd_shared)
--endif()
-+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
-+alias_library(Zstd::Zstd PkgConfig::zstd)
- find_optional_system_library(libzip 3rdparty/libzip 1.8.0)
-@@ -243,3 +240,4 @@
- add_subdirectory(3rdparty/lzma EXCLUDE_FROM_ALL)
--add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
-+pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
-+alias_library(chdr-static PkgConfig::chdr)
- 
-@@ -269,5 +267,3 @@
- if(CUBEB_API)
--	add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL)
--	target_compile_options(cubeb PRIVATE "-w")
--	target_compile_options(speex PRIVATE "-w")
-+	find_package(cubeb REQUIRED)
- endif()
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
deleted file mode 100644
index d00f9553993d..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-This check is unnecessary, bit dodgy (ldd+grep), and requires -DSDL2_API=1
-/only/ if wxGTK was built with USE=sdl or else get a cmake unused options
-warning. Test code also fails with -Werror=strict-prototypes (clang16).
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -191,3 +191,2 @@
- if(NOT PCSX2_CORE)
--	WX_vs_SDL()
- endif()
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
deleted file mode 100644
index 6dd06cea5dcb..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic wxwidgets
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
-	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
-	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
-	SRC_URI="
-		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		vulkan? (
-			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-		)"
-	KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/"
-
-LICENSE="
-	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+
-	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-cpp/rapidyaml:=
-	dev-libs/libaio
-	dev-libs/libchdr
-	>=dev-libs/libfmt-7.1.3:=
-	dev-libs/libzip:=[zstd]
-	media-libs/cubeb
-	media-libs/harfbuzz
-	media-libs/libglvnd
-	media-libs/libpng:=
-	media-libs/libsamplerate
-	>=media-libs/libsdl2-2.0.22[haptic,joystick]
-	media-libs/libsoundtouch:=
-	net-libs/libpcap
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXrandr
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qtsvg:6
-		net-misc/curl
-	)
-	!qt6? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[wayland?]
-		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		pulseaudio? ( media-libs/libpulse )
-	)
-	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	test? ( dev-cpp/gtest )"
-BDEPEND="
-	dev-lang/perl
-	qt6? ( dev-qt/qttools[linguist] )
-	!qt6? ( sys-devel/gettext )"
-
-FILECAPS=(
-	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
-	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
-	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
-	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
-	"${FILESDIR}"/${PN}-1.7.3329-unbundle.patch
-	"${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		local EGIT_SUBMODULES=()
-		if use vulkan; then
-			EGIT_SUBMODULES+=(
-				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
-				3rdparty/vulkan-headers # to keep in sync with glslang
-			)
-		fi
-		git-r3_src_unpack
-	else
-		default
-		if use vulkan; then
-			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
-			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
-			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
-	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
-		-i pcsx2/Frontend/CommonHost.cpp || die
-
-	# pulseaudio is only used for usb-mic and without qt6, not for audio output
-	{ use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
-
-	# GS tests currently fail to build with qt6
-	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
-
-	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-			-i cmake/Pcsx2Utils.cmake || die
-
-		# delete all 3rdparty/* except known-used ones in non-live
-		local keep=(
-			cpuinfo glad imgui include jpgd lzma simpleini xbyak
-			$(usev vulkan 'glslang vulkan-headers')
-		)
-		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
-			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
-	fi
-}
-
-src_configure() {
-	use qt6 || setup-wxwidgets
-
-	# for bundled glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_BUILD_DATE=yes
-		-DDISABLE_PCSX2_WRAPPER=yes
-		-DDISABLE_SETCAP=yes
-		-DENABLE_TESTS=$(usex test)
-		-DPACKAGE_MODE=yes
-		-DQT_BUILD=$(usex qt6)
-		-DUSE_SYSTEM_LIBS=yes
-		-DUSE_VTUNE=no
-		-DUSE_VULKAN=$(usex vulkan)
-		-DWAYLAND_API=$(usex wayland)
-		-DXDG_STD=yes
-
-		# sse4.1 is the bare minimum required, -m is required at build time
-		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
-		# https://github.com/PCSX2/pcsx2/pull/4329
-		-DARCH_FLAG=-msse4.1
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittests
-}
-
-src_install() {
-	cmake_src_install
-
-	use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	local replacing_old
-	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
-	then
-		replacing_old=
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
-		elog "it is recommended to backup your save states and memory cards before use."
-		elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
-	fi
-
-	if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
-		[[ -v replacing_old ]] && elog
-		elog "${PN}-1.7.x is a development branch using a nightly release model"
-		elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
-		elog "many notable features (e.g. native 64bit builds). Given it may be a long"
-		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
-		elog "roughly every months."
-		elog
-		elog "Please report an issue if feel a picked nightly release needs to be"
-		elog "updated ahead of time or masked (notably for handling regressions)."
-	fi
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3fffaee6db03..cb7a302ba9b3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/cubeb/Manifest b/media-libs/cubeb/Manifest
index 02fb35db40a2..8b17ae5b9b40 100644
--- a/media-libs/cubeb/Manifest
+++ b/media-libs/cubeb/Manifest
@@ -25,5 +25,5 @@ DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 EBUILD cubeb-0.2_p20211213.ebuild 2534 BLAKE2B 0c468fccc86a08fba686e36cceead6d47ca8fbd4dccf60979ccf190bb76baa5fe830471d77a7480aba2fc60385357a864a2e4c26991d44eb7dac92c203bc1ed8 SHA512 1affc6b1f7f48309f9af8d7b2328e6762c3b892f0f3c552f9a2409e545d9704e0e4f8529a8a5df40c1ff5f388e41e113f763e7af144c87351a6fc5756cd31b5c
-EBUILD cubeb-0.2_p20220922.ebuild 2842 BLAKE2B f4c9e0302cf24e98cd95c30da0a40b9d74b00d70eed90242dd79b9236b0310071c9499e367e84ca1a9b82328ea791f40fa1d9dac4a0981b4f8dfeebd0f9bd97b SHA512 8dcaa48ff0708fc82cfdd09902a264d74e1680ae6b561a6d6a1753183c5289327515ada583c991e0a914ebad64b5cf1d6bc792d3e4d781c4d1e5e95a166aa01b
+EBUILD cubeb-0.2_p20220922.ebuild 2727 BLAKE2B a6666bd3472559dc31928e95f5c114c93a7f91a4cdd31d501bf2ce682e608893df369fade893342590a579fe290bc0d3757292b91dd8fc3ad2e3f47111b4c5e3 SHA512 9efbb6cab07f32108e6cd6b3c5ff22c87bab154253f5583bd1828651cbd939d1313d5dba36e6854b9efe5b6db84213a549600992876e2ae9f248b3c9f925952a
 MISC metadata.xml 569 BLAKE2B 811caf3735182ee5d94f88c8b4b725deb0a64dda04e211759b2fd3c280a5f87e9c2fdb53dc2ef1fcaa50a83f6feb8ea5b58274815f97c05502144c7d372f8002 SHA512 7a8cd8ed6464e4249aa9ed97bf9f4ec9995b710c39cca631b6e42edbcfd85839815fba00db3577c60f343cb7b805fa97fd186542cd03cae05d58684415cc82a2
diff --git a/media-libs/cubeb/cubeb-0.2_p20220922.ebuild b/media-libs/cubeb/cubeb-0.2_p20220922.ebuild
index 7624610e5f4b..527199948dbe 100644
--- a/media-libs/cubeb/cubeb-0.2_p20220922.ebuild
+++ b/media-libs/cubeb/cubeb-0.2_p20220922.ebuild
@@ -33,7 +33,7 @@ S="${WORKDIR}/${PN}-${HASH_CUBEB}"
 
 LICENSE="ISC pulseaudio? ( rust? ( || ( Apache-2.0 MIT ) ) )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="alsa doc jack pulseaudio +rust sndio test"
 RESTRICT="!test? ( test )"
 
@@ -72,6 +72,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_RUST_LIBS=$(usex rust)
 		-DBUILD_TESTS=$(usex test)
+		-DBUILD_TOOLS=no # semi-broken without most backends and not needed
 		-DCHECK_ALSA=$(usex alsa)
 		-DCHECK_JACK=$(usex jack)
 		-DCHECK_PULSE=$(usex pulseaudio)
@@ -108,8 +109,4 @@ src_install() {
 	cmake_src_install
 
 	use doc && dodoc -r "${BUILD_DIR}"/docs/html
-
-	# the basic test tool users could use to check if audio works is rather
-	# limited and has a tendency to segfault if some backends are disabled
-	rm "${ED}"/usr/bin/cubeb-test || die
 }
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index e4c196391d2d..acbb8d4be334 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -5,10 +5,8 @@ AUX fontconfig-2.14.0-latin-update.patch 1889 BLAKE2B 42a5faab884bb47e645a8ee6f0
 AUX fontconfig-2.14.0-skip-bubblewrap-tests.patch 408 BLAKE2B 911a87e91dcdf49088e9a684a9af753464211f18fd471989410a57363dd71b7cc0940c9a8e61095d901b4d7ee804536262ebc6afb1af3f470d8cd164d2fd2113 SHA512 8302a3ccf5918c8a4c3af3ab3601752c005c0361003281996eba469195127fab0e99c8d225dcb674a1bc198f2c15b982cce49c6bb3234307cf58e47c9206ff5a
 AUX fontconfig-2.14.1-gperf-meson-debugging.patch 879 BLAKE2B a9697083b74ae9d7e48af9bd51fca347ef81d01e99731c31ec0535d7c9ff026f2ec41d9ad40454c72c88751b63fca6a24983b58aeae761a1a763f525136836dd SHA512 7f5d816b48ce558e87fe902ce70f6159281a6b34e7c3639997781930e9577dadad2c4d6dd929f243a5704d51db32134b5241060042f098d49dec8d83f816bb38
 AUX fontconfig-2.14.1-gperf-meson.patch 2559 BLAKE2B 203cdd0d208acaf417e81973810f2a1129f4e9ec75fb51addb36c29267943c4250d27926ab888cf339cf67e10c4ef7fd90d54990c819acfde796d4ec7dd8bd5a SHA512 b87e0506e374a04902a87bfa140fde9fcd4a1d769c249db8d218a32f0befcecca9ad7c7fe389806fc634b83d7a0100c568dba0e243f0a0c7f91e34ad6b5ac7d3
-DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58
 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
 DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73 SHA512 ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db
-EBUILD fontconfig-2.13.93.ebuild 6082 BLAKE2B 23984420c87f6e64be7b3b511c37f2c992ac739835bac59b97a06aee76b248cf3f8517804cad6d3152151d2105c1554a82aeac98af2a44f3aaa575ea20ec267d SHA512 6584dbc2c6c6e045d6450f5eff45073c88a1e936a1ad1ce67d4551706950c1c4eb68a01208cecd5a185eb69a6fc5a9f4f131cba9788c4b16409065ef75d5212d
 EBUILD fontconfig-2.14.0-r1.ebuild 6742 BLAKE2B 27a4b527cadce296d9e221c395cacc4ab22ee3fa20edbe8a736d88971e655cdd1381dc02879bae0935d0c5d97d1128a89d969b9bd764d67475d1fb185934e0c7 SHA512 b0989ef1f9365d433422ba3c2cee6d817ae0654702d59aa5ffdd05bb16e61e063fdbab912d734a7e350da5559f9f35d33d86583a00ce2748a3dab550e28cb73f
 EBUILD fontconfig-2.14.1.ebuild 6556 BLAKE2B e9808d495912d487ce2ebbfa0e6a180334e75c404d1bb415dc0617e2cadf636663c2e944b3906dbc76045b563724d37f997d00cd6f37df611e38e51f26b03ed6 SHA512 412b60c8afeb9c190a516c424d6ddc500eeecbb06102fe90b906eb559d36277de39760fb11ad1373b6f976ec476e6483cda3d787c0f27ec8753dd0c0c74d1006
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
deleted file mode 100644
index 1c12de903df3..000000000000
--- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="https://fontconfig.org/"
-SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="1.0"
-[[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc static-libs"
-
-# Test test-bz106632 is known to be broken, see bug #751232
-# and would require several backports. It will be fixed in
-# next version.
-# check-missing-doc is known to be broken, see bug #733608
-# because fontconfig-2.13.1-static_build.patch introduces a
-# function FcStrBuildFilename which is lacking documentation.
-# However, backporting isn't worth it. Will be fixed in
-# next version.
-RESTRICT="test"
-
-BDEPEND="dev-util/gperf
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	doc? (
-		=app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex]
-	)"
-# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
-# default and used by every distro.  See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9[${MULTILIB_USEDEP}]
-	!elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
-	elibc_Darwin? ( sys-libs/native-uuid )
-	elibc_SunOS? ( sys-libs/libuuid )
-	virtual/libintl[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-PDEPEND="virtual/ttf-fonts"
-# Put the eselect module in BDEPEND until EAPI 8 is ready for IDEPEND, so that
-# it is natively usable in BROOT to update ROOT when cross-compiling.
-BDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
-RDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.13.93-latin-update.patch # 130466 + make liberation default
-
-	# Patches from upstream (can usually be removed with next version bump)
-)
-
-pkg_setup() {
-	DOC_CONTENTS="Please make fontconfig configuration changes using
-	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
-	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/272
-	# Please remove on next version bump!
-	if [[ "${PV}" == 2.13.93 ]] ; then
-		local sgmlfile
-		for sgmlfile in doc/*.fncs ; do
-			touch -r ${sgmlfile} ${sgmlfile//.fncs/.sgml} || die
-		done
-	else
-		die "Forgot to clean up src_prepare()"
-	fi
-}
-
-multilib_src_configure() {
-	local addfonts
-	# harvest some font locations, such that users can benefit from the
-	# host OS's installed fonts
-	case ${CHOST} in
-		*-darwin*)
-			addfonts=",/Library/Fonts,/System/Library/Fonts"
-		;;
-		*-solaris*)
-			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
-				addfonts=",/usr/X/lib/X11/fonts/TrueType"
-			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
-				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
-		;;
-		*-linux-gnu)
-			use prefix && [[ -d /usr/share/fonts ]] && \
-				addfonts=",/usr/share/fonts"
-		;;
-	esac
-
-	local myeconfargs=(
-		$(multilib_native_use_enable doc docbook)
-		$(use_enable static-libs static)
-		$(multilib_native_enable docs)
-		--localstatedir="${EPREFIX}"/var
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts
-		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
-		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
-	default
-
-	# avoid calling this multiple times, bug #459210
-	if multilib_is_native_abi; then
-		# stuff installed from build-dir
-		emake -C doc DESTDIR="${D}" install-man
-
-		insinto /etc/fonts
-		doins fonts.conf
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-
-	# fc-lang directory contains language coverage datafiles
-	# which are needed to test the coverage of fonts.
-	insinto /usr/share/fc-lang
-	doins fc-lang/*.orth
-
-	dodoc doc/fontconfig-user.{txt,pdf}
-
-	if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ;  then
-		mv "${ED}"/usr/share/doc/fontconfig/* \
-			"${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"/usr/share/doc/fontconfig || die
-	fi
-
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' \
-		> "${T}"/37fontconfig || die
-	doenvd "${T}"/37fontconfig
-
-	# As of fontconfig 2.7, everything sticks their noses in here.
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' \
-		> "${ED}"/etc/sandbox.d/37fontconfig || die
-
-	readme.gentoo_create_doc
-
-	keepdir /var/cache/${PN}
-}
-
-pkg_preinst() {
-	# Bug #193476
-	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
-	# config files.  If we install as-is, we'll blow away user settings.
-	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then
-		local file f
-		for file in "${EROOT}"/etc/fonts/conf.avail/* ; do
-			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then
-				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" \
-						"${ED}"/etc/fonts/conf.d/ &>/dev/null
-			else
-				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
-			fi
-		done
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
-	find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
-
-	readme.gentoo_print_elog
-
-	if [[ -z ${ROOT} ]] ; then
-		multilib_pkg_postinst() {
-			ebegin "Creating global font cache for ${ABI}"
-			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
-			eend $?
-		}
-
-		multilib_parallel_foreach_abi multilib_pkg_postinst
-	fi
-}
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index ff217249c91b..b9f10cfcb836 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -5,5 +5,5 @@ DIST libopenshot-0.2.6.tar.gz 22472140 BLAKE2B 7ad35cfb927e637c4ded38de751f3f484
 DIST libopenshot-0.2.7.tar.gz 22472544 BLAKE2B 511ed214f0ecc43294a787e1c0119f036e274a1e8d051cb6e926bf7a9b5cea416325a2e051fca758d1f80ec2b9d746a4dd268e5ac5322fe8539fa2041a8c4d9d SHA512 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
 EBUILD libopenshot-0.2.5-r1.ebuild 2093 BLAKE2B ea194e811e7695bb0693dc4d596855b94b31154fa10a262eeb06c09a417dbb6f79485238f2582f0393344aa2c75fa8fa32c15517b6f6b22b9090bbe0ce5d15e4 SHA512 f070385aa981d298dba10ca14a6678c0013661a3033cd263531d8c5d951b57e98fb47e40a2a61b9e703e7fe51bcb198f89a2f3f8556989d152264478aacc38d2
 EBUILD libopenshot-0.2.6.ebuild 2214 BLAKE2B 694dfe6befa9af5cf0be420982e9512cf2f62a024471cd642c33a99082b06aca9e3c7a9a0cfdd37867a9076f2416d1e1f0992d42028c31488a492f68f35ea3f7 SHA512 26518253ebcc9e49eca4fc8f46174470d45cca9e0c86c80c31dd956b3a10c31eff7e96cabc920223e7328eae7af5b7885a599989b6990df55ce603cf40048951
-EBUILD libopenshot-0.2.7.ebuild 2233 BLAKE2B 1a63594b8931438d02b5fc692bdff06c4052a623f99a6278b677af16d0bef18396967b5155266fbbd2275421183f1410886bdb37e09cec058d461b65439f71b5 SHA512 82d5ca6fbc5e73f6ca19366b5e0181d6caf54c6437a2081821f1cdc4ea6fde6adb904cdcb7a6413ae47337b157eb905cb2442dafd7c4c8f34e1cafee21e8c395
+EBUILD libopenshot-0.2.7-r1.ebuild 2233 BLAKE2B 1a63594b8931438d02b5fc692bdff06c4052a623f99a6278b677af16d0bef18396967b5155266fbbd2275421183f1410886bdb37e09cec058d461b65439f71b5 SHA512 82d5ca6fbc5e73f6ca19366b5e0181d6caf54c6437a2081821f1cdc4ea6fde6adb904cdcb7a6413ae47337b157eb905cb2442dafd7c4c8f34e1cafee21e8c395
 MISC metadata.xml 616 BLAKE2B de66c4287ffe372cf76e3b48be340b0c981595f2381f8b248de88586cf9cad05b0a9cfc6465b55832db2bc76a5755ad5692494f5f2dc1dc9ee8a569887d50b34 SHA512 b2569b3545ef8a08ae3bc4b1307ee4414c82d488dea41efd4c3c977f2bcde65df273dc8f9aa44ba09abfc3a2fc19c8d83a3dd61faabddabe07bdb8c37f963c46
diff --git a/media-libs/libopenshot/libopenshot-0.2.7.ebuild b/media-libs/libopenshot/libopenshot-0.2.7-r1.ebuild
index 2b8a04af8424..2b8a04af8424 100644
--- a/media-libs/libopenshot/libopenshot-0.2.7.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.7-r1.ebuild
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a9a782f0bdfc..b0a01da406b8 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f08e679c09a4..1d4cce7b0ecf 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 20:09:52 +0000
+Fri, 28 Oct 2022 02:10:47 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 43f958c9110f..95f4913dbf01 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-27T20:09:55Z
+TIMESTAMP 2022-10-28T02:10:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNa5ZNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNbOitfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC2wQ/+NxeofL4wqKer6+D/Ruiz6tSo2PumFtj7ce6YuPduZolVQFDlagL/CQY0
-odVl41V8ny4aRuKYzkH6+cmXDYsYR8+15CJrps5FhlJYMAY4vVBQWQCjeHBEC0SV
-5ewnsTOQlqsJvirGSvrdWirJXxZ57eCl3p2s4GAbPLQksDTplpkkaaaIIRKxNnia
-/f3QrADKkx4GJc9bsn2yHCV8cNojNBRtxlP4Ui+RvGikx/HTol2jH+AQGQ3XXz3+
-CmE3dp1NHq16HVNnccRlzh+vzNloSArRwlRYnkI2CQk++zJ/kLWSeljanPa5dWSC
-ssAn36KmmVvnjCFs7w9nnGHlGOoqze/h3AmPguuOhiHYUq2W9qfdwyUcQ/VNIluZ
-fowLC1ZYUtTnPLNVZ/9CMEBZwDphCtTCRbiG+d/wQwmI9RBiVHjSfuoIydudjhtN
-wlAICxpr7gPzf2QAXK0ARP3c/gfc8oiTRQ+406jl/glK8OYC2G96ouduS/rShgzF
-vG5yHedo6iM+9O4so6lJuV5Cxop+o06bfF3EC8U4TSaGPLjsSbesKVPYRCcLoLYW
-vYvauCcYi4YGW3lT0/YyGmIcw7VgY+G+bmw87NGoIGIwtI2k4C6goHXjDc4ZWOcC
-JnUtsJb92Fr+saNTVD0mgR53g24P4ObhEnjtSCU8XgwEE7x+yT4=
-=cNZV
+klBwxw/9FR5SCxoiQ16JzZvHG8GRtoUEO6CwIK7Z3kAyCY+mLO0wN9bSIJBLPAie
+ogQ6aM81p1P2RZzy65ymo1UXfRAA/qZ6EO9nHoneshS9MIVyG5nwfV9PIw03nKc+
+B1FHkoiGe6z7raoqayRABxkmlH4HISK4bJyHsmMRG0JezpatvrjW8+6zPgS+orJc
+BohyuptZ+zdvQzP6CH+JxVk03YtUUdmeyqdc0Yxd+QKr/94J+zB7vYPiWy4u9pVy
+Fz0xMBq7dJe4DzdXT91eLR7HsDGhEEtbhEgbDdvyL7lH44rGHtrx9dm8vET81dVa
+MFNPRTY7jw1jfvn8OBjcsAtp2f8qQq8cT2z0pWSMugNSfqhHaj2nTa8oShC6XftC
+G2WR/FM4kjioj2NdFI2vZ+aZ7D5E/vTXkySPPWWRU2LPgPanrdMu3JeUsL2BKurd
+/toydXQ7ftHIVJ3L5qB1KJLjCXX5kijIXQSwwnuK0rGztFw650x08C1byyEcx+A0
+sE/y/m8nDEAX6JltZ5J/AgCezrlRbxkiIw1UoR2hniKYpBsaTFguA6wpIpxo+Use
+ZmbiqgUShn7q9gIIlijnvWQOqmaDafTGjxsQJjiz+U814mZxbZQlm3qqPkQ5xHmw
+2Wle9ewOULiD6i+H1nohKMdrto5C/+xgp/MoHCXHL0BJH3DJRPc=
+=pahv
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f08e679c09a4..ed825de9d265 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 20:09:52 +0000
+Fri, 28 Oct 2022 02:10:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 182d36860ecb..ff36c90f2f39 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 523c03668fc2..41ab2de81b18 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/tarlz-0.22 b/metadata/md5-cache/app-arch/tarlz-0.22
deleted file mode 100644
index 7b290f8adf63..000000000000
--- a/metadata/md5-cache/app-arch/tarlz-0.22
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DEFINED_PHASES=configure unpack
-DEPEND=>=app-arch/lzlib-1.12
-DESCRIPTION=A parallel archiver combining tar and lzip
-EAPI=8
-HOMEPAGE=https://www.nongnu.org/lzip/tarlz.html
-INHERIT=toolchain-funcs unpacker
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=>=app-arch/lzlib-1.12
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-0.22.tar.lz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=f89c5f41aa37c637b430f4d77ec72d58
diff --git a/metadata/md5-cache/app-arch/tarlz-0.23 b/metadata/md5-cache/app-arch/tarlz-0.23
index 4f3984d9c814..491a53eef86a 100644
--- a/metadata/md5-cache/app-arch/tarlz-0.23
+++ b/metadata/md5-cache/app-arch/tarlz-0.23
@@ -5,10 +5,10 @@ DESCRIPTION=A parallel archiver combining tar and lzip
 EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/tarlz.html
 INHERIT=toolchain-funcs unpacker
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=>=app-arch/lzlib-1.12
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-0.23.tar.lz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=e4ba041f85468996b9cf88039168e91e
+_md5_=027e555902c0504357cbb7fcc8cd69ad
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.5-r2 b/metadata/md5-cache/app-arch/xz-utils-5.2.5-r2
deleted file mode 100644
index 921a0f2e3353..000000000000
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.5-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-lassecollin ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
-DESCRIPTION=Utils for managing LZMA compressed files
-EAPI=7
-HOMEPAGE=https://tukaani.org/xz/
-INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
-IUSE=+extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
-RESTRICT=!extra-filters? ( test )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-5.2.5.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.5.tar.gz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=1e404b73652ba42597b504646d02957e
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 81cc611dfa1b..89a67c4f9a0f 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -7,7 +7,6 @@ INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript git-r3 auto
 IUSE=+extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 PROPERTIES=live
-RESTRICT=!extra-filters? ( test )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=9326c885437a27e6dc85329cd2ffdf08
+_md5_=ecf4c7c96862a76265bd39f7e7f65147
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 954af055515c..ec132dbee306 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2 b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
index fc4119fae064..2da1eb2d9fa1 100644
--- a/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
+++ b/metadata/md5-cache/app-crypt/mhash-0.9.9.9-r2
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mhash/mhash-0.9.9.9.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=51ad3b9e91c790ced44fc4d785906251
+_md5_=1a1e138cd822a0f465b25082ad23e720
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 37d4305ba60d..2a3c2d5d0d81 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.12.0 b/metadata/md5-cache/app-portage/iwdevtools-0.12.0
index 46cdaff678f0..12c7d4cd1578 100644
--- a/metadata/md5-cache/app-portage/iwdevtools-0.12.0
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.12.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ionenwks/iwdevtools
 INHERIT=meson optfeature
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.12.0.tar.gz -> iwdevtools-0.12.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=38dbace2cc50b20d9339350875faf52f
+_md5_=1dd1090faafac2d29fabef91c44e72c0
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7afbbb967dd0..2a66c54c3597 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/pdftk-3.3.3 b/metadata/md5-cache/app-text/pdftk-3.3.3
index 5b3463659976..2f05bc3cfea7 100644
--- a/metadata/md5-cache/app-text/pdftk-3.3.3
+++ b/metadata/md5-cache/app-text/pdftk-3.3.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/pdftk-java/pdftk
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/bcprov:0 dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/pdftk-java/pdftk/-/archive/v3.3.3/pdftk-v3.3.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=39924304075c5d7be0614595f7c4c014
+_md5_=aa638e153893b294cea8435323cd32db
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 6209873e6fdb..4818cbb8d7d1 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/fishbowl-1.4.1 b/metadata/md5-cache/dev-java/fishbowl-1.4.1
index be385b113ef1..25b5c020f150 100644
--- a/metadata/md5-cache/dev-java/fishbowl-1.4.1
+++ b/metadata/md5-cache/dev-java/fishbowl-1.4.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/stefanbirkner/fishbowl/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/fishbowl/archive/fishbowl-1.4.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=ca03456e4ef1d195563d59b971836c24
+_md5_=7926431a9c1ad7f82f68dfb45fabc973
diff --git a/metadata/md5-cache/dev-java/logback-core-1.2.11-r1 b/metadata/md5-cache/dev-java/logback-core-1.2.11-r1
index dedd4d9d751c..42b3e1127c9c 100644
--- a/metadata/md5-cache/dev-java/logback-core-1.2.11-r1
+++ b/metadata/md5-cache/dev-java/logback-core-1.2.11-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logback.qos.ch
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-servlet-api:4 dev-java/janino:0 dev-java/jansi:0 dev-java/javax-mail:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz -> logback-1.2.11.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=406e3c397fb885d3ddb0a027b9bc35e0
+_md5_=7218cf00cbd9b4db0bc6e52088799271
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.19.6 b/metadata/md5-cache/dev-java/protobuf-java-3.19.6
deleted file mode 100644
index 770d69277f1c..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.19.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/protobuf:0/30
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0/30
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz -> protobuf-3.19.6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=af4d4fb158481967ce14638867c3d7f6
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.20.3 b/metadata/md5-cache/dev-java/protobuf-java-3.20.3
deleted file mode 100644
index c045ece6dc20..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.20.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/protobuf:0/31
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0/31
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.20.3.tar.gz -> protobuf-3.20.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=6b0b3ca80a3094fffb40a070bafb1d3c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.21.8-r1 b/metadata/md5-cache/dev-java/protobuf-java-3.21.9
index 3608a52740dc..b3cb801c864f 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.21.8-r1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.21.9
@@ -11,6 +11,6 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.21.8.tar.gz -> protobuf-3.21.8.tar.gz
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.21.9.tar.gz -> protobuf-3.21.9.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=713fd9ede2f567d448ad066ec07131d6
+_md5_=000cb4f1dc1aa4b9f8524e5e071dc125
diff --git a/metadata/md5-cache/dev-java/system-rules-1.19.0 b/metadata/md5-cache/dev-java/system-rules-1.19.0
index 028ed97c5fe1..b20041956a4e 100644
--- a/metadata/md5-cache/dev-java/system-rules-1.19.0
+++ b/metadata/md5-cache/dev-java/system-rules-1.19.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://stefanbirkner.github.io/system-rules/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanbirkner/system-rules/archive/system-rules-1.19.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=66184340f7ec4dac9f498d0e8cc8f06a
+_md5_=99c09d7bec18b6cb525588968c5568bf
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67
index 455375b90806..3d15e278d3fa 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.67
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=source
-KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.67/src/apache-tomcat-9.0.67-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=2e1c0367bb158cb4746a9296639c4a13
+_md5_=89115bc19add62d8ea59308a19759575
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 47d92be9b29d..8f5aea9c4604 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/libpcre2-10.40-r1 b/metadata/md5-cache/dev-libs/libpcre2-10.40-r1
new file mode 100644
index 000000000000..f3d92d00d2c4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.40-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-philiphazel ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Perl-compatible regular expression library
+EAPI=7
+HOMEPAGE=https://www.pcre.org/
+INHERIT=flag-o-matic libtool multilib-minimal usr-ldscript verify-sig
+IUSE=bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=?? ( libedit readline )
+SLOT=0/3
+SRC_URI=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.40.tar.bz2 verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2.sig ) https://dev.gentoo.org/~whissi/dist/libpcre2/libpcre2-10.36-patchset-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/libpcre2-10.36-patchset-01.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=42967705b76be822addb73a880801c12
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ab5f63cdaebf..7f0d4c4e5a6e 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/uvloop-0.17.0 b/metadata/md5-cache/dev-python/uvloop-0.17.0
index 65853a014def..c9387038a1d3 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.17.0
+++ b/metadata/md5-cache/dev-python/uvloop-0.17.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/magicstack/uvloop/ https://pypi.org/project/uvloop/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 -riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 -riscv sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.17.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=62dad6b30e79d21230ef2933e0a43e0f
+_md5_=440f385ec4eaadbaa3c816555f2c3eeb
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 35155bc178a8..707468968ba4 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/android-tools-31.0.3 b/metadata/md5-cache/dev-util/android-tools-31.0.3
deleted file mode 100644
index 1c03aa162756..000000000000
--- a/metadata/md5-cache/dev-util/android-tools-31.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/go >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1=
-DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
-EAPI=7
-HOMEPAGE=https://github.com/nmeum/android-tools/ https://developer.android.com/
-INHERIT=cmake python-r1
-IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x86-linux
-LICENSE=Apache-2.0 BSD-2
-RDEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/nmeum/android-tools/releases/download/31.0.3/android-tools-31.0.3.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-install-e2fsdroid-ext2simg.patch https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-disable-werror-boringssl.patch
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=262706f4db1b887e0dae124edfb4cbea
diff --git a/metadata/md5-cache/dev-util/android-tools-31.0.3_p2 b/metadata/md5-cache/dev-util/android-tools-31.0.3_p2
deleted file mode 100644
index 5c3144b4e93b..000000000000
--- a/metadata/md5-cache/dev-util/android-tools-31.0.3_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/go >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1=
-DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
-EAPI=8
-HOMEPAGE=https://github.com/nmeum/android-tools/ https://developer.android.com/
-INHERIT=cmake python-r1
-IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x86-linux
-LICENSE=Apache-2.0 BSD-2
-RDEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=https://github.com/nmeum/android-tools/releases/download/31.0.3p2/android-tools-31.0.3p2.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b3a845bebf8a2ef53420259a0ec89f88
diff --git a/metadata/md5-cache/dev-util/android-tools-33.0.3 b/metadata/md5-cache/dev-util/android-tools-33.0.3
deleted file mode 100644
index bf5079c8e5d2..000000000000
--- a/metadata/md5-cache/dev-util/android-tools-33.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/go >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1=
-DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
-EAPI=8
-HOMEPAGE=https://github.com/nmeum/android-tools/ https://developer.android.com/
-INHERIT=cmake python-r1
-IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x86-linux
-LICENSE=Apache-2.0 BSD-2
-RDEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=https://github.com/nmeum/android-tools/releases/download/33.0.3/android-tools-33.0.3.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=db147b4d6d86edc8e06d8f4b3ac70315
diff --git a/metadata/md5-cache/dev-util/maturin-0.13.3 b/metadata/md5-cache/dev-util/maturin-0.13.3
deleted file mode 100644
index d6628254aff5..000000000000
--- a/metadata/md5-cache/dev-util/maturin-0.13.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-rust-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/boltons[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
-EAPI=8
-HOMEPAGE=https://maturin.rs/
-INHERIT=cargo distutils-r1 flag-o-matic
-IUSE=doc test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv ~s390 ~sparc ~x86
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 openssl doc? ( CC-BY-4.0 OFL-1.1 )
-RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.13.3.tar.gz -> maturin-0.13.3.gh.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.7.5/download -> aes-0.7.5.crate https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/anyhow/1.0.65/download -> anyhow-1.0.65.crate https://crates.io/api/v1/crates/async-io/1.9.0/download -> async-io-1.9.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.66/download -> backtrace-0.3.66.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.8.1/download -> block-modes-0.8.1.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.11.0/download -> bumpalo-3.11.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.2.1/download -> bytes-1.2.1.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.1/download -> cab-0.4.1.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/camino/1.1.1/download -> camino-1.1.1.crate https://crates.io/api/v1/crates/cargo-options/0.3.1/download -> cargo-options-0.3.1.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.10.4/download -> cargo-xwin-0.10.4.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.12.3/download -> cargo-zigbuild-0.12.3.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.0/download -> cargo_metadata-0.15.0.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfb/0.7.3/download -> cfb-0.7.3.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/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/cipher/0.3.0/download -> cipher-0.3.0.crate https://crates.io/api/v1/crates/clap/3.2.21/download -> clap-3.2.21.crate https://crates.io/api/v1/crates/clap_complete/3.2.5/download -> clap_complete-3.2.5.crate https://crates.io/api/v1/crates/clap_complete_fig/3.2.4/download -> clap_complete_fig-3.2.4.crate https://crates.io/api/v1/crates/clap_derive/3.2.18/download -> clap_derive-3.2.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/combine/4.6.6/download -> combine-4.6.6.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.4/download -> concurrent-queue-1.2.4.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.1/download -> console-0.15.1.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.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.10/download -> crossbeam-epoch-0.9.10.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.11/download -> crossbeam-utils-0.8.11.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/crypto-mac/0.11.1/download -> crypto-mac-0.11.1.crate https://crates.io/api/v1/crates/ctor/0.1.23/download -> ctor-0.1.23.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.2/download -> dialoguer-0.10.2.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.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/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.5/download -> fat-macho-0.4.5.crate https://crates.io/api/v1/crates/filetime/0.2.17/download -> filetime-0.2.17.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs-err/2.8.1/download -> fs-err-2.8.1.crate https://crates.io/api/v1/crates/futures/0.3.24/download -> futures-0.3.24.crate https://crates.io/api/v1/crates/futures-channel/0.3.24/download -> futures-channel-0.3.24.crate https://crates.io/api/v1/crates/futures-core/0.3.24/download -> futures-core-0.3.24.crate https://crates.io/api/v1/crates/futures-executor/0.3.24/download -> futures-executor-0.3.24.crate https://crates.io/api/v1/crates/futures-io/0.3.24/download -> futures-io-0.3.24.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.24/download -> futures-macro-0.3.24.crate https://crates.io/api/v1/crates/futures-sink/0.3.24/download -> futures-sink-0.3.24.crate https://crates.io/api/v1/crates/futures-task/0.3.24/download -> futures-task-0.3.24.crate https://crates.io/api/v1/crates/futures-util/0.3.24/download -> futures-util-0.3.24.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gimli/0.26.2/download -> gimli-0.26.2.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.9/download -> globset-0.4.9.crate https://crates.io/api/v1/crates/goblin/0.5.4/download -> goblin-0.5.4.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.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/hkdf/0.11.0/download -> hkdf-0.11.0.crate https://crates.io/api/v1/crates/hmac/0.11.0/download -> hmac-0.11.0.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/indicatif/0.17.1/download -> indicatif-0.17.1.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.4/download -> itertools-0.10.4.crate https://crates.io/api/v1/crates/itoa/1.0.3/download -> itoa-1.0.3.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/keyring/1.2.0/download -> keyring-1.2.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/lddtree/0.3.1/download -> lddtree-0.3.1.crate https://crates.io/api/v1/crates/libc/0.2.132/download -> libc-0.2.132.crate https://crates.io/api/v1/crates/lock_api/0.4.8/download -> lock_api-0.4.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.20.0/download -> minijinja-0.20.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.4/download -> miniz_oxide-0.5.4.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.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.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/object/0.29.0/download -> object-0.29.0.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.41/download -> openssl-0.10.41.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.22.0+1.1.1q/download -> openssl-src-111.22.0+1.1.1q.crate https://crates.io/api/v1/crates/openssl-sys/0.9.75/download -> openssl-sys-0.9.75.crate https://crates.io/api/v1/crates/os_str_bytes/6.3.0/download -> os_str_bytes-6.3.0.crate https://crates.io/api/v1/crates/os_type/2.4.0/download -> os_type-2.4.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.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.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/pep440/0.2.0/download -> pep440-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.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/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/1.0.0/download -> platform-info-1.0.0.crate https://crates.io/api/v1/crates/polling/2.3.0/download -> polling-2.3.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.4/download -> python-pkginfo-0.5.4.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.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.6.0/download -> regex-1.6.0.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.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/6.0.1/download -> rpassword-6.0.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/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustls/0.20.6/download -> rustls-0.20.6.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.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/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.2/download -> secret-service-2.0.2.crate https://crates.io/api/v1/crates/security-framework/2.7.0/download -> security-framework-2.7.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.14/download -> semver-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/serde_derive/1.0.144/download -> serde_derive-1.0.144.crate https://crates.io/api/v1/crates/serde_json/1.0.85/download -> serde_json-1.0.85.crate https://crates.io/api/v1/crates/serde_repr/0.1.9/download -> serde_repr-0.1.9.crate https://crates.io/api/v1/crates/sha2/0.10.5/download -> sha2-0.10.5.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.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.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.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/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.35/download -> thiserror-1.0.35.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.35/download -> thiserror-impl-1.0.35.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.14/download -> time-0.3.14.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/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.4/download -> toml_edit-0.14.4.crate https://crates.io/api/v1/crates/tracing/0.1.36/download -> tracing-0.1.36.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.22/download -> tracing-attributes-0.1.22.crate https://crates.io/api/v1/crates/tracing-core/0.1.29/download -> tracing-core-0.1.29.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.15/download -> tracing-subscriber-0.3.15.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.4/download -> unicode-ident-1.0.4.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.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/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.5.0/download -> ureq-2.5.0.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/uuid/1.1.2/download -> uuid-1.1.2.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.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.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/web-sys/0.3.60/download -> web-sys-0.3.60.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.4/download -> webpki-roots-0.22.4.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/which/4.3.0/download -> which-4.3.0.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-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.8/download -> xwin-0.2.8.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zbus/1.9.3/download -> zbus-1.9.3.crate https://crates.io/api/v1/crates/zbus_macros/1.9.3/download -> zbus_macros-1.9.3.crate https://crates.io/api/v1/crates/zip/0.6.2/download -> zip-0.6.2.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/indoc/1.0.6/download -> indoc-1.0.6.crate https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/libc/0.2.125/download -> libc-0.2.125.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.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/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/once_cell/1.11.0/download -> once_cell-1.11.0.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.38/download -> proc-macro2-1.0.38.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.0/download -> pyo3-build-config-0.16.0.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.0/download -> pyo3-ffi-0.16.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.3/download -> python3-dll-a-0.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.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/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.94/download -> syn-1.0.94.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/unindent/0.1.9/download -> unindent-0.1.9.crate )
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ee11a822bb159020d67264b87fdcd155
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 42fc1ce0309e..f734cff9dfe8 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.7.3329 b/metadata/md5-cache/games-emulation/pcsx2-1.7.3329
deleted file mode 100644
index 255eed1b831e..000000000000
--- a/metadata/md5-cache/games-emulation/pcsx2-1.7.3329
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl qt6? ( dev-qt/qttools[linguist] ) !qt6? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/cubeb media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-libs/libpulse ) ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
-DESCRIPTION=PlayStation 2 emulator
-EAPI=8
-HOMEPAGE=https://pcsx2.net/
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=cmake fcaps flag-o-matic wxwidgets
-IUSE=cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland +filecaps
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/cubeb media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-libs/libpulse ) ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland )
-REQUIRED_USE=cpu_flags_x86_sse4_1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PCSX2/pcsx2/archive/refs/tags/v1.7.3329.tar.gz -> pcsx2-1.7.3329.tar.gz vulkan? ( https://github.com/KhronosGroup/glslang/archive/c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5.tar.gz -> pcsx2-glslang-c9706bdda0.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/9f4c61a31435a7a90a314fc68aeb386c92a09c0f.tar.gz -> pcsx2-vulkan-headers-9f4c61a314.tar.gz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=358bb7600cc84c77c2a776e22376f1e2
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e1834a9399e8..44fea307ded6 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/cubeb-0.2_p20220922 b/metadata/md5-cache/media-libs/cubeb-0.2_p20220922
index 46c558f4fa1b..bf45280b8712 100644
--- a/metadata/md5-cache/media-libs/cubeb-0.2_p20220922
+++ b/metadata/md5-cache/media-libs/cubeb-0.2_p20220922
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mozilla/cubeb/
 INHERIT=cargo cmake flag-o-matic
 IUSE=alsa doc jack pulseaudio +rust sndio test debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=ISC pulseaudio? ( rust? ( || ( Apache-2.0 MIT ) ) )
 RDEPEND=media-libs/speexdsp alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) sndio? ( media-sound/sndio:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mozilla/cubeb/archive/93d1fa3fccdc22da37aa59f67b213591797db369.tar.gz -> cubeb-0.2_p20220922.tar.gz pulseaudio? ( rust? ( https://github.com/mozilla/cubeb-pulse-rs/archive/f32b3ef708c0bfb2c414c08971d638527353d376.tar.gz -> cubeb-pulse-rs-f32b3ef708.tar.gz https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.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/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cmake/0.1.48/download -> cmake-0.1.48.crate https://crates.io/api/v1/crates/cubeb-backend/0.10.1/download -> cubeb-backend-0.10.1.crate https://crates.io/api/v1/crates/cubeb-core/0.10.1/download -> cubeb-core-0.10.1.crate https://crates.io/api/v1/crates/cubeb-sys/0.10.1/download -> cubeb-sys-0.10.1.crate https://crates.io/api/v1/crates/libc/0.2.133/download -> libc-0.2.133.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/ringbuf/0.2.8/download -> ringbuf-0.2.8.crate https://crates.io/api/v1/crates/semver/1.0.14/download -> semver-1.0.14.crate ) )
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b5fab2483e7770f4078466da0bc6d3ea
+_md5_=3031b8965b5a6f4b0e97880c6091956d
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.13.93 b/metadata/md5-cache/media-libs/fontconfig-2.13.93
deleted file mode 100644
index 705f79d72b08..000000000000
--- a/metadata/md5-cache/media-libs/fontconfig-2.13.93
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* app-text/docbook-sgml-utils[jadetex] ) !x86-winnt? ( app-eselect/eselect-fontconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elibc_Darwin? ( sys-libs/native-uuid ) elibc_SunOS? ( sys-libs/libuuid ) virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=A library for configuring and customizing font access
-EAPI=7
-HOMEPAGE=https://fontconfig.org/
-INHERIT=autotools multilib-minimal readme.gentoo-r1
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=MIT
-PDEPEND=virtual/ttf-fonts
-RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elibc_Darwin? ( sys-libs/native-uuid ) elibc_SunOS? ( sys-libs/libuuid ) virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !x86-winnt? ( app-eselect/eselect-fontconfig )
-RESTRICT=test
-SLOT=1.0
-SRC_URI=https://fontconfig.org/release/fontconfig-2.13.93.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8a54b6a8134ebd0dea87e932c3f79f98
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.7 b/metadata/md5-cache/media-libs/libopenshot-0.2.7-r1
index 9e624ec9175d..9e624ec9175d 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.2.7
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.7-r1
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4217716189ed..c253c0a639d3 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/ipaudit-1.1 b/metadata/md5-cache/net-analyzer/ipaudit-1.1
index a6d23c529d98..ef5ff4e1f9c7 100644
--- a/metadata/md5-cache/net-analyzer/ipaudit-1.1
+++ b/metadata/md5-cache/net-analyzer/ipaudit-1.1
@@ -4,9 +4,9 @@ DESCRIPTION=IPAudit monitors network activity on a network by host, protocol and
 EAPI=8
 HOMEPAGE=https://ipaudit.sourceforge.net/
 IUSE=mysql
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=net-libs/libpcap sys-libs/zlib:= mysql? ( dev-db/mysql-connector-c:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/ipaudit/ipaudit-1.1.tar.gz
-_md5_=3fc92a13a446d46d155a1273d7426dbe
+_md5_=cb48ce0ad496e3404f332d5658989db3
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 676966fb7733..7c90d44ed8a4 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/grpc-1.43.0 b/metadata/md5-cache/net-libs/grpc-1.43.0
index 0a71ff8f55b9..763a8caeb004 100644
--- a/metadata/md5-cache/net-libs/grpc-1.43.0
+++ b/metadata/md5-cache/net-libs/grpc-1.43.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.grpc.io
 INHERIT=cmake
 IUSE=doc examples test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND==dev-cpp/abseil-cpp-20211102.0*:= >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] >=dev-libs/protobuf-3.18.1:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0/21.143
 SRC_URI=https://github.com/grpc/grpc/archive/v1.43.0.tar.gz -> grpc-1.43.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a6d1193afc054d9da01cb206a6f7b4e9
+_md5_=d11f7870e71218c76a7298f6edf1da5c
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 3cb1591bacf1..1f97291f7d08 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/transmission-3.00-r5 b/metadata/md5-cache/net-p2p/transmission-3.00-r5
index 5947eb41b73d..562926bf17c4 100644
--- a/metadata/md5-cache/net-p2p/transmission-3.00-r5
+++ b/metadata/md5-cache/net-p2p/transmission-3.00-r5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 INHERIT=cmake systemd xdg-utils
 IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/transmission-3.00.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5f2a2008fadf164a5e5c63e0c859f626
+_md5_=e66e86f99672382cbd095bdd001e6954
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index 59dd9302be3c..21e0ded6922e 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/murmur-1.4.287 b/metadata/md5-cache/net-voip/murmur-1.4.287
index 83efd9b179fd..2ae9c076903a 100644
--- a/metadata/md5-cache/net-voip/murmur-1.4.287
+++ b/metadata/md5-cache/net-voip/murmur-1.4.287
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.mumble.info
 INHERIT=cmake flag-o-matic systemd readme.gentoo-r1 tmpfiles
 IUSE=+dbus grpc +ice test zeroconf
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) grpc? ( net-libs/grpc ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) virtual/tmpfiles
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/v1.4.287/mumble-1.4.287.tar.gz https://dl.mumble.info/mumble-1.4.287.tar.gz https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz https://dev.gentoo.org/~concord/distfiles/mumble-1.4-crypto-threads.patch.xz https://dev.gentoo.org/~concord/distfiles/mumble-1.4-odr.patch.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eda4d469b9b259730fadfb699f20039e
+_md5_=cad58ff1dabf133bfac7373f10cae412
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index b263220b919e..224fff00b4e4 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/frp-0.45.0 b/metadata/md5-cache/net-vpn/frp-0.45.0
new file mode 100644
index 000000000000..f1661a101c9a
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/frp-0.45.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=A reverse proxy that exposes a server behind a NAT or firewall to the internet
+EAPI=7
+HOMEPAGE=https://github.com/fatedier/frp
+INHERIT=go-module systemd
+KEYWORDS=~amd64 ~riscv
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/zmedico/frp/archive/v0.45.0-vendor.tar.gz -> frp-0.45.0-vendor.tar.gz
+_eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0a7d02f94899ef360d2d47dbe0225cdb
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index ec04099dbf70..36bc98948414 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/nauty-2.7.4 b/metadata/md5-cache/sci-mathematics/nauty-2.7.4
index 0af035cb63e1..341e1ee0ea1f 100644
--- a/metadata/md5-cache/sci-mathematics/nauty-2.7.4
+++ b/metadata/md5-cache/sci-mathematics/nauty-2.7.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://pallini.di.uniroma1.it/
 INHERIT=autotools
 IUSE=examples
-KEYWORDS=amd64 ~arm ~riscv ~x86
+KEYWORDS=amd64 ~arm ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 sys-libs/zlib sci-mathematics/cliquer
 SLOT=0
 SRC_URI=https://pallini.di.uniroma1.it/nauty27r4.tar.gz mirror://debian/pool/main/n/nauty/nauty_2.7r4+ds-1.debian.tar.xz https://src.fedoraproject.org/rpms/nauty/raw/f35/f/nauty-includes.patch
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=13f778c5113ff843f49f857ec2670a6a
+_md5_=e5608c378fa52ebb9668cdd1e2561089
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4a3df88229d5..cf343a81e831 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/vbetool-1.2.2 b/metadata/md5-cache/sys-apps/vbetool-1.2.2
index 8cb7f36cad3b..542fa3e1d9ea 100644
--- a/metadata/md5-cache/sys-apps/vbetool-1.2.2
+++ b/metadata/md5-cache/sys-apps/vbetool-1.2.2
@@ -5,10 +5,10 @@ DESCRIPTION=Run real-mode video BIOS code to alter hw state (i.e. reinitialize v
 EAPI=8
 HOMEPAGE=https://cgit.freedesktop.org/~airlied/vbetool/
 INHERIT=autotools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libx86 sys-libs/zlib:= x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ionen/distfiles/vbetool-1.2.2.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8649278672523e2cb447c92fd2262b88
+_md5_=e98e2b2b172e43958af7a4936362d690
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 2f5a4764894f..f6125c8feb8f 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r1 b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
deleted file mode 100644
index 28f2504643d4..000000000000
--- a/metadata/md5-cache/sys-devel/flex-2.6.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/m4 nls? ( sys-devel/gettext ) test? ( sys-devel/bison ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The Fast Lexical Analyzer
-EAPI=7
-HOMEPAGE=https://github.com/westes/flex
-INHERIT=flag-o-matic libtool multilib-minimal toolchain-funcs
-IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=FLEX
-RDEPEND=sys-devel/m4
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=503481632d2a8b9adaf35c86b9666d12
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r3 b/metadata/md5-cache/sys-devel/flex-2.6.4-r4
index 2607e1d83e06..04e30e2fcc5d 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4-r3
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4-r4
@@ -10,6 +10,6 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
+SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-devel/flex/flex-2.6.4-autotools-regenerate.patch.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8891ae322079fb4bafbeee7f0b1cae0e
+_md5_=22c68a074ae32ca69ff9264a85a45807
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d837690756f7..3c9f4a9bc61e 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/cryptsetup-2.4.3-r2 b/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
index 5d3465789969..8ab729a8242f 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 INHERIT=linux-info tmpfiles
 IUSE=gcrypt kernel nettle +openssl +argon2 fips nls pwquality reencrypt ssh static static-libs test +udev urandom
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] ) dev-libs/json-c:= dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev:= ) virtual/tmpfiles
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt !ssh !udev !fips ) fips? ( !kernel !nettle )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.3.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3548db233e54ab147476ad740e81c1c8
+_md5_=61c778b61364c91f5cd7a3b71ec9a4f4
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1 b/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1
index ee6723a8e0d6..2fd19040d8ed 100644
--- a/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1
+++ b/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/
 INHERIT=autotools
 IUSE=selinux
-KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
 SLOT=0/9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.15.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=05eec2590b8b851d4eee03a39f6c9e4e
+_md5_=a8a77ec54bfd440c2d55ba79f9b1f827
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.16 b/metadata/md5-cache/sys-fs/lvm2-2.03.16
index b21be20d7b28..22ae221e8e2d 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.16
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.16
@@ -13,4 +13,4 @@ REQUIRED_USE=device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? (
 SLOT=0
 SRC_URI=https://sourceware.org/pub/lvm2/LVM2.2.03.16.tgz https://sourceware.org/pub/lvm2/old/LVM2.2.03.16.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c684d28de66eada8b88f0e7bdca72df0
+_md5_=7177129add855b426247e7ca9bc6fd22
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 5e0cd3f35599..5a784dcf3622 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/audit-3.0.9 b/metadata/md5-cache/sys-process/audit-3.0.9
index 9b9e909fb7f7..4ee49cbce084 100644
--- a/metadata/md5-cache/sys-process/audit-3.0.9
+++ b/metadata/md5-cache/sys-process/audit-3.0.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 INHERIT=autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript
 IUSE=gssapi ldap python static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 split-usr
-KEYWORDS=~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) sys-libs/libcap-ng
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.9.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=ba88dd3e3770e7451def90177c5b8641
+_md5_=994fa8388c58a73961fa9ffc6b517872
diff --git a/metadata/md5-cache/sys-process/procps-3.3.17-r1 b/metadata/md5-cache/sys-process/procps-3.3.17-r1
index 588d4e2cc5e6..4a2124c416e0 100644
--- a/metadata/md5-cache/sys-process/procps-3.3.17-r1
+++ b/metadata/md5-cache/sys-process/procps-3.3.17-r1
@@ -4,7 +4,7 @@ DEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unic
 DESCRIPTION=Standard informational utilities and process-handling tools
 EAPI=7
 HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
-INHERIT=flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
+INHERIT=flag-o-matic multilib-minimal usr-ldscript
 IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.17.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d3c15a2a3751a47467337f6ff9f2de9b
+_md5_=390afe10409e851fb4d5b4ee8f852531
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 2ed9c7934548..b34e991f4c80 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-9.0.67 b/metadata/md5-cache/www-servers/tomcat-9.0.67
index 2e26ba099170..a108dce21641 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.67
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.67
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-ant-2 prefix
 IUSE=extra-webapps doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.67:4.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.67/src/apache-tomcat-9.0.67-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.2.0/biz.aQute.bnd-6.2.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.2.0/biz.aQute.bndlib-6.2.0.jar
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fafc247f2998ffbc741126e488bb3f84
+_md5_=9011e000813038b08b10f89c4ceccac9
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 37a83da79d38..8e8e680e21af 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/kitty-0.26.4 b/metadata/md5-cache/x11-terms/kitty-0.26.4
index 61eb9c5f40b9..f69d957278e0 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.26.4
+++ b/metadata/md5-cache/x11-terms/kitty-0.26.4
@@ -7,7 +7,7 @@ HOMEPAGE=https://sw.kovidgoyal.net/kitty/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg verify-sig
 IUSE=+X test transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.4 ~x11-terms/kitty-terminfo-0.26.4 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
 REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -15,4 +15,4 @@ RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.4/kitty-0.26.4.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.26.4/kitty-0.26.4.tar.xz.sig )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1e416db60a36fb0defdd8764a4e8d0ba
+_md5_=caabea32b1ad9378b485274204897e5f
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index caf9726853f1..1c1f3d67224a 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_
 RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
 SLOT=0
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d2ead6637d7c3c790abbb35c49d3b77c
+_md5_=1e416db60a36fb0defdd8764a4e8d0ba
diff --git a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.4 b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.4
index c405524c2afa..85a8f5c7780f 100644
--- a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.4
+++ b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Shell integration scripts for kitty, a GPU-based terminal emulator
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.4/kitty-0.26.4.tar.xz
-_md5_=eb65127cac854c00116235a9993bbeb6
+_md5_=ee7faba1c6d745aad1c562c249237e30
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.4 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.4
index 587815b77817..ab4050fe8146 100644
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.4
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.4
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Terminfo for kitty, a GPU-based terminal emulator
 EAPI=8
 HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.4/kitty-0.26.4.tar.xz
-_md5_=4c49191f492e061eb3d5ee14ab5d3e90
+_md5_=9abf1d008afbb6d83de32698179705a4
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 35da8b6f568f..6939b2b5cb2f 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4
deleted file mode 100644
index 965ae54ef399..000000000000
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) virtual/pkgconfig test? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender test? ( dev-python/ewmh dev-python/python-xlib x11-apps/xsetroot x11-base/xorg-server[xephyr,xvfb] x11-misc/xdotool x11-terms/xterm )
-DESCRIPTION=A manual tiling window manager for X
-EAPI=8
-HOMEPAGE=https://herbstluftwm.org/
-INHERIT=cmake distutils-r1
-IUSE=+doc python test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.4.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=422e3210edfc1d58c56e14ddafcd9b19
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.5 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.5
index d49597ad3d83..0273f1d5fab4 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.5
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://herbstluftwm.org/
 INHERIT=cmake distutils-r1
 IUSE=+doc python test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.5.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2334e6bb53de13b3fa89fa2ca6aaf63f
+_md5_=422e3210edfc1d58c56e14ddafcd9b19
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e61d140b4706..deb36ecdf3c4 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-27T20:09:55Z
+TIMESTAMP 2022-10-28T02:10:51Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNa5ZNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNbOitfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCDtw//YSM3k5PuVVaSJm37evdlcdLTjdazKPKX4rsUhiQgkr8t014Rlq6XaCGW
-ChQc1VE+I3X8qwbGltYd3pFwSn0FAR2oe1/7TtG3l7NN9DjmyHTV7ZSzymRnS9fz
-arx2oOEwqtu8RM6T7o3+xYfEIHULBcnJQBVPs8MCLJGjHlB3UIpB9PtNvmKePVVa
-WHJHw2lw0JB4GaTZ5cvfXCTS1Az0IlJ3Cgt8wCm6cS7T6xim3HDrSw3anpLX6LJ0
-JTBR3QBVJ78E85GJRkE58fvvj9AzedE5n3YK4gAiRU+QUga7k5+vQm0Rc5F6B0us
-qAP47cuVnV8u8OHZdWWVq/iux6a7NysRKkfmgvtimHTbGQFAFHt2sBRzdi+vCUZI
-Vkq6PdrsXGZxSqG99jUM2hjO17XK29cpucPkUmTOrTqR5GfThair2wRUfAVg+FwV
-81AfU7CSWYzK7fVxpOVIU4sqDx0f8N8cNwUJryvCwHlV3kC1rUFgl7/+cGi4dtMv
-7P3GF8fCKfsyi9rh8eePJ2PQjQwk8DtD9ebSeE4dPRzq/eMWysB0JBEOryt2xjFd
-ZbVrtseOT6l3V1cTX84sCnMooLEheNWyRRJulxb5ezzFleIqb4PypME1ybydu3Gu
-a3pLs+vIKqIQPX5dd0f/TcWQbVophk42Gy8V/7htpfrbRGYV5/Y=
-=9wrB
+klAh2g//VlW9lTW71ds4CfJlKc/NsDpDjtx/MjrTf4RqEjDAvYrIUWwOlzD7qX1d
+FYpPB2310adhdr0z+0Xv7sB/uL+OZ8H55del4ioi2otX6ocYDGaK+7h+42f1tynE
+O8lzuCfklpDLKtvPwHhdDsZIttv3ipFmj7WWYuHEnbYBVsIKbNJW95agvzCHSIv0
+Rq89GXCUTpEuDDVeoaCp8pL4tFkgZ8O1R8GMzGDv6QbGHfFZuoLeh81bIfPPKxRP
+t+7N4o/R7hoalst3CoCbErv2jv9zRf7BkgXvOd5wTBVmoa70oh6Md1vXI5CuWdss
+2K19TZj8/wcD+rjn4rJ/pnVANA9crfn1ENHfbM9BLyI3SJInshf2TuVT2b9BxihV
+EmfScDvggU2L1ZviR/kD+Lin8t+3uLVhuXOqyR6ocpF4JnYi5pfPq3HVqv6K8K9U
+PikqMQz1ctqmE2YT744g2C24c/oLpbvlKlJK++Rd5d7Tm+14nrU6dg+g94O12q13
+8Ga8uuoQ/tkH2/WEbRtRw1RaRUAUAe73OwxjMhy1PX7zbVmRilRc+pWsQu2UJ+R0
+K1naXFQRugvuROUdaW8HVUw/LTLM41CrwWpo9zv8+0zXLQ5hkCS1plpIBEbC31i3
+atfAtvXGmZoK3mU5mJzBOwHcVGaUKokKS0GMz0bEu+zifAUpc6k=
+=+eQA
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f08e679c09a4..ed825de9d265 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 20:09:52 +0000
+Fri, 28 Oct 2022 02:10:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1ed25fa853fb..0009f02d0e93 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct 27 08:09:51 PM UTC 2022
+Fri Oct 28 02:10:47 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2ef06a0f084d..1ff42c1b7068 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 20:15:01 +0000
+Fri, 28 Oct 2022 02:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 766e23b846c7..16a847bcb5e6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1a996e19634a4f04cf05555a88f22af019975044 1666900945 2022-10-27T20:02:25+00:00
+dbd2882396b4fd98bec8809d7069bed59eb7aa4c 1666922527 2022-10-28T02:02:07+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9f915613f449..e3cb412dea34 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666901401 Thu 27 Oct 2022 08:10:01 PM UTC
+1666923001 Fri 28 Oct 2022 02:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f08e679c09a4..ed825de9d265 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Oct 2022 20:09:52 +0000
+Fri, 28 Oct 2022 02:10:48 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4b26c230bba9..bfc8e6438f3f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest
index 9e71f123d03a..d666c052cd83 100644
--- a/net-analyzer/ipaudit/Manifest
+++ b/net-analyzer/ipaudit/Manifest
@@ -1,5 +1,5 @@
 DIST ipaudit-1.0BETA2.tar.gz 135680 BLAKE2B 2a8e7754251c743758d6e0d7008d904a3a237c26a660f5c07661c632dd75ecda6cf3b04253eb76f64c72ed278da00030cf64231bdc4760a6b04df1497f628ec2 SHA512 3a8890821c515aea95762eeb2cc7a649533ff739984c944bcb26acb72434e1f2b453a98365719fce9e062d6262b9d76ac389f149ad2a19361422783bc0b55e09
 DIST ipaudit-1.1.tar.gz 170253 BLAKE2B 6515cab817a35835d5c3eb33dc4d8c9f28a1ceb906854e55c3695fc6ee5d230ad2ae6a6fd59849623e161fe4deb5013f55bdf6effcaaf6ca4d064ded73c148f0 SHA512 5eb1971b454c8c96c02dc260e537a9a627554b7c9d1e269be9de2ffdb5cbfed00272b643de7b15865659cef0db482e4c460f96b1545bcd6c4f208c96d7401ef9
 EBUILD ipaudit-1.0_beta2-r1.ebuild 572 BLAKE2B 3da67855fe463b17ae3fd1df3faf82e491cb38ca2f05808679a86f9fc33d850374f95cc78b86f64198831e4859e5ce0124bd40b058a34bcaadd921ed548f5ae8 SHA512 ff10e20d8ab5844822ed36a54d1d94636507af73ff4683c0e25253938491bcf9898b1658e5f60be9709488d911e80f72cdd0b6edaea24a91ee1eb37e5de544bf
-EBUILD ipaudit-1.1.ebuild 514 BLAKE2B 95c18599d1b86fe1a86a0b70a0807726e48801f913dbd9aef59773106dfa0666de3e65e50d61f00aea7be08eee2ee514147e6068cba2098ac39b533a8abe93fc SHA512 66e22ce800acbe07f7701612ad806099f8d30caf016078b108351afe081681a56f22e1ea08e5d1b72d6bf30053304323015a569500cb8ae4e2e8c354218d1d4b
+EBUILD ipaudit-1.1.ebuild 512 BLAKE2B 304111f0f0a1c7f425d474dfbd50e331516cf2ab384b35150c45e039045831db9227023941d6d0f284ade101d2967e751a7dadcb721f585c4a7e2a12dab4f64b SHA512 51a259811bc53886992bcd87d73f3ce373e52871142e00c6ae92d09aa8c5a02fe95c45b51aa29a2664e45ec5275f8b72fbe534292ab739b1db219045282c7202
 MISC metadata.xml 338 BLAKE2B 340f5c1773bbf5d3acb294d752edcc8be524d3a1bf9feacab11766f658a2a61e47da8e878ea1e1e6174d898e3d349d5f9bed0dcf6997c08e44b4fbf74d954360 SHA512 91d56934279db25b950f0f0e97983bff931a44690d416e77a673931d879a9af8274bf297c1ad6a9cb0a2682a7460ae10f31f86c155a52b4197a30c609c21ff4f
diff --git a/net-analyzer/ipaudit/ipaudit-1.1.ebuild b/net-analyzer/ipaudit/ipaudit-1.1.ebuild
index bec71b59b5a9..dc1733d16940 100644
--- a/net-analyzer/ipaudit/ipaudit-1.1.ebuild
+++ b/net-analyzer/ipaudit/ipaudit-1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="mysql"
 
 RDEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3ad6591f041f..185a6b20f65f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 9fa382b3b845..37aedf2f95e0 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -5,5 +5,5 @@ DIST grpc-1.43.0.tar.gz 8540919 BLAKE2B dc78026129a5d23e864c92a210e8de845a4bad88
 EBUILD grpc-1.38.1.ebuild 2731 BLAKE2B ca17d04e0ad895020cf096eb98dfe01e53c312e8afd0ae868ecb10012cfa1c06749dd0031489996f0d5e7367e4a2e579d713199a31372062cd4bfe62712e118c SHA512 23e9cd3479cf10dd80ae704eda03d9004143bffedc3458904840fd36801d0aa33be1027b2447da02f2f93ee1dbf11112aa7a43aaf5c71eff9632ef0bda862f4c
 EBUILD grpc-1.41.0.ebuild 2731 BLAKE2B bef8c072cc2ba43ead5fb71e4be67d25a5c67cacff38c2cdf095b4a7b8b8b140c4ef08d5afb6b6f5cc5357cf704f99ee55489e1b6bc393127b31afaf97133f8f SHA512 1e776f2f77bca939bd266b7b09dc17f3be1f1a94dfee7840883e8cc6549162b9a78e87c17fd77557cf1ca290c6bcdb9304f2a38aea489784a421a6165fbc4c70
 EBUILD grpc-1.41.1.ebuild 2729 BLAKE2B 37976ad98ac36165558f1bb4c834a9da8f74ca8c5720a983eed0945c1f1dc70e05b3471dc01c64a6fe1977801399ffc5eada1ee730e287f4b5ef8f1c86f1b95e SHA512 4f8e248f9b1105d92eb4b3d16e7b09c66e8e60e8b49e607cb593c2c91a64b6fd52e56c1c95fe62ba688ebe9b1d09cf4f4d75e30c5f92167af1055ac8a6e4ec4d
-EBUILD grpc-1.43.0.ebuild 2686 BLAKE2B 483e511a57cd533056a36962339fc90a28455cd083f0911d238acaa7a1dcc99d6caef79d7745037974fafaa40b31e7749a9407927c2d149090c78b9388ccc8cf SHA512 7663a0503307a26e197554ebbe9f5b7f1b3cbe8730e07db0fc59ef3842ee863b6d81010d8522de6ff529171bdf703436bb005585b1cdb6b94c091a022d70f974
+EBUILD grpc-1.43.0.ebuild 2685 BLAKE2B bc41bdad51ae91045d391714d9f46d970806878f49ba07a5a9a95e5bd837f53edf054e18d87e50b9f1d4dc7487656bea08f1423a5c4345d4cce2a3d6f9b01187 SHA512 3ffc2bf03460d89bc663513b1b5cd379d7fea09fcec8ba2903069db30f2abbca4cd820cb11fc887e313d005d9e15683ea14fe08268a24bdb72af9039d32c2d20
 MISC metadata.xml 460 BLAKE2B 5cd969a5813d9d872d63cad0ebe0e02381cc8e97d0eb16ae9821f24de78c69f3670dfd6698388b17165d6a3c2029d213dd1f0e88ecda42215b0b3dfc64758657 SHA512 32148c45e964de16405ed7820c2066d5332f85047b3606f0189e9a306825b291478672dd108b0e1869086103e2f9a3a283b7a30379a883c79709cdf0fba18c4d
diff --git a/net-libs/grpc/grpc-1.43.0.ebuild b/net-libs/grpc/grpc-1.43.0.ebuild
index 8aa4ce2c1860..a2adc4804b4c 100644
--- a/net-libs/grpc/grpc-1.43.0.ebuild
+++ b/net-libs/grpc/grpc-1.43.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
 SLOT="0/21.143"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="doc examples test"
 
 # look for submodule versions in third_party dir
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 4bff86c97e54..7cfe0a8a72f5 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index cae9c630741d..ea0a885231f2 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -8,7 +8,7 @@ AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3a
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
 DIST transmission-4.0.0-beta.1+r98cf7d9b3c.tar.xz 9481044 BLAKE2B 99d287645f4c28a9f021c0923712ca2b0246be53c26b2654a50e00dc7b3db51b7de304280f6ae2d57c879d96ebe811163af3c38a29e64764712d926fa5c3fb0f SHA512 1bd4265e708070577a5624ee33ab8b0a71baa6d12d121974be6c104078289892f35cab6ddb22070c749d8c1333996ad83eb6f08adf96ea492d96104cab550d60
 EBUILD transmission-3.00-r1.ebuild 3115 BLAKE2B 127e0f735cf5790d6a836ad732c3e8e414211d8d299ce90f244011ad8dc4e96bd1a5e69f735b0442cc7192415016fab5c7e81bb5cc37bf6c388c03a54b8c5d89 SHA512 3a867649911e8937c120f890c7a69dd01ef56e3e718212e5d5514308683e514049f4afe975e76340c78a1c389df076822ce02e1f2b36e6ec42fe4753ad8acfda
-EBUILD transmission-3.00-r5.ebuild 3200 BLAKE2B 02c6c6cb69cc5ada8c52a67f5d9128707eb84fd9ac91a218430b3a30cc9ff775c328d0b26c561c6696ba0f6e649d0cdcd04f87c23040547742c9e4e48743df93 SHA512 c3ae60e20c1e35b91e9538446620a65603cf2d42682f8215178f549a0cecae8fafd626ccd7db77e6472a638430c723e082f80ce55bcf3c9d3aa736c396d929d7
+EBUILD transmission-3.00-r5.ebuild 3199 BLAKE2B 82eb8401c1c197d5ca96bcf2105a12bd9d5e91e29d030a3b887028dc75cbe7a622d25120477d2424f418664448e49f66782552b373bf433e34f93116600c28a0 SHA512 5dbb34656a2f04d95179bf6702aa09ed34262864172570fa9ccf969d689c5e8b4d0d98d12ad590e8c26849342da99782527e33a2ebb22686a18c875f1ab2fcc7
 EBUILD transmission-4.0.0_beta1.ebuild 3452 BLAKE2B dbb6053f8d4b01a72d9f35dc7f0ae8594066139b2dd581975b238467eaf35de3caff4f5368c421534869834ac01c06542b1b94332b58ea2a4476626810ee5945 SHA512 e59c2838394c939aea685a0fa35cb46674e704fec0aa45acf5239396e419e8089faa3a5a65c4cb395f77c8c3ae7f39acdf8b0e6ac434b0e1286f883b94a996d1
 EBUILD transmission-9999.ebuild 3452 BLAKE2B dbb6053f8d4b01a72d9f35dc7f0ae8594066139b2dd581975b238467eaf35de3caff4f5368c421534869834ac01c06542b1b94332b58ea2a4476626810ee5945 SHA512 e59c2838394c939aea685a0fa35cb46674e704fec0aa45acf5239396e419e8089faa3a5a65c4cb395f77c8c3ae7f39acdf8b0e6ac434b0e1286f883b94a996d1
 MISC metadata.xml 521 BLAKE2B db648a0b6ddc014b568aa5a14ce5da9a9e519756264110b58ddd36bdced1a06a1db0c662cd619e2ea74c56b7ef3f8ceaedb729fb3822816c6a42014208e02184 SHA512 ae4d1791d7c5a44482367ecba5b5b1b9d38521d834d9bacd7f69978895bdf2a18db09eeb892364b73b4cd2516c67759d9b1472e1899ec3151dbcf23638ef24fb
diff --git a/net-p2p/transmission/transmission-3.00-r5.ebuild b/net-p2p/transmission/transmission-3.00-r5.ebuild
index c3299d58362c..bcda90af6099 100644
--- a/net-p2p/transmission/transmission-3.00-r5.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index af33d504fa89..451f8208c9ce 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index 9bbe5aabb12d..c202252d2919 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -11,6 +11,6 @@ DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B db1909eaab0bd1fca1f65023ff695c753af77
 DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
 EBUILD murmur-1.3.4.ebuild 3708 BLAKE2B 5d8adec92ba1d2a34bd785991e228cce40076d3e84be69b1c8ac35b84a4fa5e83fbd7feb17a63bde98008bab56f75c973d64db2fd98033f59721ffb157255e83 SHA512 c224ea63b57a387cfabaaa9a1ff6358113ecc29b7862a6add2f3dfa5e70d06d22c1132118e83e00a33b06f1448ea582781e4a6cb26e7ede55d34502a9a91376a
 EBUILD murmur-1.4.274-r1.ebuild 4423 BLAKE2B 2692dbcb799b593cd49b94acdd863d26a6181917b2bdd85a26d55c780f1c7e95efcd9f00380ed1f5baf2be9d1fe199a78ffa33293372155aa99f1bf1bc1b7ccd SHA512 54c3391cffd6b3a1b04745259c8cd50c59ad9479b24a93bd3a09b417ae0dc4dd5ff89e3753d263af58c104456de64f5df8c5b96e10e1600f3b0b931735aca7bc
-EBUILD murmur-1.4.287.ebuild 4421 BLAKE2B b3b15df114983104d81690fbffa316224a0a5fa9a388b9d085db2e1ccd65714b6a7a3764484296de4f95bad0d5f6299e152df4dbfbd9fbd8b155c0d61f90f4e5 SHA512 3bbadeb1e6e1eb068421d34146afd95b486efab3336a8f3b1dbdbe23c78509b6f1c3171cde043a0d94ef70e170487e9400c01bc8c8b4d049bbcb7c69dbe41563
+EBUILD murmur-1.4.287.ebuild 4420 BLAKE2B 804fe4297784539036e3d50f5499db62027ff045175829f5a3e209dd941c6422298213010fd75dfc1f7fcf3ab865602c0e9b0661dd6ba2153416f224713f27d4 SHA512 7ebd9dad51bce41fde3b32256d39b67d1caa8f5d210a0e89e2e76c104e642cb617b087336ab476ac79e2a122b3558f393130aa97d0a42ed48dfab386319e7314
 EBUILD murmur-9999.ebuild 4096 BLAKE2B a8dab155ddfb00225078bae416c6ae061f591161debac32a0cf0cabfe77a4718af990055c19edd6bdce1120b2ef600b8ce2615300181515051b52b7ca5f85b2c SHA512 236ff227654dea5bc0c92edf12afd417871d10fc6a0eef230be09420b81619c371c18bd8e6c8d207f5f6be51480ede954a57fce3c36bba8da77093a14b84fd56
 MISC metadata.xml 532 BLAKE2B 033c64eda04542535df56a2ab4daedb41367f776873b757610e41a7afc450cc8acc2679f07dc749a75c82b6ac2b904fe8d63afa2ca6f017263d0230269e7bc78 SHA512 7ec514d46eb13c349514504ba976f8f787202497354515be2535793d3b1a9e287c210b861bec5778ce7d6de17aa40819c1520e58642ddc384cae6d009c193c24
diff --git a/net-voip/murmur/murmur-1.4.287.ebuild b/net-voip/murmur/murmur-1.4.287.ebuild
index dd54433ffd16..3403c3b206d9 100644
--- a/net-voip/murmur/murmur-1.4.287.ebuild
+++ b/net-voip/murmur/murmur-1.4.287.ebuild
@@ -24,7 +24,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${MY_P}.src"
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 82159689ae2d..1b911bcf6eb8 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index 870318ac5c56..7adcbcad2818 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -6,7 +6,9 @@ DIST frp-0.42.0-deps.tar.xz 40716624 BLAKE2B 60f8f1486c0c83627954f45d55fff6e4256
 DIST frp-0.42.0.tar.gz 1280863 BLAKE2B 5377aeb7ef83ace3a36772bf56ab671a91688da6d6b54ce23833221cc7cadee1107a3a5d1ad8a615bb7b4e6cc6eca214888449481ad18584ca03f1b0bc484be2 SHA512 b61786a1023a09d9f854e09c406ac241c4a8684fb903511b70adc7527c44d80df92b2d3493fe49e9e04d19dbd994b8fe866285862c88ff89f090860c3bda1987
 DIST frp-0.43.0.tar.gz 1282855 BLAKE2B d2e60e89de8823ae129f91aa2cf50fe5101bcc3c42d63fde48febf89cb2511e5ecabaf799803cf6ba0042b523ef1a3de19fb7d027a34074df0ccb40ba8393b86 SHA512 e6ccbf98d9d8fb714f37784ca582684b9f27994cf3f74b7081043285394243a8e9114b65f0918b64207a99064422312d700d01adaed085175314ad0ae238eb8f
 DIST frp-0.44.0.tar.gz 1284095 BLAKE2B 35464acd0dcdf3eeeb326c612eeef457baad5a8a7eb36a28183fd3dd1f1eb585914ed290a0897928244ac1319f45358c0b19ae3606cb149501c7ead79ba2e26e SHA512 6a5d0f4985075e260bc7970031391b457a3c7b8ea05628f17b551ea9afc0f2454db76caaad49250a2aecdd7ca26abc8ff74ee705a4c44319d33a92e5c055fd56
+DIST frp-0.45.0-vendor.tar.gz 5301832 BLAKE2B 23198a326678f3ec5357ce1bd6c7abff26a27dce6810653ef0262fb3f5c68165481ec75218ded64c90a357fafefba11b0a9c0afc4dc7e3a229ad8cc245a76fc3 SHA512 b94dd5adec82ae940044d448ec4551ca24ec3c8f1a9d870327a76a9a7d3b39e7dc567199a999b85879637dca3d46df65f8f46d11c3dbe10653a20f2eb7521f9a
 EBUILD frp-0.42.0.ebuild 867 BLAKE2B 5cf05d20c378625fdba349796b2a84ade9c58fc180b7cf94f9710f00843471b7a9486db0fb48063e46fce7f661985a0a1f4176a76fd4c63a4a8dde512b1d621b SHA512 e61f2e1721b0afbcb1777f26559ba426b6d7330d359a20db09c68e3d393ea808bdc689132cd8b71e9b9e31aa6885a10388cf906deae433e7423ca00da2eda7d2
 EBUILD frp-0.43.0.ebuild 1013 BLAKE2B e44c3ec402f582c4a17132e45379ec5be8e87b6574e16575be82e26e452078472985d1e0f4a4b34b7cd7f685c3d469cb6db68e6f4ce70e204a3c4d197cff27a0 SHA512 50182b1948739fe3fe16f0fd9e6573340d1e6d51bbbcb5d98998f8fa584d2498b2d8628453c529e025a4e4497714be4906b13c58cc04b848741893d0e8e96ca9
 EBUILD frp-0.44.0.ebuild 1013 BLAKE2B e44c3ec402f582c4a17132e45379ec5be8e87b6574e16575be82e26e452078472985d1e0f4a4b34b7cd7f685c3d469cb6db68e6f4ce70e204a3c4d197cff27a0 SHA512 50182b1948739fe3fe16f0fd9e6573340d1e6d51bbbcb5d98998f8fa584d2498b2d8628453c529e025a4e4497714be4906b13c58cc04b848741893d0e8e96ca9
+EBUILD frp-0.45.0.ebuild 990 BLAKE2B 56e537db90e618c9c97f8b3e0e406f7885283ccdd7c729027312e09b42de832ca22b9cda21213e6b8b56648a304aa1a23ed3290134392f66f0fd8e75b4923b1b SHA512 4aa23f563ac27bb068f754abd39991e004b2b30194de80a160a14517896338d89e572c120d3ac7c1216948c504076e8bddc2037baa1affaee46fd834b08ad974
 MISC metadata.xml 322 BLAKE2B 8438877d202ce024eb32c6ba8196e1d6bf14b2e29179be7a0c92fb521f110b2501f29f8961752b5bfe07e2c5ddbaae6f1ea087713259c26c3255e985003d56a5 SHA512 3204b6e7ff9565b4677ffa681e88c440e12fea53936d31cd6617f6e86180f92729e5f28f7b81419b131150a89fec364a073249047cf1a36066199b76e5c174ab
diff --git a/net-vpn/frp/frp-0.45.0.ebuild b/net-vpn/frp/frp-0.45.0.ebuild
new file mode 100644
index 000000000000..86b8693dbf14
--- /dev/null
+++ b/net-vpn/frp/frp-0.45.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
+HOMEPAGE="https://github.com/fatedier/frp"
+SRC_URI="https://github.com/zmedico/frp/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+S=${WORKDIR}/${P}-vendor
+
+src_prepare() {
+	# patch LDFLAGS to preserve symbol table #792408
+	sed -e "s|^\\(LDFLAGS :=\\) -s \\(.*\\)|\1 \2|" -i Makefile || die
+	default
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	local x
+	dobin bin/{frpc,frps}
+	dodoc README*.md
+	systemd_dounit "${FILESDIR}"/frp{c,s}.service
+	systemd_newunit "${FILESDIR}"/frpc_at_.service frpc@.service
+	systemd_newunit "${FILESDIR}"/frps_at_.service frps@.service
+	insinto /etc/frp
+	for x in conf/*.ini; do mv "${x}"{,.example}; done
+	doins conf/*.example
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 96ad0af6f122..c2eeba924f19 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index ccb293d67572..2041b0503dd6 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -4,5 +4,5 @@ DIST nauty27r4.tar.gz 1731562 BLAKE2B 104481e5af3333b60574a7185848832ad08b0cfeb8
 DIST nauty_2.7r3+ds-1.debian.tar.xz 45520 BLAKE2B 5078ab84d1fcdbddc0f7442ebed57fb63551701295615b99f2833c300168dd7f71205fa3cc2e9ea977f52e389b67883b68e7d5d39e1698c6040913e4571fa4f9 SHA512 8618c78a7c6f1d579cb20048fcf55fb45b69d8d1cebd7f2c9aee664768ab78f0ab1930863c8475a153c9ac9f4692cf6e43f96d01c4a219eae1f23bb61cb50407
 DIST nauty_2.7r4+ds-1.debian.tar.xz 45712 BLAKE2B e4a7a1d2b70b5fa969f708bbd56b47aaf422c268be23ffa7ceb3f9cc21ff8d27270556adadd43fe60309e7840e1541a586b1d9d42d90ba6207801e170b747922 SHA512 7384e7637a875c35f6da94707576aa26a94f981a750eb80991a837fa9ae245680f11ca57cf24a9efe1164dcd386c9888270688c1b3de30d1a81b67bb7c670dd9
 EBUILD nauty-2.7.3.ebuild 1961 BLAKE2B af67f6907cc1ccf3bae706626e1d682c33b55aa0f0b85773968cf07f6d2ee5d7a3692d948f7aaf4ebfb30827c177f63db6fe2e7d0fe99165c720b555f4259645 SHA512 93691377b8e67eca41e8d80c2902f91c8182714eff9f3c4cae2e4afd03d379b71c0f710785671a35569105b6294abb8d4fcb9e57ab6c82ba06814955dd01dc66
-EBUILD nauty-2.7.4.ebuild 2319 BLAKE2B 54bbd896ec97e601f82fd2ced1ccc832b51c03fa5cd023aa0f2c2e785334d58b27a257d9d3e97c06e5b02b8c1ae09e43b184842c4cec5b82bc36ed518d83fc99 SHA512 9f3a9685a046b14f51671a192b70d17b7725a3124905be094e3a20eb1f2ec23f9fe7a742c7ca68217a638a984834c3d159b40562e62e8b6b3f0c5d48e56830c0
+EBUILD nauty-2.7.4.ebuild 2318 BLAKE2B 2dd9d949fd6ce32e77c66b7fe8dbe1cf09c01d554a5293843550921b2266eafdff5b95112850ef1860971d0530c719c27ced2dd425651150ed7e7cd6cd174b03 SHA512 505a7dc984b7f49fcc033a32fea185cffebc99bc66eebde505980810cb9516228eedbc68cd98187355bbaa829c74bfba4dc503ce8bcdf1a4cbd84d93f8250875
 MISC metadata.xml 554 BLAKE2B a6fbface4e867c9299680da9d2fefce4194771220489b4d9a81d295bbf1a8048fe1bf23e3c3225501a18b23af8a7daea3533f8a7c250afc7f9a4bbbf60fc8efd SHA512 c7b67c8516b9bad6cd9f60a54b3b3a4974a72e81071f53cd6562a5bea2e2b8ae990119e4391615dd3b2e30282bf70924c4f2f4b5ccd3dcf1cb7399e7de189387
diff --git a/sci-mathematics/nauty/nauty-2.7.4.ebuild b/sci-mathematics/nauty/nauty-2.7.4.ebuild
index 0666c53100dc..a07631e57792 100644
--- a/sci-mathematics/nauty/nauty-2.7.4.ebuild
+++ b/sci-mathematics/nauty/nauty-2.7.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE="examples"
 
 BDEPEND="sys-apps/help2man"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f49bd4842399..8ae96e6a579d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest
index 7709f92fc63c..4187b0822e90 100644
--- a/sys-apps/vbetool/Manifest
+++ b/sys-apps/vbetool/Manifest
@@ -3,5 +3,5 @@ AUX vbetool-1.2.2-libx86.patch 198 BLAKE2B c0f2fe6e624c14973c917d5e197aeb124c7e3
 DIST vbetool-1.1.tar.gz 182826 BLAKE2B 6b30eb468e55bedd766161e373e042b5fdf38fd2926bfc8aeb94404350864e835d41642f19be155fcf9a8fbfdc8b4e237e742cabd00626db5e8d17e7c7c5cf6f SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96
 DIST vbetool-1.2.2.tar.xz 22032 BLAKE2B 0ab3263d347ad382c73265e08bb2d81468e1066212a282eee972f1e806a8cef94a0194878a8f2a113d3c139a58b9b18a8e3e6153ce868803bd74c3724e61d9d2 SHA512 658028e6fd1e1218c08a55de75009b6256f46dd22e259a5ab605d4686baf909688997882ba98ee7bee9b26b0dd334a38ddd7e63d8884626f8c3e0cedf87c4dea
 EBUILD vbetool-1.1-r1.ebuild 626 BLAKE2B 1b17878763988226bf825c6ac2018caa4ac9be78ccc25470ceecd4c0167544c3be4c09e151dd9356ea8a65102208747591e5e3aabd52131e5d18d1b7f6a57195 SHA512 2c83bf7fed2641e41080f240ea9004d80ed72cd194e0019c64f619f8f4493c3362bce9fe7531000095a509fe74702db664bbf7290b11e44d442263794622e380
-EBUILD vbetool-1.2.2.ebuild 599 BLAKE2B e6113cf6b05b587615ae0cc829d8a0634aafe435665bcc40fd44638d6f3b4d9733c5af6d1d8a4ac46a9452fcf2caaf7910fb32571c2ad6f66b802312e4016515 SHA512 f93a94381402615e4964da20697feea1439482b091e51011d63b2d17fbb99cdce4e1ba24483cea25f428f16c09421bde647b41c78e0b333a036b9863c39f76f6
+EBUILD vbetool-1.2.2.ebuild 597 BLAKE2B 703aad84f39b9e512d1ee57c67f46f326911fa5996ce0c7f47fd74b67255ec2ff250d2f9fe519fd4c8086af4d0aa11ad85407a36d659dbd00a2c0426feb3227e SHA512 cb588a641716dec49965187f2403e371b8da598d711ecea5c4cf6d06d54b55c6ceb7cc727272aad8393605193355ebbee8b468016f5dcb0ab5344bc0c59b4c1d
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/sys-apps/vbetool/vbetool-1.2.2.ebuild b/sys-apps/vbetool/vbetool-1.2.2.ebuild
index 9ad425b7bd53..4d5e0e3f4732 100644
--- a/sys-apps/vbetool/vbetool-1.2.2.ebuild
+++ b/sys-apps/vbetool/vbetool-1.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/libx86
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index c6e9e5fa8e0c..504f5def3482 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 0c527e387c4f..9de000c0d438 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,8 +1,8 @@
+AUX flex-2.6.4-fix-build-with-glibc2.26.patch 8623 BLAKE2B 59433c6a35a05633a9e960c3d6a0248e9bf5606ca7b1376df1594b7f42e23f2e06eb04850b4f9f84f88dc820c6a6e8d88e23aee09451392ed494a71e0a147a37 SHA512 7d13f056181b4859c7bd0f3b494f8e684eb46f499004f3e9f8121382adbf59c7bdd0f26b9105e90fdeb3ee09184743859074993012f6144feb2299343ea95f54
 AUX flex-2.6.4-fix-build-with-glibc2.6+.patch 20281 BLAKE2B 859e15a65473a74635db3759f3607fd6a96ffa0949a1b532bd31ad589391d9fee9f14b04c741b3e50224f5e31ce987398344009d8cdb20dadfa15383b6f03067 SHA512 e9a03bf18a6fbc3546d96213cb483d46fa0b18609e03b37c4e5ac5427935d2694bd86ee73cf5c28ffd6bd7cec018f203e82e7c685e9426a7ba2e6d60d2a44135
-AUX flex-2.6.4-implicit-func-decl.patch 1911 BLAKE2B bb4fea60d5b4650d734d761294e2dc91c71d8f9b90c920ac95aeb6c84ee8e08a80e8092ea337aa31f3de183f6da27fde8b43d679d8e19297bc0d225e9bb975d0 SHA512 4d4466e1c8dd9608a9fc0fb0ad37997bc3646f7cbccf7b2d209af302266cbe3f6dc3ed72ead660b4223833bde645343301a698db49544606568d18af5c32d0b1
 AUX flex-2.6.4-libobjdir.patch 770 BLAKE2B 0771af247117123e3efed3e2a0c8a71573c81dc1e8d2e364a887aa49d3bf3a5198042396d1df1e2c0ae196df098241eba0e2b35e953f9a5be3d43d2408a97536 SHA512 76e3a3e19fe9c9b6b3e0fcfea98feb0eaf03fdc683e3695045b3246b57538a52842b455a9aebed87548d2b8ee3e7d34dca5ff355f06648911866b3b621b40f86
+DIST flex-2.6.4-autotools-regenerate.patch.xz 282588 BLAKE2B 3995b8b5e354a43b1a4ff72fae76027c904ddb24eb8e5d55fc6fbe81299f48fa70ac3c4a98b9ed39aca8a98190d6db5005cacb96ec1016d413860d84a434dcc0 SHA512 9efd3197fdf7f8435dfbf4dafbe6b99c1fafede0ec364dbeb9cca81711763d693bc5d30fc3b2af038a44f8848577d19dd737e3afe0cd3b08ab79daea64fcdefa
 DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
-EBUILD flex-2.6.4-r1.ebuild 2022 BLAKE2B 82ba69679aa66e9e66a3e36c037e01902394f9f99e2e057477e3c3f30f5c55a9c0a6c52c69d3a6d6df118f0cbac0c95500e04d17ec01481baf64c7997287d588 SHA512 e25615e3b8f985e07d0c0c6175467484ba09c817e411eb0cb2d30da6ecb036a316745270def159c9e294af506115adcf1c7e0ceb1aa267f2fa280d1ffc1d7d09
 EBUILD flex-2.6.4-r2.ebuild 2326 BLAKE2B 39ec3e1f7392d4705f36a513c6161ddbe147a311d8eecd08e66f1f7ba7cea20dc16b98acc3a280560f66e74766945fc2d47e3ef8d44c1eaac73e0e0c889968b1 SHA512 ed939eea185f0cbc27c2128c3b248494ef66b19f2b6106dce04ab9019a8d9b9d01b40233b44399ba231663938718c76f4ba7eab8b4c8cbedec91180453684126
-EBUILD flex-2.6.4-r3.ebuild 2379 BLAKE2B 4ec76a4aaa73d5bb4145f515d65dd9a86d867ad8fe7b1904fa1916dc6aec42f491a9a2c8a0d896e371dd8b6c5a818b10a148ff3887ec27785324b24936f3dedb SHA512 eef7a159af9235d934cfc8b705b8e35e3a56f379c40957178a77ac9ad5fa0ac00bf5d3cd772520cd11db82e4806f7c13884bae0b7fe0ad9c3ded1392822d1c8b
+EBUILD flex-2.6.4-r4.ebuild 2333 BLAKE2B 0a052ac0a780fc07a4b98f49c45642a558e6c2ddf27560fc51aaac7c69344bc815849d7af1ba3c5c924930a0ec063c4d62769331f1fdf1d4b13f265cb1ff7755 SHA512 4193c862637891722c9bf187c72c8aa814528d12aae06836c80c4c9ceb851cd2a0fff9818cc46178b4ef9a388ce3027c7cfca4b6b914184fc3bdea7481473a34
 MISC metadata.xml 444 BLAKE2B 28bd0cd35c6ab4386dffdf221e6b43927e47971bea62a0f0395e3cd6725567114675055dc1267ce5ffbd42fe4731a806b4e5666ea6b83ad4bcf4d35b5529ce85 SHA512 53f91d714d7f4401f7d986d743c08a817d794147f9b277d829a4e8065ce91ce00123cd5b42957af60ef9051568a214b7ce791aa8a4baf82a5179859971357d56
diff --git a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch
new file mode 100644
index 000000000000..9a9de8746b89
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch
@@ -0,0 +1,219 @@
+https://github.com/westes/flex/issues/436
+https://bugs.gentoo.org/705800
+https://developers.redhat.com/blog/2019/04/22/implicit-function-declarations-flexs-use-of-reallocarray
+https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda
+https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380
+https://github.com/westes/flex/commit/0db9f8903a446e7026874be519b8dc55a471f014
+https://github.com/westes/flex/commit/a17d79e9c722a6735b6d2a8f152287404f27df32
+https://github.com/westes/flex/commit/4081efa0831b15d7e4e4255401c225ad8262426d
+https://github.com/westes/flex/commit/1985bb3c7abed940e91ad816504ef08a18c3b7c1
+
+From 4b5111d9772b5c160340ca96f08d30d7f6db5cda Mon Sep 17 00:00:00 2001
+From: Explorer09 <explorer09@gmail.com>
+Date: Mon, 4 Sep 2017 08:28:53 +0800
+Subject: [PATCH] scanner: Include flexdef.h at %top block of scan.l
+
+config.h may define macros that alter the API of the standard library
+funtions, and so it should be included before any other standard
+header, even before the skeleton's standard header inclusion.
+
+For example: config.h may #define _GNU_SOURCE that would expose the
+reallocarray() prototype from <stdlib.h> on glibc 2.26+ systems. If we
+include <stdlib.h> before config.h, reallocarray() would not be
+available for use in lex file since the second include doesn't help
+due to header guard.
+
+For now our config.h might `#define malloc rpl_malloc` -- this
+substitution must work before including stdlib.h, or else the compiler
+will complain about missing prototypes, and may result in incorrect
+code in scan.l (gcc warning: return makes pointer from integer without
+a cast [-Wint-conversion]).
+
+Fixes #247.
+--- a/src/scan.l
++++ b/src/scan.l
+@@ -1,5 +1,11 @@
+ /* scan.l - scanner for flex input -*-C-*- */
+ 
++%top{
++/* flexdef.h includes config.h, which may contain macros that alter the API */
++/* of libc functions. Must include first before any libc header. */
++#include "flexdef.h"
++}
++
+ %{
+ /*  Copyright (c) 1990 The Regents of the University of California. */
+ /*  All rights reserved. */
+@@ -32,7 +38,6 @@
+ /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
+ /*  PURPOSE. */
+ 
+-#include "flexdef.h"
+ #include "parse.h"
+ extern bool tablesverify, tablesext;
+ extern int trlcontxt; /* Set in  parse.y for each rule. */
+
+From 24fd0551333e7eded87b64dd36062da3df2f6380 Mon Sep 17 00:00:00 2001
+From: Explorer09 <explorer09@gmail.com>
+Date: Mon, 4 Sep 2017 10:47:33 +0800
+Subject: [PATCH] build: AC_USE_SYSTEM_EXTENSIONS in configure.ac.
+
+This would, e.g. define _GNU_SOURCE in config.h, enabling the
+reallocarray() prototype in glibc 2.26+ on Linux systems with that
+version of glibc.
+
+Fixes #241.
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,8 +25,10 @@
+ # autoconf requirements and initialization
+ 
+ AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex])
++AC_PREREQ([2.60])
+ AC_CONFIG_SRCDIR([src/scan.l])
+ AC_CONFIG_AUX_DIR([build-aux])
++AC_USE_SYSTEM_EXTENSIONS
+ LT_INIT
+ AM_INIT_AUTOMAKE([1.15 -Wno-portability foreign std-options dist-lzip parallel-tests subdir-objects])
+ AC_CONFIG_HEADER([src/config.h])
+
+
+From 0db9f8903a446e7026874be519b8dc55a471f014 Mon Sep 17 00:00:00 2001
+From: Lukasz Baj <l.baj@radytek.com>
+Date: Fri, 22 Sep 2017 10:24:46 +0200
+Subject: [PATCH] build: Remove custom reallocarray() declaration.
+
+Use one from <stdlib.h> instead because that is more portable.
+--- a/src/flexdef.h
++++ b/src/flexdef.h
+@@ -631,10 +631,6 @@ extern int sectnum, nummt, hshcol, dfaeql, numeps, eps2, num_reallocs;
+ extern int tmpuses, totnst, peakpairs, numuniq, numdup, hshsave;
+ extern int num_backing_up, bol_needed;
+ 
+-#ifndef HAVE_REALLOCARRAY
+-void *reallocarray(void *, size_t, size_t);
+-#endif
+-
+ void   *allocate_array(int, size_t);
+ void   *reallocate_array(void *, int, size_t);
+ 
+
+From a17d79e9c722a6735b6d2a8f152287404f27df32 Mon Sep 17 00:00:00 2001
+From: Explorer09 <explorer09@gmail.com>
+Date: Sat, 14 Oct 2017 00:36:54 +0800
+Subject: [PATCH] scanner: Define _POSIX_C_SOURCE when needed in skeleton.
+
+The function fileno() is defined by POSIX. When flex would otherwise not provide that feature macro, we define it.
+
+Fixes #263
+--- a/src/flex.skl
++++ b/src/flex.skl
+@@ -218,6 +218,14 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
+ 
+ /* begin standard C headers. */
+ %if-c-only
++m4_ifdef( [[M4_YY_ALWAYS_INTERACTIVE]], ,
++[[m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]], ,
++[[#ifndef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 1 /* for fileno() */
++#ifndef _POSIX_SOURCE
++#define _POSIX_SOURCE 1
++#endif
++#endif]])]])
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+
+From 4081efa0831b15d7e4e4255401c225ad8262426d Mon Sep 17 00:00:00 2001
+From: Explorer09 <explorer09@gmail.com>
+Date: Thu, 8 Mar 2018 10:04:36 +0800
+Subject: [PATCH] scanner: Fix glibc features.h dependency in skeleton.
+
+Commit a17d79e9c722a6735b6d2a8f152287404f27df32 defines _POSIX_C_SOURCE
+to the minimum of 1 if it's not defined in the user's scanner code or
+the compiling environment. However in glibc the macros are not yet set
+up until one of the libc headers is included. This unfortunately have
+made us overwrite the default _POSIX_C_SOURCE value that would be
+defined by glibc (200809L at the time of writing), causing regressions
+in user code.
+
+Now in this patch:
+1. Ensure feature test macros have been set up in glibc before checking
+or defining any of them in our skeleton code.
+2. Have a more conservative logic when determining the need to define
+_POSIX_C_SOURCE (required for fileno()).
+
+Fixes: #313
+
+Note:
+It could be tricky for application code to ensure feature test macros
+have been set up in glibc, since <features.h> is no portable header and
+not meant to be included directly by applications. The way to do it is
+to include a libc header which in turn includes <features.h>. However,
+many of the glibc headers check __USE_POSIX (a glibc internal macro
+defined if _POSIX_C_SOURCE is defined) and determine which interfaces
+to expose already, making the headers inappropriate for our goal.
+Those which don't depend on _POSIX_C_SOURCE, and are also available
+since ANSI C89, are only <assert.h>, <errno.h> and <math.h>.
+
+<assert.h> is finally favored due to other considerations:
+- <math.h> check for __USE_XOPEN in glibc, making a dependency on
+_XOPEN_SOURCE, besides it exposes much more interfaces than we need.
+- In djgpp, <errno.h> depends on _POSIX_SOURCE to hide definitions of
+some errno values when it's defined.
+- <assert.h> exposes the fewest interfaces among the 3 headers and, at
+the time of writing, checks for only C99 (for __func__), C11 (for
+_Static_assert), and _GNU_SOURCE when needed.
+
+Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
+--- a/src/flex.skl
++++ b/src/flex.skl
+@@ -220,11 +220,21 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
+ %if-c-only
+ m4_ifdef( [[M4_YY_ALWAYS_INTERACTIVE]], ,
+ [[m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]], ,
+-[[#ifndef _POSIX_C_SOURCE
+-#define _POSIX_C_SOURCE 1 /* for fileno() */
+-#ifndef _POSIX_SOURCE
+-#define _POSIX_SOURCE 1
++[[/* Feature test macros. Flex uses functions that require a minimum set of
++ * macros defined. As defining some macros may hide function declarations that
++ * user code might use, be conservative and respect user's definitions as much
++ * as possible. In glibc, feature test macros may not be all set up until one
++ * of the libc header (that includes <features.h>) is included. This creates
++ * a circular dependency when we check the macros. <assert.h> is the safest
++ * header we can include and does not declare too many functions we don't need.
++ */
++#if !defined(__GNU_LIBRARY__) && defined(__STDC__)
++#include <assert.h>
+ #endif
++#if !(defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
++    defined(_POSIX_SOURCE))
++# define _POSIX_C_SOURCE 1 /* Required for fileno() */
++# define _POSIX_SOURCE 1
+ #endif]])]])
+ #include <stdio.h>
+ #include <string.h>
+
+From 1985bb3c7abed940e91ad816504ef08a18c3b7c1 Mon Sep 17 00:00:00 2001
+From: Explorer09 <explorer09@gmail.com>
+Date: Thu, 8 Mar 2018 09:53:24 +0800
+Subject: [PATCH] scanner: correct comments about __STDC_LIMIT_MACROS.
+
+No code changes.
+
+Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
+--- a/src/flexint.h
++++ b/src/flexint.h
+@@ -7,8 +7,8 @@
+ 
+ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ 
+-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+- * if you want the limit (max/min) macros for int types. 
++/* C++ systems might need __STDC_LIMIT_MACROS defined before including
++ * <stdint.h>, if you want the limit (max/min) macros for int types.
+  */
+ #ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS 1
+
diff --git a/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch b/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch
deleted file mode 100644
index 1900ae0529b9..000000000000
--- a/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda
-https://github.com/westes/flex/issues/436
-https://bugs.gentoo.org/705800
-https://developers.redhat.com/blog/2019/04/22/implicit-function-declarations-flexs-use-of-reallocarray
-
-From 4b5111d9772b5c160340ca96f08d30d7f6db5cda Mon Sep 17 00:00:00 2001
-From: Explorer09 <explorer09@gmail.com>
-Date: Mon, 4 Sep 2017 08:28:53 +0800
-Subject: [PATCH] scanner: Include flexdef.h at %top block of scan.l
-
-config.h may define macros that alter the API of the standard library
-funtions, and so it should be included before any other standard
-header, even before the skeleton's standard header inclusion.
-
-For example: config.h may #define _GNU_SOURCE that would expose the
-reallocarray() prototype from <stdlib.h> on glibc 2.26+ systems. If we
-include <stdlib.h> before config.h, reallocarray() would not be
-available for use in lex file since the second include doesn't help
-due to header guard.
-
-For now our config.h might `#define malloc rpl_malloc` -- this
-substitution must work before including stdlib.h, or else the compiler
-will complain about missing prototypes, and may result in incorrect
-code in scan.l (gcc warning: return makes pointer from integer without
-a cast [-Wint-conversion]).
-
-Fixes #247.
---- a/src/scan.l
-+++ b/src/scan.l
-@@ -1,5 +1,11 @@
- /* scan.l - scanner for flex input -*-C-*- */
- 
-+%top{
-+/* flexdef.h includes config.h, which may contain macros that alter the API */
-+/* of libc functions. Must include first before any libc header. */
-+#include "flexdef.h"
-+}
-+
- %{
- /*  Copyright (c) 1990 The Regents of the University of California. */
- /*  All rights reserved. */
-@@ -32,7 +38,6 @@
- /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
- /*  PURPOSE. */
- 
--#include "flexdef.h"
- #include "parse.h"
- extern bool tablesverify, tablesext;
- extern int trlcontxt; /* Set in  parse.y for each rule. */
-
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
deleted file mode 100644
index 309967cc2b37..000000000000
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="https://github.com/westes/flex"
-SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static test"
-RESTRICT="!test? ( test )"
-
-# We want bison explicitly and not yacc in general #381273
-RDEPEND="sys-devel/m4"
-BDEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bison )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
-	"${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
-)
-
-src_prepare() {
-	default
-
-	# Disable running in the tests/ subdir as it has a bunch of built sources
-	# that cannot be made conditional (automake limitation). #568842
-	if ! use test ; then
-		sed -i \
-			-e '/^SUBDIRS =/,/^$/{/tests/d}' \
-			Makefile.in || die
-	fi
-	elibtoolize # Prefix always needs this
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Do not install shared libs #503522
-	ECONF_SOURCE=${S} \
-	econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		--disable-shared \
-		$(use_enable nls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C src -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C src DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc ONEWS
-	find "${ED}" -name '*.la' -type f -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-	dosym flex /usr/bin/lex
-}
diff --git a/sys-devel/flex/flex-2.6.4-r3.ebuild b/sys-devel/flex/flex-2.6.4-r4.ebuild
index 1f1ebfe61893..14ad4c2ba6b1 100644
--- a/sys-devel/flex/flex-2.6.4-r3.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -8,6 +8,7 @@ inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://github.com/westes/flex"
 SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools-regenerate.patch.xz"
 
 LICENSE="FLEX"
 SLOT="0"
@@ -15,21 +16,27 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 
-# We want bison explicitly and not yacc in general, bug #381273
 RDEPEND="sys-devel/m4"
-BDEPEND="${RDEPEND}
+# We want bison explicitly and not yacc in general, bug #381273
+BDEPEND="
+	${RDEPEND}
 	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bison )"
+	test? ( sys-devel/bison )
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
-	"${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
-	"${FILESDIR}"/${P}-implicit-func-decl.patch
+	"${FILESDIR}"/${P}-libobjdir.patch
+	"${FILESDIR}"/${P}-fix-build-with-glibc2.26.patch
+
+	"${WORKDIR}"/${P}-autotools-regenerate.patch
 )
 
 src_prepare() {
 	default
 
+	# Drop on next release when we can remove ${P}-autotools-regenerate.patch
+	touch configure.ac aclocal.m4 Makefile.in configure src/config.h.in || die
+
 	# Disable running in the tests/ subdir as it has a bunch of built sources
 	# that cannot be made conditional (automake limitation). bug #568842
 	if ! use test ; then
@@ -49,15 +56,6 @@ src_configure() {
 }
 
 multilib_src_configure() {
-	if tc-is-cross-compiler ; then
-		# Similar to workaround for procps:
-		# - bug #705800
-		# - https://sourceforge.net/p/psmisc/bugs/71/
-		# - https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html
-		export ac_cv_func_malloc_0_nonnull=yes \
-			ac_cv_func_realloc_0_nonnull=yes
-	fi
-
 	# Do not install shared libs, #503522
 	ECONF_SOURCE="${S}" econf \
 		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index eb576f758989..7dd4fc701fe8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 45c3d67de013..d7558850a1cb 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,6 @@ AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f
 AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a
 AUX 2.4.3-dmcrypt.rc 9697 BLAKE2B 356a54e5de24717731ffdcf6235fe229bc57169c3bd248f5cac77c1cbf0c596c77c0d95a5ef502972db3bab155f4253a53db9be2b7787e10791275d4695821d2 SHA512 61434a6ae3346e5a2f330656055add0c32d1c79a62fec3e8b0f4e38e95f8cf0a3e8ab8d1cc0955316e2ea1b47d9863bffbf46c980fc2f32d6fdd4e817769ca9c
 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
-EBUILD cryptsetup-2.4.3-r2.ebuild 4260 BLAKE2B bea471e3704c7ddeeffc65783ebacf8967873bf5b5a3650888bb2f7108aa982ff3c2e1cf0a7dfae098b9796b879e309586dbb3b648f510e50e66d488b6db27ea SHA512 9990a313a6992ba81cdd233256a99420796cc6da712cf1c664a07c0fa46557a0ea34f0b3083e5995c80ba214ed5d7655d7d4a7baa8d1fdcd929efe6c192acbc2
+EBUILD cryptsetup-2.4.3-r2.ebuild 4259 BLAKE2B 227bedbb96411297404c9c5468354cf263705f3105d7452f770c86718489ab5bb20ba3a991c0aa27703f1d8c8b38549d5756e9298604ed4b6ba12f4dd2a028b4 SHA512 00c15a4ff6dfd2a59370661d1005c411b0da4941b41e33e5b8571d86016323c3921f09679a4a6717c46175360a930f35c355f2eeb460cbd90bd4c4fe702f4cee
 EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe
 MISC metadata.xml 1204 BLAKE2B aff35e9aa5025dce5c55206274e23bc575aa8138b1e8d0269ba322c86ef10f4702e69f7838c3d580a963e39c1270d2e907234f540febb5bd4fc403412623a83b SHA512 86f328fadbadb8e582b4ae9a055f943e0c9cb3711a9c80cf84868d5e329770957886d58fe43aaec7aa0f0985acb0e4ac12947f58d1a423814ea4ea8d290b2b39
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index a867b3a9d311..2ec9830e1339 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index a3381f7862a6..b388427a622f 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -2,7 +2,7 @@ AUX f2fs-tools-1.15.0-lz4-1.9.4.patch 819 BLAKE2B 0bedeb4362cf2a85e172cc5bf8b4d6
 DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
 DIST f2fs-tools-1.15.0.tar.gz 387663 BLAKE2B 1e55f87c839cee6431d9a83e9786201e9b6b872be27c8b92854b30b0fd1c651a9b7235ce93e70c530bfa7a4e9f4dfd309c72702b3338a4aa96e365b29424fb1d SHA512 61e40f16296091b55cec2dbdc6306af6abc2d3f854f39ef03a741b7f6f47348f915498375789f017f8da27fa7d27c79c905dd047693518adde503ea7ebf89387
 EBUILD f2fs-tools-1.14.0.ebuild 837 BLAKE2B 2ea6e841526daf9f2bb0ab59edd35e60d811b4b57af64053046c8590ce3f0dedd093c58ac88ed2db1b6d192364589385817c6f37b4d4ae5ac297d5dbb6dade21 SHA512 3eefc0bccc21238919659c197a6083097711e4c2f77dc8d0914b542782be4a54e816a7f986d2fa214b160779bc94568fd957571c3ea0cf170a7c61713714459c
-EBUILD f2fs-tools-1.15.0-r1.ebuild 911 BLAKE2B e461319916059ace490ba817be6d681fc50ae867e99f6f9d3d559f6eb2ebc3e78f09377a5b75207ed0ec9e519f66cf5cef3801ceb1402cf91d865b89d9d0ab48 SHA512 8da1cca34b5f352444f4e2c122a6f60460ec7907003d692941990cc9eb68d6c3334040ef6ee7928de2fd60d02842f4e1f854789e3668975d09aaddcb31e7b7c2
+EBUILD f2fs-tools-1.15.0-r1.ebuild 910 BLAKE2B 901c90c42a6b4e5abc83a86cdc59e4ef23bcac0f8fb5cd073a823e1884d50db2e2489ed2d932c0b05b18e3ddd696e9d4c1330c7e7e5ddfe7c4d4b11261937771 SHA512 64121218225b1769a0cbfdd639181a5e3a5c1e29e1e99a18197cf3ab61ba21e7b9cd53aaec1207f41fe8c7617025bc79e11577ced6874494002980ae8ac8ed53
 EBUILD f2fs-tools-1.15.0.ebuild 852 BLAKE2B e42c5f52e4b83320e7d41428ccde29bf5845daa060500e4f39e261bf6aa536390154fe2d5f2c7e48d553dcc1c793944595a082d606ac4d4e8c2cde0625688ed9 SHA512 8f43a6fb6df23376408897fd8113acc749b2a5c0dc44eec054e88aa04bfd9a9330e0dc261eadbef92749eb12b2070848fd65468103e96633def32824af5761c2
 EBUILD f2fs-tools-9999.ebuild 802 BLAKE2B c88c57eced6a4405a0bf85a5025d7511fa6a714440391542a8d003443cd059cfd2725f98be580ae747215c8b40f3309e15946bd2328776be503221cebe2dcdb4 SHA512 64579db313bf22e86ca7c9df001505c0b7f63b3aa370cbde50227188ae71b39bc14ecb78009335b002f64c888f8670b63cd60f1caae2bde546d5408ee7e58460
 MISC metadata.xml 499 BLAKE2B cf24d50513eb8417e9b61fac55db48b2867a678f97408c6200607d30870ac6737ec497d3b8e864a2595db1c0c106117582b61fd4e7dce902f4b46bf109600236 SHA512 824226cd743055abbff2be7f1f67c18db293cd2c7cc0109e0a3a2f7cdc4e305da5656ff7aeb6d34d8dc723abd32152c408d97e2a1b43f8dd94a3771acb9b44a9
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
index 6b4c738b485e..f274697e2da9 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snaps
 
 LICENSE="GPL-2"
 SLOT="0/9"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index aab9e30e7d9f..e98483b3471f 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -30,5 +30,5 @@ AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b56
 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
 DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5
 EBUILD lvm2-2.03.14-r3.ebuild 9996 BLAKE2B 6b362736c095df126b9b6ebcea21cec474f0b194cf186b7af2568820cfb2521accdaa5f4247cb5a205190c741ca866bfc409cede0b814ac12a3c1e1003df60fd SHA512 a5931ee69d8a3fb9d32ad7e8fe91c9a9d07224f4b220e1b5a6dce290ea73c87eeb125ddc0c466c7bd4aa854f8c98af4a0e7d878f6a0be101dda6288f3f63760e
-EBUILD lvm2-2.03.16.ebuild 9976 BLAKE2B 294ebc6d761ecd23a6f7f01c3ab782f8788b5a005a681d40c5cd294e109e2b850479acc62db04191e61c20f7c4cd44a9812071e8502b7294df87e3b1299fc256 SHA512 91fee7f723b24d1886db8f29b762a77e1eb5e67d2cb53f199b82b5a86624bf5511fdde1901363096b1a3f52921aa4742a636dc7959df07d5ee5aa640bfe35a24
+EBUILD lvm2-2.03.16.ebuild 10055 BLAKE2B 86b12b246425bd349ede5dd62e54bd1251343fffd558ccd3bfb7f5cb246c36f6ec85ca98793ea4c749bdc9c755ee1b54edebf22ddc9dab1ed2a45984ba264828 SHA512 b6bcb929f0d40a87afda4a7e9e60accdf444c32190074bd4942214454d56153d1504dd26a26b37852952574b78f715f0e351a9ac5e217d1c7747d9f5a1230467
 MISC metadata.xml 924 BLAKE2B f8999a0d015771eab5a4f84adac00267d7bd04b5890838e155e75208eb4ba0d8440db090b6fd877c34528fd89fd25bc68051f127a43c75af978f2fedcc9d787a SHA512 670cc840de3818ee976269902fc4ef8e7b57c38960475f702e9340c9e847a2121f92fcd58ea506e2907e4939b5596cdf72207a3a276dcfa1374be14530268c00
diff --git a/sys-fs/lvm2/lvm2-2.03.16.ebuild b/sys-fs/lvm2/lvm2-2.03.16.ebuild
index d3922e5152cf..cd7d14565326 100644
--- a/sys-fs/lvm2/lvm2-2.03.16.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.16.ebuild
@@ -201,6 +201,8 @@ src_compile() {
 
 	if use device-mapper-only ; then
 		emake V=1 device-mapper
+		# https://bugs.gentoo.org/878131
+		emake -C libdm/dm-tools V=1 device-mapper
 	else
 		emake V=1
 		emake V=1 CC="$(tc-getCC)" -C scripts #lvm2_activation_generator_systemd_red_hat
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 2577826bd1f9..046cd74b2aa3 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 290a66c32346..0f04c73b924c 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -14,5 +14,5 @@ EBUILD audit-3.0-r1.ebuild 4193 BLAKE2B b80c5342026738e6ca0c6cd3fc15970a636d78b5
 EBUILD audit-3.0.6-r1.ebuild 4134 BLAKE2B c66951f7b6352064199e019ddd3c3a1c4579866105839478ad361b3aa4109b1449aa7e3c38fbdaf14806c16a359154d6e8df1662558623c82e38c1bfd1ced8aa SHA512 17953316937cd12d5d37cfc37d5e58159f183ab422489c48859f586e675df806b9508eaa5a4166629d0a303fdf163b2a84f071c795501a9d9839b2ba02abc9ea
 EBUILD audit-3.0.7-r1.ebuild 4162 BLAKE2B 5bed15175ff989f34cc1a65981dda6e8550f1e395ddedf07d90b4f74e1ad2264c6f4d42b7881d295327152f59ee77422f036d9cd442e643fce8a94f10774564c SHA512 51fa4a90fbdd49c7c1d102a57caa8925551efc3ea87ae9f50326ee4f8ff71be500889f9657444ffe82eaefde6da4a9511d993090253b0aa77e8e30b2f1da55a1
 EBUILD audit-3.0.8.ebuild 4599 BLAKE2B efff1705308c4becea3333796ef1c9b3f95bcc10df383085b7faf4867f43e4d5ac75f324109a475893eedcf24cd0691e5154ff06dc9f828b7ed6b00d93b03206 SHA512 9de53cd51187216f01efedb8f0701630fe8bb292359a5aa649745bcbb5c71fe23a032c1b54d9804c3ac0c9fc36b724c37b71d638600f7355d0ab7b12df891905
-EBUILD audit-3.0.9.ebuild 4598 BLAKE2B 9450e469eb6c89626936f1718b7ac3a4f7235d5b7dcc47e6326466891626266f21d10e3ffbf253b36296753bafdf102304ea603ab99153653514b1bc5b230352 SHA512 468d7beeb88984949e5395e2d74c3b7489c4047129f226b4a4ff8fa21fc42269c00ba8dd1096ecfce11d58472109263bc7054e2fce971e1b471f83d361763988
+EBUILD audit-3.0.9.ebuild 4596 BLAKE2B 907569753eb9d6d20c61fc63232c7e45c59d7031508cebe8ad649d78c8e58581a1663d7ca981ffaaf8077df53b92a9d16c648a003287fd99854d198cae05be27 SHA512 7398c04090530cbddd653b629e36b7c038e777940433844a1a32290f60aa98dd6def72953f7163cee558b6377943d1b14ba1662be119cd5ad0a22c8f6cc96ccd
 MISC metadata.xml 457 BLAKE2B 2d18aba4c1e67e285691ed949808ebe7de2fddecb008eb16c1f8615d16e044fcfe3e81cceb30d325c4338462872fd2c436625a0d4eeefffd51cd074b1b5b4514 SHA512 809ea56f90880760e4b7ed180930af44f68b1ce5457fce2063969feebb22f02c8156bcc248cb885878e4d98848a2a5e91c194ac6f9fd54d8a88501e0c2d25ea9
diff --git a/sys-process/audit/audit-3.0.9.ebuild b/sys-process/audit/audit-3.0.9.ebuild
index 7fde297d24f0..56685122fd9f 100644
--- a/sys-process/audit/audit-3.0.9.ebuild
+++ b/sys-process/audit/audit-3.0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="gssapi ldap python static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index c673e4f702ec..d68ab34aa5f3 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -2,5 +2,5 @@ AUX procps-3.3.11-sysctl-manpage.patch 941 BLAKE2B e10b6f85325d1ea23b327dffe4ba3
 AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadbe5e7c54c4b0a65abad6ebe8a89f1b8f7f6bd29114b50678aa89cd0c89d26a95a10aa403d48bcc8371f16eaf34c823390 SHA512 ecc94717366a314ac4bba550b84472555f7b217be2174b68778d3364e16586ab9c21756d2041e2ac9d1449856fcd6aa691d8bd1a8558b4653d068dc1d59c2c71
 AUX procps-3.3.17-musl-fix.patch 1907 BLAKE2B 211d5512d9546592b23815bf4085447f6d07c0ac07cb03be01b520a56dc60fdfd07e9c055b0b40196efa2748f54eb5d8070cda80c5001d74fa5f261f53bd234c SHA512 5cf9852e54c307fedbf17b3a331ea992ea2c137120b6f89e4eeb7643091c09872e7e3bdcd2e80b83c46c02b2a0e0d56792afb7fe0564fa4f97e56f304b5792bd
 DIST procps-ng-3.3.17.tar.xz 1008428 BLAKE2B 43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3 SHA512 59e9a5013430fd9da508c4655d58375dc32e025bb502bb28fb9a92a48e4f2838b3355e92b4648f7384b2050064d17079bf4595d889822ebb5030006bc154a1a7
-EBUILD procps-3.3.17-r1.ebuild 2963 BLAKE2B 423e414ab253b3e0196ab34706162a1b82e7f4078fe32a3286e05ddefc14e0974ce2154be20d6acf9a4886a74f53b1c1a1d91ac47fba34da74268e05af0d2492 SHA512 90dcccd0bf6851817d4c34f79f8253db78970c04c4ee377bf134e585c9e12b3ecb4f9943fff71dfea1fc961f5b915e504f35302caf92b7ba5576c3f7d23e5ffb
+EBUILD procps-3.3.17-r1.ebuild 2516 BLAKE2B 03477cbcbf967874331b1068edc3217fc1e55b73dbf8b727d64fd8dab3b9c3ede4f03ab51730e8dc3134ed25b226c3706adf14c07525401914a7691e0d7b3b3c SHA512 27295405ac6d86fc3fc89b1ea8fa345b8d955035774d44999b206c8303105357ce732f08e5f96b075ffa1485d90256034a7ef53b2fcf06a18d7c66c3648d1c4a
 MISC metadata.xml 788 BLAKE2B b8352d682de7ad98344997d344783c444f326153bf5ed479d9e3032dac52b5f938c47ec83ca2d284617f98d0fbde2d9357ee7c205f74d7a2b2c586865a1de756 SHA512 cb6ebcf57a2800ae492fed52ad3de2ba7e767b121ccd6c20f8a0fd6c5fbbc97fb42d20e083ee3d3935fa6fa6e318bccd96d557c9b693507e64b22b8d3c92d1fd
diff --git a/sys-process/procps/procps-3.3.17-r1.ebuild b/sys-process/procps/procps-3.3.17-r1.ebuild
index 79ab60beefd1..8761ccfd17e1 100644
--- a/sys-process/procps/procps-3.3.17-r1.ebuild
+++ b/sys-process/procps/procps-3.3.17-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # See https://bugs.gentoo.org/835813 before bumping to 4.x!
 
-inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
+inherit flag-o-matic multilib-minimal usr-ldscript
 
 DESCRIPTION="Standard informational utilities and process-handling tools"
 HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
@@ -53,18 +53,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	if tc-is-cross-compiler ; then
-		# This isn't ideal but upstream don't provide a placement
-		# when malloc is missing anyway, leading to errors like:
-		# pslog.c:(.text.startup+0x108): undefined reference to `rpl_malloc'
-		# See https://sourceforge.net/p/psmisc/bugs/71/
-		# (and https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html)
-		export ac_cv_func_malloc_0_nonnull=yes \
-			ac_cv_func_realloc_0_nonnull=yes
-	fi
-
 	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
 	append-lfs-flags #471102
+
 	local myeconfargs=(
 		$(multilib_native_use_with elogind) # No elogind multilib support
 		$(multilib_native_use_enable kill)
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ca5d32f0a252..32ce00b04268 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0602a31fcfd2..e1bb28d51d09 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -31,6 +31,6 @@ EBUILD tomcat-10.1.1.ebuild 6138 BLAKE2B 3ea70bca52fc71020ab48a2dec50a8c65991a64
 EBUILD tomcat-8.5.82.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
 EBUILD tomcat-8.5.83.ebuild 5138 BLAKE2B c09b2a3e263939e1922597420fa3dff7c1fd7f46f37b556f2c0bc05f5e65a1636517248937c7acdc60407891d8d0d41e4c373501a11423d22da66004f1fcb045 SHA512 d5a35ddb59ba326cb239961b5b1d99ecaa25a1f167ba8a0a051fd38f06809045ce5d9781f93e8ad85cd1f18c80ec9b2637f26d072046987a82a08ac5afc4802d
 EBUILD tomcat-9.0.65.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
-EBUILD tomcat-9.0.67.ebuild 5823 BLAKE2B 4cb40dde75f3a89d20cd2fbf069862a0cb733499e871d4d72808424d041cfdf6e03e2226f713af663f9a56069c66874079781d72619c92fd53fe367b6b07e644 SHA512 882546993468a1743de5c3cc289fdd9da57d3b95fb8bbb5184215cd7b53f8454e3a2c49a8f765514da1545d80ee14709eead03cd919fa0b056212e80de3c0901
+EBUILD tomcat-9.0.67.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
 EBUILD tomcat-9.0.68.ebuild 6035 BLAKE2B b4cc7b8ef210d684db12046d2ed8b660b2ee14a4f9e6eae4441ce5f29858b4a845c0b43c6be960767638107944fae73e407d59af6e4632d3794217edd8c077ae SHA512 23262e6110d67b97ab5585701d375fb0c4bb43db2b1b1fd18b1b9600fec283eb0ec4b9b20fc62c34173085b2cde0a90a96bb021cd25d5814fbba450540e3e0d4
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-9.0.67.ebuild b/www-servers/tomcat/tomcat-9.0.67.ebuild
index e151500fc704..816509c99633 100644
--- a/www-servers/tomcat/tomcat-9.0.67.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.67.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 471d1f11e9ca..9b061acb4183 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 4faf34baae38..d941ed6822f4 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,6 +1,6 @@
 DIST kitty-0.26.3.tar.xz 4730520 BLAKE2B a2d8cccc76eb295256ac420700e941ac9cb0e79c9717a93226cc30db63ab047dcd0be2e11b36b44c7c15daa0b77a451242d32f71024cee724869ba8937b93dd5 SHA512 77a518cd3ec4bb059907f16d01068914951cadbbcf803dcbfae13cc9ce144f65a886d7e986c7191019a0be9ccf902f086c72a24287458d083cbd3fd136d2c589
 DIST kitty-0.26.4.tar.xz 4749148 BLAKE2B fe15d2bd3afda49fcdc911d0ada5824dffe7eac69cd22581b86f50b0d20330ef10bf567d4adfafe5e06d20f9d7a10c8acfcffb95a3d5c47c50327576d9600761 SHA512 4d3ef5ba2ca54d0f5cd84ece771297c19c05bd276fc235f92c76d469ad17e55b54de696dce38c9039ae9825c7609e03e937536261c4fb680e936865ee0e4441e
 EBUILD kitty-shell-integration-0.26.3.ebuild 1483 BLAKE2B 8bb6bf5cbd3a11f5773f1783b5d6e8ed5bdac200a61e6df7326913081280f0e334b7c100cb09df05b6a3e99682fbb63117622671184b2cc2f12b87f975c345a0 SHA512 b032be5bdada3925e23bf44ad466b4aa1b51905715c6d5fef0781aeb634f1b728ad1429f75e4fcf8abffc6b88c975d73079037d32f909dfd91b38c8802095e04
-EBUILD kitty-shell-integration-0.26.4.ebuild 1485 BLAKE2B 21a75b84ba48ae28082f872464859710ada27876c1b5e0985d94f7431ac9ee34321eed9323e044bb41eb98a8a701b2a3be5c74869482f20d9c9ba25cc6ba9fa8 SHA512 67be032810055406c81963593c0b6dcede05bf5d7c8bc3178e758f1329bf88384ee25c614cd2fa16e50b210d95297dc33fdbd949a52a58108ffa3962cfee8a53
+EBUILD kitty-shell-integration-0.26.4.ebuild 1483 BLAKE2B 8bb6bf5cbd3a11f5773f1783b5d6e8ed5bdac200a61e6df7326913081280f0e334b7c100cb09df05b6a3e99682fbb63117622671184b2cc2f12b87f975c345a0 SHA512 b032be5bdada3925e23bf44ad466b4aa1b51905715c6d5fef0781aeb634f1b728ad1429f75e4fcf8abffc6b88c975d73079037d32f909dfd91b38c8802095e04
 EBUILD kitty-shell-integration-9999.ebuild 1403 BLAKE2B 9f1e4aebc1103678d42ba5809c41848b2ace36e2ed0137bdb0f30048cb4372c61f80e509a8087a52b149fe25115ca8aaa511d4697459e1087bee65788055dd85 SHA512 d7674435c3d3d9cfd04d47889f9e0f1cb4e60a6dc3506529829b3782e958fc3cb18fe8b0a25463725128106d6ca8308a17ae961b184e13682a1b05852e22ce4e
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.4.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.4.ebuild
index 92b178c54f24..284f791cd143 100644
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.4.ebuild
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 src_compile() { :; }
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 3b950df93800..6f977b34a0a9 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,6 @@
 DIST kitty-0.26.3.tar.xz 4730520 BLAKE2B a2d8cccc76eb295256ac420700e941ac9cb0e79c9717a93226cc30db63ab047dcd0be2e11b36b44c7c15daa0b77a451242d32f71024cee724869ba8937b93dd5 SHA512 77a518cd3ec4bb059907f16d01068914951cadbbcf803dcbfae13cc9ce144f65a886d7e986c7191019a0be9ccf902f086c72a24287458d083cbd3fd136d2c589
 DIST kitty-0.26.4.tar.xz 4749148 BLAKE2B fe15d2bd3afda49fcdc911d0ada5824dffe7eac69cd22581b86f50b0d20330ef10bf567d4adfafe5e06d20f9d7a10c8acfcffb95a3d5c47c50327576d9600761 SHA512 4d3ef5ba2ca54d0f5cd84ece771297c19c05bd276fc235f92c76d469ad17e55b54de696dce38c9039ae9825c7609e03e937536261c4fb680e936865ee0e4441e
 EBUILD kitty-terminfo-0.26.3.ebuild 625 BLAKE2B bd4f3df430b79ca1ad20d73d65969a1ddc8a2f2ebbc38a88c9c9f3658b8baaabf7046f9d6cadbf77e8d131ebc1b8ee30e9615df32b70d09ffbf58ea506fc993f SHA512 a21aec302968475896ab9e1621aeba6f6da4c154c89139e4936609bbddba7f1bd8058fdf0daa6faae436b45d6eb9438390d925f12c87669f6b6929083a50e4d9
-EBUILD kitty-terminfo-0.26.4.ebuild 627 BLAKE2B 03c91e6e18e82da363b170c08d6449f14a81e592cdd36ff7278cce05b74c759370a325f2923006834e88c57f4d2c199b4c0c991595d74b296117e2a9b438ce78 SHA512 acee327cf90b880c6eaffb7b8aabb57463405e4c2858d9f85cb4a12411b26fa8a4875871e6b7299bb937553c1c3b95b01866b2e5dafeef0a2f1bea183987c0d2
+EBUILD kitty-terminfo-0.26.4.ebuild 625 BLAKE2B bd4f3df430b79ca1ad20d73d65969a1ddc8a2f2ebbc38a88c9c9f3658b8baaabf7046f9d6cadbf77e8d131ebc1b8ee30e9615df32b70d09ffbf58ea506fc993f SHA512 a21aec302968475896ab9e1621aeba6f6da4c154c89139e4936609bbddba7f1bd8058fdf0daa6faae436b45d6eb9438390d925f12c87669f6b6929083a50e4d9
 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.26.4.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.4.ebuild
index e69c32614071..8e691381f9bd 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.26.4.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 RESTRICT="test" # intended to be ran on the full kitty package
 
 BDEPEND="sys-libs/ncurses"
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 7fa5dca2162f..f78c3a6c5016 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -3,6 +3,6 @@ DIST kitty-0.26.3.tar.xz.sig 566 BLAKE2B 6e8e622bec031416b0f591c0b53f53ba874c977
 DIST kitty-0.26.4.tar.xz 4749148 BLAKE2B fe15d2bd3afda49fcdc911d0ada5824dffe7eac69cd22581b86f50b0d20330ef10bf567d4adfafe5e06d20f9d7a10c8acfcffb95a3d5c47c50327576d9600761 SHA512 4d3ef5ba2ca54d0f5cd84ece771297c19c05bd276fc235f92c76d469ad17e55b54de696dce38c9039ae9825c7609e03e937536261c4fb680e936865ee0e4441e
 DIST kitty-0.26.4.tar.xz.sig 566 BLAKE2B 8ac544b077cc30f811be665226e413e3074d3490b99b790c37ff871017131be76163a526f6c5eca6a711724975a4e3d6a6d897f2bacafac6b8f71f8ce141dd8d SHA512 f851daebc0c9d75f39c1e02a3ca14ab77f350c7f606e4e00f4513e084ca86e329dc2da033a6292aaedf683995932e83c58d273552d2afd26a0e541e89bdd4bf9
 EBUILD kitty-0.26.3.ebuild 3610 BLAKE2B 9e8b094a98eba2ecaf05d4e668548a1d739ae70549e4577390e9ae292416999952a6ddf91b8a59f9e400a41a64f3315d67e7c1a44a52fd9b1dedbbce4faa185f SHA512 93905872870522c7412f3ca884c8185f48804cf5f6b0f4b2ec595c5c62dede63251e453137c804113fd3f3cf51d6c21c41b6b2a68068e950ebbd293c354cbf05
-EBUILD kitty-0.26.4.ebuild 3612 BLAKE2B 0accffa1790494188139220e57cc82450cf6e35915c381584bc4e4078850e8d16e33c99897634a9f7a1c7078cc379b290a18dab3e75dddd84c23eb5c36b3333e SHA512 74b6f0d05b25fa7a7158d3bdfca63666f8deb6e92fca5f0eaf7c421c74ccd1b3ae6b85e286e09ba44180b072dac915f84bafa76c16ef565a16d3e813e4f0843a
-EBUILD kitty-9999.ebuild 3605 BLAKE2B ffb55f025d3b07b00a2c3a4991dfb2f0263dae8f141c24d4d62430e67c22ad09c58f67c23315ae1bd2f1c212ae813ba21e63615f351187a01f7a8c2dce4a2011 SHA512 f85eab66363333c06a7977a99bd282b24183890f9ace2b677c72cb6b3e1a77a2509954d94e077f0ef4797344ea472d94fe2e4fc9770de3d05ded09ea87a340d0
+EBUILD kitty-0.26.4.ebuild 3610 BLAKE2B 9e8b094a98eba2ecaf05d4e668548a1d739ae70549e4577390e9ae292416999952a6ddf91b8a59f9e400a41a64f3315d67e7c1a44a52fd9b1dedbbce4faa185f SHA512 93905872870522c7412f3ca884c8185f48804cf5f6b0f4b2ec595c5c62dede63251e453137c804113fd3f3cf51d6c21c41b6b2a68068e950ebbd293c354cbf05
+EBUILD kitty-9999.ebuild 3612 BLAKE2B 0accffa1790494188139220e57cc82450cf6e35915c381584bc4e4078850e8d16e33c99897634a9f7a1c7078cc379b290a18dab3e75dddd84c23eb5c36b3333e SHA512 74b6f0d05b25fa7a7158d3bdfca63666f8deb6e92fca5f0eaf7c421c74ccd1b3ae6b85e286e09ba44180b072dac915f84bafa76c16ef565a16d3e813e4f0843a
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.26.4.ebuild b/x11-terms/kitty/kitty-0.26.4.ebuild
index f94220cb393f..e097e42e5591 100644
--- a/x11-terms/kitty/kitty-0.26.4.ebuild
+++ b/x11-terms/kitty/kitty-0.26.4.ebuild
@@ -15,7 +15,7 @@ else
 		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Fast, feature-rich, GPU-based terminal"
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 3ee9cbb30121..f94220cb393f 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -15,7 +15,7 @@ else
 		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
 		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Fast, feature-rich, GPU-based terminal"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 9230aab14f9d..7761b105c9fd 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 343b7623d5ee..4a0fc7314a60 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,6 +1,4 @@
-DIST herbstluftwm-0.9.4.tar.gz 549029 BLAKE2B 23f1dbf212c4d0a64f2e2d8442ac7c2465a54a13af74de6c949c4d6eda85fd4e66b73188c526d0968372eb45691ffca43e387c8410691fd134f662e1e8c501b3 SHA512 068438d14b0addcd17a0c0bda1d33ec4aaff08a3c85698a49e9d3dd0c07f91e315f936d73c11b0c159b8735373ea1efe8a572a0976fc327f4aaa6a0f08436e9d
 DIST herbstluftwm-0.9.5.tar.gz 556773 BLAKE2B db851f02ce249be74f0104dd0b335fb1ed50b4a19e5f7de17cdc34b7eba99ac2f348c5a4a4e0afd2c68576f650029203c735ccb293a60d321769d56f746d6593 SHA512 a85fd1ab16b873f512d6965cc4a93524e3ed4a15079d0d4ee54012e217bd41db3b54729c1b30ee361c34b38799f95bc537099056ba7a5f791bf2be6724bc92c3
-EBUILD herbstluftwm-0.9.4.ebuild 2986 BLAKE2B a2eb901d21217a3960324ddd2eccfcd8e26254ca9e88ac6de266e6e97629ec2cc9f53018d0683620044d348eb348bed2cc5f0f0a4329e815f00fad8dbadab991 SHA512 b7c7900c1f84c4a2e75c61a009d8d504a5f0009b3d1b61ac3a58fd0562b3661468d266975e2fb201143dd9ba6258e11dd51af376b288598a4abfece06a2a8a79
-EBUILD herbstluftwm-0.9.5.ebuild 2988 BLAKE2B 2ecb6e7cfbf2edecc2b59c3549fad303f789ed9aad902a516359b9b3aae98bda69da512d9a54a9ef6d7d4deab5f00b3f3e6b96282b41ae45256f1ae4c5ca4076 SHA512 ec915b61d54cbf11451cfcad2da47ab753229dfa7c9a52e3eeb490fbe67cc16a4cd02158c740b55563ad0587582ffae21baf73cc0b0fe75df4d5f4fee01eebd2
+EBUILD herbstluftwm-0.9.5.ebuild 2986 BLAKE2B a2eb901d21217a3960324ddd2eccfcd8e26254ca9e88ac6de266e6e97629ec2cc9f53018d0683620044d348eb348bed2cc5f0f0a4329e815f00fad8dbadab991 SHA512 b7c7900c1f84c4a2e75c61a009d8d504a5f0009b3d1b61ac3a58fd0562b3661468d266975e2fb201143dd9ba6258e11dd51af376b288598a4abfece06a2a8a79
 EBUILD herbstluftwm-9999.ebuild 3400 BLAKE2B ebc8f10a0506aa602092455f0e51b8c1ca3c2a3d4a6c585a6210ffe240b1006b0dcebff3282b8c84eef02605679c86ccfb8900aa4f2c2486a7ca95d0dd39c446 SHA512 0b1be1854a4a331ded3929d4cbb9045a8a690b9da1d916c6cd1a67d12eac9f53c4bc6ae74bbd756d6193f11ad50127362445e2cba1d79dab375ccd7cc0e5456d
 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
deleted file mode 100644
index d69cb69d2351..000000000000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_OPTIONAL=1
-
-inherit cmake distutils-r1
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/"
-
-if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
-	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
-	inherit git-r3
-else
-	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="+doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		dev-python/ewmh
-		dev-python/python-xlib
-		x11-apps/xsetroot
-		x11-base/xorg-server[xephyr,xvfb]
-		x11-misc/xdotool
-		x11-terms/xterm
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-shells/bash
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-if [[ -n "${EGIT_REPO_URI}" ]]; then
-	# Herbstluftwm tarballs ship with pre-compiled documentation, only
-	# if we build from git asciidoc is needed.
-	BDEPEND+=" doc? ( app-text/asciidoc )"
-fi
-
-src_prepare() {
-	# Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
-	sed -i \
-		-e '/^install.*LICENSEDIR/d' \
-		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-		CMakeLists.txt || die
-	cmake_src_prepare
-
-	if use python; then
-		pushd "${S}"/python > /dev/null || die
-		distutils-r1_src_prepare
-		popd > /dev/null || die
-	fi
-}
-
-src_configure() {
-	# Ensure that 'python3' is in PATH. #765118
-	python_setup
-
-	mycmakeargs=(
-		-DWITH_DOCUMENTATION=$(usex doc)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-
-	# The man pages exists in src_install either in non-live ebuilds,
-	# since they are then shipped pre-compiled in herbstluftwm's
-	# release tarbal. Or they exist in live ebuilds if the 'doc' USE
-	# flag is enabled.
-	if [[ "${PV}" != 9999 ]] || use doc; then
-		local man_pages=(
-			herbstluftwm.1
-			herbstclient.1
-			herbstluftwm-tutorial.7
-		)
-		for man_page in "${man_pages[@]}"; do
-			doman "doc/${man_page}"
-		done
-	fi
-}
-
-distutils_enable_tests pytest
-
-src_test() {
-	ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
-	ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
-
-	pushd python > /dev/null || die
-	distutils_install_for_testing
-	popd > /dev/null || die
-
-	# Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
-	export PYTHONPATH
-	python_test
-}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
index 4989b68eb8db..d69cb69d2351 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="BSD-2"
author	V3n3RiX <venerix@koprulu.sector>	2022-10-28 03:58:39 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-28 03:58:39 +0100
commit	e5985b8e66b3b43c34328efb47b9b12e8ce5a690 (patch)
tree	a6dfa5de0a8939409fa203b13d2b292e6bf5e1bf
parent	62082029157d2ef97a43e34ce34a55877afa8a58 (diff)