From 1b295861f983d29f9bd5d5906c7ca3cee4cf1f9a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 18 Sep 2022 17:20:12 +0100
Subject: gentoo auto-resync : 18:09:2022 - 17:20:12

---
 Manifest                                           |  30 +-
 Manifest.files.gz                                  | Bin 29620 -> 29635 bytes
 app-admin/Manifest.gz                              | Bin 32848 -> 32854 bytes
 app-admin/rsyslog/Manifest                         |   4 +-
 app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild       | 493 ++++++++++++++++++++
 app-admin/rsyslog/rsyslog-8.2206.0.ebuild          | 492 --------------------
 app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild       | 494 +++++++++++++++++++++
 app-admin/rsyslog/rsyslog-8.2208.0.ebuild          | 493 --------------------
 app-crypt/Manifest.gz                              | Bin 23960 -> 23963 bytes
 app-crypt/sequoia-sq/Manifest                      | 160 -------
 app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild      | 449 -------------------
 app-portage/Manifest.gz                            | Bin 9732 -> 9736 bytes
 app-portage/recover-broken-vdb/Manifest            |   4 +-
 .../recover-broken-vdb-1.0.0-r1.ebuild             |  31 ++
 .../recover-broken-vdb-1.0.0.ebuild                |  29 --
 .../recover-broken-vdb-9999.ebuild                 |  10 +-
 dev-cpp/Manifest.gz                                | Bin 12561 -> 12909 bytes
 dev-cpp/jarowinkler-cpp/Manifest                   |   3 +
 .../jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild   |  32 ++
 dev-cpp/jarowinkler-cpp/metadata.xml               |  11 +
 dev-cpp/rapidfuzz-cpp/Manifest                     |   3 +
 dev-cpp/rapidfuzz-cpp/metadata.xml                 |  11 +
 dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild   |  42 ++
 dev-java/Manifest.gz                               | Bin 54042 -> 54046 bytes
 dev-java/gson/Manifest                             |   2 +
 dev-java/gson/gson-2.9.1.ebuild                    |  60 +++
 dev-java/jakarta-json-api/Manifest                 |   2 +-
 .../jakarta-json-api-1.1.6-r1.ebuild               |  31 ++
 .../jakarta-json-api/jakarta-json-api-1.1.6.ebuild |  41 --
 dev-python/Manifest.gz                             | Bin 260920 -> 261048 bytes
 dev-python/jarowinkler/Manifest                    |   4 +-
 dev-python/jarowinkler/jarowinkler-1.2.1.ebuild    |  34 +-
 dev-python/jarowinkler/metadata.xml                |   9 +-
 dev-python/pendulum/Manifest                       |   4 +-
 dev-python/pendulum/pendulum-2.1.2-r1.ebuild       |  30 --
 dev-python/pendulum/pendulum-2.1.2-r2.ebuild       |  41 ++
 dev-python/pytzdata/Manifest                       |   4 +-
 dev-python/pytzdata/pytzdata-2020.1-r1.ebuild      |  24 -
 dev-python/pytzdata/pytzdata-2020.1-r2.ebuild      |  33 ++
 dev-python/rapidfuzz/Manifest                      |   5 +-
 .../files/rapidfuzz-2.9.0-test-pandas.patch        |  35 ++
 dev-python/rapidfuzz/metadata.xml                  |   9 +-
 dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild        |  41 +-
 dev-python/rapidfuzz_capi/Manifest                 |   3 +
 dev-python/rapidfuzz_capi/metadata.xml             |  13 +
 .../rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild     |  23 +
 dev-python/simpleeval/Manifest                     |   2 +-
 dev-python/simpleeval/simpleeval-0.9.12-r1.ebuild  |  22 +
 dev-python/simpleeval/simpleeval-0.9.12.ebuild     |  19 -
 dev-python/sphinxcontrib-github-alt/Manifest       |   4 +-
 .../sphinxcontrib-github-alt-1.2-r1.ebuild         |  26 --
 .../sphinxcontrib-github-alt-1.2-r2.ebuild         |  33 ++
 media-fonts/Manifest.gz                            | Bin 37248 -> 37252 bytes
 media-fonts/noto-emoji/Manifest                    |   4 +-
 media-fonts/noto-emoji/noto-emoji-20210715.ebuild  | 111 -----
 media-fonts/noto-emoji/noto-emoji-20220912.ebuild  | 115 +++++
 media-libs/Manifest.gz                             | Bin 66156 -> 66149 bytes
 media-libs/suil/Manifest                           |   4 +-
 media-libs/suil/metadata.xml                       |  18 +-
 media-libs/suil/suil-0.10.16-r1.ebuild             |  67 +++
 media-libs/suil/suil-0.10.16.ebuild                |  58 ---
 media-sound/Manifest.gz                            | Bin 57097 -> 57091 bytes
 media-sound/amsynth/Manifest                       |   2 +-
 media-sound/amsynth/amsynth-1.13.0.ebuild          |   2 +-
 media-sound/ardour/Manifest                        |   4 +-
 media-sound/ardour/ardour-6.9-r2.ebuild            |   6 +-
 media-sound/ardour/ardour-9999.ebuild              |   6 +-
 media-sound/frescobaldi/Manifest                   |   1 -
 media-sound/frescobaldi/frescobaldi-3.2.ebuild     |  31 --
 media-sound/patchage/Manifest                      |   6 +-
 media-sound/patchage/patchage-1.0.10.ebuild        |  50 +++
 media-sound/patchage/patchage-1.0.6.ebuild         |   2 +-
 media-sound/patchage/patchage-1.0.8.ebuild         |   2 +-
 media-sound/zynaddsubfx/Manifest                   |   2 +-
 .../zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild        |  91 ++++
 media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild   |  89 ----
 media-video/Manifest.gz                            | Bin 25842 -> 25851 bytes
 media-video/makemkv/Manifest                       |   2 +-
 media-video/makemkv/makemkv-1.17.1.ebuild          |   1 -
 metadata/Manifest.gz                               | Bin 3853 -> 3859 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  28 +-
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 28240 -> 28240 bytes
 metadata/md5-cache/app-admin/Manifest.gz           | Bin 57250 -> 57250 bytes
 metadata/md5-cache/app-admin/rsyslog-8.2206.0      |  17 -
 metadata/md5-cache/app-admin/rsyslog-8.2206.0-r1   |  17 +
 metadata/md5-cache/app-admin/rsyslog-8.2208.0      |  17 -
 metadata/md5-cache/app-admin/rsyslog-8.2208.0-r1   |  17 +
 metadata/md5-cache/app-crypt/Manifest.gz           | Bin 37010 -> 36853 bytes
 metadata/md5-cache/app-crypt/sequoia-sq-0.26.0     |  15 -
 metadata/md5-cache/app-portage/Manifest.gz         | Bin 17104 -> 17098 bytes
 .../md5-cache/app-portage/recover-broken-vdb-1.0.0 |  15 -
 .../app-portage/recover-broken-vdb-1.0.0-r1        |  15 +
 .../md5-cache/app-portage/recover-broken-vdb-9999  |   4 +-
 metadata/md5-cache/dev-cpp/Manifest.gz             | Bin 22474 -> 22817 bytes
 metadata/md5-cache/dev-cpp/jarowinkler-cpp-1.0.2   |  15 +
 metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.6.0     |  14 +
 metadata/md5-cache/dev-java/Manifest.gz            | Bin 70173 -> 70320 bytes
 metadata/md5-cache/dev-java/gson-2.9.1             |  15 +
 metadata/md5-cache/dev-java/jakarta-json-api-1.1.6 |  14 -
 .../md5-cache/dev-java/jakarta-json-api-1.1.6-r1   |  14 +
 metadata/md5-cache/dev-python/Manifest.gz          | Bin 361638 -> 361796 bytes
 metadata/md5-cache/dev-python/jarowinkler-1.2.1    |  16 +-
 metadata/md5-cache/dev-python/pendulum-2.1.2-r1    |  17 -
 metadata/md5-cache/dev-python/pendulum-2.1.2-r2    |  17 +
 metadata/md5-cache/dev-python/pytzdata-2020.1-r1   |  16 -
 metadata/md5-cache/dev-python/pytzdata-2020.1-r2   |  16 +
 metadata/md5-cache/dev-python/rapidfuzz-2.9.0      |  17 +-
 metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5 |  15 +
 metadata/md5-cache/dev-python/simpleeval-0.9.12    |  16 -
 metadata/md5-cache/dev-python/simpleeval-0.9.12-r1 |  16 +
 .../dev-python/sphinxcontrib-github-alt-1.2-r1     |  15 -
 .../dev-python/sphinxcontrib-github-alt-1.2-r2     |  15 +
 metadata/md5-cache/media-fonts/Manifest.gz         | Bin 40168 -> 40164 bytes
 metadata/md5-cache/media-fonts/noto-emoji-20210715 |  14 -
 metadata/md5-cache/media-fonts/noto-emoji-20220912 |  14 +
 metadata/md5-cache/media-libs/Manifest.gz          | Bin 103538 -> 103542 bytes
 metadata/md5-cache/media-libs/suil-0.10.16         |  15 -
 metadata/md5-cache/media-libs/suil-0.10.16-r1      |  15 +
 metadata/md5-cache/media-sound/Manifest.gz         | Bin 73148 -> 73152 bytes
 metadata/md5-cache/media-sound/amsynth-1.13.0      |   4 +-
 metadata/md5-cache/media-sound/ardour-6.9-r2       |   8 +-
 metadata/md5-cache/media-sound/ardour-9999         |   8 +-
 metadata/md5-cache/media-sound/frescobaldi-3.2     |  17 -
 metadata/md5-cache/media-sound/patchage-1.0.10     |  17 +
 metadata/md5-cache/media-sound/patchage-1.0.6      |   4 +-
 metadata/md5-cache/media-sound/patchage-1.0.8      |   4 +-
 metadata/md5-cache/media-sound/zynaddsubfx-3.0.6   |  16 -
 .../md5-cache/media-sound/zynaddsubfx-3.0.6-r1     |  16 +
 metadata/md5-cache/media-video/Manifest.gz         | Bin 40982 -> 40978 bytes
 metadata/md5-cache/media-video/makemkv-1.17.1      |   4 +-
 metadata/md5-cache/net-analyzer/Manifest.gz        | Bin 66466 -> 66298 bytes
 metadata/md5-cache/net-analyzer/python-gvm-21.1.3  |  17 -
 metadata/md5-cache/net-im/Manifest.gz              | Bin 18399 -> 18399 bytes
 metadata/md5-cache/net-im/zoom-5.11.10.4400        |  15 +
 metadata/md5-cache/net-im/zoom-5.11.3.3882-r1      |  15 -
 metadata/md5-cache/sci-chemistry/Manifest.gz       | Bin 14689 -> 14689 bytes
 .../md5-cache/sci-chemistry/chemex-2021.4.0_p6     |  17 -
 .../md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1  |  17 +
 metadata/md5-cache/sci-chemistry/chemex-2022.0.1   |  17 -
 .../md5-cache/sci-chemistry/chemex-2022.0.1-r1     |  17 +
 metadata/md5-cache/sys-process/Manifest.gz         | Bin 17226 -> 16749 bytes
 metadata/md5-cache/sys-process/bpytop-1.0.61-r1    |  16 -
 metadata/md5-cache/sys-process/bpytop-1.0.63       |  16 -
 metadata/md5-cache/sys-process/bpytop-1.0.67       |  16 -
 metadata/md5-cache/sys-process/bpytop-1.0.68       |  16 -
 metadata/md5-cache/sys-process/bpytop-1.0.68-r1    |  16 +
 metadata/md5-cache/www-apps/Manifest.gz            | Bin 25413 -> 25420 bytes
 metadata/md5-cache/www-apps/postfixadmin-3.3.11    |  15 -
 metadata/md5-cache/www-apps/postfixadmin-3.3.11-r1 |  15 +
 metadata/md5-cache/www-client/Manifest.gz          | Bin 12262 -> 12262 bytes
 metadata/md5-cache/www-client/vivaldi-5.4.2753.40  |  15 -
 metadata/md5-cache/www-client/vivaldi-5.4.2753.47  |   4 +-
 metadata/md5-cache/www-client/vivaldi-5.4.2753.51  |  15 +
 .../www-client/vivaldi-snapshot-5.5.2770.3         |  15 -
 .../www-client/vivaldi-snapshot-5.5.2797.3         |  15 +
 metadata/md5-cache/www-servers/Manifest.gz         | Bin 7728 -> 7562 bytes
 metadata/md5-cache/www-servers/tomcat-7.0.109-r1   |  15 -
 metadata/news/Manifest                             |  28 +-
 metadata/news/timestamp.chk                        |   2 +-
 metadata/timestamp                                 |   2 +-
 metadata/timestamp.chk                             |   2 +-
 metadata/timestamp.commit                          |   2 +-
 metadata/timestamp.x                               |   2 +-
 metadata/xml-schema/timestamp.chk                  |   2 +-
 net-analyzer/Manifest.gz                           | Bin 45046 -> 45034 bytes
 net-analyzer/python-gvm/Manifest                   |   2 -
 net-analyzer/python-gvm/python-gvm-21.1.3.ebuild   |  28 --
 net-im/Manifest.gz                                 | Bin 10426 -> 10424 bytes
 net-im/zoom/Manifest                               |   4 +-
 net-im/zoom/zoom-5.11.10.4400.ebuild               | 182 ++++++++
 net-im/zoom/zoom-5.11.3.3882-r1.ebuild             | 181 --------
 profiles/Manifest.gz                               | Bin 153185 -> 153187 bytes
 profiles/package.mask                              |  14 +
 profiles/use.local.desc                            |   2 +-
 sci-chemistry/Manifest.gz                          | Bin 10191 -> 10193 bytes
 sci-chemistry/chemex/Manifest                      |   4 +-
 sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild  |  40 ++
 sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild     |  46 --
 sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild     |  42 ++
 sci-chemistry/chemex/chemex-2022.0.1.ebuild        |  48 --
 sys-process/Manifest.gz                            | Bin 9982 -> 9976 bytes
 sys-process/bpytop/Manifest                        |   9 +-
 sys-process/bpytop/bpytop-1.0.61-r1.ebuild         |  33 --
 sys-process/bpytop/bpytop-1.0.63.ebuild            |  33 --
 sys-process/bpytop/bpytop-1.0.67.ebuild            |  33 --
 sys-process/bpytop/bpytop-1.0.68-r1.ebuild         |  33 ++
 sys-process/bpytop/bpytop-1.0.68.ebuild            |  33 --
 sys-process/bpytop/files/bpytop-1.0.61-tests.patch |  20 -
 www-apps/Manifest.gz                               | Bin 13146 -> 13144 bytes
 www-apps/postfixadmin/Manifest                     |   2 +-
 .../postfixadmin/postfixadmin-3.3.11-r1.ebuild     | 104 +++++
 www-apps/postfixadmin/postfixadmin-3.3.11.ebuild   | 105 -----
 www-client/Manifest.gz                             | Bin 6214 -> 6209 bytes
 www-client/vivaldi-snapshot/Manifest               |   8 +-
 .../vivaldi-snapshot-5.5.2770.3.ebuild             | 206 ---------
 .../vivaldi-snapshot-5.5.2797.3.ebuild             | 206 +++++++++
 www-client/vivaldi/Manifest                        |  10 +-
 www-client/vivaldi/vivaldi-5.4.2753.40.ebuild      | 206 ---------
 www-client/vivaldi/vivaldi-5.4.2753.47.ebuild      |   2 +-
 www-client/vivaldi/vivaldi-5.4.2753.51.ebuild      | 206 +++++++++
 www-servers/Manifest.gz                            | Bin 5035 -> 5036 bytes
 www-servers/tomcat/Manifest                        |   6 +-
 .../tomcat/files/tomcat-7.0.99-build.xml.patch     | 163 -------
 .../tomcat/files/tomcat-instance-manager-r1.bash   | 240 ----------
 www-servers/tomcat/metadata.xml                    |   1 -
 www-servers/tomcat/tomcat-7.0.109-r1.ebuild        | 142 ------
 208 files changed, 3162 insertions(+), 4148 deletions(-)
 create mode 100644 app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild
 delete mode 100644 app-admin/rsyslog/rsyslog-8.2206.0.ebuild
 create mode 100644 app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild
 delete mode 100644 app-admin/rsyslog/rsyslog-8.2208.0.ebuild
 delete mode 100644 app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild
 create mode 100644 app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0-r1.ebuild
 delete mode 100644 app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
 create mode 100644 dev-cpp/jarowinkler-cpp/Manifest
 create mode 100644 dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild
 create mode 100644 dev-cpp/jarowinkler-cpp/metadata.xml
 create mode 100644 dev-cpp/rapidfuzz-cpp/Manifest
 create mode 100644 dev-cpp/rapidfuzz-cpp/metadata.xml
 create mode 100644 dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild
 create mode 100644 dev-java/gson/gson-2.9.1.ebuild
 create mode 100644 dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
 delete mode 100644 dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild
 delete mode 100644 dev-python/pendulum/pendulum-2.1.2-r1.ebuild
 create mode 100644 dev-python/pendulum/pendulum-2.1.2-r2.ebuild
 delete mode 100644 dev-python/pytzdata/pytzdata-2020.1-r1.ebuild
 create mode 100644 dev-python/pytzdata/pytzdata-2020.1-r2.ebuild
 create mode 100644 dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch
 create mode 100644 dev-python/rapidfuzz_capi/Manifest
 create mode 100644 dev-python/rapidfuzz_capi/metadata.xml
 create mode 100644 dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
 create mode 100644 dev-python/simpleeval/simpleeval-0.9.12-r1.ebuild
 delete mode 100644 dev-python/simpleeval/simpleeval-0.9.12.ebuild
 delete mode 100644 dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild
 create mode 100644 dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r2.ebuild
 delete mode 100644 media-fonts/noto-emoji/noto-emoji-20210715.ebuild
 create mode 100644 media-fonts/noto-emoji/noto-emoji-20220912.ebuild
 create mode 100644 media-libs/suil/suil-0.10.16-r1.ebuild
 delete mode 100644 media-libs/suil/suil-0.10.16.ebuild
 delete mode 100644 media-sound/frescobaldi/frescobaldi-3.2.ebuild
 create mode 100644 media-sound/patchage/patchage-1.0.10.ebuild
 create mode 100644 media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild
 delete mode 100644 media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild
 delete mode 100644 metadata/md5-cache/app-admin/rsyslog-8.2206.0
 create mode 100644 metadata/md5-cache/app-admin/rsyslog-8.2206.0-r1
 delete mode 100644 metadata/md5-cache/app-admin/rsyslog-8.2208.0
 create mode 100644 metadata/md5-cache/app-admin/rsyslog-8.2208.0-r1
 delete mode 100644 metadata/md5-cache/app-crypt/sequoia-sq-0.26.0
 delete mode 100644 metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0
 create mode 100644 metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0-r1
 create mode 100644 metadata/md5-cache/dev-cpp/jarowinkler-cpp-1.0.2
 create mode 100644 metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.6.0
 create mode 100644 metadata/md5-cache/dev-java/gson-2.9.1
 delete mode 100644 metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
 create mode 100644 metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
 delete mode 100644 metadata/md5-cache/dev-python/pendulum-2.1.2-r1
 create mode 100644 metadata/md5-cache/dev-python/pendulum-2.1.2-r2
 delete mode 100644 metadata/md5-cache/dev-python/pytzdata-2020.1-r1
 create mode 100644 metadata/md5-cache/dev-python/pytzdata-2020.1-r2
 create mode 100644 metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5
 delete mode 100644 metadata/md5-cache/dev-python/simpleeval-0.9.12
 create mode 100644 metadata/md5-cache/dev-python/simpleeval-0.9.12-r1
 delete mode 100644 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r1
 create mode 100644 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r2
 delete mode 100644 metadata/md5-cache/media-fonts/noto-emoji-20210715
 create mode 100644 metadata/md5-cache/media-fonts/noto-emoji-20220912
 delete mode 100644 metadata/md5-cache/media-libs/suil-0.10.16
 create mode 100644 metadata/md5-cache/media-libs/suil-0.10.16-r1
 delete mode 100644 metadata/md5-cache/media-sound/frescobaldi-3.2
 create mode 100644 metadata/md5-cache/media-sound/patchage-1.0.10
 delete mode 100644 metadata/md5-cache/media-sound/zynaddsubfx-3.0.6
 create mode 100644 metadata/md5-cache/media-sound/zynaddsubfx-3.0.6-r1
 delete mode 100644 metadata/md5-cache/net-analyzer/python-gvm-21.1.3
 create mode 100644 metadata/md5-cache/net-im/zoom-5.11.10.4400
 delete mode 100644 metadata/md5-cache/net-im/zoom-5.11.3.3882-r1
 delete mode 100644 metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6
 create mode 100644 metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1
 delete mode 100644 metadata/md5-cache/sci-chemistry/chemex-2022.0.1
 create mode 100644 metadata/md5-cache/sci-chemistry/chemex-2022.0.1-r1
 delete mode 100644 metadata/md5-cache/sys-process/bpytop-1.0.61-r1
 delete mode 100644 metadata/md5-cache/sys-process/bpytop-1.0.63
 delete mode 100644 metadata/md5-cache/sys-process/bpytop-1.0.67
 delete mode 100644 metadata/md5-cache/sys-process/bpytop-1.0.68
 create mode 100644 metadata/md5-cache/sys-process/bpytop-1.0.68-r1
 delete mode 100644 metadata/md5-cache/www-apps/postfixadmin-3.3.11
 create mode 100644 metadata/md5-cache/www-apps/postfixadmin-3.3.11-r1
 delete mode 100644 metadata/md5-cache/www-client/vivaldi-5.4.2753.40
 create mode 100644 metadata/md5-cache/www-client/vivaldi-5.4.2753.51
 delete mode 100644 metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2770.3
 create mode 100644 metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2797.3
 delete mode 100644 metadata/md5-cache/www-servers/tomcat-7.0.109-r1
 delete mode 100644 net-analyzer/python-gvm/python-gvm-21.1.3.ebuild
 create mode 100644 net-im/zoom/zoom-5.11.10.4400.ebuild
 delete mode 100644 net-im/zoom/zoom-5.11.3.3882-r1.ebuild
 create mode 100644 sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild
 delete mode 100644 sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild
 create mode 100644 sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild
 delete mode 100644 sci-chemistry/chemex/chemex-2022.0.1.ebuild
 delete mode 100644 sys-process/bpytop/bpytop-1.0.61-r1.ebuild
 delete mode 100644 sys-process/bpytop/bpytop-1.0.63.ebuild
 delete mode 100644 sys-process/bpytop/bpytop-1.0.67.ebuild
 create mode 100644 sys-process/bpytop/bpytop-1.0.68-r1.ebuild
 delete mode 100644 sys-process/bpytop/bpytop-1.0.68.ebuild
 delete mode 100644 sys-process/bpytop/files/bpytop-1.0.61-tests.patch
 create mode 100644 www-apps/postfixadmin/postfixadmin-3.3.11-r1.ebuild
 delete mode 100644 www-apps/postfixadmin/postfixadmin-3.3.11.ebuild
 delete mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2770.3.ebuild
 create mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2797.3.ebuild
 delete mode 100644 www-client/vivaldi/vivaldi-5.4.2753.40.ebuild
 create mode 100644 www-client/vivaldi/vivaldi-5.4.2753.51.ebuild
 delete mode 100644 www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
 delete mode 100644 www-servers/tomcat/files/tomcat-instance-manager-r1.bash
 delete mode 100644 www-servers/tomcat/tomcat-7.0.109-r1.ebuild

diff --git a/Manifest b/Manifest
index 86ef5884fcaf..3f690fb87797 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29620 BLAKE2B 895c0f0dda7cd223adbd018139c0ba14ba7c2a722e4c3ee90c69348c84b50431d2d63d6692415bac65a70930c065e858e7a21e35720f1bba7a0216a95983a93e SHA512 ed5e11013ad89859e1350eb345a4c73eb11eeaaefed9190fd9933488c9e99ff909baa10245aa13fe7b811d033b242afd5d0fc1cbd1404ca706d81927254ab22c
-TIMESTAMP 2022-09-18T09:39:42Z
+MANIFEST Manifest.files.gz 29635 BLAKE2B 66d6be21714025c0e4035c738d4c841e7a46d6ee9d34cb9e7c1f8d3f89fa3d202a89e3d5262d0957ff560a716dd126cb4242483359de6a5b5b60800585d25fa6 SHA512 f15db8cacc61a4790ccba1c675c2c7c9160c99d63aebb4659caa973447e008c38137a23c9ebd992feaf4cf5e91bc901558dd6801155582a1937fda410e809ae0
+TIMESTAMP 2022-09-18T15:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMm515fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnO8NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klClBg//UBC6rEAO0tQxNd51UIgnC6Y1nTvpXs9eiNJJrcl+Vg0j3E13uXvqB9Vy
-B/RaAZwRpBhESUZRWfhaxSn4SqJyANSiqS8kopg2d93oIX3ysUEy7HxpmqPTNenc
-T4iE1IjHj4mlkzxv326kF1y+33bQ/j1V7r6kxuIAlyp/C75crd+xo0vZdG32wFr/
-xKPEg18Bzov+ATao7sc3eM8wI+vlWgSilnNHhzFMf2+eGmsxZjFASXWZ/8FpUaUE
-bibx2E8Wb8DWPLCbqgIs+QLU8mVVvuYp9NdM4p/Z51fP8RlvuZCwikL678HtFvlM
-iipH9GilbeiEC6tvsEKMjjeUqzM+ViTMeiDqfYg88Lfjr+dUjqxzXJslBQjBAo/+
-ZauravMcxn7bEs2NP1s0LGs7KO2XhCUMquSIdk7bjBvCa33+riJHFXpyP7L1N8Ia
-RyKTdMx2JsFvnHahFF2S8Mbw0a/y03+/zMIhbkFl/lPUBnIGaDBFgJMrHBf6e5jp
-t377ze5tBmP4Ql3ohFNoUPP7gcCkSL7PKV8GGDBZXQM5jAuDv0AFe740gknKS3yw
-0R7LR5BpG8vZXjuklTJZe8tDvu/U0rrqCZRR/R6MQ8pGZRbEyUJrrzgTXhVW1lQN
-hVMSpToNYuGH2uf2S7+JiMNzVx2uRqlin/Bk6KWSukB0wxQdhhs=
-=bR1M
+klCRIw/+OADSVAbCSM9K7NgLw+obIzG4oURcn6MRqxBAgnbJFYRKQB2NiekbbfMD
+S749GpNIMlKFYBBrxscVcDhgo8sXFBJ5u4poBMICChdAHs1mKcyIq0Rk9dOamKwN
+4ZigFfE791CZyHmBJMIKBgZefHHTFjwiJOMNV/M5Rfkt4a6fuBVgs3xI1QShuwla
+rIM0qfKhB+XzsBkaRHbOLd7DOVGsSood/+7PrsFbkv13vSPRbmlqIXeq9+wK5CZP
+Ch9caMGPdxfV/aZHzshM5V++/y1c49RmAvnR3vA4bSY0yJHD42L9EKan906AM1Vb
+/J5wbefd+if7FW2mzBCyMoqJA60TRRLquQJIJotRDaJ5XsfmaltXvdwssPI97Myy
+SiQDwO8cva7ty6YHMhrGSzZhWUBDiSjZM06E3kDxgD8WtKAm+Nloj1grsjgFKhKV
++AO3IGeM3nVOCM2YwmI45ukaxomeuTb9YVMcBsQAlrY0eNBpmc45MzpoMdIYDnKL
+zQRxDmkJYAuquNZ7hI8nSUJaWKsON/6kys1+iOruRUY9rtJrALJfaG2Horp16W/O
+SdfzNqdR58qlDCHVwkT7KA9OafA8iyIcE6N70K4KrVGbIsvOsN3QIkbgNJ0HLn7o
+fVoYukDxTueXYReBF5OQ9iJ4EVwheHt3gTg0goIgNmdBMJEhj9M=
+=0zNu
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d575f9cdd5e2..f67fa51bf75f 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 069bcd802a36..d5c68c122111 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 6a10e25c6d12..420aa1282654 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -22,6 +22,6 @@ EBUILD rsyslog-8.2102.0-r1.ebuild 12864 BLAKE2B cdbbbe6c4b582c5d899318ebffc5a3eb
 EBUILD rsyslog-8.2110.0-r1.ebuild 12990 BLAKE2B 556a0641ea0dc1bf634a3e2eb67bf4ad98be01988b92b268d4319bee2fb044976c8c0e659f203b20583d82e9b9c2aeb78347077f32bd95d133cb4500ce66fd8c SHA512 c630700d84ed9462eaa2f56245d2bd4f4720440f686fa6c3559dcc1fb8609de440d80305ee3d8e0b75cbc21fbcf17f2e7076764b8c1d31761eede3a6de0c5870
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
 EBUILD rsyslog-8.2204.0-r1.ebuild 12922 BLAKE2B 7190afdac273d3d1be851dafb59e4a0dcebe368eff979340cd48b177ad8d896467b84b6ec33aa3e20c1310af2242b6b00d5bf2f66f5a3a20e4017486a136ff9e SHA512 730f72c6bc668aa550851dac2e7954cc35e21180adf212cdc5cbbabe367093f15e5946985ed8ad98dea456c708314eac8b966108411e99905359813129543511
-EBUILD rsyslog-8.2206.0.ebuild 12945 BLAKE2B e5df57c93da77b832e0d86ace93e4baa45e403789213575681ed9f9bcfba5f400e7b920e4cdda7d9b2971880cd70520b6952195cd72e7705e926296bb3f14150 SHA512 87d925cca33b5b71062846501a2f1e0491efb05283020a84411c8f110981cfb21484b96d4fb6118e23c22363f16d0e4cf0bde2fc228ef128e0efe225203165cd
-EBUILD rsyslog-8.2208.0.ebuild 13051 BLAKE2B bfbad8b2142b641a9a9cee8df7060d340a58eb9dbf79dec26002179824b331148fa0b9c5fa681b9daad45b651a919c10a6e15e4a0ad5d6a2ac9f5ab1e0845b27 SHA512 ca9cb1747c2aa55f80da93b00905c6aa91500e81fca229b17b23eb94d6e22248a9c2024e1971ded8c0f082fe1d9ae1ff566e64ae5c7fe2ccba133c240b6046d0
+EBUILD rsyslog-8.2206.0-r1.ebuild 12965 BLAKE2B f57c348fd034c19ab6f68da85f881c14a1cdbbd06c89f7f0cedcf72e558dafa591acd8b9e6a1739bc0482697148f51fbaf5c10dadb8b75e9d50ca1cf794ca378 SHA512 47784827bfec562177f1673d8104d0820aef01153e5623aa5e4e96d1533ff30143b442b7613cea48799d4ec0da34fde913f47a204ff3c35116d36b2adb434af3
+EBUILD rsyslog-8.2208.0-r1.ebuild 13071 BLAKE2B aed0478ec7dd4b10ee8b5b9aad97eace6dcf00c5eb4e3c5a9fd5c6c6218c711ac7a43a6634fdc3f56fe42b645cb4554d7315053c0956e1990f68eccf97d03779 SHA512 d1f8052e38ef991de236af15d070587e643e359bffc16bc332831b55acbab55f358d3a5ac63dbbb89e654c717562f771025a22482b4d3163713d820cef74a605
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild
new file mode 100644
index 000000000000..13ae583dd29d
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild
@@ -0,0 +1,493 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? (
+		>=dev-libs/hiredis-0.11.0:=
+		dev-libs/libevent[threads]
+	)
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	BDEPEND+=" >=sys-devel/bison-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imdocker
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.2206.0.ebuild b/app-admin/rsyslog/rsyslog-8.2206.0.ebuild
deleted file mode 100644
index 22c04e9e16da..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2206.0.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? (
-		dev-libs/apr-util
-		www-servers/civetweb
-		virtual/libcrypt:=
-	)
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? (
-		>=dev-libs/hiredis-0.11.0:=
-		dev-libs/libevent[threads]
-	)
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		--enable-fmunflatten
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis imhiredis)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild
new file mode 100644
index 000000000000..87f42ed5e63c
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild
@@ -0,0 +1,494 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? (
+		>=dev-libs/hiredis-0.11.0:=
+		dev-libs/libevent[threads]
+	)
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	BDEPEND+=" >=sys-devel/bison-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imdocker
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.2208.0.ebuild b/app-admin/rsyslog/rsyslog-8.2208.0.ebuild
deleted file mode 100644
index bdd7c95c4107..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2208.0.ebuild
+++ /dev/null
@@ -1,493 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? (
-		dev-libs/apr-util
-		www-servers/civetweb
-		virtual/libcrypt:=
-	)
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? (
-		>=dev-libs/hiredis-0.11.0:=
-		dev-libs/libevent[threads]
-	)
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		--enable-fmunflatten
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis imhiredis)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 1a15bcc5f18d..6f79744c5440 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/sequoia-sq/Manifest b/app-crypt/sequoia-sq/Manifest
index 2de37ad163ed..229e4749147d 100644
--- a/app-crypt/sequoia-sq/Manifest
+++ b/app-crypt/sequoia-sq/Manifest
@@ -1,22 +1,16 @@
-DIST addr2line-0.16.0.crate 33440 BLAKE2B b59a006ba732935d408d0574799037ef0a424ad3c27b894fbd7a9c91664460972a8c464aaad4e9b82b94e4cc35ee9016490bd469fa21358e11e6d78126378038 SHA512 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aead-0.3.2.crate 11145 BLAKE2B 2666f7c6a9a3ecac458fdda9d7698e1c4288d56b1d7f9fcaa91664a33652f91eaeda8807bfbdc3cfe9c29a9c8c391de9673c4b65b3e13f408ca5f1a59e8f8dad SHA512 803829ea12f3fe11c1e1f4d33610c361a11b33811ab28185ad4b54d9026384b8778c3e57cdc6feff8ffc56792b482fc64a8cb7daa14805edbbcd988c2d3256ea
 DIST aes-0.6.0.crate 86774 BLAKE2B e687f2839b53adc3ef990da8221705a462015aa0ea004a6e15dba7e7ecc008d9d13cad6222b03244dc48bd1717a442e7aa5aaab6e97bba1d3be28c1d914e464e SHA512 65349285e429f9b8815743d86b3ebdececd48ce556a08b6ec5ec89bf966bc9b187a7df4fbe1f3b25172db3aab219b23f8040c1160359868e9f71d67a767c90c9
 DIST aes-soft-0.6.4.crate 99980 BLAKE2B a4b3838e0348ed3d7468f9d0e19d8dd45071ec54d54d538943d5afabd3f88db139c459574e6694e7fa86e4d77eaa3f75c11e3a9376f45429848c91889530980b SHA512 620b38b2a6437caf393e84625beb27afdf448acb52d7adbc9cba1152ea385bdf05a68795eee0f48fd90b5edfc25fd9cc3d42a0f2593dfa2f90d4f4f9cc893ebe
 DIST aesni-0.10.0.crate 100248 BLAKE2B 2dba6f1004495a725acf171eeae5a6e393475323e8974eff2e4667194ac147dc3a52a9bed1b00cf7735d3671b6a2bd135cbb4dbde822d7c8c21af23692d3e71f SHA512 726e5213a81ea021d4be7c5220d952cb6f0cb0ecb6cc840b542e9f75539e37fc5d6378ad4f4d6a2bc7e7642ea07a18202ed32d3b6a212777bd7abca735c6707c
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
 DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
 DIST ascii-canvas-3.0.0.crate 10575 BLAKE2B fc40c40551e3e1b2bec6ae5a85ee8b0a1ab1ef3425cdd19ec6dd47d849205004781a2c8f51470417fe7556cf8524cc63b84a532532c5081604adbcd92d286b44 SHA512 216056640604f5faba6d46e2c94ff75234fec83d3bc2dc7cf34dd279706362874e3a513c717b23bc591da07cc3088458913c4e9aa5f280550c93d261095c8703
 DIST assert_cmd-2.0.4.crate 22581 BLAKE2B 7fc9fe4577e486f26d07b2b4419c331022ca61923d0664f4e8a25abbe6d6305600b47c739f9f065ef778bdeb59b6309ab73df2be11e5f8387cac2e7e8c70a4a2 SHA512 c389e0210153e9a6ccbba4dbc6a6c7a23533e5fe76e717dbc36415be2adbabfbc0de33a2e6d05e3d70779b7a278580edba400c688c9a6b446403b59a78d93720
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 DIST autocfg-0.1.8.crate 6621 BLAKE2B 15afc4b27028f542b6977bcf19cc75f7e47df1f4e241e43d858bf451a659a2e937e0a3c1c8918d4fba6d1f66e47ba2f2e329023f3dcaff182e048e9e4f783825 SHA512 d6156e0a8701f38c20b693380ed1ac5b15f84bc87c5ae0541483b9b387e6118d8673d8e5da5f4eee4d736c777e923d3fba7f61589a49c353170a708a709d8db5
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST backtrace-0.3.62.crate 74306 BLAKE2B 75bfa1ff999e33ffba88815bc143732d324bf50e92bbee2348ccb28d51eb389c9abbe3be08aa791cb167b5db2b2db3f13172c574396a7717b4512735032caca6 SHA512 d8f5f18ea168317838c05aa169b095529bcab7d7392a93f59d76d32a9eb99ea18dc14f5eb6f9e36fa087387e2c08c23e735a1823550e509d3e110a1a7f63b1b3
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bindgen-0.57.0.crate 199132 BLAKE2B ed5d73da72116acca0124770f6f8e162c161c3375980505a704d3fc73ad20fc8cd81ce59680deb4922def8737914027c1c1e2c9fb4b181ddf114a08522657b62 SHA512 a4bf376aa0f84e625f4c5eed7bdc9775549b0ab9e9edcee708d8b56df6cb49611b7093692e772ed7ad5adb1c3d8055d81b4ff19359a193a5bfb4b200ca8a26a8
 DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
@@ -30,33 +24,23 @@ DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0
 DIST block-padding-0.2.1.crate 7672 BLAKE2B 26f682717c908886fc54606950697a01e999c8d725e39cd5ca9148b089d5b32981daf717db21128b551287d5e818363db4c34123a8d8dfa3405f940eb284c01a SHA512 d0bad6ca76cd491446f17c00986aa8caab36a78b4ee4f881a14b316074a96940566ed90460aade765f2e7ce04b359cfe21f6c323200637f50e8b5adf567017af
 DIST blowfish-0.7.0.crate 16275 BLAKE2B 56206561f9301eb93411aa86b027bb7816b62154aef7f62fb6692110f88d40fba3cf110c1bc3f634254fb64600de6330b775ea777a5f3bb3a35ff8737751f2ee SHA512 1aae8ac2647955382f9caf0f23c9c8bfd3801f49f0d0b66aed46e30e89ea08ea57c4c53401b50abc47f9653c42455c44d2339df3e0e2315e5a88d89d35a98090
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
-DIST bumpalo-3.8.0.crate 79835 BLAKE2B 3937c4ca9d7c5e2ffee229c8f5503c6a59f2fabfa3b7c81fefbf5df816efc5f601aaca4b606a62e647262acafa34146aa0906eedc09368e16eb76b3c6722e8e1 SHA512 c9825e7638bd54f97877adee8ac8f6a2cee308050c3f446f9da3996688ec3d779cb6eb935a440329794fb534958a6e89749b44a9bb27dfd219a963f64a6bcac1
 DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
 DIST bzip2-0.4.3.crate 34195 BLAKE2B 946ff5824531de8b82241fa042638cd33e708c4b517fa40c99e49f77ac7fd7aabe614e4b560ed8f5484ef8fd06bf19041cb20b7a622f4f1dea9ba26c5b821c5e SHA512 2d4622c336f204ab28970ccb369ba55829bfea426bfe96f15da376f2375c441a9bfb03c46f5da210990f23115740250cc15e9036309034b39a1c960dca542da2
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
-DIST capnp-0.13.6.crate 62063 BLAKE2B 0da79e312563b49a8aa4f855a8603e78da4505ddb4eb8f51becf76248c599df5f28fe807e908a329bed07b6830c03153fd408bd7ccdea28e41245346fc3576f3 SHA512 f7973b2c89b1a9bd795ba8b01bdf9c975a40420ef1d2dde74a941fe0b21481d9e3a3045ff5080f0136125d4a0b0ad5b5a7888eaba921d7f141b67ea82859ab6d
 DIST capnp-0.14.6.crate 65297 BLAKE2B f67b448b81574f8ac9bcd4507d972f6ae07e5ab3f60ec509b4940eb36b7c210c0ac057f5240d6349bbd1fa62dc49e9d2d29e986d5a6edaba7aa464989950d10b SHA512 978ca1dfc14a67b09b033b4a2b1a0b6f3fbd1cfac86a3a08b9fead4613a01e9c153caf89858aef89303753192c62c99e4db754d128e1779968b1f3574a289049
-DIST capnp-futures-0.13.2.crate 7630 BLAKE2B aac7ff508e646db2981d1b268a13399150ee80d0ac9f492019c847e1d09bfa81b710c05f3209ed087d0c5f5c5ff60967f7cdd8b5de858f1af3f90e1ee28a6c9a SHA512 13200ee8c905246f11bb2987a54d12c325ba07b886d27de4c20b34b5844d1742c5fb36aad3a82a7784a7cdc453ac889021b1be3fc526c1b8fd36180e2027593d
 DIST capnp-futures-0.14.1.crate 7815 BLAKE2B 77f9b009317b3956190cd15840bab232edc5bcc3f0d445f487823bcf68139005c154ff110b376917e0cdc588cc5eff02cf19d707fc9ce754df0b5b07f8cd87e6 SHA512 488607532e89fca84389c88c8567af69ee71e5c83a5f2693921431a0aaa53faf44a98eabba1ff003b642738d25a60d845845979b9546546cfad88f7a53f28ade
-DIST capnp-rpc-0.13.1.crate 47484 BLAKE2B 1353171907ac6961dd31bce85a337b500e24ccabf626407ef2c30784f709d1f94218d3c7f2f7cb9073b6a264c461d982d2d8c9b4001178f51e0f0e0eb7843ad0 SHA512 11b304407dc540092f4078e5ae3d7bd57a0e105829e9855b35a75de402f551c5c123fd17f2d106150061682628966fa331edac3266e4b9a06ed7198fedbabab1
 DIST capnp-rpc-0.14.1.crate 76196 BLAKE2B 32775637354fac46e9f242a613d7a1f90c56858259222a0b08d5682265eea1484c15c928118634628e8364c419347dc4babcc9708c15f4bfdc54fb025589600a SHA512 3cd6ef7283c540074cd125fd14bb204833e37ce734c6875795f6d63079207ad8edaf9a678a181171295a882c2547519cc723d45995bac7d7dab89569b44411ba
 DIST cast-0.2.7.crate 11222 BLAKE2B 8a09b6493d68b08539b38fef39ac3abae829c8b899d5243bda3c3d8acada44f4c57416e3247c82a9a4b82180d7f96c96f048b8cdbf21a8fc184ca6957b237ad9 SHA512 24d204acf21366e088f721714c48bb6431895882263ef3a08f6644abbca5c06f430729fa8bbb4c9f37c95a6baa1b824d3fad95c5f0889e92587490d51bebb4d6
 DIST cast5-0.9.0.crate 36714 BLAKE2B 28aa02c1924b01f5bb20984122818080463a52c45ce7cbcdb9cfa05d808cfccb9e35d2d2f5481f651c6981198ef4f9309a2fabe61e9b8a02023c71fdf8376c85 SHA512 38e11c0851254f47f79560a2c08e9e767ea2c50a180a1e6d331894473dec9fd2126bd7108dc0755f9c7726d586c6164e55f2805d3e71c544d0fd410e89c60262
-DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST chrono-tz-0.6.0.crate 569342 BLAKE2B 5e7500b3e234b7a6f908b975bc0530c783255a31e88a7b1d9f7022a311c8ae1a02c9376f1998371fc2a7f9dc5201614d1fec9fc1711e57671fecc11054bcffe7 SHA512 4a2af9ca6cf3fe7bf18076bd095e86dd811e73ee92ed9c771d185fa44c65be4d178e4dfe0a14bf9c37e71d361621c12503969692679078716c287616f88a6185
-DIST chrono-tz-build-0.0.2.crate 5840 BLAKE2B cf7661f2b7205c90ed664c874c230928cc7e70d3a62d758fbe8be862b4cb35312354efa13fa39a99ffb857632cf57519b168a51b65fe5f3d573ea2a0a4194f27 SHA512 9ce99c60a61e97d987a84b367832cbc239cd13e2da5f8af8661afce16fcf6fa927fa1f3a03f002a82261fc693999832b705d62ce1dbba33bb11a0a7a8c38c521
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
-DIST clang-sys-1.2.2.crate 37661 BLAKE2B cbf637171253aca4892270e28c54c43b01cd1d56311555bd6c5e6b142b5f42d561a2808e1ce0baee344d08a2fbc19be1712ca34bbc5b33356a845042ba0df5bd SHA512 7f1736bce5dbc644a4901a73926ea2f6a92a419a7399b6cb49bf8ffed6a3177e9327add6e68fdf6b9966f4b0b580b213555d6cefbe194ad7a4bee987adf555e5
 DIST clang-sys-1.3.1.crate 37840 BLAKE2B 4c925a684d66fddb5f3953fff6b96fa56b0b996eed227e17873ccd5555baf4ca77964a38ff279999533e7409e2b1d355c13470a6c461fb4b0e11807bc948dbe4 SHA512 aeea37957f7e9a7ecc862f56c6492b68b57217d1a893d3978f5d48d5ef9f80cefa8c52604d7201b9c96402d87ca43ba694890b0bc849d4d623f74ea009ce45bb
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST clap-3.1.17.crate 209176 BLAKE2B 6c6647666ee7c13b49e998c1cf22eb410441d3c99d35a2714a4085d7f8fba01605ff88f036ee290c76e3eb37cca8cb2bbdeb2cd394928f9fa36ea92b4935a9e9 SHA512 c80c96a0de1e5f5bf0eddf72ed265560fadcc893f4683bfec814ed3da9281546960d345317ba7ee28a46794a99de02f3fbb8966cf7103d244665d26427ae147d
 DIST clap_complete-3.1.4.crate 31223 BLAKE2B ee08809da96889594fcd7f85a63ef9c4ba9bfae3feb5b7b7c491c39712b2b1d2e98e734ed4b138f919535ddcfb20cc093602cc1587ec58d97a62fe008e86714a SHA512 3a76e4e94090c8fceebdaed4e6674ab8af2e5282c72e19643998e55dcc8e07298153baf67b4bfa430ef814c92a3c3b8513d2c857eaddc7a586693bd3a9d2b1ec
@@ -64,33 +48,24 @@ DIST clap_derive-3.1.7.crate 25363 BLAKE2B d9c92e19357988e850ade69d8350f4a0cf0f9
 DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
 DIST cmac-0.5.1.crate 9684 BLAKE2B 9996639f8716d5b201191f8643f673668bca55476f484879df39c9c1fade1f074a3847257b7f899f9e8c16cfc9637595fc8754bac57eba76e06da4fa57fb2a31 SHA512 0ddcc77a62c89c27ec5e5438a5a9487e22a13506385108ac091afb5e971c996e8fe1b671137912d4ecfaffd16585091dd81239eab91434ebf50643188f7612b5
 DIST const-oid-0.5.2.crate 13862 BLAKE2B 3b7eb180621a97f0f9e4f9c4261546bffcb16bd914d890c4a1c77342c253619482fcf1f61f22b89c0f78364f2958e245835a751c7981c038ef473a3939292e3f SHA512 28f8d78796953a139b32ae4751a050f829180884e0b690722e04971a719c9e083f3ae5836baa47747c351ee497c92adeaafe4a91008cfcfbaed0cce81bc08112
-DIST core-foundation-0.9.2.crate 26857 BLAKE2B 9090a489f2d3cf8cbe59472530470dea0ae9e1a0838207424953be812586aae013f9f6cafc4ecbe68be302f4ca208d8c892c87b5736dadddffd6d739e6427934 SHA512 9f68929963fdeb16954e6642f27173fa5d08d39e835d74f03e18d7cb23e9077572d712e7c9afc8ab0be377fd1d845625986d0a905eb6d55331027be2a25d4f9a
 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
-DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
 DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
-DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST criterion-0.3.5.crate 110662 BLAKE2B deac65befe648cabfca827b8c37a57a0c48ba1edf34b6e32799117dba9147eceee91b652244b2eb5523c88d8521ae3800d05fbec13b3b3548eabdb13a56f2763 SHA512 ad5d0cf9270c3be5d76c87ada41198d0fbdcdd9831f092ae7179b57e16df153d2aebc0bb70ad7b6fc98966240a902ed5f6fc7adf044be0420bbaa95b951e5be1
 DIST criterion-plot-0.4.4.crate 22546 BLAKE2B ab1326f804cbfbedcb415baadfee2d11b4a67544856fd94dae0f3f3a9bfe46550d23a29a0c8a3a84da6e18565dfb330580aaddfd69a42284499a36b2ae596fef SHA512 4f8fdfdf4ed5e1c410b8e133b36bf9add3d86d56bb23d75d37d92b1095b81850915209c7e4d19fd6aec7cf1b1270a9b968b8e37adc491cfc76b6df71c4619943
-DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
-DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
 DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
-DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-mac-0.10.1.crate 9531 BLAKE2B 6a26505762d8d466275fe7674de1c4f95686b7a5fe107442361c892ba3123213e3f7cfb8d5516219e84c44496ef342ab534ebca724732e509d33fb9300027ef4 SHA512 39b7d966ef2df4f01a6b6f43838ec30c9df4a51106ee42d8d349f2d826722834ad5f7875bf68d7359799015d53ed45942d71a10f701fd080e264b21a89879dfe
 DIST crypto-mac-0.11.1.crate 9551 BLAKE2B 81140107f394d969d85b77050447e7d4dbfe7b2df8164293fe9a2cca04c1ed3cd245988482a232103c2ed9d35601ec6332669bd8598d903d305935dfc09af887 SHA512 3090a7a3fdb7d94b2b14841e37733d863f2e4d24d7da3c63df1726612abdd1c1df7179bba4e344eb63a94053e59a93b0988ecd1e2e5a5db0e18a4b602be4aaa9
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
-DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
 DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda40c01add4bdb7a81e9136acb1208c79763cd612160bf39b342460fecc334c6e421e7f7ff610c4bc44e2f SHA512 cd7c60dae8fb19c3b10e0bf1ffbcedac90cbbd147d564335e4da2d5483f64ea3dc10ad17d7573b00958db0a72cce45f8b7bc10c32864dd943fe64df8d22aaaab
 DIST ctr-0.6.0.crate 17092 BLAKE2B e54c7d452944d928d5777e1744208ffa4531b85a4fd0b294d26a93f1390900de97df808ab92ef9b838e8a0c59b98a16884fc3b4c081960dbc7034694fe91525c SHA512 c58c7b44de1746e560596a9409ba542eef1b33147f8ee842da6e7c9c062046044a0f4cd432d0876928f036a590d9e6c007d4372a043aa5d8317fffdd605ac993
-DIST curve25519-dalek-3.2.0.crate 517530 BLAKE2B 568ca1e1f159e62682eebe93860802c6873c5675e83ecff747ab859ff7eae52eefa40e6311ef7b0429de1d0b8dc79ebfd80f8162d466ba8822b1cf64b758b0d4 SHA512 376242559e8956bb7260d7db82ed748f18107210a12fb744a741825448e63663f4cfc7e4df62ba79defbbd1ec9732174faa84592d0f84742d3ce1ce69aec7154
 DIST curve25519-dalek-3.2.1.crate 518091 BLAKE2B b1296335873e80bff213219475045d46becc751302023ea6450c0144a369bd0b725e706708cf5d1f7eeb62620663d65868db653898558e8705e33df7e6c49893 SHA512 e6cd01f8975cf235abe589a62da53e84bb14b2636c3c817fedb90702c5d5d0cd54378bc5d566aaab2a2c3f8618e235daafece7f70e0c62a907d7d6cb1615fb56
-DIST dbl-0.3.1.crate 6266 BLAKE2B 0c8fd10fc7f1ca91a13a85f026581898aa6509adc8fcbef89cc788faf7e3f194f0bfb970b0f0117e6f3e6cb76042abf2d71289dff081bc7bf9be0179f1cee299 SHA512 f5c3e10ed6b57d429611dbf86a97a19c99eebb919b832017be39aa1b637dbb177d6b635b7c219e95ed08c74e5e6b76b04c95244c622e61659b9cea382e577cfe
 DIST dbl-0.3.2.crate 6336 BLAKE2B bb912351efaf270363c2a6cefe4da42ae8c6a552690b566e5a7b70115721efd2ef42801500d534de0245b6feff5b6895bed74924c86eda3c5e9a5322f32e1392 SHA512 efed499069e1eacb709598b9a250be353d65dd9a1a27c7fac6d23af6262af0fda60b121c283b9318f301be2d80194ec1ce33733daa554f54ed3f690478d37cfe
 DIST der-0.3.5.crate 41594 BLAKE2B 32f75f6a6758d66102229ea3bc40abdec82c62f166519631b0b71316bbb70618e400f8adc3ece63e9d19b042f109ba9e1e7f44ef188107479c97c9bf94f2fcff SHA512 92b2b44c88b30b6e3bde75173b1b5245f1e557436270b8c4718ddcca9c584975c813492016a41300ebb7c072ff943fce200ad3d0f352f0c0edfd0668b27a331a
 DIST des-0.6.0.crate 38058 BLAKE2B 2ee60fca93024901d398115b85304386df1fd45eb001673fd5a8b53d218a5232f7cb457dbe2d3c62062615b8b300af96c52e7120bf5064eed943b772c4b826a9 SHA512 7e4b60b87ca369645e52376d65c5f287972a5e634c9727bd7f68c886da09693d1b0987b2911ec3664f6ddab3ba41a141be985d23bdefe48a9a441e236aec40dd
@@ -99,19 +74,14 @@ DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c
 DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
-DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
-DIST dyn-clone-1.0.4.crate 9654 BLAKE2B 210668852b04d59b1cab21d89f99dba4ff6832c6d699d4dfb929042c04fba8d16eb6e78cba0643ac8e23c166217c79ce016a064ac263dcd43428f0c7f86e6c2d SHA512 5d2f65ab4cadb16c877e9adf762f95826e07aaaab77ef64d52c888a8c7b362559fb108f3a5eb887a771dce89fd8d05d9d07fb50328474620e0cf303349c56f6a
 DIST dyn-clone-1.0.5.crate 11942 BLAKE2B 308c4571d8c31bf95bc11bf42e9190d02cd37aaa4ccb2da25d479b30342199c2a4100706be71e5ea8f6752af7428276799f1673bd54972b9f0e103ec4fe56216 SHA512 76175579757272286a5141a320675636695b14fb400bfd0d19dd66d525fa8f0ca199a0ea9405e92e971a87f5f972d8c5528f5f1b36a9d84bc6950e4071ebd044
 DIST eax-0.3.0.crate 13841 BLAKE2B 3b921e66781b3388359e2c8289a4b1389abd1edbc6cd2ceb0590b6a2288126bd8bf497023ee42535c8cea3c1eeaf2518fa584cc1a2b0ba28874750cfd3033c40 SHA512 517ea3cf1e621d110ab78309059a7054c05bffe80603402d763f532c61c6f9570f4470f12df40abdad0f4ed68a2eccddfed311681f12cad1e25fe3a6e65f30d8
 DIST ecdsa-0.11.1.crate 16701 BLAKE2B 9e61bef45f71d687079efb854ca84c68ca2e19efe783f4f9d2d633acaab8ea368e7a125ca8ef393067bccd5ed7643efa5f7e1aefe1cad7364871e21e0aed33b3 SHA512 e82247e2b3c55242a2181b0734c0472d383d4821c574052d70c37fe28a957edc1c5ea6be47265b466574594818c09c35022bbbc52ab987b15b82d44c4507cd13
-DIST ed25519-1.2.0.crate 7225 BLAKE2B e1519a96d00f88a28ac7c27b6da105d03afa5ddf57302cef1c5185fcd72aa41c45416e5debbd73f56b921b604eeeb4a5a81ab84a321549138039d98a02b24b55 SHA512 ef1fc02a61fde57b49a25bbd1c6ce77bc20bc7bad4d8d6327f4dcab313e9719b42326bc231b57ace4e93e56110fe77ce82d1d340650ed2b0d85c242a8e01145a
 DIST ed25519-1.4.1.crate 16779 BLAKE2B 8041cc0d41427b63b77fff6075c94afc22ded3f1c840ded1d06476486ef46b57f51f816c79ded063f2ea3df8c685e28f288370874d9a30b31dd7e39224100940 SHA512 c0db4fa04d3a9c0c724ce6f7660599eb4f7ae824ef7bea9b07efc47ee9781ab7e84a731868125b1bf6aa36ce4137f5de834278a35fa58b2ff5a862973b4739e7
 DIST ed25519-dalek-1.0.1.crate 29460 BLAKE2B b156de45f81957a0f631354b7b438e35592306045a00360df71ecc1ae3298eb737fbd436b2148c471f94dacd08ef1c04dc193feed82b1d9963809ac999decadb SHA512 e3d6c4e9a8f573783817e9ec905e5fcb76f743c91f45bfff486625cebca02e17b5fd2c222f03b73932f8bf5ed680e729e6eb81f541d3f32f6d82b7cec4df7fe5
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
@@ -125,10 +95,8 @@ DIST fehler-1.0.0.crate 9032 BLAKE2B 02ec60e347bde84b67ec41ecc22c07de3059f53301e
 DIST fehler-macros-1.0.0.crate 3271 BLAKE2B 738b8945869c7837368f083c9531986e1cee81d2ca1ab11a43f56731ab73d849c3c70fda8cbdfc23de64a51ca2e727f400fc20f3adeaa777098ab81b032f8983 SHA512 737b73a7f150f0ce308cdb8d069cce3df8aae47e46039dc2e342059af4340a0f35cd3435b26cba9c3c5267fbab6d2688628355c4fcb45781d1bbab8caae1c89d
 DIST ff-0.9.0.crate 9455 BLAKE2B 8922fb3ed78800ae1aef81629a7f81130e5d3cfc45069840c1f2db643ba2711231e96e6ec91da174eba9a8d28dfd650b5f6b88b7dbeb2b48adb77595ed3f990c SHA512 7a90be9df4075ff1e1feffbf745b4c380e7ca930870dff82d55acb8a71dc5d0be54077ed76b98a67d9c46a5e7fbd2240b798654f9148b9a141a0501b52b7c42d
 DIST file_diff-1.0.0.crate 282318 BLAKE2B 628bbbd75e7a8f192e54f75e3898b2c128f23c0111299fe54676f00ebfe532794f4b7fa28b27df3f94d96c8e4405fb9d2dd73e3459dbb888a38a4e99c6383389 SHA512 260313bcf0860e63d9f78523d81416fbc360a33c7c1740306d9d5b8aa1640e509b7330313c38105cd662881a47c46f89193e473f0b7da12d3848ed59d84e9905
-DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
 DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST fixedbitset-0.2.0.crate 13597 BLAKE2B cfbdb06fefda131509b04cfa780c9e9574ef0acb902479d7ef98f32ab45b18d78cb1cc94fba78bd023267a7f2a081aab29171f81a9e90912d4aad9f5fc17ba3d SHA512 44642b270d52f71637a87e5311f70ac77baa2a377f94254d1bd728b4ff02a3176f3a5d07732c0c4fb9bf303dbeecf327432ae01e2779d966cc13b5fb97cbc28c
-DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -137,151 +105,102 @@ DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
 DIST funty-1.1.0.crate 11631 BLAKE2B 37b246ed78132b52461dda9f3c1b52feafac998f6cd0ebc62408b90e5f826def1456ce820adc745aa1ccf07b281fde3df65af84eea561eeaf1ecedaebfab24b7 SHA512 771f42f601a0349a8e9344c8df552491c64af350b18eacc99463e972335d4a4c95416704ebf49e904503fb2d6f78bf201c8cb82fa20bfbf460ab1e7ed9f94a9e
-DIST futures-0.3.17.crate 47388 BLAKE2B aef48709c0fd15e33308ccea3adfd2966335de4c4ea24d04306e6e8d724bc6bd3355c8fc3d0392d4a26dbe85e99769267569c1ddc96ffbcdb972c2fbdcaa9149 SHA512 c2099288119c37130692cb747c7db16cb3139ac5db8fbec9754dd373eded0593f9444b8d0b003ad3fd138086959c1b74e105f2105311eeed5a65367d9ce795ac
 DIST futures-0.3.21.crate 49935 BLAKE2B 290dee4f7662a473d82350092c0b12a8270f6d6f5eae9e4f7e06a6abf59e2d9f2d33e5e62e2682fcf6e109d62f651cb37cc467cff2b20f909c72b5fee2cb7683 SHA512 723fc190e4480fd812a852656fa6509a188f0d06adaa1c22ef24ec4afa7688a1c5d3961e5747f0812d073fc672b0e084af6ad5e5c3fac3ea5829466f993ad865
-DIST futures-channel-0.3.17.crate 31765 BLAKE2B a1055de0a6b8812546442acd8acf8251168015b5f6be7bb7e223b7c61841a1a15ec1fbca3e4d40e0a552d5c3fc89ed2306a29c9ef33b1665f828ab9c8c0aa142 SHA512 884fed34839c9f73551a90fdbcdc542f88623c0d74d506febd6fb0308429e0d7df879f378b6d0bc818ce8c948da495a9dc210ca55331f4760273d51f627cc416
 DIST futures-channel-0.3.21.crate 31961 BLAKE2B e99f37cdeac080c8bad2203fd24b48eb62918166104ad6cc531c8f69d3e0c3a5898ca27f19693e2c143c9049a7d244f9af49c16fecba12233f9ff3f1d01e35b0 SHA512 1c10398657949b53b6df196cc44d8e4b3acf53b4d216be6f5f631d8d4b500f5c344e2cc7d5a5642ced6c5480511884611be6d429f56a0ede4a716b9c5770cb76
-DIST futures-core-0.3.17.crate 14478 BLAKE2B bad5d1fccef7e823d52eff0db7522545c6dcc6ba94bc0cad33c013b6abe624ebc6c8ddc6a6f5a4ede5982e175eeac48113ef929cc6633a22a18bbbd4cb1cb114 SHA512 6f290620b5051a3f3a317acade5a077f502fa3ab7fdb230b6ecd4d007c63685bf343ddcb8b8d1170b5ebeb94fbf1c495dab36918490b14885361d6e53c45bf22
 DIST futures-core-0.3.21.crate 14601 BLAKE2B 73cf4c422202a34cc9916509939fab35c79093a6c1aeb99e35763727ebf7d3a06ae203684d75cc74183126f0cd95dec1530f136ffa2a0e69354c554883e3af1f SHA512 b60e7892436ae28fd2240f17816f934f6caeac663d67b8efc7d519ebb4b0bd921f0b732b6176bd4b472d2fbe346d39a37ba394401e15afa93af8294ceea90976
-DIST futures-executor-0.3.17.crate 17102 BLAKE2B 9e9864d7fd3a38a800e3b07c22f834575f92704ea88bf0f295a95d1b52b41ed698d4e7fd89c5dbf503a99676c6ad036d9f96dd3e85bfd49c26d1127d55a6a4df SHA512 e3ac739e58dbda88dd536382c603014c56b7ebbda529c81afd0d91c16770719902fb4883a7a0dd0375e7910fc03605887058ebd30824d01ca20e2daf93f3d94a
 DIST futures-executor-0.3.21.crate 17306 BLAKE2B fd20c7f0b4996cc10e3b3d30c33630a42eb363ac7893af4ae5c476775f8e4f3724ac110648252b6cfb3d652d352fbb5833f2647d262a4c9ae999de1fa69340a3 SHA512 597732f96b45ce21f7a0b149f62cbdc54a80010bfa5421ab0ef7345c501c197e1c8fe109fa2d1c813d5c2e872b4670e0fbd96e2572cc3e9d2646b68f41c78147
-DIST futures-io-0.3.17.crate 9050 BLAKE2B 729fd0c2bbf5a665640fe9e8dbb9d803474cbbf4385188d1cd906f526a2b75cecfe55f75aeb0a491057af319a19fb0117420af75425375af41622c8c68567cc4 SHA512 a2b65e07bfea15b78e988c5a9d330ef51a396cd22475f171b342cc8a6520749335af851ae11d44c91f54ab06f425b0dbfb716a959c625d3c52db5765d0407e0d
 DIST futures-io-0.3.21.crate 8902 BLAKE2B e673342d3fae38e5a6a20c426cb1127353b4f15459b4c27965566f7f2f13f0773ac6ec850b0d679bea37d68219edf6cdf9d1d0eed37665f4ff51c6060b81466c SHA512 dde0b79c4ba208b4c92c699457efbd515d331ab612e7b7df735b3b8f2ab79c012b1ba329ddaf488d68c69dbd119aa231b833b81cbcc0cc2f55c656f68dc22bd8
-DIST futures-macro-0.3.17.crate 11830 BLAKE2B bca68c3c1ddca764ff86d36667c3da3805b8aa730b300f97d5e77dfc695d33484b4b8ee7d3b415479852e02a126c14f092ee9724d3d91a8793bc91a165dd5381 SHA512 518969498808bcb63cc797934ed7d699f776588dd7fc9f9c41c63874a05d03781b5c0241ce20cfffc8db569f01fc82da433b7ea7772f24dfc2df5eca35b5146a
 DIST futures-macro-0.3.21.crate 11250 BLAKE2B c981e6d56971871102591b6f14b13f0ed75499627036a90cb71a3e11336db408d11ea0feced484d9ea454f47db74951cdfc61377af267359f46cb6462cc3fc0c SHA512 a79d4d3e487d05554e05e04f3a631fc9f0b5c525126eed550ee30eed16d4c457dc39274efac53558a3e33a119b8ff9d3552ce367359eec9d05105b278f7677c0
-DIST futures-sink-0.3.17.crate 7663 BLAKE2B 598e864fb6f2f34cd72c67e5ced93d0e54d2e508319ba191a2779377d9565799226783b2009190cd6eea63c75562e209a526c724ea8616d22a1c7b4ae543ddd7 SHA512 39996fd6bf1fb5ebb0dbd5c0d18f9a34f21e65dfe998237c2e047d836a380ebfb9a2fea05a2c11e447e9a27dff0bffe4a9762e83df2f17aa90a717fc98ba5803
 DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f96d4f0df0cb035ce964b91e97f88c7a1a4942ec4010cb4da5f4a3552487eac048a6bfcef637bf1f83398d7f38758e SHA512 9bc0198495b5a1b3ed25fcf7b053a235bba0a43a4226bf085d9027537a57add1686ef61179bf2a2d4189945cb5a05a8d64ba6e6e647c56245666d51e138d113f
-DIST futures-task-0.3.17.crate 11712 BLAKE2B ca42fc54c3a3795e59b423fbd1235b10b4ae1903256fa61e80dc9318f35fb59fbc15ca8a3be3fed67e17809ed2d5f594f939d3f51d0d718b0dff5be069200361 SHA512 2f12d8d9d404f147b601ddc6fb9b6869e2e68a4bc55cd3851cb9f7aa8ebe6519c5cd0fa14da92e564d2003ded2ac2202f5e09e1a83e81129d1600d01ecf86844
 DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099c22c0024669906036504d0e70998cb9cb5fd4074928d21847334611ccfcbe6d3e2f686c4d4d7d4436f1e7f501b8fb SHA512 8f3b27865d8c7a290471903297e3c0b52caebfaa55550a4738d7915008b893fce67c7d9ae5c5bd03f2a42ee72a96aa0245c4bee70fc06977b3493eb81bca2033
-DIST futures-util-0.3.17.crate 147679 BLAKE2B e29d07117a7285fc52a390821299f55da901573a5d3df6a1845b852488f98b359ef35de0aa3fe05e613dc662247318cf3df5aebcb00149012c6a3ff24c171a57 SHA512 6a87b0510c3f8214ce14b7f333d212558647c523b5eb7da36dfe4f694e0ca4be3cbf97fdd7bfff5e0c7015644742d74d6184221482d644653a106d5564722fba
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
 DIST generator-0.7.0.crate 28814 BLAKE2B e10bb8182d020435d583d813e097b2882a00a027d1e73d91c6ce99c1b9b4edee6ff50b3e98a71f93a17e6b7ede2c2d3cfe59265047260a06e6333b2718ff71a6 SHA512 041716166736aa027b0ccc68c6f77452b1753ec5a182437e922507a26ade7a7be2dad28ea1a668c84a1cd591838fd562a202642554ddb2c76adc7dbf48b61999
 DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
-DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
 DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
-DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa5464e6da8daeb31486d8066443eeeb693b1e84d49f390a0c33f24fd3c0332aec01986127ffe26f7e770a94614 SHA512 f4e90703b8b7d83c36a63ca7a3d4ee48eec2b0762419780670558c4496ee840489b6a275eb2b635676ba25a010c0e378bae429b54aa4591b9d9868b48e0f0beb
-DIST git-testament-0.2.0.crate 9660 BLAKE2B 021cee6539fd14b778892da177eb019d70d51a7789c1a1149b460cc1336d45bfa4b225f241a33768fbebcab606ba150376efd3c6392bdc4c20a4cc1cb4948ca5 SHA512 b7dfc0fe6750a816b870ddca359b0941bc7cc2dcc79353a34aa8c924036c83b83a899303eb6e5cff61956067c3648d4ca48e54334a15c2de51298e20aebb1301
 DIST git-testament-0.2.1.crate 9635 BLAKE2B 79af3952ecdd005a32ee5afd025756fd72dd853626dc54af998da79f589f8cfb22f4e5f2d32975096a9ebe494995cc381b21f895e709db5c3d1e67c29d98c0ab SHA512 9ed4837616ed217546c62e50bc6ceddd07557f55e9eca69d97acf7be9892ffe487d20bac4e3d9620be203b88876908cb1c591efc6ac62b9dffa329724e129464
-DIST git-testament-derive-0.1.12.crate 6680 BLAKE2B 38171d0c4f6341fc1eab030ed136c4de7cac229479fcb2f40b456d26bd77224f108aaa12eb99982de7d955b120d8a5a53ab047dfff57507426991310e74f9c58 SHA512 aa55a7fa58ba76c0f3d9c1f1d676806cf27b97a832b3c26ad1d4fa4778fc7dedee478676e1efb447bee39910f95c8cb624c4fa451c862ef2c2dfcad8b86411bb
 DIST git-testament-derive-0.1.13.crate 6815 BLAKE2B 57c3a8406b73acf1c36b41fa715c75d5577c590e90ba071bb169b4873e55a0312fa9044fcd27e5d2f1f308dadc83c4bf73bd78a89c71450d0145e499abecc030 SHA512 7d6bc9d2c3d2715dec37d415a2112fced9d47d6905fd8e62feb18bbbef87210402dcc34327dafbfdef55c62bbb97da257fac3ac4d901bccff2988f6a0e965ae1
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.8.crate 22886 BLAKE2B 726fceb279ef00589ebd6f77bbbe0642a22a9852a12ac9d14139af679ef2af0a68bb90f51f9cbb08d44190eafc35145df72ea3ff2f346d23cf22e428c887bb42 SHA512 1a1fb9731d310ced63742b2c6f7ef7f414c89780751d9881859a6e6fbc512e91bc23c91e3743bb36114dcef6dc1962fd376d67bc536752ba6a8a2fda7aa80bec
 DIST globwalk-0.8.1.crate 13705 BLAKE2B 4d0fcc805cfddb47af24f5d8f2c4f9bcbba48a8a523e565f7ce7bea767b6d108ae5e3f5cccf6647b497b3690f862e1652812b9d83ffd02c634119d5e03d1a7e6 SHA512 3235fdd9c24ffc54994a0b37862c44e16a4c9ef6a7e1a008c5d83dc62a9683ade97e451e4da7f6db710be2532339a55038fa3bb85dbe6685d1c807cf42f6d955
 DIST group-0.9.0.crate 13327 BLAKE2B e3e3d25f14a18e2e2796fed3e20e89f936aac116008433213f385fa34bdfd35029109d6e3638ea71d7f385d9d6adcbb9d7f0615c2c677f93a5c65de178532150 SHA512 df713b6f303d74c5f7445323c2cc8c8f0bb05eb89d00bf3b2e1736041accde44dfbbb8a37a0e0ae7c7f7f46d5d2da53298e4548ac3eea65f0221d8676540d4ba
 DIST h2-0.3.13.crate 161962 BLAKE2B e8fcea52f4b6020c8c7d84b440977beede9f655f85d01b58348a9b9e78bdc5ef7a34e59e89c24291917390b568e229ed5b280e68be7c4e6e9793f0b967268271 SHA512 480484b75b22060146fe373a61136585bb71fade1a99231de4bdd123ecd11e4a3237e7d8da1b952556b7e832f1d6299bf4b833361368a243cce4c23c53ea26dc
-DIST h2-0.3.7.crate 159246 BLAKE2B c75389ae07de135510d7761b8b3c7d3560cd017a59d4b286496e5049ab6846eb7ad3d27945591070ea0e329ba4b72255627206f1b420e705c8a2c28cc9edba1b SHA512 673d3690f29dae2275fb9e93a47835a00195845915a2a037f666dfaeeae70bc626db1fcefd5bc18478ad49282b5e137e0e6be3df1bb16e22067c901288e68813
 DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hmac-0.11.0.crate 11385 BLAKE2B 850527040c0fef278175f35a0c8bf77bc005708539af8ec5a85111f83e9c94a912741a2b24965c026fd75db6c58fc82a46a9c5de9454540400c9f19341561b4c SHA512 82d83071d1cea14603b1f1a85d564c78e28d982025a029779d8d83522fd5c56583303dd3a902d8023b5e9df2ddb5c5d9a5fc88000d41dba45dc026239ec81d0d
-DIST http-0.2.5.crate 106297 BLAKE2B 02917ea704475510cf9d71739b4cf3cf8f87a013fdd7b9ebbc21c702642bbfc9e33d7c7ba47e084c86cbae4d95a72a51b7f7d3c00ed5652931c9286d83f5b980 SHA512 ec56bea9a6329c82053a757b6d537834985284f22dd677f9bdd335785e8ae71acefce0e07a7fff57c6648d0fae54a8039d71d74936f10a9b5547fd90d2fdf7d0
 DIST http-0.2.6.crate 106384 BLAKE2B 7c6627eeb73834c56dee8280bf2415a5e0045ff721b02ea207ddb2cf286b69487874af0bd3d40942474989642c59efbb35c0db75d9e4156a66efde2b2c51900f SHA512 ffafa748077a1122d3f7f1b9f34da43f5923dc8cf09b7b492d286d8a924b3fc9949c3df5bebe358b11801adcea8f20d8e8986eeda1e63a2ab92d4ed1fe0e6746
 DIST http-body-0.4.4.crate 7836 BLAKE2B 7f417ff8520753324d5915e3f092988fdd26b2413db5e917045a1201d7d701d8308b468c05da4d4ddb9abb7b0a0eeaf82f15a786f29cb1ef621e4c168f4e4bfb SHA512 cbfa91e31e91807f004df77a9d8999b1224f862d4765ba92ad4d34d288fcab67372734295f30760a96eb32454d78fc527c6519eb45b484e341617686e743381c
-DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
 DIST httparse-1.7.0.crate 29323 BLAKE2B 4cf5e58074df8c250ee74893ee84018eefb89d30d378a48db7e0018cfb29355b44948084801766e256ec8f6838ebd03bb4685eb591117090fb01ffc0ea3a30eb SHA512 eb24d0ebbd78c1d76a8b8b46fdf0876b8893cf1977adc73038e6a4b4d7ad6280f97fbbe8c92465fa34d6696d0a40288f41795df7cf15733588d1bfa8dfed8584
-DIST httpdate-1.0.1.crate 10293 BLAKE2B f25b69244fd82beeb0c9c8f4691d1d057df6f835883f6cde069a4eb28bdbd7808b5f02c8a48b88ca4f60e14c2e0dcc84f4cadd733edea2f8f3d061bb485fff1a SHA512 1a63f11759e331e5938697d181c7f021e953e3616741116437253eaf6da862b6cdb08a0fef5808042d8367de9fac31b63ebcc917cfb81b0244b4d238f95538ab
 DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd
 DIST humansize-1.1.1.crate 9131 BLAKE2B 9a9717af2c61c724f1eb224eb351c7819cbc5a8f7d53e57a1ab37ff12f886095c321099a4d269e48a90475c1243c6366ead7b19e4d5b698cfbe5c9e2357cd562 SHA512 90b25500014d7ff541b6feb496ebb25ffbf0bbdfc3ea80ce3b3a1597d08c2cea9b967c674e261d3c8c3587d3481da8d899cc5e3fb05b22c55f90e178508ebeff
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST hyper-0.14.14.crate 172412 BLAKE2B 637d574ae831ff7b448bc98238ccf66df9d496e27212334220ddd8be112a802e9afd3423f1716cc6dbe1abe7d89d579fc76d23be40f6c00d788f014ef176b42e SHA512 092a53af18c7d733d84de3511bd06ecc53171d32804a34ebd9d1b5ac5376aca32ede79493f50e944b0618f7ed79611594b46c6d3169df7186e6ce59461441d3a
 DIST hyper-0.14.18.crate 179660 BLAKE2B f9c48cf9f2fccf4839a9abc1cc585c30713cf9cd57627a87d2d3ef815fb13b5795a1e6d9ae2e2c1f3f67cba16ec8441a509848a83053c558ecf6f01a6e9b9aea SHA512 9415eebfdbe3795488f57e6628ccfee4195f7b04ab3beb3fb5a0768f546322c2528f482838107cd32e2d71d1f562c8b2e6b34d94a6e7f1bbd049b44ae5cc41b9
 DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
 DIST idea-0.3.0.crate 22733 BLAKE2B a6967134fb6bf8cc8e447e07a6ce1497c488e0d51edc1eca29647df15d26144004ed6132087cef5e948848069bdf1bf6cbc04ac38e90a81ecdf88fdfc4a24775 SHA512 9cb1b45b02cd5b4564fab6878395ef9ad95773bd7b45c9cee1c549e42fa7fb9c14b353f002a16f225908a59052268b4f5688d858ae63602868b9794cd83a58c6
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
-DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
-DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
-DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
 DIST js-sys-0.3.57.crate 78605 BLAKE2B 260e2fe94a213ea169d9296dc8f5639fe62f47ce69eb69f2ac2f9b1f409c3f2dc1b26fef56cda5cbfbb775a7f85d2b6d866bd4e30cd6041feb337b744e57358f SHA512 797865ba4c40bdd338ea3b980d6f7139b580a12057437319d3427da6c5045455e0612461289ecbd6ed445e8b675369a8ce77ec8ac0383c8a800a7fc84606ac2b
-DIST lalrpop-0.19.6.crate 227279 BLAKE2B 081aba3e6169f458892755f30fb3399b045d407b7033ce778d03119f27c73a899283e9ea30413a5b7f3a97c9c78e462efa13c596d81165bd154e5734b8e9405e SHA512 ec8fe968b606a156dffdc262ad586454d9ebad19489e0c561b61d56139545094a4f55cf2262c6a917db4affecf90982d1842da3e309bd1b4b62397e5af90edd8
 DIST lalrpop-0.19.7.crate 226752 BLAKE2B ddc7611a88ceb121a6804e3657d2161199f515268fa41650805a9934f6ae15323be782790cfac1d0cfdd57b1652ab561e8872b1df8238e549d1be516ad08ce61 SHA512 a678bb9bab7de6ed2d88db6deba95e9bb53ae9b9970177fb74bbb4ce49472311f70621ea14dc3ab9865f9224a4850238533e104b64940e0336860f745785433a
-DIST lalrpop-util-0.19.6.crate 10236 BLAKE2B 24deb1ea5e38063112d228cc811329ca2b3f1d3824842226faf14a7d03b61187043e8cc03bbd7372d99927e31d0d0c48b09868e2e1e73bd119475f8ad021cd99 SHA512 b254a09f71342a7a80d469dd896db8d5e0b69b1ff4f4d9c6ccf69447bcf8722dfb1c43de666e9f8444c54a529c7b6196ead1cdb78ad50d8c49acd210e646d391
 DIST lalrpop-util-0.19.7.crate 10137 BLAKE2B f29e209a62154ec78f3a539576c3a8722242f598c3eddcc729cc8fe425496a876d6012cb048f3284afe8a81863de585bb4f5d3664df5edfebb3d2c2c2fd6e766 SHA512 1e3c88d3954f43398903172efe22cf41252f60d51ec10dd7388e72fcec1f144642ea24cf58124481bc856745d3c1d904c223379828da5060c0b6ae7053a26812
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.105.crate 554066 BLAKE2B e8e3113ee326c02355c700ce5f16b3e037cd576cdaaa68b2b9eb1d3ab1d56083f0aa43e7ad6adfd62fb154e39de5038eae1ce43b0d283e294bd6d5454bce6077 SHA512 3e6c196dffb108c67e59bfad157e6fc2dd7e65453da562456aab68d00fea8e1ffb8c552bcbc99b6f60e74a29b3e6609747f47db6598379cdd5873d3a7c0a67ee
 DIST libc-0.2.124.crate 577742 BLAKE2B d39356e89647df6a0468c2fe7ec351955afcddd38064fb64215833c716bc16636001b6d377d21cf31b773c3f392d19ec5c665d450e81ce09a55bfd6a080c82ca SHA512 19fed1eeac7ffbbe36ecb5beb3816b5244d3017b72376e84e532f253e07ee7bc310f6f636aed46174653232fcdb532c2506bc070bef31699db20572df0c45de3
-DIST libloading-0.7.1.crate 26336 BLAKE2B 2dd8d1fbd0a1a3c1b07ffbdbe367f9bc248a08fd235a7ffeb121aceb7aad95d7f947fff3df276d9161e5ccb8dbc9990f834e364357bd1574a7e5cc3eef8855f2 SHA512 b06a668868bc6b4ca0c39dcd83faa71e5c28ba0be772f96f8445a61feddef797d40be1d1180f51b2dad1a77abde2a40a55204d91b1ee9033fef22544968ac0df
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
-DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST libm-0.2.2.crate 113226 BLAKE2B 126ff68b4ccc7c4e3043095c84ef010bffdc1f76d3c0c871441d1ecaaa044534506844fd6accf145f94cfdbb611fbb1fb13ce976521911dcfe77d57c3c81463a SHA512 5aed180dec326ed9ee2fb90dfd94127ee5f75804f7ce7fa0ed5c7e1f0533215690553551da44c055f9ad47170ca32971467fb378f7328a3c22930832388eed75
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
-DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
-DIST loom-0.5.2.crate 62498 BLAKE2B a8d1d300fe9a630eb721c10711d079aaa6412d2ee1d30af9e375e0c95315b884b3978e360faaae3fda930f5e56f09f1b877093e8f5061113f3798b3485c4d9d3 SHA512 8e56186db3e4c6aad2d1154d1d900e31c62f3e4ae22d87f5233c4f0477ef5481b9b4c2e74a34d89cc434ec64c49b5443856d38691269551cd4241ba8b345d972
 DIST loom-0.5.4.crate 68124 BLAKE2B 00ca841fb9dd475336ea71dc23f22715704077e566f2fcf3e7d970d2438153db74e032d62cefdcb4437668cf2366208b61e6bae10842f69f238e4df9a0d95225 SHA512 88691492c88f1030d0a8b0ade999d0d902a8c57f7cccad36e13add50da1c82b41f48cf47d4d4f9aaae212fd14b48f73a81a93c56314b46e8c2757f8e0f501161
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
-DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST md-5-0.9.1.crate 15494 BLAKE2B 25218518792be16223f78ab0bd81284005b4a65defc538fba79dd3dc99c7d80dbc8b8ceeda51dbea4851bf1da86d3f66fb64dcaea86b5486a235c43719a3dc3b SHA512 300723a785c7edad2a9abf18fd9f8f9a40ba54676b394cb5712894d1170cc48199a0ca9ccd3b525f82832d5b33413c2565a0c079b6dd08c63d782f1a91fc3e0b
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
-DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memsec-0.6.0.crate 5494 BLAKE2B cd4c40c9ee6235fa6390ec00425faf99a7623c8ddbfe52bfb6bacc292da8fd861a994624a6784e4c0ba1d88fdb9ca4cd5bec4f29aa8bfaee8f295761fedfe14a SHA512 326bd28be5fe98720f0d57a96154e7746bd9fc5b4e8bd827361f6dcbf15f83321b5f0519ddad38f0bcbf4a043a7ef3cdec24ef6539915b007a0e85b01c584bad
-DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
-DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
 DIST mio-0.8.2.crate 88272 BLAKE2B f704802aeec66cb47a011989709e6c35352b55bc7330dac7631ea144ed71bc86a433ef742207e3e37c47417bcd7ebb505287baebb839294e5833d228a2514c57 SHA512 c82ea0afc0de8acf162188a6131373f3cb3e7f3abb3094dd51fa9094e42a36806954f267840b3fed18c0ac3ee75af0451dfea5509ab65a94dcc93057c7d37393
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352
-DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7
-DIST nettle-7.0.2.crate 287759 BLAKE2B 6ccc828d43a5d313510c58d4be9300c0dacfbb26755e2528b97a0b918bd2890c9b8bf82ccf215c055dab95fb3453653d8b6899ef2841d19623dae42174a1f5aa SHA512 4131ed46a92a5a30d42020582c06fbfeb91d671caa6c6b245e99d8646ed72117154c7db339132ce8e3260f61f8edac254175c84fba87c43d5f26791b25541503
 DIST nettle-7.1.0.crate 574121 BLAKE2B 6e5ff5045717e2d9d5f902b3f68350856aa6d39075003442d3c7e5468edcb72dfb8157917379192a5d158e857ef0161efba3a9985dad47b37d6ed90b7287d8f9 SHA512 ebd0ae8d1a210f065e07f0cd9e0fc79d8b526a15e9f72174f818a2dcc607bdd04712206e487a84ac24a97b6df1a4b49788f751b5d254d1da4127b15a56ec4dc6
-DIST nettle-sys-2.0.8.crate 24987 BLAKE2B dce8704c38875907e92f95a3a56b928bdf73ea1efc8d6e4943e43a62f6fa1e4eda4814252194aff9b5c8dabdf5903577290f67fd3757c7609e5c86a1c9e18539 SHA512 61e9d518d664cac12708cbb01a1a13d47caec20c627697b66b8e74b53c1eb48c5b418511e5d5151dc6057fca74907bd0137493d6392ecd69254b39a59bafa71d
 DIST nettle-sys-2.1.0.crate 27365 BLAKE2B d8adf0768efbab1b7bd5e12d5c7608e450d5f2090605598179b6bc5291a379c99b05b430e73d0d0cd8e301060928269652af3baaf5ce8ff513513715306c4ac5 SHA512 499f6f8d08ac4853816db3e3323695d065ee5d7e8588c3b7725e722f92875940a212945b0af71956e1846a1064c0afac74c54021fbf06d0c5f2d2704d32e9797
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST no-std-compat-0.4.1.crate 7600 BLAKE2B 28c4c943ba5384ca9fb155a53b981803c87d3cca60e0690f1c6d0f877e7bda79dc679938e625407c7b5e953aeffb921dc7d242b19f4d0fe28a14a7866a681736 SHA512 0e264b0004b735b640e132cfa057472feb12b906ddfc08f1b95bfcb262f6e1286653e92fc6e83df5fc553c06f410cb931cbf80b9a9303ca7f21cd625b82a82e5
 DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
 DIST num-bigint-0.2.6.crate 87275 BLAKE2B a7da84e705f8aa287b6704a42ae1822ac1555d25e7f51e69b4288a808557dba2c0c15552085a67f3cbd445d518fc8d4f668f7264237263acc4248d3dd1a2c0a3 SHA512 19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8
 DIST num-bigint-dig-0.6.1.crate 123877 BLAKE2B ca58d48e2d74c2c1861f47b1e7cf9e3e5cfda14e74ff50ffde21172e710e25fc2339ec731e12c08c3fd8ad8c0cf3783634e95e62c195ec468e7ff0e8e5873550 SHA512 48cb04136d7ab9a61749014cca9edda3170da66e44fa8fb7d7cef102bb93f437328a91f36abd9b42f953c094ac64bf41ecbb0f702caf7ea7371c63c8bb956966
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST num_threads-0.1.5.crate 7109 BLAKE2B b5a1055937a87c3f3b758ad527fce0a14c812b40c3bbda530bfc0e03f43dd3155c17e1eaa210c512a98919da802d9d48fec4e3c8464072fe4d309b9a402d9b61 SHA512 3ad2234945ea20f47efdd8381de2f0f05790163bb1e4b28d9e630a2da4d86c99e596558ed231e2e9d62d84ae85f8f5422dc11c323ba899e37ad1e654e3c4fdd1
-DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
-DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
-DIST openssl-0.10.36.crate 206367 BLAKE2B d059480338da28c1e6707db85127bdd4721e931f74bf27d2c8f80315c43cf9c37a977740b9d799a03bb59a1fdf26fc1fd9ef11319863b63ac7b6ba3ddc2c1385 SHA512 bf215f7ccfe24b3f490d516541ac746785853dc61ab6cf023e303275578c206fcb14b6e5001f36de2f71b0a8c48ccb26f4f343c5b88ae38ad2cba12ccc941641
 DIST openssl-0.10.38.crate 207436 BLAKE2B e2c999f1f04f7646e765fd0c1b51058136043d84c052812c4fcb0dc3cd3605768a8104d9b3ab9ada3d7d57ac057cc6ee0e7addb6e4f5897cda9236de3402a3ff SHA512 3cdd25b722b036779187a8906c11abefe69ead198204ecb8cd71aab549c910c3992761439336baf82c61dd6eb3258a365fad7eae4e4b7bd1959a979ac6c3faaa
-DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
-DIST openssl-sys-0.9.67.crate 54600 BLAKE2B 8371057756351f2e77e953e2a827e812477fd404a66053047f6a1dd891d5374ff6f6666e3c8af5f858201814d351e72a4473f95ca439c2c0b02e08c89a1ed336 SHA512 cca7edceac5a11f3e3ca0c4c09aada27f94664eb9c7ada4784dc147fdd1c9cbb5eb1ad1ec145957155aff006a21e7c954363c0f72691bcd241cb43dee98b42d1
 DIST openssl-sys-0.9.72.crate 56510 BLAKE2B 32a346a5c98fa6de7dda0c592ebbe5144de777ed5fe63b96e5ba1891831c73099e7d01ec2c1a6890150d01a77d909fc18bc961b3fd8ea7c4b85317a79d988e98 SHA512 c1a6a50c4ea30b2bd7da520bc98bbd22a22ebc327d71c12f807f518cdeb10d81117b65df9294ba9391513a60577709723b93e75fc75423e970e9fa552edad32d
 DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 DIST p256-0.8.1.crate 57730 BLAKE2B 7392e833da11541ebd56399568db1ec96656368b04625b582348bf99f06b827cf45cf103b79d9aa1dd856cbcf6f2e7313e291a3679bf6df65c6d00cd352c4121 SHA512 544486d1aeb154b335b60e1743e279c0cd56dcc68960a0b2c0314bc9511058ab9bcf1eead34b34e0c09042f535a80ac54cc408aa1b37d7db1b24a6a73c392ac2
-DIST pandoc-0.8.6.crate 17549 BLAKE2B 83cedf2a312f9c6caef02e11112ab289083ce4df2ef28fbae831b17ccd8aa8538673a8165b12170a7a0313d6733674c302318b4267703647fbc64ed3856e15c0 SHA512 8f0d419a5edf033bf25c55531101884bb1126b1d3471fe8eaa9bdbba3a9540124b4bf21c92540bfcf912656dfc9d8d48bf51991a0d5e198d967260b3973cd2c2
 DIST pandoc-0.8.9.crate 17587 BLAKE2B 3a7e1c5901acc6550691286c93482c2c19696a893b39e80e2ec0fa477fb5a73ed73816573faa84db78b5a78e89b786ade221fede08304e2b9e7acced01c60ef1 SHA512 005d950d98f5050fc3a578113005360d9d2bf490d87b1ab9348a9da5feb320df7d0557084ed2a905f3ccb7bd8ca537de6816119aed1566030861dde76337b8d3
 DIST pandoc_ast-0.7.3.crate 7380 BLAKE2B 4b5544acf59efcebf1f395293f9fed84fbeca6e030e4bb30685c314bc80c825323c264867237ee011488155d337147884979068991499db878679ef8b8e4435b SHA512 c3a934b28563220ed4ea664bf96ebf78eb8c940dbabc0035b185df55aa460694511b623f30e87ba2b16e938f8abc09ff551470b2c64fb9aaea95b25d1aa3de2e
-DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
-DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST parking_lot_core-0.9.2.crate 32254 BLAKE2B ef53a3e10228569dd38e1c5a8816fadfdf6b02ce01bf8b7099c7e3f1f71b4fb6c4d8ece8e52c9ddfc9a5ece6c273def2d9bf5aad8afd76ebdcea8b1ce08ad7e7 SHA512 0443dcd867d8be6e5d1b6ff0af8e31bde6378789e30865442bb15f48ac955beb847ab5954be4336fa47aadb7478606bd217b745134de50c16486c26e07fb10b5
-DIST parse-zoneinfo-0.3.0.crate 76590 BLAKE2B 441e96b120e9bb4f666ace28f2999974e3bc6786a8b834b07601b4a13506505a93d2647e446f1871bb072b8a1d1c2075de259319c7c1699244dc4e0b89392017 SHA512 e87eb0feca1feda438bb44d92268779053feec9b0823a336ffc593f508fb6e918add1023d4abcb23fa334efe8a07ab41143f5fe841b4f62ac000feb23c6d840e
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST pem-0.8.3.crate 9395 BLAKE2B 7d4cf8a8b3e55ca8fe39bc65c6616c5ea0f91bda666493688d98e06ea9fc3c83d0b0a1a10b4c5deff685efe2f9858f63fab765b82a1c79d1d5412a5e6a706dc1 SHA512 30421492b14ca94ad8bf7e3d80315f2cbc129fac18655f33e2866e4de20201f9b3e9109c273c5bcd7b45ecc0ccdb8f7e6d8ead07278890d1a043688752f572cb
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
@@ -290,200 +209,133 @@ DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d
 DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
 DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
 DIST petgraph-0.5.1.crate 147173 BLAKE2B 3b74b2965ecdb37a82439111ad849581254698c8701d8d5bdb050f4a30cce05016511928443cf65dac394dd45584279a933435a77ef3c610a64c73cc5a68ff9a SHA512 c3d5f53b1a0900084b0693a6f3a849bb9b443b1b6fd1ad88bce8beb12ed1b45f2399b68db3366ba15f33c2d5682e052b733dbde76fb1b646b7bb1e660a38d8bd
-DIST phf-0.10.0.crate 4675 BLAKE2B 72f3436754215f51ed2041ccf61d67ff9139d9223a0615fba6252bcb3b72f86397f91aa97fb8a439b2f5b357610c0c14979e92e718d0da29e40292b94f931f89 SHA512 4784c4acd49fb4de47aaa2484d6c018ff154094fe97199ce5fd3e6a67ab53efa454fc41b549a7addd2a02f32a096e4c541e4134f71d7bd78f77da23ab9502017
-DIST phf_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0d5690d3aa331ba252351b59c478e42212cd66f167a2a88c2b9111ae7aca2c9fff3740dcba1b77d2beedc1d44483 SHA512 dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1
-DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
-DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
-DIST pico-args-0.4.2.crate 11565 BLAKE2B 2dd0dd6679d418fba0f6bab93a8216cbb9182431dd7e0819e382db2fa1632bb5ed17cfc2bd7da90df41024066d26cc82188dd4693e6b4f7eeec44d440edfb12d SHA512 a6e46bc8d086091a37a0edf418d5414eaa5ef57a508aa81c352c66281cc2c88c97611b7eedd4f5f18c7a8169f48aa3bfdc7a5eb7b3cb570cbf871eed5e867ea1
 DIST pikchr-0.1.1.crate 75225 BLAKE2B 3a4dd9834c922723ee2ba620bf39fc9c41df65650504fc6f015f1ef086fff5b36c1baf2656daff9d1db86c106e55b9ec2bd91687c692e2a183068a359e33db48 SHA512 d3421eb1c5f5c4d8b53e77dcd5d7aa6f05e169959b075b06724b5d370171f9d60a509095185e04202fb31735df7ab658c34752e7cca6162488c4d850aea97991
-DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-project-lite-0.2.8.crate 27847 BLAKE2B a9f192e644ee443904becb1ff5cc2179c7c9a6aba5b64d2e9998f9b4b8f8e95f5d54b46963910756832d0ab1b55bbc66cf85edc94b0d04e9a8b3f4ecd4719602 SHA512 9ecb86d550f4440e19eb16c6a9a418b5c4ad859ed2449b02f77d4b07b1e3e3e6b6b7ffba44a358958679342eb21222992fe6fdfe6d9bcb7a699a3e5816f1bfa8
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkcs8-0.6.1.crate 27040 BLAKE2B 755e1fac0f37556152653d40b6986129a4f0e7af878371d2b0992481504c252f42d64cd262aff0a59de424cf9fa4881621b024a5fa1fbca3ddae770154d941d5 SHA512 f32cb6575a7d51e1235be02cc939114339dfd838acede9309d441b3f67bba6ffa3b3ad9ffeda7ed04d2e3bf6a8431642218072753d9ca00cf62fc70116cca9e6
-DIST pkg-config-0.3.22.crate 16145 BLAKE2B 346b67a2000eb91ea8867e5a861c87a7728909d6b20dd00c9b4571d89e5308a108906fc80fe3a2d014fff0411d9bb30fcde224abf8f4aaf37164107861083bdc SHA512 435b9d99a1975692db3efb3bd0e92899c43ba4003aecc4859dc71cd2175521973d5cbe1be06fc3b40af2a7bbe1b0a845be73586c0cd96dc218bc4fc7dce11107
 DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST plotters-0.3.1.crate 8595577 BLAKE2B 7c500c43c2b2875d9dc17e4eab57cbd8a470c6064deadf4e78c429abe2f1e97511f64bc67782b4e03e7cc47c8ac54aadfa5f7cc8c27d3b4453d2ee8252896c99 SHA512 c7bcdf9da56c2d1c03053f61256d44d2384fac1a9a7e0db058090c13b359bce76a2a96bbcbfde04fdcde0a9dd3db8a1a22bc57508b0b6e4a374c8b35ec6c9707
 DIST plotters-backend-0.3.2.crate 13524 BLAKE2B cfd42df0fcea4e5ee944a6b8c48e3b7fcecefd6d97f07e1c333067193c211da9eba29fb56e9fc8b861cfa2d1baa3c042fddb494bb66b9109656b26bde7901f7d SHA512 116bc6866094a2ec40a9ab9363378566ff37eeb4a4e3805562dd3e95f1d5e8664b54d3dc858a2c9974b125e308e46b77c294de2a655f836d342712c32f0242a3
 DIST plotters-svg-0.3.1.crate 7596 BLAKE2B ac8dffc5dea833c0506c472567056be0804e5519828b68f7b3bec9ee63dd59f9aa828c10732a50e004214512df06c7eaf164eb9613cda75b2753270fa358c0d6 SHA512 4d3cd02534440dc26f5eaa3b4966081901626c61d9fabe0092fed87c48929cb9be070d9c34486fc7c7bef308337ff4890d30f9581a613549e507db60dd9d8876
-DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
 DIST predicates-2.1.1.crate 23150 BLAKE2B fa8b250752f8a5d6ec30ab3aec3aca2b48e903fd8d182817180633f9f2a55e4632b1e1912c9edac453ebcded9f6624c42b38dda70ef36fd710e1dce1f1ce6346 SHA512 c850fa2541265aeb23d5c19dac6c7654dc434f1239ecc8b1cfaea89bd120112e2c45f127b491fbfba1c053db8413e8b561896729a56b6588142dd9ba9a33988b
-DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-core-1.0.3.crate 7757 BLAKE2B 91b3d1596ddfce6e58c33970ecbca94acabca660109f888f32aa73352e157d78afcf879afcb7eec61694f89445c42d355eac46a3ce3cd6163f8e53265e0554b6 SHA512 76d056f0acdb2d9c5cd44828b8da8722899438fe7e11ce6c96d3ce2bc8c267508e1010e2ac2c7bedd3281fb29856a3cf29f93de51b0ee349a5ef51466ace799a
-DIST predicates-tree-1.0.4.crate 7682 BLAKE2B 10e32e4d316bd3bb7015a6ef6d8391381d441acdce0b54a7da2ae4f741175dad7bf92c2488809e233da45360388908f200c2a2756f17210641b0e503728cf150 SHA512 f4d4f3d58c13c9b0344832709709a677d0d1f32e80a2c1e7f38a6f214efaabfc2b8e12d4bb4ac8f0c57def9a44cfe94ce9144132cacc2b6f84002a57aeb4ae5e
 DIST predicates-tree-1.0.5.crate 8126 BLAKE2B d63d2fe2bf9c61e703f11b8d3f8a8434179b8de1f45a52dc6266e79972e0abbefbefb0d57359005bb0daf06ff17276c858481be8382a7383058ff25e72dbb3dd SHA512 950f9191f44da894feb209110488de3da0e36cc86ef366ad2749a66bba0053e23c39fadb67fc5a4f5db3adccecd414619f9f805c2913733df96254913c360bfa
 DIST pretty_env_logger-0.4.0.crate 8690 BLAKE2B bd6cff07f3a9ad860378cd0bc7d44c1fe9ea346aba2970adfc1f23e6fbd3613f11cf8fb19a401f006ea69e8f05f687636d0ef870c25ccdc97c8b60505e2e0447 SHA512 770de8e256cedfb21fc89cc1ecc564ae1a8e67263705b4234b91867996c4db77ec703b70a46aef6b018c6ce09aab6a232fd1eedf8324c39f119a6807daa534f9
 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-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
-DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
 DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
-DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
 DIST pulldown-cmark-0.9.1.crate 114955 BLAKE2B ee295f4b65dee11c0b39054a4613cbfa1058a8dce05dc298bacc151e049dbe3f05b1739205ac345a98e70662187932d226c0d0667974b3c6a6f55882b566564b SHA512 466d6b4ceee89e1a8c71ff7ab8fc1000e7ef1d9bd22193a152358e1dad28c0c1bbe619caf71106d74eb376805dbfd2b888a0626c8c2851bd814d348873843306
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a
-DIST quickcheck_macros-1.0.0.crate 5275 BLAKE2B 1681fbc5a476c627da442d601d9f24dfeaa147dbad7c8d6989ad73cf5a204963c29b2b5bf68513ba74c322f74ef5ceea92594953e9034921a2c8132150252779 SHA512 f7de86f76a53fc36063f10f5405979677a2e48a96d13c439a4aa98e89ec7f3c3cae324b8dd789a5236630110ac9a1763f28361442cca08d1a1ef458c7bfadd55
-DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST radium-0.6.2.crate 9930 BLAKE2B 52ae64c10b7a3195b5ee1d6e8fe6e8b8a8ae90ded5f54d391bc398b5bbc46076fab1574365c9b401c0bd19a4d412e4e7f9c4a89baac6122c14671594fb2bd164 SHA512 a1850f2c044f9ae0e56a8992226396bf61e9f3f7f288b18bea3ba60584a6533eb94ce8532507c6d084e4b263139bf61a1193f23589dc3ed8ac7127d0f34a81fd
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
-DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
-DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-1.5.2.crate 165456 BLAKE2B 0a08064df966422d32f582f44570504bb405c59f35f20fcd792f4aa980b62fbd8797e8e01f01a9c3ec4f87eb3a1557f485a16ca2191749759beb31f4d704f082 SHA512 3c11bd89692af7e245be2c0b26d96e864a6353eb901706fe6394e3ff8bba13a829609d2a086aa69fbf716ca4286a1977123a950080d673814edf6bd55d29d459
-DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 DIST rayon-core-1.9.2.crate 65221 BLAKE2B 44b1bcf748e0bf19e7341c032eed6ea348f284ff9f834af628baa2484d3b468d6c8c31ed0309e226def441ee7a94e2ad0b9a2adf107493bef1ae27882d93a7ed SHA512 83c17e71e3da636d97ad77b64d988bfaa78addfd0c512f0fc09b1755614dab2a35532a4dcb126fa15da4e62461e59f5683b922a1fb4a5381a629992617d0383f
-DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
-DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST remove_dir_all-0.7.0.crate 9041 BLAKE2B ec298c4c6ac01bff3af5618ffa59aca535d74e06cbddf86c765318ded226c3fadb7f8277c572f173ae7d04f16c2b504375e400fa4e228d8747604860fb25660a SHA512 a4a426e7f3e9f4d3925809e22ebb61d06be04703ecabbc07aae80894458f29a146bc6aa6540ab4ac96c74a160a5520ea079ebb6ac6cca489ba036ece6678339c
 DIST ripemd160-0.9.1.crate 12087 BLAKE2B f2e0677b053cec4b93b1ba750e1a7ad603e2f4ff2f6750a659a7768627b1b30c429c91e586b61fe31531a5447d5f8d51cef1a874a8376df97b430a9629c11c7b SHA512 cd36d5b3224fd393f04b97a1f624ff190c3302ace497e37d040b5eb3a76c32cb413429de2692ae8706e62998ee82d82d13591c320b76825bf1b93ebbb3ab9ddb
-DIST roadmap-0.2.0.crate 22995 BLAKE2B 86f8095f0d3c30f6d798aeb510be31a912c83d353a8a531d994b0f335378fcac3bcc3ab879c126adb15420daa86d3c6f105f8c74fe38c25f94b35f90ceb1eb95 SHA512 a2a59b65e707c16905d309eb66012e92cd1732e538354b79fa1bd83aabadfeeee857eab7fea9a39d38fe28f9f124e0cda52b6ac3a883f07df4e2cacd8d683caa
 DIST roadmap-0.4.0.crate 12597 BLAKE2B 9ce84ab9a15c6023a59449426b8286093858b11540da5ee97a525ea37ccd10bb45ed034c445273b84d73125b17ca56a2a2b18c47a93e788187300bc67793a392 SHA512 5132b16d06c9eb3f2050793f1d6850c27764cbe01ed0a509bfeb6f61ffd23235e832e3f60bf0ef0f4806da6fa6923b132bd1653ce6e8b918cbc966b69128f905
 DIST rpassword-5.0.1.crate 11109 BLAKE2B 4d040a920673de6ad2f2cd55104a7c2dfdd7425368c77aa3c8a1f3f99e51cba4d86b2afb16ee51637d948e444ddf060f7a0c82de5d6f0696023c527e630eeb56 SHA512 bcd20c2920734a2f281b9ff924138605ea409d0bea9721ee96100f45eed14dffe65a8bdc8feed7c36d3564c8d902e78e0d2306b3736d03b8f195a9d212792feb
 DIST rsa-0.3.0.crate 40124 BLAKE2B 679de1ee93ce654c5ab442f1d8c12f91ecdfe3ee5e39ee2e31980acd333ef47f32feed30ab8dd1acadc1d88d9bcb24a6da872144394873be718201939d90fc48 SHA512 04c58f7d07babf108b7c30df94de359c413c26d1e9f044aa4782e58e4278fa2b448dd659820235f857f68e7ad428fa4fc90d69f549105b56ffa71d924b6b6a01
-DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
-DIST rustversion-1.0.5.crate 16984 BLAKE2B 314d4a7b78a91fe6a0f35d850ef7a4dda72859fec7f603307154d2b25722ef6be71d5986991b4958009ba066d3078a53131691b0d375677985b9e351876dcd15 SHA512 43f3ed12e007e0a7bf0ecbe44edec5ff092c88973903ad8032b12d678d98d8827a9e51040fa157b0d5b07d26a5b6cd314b410553fec46689b3a31b392c24770a
 DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
-DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST security-framework-2.4.2.crate 64857 BLAKE2B 7ad2311ec2ab1ebe8aca0b55a5b6b1dc328ad294818896224e950cbedf39cdda3e130395c5c2dbc64ccd3fa5603d028a2c0890c38c4a18dba4a25bd22cf66380 SHA512 de4480e4bf70148cdcaaf3a9c0e52ab061cea452b3209918fbda693faa7feb8c2df56ac29139bfea74969b8f62ba3ab2b3da38654e35aedf62fdddcec420998b
 DIST security-framework-2.6.1.crate 71688 BLAKE2B 45236a76721bde18400aa286263b5dc389db66a02a5b8feb38fc6ca576fca305cdc5f7e7d6984ebef1379209740ebef3180c4598d5117b04394562de5ceb52d8 SHA512 e4690acf5609f52c89cbe0b577c68a22caf0763d8dc781817010e695824dae44dc27f58c9ffec4254a8461e88040892b89f9628d6a71102d06ab5441b84800a4
-DIST security-framework-sys-2.4.2.crate 12821 BLAKE2B b1731747e2525aa3aad02be4da8076f6e25d33faf54b431e84c0bd072ca236c682ed492621a7aef725d0c1bd20a5f35ef01d0d518b06fa7bdfd2417b081f4cf6 SHA512 d2f35545223f1ec671f9265017c393a6219cd1ac551ec7b3bea6f90ac9e79cd9d9f7232fe7fca5f0c093b3f549925571d5a4f0b702f29a1e992e038446f48bd9
 DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
-DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
-DIST sequoia-sq-v0.26.0.tar.bz2 7426727 BLAKE2B ad81bdc46308bd36fc02b050585d8912a51c271f990bc79bc01e665a1b196c21f3b4c48e858e2f8ac772d10fa84f5ea54286c7eb6010a22c70c180fda9275f83 SHA512 e733e5702c4d1752fedc2dc7cd7544389e766bb74c46f9897d84d95890bee7aafc8a00c182d2811ace7f856b68bba09e919aeb3d6b3071d21bb9ba7f0f812773
 DIST sequoia-sq-v0.27.0.tar.bz2 7417165 BLAKE2B e006ae75063a24db3441925c758df5a4f486b97767da56dd9a35b921bb8565fe24fa945f38efb20b543569fbe74ca746f9f1bd18ce56224f515e29922dce4e41 SHA512 4b6352a7937c8fa4c97b8214aa35d111e8a6d2da3f0017ce995b9a064a48b1d983997ca8b0c12337e0cfabdeb09c660afba94e5652c72c286ce691597bfdb410
-DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
-DIST serde-aux-2.3.0.crate 10712 BLAKE2B a0df7dd1e7499768233ce2a1d9b0a5588a6f120f47943aa72d8896831b0e0ae19b6d7e798ecd58a84dd684b42c0f60ba1b1069c1da27bd7c6301614d2bf8dfc8 SHA512 ea6b884a8caa654049b299ac6e944a7e7584fd2a0d3f7f34f8f0c4b15f936750f4f6560d9b3023aaa52c452c1932e941ecad83fafc4ddb517506cfea92ea3ff7
 DIST serde-aux-3.0.1.crate 10699 BLAKE2B b4f7d4133a82c52fafdefaa1083f621eadc2f583cdc35dfe77d2d8848c0e8a292d617f00089dd00bf66666d5a1729d502d08717c5d0929f186650710c53457a9 SHA512 6a76cad1939f424536b51b8bf1068054c7acc39011ab663e81c98a7912a23904609073b82dba0dce4605223aa53fd43b2777b29cf6448af8bdeede721b2e283e
 DIST serde_cbor-0.11.2.crate 44570 BLAKE2B facc8d16886dde89125b7d69e9e77ff586c61993c3493fe4089ff03c53e6c0808c6da45a83337d3be7414dd82f3d6a7f3d43167473e49e586a7e817d47ef3014 SHA512 12ddcbd5de0d85f2da6e078e3ccfdf2115125084d57eb93d7e9b45bca6a86daf79dcc79c8e54260c56240c3b5e814b1481ac28c3aa1d1b4b982ef5956b5cc3cd
-DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
-DIST serde_json-1.0.68.crate 114986 BLAKE2B a588a87ac9fe2b3635d7bf72c185801e3866101020a0afb8f714d37939c2dc7b5b32e2177910df7221df197e4e8a92d92187968efdb5e9f1f1616647c10d81d3 SHA512 54a0345029016873883dbdcd2094615f509759f61b04d9a496dfdbc1e27ee5361dfb3d129f209a9ad66984cc1f4c82751adfe1a564198649ecc939e8c3dd1ac5
 DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
-DIST serde_yaml-0.8.21.crate 42603 BLAKE2B 4556a2cb4f81a1cc3ce7487caed863eb6403c966f38d505fef6ddad0586813612b0b1d5d6c32ddfb3a7d8dab8a870bf4d2bd6b06321e28165ee0b14293ec2203 SHA512 82e5a6663392b2a3e049f735b88b35023bb9255167b0e396c2cc5982b014ad2e6804433d15ffd19fe2ffd6e423a6e04e9a32b4b3d2b012adaa1f4f44996a81ea
 DIST serde_yaml-0.8.23.crate 42140 BLAKE2B 49d28913954173d1c062fe4668c2228286adde3d3e210befd09e04f8e43dcde469c6aeb86349a7a604188343d0c211078c9520c079249780923a4d70e3132d9b SHA512 7831299cedf0fa9155a76b61436ec1cbc06adfe672a102973e8cffc8b277d99b4104d70951ed16b18283f3291c8047d6af413e0438da3e6bc6745bfb6816628a
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
 DIST sha-1-0.9.8.crate 14029 BLAKE2B 80fa6903880ee36841375345d1763672ae8c3b790965b0bfc7cec7ecc69744be3a35a890a6f52b2a25f9ed1b91ce6986dd04b00ee455563b00218f8acd4b6ce5 SHA512 d4708a762d5f3dfd902ed335f0383cf63b442f95b1aebbaca3643606ed2480060d2ed04f123d0c44496147ecbb06a093980b435f9d3ff9e0f5c908389736aa9f
-DIST sha1collisiondetection-0.2.4.crate 821850 BLAKE2B 1188e71c25ef354e3cbe553b10048f31cf55249c792c614a2910b198ec04e48ca7d6678fb24b620d439d125f7bae690f85c557a58f85e7facf07b8e328c75ec6 SHA512 aa8835fddaf07f2988a2c4a0b86479be5d598df3caac69815529ae84915f6244a1ac89c8bdcab5f89fe7cf5ec11069121f56e3521aac7db761fcc99491028678
 DIST sha1collisiondetection-0.2.5.crate 821851 BLAKE2B 744d1c22c69204c421e2bc0298df1d186eb6ad1977f98f3568e7ac480f002b23ed950bb0ab637f09e02efc248515046bff884f57b6444de77c8e79755987951f SHA512 98dc643e2c7a0541698b5e5a10c03c436f68adae35da355cf688d49a0eedbd5c8b5505896121435b8fd791d3e40f6126a455d2063fb125f39bb72602a27a6fc2
-DIST sha2-0.9.8.crate 22132 BLAKE2B 233c2160961729590a2ee2b150715327fb09a1a38ca13b07c2c690ee6ed6eb7d180c54d84e9b3ca2e92e48d7ec923543e893786aa81b5942ecbca27b40ca12a6 SHA512 4bd858f67a3ee5a22769aaf4161d823884e112f99911d5461cafe746a19fafd2d8946eb3aa234953efa06a4dcf7becda70db6721c0d4a9b6f1fb670f31f6343d
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
-DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST signature-1.3.2.crate 10323 BLAKE2B 6e272bd0092627960039806ba9c4c6237f559c13a1f7f48e984033d1e858d85f7b052e171554b99353d29a31a3578aeacfe84e6c897a3a7ad9b847a5d8dd0c5a SHA512 15907e761b97377e4bf3c68c18da3f27cfda92ebd332845e2e9c680679cc5f954192bdfdea8c4fab4f92b634a88b3574898dde10ad7650a11ef8a8ed2c6b4665
 DIST simple_asn1-0.4.1.crate 15752 BLAKE2B 99694bf4598b2039b69058a4fed0d790e4e22ec0ca82920d202bdd1405eca0d6cef6ab660ee0d48c68466f4583c3926ba20171b8c34012df52a041df2a1630af SHA512 37211608915e6ab2408ea91fa937f93962b621bb89c1eada6a06485fbe83cfc930a116464729878f42610ad4d9d21bb1494916f71290257ddc88441317bd0ffe
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
-DIST siphasher-0.3.7.crate 10097 BLAKE2B 455b5ca81418aee667b4fe16092435e025353267e14cf4f911f5d48a18d9a46be04452ce1451a272f8b2073ecf606c6834b6d06b49687474bb7ac226383aa7e7 SHA512 4a8ef56085742de7ad638194b21ff3e315aef6de9b7590e736071859ffa2aa4a28cdea7e05ecfa781fa35a40505086a36d84bdb3ec40d679f9b83c2edffc4d3d
-DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca
 DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
 DIST slug-0.1.4.crate 6640 BLAKE2B 7ea78865af7de57fdfea3f861da655f9f191bd6048c57655da2fa90675a46263a5d4c085ed4c206b5cbe4595b86d79466765138f0167c141c4ce6580de637422 SHA512 2c85dabcca9400c5e2a3b409997403a6acb17357449df4ef9a7b27511c5a979bfcb1a4d80b7e7c36122233ee6d47e59507631dd6ac9e93d1610f54b9b160ee96
-DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
-DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
-DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST spki-0.3.0.crate 7877 BLAKE2B 6425efeca07316ad3d6e428891640dfe096ca3e4762bfe260b969674197b525d61ce72f2937ebb7fe61f3f3cbc4cd48ecae1183ea8d0feebef20ce687b147c40 SHA512 21179f7e0fc9539c610bc468b899eeb7ab2ddec4294c8d2c366cb1baa0ef25f96dfd1e843c63112d5fb1793d7cf82300fa215b6d685c94dbf3462e9720dabfdf
 DIST state-0.5.2.crate 30371 BLAKE2B c6b859095f8b999aa44736c32cf034bfcf62af270f03370daffed70bd4be9a045029b53142d8b9359387a923ffad43b0a077a08c558e68c69444c0c3ec115575 SHA512 8d61d62a18a5c5d402d7b734eb788a02e796f4be147a16fc382a41b6d2fe9fff32a6bcf141d48b55c438891d3418de90e9a29f4113518a86d7ab07b705ca96b8
-DIST string_cache-0.8.2.crate 15770 BLAKE2B 36e2984684931fb15371dd0aeb30d93312153daf65f8b8c720c16327b169078763c0c7b70a00c9670a0c8c3b1099c9a98488c893f8e90eb03952cc0e694b6fe2 SHA512 d4ae1fbea4de469e342ba1a0d4c0f26386633dcc46c0cb9adbb7983e565476a57aedf1798e65f21ee5326f96880ee2bb4a5dc1621ff7e7d0ca23fb3536dc98aa
 DIST string_cache-0.8.4.crate 16380 BLAKE2B 235973fff64a66175b563bc512137bba98f84bc00fdffa771a9925950903f3ee91a9f1025786aa68b796a55782e4d5bb26756e1134db96dc6f4cf69974c18774 SHA512 dff6d359226fd2c4ea5934a3d5ea73324d548ec235cd9aac8c233f2d9e67ba9b045ee598a34063839eb5b906d344a70fe3be65abcbe106cb9ff79cbc40b833e3
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.25.crate 52296 BLAKE2B 07fb1f601ff0233c5ccc15fdc45ccc6bc06636c261c96c7554c516c4cfd1f38a9541cca67c670985bfe7984da04a0cfcbdf37a83479ce1aeea9b795c7d323889 SHA512 f07c505fbabfd880ee5f931e8a3ed8a1d01fc0a66a78c0cc04a2600d2f5cb2d699ac41719062c5c4d2cb06a64ce1433641837bb7d9fb755018ce95844216811d
 DIST structopt-0.3.26.crate 53798 BLAKE2B 04be64637d18bcc87d261320668023459a42c167bb5a4c52216df556a7dd19be28032e7bf759cbcf710a3729a9dfaeb20c29f37f35fcf33533db583ac4fa049a SHA512 dec27090b57107473c9d398db68bde3b1b5191e7c7980d7d2c20fc723f92c64a6cf1d391d5122a103222c4262253d8073fd0fdfb11c74f235af79b2ae0caf069
 DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623ee0d5acf45afdc3844114e02975b855fd1a9f7df404a24044cf33a3a4cc4142eccc34d1e97925646d54d460a89baa28275 SHA512 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
-DIST subplot-0.3.1.crate 122561 BLAKE2B 21309912f9476267cbb92a648341a95f9875f237a67fed69c6df221c1f05255794a617a825a21cca023ed5ca047b6746da6f0007170c1163f39ea7ad669cc261 SHA512 83c7c8743fb8140356d74fcff6126d8a746bef1e9202cc4f8fe9f7c56e72faf01b257e967e1dcc705e16a7146f5eb375d246a6b42aab77d1ddf1464830a7517b
 DIST subplot-0.4.0.crate 124988 BLAKE2B 747b310fe2376b4459be2c33c2824191668261e1ddde5289b39fb906c700e88e35ce9d7947b894ebac8241be3b179090d05b705a9cd890f2022cd6bd795b3a55 SHA512 018a00c634c7b2e93ccf572d24bff5de9cf963c1c4662fbedfed22d2781ca018fcaf36b8d5096d16007c3b7970af76abe0823f2d7aba73a537255d3a8978fb24
-DIST subplot-build-0.1.0.crate 2077 BLAKE2B e174547d07bc4b9d84e7e0f94983869d9ef5112c62f3cdaae84ce39e91e5d5fffde237c10b764c8075033fe418db6296417d0747cb34f06973bd9f596b4e6046 SHA512 568e5e9abe1dcb851747e12b3f2f3e5ace7e358d8890370f577d2ee6dac0ca9cb4f06d4a9a94bb44a0430aa4f2132477ed10564accd0d123d481b68316d65266
 DIST subplot-build-0.4.0.crate 2169 BLAKE2B f1527ad986df4b81463015e1a37507bb8bbbc52d3d12173d1a11432cb5c27868281ac8ff3b0c62eed9a4b14f5c8321a214506ee9996665d8ba1bfeed8f384f78 SHA512 c4f745b5d53033e57273d7baa5ec8b1c65b6e294404316541ba8a1fc136e2e11ad4ab6a76d19279b0e359aeee89d1f224550d43d6e66e6960ca064708532f3f3
-DIST subplotlib-0.1.1.crate 20323 BLAKE2B d2d9878cd436f582fbc2508d45b00d954c48b013187759ba730ccb9014336969c5e989b669189917dc38595ef624ffec5980ab3a8405adde63159726163fbbb7 SHA512 33e16cff56c63390dde5839f02f400db312211ac7304aa0d5d442372291c3076ec616b3dbb644ea4db0e3fc3e90f75a86cdaf728071cc9e768990fd01cb9d77b
 DIST subplotlib-0.4.1.crate 22176 BLAKE2B 8f9051bf22a838c208da9ccbbe284d1ac92c4caaf07f5e2003ba7a514436ebe45b7f6a775b96d656aacde4c4f7d8dc4c1d91a6ed8a08ca3ad845831173fd3df8 SHA512 f27f1a68c3332f86b64db4a12e7d14f37453b1db316981ceb80a939336abb4d9054ef0ef681633878de39b19178cfd62cdbc8476e2ab99c344e3ab0fbd8db07b
-DIST subplotlib-derive-0.1.0.crate 4401 BLAKE2B 0caf642c76677535a9d22b30b61713b927e423473bd8b6726246ae4b7c07dea61edec7a775f5c5c34be9065e4f801887438e12f0eb6ee9f7023d08cfabdea710 SHA512 6f6fe8d03bc3bc2a6c10be0e5be60c63edab75750cbb15b9e9d75053a87e8418cc3b84fb8bd620bfa7b412090d938c16947d7fa81a2e4b44b876011a24562d80
 DIST subplotlib-derive-0.4.0.crate 4389 BLAKE2B aa3d361faa1cd365002d10d8ad43594d650c9c1277d4fd49fbbc673c143c0e08f5d2305a24b8f344b65002ac763b4794adfb370936cc422cb15e3e139d622a14 SHA512 6b9b7728a655bb4aeb99cd66c2719385bdc9bcca8b7dce7a2c28bdc2bf83e99aad8868a834418d01ca47c3be8df6e37c323e0b7d0aea0bf44bf0dcc51003eeec
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
-DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
 DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
-DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST tempfile-fast-0.3.4.crate 8991 BLAKE2B 98fae1979a2be1aef1d9c6abafdffb6b90df92328af5c74d19ea4991539f8c3be7cd823e980c13e90f16300611d222c1d81b7eac4c55b7a3da3c38abe385cc36 SHA512 b0d44bbf78e9991784a9d20f3f3ea8d5e59e95d74d782889a3f38f732a0fb06920ec81295c8abdff7603675c55c43c3ff7d9f4bcc094f403ad83bfb96a9ceb1f
-DIST tera-1.13.0.crate 96667 BLAKE2B 0374dfc1de4b33e590eb9a4f3b4d6e95dc4573f439797dbf4d9f076b50b6178a58991184a58098626e589651ae6916d4e341b5383a09cb6f5b96a235cbc4caa6 SHA512 26ef7b4c8ffeae83a5bffdf646fb4b2d9fc647237d1907372cec1f9fa1361eb8d35af628a70a02645ed3f6ab7d199ac7577b338e05f9abbf90041193f12c9c86
 DIST tera-1.15.0.crate 96195 BLAKE2B ef3dc79403f7dac93493890b3c540d6905dd15b0c2ed5ae000638e64d839588f39e108e7e293c8938308229f64b492fe852b0bbfe293bc909762f56972674977 SHA512 d303b41dfb66125397c045695c468b777c5371b1b34efc9dbc028e4480a5653ef84ed199f9b12825352a564c5fc83624f1352c5d6154373639aa779b0ba0ab9c
 DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
-DIST termtree-0.2.3.crate 6926 BLAKE2B 390aad5f90602785674fddf6dd5ffe5ddb37b5f2eea7cfd330e04e4b3f482c8ab3bca63fa595ee409a8bed3ffd27684bc6a1227ca679763f94cf5a75ad55ee93 SHA512 183a99ece5ba686e6fc9884c3dc702083a6f7918514a20e3af460195d8f171d9ec91fccb8e2a93319f844ca7164455c9490e4a6478ef096f44c1b57e532a7a76
 DIST termtree-0.2.4.crate 4416 BLAKE2B 994134f7af962123b19984aa32b30c19c6f77202067a90ddb3aa4414ec8dc541f5d8be9282244cdbb1eb16686c11750393325fc7f7005de0bec38d6a9219e015 SHA512 afe4e94bd57c9917ba48be4b3a22ff2b9b8a6c764c86871a3be9087ae0c65326fadb466e285a129082e4243ba6bca933d89ea01aa9188222c055f0c2b308cdf3
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
-DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
 DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
-DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST tokio-1.14.0.crate 534070 BLAKE2B 5e15babc9a2ff9c74e71174bcaee4f34fc88038983a870aba7cb4beffa79eb5ac1a4bd54718971cf193bd85f2664c274395090105b4ae74f86e81c23aceee9fa SHA512 b9961d0be60b0ff6d5b11dc74b69ae8406e748201de74d3789d1c8b2c996d8db6359a7089123ef24c5b1a1e86f3e282b6e031a5b99a73b6ee9e8b24a6fa1c7fc
 DIST tokio-1.19.2.crate 581250 BLAKE2B 4ea9699f8fd132b3fcfd58d61516a08bd26e26fc575f14b5eeea6b90312b6d90f9d2ed926d6f3376ca83608c9858668faae04ea89bf053bc4d03a78edc788f6f SHA512 db20c31ee19bfccf91b7f5c6495a1d49ca9492828b0d6d3877fb586fdddce369d6f828e05c04fd826c246235accf05fbfb0819965fc5c99aff23477f0bf71acd
-DIST tokio-macros-1.6.0.crate 9225 BLAKE2B 0fd8eead025eb5789d57af750414ddcbc05597a5e06ab953611201db3b34ef4bbfe182c25463f63b9012e5c4916c4dd239679934c2f7cfd6114fa7780104c4c2 SHA512 f39958e210300341d1fcc2cc5f44f0a41d493727e9b50216d4cadc574cff46a7d29999a72dc1a39b29c85cb3044fcb941847198d1ac6557e7aaed10be829931a
 DIST tokio-macros-1.7.0.crate 9261 BLAKE2B b22228dadc1e4158666a4102d582c2d15668f8451e6c4959640119408d6d712de66813fbb2c26ca692d7f935430b54fc14c276be7e11f869dd70e2115da4be99 SHA512 30c57950d4477a92043683fbc654e8cbc23e87a34276ec11e33ee094ef3cab1bd3e5b2574b3b65030e04ca937f9046d024ec50506ed4eec2ce9ef4d295e7e8cc
 DIST tokio-native-tls-0.3.0.crate 20759 BLAKE2B 5073c5d93f5fa08170ffc76e21404b67100df5d944daa9cfe73420d4cb2409ca2617a0b1c25058a8b356b51fc4815972692aed7baa47ee3a11574a3109ce1691 SHA512 a8aa7586f15a3347ba9152497db84a098e751797c06df1a75d9b108689e14d6692b4efc6e5b49b5bf8f8fdb3bfc4f1157f56b3b0c9d9e753a8b31a61e65dfc4d
-DIST tokio-util-0.6.8.crate 74116 BLAKE2B f47f61a1566b721ef5294526f6b0fc08a5662eee2b12def6b699de38e6888e3cb61623a76a52a71843449a5657ce3829bd5fdf2826428e370b6d912320c5863c SHA512 b81ee8086a069de580bb2769145a77d12d3ae2c4d8a689d979c58988c64b221ffeeeb0f159181f92f402011931eda8549ff173b227433d6597492dc7f024b7bd
 DIST tokio-util-0.7.1.crate 87364 BLAKE2B 8c6b5efb9a5a693330867710458cc1dad797ae951105a0882f73662634879300412f4e097aef22bd2ed43214487589a21fbdada95458fce9ccd0b6100b2218a6 SHA512 738e206a107d721dbbaa6cebbf24153af317338416a7fee632e3a895f7702df9538629d2016cb0e7cd28338e7e38e9d6ac5e289dedce2d0230f3d852b4814f20
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
-DIST tracing-0.1.29.crate 72444 BLAKE2B 637f52a1890ee8b2ce20eabb8491b100de680088792be87008107455e5404c9efdb2d2e97129fbed6ce29296a880ecfca370535ccefdea2fea49d9457ad6b683 SHA512 8b9c58aa6d236485cbd8e6c3b39a1cc05d30169dd9ddb377ba464ba72c774af69b0eecce1551660d26fa6735e5483f45463cfcd196513c0b4c351c900cf4c7d8
 DIST tracing-0.1.34.crate 72775 BLAKE2B afdcc78ba29f68f3e87e401a89e4c5944da620890823d56f3d345c2e97a2268c19c342014903aa4a62b8d39b67a5313506563a7be0a555b86cd93aa9db4dbae4 SHA512 d4641f3f239d158547d7c811a80cbd2d1d7df366122dcc678d01844988ef3c5f5db637707e7e91bfb2ea16bef5463d52f8a481d1a9804bac197157453b5877d8
-DIST tracing-appender-0.1.2.crate 14062 BLAKE2B 6adfcd0fdcdf1c21c8cf239f65f2f859b3a5a6c0eaa80400d056f97da878d1f612461809f1392593fa42455f778e44b707359c1989882981704de0b591c15c33 SHA512 4b494c25c3d47dde482f872e31dcd53b41890930cd3abef9028cb8cc1d5f2a0972b3bf5c59a658b896c642e82ea302c0791b997f5106c1bced69b190f77d95a7
-DIST tracing-attributes-0.1.18.crate 22779 BLAKE2B 46fe07f2e2b8df2e510624981a8e882c27cdebac3e6b6cb282bbc5acc69fe8335461203f0ce4b87dd23c5412108aa3ab2ebb906ba40ce5f2bd2669a5a90c5d8b SHA512 69417ae19fb88742ce609724113945fcc3c28615c84780ee169f4149d3f479dec5fcd39c95aeb2b64a4a2678ec72f53a93cc02996ce2f46a0d3f1ef4754216d3
 DIST tracing-attributes-0.1.20.crate 26316 BLAKE2B 33d5d160d4de0d117bc45e33ca76f2dbb0838021bd7b3cee07603ec86e328b27e4fea993becaa9cdda11f4c6fced74575ae9a4a25bba64b26646d72b72942156 SHA512 8ae65a131ba700a03a2e35646a1bdaf043f04b4d5de00f5c58022caf06346b50cd88e1917bcad3a3ad591921fbf2dcef3b49793b8569604eddeea2470627a0c6
-DIST tracing-core-0.1.21.crate 50683 BLAKE2B dc48e0fd6586b8ac0059469a26049c6746b44a06a4e7768d129822bbd2f6ce719c63964ee3e4f9543ce278566efda8fd957c8b4be8b696ef12724f899b2830dc SHA512 2c3e00674c02023ee3e9a114878ad8941253a9489312082b2cf9a163b04fb8d23767f00892874645f59f30b6f620dfb83dab8680c64db5510208678b52f2db9c
 DIST tracing-core-0.1.26.crate 53727 BLAKE2B 1e3efbd8e5ad0617ce15ea14eb6365752067f580504a4cc90f1f486ad3eb7e59087c0f332e3e93ae32a2f4c42a42482a9ecbe180f43dcf34a427babd5290fc61 SHA512 b9d44c307d0fee51675bef07ed7f7d2eb8de8a6ffb37256994f3485f7f80e40f1fa9de1663e5360f945270f10d22e42cd9af60193449bd0a0d323895e994bdbb
 DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
-DIST tracing-serde-0.1.2.crate 6362 BLAKE2B 81eaa1f5fd51de57a2e2d7c78c1441513e1df1afd434ec6bcd955c933fecf165a690429d62fd919960250eb931989a0a9681d6b17253208cb7b297418c5e0680 SHA512 1f9c1690ab9f94588169454fa7d9e9e164aea5827073e4f5c29f1aba80cddfc11cf9e60b05dbb7951024c2fd0b0b46d278867f85d4df69d85631d39d63b5cf96
-DIST tracing-subscriber-0.2.25.crate 149469 BLAKE2B 4624243b66571b88ade80cdd7ea4a9ab1ddb44f62bd0c373b3d4b121103f4001ed6c0276fd25920dd308dbf3aa73b98f04fb5105224eafe14d721bc27ab24a81 SHA512 edefa55a94b4abc1641df4190ad4da121320d402f8c413d00697b05d35100133f8955ab672c32bd795fc0965ac5b5e6ce09cab5147e8c77c262b8f9340647712
 DIST tracing-subscriber-0.3.11.crate 184827 BLAKE2B 83686c5affeb40a84e95c161b121dcdd533b782151896b86752f4d9a922683847dc350482a7436fee23a23cbadbb9522dcb7966993e877fb84fa8e6deda050e2 SHA512 5d45d5108742aece42bfe7d6f6ed71b0bee81c3e3e3a3117489ec5d4d4ee9c23c157077ad5020b74b019d212fb2a46623e93dc57a7f6bc0a1a853981ea097493
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST twofish-0.5.0.crate 11649 BLAKE2B 1c000f9c218bb33e8730a84d5da66a75c27b87b51e5283ab9f46bb74acf4f8df4195617b755d08f748a7394d7e485cf29448846367c05c9d8b846f6d1148c7c8 SHA512 f281f2e77495a6ab2077d4595a3398d27784bac65d27152c336f8f08617305171ddc9d3d03599a7448e68d599341f9063308e25cf57312b3ac82b5b020385dd3
-DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
-DIST uncased-0.9.6.crate 10413 BLAKE2B 67c9c7da6c706e6e51831453b5c8140568efd046588ec4d972bbf895c191da95ed8d7e5ebd65f6b1ce83544bcaed4dd4f631c002daf7495e2b47eb1a7e8df254 SHA512 8d0f29b60cf800afc92d08fc4d4b92f5ca80c6ad4f38c64c2cff88b959cdb7e59952eda1200c65eae1c379e3e3d55b946a8588c393e60938a776538492af9989
 DIST unescape-0.1.0.crate 2412 BLAKE2B d373b1deeb116af0cdf177086bdfb2228cb9a1cdf56845a4fa37d92c700e1b71cc959617687d163e0f5d062f73ca48e9121dce56bc278374340189ecb8f110da SHA512 8900083c068fa12f719ac6a08436b22945a35ddddc61bba85fe47015e449026191f543c3ab15e436925f0799f8611acacb1d016646a1b0742a77617886533eac
 DIST unic-char-property-0.9.0.crate 6809 BLAKE2B d2bb66259b66e59e831ad74d89528882336a7cf6dfac7a9f49308a70a3d61d5ab88f3ade9df2c086f27ff4a6eae0d2d2b8e63bd154ce3e700cc525769f34542a SHA512 ef969968c61eae6a7d68e6ccb0b40f6618a69bfc4714b51bf4ee8c5ec4532d10b9c6675a4cd5121c904a578ceec7c6471d1496fedbf121059f076ad1c5ccb70d
 DIST unic-char-range-0.9.0.crate 7020 BLAKE2B ab79b4298b999a9fbb769bf191f83e259b40b8d06cc5cb82abac48434162216a283fa82c1bc9af8b40656c2d06e5b6a919ff7888852eabb9001a92db12fa48d7 SHA512 bb0ede1695f4f016bdf9ec83bb49639527248c175c71d24993b8651ea6be0a411251ed8518893101dd5e96fd2913cf15ec27799c677ddb08b8e408da06ae0ceb
@@ -495,7 +347,6 @@ DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
 DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-segmentation-1.9.0.crate 93241 BLAKE2B 359904bcaadfd161128d40a896a2d10e5dfdb4098de245c949ae3fffecce9b4b6b999bbc2c6ca522944733ab0074e50fe829690183639c312bba8f8d0ad24456 SHA512 7d0ea37bfb24a1a803b1cd40b7b0c0e6e44ebf9a474fdedf0dcca1ead25662e19f44af29b87de1b000c3cc75fec93320938bb3ab9d9e82298eda324bb97e7294
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
@@ -503,7 +354,6 @@ DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
@@ -511,17 +361,11 @@ DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca5202
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wasm-bindgen-0.2.78.crate 162111 BLAKE2B a3311e67900961b35a59ead7a8972dcee37671921c0f524895c821658a7b1246403d4674bee1735f1b2b94aa789d5376edd02afe4c8ebda110f4344ef58c9225 SHA512 bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9
 DIST wasm-bindgen-0.2.80.crate 164576 BLAKE2B ee581f812bdab9dcf23c73ce25afa6aafeffb7b9c70d5a64539487548efb290bfcb94cbe5af6e12b5a5912548ae0fc6cc3168de4a5ab63b3823b6b071d41161c SHA512 928fd6575217909a46f23ea8147caa438efed8eef31d1e0d75610fc380c18d7cf51cb74c7d5c83136d36433fd19bc9256b6566c2624a4008daca1b3e155aacf1
-DIST wasm-bindgen-backend-0.2.78.crate 25576 BLAKE2B 03dc6b255ab9e30f9eb54f81638eb02a05a0b994ddd51f47852bca376a02080fcce596453d688f5e8e7b5a814fd081b9709c1215f7e9f9fec0e4a7a6cba1000c SHA512 00a0ec9afb65c084b64cf9d25f778ab03bf2368a1e0ff213e07b8fe742a125ddae00c7b4d693225d6d798618b0441d4dea3c175cacdb37fdd75b0a46ba3a287b
 DIST wasm-bindgen-backend-0.2.80.crate 25741 BLAKE2B bac730f41a17aa963bdb005bcbce76e988b0c163fdf1b117cb3bf838d7186b732f81ce4edc068c6e3d2934802c974e19f1d8588ff71310462a189b3e5b9d4653 SHA512 20c33664f194dbc5998093831d8ed0eae82cfa6c90b8c3b9338c4f32104594a8864c68a51ee3e39fca1eba166b241a9a8e508d5f942791d727deb2decd9056d2
-DIST wasm-bindgen-macro-0.2.78.crate 11700 BLAKE2B 9f1538d79a39555f643b9ac6bfe026c259dfd129c45fdcc33cfbeeba2acb2a26ff4c9df83a3d11674c5ef8e9393af7a4d0cd7e3bd08b7eca0fa55986c893c5e3 SHA512 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d
 DIST wasm-bindgen-macro-0.2.80.crate 11805 BLAKE2B ce070eac93a0cecac6d2e303f40b9f9784489133da2cf7fabbadd57afdeff5966308481276d4375150f0950fdbee165f466b4b099f0932ce26dd02ce6007af10 SHA512 816922762591e7ccd07d9bab1f089d1d0484c04ca4d8b9060d432fabe4ca28a6b6f0e701129f6d0a3fc341b845115c2dd1bea3bb67493234a73f7cd2bc0c66db
-DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f2cd836f56143a498d3be5fc30eced6fe4fc2e1bfe14a70f3165cdc5cc1c88f0162efec75b64e56aa9819596984afa97003601b933ce SHA512 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236
 DIST wasm-bindgen-macro-support-0.2.80.crate 17857 BLAKE2B 9f51e4193f64088d95079a105164c75d2397f07846bc8fb29bf7f9dd3747dd7d4d6f3b340cde219fbc3b181199c8f1aaf62317ddd3ce8e7f25f68b2d5ffbd514 SHA512 8d4a68c363dde93d9644f30ab69ef28879e8c354e41e6ed1d1598beeeaba5bb6c8e6769fac5404faf438a90d87fbdaf9bc9b4d082dd7b1986f789d739f7b5108
-DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134
 DIST wasm-bindgen-shared-0.2.80.crate 7204 BLAKE2B dd955b920bb74d96734b58c3143a10182c64ff5d4c1cbcdcba909521b45c0f97422c3aca2894722d96a226884a7c334b06649ca7c1cb2e7b08c2cac5acf53dd5 SHA512 c170759d46e12edd41dcafc908caa887756a811006a178b3bf5ae73f73556d51fa13fc4a0844e28071d21c177a1d98e1e2f6dcac41dc240b972b697d36d74203
-DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764
 DIST web-sys-0.3.57.crate 686563 BLAKE2B ddb687a252181a9198bc96da3feaea007ff188641996172293772257cffd748a79f306c24d9eb619c61a5ddcec4bb6e423288a831ff14c7b5ec6b37839b52508 SHA512 144a481ff7562ff5f96145c7db64ecc704863e2fd6c0c9afc87fe87513e5be660fcadec6b1114ed2c86da36ccd97024ce601b843c8768dd8b5c53c71daae9800
 DIST win-crypto-ng-0.4.0.crate 44313 BLAKE2B 42d1058b73ac9899f5399ab7aec08276cc5d431b5634a16d69dde1ebbdb46af8b4199097efd51e2f22b3bb9710db2a6897a1573f93742b762575fc93f18ca2d0 SHA512 2e5428680678c78ca5867ad25204d6c16e823ecccdf0d4efd3df7f7cebb21f6ea633c1802d76402d44f977df47a7be2f9a9db222697cc27522c38302aa239d46
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -535,15 +379,11 @@ DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82d
 DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
 DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
 DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
-DIST x25519-dalek-1.1.1.crate 84499 BLAKE2B b4dd353f5876dd04ae404b75a6599434428e382931bb071aa518bd6b75d0b75f98f0d5ef8f677092b75348ecf2349cc5a2bc43f9a43f4b249cc117ee89c6b7c2 SHA512 e9b95168997c57d1493792eba8ad1d85e856313c65d0f51bcd545547d8780ea4840f490dc2a0bcf2b5a35b64a944bee06dbb72ea4a5871883f1c0079b03b496a
 DIST x25519-dalek-1.2.0.crate 88676 BLAKE2B 8707b34b7d438ae97ddd7ce35084d1e9d4f15b08827d021fdf5e1d407a70e0a636bfed5860289f293ac4cb7ee9cee41bd6792c7cb4783adda5815775dd495adb SHA512 d1366c56e79e2d764c8c9d463445896d870871867957fa120c9987fd7733e7f94db9e34b6ae546f9caa2140ee09f44a8359e701d30affc6a2fc2e70f0ba729b7
-DIST xxhash-rust-0.8.2.crate 16721 BLAKE2B 898102bd731013bc18557e5087aa03e8df362004d658705af7c931964e4f436862c8aff53e135e2777c3234f54df36f7b3227715d17e3bd80d17b9644292c916 SHA512 083afaad3e36e18b370eb7ca457289c9aa37c806f45615d65a83f7f6f74ca619181bae3d3bef315fd1625ee23706490606ea61dbe628714940bb53e3a4b85762
 DIST xxhash-rust-0.8.5.crate 90467 BLAKE2B 0c2f4e2539ce7063b7b6e6cf80de61d4d051b2651ab051479d7a4dd33ae0c51c465230405051922bce899db2093693bd16724eda43b1d4b28b93efa282cedbde SHA512 1bb5244f99834b2420c20563c1083ceaff21ed5b50e964452cffdd40438a32bf5c6284909035444652bb721d739bfd46b30d3abf15d0d1de4eebe0355e00e43b
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST zbase32-0.1.2.crate 8721 BLAKE2B d7f5881c8d3f06f5fd78669ae6943ffa5ebe35b5e34db2718825e88e5602fa03bbc33c11589021ad2e8754414b355b86a9391335e4df9361627aede9336b14d3 SHA512 50d703350a6404f0084b4d341ac1aef16f7a5f8924662c4d180ffaece00d295aec3f9925168d39c20837c7306ef88f98ffc5ef4c945d01c7fc6e5078c5dfb4bc
 DIST zeroize-1.3.0.crate 15913 BLAKE2B 571d96420e85e3d12100dcaff00d4721eae7296465cafce83db81293e801cd5a1f78b19986dc537fab208519a48e6a7df344d8e8a7053b094c1aa5bb90de083b SHA512 352a668a4c491cbd644368eb19f797709a41f3abf9a09028b6c1c4077710d48b74c3018e65112762a31403917f000340a0e57bc095a745e3f99300d6c25ca8bb
-DIST zeroize_derive-1.1.1.crate 8820 BLAKE2B 59f83251c44b9994ef1b629d5cc2229f37941d7578da651fda67e1ec502a15837a196ce81254b653211779a524cb50739ebb68abdc5196ab35182e356885f66e SHA512 03d3c6af77ac1a0c73eb8955f488dbb986bbc22bc1485ddb5fe8017cc50659be8708fd02c2c2c83d283c67c999390ab3c53daf7ef3f1c8ac693b17ca102a5df8
 DIST zeroize_derive-1.3.2.crate 10299 BLAKE2B 39cd21629ae91a3a80ec283c8a988be3559973b891c8ff9098dc78d2ccd8ac4352db3e52577fe6d560b2063f66d5e39cd77c9f24a01b7736fdb2d70f6dbc417d SHA512 3efcb9265a6bef7a752562ef9e3af1ccf28749afffdf1e21abf5baa51d5d761e10f77b9d655e69f26c587f2a0c412ddedf29776c2c66a9f69443a82d66c9da88
-EBUILD sequoia-sq-0.26.0.ebuild 8231 BLAKE2B 70c2ec86484aba0efbc74426e8fa5205f1307f71fa7bf524f8cbfaf16b0502fa62f6576359d2e534915fb320f3d6a7f726f9085e3389c1bfd62fdd75db7beb0b SHA512 e66ac11316705a8f01e9a88315607e32ef4ce0cb3ddf87955fc766aaafa279945be5674e0c2e6205e9d0be16546a60044bc7277ebc51a642b267de8e5b2f6d23
 EBUILD sequoia-sq-0.27.0.ebuild 8390 BLAKE2B 356c0d7d5eb35350bb2936ed0680f7aaf12f3ccad7ab6c997ead36503477d7b52ec58d6d0cc05bde82069cc314399b07b124ed66348036875a9aff5e2d930156 SHA512 967d360d541752ff1449e68cac11a44b46a9023a997e6be4206e8304104e5f82b60817694b360dcdeca6a9f399604a43e4c59d41472b818bdbe3ecca38591577
 MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
diff --git a/app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild b/app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild
deleted file mode 100644
index c9ab4003ba0d..000000000000
--- a/app-crypt/sequoia-sq/sequoia-sq-0.26.0.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Generate base ebuild via
-# cargo-ebuild ebuild --manifest-path sq/Cargo.toml --package-name sequoia-sq
-# and then extract contents of CRATES variable.
-
-EAPI=8
-
-CRATES="
-	addr2line-0.16.0
-	adler-1.0.2
-	aead-0.3.2
-	aes-0.6.0
-	aes-soft-0.6.4
-	aesni-0.10.0
-	aho-corasick-0.7.18
-	ansi_term-0.11.0
-	ansi_term-0.12.1
-	anyhow-1.0.44
-	ascii-canvas-3.0.0
-	assert_cmd-2.0.4
-	atty-0.2.14
-	autocfg-0.1.7
-	autocfg-1.0.1
-	backtrace-0.3.62
-	base64-0.13.0
-	bindgen-0.57.0
-	bit-set-0.5.2
-	bit-vec-0.6.3
-	bitflags-1.3.2
-	bitvec-0.20.4
-	block-buffer-0.7.3
-	block-buffer-0.9.0
-	block-modes-0.7.0
-	block-padding-0.1.5
-	block-padding-0.2.1
-	blowfish-0.7.0
-	bstr-0.2.17
-	bumpalo-3.8.0
-	byte-tools-0.3.1
-	byteorder-1.4.3
-	bytes-1.1.0
-	bzip2-0.4.3
-	bzip2-sys-0.1.11+1.0.8
-	capnp-0.13.6
-	capnp-futures-0.13.2
-	capnp-rpc-0.13.1
-	cast-0.2.7
-	cast5-0.9.0
-	cc-1.0.71
-	cexpr-0.4.0
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	chrono-0.4.19
-	chrono-tz-0.6.0
-	chrono-tz-build-0.0.2
-	cipher-0.2.5
-	clang-sys-1.2.2
-	clap-2.33.3
-	cmac-0.5.1
-	const-oid-0.5.2
-	core-foundation-0.9.2
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.1
-	crc32fast-1.2.1
-	criterion-0.3.5
-	criterion-plot-0.4.4
-	crossbeam-channel-0.5.1
-	crossbeam-deque-0.8.1
-	crossbeam-epoch-0.9.5
-	crossbeam-utils-0.8.5
-	crunchy-0.2.2
-	crypto-mac-0.10.1
-	crypto-mac-0.11.1
-	csv-1.1.6
-	csv-core-0.1.10
-	ctor-0.1.21
-	ctr-0.6.0
-	curve25519-dalek-3.2.0
-	dbl-0.3.1
-	der-0.3.5
-	des-0.6.0
-	deunicode-0.4.3
-	diff-0.1.12
-	difflib-0.4.0
-	digest-0.8.1
-	digest-0.9.0
-	dirs-2.0.2
-	dirs-next-2.0.0
-	dirs-sys-0.3.6
-	dirs-sys-next-0.1.2
-	doc-comment-0.3.3
-	dtoa-0.4.8
-	dyn-clone-1.0.4
-	eax-0.3.0
-	ecdsa-0.11.1
-	ed25519-1.2.0
-	ed25519-dalek-1.0.1
-	either-1.6.1
-	elliptic-curve-0.9.12
-	ena-0.14.0
-	fake-simd-0.1.2
-	fehler-1.0.0
-	fehler-macros-1.0.0
-	ff-0.9.0
-	file_diff-1.0.0
-	filetime-0.2.15
-	fixedbitset-0.2.0
-	flate2-1.0.22
-	float-cmp-0.9.0
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	form_urlencoded-1.0.1
-	fs2-0.4.3
-	funty-1.1.0
-	futures-0.3.17
-	futures-channel-0.3.17
-	futures-core-0.3.17
-	futures-executor-0.3.17
-	futures-io-0.3.17
-	futures-macro-0.3.17
-	futures-sink-0.3.17
-	futures-task-0.3.17
-	futures-util-0.3.17
-	generator-0.7.0
-	generic-array-0.12.4
-	generic-array-0.14.4
-	getopts-0.2.21
-	getrandom-0.1.16
-	getrandom-0.2.3
-	gimli-0.25.0
-	git-testament-0.2.0
-	git-testament-derive-0.1.12
-	glob-0.3.0
-	globset-0.4.8
-	globwalk-0.8.1
-	group-0.9.0
-	h2-0.3.7
-	half-1.8.2
-	hashbrown-0.11.2
-	heck-0.3.3
-	hermit-abi-0.1.19
-	hmac-0.11.0
-	http-0.2.5
-	http-body-0.4.4
-	httparse-1.5.1
-	httpdate-1.0.1
-	humansize-1.1.1
-	hyper-0.14.14
-	hyper-tls-0.5.0
-	idea-0.3.0
-	idna-0.2.3
-	ignore-0.4.18
-	indexmap-1.7.0
-	instant-0.1.12
-	itertools-0.8.2
-	itertools-0.9.0
-	itertools-0.10.1
-	itoa-0.4.8
-	js-sys-0.3.55
-	lalrpop-0.19.6
-	lalrpop-util-0.19.6
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	libc-0.2.105
-	libloading-0.7.1
-	libm-0.2.1
-	linked-hash-map-0.5.4
-	lock_api-0.4.5
-	log-0.4.14
-	loom-0.5.2
-	maplit-1.0.2
-	matchers-0.0.1
-	matches-0.1.9
-	md-5-0.9.1
-	memchr-2.4.1
-	memoffset-0.6.4
-	memsec-0.6.0
-	miniz_oxide-0.4.4
-	mio-0.7.14
-	miow-0.3.7
-	native-tls-0.2.8
-	nettle-7.0.2
-	nettle-sys-2.0.8
-	new_debug_unreachable-1.0.4
-	no-std-compat-0.4.1
-	nom-5.1.2
-	normalize-line-endings-0.3.0
-	ntapi-0.3.6
-	num-bigint-0.2.6
-	num-bigint-dig-0.6.1
-	num-integer-0.1.44
-	num-iter-0.1.42
-	num-traits-0.2.14
-	num_cpus-1.13.0
-	object-0.27.1
-	once_cell-1.8.0
-	oorandom-11.1.3
-	opaque-debug-0.2.3
-	opaque-debug-0.3.0
-	openssl-0.10.36
-	openssl-probe-0.1.4
-	openssl-sys-0.9.67
-	p256-0.8.1
-	pandoc-0.8.6
-	pandoc_ast-0.7.3
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	parse-zoneinfo-0.3.0
-	peeking_take_while-0.1.2
-	pem-0.8.3
-	percent-encoding-2.1.0
-	pest-2.1.3
-	pest_derive-2.1.0
-	pest_generator-2.1.3
-	pest_meta-2.1.3
-	petgraph-0.5.1
-	phf-0.10.0
-	phf_codegen-0.10.0
-	phf_generator-0.10.0
-	phf_shared-0.8.0
-	phf_shared-0.10.0
-	pico-args-0.4.2
-	pikchr-0.1.1
-	pin-project-lite-0.2.7
-	pin-utils-0.1.0
-	pkcs8-0.6.1
-	pkg-config-0.3.22
-	plotters-0.3.1
-	plotters-backend-0.3.2
-	plotters-svg-0.3.1
-	ppv-lite86-0.2.15
-	precomputed-hash-0.1.1
-	predicates-2.1.1
-	predicates-core-1.0.2
-	predicates-tree-1.0.4
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro-nested-0.1.7
-	proc-macro2-1.0.32
-	pulldown-cmark-0.8.0
-	quickcheck-1.0.3
-	quickcheck_macros-1.0.0
-	quote-1.0.10
-	radium-0.6.2
-	rand-0.7.3
-	rand-0.8.4
-	rand_chacha-0.2.2
-	rand_chacha-0.3.1
-	rand_core-0.5.1
-	rand_core-0.6.3
-	rand_hc-0.2.0
-	rand_hc-0.3.1
-	rayon-1.5.1
-	rayon-core-1.9.1
-	redox_syscall-0.2.10
-	redox_users-0.4.0
-	regex-1.5.4
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	remove_dir_all-0.5.3
-	remove_dir_all-0.7.0
-	ripemd160-0.9.1
-	roadmap-0.2.0
-	rpassword-5.0.1
-	rsa-0.3.0
-	rustc-demangle-0.1.21
-	rustc-hash-1.1.0
-	rustc_version-0.4.0
-	rustversion-1.0.5
-	ryu-1.0.5
-	same-file-1.0.6
-	schannel-0.1.19
-	scoped-tls-1.0.0
-	scopeguard-1.1.0
-	security-framework-2.4.2
-	security-framework-sys-2.4.2
-	semver-1.0.4
-	serde-1.0.130
-	serde-aux-2.3.0
-	serde_cbor-0.11.2
-	serde_derive-1.0.130
-	serde_json-1.0.68
-	serde_yaml-0.8.21
-	sha-1-0.8.2
-	sha-1-0.9.8
-	sha1collisiondetection-0.2.4
-	sha2-0.9.8
-	sharded-slab-0.1.4
-	shell-words-1.0.0
-	shlex-0.1.1
-	signature-1.3.2
-	simple_asn1-0.4.1
-	siphasher-0.3.7
-	slab-0.4.5
-	slug-0.1.4
-	smallvec-1.7.0
-	socket2-0.3.19
-	socket2-0.4.2
-	spin-0.5.2
-	spki-0.3.0
-	state-0.5.2
-	string_cache-0.8.2
-	strsim-0.8.0
-	structopt-0.3.25
-	structopt-derive-0.4.18
-	subplot-0.3.1
-	subplot-build-0.1.0
-	subplotlib-0.1.1
-	subplotlib-derive-0.1.0
-	subtle-2.4.1
-	syn-1.0.81
-	synstructure-0.12.6
-	tap-1.0.1
-	tempfile-3.2.0
-	tempfile-fast-0.3.4
-	tera-1.13.0
-	term-0.7.0
-	term_size-0.3.2
-	termtree-0.2.3
-	textwrap-0.11.0
-	thiserror-1.0.30
-	thiserror-impl-1.0.30
-	thread_local-1.1.3
-	time-0.1.43
-	tiny-keccak-2.0.2
-	tinytemplate-1.2.1
-	tinyvec-1.5.0
-	tinyvec_macros-0.1.0
-	tokio-1.14.0
-	tokio-macros-1.6.0
-	tokio-native-tls-0.3.0
-	tokio-util-0.6.8
-	tower-service-0.3.1
-	tracing-0.1.29
-	tracing-appender-0.1.2
-	tracing-attributes-0.1.18
-	tracing-core-0.1.21
-	tracing-log-0.1.2
-	tracing-serde-0.1.2
-	tracing-subscriber-0.2.25
-	try-lock-0.2.3
-	twofish-0.5.0
-	typenum-1.14.0
-	ucd-trie-0.1.3
-	uncased-0.9.6
-	unescape-0.1.0
-	unic-char-property-0.9.0
-	unic-char-range-0.9.0
-	unic-common-0.9.0
-	unic-segment-0.9.0
-	unic-ucd-segment-0.9.0
-	unic-ucd-version-0.9.0
-	unicase-2.6.0
-	unicode-bidi-0.3.7
-	unicode-normalization-0.1.19
-	unicode-segmentation-1.8.0
-	unicode-width-0.1.9
-	unicode-xid-0.2.2
-	url-2.2.2
-	vcpkg-0.2.15
-	vec_map-0.8.2
-	version_check-0.9.3
-	wait-timeout-0.2.0
-	walkdir-2.3.2
-	want-0.3.0
-	wasi-0.9.0+wasi-snapshot-preview1
-	wasi-0.10.2+wasi-snapshot-preview1
-	wasm-bindgen-0.2.78
-	wasm-bindgen-backend-0.2.78
-	wasm-bindgen-macro-0.2.78
-	wasm-bindgen-macro-support-0.2.78
-	wasm-bindgen-shared-0.2.78
-	web-sys-0.3.55
-	win-crypto-ng-0.4.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
-	wyz-0.2.0
-	x25519-dalek-1.1.1
-	xxhash-rust-0.8.2
-	yaml-rust-0.4.5
-	zbase32-0.1.2
-	zeroize-1.3.0
-	zeroize_derive-1.1.1
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="CLI of the Sequoia OpenPGP implementation"
-HOMEPAGE="https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia"
-
-SRC_URI="
-	https://gitlab.com/sequoia-pgp/sequoia/-/archive/sq/v${PV}/${PN}-v${PV}.tar.bz2
-	$(cargo_crate_uris)
-"
-
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 GPL-2 GPL-2+ GPL-3 GPL-3+ ISC LGPL-2+ LGPL-3 LGPL-3+ MIT MPL-2.0 Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-QA_FLAGS_IGNORED="usr/bin/sq"
-
-COMMON_DEPEND="
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	dev-libs/openssl:=
-"
-
-DEPEND="
-	sys-devel/clang
-	${COMMON_DEPEND}
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_compile() {
-	cd sq || die
-	# Setting CARGO_TARGET_DIR is required to have the build system
-	# create the bash and zsh completion files.
-	CARGO_TARGET_DIR="${S}/target" cargo_src_compile
-}
-
-src_test() {
-	cd sq || die
-	cargo_src_test
-}
-
-src_install() {
-	cargo_src_install --path sq
-
-	doman sq/man-sq-net-autocrypt/*
-
-	newbashcomp target/sq.bash sq
-
-	insinto /usr/share/zsh/site-functions
-	doins target/_sq
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins target/sq.fish
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index f09f1487e152..5cfa326e2484 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/recover-broken-vdb/Manifest b/app-portage/recover-broken-vdb/Manifest
index d86a6d54fb71..fd26c3f27a9d 100644
--- a/app-portage/recover-broken-vdb/Manifest
+++ b/app-portage/recover-broken-vdb/Manifest
@@ -1,4 +1,4 @@
 DIST recover-broken-vdb-1.0.0.tar.gz 15723 BLAKE2B a2c39f64f1db3c0cb1e285deb37654575f35fbdd419b5eaabef52293299e70d98cf7804654f596655fb68beff88699cb9f87628ea29ffd1a29cf2893589f9508 SHA512 4a6428b65c33be4128936423c6770f6af9574fe6caef90837a7d9a1d62d4a595c798b29021f81df4dcd39db4e086abb18f256345f2a8f1e0e7c6687863dea092
-EBUILD recover-broken-vdb-1.0.0.ebuild 964 BLAKE2B 92ef03ff5a332139c8927d64c4e1220daeb5cd5a21861933d13a10d7badaa67350fedfdd0898f17303f7616a45d8499d3efe621bd1a851e5421c893dfe2f5736 SHA512 0b066644397306a527eca59b998d45de1e8a36e8a1f9857e88d0b31720a21e15b528140192412e76da8691dc795bd98704558d3cf29da021979fb1bdfc043e20
-EBUILD recover-broken-vdb-9999.ebuild 972 BLAKE2B 306c767a94c17e3a943fedd7c72eab00578b68ae671d59c6597c9f26eac9a1b92c77cc50d776cdbffb6b8ad2acf4f26b08e0c10d5f6f40c0cc5d0acca8f71951 SHA512 6bc0864b42ef78c3eeabc7bf04e5715d5c3c1cfdf737eef2301746b741909e1eb716b2926f1417c8a299829410e6d953bbc8ad9cf1d8897da96c3bf8cd5c3ece
+EBUILD recover-broken-vdb-1.0.0-r1.ebuild 959 BLAKE2B 29b9168340e1449faf3aabd99adb2bfd0d3751cae1abeb48d433b8c35aad0cac2549368deb9c012957ca9bec0c7d7709b78b2a0b199d6150964e457de77e06d5 SHA512 3a790517f5bcde2ed058eca70a2dd0f171be8355ca491c6d0e4c41b5899a003f6900e2bb6bf7ace7bbe02b2e6984ab1d45751811c810b0931de7da21a43d8c34
+EBUILD recover-broken-vdb-9999.ebuild 967 BLAKE2B 42c8f1b70109674e14b0e0babb3f8c3e9a0434fc8d5211e7be91668dde60f454d0f15bb323c9dca5e6f503985ac36bbc564ea65e273b7df021a520bc928b7803 SHA512 ff95cea42b91de134503f62c40075cf40415b57e3a4dd38e5581e7d7f29d3d810c75cf3ab125d22342ded1c76cda4717d31f811c782a3d0fde476593c25bf3e7
 MISC metadata.xml 542 BLAKE2B c65008fabc6fcf791a935f514a218eebff103d0ce07290b84c545d1551ad8f7834b2245299081bb97c659280670bd2b4b252dbe328a0df946ae29c9110f34fc3 SHA512 dda7cb383905a922852267329a6a848f3e1c19c0fa0a97952dff0995192d00bf227722415194514edc778bd68a1634efdee1ab89cc8b0ce2e9433b8420d478a4
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0-r1.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..090365bd9c15
--- /dev/null
+++ b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
+HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
+else
+	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Require latest version of pax-utils to avoid users breaking their systems again
+# The tool itself works fine with older versions
+RDEPEND="
+	>=app-misc/pax-utils-1.3.3
+	sys-apps/file
+	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')
+"
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
deleted file mode 100644
index 1aa783fa8e1b..000000000000
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Check Portage's VDB for internal inconsistency on ELF metadata"
-HOMEPAGE="https://github.com/thesamesam/recover-broken-vdb"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
-else
-	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Require latest version of pax-utils to avoid users breaking their systems again
-# The tool itself works fine with older versions
-RDEPEND=">=app-misc/pax-utils-1.3.3
-	sys-apps/file
-	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild
index 6bf736875162..6577b6801c54 100644
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild
+++ b/app-portage/recover-broken-vdb/recover-broken-vdb-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
@@ -24,6 +24,8 @@ SLOT="0"
 
 # Require latest version of pax-utils to avoid users breaking their systems again
 # The tool itself works fine with older versions
-RDEPEND=">=app-misc/pax-utils-1.3.3
+RDEPEND="
+	>=app-misc/pax-utils-1.3.3
 	sys-apps/file
-	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')"
+	$(python_gen_cond_dep 'sys-apps/portage[${PYTHON_USEDEP}]')
+"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 43ba86e26463..041e46c8ce9f 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/jarowinkler-cpp/Manifest b/dev-cpp/jarowinkler-cpp/Manifest
new file mode 100644
index 000000000000..cdae75728102
--- /dev/null
+++ b/dev-cpp/jarowinkler-cpp/Manifest
@@ -0,0 +1,3 @@
+DIST jarowinkler-cpp-1.0.2.gh.tar.gz 10375 BLAKE2B e55f6e72ea66e553c047bfd2df8d4337430292391138595cd148686bc79a326e195cd55d81fe3b46aa41e7a852c0ea8bfb5891e6207ed3af538eea7597accd5a SHA512 8eeae55ff64dcc434dd8f8d33c03c9b9c828f54cd6a6a028e376763036e445fa6db81b5a9a19d84d023c6bf3968223c3f9a9e4220feb6f537e9c1b2c4f21cb11
+EBUILD jarowinkler-cpp-1.0.2.ebuild 569 BLAKE2B 99e0c790bee9d57e25846feea59706173c150f6a105113e06472ddd186a4fcc78d3c9688549fa528a72852eb5524a17fca0d07ed6bdc2e3f38600fe7e0f0e203 SHA512 124ac77c53a7d0d62f2a62447b463237a9a3a627aa89128627f545da0e5db564864ad8c1f92a3aa480f5dace49462d48eb4ff1f61a2977df8a9135affd86a802
+MISC metadata.xml 340 BLAKE2B d2d874a171c2e5170d48a31e0d95110996d73f566f19bc9f4aaca9094d996e206d29266a4083f9a74673c5399ed8a5294d293ae498046dd61c8ccbe08249f2c6 SHA512 d9feb8a9e4328e16a25d83164516a7a4f271bf81a07e375f6906e7f18773663106d0fcd8cf16759b3b73a75486ca989210d4951e093c4ad95b82012921c76f58
diff --git a/dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild b/dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild
new file mode 100644
index 000000000000..43f5ed39f112
--- /dev/null
+++ b/dev-cpp/jarowinkler-cpp/jarowinkler-cpp-1.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Fast Jaro and Jaro Winkler distance"
+HOMEPAGE="https://github.com/maxbachmann/jarowinkler-cpp/"
+SRC_URI="
+	https://github.com/maxbachmann/jarowinkler-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		>=dev-cpp/catch-3
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DJARO_WINKLER_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/jarowinkler-cpp/metadata.xml b/dev-cpp/jarowinkler-cpp/metadata.xml
new file mode 100644
index 000000000000..8006795ac5b2
--- /dev/null
+++ b/dev-cpp/jarowinkler-cpp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">maxbachmann/jarowinkler-cpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
new file mode 100644
index 000000000000..afac94827977
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -0,0 +1,3 @@
+DIST rapidfuzz-cpp-1.6.0.gh.tar.gz 250024 BLAKE2B 96d70680bb9b3c3e053b385845b543f69bb4215c6be92df6b7e61559cfa0f072833a13ceadf24f73531e848517864461cd696504584ea3a489d37e56c0a03c3b SHA512 ba319af67428a96df406b10b11eafa4c73762f0916d2ac4ac2860f1a25a97fc9e4e3a69c8633c8fed8ef76a0c4a8e073bc16048bde111782d0e8f00e396a4df9
+EBUILD rapidfuzz-cpp-1.6.0.ebuild 825 BLAKE2B b4323c2873210fe0bd3ed5fdd79d45fa552f2e9c48bea3144c98dc4a2e9cc52119b4b16926d08a8a12d0c92f89d2598662da22a4d4130192e5c40958e9000289 SHA512 bcb6ff63843c3e50ad6c80cee4b2c94a98c96946fee0970ca1997a1185c0587e5f87e88c6051803813791f1f9537f9e4927f3903e5974954b1485939c4198998
+MISC metadata.xml 338 BLAKE2B 43c0cb99a03961ca48146b237a22fbf56c90312b7a39b57a3d01dd532f4f01891e713c802b372b4efb0af528198d8f2c0febae6ffec65da152e8e23f7a67b8a4 SHA512 a54d78c951d15319a2e467dc5d5692d9af5ef9e79c9c9135ee5e26853361ec6bcfebab8e82e3299314f9b7c8cd703365ff6d144e7e6876f486ca5f3a02a3b0f7
diff --git a/dev-cpp/rapidfuzz-cpp/metadata.xml b/dev-cpp/rapidfuzz-cpp/metadata.xml
new file mode 100644
index 000000000000..b69c1750aa36
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">maxbachmann/rapidfuzz-cpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild
new file mode 100644
index 000000000000..99e66055cc0f
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
+SRC_URI="
+	https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-3
+	)
+"
+
+src_prepare() {
+	# apparently "C++ best practices" don't mind fetching random stuff
+	# at build time
+	sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die
+	find -name 'CMakeLists.txt' -exec \
+		sed -i -e 's:project_warnings::' {} + || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 35103adcc738..74e902436d50 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index ef988e058175..e4579ff74059 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,3 +1,5 @@
 DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
+DIST gson-parent-2.9.1.tar.gz 359012 BLAKE2B e0a0d6e517e7323a508d7aa6cb26e39aad4a3c479b479ae7b075d3cb47c0312294eb074ed52f1fbbec5de301341dac7f5d742913498205f0544a53da0c0eb1a1 SHA512 928a17491efc9866271f08d4ec0fc22b96b4b6f4827d86679cd4a9085e91fbf6b1b4d6618d380ff63e7a9922d9cf0ec7ba9cd073862e7e212eb31c0140c6b6ad
 EBUILD gson-2.9.0-r2.ebuild 2056 BLAKE2B 7e7f9c4f49c6a38f22aa071b0a79adc7e8b995833707d0aebe019f7e200ef9f2de245cb848307460bcf50ea391b044b75e0e53496ce058ac188aafd873c8e20b SHA512 b6bda86b5b96bcd96e9b9260916b01f01895cfd04e835ff96c8cb66c2b1e9740601e5eea5f62b7eb9b30b943eba5e626697de66f3ab2f6352f23f280ce5951ed
+EBUILD gson-2.9.1.ebuild 2040 BLAKE2B ee59a52d3b3f19cc1a655fb0d5096a037bb337f5591eec2dff8e647a11824cf764f0d2197cbb2f6f023abc77a613d5246a5a1c5dbc732bc158028db968a17010 SHA512 36f3e4226cb1236ed728c09158fc8c4685e125ff09d2ac7ea2431da1a2f18a4e7d686c5683aaf0fb04e87960edc4cf05318a8d92d38086677889df1961fc4253
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.9.1.ebuild b/dev-java/gson/gson-2.9.1.ebuild
new file mode 100644
index 000000000000..db9194478d17
--- /dev/null
+++ b/dev-java/gson/gson-2.9.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.9.1.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.code.gson:gson:2.9.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Gson JSON library"
+HOMEPAGE="https://github.com/google/gson"
+SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.6"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/gson-gson-parent-${PV}/gson"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-templates"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# requires the test class to be obfuscated using proguard which we do not have atm
+	"com.google.gson.functional.EnumWithObfuscatedTest"
+	# FAILURES!!!
+	# Tests run: 1135,  Failures: 3
+	# testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
+	# junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
+	"com.google.gson.regression.OSGiTest"
+	# testSerializeInternalImplementationObject(com.google.gson.functional.ReflectionAccessTest)
+	# java.lang.IllegalStateException: Expected BEGIN_ARRAY but was BEGIN_OBJECT at line 1 column 2 path $
+	"com.google.gson.functional.ReflectionAccessTest"
+)
+
+src_prepare() {
+	default
+	sed -e "s/\${project.version}/${PV}/g" \
+		-i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \
+			|| die "Failed to set version"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge "17" ; then
+		JAVA_TEST_EXCLUDES+=( "com.google.gson.internal.bind.DefaultDateTypeAdapterTest" )
+	fi
+}
diff --git a/dev-java/jakarta-json-api/Manifest b/dev-java/jakarta-json-api/Manifest
index a55631f89e11..dbdc0a6bf170 100644
--- a/dev-java/jakarta-json-api/Manifest
+++ b/dev-java/jakarta-json-api/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-json-api-1.1.6.tar.gz 205455 BLAKE2B d928c0fbf65da992670eea0ad5a010b536ba6619b2d981a7fb02cf4cd05f00120f84dc0e19bbb4ee415de06d0c715a1e6736d11f2e1d3d8cc262f496319e389e SHA512 107fd6e48a3b3693a3019726cbe398ff7640896ffc7eac05bccee168f45be2c91baa1b673684006a3147716c274b11f1e44314b4d8fe89fbf124117fde26da1a
-EBUILD jakarta-json-api-1.1.6.ebuild 916 BLAKE2B d0c576304b863523e215ad88bd9a6d58def633093afdf65fad1b9252b016edf37d500534afc5f12d6c78d61d8a5c226a161b1dc468940230f38399b3a2c06b0c SHA512 5338612b055fd695b1e82e134daa63a69e087acdf4a04398227b05a26b11dbc5f214ef9b09a261b8a80183f9fbcec90b2f4198199cf78e2d1949754cdccacab4
+EBUILD jakarta-json-api-1.1.6-r1.ebuild 803 BLAKE2B 9c3a651f08fc3ed2d97bb22992b66c2244ad67538ab380b4ae0383c44814f5d379d8a6c3c34bbd28017d29262e79f4f49f704283f5b6a465c2358cfca7020b78 SHA512 6ae0cb7747ee871e2092c8aee10478619042015a9c592937cb7b75922f3b818d249adaec8ed87f98f12f802e2c821e3c0f9e47b84ddfdf65672a9e8ebb559726
 MISC metadata.xml 320 BLAKE2B 7122c677970180a1bf5faa715f1a4887df4692673cb4dfb0df9538e36f645e89b64fb3374a854cad50e2d2a0965ee97eaaafbc20f6526397a035e9182979ac19 SHA512 3fc26e2503653efab9e6724b7947fc01ec8d23934f3c9455dc55e731f88546844cd7aebdcd696c7bdf62bd3f05094fb35aad03c38078a1824c6031f26877a240
diff --git a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..81ff7a0206e8
--- /dev/null
+++ b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.json:jakarta.json-api:1.1.6"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="jsonp"
+MY_PV="1.1-${PV}-RELEASE"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JSR 374 (JSON Processing) API"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jsonp"
+SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( EPL-2.0 GPL-2-with-classpath-exception )"
+# Since version 2.0.0, the namespace has changed to jakarta.json
+SLOT="1"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="api/src/main"
+
+DOCS=( CONTRIBUTING.md NOTICE.md README.md )
diff --git a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild
deleted file mode 100644
index d8ca5b27516a..000000000000
--- a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="jakarta.json:jakarta.json-api:1.1.6"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="jsonp"
-MY_PV="1.1-${PV}-RELEASE"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="JSR 374 (JSON Processing) API"
-HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jsonp"
-SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( EPL-2.0 GPL-2-with-classpath-exception )"
-# Since version 2.0.0, the namespace has changed to jakarta.json
-SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_SRC_DIR="api/src/main"
-
-DOCS=( CONTRIBUTING.md NOTICE.md README.md )
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 97f79732b0ec..08ec48ae421a 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/jarowinkler/Manifest b/dev-python/jarowinkler/Manifest
index 03d430929f9a..f166384ebd35 100644
--- a/dev-python/jarowinkler/Manifest
+++ b/dev-python/jarowinkler/Manifest
@@ -1,3 +1,3 @@
 DIST jarowinkler-1.2.1.tar.gz 85696 BLAKE2B 4e9c4dd4160a80fa600ae57c7cc97abd794bb0a49881137ed3f69c03549268bbf71dc410b86f8bd782b92df4eac63738ebd32dd716d682a0ce8aaaf039a38f61 SHA512 1337a5f67e54a0c0990dde7fc631c263b63c64c7dbefae82579842a639a85ea7214185489d56b6e2be5a6362773fbaea29a958f62dbfa270beefba516c325654
-EBUILD jarowinkler-1.2.1.ebuild 419 BLAKE2B 7063c9bbd412368b7bf992d6760032e4d02273f2776aedefc39d6b2aba37974f4625b43ac8b1938a64a1a5850d1dc9dd32fa7e701f37da48881d5eaae915a75a SHA512 e3f9682bd5c0774fd8a48a22637f9e041f4fe8f1f8913d99f5e16e1eea549f2d87eb1c0921e7d11d73fed53f13eb97bf8cf9b462dec995227ada31c16aa5a5c9
-MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
+EBUILD jarowinkler-1.2.1.ebuild 813 BLAKE2B 897d354dba6889e38ad14d68c23b5396f58188651998c7def84b530702e549f3c4aac97273e246f47973bcfa2226f93ef2a2e49949f6c10307adb56c1a466c5d SHA512 684e08ca81311c12cd3c9d5ec9943cc15b426ac3e2a4306e13213580215287d56ee05c56730d95f6688505212476b37219aa7bc6a73b1ecfe57c997467261a7e
+MISC metadata.xml 378 BLAKE2B cab755442b4916aff192b1510608c613e7b9e71258c5fa5d4beeee509384d83ebb798b4149db2458b7449942502c9bb45bd286a252fb9501251f92334f8b70c9 SHA512 334c4fe6aa31d180a227c828ffda309a9c1892eca69f414f5e6dbb8ba33a496e319701e3c8c72e955c0a1401b8e9d49bf44702537447282e683789138e170ba1
diff --git a/dev-python/jarowinkler/jarowinkler-1.2.1.ebuild b/dev-python/jarowinkler/jarowinkler-1.2.1.ebuild
index 47752e66cc05..3aaf6a9b002b 100644
--- a/dev-python/jarowinkler/jarowinkler-1.2.1.ebuild
+++ b/dev-python/jarowinkler/jarowinkler-1.2.1.ebuild
@@ -1,17 +1,39 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-DESCRIPTION="String matching in Python using various string metrics"
-HOMEPAGE="https://github.com/maxbachmann/JaroWinkler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+DESCRIPTION="Fast fuzzy string matching using Jaro and Jaro-Winkler similarity"
+HOMEPAGE="
+	https://github.com/maxbachmann/JaroWinkler/
+	https://pypi.org/project/jarowinkler/
+"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-distutils_enable_tests setup.py
+DEPEND="
+	dev-cpp/jarowinkler-cpp
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export JAROWINKLER_BUILD_EXTENSION=1
diff --git a/dev-python/jarowinkler/metadata.xml b/dev-python/jarowinkler/metadata.xml
index 572c7daf2ccf..8e8cec6dbf6f 100644
--- a/dev-python/jarowinkler/metadata.xml
+++ b/dev-python/jarowinkler/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pacho@gentoo.org</email>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">maxbachmann/JaroWinkler</remote-id>
+		<remote-id type="pypi">jarowinkler</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
index 65dd6f2f32ac..ae9a22038a64 100644
--- a/dev-python/pendulum/Manifest
+++ b/dev-python/pendulum/Manifest
@@ -1,3 +1,3 @@
-DIST pendulum-2.1.2.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
-EBUILD pendulum-2.1.2-r1.ebuild 763 BLAKE2B 73f364e9cac88250bbfe2bde5d66d0b3dbad909d82e5915659bb08ce3740e3429c39afb5e9aceb59b90a0cc2d213caa9d5176e7864a4f8cde2d7dcc1ac1793ef SHA512 6ebfeb1132d9978f70a1070a5adeb1077f185019e0509349dc39741639df01ee1669748ee08560aaf84aaac6e78db7149f04a8a284f4bac23e2f8865b797e1df
+DIST pendulum-2.1.2.gh.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
+EBUILD pendulum-2.1.2-r2.ebuild 805 BLAKE2B 86286f59300cf275049b6c001b6eb7a47f6365f5fa1f5ba8644614361176dff3fabfcae91602396f59b847b9a9d1063ef2df0cb9f1edddaecadc087dd9676ab7 SHA512 ea465f79250be6b91b1341e0d7d66b851802bdd53f2457d265f4f7fac76905639094aa52413d601b5b7a5ba29b99e80ed2ec66622e49c4ee53dc1de349360e19
 MISC metadata.xml 414 BLAKE2B 5f77b163192f5fd8ec655fe630948c160f8e31017cc78527fa379b7e6afab44fe51ed6b0acf2188d82cc4804f6377872646076e3bfb3362e4a5a46ca62acb058 SHA512 32aa44b3f154c7bf634244963e28d196fc629ba2415bd60ed66339a664075a0db8c31f093f13ac268b551d260e6c05220eceacff8d0f784b52e1fa62e71cacaf
diff --git a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
deleted file mode 100644
index 602bea9a4764..000000000000
--- a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for the standard datetime class"
-HOMEPAGE="https://pendulum.eustace.io/ https://github.com/sdispater/pendulum"
-SRC_URI="https://github.com/sdispater/pendulum/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytzdata[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pendulum/pendulum-2.1.2-r2.ebuild b/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
new file mode 100644
index 000000000000..8ed0456d4293
--- /dev/null
+++ b/dev-python/pendulum/pendulum-2.1.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for the standard datetime class"
+HOMEPAGE="
+	https://pendulum.eustace.io/
+	https://github.com/sdispater/pendulum/
+	https://pypi.org/project/pendulum/
+"
+SRC_URI="
+	https://github.com/sdispater/pendulum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+DEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytzdata[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytzdata/Manifest b/dev-python/pytzdata/Manifest
index 5e1f5d050f13..a8e9306ec2b2 100644
--- a/dev-python/pytzdata/Manifest
+++ b/dev-python/pytzdata/Manifest
@@ -1,4 +1,4 @@
 AUX pytzdata-2020.1-system-zoneinfo.patch 3482 BLAKE2B 26c62593303e02d4037aba6e7b4ec7645610f3e73eadef9fcf483db5567e31d407efe92859d4157e672ce9683d135c2fcf2e63d427898d8bab1b0ead8db09299 SHA512 707afdd4bff5fb70f3bc4e20c88a1962f3fd56c15b3ff3e5896446d1eff55aaceefd53509fef1b4941d797e2c2aea41b72a87276fa64e562ad71609fa717a78e
-DIST pytzdata-2020.1.tar.gz 249045 BLAKE2B 6f07a7577edc87030fd70e720b32146e9044a8c6f74d0bafb9239ad666d0d6fd0ac7c3cca070914701af301b1a3368ace2985f8169b9747937fa6ed066be7302 SHA512 fd154bfbe90ce07a90f769063b772234036d2627c1e6d78a465d9ddbc894e50cb9d821c04ebff1a7cc6a327266f7843fe54e5592d37c41db023329d6e0f668c2
-EBUILD pytzdata-2020.1-r1.ebuild 597 BLAKE2B 95aff29b6e118ea5d7b4b01258ed43e16077768beabe3852253218d2ecedf353674a1acf8fe48560088ac61028645bd3e76092e8a962fef3ca18152e6bef8b65 SHA512 792134adf5178151260f68bc4469a2ea45472d7007ea41cf452e81dc9b857b42a90e67150409120e0a683a066853e094e1a6377953c53224781b8d696d7c06a1
+DIST pytzdata-2020.1.gh.tar.gz 249045 BLAKE2B 6f07a7577edc87030fd70e720b32146e9044a8c6f74d0bafb9239ad666d0d6fd0ac7c3cca070914701af301b1a3368ace2985f8169b9747937fa6ed066be7302 SHA512 fd154bfbe90ce07a90f769063b772234036d2627c1e6d78a465d9ddbc894e50cb9d821c04ebff1a7cc6a327266f7843fe54e5592d37c41db023329d6e0f668c2
+EBUILD pytzdata-2020.1-r2.ebuild 637 BLAKE2B 71a4cbcf1a12837e8a9c3a197ab855e689015784be36d54910c4a7e258bcee6adebb0e38c5c5041144700f90b9038e044872dd3b5f56cad98aaf85e68d95ad26 SHA512 05755f3f15467684cd75f21a30c2d90f52af8c5184b506ad3a9af5a4734cd01213258df3e3f6f8b970c7b2c2cf7daddaccd016aa4f378c73d4c9aa043c99e88d
 MISC metadata.xml 414 BLAKE2B 4b6e7f935a42ed815b92d7fec75b4db6fd3fa46386b5055462bb317bb6ac8526e3a965c803d6e207382ec396bc132d514ef083af91c9ac45ad2eaf67998b0b9e SHA512 80c0e415716770a0f18bd237e9039f72bdab0056c11e98ad2359431b14d0b239ae7a88840d774aa6d3b390fbc86bcf30e42a4981e52acda8e99666219982f445
diff --git a/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild b/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild
deleted file mode 100644
index 56781a4e3dd0..000000000000
--- a/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The Olson timezone database for Python"
-HOMEPAGE="https://github.com/sdispater/pytzdata"
-SRC_URI="https://github.com/sdispater/pytzdata/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/cleo[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pytzdata-2020.1-system-zoneinfo.patch
-)
diff --git a/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild b/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild
new file mode 100644
index 000000000000..b6682c88963b
--- /dev/null
+++ b/dev-python/pytzdata/pytzdata-2020.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="The Olson timezone database for Python"
+HOMEPAGE="
+	https://github.com/sdispater/pytzdata/
+	https://pypi.org/project/pytzdata/
+"
+SRC_URI="
+	https://github.com/sdispater/pytzdata/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cleo[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/pytzdata-2020.1-system-zoneinfo.patch
+)
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 67a6178a7fc4..623547bf1b7d 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,3 +1,4 @@
+AUX rapidfuzz-2.9.0-test-pandas.patch 1153 BLAKE2B a4f707ed63fc73199c29e9b9f63d9e02a4eb2b4ebefe3a40b72ce4133221f19f0b0b0eed59f07fa15996bda16a826df042eed3399681ed3efe7dde63bb3aaceb SHA512 1bf18ba7fad414c31a254429b47a2a2ac84fb63a7f3898f376bff4396dd1c6fba0eb8c408b735e869f8cd34e9fedaec37056171408a5904f272cb5147dd20b5e
 DIST rapidfuzz-2.9.0.tar.gz 780939 BLAKE2B c43dfd89d18dc1f5b4738930f1d0d9c4956f66479217b4400844b50636e2b0bb13f15d8b9a6edc0ce30fc943f35a44dad802ecf90107556ed2dee7f70fcc16ac SHA512 b8f83cc35e84a4ed95e2086eb7bfbc6e7e2e25a05accc965092b8b51012c79e86e2af15397577bb91aadfa9a257a62d6f3d6bb9bf928a9c767d53468904a12be
-EBUILD rapidfuzz-2.9.0.ebuild 529 BLAKE2B 6cded32992abdbfe9d50d1497ed654af473eb9edf46653276896d8e4454d4e14bd93cede44337c62066b9414b6ac8545326b3c44382d4b429f196996198f8d0f SHA512 6bdcf73f21d54da39940ae7f6d45fdb9d724e33f27a26996084d35b7511b8931ff00d4d5a166908459fa0ad29550a7bd88ed52f428112e38152cdbb37d75d623
-MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
+EBUILD rapidfuzz-2.9.0.ebuild 1001 BLAKE2B 7cc7a0f50c4b2daac35dd56bf79eeccd7e008a078c59a8602a833c9a9444488248008368a9a12290d40d3ccbac15b6d9a7518ce438b24e87cf11c16aa305f692 SHA512 402e8462fe135782d7e1090c5baff84b1a42688fb1a154781f99dcc25fc78df79533c7a84afa60731ed7f5b2859b4adacf388c4e5838105f265594d236fbf68f
+MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch b/dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch
new file mode 100644
index 000000000000..fa73c8f3ef3b
--- /dev/null
+++ b/dev-python/rapidfuzz/files/rapidfuzz-2.9.0-test-pandas.patch
@@ -0,0 +1,35 @@
+From 1df09fb54c466efddfc62ed630fddd5fb34cab3f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 18 Sep 2022 15:37:39 +0200
+Subject: [PATCH] tests: handle missing pandas gracefully
+
+Pandas is not yet ready for Python 3.11.  Use pytest.importorskip()
+to skip that one regression test that requires it when it's not
+available to unblock rapidfuzz on py3.11 on Gentoo.
+---
+ tests/test_process.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_process.py b/tests/test_process.py
+index ca5afee..b786d2d 100644
+--- a/tests/test_process.py
++++ b/tests/test_process.py
+@@ -5,7 +5,6 @@ import unittest
+ import pytest
+ 
+ from rapidfuzz import process_py, process_cpp, fuzz
+-import pandas as pd
+ 
+ 
+ class process:
+@@ -298,6 +297,7 @@ class ProcessTest(unittest.TestCase):
+ 
+     def testIssue81(self):
+         # this mostly tests whether this segfaults due to incorrect ref counting
++        pd = pytest.importorskip("pandas")
+         choices = pd.Series(
+             ["test color brightness", "test lemon", "test lavender"],
+             index=[67478, 67479, 67480],
+-- 
+2.37.3
+
diff --git a/dev-python/rapidfuzz/metadata.xml b/dev-python/rapidfuzz/metadata.xml
index 572c7daf2ccf..91cac0023d89 100644
--- a/dev-python/rapidfuzz/metadata.xml
+++ b/dev-python/rapidfuzz/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pacho@gentoo.org</email>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">maxbachmann/RapidFuzz</remote-id>
+		<remote-id type="pypi">rapidfuzz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
index 22ed8a87143e..d61dc5c429e4 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.9.0.ebuild
@@ -1,22 +1,47 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-DESCRIPTION="String matching in Python using various string metrics"
-HOMEPAGE="https://github.com/maxbachmann/rapidfuzz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
+HOMEPAGE="
+	https://github.com/maxbachmann/RapidFuzz/
+	https://pypi.org/project/rapidfuzz/
+"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
+RDEPEND="
+	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
+"
+# all these are header-only libraries
+DEPEND="
+	>=dev-cpp/taskflow-3.0.0
+	>=dev-cpp/jarowinkler-cpp-1.0.0
+	>=dev-cpp/rapidfuzz-cpp-1.0.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
 BDEPEND="
-	>=dev-python/jarowinkler-1.2.0[${PYTHON_USEDEP}]
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
-RESTRICT="test" # Tests need network connection
-#distutils_enable_tests setup.py
+distutils_enable_tests pytest
+
+export RAPIDFUZZ_BUILD_EXTENSION=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-pandas.patch
+)
diff --git a/dev-python/rapidfuzz_capi/Manifest b/dev-python/rapidfuzz_capi/Manifest
new file mode 100644
index 000000000000..5211743d9082
--- /dev/null
+++ b/dev-python/rapidfuzz_capi/Manifest
@@ -0,0 +1,3 @@
+DIST rapidfuzz_capi-1.0.5.gh.tar.gz 5908 BLAKE2B a5f3c27c2292800527f0e0558e0f25525c2865a6348fbbe36da8d5a96e5524c68154bfba8dbfc3c174f759dde14a95c64e47dd6669166beb035bd1126741569b SHA512 b62c6fdd0e5d0804f7c1ef6f6b5e007afd8439720071fbdf1440232c62925e794a6ae33774a33ef745ebbd4ef956a85d2bf60934a7d568d39d1e590467f26bcf
+EBUILD rapidfuzz_capi-1.0.5.ebuild 515 BLAKE2B 18abe0ac4cf47616c8bc46f4a9b26f26764301a4378082884727f6c828f3f43d32c741c5a80c3953b2fd9c45dd3eec8f690cdf69293e96d8545b4abf3134900e SHA512 dc24ce1bbd8e262f8d6bbfa6dd91212c5008f3ee4a90b758bb1f49bb41ab575c042f42e19fa89183dfaec8d2281d1001178d428df43632e57ea568af99260464
+MISC metadata.xml 408 BLAKE2B ef5cb671e756eccc17d4bbbd4aa4c3fc0ac5931994750659ee9a6746bfbcbe5e3d283764749531fa2d7e46afc8eb14acc234f15f539ad0d1b7186b56ccff0a84 SHA512 fa723a5d815999bb2f0e12369aeb64726164adda4c89f2ed8b1136985f3843a9cb62a6250f7fea811e45c1ee1a3aae3d7911954955b8f32bda3af9f976bc6650
diff --git a/dev-python/rapidfuzz_capi/metadata.xml b/dev-python/rapidfuzz_capi/metadata.xml
new file mode 100644
index 000000000000..43ddd18c41eb
--- /dev/null
+++ b/dev-python/rapidfuzz_capi/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">maxbachmann/rapidfuzz_capi</remote-id>
+		<remote-id type="pypi">rapidfuzz-capi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
new file mode 100644
index 000000000000..89c0f91f964c
--- /dev/null
+++ b/dev-python/rapidfuzz_capi/rapidfuzz_capi-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="C-API of RapidFuzz, which can be used to extend RapidFuzz"
+HOMEPAGE="
+	https://github.com/maxbachmann/rapidfuzz_capi/
+	https://pypi.org/project/rapidfuzz-capi/
+"
+SRC_URI="
+	https://github.com/maxbachmann/rapidfuzz_capi/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index e3668785d313..87351bf97ef8 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,3 +1,3 @@
 DIST simpleeval-0.9.12.tar.gz 22693 BLAKE2B 6c0b08859df8b7b55970d0d2a96d2b58a98c9bf43efed4952c7f0220594b1aa531398e881b9fa41caf40d2bd8d5d2e615c4da724a2850ddc05f9bfbda52c8841 SHA512 9b00bfd13a7c7bd05c1c68c43dcd2b52abe0ea648d640780a05499c95ff96bb4366add1d92086ec7e840075fcbff692e133ddbf4c2b8497dd80e115c24367641
-EBUILD simpleeval-0.9.12.ebuild 451 BLAKE2B db904a3f3e2f3ec44966220cf2144956ffd421f9f1a9cbc7a943e347b33a45c679b187b28a2babb4b0a0c47aebdab1023e6e9d96cd791b3451ebcc8faa383d2c SHA512 59e34834f9e968172a3706447ad2679e696fd71e91fe3bc7a93e051d2d08b54a814398e7d8ce89fb18a54257c017e1b2e6e38cfadd826be0b010d852ce039742
+EBUILD simpleeval-0.9.12-r1.ebuild 492 BLAKE2B 21ca7c387b64e239d24bbd265c4593d8412b7ad6d5e1127ab5e386620820324a19e8dc44e59e89be6a495fb7fa6bbaa2c22c3ec62dc5bf264b1078a91b8f2c0f SHA512 1945b34bd333741c454f7d6e23383c31d039ab943b6ac76606c9b92cfa54dd3a2fc2d97e85b4573110bb42c46b5bda6dd23082eb87fa70903169b7a59bc05ba5
 MISC metadata.xml 506 BLAKE2B 697e9acab14f80458e539abe119b70a47f4b97ff3e8e88cfc5b071a4403d80ed637976a2428512bcd6570ee37aad12cbf853b87988262548c09670c31dd7c970 SHA512 be74df1cba2c5c7684d767a229eed2f641747abee58f421ad437c33d40ebd55b360e7bee162a9464ea4443afc4de03c7dbc9c7db35c832f6cd531dcd151aa796
diff --git a/dev-python/simpleeval/simpleeval-0.9.12-r1.ebuild b/dev-python/simpleeval/simpleeval-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..1d313bbbaa4d
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-0.9.12-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, safe single expression evaluator library"
+HOMEPAGE="
+	https://github.com/danthedeckie/simpleeval/
+	https://pypi.org/project/simpleeval/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/simpleeval/simpleeval-0.9.12.ebuild b/dev-python/simpleeval/simpleeval-0.9.12.ebuild
deleted file mode 100644
index 3d8806ea1a9f..000000000000
--- a/dev-python/simpleeval/simpleeval-0.9.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, safe single expression evaluator library"
-HOMEPAGE="https://github.com/danthedeckie/simpleeval"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 7e741209015b..e96cbb43f985 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,3 +1,3 @@
-DIST sphinxcontrib-github-alt-1.2.tar.gz 3680 BLAKE2B afd5a20d073e58bcb657fbf100b28fab9d8cda2e1ae7e488dab42e8d4b12e4668185657673a56e9c410aa81cb65dbf4b706740511a8ed9d6c49482ea014c2fc0 SHA512 08f6738206232a5f37446ecac7b804178a57173efee58886623c7d2b43678c8acfd5a7527bacfe7c8f004fd531be9606f24a99c5665b78f97a5676398d2d2857
-EBUILD sphinxcontrib-github-alt-1.2-r1.ebuild 757 BLAKE2B 5cc25b663872cd2d74b8d25504ce9d7a0eec29b2ffb24fdefbcecec1937148d881fbc9e6bcddce9562c028fba87953c4ca7d874153e4da30ee2e274a76462abe SHA512 ebd737976cefa96e0d7015e0cc9d1b94f4fab0e2a6374fe3e162c675a9c5588bbeae603f040bef1114b88ba50ca228f07faf8387fbdc65f63220e00f6ffa6dbd
+DIST sphinxcontrib_github_alt-1.2.gh.tar.gz 3680 BLAKE2B afd5a20d073e58bcb657fbf100b28fab9d8cda2e1ae7e488dab42e8d4b12e4668185657673a56e9c410aa81cb65dbf4b706740511a8ed9d6c49482ea014c2fc0 SHA512 08f6738206232a5f37446ecac7b804178a57173efee58886623c7d2b43678c8acfd5a7527bacfe7c8f004fd531be9606f24a99c5665b78f97a5676398d2d2857
+EBUILD sphinxcontrib-github-alt-1.2-r2.ebuild 822 BLAKE2B d7780641b8bbecc33526fc9accc19e6e913809cf1de91993aeed5f3e17d97cc460445367d48585ff74c2bc456899f6d8287960fc43d406b0d2bf3e73c16a37fe SHA512 48195125f3a2c2be2b7a6703d19f1efde3aaffd3862f68bd497950049a79e8a9e7e3796bfa5dee6fe50fa8ead95bbb1b1040a2e57be62f13613c843f5a15b3c4
 MISC metadata.xml 437 BLAKE2B 74c212e371aeaf70f1ad5d4b4a2afb0cb6cb1f3ecd5f45934675d711e4b01a878656ad154f517bd4100663ec7da232443625c8dfb79a6b0779a00abce35528b1 SHA512 5fafca03639f467b05a5f7cf1ab5a019817b505504b3d4e4fbc711ddd0cd679f9416e5773f032760b089398e8518291d179e8146c405e5e189e9c26f0a2de642
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild
deleted file mode 100644
index 9fe7b806baf5..000000000000
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN="sphinxcontrib_github_alt"
-
-DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
-HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
-SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	!dev-python/sphinxcontrib_github_alt
-"
-BDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r2.ebuild
new file mode 100644
index 000000000000..6b653bee52cb
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=sphinxcontrib_github_alt-${PV}
+DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
+HOMEPAGE="
+	https://github.com/jupyter/sphinxcontrib_github_alt/
+	https://pypi.org/project/sphinxcontrib_github_alt/
+"
+SRC_URI="
+	https://github.com/jupyter/sphinxcontrib_github_alt/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	!dev-python/sphinxcontrib_github_alt
+"
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 25267ff9a684..b303e3e6bb72 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 17f5996a21af..a5ff6f2e75f8 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -2,8 +2,8 @@ AUX noto-emoji-20180823-build-path.patch 313 BLAKE2B c7a6a67639444329f033da14b58
 AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae90ad9167cd30812e6fc71abe3df3179184b2be389ee8f277a4ce696269ffba2e25e8c024677b73c925b7ad06cdebc5846b SHA512 e3c1d68bd887c8e9dd7e752f946cff8265c996cbfafe27652ca90e67bb555433787edd45a5805bbca5b73b15377c5102593f594bbe2777d2c07452143b164c5e
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
 AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c6a36e733acf88a6089b56004f9d2a265851278cbb85b6a5d2c2ab18e46f12fcf84d7185e768cae2e3eafefeb3bc06869e5 SHA512 5bcb05c6b7a1e0970e1ff67707a1a5d49b22ada4ef4677d3bb9f9874e045d79f1d35419abc80b39bec81512f547360eb705dffeb421c48296a9646c618f75f61
-DIST noto-emoji-20210715.tar.gz 166643705 BLAKE2B 355e993aee720e634d174fceb4d0d6b16ebce91cf948657428861fa63283120eef7fb706a5e6139f0ff7c13f0d72dc1c906ab30bc9b7509644ae6a56f4156e16 SHA512 2b1071c39d85f834baf4c9b6c59f9b06f1622bf972bac6087e0f44bd034025933b9a85a9a63a307f2e4b6337f8fbf7b11ba14838cd4bc13c8075b7ffae65ae78
 DIST noto-emoji-20211101.tar.gz 170403395 BLAKE2B d37ef3b11c339d2d2f2a8c1b6370551c14fbe3d902a51a956b6cb89592001a751656a2050f6501619f770d53fefbdf6b1223725967206c9f13072928ebacbfe0 SHA512 b80d3ca838e0cc66b6b6af9b368164da3f40bd22cfbb1d923a172bd51e87f1db9b7722494f220e4e912160664bb1c5318bbd9253981c1262ce563482d6cad7a4
-EBUILD noto-emoji-20210715.ebuild 2709 BLAKE2B 937afabd10ee1b8b240295ab598051ff410e1b409d1579c5d68405dbf27dffb38a4d9a1c86cb8c8e0e2677b1bf7241bf46778d4c1a6ef039a0f74c11ebaf2254 SHA512 6325322fd09be72b5d183b39494c08f61e4f95d8d912f846ce8ffca7f796c1a64eef99029608727c67a3d11b8b22cb6d93a8188725db5469634442552382631c
+DIST noto-emoji-20220912.tar.gz 178768907 BLAKE2B b998a74903e0a559e6c2d87f6d05649054728d5359659882c89b99fc41ec80f9dbafba6f418500059acef7bb85b9d60b189abea286c9c4cb5491f501095ca425 SHA512 4e9b01be1ac7853d840379f84350f2709212401ccebb221308eb83982a8673af9a8ef166952aba4d6f8d9939efc4989f38a7db69e022eb055f265ccba78884a6
 EBUILD noto-emoji-20211101.ebuild 2717 BLAKE2B e75272aa79c8b689e630486c5e0a6ee1f3061cd8d6912a478dd25f616d47d2f744845d363bd028768f1855e3ad4edbf650b3d00c1ad967b490cb928e6cb219a0 SHA512 4a2f955bfd43d1d1f2aeb73c5d75003636abcdcc903aa2b9a62584311d96dfbc6a9def87751700c36b75e9562484d19a56a98e82b4096db8ea7cf57238050c61
+EBUILD noto-emoji-20220912.ebuild 2845 BLAKE2B 010016bf39dd6c4df4a838217bdf4215a82ba7c0b12078ebd79e45afad765c07f5d6793c4ba972c3ef02026c5404822b5bd6bd55e0cb9a7d41af99908e7b6a59 SHA512 7df7d239e888893252166351f742a0898ea3b04e96009e988f7aeffe121e755e62abfe3b6dced51f2d7e228d34baafd3bfac608878d06cf0d2db09e7165af09f
 MISC metadata.xml 332 BLAKE2B 70f041e88305198971fae1b6dde29c425677c8a378fff9de17be7ef9d70289a6b10b41eb87bb661fef13855b01833b0cd86a430432ffeddcef7b33e0368b4e31 SHA512 25b86186d6c968cf80a1493d079da26f5821ec9426e9566b2d02f5e0db0a629b1b176c6cccad43a679607d53aeb49293aa298da9aaa90616e60115e1fd6214aa
diff --git a/media-fonts/noto-emoji/noto-emoji-20210715.ebuild b/media-fonts/noto-emoji/noto-emoji-20210715.ebuild
deleted file mode 100644
index 46b120c9443d..000000000000
--- a/media-fonts/noto-emoji/noto-emoji-20210715.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
-
-COMMIT="c05b4b47c8250ccd232780cae46d66a8179e77ab"
-SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="buildfont"
-
-BDEPEND="
-	buildfont? (
-		${PYTHON_DEPS}
-		app-arch/zopfli
-		$(python_gen_any_dep '
-			>=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]
-			>=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]
-		')
-		media-gfx/pngquant
-		x11-libs/cairo
-		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-	)
-"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	font_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Drop font for Windows 10
-	rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
-
-	if use buildfont; then
-		# From Fedora
-		eapply "${FILESDIR}/${PN}-build-all-flags.patch"
-
-		# https://github.com/googlei18n/noto-emoji/issues/240
-		eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
-
-		# Be more verbose, bug #717654
-		eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
-		sed -i -e 's:@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1:@$(ZOPFLIPNG) -y "$<" "$@":g' Makefile || die
-
-		# Based on Fedora patch to allow graphicsmagick usage
-		if has_version -b media-gfx/graphicsmagick; then
-			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
-		fi
-	fi
-}
-
-src_compile() {
-	if ! use buildfont; then
-		einfo "Installing pre-built fonts provided by upstream."
-		einfo "They could be not fully updated or miss some items."
-		einfo "To build fonts based on latest images enable 'buildfont'"
-		einfo "USE (that will require more time and resources too)."
-	else
-		python_setup
-		einfo "Building fonts..."
-
-		# From Debian:
-		# The build requires a VIRTUAL_ENV variable and sequence check isn't working
-		VIRTUAL_ENV=true \
-		BYPASS_SEQUENCE_CHECK=true \
-		default
-	fi
-}
-
-src_install() {
-	if ! use buildfont; then
-		FONT_S="${S}/fonts"
-	else
-		mv -i fonts/NotoEmoji-Regular.ttf "${S}" || die
-		# Built font and Regular font
-		FONT_S="${S}"
-
-		# Don't lose fancy emoji icons
-		for i in 32 72 128 512; do
-			insinto "/usr/share/icons/${PN}/${i}/emotes/"
-			doins png/"${i}"/*.png
-		done
-
-		insinto /usr/share/icons/"${PN}"/scalable/emotes/
-		doins svg/*.svg
-	fi
-
-	FONT_SUFFIX="ttf"
-	font_src_install
-
-	dodoc README.md
-}
diff --git a/media-fonts/noto-emoji/noto-emoji-20220912.ebuild b/media-fonts/noto-emoji/noto-emoji-20220912.ebuild
new file mode 100644
index 000000000000..81ade31b2d25
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20220912.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit font python-any-r1
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
+
+COMMIT="e8073ab740292f8d5f19b5de144087ac58044d06"
+SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="buildfont"
+
+BDEPEND="
+	buildfont? (
+		${PYTHON_DEPS}
+		app-arch/zopfli
+		$(python_gen_any_dep '
+			>=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]
+			>=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]
+		')
+		media-gfx/pngquant
+		x11-libs/cairo
+		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+	)
+"
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b ">=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Drop font for Windows 10
+	rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
+
+	if use buildfont; then
+		# From Fedora
+		eapply "${FILESDIR}/${PN}-build-all-flags.patch"
+
+		# https://github.com/googlei18n/noto-emoji/issues/240
+		eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
+
+		# Be more verbose, bug #717654
+		eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
+		sed -i -e 's:@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1:@$(ZOPFLIPNG) -y "$<" "$@":g' Makefile || die
+
+		# Based on Fedora patch to allow graphicsmagick usage
+		if has_version -b media-gfx/graphicsmagick; then
+			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
+		fi
+	fi
+}
+
+src_compile() {
+	if ! use buildfont; then
+		einfo "Installing pre-built fonts provided by upstream."
+		einfo "They could be not fully updated or miss some items."
+		einfo "To build fonts based on latest images enable 'buildfont'"
+		einfo "USE (that will require more time and resources too)."
+	else
+		python_setup
+		einfo "Building fonts..."
+
+		# From Debian:
+		# The build requires a VIRTUAL_ENV variable and sequence check isn't working
+		VIRTUAL_ENV=true \
+		BYPASS_SEQUENCE_CHECK=true \
+		default
+	fi
+}
+
+src_install() {
+	if ! use buildfont; then
+		FONT_S="${S}/fonts"
+		# Drop non used fonts
+		rm -f fonts/*COLR*.ttf || die
+	else
+		# Drop Windows compatible fonts and temporal files
+		rm -f *tmpl.ttf *Windows*.ttf *COLR*.ttf || die
+
+		# Built fonts
+		FONT_S="${S}"
+
+		# Don't lose fancy emoji icons
+		for i in 32 72 128 512; do
+			insinto "/usr/share/icons/${PN}/${i}/emotes/"
+			doins png/"${i}"/*.png
+		done
+
+		insinto /usr/share/icons/"${PN}"/scalable/emotes/
+		doins svg/*.svg
+	fi
+
+	FONT_SUFFIX="ttf"
+	font_src_install
+
+	dodoc README.md
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 144c40da98f8..476e19290f32 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 3f5fcd9c6222..64e22be1f0d7 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -3,5 +3,5 @@ DIST suil-0.10.14.tar.xz 33620 BLAKE2B 8ad873ade71ee6f5ba9c8560e116d8de86d8a919c
 DIST suil-0.10.16.tar.xz 33744 BLAKE2B 614217013b39215f4b6d9414451a55fbca42dd038c6bc961d3769660707bf2da45432c97628edef8dacb8630437bcb304d10616ced2fd9cf9a6a4d094f196f6c SHA512 9b1dac07b017934a93f70d514ec477785683e7ed5949b62a2c4ad139c1e84265399f54d3140dcf0e542d20a0919286aacb52103c91e2f6fc7ebd707db2d98ac4
 EBUILD suil-0.10.12.ebuild 1067 BLAKE2B f4d2fe9dc9af625225b401572446c6a53292e7f80a1d863a5daaf1718fdf758a3c5e6445f2aa4914bae865d6b56f1489b19ef086a4a4df56e5e89db407ede7d3 SHA512 e720c79edcc253b081577347ec7d82fbe03182403e608bfe9b8d5badf1ee08ab4992e3f9a00e4a1d43e9aed04710f6d0dc8698a5a7795f2f0efadb9c7a2df585
 EBUILD suil-0.10.14.ebuild 1079 BLAKE2B f7b12cb31c17b65f94c739929736dabe62118cc63cd9d497caf122467b0ec5be9b67d688a518db370fba44388db710266c868de62a127201c97a774df8259f7e SHA512 06426c6fbb3ae2e6c4e79fa3e3d5df53aee7b0c51e053d081035f840bafbcf6e0a92913567c2be1ae948573496222d0dee1dcb0a03955af8c175e70a370b16de
-EBUILD suil-0.10.16.ebuild 1079 BLAKE2B f7b12cb31c17b65f94c739929736dabe62118cc63cd9d497caf122467b0ec5be9b67d688a518db370fba44388db710266c868de62a127201c97a774df8259f7e SHA512 06426c6fbb3ae2e6c4e79fa3e3d5df53aee7b0c51e053d081035f840bafbcf6e0a92913567c2be1ae948573496222d0dee1dcb0a03955af8c175e70a370b16de
-MISC metadata.xml 492 BLAKE2B 08b9c4faabd0b31d5397307c0a025e49b25124edf27fb2972e3d77f93b221985dc8a94eb7626e0b6f845877cdf4c714ead49c25dee3e7346efb92c7fa98ba0c1 SHA512 2505c885384508559d1ee43cd2c5f382d444299de05abb7395cad7510cb9dd40c55b3c33a0f4348b278ac4c7c52d3f083d7996a44d8f5bda4611f038822c5500
+EBUILD suil-0.10.16-r1.ebuild 1224 BLAKE2B 32121d681c742680cda4bba03f9ac18f06ae395815f28cc8cc734d43e9c6a0058c5392fbea4dd4912f006734a52ddaef60a812b64614f9a89f180d61e829ae6d SHA512 049c33406e399a58d486cbe31ebad8025d8e9044a321ad524b7cd053261497ab1fe737673891d972b97d92fc44eebbf88a040f7a07273527384ca55503f2d54a
+MISC metadata.xml 561 BLAKE2B c2a96aa27533596af606b3b63c853b37d35503748f042d4b69cbb2a17568fc62acad26562fca3564d5f80a0d39227984191b28a78082e6ecfd47a3cef7bb5e32 SHA512 dc4919cfa4180f4ee402a833e69aae86d5d04d28f085e5f26228f8001cb2d04a7547bb17048960e74e4c8925291c043974bcdeb318b20089604ff189c4001261
diff --git a/media-libs/suil/metadata.xml b/media-libs/suil/metadata.xml
index f9a9fe3099dc..ef7c2a13b89e 100644
--- a/media-libs/suil/metadata.xml
+++ b/media-libs/suil/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
-<longdescription lang="en">
-	Lilv is a library to make the use of LV2 plugins as simple as possible for applications. Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
-</longdescription>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Suil makes it possible to load a UI of any toolkit in a host using any other toolkit.
+    Suil currently supports every combination of Gtk 2, Gtk 3, Qt 5, and X11.
+  </longdescription>
+  <use>
+    <flag name="gtk2">Enable GTK2 based GUI support</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-libs/suil/suil-0.10.16-r1.ebuild b/media-libs/suil/suil-0.10.16-r1.ebuild
new file mode 100644
index 000000000000..710d7c1ed85d
--- /dev/null
+++ b/media-libs/suil/suil-0.10.16-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
+HOMEPAGE="https://drobilla.net/software/suil.html"
+SRC_URI="https://download.drobilla.net/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc gtk gtk2 qt5 X"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+	)
+"
+# This could be way refined, but it's quickly a rabbit hole
+
+RDEPEND="
+	media-libs/lv2
+	gtk2? (
+		x11-libs/gtk+:2
+		dev-libs/glib:2
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		dev-libs/glib:2
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	X? ( x11-libs/libX11 )
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_prepare() {
+	default
+
+	# fix doc installation path
+	sed -iE "s%install_dir: docdir / 'suil-0',%install_dir: docdir / '${PF}',%g" doc/c/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc docs)
+		$(meson_feature gtk2)
+		$(meson_feature gtk gtk3)
+		$(meson_feature qt5)
+		$(meson_feature X x11)
+	)
+
+	meson_src_configure
+}
diff --git a/media-libs/suil/suil-0.10.16.ebuild b/media-libs/suil/suil-0.10.16.ebuild
deleted file mode 100644
index 951d4de5215c..000000000000
--- a/media-libs/suil/suil-0.10.16.ebuild
+++ /dev/null
@@ -1,58 +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} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit meson python-any-r1
-
-DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
-HOMEPAGE="http://drobilla.net/software/suil/"
-SRC_URI="http://download.drobilla.net/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc gtk qt5"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		dev-python/sphinx_lv2_theme
-	)
-"
-CDEPEND="
-	media-libs/lv2
-	gtk? ( x11-libs/gtk+:2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-src_prepare() {
-	default
-
-	# fix doc installation path
-	sed -iE "s%install_dir: docdir / 'suil-0',%install_dir: docdir / '${PF}',%g" doc/c/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc docs)
-		$(meson_feature gtk gtk3)
-		$(meson_feature qt5)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ed33cae85bed..096d10f4a757 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 8ee749fbb3fe..5b4064865dad 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -3,5 +3,5 @@ AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d430
 DIST amsynth-1.12.4.tar.gz 1624416 BLAKE2B 1dcd2454d94200b76097d4215ed419123a3b8427064c8f674a1e7cb27620fb5b2977470ea7feb8114c429ed904511ec73c73461b7f38e1388e4cfeabc4e68ec3 SHA512 502fdd1d6c4e54a57482d266977d78008efa26717c173be0bf98e907a111366fd80b65d667b9448e751085901dc5f2a61ac0bf5b1d02e35c695ecd99c9d1df00
 DIST amsynth-1.13.0.tar.gz 1626209 BLAKE2B 29b79f18ca0ddbba77aaf1bde738f235698f0debe2ddea3b9f2bce2eeaaa399ba125f72b97c83157b87bb28bdb4a259ae2e535c87def16a9e1af3d3093bf0270 SHA512 29698be7d690c76a46a0c8306d6c3b94630b25ed9a3524d7e27d22e244f5c144b74b8473f09eecdb1368443f503ba7024d1c71ead6794f11a2d1cb2114c84bd5
 EBUILD amsynth-1.12.4.ebuild 1151 BLAKE2B 4feb08fe1ab1b3817709aca28d7f659566e76e5b819905ff2c4a1aa2e63209bd617aa8fa3b3f0196f343331483eb5c0595918675cd72761f0343fb9cdcc91350 SHA512 532c7810d7cd4a5dc5b033d9e197a26b898db708a5c4318d967e4565a1c8d21c4a20c2a6205021357e6ad54d13c9810a6c0357eda48e7ea9fa9c126afc4f5062
-EBUILD amsynth-1.13.0.ebuild 1153 BLAKE2B 9801e8b2e0b620b5360625977556e3f053f4da5d409a7d3d23a59fab201db06df1328415cccbe46e4eecdb065869130265532e652ed301ad557d7d1bb08e3afd SHA512 a78417056fdabe0a6ca6282024b22c70492de41715079018c7b70681546752228df29645dbce199d7e74f3cdcf4aa99e653dc56386cc476872c98e20cb519dd8
+EBUILD amsynth-1.13.0.ebuild 1166 BLAKE2B 50493cee4e2b02347ee66d0d445b41cdbaf6143bb15c794425a0c0caf122f57c45e3c7501c82afde57983f58993112c9886ea5fc3eb9aac2edd4b278813bbbd7 SHA512 b1fc9877ef6cad92857835bf536daee404ac87c99a1ab00c115f85ffaf2ccd939e1a4348feeb7e5f8d9ba4a4c18698160b522ed1b76aff9707df534b1af0b2f6
 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965
diff --git a/media-sound/amsynth/amsynth-1.13.0.ebuild b/media-sound/amsynth/amsynth-1.13.0.ebuild
index e42fb11b9d12..19dabda91b84 100644
--- a/media-sound/amsynth/amsynth-1.13.0.ebuild
+++ b/media-sound/amsynth/amsynth-1.13.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
 
-REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk ) vst? ( gtk )"
 
 BDEPEND="
 	dev-util/intltool
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 77692505934e..547aa4bd4324 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,5 @@
 AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-EBUILD ardour-6.9-r2.ebuild 4836 BLAKE2B 23e48715ff26825687eda74d6f9fd9f927d4904d4b2182457094a454f7d93201a15320e45c97e0cd43a47600a2bc1a80f822f7055969be34b1595e8f67c09d10 SHA512 4f43442cf23d86adcd47800eedc10cfbf014cb6f5fe2ad4baef63ab0eec37c912105a69d850b8c62f73e477c129b7cbbb0d0a693554db2df9e2bf7546e34b983
-EBUILD ardour-9999.ebuild 5001 BLAKE2B 859d7c38c538879eae9d90682b4bfba684dce88f5bdec8a6d19d0bad54320bdf1e9b748963fa521195696cb628af819358dd56d50078aba086f5b7eb4c993a43 SHA512 345a5a31557ec119fcc226705229ee611f21bbdbde50898bc0cf3a2d223d9d641aa8a4edc04d9834745ea39928098b2784588016222cc494d98b6289a05a7412
+EBUILD ardour-6.9-r2.ebuild 4880 BLAKE2B f0bda35454e1bf344a4296e822a32bcebfabc1f5ddbf4b76f33f69c5ef9d8ccaa4b6ead7228324f0c828bd1dd4538698bcdfbc2f1d18d9b2c51a91e6280f7845 SHA512 a0b544100e88708818ff809f85251981c490033e7d7ea11d9558326e9138bed9ed66f0d79a3108bb91256485505f0b5cae3341de9b7f481b5cc559d806005a25
+EBUILD ardour-9999.ebuild 5045 BLAKE2B 59ce5767e5dbcadfd948af2de5c8284540ef73321de6b4725185fe285db315710f14304ef31b4899811428375535c02d3d8c285fb50f8513ef1a55a8d4e994a7 SHA512 be4ea4500bcaa8aae369429ea6da1474842f6528a398f63d80238189233845684d98d8334bd8242dc999dc71961d31d22d153856f01d802cd255656abdf49372
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-6.9-r2.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild
index d25d23fb3095..21e7af85210c 100644
--- a/media-sound/ardour/ardour-6.9-r2.ebuild
+++ b/media-sound/ardour/ardour-6.9-r2.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
+inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil[gtk]
+	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 19e5493895f8..6b4cd2f9e9be 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
+inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil[gtk]
+	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index c73f776e74d5..e70c62fb5a7d 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,4 +1,3 @@
 DIST frescobaldi-3.2.tar.gz 6696111 BLAKE2B e74a8c3a59c6dc5187538785bc5971dd996cf897c6428ff510775bad58aa4c04dd69b91f3821b9c868a3e7f13b6cae6f76814188de2620542959039e768c9be0 SHA512 403ae6cfe145595fef0ffe06ce4fd595a0417201b19e5f2315944b45cdcec50592296424f2bf2c7e3eccbe3dbeb9ff5bfc4aa7813241d8168bc057e7bf5539b3
 EBUILD frescobaldi-3.2-r1.ebuild 862 BLAKE2B a2d9982b7b492afde106fcbb870084ab5e7e29d0f9a6bc8742e2cf7af92c1de60514b19c5263d67eff876dfb26c8aa45964b0d980d044baf1c307fc3db41b521 SHA512 0548d5386cdd3126474dfc2d173f483a3e363328b5d1e7dc9359092bc4734ae18edb63ea7149bc2325ab345ce839fc816ecc1dad1186c1e7931c79b94f7cf119
-EBUILD frescobaldi-3.2.ebuild 822 BLAKE2B 22c7e2441e63e59912ac3ef5d248ae016f616b4792f19243b4f0e82c40d23f426c729cbb984056bcadfbb3c89adcaa565e252ba945c492bb6cb7531fa425f82c SHA512 f79bdfc9511a1b3ad11dbf876b19a47d8193b0138bf245fafbe3ddafca0d10068d0c3db48be520f36004114ec620d47d8c8072339a7e03765664ee481239f0a6
 MISC metadata.xml 438 BLAKE2B d6f42ae0b227211e9000c25a1eb3e371881df6c663891549abd7d878d7cfbf7a9a0e514d2f6b01530667667d4a4c55e7801c3ce5fddc7a13f3ad4448813ff898 SHA512 e94573420812bfbca28fe96cc047eb270ddae4f526fd0d1932893bb06ed3c22de1a76d81ca210cca6cbf7b76ab2ddb74b887a122ea54a92f9b05d1b581165ed9
diff --git a/media-sound/frescobaldi/frescobaldi-3.2.ebuild b/media-sound/frescobaldi/frescobaldi-3.2.ebuild
deleted file mode 100644
index a71a77966f4c..000000000000
--- a/media-sound/frescobaldi/frescobaldi-3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 xdg
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="https://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/PyQt5[gui,network,printsupport,svg,widgets,${PYTHON_USEDEP}]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	dev-python/python-ly[${PYTHON_USEDEP}]
-	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
-	media-sound/lilypond"
-RDEPEND="${DEPEND}
-	x11-themes/tango-icon-theme
-"
-
-python_prepare_all() {
-	rm -r frescobaldi_app/icons/Tango || die "failed to remove tango icon theme"
-	distutils-r1_python_prepare_all
-}
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index ccdc0ceca4f1..27edbff20e18 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,6 +1,8 @@
+DIST patchage-1.0.10.tar.xz 341164 BLAKE2B db7e17acc483b1fec27c80a3bedf3b546d303d8ce4f90f7f7669a4e4e1dcb526881d949d91edfdd6283dff3d9382c4c3534972065e2769a43e9e4b982b0dfbec SHA512 c6c43afc50978db02517282c1e8c7aad131e30f6255e79e65ea17edcee0b470ec3172da2c057abe4cf4bb12a081a92165ac322cfc4ec77382bb992e74827831b
 DIST patchage-1.0.6.tar.bz2 664841 BLAKE2B 72d0de6d12e07ec160f4c59c51f138e1220a1b8994bdab90f56dd715bf16b6f561836d184ec5d5077de3bc7bb5c6778ea2b7bcbf0b33230be662f2b729eac568 SHA512 b7aedcb07da0c81842929833ab93a0b20c08e465bf05ebb4e47670d295c0d4d0d50f0f74001d9264c2c23ef08d3881232e7622ecf101d1d53ffcae2f8c0f31d3
 DIST patchage-1.0.8.tar.xz 334888 BLAKE2B d6bac04a3a6880c7758a01c60b4f4c907e7ae191ef8956fb6ad6f039d9bf40e973ff6e38fc6a5af5b4b4ce5386496282ab5cb06573b0e091e24b7c80fae73ac3 SHA512 af2e43c53ce80ab59416745e85cd7fc524fd3b21ae259d171f15998566cfa067a84a7406e78f5b50bc3ff339363b3ed9cacc9790f08cc6189e4919fc43d041dc
-EBUILD patchage-1.0.6.ebuild 918 BLAKE2B 4455184ad29ce50c102d6f13705bfbec72424db030301ed5f4d8d87fb97596ee5dd926b76848bfc2dc36524243f99cd603db43667c9f8318515f4688bc149830 SHA512 8127a176c9a09d8697297cfa46d9fab895b0cdf5f72af3d1c9d18824cb3e062c4bf7ef222483e4a964cdc42656c6303c68b68ca8183ccbe1ce4427402582828c
-EBUILD patchage-1.0.8.ebuild 1001 BLAKE2B f242b4886b34252ecc8cfe6aff572f2d2156ba475b7b8777c47d0b2dfb1c9f83a78441685c313efda4bb9ea0bd7708ce00042ac0a2f1677013605875dff3944f SHA512 bf40b32939ba699bb51d56288b8437e5e8cf496dd3b60c30b72467ba2e8985b5dd82a370b69794d9bf14f6396e291b41ee25322972ca106aec29f5630a2895b9
+EBUILD patchage-1.0.10.ebuild 1005 BLAKE2B 3c10e0793301589778fb9eb93831c6bc9aabe4266e48964fe93b518be46a96355833d6ad358b7a848137b59a74655563de17f68c911bf92b873122bea5a0d671 SHA512 81ef4e512a6eb275fefd4db62e23f6ad392281b9040cfb1c097dcf0ec4d98dbed9e5ba5fd3d9914a05ae9f762db8f3b4d215fbd0aa69ca28a0df0ecb8a0f34f1
+EBUILD patchage-1.0.6.ebuild 921 BLAKE2B 67f10fd2d46cb13a01af5c6d4d56883aeb37f53864d3f41a4bb04c659a187792ab7baace5a99f1eb7817e10af69550cd7037120f4d4477f879edc4627f34bdd1 SHA512 7b66c09f5667d8bc16cb754b612c6a22fdf08fe9d25f2a7daabbb7f7aaf01b97f44addd76c1fd608f7945c3995315c6a68b57586fc31495c4391f45972196fa7
+EBUILD patchage-1.0.8.ebuild 1004 BLAKE2B 8ef0b0e0581e382158009f77f3f9182c9830c29de310b0f00906659fa515d67f960e05e734a8886003d0b94a3e75ae87d99f8ee7f56df3bad216880d721c9261 SHA512 0c4edcc9f0d6ef736bde6e6a1247cf315846da882e4a61f58cb5a655f425358b76846c1172851a404a9e63410a0eff3f524b95c7d70118ac1147ae79cbcc2e11
 EBUILD patchage-9999.ebuild 1005 BLAKE2B 3c10e0793301589778fb9eb93831c6bc9aabe4266e48964fe93b518be46a96355833d6ad358b7a848137b59a74655563de17f68c911bf92b873122bea5a0d671 SHA512 81ef4e512a6eb275fefd4db62e23f6ad392281b9040cfb1c097dcf0ec4d98dbed9e5ba5fd3d9914a05ae9f762db8f3b4d215fbd0aa69ca28a0df0ecb8a0f34f1
 MISC metadata.xml 427 BLAKE2B a77d10e847d1ceb32b0ba9ba22a723df471d751c6ecd7ddc849f13fea71c451b9a0c7959687ba09efd23ca7dd6ffd7a77e00abd69021f5ecfeacde0680fa0814 SHA512 3ed9c62eb59dad36bd4477bcdbb95eeff21fcf8ac8c989814d24e288e58b7032452acbce472a191c8151551071b86274fdb935ae6ef5cb916a4b22510ec96789
diff --git a/media-sound/patchage/patchage-1.0.10.ebuild b/media-sound/patchage/patchage-1.0.10.ebuild
new file mode 100644
index 000000000000..e449d00c7bf0
--- /dev/null
+++ b/media-sound/patchage/patchage-1.0.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
+HOMEPAGE="https://drobilla.net/software/patchage"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/drobilla/patchage.git"
+else
+	SRC_URI="https://download.drobilla.net/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa jack jack-dbus test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	media-libs/ganv
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	jack-dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-libs/libfmt-9:="
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature alsa)
+		$(meson_feature jack)
+		$(meson_feature jack-dbus jack_dbus)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/patchage/patchage-1.0.6.ebuild b/media-sound/patchage/patchage-1.0.6.ebuild
index 3427226b5b01..d32bc3586aef 100644
--- a/media-sound/patchage/patchage-1.0.6.ebuild
+++ b/media-sound/patchage/patchage-1.0.6.ebuild
@@ -31,7 +31,7 @@ RDEPEND="dev-cpp/glibmm:2
 	)"
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	dev-libs/libfmt:="
+	<dev-libs/libfmt-9:="
 
 DOCS=( AUTHORS NEWS README.md )
 
diff --git a/media-sound/patchage/patchage-1.0.8.ebuild b/media-sound/patchage/patchage-1.0.8.ebuild
index a629310e40dd..b9c459f1ed41 100644
--- a/media-sound/patchage/patchage-1.0.8.ebuild
+++ b/media-sound/patchage/patchage-1.0.8.ebuild
@@ -35,7 +35,7 @@ RDEPEND="dev-cpp/glibmm:2
 	)"
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	dev-libs/libfmt:="
+	<dev-libs/libfmt-9:="
 
 DOCS=( AUTHORS NEWS README.md )
 
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index d6b8b8d214a4..6861a3bb5265 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -4,5 +4,5 @@ AUX zynaddsubfx-3.0.6-docs.patch 500 BLAKE2B 6f6e81c4e700f42c56417f4226408bfb7b4
 DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
 DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea
 EBUILD zynaddsubfx-3.0.5.ebuild 2020 BLAKE2B 1d91b8f853875abcdfbc0e11bdfe29365b14479708d721aaf06450aadde4c6e5e601002a3fdb5b45ab874b8de70b515012e6876b584be9d59d8f956600d5e4e2 SHA512 a72b79d923b556ff0b9310ea90600a16dfbdf9e3494cbe1d662b775ccbbe6415711f1dcd2f59fb23672a3667d6ce09c0ecfa89100a7f2c4fb51397b2aac504a8
-EBUILD zynaddsubfx-3.0.6.ebuild 1963 BLAKE2B 8d3c024a839d57b12f26ab67d433da5d6eb71b1a61c7bf1bae11254f5b69a53cfb57431ea83221a14c524fb047ffb089ad4e5583c5ffa4c8a4fb85140cafef6f SHA512 ef7ba112a4ef14c80a54580f09bfb9c76680df0537484a009654698f738364b1e21d74289ef73b672e184201264b35aab430e39345507d0adcedb084d606f610
+EBUILD zynaddsubfx-3.0.6-r1.ebuild 2029 BLAKE2B c3cb435c29d1684024f0184dbcda1ae67cdcdb065412a22532a8cba6ad17890f2561198318d748349847d6fed5ff290a56e991ea02186aad377ca9d0d386c0b3 SHA512 cd83d08f5c630fac1b2660b937c6030813bd1bd0282f3c6dd73f7727ebea2fb9ff8605d3d97c583e1b68c416e2d4257872208aa292cccb13f291ea13f453a81e
 MISC metadata.xml 428 BLAKE2B 5a450f26afae683f0aa9ff386c87c37c3445b81240d4864fe90564f2c86913af772174cfeaeb82c29b4df0b92337d00f710d8779c9f3300865e7d20e6f9fc06c SHA512 53de61301fd080758dc195c67dfaf9ece5fba941988d17ca6edb7249e01a8804fe4e7edf961a4a0ec6891730dc6f6250e5cf7e91441061eb1e487be243c9b111
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..af37f4ab7c9f
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+alsa doc dssi +fltk jack lash portaudio"
+
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-libs/mxml
+	media-libs/liblo
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	doc? ( dev-texlive/texlive-fontutils )
+	dssi? ( media-libs/dssi )
+	fltk? (
+		x11-libs/fltk:1
+		x11-libs/libX11
+		x11-libs/libXpm
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/ruby:*"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+)
+
+DOCS=( AUTHORS.txt NEWS.txt README.adoc )
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use dssi; then
+		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use jack; then
+		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+	fi
+	if ! use lash; then
+		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use portaudio; then
+		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+
+	# FIXME upstream: sandbox error
+	sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		-DPluginLibDir=$(get_libdir)
+		$(cmake_use_find_package alsa Alsa)
+		$(cmake_use_find_package doc Doxygen)
+		$(cmake_use_find_package fltk FLTK)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+	insinto /usr/share/${PN}
+	doins -r instruments/*
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild
deleted file mode 100644
index 7ba88ec4ec0a..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+alsa doc dssi +fltk jack lash portaudio"
-
-REQUIRED_USE="|| ( alsa jack portaudio )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	dev-libs/mxml
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	dssi? ( media-libs/dssi )
-	fltk? (
-		x11-libs/fltk:1
-		x11-libs/libX11
-		x11-libs/libXpm
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docs.patch
-)
-
-DOCS=( AUTHORS.txt NEWS.txt README.adoc )
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use dssi; then
-		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-	if ! use jack; then
-		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
-	fi
-	if ! use lash; then
-		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-	if ! use portaudio; then
-		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-
-	# FIXME upstream: sandbox error
-	sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		-DPluginLibDir=$(get_libdir)
-		$(cmake_use_find_package alsa Alsa)
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package fltk FLTK)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-	insinto /usr/share/${PN}
-	doins -r instruments/*
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 5e4ff61a82e9..66037bd4368d 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 03524558b6f2..f1f1506ad3f0 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -2,5 +2,5 @@ AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db
 AUX makemkvcon.1 6118 BLAKE2B bf8f7665d7b367e4dc5cfb12136cb91271087991d86bb0c2bfe6fe41def407539276114f95548cd867c49bc10bed25cec51ac00dbd6defe5df7fd82f2fe29b25 SHA512 a9334a96fcc90932a109c2d74b1769ab60e652a1e860399d8a486bd36ba02fbdabf55816059e0c51e3e4826824b7798f86b85cb5e22a4d13c2e18a2944522ac4
 DIST makemkv-bin-1.17.1.tar.gz 16162724 BLAKE2B f6d6f7e7effb6c71dd9c6f6c6d8e8604dfe9b8f29ada1765a52b8e5e3ae0342393455cea6902f3f564904629e9bca4fff20b09bfd8ef9accbdb9c202bf3e136a SHA512 cb875580a69b7a23a84aced235dbfb80e44bbc92f87945d0745cdb00089862bf03818e0d0d2bfee978f310d97778f253028a595d273ff397f76afb442425407d
 DIST makemkv-oss-1.17.1.tar.gz 6631683 BLAKE2B f70bc3d663703c0a0915064e5e8df4eea807c573ef1a1666d907b97448894e59f3b4be77752ae31150e2069d766151d330c3dc04d9c5f4a4c8cc5c44cf90f1e7 SHA512 83cf5c3abeb19602891b11494ff002f7901467b491841781f4c698abfb2cbcb67a7be2d01214562506fe2642254027cbc74114d1d84601af901f1358e299e696
-EBUILD makemkv-1.17.1.ebuild 3095 BLAKE2B 814495e481c6cb6a8b12c6220dceedd4923ffa431bcaa283592c948b86ee161431764f86ab6717a6fda991a0eae0c6ec95a40e9e209c1ce957372b7edcdc9b6e SHA512 6772fac2af038a52c688867e84f81d034e2231f20408299592fe70da0961aea3850d0781efdbb2877b4277f0c0cc3b793afc4ecab7e8b020aa8f59d637cf8946
+EBUILD makemkv-1.17.1.ebuild 3080 BLAKE2B 9f3e488dc6577aef5e2fb08b4d61252d42ee66a3597f0f319ba5edd1ab3ecd6cbea9142f64747e9e30d42cff9dd8efd5b04eada20ca360a969a837ab29c79919 SHA512 deac55c7f5099c8a9e1ba6f86ac4ae5c5c9bb2ec3e63aec620a0e4a472da74ef402dd7bf3139b1b99d070df2459da872b5cc4625eaafe87e590bc053d7835067
 MISC metadata.xml 1272 BLAKE2B 7c02bfcb2638d2f33c6fbee2d0e79b6d7d270b8209f7ec82ec51d7cf0e19b94936ee599b618f9a6b9df280fc403b0890b2c8e2323525f6d50b79fc19d26c8756 SHA512 8de92a5802b26a98984be7b5e3c0868b249c14a77a690a186dc4361db1508b79c7ebccd261e7fe9251b2d4abbbe2b93aec8a91efeafc00baada2839020a9207f
diff --git a/media-video/makemkv/makemkv-1.17.1.ebuild b/media-video/makemkv/makemkv-1.17.1.ebuild
index f458e1ceb1d6..c92f3258e0e3 100644
--- a/media-video/makemkv/makemkv-1.17.1.ebuild
+++ b/media-video/makemkv/makemkv-1.17.1.ebuild
@@ -36,7 +36,6 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	net-misc/wget
 	java? ( >=virtual/jre-1.8 )
 "
 BDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1bc3279ddfdd..01b5088dca82 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7dd7c86ffb37..f82496810a03 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 09:39:38 +0000
+Sun, 18 Sep 2022 15:39:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b13b9ce6811b..2cda540dfb13 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 525759 BLAKE2B 487aaba91a7a713d59ac9586bbe0ffaeb7bf01fde9781422d78f1d1e009e745a8cea346fbefedc07f275060c3798240f56799ae9f182d10305c04a36eac8db25 SHA512 9ad37d1ae3ef248f0c465e37bce58b95e6f9da024c5d52c9ede183ff971546b15abed0e4dd4ca83a4f69fd2c722ad188eb583dd8d8337d8d99ae3e7c776b7da4
-TIMESTAMP 2022-09-18T09:39:42Z
+TIMESTAMP 2022-09-18T15:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMm515fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnO8NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDHxw//TRymF1mWuhV7FKU661a0Yn8zkkn3ebz8MugqGe/Upi3jI0avJrh3SXHU
-q6vdKSc0yyJOeNK8Ynh1hrqmsbb8RMDHtu6Oe0FOpB6MGsAUpuf36VJIx5IRKAzt
-w9eX7p3ZzPaHujZhtQkJVioFLN1bpjS0HhXh0NtoHQP2gFdFw6vn8k4Jp5PHAao9
-HNZB8t/O0ks4NR7yFVL75LCdBzhslwD54srN330B8S7OtvBhq3OX0U4tof+/qGl6
-09mS3qV1GbdleZS7DEM2zwEJBcqMLmMAIk5shFO/YV/euy/DFntxsznMLmW6teu/
-qUL9VH+4fKo+wXTk8DZzqc8TGPclEY6rNUZLueL56Jc/4CpaL9cxaBE8MTepwAEd
-dwimAaXJU6YuWnN8UWdywr3vmRc+aSGsDS3kFWewjFucfs3ma2t0Pn1Tx2/A7HJh
-6EU/TN4TZeZlO3nOfs0URdLvW7bHFsMqOD81jmoBJBdZlhAUKpdvJcilorFMl+oM
-+IRR2ceRb1EOO2yqdnQD9H3d4/JaBDE2FBs1r2+Drg7ZSRpwPsc2doemj+v6AUl/
-Ukd0rXgEdu+JPO/xcXYu/ZvACHA+1LSzZKef7BGJwxkYSOTmURFyE/sxdvD7jHLY
-L5bCJUciyxk5IgP7sb+u71/O+FlWljnLVoPPjNxnKFP6IrgvQAE=
-=pnfy
+klAkMQ//ZfjjI570kuxhcU6g/I/fkSvIvSkGOlh9oEu8UhjCnZ+hDfvRu7mXcSDm
+SdyO/rYpuavjBd8jvSIqqrlEt4inZ8yXh/ipQZfFmsoorUCIqDXI/lBuG7ZpKCjk
+q3UNreis1OnxsGsKv+7KGdzFdhXIiwGznQODKl2wJBw3GGIa43J3nCyNC12l2yOk
+wUSSH7GB6W8qmkU7VxHU1iAEl1X9HTGyVenCJ3Y0jCSqg/w6ppSzkEXZqwrjBsCK
+4DMlowJHxochNCPli3pFLuJEhTtwcSmUnkh1ObNCGGByESAXwF6zf+ALwbivBld0
+dbxei+rTjb6xgXDNoh7kuApbykoAk2aN63C1xAzTXci03n2N/kChowPCdGoJj23+
+vG+OFYpTIQRsddht5VdGXJdJM9Pk57Zux1MZsKCNXOOf5+1FHHgEuCX+TYJfBN/c
+LXgsOr9isqM9CmhvWPjlp28MkDlYTJKvdpzplyDnFPTTCGzZvLGu1Q5CQNTzhLBv
+MMUoBpsbTq4VZsDvrKmrbgo5Sar/5VSSmI6qr7ONBJs8BEi+XtJdWRUs8Xpxy1Xl
+TLNaoGiNeaUNLV2N27mqV2Se9o95Ex+wVSac/z7xtu+zKmgTKMOlg+j4b9dQROuU
+fOxNcsLQfLd+hR9uh5Xy5yoApvnM4B0TP05Itb4p/c+hn1iaxlw=
+=ryfB
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7dd7c86ffb37..f82496810a03 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 09:39:38 +0000
+Sun, 18 Sep 2022 15:39:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index cb0f27e28645..a3c40531c337 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 5be57a6f8861..a16d00f59be2 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2206.0 b/metadata/md5-cache/app-admin/rsyslog-8.2206.0
deleted file mode 100644
index 19d17a18fdf8..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2206.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) 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 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=8
-HOMEPAGE=https://www.rsyslog.com/
-INHERIT=autotools linux-info python-any-r1 systemd
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2206.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2206.0.tar.gz )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=df22450f0287e513a4e53ec947602d70
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2206.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2206.0-r1
new file mode 100644
index 000000000000..4a4b361c366d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2206.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) 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 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=8
+HOMEPAGE=https://www.rsyslog.com/
+INHERIT=autotools linux-info python-any-r1 systemd
+IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2206.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2206.0.tar.gz )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f72eae8cc840b6fafa1c2d4a0276d0b2
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2208.0 b/metadata/md5-cache/app-admin/rsyslog-8.2208.0
deleted file mode 100644
index 58d27f026b36..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2208.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) 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 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=8
-HOMEPAGE=https://www.rsyslog.com/
-INHERIT=autotools linux-info python-any-r1 systemd
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2208.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2208.0.tar.gz )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=56d2f2394cc7a4b73e06a13fe98038c3
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2208.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2208.0-r1
new file mode 100644
index 000000000000..1c283d2e939f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2208.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) 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 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=8
+HOMEPAGE=https://www.rsyslog.com/
+INHERIT=autotools linux-info python-any-r1 systemd
+IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2208.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2208.0.tar.gz )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1f3916f987a0cd8b57a94eadf3dbe8f9
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 8a9fa835fd30..ebcc33add864 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/sequoia-sq-0.26.0 b/metadata/md5-cache/app-crypt/sequoia-sq-0.26.0
deleted file mode 100644
index 846f6a520ee0..000000000000
--- a/metadata/md5-cache/app-crypt/sequoia-sq-0.26.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=sys-devel/clang dev-libs/gmp:= dev-libs/nettle:= dev-libs/openssl:=
-DESCRIPTION=CLI of the Sequoia OpenPGP implementation
-EAPI=8
-HOMEPAGE=https://sequoia-pgp.org/ https://gitlab.com/sequoia-pgp/sequoia
-INHERIT=bash-completion-r1 cargo
-IUSE=debug
-KEYWORDS=amd64 ~ppc64
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 GPL-2 GPL-2+ GPL-3 GPL-3+ ISC LGPL-2+ LGPL-3 LGPL-3+ MIT MPL-2.0 Unlicense ZLIB
-RDEPEND=dev-libs/gmp:= dev-libs/nettle:= dev-libs/openssl:=
-SLOT=0
-SRC_URI=https://gitlab.com/sequoia-pgp/sequoia/-/archive/sq/v0.26.0/sequoia-sq-v0.26.0.tar.bz2 https://crates.io/api/v1/crates/addr2line/0.16.0/download -> addr2line-0.16.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aead/0.3.2/download -> aead-0.3.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.44/download -> anyhow-1.0.44.crate https://crates.io/api/v1/crates/ascii-canvas/3.0.0/download -> ascii-canvas-3.0.0.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.62/download -> backtrace-0.3.62.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bindgen/0.57.0/download -> bindgen-0.57.0.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitvec/0.20.4/download -> bitvec-0.20.4.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.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.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.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/blowfish/0.7.0/download -> blowfish-0.7.0.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.8.0/download -> bumpalo-3.8.0.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.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.1.0/download -> bytes-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/capnp/0.13.6/download -> capnp-0.13.6.crate https://crates.io/api/v1/crates/capnp-futures/0.13.2/download -> capnp-futures-0.13.2.crate https://crates.io/api/v1/crates/capnp-rpc/0.13.1/download -> capnp-rpc-0.13.1.crate https://crates.io/api/v1/crates/cast/0.2.7/download -> cast-0.2.7.crate https://crates.io/api/v1/crates/cast5/0.9.0/download -> cast5-0.9.0.crate https://crates.io/api/v1/crates/cc/1.0.71/download -> cc-1.0.71.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.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/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chrono-tz/0.6.0/download -> chrono-tz-0.6.0.crate https://crates.io/api/v1/crates/chrono-tz-build/0.0.2/download -> chrono-tz-build-0.0.2.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clang-sys/1.2.2/download -> clang-sys-1.2.2.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmac/0.5.1/download -> cmac-0.5.1.crate https://crates.io/api/v1/crates/const-oid/0.5.2/download -> const-oid-0.5.2.crate https://crates.io/api/v1/crates/core-foundation/0.9.2/download -> core-foundation-0.9.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/criterion/0.3.5/download -> criterion-0.3.5.crate https://crates.io/api/v1/crates/criterion-plot/0.4.4/download -> criterion-plot-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.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/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/ctr/0.6.0/download -> ctr-0.6.0.crate https://crates.io/api/v1/crates/curve25519-dalek/3.2.0/download -> curve25519-dalek-3.2.0.crate https://crates.io/api/v1/crates/dbl/0.3.1/download -> dbl-0.3.1.crate https://crates.io/api/v1/crates/der/0.3.5/download -> der-0.3.5.crate https://crates.io/api/v1/crates/des/0.6.0/download -> des-0.6.0.crate https://crates.io/api/v1/crates/deunicode/0.4.3/download -> deunicode-0.4.3.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dyn-clone/1.0.4/download -> dyn-clone-1.0.4.crate https://crates.io/api/v1/crates/eax/0.3.0/download -> eax-0.3.0.crate https://crates.io/api/v1/crates/ecdsa/0.11.1/download -> ecdsa-0.11.1.crate https://crates.io/api/v1/crates/ed25519/1.2.0/download -> ed25519-1.2.0.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.1/download -> ed25519-dalek-1.0.1.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/elliptic-curve/0.9.12/download -> elliptic-curve-0.9.12.crate https://crates.io/api/v1/crates/ena/0.14.0/download -> ena-0.14.0.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fehler/1.0.0/download -> fehler-1.0.0.crate https://crates.io/api/v1/crates/fehler-macros/1.0.0/download -> fehler-macros-1.0.0.crate https://crates.io/api/v1/crates/ff/0.9.0/download -> ff-0.9.0.crate https://crates.io/api/v1/crates/file_diff/1.0.0/download -> file_diff-1.0.0.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/fixedbitset/0.2.0/download -> fixedbitset-0.2.0.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/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.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.17/download -> futures-0.3.17.crate https://crates.io/api/v1/crates/futures-channel/0.3.17/download -> futures-channel-0.3.17.crate https://crates.io/api/v1/crates/futures-core/0.3.17/download -> futures-core-0.3.17.crate https://crates.io/api/v1/crates/futures-executor/0.3.17/download -> futures-executor-0.3.17.crate https://crates.io/api/v1/crates/futures-io/0.3.17/download -> futures-io-0.3.17.crate https://crates.io/api/v1/crates/futures-macro/0.3.17/download -> futures-macro-0.3.17.crate https://crates.io/api/v1/crates/futures-sink/0.3.17/download -> futures-sink-0.3.17.crate https://crates.io/api/v1/crates/futures-task/0.3.17/download -> futures-task-0.3.17.crate https://crates.io/api/v1/crates/futures-util/0.3.17/download -> futures-util-0.3.17.crate https://crates.io/api/v1/crates/generator/0.7.0/download -> generator-0.7.0.crate https://crates.io/api/v1/crates/generic-array/0.12.4/download -> generic-array-0.12.4.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.25.0/download -> gimli-0.25.0.crate https://crates.io/api/v1/crates/git-testament/0.2.0/download -> git-testament-0.2.0.crate https://crates.io/api/v1/crates/git-testament-derive/0.1.12/download -> git-testament-derive-0.1.12.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.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/globwalk/0.8.1/download -> globwalk-0.8.1.crate https://crates.io/api/v1/crates/group/0.9.0/download -> group-0.9.0.crate https://crates.io/api/v1/crates/h2/0.3.7/download -> h2-0.3.7.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.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/hmac/0.11.0/download -> hmac-0.11.0.crate https://crates.io/api/v1/crates/http/0.2.5/download -> http-0.2.5.crate https://crates.io/api/v1/crates/http-body/0.4.4/download -> http-body-0.4.4.crate https://crates.io/api/v1/crates/httparse/1.5.1/download -> httparse-1.5.1.crate https://crates.io/api/v1/crates/httpdate/1.0.1/download -> httpdate-1.0.1.crate https://crates.io/api/v1/crates/humansize/1.1.1/download -> humansize-1.1.1.crate https://crates.io/api/v1/crates/hyper/0.14.14/download -> hyper-0.14.14.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/idea/0.3.0/download -> idea-0.3.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.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.7.0/download -> indexmap-1.7.0.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.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/js-sys/0.3.55/download -> js-sys-0.3.55.crate https://crates.io/api/v1/crates/lalrpop/0.19.6/download -> lalrpop-0.19.6.crate https://crates.io/api/v1/crates/lalrpop-util/0.19.6/download -> lalrpop-util-0.19.6.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.105/download -> libc-0.2.105.crate https://crates.io/api/v1/crates/libloading/0.7.1/download -> libloading-0.7.1.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/loom/0.5.2/download -> loom-0.5.2.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matchers/0.0.1/download -> matchers-0.0.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/md-5/0.9.1/download -> md-5-0.9.1.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/memsec/0.6.0/download -> memsec-0.6.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.14/download -> mio-0.7.14.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/native-tls/0.2.8/download -> native-tls-0.2.8.crate https://crates.io/api/v1/crates/nettle/7.0.2/download -> nettle-7.0.2.crate https://crates.io/api/v1/crates/nettle-sys/2.0.8/download -> nettle-sys-2.0.8.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/no-std-compat/0.4.1/download -> no-std-compat-0.4.1.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num-bigint-dig/0.6.1/download -> num-bigint-dig-0.6.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.27.1/download -> object-0.27.1.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.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.36/download -> openssl-0.10.36.crate https://crates.io/api/v1/crates/openssl-probe/0.1.4/download -> openssl-probe-0.1.4.crate https://crates.io/api/v1/crates/openssl-sys/0.9.67/download -> openssl-sys-0.9.67.crate https://crates.io/api/v1/crates/p256/0.8.1/download -> p256-0.8.1.crate https://crates.io/api/v1/crates/pandoc/0.8.6/download -> pandoc-0.8.6.crate https://crates.io/api/v1/crates/pandoc_ast/0.7.3/download -> pandoc_ast-0.7.3.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/parse-zoneinfo/0.3.0/download -> parse-zoneinfo-0.3.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/pem/0.8.3/download -> pem-0.8.3.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/petgraph/0.5.1/download -> petgraph-0.5.1.crate https://crates.io/api/v1/crates/phf/0.10.0/download -> phf-0.10.0.crate https://crates.io/api/v1/crates/phf_codegen/0.10.0/download -> phf_codegen-0.10.0.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pico-args/0.4.2/download -> pico-args-0.4.2.crate https://crates.io/api/v1/crates/pikchr/0.1.1/download -> pikchr-0.1.1.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkcs8/0.6.1/download -> pkcs8-0.6.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.22/download -> pkg-config-0.3.22.crate https://crates.io/api/v1/crates/plotters/0.3.1/download -> plotters-0.3.1.crate https://crates.io/api/v1/crates/plotters-backend/0.3.2/download -> plotters-backend-0.3.2.crate https://crates.io/api/v1/crates/plotters-svg/0.3.1/download -> plotters-svg-0.3.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.15/download -> ppv-lite86-0.2.15.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.4/download -> predicates-tree-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-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-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.32/download -> proc-macro2-1.0.32.crate https://crates.io/api/v1/crates/pulldown-cmark/0.8.0/download -> pulldown-cmark-0.8.0.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quickcheck_macros/1.0.0/download -> quickcheck_macros-1.0.0.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/radium/0.6.2/download -> radium-0.6.2.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.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.5.1/download -> rand_core-0.5.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/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.7.0/download -> remove_dir_all-0.7.0.crate https://crates.io/api/v1/crates/ripemd160/0.9.1/download -> ripemd160-0.9.1.crate https://crates.io/api/v1/crates/roadmap/0.2.0/download -> roadmap-0.2.0.crate https://crates.io/api/v1/crates/rpassword/5.0.1/download -> rpassword-5.0.1.crate https://crates.io/api/v1/crates/rsa/0.3.0/download -> rsa-0.3.0.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-hash/1.1.0/download -> rustc-hash-1.1.0.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/rustversion/1.0.5/download -> rustversion-1.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.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.19/download -> schannel-0.1.19.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/security-framework/2.4.2/download -> security-framework-2.4.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.4.2/download -> security-framework-sys-2.4.2.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde-aux/2.3.0/download -> serde-aux-2.3.0.crate https://crates.io/api/v1/crates/serde_cbor/0.11.2/download -> serde_cbor-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.68/download -> serde_json-1.0.68.crate https://crates.io/api/v1/crates/serde_yaml/0.8.21/download -> serde_yaml-0.8.21.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/sha-1/0.9.8/download -> sha-1-0.9.8.crate https://crates.io/api/v1/crates/sha1collisiondetection/0.2.4/download -> sha1collisiondetection-0.2.4.crate https://crates.io/api/v1/crates/sha2/0.9.8/download -> sha2-0.9.8.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/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signature/1.3.2/download -> signature-1.3.2.crate https://crates.io/api/v1/crates/simple_asn1/0.4.1/download -> simple_asn1-0.4.1.crate https://crates.io/api/v1/crates/siphasher/0.3.7/download -> siphasher-0.3.7.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/slug/0.1.4/download -> slug-0.1.4.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/spki/0.3.0/download -> spki-0.3.0.crate https://crates.io/api/v1/crates/state/0.5.2/download -> state-0.5.2.crate https://crates.io/api/v1/crates/string_cache/0.8.2/download -> string_cache-0.8.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.25/download -> structopt-0.3.25.crate https://crates.io/api/v1/crates/structopt-derive/0.4.18/download -> structopt-derive-0.4.18.crate https://crates.io/api/v1/crates/subplot/0.3.1/download -> subplot-0.3.1.crate https://crates.io/api/v1/crates/subplot-build/0.1.0/download -> subplot-build-0.1.0.crate https://crates.io/api/v1/crates/subplotlib/0.1.1/download -> subplotlib-0.1.1.crate https://crates.io/api/v1/crates/subplotlib-derive/0.1.0/download -> subplotlib-derive-0.1.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.81/download -> syn-1.0.81.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/tempfile-fast/0.3.4/download -> tempfile-fast-0.3.4.crate https://crates.io/api/v1/crates/tera/1.13.0/download -> tera-1.13.0.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.0.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termtree/0.2.3/download -> termtree-0.2.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tinyvec/1.5.0/download -> tinyvec-1.5.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/tokio/1.14.0/download -> tokio-1.14.0.crate https://crates.io/api/v1/crates/tokio-macros/1.6.0/download -> tokio-macros-1.6.0.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.8/download -> tokio-util-0.6.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.29/download -> tracing-0.1.29.crate https://crates.io/api/v1/crates/tracing-appender/0.1.2/download -> tracing-appender-0.1.2.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.18/download -> tracing-attributes-0.1.18.crate https://crates.io/api/v1/crates/tracing-core/0.1.21/download -> tracing-core-0.1.21.crate https://crates.io/api/v1/crates/tracing-log/0.1.2/download -> tracing-log-0.1.2.crate https://crates.io/api/v1/crates/tracing-serde/0.1.2/download -> tracing-serde-0.1.2.crate https://crates.io/api/v1/crates/tracing-subscriber/0.2.25/download -> tracing-subscriber-0.2.25.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/twofish/0.5.0/download -> twofish-0.5.0.crate https://crates.io/api/v1/crates/typenum/1.14.0/download -> typenum-1.14.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/uncased/0.9.6/download -> uncased-0.9.6.crate https://crates.io/api/v1/crates/unescape/0.1.0/download -> unescape-0.1.0.crate https://crates.io/api/v1/crates/unic-char-property/0.9.0/download -> unic-char-property-0.9.0.crate https://crates.io/api/v1/crates/unic-char-range/0.9.0/download -> unic-char-range-0.9.0.crate https://crates.io/api/v1/crates/unic-common/0.9.0/download -> unic-common-0.9.0.crate https://crates.io/api/v1/crates/unic-segment/0.9.0/download -> unic-segment-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-segment/0.9.0/download -> unic-ucd-segment-0.9.0.crate https://crates.io/api/v1/crates/unic-ucd-version/0.9.0/download -> unic-ucd-version-0.9.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.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download -> wasm-bindgen-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download -> wasm-bindgen-backend-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download -> wasm-bindgen-macro-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download -> wasm-bindgen-macro-support-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download -> wasm-bindgen-shared-0.2.78.crate https://crates.io/api/v1/crates/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/win-crypto-ng/0.4.0/download -> win-crypto-ng-0.4.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/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/x25519-dalek/1.1.1/download -> x25519-dalek-1.1.1.crate https://crates.io/api/v1/crates/xxhash-rust/0.8.2/download -> xxhash-rust-0.8.2.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/zbase32/0.1.2/download -> zbase32-0.1.2.crate https://crates.io/api/v1/crates/zeroize/1.3.0/download -> zeroize-1.3.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.1.1/download -> zeroize_derive-1.1.1.crate
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d3cf0558939175a71e35d79525cce499
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 79b1b9359f4e..3d7a433bd66a 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0 b/metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0
deleted file mode 100644
index e96f0cd761a3..000000000000
--- a/metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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 ) python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
-EAPI=7
-HOMEPAGE=https://github.com/thesamesam/recover-broken-vdb
-INHERIT=distutils-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[python_targets_python3_10(-)] ) 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 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/1.0.0.tar.gz -> recover-broken-vdb-1.0.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4c7e8149e18c1a6abf355ff6ba6b72c8
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0-r1 b/metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0-r1
new file mode 100644
index 000000000000..8410dd96116f
--- /dev/null
+++ b/metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=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 ) python_single_target_python3_8? ( >=dev-python/gpep517-8[python_targets_python3_8(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-8[python_targets_python3_9(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-8[python_targets_python3_10(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
+EAPI=7
+HOMEPAGE=https://github.com/thesamesam/recover-broken-vdb
+INHERIT=distutils-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8? ( sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( sys-apps/portage[python_targets_python3_10(-)] ) 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 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/1.0.0.tar.gz -> recover-broken-vdb-1.0.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6a76b9288939780aed7aa43e936ea7cc
diff --git a/metadata/md5-cache/app-portage/recover-broken-vdb-9999 b/metadata/md5-cache/app-portage/recover-broken-vdb-9999
index 018301ee2311..d905800d62fb 100644
--- a/metadata/md5-cache/app-portage/recover-broken-vdb-9999
+++ b/metadata/md5-cache/app-portage/recover-broken-vdb-9999
@@ -1,4 +1,4 @@
-BDEPEND=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 ) python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_10(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=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 ) python_single_target_python3_8? ( >=dev-python/gpep517-8[python_targets_python3_8(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-8[python_targets_python3_9(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-8[python_targets_python3_10(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=Check Portage's VDB for internal inconsistency on ELF metadata
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=>=app-misc/pax-utils-1.3.3 sys-apps/file python_single_target_python3_8?
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2237c831728511b32d761d2427624740
+_md5_=571aaedfd1144b18e0608204434d1da6
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 4ebed428aa9c..4febf8490f64 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/jarowinkler-cpp-1.0.2 b/metadata/md5-cache/dev-cpp/jarowinkler-cpp-1.0.2
new file mode 100644
index 000000000000..4baf8a3ea6e6
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/jarowinkler-cpp-1.0.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-cpp/catch-3 )
+DESCRIPTION=Fast Jaro and Jaro Winkler distance
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/jarowinkler-cpp/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/jarowinkler-cpp/archive/v1.0.2.tar.gz -> jarowinkler-cpp-1.0.2.gh.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d65b82335f15c326eddf0bb39ecc1deb
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.6.0 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.6.0
new file mode 100644
index 000000000000..d531f0dfcd43
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.6.0
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-cpp/catch-3 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Rapid fuzzy string matching in C++
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.6.0.tar.gz -> rapidfuzz-cpp-1.6.0.gh.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6fd0f549df4c55037f1d24e8d6a2b97d
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1eb486faf0db..c81195882a70 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/gson-2.9.1 b/metadata/md5-cache/dev-java/gson-2.9.1
new file mode 100644
index 000000000000..220c9c324857
--- /dev/null
+++ b/metadata/md5-cache/dev-java/gson-2.9.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Gson JSON library
+EAPI=8
+HOMEPAGE=https://github.com/google/gson
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2.6
+SRC_URI=https://github.com/google/gson/archive/gson-parent-2.9.1.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=1143ded523b26415e6aa1abd4a964593
diff --git a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6 b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
deleted file mode 100644
index ee974d9e2c8c..000000000000
--- a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JSR 374 (JSON Processing) API
-EAPI=8
-HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jsonp
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/refs/tags/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=6c329892ea7e59d87209e53bb82d0310
diff --git a/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1 b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
new file mode 100644
index 000000000000..ff4131537645
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-json-api-1.1.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=JSR 374 (JSON Processing) API
+EAPI=8
+HOMEPAGE=https://projects.eclipse.org/projects/ee4j.jsonp
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=|| ( EPL-2.0 GPL-2-with-classpath-exception )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=1
+SRC_URI=https://github.com/eclipse-ee4j/jsonp/archive/1.1-1.1.6-RELEASE.tar.gz -> jakarta-json-api-1.1.6.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=16e7a8330d20712e4a37c8dfb8291e1f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 12039417f164..626e5c7cbcb6 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/jarowinkler-1.2.1 b/metadata/md5-cache/dev-python/jarowinkler-1.2.1
index 2a2456dae259..4c52f9686d3c 100644
--- a/metadata/md5-cache/dev-python/jarowinkler-1.2.1
+++ b/metadata/md5-cache/dev-python/jarowinkler-1.2.1
@@ -1,15 +1,17 @@
-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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=String matching in Python using various string metrics
+DEPEND=dev-cpp/jarowinkler-cpp
+DESCRIPTION=Fast fuzzy string matching using Jaro and Jaro-Winkler similarity
 EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/JaroWinkler
+HOMEPAGE=https://github.com/maxbachmann/JaroWinkler/ https://pypi.org/project/jarowinkler/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=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_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jarowinkler/jarowinkler-1.2.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c97b814bab006e524e5350b4d37d5aea
+_md5_=a309ba7b45e9abed948d6c545c3694c2
diff --git a/metadata/md5-cache/dev-python/pendulum-2.1.2-r1 b/metadata/md5-cache/dev-python/pendulum-2.1.2-r1
deleted file mode 100644
index 6dd879527308..000000000000
--- a/metadata/md5-cache/dev-python/pendulum-2.1.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytzdata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytzdata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Drop-in replacement for the standard datetime class
-EAPI=7
-HOMEPAGE=https://pendulum.eustace.io/ https://github.com/sdispater/pendulum
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytzdata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sdispater/pendulum/archive/2.1.2.tar.gz -> pendulum-2.1.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e52617d118afa6e46ac3b5c439a3d2f6
diff --git a/metadata/md5-cache/dev-python/pendulum-2.1.2-r2 b/metadata/md5-cache/dev-python/pendulum-2.1.2-r2
new file mode 100644
index 000000000000..2a11c486faf5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pendulum-2.1.2-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytzdata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytzdata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Drop-in replacement for the standard datetime class
+EAPI=7
+HOMEPAGE=https://pendulum.eustace.io/ https://github.com/sdispater/pendulum/ https://pypi.org/project/pendulum/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytzdata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sdispater/pendulum/archive/2.1.2.tar.gz -> pendulum-2.1.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9631160af81fe202cca15d19feda5990
diff --git a/metadata/md5-cache/dev-python/pytzdata-2020.1-r1 b/metadata/md5-cache/dev-python/pytzdata-2020.1-r1
deleted file mode 100644
index d3c1467df726..000000000000
--- a/metadata/md5-cache/dev-python/pytzdata-2020.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cleo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The Olson timezone database for Python
-EAPI=8
-HOMEPAGE=https://github.com/sdispater/pytzdata
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/cleo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sdispater/pytzdata/archive/2020.1.tar.gz -> pytzdata-2020.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d65620b36f79561503b7e76d3520a540
diff --git a/metadata/md5-cache/dev-python/pytzdata-2020.1-r2 b/metadata/md5-cache/dev-python/pytzdata-2020.1-r2
new file mode 100644
index 000000000000..ea6ef7a2273d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytzdata-2020.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cleo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The Olson timezone database for Python
+EAPI=8
+HOMEPAGE=https://github.com/sdispater/pytzdata/ https://pypi.org/project/pytzdata/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cleo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sdispater/pytzdata/archive/2020.1.tar.gz -> pytzdata-2020.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=684adb88e2313a8283976ba389a9f73f
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-2.9.0 b/metadata/md5-cache/dev-python/rapidfuzz-2.9.0
index aae6a31f6347..34f83ea77f96 100644
--- a/metadata/md5-cache/dev-python/rapidfuzz-2.9.0
+++ b/metadata/md5-cache/dev-python/rapidfuzz-2.9.0
@@ -1,16 +1,17 @@
-BDEPEND=>=dev-python/jarowinkler-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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/setuptools-42.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-python/jarowinkler-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=String matching in Python using various string metrics
+DEPEND=>=dev-cpp/taskflow-3.0.0 >=dev-cpp/jarowinkler-cpp-1.0.0 >=dev-cpp/rapidfuzz-cpp-1.0.1 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Rapid fuzzy string matching in Python using various string metrics
 EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/rapidfuzz
+HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=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_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
+RDEPEND=<dev-python/jarowinkler-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rapidfuzz/rapidfuzz-2.9.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d5dfbe36e81693fc081d24a693bb3ae1
+_md5_=9ee12cc63dd87c0cbd64460ef79f3f12
diff --git a/metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5 b/metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5
new file mode 100644
index 000000000000..b0c17cb137e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rapidfuzz_capi-1.0.5
@@ -0,0 +1,15 @@
+BDEPEND=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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C-API of RapidFuzz, which can be used to extend RapidFuzz
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/rapidfuzz_capi/ https://pypi.org/project/rapidfuzz-capi/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=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 )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/rapidfuzz_capi/archive/v1.0.5.tar.gz -> rapidfuzz_capi-1.0.5.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=729195bf0897e834ed97083890263653
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.12 b/metadata/md5-cache/dev-python/simpleeval-0.9.12
deleted file mode 100644
index 04fe56c3ccf4..000000000000
--- a/metadata/md5-cache/dev-python/simpleeval-0.9.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A simple, safe single expression evaluator library
-EAPI=8
-HOMEPAGE=https://github.com/danthedeckie/simpleeval
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.12.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=69ca2b8a3fb242b3952913a6520bfe42
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.12-r1 b/metadata/md5-cache/dev-python/simpleeval-0.9.12-r1
new file mode 100644
index 000000000000..2aa2b670f332
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simpleeval-0.9.12-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A simple, safe single expression evaluator library
+EAPI=8
+HOMEPAGE=https://github.com/danthedeckie/simpleeval/ https://pypi.org/project/simpleeval/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.12.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=195967368467319d22f5c8442e2536bb
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r1
deleted file mode 100644
index 21d4e04b3a7e..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Link to GitHub issues, pull requests, commits and users from Sphinx docs
-EAPI=7
-HOMEPAGE=https://github.com/jupyter/sphinxcontrib_github_alt
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD-2
-RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/sphinxcontrib_github_alt 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 )
-SLOT=0
-SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.2.tar.gz -> sphinxcontrib-github-alt-1.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a78246204e2467879d722c855be32d55
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r2
new file mode 100644
index 000000000000..c7f3cbda2e89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Link to GitHub issues, pull requests, commits and users from Sphinx docs
+EAPI=7
+HOMEPAGE=https://github.com/jupyter/sphinxcontrib_github_alt/ https://pypi.org/project/sphinxcontrib_github_alt/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=BSD-2
+RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/sphinxcontrib_github_alt 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 )
+SLOT=0
+SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.2.tar.gz -> sphinxcontrib_github_alt-1.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c0ee099bcd6edc5b2e7c88bd94c3ac9a
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index f1d96d7a6116..21b65b961ce0 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20210715 b/metadata/md5-cache/media-fonts/noto-emoji-20210715
deleted file mode 100644
index 42293d069263..000000000000
--- a/metadata/md5-cache/media-fonts/noto-emoji-20210715
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=buildfont? ( || ( >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/zopfli || ( ( >=dev-lang/python-3.9.12:3.9 >=dev-python/fonttools-4.7.0[python_targets_python3_9(-)] >=dev-python/nototools-0.2.13[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/fonttools-4.7.0[python_targets_python3_8(-)] >=dev-python/nototools-0.2.13[python_targets_python3_8(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DESCRIPTION=Google Noto Emoji fonts
-EAPI=7
-HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji
-INHERIT=font python-any-r1
-IUSE=buildfont X
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0 OFL-1.1
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/googlefonts/noto-emoji/archive/c05b4b47c8250ccd232780cae46d66a8179e77ab.tar.gz -> noto-emoji-20210715.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a92078f8b98b95934afb63ba7ea1333f
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20220912 b/metadata/md5-cache/media-fonts/noto-emoji-20220912
new file mode 100644
index 000000000000..094d4f36e161
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20220912
@@ -0,0 +1,14 @@
+BDEPEND=buildfont? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/zopfli || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/fonttools-4.7.0[python_targets_python3_10(-)] >=dev-python/nototools-0.2.13[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/fonttools-4.7.0[python_targets_python3_9(-)] >=dev-python/nototools-0.2.13[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/fonttools-4.7.0[python_targets_python3_8(-)] >=dev-python/nototools-0.2.13[python_targets_python3_8(-)] ) ) media-gfx/pngquant x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DESCRIPTION=Google Noto Emoji fonts
+EAPI=8
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji
+INHERIT=font python-any-r1
+IUSE=buildfont X
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0 OFL-1.1
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlefonts/noto-emoji/archive/e8073ab740292f8d5f19b5de144087ac58044d06.tar.gz -> noto-emoji-20220912.tar.gz
+_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fcab1ac190f4860aa7baa0c55c525c00
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index bac3d92e65db..56f006f15f4a 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/suil-0.10.16 b/metadata/md5-cache/media-libs/suil-0.10.16
deleted file mode 100644
index 8616bed08af9..000000000000
--- a/metadata/md5-cache/media-libs/suil-0.10.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) || ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] )
-DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
-EAPI=8
-HOMEPAGE=http://drobilla.net/software/suil/
-INHERIT=meson python-any-r1
-IUSE=doc gtk qt5
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=ISC
-RDEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
-SLOT=0
-SRC_URI=http://download.drobilla.net/suil-0.10.16.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f07dd609107e0821be5efe3baaf7f2b
diff --git a/metadata/md5-cache/media-libs/suil-0.10.16-r1 b/metadata/md5-cache/media-libs/suil-0.10.16-r1
new file mode 100644
index 000000000000..f12a6258ab8d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/suil-0.10.16-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/lv2 gtk2? ( x11-libs/gtk+:2 dev-libs/glib:2 ) gtk? ( x11-libs/gtk+:3 dev-libs/glib:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) X? ( x11-libs/libX11 )
+DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
+EAPI=8
+HOMEPAGE=https://drobilla.net/software/suil.html
+INHERIT=meson
+IUSE=doc gtk gtk2 qt5 X
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=ISC
+RDEPEND=media-libs/lv2 gtk2? ( x11-libs/gtk+:2 dev-libs/glib:2 ) gtk? ( x11-libs/gtk+:3 dev-libs/glib:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=https://download.drobilla.net/suil-0.10.16.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=70fe13d9029ed3f96bdb356341ea154b
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 7d59b4a7b5b8..308d05ad54c5 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/amsynth-1.13.0 b/metadata/md5-cache/media-sound/amsynth-1.13.0
index 74c042770b8e..472a3df7e404 100644
--- a/metadata/md5-cache/media-sound/amsynth-1.13.0
+++ b/metadata/md5-cache/media-sound/amsynth-1.13.0
@@ -10,8 +10,8 @@ IUSE=alsa dssi gtk jack lash lv2 nsm oss vst
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib:= media-sound/alsa-utils ) dssi? ( media-libs/dssi:= media-libs/liblo:= ) gtk? ( x11-libs/gtk+:2 x11-libs/libX11 ) jack? ( virtual/jack ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 )
-REQUIRED_USE=dssi? ( gtk ) lv2? ( gtk )
+REQUIRED_USE=dssi? ( gtk ) lv2? ( gtk ) vst? ( gtk )
 SLOT=0
 SRC_URI=https://github.com/amsynth/amsynth/releases/download/release-1.13.0/amsynth-1.13.0.tar.gz
 _eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=50dab15d9bcab12df1bc48d08fbd3d76
+_md5_=786732a310230f2df749e4292a835e46
diff --git a/metadata/md5-cache/media-sound/ardour-6.9-r2 b/metadata/md5-cache/media-sound/ardour-6.9-r2
index a550f92fa342..8c30fe6754d8 100644
--- a/metadata/md5-cache/media-sound/ardour-6.9-r2
+++ b/metadata/md5-cache/media-sound/ardour-6.9-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[gtk] media-libs/lv2 || ( >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] ) dev-util/itstool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) jack? ( virtual/jack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord || ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] ) media-libs/lv2 || ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] ) dev-util/itstool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) jack? ( virtual/jack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Digital Audio Workstation
 EAPI=7
 HOMEPAGE=https://ardour.org/
-INHERIT=eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
+INHERIT=toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 IUSE=doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[gtk] media-libs/lv2
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord || ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] ) media-libs/lv2
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-6.9.0.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	7ce00136a77130df46fbbd5966f98a61	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e22567da5962c660d00d1d6db7650ecf
+_md5_=de071180ff60398967fe53f3cc52785f
diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999
index 71d06eca97e7..7c2eaa1f143a 100644
--- a/metadata/md5-cache/media-sound/ardour-9999
+++ b/metadata/md5-cache/media-sound/ardour-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[gtk] media-libs/lv2 || ( >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] ) dev-util/itstool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) jack? ( virtual/jack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord || ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] ) media-libs/lv2 || ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] ) dev-util/itstool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) jack? ( virtual/jack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Digital Audio Workstation
 EAPI=7
 HOMEPAGE=https://ardour.org/
-INHERIT=eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg git-r3
+INHERIT=toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg git-r3
 IUSE=doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[gtk] media-libs/lv2
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord || ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] ) media-libs/lv2
 SLOT=7
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	7ce00136a77130df46fbbd5966f98a61	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=00b662d09846334e503bb7efef2ddfad
+_md5_=365a6f5019ba3bf39243c0baa5eb805d
diff --git a/metadata/md5-cache/media-sound/frescobaldi-3.2 b/metadata/md5-cache/media-sound/frescobaldi-3.2
deleted file mode 100644
index 9bd1eecafbe5..000000000000
--- a/metadata/md5-cache/media-sound/frescobaldi-3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=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 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-ly[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-sound/lilypond
-DESCRIPTION=A LilyPond sheet music text editor
-EAPI=8
-HOMEPAGE=https://www.frescobaldi.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 xdg
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-ly[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-sound/lilypond x11-themes/tango-icon-theme 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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v3.2/frescobaldi-3.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0b1934e88a873ce2f4839b3c26643560
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.10 b/metadata/md5-cache/media-sound/patchage-1.0.10
new file mode 100644
index 000000000000..4ba0b37b4412
--- /dev/null
+++ b/metadata/md5-cache/media-sound/patchage-1.0.10
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus ) dev-libs/boost >=dev-libs/libfmt-9:=
+DESCRIPTION=Modular patch bay for JACK-based audio and MIDI systems
+EAPI=8
+HOMEPAGE=https://drobilla.net/software/patchage
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson xdg
+IUSE=alsa jack jack-dbus test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.drobilla.net/patchage-1.0.10.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8ef72b106cd5c1f73c0d0a3532a3ced3
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.6 b/metadata/md5-cache/media-sound/patchage-1.0.6
index 4f75cf1d458e..bdcd9e153974 100644
--- a/metadata/md5-cache/media-sound/patchage-1.0.6
+++ b/metadata/md5-cache/media-sound/patchage-1.0.6
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus ) dev-libs/boost dev-libs/libfmt:= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus ) dev-libs/boost <dev-libs/libfmt-9:= dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Modular patch bay for JACK-based audio and MIDI systems
 EAPI=7
 HOMEPAGE=https://drobilla.net/software/patchage
@@ -12,4 +12,4 @@ RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv virtual/jack alsa? (
 SLOT=0
 SRC_URI=https://download.drobilla.net/patchage-1.0.6.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e8682e8abd3deab70d45b6504be52bd1
+_md5_=0d6e635e066c6b466337922e6d9b172d
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.8 b/metadata/md5-cache/media-sound/patchage-1.0.8
index cf5919acea87..104ccad183b0 100644
--- a/metadata/md5-cache/media-sound/patchage-1.0.8
+++ b/metadata/md5-cache/media-sound/patchage-1.0.8
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus ) dev-libs/boost dev-libs/libfmt:=
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus ) dev-libs/boost <dev-libs/libfmt-9:=
 DESCRIPTION=Modular patch bay for JACK-based audio and MIDI systems
 EAPI=8
 HOMEPAGE=https://drobilla.net/software/patchage
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.drobilla.net/patchage-1.0.8.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b707989c36fd443ad6beae4808e009cc
+_md5_=696993a0d9c904bf99ac929e6326e0fc
diff --git a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.6 b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.6
deleted file mode 100644
index 326d7d68af1d..000000000000
--- a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/mxml media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) dssi? ( media-libs/dssi ) fltk? ( x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXpm ) jack? ( virtual/jack ) lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio )
-DESCRIPTION=Software synthesizer capable of making a countless number of instruments
-EAPI=8
-HOMEPAGE=http://zynaddsubfx.sourceforge.net/
-INHERIT=cmake flag-o-matic
-IUSE=+alsa doc dssi +fltk jack lash portaudio
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/mxml media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) dssi? ( media-libs/dssi ) fltk? ( x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXpm ) jack? ( virtual/jack ) lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio )
-REQUIRED_USE=|| ( alsa jack portaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/zynaddsubfx/zynaddsubfx-3.0.6.tar.bz2
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4e5159df99e4692d1c8634dc1930b635
diff --git a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.6-r1 b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.6-r1
new file mode 100644
index 000000000000..7241121cfa1c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/ruby:* >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/mxml media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) doc? ( dev-texlive/texlive-fontutils ) dssi? ( media-libs/dssi ) fltk? ( x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXpm ) jack? ( virtual/jack ) lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio )
+DESCRIPTION=Software synthesizer capable of making a countless number of instruments
+EAPI=8
+HOMEPAGE=http://zynaddsubfx.sourceforge.net/
+INHERIT=cmake flag-o-matic
+IUSE=+alsa doc dssi +fltk jack lash portaudio
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/mxml media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) doc? ( dev-texlive/texlive-fontutils ) dssi? ( media-libs/dssi ) fltk? ( x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXpm ) jack? ( virtual/jack ) lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio )
+REQUIRED_USE=|| ( alsa jack portaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/zynaddsubfx/zynaddsubfx-3.0.6.tar.bz2
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a740ba9cfcae3a60a3883447502ef9bd
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index e1a383d0a51d..b3885730f43f 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/makemkv-1.17.1 b/metadata/md5-cache/media-video/makemkv-1.17.1
index 2b178d17a68b..133a3ec93334 100644
--- a/metadata/md5-cache/media-video/makemkv-1.17.1
+++ b/metadata/md5-cache/media-video/makemkv-1.17.1
@@ -9,9 +9,9 @@ INHERIT=flag-o-matic linux-info xdg
 IUSE=+gui +java
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
-RDEPEND=dev-libs/expat dev-libs/openssl:0=[-bindist(-)] >=media-video/ffmpeg-1.0.0:0= sys-libs/glibc sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) net-misc/wget java? ( >=virtual/jre-1.8 )
+RDEPEND=dev-libs/expat dev-libs/openssl:0=[-bindist(-)] >=media-video/ffmpeg-1.0.0:0= sys-libs/glibc sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) java? ( >=virtual/jre-1.8 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.17.1.tar.gz http://www.makemkv.com/download/makemkv-bin-1.17.1.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c8296ec696813ad22054111a565c8608
+_md5_=9f9411ee95e393e22c2bf243e73257ed
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 94a1f043e0c0..b779b0b54660 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/python-gvm-21.1.3 b/metadata/md5-cache/net-analyzer/python-gvm-21.1.3
deleted file mode 100644
index cf6e4f1d8d10..000000000000
--- a/metadata/md5-cache/net-analyzer/python-gvm-21.1.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Greenbone Vulnerability Management Python Library
-EAPI=7
-HOMEPAGE=https://www.greenbone.net/en/ https://github.com/greenbone/python-gvm/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/greenbone/python-gvm/archive/v21.1.3.tar.gz -> python-gvm-21.1.3.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=989ff0b6e7e30dffd1cca969f5cc31dc
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index a15b77b6a79f..5126acb3df80 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/zoom-5.11.10.4400 b/metadata/md5-cache/net-im/zoom-5.11.10.4400
new file mode 100644
index 000000000000..ad70bece9085
--- /dev/null
+++ b/metadata/md5-cache/net-im/zoom-5.11.10.4400
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
+DEFINED_PHASES=install postinst postrm prepare setup
+DESCRIPTION=Video conferencing and web conferencing service
+EAPI=8
+HOMEPAGE=https://zoom.us/
+INHERIT=desktop linux-info readme.gentoo-r1 wrapper xdg-utils
+IUSE=bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=!games-engines/zoom app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/quazip-1.0:0=[qt5(+)] media-libs/alsa-lib media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-libs/mesa[gbm(+)] media-sound/mpg123 net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc virtual/opengl x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango x11-libs/xcb-util-image x11-libs/xcb-util-keysyms opencl? ( virtual/opencl ) pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 wayland? ( dev-qt/qtwayland ) )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://zoom.us/client/5.11.10.4400/zoom_x86_64.tar.xz -> zoom-5.11.10.4400_x86_64.tar.xz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=90d5c69b1e62c55796e4ae46fc5873d9
diff --git a/metadata/md5-cache/net-im/zoom-5.11.3.3882-r1 b/metadata/md5-cache/net-im/zoom-5.11.3.3882-r1
deleted file mode 100644
index 95f002e5da78..000000000000
--- a/metadata/md5-cache/net-im/zoom-5.11.3.3882-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=Video conferencing and web conferencing service
-EAPI=8
-HOMEPAGE=https://zoom.us/
-INHERIT=desktop readme.gentoo-r1 wrapper xdg-utils
-IUSE=bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!games-engines/zoom app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/quazip-1.0:0=[qt5(+)] media-libs/alsa-lib media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-libs/mesa[gbm(+)] media-sound/mpg123 net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc virtual/opengl x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango x11-libs/xcb-util-image x11-libs/xcb-util-keysyms opencl? ( virtual/opencl ) pulseaudio? ( media-sound/pulseaudio ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 wayland? ( dev-qt/qtwayland ) )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://zoom.us/client/5.11.3.3882/zoom_x86_64.tar.xz -> zoom-5.11.3.3882_x86_64.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6e435c5301d7ea590aa5e5e87370b6a7
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index eb422afe1970..dc8979386dd2 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6 b/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6
deleted file mode 100644
index cf61aba6f4d0..000000000000
--- a/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) 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 ) python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] )
-DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
-EAPI=8
-HOMEPAGE=https://github.com/gbouvignies/chemex
-INHERIT=distutils-r1
-IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) 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 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gbouvignies/chemex/archive/2021.4.0-dev6.tar.gz -> chemex-2021.4.0_p6.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e88fafb6cccdbbff67212d6d8600b15b
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1 b/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1
new file mode 100644
index 000000000000..3ce6a4587410
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p6-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) 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 ) python_single_target_python3_8? ( >=dev-python/gpep517-8[python_targets_python3_8(-)] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-8[python_targets_python3_9(-)] >=dev-python/poetry-core-1.0.8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-8[python_targets_python3_10(-)] >=dev-python/poetry-core-1.0.8[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=8
+HOMEPAGE=https://github.com/gbouvignies/chemex
+INHERIT=distutils-r1
+IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) 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 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/chemex/archive/2021.4.0-dev6.tar.gz -> chemex-2021.4.0_p6.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4cc795e53a69163691239c881ed9435a
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2022.0.1 b/metadata/md5-cache/sci-chemistry/chemex-2022.0.1
deleted file mode 100644
index 49954d990fcc..000000000000
--- a/metadata/md5-cache/sci-chemistry/chemex-2022.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) 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 ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-22[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] )
-DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
-EAPI=8
-HOMEPAGE=https://github.com/gbouvignies/chemex
-INHERIT=distutils-r1
-IUSE=test test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) 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 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2022.0.1.tar.gz -> chemex-2022.0.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=45df81b0fcffdbad271944b16cfc5a8d
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2022.0.1-r1 b/metadata/md5-cache/sci-chemistry/chemex-2022.0.1-r1
new file mode 100644
index 000000000000..a74f3504876c
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-2022.0.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) 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 ) python_single_target_python3_9? ( >=dev-python/gpep517-8[python_targets_python3_9(-)] >=dev-python/poetry-core-1.0.8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-8[python_targets_python3_10(-)] >=dev-python/poetry-core-1.0.8[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=8
+HOMEPAGE=https://github.com/gbouvignies/chemex
+INHERIT=distutils-r1
+IUSE=test test python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_9(-)] >=dev-python/numpy-1.23.3[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_9(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_9(-)] >=dev-python/rich-12.5.1[python_targets_python3_9(-)] >=dev-python/scipy-1.9.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.2.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.5.3[python_targets_python3_10(-)] >=dev-python/numpy-1.23.3[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.2[python_targets_python3_10(-)] >=dev-python/rapidfuzz-2.8.0[python_targets_python3_10(-)] >=dev-python/rich-12.5.1[python_targets_python3_10(-)] >=dev-python/scipy-1.9.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) 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 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2022.0.1.tar.gz -> chemex-2022.0.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=36af9a222bdf212c884b7064d6025a64
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 1400946a6ede..55d451e00136 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/bpytop-1.0.61-r1 b/metadata/md5-cache/sys-process/bpytop-1.0.61-r1
deleted file mode 100644
index cb410fe8189a..000000000000
--- a/metadata/md5-cache/sys-process/bpytop-1.0.61-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Linux/OSX/FreeBSD resource monitor
-EAPI=7
-HOMEPAGE=https://github.com/aristocratos/bpytop
-INHERIT=distutils-r1
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aristocratos/bpytop/archive/v1.0.61.tar.gz -> bpytop-1.0.61.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ca6706550c93a7a907ef640ba04419e9
diff --git a/metadata/md5-cache/sys-process/bpytop-1.0.63 b/metadata/md5-cache/sys-process/bpytop-1.0.63
deleted file mode 100644
index cca0c03ca2f4..000000000000
--- a/metadata/md5-cache/sys-process/bpytop-1.0.63
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Linux/OSX/FreeBSD resource monitor
-EAPI=7
-HOMEPAGE=https://github.com/aristocratos/bpytop
-INHERIT=distutils-r1
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aristocratos/bpytop/archive/v1.0.63.tar.gz -> bpytop-1.0.63.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5ec0e7bb9f133d7d70e7bcf869aaf1d1
diff --git a/metadata/md5-cache/sys-process/bpytop-1.0.67 b/metadata/md5-cache/sys-process/bpytop-1.0.67
deleted file mode 100644
index df57888d0788..000000000000
--- a/metadata/md5-cache/sys-process/bpytop-1.0.67
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Linux/OSX/FreeBSD resource monitor
-EAPI=7
-HOMEPAGE=https://github.com/aristocratos/bpytop
-INHERIT=distutils-r1
-IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aristocratos/bpytop/archive/v1.0.67.tar.gz -> bpytop-1.0.67.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3be0426fce6bbdaf282ef882d04b23cf
diff --git a/metadata/md5-cache/sys-process/bpytop-1.0.68 b/metadata/md5-cache/sys-process/bpytop-1.0.68
deleted file mode 100644
index 4662b24ccecf..000000000000
--- a/metadata/md5-cache/sys-process/bpytop-1.0.68
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Linux/OSX/FreeBSD resource monitor
-EAPI=8
-HOMEPAGE=https://github.com/aristocratos/bpytop
-INHERIT=distutils-r1
-IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aristocratos/bpytop/archive/v1.0.68.tar.gz -> bpytop-1.0.68.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=24dc76327adb922144e62d09a29b07e6
diff --git a/metadata/md5-cache/sys-process/bpytop-1.0.68-r1 b/metadata/md5-cache/sys-process/bpytop-1.0.68-r1
new file mode 100644
index 000000000000..d40a914d7005
--- /dev/null
+++ b/metadata/md5-cache/sys-process/bpytop-1.0.68-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Linux/OSX/FreeBSD resource monitor
+EAPI=8
+HOMEPAGE=https://github.com/aristocratos/bpytop
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aristocratos/bpytop/archive/v1.0.68.tar.gz -> bpytop-1.0.68.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ece6e85edf8e8d527e270d9f4ccea65a
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 2f21093a7234..a95c1f69cf72 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/postfixadmin-3.3.11 b/metadata/md5-cache/www-apps/postfixadmin-3.3.11
deleted file mode 100644
index 1ba5df4fe171..000000000000
--- a/metadata/md5-cache/www-apps/postfixadmin-3.3.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
-DESCRIPTION=Web Based Management tool for Postfix style virtual domains and users
-EAPI=7
-HOMEPAGE=http://postfixadmin.sourceforge.net
-INHERIT=webapp
-IUSE=+mysql postgres +vacation vhosts
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) virtual/httpd-php mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) ) app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres )
-SLOT=3.3.11
-SRC_URI=https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-3.3.11.tar.gz
-_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=5f91f6dca32215f033226ff6099e2d5c
diff --git a/metadata/md5-cache/www-apps/postfixadmin-3.3.11-r1 b/metadata/md5-cache/www-apps/postfixadmin-3.3.11-r1
new file mode 100644
index 000000000000..846de81e08d1
--- /dev/null
+++ b/metadata/md5-cache/www-apps/postfixadmin-3.3.11-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=Web Based Management tool for Postfix style virtual domains and users
+EAPI=7
+HOMEPAGE=http://postfixadmin.sourceforge.net
+INHERIT=webapp
+IUSE=+mysql postgres +vacation vhosts
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( acct-group/vacation acct-user/vacation dev-perl/DBI dev-perl/Email-Sender dev-perl/Email-Valid dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset dev-perl/MIME-EncWords mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) virtual/httpd-php mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) ) app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres )
+SLOT=3.3.11-r1
+SRC_URI=https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-3.3.11.tar.gz
+_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=492ff2ac71eaa13d7cfc5d91249df261
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index b81ca2c16a31..4ae81a995592 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/vivaldi-5.4.2753.40 b/metadata/md5-cache/www-client/vivaldi-5.4.2753.40
deleted file mode 100644
index dabfab3f8404..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-5.4.2753.40
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DESCRIPTION=A browser for our friends
-EAPI=8
-HOMEPAGE=https://vivaldi.com/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=chromium-2 desktop unpacker xdg
-IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.40-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.40-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.40-1_arm64.deb )
-_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ed712b79f613228d67574e054165cf53
diff --git a/metadata/md5-cache/www-client/vivaldi-5.4.2753.47 b/metadata/md5-cache/www-client/vivaldi-5.4.2753.47
index f423dda78da0..6e4371f8f434 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.4.2753.47
+++ b/metadata/md5-cache/www-client/vivaldi-5.4.2753.47
@@ -5,11 +5,11 @@ HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop unpacker xdg
 IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.47-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.47-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.47-1_arm64.deb )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c91ac2d27bf30f3918339336bb7d010d
+_md5_=ed712b79f613228d67574e054165cf53
diff --git a/metadata/md5-cache/www-client/vivaldi-5.4.2753.51 b/metadata/md5-cache/www-client/vivaldi-5.4.2753.51
new file mode 100644
index 000000000000..354d20dd868d
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-5.4.2753.51
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DESCRIPTION=A browser for our friends
+EAPI=8
+HOMEPAGE=https://vivaldi.com/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=chromium-2 desktop unpacker xdg
+IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.51-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.51-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.4.2753.51-1_arm64.deb )
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2770.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2770.3
deleted file mode 100644
index 6d00b8c1f304..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2770.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DESCRIPTION=A browser for our friends
-EAPI=8
-HOMEPAGE=https://vivaldi.com/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=chromium-2 desktop unpacker xdg
-IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2770.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2770.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2770.3-1_arm64.deb )
-_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2797.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2797.3
new file mode 100644
index 000000000000..398f17d82a63
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.5.2797.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DESCRIPTION=A browser for our friends
+EAPI=8
+HOMEPAGE=https://vivaldi.com/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=chromium-2 desktop unpacker xdg
+IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2797.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2797.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.5.2797.3-1_arm64.deb )
+_eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index e3cf74301c24..e50cf489fb67 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.109-r1 b/metadata/md5-cache/www-servers/tomcat-7.0.109-r1
deleted file mode 100644
index 2948361a0d0d..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-7.0.109-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.15 ~dev-java/tomcat-servlet-api-7.0.109:3.0 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix
-IUSE=extra-webapps websockets doc source test
-KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 ~dev-java/tomcat-servlet-api-7.0.109:3.0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=7
-SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.109/src/apache-tomcat-7.0.109-src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7a1e1a0ec1613d9a66a07ca7eae97a48
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 995b6d6c8310..1c09450dd503 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-09-18T09:39:42Z
+TIMESTAMP 2022-09-18T15:39:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMm515fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMnO8NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC1xw/8C45UqQ5Z19gM09j35T6wPrmVY3OC+0QnBnzMiw1KvCDwCnqe+MpETpBR
-qhxjRYfopOmv21h2V0SMr2TrvAgD2R7yFGWdJKr6380jrBdwzhpvIusdjpdFnCDS
-AsfADyroMzyOF95QonPxtNi33IrS7CJaWTws15AL9C6dqRxfNTIwHbz3wONRlib6
-SfffEpQCJAnMzcFKZdQWd8qBJZQ1R4tk6xGm+dazzsSLL2sZtY5eGRHuv2S6gqkS
-08KcWOkwGwu9sK8FAxnJtWZWqpQA65e3KFZx4Tnoj4sDIJO35QqlFhiuWYxSdJGI
-3gjU6CeRfwHFHScuFn5bW3lk+PbGADIM82Kyi5HWRj4a+5+777E//tMuGgwulmst
-7diWv2o9HI5AWLJzGEen2Jqsqhu6HKYQaJBnEZdIBZ2kFW3urIAkbCouGpgAuojO
-7HMKr1dDLbcQ6G11UIHbQOSqJ1mKlT4+VZ8VoyTnglBGWBgATmnNNJuX+l63D00r
-T7AUDB1IyxX/m521xBbrgXNJwrfLbYjLzGxrr3+NEAaAAcRpJ0IrdtDqOv2w/4oW
-hTJBeUgTqjU2s9DtzcbLwWdsesEdzfp6ev4nBQ2Gf6Ag41myBsnRKZBsN8h7d7w3
-l2PWpX+Eh047ejtP4TNLq4RF90azPn7wHIQgC4kURQLztA3SmDc=
-=Uqeg
+klAN9Q//Wgdj9CiKy/fltgLpXaEfB5EDKVN+NqKgY+ndCHqzWhtDODy95hiBH2TM
+l+u79/U9v1eKndwnZ4jp3m8xznP/hBWR9dzVpgtHc5I4qMbJjxxhxkY5flKnLD1G
+EbV52RIWDPQMYl0u4TU9vy7nQq8bWP2RlY7kNFW+52ehEJvmDeCIbMLF0ZlV6ya+
++FIffQRGGastFFqVmnXTtmpzQvOECbsGKK6VaKZw9MI2usfsyIjWzGjbi9j80LAm
+kmeWaUMp+qq8/FM2jMvX/FA+57Yv9wDcQZXN0GoQnpK4/jK89lj5qYRlaLq+hktU
+wSNPXoC8ruepqod8EBCfvORGCCpNhLlL2zbUJRgMGRZopwFffXrwzENeWfaUmkjr
+/e5eck7QJA9yO/pMEDQH3PR+NEdK0wNZrDqO2onbZQQ7PmtHLX8symuzyTpIXXR4
+wRX/WgCdnFCU6bWsMfXCRO9xt/v9G0Z9EOILocIcPJFa4XTfags8wze0PMQ1o6Qt
+8Q6/QQpymwo+NX6Vu3UJoyMS6/jCWSdhEg6W0nTovizcOUtYj/6yGPgZHDgH7BJa
+jWJebyWaKGV8DmtdqA/xfuV1XsRee7j0eIhunSMDhbzoov+yuM4wqb01qFa/rj/M
+7JCOKcxQbDt/HArAAaLCPX1E35fFdA2Hstjp4gbgOpaCuwO2JpQ=
+=Z1a/
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7dd7c86ffb37..f82496810a03 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 09:39:38 +0000
+Sun, 18 Sep 2022 15:39:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d05e05b1a3fb..456baf636528 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Sep 18 09:39:38 AM UTC 2022
+Sun Sep 18 03:39:40 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b7f1f8a7a8b6..565d54d03e93 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 09:45:01 +0000
+Sun, 18 Sep 2022 15:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9ae2c933296e..1e841f40f1ff 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-134eb502c4a7cea664551df567100789b2f91507 1663493532 2022-09-18T09:32:12+00:00
+3b918754ee7be5ad728e00234b2350e0eeb378c3 1663515273 2022-09-18T15:34:33+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index aa2074494644..38c5b4d66558 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1663494001 Sun 18 Sep 2022 09:40:01 AM UTC
+1663515601 Sun 18 Sep 2022 03:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7dd7c86ffb37..f82496810a03 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Sep 2022 09:39:38 +0000
+Sun, 18 Sep 2022 15:39:40 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3bddefa6f874..e50e9b59a34b 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest
index d6f3a9b5247f..f6edc41b7c3b 100644
--- a/net-analyzer/python-gvm/Manifest
+++ b/net-analyzer/python-gvm/Manifest
@@ -1,5 +1,3 @@
-DIST python-gvm-21.1.3.tar.gz 244785 BLAKE2B 7f0a63651a01a914359ea683cf52fe2e1ced22aba0bb90d232c4e5a13f25bb0a9d76a647c2bbe34f0be9615c0ce4d7fb938eee3fbe3a2389b7483b4d55069fee SHA512 eb92be77e69303e0ece54efb5bceaefb469ab1c3f4a2714ec1c839d43584e5760618c39a133aaaeb436c9f62d6deec8f40608e792f408e8cae7c083db857183f
 DIST python-gvm-21.11.0.tar.gz 230324 BLAKE2B 1c4ca09f62dbeb6863e6f2da7188fd499d38ec9e1c01a2cac3534b2bff996082a5075a437e225a51bbb98f7a6ebc67062f5bd31ac1ce1a831a82bcc85f377a62 SHA512 df1fe64c65453a782dd89615cb6426a47091c82899d73855ec14174ea01ca3066a987eacb4f553c575695c6a962ec635023d0b79eafe143b564e4dfe494cc2a9
-EBUILD python-gvm-21.1.3.ebuild 683 BLAKE2B a85505205965fefdca9f5ce263a96c9abafe00596ff9df0a4a01907b8b5462147ef0ccfd4311bfd16114d7814999b3d9cf878c4d7342ee0ead122766e7478ebd SHA512 467ec1bcc05b1bdf00d74c2df29efa053a98428b668cbf65406e4e5dc258025ae708723d982caf9f8b87e517d0bb43e2ca602c9884aa563b2b2be535f9625c6a
 EBUILD python-gvm-21.11.0.ebuild 761 BLAKE2B eca33332622e0fc5ae4c2b85c0c8f72b90215807c212a83ca975ae14a7db173694e7b3f938081d8de965a96e47532b6c1c3307d7cbc4a0a6d97ee4275e9b0331 SHA512 cc11715ed10aaa52a18b8f222ff5c6d98a18ddef8bca78a21e932b2f4b564db6e967cbb0500dc98a13e20724d7062d8e03655e0a78e65c0c4dfdade4f149425f
 MISC metadata.xml 910 BLAKE2B a6209f005be28029d5aa5d9da8ff7224aa477aef39fce1c5276072ee51aea61741db445707223467ad6e7a0c6a8ffdf58253245600aa3d03a87418f717c58ce2 SHA512 5ad5915c9d19c5653c47f190fa58d2b7e0ad4961218702596d5d7aa09adb6bf4e679104bf4c4e6783307e6f0b2ec71ca1027b8ecdb8edb91c22a31b3c0c90b3d
diff --git a/net-analyzer/python-gvm/python-gvm-21.1.3.ebuild b/net-analyzer/python-gvm/python-gvm-21.1.3.ebuild
deleted file mode 100644
index 21cee4b94358..000000000000
--- a/net-analyzer/python-gvm/python-gvm-21.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Greenbone Vulnerability Management Python Library"
-HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/python-gvm/"
-SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}"
-
-distutils_enable_tests unittest
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 028ed48de628..918002a9f1a8 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 008846247792..1df49646c18b 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,5 +1,5 @@
-DIST zoom-5.11.3.3882_x86_64.tar.xz 132055676 BLAKE2B bef2b6eadcc2595e3cf4c004f2faf94831d5b1b4289b49654c16030276804893bf5f7192cfd437e28470ba5b891933321a76792e8d8588416ac0284d8654a856 SHA512 56c67ce44a88ec01732150b17b81ad9109329fa0f833eefcd32c5c029eb47928371571296745ae458147953cb9109f5622de1040d0f5bac70e118ae6a4ee18da
+DIST zoom-5.11.10.4400_x86_64.tar.xz 132583796 BLAKE2B a81771f5f07943d28f5ad9e2d1d349ca1245841f69589c552cf8db81179486e9e6dad12db13bb9403d184d28f994255ec124077c163025fd21b5f9882eb16c3c SHA512 d662c58877f5976ca8e4fd4b77ec67fe8769e3954df9a13fe1f7ddd4073db2df430287dbe5b124dbfad854deaa73f5a89dbbc5131a058c85c6f6ed3f5f0767ec
 DIST zoom-5.11.9.4300_x86_64.tar.xz 132589368 BLAKE2B 44232cb69d69f2be15639d7c633a311645d645b93e9c367e74ab3df5153b9cbbe2ac8d8554849d56b8512b50357637aa9134893174014571929a6deb6fdba0c9 SHA512 421ad949f9e3a266170864551336f40daeb6e72979174ec8fc796eadb5e5b132f7267c812d92a845fa9d5ca94aacc047336ab655246d8de56b7844432952811b
-EBUILD zoom-5.11.3.3882-r1.ebuild 5296 BLAKE2B 5966a1d4cd52cfa15b00d4a3f6b24455fde2dd06d7dbb1edb729b81899ed7b4949f8b244014babb4dffbf85b56f726a786836a956fd44e555b62789fa1114909 SHA512 bfa0eebfef2210d722af26657c407eab8b42cadaf778ec50d636809cbab9aeba886e1ab4f35dfe9f48c1aa972b9ba3cdeaee274b69fe2e04b867441eab4d1536
+EBUILD zoom-5.11.10.4400.ebuild 5360 BLAKE2B b684fa13816789313a65cbc9b0585d60170588cb56c0859e7ce1d913507500b435d8937469f59604190ff93c62619f7bffbd3f65ccd27f0bef4683c48d5ffa67 SHA512 eea31a15997ea6dfa2817987534a99ab1b790bd716844915ffe7ac5413a79398d7db087a991b4eb15af72a3511f33289b096609e38e6027495932454330a667b
 EBUILD zoom-5.11.9.4300-r4.ebuild 5360 BLAKE2B b684fa13816789313a65cbc9b0585d60170588cb56c0859e7ce1d913507500b435d8937469f59604190ff93c62619f7bffbd3f65ccd27f0bef4683c48d5ffa67 SHA512 eea31a15997ea6dfa2817987534a99ab1b790bd716844915ffe7ac5413a79398d7db087a991b4eb15af72a3511f33289b096609e38e6027495932454330a667b
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.11.10.4400.ebuild b/net-im/zoom/zoom-5.11.10.4400.ebuild
new file mode 100644
index 000000000000..0e53f1f8aa8c
--- /dev/null
+++ b/net-im/zoom/zoom-5.11.10.4400.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop linux-info readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/quazip-1.0:0=[qt5(+)]
+	media-libs/alsa-lib
+	media-libs/fdk-aac:0/2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa[gbm(+)]
+	media-sound/mpg123
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	opencl? ( virtual/opencl )
+	pulseaudio? ( media-libs/libpulse )
+	wayland? ( dev-libs/wayland )
+	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
+	!bundled-qt? (
+		dev-libs/icu
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtdiag:5
+		dev-qt/qtgraphicaleffects:5
+		dev-qt/qtgui:5
+		dev-qt/qtlocation:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5[widgets]
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+BDEPEND="dev-util/bbe
+	bundled-libjpeg-turbo? ( dev-util/patchelf )"
+
+CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+
+	# The tarball doesn't contain an icon, so extract it from the binary
+	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
+		|| die "Extraction of icon failed"
+
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		# Remove insecure RPATH from bundled lib
+		patchelf --remove-rpath libturbojpeg.so || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r cef json ringtone scheduler sip timezones translations
+	doins *.pcm Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher *.sh
+	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
+
+	if use opencl; then
+		doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
+	fi
+
+	if use bundled-qt; then
+		doexe libicu*.so.56 libQt5*.so.5
+		doins qt.conf
+
+		local dirs="Qt* bearer generic iconengines imageformats \
+			platforminputcontexts platforms wayland* xcbglintegrations"
+		doins -r ${dirs}
+		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
+
+		(	# Remove libs and plugins with unresolved soname dependencies
+			cd "${ED}"/opt/zoom || die
+			rm -r Qt/labs/location QtQuick/LocalStorage QtQuick/Particles.2 \
+				QtQuick/Scene2D QtQuick/Scene3D QtQuick/XmlListModel \
+				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
+			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
+				platforms/libqwayland*.so || die
+		)
+	else
+		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
+		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
+			ewarn "You have disabled the bundled-qt USE flag."
+			ewarn "You may experience problems when running Zoom with"
+			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
+			ewarn "See https://bugs.gentoo.org/798681 for details."
+		fi
+	fi
+
+	make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef
+	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
+		"Network;VideoConference;" \
+		"MimeType=$(printf '%s;' \
+			x-scheme-handler/zoommtg \
+			x-scheme-handler/zoomus \
+			application/x-zoom)"
+	doicon videoconference-zoom.svg
+	doicon -s scalable videoconference-zoom.svg
+
+	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
+		the whiteboard) require display compositing. If you encounter
+		a black window when sharing the screen, then one of the following
+		actions should help:
+		\\n- Enable compositing in your window manager if it is supported
+		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-im/zoom/zoom-5.11.3.3882-r1.ebuild b/net-im/zoom/zoom-5.11.3.3882-r1.ebuild
deleted file mode 100644
index a595add9a468..000000000000
--- a/net-im/zoom/zoom-5.11.3.3882-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop readme.gentoo-r1 wrapper xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	app-accessibility/at-spi2-atk
-	app-accessibility/at-spi2-core
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	media-libs/alsa-lib
-	media-libs/fdk-aac:0/2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa[gbm(+)]
-	media-sound/mpg123
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	opencl? ( virtual/opencl )
-	pulseaudio? ( media-sound/pulseaudio )
-	wayland? ( dev-libs/wayland )
-	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="dev-util/bbe
-	bundled-libjpeg-turbo? ( dev-util/patchelf )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
-		|| die "Extraction of icon failed"
-
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-
-	if use bundled-libjpeg-turbo; then
-		# Remove insecure RPATH from bundled lib
-		patchelf --remove-rpath libturbojpeg.so || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r cef json ringtone scheduler sip timezones translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh
-	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
-
-	if use opencl; then
-		doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
-	fi
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so
-	else
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
-	fi
-
-	if use bundled-qt; then
-		doexe libicu*.so.56 libQt5*.so.5
-		doins qt.conf
-
-		local dirs="Qt* bearer generic iconengines imageformats \
-			platforminputcontexts platforms wayland* xcbglintegrations"
-		doins -r ${dirs}
-		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
-
-		(	# Remove libs and plugins with unresolved soname dependencies
-			cd "${ED}"/opt/zoom || die
-			rm -r Qt/labs/location QtQuick/LocalStorage QtQuick/Particles.2 \
-				QtQuick/Scene2D QtQuick/Scene3D QtQuick/XmlListModel \
-				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
-			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
-				platforms/libqwayland*.so || die
-		)
-	else
-		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
-
-	make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef
-	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
-		"Network;VideoConference;" \
-		"MimeType=$(printf '%s;' \
-			x-scheme-handler/zoommtg \
-			x-scheme-handler/zoomus \
-			application/x-zoom)"
-	doicon videoconference-zoom.svg
-	doicon -s scalable videoconference-zoom.svg
-
-	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
-		the whiteboard) require display compositing. If you encounter
-		a black window when sharing the screen, then one of the following
-		actions should help:
-		\\n- Enable compositing in your window manager if it is supported
-		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index dcc552da3aa7..8f387987f7b5 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index f553ccc371f7..8dffe429cb8d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,20 @@
 
 #--- END OF EXAMPLES ---
 
+# Pacho Ramos <pacho@gentoo.org> (2022-09-18)
+# ABRT environment keeps breaking more and more on non-Fedora systems.
+# Removal: 2022-10-18.  Bugs #849305, #849092, #849095, #713858.
+app-admin/abrt
+app-admin/gnome-abrt
+dev-libs/libreport
+dev-libs/satyr
+
+# Pacho Ramos <pacho@gentoo.org> (2022-09-18)
+# Unmaintained for a long time and unneeded with current pulseaudio and
+# pipewire versions.
+# Removal: 2022-10-18.
+media-sound/pulseaudio-modules-bt
+
 # Joonas Niilola <juippis@gentoo.org> (2022-09-16)
 # This theme has been incorporated to enlightenment-0.25, and with
 # 0.24 removed from Gentoo's git tree, this ebuild is useless. Removal
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 25be96b74748..1baf084f7fa5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4405,6 +4405,7 @@ media-libs/sge:image - enable sdl-image support
 media-libs/spandsp:fixed-point - Enable fixed point support
 media-libs/speex:utils - Enables speex commandline utilities (speexenc, speexdec).
 media-libs/speex:vbr - Enable VBR support.
+media-libs/suil:gtk2 - Enable GTK2 based GUI support
 media-libs/svgalib:kernel-helper - Build the helper kernel module
 media-libs/tremor:low-accuracy - enable 32bit only multiply operations
 media-libs/urt:tools - Install tools
@@ -8771,7 +8772,6 @@ www-servers/sniproxy:dns - Enable DNS resolver via net-libs/udns
 www-servers/sniproxy:largefile - Enable large file support (so we can log more than 2GB)
 www-servers/sniproxy:rfc3339 - Use RFC3339 timestamp format in log.
 www-servers/tomcat:extra-webapps - Build also the docs and examples webapp
-www-servers/tomcat:websockets - Builds websockets api and implementation (requires java 7)
 www-servers/uwsgi:embedded - Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.
 www-servers/uwsgi:go - Build the gccgo plugin to run Go applications.
 www-servers/uwsgi:json - Support json as a configuration file format.
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 34e31440f73b..f5ab0eafca59 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index 9df3200797ae..68ab0b96d591 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,5 +1,5 @@
 DIST chemex-2021.4.0_p6.tar.gz 2395324 BLAKE2B adb08fdebe816b66359c8a567d7f7a4600715015e6f9b86b568cb8e3cd5e66b040895c09688a956cedd398a7c56a6d3a73d77f647a2f4e83280a91879a6184d0 SHA512 7d20ae73a2cf52f9d21b875cd661cefc14ce36ff603402e5dacad3e21bcb0bdb28f8f111414691b99f93196a971215d0beec3fff07535d3d781b4e7bb6782c52
 DIST chemex-2022.0.1.tar.gz 2840066 BLAKE2B 05e3cd048a996b85e9a88297180bdd6e0b972619f5ac734d10a5744e7ab28fa2080bf6d6b53b69d04192ca420a24014f7eded0668ec716218ca4cc4877875ec9 SHA512 c2b49d83d618e69e43737b9d8b6a16de4fc46b481b2c65aaa4110bf425cd71bd5347240e7336855ec294ea126dd036262535645fca93ae352616f1a71b11e698
-EBUILD chemex-2021.4.0_p6.ebuild 1292 BLAKE2B 2264c354a978cb6e2cb77431aa491d18cb96883aa03dc06781265060b13045f26a6181a6ab19bbc81cf84dcac39ad6b5899af067917066d1db246a3a44229e87 SHA512 dbb95167c9615e44627387d5a599520bff593739e9406089f8daea0355fa309f98e27d0c297c8241db5dfe8673adfa92bf055109ac51aa83f29856a8b0e17826
-EBUILD chemex-2022.0.1.ebuild 1399 BLAKE2B 2b70699cf42eef7c72af2fbce5f5b9ad9a7569465c7f90e4523af0819ae413e57df676197acaa1337a95b072dbb45d63da8b1e7590772bd8f55c9994845e5466 SHA512 22ea8bdbfa85dc3dcf948ce62580f212d17ce7f0ac691d55d9afc123892c4ff6ccbe7b3335cc04a7f53718de6b925ee8ce3fe0e8d766b3c15c08ef75fcc86189
+EBUILD chemex-2021.4.0_p6-r1.ebuild 1142 BLAKE2B 6811e7f75ba8604ac23af16b2b3d82f10f9136fcef5fbed001ecda53c50ba462add05a5284217a82c4c51309bffccdf9feda9229dbdb0f8e1d466d41be02c242 SHA512 2306a47cec2f17f0f1c7fa3ca98b4d5a0c3733284a5b7004e7b5a6584b14210659006825dd9bebb151091ab3b40622b707d453ae0252e8852460ecf857ee8e33
+EBUILD chemex-2022.0.1-r1.ebuild 1249 BLAKE2B 832d5323349b107606813e7eceae349ee1b9d591613de21f14887b67102b043c2155b3d1e758d66855d4547057e71bce2f887042e66f732d6677cec44ad998f3 SHA512 a9b1dd5c3c10ca9a221541c7426d08ebcba84421a634c8a71776bbf1e7c5b5bda281fb6890ae64104fe677c1723de881a54aedd3b98d667bea975796318d9908
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild b/sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild
new file mode 100644
index 000000000000..3b5a05f349d5
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-2021.4.0_p6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL="yes"
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+
+#RESTRICT="!test? ( test )"
+# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.4.3[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.7.2[${PYTHON_USEDEP}]
+		>=dev-python/tqdm-4.61.1[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild b/sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild
deleted file mode 100644
index 62c958f646d3..000000000000
--- a/sci-chemistry/chemex/chemex-2021.4.0_p6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_SINGLE_IMPL="yes"
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
-HOMEPAGE="https://github.com/gbouvignies/chemex"
-SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="test"
-
-#RESTRICT="!test? ( test )"
-# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.4.3[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21.2[${PYTHON_USEDEP}]
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tomlkit-0.7.2[${PYTHON_USEDEP}]
-		>=dev-python/tqdm-4.61.1[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
diff --git a/sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild b/sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild
new file mode 100644
index 000000000000..9abd2a6493fb
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-2022.0.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL="yes"
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+
+#RESTRICT="!test? ( test )"
+# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
+		>=dev-python/cachetools-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.5.3[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.23.3[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.2[${PYTHON_USEDEP}]
+		>=dev-python/rapidfuzz-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/rich-12.5.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.9.1[${PYTHON_USEDEP}]
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/sci-chemistry/chemex/chemex-2022.0.1.ebuild b/sci-chemistry/chemex/chemex-2022.0.1.ebuild
deleted file mode 100644
index 073cdcbe2dac..000000000000
--- a/sci-chemistry/chemex/chemex-2022.0.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_SINGLE_IMPL="yes"
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
-HOMEPAGE="https://github.com/gbouvignies/chemex"
-SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="test"
-
-#RESTRICT="!test? ( test )"
-# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
-		>=dev-python/cachetools-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.5.3[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23.3[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.2[${PYTHON_USEDEP}]
-		>=dev-python/rapidfuzz-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/rich-12.5.1[${PYTHON_USEDEP}]
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.9.1[${PYTHON_USEDEP}]
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index db65c603dfa8..f874518b9aeb 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/bpytop/Manifest b/sys-process/bpytop/Manifest
index 41046cd68b47..4f217eba4577 100644
--- a/sys-process/bpytop/Manifest
+++ b/sys-process/bpytop/Manifest
@@ -1,11 +1,4 @@
-AUX bpytop-1.0.61-tests.patch 768 BLAKE2B 9b5628081b134310dc0bddfc6bbc2c378ab0d28199434a816475b7db6f0a0aac32f8861b48fbfc56ae338b1d25882a06dbc9c3de233fe0b105bab711c251b2a8 SHA512 b024e338b81034d3c10ccb6fda5a6e942fbf3481caeb4384111f12cfec40ff3a28f009d45854f0daf04c2945256de8b6a77bcb9c0d3424e69fea056508c5c074
 AUX bpytop-1.0.63-tests.patch 1326 BLAKE2B bf35b34611964e005cdac75054ea2733309e68637df95c3df3c58cd076156b44c1f7dab45c986cde5fa02296efdebeff67d1f6955032f98fdf43c4ea27728e08 SHA512 b75f667226ce466305037b271060656edf08f2941351012cb02bf59048ae696c052d7a80de80932256728b256524dc8f778e8d449dc011432a54f8f8ba34ae73
-DIST bpytop-1.0.61.tar.gz 626468 BLAKE2B 84a9bbaec6af27b06af53acbe2e735421de3bc4567fcf7fb29d05f801f7414b4e035e67a2fecb27a45d4d91c1d6ef527a16775f44c2e5620ecf797794969a2d2 SHA512 639e0d94bd500477b8288400c6fa1769f1b7327733bec8292e72eb3024e26f6242901970dfc539d9fb309f69299ea934e02ab93226f907ddbbefb670bffb027c
-DIST bpytop-1.0.63.tar.gz 627729 BLAKE2B a61d7c101c05d8e706b5c89f3c52dd02cf99e126d73f4cdb58adf8e474774e618abce7184a6fcf1c1b69f4c491b088c4c715d7b803c56933e1a8eeb8efa77fec SHA512 85334a43137466992fe3003f7f29b6a66b41732d1953fd5653ce277d35735127eef97607599906c0d0cfc7323852da75541b2ae79db22f843892097a2d3398e4
-DIST bpytop-1.0.67.tar.gz 628491 BLAKE2B 9ce35332dde806d132fee42f04f787e9220f05644e938d83725369157032a556c89d216a393a52a26fa6c6841a2b91b8212ee122ba734e1aedc912f7a02d350b SHA512 bfd6b365d4d76521cb5d1edccfd858732143a1a9273dc0e17d348c824c125df904b1160d9e7f81d718f880c4f3eea33d045a684706039bceb7f95ed67df2b56b
 DIST bpytop-1.0.68.tar.gz 632649 BLAKE2B a32a3b583b31c2c2013f4d2bb8834cf02a8702d37f723e304691eecdebcf32e21f639428abe7f5251c075aa73ed46f610e47c4241092455351001c31b2a051b5 SHA512 88a8be5cb5bbf5516dbafeb4d513d6a489ae9a8a84de316e2331a428cd4f338f8e01ed2eedd92c610b722c06dd968d85baf27692316f905855aca3d8a67a731d
-EBUILD bpytop-1.0.61-r1.ebuild 710 BLAKE2B 65f31779d8ec7541de778a046d05837bd30ae24222d47f1f6f71c1a740061e2402ca3b157503aa167068f94e963c14243f6c23bc8396e983ad10923e5420cd51 SHA512 493910aaa46a19175de31abb3a1c91fc1b250f3a5ba1c3d7ed309b32ce7c05248b6ebe973eaae614fd84fe559bcf108e9ee1a19eaa5fad6bec005c04d3c18b2e
-EBUILD bpytop-1.0.63.ebuild 709 BLAKE2B a531a7390fbab83b01852b57d05b95c086ec3454a075e9cf55e73f3a20200dc78b0045ae6604bc1cebb228acfc37e9b7403c9bf47eec05dbda527b130de1f15f SHA512 e7f4912a0ec0a3481cf8d87a1169c608a6bc67b872161ed7d7c50a06e4113983280df2617831f8ad63c5eeaa3df86ed6d850fe5772c053ea478886837b39979a
-EBUILD bpytop-1.0.67.ebuild 730 BLAKE2B d3eec3fe7ad6ce906840f5400d567933d770ba24b6b460fa6e3ff8dca829ae1c86210b64f299bc0f0bf9d982b11884d408f1c3289275a0269355a31405e0d524 SHA512 783ddf022703635b16b82cf21400e6f3479683f8f2e7eb19041cc882c7c41fa3825fd1f248bf68f525bfa55d35550ffe73839923404cf2c0690d0a0af65f4953
-EBUILD bpytop-1.0.68.ebuild 729 BLAKE2B 19d21d50aaf1c4162bd414a670afa492df1cee6cc455283542e132beea54ed90c2fe6319a8cc4fae81445823cc56049be6f2ae18160896d8ff73541b02983e06 SHA512 857111f29661a4f0fd2939a895521d11378baaa3eea71fbe1bd76a069579f1e8c40ac25cd11ceb2d8c5d511332e879a659047d88a135d6b9e2408672565b11e2
+EBUILD bpytop-1.0.68-r1.ebuild 706 BLAKE2B 5260547bf52fc122ebd005bb9a2d4af104ee66d023de0f95230aa2507bebe0a8b198b83cdf73061df7332e12a752c5af7a41c7888e60dd1f4ee4e6684b4a906c SHA512 c7c636cbca75e84e7c7af3b6d6014096afc3614948a0e69e0dad5460cb14a2846992ed75803e83222f24cc4ddaf45c54ed2633ef37abee8d5d4f9b6bec93aad8
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/sys-process/bpytop/bpytop-1.0.61-r1.ebuild b/sys-process/bpytop/bpytop-1.0.61-r1.ebuild
deleted file mode 100644
index f6f0711dff40..000000000000
--- a/sys-process/bpytop/bpytop-1.0.61-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Linux/OSX/FreeBSD resource monitor"
-HOMEPAGE="https://github.com/aristocratos/bpytop"
-SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/psutil-5.7.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/bpytop-1.0.61-tests.patch"
-)
-
-src_install() {
-	insinto "/usr/share/${PN}/themes"
-	doins bpytop-themes/*.theme
-	distutils-r1_src_install
-}
diff --git a/sys-process/bpytop/bpytop-1.0.63.ebuild b/sys-process/bpytop/bpytop-1.0.63.ebuild
deleted file mode 100644
index ad730c667c56..000000000000
--- a/sys-process/bpytop/bpytop-1.0.63.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Linux/OSX/FreeBSD resource monitor"
-HOMEPAGE="https://github.com/aristocratos/bpytop"
-SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/psutil-5.7.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/bpytop-1.0.63-tests.patch"
-)
-
-src_install() {
-	insinto "/usr/share/${PN}/themes"
-	doins bpytop-themes/*.theme
-	distutils-r1_src_install
-}
diff --git a/sys-process/bpytop/bpytop-1.0.67.ebuild b/sys-process/bpytop/bpytop-1.0.67.ebuild
deleted file mode 100644
index eab03f77eecc..000000000000
--- a/sys-process/bpytop/bpytop-1.0.67.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Linux/OSX/FreeBSD resource monitor"
-HOMEPAGE="https://github.com/aristocratos/bpytop"
-SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/psutil-5.7.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/bpytop-1.0.63-tests.patch"
-)
-
-src_install() {
-	insinto "/usr/share/${PN}/themes"
-	doins bpytop-themes/*.theme
-	distutils-r1_src_install
-}
diff --git a/sys-process/bpytop/bpytop-1.0.68-r1.ebuild b/sys-process/bpytop/bpytop-1.0.68-r1.ebuild
new file mode 100644
index 000000000000..70dd6357c461
--- /dev/null
+++ b/sys-process/bpytop/bpytop-1.0.68-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Linux/OSX/FreeBSD resource monitor"
+HOMEPAGE="https://github.com/aristocratos/bpytop"
+SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/psutil-5.7.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/bpytop-1.0.63-tests.patch"
+)
+
+src_install() {
+	insinto "/usr/share/${PN}/themes"
+	doins bpytop-themes/*.theme
+	distutils-r1_src_install
+}
diff --git a/sys-process/bpytop/bpytop-1.0.68.ebuild b/sys-process/bpytop/bpytop-1.0.68.ebuild
deleted file mode 100644
index ea2db45e6316..000000000000
--- a/sys-process/bpytop/bpytop-1.0.68.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Linux/OSX/FreeBSD resource monitor"
-HOMEPAGE="https://github.com/aristocratos/bpytop"
-SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/psutil-5.7.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/bpytop-1.0.63-tests.patch"
-)
-
-src_install() {
-	insinto "/usr/share/${PN}/themes"
-	doins bpytop-themes/*.theme
-	distutils-r1_src_install
-}
diff --git a/sys-process/bpytop/files/bpytop-1.0.61-tests.patch b/sys-process/bpytop/files/bpytop-1.0.61-tests.patch
deleted file mode 100644
index 51cef1ce6394..000000000000
--- a/sys-process/bpytop/files/bpytop-1.0.61-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/bpytop.py b/bpytop.py
-index 38d6e8b..12e4853 100755
---- a/bpytop.py
-+++ b/bpytop.py
-@@ -65,10 +65,11 @@ args.add_argument("-v", "--version",	action="store_true", 			help = "show versio
- args.add_argument("--debug",			action="store_true", 			help = "start with loglevel set to DEBUG overriding value set in config")
- stdargs = args.parse_args()
- 
--if stdargs.version:
--	print(f'bpytop version: {VERSION}\n'
--		f'psutil version: {".".join(str(x) for x in psutil.version_info)}')
--	raise SystemExit(0)
-+if __name__ == "__main__":
-+	if stdargs.version:
-+		print(f'bpytop version: {VERSION}\n'
-+			f'psutil version: {".".join(str(x) for x in psutil.version_info)}')
-+		raise SystemExit(0)
- 
- ARG_BOXES: str = stdargs.boxes
- LOW_COLOR: bool = stdargs.low_color
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 62e89788141a..850b6f9d01f0 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 794763b4bc1f..9aa031265186 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -2,5 +2,5 @@ AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c48295790
 DIST postfixadmin-3.3.10.tar.gz 1868307 BLAKE2B 489cac00205dbac9d1995f83a38a1817dfa207b2fd858ef87c0f4f3c45018759f6b2510e44da51f550df4182b0677cba346fd10a7fc3d4183672ebf70e64dd81 SHA512 b922ef08cbb3338e7581a78abb3077e92401019bea584710816615ab019a8cf678b22dbb068d0321550e2298f6a235b8a245c44c9f7eef02bb6b49b696225a2f
 DIST postfixadmin-3.3.11.tar.gz 1869783 BLAKE2B 21aecab15e75918908cf57450ce6458ae74b1077fac96c58891bc18fea33916cecb4fc7347204aba358f35c5e82348ceddc9e7ab83369c96172fd10a7f24dc3d SHA512 84b22fd1d162f723440fbfb9e20c01d7ddc7481556e340a80fda66658687878fd1668d164a216daed9badf4d2e308c958b0f678f7a4dc6a2af748e435a066072
 EBUILD postfixadmin-3.3.10.ebuild 2901 BLAKE2B 19b5cb0f3397715224a29106f105bc5bf8c168e62880be57ed85693ff33b170c1ae6f32f1827b4392171f615509a00100067863b359499f951d461793032858a SHA512 4f7435f7b52b2f10ffd36e7abc3225921c39e4718ba4a8f4b163191a61ce8703e2a5d031168b2c19d80fa19d343aa11e24f592e39306e3a34f1688454dea1497
-EBUILD postfixadmin-3.3.11.ebuild 2903 BLAKE2B 69db08f68dca608a8a0377ba1d85b66cceab5c9f75bd6477d9256bc2a297048733d8b54080a68fc6ea12164ff15015d928adcf4b4375e4bbafa2fa9c1bd514d4 SHA512 df53b2af84f4d028b7d89842e8535fbcc2eca530a715f9e6cf3b8dd277c98a8344844be632bb87dd5f4390f071470e17e8869ca5c2ac5394e7c962d6f3798525
+EBUILD postfixadmin-3.3.11-r1.ebuild 2835 BLAKE2B d195a63412ee5c1ca63ac5a9e7eb0a6782e287ca90906adcc462e2bd9875fed0a960e04b66aaa355e72232248411934e0cefe97b721eed42af7058651668a4a2 SHA512 71743a96344106f296647305a3326fb330dd228751a23eb256e9b7747a997d1480dc026b3593dec42934b9521d2d0b8e48a0ee94a9032a805e6790f0d530355b
 MISC metadata.xml 561 BLAKE2B 858369802630451dd80d9207bbbd3fff9a4dc086b328d890cd29c4682a21e74cd249a2918444dfa12987e4783ae6d358e315ad518b45c22239a80b6a9dc7d2aa SHA512 b1d4c70e5c6c4b2f668d2e3886b81df2bb15d5aae17ae545b2ba716725dc09a5e95b993a8776d5a54ab5ed8224eddf287da460e39c3e6c09eaab46b95bb5597d
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.11-r1.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.11-r1.ebuild
new file mode 100644
index 000000000000..cfd79a1f8c4f
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.3.11-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+mysql postgres +vacation"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?]
+	vacation? (
+		acct-group/vacation
+		acct-user/vacation
+		dev-perl/DBI
+		dev-perl/Email-Sender
+		dev-perl/Email-Valid
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		dev-perl/MIME-EncWords
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )
+"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fperms 755 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
+	fi
+
+	dodoc -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	einfo "Please note that if upgrading from version prior to 3.3.0,"
+	einfo "existing setup_password will no longer work and you will"
+	einfo "need to generate new one. See instructions in setup.php."
+
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
+	${shopt_save}
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
+		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.11.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.11.ebuild
deleted file mode 100644
index c6881c4b2bf9..000000000000
--- a/www-apps/postfixadmin/postfixadmin-3.3.11.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
-HOMEPAGE="http://postfixadmin.sourceforge.net"
-SRC_URI="https://github.com/postfixadmin/postfixadmin/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+mysql postgres +vacation"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="
-	dev-lang/php:*[unicode,imap,postgres?]
-	vacation? (
-		acct-group/vacation
-		acct-user/vacation
-		dev-perl/DBI
-		dev-perl/Email-Sender
-		dev-perl/Email-Valid
-		dev-perl/Log-Dispatch
-		dev-perl/Log-Log4perl
-		dev-perl/MIME-Charset
-		dev-perl/MIME-EncWords
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/httpd-php
-	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )
-"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	if use vacation; then
-		insinto /var/spool/vacation
-		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
-		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
-		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
-		dodoc VIRTUAL_VACATION/FILTER_README
-		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
-		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
-	fi
-
-	dodoc -r ADDITIONS
-
-	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
-	dodoc ${docs}
-
-	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	einfo "Please note that if upgrading from version prior to 3.3.0,"
-	einfo "existing setup_password will no longer work and you will"
-	einfo "need to generate new one. See instructions in setup.php."
-
-	if use vacation; then
-		# portage does not update owners of directories (feature :)
-		chown vacation:vacation "${ROOT}"/var/spool/vacation/
-		einfo
-		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
-		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
-		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
-	fi
-}
-
-pkg_postrm() {
-	# Make sure we don't leave broken vacation.pl symlink
-	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	local shopt_save=$(shopt -p nullglob)
-	shopt -s nullglob
-	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
-	${shopt_save}
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
-		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
-		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
-		ewarn "recent verion, but please, do your own checks"
-	fi
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index bb000d213f28..9fdccefb6bc3 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 66d2d6e8f5c1..e13226750827 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_5.5.2770.3-1_amd64.deb 97618168 BLAKE2B 99f7bab3523ffad607f61b07ad32a56d33ee28f75e1df98d116a04d3e7f5eef42c55f7e8a357b30118b4d65c7e7c27db5e7d5a57108eb197b542a8164ec9f1c7 SHA512 12863ac479a73abfab2e15ab56e79e454366e3d2fce05b876c1a6211f1066b2498ccf92c5118f8937aab52db3c01b8765c605e5ac01983f46337c363ad3329c4
-DIST vivaldi-snapshot_5.5.2770.3-1_arm64.deb 87840948 BLAKE2B bd67be7e88cff485bfaf14d6fa765e5460bb169f07b2bc1e0671c3ef1585bc1d3606c4563ea171677458404404fc74e27e9b4ae2e21afde3525052c2cf4698dd SHA512 bff26bc72c1975a89df7fa0510de18c4575f316b598c7b279955f660a09e07e71bbe173136f8424ecd46947c9c02220629ebb81be30c03da632c2f5acfaa53e3
-DIST vivaldi-snapshot_5.5.2770.3-1_armhf.deb 88366040 BLAKE2B 912f480fce94b1e7a756ad4c91485431e4a2fd6ec0cc06bf5ee27a29af32660bb5cbe43539c7f8a03929e6d7afb174c5542a9f7c64e1d0088edf6dd589d4ae4d SHA512 4d38d10ae24049ca0e961e81cf341b1dfeb673f066573ef53c3b501a95caa2f62c54208f4c519c4b64947549343f6e2539b1f1421356f9597dd22d54d4b02016
 DIST vivaldi-snapshot_5.5.2794.3-1_amd64.deb 100980824 BLAKE2B 50841bef2fce40a26f3b16e75cb3bb17b8a1c66ce3516c736177c48abc49ae4cdd432ef76e9b2914286427235712ff1865a7e58bd493bbb7a915cdd7dffacb85 SHA512 5c48045fc82d4c75ec3f12679fff5322ce6039d5f3890244d4e2b5fa9965cf285df9f29dd9825bd780a045ce61c432435ad61fa0d9178c97d98920570f34b714
 DIST vivaldi-snapshot_5.5.2794.3-1_arm64.deb 90812924 BLAKE2B 8f3d6ecc8216d4367399b601d4ae7703b710ffef8cc7ed2597f105e3b6b2fb2e27bd0730206ed934b4d0cae09a2e0dc4588383e4c4158f2ef982e500e033a32d SHA512 fbd141e95d007c0d94dc22fe4d538a02ccddc46656dbc37c02b8d2be39b1d7c9653b8c3eac51587144815b2ed30e61dc1a5d96ddba30563212f883c9cf085544
 DIST vivaldi-snapshot_5.5.2794.3-1_armhf.deb 90163872 BLAKE2B e07a2654d3d301481ee4c38752bfd36abc6479170db7c25fd3de919af354cf4305ce98a4f54e893b333dfb0388fdfa588c6eb28cd6549320a96db6b789fa15b5 SHA512 01c4bbb8a6dd2578263ba25f03684922f788b3af7e977b4db88870c94772f65a4aee1a9356f4f0a608d4b681f52db923c6682f18836a5eaa677713d70f9cc913
-EBUILD vivaldi-snapshot-5.5.2770.3.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+DIST vivaldi-snapshot_5.5.2797.3-1_amd64.deb 100997108 BLAKE2B 20fad320d40838db70738b97ee677b95557811239cabc986879cb28cb182cd4bf29e6634a8b139ea3dfe806b45440b1f72b34383b7f4afc058c443da32267561 SHA512 cb1898cd9dee452553c360b06a848608cf77353dc3bdedaf8700acdbcbebadd1cdbe75a20d0e5b41bd269e7e6463bacf5b2dfb722bf82ca4e1d353d06c070b5c
+DIST vivaldi-snapshot_5.5.2797.3-1_arm64.deb 90833996 BLAKE2B 927900bb5617bfe5d1c69f527bac7e9c6bf7d4eb9486d124e12f77224b4252d25665399fe74640bdde2675f875b326128b4de41f57574eb80510f80ede33c221 SHA512 ee11184cde33dee8692984f815c80fe93b7b208216eab6f2413e3dad14dc00b34181f104d07b9761f8a9085b3a3e175ccd645f55cee3ec949e1d5598a7a08a65
+DIST vivaldi-snapshot_5.5.2797.3-1_armhf.deb 90165832 BLAKE2B 40569e16df20338c743aeacf893089315d65da234f8f7c8c9f0a1cfe851f1a6c00edd5bc7f4b13d0c11a89371b6db452047ac82277dd6b8d53a21a36364962af SHA512 a29f3e4dfff60a7618610bc31fef0324b9a6cc9b75c12f9d4f9c0ec1754a4062272f69777bad17dd9d08eb44b71dde439b51d04b0ce8dc7aeacdcb1eee6ca01b
 EBUILD vivaldi-snapshot-5.5.2794.3.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+EBUILD vivaldi-snapshot-5.5.2797.3.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2770.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2770.3.ebuild
deleted file mode 100644
index cc815568ad94..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2770.3.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="102"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	ur
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
-RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
-RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
-RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango[X]
-	|| ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	case ${PN} in
-		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
-		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
-	esac
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2797.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2797.3.ebuild
new file mode 100644
index 000000000000..cc815568ad94
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.5.2797.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="102"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	ur
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
+
+LICENSE="Vivaldi"
+SLOT="0"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango[X]
+	|| ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index adb5c8a31db8..7c66ec035f94 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-stable_5.4.2753.40-1_amd64.deb 97585144 BLAKE2B e2ddfe3f1b8a75e7abf39fd2fef296f1d72233a4932e2c2833e464b985724a3c00b5b79190a84e4d51e6e25bfda21ba70e8441d0a9a4d2d37a20788698dad871 SHA512 2e0ce8da1be818e10271975baa6dde825d6edb9dcef07b2a54270eed6ef7d2393c6f1e8b41ad739df51482638596e3e603674dbc6a657f4f2208c9747b47428a
-DIST vivaldi-stable_5.4.2753.40-1_arm64.deb 87873620 BLAKE2B f88ee3481a3e3c91e94183323434fa3946927f345afa8fc67496ded5d9498ab8726397800f759aa9e38b37ccf77424f964a0a0d20bff8145407421163531884b SHA512 495c4e6804620b2a4c17aa8184a30ceed286de38ac59370908987893b59c897a4745a3443fd0df41a8d7573f6d4eac398192be470b5cb3279234c2cdbb02f991
-DIST vivaldi-stable_5.4.2753.40-1_armhf.deb 88402880 BLAKE2B 2ab20a288f7d91cdc840578b02b3bad8341baaff4d291e3a6edec00f04b06e28546389f8f4f0e7324fdacb4e012eb572ed74d6be28cb85ee32290dfdaf910f71 SHA512 884a45ddadf74ef906715f11f214e3d8d98a8fe6d295beaf8518d444833f3bfd1aa838bee244fccfaba8638d10c636dec9c233425c5c8358eb300fa79cc5f18d
 DIST vivaldi-stable_5.4.2753.47-1_amd64.deb 97621584 BLAKE2B 94b7f93a07a90485f5b385275fd41ecd5793ee43c54a35b3e058b540585b4f80c7561cf4264549b1a30aff0a750706c2a29af70459ae454220bcf315232a9c55 SHA512 e8a865eb669ad417c70843e39679294a8a0d65e1e3c0fb09df347f6341b4d8af872e233b71ed4ff66bd6195c44b93b34f5633a466e8bee4d4584ac4006cb330e
 DIST vivaldi-stable_5.4.2753.47-1_arm64.deb 87872068 BLAKE2B ad0b5e2f92a05bd315176e5cd4bec79cb86d3ffdce3f459853292d7e33acc853bd161ac7d15aef4e602fc4ff5a4c1cc7706a0fce859d599acf484a3b667bccaa SHA512 c1cc38829dbeab3180e9ebf2e99d89cd7f247fde8e8323d75a40b7ccf18423536c54552f2e0e9d4039a92c6e334b67989ef7ab7ac12516f16765dc4ad319013b
 DIST vivaldi-stable_5.4.2753.47-1_armhf.deb 88396408 BLAKE2B 8e0c660886b63dd13c7f5c9ee3488db2520cf75342c7d715a724d8431fc5568cf9f0ae7946d1620364502998f2f9313f548a222599d1c8608ea60bf957d3105f SHA512 f3531b2a54b64890d4f5d9df57f89a785b699c98a92a29bf5ce17b3047bae735d6fa0db0860966cf591a8368abbafe95e7b7ceca0aa947533f36ae59395c3009
-EBUILD vivaldi-5.4.2753.40.ebuild 3659 BLAKE2B 768633f5a10cf3f65d1419e0bf726d4f74eea7ab20e6e8c0c63be13a4b2bc8df575900e7e833cf591d27779f32981a714ae2b33ed5511225e8dc385ea297629e SHA512 6ae743d7f41787ae3962b9c0821face2373a370687b536ac67996ece63f6a6ad528d406c3375d2406eb2daf4ccb7ea8de96a7b06ed73ee881596c239a222e1fe
-EBUILD vivaldi-5.4.2753.47.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+DIST vivaldi-stable_5.4.2753.51-1_amd64.deb 97623688 BLAKE2B b0c90228893a39280db7aa51365eab2eae4b1558bfeca98aa28b168c19cb8323e6de5b4c6f7c0a275a635cc8063243733a7dd661498e09998476a14cd46fc924 SHA512 705f1239c4048629c525cf8e05434e51f911a51fb59c8200335029586c98d6ca6941e2e23a129eb7e3df3da2eb7dc3e12d96c5efc6640016924aec348c08562a
+DIST vivaldi-stable_5.4.2753.51-1_arm64.deb 87869712 BLAKE2B 2adc9f8e8873fc579bc731a183394fb3673327a2c42f06572995b75b11fe0f8eea5b1222f6fc14f933be31aeb13a8c06022f0d996a1aead8a35e30e6becb049f SHA512 352a4375e7c49f5aa5fe81c4f28e7ddfd16433d5c6d61ad61e1e200efd0a47b73cbcc045f40391a08cc83b67af4b63be091b5b5cc54492cc70338ddc075f32f3
+DIST vivaldi-stable_5.4.2753.51-1_armhf.deb 88402652 BLAKE2B b87909d28ad454e700bc9f3cd2f7e403ba9f69d8110ef243e7ad711a7707e98f4ce89e947b089472b471a2e1f01f7dd46f84984a41b20030f43c682000e0c585 SHA512 2584e22d0b376c29c7ffc3b7449a6a4e2044a23c79aac3ccc59972928ccd496f18d721591a4bf10b4cb61699ef12986c567591d438ed1ec439c8a5a7db33e008
+EBUILD vivaldi-5.4.2753.47.ebuild 3659 BLAKE2B 768633f5a10cf3f65d1419e0bf726d4f74eea7ab20e6e8c0c63be13a4b2bc8df575900e7e833cf591d27779f32981a714ae2b33ed5511225e8dc385ea297629e SHA512 6ae743d7f41787ae3962b9c0821face2373a370687b536ac67996ece63f6a6ad528d406c3375d2406eb2daf4ccb7ea8de96a7b06ed73ee881596c239a222e1fe
+EBUILD vivaldi-5.4.2753.51.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-5.4.2753.40.ebuild b/www-client/vivaldi/vivaldi-5.4.2753.40.ebuild
deleted file mode 100644
index 24b5ca5420a8..000000000000
--- a/www-client/vivaldi/vivaldi-5.4.2753.40.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="102"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	ur
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-KEYWORDS="-* amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
-RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
-RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
-RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango[X]
-	|| ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	case ${PN} in
-		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
-		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
-	esac
-}
diff --git a/www-client/vivaldi/vivaldi-5.4.2753.47.ebuild b/www-client/vivaldi/vivaldi-5.4.2753.47.ebuild
index cc815568ad94..24b5ca5420a8 100644
--- a/www-client/vivaldi/vivaldi-5.4.2753.47.ebuild
+++ b/www-client/vivaldi/vivaldi-5.4.2753.47.ebuild
@@ -97,7 +97,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi/vivaldi-5.4.2753.51.ebuild b/www-client/vivaldi/vivaldi-5.4.2753.51.ebuild
new file mode 100644
index 000000000000..cc815568ad94
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-5.4.2753.51.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="102"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	ur
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
+
+LICENSE="Vivaldi"
+SLOT="0"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango[X]
+	|| ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 50e0ded8536c..4c59ae7c81d0 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4970285cff82..357dea583535 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,22 +1,18 @@
 AUX tomcat-10.0.16-build.xml-strip-html5.patch 1201 BLAKE2B 57df5e44b741bc3c981312ce48330d0f43353f3ca010870c5f4a43539c120178147371129a66baa6d3a16da31328d21e0653060aa5cd4647b5935a05349d20e9 SHA512 38e194748ffae04be81624fe3dd5175acc1d0f62d07f9762e0831c5e840180c947492d03bde9722271690f6c94b5805992a5f7513520968bfdc037e33f9ba455
 AUX tomcat-10.0.20-build.xml.patch 13813 BLAKE2B 2c6b1376751a768910b38de8bf4cd0e68f71e6215186f1efbfdd06e4a83e63faf8c124e7413f33f91eea50c8c35624f7cc0e43081c1ecdb18935bec6bae0f1e2 SHA512 43312b1fe6c25ff9144a20feba1871762abd6469d02cc7c92a649ffd738ce64fe3a2882d8129b6d0e1f8a69a73ba726001d6053873553cde25234701cd14e895
-AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
 AUX tomcat-8.5.66-build.xml.patch 10850 BLAKE2B 69353bcf5697e6ae0b930c71fbb870401e822340f0eb0b8a6283e0d8cd1388d1d22a12190d089f7001a06e2491bb2309aab8c93b8f2a79e8439571fed8d0aebb SHA512 498c2ac8ab49cd83151ddfc6b47bd3a7a7148096e331ae55c7fe3da90007c19387208de64f5b3e796ec54b4b8534b11f906940fcf49343157acc862fcf06f5c7
 AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
 AUX tomcat-9.0.50-insufficient-ecj.patch 2890 BLAKE2B 586fed374f9da437d441d59272faaadf898b684375edd999f7ea50c81a5fe1ffe98e89037ee64997e583fa835f32598a7b16f0595be75fbf947264d84eea4379 SHA512 3d31beab19f79b8bd477d06e2b0ff7575e8c5cfb6c056da6fb1c19e2a1efebe9151c9b698baa1e4168006a9c28974eb49924bf52c89795ba227111d678e38439
 AUX tomcat-9.0.62-build.xml.patch 12687 BLAKE2B 55b0c142875581231ca65e9198d5da116f01e1b9d4b16d50cd79300e9fd49c5d9f79341f34a0285af8683e14bb51d1c4fa2bb91e893591c114692021608ffedf SHA512 0c82adb799539eeb4691f86e2e2815feefbefce579576a3419bd3b5efbaf7e6d24c03862b70d514424cfa74abb217e214a9005390b73ecf9836721c7b289a802
-AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360
-DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
 DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
 DIST biz.aQute.bnd-6.2.0.jar 16669843 BLAKE2B 290aec26cb4e2248488038e6cb0919728ca0cc802b16de3f390d549d135bc1177053b75e500b9f74e47c996d20b231404d57965a3f412662730cc4c938d90a4f SHA512 ad51dc9a04fc117cd01b604559989dd7c7db776761ef6000eccdcfdab825dedc615297af60c778044e46867972a74840d90eebea9b0ff826bdbd10f4d2ec5d6f
 DIST biz.aQute.bndlib-6.2.0.jar 3156015 BLAKE2B 922b9bc78e47968bad73a26f4df475d84d8a2bca3773473b1f8c147737e652728df4e90a49d09a20943f418a91fd5acfe18e51137e85850796d95b7415bcf684 SHA512 7b7b366467b71c6dd67b3d7a7bc63d476c4aca479153bbc1506435168b0b4c792152fb5b44e2b1f916cd67f482d15956d2c38182fdfaf9679dff65b1b109a16a
 EBUILD tomcat-10.0.23.ebuild 6258 BLAKE2B 438a3004bf5f4206f8aee6b0267f9597e56981ad4a698f181e135df2cc3576f7e695be10815fce7a15207646e991ecfcfc69de13ce8325cb285e0eb75cce38d8 SHA512 d5c7815169e200036d326f8b2901342a00fe88992409eb53c956393640f791bf4e5f8030bf0389d36be9fc04ae5c2a9a3c6a22e7bca4cad2a6b080d127f0f3a7
-EBUILD tomcat-7.0.109-r1.ebuild 4151 BLAKE2B 2dd58aae5be3d975b4cee4852a61e97d670f7b312d0e8f6dad1f6faaaab617c1d1270f7d574b2c740432fd34818aa618c04fb488b38b29493e9ae7336a6c7fba SHA512 8f92e1f5f08be910962366c1b812b5f0386c983137fc41e20d812232ca156a2daa9062c89ad00ce093f583c67953efa3d70d24b002d814db8298e8d03827fbf3
 EBUILD tomcat-8.5.82.ebuild 4749 BLAKE2B 07355b40016620c842b4b582ea11ca987bc04b4b89c65ed6228d0d94a37518d5cfe0da98589cec5985aa6d62fa701f9932c1bde8683734c1985bea6f7f181656 SHA512 2c5edb87d504df16582030f7340df7a27f845b12c95f0b342aaf5a2c88fae025ec1c8582d18312d9cf1d15cb8a0973e7f2763986690a3c3b59223832ea368cfe
 EBUILD tomcat-9.0.65.ebuild 5822 BLAKE2B 9ec1e8f21e7a6b07adf51e10dec445291e86260d33b2c014848c301e1593becc7a32a73c25c60ee19570c2ec8b6ead7005f9052b3b2e503b80d38e88e03baa73 SHA512 f5de64b7838ebeff771bb1c8f6aa3ddc0ad1a929faee65aa483ef79ae8aaecf6056b633f1ae0e4f169f09422b55b9053aefaa2caab94ab2d359a932e3d49dd16
-MISC metadata.xml 713 BLAKE2B 8a4ecfb2190e156b77598a825550953f936ddc1a1303a95bcae173592ac4f482e81af1d7b62bc62248c20ac92cdd1dd3a9c351c74f684193085c0b242043fee7 SHA512 946fed270cb43e9c239f6f831ac2e8021526a9c3b1b8fea91d00d1b48f979273de3f7c227bce03009de04bcc8386803606864ffdb85666005d6b0ef5c49f01c5
+MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
deleted file mode 100644
index 29cf6c2e403c..000000000000
--- a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff --git a/build.xml b/build.xml
-index dbad7cb..101bc57 100644
---- a/build.xml
-+++ b/build.xml
-@@ -715,12 +715,14 @@
-       </fileset>
-     </copy>
-     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
-     <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
-       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
-         <include name="*" />
-         <exclude name="jspxml*" />
-       </fileset>
-     </copy>
-+-->
- 
-     <!-- Convert the message files from UTF-8 to ASCII. This can be removed
-     after upgrading to Java 9+ as the minimum JRE and specifying the encoding
-@@ -776,26 +778,32 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.2 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.2 EL Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -854,9 +862,9 @@
-       filesId="files.jasper-el" />
- 
-     <!-- Re-packaged Apache Commons DBCP 1-->
--    <jarIt jarfile="${tomcat-dbcp.jar}"
-+<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
--      filesId="files.tomcat-dbcp" />
-+      filesId="files.tomcat-dbcp" /> -->
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
-@@ -1087,9 +1095,9 @@
- 
-   <target name="deploy" depends="package,build-docs,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1149,7 +1157,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1839,7 +1847,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -2034,11 +2042,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2070,6 +2079,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -2137,6 +2147,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -2181,9 +2192,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-       <link href="../annotationapi"/>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="https://docs.oracle.com/javase/7/docs/api/"/>
-       <link href="https://docs.oracle.com/javaee/6/api/"/>
-@@ -2889,7 +2902,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-compile"
--          description="Download components necessary to compile" >
-+          description="Download components necessary to compile" unless="noget" >
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -2925,7 +2938,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2989,7 +3002,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-instance-manager-r1.bash b/www-servers/tomcat/files/tomcat-instance-manager-r1.bash
deleted file mode 100644
index de5152198b3e..000000000000
--- a/www-servers/tomcat/files/tomcat-instance-manager-r1.bash
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Author: Ralph Sennhauser <sera@gentoo.org>
-
-die() {
-	echo "${@}"
-	exit 1
-}
-
-usage() {
-	cat <<EOL
-Usage: ${BASH_SOURCE} <--create|--remove|--help> [--suffix s][--user u][--group g]
-
-  Options:
-    --help:
-      show this text.
-    --create:
-      create a new instance
-    --remove:
-      remove an existing instance.
-    --suffix SUFFIX:
-      a suffix for this instance. the suffix may not collide with an already
-      existing instance, defaults to empty.
-    --user USER:
-      the user for which to configure this instance for. The user needs to
-      exist already. defaults to tomcat.
-    --group GROUP:
-      the group for which to configure this instance for. The group needs to
-      exist already. defaults to tomcat.
-
-  Examples:
-    ${BASH_SOURCE} --create --suffix testing --user tacmot --group tacmot
-    ${BASH_SOURCE} --remove --suffix testing
-EOL
-}
-
-parse_argv() {
-	action="not specified"
-	instance_name="tomcat-@SLOT@"
-	instance_user="tomcat"
-	instance_group="tomcat"
-
-	while [[ -n $1 ]]; do
-		case $1 in
-			--help)
-				usage
-				exit 0;;
-			--suffix)
-				instance_name+="-$2"
-				shift; shift;;
-			--user)
-				instance_user="$2"
-				shift; shift;;
-			--group)
-				instance_group="$2"
-				shift; shift;;
-			--create)
-				action=create
-				shift;;
-			--remove)
-				action=remove
-				shift;;
-			--backup)
-				action=backup
-				shift;;
-			--restore)
-				action=restore
-				shift;;
-			--update)
-				action=update
-				shift;;
-			*)
-				echo "Invalid option '$1'"
-				usage
-				exit 2;;
-		esac
-	done
-
-	tomcat_home="/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@"
-	instance_base="/@GENTOO_PORTAGE_EPREFIX@var/lib/${instance_name}"
-	instance_conf="/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
-	instance_logs="/@GENTOO_PORTAGE_EPREFIX@var/log/${instance_name}"
-	instance_temp="/@GENTOO_PORTAGE_EPREFIX@var/tmp/${instance_name}"
-
-	all_targets=(
-		"${instance_base}"
-		"${instance_logs}"
-		"${instance_temp}"
-		"/@GENTOO_PORTAGE_EPREFIX@etc/${instance_name}"
-		"/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}"
-		"/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}"
-	)
-}
-	
-test_can_deploy() {
-	local no_deploy target
-	for target in "${all_targets[@]}"; do
-		if [[ -e "${target}" ]]; then 
-			echo "Error: '${target}' already exists."
-			no_deploy=yes
-		fi
-	done
-	if [[ -n "${no_deploy}" ]]; then
-		cat <<-EOL
-
-			To protect an existing installation no new instance was deployed. You can use
-			'${BASH_SOURCE} --remove'
-			to remove an existing instance first or run
-			'${BASH_SOURCE} --create --sufix <instance_suffix>'
-			to deploy an instance under a different name
-
-		EOL
-		usage
-		exit 1
-	fi
-
-	if ! getent passwd | cut -d: -f1 | grep -Fx "${instance_user}" > /dev/null; then
-		echo "Error: user '${instance_user}' doesn't exist."
-		exit 1
-	fi
-
-	if ! getent group | cut -d: -f1 | grep -Fx "${instance_group}" > /dev/null; then
-		echo "Error: group '${instance_group}' doesn't exist."
-		exit 1
-	fi
-}
-
-deploy_instance() {
-	test_can_deploy
-
-	mkdir -p "${instance_base}"/{work,webapps} || die
-	mkdir -p "${instance_logs}" || die
-	mkdir -p "${instance_temp}" || die
-
-	cp -r "${tomcat_home}"/webapps/ROOT "${instance_base}"/webapps || die
-
-	chown -R "${instance_user}":"${instance_group}" \
-		"${instance_base}" "${instance_logs}" "${instance_temp}" || die
-
-	find "${instance_base}"/webapps -type d -exec chmod 750 {} + || die
-	find "${instance_base}"/webapps -type f -exec chmod 640 {} + || die
-
-	# initial config #
-
-	cp -r "${tomcat_home}"/conf "${instance_conf}" || die
-
-	sed -i -e "s|\${catalina.base}/logs|${instance_logs}|" \
-		"${instance_conf}"/logging.properties || die
-	sed -i -e "s|directory=\"logs\"|directory=\"${instance_logs}\"|" \
-		"${instance_conf}"/server.xml || die
-
-	mkdir -p "${instance_conf}"/Catalina/localhost || die
-	cat > "${instance_conf}"/Catalina/localhost/host-manager.xml <<-'EOF'
-		<?xml version="1.0" encoding="UTF-8"?>
-		<Context docBase="${catalina.home}/webapps/host-manager"
-				antiResourceLocking="false" privileged="true" />
-	EOF
-
-	cat > "${instance_conf}"/Catalina/localhost/manager.xml <<-'EOF'
-		<?xml version="1.0" encoding="UTF-8"?>
-		<Context docBase="${catalina.home}/webapps/manager"
-				antiResourceLocking="false" privileged="true" />
-	EOF
-
-	if [[ -d "${tomcat_home}"/webapps/docs ]]; then
-		cat > "${instance_conf}"/Catalina/localhost/docs.xml <<-'EOF'
-			<?xml version="1.0" encoding="UTF-8"?>
-			<Context docBase="${catalina.home}/webapps/docs" />
-		EOF
-	fi
-
-	if [[ -d "${tomcat_home}"/webapps/examples ]]; then
-		cat > "${instance_conf}"/Catalina/localhost/examples.xml <<-'EOF'
-			<?xml version="1.0" encoding="UTF-8"?>
-			<Context docBase="${catalina.home}/webapps/examples" />
-		EOF
-	fi
-
-	chown -R "${instance_user}":"${instance_group}" "${instance_conf}" || die
-	find "${instance_conf}" -type d -exec chmod 750 {} + || die
-	find "${instance_conf}" -type f -exec chmod 640 {} + || die
-
-	# rc script #
-
-	cp "${tomcat_home}"/gentoo/tomcat.init \
-		"/@GENTOO_PORTAGE_EPREFIX@etc/init.d/${instance_name}" || die
-
-	sed -e "s|@INSTANCE_NAME@|${instance_name}|g" \
-		-e "s|@INSTANCE_USER@|${instance_user}|g" \
-		-e "s|@INSTANCE_GROUP@|${instance_group}|g" \
-		"${tomcat_home}"/gentoo/tomcat.conf \
-		> "/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${instance_name}" || die
-
-	# some symlinks for tomcat and netbeans #
-
-	ln -s "${instance_conf}" "${instance_base}"/conf || die
-	ln -s "${instance_temp}" "${instance_base}"/temp || die
-
-	# a note to update the default configuration #
-
-	cat <<-EOL
-		Successfully created instance '${instance_name}'
-		It's strongly recommended for production systems to go carefully through the
-		configuration files at '${instance_conf}'.
-		The generated initial configuration is close to upstreams default which
-		favours the demo aspect over hardening.
-	EOL
-}
-
-remove_instance() {
-	echo "The following files will be removed permanently:"
-	local target; for target in "${all_targets[@]}"; do
-		find ${target}
-	done
-
-	echo "Type 'yes' to continue"
-	read
-	if [[ ${REPLY} == yes ]]; then
-		rm -rv "${all_targets[@]}"
-	else 
-		echo "Aborting as requested ..."
-	fi
-}
-
-parse_argv "$@"
-
-if [[ ${action} == create ]]; then
-	deploy_instance
-elif [[ ${action} == remove ]]; then
-	remove_instance
-elif [[ ${action} == "not specified" ]]; then
-	echo "No action specified!"
-	usage
-	exit 1
-else
-	echo "${action} not yet implemented!"
-	usage
-	exit 1
-fi
diff --git a/www-servers/tomcat/metadata.xml b/www-servers/tomcat/metadata.xml
index 8fb0d0abaeee..aaecdcb10391 100644
--- a/www-servers/tomcat/metadata.xml
+++ b/www-servers/tomcat/metadata.xml
@@ -13,6 +13,5 @@
 	</longdescription>
 	<use>
 		<flag name="extra-webapps">Build also the docs and examples webapp</flag>
-		<flag name="websockets">Builds websockets api and implementation (requires java 7)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-servers/tomcat/tomcat-7.0.109-r1.ebuild b/www-servers/tomcat/tomcat-7.0.109-r1.ebuild
deleted file mode 100644
index b7489d78220d..000000000000
--- a/www-servers/tomcat/tomcat-7.0.109-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="https://archive.apache.org/dist/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	virtual/jdk:1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	java-pkg_clean
-
-	eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
-	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
-- 
cgit v1.2.3