From 21dbcce41990b13f301240313be05c8d013a9258 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 28 Jan 2023 08:51:03 +0000
Subject: gentoo auto-resync : 28:01:2023 - 08:51:03

---
 Manifest                                           |  30 +-
 Manifest.files.gz                                  | Bin 29450 -> 29454 bytes
 acct-user/Manifest.gz                              | Bin 70815 -> 70817 bytes
 acct-user/pipewire/Manifest                        |   1 +
 acct-user/pipewire/pipewire-1.ebuild               |  13 +
 app-admin/Manifest.gz                              | Bin 32353 -> 32354 bytes
 app-admin/awscli/Manifest                          |   2 +
 app-admin/awscli/awscli-1.27.59.ebuild             |  80 +++
 app-arch/Manifest.gz                               | Bin 16901 -> 16898 bytes
 app-arch/dpkg/Manifest                             |   4 +-
 app-arch/dpkg/dpkg-1.21.18.ebuild                  | 111 ----
 app-arch/dpkg/dpkg-1.21.19.ebuild                  | 111 ++++
 app-text/Manifest.gz                               | Bin 49084 -> 49072 bytes
 app-text/msort/Manifest                            |   3 +-
 .../msort/files/msort-8.53-configure-clang16.patch |  18 +
 app-text/msort/msort-8.53-r1.ebuild                |  46 --
 app-text/msort/msort-8.53-r2.ebuild                |  47 ++
 app-text/poppler/Manifest                          |   4 +-
 app-text/poppler/poppler-23.01.0.ebuild            |   4 +-
 app-text/poppler/poppler-9999.ebuild               |   4 +-
 dev-games/Manifest.gz                              | Bin 6719 -> 6718 bytes
 dev-games/godot/Manifest                           |   6 +-
 dev-games/godot/godot-4.0_beta14.ebuild            | 250 -------
 dev-games/godot/godot-4.0_beta16.ebuild            | 240 +++++++
 dev-games/godot/metadata.xml                       |   1 -
 dev-java/Manifest.gz                               | Bin 56657 -> 56636 bytes
 dev-java/error-prone-annotations/Manifest          |   2 -
 .../error-prone-annotations-2.7.1.ebuild           |  27 -
 dev-java/guava-testlib/Manifest                    |   2 -
 dev-java/guava-testlib/guava-testlib-30.1.1.ebuild |  67 --
 dev-java/guava/Manifest                            |   2 -
 dev-java/guava/guava-30.1.1.ebuild                 |  58 --
 dev-java/jctools-core/Manifest                     |   2 -
 dev-java/jctools-core/jctools-core-3.3.0.ebuild    |  69 --
 dev-java/woodstox-core/Manifest                    |   2 -
 dev-java/woodstox-core/woodstox-core-6.3.1.ebuild  |  89 ---
 dev-java/xmlgraphics-commons/Manifest              |   2 -
 .../xmlgraphics-commons-2.7-r1.ebuild              |  72 --
 dev-java/zstd-jni/Manifest                         |   2 -
 dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild          |  67 --
 dev-lang/Manifest.gz                               | Bin 19535 -> 19535 bytes
 dev-lang/rust-bin/Manifest                         |  34 +
 dev-lang/rust-bin/rust-bin-1.67.0.ebuild           | 224 +++++++
 dev-lang/rust/Manifest                             |  35 +
 dev-lang/rust/rust-1.67.0.ebuild                   | 740 +++++++++++++++++++++
 dev-python/Manifest.gz                             | Bin 256900 -> 256930 bytes
 dev-python/boto3/Manifest                          |   2 +
 dev-python/boto3/boto3-1.26.59.ebuild              |  68 ++
 dev-python/botocore/Manifest                       |   2 +
 dev-python/botocore/botocore-1.29.59.ebuild        |  74 +++
 dev-python/cfn-lint/Manifest                       |  10 +-
 dev-python/cfn-lint/cfn-lint-0.72.10.ebuild        |  54 ++
 dev-python/cfn-lint/cfn-lint-0.72.6.ebuild         |  54 --
 dev-python/cfn-lint/cfn-lint-0.72.7.ebuild         |  54 --
 dev-python/cfn-lint/cfn-lint-0.72.8.ebuild         |  54 --
 dev-python/cfn-lint/cfn-lint-0.72.9.ebuild         |   2 +-
 dev-python/cmd2/Manifest                           |   2 +
 dev-python/cmd2/cmd2-2.4.3.ebuild                  |  60 ++
 dev-python/dask/Manifest                           |   2 +
 dev-python/dask/dask-2023.1.1.ebuild               |  69 ++
 dev-python/emcee/Manifest                          |   2 +
 dev-python/emcee/emcee-3.1.4.ebuild                |  45 ++
 dev-python/fakeredis/Manifest                      |   2 +
 dev-python/fakeredis/fakeredis-2.6.0.ebuild        |  88 +++
 dev-python/httpx/Manifest                          |   6 +-
 dev-python/httpx/httpx-0.23.1-r1.ebuild            |  87 ---
 dev-python/httpx/httpx-0.23.2.ebuild               |  87 ---
 dev-python/httpx/httpx-0.23.3-r1.ebuild            |   2 +-
 dev-python/hypothesis/Manifest                     |   2 +
 dev-python/hypothesis/hypothesis-6.65.2.ebuild     |  77 +++
 dev-python/ipython/Manifest                        |   2 +
 dev-python/ipython/ipython-8.9.0.ebuild            | 156 +++++
 dev-python/jaraco-text/Manifest                    |   2 +
 dev-python/jaraco-text/jaraco-text-3.11.1.ebuild   |  71 ++
 dev-python/jupyter_kernel_test/Manifest            |   2 +
 .../jupyter_kernel_test-0.5.0.ebuild               |  32 +
 dev-python/pefile/Manifest                         |   2 +-
 dev-python/pefile/pefile-2022.5.30-r1.ebuild       |   2 +-
 dev-python/pyannotate/Manifest                     |   2 +-
 dev-python/pyannotate/pyannotate-1.2.0-r1.ebuild   |  23 +
 dev-python/pyannotate/pyannotate-1.2.0.ebuild      |  20 -
 dev-python/rich/Manifest                           |  12 +-
 dev-python/rich/rich-12.6.0.ebuild                 |  56 --
 dev-python/rich/rich-13.0.0.ebuild                 |  48 --
 dev-python/rich/rich-13.0.1.ebuild                 |  51 --
 dev-python/rich/rich-13.1.0.ebuild                 |  51 --
 dev-python/rich/rich-13.2.0.ebuild                 |   2 +-
 dev-python/rich/rich-13.3.0.ebuild                 |  52 ++
 dev-python/rst-linker/Manifest                     |   2 +
 dev-python/rst-linker/rst-linker-2.4.0.ebuild      |  34 +
 dev-python/snakeoil/Manifest                       |   4 +-
 dev-python/snakeoil/snakeoil-0.10.4.ebuild         |  32 -
 dev-python/snakeoil/snakeoil-0.10.5.ebuild         |   2 +-
 dev-python/zipp/Manifest                           |   2 +
 dev-python/zipp/zipp-3.12.0.ebuild                 |  58 ++
 games-action/Manifest.gz                           | Bin 14540 -> 14537 bytes
 games-action/spacearyarya-kxl/Manifest             |   8 +-
 .../files/spacearyarya-kxl-1.0.2-cflags.patch      |   9 -
 .../files/spacearyarya-kxl-1.0.2-clang.patch       |  19 -
 games-action/spacearyarya-kxl/metadata.xml         |   3 +
 .../spacearyarya-kxl-1.0.2-r3.ebuild               |  56 --
 .../spacearyarya-kxl/spacearyarya-kxl-1.0.3.ebuild |  49 ++
 games-action/supertuxkart/Manifest                 |   4 +-
 games-action/supertuxkart/metadata.xml             |   1 -
 .../supertuxkart/supertuxkart-1.4-r1.ebuild        |  84 +++
 games-action/supertuxkart/supertuxkart-1.4.ebuild  |  83 ---
 games-fps/Manifest.gz                              | Bin 11877 -> 11876 bytes
 games-fps/alephone-durandal/Manifest               |   4 +-
 .../alephone-durandal-20220115.ebuild              |  37 --
 .../alephone-durandal-20221126.ebuild              |  37 ++
 games-fps/alephone-infinity/Manifest               |   4 +-
 .../alephone-infinity-20220115.ebuild              |  37 --
 .../alephone-infinity-20221126.ebuild              |  37 ++
 games-fps/alephone-marathon/Manifest               |   4 +-
 .../alephone-marathon-20220115.ebuild              |  37 --
 .../alephone-marathon-20221126.ebuild              |  37 ++
 games-fps/alephone/Manifest                        |   6 +-
 games-fps/alephone/alephone-20220115-r1.ebuild     |  98 ---
 games-fps/alephone/alephone-20221126.ebuild        | 100 +++
 games-fps/alephone/alephone-99999999.ebuild        |   8 +-
 games-strategy/Manifest.gz                         | Bin 8083 -> 8088 bytes
 games-strategy/warzone2100/Manifest                |   1 +
 .../warzone2100/warzone2100-4.3.3-r3.ebuild        | 119 ++++
 games-util/Manifest.gz                             | Bin 7696 -> 7870 bytes
 games-util/basis_universal/Manifest                |   5 +
 .../basis_universal/basis_universal-1.16.3.ebuild  |  43 ++
 .../files/basis_universal-1.16.3-fix-RPATH.patch   |  10 +
 .../basis_universal-1.16.3-respect-CFLAGS.patch    |  11 +
 games-util/basis_universal/metadata.xml            |  14 +
 media-tv/Manifest.gz                               | Bin 3777 -> 3779 bytes
 media-tv/kodi/Manifest                             |   8 +-
 media-tv/kodi/kodi-19.4-r3.ebuild                  |   2 +-
 media-tv/kodi/kodi-19.4-r4.ebuild                  |   2 +-
 media-tv/kodi/kodi-19.5.ebuild                     |   2 +-
 media-tv/kodi/kodi-19.9999.ebuild                  |   2 +-
 media-video/Manifest.gz                            | Bin 25210 -> 25212 bytes
 media-video/pipewire/Manifest                      |   6 +-
 media-video/pipewire/pipewire-0.3.63-r2.ebuild     | 443 ------------
 media-video/pipewire/pipewire-0.3.63-r3.ebuild     | 450 +++++++++++++
 media-video/pipewire/pipewire-0.3.65-r1.ebuild     | 451 -------------
 media-video/pipewire/pipewire-0.3.65-r2.ebuild     | 458 +++++++++++++
 media-video/pipewire/pipewire-9999.ebuild          |   9 +-
 metadata/Manifest.gz                               | Bin 3509 -> 3512 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  28 +-
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 28085 -> 28066 bytes
 metadata/md5-cache/acct-user/Manifest.gz           | Bin 70863 -> 71025 bytes
 metadata/md5-cache/acct-user/pipewire-1            |   9 +
 metadata/md5-cache/app-admin/Manifest.gz           | Bin 52542 -> 52694 bytes
 metadata/md5-cache/app-admin/awscli-1.27.59        |  16 +
 metadata/md5-cache/app-arch/Manifest.gz            | Bin 21324 -> 21337 bytes
 metadata/md5-cache/app-arch/dpkg-1.21.18           |  15 -
 metadata/md5-cache/app-arch/dpkg-1.21.19           |  15 +
 metadata/md5-cache/app-text/Manifest.gz            | Bin 68920 -> 68926 bytes
 metadata/md5-cache/app-text/msort-8.53-r1          |  15 -
 metadata/md5-cache/app-text/msort-8.53-r2          |  15 +
 metadata/md5-cache/app-text/poppler-23.01.0        |   6 +-
 metadata/md5-cache/app-text/poppler-9999           |   6 +-
 metadata/md5-cache/dev-games/Manifest.gz           | Bin 8517 -> 8512 bytes
 metadata/md5-cache/dev-games/godot-4.0_beta14      |  17 -
 metadata/md5-cache/dev-games/godot-4.0_beta16      |  17 +
 metadata/md5-cache/dev-java/Manifest.gz            | Bin 72894 -> 71787 bytes
 .../dev-java/error-prone-annotations-2.7.1         |  14 -
 metadata/md5-cache/dev-java/guava-30.1.1           |  14 -
 metadata/md5-cache/dev-java/guava-testlib-30.1.1   |  15 -
 metadata/md5-cache/dev-java/jctools-core-3.3.0     |  15 -
 metadata/md5-cache/dev-java/woodstox-core-6.3.1    |  15 -
 .../md5-cache/dev-java/xmlgraphics-commons-2.7-r1  |  15 -
 metadata/md5-cache/dev-java/zstd-jni-1.5.2.4       |  15 -
 metadata/md5-cache/dev-lang/Manifest.gz            | Bin 39571 -> 39892 bytes
 metadata/md5-cache/dev-lang/rust-1.67.0            |  17 +
 metadata/md5-cache/dev-lang/rust-bin-1.67.0        |  15 +
 metadata/md5-cache/dev-python/Manifest.gz          | Bin 338253 -> 338876 bytes
 metadata/md5-cache/dev-python/boto3-1.26.59        |  16 +
 metadata/md5-cache/dev-python/botocore-1.29.59     |  16 +
 metadata/md5-cache/dev-python/cfn-lint-0.72.10     |  16 +
 metadata/md5-cache/dev-python/cfn-lint-0.72.6      |  16 -
 metadata/md5-cache/dev-python/cfn-lint-0.72.7      |  16 -
 metadata/md5-cache/dev-python/cfn-lint-0.72.8      |  16 -
 metadata/md5-cache/dev-python/cfn-lint-0.72.9      |   4 +-
 metadata/md5-cache/dev-python/cmd2-2.4.3           |  16 +
 metadata/md5-cache/dev-python/dask-2023.1.1        |  16 +
 metadata/md5-cache/dev-python/emcee-3.1.4          |  17 +
 metadata/md5-cache/dev-python/fakeredis-2.6.0      |  16 +
 metadata/md5-cache/dev-python/httpx-0.23.1-r1      |  16 -
 metadata/md5-cache/dev-python/httpx-0.23.2         |  16 -
 metadata/md5-cache/dev-python/httpx-0.23.3-r1      |   4 +-
 metadata/md5-cache/dev-python/hypothesis-6.65.2    |  16 +
 metadata/md5-cache/dev-python/ipython-8.9.0        |  17 +
 metadata/md5-cache/dev-python/jaraco-text-3.11.1   |  17 +
 .../md5-cache/dev-python/jupyter_kernel_test-0.5.0 |  16 +
 metadata/md5-cache/dev-python/pefile-2022.5.30-r1  |   4 +-
 metadata/md5-cache/dev-python/pyannotate-1.2.0     |  16 -
 metadata/md5-cache/dev-python/pyannotate-1.2.0-r1  |  16 +
 metadata/md5-cache/dev-python/rich-12.6.0          |  16 -
 metadata/md5-cache/dev-python/rich-13.0.0          |  16 -
 metadata/md5-cache/dev-python/rich-13.0.1          |  16 -
 metadata/md5-cache/dev-python/rich-13.1.0          |  16 -
 metadata/md5-cache/dev-python/rich-13.2.0          |   4 +-
 metadata/md5-cache/dev-python/rich-13.3.0          |  16 +
 metadata/md5-cache/dev-python/rst-linker-2.4.0     |  16 +
 metadata/md5-cache/dev-python/snakeoil-0.10.4      |  16 -
 metadata/md5-cache/dev-python/snakeoil-0.10.5      |   4 +-
 metadata/md5-cache/dev-python/zipp-3.12.0          |  16 +
 metadata/md5-cache/games-action/Manifest.gz        | Bin 15322 -> 15319 bytes
 .../games-action/spacearyarya-kxl-1.0.2-r3         |  14 -
 .../md5-cache/games-action/spacearyarya-kxl-1.0.3  |  14 +
 metadata/md5-cache/games-action/supertuxkart-1.4   |  16 -
 .../md5-cache/games-action/supertuxkart-1.4-r1     |  16 +
 metadata/md5-cache/games-fps/Manifest.gz           | Bin 12427 -> 12418 bytes
 metadata/md5-cache/games-fps/alephone-20220115-r1  |  16 -
 metadata/md5-cache/games-fps/alephone-20221126     |  16 +
 metadata/md5-cache/games-fps/alephone-99999999     |   4 +-
 .../md5-cache/games-fps/alephone-durandal-20220115 |  14 -
 .../md5-cache/games-fps/alephone-durandal-20221126 |  14 +
 .../md5-cache/games-fps/alephone-infinity-20220115 |  14 -
 .../md5-cache/games-fps/alephone-infinity-20221126 |  14 +
 .../md5-cache/games-fps/alephone-marathon-20220115 |  14 -
 .../md5-cache/games-fps/alephone-marathon-20221126 |  14 +
 metadata/md5-cache/games-strategy/Manifest.gz      | Bin 10512 -> 10675 bytes
 .../md5-cache/games-strategy/warzone2100-4.3.3-r3  |  16 +
 metadata/md5-cache/games-util/Manifest.gz          | Bin 9334 -> 9512 bytes
 .../md5-cache/games-util/basis_universal-1.16.3    |  14 +
 metadata/md5-cache/media-tv/Manifest.gz            | Bin 4982 -> 4984 bytes
 metadata/md5-cache/media-tv/kodi-19.4-r3           |   6 +-
 metadata/md5-cache/media-tv/kodi-19.4-r4           |   6 +-
 metadata/md5-cache/media-tv/kodi-19.5              |   6 +-
 metadata/md5-cache/media-tv/kodi-19.9999           |   6 +-
 metadata/md5-cache/media-video/Manifest.gz         | Bin 35770 -> 35771 bytes
 metadata/md5-cache/media-video/pipewire-0.3.63-r2  |  18 -
 metadata/md5-cache/media-video/pipewire-0.3.63-r3  |  18 +
 metadata/md5-cache/media-video/pipewire-0.3.65-r1  |  18 -
 metadata/md5-cache/media-video/pipewire-0.3.65-r2  |  18 +
 metadata/md5-cache/media-video/pipewire-9999       |   8 +-
 metadata/md5-cache/net-misc/Manifest.gz            | Bin 89414 -> 89562 bytes
 metadata/md5-cache/net-misc/ena-driver-2.8.2       |  15 +
 metadata/md5-cache/sys-apps/Manifest.gz            | Bin 76023 -> 76184 bytes
 metadata/md5-cache/sys-apps/baselayout-2.12        |  13 -
 metadata/md5-cache/sys-apps/baselayout-2.13        |  13 +
 metadata/md5-cache/sys-apps/fwupd-efi-1.4          |   4 +-
 metadata/md5-cache/sys-apps/systemd-utils-252.4    |  18 +
 metadata/md5-cache/sys-apps/usbguard-1.1.2         |   2 +-
 metadata/md5-cache/sys-devel/Manifest.gz           | Bin 30496 -> 30656 bytes
 metadata/md5-cache/sys-devel/gcc-11.3.1_p20230127  |  16 +
 metadata/md5-cache/sys-kernel/Manifest.gz          | Bin 24033 -> 23705 bytes
 metadata/md5-cache/sys-kernel/zen-sources-5.15.10  |  14 -
 metadata/md5-cache/sys-kernel/zen-sources-5.19.13  |  14 -
 metadata/md5-cache/sys-kernel/zen-sources-6.0.12   |  14 -
 metadata/md5-cache/sys-kernel/zen-sources-6.1.8    |  14 +
 metadata/md5-cache/sys-libs/Manifest.gz            | Bin 31894 -> 32375 bytes
 metadata/md5-cache/sys-libs/talloc-2.4.0           |  17 +
 metadata/md5-cache/sys-libs/tdb-1.4.8              |  17 +
 metadata/md5-cache/sys-libs/tevent-0.14.0          |  17 +
 metadata/md5-cache/virtual/Manifest.gz             | Bin 40457 -> 40615 bytes
 metadata/md5-cache/virtual/rust-1.67.0             |  10 +
 metadata/md5-cache/www-apps/Manifest.gz            | Bin 24015 -> 23691 bytes
 metadata/md5-cache/www-apps/gitea-1.17.4           |  17 -
 metadata/md5-cache/www-apps/gitea-1.18.0           |  17 -
 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-misc/Manifest.gz                               | Bin 54278 -> 54286 bytes
 net-misc/ena-driver/Manifest                       |   2 +
 net-misc/ena-driver/ena-driver-2.8.2.ebuild        |  40 ++
 profiles/Manifest.gz                               | Bin 182091 -> 182096 bytes
 profiles/package.mask                              |  16 +
 profiles/use.local.desc                            |   3 +-
 sys-apps/Manifest.gz                               | Bin 48612 -> 48594 bytes
 sys-apps/baselayout/Manifest                       |   4 +-
 sys-apps/baselayout/baselayout-2.12.ebuild         | 381 -----------
 sys-apps/baselayout/baselayout-2.13.ebuild         | 376 +++++++++++
 sys-apps/fwupd-efi/Manifest                        |   2 +-
 sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild            |   2 +-
 sys-apps/systemd-utils/Manifest                    |   4 +
 sys-apps/systemd-utils/files/legacy.conf           |   3 +
 sys-apps/systemd-utils/systemd-utils-252.4.ebuild  | 536 +++++++++++++++
 sys-apps/usbguard/Manifest                         |   3 +-
 .../usbguard/files/usbguard-1.1.2-gcc-13.patch     |  19 +
 sys-apps/usbguard/usbguard-1.1.2.ebuild            |   6 +-
 sys-devel/Manifest.gz                              | Bin 10618 -> 10618 bytes
 sys-devel/gcc/Manifest                             |   3 +
 sys-devel/gcc/gcc-11.3.1_p20230127.ebuild          |  52 ++
 sys-kernel/Manifest.gz                             | Bin 4422 -> 4420 bytes
 sys-kernel/zen-sources/Manifest                    |  20 +-
 sys-kernel/zen-sources/zen-sources-5.15.10.ebuild  |  42 --
 sys-kernel/zen-sources/zen-sources-5.19.13.ebuild  |  42 --
 sys-kernel/zen-sources/zen-sources-6.0.12.ebuild   |  42 --
 sys-kernel/zen-sources/zen-sources-6.1.8.ebuild    |  42 ++
 sys-libs/Manifest.gz                               | Bin 14730 -> 14726 bytes
 sys-libs/talloc/Manifest                           |   2 +
 sys-libs/talloc/talloc-2.4.0.ebuild                | 121 ++++
 sys-libs/tdb/Manifest                              |   2 +
 sys-libs/tdb/tdb-1.4.8.ebuild                      |  71 ++
 sys-libs/tevent/Manifest                           |   2 +
 sys-libs/tevent/tevent-0.14.0.ebuild               |  98 +++
 virtual/Manifest.gz                                | Bin 28261 -> 28263 bytes
 virtual/rust/Manifest                              |   1 +
 virtual/rust/rust-1.67.0.ebuild                    |  23 +
 www-apps/Manifest.gz                               | Bin 12942 -> 12938 bytes
 www-apps/gitea/Manifest                            |   4 -
 www-apps/gitea/gitea-1.17.4.ebuild                 | 125 ----
 www-apps/gitea/gitea-1.18.0.ebuild                 | 125 ----
 307 files changed, 6210 insertions(+), 4221 deletions(-)
 create mode 100644 acct-user/pipewire/pipewire-1.ebuild
 create mode 100644 app-admin/awscli/awscli-1.27.59.ebuild
 delete mode 100644 app-arch/dpkg/dpkg-1.21.18.ebuild
 create mode 100644 app-arch/dpkg/dpkg-1.21.19.ebuild
 create mode 100644 app-text/msort/files/msort-8.53-configure-clang16.patch
 delete mode 100644 app-text/msort/msort-8.53-r1.ebuild
 create mode 100644 app-text/msort/msort-8.53-r2.ebuild
 delete mode 100644 dev-games/godot/godot-4.0_beta14.ebuild
 create mode 100644 dev-games/godot/godot-4.0_beta16.ebuild
 delete mode 100644 dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
 delete mode 100644 dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
 delete mode 100644 dev-java/guava/guava-30.1.1.ebuild
 delete mode 100644 dev-java/jctools-core/jctools-core-3.3.0.ebuild
 delete mode 100644 dev-java/woodstox-core/woodstox-core-6.3.1.ebuild
 delete mode 100644 dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
 delete mode 100644 dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild
 create mode 100644 dev-lang/rust-bin/rust-bin-1.67.0.ebuild
 create mode 100644 dev-lang/rust/rust-1.67.0.ebuild
 create mode 100644 dev-python/boto3/boto3-1.26.59.ebuild
 create mode 100644 dev-python/botocore/botocore-1.29.59.ebuild
 create mode 100644 dev-python/cfn-lint/cfn-lint-0.72.10.ebuild
 delete mode 100644 dev-python/cfn-lint/cfn-lint-0.72.6.ebuild
 delete mode 100644 dev-python/cfn-lint/cfn-lint-0.72.7.ebuild
 delete mode 100644 dev-python/cfn-lint/cfn-lint-0.72.8.ebuild
 create mode 100644 dev-python/cmd2/cmd2-2.4.3.ebuild
 create mode 100644 dev-python/dask/dask-2023.1.1.ebuild
 create mode 100644 dev-python/emcee/emcee-3.1.4.ebuild
 create mode 100644 dev-python/fakeredis/fakeredis-2.6.0.ebuild
 delete mode 100644 dev-python/httpx/httpx-0.23.1-r1.ebuild
 delete mode 100644 dev-python/httpx/httpx-0.23.2.ebuild
 create mode 100644 dev-python/hypothesis/hypothesis-6.65.2.ebuild
 create mode 100644 dev-python/ipython/ipython-8.9.0.ebuild
 create mode 100644 dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
 create mode 100644 dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild
 create mode 100644 dev-python/pyannotate/pyannotate-1.2.0-r1.ebuild
 delete mode 100644 dev-python/pyannotate/pyannotate-1.2.0.ebuild
 delete mode 100644 dev-python/rich/rich-12.6.0.ebuild
 delete mode 100644 dev-python/rich/rich-13.0.0.ebuild
 delete mode 100644 dev-python/rich/rich-13.0.1.ebuild
 delete mode 100644 dev-python/rich/rich-13.1.0.ebuild
 create mode 100644 dev-python/rich/rich-13.3.0.ebuild
 create mode 100644 dev-python/rst-linker/rst-linker-2.4.0.ebuild
 delete mode 100644 dev-python/snakeoil/snakeoil-0.10.4.ebuild
 create mode 100644 dev-python/zipp/zipp-3.12.0.ebuild
 delete mode 100644 games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch
 delete mode 100644 games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
 delete mode 100644 games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild
 create mode 100644 games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.3.ebuild
 create mode 100644 games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
 delete mode 100644 games-action/supertuxkart/supertuxkart-1.4.ebuild
 delete mode 100644 games-fps/alephone-durandal/alephone-durandal-20220115.ebuild
 create mode 100644 games-fps/alephone-durandal/alephone-durandal-20221126.ebuild
 delete mode 100644 games-fps/alephone-infinity/alephone-infinity-20220115.ebuild
 create mode 100644 games-fps/alephone-infinity/alephone-infinity-20221126.ebuild
 delete mode 100644 games-fps/alephone-marathon/alephone-marathon-20220115.ebuild
 create mode 100644 games-fps/alephone-marathon/alephone-marathon-20221126.ebuild
 delete mode 100644 games-fps/alephone/alephone-20220115-r1.ebuild
 create mode 100644 games-fps/alephone/alephone-20221126.ebuild
 create mode 100644 games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild
 create mode 100644 games-util/basis_universal/Manifest
 create mode 100644 games-util/basis_universal/basis_universal-1.16.3.ebuild
 create mode 100644 games-util/basis_universal/files/basis_universal-1.16.3-fix-RPATH.patch
 create mode 100644 games-util/basis_universal/files/basis_universal-1.16.3-respect-CFLAGS.patch
 create mode 100644 games-util/basis_universal/metadata.xml
 delete mode 100644 media-video/pipewire/pipewire-0.3.63-r2.ebuild
 create mode 100644 media-video/pipewire/pipewire-0.3.63-r3.ebuild
 delete mode 100644 media-video/pipewire/pipewire-0.3.65-r1.ebuild
 create mode 100644 media-video/pipewire/pipewire-0.3.65-r2.ebuild
 create mode 100644 metadata/md5-cache/acct-user/pipewire-1
 create mode 100644 metadata/md5-cache/app-admin/awscli-1.27.59
 delete mode 100644 metadata/md5-cache/app-arch/dpkg-1.21.18
 create mode 100644 metadata/md5-cache/app-arch/dpkg-1.21.19
 delete mode 100644 metadata/md5-cache/app-text/msort-8.53-r1
 create mode 100644 metadata/md5-cache/app-text/msort-8.53-r2
 delete mode 100644 metadata/md5-cache/dev-games/godot-4.0_beta14
 create mode 100644 metadata/md5-cache/dev-games/godot-4.0_beta16
 delete mode 100644 metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
 delete mode 100644 metadata/md5-cache/dev-java/guava-30.1.1
 delete mode 100644 metadata/md5-cache/dev-java/guava-testlib-30.1.1
 delete mode 100644 metadata/md5-cache/dev-java/jctools-core-3.3.0
 delete mode 100644 metadata/md5-cache/dev-java/woodstox-core-6.3.1
 delete mode 100644 metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
 delete mode 100644 metadata/md5-cache/dev-java/zstd-jni-1.5.2.4
 create mode 100644 metadata/md5-cache/dev-lang/rust-1.67.0
 create mode 100644 metadata/md5-cache/dev-lang/rust-bin-1.67.0
 create mode 100644 metadata/md5-cache/dev-python/boto3-1.26.59
 create mode 100644 metadata/md5-cache/dev-python/botocore-1.29.59
 create mode 100644 metadata/md5-cache/dev-python/cfn-lint-0.72.10
 delete mode 100644 metadata/md5-cache/dev-python/cfn-lint-0.72.6
 delete mode 100644 metadata/md5-cache/dev-python/cfn-lint-0.72.7
 delete mode 100644 metadata/md5-cache/dev-python/cfn-lint-0.72.8
 create mode 100644 metadata/md5-cache/dev-python/cmd2-2.4.3
 create mode 100644 metadata/md5-cache/dev-python/dask-2023.1.1
 create mode 100644 metadata/md5-cache/dev-python/emcee-3.1.4
 create mode 100644 metadata/md5-cache/dev-python/fakeredis-2.6.0
 delete mode 100644 metadata/md5-cache/dev-python/httpx-0.23.1-r1
 delete mode 100644 metadata/md5-cache/dev-python/httpx-0.23.2
 create mode 100644 metadata/md5-cache/dev-python/hypothesis-6.65.2
 create mode 100644 metadata/md5-cache/dev-python/ipython-8.9.0
 create mode 100644 metadata/md5-cache/dev-python/jaraco-text-3.11.1
 create mode 100644 metadata/md5-cache/dev-python/jupyter_kernel_test-0.5.0
 delete mode 100644 metadata/md5-cache/dev-python/pyannotate-1.2.0
 create mode 100644 metadata/md5-cache/dev-python/pyannotate-1.2.0-r1
 delete mode 100644 metadata/md5-cache/dev-python/rich-12.6.0
 delete mode 100644 metadata/md5-cache/dev-python/rich-13.0.0
 delete mode 100644 metadata/md5-cache/dev-python/rich-13.0.1
 delete mode 100644 metadata/md5-cache/dev-python/rich-13.1.0
 create mode 100644 metadata/md5-cache/dev-python/rich-13.3.0
 create mode 100644 metadata/md5-cache/dev-python/rst-linker-2.4.0
 delete mode 100644 metadata/md5-cache/dev-python/snakeoil-0.10.4
 create mode 100644 metadata/md5-cache/dev-python/zipp-3.12.0
 delete mode 100644 metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r3
 create mode 100644 metadata/md5-cache/games-action/spacearyarya-kxl-1.0.3
 delete mode 100644 metadata/md5-cache/games-action/supertuxkart-1.4
 create mode 100644 metadata/md5-cache/games-action/supertuxkart-1.4-r1
 delete mode 100644 metadata/md5-cache/games-fps/alephone-20220115-r1
 create mode 100644 metadata/md5-cache/games-fps/alephone-20221126
 delete mode 100644 metadata/md5-cache/games-fps/alephone-durandal-20220115
 create mode 100644 metadata/md5-cache/games-fps/alephone-durandal-20221126
 delete mode 100644 metadata/md5-cache/games-fps/alephone-infinity-20220115
 create mode 100644 metadata/md5-cache/games-fps/alephone-infinity-20221126
 delete mode 100644 metadata/md5-cache/games-fps/alephone-marathon-20220115
 create mode 100644 metadata/md5-cache/games-fps/alephone-marathon-20221126
 create mode 100644 metadata/md5-cache/games-strategy/warzone2100-4.3.3-r3
 create mode 100644 metadata/md5-cache/games-util/basis_universal-1.16.3
 delete mode 100644 metadata/md5-cache/media-video/pipewire-0.3.63-r2
 create mode 100644 metadata/md5-cache/media-video/pipewire-0.3.63-r3
 delete mode 100644 metadata/md5-cache/media-video/pipewire-0.3.65-r1
 create mode 100644 metadata/md5-cache/media-video/pipewire-0.3.65-r2
 create mode 100644 metadata/md5-cache/net-misc/ena-driver-2.8.2
 delete mode 100644 metadata/md5-cache/sys-apps/baselayout-2.12
 create mode 100644 metadata/md5-cache/sys-apps/baselayout-2.13
 create mode 100644 metadata/md5-cache/sys-apps/systemd-utils-252.4
 create mode 100644 metadata/md5-cache/sys-devel/gcc-11.3.1_p20230127
 delete mode 100644 metadata/md5-cache/sys-kernel/zen-sources-5.15.10
 delete mode 100644 metadata/md5-cache/sys-kernel/zen-sources-5.19.13
 delete mode 100644 metadata/md5-cache/sys-kernel/zen-sources-6.0.12
 create mode 100644 metadata/md5-cache/sys-kernel/zen-sources-6.1.8
 create mode 100644 metadata/md5-cache/sys-libs/talloc-2.4.0
 create mode 100644 metadata/md5-cache/sys-libs/tdb-1.4.8
 create mode 100644 metadata/md5-cache/sys-libs/tevent-0.14.0
 create mode 100644 metadata/md5-cache/virtual/rust-1.67.0
 delete mode 100644 metadata/md5-cache/www-apps/gitea-1.17.4
 delete mode 100644 metadata/md5-cache/www-apps/gitea-1.18.0
 create mode 100644 net-misc/ena-driver/ena-driver-2.8.2.ebuild
 delete mode 100644 sys-apps/baselayout/baselayout-2.12.ebuild
 create mode 100644 sys-apps/baselayout/baselayout-2.13.ebuild
 create mode 100644 sys-apps/systemd-utils/files/legacy.conf
 create mode 100644 sys-apps/systemd-utils/systemd-utils-252.4.ebuild
 create mode 100644 sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch
 create mode 100644 sys-devel/gcc/gcc-11.3.1_p20230127.ebuild
 delete mode 100644 sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
 delete mode 100644 sys-kernel/zen-sources/zen-sources-5.19.13.ebuild
 delete mode 100644 sys-kernel/zen-sources/zen-sources-6.0.12.ebuild
 create mode 100644 sys-kernel/zen-sources/zen-sources-6.1.8.ebuild
 create mode 100644 sys-libs/talloc/talloc-2.4.0.ebuild
 create mode 100644 sys-libs/tdb/tdb-1.4.8.ebuild
 create mode 100644 sys-libs/tevent/tevent-0.14.0.ebuild
 create mode 100644 virtual/rust/rust-1.67.0.ebuild
 delete mode 100644 www-apps/gitea/gitea-1.17.4.ebuild
 delete mode 100644 www-apps/gitea/gitea-1.18.0.ebuild

diff --git a/Manifest b/Manifest
index 7651a4c49bdd..570d630e9f83 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29450 BLAKE2B 99800ff156ac6a30de521cd8710e5e967d754b4e4ce1bd8eba69020d296168101aa84214cd66b17778884db6668d09f6c2c47d4494643ecac1523af08ca1132a SHA512 286467b067fff825e0a5b7cf554d874ce116d076bb9e70b9ea6e4904f8b548d0045c16c6025c438962fcfb7a73cb9a1bc9acfd3a3c26145addc5e851c9be38fc
-TIMESTAMP 2023-01-28T02:11:12Z
+MANIFEST Manifest.files.gz 29454 BLAKE2B 94a8b8b501eb864a4a170a791ef342e67dfa8afad399145863e2aa1c93cc72bc049e1ec6276278fd8f3536100b9fc611722bfed4762a845cf293d55201b85a23 SHA512 a326f9d7be2f434a61e6155fa6049674955462e8d6533f731b1d3d4e29fab9df4fbc4b042d637190e289c166c4b8ce6d58ba11ea343f28fa670d2325bf41ae9b
+TIMESTAMP 2023-01-28T08:10:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPUhEBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPU2FhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCFDw//QQbp2lZVzsekVu8neImiDX+aKjOIc9u/2CXMHsnXc0s3gPq88s6IcEqU
-OatwmiW21SNhlvA0vIicw0mYea8GKhnpTuIweKET2AAFKBRN8meU2L9JIIwhZq1n
-MrHCypA6Tx6kytUEEuxNdGkpo/6rIRstYesdpNROCkTtWDshkjetzWg94nJCkdlv
-iwOnLpMBECvDA3fewslTTFOqOUUfHK6k2h0xMXYmhMj/wl6bEAQesz5btXoxDRiX
-OOpBeQimaClyu6wU1god2gu/bzovenRBJgXZqRN8zXQQVqkK4Prv883/a5ReqoIz
-roV5Ny98eOBtFitYJgHtk/R+nD+NvpCMqkb5gpuSsFar38zB/6yPR0W1xA/zilyc
-KGq3BR45xaMQ0pKkptsAZw1LbFuvhNNxTZGHqnUX3NezYXAEXY6QsddCHQtsKavF
-KJR5cT37RYamboD93NWHjqjq7LZeC8czBZl4GtMK4UnuhypRqzlgOA6fW/bKbrA2
-zsOz0jIco0vNDPkg76lhhIooaiaMfRJn3R9tejkw7OnSP26XMHLnCL+Uk5ky2KZn
-lKZatPHj6gO1BlrA/h1zKw14CEao6jzuonh/tswmYItoGuqXBCKUfi987V+zVSnG
-bJFpjxjPazfUA4bfQ8ETvqm1riPj7x1Fo14hBfa8qduQ7I1IFVI=
-=pHv5
+klCJVw/+JdJQZY+PQr5zHgI8SCM6Osn4+NwWB56jxlkMo3ZKhmfdqfdDzJ2ZXatN
+heZHBlxUTPj/7qtCMY0Kmy/FslVNZEOoc5yD4S/WBguhP9kn09SLuznkbaYXEiIH
+4/6JKK7EUiujO9KtwJCqTNMDZfQESqRsw8osC6gogx8Nf/C6bFRy20m08KhKDxZJ
+0RWZ09Wx/sqIY/hRPKZ/Kr6oSA85G9Zh8OWiKxKj+bYy83hyw9iGuh6V1YyVToae
+RTIvYZjyKZpF/aAvhqqb2QyGSpKPKN/2BDAnPY4ra2oxEH5v8iye/9FoTS8Un/wt
+cpiuSnoVQ/BX34FpFlrrr2GVrS99RCR0WrOD/rF6SfsE9Sif1hYcPw1kEdLiHMbd
+jE/HlSUUnB5NzD/EM+Twn7OFKKogtXiZW23txKbFOAGXfr4L/fJ0g3Z0F3qTkvsz
+O7n9gxc0vq1NVMExy6M9x8TSabdAVU38brcUhQOGLRi0IPQSwLtkUo97y361T8IB
+8ljsD8mPwz6eYZTr6OBuegIDis+VLHWWQyH5v8iaVCNJmug0ZvfnAbtlOF9uN9c9
+v1i9pSv88RADxGfIAf1sbQ+4h760T/0ClZ5K8U2YROBWZiIQa01uy047F7x5MFI/
+IKgZdQqPFkN3Mi+qYUqfHXFPE6HRM4jugYLwL/LiNbElb6cOPd4=
+=pAo8
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4c02ba296d8f..d8c451a79eb7 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 539d5d9d3282..0b91a6ec917b 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/pipewire/Manifest b/acct-user/pipewire/Manifest
index 89fab494ccc2..2b974f3d6912 100644
--- a/acct-user/pipewire/Manifest
+++ b/acct-user/pipewire/Manifest
@@ -1,2 +1,3 @@
 EBUILD pipewire-0.ebuild 304 BLAKE2B 8e05fa9d67ce8934b9900f5c8a01bc52e8b9c2c4769d5f1996a626c586b510e858dd1ce62d4f53d3f4e1e831425270abd539754624225b3f6988911da74f732a SHA512 d85678788914f8ba66ef2d03702442fa0576223e5d30c9d712dd821ac7862e4876fb2aaac642b42b68cf1e6d1b2669dd19e2518e1d5522d3f22d08d1f7b05956
+EBUILD pipewire-1.ebuild 296 BLAKE2B e1d875f4ef1e567f006fef2c1d62892024a7861f83ed205bba7cdf40cf0fe1e248cf2531a0677dac4a4af1c29ef45bf461451b6819db2eceaceab1795a829bc3 SHA512 6bfb6cea55816f5cd03f4d6d9e422fa2aaea53c0102266f5009a76ab815ef8f3144b03f6fcb6c635253e5f69f278781d75fde68c39853e042dea20840be751ac
 MISC metadata.xml 345 BLAKE2B f519f452866108391c70c15f93d9c861d4d2abc2d7e8abad79bee5e5e2649119643c9563e2c256c5fa194df4b2bb8b641ff62136215ea3d79564edffc849e9f8 SHA512 1fe7551246560d5f17056ed4d8ef3b88f080d7beb1285054cdc691e392686b62107695fc35afaa4bee308bcdd850ae69d1302bb7127fec149854de58b226f469
diff --git a/acct-user/pipewire/pipewire-1.ebuild b/acct-user/pipewire/pipewire-1.ebuild
new file mode 100644
index 000000000000..0492f9ffcc2e
--- /dev/null
+++ b/acct-user/pipewire/pipewire-1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running PipeWire as a system-wide instance"
+ACCT_USER_ID=509
+ACCT_USER_GROUPS=( pipewire audio )
+ACCT_USER_HOME=/dev/null
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bb7e96ba6a95..75aca76d050c 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 363f9d5dacf3..4008383aa47c 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.27.50.gh.tar.gz 2347235 BLAKE2B cacfe2c8d4fce7de6452a02fa8bcbcde5
 DIST aws-cli-1.27.54.gh.tar.gz 2349811 BLAKE2B 08cb317ea4621273644c39c1152e1a3f8bd9f52ed8c30d7c37dfea9e986ca1597fda1dfbdea8c4043fa783f061609d6f24895997e9f9a3f27d5677c0f9e6c3de SHA512 af4783eef3c1c666b8b3c6d20f1c0177db6d4ce01645b092770cba535dad95609b4bece366355ce6d6a505ac7ab5a2e390d64fb84d6c00e402f9f8ab88db91d9
 DIST aws-cli-1.27.57.gh.tar.gz 2359650 BLAKE2B 637674f1726828b43a8135b9f7ff9d1f4a05716680aa909829148e4acf7104290c49f90b453294e16cc74d0d200bdfa4049b470a5194df5e3098308d0c088d3b SHA512 be1ac08e57012751f59e63996395b39bf5a9f42381e9a08baffacc2ac9d104c3560c250b2b210608bf6b460fdc31cc1f794a90949a52ebdbb3c22f03e5fb00c2
 DIST aws-cli-1.27.58.gh.tar.gz 2359921 BLAKE2B da3ead9140407faff60384fa7aafbc27a8a86d088e4516599e573b9e968f00d3e292a8ea6a0eb0a80449f1fef3bb62204dad2a788f10ba87a959218d909da77b SHA512 2bc4dfe5058c847510f4f43006191153b23e5efecc51bb010f9b06ba127504ee40c953bcb6e47d921760f1bc6eb87747971a9a3514f781dd4bd76f30ecd7de81
+DIST aws-cli-1.27.59.gh.tar.gz 2360458 BLAKE2B e60117e41cf95d442db333cf49c146e4ed02247007b8f46228799c5dee8c486aec34b236c9a0a6d152d690ff86c34fd797a6f35227a6e443805cdfe1b1b30f00 SHA512 87b9aebe812415223285c09ab5a36de2b9c0da49775d1162a5b5d7489ad61c16ca5361b721bc9e4ec4ccc09306be24513f42d7263b315d6856be20fdf0779686
 EBUILD awscli-1.27.50.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.54.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.57.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.58.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.59.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.59.ebuild b/app-admin/awscli/awscli-1.27.59.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.59.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 83a1580fa3f3..d8036f0973d3 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 2577318d68e2..64d312205bc5 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -8,10 +8,10 @@ DIST dpkg_1.20.12.tar.xz 5009108 BLAKE2B 47ecb53c331503c72081a4c472acd6e94a5b7fc
 DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
 DIST dpkg_1.21.1.tar.xz 4986936 BLAKE2B f5b0f9fe7ac5fe7ba47191a9e467356e748418846ce0fc9f3c61d731e035eb096932848b15e6a85a15938d3bbd6fa069c786ab0e89c77119958fe632a91c309f SHA512 3f3f263e1300f3e4b55e84521847703dcfe465aa54829a69c31c174a2ad5e8b6a8a251da7c6020d31a38e9e6744113924a71e9579469e32289328e91a48db07f
 DIST dpkg_1.21.15.tar.xz 5350148 BLAKE2B f26611db365266ef9f43484c20d3150889238b34b156cac26f0ae8ae9572e7e4a9839e08a0073a25c886cd2891fc6d84afc97262ae6992267b47fa6e86c03a33 SHA512 eb31db63dd454048c3b7539b539720ed71239303ca679df92b934e971914d63dd771da09149054048e24dde1f5627ee24d43dbd8782ca1dc28c4a2bd3ed8f26a
-DIST dpkg_1.21.18.tar.xz 5355160 BLAKE2B 448f1500c19da97f535630ff231b19852727e6d838c66d86edc8f92615fbebeef1d31ac26d9f86ec7e4cd018ffb9f2f40ab1a2987aa60187f995dc901f99119d SHA512 a0fd2fc0ebffd1c1939b50fb5ba0e13864ef8f6b22dbdb2b2452380add7a723edf2a194010e43faf60803042e6652d4c28356c778e0d0f05ca84463ae1e1ce80
+DIST dpkg_1.21.19.tar.xz 5360888 BLAKE2B 1a48781c136b47b74fb947a14ddfde8e3d8441f728215257d4c7b9618b5af79225be6312a31166181acbf5c05a408332d9faae2c7e16f7757a442e8d4e6a0afd SHA512 660297e678326350b70e6a49635642347413046ebab05bdc076505511e844f7de0261a12c6c07e586d661f6536b987e3c32c21b8cc95d7135538a5c2f6d1514e
 EBUILD dpkg-1.20.12-r1.ebuild 2094 BLAKE2B 223c1a0fb84047b8fa33bb86127b6a01c699035aadd8244ee5bcfcca555f39cf5e8364665bf557e39257eb86a1582bf9ae6a852cf4c574752b1a08dbd4e6bda7 SHA512 455b2a89f88cc46f14e705244165b5ab7d0f44f9a266c56fc1859b54492b856aabd4585fa9dbe52f5af1a7a61636052cc04d864dc18c6ca4b0338e998478f67d
 EBUILD dpkg-1.20.9-r1.ebuild 2039 BLAKE2B 581e7a5a5f1814a2571694eb46911bf5a903582f911a989885ce9dbbec6c1517748e741c87a9472258d701cf4ed1ff0c4d0e83fd44432d672b01bed88c0b6109 SHA512 930a798ff3f057fcb8603751d70ea1b5d6cea379290681bccbd70270aac0bcc69c187dcc302231f2fa7e5a461e4d70edacc1057a3147d9adfaca596ab52ad5f3
 EBUILD dpkg-1.21.1.ebuild 1990 BLAKE2B 3aff143bc3013658754a67e43ca6f9aacd43372cf32ac3821321c1ff454d30a08c62edafc9eafd6444de9c39d082f625fc73df86c89ef142ec5b7d8535ace1b4 SHA512 c47497584a0ab84311361eab048da24c23ba422478210f366e7f8a0f8223fb498e930fedaa0b72e4a0ef2062f67f338b681501c0eafa05d36be3759884f7579b
 EBUILD dpkg-1.21.15-r2.ebuild 2355 BLAKE2B 2277406e12148a3e1498eb3d19b568249a5b785dbf0dca30fa4e1fcd96302600f78787cc51087c0c95a4c76fbf42af0650d60eefc72714125fd0b2025feb46a8 SHA512 bd7f987fd8c84c0531e8b6ca2d208bb99a64c1e54496cc17fd8573e1fffa3c88527eae32ae03be9391d22cf81347cbd08f58f4d3847d4c91221d0621ff5b8875
-EBUILD dpkg-1.21.18.ebuild 2376 BLAKE2B 0256208e6735254b3ccd2a0354ea9e0e4352b94faf4b0d626f7afc517bd649a9b46a18c51b7b5d4b9437c97dc89ed98c7cf7e4e00e9fcf874c39af0102fd5441 SHA512 8aa8cd29dab16028a034ae6adc62633b7482ebe5a5e5f9550b17ed696b8572e8b1ba5ff9aabb7eace3c4d85f2981ba58a37c8f16a5e42aa85497aafc0e864819
+EBUILD dpkg-1.21.19.ebuild 2376 BLAKE2B 0256208e6735254b3ccd2a0354ea9e0e4352b94faf4b0d626f7afc517bd649a9b46a18c51b7b5d4b9437c97dc89ed98c7cf7e4e00e9fcf874c39af0102fd5441 SHA512 8aa8cd29dab16028a034ae6adc62633b7482ebe5a5e5f9550b17ed696b8572e8b1ba5ff9aabb7eace3c4d85f2981ba58a37c8f16a5e42aa85497aafc0e864819
 MISC metadata.xml 433 BLAKE2B fe1e0ca0c96628891b711ca120d5c119f8effe66ce43198ebb2a16fce1cea23b7ab6ab88d807a71645298e2311bc3044dca4989fe83cf99e54a9e97f66835c69 SHA512 2882194685980d67acc10913c8863b55dc0a9215558db2e3cf33f0489d91e5477bf2ac0c0fc5b4a134f45593f6f5d3fde5e09493d20ca45224645b8c1c597fef
diff --git a/app-arch/dpkg/dpkg-1.21.18.ebuild b/app-arch/dpkg/dpkg-1.21.18.ebuild
deleted file mode 100644
index 9853cc616b20..000000000000
--- a/app-arch/dpkg/dpkg-1.21.18.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="https://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/gzip-1.7
-	>=app-arch/tar-1.34-r1
-	app-crypt/libmd
-	>=dev-lang/perl-5.14.2:=
-	sys-libs/ncurses:=[unicode(+)]
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	test? (
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-		virtual/perl-Test-Harness
-	)
-"
-BDEPEND="
-	sys-devel/flex
-	nls? (
-		app-text/po4a
-		>=sys-devel/gettext-0.18.2
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.12-flags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|\<ar\>|${AR}|g' src/at/deb-format.at src/at/testsuite || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR CC
-
-	local myconf=(
-		--disable-compiler-warnings
-		--disable-devel-docs
-		--disable-dselect
-		--disable-start-stop-daemon
-		--enable-unicode
-		--localstatedir="${EPREFIX}"/var
-		$(use_enable nls)
-		$(use_enable update-alternatives)
-		$(use_with bzip2 libbz2)
-		$(use_with lzma liblzma)
-		$(use_with selinux libselinux)
-		$(use_with zlib libz)
-		$(use_with zstd libzstd)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	local DOCS=( debian/changelog THANKS TODO )
-	default
-
-	# https://bugs.gentoo.org/835520
-	mv -v "${ED}"/usr/share/zsh/{vendor-completions,site-functions} || die
-
-	# https://bugs.gentoo.org/840320
-	insinto /etc/dpkg/origins
-	newins - gentoo <<-_EOF_
-		Vendor: Gentoo
-		Vendor-URL: https://www.gentoo.org/
-		Bugs: https://bugs.gentoo.org/
-	_EOF_
-	dosym gentoo /etc/dpkg/origins/default
-
-	keepdir \
-		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
-		/var/lib/dpkg/{alternatives,info,parts,updates}
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/app-arch/dpkg/dpkg-1.21.19.ebuild b/app-arch/dpkg/dpkg-1.21.19.ebuild
new file mode 100644
index 000000000000..9853cc616b20
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.21.19.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="https://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/gzip-1.7
+	>=app-arch/tar-1.34-r1
+	app-crypt/libmd
+	>=dev-lang/perl-5.14.2:=
+	sys-libs/ncurses:=[unicode(+)]
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	nls? ( virtual/libintl )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? (
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+BDEPEND="
+	sys-devel/flex
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.12-flags.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|\<ar\>|${AR}|g' src/at/deb-format.at src/at/testsuite || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR CC
+
+	local myconf=(
+		--disable-compiler-warnings
+		--disable-devel-docs
+		--disable-dselect
+		--disable-start-stop-daemon
+		--enable-unicode
+		--localstatedir="${EPREFIX}"/var
+		$(use_enable nls)
+		$(use_enable update-alternatives)
+		$(use_with bzip2 libbz2)
+		$(use_with lzma liblzma)
+		$(use_with selinux libselinux)
+		$(use_with zlib libz)
+		$(use_with zstd libzstd)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=( debian/changelog THANKS TODO )
+	default
+
+	# https://bugs.gentoo.org/835520
+	mv -v "${ED}"/usr/share/zsh/{vendor-completions,site-functions} || die
+
+	# https://bugs.gentoo.org/840320
+	insinto /etc/dpkg/origins
+	newins - gentoo <<-_EOF_
+		Vendor: Gentoo
+		Vendor-URL: https://www.gentoo.org/
+		Bugs: https://bugs.gentoo.org/
+	_EOF_
+	dosym gentoo /etc/dpkg/origins/default
+
+	keepdir \
+		/usr/$(get_libdir)/db/methods/{mnt,floppy,disk} \
+		/var/lib/dpkg/{alternatives,info,parts,updates}
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5e8d888e91b2..b29e1ffd0677 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest
index 64bc1e9f0d64..9ae60c68a6ab 100644
--- a/app-text/msort/Manifest
+++ b/app-text/msort/Manifest
@@ -1,7 +1,8 @@
+AUX msort-8.53-configure-clang16.patch 738 BLAKE2B acf265459c2d943f955034eb675fe9661d5edc4fec07693db886a8b02af667133a6e3c501bced2b3a8cc7875f85d64cb7cce0c15cd1d7876568e0f7510daed9e SHA512 0ec6c8f499c7357ea3566fea5fe2561f315dbb844c5b8d9b5b921949e9782c68b27da8beb011da14bbb34b511f629d4d920081180ed2c8f113b12b1d88306323
 AUX msort-8.53-fix-icu-build.patch 239 BLAKE2B ff53316fd6b1f531b432655d1fac1c3b24c114ea35ae63f4f4bb65f4598db2039dae80103bf942ba2ecd269ae3fb8ea9735bee71907876a6494181db052941ee SHA512 86f7c131166a568dd3b9534662c02681396686d9642d6cbdb6b4128d0c6c8eeec9660c8e5f9c8156e78e096a668ec67eba52e9c368455f40002e18de4dddf269
 AUX msort-8.53-fix-missing-limits-header.patch 559 BLAKE2B cb158b619540aa9679d845c1c94986f3bbe9f75aab0069d7a12133043ba547d13d26727251cf2524e4e285d0f1207ea43353972eea782198dda34456b984707a SHA512 9e779627e2f92955dc66b03fb64fce767e2cbf2dcdd8a42c9e10f06b512625be10434a47c26a9b7c46e1a15c226d4f66eeda21194f9a0d3eb6deb801b83633eb
 AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc
 AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
 DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
-EBUILD msort-8.53-r1.ebuild 977 BLAKE2B dd7a2d2220d626de9e1319769465e66e51e3007766494fc728732476ce5af14d48bcaa1a4503e56709ed504fb0b76d3eb8edd745e6e124f028ee400c8118d3f4 SHA512 50910b18d2462593b4bf4ab8ae0169a0de1069e70c348f49465a6698e003ea795067a676b6e22c217648be3ee58836f5b3609e5636cd3b708318025097d14d76
+EBUILD msort-8.53-r2.ebuild 1020 BLAKE2B b22562cf05a6958035c94c6db93db165fa27233227971589a38a025a1972101121b8250edabb241ed3eec5c21fdf339a02a245fa89c7904e0900087f81643a50 SHA512 5bd0c94ccfdf4f43aad1e7fbdc1d06070cb83d1e820aff183179f982d415594721a49e2d920f2944d84f81fe0b604fc9a2bf0ef1f4758a52cc66ea658bd78eb9
 MISC metadata.xml 1001 BLAKE2B 85c37e686432dc1f791c14ad0d07ece535b835c0fe7b2f220f682abfb494411849a69fb0c197981d1cf97b3f2d3bb7e7d0d621179cec0a1980218dc72115b0ff SHA512 63558ec0d6109f89d80700048f62df5fb57245ba7ba5aed4467f63041777c8cb9d6fa9d0a2c75fd64bdc5f72b23ba8d2c61746e34a4d8a20b18831900fd880f2
diff --git a/app-text/msort/files/msort-8.53-configure-clang16.patch b/app-text/msort/files/msort-8.53-configure-clang16.patch
new file mode 100644
index 000000000000..de19a029caa4
--- /dev/null
+++ b/app-text/msort/files/msort-8.53-configure-clang16.patch
@@ -0,0 +1,18 @@
+https://src.fedoraproject.org/rpms/msort/blob/addd4dfbb265c79e76f3329c691639d3cf837cb4/f/msort-configure-c99.patch
+
+Include <stdio.h> for the printf function.  This avoids a check
+failure with future compilers which do not support implicit function
+declarations.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,7 +18,7 @@ AC_DEFUN([AC_C_LONG_LONG],
+ ])
+ 
+ AC_DEFUN([AC_C_PRINTF_THSEP],
+-[AC_TRY_COMPILE(,[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no)
++[AC_TRY_COMPILE([#include <stdio.h>],[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no)
+  if test $ac_cv_c_printf_thsep = yes; then
+   AC_DEFINE(HAVE_PRINTF_THSEP, 1, [compiler understands printf flag for thousands separation in ints])
+  fi
+
diff --git a/app-text/msort/msort-8.53-r1.ebuild b/app-text/msort/msort-8.53-r1.ebuild
deleted file mode 100644
index 7165b1210a09..000000000000
--- a/app-text/msort/msort-8.53-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A program for sorting files in sophisticated ways"
-HOMEPAGE="https://billposer.org/Software/msort.html"
-SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE="heap +icu +libuninum"
-
-RDEPEND="dev-libs/tre
-	icu? ( dev-libs/icu:= )
-	!icu? ( dev-libs/libutf8proc:= )
-	libuninum? ( dev-libs/libuninum:= )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-icu-build.patch"
-	"${FILESDIR}/${P}-fix-missing-limits-header.patch"
-	"${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
-	"${FILESDIR}/${P}-respect-users-cflags.patch"
-	)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable !heap allocaok)
-		$(use_enable !icu utf8proc)
-		$(use_enable libuninum uninum)
-		--disable-debugbuild
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-text/msort/msort-8.53-r2.ebuild b/app-text/msort/msort-8.53-r2.ebuild
new file mode 100644
index 000000000000..39dfa9ff4a68
--- /dev/null
+++ b/app-text/msort/msort-8.53-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A program for sorting files in sophisticated ways"
+HOMEPAGE="https://billposer.org/Software/msort.html"
+SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
+
+KEYWORDS="amd64 x86"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+IUSE="heap +icu +libuninum"
+
+RDEPEND="dev-libs/tre
+	icu? ( dev-libs/icu:= )
+	!icu? ( dev-libs/libutf8proc:= )
+	libuninum? ( dev-libs/libuninum:= )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-icu-build.patch"
+	"${FILESDIR}/${P}-fix-missing-limits-header.patch"
+	"${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
+	"${FILESDIR}/${P}-respect-users-cflags.patch"
+	"${FILESDIR}/${P}-configure-clang16.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable !heap allocaok)
+		$(use_enable !icu utf8proc)
+		$(use_enable libuninum uninum)
+		--disable-debugbuild
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 1924d09fce36..0295c8021a14 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,6 +3,6 @@ AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
 DIST poppler-23.01.0.tar.xz 1847492 BLAKE2B 8dd85767a0c101b3d7166719374658a233aff491b0990917aacaa6fb3c5d8e51104b3ac45c78dcfb380286ea48067d1db57c2794d99a93cae9f4d64e9ca3dd07 SHA512 a44fd59cdb4dc1c04765990d9666f27538895883fe98a64e7bea30caebeab10875615282307fbd6eacecf83b7a7c8daa81afa1b13ae6c09b80673e3fb8563053
 DIST poppler-23.01.0.tar.xz.sig 833 BLAKE2B 46c3910627fd69930fd428397e739e3fe41c9b835379dfe7abbdf421049a77b33ce1cf6a44bd386278d3610ae2547d119ac6da4c3bfa7f348c51fbce7319a878 SHA512 0cebaac1846e6b3944175bcb28b49592d562738c009a97e048abe9f6677718c97bea2b470ea503b8dd083fc5f154e71d539cf1e3bce08363c6979d268dcdfd3b
-EBUILD poppler-23.01.0.ebuild 3691 BLAKE2B b1b52a48b8ca405bf01df7579a4f9414df1cb2115199cb71f290a194ce3598cfbdda71d003afa529c34824876d8619b89c073a34c2f1e8d1feb919cc475f1a06 SHA512 0ea18092d7d254fea35e88cba2e384cbaa45aaa03fe9fa8f9b9d67c3cd70c03b9b72b2e4df7611cdf55c0bb6e938329eb38760dc81447458fadc632db96fa44f
-EBUILD poppler-9999.ebuild 3699 BLAKE2B e56b5203b0b6c8b2a4b48e12d2c8037a965778922f1824e9fe58424746347e1750ecccba016ef5aca025d901d970bae659da15897cc7693a42f4d0c4d9b217a7 SHA512 c5ea1bf14bbcae2ec36ade3fdd47e8fdd3e945149f7786110bb2f148b258965632171f1f245b1f93e788e66bbc5194197bc8954aeb512d4d53790048b77029b2
+EBUILD poppler-23.01.0.ebuild 3697 BLAKE2B cb47f67742bd07faa89a68d0128295bc1b5a21a1b2716c2af58cf88393da79ce5eb60f1cc327a15daa0a18193150d67615ae18d94637eeade2d3ec5456cb1cbf SHA512 00699421e072ce5bcdda3ab9b4c6725c72cefcc211a00a3dfdb17362bb1a1af541c356b3afaa6781ab53db4d210698c12be793202f1d2fc8d6682042d372c3a6
+EBUILD poppler-9999.ebuild 3705 BLAKE2B 42f662364ef1bad66807f095c898799aef5b5e013bb9b0e289fa439c4f61de05ff16b4acbaf6d822dbc5da9c0bbbaf61a943d0ab77143fbf63469e5854e14ba7 SHA512 36aca9e21798fdf3bef1e2b1ef0568a1e767747c83781e49b9283b8ba8b6bf8cbe364c28f93f3b1e112e3b8438deac44b00416d8aed5064a636e3c341c54569b
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-23.01.0.ebuild b/app-text/poppler/poppler-23.01.0.ebuild
index b335955fa02d..4ebe3939c5c1 100644
--- a/app-text/poppler/poppler-23.01.0.ebuild
+++ b/app-text/poppler/poppler-23.01.0.ebuild
@@ -38,10 +38,10 @@ COMMON_DEPEND="
 		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
 	)
 	curl? ( net-misc/curl )
-	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
+	nss? ( >=dev-libs/nss-3.49 )
 	png? ( media-libs/libpng:0= )
 	qt5? (
 		dev-qt/qtcore:5
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index eafad6c41cf7..750ab1f52a57 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -38,10 +38,10 @@ COMMON_DEPEND="
 		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
 	)
 	curl? ( net-misc/curl )
-	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
 	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
+	nss? ( >=dev-libs/nss-3.49 )
 	png? ( media-libs/libpng:0= )
 	qt5? (
 		dev-qt/qtcore:5
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index f63b5994f7c1..7f462fb35fa9 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 9d19d8deac91..b864a0331996 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -4,9 +4,9 @@ AUX godot-4.0-musl.patch 345 BLAKE2B 05057241c1e29ff886a38b815f68fcfe2b8c5e23fce
 AUX godot-4.0_beta3-headless-header.patch 498 BLAKE2B 401942c17829136aace28e34f7c9a4f843457d5a76c8b7035f40894f3d4d06936ddf3f1bcedf81584a65c0bff96e6e556d20ed8856107dd76deb173c98256964 SHA512 f83ec6b0667108b7c8f744b90944cd686de114db5694e09febf20a359a7d3fe11457b0c3279719a1281309a647e856b729354d3bed5f6d5048548b8dd259f63b
 AUX godot-4.0_beta8-scons.patch 1445 BLAKE2B 6fc5a18911681da54191af590afb9fa62181e485eb06a5eb89e9c1f5a52fd53abf712e0f58f48b9a3bf8c8adc47aa1e7833ea025ede7436873b0a8a7f46cf92a SHA512 cb579d8c8925ee20152aa48a89171433b9e663ee9a44c869987bd9f736cdf9213d77e63d1ddaf45cbecf8b55113e204c80a378dfd8637aa6d0ba64933d48b2cb
 DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f
-DIST godot-4.0-beta14.tar.xz 31634268 BLAKE2B 6381d8efd0f2298a74c939a8c36f6d29f2b434ef870575fd01a844cfe04711fc29cccc280d6c0a92a4abd0344102b3fb36a87b9629e2cc08233ac7fde65a3be0 SHA512 38c5f33ed4d6c35d4eb45337399b525059caab7fff2efe611b2bbe9a36a23413c02690a94976cc63e6f4b857a1db7a0c7b86a8db3a504fdbf12a8d38c644acf2
 DIST godot-4.0-beta15.tar.xz 31921348 BLAKE2B 45482ac65e74b431d4f781a9055fdb578b8c838e659f459a09e3c39b80d50b1ee9222373159032d3eb25569f259330ef87967177765137491f793afe4d59ad93 SHA512 c0c0a139a437b2a27f38d6c104e64a2d4d9153d4b0c8ad66e157dde2422c86887796e1a1dd2eb9b9385013e7af2e513b8cd77d8bdcdb0750703fa5bba6770986
+DIST godot-4.0-beta16.tar.xz 31937624 BLAKE2B 998edcd6d9f118cb96a4f84b81b73c36d060d297702fa2a9dc4be936c7ca9aa35b77db16caf5ed19662fcae700f59e329393a17fd88448d8a6ff8f484a136f9c SHA512 c9cf5b66675dfe9253852eee7748a5c2bd04f356524def6e9925bef73baee3239f9f9405a92d373dcadbaff7c3288e54e547ae3cb46974bea61bfb68576b7c13
 EBUILD godot-3.5.1.ebuild 6752 BLAKE2B b7a6a3851292aa6bd134a45bf2ab7019a55da8bcc815e952ae3acd204b71314fb1a436fe5bab3c83906289566c274f1bc3240e3482c337aca488071d71618df5 SHA512 84a385fbcb01813c6b09e21a76b832b6e7329302e9d7ebd3d3ccbb37ce504f3cc13e1c0d460daa299ef40f9fe5cb04b7d1362e538004f96ef9b6c9dd56a115ac
-EBUILD godot-4.0_beta14.ebuild 7986 BLAKE2B 71456b92cf217ff2403b1c156132e05e433867811728b5f60a4ad4901321998eaa34a1110a423d6c6faafd07bfb979790b06dc6e9575ddc8a84c63c399ff8f43 SHA512 99028682672f894f46119a269388aa6f347fc048eea5ee726cdf212703dc3fe74c1624d2b570da7aa93f244c39f422baadfbd8e66a98c5720397d20b6bc1227c
 EBUILD godot-4.0_beta15.ebuild 7782 BLAKE2B c1ae4eaf5281e8ff8d553b359278b2c4be5a093075e95daf9c6e5582012651188744e3cf88ebb79f0675de368169901c5acacf4a134ef0493a43c3a93eafbb69 SHA512 ac25c9d9fe5068aa5cf14b07f2536ec5edf6b142255f4949ce5e7882ea8064a2ef7ec572ae391b8c6e83f30d2d0a13e8dba0572a191ad99b932fe18ba8e64370
-MISC metadata.xml 1606 BLAKE2B 5e4f1116549672d8cf6f88ef0b764e0710d5f5a1259110c323b67e911dc186c7b618ceb6e5d8b5ada540f531bf34b8e87c9de1652e13db9b08e865bacd7d0c29 SHA512 b4cdc297ad05067832bbd8ab849203201a3f65e00f0dd27ca4dd4c1f808ea2fd13a18615ac9fe6853ae30ae1e53168b73627d72df1f8f428d3979b06697defe5
+EBUILD godot-4.0_beta16.ebuild 7782 BLAKE2B c1ae4eaf5281e8ff8d553b359278b2c4be5a093075e95daf9c6e5582012651188744e3cf88ebb79f0675de368169901c5acacf4a134ef0493a43c3a93eafbb69 SHA512 ac25c9d9fe5068aa5cf14b07f2536ec5edf6b142255f4949ce5e7882ea8064a2ef7ec572ae391b8c6e83f30d2d0a13e8dba0572a191ad99b932fe18ba8e64370
+MISC metadata.xml 1547 BLAKE2B 39108142c8e34b3c2683d5bbab6989693156d320797d86efa36f3df39e3d667160cbdb1a0b0efe127f67b3977e1cf3cde151d07915542fa88831e626457bf86f SHA512 a099aacfdd27c4b9536512762fcc63f09ea71cce807b59ff70026a09d79856e1911405e64186597b8e3dd9fef0029c13944ceb3b77d7969adf7182218e532559
diff --git a/dev-games/godot/godot-4.0_beta14.ebuild b/dev-games/godot/godot-4.0_beta14.ebuild
deleted file mode 100644
index 4967572eeddd..000000000000
--- a/dev-games/godot/godot-4.0_beta14.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-
-MY_P="${PN}-$(ver_rs 2 -)"
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
-SLOT="4"
-KEYWORDS="~amd64"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	+dbus debug deprecated +fontconfig +gui pulseaudio raycast
-	+runner speech test +theora +tools +udev +upnp +vulkan +webp"
-# disable tests until out of beta, tests themselves are new and can be volatile
-RESTRICT="test"
-
-# dlopen: alsa-lib,dbus,fontconfig,libX*,pulseaudio,speech-dispatcher,udev
-RDEPEND="
-	app-arch/zstd:=
-	dev-games/recastnavigation:=
-	dev-libs/icu:=
-	dev-libs/libpcre2:=[pcre32]
-	media-libs/freetype[brotli,harfbuzz]
-	media-libs/harfbuzz:=[icu]
-	media-libs/libogg
-	media-libs/libpng:=
-	media-libs/libvorbis
-	<net-libs/mbedtls-3:=
-	net-libs/wslay
-	sys-libs/zlib:=
-	fontconfig? ( media-libs/fontconfig )
-	gui? (
-		media-libs/alsa-lib
-		media-libs/libglvnd[X]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		dbus? ( sys-apps/dbus )
-		pulseaudio? ( media-libs/libpulse )
-		tools? ( raycast? ( media-libs/embree:3 ) )
-		udev? ( virtual/udev )
-		vulkan? ( media-libs/vulkan-loader[X] )
-	)
-	speech? ( app-accessibility/speech-dispatcher )
-	theora? ( media-libs/libtheora )
-	tools? ( app-misc/ca-certificates )
-	upnp? ( net-libs/miniupnpc:= )
-	webp? ( media-libs/libwebp:= )"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )
-	tools? ( test? ( dev-cpp/doctest ) )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-musl.patch
-	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
-	"${FILESDIR}"/${PN}-4.0_beta8-scons.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || die
-
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
-
-	# use of builtin_ switches can be messy (see below), delete to be sure
-	local unbundle=(
-		doctest embree freetype graphite harfbuzz icu4c libogg
-		libpng libtheora libvorbis libwebp mbedtls miniupnpc
-		pcre2 recastnavigation volk wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-
-	# do symlinks to avoid too much patching with hardcoded header paths
-	mkdir thirdparty/lib{vorbis,ogg} || die
-	ln -s "${ESYSROOT}"/usr/include thirdparty/zstd || die
-	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
-	ln -s "${ESYSROOT}"/usr/include/ogg thirdparty/libogg/ || die
-	ln -s "${ESYSROOT}"/usr/include/vorbis thirdparty/libvorbis/ || die
-}
-
-src_compile() {
-	local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		progress=no
-		verbose=yes
-
-		deprecated=$(usex deprecated)
-		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
-		fontconfig=$(usex fontconfig)
-		minizip=yes # uses a modified bundled copy
-		opengl3=$(usex gui)
-		pulseaudio=$(usex gui $(usex pulseaudio))
-		speechd=$(usex speech)
-		udev=$(usex gui $(usex udev))
-		use_dbus=$(usex gui $(usex dbus))
-		use_volk=no # unnecessary when linking directly to libvulkan
-		vulkan=$(usex gui $(usex vulkan))
-		x11=$(usex gui)
-
-		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-
-		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but ignores whether the dep is
-		# actually used, so "enable" deleted builtins on disabled deps
-		builtin_certs=no
-		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
-		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
-		builtin_freetype=no
-		builtin_glslang=yes #879111
-		builtin_graphite=no
-		builtin_harfbuzz=no
-		builtin_icu=no
-		builtin_libogg=no
-		builtin_libpng=no
-		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=no
-		builtin_libwebp=$(usex !webp)
-		builtin_mbedtls=no
-		builtin_miniupnpc=$(usex !upnp)
-		builtin_msdfgen=yes # not wired for unbundling nor packaged
-		builtin_pcre2=no
-		builtin_recast=no
-		builtin_rvo2=yes # bundled copy has godot-specific changes
-		builtin_squish=yes # ^ likewise, may not be safe to unbundle
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# also bundled but lacking a builtin_* switch:
-		#	amd-fsr, astcenc, basis_universal, cvtt, etcpak, fonts, glad,
-		#	jpeg-compressor, meshoptimizer, minimp3, minizip (patched to
-		#	seek in archives), noise, oidn, openxr, spirv-reflect, thorvg,
-		#	tinyexr, vhacd, vulkan, and the misc directory.
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
-		module_mono_enabled=no # unhandled
-		# note raycast is only enabled on amd64+arm64, see raycast/config.py
-		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
-		module_theora_enabled=$(usex theora)
-		module_upnp_enabled=$(usex upnp)
-		module_webp_enabled=$(usex webp)
-
-		# let *FLAGS handle these, e.g. can pass -flto as-is
-		debug_symbols=no
-		lto=none
-		optimize=custom
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		target=$(usex tools editor template_$(usex debug{,} release))
-		dev_build=$(usex debug)
-
-		# harmless but note this bakes in --test in the final binary
-		tests=$(usex tools $(usex test))
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_test() {
-	xdg_environment_reset
-	bin/godot*.main --headless --test || die
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	bashcomp_alias ${s}{,-runner}
-
-	insinto /usr/share/fish/vendor_completions.d
-	newins misc/dist/shell/godot.fish ${s}.fish
-	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/dist/shell/_godot.zsh-completion _${s}
-	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]] && has_version ${CATEGORY}/${PN}:3; then
-		elog
-		elog "Remember to make backups before opening any Godot <=3.x projects in Godot 4."
-		elog "Automated migration is only partial, and it would be difficult to revert."
-	fi
-}
diff --git a/dev-games/godot/godot-4.0_beta16.ebuild b/dev-games/godot/godot-4.0_beta16.ebuild
new file mode 100644
index 000000000000..180498ade9c3
--- /dev/null
+++ b/dev-games/godot/godot-4.0_beta16.ebuild
@@ -0,0 +1,240 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 desktop optfeature python-any-r1
+inherit scons-utils toolchain-funcs xdg
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="
+	MIT
+	AFL-2.1 Apache-2.0 BSD Boost-1.0 CC0-1.0 LGPL-2.1+ Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
+SLOT="4"
+KEYWORDS="~amd64"
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="debug deprecated +gui raycast +runner test +theora +tools +upnp +vulkan +webp"
+# disable tests until out of beta, tests themselves are new and can be volatile
+RESTRICT="test"
+
+# dlopen: libX*,libglvnd
+RDEPEND="
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	gui? (
+		media-libs/libglvnd[X]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		vulkan? ( media-libs/vulkan-loader[X] )
+	)
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )"
+DEPEND="
+	${RDEPEND}
+	tools? ( test? ( dev-cpp/doctest ) )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-musl.patch
+	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
+	"${FILESDIR}"/${PN}-4.0_beta8-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp mbedtls miniupnpc
+		pcre2 recastnavigation volk wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+		# linuxbsd_headers: would /want/ to unbundle these, but it is rather
+		# messy given godot has dropped all the pkg-config calls and uses
+		# hardcoded paths on top -- on the plus side, removes a real need
+		# to have IUSE="alsa dbus fontconfig pulseaudio speech udev" (dlopen)
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	# do symlinks to avoid too much patching with hardcoded header paths
+	mkdir thirdparty/lib{vorbis,ogg} || die
+	ln -s "${ESYSROOT}"/usr/include thirdparty/zstd || die
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+	ln -s "${ESYSROOT}"/usr/include/ogg thirdparty/libogg/ || die
+	ln -s "${ESYSROOT}"/usr/include/vorbis thirdparty/libvorbis/ || die
+}
+
+src_compile() {
+	local -x GODOT_VERSION_STATUS=$(ver_cut 3-4) # for dev versions only
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		deprecated=$(usex deprecated)
+		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
+		opengl3=$(usex gui)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but ignores whether the dep is
+		# actually used, so "enable" deleted builtins on disabled deps
+		builtin_certs=no
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=yes #879111
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=$(usex !upnp)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_pcre2=no
+		builtin_recast=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_gridmap_enabled=$(usex deprecated) # fails without deprecated
+		module_mono_enabled=no # unhandled
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these, e.g. can pass -flto as-is
+		debug_symbols=no
+		lto=none
+		optimize=custom
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		target=$(usex tools editor template_$(usex debug{,} release))
+		dev_build=$(usex debug)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# these use bundled headers then get dlopen()'ed if available, USE=gui
+	# itself could technically be a optfeature too but it'd be messy here
+	if use gui; then
+		optfeature "gamepad connection detection support" virtual/libudev
+		optfeature "screensaver and portal desktop handling" sys-apps/dbus
+		optfeature "sound support" media-libs/alsa-lib media-libs/libpulse
+	fi
+	optfeature "system fonts support" media-libs/fontconfig
+	optfeature "text-to-speech support" app-accessibility/speech-dispatcher
+}
diff --git a/dev-games/godot/metadata.xml b/dev-games/godot/metadata.xml
index ad0df117f2fd..82c690208342 100644
--- a/dev-games/godot/metadata.xml
+++ b/dev-games/godot/metadata.xml
@@ -24,7 +24,6 @@
 		<flag name="deprecated">Enable support for deprecated features</flag>
 		<flag name="raycast">Enable the raycast Editor module using <pkg>media-libs/embree</pkg></flag>
 		<flag name="runner">Build an additional binary optimized for running games (only relevant with USE=tools)</flag>
-		<flag name="speech">Enable text-to-speech support</flag>
 		<flag name="tools">Enable the Godot Editor for game development</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="webm">Enable the WebM module</flag>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 543794d9d6b5..acc954f441e3 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index 893075ded3af..9dbfefd9c224 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,5 +1,3 @@
 DIST error-prone-2.16.tar.gz 2685946 BLAKE2B e10d38e5d0f6be102d64c4d24543f525c192300665a141d136d4bcb1db0e8553c16828411b60e2bca0d27a89fe7e094ac2fc2a367028091a4ad28b303c023a43 SHA512 c61d14e237ae45f3d1196e03ecdb5e77aa8aaa2f5983eee3667cc73951a12b1f0c85bd8a15c477c18fd517d486024d3b1f115928affb3697afc064d561b5f405
-DIST error-prone-2.7.1.tar.gz 1576363 BLAKE2B a204a6a0dfcc88e06ff4f9288764c33c72e1d0c692ba20ce34a1440025abbb96d510129e335a475ffecc037806c72a0e1a85f0ad55a5ee4402d7b731eabd057b SHA512 2e8ff78b2fc65a0a53244711a3b5dd3d42cd09c0c9cca8dde5c814ee3e9dbc6e2c44f8bdb778111c93cd867f9b85b8afae4fd0551eda9326c0a9b1aa1dcaaf92
 EBUILD error-prone-annotations-2.16.ebuild 961 BLAKE2B 0d03f0709f5731a7123fb822d1f640cc0a63f3f327ed8b2f616b20edcd3b42fea72c9e45928fdf07e32c4cee673dac3e6784ac44b7868c676ea45fdac3f1c686 SHA512 608e1581f00c5b9cfb079a0f6fe5615cdb28074f19f16f9d87b5062cfedb2a34869a7e0bae9e31d861eeb4952e6e3ed2196be4df80e2c1227f3c49cf8dc4a5e6
-EBUILD error-prone-annotations-2.7.1.ebuild 928 BLAKE2B f49580ddc370cb985d8be8d33dd141324776ac6cd60ba6883711c9908703927f3a0f4afab60207c5f93490373c1f84959ea46c6a93fc7bee8eee131a0edec566 SHA512 54a0b82ed79a85dff80670fc45b54eafacdb480e774f1ee4652b0c03da22df7c07cc61a6bdbbc8413ce0d1bc6e1235a4038160e54cce496649aae9edc712c2da
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
deleted file mode 100644
index 2e15db67603f..000000000000
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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://codeload.github.com/google/error-prone/tar.gz/v2.7.1 --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild error-prone-annotations-2.7.1-r1.ebuild
-
-EAPI=7
-
-MY_PN="${PN%-annotations}"
-MY_P="${MY_PN}-${PV}"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.errorprone:error_prone_annotations:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java annotations for the Error Prone static analysis tool"
-HOMEPAGE="http://errorprone.info"
-SRC_URI="https://codeload.github.com/google/${MY_PN}/tar.gz/v${PV} -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/annotations"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index a4664e60a3c3..c5365fa434c3 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,5 +1,3 @@
-DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
 DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
-EBUILD guava-testlib-30.1.1.ebuild 1986 BLAKE2B 5b61182607c6996a2e8aee2e42aecdd7599f31b3fb48eddb081a90309ca80d7545ca3e97adbc06524a112567559192d00bd875ba388238973411af666fa833af SHA512 db0d1758354bb210d6460be7ab17c9aa306d05509ed5416d0318d6c5e70727c9090818c6624a35a6c16c12b2119227c5e14f9b5e8ae526dba5c2676a44699718
 EBUILD guava-testlib-31.1.ebuild 1646 BLAKE2B 47da5c59670dc4ddf27b2f02a2befe071ba5348b1ff1582e500bab4fe47b1e5e1fbaac53ffc80246d505cf2101547b8ae1547f1862c881fc0dfefd7cf075f73a SHA512 1b9ab91d462df2c38d3ad10304906ab9d870d3308632cafefba10d24f78065b635d1759bf34a727064a5dd61bcb06206ee3172dad82b44229606657871639bd7
 MISC metadata.xml 388 BLAKE2B 619e640d22637685b8b59294275ab1a36e74839c5eb2f6002055cb40037406800379274d4085d41ce2a8f2000b6bedcd137b4e7fe38933734474f998e4cf909b SHA512 b44014388651d54e41671847c438c9ba03ff1a551924a82ff0ce12deb8f347e94f49469ab41413e052776c9b7893a1989d570f12454117e828051eef5fef1c11
diff --git a/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild b/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
deleted file mode 100644
index 24c89a665ecc..000000000000
--- a/dev-java/guava-testlib/guava-testlib-30.1.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom guava-testlib --download-uri https://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-testlib-30.1.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.guava:guava-testlib:30.1.1-jre"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A set of java classes to assist the tests for Guava itself"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# error: package com.google.common.truth does not exist
-RESTRICT="test"
-
-# Common dependencies
-# POM: ${PN}
-# com.google.code.findbugs:jsr305:3.0.2 -> !!!groupId-not-found!!!
-# com.google.errorprone:error_prone_annotations:2.5.1 -> >=dev-java/error-prone-annotations-2.7.1:0
-# com.google.guava:guava:30.1.1-jre -> >=dev-java/guava-30.1.1:0
-# com.google.j2objc:j2objc-annotations:1.3 -> !!!groupId-not-found!!!
-# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# org.checkerframework:checker-qual:3.8.0 -> >=dev-java/checker-framework-qual-3.14.0:0
-
-CP_DEPEND="
-	dev-java/checker-framework-qual:0
-	dev-java/error-prone-annotations:0
-	~dev-java/guava-30.1.1:0
-	dev-java/jsr305:0
-	dev-java/junit:4
-	dev-java/j2objc-annotations:0
-"
-
-# Compile dependencies
-# POM: ${PN}
-# test? com.google.truth:truth:1.1 -> !!!groupId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}"
-#	test? (
-#		!!!groupId-not-found!!!
-#	)
-#"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-S="${WORKDIR}/guava-${PV}"
-
-JAVA_SRC_DIR=( "${PN}/src" )
-#	JAVA_RESOURCE_DIRS="${PN}/src"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
-JAVA_TEST_SRC_DIR=( "${PN}/test" )
-JAVA_TEST_RESOURCE_DIRS=( "${PN}/test" )
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index 8878a6d76f54..03ad7e0e1a2f 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,5 +1,3 @@
-DIST guava-30.1.1.tar.gz 5404546 BLAKE2B 818ef4b17c4f0c8e92c327f046434a3bb428ac35d6e95edd6d6be558c755d138a8ac7f8ad2032073cad131890d8f838e896fff84ba217f8305be8bd65c619a48 SHA512 23b30d886a3200b8f998897ca7bc424b2d223a4fecb03ab644e08a989a85f008e30ef093055e6305c4148a1eb8919c407e35d19f492c5b189830bd115e9484f2
 DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
-EBUILD guava-30.1.1.ebuild 1820 BLAKE2B 120c69dac6a1b6e2452f15173645d4b1b43b04411bf5979a67e17cf241e53dd98e27b88151f6ada7f4bea5018d66c57603d99338d2ac6d07ba799d8b925ebf87 SHA512 4c4760e49e08fc5dd474e1ca9763b1d8a63f094d0bbc47a1c0356f9bbb7a20d75f1fb75d945b3d3a970da1434dc7c88440adf28b78f2c94f567295140bea4704
 EBUILD guava-31.1.ebuild 1661 BLAKE2B 827e4095f2dac42147b1941e26cbd75a53cad90a3fc2b7ab24e67f9cb5aef96a47363860348e36eb05835ace4342633370da0c78f6f5f3ba64fa140931a86811 SHA512 f631348ea551d6e4f69e366caa59d7cd67a15d4c165b0dfbfabd85bdb5a65b11bd372fb4516cff289b8ae52690d66c7619a7a670a70353afeb09a6dd351e73ef
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-30.1.1.ebuild b/dev-java/guava/guava-30.1.1.ebuild
deleted file mode 100644
index 8b858ee7d259..000000000000
--- a/dev-java/guava/guava-30.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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://codeload.github.com/google/guava/tar.gz/refs/tags/v30.1.1 --slot 0 --keywords "" --ebuild guava-30.1.1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-#JAVA_TESTING_FRAMEWORKS="junit-5"
-MAVEN_ID="com.google.guava:guava:${PV}-jre"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://codeload.github.com/google/guava/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.google.code.findbugs:jsr305:3.0.2 -> !!!groupId-not-found!!!
-# com.google.errorprone:error_prone_annotations:2.5.1 -> >=dev-java/error-prone-annotations-2.7.1:0
-# com.google.guava:failureaccess:1.0.1 -> >=dev-java/failureaccess-30.1.1:0
-# com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -> !!!artifactId-not-found!!!
-# com.google.j2objc:j2objc-annotations:1.3 -> !!!groupId-not-found!!!
-# org.checkerframework:checker-qual:3.8.0 -> >=dev-java/checker-framework-qual-3.14.0:0
-
-CDEPEND="
-	>=dev-java/error-prone-annotations-2.7.1:0
-	>=dev-java/failureaccess-30.1.1:0
-	dev-java/jsr305:0
-"
-
-DEPEND="
-	>=dev-java/checker-framework-qual-3.14.0:0
-	dev-java/j2objc-annotations:0
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="error-prone-annotations,failureaccess,jsr305"
-
-src_configure() {
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only checker-framework-qual,j2objc-annotations)"
-}
-
-JAVA_SRC_DIR="${PN}/src"
-
-JAVA_TEST_SRC_DIR="${PN}-tests/"
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index 2ef20b64bf9c..f8e12a4c3b09 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,5 +1,3 @@
-DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
 DIST jctools-4.0.1.tar.gz 4234647 BLAKE2B 652cfc70d92a37e04056e306050b156632ba92b2cacd9b759556ea92e1b9b6dda3d766e33936cdd92ec690abb6fb51a562305f82746f500f89d9d797e27f9c54 SHA512 9c8f55be4640f7b1315e7f93c20cf6b4b8d84c542103d69a2e34c0abe00c25fb362b6d8c4042feb4462559e5f6babd90ab0a59a66c3d407e13004ff02ce95c8f
-EBUILD jctools-core-3.3.0.ebuild 2253 BLAKE2B 260724ac01c2202cfe685bb232a5533b5dd611b5e57d7c9e47fb06b35c8e66c1026622c0ee14c62e09535219c90225f990215e6b573e0113721c9f9c64a54210 SHA512 68a3b914db018eee7354adc21aab9502c533d5ae6e2b00347127ce97dc3a5639fb810a3d889d0100e5065c23af3be807143ccea974d940586b0362d5f3280b2b
 EBUILD jctools-core-4.0.1.ebuild 2299 BLAKE2B 38309ccf734d0200d29a8b251276bb8e0154e87fb26784d219f3fbf478926b8e38050fb0e3e432cf13c26ca806c2b33ebc8117a1651008e7c64b8cb8493e523f SHA512 b6e56a73857f886e355756215ec491f53e68e9c187c45f99e604bdfd2b5787df06196aaa37bf4c9e65753d2b510a03eefe776d78aa1e06047bf2fd193656dbc5
 MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-3.3.0.ebuild b/dev-java/jctools-core/jctools-core-3.3.0.ebuild
deleted file mode 100644
index a58d2f320e2d..000000000000
--- a/dev-java/jctools-core/jctools-core-3.3.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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/JCTools/JCTools/archive/v3.3.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-3.3.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.jctools:jctools-core:3.3.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Concurrency Tools Core Library"
-HOMEPAGE="https://jctools.github.io/JCTools/"
-SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava-testlib:0
-		dev-java/hamcrest-library:1.3
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../{README,RELEASE-NOTES}.md )
-
-S="${WORKDIR}/JCTools-${PV}/jctools-core"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-# Using the defaults of java-pkg-simple would skip more than half the number of tests.
-src_test() {
-	# org.jetbrains.kotlinx.lincheck is not yet packaged
-	rm -r src/test/java/org/jctools/maps/linearizability_test || die
-	# These tests would fail and are not run by "mvn test".
-	# "org.jctools.queues.MpqSanityTest"
-	# "org.jctools.queues.QueueSanityTest"
-	# "org.jctools.queues.ScQueueRemoveTest"
-	# "org.jctools.util.TestUtil"
-	# Test timeout on arm64, https://bugs.gentoo.org/863977
-	# "org.jctools.queues.atomic.AtomicMpqSanityTestMpscLinked"
-	# "org.jctools.queues.MpqSanityTestMpscLinked"
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			\( -name "*Test*.java" \
-			-o -name "nbsi_tester.java" \
-			-o -name "nbhs_tester.java" \)\
-			! -name "MpqSanityTest.java" \
-			! -name "QueueSanityTest.java" \
-			! -name "ScQueueRemoveTest.java" \
-			! -name "TestUtil.java" \
-			! -name "AtomicMpqSanityTestMpscLinked.java" \
-			! -name "MpqSanityTestMpscLinked.java" \
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-	# OK (7226 tests)
-}
diff --git a/dev-java/woodstox-core/Manifest b/dev-java/woodstox-core/Manifest
index eb7c2c6e4d23..782029eff8f4 100644
--- a/dev-java/woodstox-core/Manifest
+++ b/dev-java/woodstox-core/Manifest
@@ -1,5 +1,3 @@
-DIST woodstox-core-6.3.1.tar.gz 6029586 BLAKE2B 04fcd7fd958cd3efa8a1e864786b88a1f8c3f0d6d6faecb5eb91a7cf755da4cef2664c0583702bf21dde741632638242131f0d46acb8f1b91bd00bf4c9a7af5b SHA512 fee1d8dc33aa2e3617b451fab285dbc91154738765eb9d93e8c1809a70f09ccb2f1cf2b70f57f836323d0a80bd5caeae0f5a4c5e2cee609c2a9d30106bf42acb
 DIST woodstox-core-6.4.0.tar.gz 6030457 BLAKE2B 0506a4af84eff8ac11bc6363581f8de737116bd254d0c3b2f68a9ce062325934188c5a05eeff918ae012330d885ba7940f9dc1afb01ee951ff58cdcd1c86b2c7 SHA512 ca8033084c0355c5a321ab51ab6cfee62737b49ab98106fab0abb3ac8950ddd773dc91d864e4e62bdddaca1b7ba98f3639d1a61d8c436892b35193a8c838659f
-EBUILD woodstox-core-6.3.1.ebuild 2850 BLAKE2B 28f9d92896a8af36c2eaa9038374cd8045a0a49e32aaf52cf86b1dfd96c71e60786698df2a080a1c6b8ede412ff917aadbe070be73aaa293cd40b42b26228fa6 SHA512 899f55fbab59ad7472a663bcd8a27565721ad816d153e15a56ff412d64e282ceea28e9255bf88df4f9b8da4baeeea783764f4e51e1d3cf209979e85be7927a08
 EBUILD woodstox-core-6.4.0.ebuild 2850 BLAKE2B 6e67c932f4b4f6d0cbdfda5f9fa0a3a0947d34365d500022c14c6152f96310077ecc151f6f3c1ecf4de561cfd3da3be2d35512e641d89d1a04b3cc07c2cfb649 SHA512 d1dc7975e313e0a2f13742e8e2fd47b680062c0cbcaea5c518b540b69cde0205d7e72a1ca3dd43fb738341e0921b0b40ced66cccc35061ee66d97d496e7bd9ba
 MISC metadata.xml 366 BLAKE2B 2605af42f3dba4c792fde507b196dffd8f474581e64230e570e645754507323897bc100baae9af4851e018badcb06cb74e77725471ff3b6c28d99dd4f6824964 SHA512 9d6e03f3d734515b02329cfd788f581e88b95f3df6fcdb34884d935936034c284af861a595a7e08fad81bae4a27abb09100521d4ed0c94e39c6cff14fbf27769
diff --git a/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild b/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild
deleted file mode 100644
index 3a6b3c2a149a..000000000000
--- a/dev-java/woodstox-core/woodstox-core-6.3.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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/FasterXML/woodstox/archive/woodstox-core-6.3.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild woodstox-core-6.3.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.fasterxml.woodstox:woodstox-core:6.3.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs"
-HOMEPAGE="https://github.com/FasterXML/woodstox"
-SRC_URI="https://github.com/FasterXML/woodstox/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# net.java.dev.msv:msv-core:2013.6.1 -> >=dev-java/msv-2022.7:0
-# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-2022.7:0
-# org.codehaus.woodstox:stax2-api:4.2.1 -> >=dev-java/stax2-api-4.2.1:0
-# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
-
-CP_DEPEND="
-	dev-java/msv:0
-	dev-java/relaxng-datatype:0
-	dev-java/stax2-api:0
-	dev-java/xsdlib:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# biz.aQute.bnd:biz.aQute.bnd.annotation:6.3.1 -> >=dev-java/aqute-bnd-annotation-6.3.1:0
-# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*
-	dev-java/aqute-bnd-annotation:0
-	dev-java/osgi-core:0"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {README,SECURITY}.md release-notes/{CREDITS,VERSION} )
-
-S="${WORKDIR}/woodstox-${P}"
-
-JAVA_CLASSPATH_EXTRA="aqute-bnd-annotation,osgi-core"
-JAVA_SRC_DIR=( "src/main/java" "src/moditect" )
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-# https://github.com/FasterXML/woodstox/blob/woodstox-core-6.3.0/pom.xml#L229-L243
-src_test() {
-	pushd src/test/java > /dev/null || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			\( -wholename "**/Test*.java" \
-			-o -wholename "**/*Test.java" \) \
-			! -wholename "failing/*.java" \
-			! -wholename "**/Abstract*.jav" \
-			! -wholename "**/Base*.java" \
-			)
-	popd > /dev/null
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_prepare() {
-	default
-
-	# src/moditect/module-info.java:33: error: cannot find symbol
-	#    provides org.codehaus.stax2.validation.XMLValidationSchemaFactory.dtd with com.ctc.wstx.dtd.DTDSchemaFactory;
-	# https://bugs.gentoo.org/858302
-	sed -e '/com.ctc.wstx.shaded.msv/d' \
-		-e '/org.codehaus.stax2.validation/d' \
-		-i "src/moditect/module-info.java" || die
-}
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index aed9266450ab..5c1cc41a75a5 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,6 +1,4 @@
-DIST xmlgraphics-commons-2.7-src.tar.gz 2021218 BLAKE2B a16dda389662a38d5ebf6cbd015ac5bf8154b5e2df9e36fd3a33987b04a4de08cc1ebc71e940c05793ef045249c68e7dbb54c418a7c6888020a800e039b0a188 SHA512 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
 DIST xmlgraphics-commons-2.8-src.tar.gz 2243271 BLAKE2B 86456adf4b9610e580b3b4f87c362dc1259c2f2bb4d4abb0dc3d765ee2cc5fb3df54597f5a5fa620a813dee83cd7549771d2b4116d20077103e389f1942903a0 SHA512 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b
 DIST xmlgraphics-commons-2.8-src.tar.gz.asc 833 BLAKE2B d68b6fe36b44764c44b67baca02a50f01644aaf2e8ed6571caeffd7724b6284860bd81d5a2ddcbefde6411bd5c9ed072f853cd178f862541f9f49aea3e023e21 SHA512 6e17a628ddd253c44d62a7f08d615f5a484bb6433482e6e217e794620396150b327f2e89836f62aafde3050ac0677432e0b12b645c57ae74cc11e093d86ac43c
-EBUILD xmlgraphics-commons-2.7-r1.ebuild 2095 BLAKE2B 58a8aa16af88bd0cb888efa1e79b21c9601b09e2d6fc408da27062270dddd0ed41c37c6451050bcdc05fbedbe12d89f09cb5142f4dd62cb1aa57e44135ab1126 SHA512 30e5b801298c0bce4e6aed077226fdbc9cd4c558a24046a552b5df2372926c0906a3d3f15a6c4cfe3c98ce797d60042202fe63e19c493b5a8ebfb55583de2ec3
 EBUILD xmlgraphics-commons-2.8.ebuild 2272 BLAKE2B ab815ebd7ac3fd0b2633a9cb8e9158c10a10549a1c1e3ac8be3fc6de2dd2b9d1a62f492c83693dafcaba9e811021518ef2a33730e9b803b7e39734096984e23f SHA512 fb442455d653b19efa86f6d3dca207e66c79ce5fca0fa172ce11c1b521c69fe1245369c080010fc73247bff9e52954d23d30858120f2b4f96f2ceaaaa0365dd6
 MISC metadata.xml 328 BLAKE2B 0116b6e35d9f22341807f3da68bd8d38fc43447920207a08508c46796bf1ff9d2634f38002b22139b7142c912e531d27043f629f259ab2e87d12b8e590d4b92a SHA512 74979721cdcb0c26c82a27e23043487990f41691ea1dd6acf87fb4e403dc8a44402c9907d697ac3024d754b3c504c266d51753b3cad1e4e3a16d861758574a61
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
deleted file mode 100644
index 967964f74e06..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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 mirror://apache/xmlgraphics/commons/source/2.7-src.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild xmlgraphics-commons-2.7.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:xmlgraphics-commons:2.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XML Graphics Commons"
-HOMEPAGE="https://xmlgraphics.apache.org/commons/"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:1.3.2 -> >=dev-java/commons-io-2.11.0:1
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CP_DEPEND="
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:2.28.2 -> !!!suitable-mavenVersion-not-found!!!
-# test? xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/mockito:4
-		dev-java/xml-commons-resolver:0
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( NOTICE README )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,xml-commons-resolver"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-# There are test failures, bug #832058
-JAVA_TEST_EXCLUDES=(
-	"org.apache.xmlgraphics.image.codec.tiff.TIFFImageEncoderTestCase"
-	"org.apache.xmlgraphics.image.loader.impl.ImageLoaderImageIOTestCase"
-	"org.apache.xmlgraphics.io.XmlSourceUtilTestCase"
-	"org.apache.xmlgraphics.ps.dsc.ListenerTestCase"
-	"org.apache.xmlgraphics.xmp.XMPParserTestCase"
-)
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 6af0973b7e02..ad9582c8ea3b 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,5 +1,3 @@
-DIST zstd-jni-1.5.2.4.tar.gz 9343792 BLAKE2B 8a446b229d49671b3f38d630ecf2c2688210176af95b66c788027de89986ad1f23615582d670f1d7a0b3866572b05c722ad6c71783d208401844287e8149f65c SHA512 bf67fc6573f2b1e45bd4985186814a54fb948a1b7280b5cf2f6d2577626c1f70626a58994291ffb228f097c91d60e3ed52d56ad92830c8f386b96b11fb6cf4a2
 DIST zstd-jni-1.5.2.5.tar.gz 9342510 BLAKE2B 259f3087f06c567f2126dacfb90ecfcc1d20f389ff99ef48a6f8c558441b37b56f29b73ca55aad176116439c4ef47f9ad253116a968f74e527eb13a0fda98f7e SHA512 16f2aeee6005e2da366a849f0972b3ef9245d355ed875e633bf4013d340cc74445604710e7b628aefafa90f74dfaa82a93c741f06f633b8a6c2162e9da304850
-EBUILD zstd-jni-1.5.2.4.ebuild 1693 BLAKE2B c186358196b6c5425eb71ced0d9c594f039c440b73e3e013c3dab89d61d94f478535803312e6180809911dc5b7cf7114ff2446340e666538a5e67b30bd4584d7 SHA512 e5ee8352fcb398a6a6f077c7d70dc3443f62a81f665bb848b33f03fc647528f752bb864444c06da01e0d69008360c84725d3b8d146461166ce97fd84c22dbf35
 EBUILD zstd-jni-1.5.2.5.ebuild 1533 BLAKE2B 96eb0470148ba2b6d72431359fa199c2a77766c2b6aa228bf3448333897edc38adc8a8f924e3a1c961035bf68e9ed62e2b7e5e3ddcecb1209aca90b578f3e2e4 SHA512 6d11d9f9997617d0c25ea39e932e9284bfd8403e769a4d149db133643ed1c3d53cdbe7e49c20a5d5e207f910a37f4c3a28b5d7b9029abb0fcfb8623856804b08
 MISC metadata.xml 309 BLAKE2B e1f360be677365cd79f35f3c99ec59722ccfe2e2cf7df5d534d7fae1c0f47d6a4c286622a16308bf36c45a2ea4126ba00eef1c8a531d27f1e80288cf5d9ee79e SHA512 2e274c669ea732048cd2fd381188e59f1041e46d1ba738de980e21f763597508e5816ef5eae5a6930ab1c6981b06785e355bd6d3275dff5b30842f35253acfac
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild
deleted file mode 100644
index abfe3a755489..000000000000
--- a/dev-java/zstd-jni/zstd-jni-1.5.2.4.ebuild
+++ /dev/null
@@ -1,67 +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"
-MAVEN_ID="com.github.luben:zstd-jni:1.5.2-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="JNI bindings for Zstd native library"
-HOMEPAGE="https://github.com/luben/zstd-jni"
-# Snapshop needed because this version is not tagged.
-MY_COMMIT="37faee49643b2739457716e3752f44fcaa09005f"
-SRC_URI="https://github.com/luben/zstd-jni/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/zstd-jni-${MY_COMMIT}"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.github.luben.zstd_jni"
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	cmake_src_prepare
-	# https://github.com/luben/zstd-jni/blob/v1.5.2-3/build.gradle#L66
-	cat > src/main/java/com/github/luben/zstd/util/ZstdVersion.java <<-EOF || die
-		package com.github.luben.zstd.util;
-
-		public class ZstdVersion
-		{
-			public static final String VERSION = "$(ver_rs 3 -)";
-		}
-	EOF
-
-	mkdir -p  resources/META-INF || die
-	cat > resources/META-INF/MANIFEST.MF <<-EOF || die
-		Implementation-Version: $(ver_rs 3 -)
-		Bundle-NativeCode: libzstd-jni.so;osname=Linux"
-	EOF
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
-		# Resolve bug #776910
-		# Reference: https://stackoverflow.com/a/51764145
-		-DJAVA_AWT_LIBRARY="NotNeeded"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg_doso "${BUILD_DIR}/libzstd-jni-$(ver_rs 3 -).so"
-	java-pkg-simple_src_install
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d393d44d9ef7..9163d82d278a 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 30ff21af9183..f8bd0e4a2002 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -64,8 +64,42 @@ DIST rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz 186651920 BLAKE2B de89dd720320d
 DIST rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d313eafed62763b0905636ff22d6c736696c55e55d2442512a95e239b5b37199fdb125d312284b2a249782fa61d552284c8eb3ef8c9aa9ea36283a9fb975dd66 SHA512 c491f07c77baeac6b92c2425092c1b3694e72c49d4e6e511597aac03d51930cd414a95b0d691a9b23df266fba8df3dd90bf7d30624383bd213403fe0cbc83ffb
 DIST rust-1.66.1-x86_64-unknown-linux-musl.tar.xz 270294752 BLAKE2B b068a9400f29e9318e8d52f2c37df72f1b8fd91ca0bba342e6681544595a7f2697bf10437be6c4612a36d2781cc915920b498273ab12dbe1163c41d9d4e9b438 SHA512 df03ef29b03924346ef2a4b5dbf1c7ce6e33fb1f357eb04b0fa80e48a607b29f5929ce587412c9dd3f385d6382f0229c19d0ce78d6c060ddc0539429d3cfc606
 DIST rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B a262a2a020a142ea8e3906a9c93d9294906ee51f5d22efd4ef041b6032524d2714e0b511f7deb366c0ee3337ecd52f1e091b6bfed01615eaa9026996100afe2d SHA512 f390b3a788c5b15b1acee01505b6501ad4a3170cd2f23ec490b02294ce0a62c3f708f1e66c0ba8258a1042dea0401a1e09d31d34e99558f50b0f65b359354182
+DIST rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz 258660884 BLAKE2B 282a9881bf10c17aff5304f968b038b581d9e7ef35553e601f86a5831c237504d8d74d8bd31c8d704c2748fc93f2a42bc93b1213bf7a21326769478647e79d1f SHA512 9b519d3fe1e9daef9dec509fb28d68b66fee0db61a688785c4491340e568e5cb1ce259556f218d81a2420a2ec7e378db9aea9b918aa22e19ca8d56c24607e43e
+DIST rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7c59c61d919156595cc6f2caa443ab5bb7ab4de54d41b5e2363b6a1eb837a0886738cfaef09bc8e7aa3efab852e87548a069615257b942b4065d958c2d02e192 SHA512 2ab4b461191f89c2dbb792a8b168c0e19abddf1b7be6b69077693284cbbff1f32a12d648641956bf27d7208de31e3a993739a77ad03188f8a65d41099249554d
+DIST rust-1.67.0-aarch64-unknown-linux-musl.tar.xz 236674492 BLAKE2B 5c9eebd4f84694fbbaac28850056f58eb9e2cb1f8f2e98344105fc770e95fea34f61aed2f9249efdab225f37be4e99f1e50597a0325d1a595876870e5ef98482 SHA512 5b220bd52498b2bff01286bf03bfff28dfadf9257bf46e10cc1b3d1e7884f0223c00288c843a98b6dfef0f1408f255b320140597d4cba133384c0cfdf7d84365
+DIST rust-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B dbf5f8a0c7cf017456d45f9e02a624e01b4ba4de0a18bc45784e3b425fcf90b8c07b73d40265e5ead5d08719a043a62083b0a4484004f4691c5467cee47bc257 SHA512 cbef9c6f8d531088390456e0da6ad114272f2df579c48a3180bd714f824eb1473450e406372f9835e8576cd3c50a374cf6c463ea4ba88325aead9800336f951e
+DIST rust-1.67.0-arm-unknown-linux-gnueabi.tar.xz 213875616 BLAKE2B e032b62d879efb02b6dcaa52501c3d831f19c38645af9f95ede4a80dad88be3bce81ca2c88866be9548c7e2ca1e783423a525b936d433245c09d23305882e05f SHA512 8148fa66063b9c0c2055d24582cfc234e5e05e8d430516edd467d80642e5aa971a1191a26fe3e6d77507af306f002e07af2dd021a343e472110f4ad47ee7926d
+DIST rust-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 0240a75bb28094a4a7187a153449f4912fe4052c096d7f59d5f4e0ea2699dbddb8e3f2f6a2494a5db059427b83b35b1af03315f4b952ada64701fb37cc53a2ac SHA512 d4bc0fbcd45588a7b2d1170d55a82ec11d23f61fdda0f72ced74005eb74bfb31fe146683d91671458d389d23a9f310c5e6c1b5684b21b4f9d9219d4f01e392a9
+DIST rust-1.67.0-arm-unknown-linux-gnueabihf.tar.xz 213541168 BLAKE2B 25baf17e590ac1dac5933fdaf2c5fcb0d1849996224952c7526fa089bf1879a67f928721d990c5fc9dfd9aa9d6fe1e7ca32b5fe2a6048c2f606cca8e3cd0330e SHA512 a98833d19089359cc39bb2c67eff14b255cbbbe999d0e5fd1e4580a4fe7bc450726074a6f346cb8688fe843162c09a5bd95e9fe66e34e09740b104fd61b4dd1d
+DIST rust-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 080a9a84e18e51b51047ab502cd6ac1b2ddc6c2ea59a2e6cd57557d7b5c45edc40919f9c5190729bd4767ba7a9972be78fe0bb3e5d96f1dbc511cb0199fd0de4 SHA512 b938bf08774ace65d10e558020f7801e3757aeca8ac51f56238b9a4b41c79b434e89404486bc08422d8e2f9a69874af5a425b58e35e17c3773c8ee5a3d3d96fc
+DIST rust-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz 219678556 BLAKE2B 8b3d7d0336c25a7769cfbda82900dc8472ce912fb16f75ebe6ad9457cc5595fdc6dea4d4be7e30c09e6329ef9eba99b9e480f525bc85b8235ce9ae7a4b21afd7 SHA512 d941cfaee0276ca583e2b605b6f943dea7386d543cc25368f31ed21d7086837ef6fab935c9ea9da0a766e5479d993872923d3de81d5fe55991715cd396d1d63e
+DIST rust-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B f54f0e99292354b6f83158286e637e5df7642427ec1d2ae2561256762e9cc909d91c7ff09c382b5df19db96fe885e83c23d279a2a282f5b1a9d93bdb72b595f7 SHA512 ed3d2a6405ab2f53008cd35fc2fc30e09f76fd201c92d064114452c169ef81ab985c942834028c5bba387da0572ab0c68525b44b806577c8f3179094c55edfd1
+DIST rust-1.67.0-i686-unknown-linux-gnu.tar.xz 235101748 BLAKE2B 0344ad28f3ddf597fd1b29b6d8b4afca07f7fe86b99bef1aef09d6860c5c223cfe0be0a9e37209fe3ecc5ab87699fff51162cf3da1d65f25f755e985503f39cb SHA512 8f4c34736d7238d1e359f86bb9d6eb9b616238bea9fea3101a7c34336b9c772c7ddeca53c6013cf970c92945cc19b12979209675eeb43e7f65ab4d0c9b6b5937
+DIST rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 8253e25276590eefbef1f302995eb9c3c259454380c7246eb5637c82343d1b56c3d1e001d572371b8fb907539c2ffe5ce4d82f3285a0272e005a6386554a628c SHA512 a936ecda6242c1b00db86bac53417d51765e228bcf49d2046b281d75c37ef3dff0a4a3e0b0be13abfe7e4634815f43e35ebb2c683a8b91cabb9a8002238c5f5c
+DIST rust-1.67.0-mips-unknown-linux-gnu.tar.xz 196383600 BLAKE2B d2ec0464be57d1abdd0363d08f1e947f4735e21021745060f7b5716fafb80579bdbf78f4c994732409f0faabcd7f6e75193c35ed8c2787ec5abb9cfac28a6755 SHA512 d0e5d6ba2dda3d5d62957ba9cc55df6d1289f010b525fd5ef4070037e72fd8391a6567876b72353621ce2a301e8534d2a32a68068c35b9698bbb37b642716f44
+DIST rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a2c12c0d776e3b864769720e057e3d23378eac58301ceb42e6d50441b5a87c56b581eb9b5c3d7a788de94b9ba848ba72b643d44219a100326f40865df1e6d307 SHA512 6ff7c3712a034842dc4aff494ea1e505186fe07cb1a87415dd053869f205e6c210a517165767c4dec347fe07864567eada39ba17100cd2135586b3e5dbbe1d48
+DIST rust-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz 193741280 BLAKE2B 2ce32d802f5940c1fece0609aa8834b259c8e8e78757999e4f7dd2738509edaca5ce808469af0309d1a2de660c777a591f15798a67e26922433a543188f16436 SHA512 1144cc93d5b70c59e94407a262b27577b5093bf402f1651308244b35e4701428930bbe020743b2f46bc5c4d0423c8d94562ca401f9fda227e313a6f162431cbf
+DIST rust-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B f2e04511870325c0d3317faac00fd71716b65cdc49b151f1ea698a9e20026cbf05b2f2142beaae7f94ad166346500a1d0ca6ac177e32791f48984304d51e8c32 SHA512 7a9bcef40f7e7215d2de483013027d75cff2eee1a6d8b8a65c3a2fb3627e41971af0e55cc12ed9a7e9c025f9bbbc2b20c681427a591e37469dadc36fe113871c
+DIST rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz 197872564 BLAKE2B 369c52ce8bd48c725e6004939b2dbc6d2708225069226082b25c5fc32e26a40a65f232b3658351fb2bd75a1dbbdea829f1c30dfe240479dfa8fbcbd6ded74c13 SHA512 f0d45627c1192e981bedf893e68c75dce528737dad13e9b8b5bb4647a7ae8243b02aa54b364ff92474b1bcf6b25e60ee6b4028885b2db20feddbc79829bb95a2
+DIST rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 947433cb33e7f1e3b14b6edfb1d11aaaf3e278ffaa2e70d990ae5f2c75a9dfd6ea6f7fb9d738528bcbb3f87d1cb753e24b25aa27c1917f9ccd806193d6f85100 SHA512 f46cb0949eaaf8373e04d14f55c83708bdd0c9ac541d1a89dc9414eb316159bbccba3f955528cc81b30be5107c931a3cdef6edfbcaed2fb0025fc7b8dd1b04c5
+DIST rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz 223122724 BLAKE2B e078393e63cfe089a4942b0a0d1a8a9a8b964a608f09deb3b3dc4dcd2cf9fc1b97ea2510193b7ae43059b27a9bd063293366ae83fb2eec8b4192ea8ceb41a5b5 SHA512 94982573bd992bdea27b90202b03cf79312c2fc8ff0c822f74bf883b0624ad5f9968b8843b6abd3bc74ded454e959b39ac880a999114664ae5c57d274499439e
+DIST rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 830a09a8774853eb71431dfa126a17b9d2939b5305e280c2de69218c440010e92594829f13c7f15f0ae8d028c0eb4d4c83bfd5a7a9c0b112d885981652fc0832 SHA512 7bda28867dd5c6d415b924887ddff9042bd51e913fedae2c9d68451427685d82e282345d02d2b30ecfb60638a08200d9c946656a2711f51b40348fc7fe88789b
+DIST rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz 220280040 BLAKE2B a47cc9c0636fd654a3cbeda2a95a04c7c190cb295364e4ebe9824354f3908b2645f36633b0827a10e562d5c96d99deb98431c29a9459674ac896f46a63228cf9 SHA512 b49bf8ee407f31ef13834ed856ead56fc35463ca770fa2d6b821eda12efc09f41d999b30bedc5c7690aa7682c09b4445ba8576af5cbd037369a0d02cd2fc0e96
+DIST rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 835c0699a036f89d3c6e60ea99e736fb1195da7c3d6098743f4ebfee82c6c9f0565c3210713e706f1c8bc9b4744514d3a463335676da7b86527010370765485a SHA512 afdb5f5fe8731e87656bda0d057526a78b9c39f61d9788d32d022c7bf06157fb68f169a1156b6b4b947c36a5bc44ed2f61f033beaaef27b8cb0396fb79b81a34
+DIST rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz 232559592 BLAKE2B 67b0bc67f59f84868bb75a7b9a598c36edb202bf0d001d10a73d4944b4e779187b6dceeabf744d11f6a0980ed5ac3d2c14d1053ab086f919489db28208f9134a SHA512 acbbf36e3aaf0a5e9d9002d1e7968d43f8557f9e5537957a5c31a5c340b9d2a4a8a39275021c7b8be9b83d916b067a9028e742da26a91ad7a7d7efa1e60f2c67
+DIST rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d58654e30f932a3ebaf02e678da143afd1efc908bf7260f7681020446aea6e57429dc46783de868a33b487e324272810d0df1e010d9621028a1d3c117d3f908b SHA512 7f9a496b13976022bca8c16756bf099c725bdd44fc188051599623f86097beb4a503449e47c07bede4ad9e54c45b689d153384c01e042577cc6d263401ed99cc
+DIST rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz 199550588 BLAKE2B 67875dd18e36c84c87ddb48027e17c90fe692b35b04de3501129c7dedfaa9b2a1c713c51ae8a7a37bd10a27e424ae58001472a4cdcfe6fe4a3aac61bf569c4ae SHA512 ea46c3f669f0ace973dcc318f4980be80df71faa264396426a7ca3f65c4fe4223dacbf591d597611c6ce175aecd64ec43269e96140e338f8886571521ed00cd9
+DIST rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 468f819d02535f8cadac3504a78c4025616ea5d41e5e6a7aa656bb11cb71da2f902094715c36ac96cd032cb43d20b4ff3d6260c1f9a69608ec06f1f2af0acd63 SHA512 1cfbc331ca106e32acd8afe6111d34960abe0be65d411989ec3ff10ebf8d98a3f1379be9018a67d4ca2887b060728decbf826650b561f5de2c1f750a3c08fcce
+DIST rust-1.67.0-s390x-unknown-linux-gnu.tar.xz 234563160 BLAKE2B 7022c16d42a6433c1b696f9fb809f89213e6f1164ee907bc0a5a13fff226336691f9b6ac2cb39fc128ec7240eab6c8ed45f2332cdbf851a7868f20fd9bf57150 SHA512 5262618ac38f1fdf207d574b80b625cd8f9710f60a8b1584a687c0803a69c48a7d257555b2c91fad55ad91300104581847819f03cedeb754f744ce23bf619479
+DIST rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 2f296deb5e283a18b1317c2566ad30f31162fa17c37839f6f7c4fdc3ba91c0186ed6d07dba3654d2a33ffd2bfe3a5de95b6381f2473cf89f43d5c9a3a46e658f SHA512 3a5bc46d6005832b90cddcd9244ff3bb305597b55cb39786db5a4dbf433962ec7a1f6a04b9ec6681f6611aae85672b11dae8008596e4e48a38c7813b11776acd
+DIST rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz 186247872 BLAKE2B ce6536d349e84bed60eca34cad4d547c999dfa5cd607690bbeff110d7ca6ee51831fcf8b378246c556416cee750f97fae7daef1498b1a5e9b5c1d2fc53fb888f SHA512 f7cc8b57b3460525b33c925f27c71d7d9d97d752629cb098c690927374a8e2fa669a22a090e6ab9b80d5595c7af126c5e20d17a41890578b8fe3dfc24e86e3a8
+DIST rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 699c80f8c4170006a27fc2f888c695c773ecc2d595adfa8247697c824a414ab34b25dbad755d954a9fdec5a6b2a891c1038ea988f1c9fe993798b0db9844fe61 SHA512 76fca41753c26689cc7f068fe05be38604fe8cd8947adbdf457d793be1bb426fa6fe5ddaa59dbdcfd71ad559823dd710eaa447b4d3f5d1df3054ce3c202b219a
+DIST rust-1.67.0-x86_64-unknown-linux-musl.tar.xz 270123152 BLAKE2B a663f12acd11506263de4d10af0e3ee24cbdc51ce09b4df19d4c1bb0de6887fc17ebee895b7de5a03444c8d2ff44c03d2ebc2e9eb8d4307db4b1e708328cfd74 SHA512 d01eeb40a3e0e8ac5de3eb367f10fe5bcfc7db05e6951532732611fb99f40484f668672991ff40f41a113ede098fa66e7d37d3569978196f82fb5cb550aa1c5d
+DIST rust-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 6617b3e5029da925e19c2d7b5fa69386d6e1c125da858d0b0a20db3df19dafcbe988d710b19129e70244cb9c448d6efe575b38c305d54a8645d6a905d2cfab9f SHA512 8e5dcf410da568b9379c4ef9007379591410432fdfd2cdd8fba236d8b3e3fa2fcd97712d1b853447ce425cec5ece35e3ea9ad567e07aef8d7cb8075115718f91
 DIST rust-src-1.65.0.tar.xz 2488012 BLAKE2B d48f5591e72e14084f2fb0d66c1365f1648060d514af23c0498e02adfd7223b1a79bd1f512859b058f9cabc4b88b9230d15960df7c30762a5263d1785b877a68 SHA512 247f822a9c2f16d1de29d1cf6fa7ff393b7c7fe01da66a7c0b4add6259d72403922b8b1bd1b511ed8a9cc0b2c12ff574945aa7fc76c731fba620b466bcdc2eac
 DIST rust-src-1.66.1.tar.xz 2512096 BLAKE2B 514b8f9170d8a0e9b9deeeda27c5b83c18b7f038cb27a867fc4df1a0375b5c492793e67d0f0a2c26354ed1b58c699e1ff3e19f536dec10fc8b8211325dd4999a SHA512 3b77e29bf0803278d46aa5a484a2d74f242bf7f1ce6f5a6d1e84107630aa238620c91459f385f1b9f1bfb67c593ea5a274950a4db2975307cabc3a009b89f157
+DIST rust-src-1.67.0.tar.xz 2522244 BLAKE2B d16b4094848560f9db30a7e91ae2cdd0ed06d5bf6ff9a75526621bd6aac813344fa2c4969c4508c19f73e1933ffd5bc920873876a54b19e0eeb2cf8b685f21b5 SHA512 d57eff876115ef0e0885e8ebb9648e6319813e98fe946ab81da0becca29f18fda97f047bb2ce0a9ea4813d6cd98c6e2eef6e757aa21611e41abd1be888afa52e
 EBUILD rust-bin-1.65.0.ebuild 6730 BLAKE2B 0f0bf58c8401dbcc858d22585a57e96988e3ee5d9dab120b4e9f955c630aa61d12e15b9deba0f4edf62a1e6c4dc869980081fa21537b014fb9cc897c3881858b SHA512 ec04fa1da0481714bf7b9d43f175f456d01eae4d70f0d914f6911bb7b809c3c133df0b614243a0f1bb0c0c2fa8345b0b6d19e269b5017cbd36252c85fdb4a176
 EBUILD rust-bin-1.66.1.ebuild 6737 BLAKE2B bbc9dea9c85652e32db45d3b865a0c8dfadd3ec5bc4fd4fc900ea0596d57b3f928478c88ed70003e1cde4b689d6cc9faa0933daaed9fe8652316d595eaf3cb26 SHA512 41684b6ac03ed16016e522204e96012120d39c9da0633010b6fc28b0251a5cbddb7e55267cb94273d3b9c339c38e4e4c96f24ae188d6dd3962b2390dfc7f9448
+EBUILD rust-bin-1.67.0.ebuild 6735 BLAKE2B 3c74b0fa2e4258a25db31b95c02b5be21f653970b31c8a59c8055d664c4f927ab6c2560e2802b0015b4297469d1cea23faffda5632a8fde86bd4156ca371987b SHA512 9d10d68d8c02bf8dd641acf23c2ec36bbd8e59242be17d320cee560d13bbe295a0523e42b273e3092f586fed1f604465b314bd59498738e931ab9810ac9c5db6
 MISC metadata.xml 602 BLAKE2B 8e74f441d22eeb8b276d77ed0a9c5bde01540a3f34d6053185b2be77dd9188b80c01c536f8bb18c4c60214bd0bf366a504c1f3627110a213332120b533f7ddd2 SHA512 5f120deec600c7453d503b6acb9460d1c765a567954c79749654365721b1b6fa2dd48d60d5f3fc86191e79d5f7f78d7aa1e9634e6127f333f81e546f9b0f74ac
diff --git a/dev-lang/rust-bin/rust-bin-1.67.0.ebuild b/dev-lang/rust-bin/rust-bin-1.67.0.ebuild
new file mode 100644
index 000000000000..cdc21d84d332
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.67.0.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+
+MY_P="rust-${PV}"
+# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
+MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2023-01-26/rust-src-${PV}.tar.xz"
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}" # omit leading slash
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})
+	rust-src? ( ${MY_SRC_URI} )
+"
+# Keep this separate to allow easy commenting out if not yet built
+#SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
+
+DEPEND=""
+
+RDEPEND="
+	>=app-eselect/eselect-rust-20190311
+	sys-apps/lsb-release
+"
+
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/libexec/.*
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	# sadly rust-src tarball does not have corresponding .asc file
+	# so do partial verification
+	if use verify-sig; then
+		for f in ${A}; do
+			if [[ -f ${DISTDIR}/${f}.asc ]]; then
+				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
+			fi
+		done
+	fi
+
+	default_src_unpack
+
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+patchelf_for_bin() {
+	local filetype=$(file -b ${1})
+	if [[ ${filetype} == *ELF*interpreter* ]]; then
+		einfo "${1}'s interpreter changed"
+		patchelf ${1} --set-interpreter ${2} || die
+	elif [[ ${filetype} == *script* ]]; then
+		hprefixify ${1}
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rustfmt && components="${components},rustfmt-preview"
+	use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	einfo "installing eselect-rust symlinks and paths"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
+		local ver_i="${i}-bin-${PV}"
+		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}" || die
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	# make all capital underscored variable
+	local CARGO_TRIPLET="$(rust_abi)"
+	CARGO_TRIPLET="${CARGO_TRIPLET//-/_}"
+	CARGO_TRIPLET="${CARGO_TRIPLET^^}"
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib"
+	MANPATH="${EPREFIX}/usr/lib/rust/man"
+	$(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"")
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	if use rust-analyzer; then
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+
+	# BUG: installs x86_64 binary on other arches
+	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 91c32498a989..d1807f0a05bb 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -65,10 +65,45 @@ DIST rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz 162028064 BLAKE2B 8c572cc304c16
 DIST rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7a9287b6125eab2c14a026d6b4d8a3e980b9fedac0436b75b1bf314b093b5e39de0d70045e183a2e823d729d24f43f6251a2fc28b072e3caa1950fbbddf149e6 SHA512 16abed6d7a17b9e5f3e399865ed5fee01272c8e6696ea2e784a6fb149df16da2c4123572dfb56c3c44d407d388033e52b552cd164600629cf61b33c011e4e415
 DIST rust-1.65.0-x86_64-unknown-linux-musl.tar.xz 266683288 BLAKE2B 4312a53bca3e33f6633fd5eed1b17754813e54d688185ff4cca6c5d6b24713994fb5fc424113ab08c121319cc79da3d7d89518d18dbb1b491bc8ba2ec831c12e SHA512 6c7ddc98da3227b23dd681615bb8f8ea883f3bdd9547e35733cf6acaf2a625301c53449b1a3ddf88dad9a5c940f8324c3e1bb31d871092fc848b863256c85935
 DIST rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 054f1b773518a9640f3d9226510cb0b00a7f8dc4a9046c325b82d038a50c699a8bd84f71ed62790e9b96b4d65ad12ea631f6a8bc18b3bafd66db3d21137cd378 SHA512 39aa000c2a1359cfd7d2eda2b22a9b10c0fe4aa024862b7ea67bd488e06fdee6f5cc4e98db7486b84ce53f1c299bbd5391f63e25df0358184533a5fdced4ce61
+DIST rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz 248806760 BLAKE2B fc5474257221705de7a8220029a406145b886914e59a3ae1ca4048b5789d4bdfa1b11506f7473590efb65c36463d0c34b2a185a407fb31247714eab715a9e3f0 SHA512 3f6f0f03d88c7f175efdf9ed541a4e1965df5473a7865e7611ad8df51cf53a12b27e3493c4b2021749e0c912dd844f9117616d2c740a5e9242872f07d3978c48
+DIST rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 4fdbf4edaf4a346557996faceda168bbd74064566a902811c52772ba832f4ab96b3128dbe06e06de4e54cceb642b837e1cb1ff7e30ff9c0739f9ec44aedec8a9 SHA512 7e59bba51666275559362515f31fcbb0635055de7d85f3e3d6598b2caa9fe2c5656032c221327debc2d174592cb981c86212ec7860d5b73d55e90c02a0258c58
+DIST rust-1.66.1-aarch64-unknown-linux-musl.tar.xz 228044080 BLAKE2B 8cb2341e84c2f8df44a0484a6a559148260c1300e81e6ab145bb57920d65fd44af8144cd0150ab9c203aa2a000f09e0696a53668e7b8d0984f9fd4710012b736 SHA512 6bb116af95b7946609017afa68eebb5278e568f852d879fd0f068d4ef10afdc7638ced0a87683080240a24f7e52f119cbe0268639906984ef8bddbe4c5dcd43d
+DIST rust-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 6b7ff46ef90437ca89322d66c0ec78d549d65d0d206704ac6e72c9f427e9d7224162291b37dde40b35954795c8879a3f380dfbf1de38da0c979b33ee315d5aea SHA512 935055c5dc28e4b2b44a5b1279d401a0b939ba576c1d8157de083d8a726fed678b5420cfd090e94dc1e9a309cc070329590515c4110fc241f9b5be7f8df2d493
+DIST rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz 207170588 BLAKE2B 0c3a52fb3549c63ccbb43109cf54cb676812d49461344629b1c0f8d4747a40c9f6b6d050c9e27da6dad5914cf491fa7653a107b9f9e3a7f851ebecef2a98588c SHA512 6e4e385caf95a3ddc2fe4a05ecec745b721bf2eac9846d61e8ffaef749b1db2e506b7face55aa72cc7ffcda340f69185f30eb1d456a9f063c7a7c7ed7fd4eb9b
+DIST rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 8068dac7f1078470cabdeadfde8722bc96a1271e5572a4b84b7d108b173d87d1be32eef9b9be67b2c6bb3ab72dfc6a524476bfa46e222c29bc93724a183410c6 SHA512 ab3e4c7e470d4f7736e452c7118ab945747db5566b7e6d1c81359c3e224ec348b18193d4cd054772e878f791308dce792630fd4f10f750efc7e0e23b150c16d2
+DIST rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz 208535556 BLAKE2B cd1454141cd89f63d401047801b88421d9a2906425bfc4482a24fa1b468d2db382a939cb64b836808a1d0438f464d28a83b7e8097e2f97f1053a5fac7bc6de29 SHA512 92abac3fd13319b9edc6daee72689ae29e463bb317ed08580e04ff6f31b0ba5816052b8d26914d9c224ea47399517b388db78ce8ec17629795ea3988c353e2c6
+DIST rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B f828310aecad4d96c9074688f0211ba7e5286f0b3e669cb6fb1b9e3ae3adc776d6fdfda0702103cc571771eb404307df6f55c498fbd8dd006e02338cbc14893e SHA512 d3b88b83efd4303b5fde991672594d25c253b0fc6d66875dc217808190903f28a6afe8977a9ac436542c42675a12c0e244bba9aafb239c15f2ffcfe533ed92b2
+DIST rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz 212774560 BLAKE2B 4bad7755067da0a99135cc8212928b78ff254e143908712c1cb77d41ce7a8db1c7d2eed3b12b916214d03f0bf0be17d81b2669ddb5f3722fee921f2d65aec491 SHA512 4cd871dd6cdf379c71290287ae2125ef57c2d5d52753285f064a6d96e8cb586cb263ee49f7b099ede8f3e15f1bbc5b286628acf242de4fb3ba8e5d80323c08bf
+DIST rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 56504503b1b45a43f10b01f3e470667c93fc12036506b94cefb66f4241bf457d537899c2db4894027ef7f649eec627ad7bef8e1989523aa8ab67ba3f51976f23 SHA512 0a7de37872ac1a8c07ad1ac02d2bec9fb614175a5f394d603ca0c894d3d6cb12a35877e38c807da29ef89c7465a27080cfa0d5fd8ac21884fa5bc3f3c47fbe9b
+DIST rust-1.66.1-i686-unknown-linux-gnu.tar.xz 234959096 BLAKE2B 0e0583c460092539e8813feaa0f65a026f4f52357571be5bcaef114f062c598ac5d2e3f4f22c88514b9b0a9e53e256a25eb2f18353642a8e40c6156df4309b54 SHA512 19cafc7763b40aa48543c5678f3c4d23b552f091bf6dc592f57ec950856802b3e7dee98d06b73ead0861630ff101260d741082fc1cc65c7f256e4591b821068b
+DIST rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B dd2c75d23caac69aa5e8cc965d5de9705f9f8e5f0be53cdd87e51deb07875579cf948bd6a7a02f10de3fcdbc70fb1cc46a4b616af44f3296787e5d9a32557490 SHA512 9364bf48b262c797815cc3f38188bdbe595cd39839b5bdcd43f7da07fdd421c61ab93ff4fa65d6b20f7d15e8eff190cb0d8a92a806878b1db5ccb62e80eddfeb
+DIST rust-1.66.1-mips-unknown-linux-gnu.tar.xz 187966796 BLAKE2B 193f18a9c56465d297ee2b3f1d9a8a67d8a6b1d07565503e6f5b31d4bd5b05782f45e95ee50a93e6d1b91275e9769a9d56518349a456f55392dc28b9d3a1ee82 SHA512 8f23b47f38ca42af3dccb395fa183edee3f18a478bdf1f7de2135e5afc6dd87d14508f7e2ada938dd64eb51f5acee27d0417fae6e3b1c114c6c812006206d89c
+DIST rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a04c0f9320d663658b758e6b89709645433a0d16548c511945c439ce134617c8a05d7e9ff988e8f7a1ef62a726284548bf8b259648f614c3a2205ee9c02b3a91 SHA512 4b581b997a643c0ee6105c141c7859e86d9b2cb6dda85d867593829978911dc5a6c343a11712a334b94188078c0d3b1e7e734334b8b4a16b38afab228172bc6b
+DIST rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz 184874416 BLAKE2B 64d96a026634cce03496be36ea7a42986e0fedc75d6c61e0f9a6ffe5cd3432bacd353276636c58989d02328be62f760bc0157c5999262bbac5c570dbc049635a SHA512 ce4b5ff464e358b085c18c21697cf7f339c19db163a873bf68b24e2febf42e69e582bbfc9f95cc38a6c96610a8ccfe6ec431cb2f98be10c48f9c1cbf027456a0
+DIST rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B fdcc56efc4f7df5d13595661d59354e4fcc757e966360fccf8a86d42f31f952334b9cedd107d23e4132b90e3082013cc26076a0754455d2759e2bb878afe023e SHA512 c5918b76fdfa39ba89c980ec2d252b3755439c8baece26d27f3515e800061370c2715620a052d3f22bd57412d058f5e3f53084bee08b5026b0f50112e6c41b93
+DIST rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz 191073888 BLAKE2B b88ebb699e97e7e243138bf5674956afac0204bcc19882efd59340bd45256e9ba07b7e160895faffd81c62b533b2d305b088c08d3a99060e91025627ec8b7c7b SHA512 9afe6b80df0e24f2cedd65e7ab5fb25cd28be69b3e442c80a8f92291c7ad7ff7c2f8ec2e901bdeeb8084467700db4c19055edfe4ca8ccf7f6ffbf69e5c20426f
+DIST rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9a8c4eb0683465c63d1d5f25eedbc2ee96331960cbb2704d67a806852a05544f646cfe8220a3582d6e05dd30e63fdb736d176c0467166192501d168e5a0fb7d2 SHA512 e35e0e6b94feb551dc1a06e36ad0c70fe2641dc5671fc74fe99baede8c40cbca828259eafbf790af43cb8775fcf8c38442d2ca3349277b07bacbb508676b25d3
+DIST rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz 209784584 BLAKE2B d582f2efaf7401dfc8ece24026653dd52acd3bd5f3a87d12eaf1be5170909ebf009189312d59d5508beb6a68bb88545ce97af1d87049dd61b2736ddd9fbb9ffc SHA512 b8a9f4115864e0e6262c603e11b2dd9a66706c120aecbd0e7b0acc79ff1675f0dbbd2c6c0095d21be664a04408e610f07b4e09adc31f73b0fc92dbb2083f9b13
+DIST rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 1bf9e84765268fd89e4e18adc5584dc5b7517217e2c042e6a4b4b68d9716f0502df83115308451792d800458c71535f9bebcd1254f0d26e0359cc19e398d651d SHA512 93b7bc720dd9f0324a6a3a066e26d218236f8a87e50d4ee827d1f785eacc1e289d3635d7653d38197294c4ab4bbf6e15acd2341517f1a75c1e48a2034f5bdd3e
+DIST rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz 211414032 BLAKE2B fcd16f3cffc4a8fa4d42daa75562d48c1a9aeb487b72a461a7a300fc15a51ef478afd8a129a34681c9035b3b846c3fc713e9f128e55ec0f3688022bf92ee2529 SHA512 8acd1e8b4ebd25d31652cbaca0173c87499fce233525d516279557d63c50cbf36d4bdce0bd73ab4b69d9dd95d0f3a91b7b80f77ae3a3f23de7660ee38b5e6b59
+DIST rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d07e572b2dd85f47c7cde4d6e328ba35f20f143d637a5b0b9d295f24b9bc3bccd72282718351419784a32c5d26189557beb2fd143792e3115aea4640650b4371 SHA512 dcc1708cb37bcf2820c7f6280fedfbfebc8a85ed76f6e5acc64f6b1f768b32f2895d737f7209ef8a7f81f339047531e28675f3a31e3f648d382359550f255095
+DIST rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz 223088628 BLAKE2B 1627b274c35596e7fa932e42d8a14e6487fc74d34b1d8e2c4661d6346bcf3dc6adbea86ad62de8c9901b3cf7616e92e07d5d9f7002ef39d20a0c2a418e2533a5 SHA512 4834a7a794967b32c3daf633c4627e3ae9adb60268bb409f8886607ba8799f98fc8774a8652a41bba1e8147fd51e8a30ceb569cc22ac1f29e23d335974374aa2
+DIST rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 105e598220ad4c82ea4822b3b09744f6445e962dc4c9d9c01846f2e51586d2d18c71ed9ec9ed3c3e4d76715879e8e714d3ea47628fa9bad2ceca1c0f34faaa6a SHA512 cc368e40e09fe42df2c01d124912e7dd90b14c694512d6761e4c25cd183998bb1b5426916087ed05488260e916f4ac97f53dac27e278b53ae1f8387c086e384e
+DIST rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz 189480332 BLAKE2B 98f9cd36895a415967f4392ec58ff290850bbb094c473ec8a7956888b22dd9cec412f540f73acaa99c17ceb3c2255d6745f1072f7e170ff5e28fb6475ee396fa SHA512 ce35e57cbe0e92a33e9efac4be3c8f650615197728654f775a3784ff28d823907f59fef0743d63d65d034cff8079cbc000a98531f2fcfbeb8f33de66d772a4be
+DIST rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ab78efea869dd2233cfa9929995546c33146ee0d92b262549a44d2b5bfa6e1309cb32c831f8a3be4baeb0e27f1abc044e03d87de23eb28c6057f5ac383d4d9b7 SHA512 c9f5764c78031bdaf8106c53a4774f55acf6308be057bd8acdf1c07863daeb5fbf2a5bc8fcefdf9fc0391a2984e7b1b7aaa11d89402938575df2ca38a3758739
+DIST rust-1.66.1-s390x-unknown-linux-gnu.tar.xz 226436776 BLAKE2B a45528d58550b51a0e5d589e3f44ae5bde739e58e9172d83822068235f753007094129da606b034aa534aa9e5bb85c020adc8f7054d59b61f1fe0fbdece2e894 SHA512 ce22b52c9ea4dd3ac9f8ac84a6a50f7a2c031c485ae01fc57be1ce922b927f2e138862b620dd6a538375a0e6c5ca4d693b32643b26f9f647d0ec1d6eee8a799c
+DIST rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e705dc1a56d686c540e9a3667a0e14bff66f27f789f7a4022fb9a7d3919deca0cb264eee8da4fb0d54d625bf86798a2926176c0f148218a97bc4cd94f3c2d192 SHA512 5a657456f75aea4246fb3b7ec8c43ba2ace111ee41ee22ff26c05f246b699eb7ad76703168aafc1ebd88673390e13ac03caf7dcfbf270eef2cb5f943bdd5296f
+DIST rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz 186651920 BLAKE2B de89dd720320da6a8f27f5499e90d417eb3d3a9a934deddda8fdda279694ff33312af14c4c5be1c8b4e22333d5663b4c51c2d1d22914876bc4ab6e39dbf16476 SHA512 8bcbbd4a9246dd48c4109b9c91852b3a470036a8c0ac31b77cb4c05a205644a5829c5c38977240ab51e25778d1f9c7c3cda303da3f6b50a98d6a4eccb0f73782
+DIST rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d313eafed62763b0905636ff22d6c736696c55e55d2442512a95e239b5b37199fdb125d312284b2a249782fa61d552284c8eb3ef8c9aa9ea36283a9fb975dd66 SHA512 c491f07c77baeac6b92c2425092c1b3694e72c49d4e6e511597aac03d51930cd414a95b0d691a9b23df266fba8df3dd90bf7d30624383bd213403fe0cbc83ffb
+DIST rust-1.66.1-x86_64-unknown-linux-musl.tar.xz 270294752 BLAKE2B b068a9400f29e9318e8d52f2c37df72f1b8fd91ca0bba342e6681544595a7f2697bf10437be6c4612a36d2781cc915920b498273ab12dbe1163c41d9d4e9b438 SHA512 df03ef29b03924346ef2a4b5dbf1c7ce6e33fb1f357eb04b0fa80e48a607b29f5929ce587412c9dd3f385d6382f0229c19d0ce78d6c060ddc0539429d3cfc606
+DIST rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B a262a2a020a142ea8e3906a9c93d9294906ee51f5d22efd4ef041b6032524d2714e0b511f7deb366c0ee3337ecd52f1e091b6bfed01615eaa9026996100afe2d SHA512 f390b3a788c5b15b1acee01505b6501ad4a3170cd2f23ec490b02294ce0a62c3f708f1e66c0ba8258a1042dea0401a1e09d31d34e99558f50b0f65b359354182
 DIST rustc-1.65.0-src.tar.xz 139674928 BLAKE2B a218263fb67e306b153f5a6dae95b5ec653acaa5eb4b833862d6f0fd4685a8cec097dadc1b8a934e1bf6055672c7a617f9a0ad4a7dbf2e78084297f10b7ada04 SHA512 3d0369ed3028209c4ecb9b9e7b5f5e3a20be8cc05199675df4f091d62a96c0734bc1dbd7630928fe162792392ec6d0daf9ceed10771531ce022200c7b631e3be
 DIST rustc-1.65.0-src.tar.xz.asc 801 BLAKE2B 43ff92011cd6f7f34ce0495fa341379e5907d032ea90f91e533e5edaec6ad518aad50a9d8b2694074d6909ee96aa779403b16e95792e962e79c1b967542ae26f SHA512 75b9be53363022c81333117876cbcc573bbd4733edf767cbb164218644efb1a9c4bfc2aa73aaa1e39f248a84f1adacb1930a94a6e63f60093ff760fb9ae02efc
 DIST rustc-1.66.1-src.tar.xz 141692940 BLAKE2B 3fae45345998386fda1b11ec896fac4613b8e3f0092bc0df29c9685f4a4012c0bd1b600911c2d19bcfa8f5a84b8a3c39d4c9e062a62cd61925b59129e1cd72b9 SHA512 1944c024c603140d0a9236043a3bd1d0d211dd8d368d6d82a3a620f1ff43b29624755b0943f2b38b40a188c7eee77a840238ea757eaf435e2a3fa6a0e6b82832
 DIST rustc-1.66.1-src.tar.xz.asc 801 BLAKE2B 18e27c88b39eed29147854733c5533b7fffc417ff0b3bd5982174ffa2c5f6d217e2e28ced4da75863a4557800e7ad7a124a4bbb0def4c20da7ed543602185941 SHA512 4511f41ad3d098a339ea3173e3ffa692d1d3cd3ec9dd45af68e4491471f9a72a2e866f6924090eb366bdf6f856650d981eabe1cd851843a17f4a6e4f1dfbc8a9
+DIST rustc-1.67.0-src.tar.xz 142750964 BLAKE2B 5dcea694548f5162bed6020ca12ecfa178fba479fbe6f29ec310f9c5cfaae13999de7b861498e92561f21001fed295d21dd9230ccb5da2f20c638309e785cfda SHA512 6d1ddb54c0ee2c4f8ccf73f3c306c8d8868feb738d5e77eb5a5d25f716395c27d1b3666929c87f9dc84213a9acfdb56254feac92ef0fea3147e2c644391c12b4
+DIST rustc-1.67.0-src.tar.xz.asc 801 BLAKE2B b46159b7cbe081cb34d82b2642397788d09d09f9e55fd961a491862c2c1827b0752530fa74e1a8245cab9ff898d2f021bfdae4820edca34a87c9e18202d7a31e SHA512 cceb0aa5d43c476a051c77263fe152085b8d7d337f78117077a1e460bb9e31b75becd36a8f571fc1275a268ac1107d680012a82a7378851d2a9f16748d95a929
 EBUILD rust-1.65.0.ebuild 23818 BLAKE2B c5a288099dc15b8dd61ffe06b2933bce2edbd2490bed6659e990863804448dff60e95f13362d33529e690bbbeee32f830bac1f7afc8fa34e63e93e905a78a14e SHA512 7f3b80e402f44e6edb8d29fa271f0e9246dcd101f5301c787965b75b209d1f4e0df25484dfc3a686e8f7ab70626558479c24233bbd036c4f59b178cfd61d1407
 EBUILD rust-1.66.1.ebuild 23695 BLAKE2B 123eb9b2e5a3dd9380b54ec9bf4d2fab5bde4de44c67ebbc5935e5596ae4fb2ac51d9895d812138cefca3795fcb96b2c4f8923080bc7c539a9b98b4094361a00 SHA512 0eaecc97a1507b0d25323ac4b79d6dfa10d6d58cf9457b0d31f9cb91810429478fc36e18bf123dd340db60e806e50415123c64223d2c490d4b3d442369919c63
+EBUILD rust-1.67.0.ebuild 23059 BLAKE2B 507f17361593e96c1307341728aa8c9df8d2ee4c792daccf9771d74277096542374373e37e11d589ab1696f96b14bdd6818093347c0455a3feea82f9f516fec2 SHA512 3c121af3c427d2e82caacc6b7c5167807abb4cb9eadb2eedfed61481c70647d55c017d6b32d7bd97267305240ee1a4ff3bf92e3dcf7db710d51c214aabc21c28
 MISC metadata.xml 1676 BLAKE2B 37d026b952e72914faf51b5258c6a3da77aa088974094af5533a029abe3975beaba4efd8894cd419577f00b871c45ca3efa80195d90a42c9d1be1fb4befbe5eb SHA512 9a5e30977be9d76e60cab5a0698d5cc544240a6b0c54350aa0bd6aeff0e864f14d97a90ae5e3024e9b7bed54f7b2c7f561f46ad97ff99928f454af44f420d17c
diff --git a/dev-lang/rust/rust-1.67.0.ebuild b/dev-lang/rust/rust-1.67.0.ebuild
new file mode 100644
index 000000000000..91631c7b433a
--- /dev/null
+++ b/dev-lang/rust/rust-1.67.0.ebuild
@@ -0,0 +1,740 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
+	multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC}
+	verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+# keep in sync with llvm ebuild of the same version as bundled one.
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one slot
+# simultaneously.
+
+# How to use it:
+# List all the working slots in LLVM_VALID_SLOTS, newest first.
+LLVM_VALID_SLOTS=( 15 )
+LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
+
+# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
+# (-) usedep needed because we may build with older llvm without that target
+LLVM_DEPEND="|| ( "
+for _s in ${LLVM_VALID_SLOTS[@]}; do
+	LLVM_DEPEND+=" ( "
+	for _x in ${ALL_LLVM_TARGETS[@]}; do
+		LLVM_DEPEND+="
+			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )
+			wasm? ( sys-devel/lld:${_s} )"
+	done
+	LLVM_DEPEND+=" )"
+done
+unset _s _x
+LLVM_DEPEND+=" )
+	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
+"
+
+# to bootstrap we need at least exactly previous version, or same.
+# most of the time previous versions fail to bootstrap with newer
+# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
+# but it fails to bootstrap with 1.48.x
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.json
+RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
+RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
+BOOTSTRAP_DEPEND="||
+	(
+		=dev-lang/rust-"${RUST_DEP_PREV}"
+		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
+		=dev-lang/rust-"${RUST_DEP_CURR}"
+		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
+	)
+"
+
+BDEPEND="${PYTHON_DEPS}
+	app-eselect/eselect-rust
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
+	!system-llvm? (
+		>=dev-util/cmake-3.13.4
+		dev-util/ninja
+	)
+	test? ( sys-devel/gdb )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+DEPEND="
+	>=app-arch/xz-utils-5.2
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	dev-libs/openssl:0=
+	system-llvm? (
+		${LLVM_DEPEND}
+		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	)
+	!system-llvm? (
+		!llvm-libunwind? (
+			elibc_musl? ( sys-libs/libunwind:= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+	sys-apps/lsb-release
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	miri? ( nightly )
+	parallel-compiler? ( nightly )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warning
+CMAKE_WARN_UNUSED_CLI=no
+
+QA_FLAGS_IGNORED="
+	usr/lib/${PN}/${PV}/bin/.*
+	usr/lib/${PN}/${PV}/libexec/.*
+	usr/lib/${PN}/${PV}/lib/lib.*.so
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="
+	usr/lib/${PN}/${PV}/lib/lib.*.so.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/rust-llvm-dwp
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/self-contained/crtn.o
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+# causes double bootstrap
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
+
+PATCHES=(
+	"${FILESDIR}"/1.65.0-ignore-broken-and-non-applicable-tests.patch
+	"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "${1}" true false
+}
+
+bootstrap_rust_version_check() {
+	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
+	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
+		eerror "Rust >=${rustc_wanted} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too old"
+	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
+		eerror "Rust <${rustc_toonew} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too new"
+	else
+		einfo "Using rust ${rustc_version} to build"
+	fi
+}
+
+pre_build_checks() {
+	local M=8192
+	# multiply requirements by 1.3 if we are doing x86-multilib
+	if use amd64; then
+		M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 ))
+	fi
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	M=$(( $(usex miri 128 0) + ${M} ))
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	# add 2G if we compile llvm and 256M per llvm_target
+	if ! use system-llvm; then
+		M=$(( 2048 + ${M} ))
+		local ltarget
+		for ltarget in ${ALL_LLVM_TARGETS[@]}; do
+			M=$(( $(usex ${ltarget} 256 0) + ${M} ))
+		done
+	fi
+	M=$(( $(usex wasm 256 0) + ${M} ))
+	M=$(( $(usex debug 2 1) * ${M} ))
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		M=$(( 15 * ${M} / 10 ))
+	fi
+	eshopts_pop
+	M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
+	M=$(( $(usex doc 256 0) + ${M} ))
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+llvm_check_deps() {
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+
+	export LIBGIT2_NO_PKG_CONFIG=1 #749381
+
+	use system-bootstrap && bootstrap_rust_version_check
+
+	if use system-llvm; then
+		llvm_pkg_setup
+
+		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+		export LLVM_LINK_SHARED=1
+		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+	fi
+}
+
+esetup_unwind_hack() {
+	# https://bugs.gentoo.org/870280
+	# this is a hack needed to bootstrap with libgcc_s linked tarball on llvm-libunwind system.
+	# it should trigger for internal bootstrap or system-bootstrap with rust-bin.
+	# the whole idea is for stage0 to bootstrap with fake libgcc_s.
+	# final stage will receive -L${T}/lib but not -lgcc_s args, producing clean compiler.
+	local fakelib="${T}/fakelib"
+	mkdir -p "${fakelib}" || die
+	# we need both symlinks, one for cargo runtime, other for linker.
+	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so.1" || die
+	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so" || die
+	export LD_LIBRARY_PATH="${fakelib}"
+	export RUSTFLAGS+=" -L${fakelib}"
+	# this is a literally magic variable that gets through cargo cache, without it some
+	# crates ignore RUSTFLAGS.
+	# this variable can not contain leading space.
+	export MAGIC_EXTRA_RUSTFLAGS+="${MAGIC_EXTRA_RUSTFLAGS:+ }-L${fakelib}"
+}
+
+src_prepare() {
+	if ! use system-bootstrap; then
+		has_version sys-devel/gcc || esetup_unwind_hack
+		local rust_stage0_root="${WORKDIR}"/rust-stage0
+		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+			--without=rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
+	fi
+
+	default
+}
+
+src_configure() {
+	filter-flags '-flto*' # https://bugs.gentoo.org/862109 https://bugs.gentoo.org/866231
+
+	local rust_target="" rust_targets="" arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets+=",\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets+=",\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/wasm_base.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local tools='"cargo"'
+	use clippy && tools+=',"clippy"'
+	use miri && tools+=',"miri"'
+	use profiler && tools+=',"rust-demangler"'
+	use rustfmt && tools+=',"rustfmt"'
+	use rust-analyzer && tools+=',"rust-analyzer","analysis"'
+	use rust-src && tools+=',"src"'
+
+	local rust_stage0_root
+	if use system-bootstrap; then
+		local printsysroot
+		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
+		rust_stage0_root="${printsysroot}"
+	else
+		rust_stage0_root="${WORKDIR}"/rust-stage0
+	fi
+	# in case of prefix it will be already prefixed, as --print sysroot returns full path
+	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+
+	rust_target="$(rust_abi)"
+
+	local cm_btype="$(usex debug DEBUG RELEASE)"
+	cat <<- _EOF_ > "${S}"/config.toml
+		changelog-seen = 2
+		[llvm]
+		download-ci-llvm = false
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		ninja = true
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = ""
+		link-shared = $(toml_usex system-llvm)
+		$(if is_libcxx_linked; then
+			# https://bugs.gentoo.org/732632
+			echo "use-libcxx = true"
+			echo "static-libstdcpp = false"
+		fi)
+		$(case "${rust_target}" in
+			i586-*-linux-*)
+				# https://github.com/rust-lang/rust/issues/93059
+				echo 'cflags = "-fcf-protection=none"'
+				echo 'cxxflags = "-fcf-protection=none"'
+				echo 'ldflags = "-fcf-protection=none"'
+				;;
+			*)
+				;;
+		esac)
+		[llvm.build-config]
+		CMAKE_VERBOSE_MAKEFILE = "ON"
+		CMAKE_C_FLAGS_${cm_btype} = "${CFLAGS}"
+		CMAKE_CXX_FLAGS_${cm_btype} = "${CXXFLAGS}"
+		CMAKE_EXE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
+		CMAKE_MODULE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
+		CMAKE_SHARED_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
+		CMAKE_STATIC_LINKER_FLAGS_${cm_btype} = "${ARFLAGS}"
+		[build]
+		build-stage = 2
+		test-stage = 2
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		rustfmt = "${rust_stage0_root}/bin/rustfmt"
+		docs = $(toml_usex doc)
+		compiler-docs = false
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [${tools}]
+		verbose = 2
+		sanitizers = false
+		profiler = $(toml_usex profiler)
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debug-assertions-std = $(toml_usex debug)
+		debuginfo-level = $(usex debug 2 0)
+		debuginfo-level-rustc = $(usex debug 2 0)
+		debuginfo-level-std = $(usex debug 2 0)
+		debuginfo-level-tools = $(usex debug 2 0)
+		debuginfo-level-tests = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		parallel-compiler = $(toml_usex parallel-compiler)
+		channel = "$(usex nightly nightly stable)"
+		description = "gentoo"
+		rpath = false
+		verbose-tests = true
+		optimize-tests = $(toml_usex !debug)
+		codegen-tests = true
+		dist-src = false
+		remap-debuginfo = true
+		lld = $(usex system-llvm false $(toml_usex wasm))
+		# only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
+		# https://github.com/rust-lang/rust/issues/74976
+		# https://github.com/rust-lang/rust/issues/76526
+		deny-warnings = $(usex wasm $(usex doc false true) true)
+		backtrace-on-ice = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		compression-formats = ["xz"]
+	_EOF_
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		export CFLAGS_${rust_target//-/_}="${arch_cflags}"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${rust_target}]
+			ar = "$(tc-getAR)"
+			cc = "$(tc-getCC)"
+			cxx = "$(tc-getCXX)"
+			linker = "$(tc-getCC)"
+			ranlib = "$(tc-getRANLIB)"
+			llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+		# by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		# but we patch it and set to false here as well
+		if use elibc_musl; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				crt-static = false
+			_EOF_
+		fi
+	done
+	if use wasm; then
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+			# wasm target does not have profiler_builtins https://bugs.gentoo.org/848483
+			profiler = false
+		_EOF_
+	fi
+
+	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
+	# experimental cross support
+	# discussion: https://bugs.gentoo.org/679878
+	# TODO: c*flags, clang, system-llvm, cargo.eclass target support
+	# it would be much better if we could split out stdlib
+	# complilation to separate ebuild and abuse CATEGORY to
+	# just install to /usr/lib/rustlib/<target>
+
+	# extra targets defined as a bash array
+	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
+	# best place would be /etc/portage/env/dev-lang/rust
+	# Example:
+	# RUST_CROSS_TARGETS=(
+	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+	# )
+	# no extra hand holding is done, no target transformations, all
+	# values are passed as-is with just basic checks, so it's up to user to supply correct values
+	# valid rust targets can be obtained with
+	# 	rustc --print target-list
+	# matching cross toolchain has to be installed
+	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+	# only gcc toolchains installed with crossdev are checked for now.
+
+	# BUG: we can't pass host flags to cross compiler, so just filter for now
+	# BUG: this should be more fine-grained.
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+	local cross_target_spec
+	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
+		local cross_llvm_target="${cross_target_spec%%:*}"
+		# extracts toolchain triples, <rust-target>:<CTARGET>
+		local cross_triples="${cross_target_spec#*:}"
+		# extracts first element after before : separator
+		local cross_rust_target="${cross_triples%%:*}"
+		# extracts last element after : separator
+		local cross_toolchain="${cross_triples##*:}"
+		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${cross_rust_target}]
+			ar = "${cross_toolchain}-ar"
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ranlib = "${cross_toolchain}-ranlib"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+		if [[ "${cross_toolchain}" == *-musl* ]]; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
+			_EOF_
+		fi
+
+		# append cross target to "normal" target list
+		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
+		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+		rust_targets="${rust_targets},\"${cross_rust_target}\""
+		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+		ewarn
+		ewarn "Enabled ${cross_rust_target} rust target"
+		ewarn "Using ${cross_toolchain} cross toolchain"
+		ewarn
+		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+			ewarn "'sys-devel/binutils[multitarget]' is not installed"
+			ewarn "'strip' will be unable to strip cross libraries"
+			ewarn "cross targets will be installed with full debug information"
+			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+			ewarn
+			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+			ewarn
+		fi
+	done
+	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+	einfo "Rust configured with the following flags:"
+	echo
+	echo RUSTFLAGS="\"${RUSTFLAGS}\""
+	echo RUSTFLAGS_BOOTSTRAP="\"${RUSTFLAGS_BOOTSTRAP}\""
+	echo RUSTFLAGS_NOT_BOOTSTRAP="\"${RUSTFLAGS_NOT_BOOTSTRAP}\""
+	echo MAGIC_EXTRA_RUSTFLAGS="\"${MAGIC_EXTRA_RUSTFLAGS}\""
+	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
+	env | grep "CFLAGS_.*"
+	echo
+	einfo "config.toml contents:"
+	cat "${S}"/config.toml || die
+	echo
+}
+
+src_compile() {
+	RUST_BACKTRACE=1 "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
+
+	# those are basic and codegen tests.
+	local tests=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# fragile/expensive/less important tests
+	# or tests that require extra builds
+	# TODO: instead of skipping, just make some nonfatal.
+	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
+		tests+=(
+			rustdoc
+			rustdoc-js
+			rustdoc-js-std
+			rustdoc-ui
+			run-make-fulldeps
+			ui
+			ui-fulldeps
+		)
+	fi
+
+	local i failed=()
+	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
+	for i in "${tests[@]}"; do
+		local t="src/test/${i}"
+		einfo "rust_src_test: running ${t}"
+		if ! RUST_BACKTRACE=1 "${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
+		then
+				failed+=( "${t}" )
+				eerror "rust_src_test: ${t} failed"
+		fi
+	done
+
+	if [[ ${#failed[@]} -ne 0 ]]; then
+		eerror "rust_src_test: failure summary: ${failed[@]}"
+		die "aborting due to test failures"
+	fi
+}
+
+src_install() {
+	DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+
+	# bug #689562, #689160
+	rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
+	rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die
+	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use miri && symlinks+=( miri cargo-miri )
+	use profiler && symlinks+=( rust-demangler )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
+		# need to fix eselect-rust to remove this hack.
+		local ver_i="${i}-${PV}"
+		if [[ -f "${ED}/usr/lib/${PN}/${PV}/bin/${i}" ]]; then
+			einfo "Installing ${i} symlink"
+			ln -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}" "${ED}/usr/lib/${PN}/${PV}/bin/${ver_i}" || die
+		else
+			ewarn "${i} symlink requested, but source file not found"
+			ewarn "please report this"
+		fi
+		dosym "../lib/${PN}/${PV}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "${PV}/lib" "/usr/lib/${PN}/lib-${PV}"
+	dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}"
+	dosym "${PV}/share/man" "/usr/lib/${PN}/man-${PV}"
+	dosym "rust/${PV}/lib/rustlib" "/usr/lib/rustlib-${PV}"
+	dosym "../../lib/${PN}/${PV}/share/doc/rust" "/usr/share/doc/${P}"
+
+	newenvd - "50${P}" <<-_EOF_
+		LDPATH="${EPREFIX}/usr/lib/rust/lib"
+		MANPATH="${EPREFIX}/usr/lib/rust/man"
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${PV}/doc"/*.old || die
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+		/usr/bin/cargo
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+		/usr/lib/rustlib
+		/usr/lib/rust/lib
+		/usr/lib/rust/libexec
+		/usr/lib/rust/man
+		/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
+	if use profiler; then
+		echo /usr/bin/rust-demangler >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	if use rust-analyzer; then
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+
+	if use dist; then
+		insinto "/usr/lib/${PN}/${PV}/dist"
+		doins -r "${S}/build/dist/."
+	fi
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	if has_version sys-devel/gdb || has_version dev-util/lldb; then
+		elog "Rust installs a helper script for calling GDB and LLDB,"
+		elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a9870601bd64..846ed0cb6583 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5ea6bebc7dd4..cbbbf3405f5f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,9 +2,11 @@ DIST boto3-1.26.50.gh.tar.gz 589841 BLAKE2B 98808cc2811f6371152b75424abe7da24230
 DIST boto3-1.26.54.gh.tar.gz 592401 BLAKE2B 7fd5bb10cda2b27fc43a7efa65c4651d95c8ddb7c94b424847f21010f9d748398a9efc47118ed7d2d90369664dddd4903fb8c4e7bc3ba3f70643a565b426023f SHA512 86d315eba84d783d327d19b41a593f193d9b356a205f29a1589e43e43519aa6eedefc26e7b23234dade6ab0bbb309d8039b011d0ba766757be8eb7a57c22f49b
 DIST boto3-1.26.57.gh.tar.gz 593947 BLAKE2B 5a30f237d992bb766b3afaced8b9e01c792c857a02aee5ba589f0f03c4c8eace3b32920d1dd62554fbb85d14b7f96789590d4acbc764dd3c56208fa5bf2dea1d SHA512 112719584ad122373e5aa24ebb6ea5c87772cdab71f59274b2f2172d92c72ed6894645253e15e12a808a83e14b12d27fde8a9fe086ccc33b987166de3fe0984b
 DIST boto3-1.26.58.gh.tar.gz 594149 BLAKE2B 5bf0ec6a321826a6f7cc346e6051e6b4d99451d0222ccf9445a9f24f561dd1797333a05d44addf1bea9b2b7e18b952c5acfa9f51a5d275fc7b34c5e8c5ab4342 SHA512 16a68f232cfdfbd4c8c6368d520c5826150039f069819aaf608a2e8b03845739a8014c54ba1fb57eeba8ebe4c6ad8e3b135d2a6a4dccd9d41de98fa0b730142d
+DIST boto3-1.26.59.gh.tar.gz 594565 BLAKE2B 90c5fe950da7fabc46a4c34e0a77997cfc643273f6b3c1afed6caad3415486b25a6610c8fb9d3f3450b4f3b73e45cfec5d6b1f02666dbd2608944e2db81a955b SHA512 e4dff5978e41a9f4c29ef131d7b8c1f0ec625d9fc77a8cff9ce3c6d5a00d68e75b62da34b418252ddfeedf6302332edd8a30d88401ea393d0de3add64ab5cc40
 EBUILD boto3-1.26.50.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.54.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.57.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.58.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.59.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.59.ebuild b/dev-python/boto3/boto3-1.26.59.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.59.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 4026a678a72b..15557e815df6 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,9 +2,11 @@ DIST botocore-1.29.50.gh.tar.gz 11116392 BLAKE2B a9d12740ea927b6331b8593b9d7ae2a
 DIST botocore-1.29.54.gh.tar.gz 11127081 BLAKE2B 7c2d11d968ca6a4d3b23b12c44cb8f050ac1848f75280c44bbb2f3567860204ed8615bd1596e02b8d0222f4d54c22a8559114365ec6a69e4a01a166a821d8c8a SHA512 4ba58c9b881ff95149ba1a5805453885208cdb68f197cc9a6c13cc9ca075e988ae33e4809f2970d9c48fa426e26c06d83686b8bbf4ff69d4a7cfe26ef3f903bf
 DIST botocore-1.29.57.gh.tar.gz 11132049 BLAKE2B 748a8b709cb6bff1a1bb38757ad68c31aa680589ed59e7c3f73b6563a5b9572ace96102ffda56643d33f0dee98f30f8443a431c7869ccfe54a311964ce781b5b SHA512 adbd760b8238b259bcc1eb3ba42cdb702b60eb6fece73a5bda5129a974826655157e702cef6a1114c2e3bd036b1cf22ebbead6e78bf88129fe68b02de1f38dae
 DIST botocore-1.29.58.gh.tar.gz 11135559 BLAKE2B 937b00f1a3c4e3ec818846549bc0cef391c86d3fee9bdd53285111e51c2c52145e7e904020511ed32f2247dd4f150f036f40feeac1a6f899781aff057f9a6d85 SHA512 5cfe5fb174cc14018cd2b7b7af15110665d7ca22f5ae827ba939ce12e71a45e9b5cab8d7ec656fa94c450d46c430a5541cd5bfe92d82da868424db4f8fa4fb2e
+DIST botocore-1.29.59.gh.tar.gz 11131182 BLAKE2B fa85e1f8dc3c366f7a7fb3e9b06dd298b1ad62be882891df3414289aa9e88bff72753690a1438e6040aefb7cafa1718a70c940e8cd2b4e743df44013b5748ef6 SHA512 9a4811b44c67652cacc899d1d84d4db1305cb60e73dd47d7f543b85ec37f921cab00a51d67b48ab6a215be8f7543e30c54585e0fb337085e1b75774b053c4bf3
 EBUILD botocore-1.29.50.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.54.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.57.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.58.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.59.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.59.ebuild b/dev-python/botocore/botocore-1.29.59.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.59.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 5e5270286bc2..6375ecd4401e 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,9 +1,5 @@
-DIST cfn-lint-0.72.6.gh.tar.gz 3240330 BLAKE2B f7673efbf6ce88e618e6fb1ff6e21cbb66cef2a1d9922ed90eb3556eff4f38827fce4efa799913168d60dc91929478a82644b7dcee25515172bb86ff74e33f0f SHA512 1db7bd50762c646be2f4bf3e74af8039cd593ccd9c10e68f43d3bc2e435ceb0dbbb70ac5a7cfd8408b7bc0eca2033d78d1fe3f65d0af89917684f7d44c52420b
-DIST cfn-lint-0.72.7.gh.tar.gz 3237460 BLAKE2B 9300703c15dea1cfa804663ad5804cc8d8103cac5c5b19cbda2ed8d2ab721037bd55295bf2e9edbc4d73e19add5de1104fb4c34bd02bf3d6529425666fde6489 SHA512 326bee0c9fa22b76f051109fc1cfa4dee6fa4472a9b598d2f3117c345a07c89c46024d5ada4abd77ff356ac697d034389e1dd131d2ee9e5a270c897b054bb474
-DIST cfn-lint-0.72.8.gh.tar.gz 3239410 BLAKE2B 3f9af91e9effa863fd780f3be78575e66fb9ce547f14e1ed62a380d1bd470181043a2a6c585aff6673cf24f583dc2b7b48bf262ab68e38b3808fd1a7d2a33d04 SHA512 a2242139c96899c13b753a14ab91dcf96c89e890b86534b08aca2ee221006bd9951dc1fc4c76439c19dfd17fafabce8e8910f0b6ad20b064e0feec2792905faa
+DIST cfn-lint-0.72.10.gh.tar.gz 3252485 BLAKE2B 34290170b4620f2f094d96ebb41cb9e5afb84fb2a0b26826cfa92cf8f73ad7e15d3ab0d38ce3ac81477f389480b36edcea26bfcb5246de8b1a5ea93b6b60ca3d SHA512 2ae9cb11956ba431c7282c3813c3f00cb4a3599a0d73f521f3880ed1f916cf0fb447a889db2ae44748be810b1e95a7709d18ac18f27b4dd3e762fa7bfd499d13
 DIST cfn-lint-0.72.9.gh.tar.gz 3239001 BLAKE2B 935d07e58d12a7b95bb589523a9ef49c9f508386d58384e7b391442ef02e304e583d687fce0f8faf892049525d6e621670061ab96a124229de7fc94df3e3533e SHA512 bf83e4146d4f2951e670c07a3a0bb3ab212881af9687c16244cade18bac101468c35532516731f66a80708312a9ee33bc531be9a6b7fab671bf54d596886a523
-EBUILD cfn-lint-0.72.6.ebuild 1639 BLAKE2B ba72b1969e856115cc4f5445e8e74aa75892ff5ca6e83603948bbeb00e6ca7a598cd80e4da509a4bff3d220b01457356793b519e777b19a90a8131552543322c SHA512 2782fea8a9be49eb24aa8966d107c5c192422a5424b058f392d7745e6e1be38293a73811240684f1bccc913335cf4c1fc6673171e8217ce88cb55c56cc9f056f
-EBUILD cfn-lint-0.72.7.ebuild 1641 BLAKE2B 05e10a408f24f3241114f3d314c8e51e75a2df14ffecddafb69074e5a5fc1c369ba99912470205fcadac5ae005986b83bfe121ce09afa78c520f2287a75fb6b7 SHA512 b9bd4c212967379eab8b4e72e62bc09d665a7670c2d1f7f6597f27562cf0c2ca87899182c423046bb71e8bcc914f359820bbfc07558e317894826f7bebb8d6b6
-EBUILD cfn-lint-0.72.8.ebuild 1641 BLAKE2B 05e10a408f24f3241114f3d314c8e51e75a2df14ffecddafb69074e5a5fc1c369ba99912470205fcadac5ae005986b83bfe121ce09afa78c520f2287a75fb6b7 SHA512 b9bd4c212967379eab8b4e72e62bc09d665a7670c2d1f7f6597f27562cf0c2ca87899182c423046bb71e8bcc914f359820bbfc07558e317894826f7bebb8d6b6
-EBUILD cfn-lint-0.72.9.ebuild 1641 BLAKE2B 05e10a408f24f3241114f3d314c8e51e75a2df14ffecddafb69074e5a5fc1c369ba99912470205fcadac5ae005986b83bfe121ce09afa78c520f2287a75fb6b7 SHA512 b9bd4c212967379eab8b4e72e62bc09d665a7670c2d1f7f6597f27562cf0c2ca87899182c423046bb71e8bcc914f359820bbfc07558e317894826f7bebb8d6b6
+EBUILD cfn-lint-0.72.10.ebuild 1641 BLAKE2B 05e10a408f24f3241114f3d314c8e51e75a2df14ffecddafb69074e5a5fc1c369ba99912470205fcadac5ae005986b83bfe121ce09afa78c520f2287a75fb6b7 SHA512 b9bd4c212967379eab8b4e72e62bc09d665a7670c2d1f7f6597f27562cf0c2ca87899182c423046bb71e8bcc914f359820bbfc07558e317894826f7bebb8d6b6
+EBUILD cfn-lint-0.72.9.ebuild 1639 BLAKE2B 789e5c89ccaaa2a295866d148e4260b98de3b0c36177628736d1a66db2e52968767d4696565c2e78f7e39a75e25928f528e71698adef7180d3fce22e630c4d3a SHA512 822c477b1268749550dd36ab92a9ec4e95fef14143c3a70100c953deeff13f0bbe410b461e3c0d835cfd77a250e8f9a5c296f9dfe1bfcaf2417cb8494ca3e67b
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.10.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.10.ebuild
new file mode 100644
index 000000000000..eeb94f75e137
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.72.10.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.56.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.6.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.6.ebuild
deleted file mode 100644
index 06f14d0cbe77..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.72.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.55.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.7.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.7.ebuild
deleted file mode 100644
index eeb94f75e137..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.72.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.56.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.8.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.8.ebuild
deleted file mode 100644
index eeb94f75e137..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.72.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.56.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.9.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.9.ebuild
index eeb94f75e137..80be21e51ad3 100644
--- a/dev-python/cfn-lint/cfn-lint-0.72.9.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.72.9.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.56.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 1566de5f9d7b..824457b2d635 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,3 +1,5 @@
 DIST cmd2-2.4.2.tar.gz 677598 BLAKE2B 38b767e70d42125639578a906a6bd0ac737ee1e3be2951b122f91a1a2bfe366ea23db2d7d7350842b667aca7614a3520057f689cb1c253d1c4b11e164c2ee4a1 SHA512 d70d264671db2783526c589199ff74cc70d53a4fbaa1d78636a508dbf8216aefab17f5764bf25b2b86e9c1413e0e61977819fbb0dec59d3209195df522d3fa5f
+DIST cmd2-2.4.3.tar.gz 678661 BLAKE2B 806fbd6abc26737032dd6330ebabc1e5308e9082f9c98002845a54f1458d314feb476e4d491892e74cde16f5043c57495426ad50aaf3e7e8d0d938f0388db6e2 SHA512 1d440752262f38a742069e636373884edcc49c17ba17b21b24015cfe559b4df36b45ac9489f2f643897fbd38f54b8e6120daf07ef25d2f209af8a4ac8e4c0085
 EBUILD cmd2-2.4.2.ebuild 1501 BLAKE2B adbc95a0581483d6545c7dd3364ca9bbc7e3805558129c345edda4e7612d4c56f96da449fe00d1979c2f10d410646cbc473e4664c2e09334ebd107706f0b24cd SHA512 7431a31feab279e9c198381d34a924353a6d4431704698dacc4d1c735af196447211ba134c84d1577f008984944ff9afcd1834f75065cbdfd224f7789723ea6f
+EBUILD cmd2-2.4.3.ebuild 1506 BLAKE2B 661bb5218f0a6809a8fa25969bab9c330785c2ce532ae7bd0ffa9b8b8a4b87df7877d03703b1e9098cb88b7450ee8b2b5e6e6a41699ea3d8f7a2a450042910e5 SHA512 de355201ddb35ca3ed7b6cd626d49988da4fc95c525cf333d66a7221eea93412724af367d1ee559ff82ee2dc5a6b8ed05bc6ee4006fd4fe4e67582fc08185924
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.4.3.ebuild b/dev-python/cmd2/cmd2-2.4.3.ebuild
new file mode 100644
index 000000000000..aa52347efcf8
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.4.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="
+	https://github.com/python-cmd2/cmd2/
+	https://pypi.org/project/cmd2/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel).
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest -p no:pytest-qt || die
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 7659a0340b7b..868059369cbe 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,5 +1,7 @@
 DIST dask-2022.12.1.gh.tar.gz 8233697 BLAKE2B 90caeb7a8a9abc03b035c787ae2f26d5dacbd8da9314b65deb7c38e1990a7d3067b4066c8f2bbb6d8179d03af471374df28e511f000097cb7b031e692e72ccd9 SHA512 1945f5737de55c559aff14c67efeee00afef18ff5dbdc07aa79affd89eb45a0808078bbc7ce24c904168e7c7a74a678a8dc90ed129593777dd25598cb45372b6
 DIST dask-2023.1.0.gh.tar.gz 8234373 BLAKE2B 39f4d6336604a66ac769732a36c718b983d2fc37a59276c4140e35354c5c469b5edbff2333ae0b52f3f1462b85ae5c11fc994a99a79330394fff0d7ead14035f SHA512 99650fd2d3805e557ee91bd578e8e4af7f12cc78bbaf72f406d13ff7805591ca0f307d78bb68fdb320dab82da23def01244708e31a87d1a8b5b18dcec8a048fb
+DIST dask-2023.1.1.gh.tar.gz 8497754 BLAKE2B ff9f9f738a557fa0b6a57e0a006fb0c7a29d37c38d4d6ee8656e2e5519a44d7ac6235f106c09c8d28b402bc32909bd065df1cb3d2f9baf8b0ac86bf5ed858969 SHA512 7638a8c8213bec4870bfc1d649bec6ab50354e20df722c3f715b9e438435838253907ead4c13a73d5f1570f63d745059e579274fd0e85c5cdf64411e9d8a761b
 EBUILD dask-2022.12.1-r1.ebuild 1780 BLAKE2B 08640632cc03a699e1824655b9da4337bcb190c82fb7c38448e717e208d4de0bcba0d841de0e5986e5785c3008ba1cde4b84d6869e84823f949effae67ef8896 SHA512 ab09ab6bd8fd5eef7a0cc6728938fac131ff85a0fd0b5d0702efeeb67f1ec851827f0a5acf9cb3c45d5c22928ec6770824c4fc09ee79b85bfe961fcc2cac680d
 EBUILD dask-2023.1.0.ebuild 1781 BLAKE2B 3376599fb69f99d5e3088632adf6ae3b9ea08546af497850a2ea0eca99e08198163b07ba762d1316e6e5d7d2fbd06319c0b628ded12ff9cbd88b5f6e9049a14c SHA512 227eaf57c69c39abaa64c8ae1a057e8f78b4cd89ea2f1a48cf73e48a378ca16a9a14f23ffa9d90a2a1d51a67e7d050039f10534403ca36161f5c294a4feae2f0
+EBUILD dask-2023.1.1.ebuild 2003 BLAKE2B b27dfd14c7d788de64d97ff24f3dc5f40f4c8c0a2ce138f9af2edce54530bc451ce94cd976b2095985b8d28567e13ad39d75c3d735c897ad966116131e136fd9 SHA512 d1374fb5c9ee1ad61e3984363451a388d93d5156865ae04124656fe305b179c31eab7ff762def7961aff202a8207e3e7baf900a2f60e121872b7d06228f06c6d
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2023.1.1.ebuild b/dev-python/dask/dask-2023.1.1.ebuild
new file mode 100644
index 000000000000..ec63a8cffc84
--- /dev/null
+++ b/dev-python/dask/dask-2023.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# another test relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+	dask/array/tests/test_linalg.py::test_solve_assume_a
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+	# require sqlalchemy<2.0
+	dask/dataframe/io/tests/test_sql.py
+)
+
+src_prepare() {
+	# fails with sqlalchemy-2.0, even though we don't use it x_x
+	sed -i -e '/RemovedIn20Warning/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index a82634d63875..f67309dc90e5 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1,3 +1,5 @@
 DIST emcee-3.1.3.tar.gz 2868872 BLAKE2B 0c665aa0cf4d96041b6627d849b40a906623724a8a51affc613e3e2da7910efb0016d17bbbc48b03e2d960873b6565c6c1345ceaffbfcda4cb16f0c56bf9534b SHA512 95b81b124183dd9f7df9381a4b792e1daa8154b2f187f0b5d2627d174371e01a6fcbc1a29e907efb1689065e8d037e3d98a40f1f35053a5dd400a922c30da38f
+DIST emcee-3.1.4.tar.gz 2869179 BLAKE2B 19e93a154a7c9f8c43389681b7318ff6e79aea8588af10bf86d63bdee51551c538ad8850b82c1233f656a45bbbd344655aad01ed93ddb30337ad49b6bfed8b46 SHA512 23f3945571bc4346c90026f9c675cb72a5cf173294eafd5bf02dc8572cfea63de3260ade91cb9360e420969f2a939fa8ac55961e808c55900fef903be357facf
 EBUILD emcee-3.1.3.ebuild 896 BLAKE2B 747dd2f6a2924d1f7baae1d70e826af87d2e868f8be57253582ff8eeeb3ef3c95def46dbecb9cba8d5883c15848d78ce9e649c49b97aa671b88b236a09705c0e SHA512 a4a71ffd68295cf95a1ac78b521c0b3a64cba65339a39ce13ae72abb38542c883b1b45961ced2177ac9f59eca74d0406d919e5dc68e03869bc76c0f4fd6e7875
+EBUILD emcee-3.1.4.ebuild 896 BLAKE2B 747dd2f6a2924d1f7baae1d70e826af87d2e868f8be57253582ff8eeeb3ef3c95def46dbecb9cba8d5883c15848d78ce9e649c49b97aa671b88b236a09705c0e SHA512 a4a71ffd68295cf95a1ac78b521c0b3a64cba65339a39ce13ae72abb38542c883b1b45961ced2177ac9f59eca74d0406d919e5dc68e03869bc76c0f4fd6e7875
 MISC metadata.xml 975 BLAKE2B 7fc8bc6247166b98609ab27624ab854a0efd4eb38ba5fbf8611d592c158ac4c9920742d1c15de7b3c53f85a2e297e8b4e348532bb47abdcc0ad9a9287a058f30 SHA512 9937e103283b6d8f6290c024699cf8837e74e94667802fabeea01d45a60b6cf81d0deda421732b57e4e5635ccadd3d25fdb2588444dcdf2f655d94cdd34d6165
diff --git a/dev-python/emcee/emcee-3.1.4.ebuild b/dev-python/emcee/emcee-3.1.4.ebuild
new file mode 100644
index 000000000000..d83883fd702b
--- /dev/null
+++ b/dev-python/emcee/emcee-3.1.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
+HOMEPAGE="
+	https://emcee.readthedocs.io/en/stable/
+	https://github.com/dfm/emcee/
+	https://pypi.org/project/emcee/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst README.rst )
+
+src_prepare() {
+	# unnecessary dep
+	sed -i -e '/wheel/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index eb58d2477351..420da2784234 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,5 +1,7 @@
 DIST fakeredis-py-2.4.0.gh.tar.gz 132163 BLAKE2B fc3858eb364c63d776c81d715cbfb218dc0e763d568c97b0d1dafb0716aaf87e928f9b81bd49d28fcc235f4285277446945595d42ff1d440e5c8491b78abb6c3 SHA512 5fba3e84d0506b52e1561f750e045b6227ea21387ddb3a89b8a61e9698fc0e9ec80c4a7048d9426fb0d8e9f2acd808e7e07fcb11d14d6852d9b057fec86d6e6a
 DIST fakeredis-py-2.5.0.gh.tar.gz 139911 BLAKE2B 4e9c616b0066012e1ed681d06e73390fb670969c15fa57689244147a0175dbb14ff1c312066ffdc6eb2c647f884c351a98eebfb2c1ba0e6c1bbe1e6c3553808a SHA512 aff5a8679763d4cf1717f790c7c384aa8e5056e5f175c306626f3a1671fe27aa3caf24368831033c9cf5bffa2e3e6be1104b183f3912eadf34fd6f37ea0c63e8
+DIST fakeredis-py-2.6.0.gh.tar.gz 151925 BLAKE2B 60538efa5de93436177aa019908f02affb9df9b2aaf1349e933da6f066f98aaa255bbdb3297645ad1dc3b67a57a61bb8081e476f451799b512719f5779c1218d SHA512 19a23be7a182f962e66686f3c4ec3a5b9fbc847d97e48f19fde11ae268f4a70de567ff2ca302a9fe0e7080de2215698cf5b2ff2febda5eef6748f3ec8d601720
 EBUILD fakeredis-2.4.0.ebuild 2080 BLAKE2B 8a72bc144e8edf9b1f8d55b65776364084f319b5522935665739984552f1e7622f34e15f9c1e0f9d3b7387d8f1408120bdf616fc3175c9d136cdc89270a75e3f SHA512 6e2da686bf464f1c67cfa63888c233908b27bf2d6ce84d8e99d4de23c134d456b397aec24fb235673173fae0e48e6ef0d3f156f9f02aebf2647c58e02f61e167
 EBUILD fakeredis-2.5.0.ebuild 2084 BLAKE2B 4591f6e8d91b0327225bfc6a2c792eab83298682c4f713786204e570bdca3b166d37616e7729e15f8bcbaf46b2a241ebcf25ce4f3146bdba451750941d6c461f SHA512 fab3b715ef33a7ca5fed697032c74237e52c23e1ca741e03109849a992d397f58705d36f476f0d8873fe47138781d84e29a62d180b9e8715044c72f1b432303c
+EBUILD fakeredis-2.6.0.ebuild 2084 BLAKE2B 4591f6e8d91b0327225bfc6a2c792eab83298682c4f713786204e570bdca3b166d37616e7729e15f8bcbaf46b2a241ebcf25ce4f3146bdba451750941d6c461f SHA512 fab3b715ef33a7ca5fed697032c74237e52c23e1ca741e03109849a992d397f58705d36f476f0d8873fe47138781d84e29a62d180b9e8715044c72f1b432303c
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.6.0.ebuild b/dev-python/fakeredis/fakeredis-2.6.0.ebuild
new file mode 100644
index 000000000000..4186af5980d2
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.6.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index d3d0a06e3f54..801288a1a2aa 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,7 +1,3 @@
-DIST httpx-0.23.1.gh.tar.gz 2161798 BLAKE2B ee01771377bbfebbc4a9346280c8d59508c78295e61b6f9d60a07099e44dfb0fc208d37b68f511bbbacb48438cf6daa73ef82d7a7ae75470409c8346ddad0ad5 SHA512 3fe280b6d3cb1a12bdd502e7bd432588375f9cebfcd9e071acb6e851866a56d84a715428599a297f5df43d73997b2a0c02ba1a12b3e32d292b2051161a350751
-DIST httpx-0.23.2.gh.tar.gz 2163739 BLAKE2B fe89a162749e8710f6392ce3a2eb887a4ee0053270ad4ce20cb74d6fb4e70a14c800755ea2b32166f11e3dcb74a3c7d50a3e3a0644fa489a89f9f65050b826a4 SHA512 49b0b8cd3ba3f4c18fcfaab5e9ac52bfacb80241aa2b8452542a274a4b203ef6b35d936ad7f9a0b1e0d9857b1394a4e388572676cd288c8fb20f78a6df3ada4c
 DIST httpx-0.23.3.gh.tar.gz 2163546 BLAKE2B 96903669ca9d22cbb85bd322a407aa2b6799b5f8bfce277a763248ac2d65d60b85c0c71f24af99098eaca585f8136d9db687d6d0ab8cf2347d3c6fe28222def0 SHA512 d4f051578de63e677492727c466d44858c31d1b85441621667d4aeaec5cd2ebd0257a1db115f1b4d77d563359dfc81c2cd1221c0cc66c891b461fa1f4e8a5aee
-EBUILD httpx-0.23.1-r1.ebuild 2175 BLAKE2B 7dacfec26c08fdfab04dcde815a4251baaef93d403776f45375fea58acaab326a34b9fb40a5d2abf96ea838029849a889d830e4be1cc35627fa6ebd717eda6bc SHA512 33b3327ac392fc5845ed7940ffe16d5b469e4d8f1055e3ec3e40545126107f5ff5ea7ea26e5482b0e46ec7ecdc98c43b6d21a51b3e19651de67c9f5ee1cbf81a
-EBUILD httpx-0.23.2.ebuild 2183 BLAKE2B e73fafb05859fd765aeb92285be448e2e4e5c29eddb0a226984e189ad955fe3fae508fc1d8e2d1a062fd3fb12f061c1753acd11c84ddb9694da162f8001ade3a SHA512 3e86084b9fc8428e229cc3ad5c4fa35521dd1b5b23e8fd557e8e8406be2628353d53e505a9e538cce5dfc534d77c6ea51433d1867a5ea73953d47fb257abeb12
-EBUILD httpx-0.23.3-r1.ebuild 2066 BLAKE2B 129ba6449288dfe129b23c80450221f65c2fd68c2750523f48ddb31d7ca63adcf90c311eeae2d16832bb7c2df7cf6685d677095ca2d5aca3c250baef23ebd9e2 SHA512 263815de224e55b53243a6f136bb7ce2f93f692e8bb5304d291f2328f14144b9db5096b42ff64abf4deae4c49b81bab0b411553e0c5824ccc55753357c2d4429
+EBUILD httpx-0.23.3-r1.ebuild 2058 BLAKE2B 7553fef751b1bd7fe605d591f382f749b39b4508215fe7290a4702d08c34f671cf974c4fc46c31d5b9c8d12451f070269b1f4b773b540b87750120c74e8cac8d SHA512 5d47b2cb4620a884182a9e9532ca857f6d2e4de7ac5a4c3361cccf684a10dd16964e63224f7284da7462c90d16c9b21afd0d08b67e56d96f4b7f7183aa8d454a
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.23.1-r1.ebuild b/dev-python/httpx/httpx-0.23.1-r1.ebuild
deleted file mode 100644
index f80deabaee79..000000000000
--- a/dev-python/httpx/httpx-0.23.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 optfeature # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="
-	https://www.python-httpx.org/
-	https://github.com/encode/httpx/
-	https://pypi.org/project/httpx/
-"
-SRC_URI="
-	https://github.com/encode/httpx/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/httpcore-0.17[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-0.15[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		<dev-python/rich-13[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use cli; then
-		sed -i -e '/^httpx =/d' pyproject.toml || die
-	fi
-	sed -i -e '/rfc3986/s:,<2::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-	local EPYTEST_IGNORE=(
-		# TODO: package multipart
-		tests/test_multipart.py
-	)
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "HTTP/2 support" dev-python/h2
-	optfeature "SOCKS proxy support" dev-python/socksio
-	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
-}
diff --git a/dev-python/httpx/httpx-0.23.2.ebuild b/dev-python/httpx/httpx-0.23.2.ebuild
deleted file mode 100644
index 1eac1b7fe8ff..000000000000
--- a/dev-python/httpx/httpx-0.23.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 optfeature # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="
-	https://www.python-httpx.org/
-	https://github.com/encode/httpx/
-	https://pypi.org/project/httpx/
-"
-SRC_URI="
-	https://github.com/encode/httpx/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/httpcore-0.17[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-0.15[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		<dev-python/rich-13[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use cli; then
-		sed -i -e '/^httpx =/d' pyproject.toml || die
-	fi
-	sed -i -e '/rfc3986/s:,<2::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-	local EPYTEST_IGNORE=(
-		# TODO: package multipart
-		tests/test_multipart.py
-	)
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "HTTP/2 support" dev-python/h2
-	optfeature "SOCKS proxy support" dev-python/socksio
-	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
-}
diff --git a/dev-python/httpx/httpx-0.23.3-r1.ebuild b/dev-python/httpx/httpx-0.23.3-r1.ebuild
index 75217132f934..9b24e4b5407e 100644
--- a/dev-python/httpx/httpx-0.23.3-r1.ebuild
+++ b/dev-python/httpx/httpx-0.23.3-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 9f8a77b52d57..042d9fc79c4a 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,9 +3,11 @@ DIST hypothesis-6.63.0.gh.tar.gz 9342417 BLAKE2B edd4795c9fc4e254fda89fff7554965
 DIST hypothesis-6.64.0.gh.tar.gz 9345246 BLAKE2B 2ee9a14e84bb72a8248c28096a31b4873f51c121b6446cbcd5d2831418f769ba464d2aead1a52f3da23e640f46e05e7af8927c65113fc7fb3ea59086324c2210 SHA512 4da49b4ab62e9c90770c098653d3b43bbf3fbf8b7aca27546ae2ce0be7923cbabe240a73d124e4e48fc9b8a3e06d31e336b18b875b743992e175acfe2cddd270
 DIST hypothesis-6.65.0.gh.tar.gz 9347619 BLAKE2B 5e67e4659d883209aefe3a459620a2d9774122cb15137851f291365846b179130a1209b18aabd4cb120dd5f522e2ac1b3928904e9b25b10109ae779926712220 SHA512 93ecf5bd72e6f8ff69acb8056f2bb26011cbc997c58bbf3055f17c4690d6fe21f22d6e2a86bc3e7172063c85278b7abc42904028ac73174d6f2855ff7175449f
 DIST hypothesis-6.65.1.gh.tar.gz 9347804 BLAKE2B 555b8eb742b35cffbc0985394b7b830fbff0c601c031b270ffb50c8e1e8437b99c4f827b92cfc74f5239aac43b34e70520b3674129c70338ad010b289552b14b SHA512 faa1330477a5932b47af5c0b70742a81455aba85f5ba19e355a1678a23e62612a8972e510f3bd0f133491fdd5c2f293a4ea2f75e181dedaa3304d789e3bc90cc
+DIST hypothesis-6.65.2.gh.tar.gz 9349189 BLAKE2B 4a36cde376a56c9eee7645c76606777e8c40144f0495a1a6f2d2d840262be26f52e077f932e90790214decfbc3fbb9b3f64add1830e451bb8e56b8c9c5ba5f34 SHA512 0955e95d9d97f44170dfc937c3ea6b43f6c4ac74dbb48e16a4998e735310f72448083382f6628b4bb9620ac0d21d6c749a5464c6a7caee24cdb7af8cd0c01dcb
 EBUILD hypothesis-6.62.1.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.63.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.64.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.65.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.65.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
+EBUILD hypothesis-6.65.2.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.65.2.ebuild b/dev-python/hypothesis/hypothesis-6.65.2.ebuild
new file mode 100644
index 000000000000..c793a8a143d2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.65.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 8734641eb7e3..3e3303fc9ab3 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-8.7.0.tar.gz 5329857 BLAKE2B 876ed4e16377f2a4d1c0aa83a7e2e0dfda64100de97ff349911d10b07acf351329b0bff75bcf6085f9fadf773fa6762ed88586e1132cabf6479790a38a0bc4e6 SHA512 4652d06d1a0cf33a2b55f640d6bcc3fd9f1f644c848e869bc3807da8f4166060798ea5629fa80cc98a4a79b8ea1cde6013507eae859354a5db270b7fb3cca6bf
 DIST ipython-8.8.0.tar.gz 5341086 BLAKE2B 6cab547c693494aed85c750ae566947c8035018213839c36ec906cf11c80e93269c4b861a5a4d72994bc4e5fc8f2787fd7674fdb836dad22c8c04c33d8f37de3 SHA512 18e8eaa285fe6278a27ffd2edcf4eccf629e05a8718faa721013d0433822ff8b850a2060135f26b5254a96b7ae0139e2ff4338676c08d3271a12c1b91532d7d1
+DIST ipython-8.9.0.tar.gz 5454595 BLAKE2B bb091bf9c2d9571ded5e1007d9fe60d34b9b0010747759ccceee3368822e3e190766439e3dd9b26df2dbb136ed2b81bc0d89d9b8857baae6e4d86a3524c07972 SHA512 2a9df79ff26bb34866dc523e75ba8e8d8de25d510fc273cbbf762b3011e53ff5331869f1d6fc8c44df6c9a8b5745a0545fe301a556b7f20e3a3dfca994316735
 EBUILD ipython-8.7.0.ebuild 4297 BLAKE2B 3e9de4b15720ee409c5dddc301acf5163799d1ce195fceca087f196412d2ba94b80ba7ad776bdbaaf2843cf56c8295c45c979e9d88045243cc4dbcf05f3b6eb1 SHA512 392ba36343857fb5022517b8fd71f820721fe6da42b5a4a086595a9bee419134d490113f6a5387bc861cb07098eeeff54be60b3ad1d06ca2f6851dbafece8a4e
 EBUILD ipython-8.8.0.ebuild 4305 BLAKE2B 343245d9af78f3d203f40e896a80bf7fa5859159483e44ad169f5418081cf00cae295d499631aad39f3bfb0e248bc5a110619612272acc472f8dff4d6975b68d SHA512 01e55532a5bcfbf63d11258c683af12746ac577b6b122ae7f85347440ebd8e02745c0782604d98f92af2ae65785cc32b1785c9089ffc710c9cdc23908cea1ba9
+EBUILD ipython-8.9.0.ebuild 4310 BLAKE2B 854d6548b6a63ffa85302141ec3aa6cf699253574854f1e27dc3e60b5f6d361cc05a20236927e4c0428c6b214fdc21d4fc504b7dd3b193aedda41666c052c680 SHA512 5761a8c5de0ec8076539753cfd7e06f1b65b9dca98b5d8393bd811d613fdc704af3b4137f4db17c67e84ecea6850a3b905be01fe4b584214d8d619d2640c4c58
 MISC metadata.xml 2886 BLAKE2B 88c80f5eef5c89c8939e60c1944be4c63a5a318e55a3490b38bf864e7919debf8e3c3a32f1fa0a43766ceec6462fb20fd4d943194fe2c08208f0839783c20916 SHA512 f4ed7c1898930ade11983fb0666dc25dce7907f017145e1ad903651dcd95ead2734893d55b4548c4ae23425388485a86bffc9d885eae17d12ae1ac2c0058aac2
diff --git a/dev-python/ipython/ipython-8.9.0.ebuild b/dev-python/ipython/ipython-8.9.0.ebuild
new file mode 100644
index 000000000000..432e2adecfdb
--- /dev/null
+++ b/dev-python/ipython/ipython-8.9.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="
+	https://ipython.org/
+	https://github.com/ipython/ipython/
+	https://pypi.org/project/ipython/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-3.0.30[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+	)
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "code formatting" dev-python/black
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index ee69e3fe119c..d0c68d13aa95 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.text-3.11.0.tar.gz 15883 BLAKE2B f0f3fe33901a68741cb26270384750f070476ef921bf2822f81dddfc1c66e41016757579e310bd20fc8a7f02b188de96f07bf58db41cca51252e46ebbbddcff9 SHA512 ad3ac412df5e21cef86dc56cdc869a93a660a103a676c1d187e5ea762690b89d61c8f68994e6a891e3d98071b440a052fad60a37f71066e4e11a2cfaf45ae009
+DIST jaraco.text-3.11.1.tar.gz 16083 BLAKE2B f7268128209fbdc849a745595339f4dc9a097f3f4f8f0cdcb05ca3106ed5a45460126fbb2b7d9c3b01b63aa3f750175e8cd366034183b7d8804a1650fe493e4b SHA512 b4066589e9d4c9a2a82ae2b0825d34b22b93ee179d29c3666e9b978390121520afcb8fc5ffa6457022d2e8477f4cf2b76485d9896438ee46275326577609f201
 EBUILD jaraco-text-3.11.0.ebuild 1860 BLAKE2B 87ad59442da69a059c8acd9cb1438276e184d3e3d9864e6b1d5bc70cb6e6d35f804a0f40fca70ca6a16ff862a130813622f41543ae70cf48272745a069bd042e SHA512 962b38a5b0c619d55a70e3e5d1c5673096ab1cef597b50997f793fec7fb1718b72c7ee5908ba2ada46d384b599ddf2fde8e9e6dd76758f6ef3c3fe9406db5522
+EBUILD jaraco-text-3.11.1.ebuild 1868 BLAKE2B 4b72186540529177fe7c1019696cc12964291cca1497e821f22ca6d30b05b15e12f26f2397c7f51d7c9024b08e45631127683adfda2fc39acca77b16bf651898 SHA512 dbe570588a7bd68e46b59876ddc357b58814f9b5cc7bf354a963527767da2e424ea40d1db43339edcf9b3497a977720be92f5f23dfc314ad2cb022f3a82e4c58
 MISC metadata.xml 550 BLAKE2B 147f1a6d5bb65e6ca4a29de497742b1cc69da4f46111512c05518c54c8fc351c12aeb452cc12c0a70974094ddead7014f58a5a2fb546173334ce282e218b8c9f SHA512 fd3bf89a43ca3ebf4be15c1cff79ebc70085b0fa0192fc9a44e6e1e799044ab9935545d4722d3bc6a3989d2a3199432a47f64876ea5b822e8e46fc3c41acd005
diff --git a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
new file mode 100644
index 000000000000..befb604a10f1
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.text/
+	https://pypi.org/project/jaraco.text/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-3.5.0-r1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+# needed only for CLI tool, make it PDEPEND to reduce pain in setuptools
+# bootstrap
+PDEPEND="
+	dev-python/autocommand[${PYTHON_USEDEP}]
+	dev-python/inflect[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/pathlib2[${PYTHON_USEDEP}]
+		' 3.8 3.9)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "jaraco.text"
+		version = "${PV}"
+		description = "Module for text manipulation"
+	EOF
+}
+
+python_install() {
+	distutils-r1_python_install
+	# rename to workaround a bug in pkg_resources
+	# https://bugs.gentoo.org/834522
+	mv "${D}$(python_get_sitedir)"/jaraco{_,.}text-${PV}.dist-info || die
+}
diff --git a/dev-python/jupyter_kernel_test/Manifest b/dev-python/jupyter_kernel_test/Manifest
index 63e268fd963d..90e364d02598 100644
--- a/dev-python/jupyter_kernel_test/Manifest
+++ b/dev-python/jupyter_kernel_test/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_kernel_test-0.4.5.tar.gz 14326 BLAKE2B ff33a2357969345ae7b62b7621c2a0552adf55d5d7cff341ccafd6224fded6db2a9f77a123a820a51b1a87d29e8a1e175e4a6a3dcdb9f77646edcb4aba4c1b3c SHA512 c12df619f6cd49507a3ac099e305ae8b3594796f2ae52cb2dad6a45d097d58d32c00ebf152c909d997be6447319162d54104af238e143f48560acb339bdf58ce
+DIST jupyter_kernel_test-0.5.0.tar.gz 15022 BLAKE2B ec02d8a4a1271b2aa6a9c04820c54abe312f7dddef62d5284b858ad5d63ff8b6af12714cc93a252b2594dec713f78d70d0433bac26e34055c4bf41c33f708c17 SHA512 9b440e170a70fb1f505a6cbda1642c68e9d4462dac7fbf7f103c6ef6fcd4adc5152b2cdf7538a78a6fbc02c504108d766ae8edab6d7dce421ae92648d2142b94
 EBUILD jupyter_kernel_test-0.4.5.ebuild 603 BLAKE2B 3d90ab410bcb4b0b192d64951a0c7453fca2975b02d1412bbdb3657af5214000056e4f00a643bbc9b1acccca57eecb90ebfbd5cd698a3dcde7eb6b30ad3f8b94 SHA512 3e49702d46e365af5163846544e36a2df97cda7d3715a6681415fa041c788a5741eae29e33582f5854ca41a71a92d21b36abdb9e3219e47c8b9dabd2cef063a1
+EBUILD jupyter_kernel_test-0.5.0.ebuild 655 BLAKE2B 902baf92026f20b7a2f16cb73ad1335124ac0bf62bde52b090c12823e8ace741534fad244fef5e010bdcecd0dff87ba81bd4797a653c7f438a4e6251458d9471 SHA512 7035b69c36086cf27e812200a98435640035f1760bb6d92b6d04a3cce25d6aefba26027042990ec8ee5762b5f517fc2fe2cbdf0e7d58817b418e256eb3684043
 MISC metadata.xml 440 BLAKE2B a4b9e3325411a76f939b73cbff422b92265de8388ad53441421d93c26a8b7341694e4540f43a91aeec6e13af8a746f6f78b3b76cf7e6b4d253958f1573443e16 SHA512 71036118a1fb347f7d8733ed631a223655e58aa8fd0c0e527b4802b10eac8ce32fa1e30f1736803bd4b2a69fd0973546c4bc56a551c9b4b29e379db72bb7bb07
diff --git a/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild b/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild
new file mode 100644
index 000000000000..a72d4577b96d
--- /dev/null
+++ b/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter kernel for octave"
+HOMEPAGE="
+	https://github.com/jupyter/jupyter_kernel_test/
+	https://pypi.org/project/jupyter-kernel-test/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_client-6.1.13[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
index c587067e28bd..e3065982b0f8 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1,6 +1,6 @@
 AUX pefile-2022.5.30-remove-future.patch 2980 BLAKE2B 7cd8d7e744d488cc8720ba6da84ccee4f481b58e4e0cd7f5810b873ee74a0b57fc2e578a4444dfdfc1948b16c75af94e1ccbf57baa4efbe1c244326bfc8d12bf SHA512 cc04fff8f25b008c2b966b6072548b90948881c59eeecb20fb6b285e72e56f42768f1853ef839a6a697c43d33d867e42c835ec1a007b6c3b2846dc973d9d109b
 DIST pefile-2022.5.30.tar.gz 72899 BLAKE2B 11752fe849c91749c5272ee9157513db0690fa47a51e274d24093f47c21096e877b364e1dba9cf08d9369abb7e9133743fe98d524079559b9aa9159ece76af74 SHA512 b584472387f7f0161449d2dc0035867da8983eb2c89b488952f38a3e836d23241d46f49a1c9cde13dde4253ef3f212971df48747ea2fec6b91c4db2b7618956d
-EBUILD pefile-2022.5.30-r1.ebuild 846 BLAKE2B 38926cca0047dc58d1717fdfde78747df6cc74832aab6f523875d751298935411b7d2fe61438ba79eedb8fa1c24a9a150b0b4d59d99684df0ea0cc70f3a1823f SHA512 ba765c7fcf26728cd05fcf7f641cdb4d3698ea147e50e066f073979e06f025fe0191440a1f6a0195df875e6642e58906b4adc3448409bca29f013c1fbe3d6972
+EBUILD pefile-2022.5.30-r1.ebuild 853 BLAKE2B 1ee758f3f5f0fc339d35388c60defc9e11d58290de93f8ad5f821dcda40f9a4e24be755704695ed2c25acb14ab456417bbad7ddb6ba1f314464364675b542e16 SHA512 e9c58dbc32f1499307a95b8b58e410a0c95552a42dc070ae65ed8759b1044dadf07989d3db432840207e862c2b4c3af20240e72e6e4751b110e1173bad8cbe01
 EBUILD pefile-2022.5.30.ebuild 854 BLAKE2B 8a66bdf36578b41468e2ced0bead66cab7e6e08c68dbd87670e0e8bf336416e3ca5eebb2bfd16df5743ac3134d45a0fc565583e8199301a014d244b957480003 SHA512 69f16b7e0d11dd78187efa7c690a102d27c4de8deca34540467f43e03dee3fadf051081305242bf8f3f1eec5b7798dd1dd6dea19b14aff5fcdd0968f1638f148
 EBUILD pefile-9999.ebuild 793 BLAKE2B 163a3981b0b726cea195651054130305983a440910386df5025af73f580bcd52fb9d88ceb1e873fa04c17dff5ae121c8ba544278e482f6fff6dc4304e07da10b SHA512 a799a8c0c685e03b11658ea09104fb82c705bc35da0d6e5b0f3cf9b34e595f0e55349a1fa9727d12eb5ae966ff278cdfbf0288c32c0ad94ec4699ba272356cb2
 MISC metadata.xml 766 BLAKE2B 8cd0206bb0cc7de9a76159851092c27b5e7c6d8294a136de2dd74e51da9062f6daa67c2421c173b6125758a9f350b84b03e2a85fa2029beb50032aa034f08c3a SHA512 7c3e9d6d89108b17a722c805353a9c457ccb5a5233bfca7145f82a37ab0337405c84a1e806d9fba77dbee779dd06cb18f7272399277d377aa84dcafc470156bf
diff --git a/dev-python/pefile/pefile-2022.5.30-r1.ebuild b/dev-python/pefile/pefile-2022.5.30-r1.ebuild
index 0fc43eb862c7..e8ad4af63362 100644
--- a/dev-python/pefile/pefile-2022.5.30-r1.ebuild
+++ b/dev-python/pefile/pefile-2022.5.30-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/pyannotate/Manifest b/dev-python/pyannotate/Manifest
index 3eb59e1175b1..578ab56cf307 100644
--- a/dev-python/pyannotate/Manifest
+++ b/dev-python/pyannotate/Manifest
@@ -1,3 +1,3 @@
 DIST pyannotate-1.2.0.gh.tar.gz 46148 BLAKE2B c52c93c0d27cb23b0b0683bbd5f353ba9a45714b8a50fb3a6f5aa4e67bfe71e60bc7afbee85a021ed25a7f5a1df720dc863fc6dd92d20dee0d97af72786866cf SHA512 cd755f3061f5c4320346f0198b71e4b312378a3810c5999f1d318b7427e7c55bd1bdfc4af84880bd45faf69eabccbd2684d1c18c1f9ad0661d35a377984ca063
-EBUILD pyannotate-1.2.0.ebuild 520 BLAKE2B e03d3cd01a5b76315861ecb1ccf685a8194304f9bba810bf3a6979e392fcb7c26f8fb12557389ada7cb2902a1b4560deb337d2f6a3a955d3f4b09d6cb434614e SHA512 44fba6ac1532423270e7228b9e3025a1b3529515ddc5004307d6fb5f462ac43f3be27514f21fc6dbc2bb002147d49580e089babdb1c758d6f098fc5dcd1f555a
+EBUILD pyannotate-1.2.0-r1.ebuild 574 BLAKE2B 4fc16bfb1489eb5fd2f84d129ab9a60400cace8ea7d7e7cf26c1ef1aa9a2dbd2edfd9a6dce50915b7bd68f4808bef6fbdd18bd5f4b62ded4853a39bda71b1f54 SHA512 b3a0a8ccae9672ed64faaebed1f1970d8355b76272e60d25786261489cf2f80fb9526c909a331a27490684957dd8ec5e2b32c4be45b74603e61e2829dbd3c664
 MISC metadata.xml 604 BLAKE2B 72f9fad12803b851cf8dd2599471860208a0dc24bafe7f67d2b2a69be49bcd1eff6ae2c38e9b83ad2884fd6b3a44feadf72351076e7af7bfefb5523309946c25 SHA512 1a8329f48b59c4e7b1cefaeacf7c8b590f2e5a910d9513507d9d712aad955f59127bdcf44df95a6c0ac3927fcddd62eadf2b3969b9316539c129bd8204dac30a
diff --git a/dev-python/pyannotate/pyannotate-1.2.0-r1.ebuild b/dev-python/pyannotate/pyannotate-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..83f6d72f0016
--- /dev/null
+++ b/dev-python/pyannotate/pyannotate-1.2.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Auto-generate PEP-484 annotations"
+HOMEPAGE="https://github.com/dropbox/pyannotate"
+SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/mypy_extensions-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyannotate/pyannotate-1.2.0.ebuild b/dev-python/pyannotate/pyannotate-1.2.0.ebuild
deleted file mode 100644
index facb5bc2a4dc..000000000000
--- a/dev-python/pyannotate/pyannotate-1.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Auto-generate PEP-484 annotations"
-HOMEPAGE="https://github.com/dropbox/pyannotate"
-SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/mypy_extensions[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 60b22c9afb16..0e5899e3093f 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,11 +1,5 @@
-DIST rich-12.6.0.gh.tar.gz 15056457 BLAKE2B 58367ef0acb61d68931ea0394ea458e29b3bb59726c6b95d4b179553183c5cef2766484e0d040203181aad927add70198fb3483bfe6113e20851db141de3a867 SHA512 e05a0ad1d6b4f1e4f7e5e3d09c70d5892a618707ae0952e34274c5ffb18a833fe85a4ac15024cc34915515b63059c02f0df32a6c97cbe91e9ac96928c7134fb0
-DIST rich-13.0.0.gh.tar.gz 15065008 BLAKE2B b2b323b633e6600dd1595c1769daf3659b2d7cf6f98fe91ca9e083c24bc3de9de79b27de08144ab7acaa3634cc588f1548d73536555a06f1b4832f91c978ab9a SHA512 6837aad1015318c0a017000ba60cea0b4b06e85b7fb9650e90ed87ca8dedd3bf3369c5520571661123aee099380445eefa6b30002f0290c2160540a49433bb91
-DIST rich-13.0.1.gh.tar.gz 15065056 BLAKE2B 71d6418b483a88834f7fbce9d9ac8deffbf8940b32ac751503b68994ac1717c8cbede57a37fa33ba025ee6f03196a65797f934252c1658e7ca651cef759d731e SHA512 12458ceae7cc1a8796339547405df23598adbf8ac71dec42b65e0685c8725b0f183b4934c9a91690be3f54af463a91645cb595934749c0ee4ac7d1a4062cfb46
-DIST rich-13.1.0.gh.tar.gz 15065402 BLAKE2B 3d23cbf20536e0d1ed9cfa6257875e49d319364f4c9696643f6fbe6da01dd30b1de639b75631fbe6ab1204e177017031bea23f3e0e07b808070068e39397664f SHA512 6a8f264e16f691f38e4094359bad46cc62d40e5118887311d91732a194100aae27da8f2b29ba21b3cf1ec46c42d3b7d4446f125421e5494725bc5095bcc36104
 DIST rich-13.2.0.gh.tar.gz 15066145 BLAKE2B 1a767de5d3b872e07e74374d956b4a3d1b6916a98846f98208f8a2e14a1c12f18fe7d85919f0b2104228fd74d25e640d446fae416a70254f7241fa726fb82802 SHA512 a3df2d3bdb35d25cad867cafad726a081d7fcba45e0b4ea2ec9aa17c28fc4d2c22f4ba1c7e3ef16fea7137c052875632b8d774895082d40804dc929021c0a2ef
-EBUILD rich-12.6.0.ebuild 1571 BLAKE2B eb5604a4ab05fc418f620a993696e32e73078cfa120369b32be27d5fc8b1cd39c2273e445166659e7aa3cc34b10176f7e071b147549c876bf9846030130e6c82 SHA512 f91b70f5d2a47a27e33f5ab51452039f67b538651797fbc9b47b99a8aaba8973fd8562695474da953ef077eed381207c36f879d9c54deed793266ae79130a86a
-EBUILD rich-13.0.0.ebuild 1194 BLAKE2B c71d07c817837bb087a36fde65354b27f98d5be028d30270248dfe94b8551832c603816d4b180cf4be6ecf73f424294cc80c5c3e7428fb652532f4ce7d1f3ce0 SHA512 bcb37ef391685e7870bfeb80172008005e770e0aec3a79c52a5557dc22c507cb30ca229bdfa53223ed655958d196e61aaf5d6a7e420e5c4e47b95b1049cc4319
-EBUILD rich-13.0.1.ebuild 1340 BLAKE2B ec2227be0abf99942fc9ed2e049f75534ebf9c0f2d8b14d843e4cfccb0b5ce1cd1f6519c097da47beeaabe9201c10077c4833a81cc6a3492d7727b1231755209 SHA512 edfb7399239593a5fc9783e9d3cfcdd2ea2940df74754eacaf819ef45e65e51df00fca1c071b975e26f8512c96e9cc1564e50ad5959f00ef1bf77e98d0203692
-EBUILD rich-13.1.0.ebuild 1340 BLAKE2B ec2227be0abf99942fc9ed2e049f75534ebf9c0f2d8b14d843e4cfccb0b5ce1cd1f6519c097da47beeaabe9201c10077c4833a81cc6a3492d7727b1231755209 SHA512 edfb7399239593a5fc9783e9d3cfcdd2ea2940df74754eacaf819ef45e65e51df00fca1c071b975e26f8512c96e9cc1564e50ad5959f00ef1bf77e98d0203692
-EBUILD rich-13.2.0.ebuild 1394 BLAKE2B 320e9145154b0d785a1cae43ce9d975f98304d354be93ca5e93610b2b1481f09abe7f46918b2d2f43871f31869b4e5e98df0a9f08f665f16ad6a6506f7efc53b SHA512 2f827f839480c8201bef5b0600b07a117ddca97bac340328749acbd5ae1019563e65de7e7a56464d8f7192149dd56b3eb71d9f0e563ba0e6727d9d615d0dbe8f
+DIST rich-13.3.0.gh.tar.gz 15055287 BLAKE2B bf314606d2da55d1c20d01083c21edc6f10590431152d360f1a5731fc543d47360faabd5141d3bf9b46793145a08bd79c971974ae85956df8821a33afa45bc50 SHA512 1ad28c6ea505ad4088ccab8a034b5ffa49f9ad59e7b60fe27dbcb8fec485f9f695d25dde83b102021c24ff149fdd9e981a1009bb82eb545250824436bd818d62
+EBUILD rich-13.2.0.ebuild 1386 BLAKE2B 9304363e641c4490e8fe893ec8b3fbe9167eee0411e04922310d3743a8283587b5fac99b687898e31431873ba4bb108f3d24b7c71b8c44db02bc436755036c9c SHA512 e80dc615cc64f0528cbee4882b262a59ac3c7e584928f14b4914d7afb09be98f54ef56b7e68f1db24f7136b3c92be8c1fa9c668d6d2d30784e42f070e42bb1a5
+EBUILD rich-13.3.0.ebuild 1403 BLAKE2B ac19050432c53732f51c53a1e4faf6d0bbc7f2921fcecd11129b5159bcda9c11c7f25d3556da60d999da492c5bf49c3cda29645ebbf4fbc700ee3ab0daaa5578 SHA512 69ef77591541942924deb066e636f2072b5ec3018ac59a2be898d50892be5b5e6660eb827f93dd9ad84910da94f1d72cc5f21c0f3580ec052f492ffa80efea30
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-12.6.0.ebuild b/dev-python/rich/rich-12.6.0.ebuild
deleted file mode 100644
index 607cd21f6e25..000000000000
--- a/dev-python/rich/rich-12.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# broken with >=dev-python/pygments-2.12.0
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# the usual deal: output changes that cause test mismatches
-		tests/test_inspect.py::test_inspect_text
-		tests/test_inspect.py::test_inspect_builtin_function
-		tests/test_inspect.py::test_inspect_integer_with_methods
-		tests/test_log.py::test_log
-		tests/test_pretty.py::test_attrs_broken
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.0.0.ebuild b/dev-python/rich/rich-13.0.0.ebuild
deleted file mode 100644
index 4283770bbcd5..000000000000
--- a/dev-python/rich/rich-13.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.0.1.ebuild b/dev-python/rich/rich-13.0.1.ebuild
deleted file mode 100644
index 294866c9fd24..000000000000
--- a/dev-python/rich/rich-13.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.1.0.ebuild b/dev-python/rich/rich-13.1.0.ebuild
deleted file mode 100644
index 294866c9fd24..000000000000
--- a/dev-python/rich/rich-13.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.2.0.ebuild b/dev-python/rich/rich-13.2.0.ebuild
index bd8237dcdcdd..5a00191deda0 100644
--- a/dev-python/rich/rich-13.2.0.ebuild
+++ b/dev-python/rich/rich-13.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/rich-13.3.0.ebuild b/dev-python/rich/rich-13.3.0.ebuild
new file mode 100644
index 000000000000..55b97b52578e
--- /dev/null
+++ b/dev-python/rich/rich-13.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+	https://github.com/Textualize/rich/
+	https://pypi.org/project/rich/
+"
+SRC_URI="
+	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
+	>=dev-python/markdown-it-py-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
+		# pygments?
+		tests/test_syntax.py::test_python_render_simple_indent_guides
+		tests/test_syntax.py::test_python_render_line_range_indent_guides
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 865f67d123f3..571c3d2dd2b1 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,3 +1,5 @@
 DIST rst.linker-2.3.1.tar.gz 10436 BLAKE2B 0de71c1994b65c20f2ef13e1e8f9f04d431d9bd7215ca9dca2c51d78deaa55803f69432d27dd14b3b5f9d224b75f72a56ac4bba72ec3fad660af31b248a265ba SHA512 0c9f236e372ffe69c2b37983c491c5b6fdb41f1c2a4ac16d3d815bfe5e8b93b58f001d449a57e663041d69d0e13e13d17178c477a1ea37f05ba7e919fcee698c
+DIST rst.linker-2.4.0.tar.gz 11340 BLAKE2B a1ae9c811b7d6fa2821bfbf5787dce75fd3d7e5d933ec15fbac9cd3bde08cfad59fdc81b3b58dc39d1209a27ca9dd8d2ecd68034b434b3f6d15469bfb98efa3d SHA512 31e3427ecf35b433cc9650138ee36090e99003b72c69b60b530835eb624d7eb13aae4cf81cc0044b36750798a4b8aa676e53e3b9eb335430076593640a243940
 EBUILD rst-linker-2.3.1.ebuild 801 BLAKE2B fd913e093686cf15600053b284d2850fafa8953419c7148abeccf3bff7866c62027c0efc19bb227458ef1ce0905b0bf1b6e6434d8890758a6f151f5ac737ffbb SHA512 7675d6cd2d74e7d33fbd59dc9157b185d0ec7869d0ba50a22fa77351b9dedf63eafcc492c67bb784fdca5eb50abbd35c3939b96d4beff0337e22f6e29821fb76
+EBUILD rst-linker-2.4.0.ebuild 809 BLAKE2B 14c29f8deb7f890210245c99484351b4d2d52b4b12f249f80e72b1d8452d03ac540ffaea3948b05aa3627413137a6f0381ab7b37cc625b1cd1a9e5a7d0b5ee6e SHA512 bbaf5a33d4634d3014b28bda0afc81af1007dc9dbc6c6809d1205e11079194a0a026c258824fabc663b612c87adc4c85d633c0d9fda0df5c61e52760afc93d36
 MISC metadata.xml 566 BLAKE2B 25dde9994c8bd1a39a9ca0f9a35d344730f43711d1b1219b834d3eee4232e5a1b2843aeac4f16cc780c96ec7537b750380d8adf4e06d6aa14eb4a2334c53db59 SHA512 31e07b2b90a0288af173214898a2f7589aa58c14a7641f05e18c4bd4a8623a3951d297337e9708a3c732649d23c74a22b1a1cd4cc7a18dbb28d0ead1a5eca87e
diff --git a/dev-python/rst-linker/rst-linker-2.4.0.ebuild b/dev-python/rst-linker/rst-linker-2.4.0.ebuild
new file mode 100644
index 000000000000..af00fd4c42e9
--- /dev/null
+++ b/dev-python/rst-linker/rst-linker-2.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
+HOMEPAGE="
+	https://github.com/jaraco/rst.linker/
+	https://pypi.org/project/rst.linker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/path[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 7351d27af54e..b2c1d6043499 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,4 @@
-DIST snakeoil-0.10.4.tar.gz 181814 BLAKE2B 953432469bc588623f154103ba8e698073a39222e5a6d6496759067ee269e587bec86ae96ba7665e75c83936f2f78e9bec1fa51c4e9f98a3ff1b1e72d75f1fcb SHA512 815707f13fbf0ae17b5e2188a9357df66d2564e5f8c5dc0ed7e8d07e2eea21cd15d79b8fc44b4072ef4524446d27d6742f6f95a650c327103e656c4b6b78e72f
 DIST snakeoil-0.10.5.tar.gz 183358 BLAKE2B 6154eb0b5ce55aefc67484dc33c8a6e36ee903bce4293045252a8c9a3b4ecfc27690c720bb46842c1bca8c14ef59fbae4d3c1f02ebd46a7c91c1c9fbd1aa1532 SHA512 fafc04aa65423ebb3db66daa9c239bdf0968722b8ac14c1206dd3f26e3960d832fd15001e320463f98ca142ec7e1d6bff73ebc0ab10c3c5d3cde241b8160fdc3
-EBUILD snakeoil-0.10.4.ebuild 800 BLAKE2B 5cbcd7c1815d2e520dc36cbc11db030ffe315915c07a23c933102f76c76d7ad76af34323f93327084f8b1f0ec4b1672df0cbb05da71df30da718f7c9ff84c837 SHA512 49ebb849b9b878237e47eacf8bc591d455f6997079a3e7acc32f8c2e16c8ec10097bc815b2200c127391a672b039a2982936166512cfcbbdc6c60fe4c74c6126
-EBUILD snakeoil-0.10.5.ebuild 808 BLAKE2B acc97fe422d3270ce8a69fcbadbdf9ff8827587858135ca8820f1c36e2aa7dc184587ca4af2b2b9dbc8f12121b9c8c5191245ee76f5bd0f97d6955a1e967e61d SHA512 9ffbebc1fdf74c90799d9b0b7e638ca25b896bf07fa0489b95adab5f45711df8f80d9242d45cba530ad81ebf7221a0e4db10e1ef6ee43ef67857ca8f59f9b88e
+EBUILD snakeoil-0.10.5.ebuild 800 BLAKE2B 5cbcd7c1815d2e520dc36cbc11db030ffe315915c07a23c933102f76c76d7ad76af34323f93327084f8b1f0ec4b1672df0cbb05da71df30da718f7c9ff84c837 SHA512 49ebb849b9b878237e47eacf8bc591d455f6997079a3e7acc32f8c2e16c8ec10097bc815b2200c127391a672b039a2982936166512cfcbbdc6c60fe4c74c6126
 EBUILD snakeoil-9999.ebuild 808 BLAKE2B df7d8f73632d9da3320f2339a10fbe7f13c34264c3a14ac2bd53eaf2e92bfb1774738c79ffcaba2ec22030542a7476a0d6afdaded4b0410f5f7692c026be2a65 SHA512 185dbef5c07c609f0f666e89bf5886917551f1ba860ab253277573aa539664cabbd333402e44a83bd03135893586aa2e464111dabba75ac1dfe85e28e5d3e4cc
 MISC metadata.xml 394 BLAKE2B 1f11a6a69a1ed5736bdddaf949b97760d2986eaf848bbceafa706dae01dd8e84f2977d130179324856e35353702e8f84e2cf7b2e30587b5f21a7113237825c3e SHA512 71abd7d9037eb4412a992bcf6933999f0dfec0c39465fe5bcb63e6a8437ff901764c03ad65e363f4ce5d8789f364b7f732542c7f298f1d04a2a68343acbc2129
diff --git a/dev-python/snakeoil/snakeoil-0.10.4.ebuild b/dev-python/snakeoil/snakeoil-0.10.4.ebuild
deleted file mode 100644
index 9927318bb579..000000000000
--- a/dev-python/snakeoil/snakeoil-0.10.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-0.10.5.ebuild b/dev-python/snakeoil/snakeoil-0.10.5.ebuild
index 9a344ead0fff..9927318bb579 100644
--- a/dev-python/snakeoil/snakeoil-0.10.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.10.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index cc0219682df5..4d5604d8248d 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,5 @@
 DIST zipp-3.11.0.tar.gz 16799 BLAKE2B 96cbb86e4c112a2cc0bbd8cf8f7a6d0e7b5a5b4af0857bfea87583341e7d08c9f0879f8455131f81e21ffb75bb362fb312c5575a8ccb2e2996313fe3f95ffe36 SHA512 10e1eca131063d9e34db18320152ea5e2445585802e7814fcb0a0aeddd8eb5481c60c2eaca1f7f2729826aafd4004fc4a0b8ee26896c833f789752a501f77e86
+DIST zipp-3.12.0.tar.gz 17705 BLAKE2B 7159d45deb7e22625a270c7f6a5610f64c511ebde11b42769730245befc679750390928c89cfe2ef979df081b07f87e35eea9d82d7063513ac420afc8e60cf79 SHA512 922d293dbfdc1871d339a6ebc0176cb5147518f281daf685318d08f6bb4057eb4c49380e49a220c6fa17d749eb8a32b9fa90070acb953f17595d1e509bc6cdf4
 EBUILD zipp-3.11.0.ebuild 1579 BLAKE2B b311be46ee40b899db7afecee2667e4f340a1c6ca18dcf53a5858d59fb4439318ef10a264f8c6efcb686c01da719224ef7765f76072366356986b9451e75cb9e SHA512 da98d810c8e52d48f40c46d9f03692d5f35a8201d641702db6f0345ceeb957927bc4cbd1810a7e1c3313ef5abfe4310b88fcdd68efa416f9ebcbdee93036b990
+EBUILD zipp-3.12.0.ebuild 1587 BLAKE2B 3da2bb496f27e559a3362526ced24737942e185efa685755d1a5409d65b56b2c46932c59535e9cb80a30998bbe6123dced260287ef23a0160bdfd82acdaf9210 SHA512 af6988be2d73be904668f8e67587efc31f7600314e2a4f9da8ed176c395a31c1ebb949d0f69d32ca9e7a80365b3eeab4365cb198fbb0fffda96a858b43d1f77a
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.12.0.ebuild b/dev-python/zipp/zipp-3.12.0.ebuild
new file mode 100644
index 000000000000..ea6301a426b0
--- /dev/null
+++ b/dev-python/zipp/zipp-3.12.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="
+	https://github.com/jaraco/zipp/
+	https://pypi.org/project/zipp/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# speed tests are flaky by design
+	tests/test_zipp.py::TestPath::test_implied_dirs_performance
+)
+
+src_prepare() {
+	# dep of disabled test
+	sed -i -e '/func_timeout/d' tests/test_zipp.py || die
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "zipp"
+		version = "${PV}"
+		description = "Backport of pathlib-compatible object wrapper for zip files"
+	EOF
+}
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index f97230b83f6e..5f841a3d66c5 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/spacearyarya-kxl/Manifest b/games-action/spacearyarya-kxl/Manifest
index 2ea01a352acd..bdf30e143490 100644
--- a/games-action/spacearyarya-kxl/Manifest
+++ b/games-action/spacearyarya-kxl/Manifest
@@ -1,6 +1,4 @@
-AUX spacearyarya-kxl-1.0.2-cflags.patch 221 BLAKE2B 3b92bcc7ce4a11d53da26ec3b8031b7e2b01d29957866cd4eb2d1cb29ba69382ea3b061faa365ce3865363e30a8e9cc5e3adfd0ec876a75811f476847088394f SHA512 e7e62ae45a406dde281efcc98020b2994a87c26b4227d6bce768072702565aab1799a96659af80e3bd088cf05dd4137f470ba19a3d2f2b402e7b6ceb8ff05b4f
-AUX spacearyarya-kxl-1.0.2-clang.patch 435 BLAKE2B 8e28a600f8a19aebfc9a7e8349ff985c35dccdf0edb3d75bd51c296dc1c9ef520b0083e960a6db8be5c663749b8583997b526af2f4239c9d7dd9d256270f4a5a SHA512 461213b469ad6d68980143821e8d4dedc3e13bfb8e28bc645430f65fbe6d849d16b30ad8dcdca63145f462c8f52befc987c712f6c8a989ce0c4096ce1fe8a1e8
-DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 BLAKE2B 1e7d24107d21396d4463924c7e5665271c14c6ba84f600f126128195ac9d6a08bd112cb6730b1931cf113700d7cae18367359639c8c8a10073a2395bcdc87948 SHA512 1109606741bab6c290395cdfd8d19cf12e68cfef41f50164586c316fc425a32232e0f8dd822207d969c27c3f7a8478d1a65f36fe5468f3cfa8932c99ab3cb125
+DIST space-aryarya-1.0.3.tar.bz2 267139 BLAKE2B 9893d9ca6b02533231bc6d391726048089be901ad879be58cdc90c910d9c9b973592b2e37af27b1498b1931bb9947eb601e7bf409b20158f7e6c76bc7f3e433f SHA512 327f1821e1457424d8fce15b33940328b191f1e2f849284e1709bcafa6a33279d4cf7639fba235dd3c7107d5b1c4dcae0425b34c013b87c2c7dc3c00bb9d2bac
 DIST spacearyarya-kxl.png 4853 BLAKE2B e8dcaf2e75f18900d67c68f75939ba030dc8207d4a2df1b465ce516527d846c4b44d105f85afcb0750dbfc6b33c9030da34c863b6e8f09f120d855d7361cce67 SHA512 f47c497f28c4cb22a518c8bc593a443aa0f52a600db04b6a3d33006b40aa57c11bdedd97a272587d6751bee04a593965c4f348ad5e7dff4deb276b7d89243e2e
-EBUILD spacearyarya-kxl-1.0.2-r3.ebuild 1158 BLAKE2B d7e0ae42d347199749b4e433134dd093a5f30365e2484dd0a0a6c2ff360f3c81cc629289d16cdcdc8e865fd721e59f236655c68f16a3b5334a5544abfdd1dae2 SHA512 9ae7e2d439d26ae11dac867667b2918b1b7940ac10505f0227a12f311d299333af8420bfb17d596aaad8f65e0636b507366671bbe208e59c1c5a2d8932ba188f
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+EBUILD spacearyarya-kxl-1.0.3.ebuild 1136 BLAKE2B 6155820f327f6be0b17addecfb0315e7b40ff9506b16c262c95be23b69593df0617e495bf62dd852d66cfc2692a81fedcd8d072636ffb60890368b80b7e35c6d SHA512 e95f64d8851f5452d976b715b6549bdf00d909d9f3f27ea0d6646a8450f3d6577ca2496afa4d8be67abec826094783fbf1b79dcccbb0e13b8281b415da7846c9
+MISC metadata.xml 354 BLAKE2B cb7ed1870d242a2dd7f1581f519ffa4d0a4deb6d6646cbb1c20d6d1922f0b8f58df58b55a7165ba22786876e0ba414f993ddb20ffa450b3dd80758ff542c63b7 SHA512 132575d4c41ae8df77762037cf8a51314f2b9dfd063ae6786cd8fd650f839cb59d8f4fb17e07939cb0d75ee1c5fe1557057d53ef503e72b22ad7eac07da5b069
diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch
deleted file mode 100644
index 66cd0b7fe1bc..000000000000
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-cflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://bugs.gentoo.org/429422
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,4 +6,4 @@
- 		boss.c boss.h
- 
--CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
-+AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
- LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL
diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
deleted file mode 100644
index 7115b4a2382f..000000000000
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Use void so that clang does not complain about missing (unused)
-return value, and also add missing string.h.
---- a/src/ranking.c
-+++ b/src/ranking.c
-@@ -1,2 +1,3 @@
- #include <pwd.h>
-+#include <string.h>
- #include "geki4.h"
-@@ -7,3 +8,3 @@
-  **********************/
--int ScoreRanking(void)
-+void ScoreRanking(void)
- {
---- a/src/ranking.h
-+++ b/src/ranking.h
-@@ -3,2 +3,3 @@
- 
-+void ScoreRanking(void);
- void RankingScore(void);
diff --git a/games-action/spacearyarya-kxl/metadata.xml b/games-action/spacearyarya-kxl/metadata.xml
index 1c3ba213c494..361e5395db04 100644
--- a/games-action/spacearyarya-kxl/metadata.xml
+++ b/games-action/spacearyarya-kxl/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="gitlab">oss-abandonware/games-action/space-aryarya</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild
deleted file mode 100644
index 935cf953f9f6..000000000000
--- a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop
-
-MY_P="SpaceAryarya-KXL-${PV}"
-
-DESCRIPTION="2D/3D shooting game"
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
-SRC_URI="
-	mirror://gentoo/${MY_P}.tar.gz
-	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	acct-group/gamestat
-	dev-games/KXL"
-RDEPEND="
-	${DEPEND}
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-bitstream-100dpi"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "s|DATA_PATH \"/.score\"|\"${EPREFIX}/var/games/${PN}.hs\"|" src/ranking.c || die
-
-	eautoreconf
-}
-
-src_install() {
-	emake -C data DESTDIR="${D}" install-dataDATA
-	default
-
-	rm "${ED}"/usr/share/SpaceAryarya/data/.score
-	insinto /var/games
-	newins data/.score ${PN}.hs
-
-	fowners :gamestat /var/games/${PN}.hs /usr/bin/spacearyarya
-	fperms g+s /usr/bin/spacearyarya
-	fperms 660 /var/games/${PN}.hs
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry spacearyarya SpaceAryarya
-}
diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.3.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.3.ebuild
new file mode 100644
index 000000000000..5e7537d754e6
--- /dev/null
+++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="2D/3D shooting game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
+SRC_URI="
+	https://gitlab.com/oss-abandonware/games-action/space-aryarya/-/archive/${PV}/space-aryarya-${PV}.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}/space-aryarya-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-group/gamestat
+	dev-games/KXL"
+RDEPEND="
+	${DEPEND}
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-bitstream-100dpi"
+
+src_prepare() {
+	default
+
+	sed -i "s|DATA_PATH \"/.score\"|\"${EPREFIX}/var/games/${PN}.hs\"|" src/ranking.c || die
+
+	eautoreconf
+}
+
+src_install() {
+	emake -C data DESTDIR="${D}" install-dataDATA
+	default
+
+	rm "${ED}"/usr/share/SpaceAryarya/data/.score
+	insinto /var/games
+	newins data/.score ${PN}.hs
+
+	fowners :gamestat /var/games/${PN}.hs /usr/bin/spacearyarya
+	fperms g+s /usr/bin/spacearyarya
+	fperms 660 /var/games/${PN}.hs
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry spacearyarya SpaceAryarya
+}
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 09228d3e928f..944d22507f35 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -5,5 +5,5 @@ DIST SuperTuxKart-1.3-src.tar.xz 627753500 BLAKE2B 3ffc86edf80adb27cd17a6ba796fb
 DIST SuperTuxKart-1.4-src.tar.xz 650010456 BLAKE2B dc85c77cdf8b8f7377b5771eb3b3edbe20f6949c99f710ca70506c09152e7a846b3d3239f185d23c9fdf0477da417bacc644793b3407aed1e68fc41ced41a71e SHA512 e88f3fb5ccdb38d0ef75e92d73b43c5cc7a1f6c76ac9502033df099a00d6dc3e86b2c5442b806237d2420c44ada7dd23a2c90ecf94785a44d2348c933770a5ab
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
 EBUILD supertuxkart-1.3.ebuild 2175 BLAKE2B 71eed85edb65a6d9b3b801d471d818b8c773c0e079b38937a31581c1f2da1d3fd91f6aad2780f6c9befe1e6e8ceaca8a2234cb42c2cebb3ef0ead96b95426283 SHA512 6a6283615eae76489e18a37e36d1cbcfad907f7005e44c4bfb20fcb9b2a2ba3a55af9a48eed66013d3ebeec33bb59eba9a849adeaa08a9086b3a874b759012c9
-EBUILD supertuxkart-1.4.ebuild 2110 BLAKE2B 37b9972b98cd7e16fd8d6211f0bedc4f1b2f19d5a3544280bb65aae9e9b322b97ba6624ee667c2867ca045ee14ef418e17b5043e0585f6d31a5cf8b4a365ba4f SHA512 08cf67cf06ace8a7bfb2d05ce1927fc997900385491e8d7b53284e902fa565f197c93f41dbc156c91edff0e2486e6b72083171bef35b4a9412ca9abdcc1b697c
-MISC metadata.xml 800 BLAKE2B 3c8e8faf65549ebc5ed553ed34e07c89480414858c1a90a0355fc4dbd758dba9feb6ffde9d799322957677e1cb3f740f008bc7dccf0986d659a5d2b6a1733a94 SHA512 e1cb946bd8bba015c85c994346ac18ecd13e570d49b9a293637e59539d787c53571285cb00d88dc3d234166029459d9bdde255baae9331cda830fd99cb04e3fd
+EBUILD supertuxkart-1.4-r1.ebuild 2146 BLAKE2B cfaca400a4ad23554daba7e20b27051c914e4d7fa9beb73bed66cd82d808fd92c8e99699d4029ce540a79ed2d2a8293d6a7e2d463a34ec42ca7e2a6b8d280896 SHA512 1a9245fab7be7d45831ce8f3c6a5802050dd540b59c85dc751136c6e26e97f753fac8f027057474efd30f94abe34602aa81d0c8c7a84805865640f61bb9b60ce
+MISC metadata.xml 745 BLAKE2B 6064e59ccfa2826a6cd00a72834b768e2a4de4882e341c4acc9fbb2f5b92e316a97ceee1b836c79c1cebb269add19a0d835048484a4f0d72bf9a7358c3cbae91 SHA512 66ead957f3f61f4796471cc2dd091b35caa601568ef86431658212228671a98ba515026dd576226ce18c25b49d46bc5e4a214a0a4c79533acf08709f72a61b1b
diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supertuxkart/metadata.xml
index 2e74607fa408..28d5e6b38a19 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
 		<flag name="recorder">Enable recording with <pkg>media-libs/libopenglrecorder</pkg></flag>
 		<flag name="sqlite">Record IP bans, statistics in server mode with <pkg>dev-db/sqlite</pkg></flag>
-		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="wiimote">Support for wiimote input devices</flag>
 	</use>
 	<upstream>
diff --git a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
new file mode 100644
index 000000000000..8cf641688c37
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+MY_P="SuperTuxKart-${PV}-src"
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="https://supertuxkart.net/"
+SRC_URI="
+	https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.xz
+	mirror://gentoo/${PN}.png
+"
+
+LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug nettle recorder sqlite wiimote"
+
+# - Don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# https://sourceforge.net/p/irrlicht/feature-requests/138/
+# - For >1.4, restore USE=vulkan and make shaderc dep optional,
+# and pass -DNO_SHADERC to cmake.
+RDEPEND="
+	dev-cpp/libmcpp
+	dev-libs/angelscript:=
+	media-libs/freetype:2
+	media-libs/harfbuzz:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsdl2[opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/shaderc
+	net-libs/enet:1.3=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/libintl
+	nettle? ( dev-libs/nettle:= )
+	!nettle? ( >=dev-libs/openssl-1.0.1d:= )
+	recorder? ( media-libs/libopenglrecorder )
+	sqlite? ( dev-db/sqlite:3 )
+	wiimote? ( net-wireless/bluez )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
+	"${FILESDIR}"/${PN}-1.3-irrlicht-system-libs.patch
+	"${FILESDIR}"/${P}-gcc-13.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SQLITE3=$(usex sqlite)
+		-DUSE_SYSTEM_ANGELSCRIPT=ON
+		-DUSE_SYSTEM_ENET=ON
+		-DUSE_SYSTEM_SQUISH=OFF
+		-DUSE_SYSTEM_WIIUSE=OFF
+		-DUSE_IPV6=OFF # not supported by system enet
+		-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
+		-DBUILD_RECORDER=$(usex recorder)
+		-DUSE_WIIUSE=$(usex wiimote)
+		-DSTK_INSTALL_BINARY_DIR=bin
+		-DSTK_INSTALL_DATA_DIR=share/${PN}
+		-DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+}
diff --git a/games-action/supertuxkart/supertuxkart-1.4.ebuild b/games-action/supertuxkart/supertuxkart-1.4.ebuild
deleted file mode 100644
index 495e18a9ae69..000000000000
--- a/games-action/supertuxkart/supertuxkart-1.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-MY_P="SuperTuxKart-${PV}-src"
-DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
-HOMEPAGE="https://supertuxkart.net/"
-SRC_URI="
-	https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.xz
-	mirror://gentoo/${PN}.png
-"
-
-LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="debug nettle recorder sqlite vulkan wiimote"
-
-# Don't unbundle irrlicht and bullet
-# both are modified and system versions will break the game
-# https://sourceforge.net/p/irrlicht/feature-requests/138/
-RDEPEND="
-	dev-cpp/libmcpp
-	dev-libs/angelscript:=
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsdl2[opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/libintl
-	nettle? ( dev-libs/nettle:= )
-	!nettle? ( >=dev-libs/openssl-1.0.1d:= )
-	recorder? ( media-libs/libopenglrecorder )
-	sqlite? ( dev-db/sqlite:3 )
-	vulkan? ( media-libs/shaderc )
-	wiimote? ( net-wireless/bluez )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
-	"${FILESDIR}"/${PN}-1.3-irrlicht-system-libs.patch
-	"${FILESDIR}"/${P}-gcc-13.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_SYSTEM_ANGELSCRIPT=ON
-		-DUSE_SYSTEM_ENET=ON
-		-DUSE_SYSTEM_SQUISH=OFF
-		-DUSE_SYSTEM_WIIUSE=OFF
-		-DUSE_IPV6=OFF # not supported by system enet
-		-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
-		-DBUILD_RECORDER=$(usex recorder)
-		-DUSE_WIIUSE=$(usex wiimote)
-		-DNO_SHADERC=$(usex !vulkan)
-		-DSTK_INSTALL_BINARY_DIR=bin
-		-DSTK_INSTALL_DATA_DIR=share/${PN}
-		-DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc CHANGELOG.md
-
-	doicon -s 64 "${DISTDIR}"/${PN}.png
-}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index c3f58e8218a8..4a97a658e1bf 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/alephone-durandal/Manifest b/games-fps/alephone-durandal/Manifest
index 10671a39311b..dd986429711d 100644
--- a/games-fps/alephone-durandal/Manifest
+++ b/games-fps/alephone-durandal/Manifest
@@ -1,3 +1,3 @@
-DIST Marathon2-20220115-Data.zip 29710307 BLAKE2B eadf9dac7ad9bedec5b4484c74b5bc4c342223d209af0a4ce90c58649833642c8127a7c21ec87efe1d6229018d6b1002ca1a63b5ed8634103547796e1750c559 SHA512 3f259a865bd9d3709fdc79722e5b0cffd3ddfec981310a00898d2a1348c6b2ffcee0fe36a8ef2da26f235e800703e24ab8f33fbfb3ed8f96a6fc46f84808700f
-EBUILD alephone-durandal-20220115.ebuild 890 BLAKE2B 8cd86943fcc9c7e9465b964286761a59a60e6a31d67fecfd88ea7ae0aebd5b32e1098525fc66c99b47b355349b5c84abc61f73f7964fc18727be38c6bf8b7295 SHA512 61c3e01b32fe0a07ef74b5f1de57d56bdde1d8bb73f0d98e3ba13c49a08cfdc327531785144f9718efe863b72a32906fa851fed1d40e2cf0d8ad062e675284d9
+DIST Marathon2-20221126-Data.zip 29711060 BLAKE2B aa65a575a2b36a9b07cfc978042aa31485e2e02de7886fc7505ca430e7c8e67d1b2b9a77578777abe1042192f82bd7a40f2ab5e848d6a5d4a2e48ddd0b8f075d SHA512 18911eb415b66d6a698c56a6343eb319d9fd2baa34b408d26e0800f2028e0a5724556530beda8660b5f6b071e1544ad7ee59307888e6d021c7628c295e813147
+EBUILD alephone-durandal-20221126.ebuild 886 BLAKE2B a0e2efe227596b0479a5fe4c88835e0019c7eb2276387ebe967a7a8c74d82b52e7d6b4c92f6220c96cca70fc2ac84db8394b63de0795a12297ba2bfa283ba881 SHA512 2cbb2f6154faf25e02579bfc419a2b0a18291ae87cd019a1e9e4608c1ef0095d0bab6e68255601e62bfc633e19d0d338c8a569914926cc842cc82f53d951c061
 MISC metadata.xml 510 BLAKE2B 585a78c69b8ffff8640baa9eb39fe66a3115cc004da917eeb37573b1ae816e399a63ed5f043d547bcd7e59499c670e5063da56356e00c78cc22df039f11d8a09 SHA512 95337185f46c35a2f8022a1acc00bbebc8174472bcda28dae1a58acd2c314081a0451ef9a6a348390ac908eb249ede97721cf43b21f8ff1984e74f1ea63a6f5e
diff --git a/games-fps/alephone-durandal/alephone-durandal-20220115.ebuild b/games-fps/alephone-durandal/alephone-durandal-20220115.ebuild
deleted file mode 100644
index 3815c515b226..000000000000
--- a/games-fps/alephone-durandal/alephone-durandal-20220115.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-DESCRIPTION="Aleph One - Marathon 2 (Durandal)"
-HOMEPAGE="http://marathon.sourceforge.net/"
-SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/Marathon2-${PV}-Data.zip"
-S="${WORKDIR}/Marathon 2"
-
-LICENSE="bungie-marathon"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="games-fps/alephone"
-BDEPEND="app-arch/unzip"
-
-MY_NAME="durandal"
-MY_DIR="/usr/share/alephone-${MY_NAME}"
-
-src_install() {
-	insinto "${MY_DIR}"
-	doins -r *
-
-	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
-
-	# Make sure the extra dirs exist in case the user wants to add some data
-	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
-}
-
-pkg_postinst() {
-	elog "To play this scenario, run:"
-	elog "alephone.sh ${MY_NAME}"
-}
diff --git a/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild b/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild
new file mode 100644
index 000000000000..ae8fcfa41812
--- /dev/null
+++ b/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Aleph One - Marathon 2 (Durandal)"
+HOMEPAGE="https://alephone.lhowon.org/"
+SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/Marathon2-${PV}-Data.zip"
+S="${WORKDIR}/Marathon 2"
+
+LICENSE="bungie-marathon"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="games-fps/alephone"
+BDEPEND="app-arch/unzip"
+
+MY_NAME="durandal"
+MY_DIR="/usr/share/alephone-${MY_NAME}"
+
+src_install() {
+	insinto "${MY_DIR}"
+	doins -r *
+
+	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
+
+	# Make sure the extra dirs exist in case the user wants to add some data
+	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
+}
+
+pkg_postinst() {
+	elog "To play this scenario, run:"
+	elog "alephone.sh ${MY_NAME}"
+}
diff --git a/games-fps/alephone-infinity/Manifest b/games-fps/alephone-infinity/Manifest
index 4f75eeaa9361..80797d0e88a6 100644
--- a/games-fps/alephone-infinity/Manifest
+++ b/games-fps/alephone-infinity/Manifest
@@ -1,3 +1,3 @@
-DIST MarathonInfinity-20220115-Data.zip 32203483 BLAKE2B c00e1ff6b4fc053e9df7f15711a73fd46f8e978714a7755137d1d9228a11715f5f3f161af17c1bd9d8bb9b6aaa4ae8292f5d007223c0c14b9a37a5f3e466675c SHA512 b37865f9f8e7ec14995e3ef5df8c3b3a8badc12fc1dc2388beaad90863e40f4fc589a08482e11a9ab21b7b1659c2248a340083ae0d0166689a4377a07d3c03ae
-EBUILD alephone-infinity-20220115.ebuild 900 BLAKE2B 610cecae473bb5216da717ff7f052f4ffdee1507ce9601836bc2ac4489839725eddb443ecf325bcea284913cfcebcd05dc01743b6baf8c6ece0a652f71cc5da9 SHA512 ff056ce38f86babfcd10b7d9261f6b3f834e902ed352e93d2002e1919bc0b07756c61469a7d79ce96a428d7e89e8868b3e585da22fceef2f5356d66793f8e0fc
+DIST MarathonInfinity-20221126-Data.zip 32204262 BLAKE2B 35292a53b9983411c4fd07f4c424950c8d2588132f75153ce88d6b97fbb43638985be3f254c7ce847a5eb63fbaf757a0b3914d23fd3025bd1f4d8a7f374691da SHA512 8e245618d0ed9ed3b7944360fa2db36f9cc255510c04c8d45f168a43ed398965ebc5551b604cc59b51b37cacbf41ac0e4aaced046704cb095dadd4e585d2763a
+EBUILD alephone-infinity-20221126.ebuild 896 BLAKE2B 6cfd4774ecc5ccf513e81c9d0343bd1e38566bc300855dc50af25eb53787d9f44a94bb9e246310811df1b250bf16673bf2dd457664c6f22ff3cbf13f14e3bf46 SHA512 23c6369f428bee1161dc2f3c1e62b1ba93b952c094cd9364203a10342f729adebae62a6f9985e2f6158511d4e35aa0948f92a227aefbacf5a7dc1a5baa8c8b96
 MISC metadata.xml 510 BLAKE2B 585a78c69b8ffff8640baa9eb39fe66a3115cc004da917eeb37573b1ae816e399a63ed5f043d547bcd7e59499c670e5063da56356e00c78cc22df039f11d8a09 SHA512 95337185f46c35a2f8022a1acc00bbebc8174472bcda28dae1a58acd2c314081a0451ef9a6a348390ac908eb249ede97721cf43b21f8ff1984e74f1ea63a6f5e
diff --git a/games-fps/alephone-infinity/alephone-infinity-20220115.ebuild b/games-fps/alephone-infinity/alephone-infinity-20220115.ebuild
deleted file mode 100644
index 2b0f0b0b8319..000000000000
--- a/games-fps/alephone-infinity/alephone-infinity-20220115.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-DESCRIPTION="Aleph One - Marathon Infinity"
-HOMEPAGE="http://marathon.sourceforge.net/"
-SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/MarathonInfinity-${PV}-Data.zip"
-S="${WORKDIR}/Marathon Infinity"
-
-LICENSE="bungie-marathon"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="games-fps/alephone"
-BDEPEND="app-arch/unzip"
-
-MY_NAME="infinity"
-MY_DIR="/usr/share/alephone-${MY_NAME}"
-
-src_install() {
-	insinto "${MY_DIR}"
-	doins -r *
-
-	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
-
-	# Make sure the extra dirs exist in case the user wants to add some data
-	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
-}
-
-pkg_postinst() {
-	elog "To play this scenario, run:"
-	elog "alephone.sh ${MY_NAME}"
-}
diff --git a/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild b/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild
new file mode 100644
index 000000000000..4c0369226bad
--- /dev/null
+++ b/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Aleph One - Marathon Infinity"
+HOMEPAGE="https://alephone.lhowon.org/"
+SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/MarathonInfinity-${PV}-Data.zip"
+S="${WORKDIR}/Marathon Infinity"
+
+LICENSE="bungie-marathon"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="games-fps/alephone"
+BDEPEND="app-arch/unzip"
+
+MY_NAME="infinity"
+MY_DIR="/usr/share/alephone-${MY_NAME}"
+
+src_install() {
+	insinto "${MY_DIR}"
+	doins -r *
+
+	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
+
+	# Make sure the extra dirs exist in case the user wants to add some data
+	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
+}
+
+pkg_postinst() {
+	elog "To play this scenario, run:"
+	elog "alephone.sh ${MY_NAME}"
+}
diff --git a/games-fps/alephone-marathon/Manifest b/games-fps/alephone-marathon/Manifest
index e22fc9834102..8b0d45cf42e6 100644
--- a/games-fps/alephone-marathon/Manifest
+++ b/games-fps/alephone-marathon/Manifest
@@ -1,3 +1,3 @@
-DIST Marathon-20220115-Data.zip 26473230 BLAKE2B d6a917c0e884d128af11a56473cd4ec0022ca373c4c1e33f39b58ed24cd65a3cb40efd3e874f9ef64be6d3bf39206cd3a51310719223788d240747670075f697 SHA512 dd1eaaafcffe03b66244497c69044a3cabb8348186f1023dd08444a519a6fca59330bc5daf4950967482a12167059055d577e8211f3a70c92f512f74c8415bc8
-EBUILD alephone-marathon-20220115.ebuild 881 BLAKE2B 75551d5e841db81fb50863f94d6b7b0b412b12ef11a1007ef1b1e9f7f0cb4067021381f66b677a790308760fc2a70c3c89aded41844315137cddae5e786d7ca1 SHA512 356372d486e8a25aacb0059c9c32af41ebca53e761ddcc1ccfdba17d2b0d1aedc0e66db2d51d3433b10ce168dcf064407e0a18499c0f222dc65aead8561ef3ac
+DIST Marathon-20221126-Data.zip 26473388 BLAKE2B 16e93da81942c77ff399364d16a9b554c9f13320f08604006dc991b0be24db69d2a6496c45053d2ebb66628f3f2024d09953cec565d6fbdf8d6380f593f47e3e SHA512 4fcf16fcf0a04ccb5ce1fc4dc0ef95a09ff9010f444438c830977490401d3ca01e10d1ffe429df804d3ed6683e8b8f5aed982ca5a3e3049a23b074c783fb7c61
+EBUILD alephone-marathon-20221126.ebuild 877 BLAKE2B 21bc4a701e1bdbc427ad68f2e1135948ca9b7d3e9a7b03b7a1443ee672b4b5277de42f7746699978866fd5fd142db52d4e600026cc8fa129b9d38ab851addb53 SHA512 a44066187deb3d870c2398bd2e4426dc5f116978b5e68ca8a697ed1dd3574901621c622a8dabc4931e76bba0052986e8dc20d8aba8715014ecd189063fd00e12
 MISC metadata.xml 510 BLAKE2B 585a78c69b8ffff8640baa9eb39fe66a3115cc004da917eeb37573b1ae816e399a63ed5f043d547bcd7e59499c670e5063da56356e00c78cc22df039f11d8a09 SHA512 95337185f46c35a2f8022a1acc00bbebc8174472bcda28dae1a58acd2c314081a0451ef9a6a348390ac908eb249ede97721cf43b21f8ff1984e74f1ea63a6f5e
diff --git a/games-fps/alephone-marathon/alephone-marathon-20220115.ebuild b/games-fps/alephone-marathon/alephone-marathon-20220115.ebuild
deleted file mode 100644
index a1a96ad86ae5..000000000000
--- a/games-fps/alephone-marathon/alephone-marathon-20220115.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-DESCRIPTION="Aleph One - Marathon (M1A1)"
-HOMEPAGE="http://marathon.sourceforge.net/"
-SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/Marathon-${PV}-Data.zip"
-S="${WORKDIR}/Marathon"
-
-LICENSE="bungie-marathon"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="games-fps/alephone"
-BDEPEND="app-arch/unzip"
-
-MY_NAME="marathon"
-MY_DIR="/usr/share/alephone-${MY_NAME}"
-
-src_install() {
-	insinto "${MY_DIR}"
-	doins -r *
-
-	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
-
-	# Make sure the extra dirs exist in case the user wants to add some data
-	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
-}
-
-pkg_postinst() {
-	elog "To play this scenario, run:"
-	elog "alephone.sh ${MY_NAME}"
-}
diff --git a/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild b/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild
new file mode 100644
index 000000000000..020967a4d7da
--- /dev/null
+++ b/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Aleph One - Marathon (M1A1)"
+HOMEPAGE="https://alephone.lhowon.org/"
+SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/Marathon-${PV}-Data.zip"
+S="${WORKDIR}/Marathon"
+
+LICENSE="bungie-marathon"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="games-fps/alephone"
+BDEPEND="app-arch/unzip"
+
+MY_NAME="marathon"
+MY_DIR="/usr/share/alephone-${MY_NAME}"
+
+src_install() {
+	insinto "${MY_DIR}"
+	doins -r *
+
+	make_desktop_entry "alephone.sh ${MY_NAME}" "${DESCRIPTION}"
+
+	# Make sure the extra dirs exist in case the user wants to add some data
+	keepdir "${MY_DIR}"/{Scripts,"Physics Models",Textures,Themes}
+}
+
+pkg_postinst() {
+	elog "To play this scenario, run:"
+	elog "alephone.sh ${MY_NAME}"
+}
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index b6858e25ce87..e654cff7951e 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,5 +1,5 @@
 AUX alephone.sh 486 BLAKE2B ed0a60d272e7894ec64ce6f5a727dd4cd129ae8e582f72c74d2177cf22e2be18ee72d0988204fb65650da2c0e3890c9640844bea2f8091b32d24dfb80537dd8e SHA512 4eaf345bec8daecba38125a4bceef2d20985b1653550f935af20a28ec59f8615bf14d9254257e56d006affa24d63a3859e3270f416fcfb318dc688fefa2aff3b
-DIST release-20220115.tar.gz 6487243 BLAKE2B 7c304d28e826e2b3b32427661d3e85ff5ec41e6200d98468edeb5ea11a751fbbd333b72e3efe0937bc496088e36560351f810a6471d92cb684b0bf6adceabf68 SHA512 53d9c602af58f56b5236ca9a539ffac47abe8350b3d228345348e63648a5ef343335be9b0a3366a201807b3e3aa013dc360a38c3e7b47f4a6da2a696ec6ea646
-EBUILD alephone-20220115-r1.ebuild 2286 BLAKE2B 73a31137f5863efe70696353f09b32733c1f91ef823d718e322a11a4df551bde742f9bb006091bdb24273e25bc55b05fd924dd8a8147a8fcb3d4bf41f57af27f SHA512 dc283699ede8510f2c9ae50b38efe1e1e1061e23df7718b2b4cac7385f4894ee83001b5da9f73b3e44b6364f3f79e0cf73ecfb4c5fe180584f0d8ec476914d0e
-EBUILD alephone-99999999.ebuild 2286 BLAKE2B 73a31137f5863efe70696353f09b32733c1f91ef823d718e322a11a4df551bde742f9bb006091bdb24273e25bc55b05fd924dd8a8147a8fcb3d4bf41f57af27f SHA512 dc283699ede8510f2c9ae50b38efe1e1e1061e23df7718b2b4cac7385f4894ee83001b5da9f73b3e44b6364f3f79e0cf73ecfb4c5fe180584f0d8ec476914d0e
+DIST release-20221126.tar.gz 6968670 BLAKE2B d4437f845fd9cc1c6f99620e3ff5b2e5e3fabda82622343589246999ee8c654f4762a0a2e13fc9e595ec34d1d1db7a114b4f8436967da559737af8ca86bfd559 SHA512 ca6acc4de03b65c27829c57bfabd7f6e49e78111c94aac29cf03aeb8606c9c6d8e56a477ebfbbd0b6079b2d8ed0946717883de27855532917ac4758ab43d108d
+EBUILD alephone-20221126.ebuild 2293 BLAKE2B ac084f706868778a9e5e53607729c3f44306125b9c5937685e12b044d9a985a034108c981c2e5c347a8b5412c602d38af205fdc68714d929b86f868bc9a91b00 SHA512 1940625d889d7936755a8dbd814bda300e9c658ada25ee9931c353542d120022317d38d853d1d83cd7c7566b951d83ae5d82307fa43ac4aba9ea6b45f4c9ee80
+EBUILD alephone-99999999.ebuild 2293 BLAKE2B ac084f706868778a9e5e53607729c3f44306125b9c5937685e12b044d9a985a034108c981c2e5c347a8b5412c602d38af205fdc68714d929b86f868bc9a91b00 SHA512 1940625d889d7936755a8dbd814bda300e9c658ada25ee9931c353542d120022317d38d853d1d83cd7c7566b951d83ae5d82307fa43ac4aba9ea6b45f4c9ee80
 MISC metadata.xml 599 BLAKE2B fec1ac113594c4548d8cc07eda9a63bc49c345fb0c08ee0622d3de2c1f15b25f8f4a1c4f33770685a479417136a2aa5f66f3f8ee7e7b4ff91e4f3fb97c05eddb SHA512 42faf1057312f77764da14f535dacc06f1029524b4c92db915bcd353d529334614545bff73ee9c36ffc6955f78f451063fee03660a9d615f0b00a023cea1aefc
diff --git a/games-fps/alephone/alephone-20220115-r1.ebuild b/games-fps/alephone/alephone-20220115-r1.ebuild
deleted file mode 100644
index 3fc299106b8f..000000000000
--- a/games-fps/alephone/alephone-20220115-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools optfeature prefix toolchain-funcs xdg
-
-DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
-HOMEPAGE="http://source.bungie.org/"
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
-	EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
-else
-	SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3+ BitstreamVera OFL-1.1"
-SLOT="0"
-
-IUSE="alsa curl speex upnp"
-
-# ffmpeg covers most audio/video use cases and the package doesn't configure with alternatives enabled (media-libs/smpeg)
-# When resolved upstream, !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
-# with an appropriate REQUIRED_USE may be added.
-# See https://github.com/Aleph-One-Marathon/alephone/issues/85
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/zziplib:=
-	media-libs/libpng
-	media-libs/libsdl2
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-net
-	media-libs/sdl2-ttf
-	media-video/ffmpeg:=[mp3,vorbis]
-	sys-libs/zlib
-	virtual/opengl
-	virtual/glu
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	upnp? ( net-libs/miniupnpc )
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-lua \
-		--enable-opengl \
-		--with-ffmpeg \
-		--without-mad \
-		--without-smpeg \
-		--without-sndfile \
-		--without-vorbis \
-		$(use_with alsa) \
-		$(use_with curl) \
-		$(use_with speex) \
-		$(use_with upnp miniupnpc)
-}
-
-src_compile() {
-	tc-export AR
-	default
-}
-
-src_install() {
-	default
-	prefixify_ro "${FILESDIR}"/${PN}.sh
-	dobin "${T}"/${PN}.sh
-	doman docs/${PN}.6
-	docinto html/
-	dodoc docs/*.html
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature_header "Install game data:"
-	optfeature "Marathon data files" games-fps/alephone-marathon
-	optfeature "Marathon 2 Durandal data files" games-fps/alephone-durandal
-	optfeature "Marathon: Infinity data files" games-fps/alephone-infinity
-}
diff --git a/games-fps/alephone/alephone-20221126.ebuild b/games-fps/alephone/alephone-20221126.ebuild
new file mode 100644
index 000000000000..70b887308564
--- /dev/null
+++ b/games-fps/alephone/alephone-20221126.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature prefix toolchain-funcs xdg
+
+DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
+HOMEPAGE="https://alephone.lhowon.org/"
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
+	EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
+else
+	SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+ BitstreamVera OFL-1.1"
+SLOT="0"
+
+IUSE="alsa curl speex upnp"
+
+# ffmpeg covers most audio/video use cases and the package doesn't configure
+# with alternatives enabled (media-libs/smpeg)
+# When resolved upstream,
+# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
+# with an appropriate REQUIRED_USE may be added.
+# See https://github.com/Aleph-One-Marathon/alephone/issues/85
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/zziplib:=
+	media-libs/libpng
+	media-libs/libsdl2
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	media-video/ffmpeg:=[mp3,vorbis]
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	upnp? ( net-libs/miniupnpc )
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-lua \
+		--enable-opengl \
+		--with-ffmpeg \
+		--without-mad \
+		--without-smpeg \
+		--without-sndfile \
+		--without-vorbis \
+		$(use_with alsa) \
+		$(use_with curl) \
+		$(use_with speex) \
+		$(use_with upnp miniupnpc)
+}
+
+src_compile() {
+	tc-export AR
+	default
+}
+
+src_install() {
+	default
+	prefixify_ro "${FILESDIR}"/${PN}.sh
+	dobin "${T}"/${PN}.sh
+	doman docs/${PN}.6
+	docinto html/
+	dodoc docs/*.html
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature_header "Install game data:"
+	optfeature "Marathon data files" games-fps/alephone-marathon
+	optfeature "Marathon 2 Durandal data files" games-fps/alephone-durandal
+	optfeature "Marathon: Infinity data files" games-fps/alephone-infinity
+}
diff --git a/games-fps/alephone/alephone-99999999.ebuild b/games-fps/alephone/alephone-99999999.ebuild
index 3fc299106b8f..70b887308564 100644
--- a/games-fps/alephone/alephone-99999999.ebuild
+++ b/games-fps/alephone/alephone-99999999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools optfeature prefix toolchain-funcs xdg
 
 DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
-HOMEPAGE="http://source.bungie.org/"
+HOMEPAGE="https://alephone.lhowon.org/"
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
@@ -22,8 +22,10 @@ SLOT="0"
 
 IUSE="alsa curl speex upnp"
 
-# ffmpeg covers most audio/video use cases and the package doesn't configure with alternatives enabled (media-libs/smpeg)
-# When resolved upstream, !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
+# ffmpeg covers most audio/video use cases and the package doesn't configure
+# with alternatives enabled (media-libs/smpeg)
+# When resolved upstream,
+# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
 # with an appropriate REQUIRED_USE may be added.
 # See https://github.com/Aleph-One-Marathon/alephone/issues/85
 RDEPEND="
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 23f03cae7eac..25ad526404c1 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 63e30cde35ee..ec7b0005835b 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -7,4 +7,5 @@ DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db
 EBUILD warzone2100-4.2.7.ebuild 2678 BLAKE2B abbd712501c57c331e199ff6d75ecfba88660576549f181e21e8e769f0525d2096b9781434031a10f1a8990313ccad49a609258ba8099836e4d8499726c396a7 SHA512 f30803098c061db711c06b007cb384d31c9a4888044815308ea74cbaf748cba05db41b3b90ba7a400b32a82155379ceb1f5bddfeda628f160aa19b7a4c5377f2
 EBUILD warzone2100-4.3.1.ebuild 2737 BLAKE2B a43686ac02cc569b9a394613c9d84c370ace499da95c11b1f4b24f70094db8cc35acd954d9d08c47055a6815ee64ee9f217d841b05c2f12392568dcdbcbf050a SHA512 f096eb5d1be3eda53ef1514e5c2117314ccdc4475d56180329629c031533edc2f82d92bf6c9437b675f0a32396633218ffcfff4700f9370fc83f61c9c0ca69a7
 EBUILD warzone2100-4.3.3-r2.ebuild 2816 BLAKE2B 8b3df9615983109685193bf4049cd610f4630bf3a8b1037ee6562bfcb5814c712493cb33bc9b80afc7e675555bd5ea5f335dc6120889ee153b7a383b8882ddb4 SHA512 c2de63773766712adf1c5ea5ad847f080818f8065aea6b9c04953411422d77d3461ffcc4a6c5c51e0545e07612cd723e6da5795e85a6ee97be15e4f7c8a26989
+EBUILD warzone2100-4.3.3-r3.ebuild 2796 BLAKE2B 8aee3a3a031eede114b721add666549487a105b03e54b04bad46fe78d4c2bec81891949ff257e093b7d4531a197d8314a3ad5656066168b521a32c6228a9184b SHA512 be94af6386f45ff996b102f269a23dbf0dab0e67fa1a33a926d16a9a0fa8a9d38e54f884f492fc6e9916a27995c2a6deaaa775f8184b114a0e74104379903bd8
 MISC metadata.xml 812 BLAKE2B b2b9ab08275974118342f645f9c6fee90fb2f8904a3c6708666d71d57ec71ab86e9f905669cc3fe9424cec8329d434c979e9ae87324f0b47ed313b28c66d6070 SHA512 0af92d46baaf497a9f5aa57e45f0860e94c36f008386c1f483a49d8df50719ef11532a8473b4068a5cc63286d7af72b71e4de2e883b178c278b7aecf27f8389d
diff --git a/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild b/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild
new file mode 100644
index 000000000000..728e1a377b03
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.3.3-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af_ZA bg_BG ca_ES cs da de el en_GB eo es et_EE fa_IR fi fr fy ga he_IL hr hu id_ID id it ko la lt nb nl pl pt_BR pt ro ru sk sl tr tt_RU uk_UA zh_CN zh_TW"
+inherit cmake plocale xdg
+
+MY_PV=$(ver_cut 1-2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="https://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+# Upstream requested debug support
+IUSE="debug discord nls videos vulkan"
+
+COMMON_DEPEND="
+	dev-libs/fribidi
+	>=dev-games/physfs-2[zip]
+	dev-db/sqlite:3
+	>=dev-libs/libsodium-1.0.14:=
+	media-libs/freetype:2
+	media-libs/harfbuzz:=
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libsdl2[opengl,video,X]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/opus
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-fonts/dejavu
+"
+BDEPEND="
+	app-arch/zip
+	app-text/asciidoc
+	games-util/basis_universal
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
+DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
+	"${FILESDIR}"/${PN}-4.3.3-gcc13.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.xz
+}
+
+src_prepare() {
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+
+	# Delete translations we're not using
+	cleanup_po() {
+		local locale=${1}
+		einfo "Cleaning up disabled locale: ${locale}"
+		rm po/${locale}.po || die
+	}
+
+	plocale_for_each_disabled_locale cleanup_po
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: unbundle nlohmann-json
+	# TODO: unbundle fmt
+	local mycmakeargs=(
+		-DWZ_DISTRIBUTOR="Gentoo Linux"
+		-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF
+		-DWZ_ENABLE_BACKEND_VULKAN=$(usex vulkan)
+		-DBUILD_SHARED_LIBS=OFF
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_DISCORD=$(usex discord)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	asciidoc -b html5 doc/quickstartguide.asciidoc || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# We cover licencing within the ebuild itself
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* \
+		"${ED}"/usr/share/doc/${PF}/copyright || die
+
+	if use videos ; then
+		insinto /usr/share/${PN}
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index ec0a65bd0837..ff70f332695c 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/basis_universal/Manifest b/games-util/basis_universal/Manifest
new file mode 100644
index 000000000000..a68a52bf284f
--- /dev/null
+++ b/games-util/basis_universal/Manifest
@@ -0,0 +1,5 @@
+AUX basis_universal-1.16.3-fix-RPATH.patch 332 BLAKE2B 46349fb09343dfd28dfb383a7d21a5abbb64245f4ba85012f3bc97084740bb8dcbbbb2432902f27863c5a80cc04e3f2b3569dc13ee97b498932fd75182c7a6a2 SHA512 0ab6e03146c5e924644112200b6c0b6cce3f9ab5797be4a052994ee553814c128b74a1e91f66f248af21c496a4407267d0b27c46bc6c29bb1554a66581da3f58
+AUX basis_universal-1.16.3-respect-CFLAGS.patch 556 BLAKE2B b9e099ddcca8a5902da78faf293b953f231c2d05c746f6ff105a0db5dcab07009276c76f8a034a22aa42ac063850fbfaba905ce1c5022aff4e0889b9f2546123 SHA512 5eaa8339b853fb14fd5efd2596ae7221c648203fb253678c0791d7b6278e3ea55ab3d275ee28c2c9a704a5d23dc52e7f54e825c2d8de86874f79ecaced37e3be
+DIST basis_universal-1.16.3.tar.gz 29151155 BLAKE2B e3ef3ead6223aa73012bd74e51dae269746cfcf2720c524be8096ce8643777723888f98a140d2e28c881ed60ab54b7ea6fef4205b72757d72e766f85806b4484 SHA512 3dca02ad6c14e74df7a89d3b2a59b970635cf5e268b96eb91b10033e2b8e635c83aca6b8e9b34a1b689ed5ffe7c8348d15b8524385f6d07a51cc34a46246a0b7
+EBUILD basis_universal-1.16.3.ebuild 1049 BLAKE2B b9cc79ffff04195f5c2cb66bbbf70565e4be2537bce3780cdcf2e4ab0d58bf41d29d7c2af8af1927a9cabae3ec29e6e9e927aed9b2a19c977b32ba83ff8c7bd9 SHA512 b80b6cfdab06d9c94d909fdf8a761f480cab07883c7aeb92dbba37e7741666668fcb74d038bf28ca599d8c22d910e84ac475c3eca8f491a2295cf706b26331a5
+MISC metadata.xml 412 BLAKE2B 00c914af265ebe97107ee3ed185ae7693348de4902d557beb6590efae0b1ec351baed1fd02facb6605b390fff36ddc40aa49ff1786472ccd5376d16abd522540 SHA512 1a971517dc0b642e254f2acab248d9364b510b16b80fe095c320d552869f6e8909343fd6e62a1896c344d57d7f4624e10f193c3b4f3b7689eb5b669b85517998
diff --git a/games-util/basis_universal/basis_universal-1.16.3.ebuild b/games-util/basis_universal/basis_universal-1.16.3.ebuild
new file mode 100644
index 000000000000..d89b78821f60
--- /dev/null
+++ b/games-util/basis_universal/basis_universal-1.16.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Basis Universal GPU Texture Codec"
+HOMEPAGE="https://github.com/BinomialLLC/basis_universal"
+# dist .zip is just a exe for windows
+SRC_URI="https://github.com/BinomialLLC/basis_universal/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 zstd? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse4_1 opencl zstd"
+
+# zstd is bundled, see https://github.com/BinomialLLC/basis_universal/pull/228
+DEPEND="
+	opencl? ( virtual/opencl )
+"
+RDEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.3-respect-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.16.3-fix-RPATH.patch
+)
+
+src_configure() {
+	local x64=ON
+	if $(tc-getCC) -dM -E  -x c - < <(echo 'int main() { }') | grep -qi "#define __PTRDIFF_WIDTH__ 32" ; then
+		x64=OFF
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_X64=${x64}
+		-DOPENCL=$(usex opencl)
+		-DSSE=$(usex cpu_flags_x86_sse4_1)
+		-DZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
diff --git a/games-util/basis_universal/files/basis_universal-1.16.3-fix-RPATH.patch b/games-util/basis_universal/files/basis_universal-1.16.3-fix-RPATH.patch
new file mode 100644
index 000000000000..d15ba0d4ddfb
--- /dev/null
+++ b/games-util/basis_universal/files/basis_universal-1.16.3-fix-RPATH.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -103,7 +103,6 @@ if (NOT MSVC)
+ 		set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=0")
+ 	  endif()
+ 	  
+-	  set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS} -Wl,-rpath .")
+    endif()
+ 
+    set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} ${GCC_COMPILE_FLAGS}")
diff --git a/games-util/basis_universal/files/basis_universal-1.16.3-respect-CFLAGS.patch b/games-util/basis_universal/files/basis_universal-1.16.3-respect-CFLAGS.patch
new file mode 100644
index 000000000000..e7c1db7ea2bf
--- /dev/null
+++ b/games-util/basis_universal/files/basis_universal-1.16.3-respect-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,7 @@ if (NOT MSVC)
+       set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined")
+    endif()
+ 
+-   set(CMAKE_CXX_FLAGS -std=c++11)
++   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(GCC_COMPILE_FLAGS "-fvisibility=hidden -fPIC -fno-strict-aliasing -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -Wno-unused-local-typedefs -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable")
+ 
+    if (NOT BUILD_X64)
diff --git a/games-util/basis_universal/metadata.xml b/games-util/basis_universal/metadata.xml
new file mode 100644
index 000000000000..20e5846d4192
--- /dev/null
+++ b/games-util/basis_universal/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="opencl">Enable OpenCL support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">BinomialLLC/basis_universal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 678a8875693c..99be7dc447d1 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index a4508e0e7afc..cd2c3afa3ce2 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -12,9 +12,9 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173
 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2.tar.gz 128896 BLAKE2B 021da81f82da0a6a47dfa1019ef07f1879cb3fcc41e790726b0afd5ba0591d24c58399c28f8e3e9b60fe4b078853236e1cb49c0c7a57c1508e6cc4d2f8ecaabd SHA512 01c415a561ea8bd9d568ad2668fbf8bc54304557e413776e1b841145cad3f7b9991a6772af7bac408b2cb87c6236c378e79c1c023a58b280a6c92fee151f0fb1
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz 110631 BLAKE2B f84f6ac77ba3fb94cf513d602c79014eb34c7d16a4c7c091a6054d7e121175b8c53a8f1339a6e5baa2d9687e8b6d8439ce76781c49612d26593a20d5ede6a388 SHA512 f96e365ac6788c538b5ed54c5330ef8625962e77c27098b5cbd21332fed5cbafd422f2a997499bc17aa814849fa44b131942278547207e6611a491b0ee05b91a
-EBUILD kodi-19.4-r3.ebuild 11143 BLAKE2B 9066e00cf8f3bb62c9c00603a743c33c3dac26d7c0af6372164aa6dea9d2ccae01894a63c748280c6f9b8919f0691bb35a5e8725b85757a717fd9efd0d637cc4 SHA512 86b2f35dab51ab9cb81be159866036ba9e62a9a015916680043f00c265d2c9499f8904155da635836f4ba96d1cc8654d1ddebc1bfdecb05dc3bfa22276e80d8c
-EBUILD kodi-19.4-r4.ebuild 11179 BLAKE2B c5472c5ac52c8fb5fe95b861998f93b226d951d802a0d80d2b558c8b61a7af6184be35055a2d3d926f5c1cc5d555629d1d7ca3f1e8810873726ecf715256b99a SHA512 a70160fcc89260a1d7ce3c62d2d007501b2f2372def2039d547fa3c63b895eccaf58cecc2507dab8c8551f54d0f1c6344dadc1b7f57c9e334454743c611c89c1
-EBUILD kodi-19.5.ebuild 11165 BLAKE2B 3bd61abebd631e7c4d4325e9e62b44c25ec8334f9a39109091653559bf9f6879c9211409b3b2f262f9d53003ae6dfd9452637f7c4f84c02d27fbdbd8755f049d SHA512 65e0c70c92424cf810c7dafd2bfecab235fad4a375a50e9fc27de7d286827e009c8fb52f5cd4d86993e089984a5c9023af585460fa81fcedb402ccce93108820
-EBUILD kodi-19.9999.ebuild 10905 BLAKE2B 7640471bd3242db1b27faba5a7d290adec2685b5e031f45d6223ae4ded57e1ff1bb44930dc24e466aafa2cdb6173d216cdfecf9c0d8fa3348d207b5617ed6186 SHA512 acf860f73c0ba91c1b70d47c11613ad9a6cfe4b521a9b919b8b4d6ced4d56ad6cab675aa99aa76982f873543e83d04e3f0cb16f365d191d7e4dfae775ee4d25f
+EBUILD kodi-19.4-r3.ebuild 11160 BLAKE2B c9b04c12381c63f80177d0b963b149ebfdbaaa20261b985756229418f67f1406f499ebd3920383cad4de8148c37bc288c834297fc39dc1de811b62ed2c8f675c SHA512 b67930cbd3ca5bbdc341cc7317137fb1eb312acc5f8762ed94d339ec20b5c34308b5c82d64c85f2bb46054547979844c2821853cbe2b9a7c4989c8b88956ce30
+EBUILD kodi-19.4-r4.ebuild 11196 BLAKE2B 4029c40f4eaaa745b407599f777ba23dfcc678a4a98fe61b2d32aff26ed96be05286bfb13bc79ab434eaa6131b99b708a170c48bf68aeecd41d400649686eed7 SHA512 af17633390ccad65aa6d64820d7ce8aecaf92cb98f11bcac39b8be52dbd5634cfdec093d9deeabdf38625fbf75f9cbbe1670fd1e2ae0a72df03595fc6027411d
+EBUILD kodi-19.5.ebuild 11182 BLAKE2B 75e20fc14831288cabe4a4ac15a01abd92117828413ff1e2bb7f3c0242c017efe2b315944349be9833a89cbc9e5ca267cbe5ca41ffc7d815bee39dc2656f7060 SHA512 df04e9dbac106251cd8cd56e0f76773ee70e7306ba1c208dbf935bbd931979f05ca65a97c00f46b925121795701e2e38a2166319098a8f4b66b9b8847f7ae5b7
+EBUILD kodi-19.9999.ebuild 10922 BLAKE2B 1cb8bd4eccfc4a78f349d36728153379e769cdc734a31ab54a5fccb42cc18a3b805c65f2030b0cbf86ce5b2fd9ad83dd5229c1c984c4df8b688b4c60f4a12dfc SHA512 e1dad9fde61a3513de1d224fe956a9e6f59f4acd145098842e36212a4c82c6a549d243b6889cf3b8064eab667e79bc033f48c181165262b851ba986b0ef9d5ad
 EBUILD kodi-9999.ebuild 10968 BLAKE2B dee8641999a50bd8f1e3e5cf2729e6f7f9351cf1bf6bcb693991429b4b2b0ac5b497b7f540aba8cac9490b249cf0f8617251b102f72d34e5d284f372366fb79a SHA512 c480c9658c4e8f018ab533304dc18d2965fd94c18f2b825c639f7977a410bcfd8f7af2e3368ecb64503c8763b703e2633ff6e872fa25e9b8d8c51ae77a74067d
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/kodi-19.4-r3.ebuild b/media-tv/kodi/kodi-19.4-r3.ebuild
index fb80e98d4055..7f010fb5fdd6 100644
--- a/media-tv/kodi/kodi-19.4-r3.ebuild
+++ b/media-tv/kodi/kodi-19.4-r3.ebuild
@@ -82,7 +82,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	caps? ( sys-libs/libcap )
 	dbus? ( sys-apps/dbus )
 	dev-db/sqlite
-	dev-libs/crossguid
+	<dev-libs/crossguid-0.2.2_p20190529
 	>=dev-libs/fribidi-1.0.5
 	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
 	dev-libs/libpcre[cxx]
diff --git a/media-tv/kodi/kodi-19.4-r4.ebuild b/media-tv/kodi/kodi-19.4-r4.ebuild
index fee5480e298a..319a0c88d9f9 100644
--- a/media-tv/kodi/kodi-19.4-r4.ebuild
+++ b/media-tv/kodi/kodi-19.4-r4.ebuild
@@ -84,7 +84,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	caps? ( sys-libs/libcap )
 	dbus? ( sys-apps/dbus )
 	dev-db/sqlite
-	dev-libs/crossguid
+	<dev-libs/crossguid-0.2.2_p20190529
 	>=dev-libs/fribidi-1.0.5
 	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
 	dev-libs/libpcre[cxx]
diff --git a/media-tv/kodi/kodi-19.5.ebuild b/media-tv/kodi/kodi-19.5.ebuild
index f2e357770c01..bda9d573b7d2 100644
--- a/media-tv/kodi/kodi-19.5.ebuild
+++ b/media-tv/kodi/kodi-19.5.ebuild
@@ -83,7 +83,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	caps? ( sys-libs/libcap )
 	dbus? ( sys-apps/dbus )
 	dev-db/sqlite
-	dev-libs/crossguid
+	<dev-libs/crossguid-0.2.2_p20190529
 	>=dev-libs/fribidi-1.0.5
 	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
 	dev-libs/libpcre[cxx]
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 2e29adf1eb88..46037f8a406b 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -78,7 +78,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	caps? ( sys-libs/libcap )
 	dbus? ( sys-apps/dbus )
 	dev-db/sqlite
-	dev-libs/crossguid
+	<dev-libs/crossguid-0.2.2_p20190529
 	>=dev-libs/fribidi-1.0.5
 	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
 	dev-libs/libpcre[cxx]
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4aa8829f115a..e7c8e79ea9d7 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 1ebdf3c48bc2..417509835568 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -14,9 +14,9 @@ AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed5
 DIST pipewire-0.3.63.tar.bz2 1485423 BLAKE2B 8629bce6d11959d4b3930d7db4e0ad201981002d52c6b73b3ee2b0ac141518f553f7b0e47aef4157b3c3ef71c6b544889f60f4be0fadb01b8a35c1d457edb1aa SHA512 0a45e9017bbcd74f21c6a1f388c5b58123deec083bbc9a9e695948ea95e67b6384acfff6e5ab685ea7287b4696e01176e257b73286ecd03c2d2e43d80fd60805
 DIST pipewire-0.3.64.tar.bz2 1490475 BLAKE2B 9a4d9e23a5d60da7c5788ce5145ce083f13fe771f3f5bcb3dfd1e9560d982f20415f32f756b875081464e1b175ef80af56d7babb3bbbd7a5eaf034c9c43b810a SHA512 4dff77cf1ab9fefffad1b6f7182115dbb5e4f0339f052dcfcc34b62687b461d25a6f891d1ad0246dab5a8cb80ca190d97d358a6494da8c6a8cc64e0b38452093
 DIST pipewire-0.3.65.tar.bz2 1522095 BLAKE2B d991820e8780773ccf1cd68baa3156428eb099703b82c3e3ad24a86bc634ad43fb474fe362de5e5704ee8b35832b75995fd56096b6539835e8b1f31710450d08 SHA512 0c2402044a04ab6ba724b0808279498e2126dd567920f3241d7d3d5e13ea676e353fc85a73634cf4cae5429454250dfce5cd18ba4a5444a7ed1a5ca2e0ae1eef
-EBUILD pipewire-0.3.63-r2.ebuild 16344 BLAKE2B 2897cf44a92dc35a2444f088f3e119bfe004cdce7ed84949244477e28a6fc27a3ef1e6fec7f4f5b475c75779fd79847d4184210ad6a141d7a3d6dd80b62f2070 SHA512 ec27287f348b4989b9c0950006cb83969971c65a86698feaee983d328bf08c1478d953176f32ac1b5de815bc3ea470cd5ac048e092004f07f17052a58e3e379d
+EBUILD pipewire-0.3.63-r3.ebuild 16537 BLAKE2B 2fecbd30359107e2c6d82420c3199ddaf1a535a5c7b811db45f8d021ee350f73e92ef3fc3ce56323d5f26954d81d07bd6f970ee04bd91e6c8d4b3bef103fd170 SHA512 e160f3d01d068d093c890a716f4098879b2b6d068d0afcd1e2f08ddc0b845f20f4722a451fc94cc4b07747fa21c9057ae21405c6a3ce76e3d5feb354c6aac52e
 EBUILD pipewire-0.3.64-r2.ebuild 16375 BLAKE2B 776c12e939de524b096165c5b794637e8caee90b437068da593c8bd186128a2948db44d91ac1a20ce981f27a0729078a5a0abb4521c12e77abaf8be6b9682c7c SHA512 40cda83b4df6885887d4bf841a97c6682919ea9d91bc2cbcc7517858b1d04e0ae74b6a79a81270e02d349697f6b39b6bf5f642dcd85e65975f855606bbd9c9fb
 EBUILD pipewire-0.3.64.ebuild 16187 BLAKE2B f9036abc280611f3e9a82733e6f8ecdf9ec123d491f86c46734346ea3e890b19e72e0806fd532f31dbefb9fca964fb8a15a94386d85b7364cb2a30834f005459 SHA512 2311b635e07226a064c5e0ea55ea12fbe58c163dbf8813d343cadfc67f859fb32b6649bcf2134e52f5e34c6e84eaf7b3fb6e138df91442bd7ce0b4777dde6820
-EBUILD pipewire-0.3.65-r1.ebuild 16724 BLAKE2B 086455fde3ed5ea7e06e24bb0733f20dc124629f2dde39d4f577edd44e60755d6948c9fd217c29d7cd2f578ab8b6963ba29c2aec8ea86721c695f70b973dad7d SHA512 d0d10cc2bb476146e051ff56f41b2ece6206b62881b8ce2dfa6feb3daa4f0b68fb32dd1342ca5f506fd0e0ffbebc6f7c98340a0a5d48f6bcd5b64ab1f45b621d
-EBUILD pipewire-9999.ebuild 16724 BLAKE2B 086455fde3ed5ea7e06e24bb0733f20dc124629f2dde39d4f577edd44e60755d6948c9fd217c29d7cd2f578ab8b6963ba29c2aec8ea86721c695f70b973dad7d SHA512 d0d10cc2bb476146e051ff56f41b2ece6206b62881b8ce2dfa6feb3daa4f0b68fb32dd1342ca5f506fd0e0ffbebc6f7c98340a0a5d48f6bcd5b64ab1f45b621d
+EBUILD pipewire-0.3.65-r2.ebuild 16917 BLAKE2B 63ddcbb10d96ea2facc5b65f581286b9328c706dc44452eafe77de7c1392ac7ed2b4d2efac3c0829286bd0776e297ed98fe8796e7ae1b47d71eae2e9055614d6 SHA512 359508558042eb92f4eea8b20859e86a5630ed0cec3a2b20cd2ce1199ba1d18d4f80fbd310cc07054aa6624ec72677ba188139c4ba6bee1865291f95418656fa
+EBUILD pipewire-9999.ebuild 16917 BLAKE2B 63ddcbb10d96ea2facc5b65f581286b9328c706dc44452eafe77de7c1392ac7ed2b4d2efac3c0829286bd0776e297ed98fe8796e7ae1b47d71eae2e9055614d6 SHA512 359508558042eb92f4eea8b20859e86a5630ed0cec3a2b20cd2ce1199ba1d18d4f80fbd310cc07054aa6624ec72677ba188139c4ba6bee1865291f95418656fa
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/pipewire-0.3.63-r2.ebuild b/media-video/pipewire/pipewire-0.3.63-r2.ebuild
deleted file mode 100644
index a43956977dc6..000000000000
--- a/media-video/pipewire/pipewire-0.3.63-r2.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to mention
-# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT=""
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	fi
-
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2
-modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
-# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
-# which provides adequate guarantee that alsa-lib will be able to provide audio services.
-# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
-# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	modemmanager? ( bluetooth )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/opus
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	flatpak? (
-		dev-libs/glib
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gsettings? (
-		>=dev-libs/glib-2.26.0:2
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	lv2? ( media-libs/lilv )
-	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-	)
-	sound-server? (
-		!media-sound/pulseaudio[daemon(+)]
-		!media-sound/pulseaudio-daemon
-	)
-	readline? ( sys-libs/readline:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${P}-alsa-node-target.patch
-	"${FILESDIR}"/${P}-bluez-ldac_abr.patch
-	"${FILESDIR}"/${P}-bluetooth-typo.patch
-	"${FILESDIR}"/${P}-rate-update.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_feature dbus)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature gsettings)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
-		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth bluez5-codec-opus)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		# Not yet packaged.
-		-Dbluez5-codec-lc3=disabled
-		-Dbluez5-codec-lc3plus=disabled
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		$(meson_native_use_feature flatpak)
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature readline)
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-
-		# Disable pipewire-pulse if sound-server is disabled.
-		if ! use sound-server ; then
-			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-
-			break
-		fi
-	done
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both new users and those upgrading need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-
-		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.63-r3.ebuild b/media-video/pipewire/pipewire-0.3.63-r3.ebuild
new file mode 100644
index 000000000000..e91c865b5b7e
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.63-r3.ebuild
@@ -0,0 +1,450 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	fi
+
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+REQUIRED_USE="
+	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	flatpak? (
+		dev-libs/glib
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gsettings? (
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	readline? ( sys-libs/readline:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${P}-alsa-node-target.patch
+	"${FILESDIR}"/${P}-bluez-ldac_abr.patch
+	"${FILESDIR}"/${P}-bluetooth-typo.patch
+	"${FILESDIR}"/${P}-rate-update.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - nice -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature gsettings)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3=disabled
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		$(meson_feature udev)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if use system-service; then
+		newtmpfiles - pipewire.conf <<-EOF || die
+			d /run/pipewire 0755 pipewire pipewire - -
+		EOF
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	use system-service && tmpfiles_process pipewire.conf
+
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+
+			break
+		fi
+	done
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
+		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+
+		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-0.3.65-r1.ebuild b/media-video/pipewire/pipewire-0.3.65-r1.ebuild
deleted file mode 100644
index a97ab7ef8c55..000000000000
--- a/media-video/pipewire/pipewire-0.3.65-r1.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to mention
-# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT=""
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	fi
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2
-modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
-# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
-#   which provides adequate guarantee that alsa-lib will be able to provide audio services.
-#   If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
-#   When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
-# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
-REQUIRED_USE="
-	ffmpeg? ( extra )
-	bluetooth? ( dbus )
-	jack-sdk? ( !jack-client )
-	modemmanager? ( bluetooth )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-# While udev could technically be optional, it's needed for a numebr of options,
-# and not really worth it, bug #877769.
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		dev-libs/glib
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/opus
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	flatpak? (
-		dev-libs/glib
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gsettings? (
-		>=dev-libs/glib-2.26.0:2
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	lv2? ( media-libs/lilv )
-	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-	)
-	sound-server? (
-		!media-sound/pulseaudio[daemon(+)]
-		!media-sound/pulseaudio-daemon
-	)
-	readline? ( sys-libs/readline:= )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	# Used for upstream backports
-	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_feature dbus)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature gsettings)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Dcompress-offload=disabled # Matches upstream, tinycompress unpackaged too
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
-		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth bluez5-codec-opus)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		# Not yet packaged.
-		# http://www.bluez.org/le-audio-support-in-pipewire/
-		-Dbluez5-codec-lc3=disabled
-		-Dbluez5-codec-lc3plus=disabled
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
-		$(meson_native_use_feature flatpak)
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature readline)
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-
-		# Disable pipewire-pulse if sound-server is disabled.
-		if ! use sound-server ; then
-			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-
-			break
-		fi
-	done
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both new users and those upgrading need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-
-		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.65-r2.ebuild b/media-video/pipewire/pipewire-0.3.65-r2.ebuild
new file mode 100644
index 000000000000..7e07410dfab4
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.65-r2.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+#   which provides adequate guarantee that alsa-lib will be able to provide audio services.
+#   If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+#   When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
+REQUIRED_USE="
+	ffmpeg? ( extra )
+	bluetooth? ( dbus )
+	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+# While udev could technically be optional, it's needed for a numebr of options,
+# and not really worth it, bug #877769.
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		dev-libs/glib
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	flatpak? (
+		dev-libs/glib
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gsettings? (
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	readline? ( sys-libs/readline:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	# Used for upstream backports
+	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - nice -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature gsettings)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Dcompress-offload=disabled # Matches upstream, tinycompress unpackaged too
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		# http://www.bluez.org/le-audio-support-in-pipewire/
+		-Dbluez5-codec-lc3=disabled
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if use system-service; then
+		newtmpfiles - pipewire.conf <<-EOF || die
+			d /run/pipewire 0755 pipewire pipewire - -
+		EOF
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
+	use system-service && tmpfiles_process pipewire.conf
+
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+
+			break
+		fi
+	done
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
+		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+
+		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index a97ab7ef8c55..7e07410dfab4 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -15,7 +15,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -309,6 +309,12 @@ multilib_src_install_all() {
 		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
 	fi
 
+	if use system-service; then
+		newtmpfiles - pipewire.conf <<-EOF || die
+			d /run/pipewire 0755 pipewire pipewire - -
+		EOF
+	fi
+
 	if ! use systemd; then
 		insinto /etc/xdg/autostart
 		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
@@ -331,6 +337,7 @@ pkg_postrm() {
 
 pkg_postinst() {
 	udev_reload
+	use system-service && tmpfiles_process pipewire.conf
 
 	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
 	elog "using PipeWire. Do it either manually or add yourself"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 02bbd7ab172f..f71b4865fff7 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 8d37332006cf..af2c6531c747 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 02:11:07 +0000
+Sat, 28 Jan 2023 08:09:56 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 608507045196..a4dfd293bc36 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-01-28T02:11:11Z
+TIMESTAMP 2023-01-28T08:09:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPUhD9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPU2FdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAlvA//Y4lK4FgL+dqTAZqh/hoIYmop+BlbGSpmZljWS9+Jf2n1kzQVIvZInXQ4
-RnYUvkJsGvcZvLfWmA2tuzJIJ/CyIyPw+0oOCUAmmHf89RT6brjgwtvtemLB2W5F
-6HEkRGcNeThsTLKLxVp1c6+XByuWnUgE24nUP49G9+fUY4iL0tSJs7mrsvN83KWO
-aQSYMzovGtkuZqamipHH0LikMc6rzZXY69/0y2FntafbXgrz+vaUo90sd7Ax5omS
-FEWyT9TSG5aFBT/gbtRzx4R/jDPNgJC5anuANfZQtBz3Tiv5yUbYFNdmmeaVEZx1
-TMH2BGYVzNGV9mwjHSJPN1xtscvOwbFda5cXOSupS4Lk6NjPI8NjFI/8BBJl42M5
-t6Uw1lJMUGlW+IhS2LbjBf3utCSgHZq0mQKvvnPiFqZBytIczchHHwcW7VYDHww2
-CTkBJPuiHFVovdxTsDQqoXny247pvmlVm3lPbn7HK74zRhMn0S2v05NK+Svqxvmu
-JqURSC9tfx5MMJKCcp7vxc1OMQR4QonB47hsO3OsF1aUZQMNfYwhVg/JdCdRW025
-yqCj1o3cXHjiMJMKt8kXxsQQIupNCZ0H/pOvE38axqgivbAzfAe3YJKeenLLlmke
-dkjcuOBXYRva+hbz3MdkPNcpKFxD+u7JuBLt+aZiR6RQE77DZck=
-=6dNk
+klDT9RAAluGM3FtyC/AX0OUJIyuzGzVuxkgu7wlc/dltijjFmnTdVaqA9e1WJgH1
+lbOgBtulzBd5WHCCUQC/eM9d189fxDyYWVsKZJ+eajVtCduRR5ZeLvSjRGz8+Cut
+TrwmWu/vhtTj3r68Wxl6/T8nIXXw0+C08163DhoEBPpqdVdinEIKIrRVFz1xlxXK
+bSvW6vbEX0SkCoWewxVeRSnffFn66+sPjPeu/cj5w8xVGPj7o4nnhcFldpT/U0hV
++Y0jgitdEqXWo7OuJu2TZETOCQoq3K6HdzJevKSDCfjYKp2g5GRBrkaSTpeI5WUc
+zlVV5BMSyYRpRBu7YlVlhFPvD3jUf0qsXesYIxs2ASuQV2nldLbIPdCAJP7jfJO/
+N6J1NXiIrI0cvFF0JykOt+SMNAplFSwBnPaEcHASqSm0xXU75rTFuvTtlFogzw8d
+RdXQcSsW649TGyAZeJC3ltS5NPBR/dwHbDnr4h7TAs6LbC3gD+d0g5qEWgUaUOZ4
+Qjck5t6qUIEMl3f6r5W1/TL1PHKXCyEJN4EhYXDbpqUemZiksy8Su5c8iMgRXMXx
+ZjHVz+8EcszsXCjhes4ESLOe7d7x5OOe//4H+cPcFOsCdHcTW2vkM4cGy6AwFf0f
+f0WIKDlF1TWZuVTJ8OGNhOTTfuYy1F/R9lpJvGjB/9fQ6bmXtM0=
+=1KhA
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a79d2b6c1952..af2c6531c747 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 02:11:08 +0000
+Sat, 28 Jan 2023 08:09:56 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 4cbed66b9e30..481b8beb5c67 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index d0797e89abda..04049310af7d 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/pipewire-1 b/metadata/md5-cache/acct-user/pipewire-1
new file mode 100644
index 000000000000..cccf5796366e
--- /dev/null
+++ b/metadata/md5-cache/acct-user/pipewire-1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for running PipeWire as a system-wide instance
+EAPI=7
+INHERIT=acct-user
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/pipewire acct-group/audio
+SLOT=0
+_eclasses_=acct-user	bdca122e03cd10755e7ed12b03562501	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_md5_=6e22dbdd2ee3bc310947e1db36482fae
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 280f700c32f4..faec04d52223 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/awscli-1.27.59 b/metadata/md5-cache/app-admin/awscli-1.27.59
new file mode 100644
index 000000000000..9a21866a8a9f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.59
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.59[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.59[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.27.59.tar.gz -> aws-cli-1.27.59.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 8d5ee0d21807..6ba2596450ed 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/dpkg-1.21.18 b/metadata/md5-cache/app-arch/dpkg-1.21.18
deleted file mode 100644
index 940c4591b136..000000000000
--- a/metadata/md5-cache/app-arch/dpkg-1.21.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-arch/gzip-1.7 >=app-arch/tar-1.34-r1 app-crypt/libmd >=dev-lang/perl-5.14.2:= sys-libs/ncurses:=[unicode(+)] bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= ) app-arch/xz-utils virtual/pkgconfig test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness )
-DESCRIPTION=Package maintenance system for Debian
-EAPI=8
-HOMEPAGE=https://packages.qa.debian.org/dpkg
-INHERIT=autotools toolchain-funcs
-IUSE=+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd
-LICENSE=GPL-2+
-RDEPEND=>=app-arch/gzip-1.7 >=app-arch/tar-1.34-r1 app-crypt/libmd >=dev-lang/perl-5.14.2:= sys-libs/ncurses:=[unicode(+)] bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.21.18.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=861e5a98ae73bd0bf9efa7368728fe3f
diff --git a/metadata/md5-cache/app-arch/dpkg-1.21.19 b/metadata/md5-cache/app-arch/dpkg-1.21.19
new file mode 100644
index 000000000000..37eb864f0450
--- /dev/null
+++ b/metadata/md5-cache/app-arch/dpkg-1.21.19
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=app-arch/gzip-1.7 >=app-arch/tar-1.34-r1 app-crypt/libmd >=dev-lang/perl-5.14.2:= sys-libs/ncurses:=[unicode(+)] bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= ) app-arch/xz-utils virtual/pkgconfig test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness )
+DESCRIPTION=Package maintenance system for Debian
+EAPI=8
+HOMEPAGE=https://packages.qa.debian.org/dpkg
+INHERIT=autotools toolchain-funcs
+IUSE=+bzip2 +lzma nls selinux static-libs test +update-alternatives +zlib +zstd
+LICENSE=GPL-2+
+RDEPEND=>=app-arch/gzip-1.7 >=app-arch/tar-1.34-r1 app-crypt/libmd >=dev-lang/perl-5.14.2:= sys-libs/ncurses:=[unicode(+)] bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.21.19.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=861e5a98ae73bd0bf9efa7368728fe3f
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 54e2dafa1337..9efaf90c3e29 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/msort-8.53-r1 b/metadata/md5-cache/app-text/msort-8.53-r1
deleted file mode 100644
index 37d59f94c5a1..000000000000
--- a/metadata/md5-cache/app-text/msort-8.53-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/tre icu? ( dev-libs/icu:= ) !icu? ( dev-libs/libutf8proc:= ) libuninum? ( dev-libs/libuninum:= )
-DESCRIPTION=A program for sorting files in sophisticated ways
-EAPI=8
-HOMEPAGE=https://billposer.org/Software/msort.html
-INHERIT=autotools
-IUSE=heap +icu +libuninum
-KEYWORDS=amd64 x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-libs/tre icu? ( dev-libs/icu:= ) !icu? ( dev-libs/libutf8proc:= ) libuninum? ( dev-libs/libuninum:= )
-SLOT=0
-SRC_URI=https://billposer.org/Software/Downloads/msort-8.53.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9fe14d665ac48a69d7d98843aa285b7d
diff --git a/metadata/md5-cache/app-text/msort-8.53-r2 b/metadata/md5-cache/app-text/msort-8.53-r2
new file mode 100644
index 000000000000..eeecb922472f
--- /dev/null
+++ b/metadata/md5-cache/app-text/msort-8.53-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/tre icu? ( dev-libs/icu:= ) !icu? ( dev-libs/libutf8proc:= ) libuninum? ( dev-libs/libuninum:= )
+DESCRIPTION=A program for sorting files in sophisticated ways
+EAPI=8
+HOMEPAGE=https://billposer.org/Software/msort.html
+INHERIT=autotools
+IUSE=heap +icu +libuninum
+KEYWORDS=amd64 x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=dev-libs/tre icu? ( dev-libs/icu:= ) !icu? ( dev-libs/libutf8proc:= ) libuninum? ( dev-libs/libuninum:= )
+SLOT=0
+SRC_URI=https://billposer.org/Software/Downloads/msort-8.53.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=15ce5b44e823d54e8ae4737dcfead717
diff --git a/metadata/md5-cache/app-text/poppler-23.01.0 b/metadata/md5-cache/app-text/poppler-23.01.0
index 99fb5cffed70..d30ecbd0624b 100644
--- a/metadata/md5-cache/app-text/poppler-23.01.0
+++ b/metadata/md5-cache/app-text/poppler-23.01.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/glib-utils-2.64 virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-aacid ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) boost? ( >=dev-libs/boost-1.71 )
+DEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) boost? ( >=dev-libs/boost-1.71 )
 DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
@@ -8,9 +8,9 @@ INHERIT=cmake toolchain-funcs xdg-utils verify-sig
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils verify-sig
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) cjk? ( app-text/poppler-data )
+RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/126
 SRC_URI=https://poppler.freedesktop.org/poppler-23.01.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-23.01.0.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=64131540ab5d11f82b737bf7ff0861f3
+_md5_=d444090f21a3e303e8b5761d638e7049
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 3ba56898c2ad..4ff0d98b69cd 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/glib-utils-2.64 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) boost? ( >=dev-libs/boost-1.71 )
+DEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) boost? ( >=dev-libs/boost-1.71 )
 DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
@@ -8,8 +8,8 @@ INHERIT=cmake toolchain-funcs xdg-utils git-r3
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) cjk? ( app-text/poppler-data )
+RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0454feaa5c3f6ca9c5abe6bfd8c94eb4
+_md5_=898da044c14e9b064f3f3305248ba8f6
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 5bb387942653..f1ed7b8f24ab 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/godot-4.0_beta14 b/metadata/md5-cache/dev-games/godot-4.0_beta14
deleted file mode 100644
index cff2dffc83dc..000000000000
--- a/metadata/md5-cache/dev-games/godot-4.0_beta14
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) vulkan? ( media-libs/vulkan-loader[X] ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
-DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
-EAPI=8
-HOMEPAGE=https://godotengine.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-IUSE=+dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +vulkan +webp
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
-RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) vulkan? ( media-libs/vulkan-loader[X] ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
-RESTRICT=test
-SLOT=4
-SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/beta14/godot-4.0-beta14.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b22818c1ceba5c37bae22c8c39808f0a
diff --git a/metadata/md5-cache/dev-games/godot-4.0_beta16 b/metadata/md5-cache/dev-games/godot-4.0_beta16
new file mode 100644
index 000000000000..ad8e1b6a44ac
--- /dev/null
+++ b/metadata/md5-cache/dev-games/godot-4.0_beta16
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= gui? ( media-libs/libglvnd[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) tools? ( test? ( dev-cpp/doctest ) )
+DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
+EAPI=8
+HOMEPAGE=https://godotengine.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=bash-completion-r1 desktop optfeature python-any-r1 scons-utils toolchain-funcs xdg
+IUSE=debug deprecated +gui raycast +runner test +theora +tools +upnp +vulkan +webp
+KEYWORDS=~amd64
+LICENSE=MIT AFL-2.1 Apache-2.0 BSD Boost-1.0 CC0-1.0 LGPL-2.1+ Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= gui? ( media-libs/libglvnd[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
+RESTRICT=test
+SLOT=4
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/beta16/godot-4.0-beta16.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8ade416ef206719062cbc907772307ef
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4489746cb92c..84443f9bd039 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/error-prone-annotations-2.7.1 b/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
deleted file mode 100644
index 7a18e35d185a..000000000000
--- a/metadata/md5-cache/dev-java/error-prone-annotations-2.7.1
+++ /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=Java annotations for the Error Prone static analysis tool
-EAPI=7
-HOMEPAGE=http://errorprone.info
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-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 )
-SLOT=0
-SRC_URI=https://codeload.github.com/google/error-prone/tar.gz/v2.7.1 -> error-prone-2.7.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=0cca748e4ff975067e06bc5596d4962a
diff --git a/metadata/md5-cache/dev-java/guava-30.1.1 b/metadata/md5-cache/dev-java/guava-30.1.1
deleted file mode 100644
index 9aa38f42fb32..000000000000
--- a/metadata/md5-cache/dev-java/guava-30.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=dev-java/checker-framework-qual-3.14.0:0 dev-java/j2objc-annotations:0 >=virtual/jdk-1.8:* >=dev-java/error-prone-annotations-2.7.1:0 >=dev-java/failureaccess-30.1.1:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A collection of Google's core Java libraries
-EAPI=7
-HOMEPAGE=https://github.com/google/guava
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/error-prone-annotations-2.7.1:0 >=dev-java/failureaccess-30.1.1:0 dev-java/jsr305:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://codeload.github.com/google/guava/tar.gz/v30.1.1 -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=b7a8182279a430660d9c84a74b18d222
diff --git a/metadata/md5-cache/dev-java/guava-testlib-30.1.1 b/metadata/md5-cache/dev-java/guava-testlib-30.1.1
deleted file mode 100644
index 0cdf69e01dd2..000000000000
--- a/metadata/md5-cache/dev-java/guava-testlib-30.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~dev-java/guava-30.1.1:0 dev-java/jsr305:0 dev-java/junit:4 dev-java/j2objc-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=A set of java classes to assist the tests for Guava itself
-EAPI=8
-HOMEPAGE=https://github.com/google/guava
-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/checker-framework-qual:0 dev-java/error-prone-annotations:0 ~dev-java/guava-30.1.1:0 dev-java/jsr305:0 dev-java/junit:4 dev-java/j2objc-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/guava/archive/v30.1.1.tar.gz -> guava-30.1.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=3fbd991319b8644dea02060fac23b0ee
diff --git a/metadata/md5-cache/dev-java/jctools-core-3.3.0 b/metadata/md5-cache/dev-java/jctools-core-3.3.0
deleted file mode 100644
index 538ead798767..000000000000
--- a/metadata/md5-cache/dev-java/jctools-core-3.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava-testlib:0 dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Java Concurrency Tools Core Library
-EAPI=8
-HOMEPAGE=https://jctools.github.io/JCTools/
-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=3
-SRC_URI=https://github.com/JCTools/JCTools/archive/v3.3.0.tar.gz -> jctools-3.3.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=1564a9dc41ccccdfd157077b2452831f
diff --git a/metadata/md5-cache/dev-java/woodstox-core-6.3.1 b/metadata/md5-cache/dev-java/woodstox-core-6.3.1
deleted file mode 100644
index 95dc277e472e..000000000000
--- a/metadata/md5-cache/dev-java/woodstox-core-6.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jdk-11:* dev-java/aqute-bnd-annotation:0 dev-java/osgi-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=An XML processor that implements Stax (JSR-173), SAX2 and Stax2 APIs
-EAPI=8
-HOMEPAGE=https://github.com/FasterXML/woodstox
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/stax2-api:0 dev-java/xsdlib:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FasterXML/woodstox/archive/woodstox-core-6.3.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=38d50f80bbcf974ebe9908bd4526c729
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
deleted file mode 100644
index 93cfff252510..000000000000
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jdk-1.8:* test? ( dev-java/mockito:4 dev-java/xml-commons-resolver:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=XML Graphics Commons
-EAPI=8
-HOMEPAGE=https://xmlgraphics.apache.org/commons/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.7-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=ec3c7a3bfcc7f8291d550d34ad8799a7
diff --git a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.4 b/metadata/md5-cache/dev-java/zstd-jni-1.5.2.4
deleted file mode 100644
index fc2c5646af4e..000000000000
--- a/metadata/md5-cache/dev-java/zstd-jni-1.5.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JNI bindings for Zstd native library
-EAPI=8
-HOMEPAGE=https://github.com/luben/zstd-jni
-INHERIT=java-pkg-2 java-pkg-simple cmake
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/luben/zstd-jni/archive/37faee49643b2739457716e3752f44fcaa09005f.tar.gz -> zstd-jni-1.5.2.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3d003143c8b6daf737dee683b2d9d113
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e14209c3ef6e..6ef42033464a 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/rust-1.67.0 b/metadata/md5-cache/dev-lang/rust-1.67.0
new file mode 100644
index 000000000000..d11410dcdf09
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.67.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.66* =dev-lang/rust-bin-1.66* =dev-lang/rust-1.67* =dev-lang/rust-bin-1.67* ) ) !system-llvm? ( >=dev-util/cmake-3.13.4 dev-util/ninja ) test? ( sys-devel/gdb ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:15[llvm_targets_AArch64(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AMDGPU? ( sys-devel/llvm:15[llvm_targets_AMDGPU(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_ARM? ( sys-devel/llvm:15[llvm_targets_ARM(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AVR? ( sys-devel/llvm:15[llvm_targets_AVR(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_BPF? ( sys-devel/llvm:15[llvm_targets_BPF(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Hexagon? ( sys-devel/llvm:15[llvm_targets_Hexagon(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Lanai? ( sys-devel/llvm:15[llvm_targets_Lanai(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Mips? ( sys-devel/llvm:15[llvm_targets_Mips(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_MSP430? ( sys-devel/llvm:15[llvm_targets_MSP430(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_NVPTX? ( sys-devel/llvm:15[llvm_targets_NVPTX(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_PowerPC? ( sys-devel/llvm:15[llvm_targets_PowerPC(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_RISCV? ( sys-devel/llvm:15[llvm_targets_RISCV(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Sparc? ( sys-devel/llvm:15[llvm_targets_Sparc(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_SystemZ? ( sys-devel/llvm:15[llvm_targets_SystemZ(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_WebAssembly? ( sys-devel/llvm:15[llvm_targets_WebAssembly(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_X86? ( sys-devel/llvm:15[llvm_targets_X86(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_XCore? ( sys-devel/llvm:15[llvm_targets_XCore(-)] ) wasm? ( sys-devel/lld:15 ) ) ) <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) !system-llvm? ( !llvm-libunwind? ( elibc_musl? ( sys-libs/libunwind:= ) ) ) !!sys-devel/llvm:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=8
+HOMEPAGE=https://www.rust-lang.org/
+INHERIT=bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
+IUSE=clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:15[llvm_targets_AArch64(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AMDGPU? ( sys-devel/llvm:15[llvm_targets_AMDGPU(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_ARM? ( sys-devel/llvm:15[llvm_targets_ARM(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AVR? ( sys-devel/llvm:15[llvm_targets_AVR(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_BPF? ( sys-devel/llvm:15[llvm_targets_BPF(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Hexagon? ( sys-devel/llvm:15[llvm_targets_Hexagon(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Lanai? ( sys-devel/llvm:15[llvm_targets_Lanai(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Mips? ( sys-devel/llvm:15[llvm_targets_Mips(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_MSP430? ( sys-devel/llvm:15[llvm_targets_MSP430(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_NVPTX? ( sys-devel/llvm:15[llvm_targets_NVPTX(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_PowerPC? ( sys-devel/llvm:15[llvm_targets_PowerPC(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_RISCV? ( sys-devel/llvm:15[llvm_targets_RISCV(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Sparc? ( sys-devel/llvm:15[llvm_targets_Sparc(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_SystemZ? ( sys-devel/llvm:15[llvm_targets_SystemZ(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_WebAssembly? ( sys-devel/llvm:15[llvm_targets_WebAssembly(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_X86? ( sys-devel/llvm:15[llvm_targets_X86(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_XCore? ( sys-devel/llvm:15[llvm_targets_XCore(-)] ) wasm? ( sys-devel/lld:15 ) ) ) <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) !system-llvm? ( !llvm-libunwind? ( elibc_musl? ( sys-libs/libunwind:= ) ) ) app-eselect/eselect-rust sys-apps/lsb-release
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+RESTRICT=test
+SLOT=stable/1.67
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=abc2460edcdfe816f7fcc49f39d8b6d3
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.67.0 b/metadata/md5-cache/dev-lang/rust-bin-1.67.0
new file mode 100644
index 000000000000..faae765220ff
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.67.0
@@ -0,0 +1,15 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=8
+HOMEPAGE=https://www.rust-lang.org/
+INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+IUSE=clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311 sys-apps/lsb-release
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.67.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-01-26/rust-src-1.67.0.tar.xz )
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=de0c644810cec92c0e1dda8c166d1c39
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e736f79948d5..b52f15c63029 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/boto3-1.26.59 b/metadata/md5-cache/dev-python/boto3-1.26.59
new file mode 100644
index 000000000000..001415e5672f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.59
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.59[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.59[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.59.tar.gz -> boto3-1.26.59.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.59 b/metadata/md5-cache/dev-python/botocore-1.29.59
new file mode 100644
index 000000000000..4b320ea6d415
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.59
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.59.tar.gz -> botocore-1.29.59.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.72.10 b/metadata/md5-cache/dev-python/cfn-lint-0.72.10
new file mode 100644
index 000000000000..4ef8291d83b2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.72.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.56.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.56.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.72.10.tar.gz -> cfn-lint-0.72.10.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=d858537e895a86b21ceaaa07f97fe98e
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.72.6 b/metadata/md5-cache/dev-python/cfn-lint-0.72.6
deleted file mode 100644
index afc41464eb7a..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.72.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.55.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.55.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.72.6.tar.gz -> cfn-lint-0.72.6.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=cd91e69c22766ba77f4e00d18d78fb18
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.72.7 b/metadata/md5-cache/dev-python/cfn-lint-0.72.7
deleted file mode 100644
index ff2d84d0c25a..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.72.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.56.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.56.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.72.7.tar.gz -> cfn-lint-0.72.7.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d858537e895a86b21ceaaa07f97fe98e
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.72.8 b/metadata/md5-cache/dev-python/cfn-lint-0.72.8
deleted file mode 100644
index 6e18d96df473..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.72.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.56.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.56.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.72.8.tar.gz -> cfn-lint-0.72.8.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d858537e895a86b21ceaaa07f97fe98e
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.72.9 b/metadata/md5-cache/dev-python/cfn-lint-0.72.9
index 57f3cb89697e..530f57f4dc38 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-0.72.9
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.72.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.56.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.72.9.tar.gz -> cfn-lint-0.72.9.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d858537e895a86b21ceaaa07f97fe98e
+_md5_=2fc0cdefa821c146591f8a6436651446
diff --git a/metadata/md5-cache/dev-python/cmd2-2.4.3 b/metadata/md5-cache/dev-python/cmd2-2.4.3
new file mode 100644
index 000000000000..3e6e4f48ecc6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cmd2-2.4.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extra features for standard library's cmd module
+EAPI=8
+HOMEPAGE=https://github.com/python-cmd2/cmd2/ https://pypi.org/project/cmd2/
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cmd2/cmd2-2.4.3.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=adeb71fff2a698b6314f1997753c4b3f
diff --git a/metadata/md5-cache/dev-python/dask-2023.1.1 b/metadata/md5-cache/dev-python/dask-2023.1.1
new file mode 100644
index 000000000000..e5140a37e819
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2023.1.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=8
+HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-0.3.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dask/dask/archive/2023.1.1.tar.gz -> dask-2023.1.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=1214bc6090122ba1ede385a9ebb0314c
diff --git a/metadata/md5-cache/dev-python/emcee-3.1.4 b/metadata/md5-cache/dev-python/emcee-3.1.4
new file mode 100644
index 000000000000..d3c28e06136d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/emcee-3.1.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Python ensemble sampling toolkit for affine-invariant MCMC
+EAPI=8
+HOMEPAGE=https://emcee.readthedocs.io/en/stable/ https://github.com/dfm/emcee/ https://pypi.org/project/emcee/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/e/emcee/emcee-3.1.4.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=b1c48bda4d4f5407dedfbab9dd7dd739
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.6.0 b/metadata/md5-cache/dev-python/fakeredis-2.6.0
new file mode 100644
index 000000000000..f83a644c940f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fakeredis-2.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fake implementation of redis API for testing purposes
+EAPI=8
+HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cunla/fakeredis-py/archive/v2.6.0.tar.gz -> fakeredis-py-2.6.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=eb1f9893542938a4dd5a2e0feec609ef
diff --git a/metadata/md5-cache/dev-python/httpx-0.23.1-r1 b/metadata/md5-cache/dev-python/httpx-0.23.1-r1
deleted file mode 100644
index 349f0a893298..000000000000
--- a/metadata/md5-cache/dev-python/httpx-0.23.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-trio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/socksio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uvicorn[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpcore-0.17[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/rich-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
-EAPI=8
-HOMEPAGE=https://www.python-httpx.org/ https://github.com/encode/httpx/ https://pypi.org/project/httpx/
-INHERIT=distutils-r1 optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpcore-0.17[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/rich-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/httpx/archive/0.23.1.tar.gz -> httpx-0.23.1.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=63babe65257a9ce5a1cb2b4856ceb6f7
diff --git a/metadata/md5-cache/dev-python/httpx-0.23.2 b/metadata/md5-cache/dev-python/httpx-0.23.2
deleted file mode 100644
index 4402a8bd29be..000000000000
--- a/metadata/md5-cache/dev-python/httpx-0.23.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-trio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/socksio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uvicorn[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpcore-0.17[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/rich-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
-EAPI=8
-HOMEPAGE=https://www.python-httpx.org/ https://github.com/encode/httpx/ https://pypi.org/project/httpx/
-INHERIT=distutils-r1 optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpcore-0.17[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/rich-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/httpx/archive/0.23.2.tar.gz -> httpx-0.23.2.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=52b04a55f92feabb60ebfe50dd142203
diff --git a/metadata/md5-cache/dev-python/httpx-0.23.3-r1 b/metadata/md5-cache/dev-python/httpx-0.23.3-r1
index 3ea6bbc90587..814795ead501 100644
--- a/metadata/md5-cache/dev-python/httpx-0.23.3-r1
+++ b/metadata/md5-cache/dev-python/httpx-0.23.3-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.python-httpx.org/ https://github.com/encode/httpx/ https://pypi.org/project/httpx/
 INHERIT=distutils-r1 optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httpcore-0.17[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpcore-0.15[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpx/archive/0.23.3.tar.gz -> httpx-0.23.3.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=20d320956b5383eec3f372f4fb9093c2
+_md5_=e8d0e45b81547b8631519cf519ac518b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.65.2 b/metadata/md5-cache/dev-python/hypothesis-6.65.2
new file mode 100644
index 000000000000..3c5902e89263
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.65.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.65.2.tar.gz -> hypothesis-6.65.2.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=990cdabf0a2222632a46e5fc0ed375f9
diff --git a/metadata/md5-cache/dev-python/ipython-8.9.0 b/metadata/md5-cache/dev-python/ipython-8.9.0
new file mode 100644
index 000000000000..99a4be0b8805
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-8.9.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[readline,sqlite,threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=8
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/ https://pypi.org/project/ipython/
+INHERIT=distutils-r1 optfeature virtualx
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/widgetsnbextension[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+RDEPEND=dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.30[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] nbconvert? ( dev-python/nbconvert[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[readline,sqlite,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-8.9.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=993d1e0d8c76c2c5ba2d574cbb3f3245
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.11.1 b/metadata/md5-cache/dev-python/jaraco-text-3.11.1
new file mode 100644
index 000000000000..edfdc1d89d2c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.11.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/inflect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) ) test? ( >=dev-python/jaraco-context-4.1.1-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-3.5.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Text utilities used by other projects by developer jaraco
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.text/ https://pypi.org/project/jaraco.text/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+PDEPEND=dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/inflect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/jaraco-context-4.1.1-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-3.5.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.11.1.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=458be2be1d056bebea01532657cc319c
diff --git a/metadata/md5-cache/dev-python/jupyter_kernel_test-0.5.0 b/metadata/md5-cache/dev-python/jupyter_kernel_test-0.5.0
new file mode 100644
index 000000000000..406da42aa922
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_kernel_test-0.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_client-6.1.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Jupyter kernel for octave
+EAPI=8
+HOMEPAGE=https://github.com/jupyter/jupyter_kernel_test/ https://pypi.org/project/jupyter-kernel-test/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/jupyter_client-6.1.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_kernel_test/jupyter_kernel_test-0.5.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=46cb0ead373c62ee34b21721890db67f
diff --git a/metadata/md5-cache/dev-python/pefile-2022.5.30-r1 b/metadata/md5-cache/dev-python/pefile-2022.5.30-r1
index be19d331fdfe..c9ea37025c61 100644
--- a/metadata/md5-cache/dev-python/pefile-2022.5.30-r1
+++ b/metadata/md5-cache/dev-python/pefile-2022.5.30-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/erocarrera/pefile
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pefile/releases/download/v2022.5.30/pefile-2022.5.30.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=73b1e356f4f9245f08d122c393c016ed
+_md5_=a6ce629fab259f300b35f48a0a628ed2
diff --git a/metadata/md5-cache/dev-python/pyannotate-1.2.0 b/metadata/md5-cache/dev-python/pyannotate-1.2.0
deleted file mode 100644
index 30bfdcf15a18..000000000000
--- a/metadata/md5-cache/dev-python/pyannotate-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mypy_extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Auto-generate PEP-484 annotations
-EAPI=8
-HOMEPAGE=https://github.com/dropbox/pyannotate
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/mypy_extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dropbox/pyannotate/archive/refs/tags/v1.2.0.tar.gz -> pyannotate-1.2.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ebec969e948e0a8b204b201177435cc7
diff --git a/metadata/md5-cache/dev-python/pyannotate-1.2.0-r1 b/metadata/md5-cache/dev-python/pyannotate-1.2.0-r1
new file mode 100644
index 000000000000..74b2234345e9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyannotate-1.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/mypy_extensions-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Auto-generate PEP-484 annotations
+EAPI=8
+HOMEPAGE=https://github.com/dropbox/pyannotate
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/mypy_extensions-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dropbox/pyannotate/archive/refs/tags/v1.2.0.tar.gz -> pyannotate-1.2.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=2c957e08d94a49614832d0456d6d8b3a
diff --git a/metadata/md5-cache/dev-python/rich-12.6.0 b/metadata/md5-cache/dev-python/rich-12.6.0
deleted file mode 100644
index 7ed02e41850d..000000000000
--- a/metadata/md5-cache/dev-python/rich-12.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v12.6.0.tar.gz -> rich-12.6.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ff66c3fc3f38bdaa51000d95a3f30041
diff --git a/metadata/md5-cache/dev-python/rich-13.0.0 b/metadata/md5-cache/dev-python/rich-13.0.0
deleted file mode 100644
index f5d0d9b20b5b..000000000000
--- a/metadata/md5-cache/dev-python/rich-13.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v13.0.0.tar.gz -> rich-13.0.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=99c23725c43c8d09f9dc2a6f00bddf6d
diff --git a/metadata/md5-cache/dev-python/rich-13.0.1 b/metadata/md5-cache/dev-python/rich-13.0.1
deleted file mode 100644
index b0d2c7028ce7..000000000000
--- a/metadata/md5-cache/dev-python/rich-13.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v13.0.1.tar.gz -> rich-13.0.1.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6474c43aa2fc7c9751412fca087f9751
diff --git a/metadata/md5-cache/dev-python/rich-13.1.0 b/metadata/md5-cache/dev-python/rich-13.1.0
deleted file mode 100644
index a989c3fd54e2..000000000000
--- a/metadata/md5-cache/dev-python/rich-13.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v13.1.0.tar.gz -> rich-13.1.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6474c43aa2fc7c9751412fca087f9751
diff --git a/metadata/md5-cache/dev-python/rich-13.2.0 b/metadata/md5-cache/dev-python/rich-13.2.0
index 6aec84acb0b0..c1d98b0b43ae 100644
--- a/metadata/md5-cache/dev-python/rich-13.2.0
+++ b/metadata/md5-cache/dev-python/rich-13.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Textualize/rich/archive/v13.2.0.tar.gz -> rich-13.2.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=eae5a03579ec4a2cacbae58a0c9fa66e
+_md5_=348aca590410de1ac7e5571fb0a79575
diff --git a/metadata/md5-cache/dev-python/rich-13.3.0 b/metadata/md5-cache/dev-python/rich-13.3.0
new file mode 100644
index 000000000000..ba21c523193b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rich-13.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
+EAPI=8
+HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 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=MIT
+RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Textualize/rich/archive/v13.3.0.tar.gz -> rich-13.3.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=3e31b8fe762824800cbdcbc3a12e57cc
diff --git a/metadata/md5-cache/dev-python/rst-linker-2.4.0 b/metadata/md5-cache/dev-python/rst-linker-2.4.0
new file mode 100644
index 000000000000..72050880ad8c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rst-linker-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/path[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sphinx plugin to add links and timestamps to the changelog
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/rst.linker/ https://pypi.org/project/rst.linker/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/rst.linker/rst.linker-2.4.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=d9805adc706e9b618bd970c99dd57fae
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.4 b/metadata/md5-cache/dev-python/snakeoil-0.10.4
deleted file mode 100644
index 19598f258ec2..000000000000
--- a/metadata/md5-cache/dev-python/snakeoil-0.10.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/flit_core-3.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=misc common functionality and useful optimizations
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/snakeoil
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD BSD-2 MIT
-RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.4.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=205ba59fa552030c027d761e2e6ae28a
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.5 b/metadata/md5-cache/dev-python/snakeoil-0.10.5
index ceb0cb88db24..910fdeab0689 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.10.5
+++ b/metadata/md5-cache/dev-python/snakeoil-0.10.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD BSD-2 MIT
 RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.5.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=26b0a700d65a4472c4e2ae11837e76c0
+_md5_=205ba59fa552030c027d761e2e6ae28a
diff --git a/metadata/md5-cache/dev-python/zipp-3.12.0 b/metadata/md5-cache/dev-python/zipp-3.12.0
new file mode 100644
index 000000000000..c3f202e41c2c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zipp-3.12.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-itertools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/zipp/ https://pypi.org/project/zipp/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zipp/zipp-3.12.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=7854f72135d3dd23398d03572deaceb5
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 13a5a234f7ff..cddb2b7acbd3 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r3 b/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r3
deleted file mode 100644
index 2e60be38aa31..000000000000
--- a/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install prepare
-DEPEND=acct-group/gamestat dev-games/KXL
-DESCRIPTION=2D/3D shooting game
-EAPI=8
-HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
-INHERIT=autotools desktop
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/gamestat dev-games/KXL media-fonts/font-adobe-100dpi media-fonts/font-bitstream-100dpi
-SLOT=0
-SRC_URI=mirror://gentoo/SpaceAryarya-KXL-1.0.2.tar.gz https://dev.gentoo.org/~ionen/distfiles/spacearyarya-kxl.png
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4d01251b4f5916fa32de5c7626a632b0
diff --git a/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.3 b/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.3
new file mode 100644
index 000000000000..6141dd24adb3
--- /dev/null
+++ b/metadata/md5-cache/games-action/spacearyarya-kxl-1.0.3
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install prepare
+DEPEND=acct-group/gamestat dev-games/KXL
+DESCRIPTION=2D/3D shooting game
+EAPI=8
+HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
+INHERIT=autotools desktop
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/gamestat dev-games/KXL media-fonts/font-adobe-100dpi media-fonts/font-bitstream-100dpi
+SLOT=0
+SRC_URI=https://gitlab.com/oss-abandonware/games-action/space-aryarya/-/archive/1.0.3/space-aryarya-1.0.3.tar.bz2 https://dev.gentoo.org/~ionen/distfiles/spacearyarya-kxl.png
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=30ab4a6afad71100f02463e535309a5e
diff --git a/metadata/md5-cache/games-action/supertuxkart-1.4 b/metadata/md5-cache/games-action/supertuxkart-1.4
deleted file mode 100644
index 57381b007a2e..000000000000
--- a/metadata/md5-cache/games-action/supertuxkart-1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-cpp/libmcpp dev-libs/angelscript:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsdl2[opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/libintl nettle? ( dev-libs/nettle:= ) !nettle? ( >=dev-libs/openssl-1.0.1d:= ) recorder? ( media-libs/libopenglrecorder ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/shaderc ) wiimote? ( net-wireless/bluez )
-DESCRIPTION=A kart racing game starring Tux, the linux penguin (TuxKart fork)
-EAPI=8
-HOMEPAGE=https://supertuxkart.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop xdg
-IUSE=debug nettle recorder sqlite vulkan wiimote
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB
-RDEPEND=dev-cpp/libmcpp dev-libs/angelscript:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsdl2[opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/libintl nettle? ( dev-libs/nettle:= ) !nettle? ( >=dev-libs/openssl-1.0.1d:= ) recorder? ( media-libs/libopenglrecorder ) sqlite? ( dev-db/sqlite:3 ) vulkan? ( media-libs/shaderc ) wiimote? ( net-wireless/bluez )
-SLOT=0
-SRC_URI=https://github.com/supertuxkart/stk-code/releases/download/1.4/SuperTuxKart-1.4-src.tar.xz mirror://gentoo/supertuxkart.png
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=57e290e6fa705df3781e1946af4a02f3
diff --git a/metadata/md5-cache/games-action/supertuxkart-1.4-r1 b/metadata/md5-cache/games-action/supertuxkart-1.4-r1
new file mode 100644
index 000000000000..b3d94d8d144f
--- /dev/null
+++ b/metadata/md5-cache/games-action/supertuxkart-1.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-cpp/libmcpp dev-libs/angelscript:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsdl2[opengl,video] media-libs/libvorbis media-libs/openal media-libs/shaderc net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/libintl nettle? ( dev-libs/nettle:= ) !nettle? ( >=dev-libs/openssl-1.0.1d:= ) recorder? ( media-libs/libopenglrecorder ) sqlite? ( dev-db/sqlite:3 ) wiimote? ( net-wireless/bluez )
+DESCRIPTION=A kart racing game starring Tux, the linux penguin (TuxKart fork)
+EAPI=8
+HOMEPAGE=https://supertuxkart.net/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake desktop xdg
+IUSE=debug nettle recorder sqlite wiimote
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB
+RDEPEND=dev-cpp/libmcpp dev-libs/angelscript:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsdl2[opengl,video] media-libs/libvorbis media-libs/openal media-libs/shaderc net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/libintl nettle? ( dev-libs/nettle:= ) !nettle? ( >=dev-libs/openssl-1.0.1d:= ) recorder? ( media-libs/libopenglrecorder ) sqlite? ( dev-db/sqlite:3 ) wiimote? ( net-wireless/bluez )
+SLOT=0
+SRC_URI=https://github.com/supertuxkart/stk-code/releases/download/1.4/SuperTuxKart-1.4-src.tar.xz mirror://gentoo/supertuxkart.png
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=45c35bae06e398426bdbb3cc1e3c9474
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index fe44d5c9b2eb..73ef687232bf 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/alephone-20220115-r1 b/metadata/md5-cache/games-fps/alephone-20220115-r1
deleted file mode 100644
index 2163d1e8ce3c..000000000000
--- a/metadata/md5-cache/games-fps/alephone-20220115-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex media-libs/speexdsp ) upnp? ( net-libs/miniupnpc )
-DESCRIPTION=An enhanced version of the game engine from the classic Mac game, Marathon
-EAPI=8
-HOMEPAGE=http://source.bungie.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools optfeature prefix toolchain-funcs xdg
-IUSE=alsa curl speex upnp
-KEYWORDS=~amd64
-LICENSE=GPL-3+ BitstreamVera OFL-1.1
-RDEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex media-libs/speexdsp ) upnp? ( net-libs/miniupnpc )
-SLOT=0
-SRC_URI=https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-20220115.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3a1352a398b181206e54bb8f6792ed66
diff --git a/metadata/md5-cache/games-fps/alephone-20221126 b/metadata/md5-cache/games-fps/alephone-20221126
new file mode 100644
index 000000000000..d21d82f4af36
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-20221126
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex media-libs/speexdsp ) upnp? ( net-libs/miniupnpc )
+DESCRIPTION=An enhanced version of the game engine from the classic Mac game, Marathon
+EAPI=8
+HOMEPAGE=https://alephone.lhowon.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools optfeature prefix toolchain-funcs xdg
+IUSE=alsa curl speex upnp
+KEYWORDS=~amd64
+LICENSE=GPL-3+ BitstreamVera OFL-1.1
+RDEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex media-libs/speexdsp ) upnp? ( net-libs/miniupnpc )
+SLOT=0
+SRC_URI=https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-20221126.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6f5b8266d9c89c7f6e52b7cf32c539f2
diff --git a/metadata/md5-cache/games-fps/alephone-99999999 b/metadata/md5-cache/games-fps/alephone-99999999
index c5cde8b0bdbb..43e30aa8394a 100644
--- a/metadata/md5-cache/games-fps/alephone-99999999
+++ b/metadata/md5-cache/games-fps/alephone-99999999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex media-libs/speexdsp ) upnp? ( net-libs/miniupnpc )
 DESCRIPTION=An enhanced version of the game engine from the classic Mac game, Marathon
 EAPI=8
-HOMEPAGE=http://source.bungie.org/
+HOMEPAGE=https://alephone.lhowon.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools optfeature prefix toolchain-funcs xdg git-r3
 IUSE=alsa curl speex upnp
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-libs/zziplib:= media-libs/libpng media-libs/libsdl2 media-libs/sdl2-image[png] media-libs/sdl2-net media-libs/sdl2-ttf media-video/ffmpeg:=[mp3,vorbis] sys-libs/zlib virtual/opengl virtual/glu alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) speex? ( media-libs/speex media-libs/speexdsp ) upnp? ( net-libs/miniupnpc )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3a1352a398b181206e54bb8f6792ed66
+_md5_=6f5b8266d9c89c7f6e52b7cf32c539f2
diff --git a/metadata/md5-cache/games-fps/alephone-durandal-20220115 b/metadata/md5-cache/games-fps/alephone-durandal-20220115
deleted file mode 100644
index 9c356cd886c1..000000000000
--- a/metadata/md5-cache/games-fps/alephone-durandal-20220115
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst
-DESCRIPTION=Aleph One - Marathon 2 (Durandal)
-EAPI=8
-HOMEPAGE=http://marathon.sourceforge.net/
-INHERIT=desktop
-KEYWORDS=~amd64
-LICENSE=bungie-marathon
-RDEPEND=games-fps/alephone
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20220115/Marathon2-20220115-Data.zip
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
-_md5_=b373c7d4bbe29f57dda4ff6785c8d3e2
diff --git a/metadata/md5-cache/games-fps/alephone-durandal-20221126 b/metadata/md5-cache/games-fps/alephone-durandal-20221126
new file mode 100644
index 000000000000..caf8050cebd1
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-durandal-20221126
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst
+DESCRIPTION=Aleph One - Marathon 2 (Durandal)
+EAPI=8
+HOMEPAGE=https://alephone.lhowon.org/
+INHERIT=desktop
+KEYWORDS=~amd64
+LICENSE=bungie-marathon
+RDEPEND=games-fps/alephone
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20221126/Marathon2-20221126-Data.zip
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
+_md5_=ce5fbafb1708c5662413fd71101a2a36
diff --git a/metadata/md5-cache/games-fps/alephone-infinity-20220115 b/metadata/md5-cache/games-fps/alephone-infinity-20220115
deleted file mode 100644
index 0db9558efd40..000000000000
--- a/metadata/md5-cache/games-fps/alephone-infinity-20220115
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst
-DESCRIPTION=Aleph One - Marathon Infinity
-EAPI=8
-HOMEPAGE=http://marathon.sourceforge.net/
-INHERIT=desktop
-KEYWORDS=~amd64
-LICENSE=bungie-marathon
-RDEPEND=games-fps/alephone
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20220115/MarathonInfinity-20220115-Data.zip
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
-_md5_=5bb0d17114e0cf7c4c12b65cb0ea0053
diff --git a/metadata/md5-cache/games-fps/alephone-infinity-20221126 b/metadata/md5-cache/games-fps/alephone-infinity-20221126
new file mode 100644
index 000000000000..658e17fd4005
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-infinity-20221126
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst
+DESCRIPTION=Aleph One - Marathon Infinity
+EAPI=8
+HOMEPAGE=https://alephone.lhowon.org/
+INHERIT=desktop
+KEYWORDS=~amd64
+LICENSE=bungie-marathon
+RDEPEND=games-fps/alephone
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20221126/MarathonInfinity-20221126-Data.zip
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
+_md5_=49dbdc97d696e106803dd6a09f4c039d
diff --git a/metadata/md5-cache/games-fps/alephone-marathon-20220115 b/metadata/md5-cache/games-fps/alephone-marathon-20220115
deleted file mode 100644
index 3785ad35f350..000000000000
--- a/metadata/md5-cache/games-fps/alephone-marathon-20220115
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst
-DESCRIPTION=Aleph One - Marathon (M1A1)
-EAPI=8
-HOMEPAGE=http://marathon.sourceforge.net/
-INHERIT=desktop
-KEYWORDS=~amd64
-LICENSE=bungie-marathon
-RDEPEND=games-fps/alephone
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20220115/Marathon-20220115-Data.zip
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
-_md5_=5abfa1399d16737d9c305c9a7188387a
diff --git a/metadata/md5-cache/games-fps/alephone-marathon-20221126 b/metadata/md5-cache/games-fps/alephone-marathon-20221126
new file mode 100644
index 000000000000..dcd6f6ace504
--- /dev/null
+++ b/metadata/md5-cache/games-fps/alephone-marathon-20221126
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst
+DESCRIPTION=Aleph One - Marathon (M1A1)
+EAPI=8
+HOMEPAGE=https://alephone.lhowon.org/
+INHERIT=desktop
+KEYWORDS=~amd64
+LICENSE=bungie-marathon
+RDEPEND=games-fps/alephone
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20221126/Marathon-20221126-Data.zip
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
+_md5_=6135777040ee088790c158caeeec2e13
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 145c660031f7..3ad8e0944df1 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/warzone2100-4.3.3-r3 b/metadata/md5-cache/games-strategy/warzone2100-4.3.3-r3
new file mode 100644
index 000000000000..5dd4c1da68c6
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/warzone2100-4.3.3-r3
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/zip app-text/asciidoc games-util/basis_universal virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-libs/fribidi >=dev-games/physfs-2[zip] dev-db/sqlite:3 >=dev-libs/libsodium-1.0.14:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/opus net-libs/miniupnpc:= net-misc/curl sys-libs/zlib nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) media-libs/fontconfig
+DESCRIPTION=3D real-time strategy game
+EAPI=8
+HOMEPAGE=https://wz2100.net/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake plocale xdg
+IUSE=debug discord nls videos vulkan
+KEYWORDS=~amd64
+LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain vulkan? ( GPL-3 )
+RDEPEND=dev-libs/fribidi >=dev-games/physfs-2[zip] dev-db/sqlite:3 >=dev-libs/libsodium-1.0.14:= media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/opus net-libs/miniupnpc:= net-misc/curl sys-libs/zlib nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) media-fonts/dejavu
+SLOT=0
+SRC_URI=mirror://sourceforge/warzone2100/releases/4.3.3/warzone2100_src.tar.xz -> warzone2100-4.3.3.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e1a9aea873e1c35f50fa2ba4e62b5d40
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 4dba26fa7088..a4fe7f6490ff 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/basis_universal-1.16.3 b/metadata/md5-cache/games-util/basis_universal-1.16.3
new file mode 100644
index 000000000000..70ba4a418fc7
--- /dev/null
+++ b/metadata/md5-cache/games-util/basis_universal-1.16.3
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=opencl? ( virtual/opencl )
+DESCRIPTION=Basis Universal GPU Texture Codec
+EAPI=8
+HOMEPAGE=https://github.com/BinomialLLC/basis_universal
+INHERIT=cmake toolchain-funcs
+IUSE=cpu_flags_x86_sse4_1 opencl zstd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 zstd? ( BSD )
+SLOT=0
+SRC_URI=https://github.com/BinomialLLC/basis_universal/archive/refs/tags/1.16.3.tar.gz -> basis_universal-1.16.3.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2f65c5a412f697af774d3f8cde676708
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index d900b253abfb..0fe58b3c7508 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/kodi-19.4-r3 b/metadata/md5-cache/media-tv/kodi-19.4-r3
index ce00fc4230a7..4140492f0950 100644
--- a/metadata/md5-cache/media-tv/kodi-19.4-r3
+++ b/metadata/md5-cache/media-tv/kodi-19.4-r3
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= !gles? ( media-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= !gles? ( media-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
@@ -8,10 +8,10 @@ INHERIT=autotools cmake desktop libtool linux-info pax-utils python-single-r1 xd
 IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= !gles? ( media-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= !gles? ( media-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.4-Matrix.tar.gz -> kodi-19.4-Matrix.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=464ef6ea20202b9975d92cad8dc49855
+_md5_=b08e14c062ad1b6eaa630237e45d5c68
diff --git a/metadata/md5-cache/media-tv/kodi-19.4-r4 b/metadata/md5-cache/media-tv/kodi-19.4-r4
index 17b48f6a3339..4b9cac11227f 100644
--- a/metadata/md5-cache/media-tv/kodi-19.4-r4
+++ b/metadata/md5-cache/media-tv/kodi-19.4-r4
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
@@ -8,10 +8,10 @@ INHERIT=autotools cmake desktop libtool linux-info pax-utils python-single-r1 xd
 IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.4-Matrix.tar.gz -> kodi-19.4-Matrix.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=570c7c655a175c21f496218b3ff47e1e
+_md5_=8572bd5e563320e36a5c50024c30cc2b
diff --git a/metadata/md5-cache/media-tv/kodi-19.5 b/metadata/md5-cache/media-tv/kodi-19.5
index 9930b1781026..a16f31dbdc63 100644
--- a/metadata/md5-cache/media-tv/kodi-19.5
+++ b/metadata/md5-cache/media-tv/kodi-19.5
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
@@ -8,10 +8,10 @@ INHERIT=autotools cmake desktop libtool linux-info pax-utils python-single-r1 xd
 IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.5-Matrix.tar.gz -> kodi-19.5-Matrix.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2a997746a62c0d721298f6fa681dc9cb
+_md5_=8a8ce25d7bd01d787cabc57daa8c6db2
diff --git a/metadata/md5-cache/media-tv/kodi-19.9999 b/metadata/md5-cache/media-tv/kodi-19.9999
index a6aafcfd45e9..e1dc9a1d5880 100644
--- a/metadata/md5-cache/media-tv/kodi-19.9999
+++ b/metadata/md5-cache/media-tv/kodi-19.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
@@ -8,10 +8,10 @@ INHERIT=git-r3 autotools cmake desktop libtool linux-info pax-utils python-singl
 IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=364319141c215259f9b033d9773a7831
+_md5_=dd8ac9e4b6b23c27b84ff36097b3d2df
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index d85ce94a4bba..998161a5a4e7 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/pipewire-0.3.63-r2 b/metadata/md5-cache/media-video/pipewire-0.3.63-r2
deleted file mode 100644
index de0d8bc402a6..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.63-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Multimedia processing graphs
-EAPI=8
-HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-PDEPEND=>=media-video/wireplumber-0.4.8-r3
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.63/pipewire-0.3.63.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=72bd1cd5c2ecd2e2e4a5ffeb2ccad11e
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.63-r3 b/metadata/md5-cache/media-video/pipewire-0.3.63-r3
new file mode 100644
index 000000000000..2928139c03bd
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.63-r3
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi ) virtual/tmpfiles
+REQUIRED_USE=jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.63/pipewire-0.3.63.tar.bz2
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=b15a1e16cf0f0a73a9d45cfa43310159
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.65-r1 b/metadata/md5-cache/media-video/pipewire-0.3.65-r1
deleted file mode 100644
index d131ae606a3d..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.65-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Multimedia processing graphs
-EAPI=8
-HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-IUSE=bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-PDEPEND=>=media-video/wireplumber-0.4.8-r3
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=ffmpeg? ( extra ) bluetooth? ( dbus ) jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.65/pipewire-0.3.65.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=4bd1032ea1e85fb68f85fc42e0e45a98
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.65-r2 b/metadata/md5-cache/media-video/pipewire-0.3.65-r2
new file mode 100644
index 000000000000..fdac42632d23
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.65-r2
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+IUSE=bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi ) virtual/tmpfiles
+REQUIRED_USE=ffmpeg? ( extra ) bluetooth? ( dbus ) jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.65/pipewire-0.3.65.tar.bz2
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=df7663bd3f8e167f03f88c24e64c6139
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 1cb99a334ee6..f30ac40ff19f 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -4,14 +4,14 @@ DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtu
 DESCRIPTION=Multimedia processing graphs
 EAPI=8
 HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev git-r3
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev git-r3
 IUSE=bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 PROPERTIES=live
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi ) virtual/tmpfiles
 REQUIRED_USE=ffmpeg? ( extra ) bluetooth? ( dbus ) jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=4bd1032ea1e85fb68f85fc42e0e45a98
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=df7663bd3f8e167f03f88c24e64c6139
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c3478b682467..a4792ad06074 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.8.2 b/metadata/md5-cache/net-misc/ena-driver-2.8.2
new file mode 100644
index 000000000000..39423ef08afe
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ena-driver-2.8.2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Amazon EC2 Elastic Network Adapter (ENA) kernel driver
+EAPI=8
+HOMEPAGE=https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html
+INHERIT=linux-info linux-mod
+IUSE=dist-kernel
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.8.2.tar.gz -> ena-driver-2.8.2-linux.tar.gz
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	a138af023f7507b676b0aec9fe4b1e83	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=fe14131812228e59b5f0976859e71343
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b8b21c7355f3..3ada09e1a1eb 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.12 b/metadata/md5-cache/sys-apps/baselayout-2.12
deleted file mode 100644
index 4a29204ca956..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare pretend setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib prefix
-IUSE=build +split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=GPL-2
-RDEPEND=!sys-apps/baselayout-prefix
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.12.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f6dcc0cc77d03b1693fb963bea9c1351
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.13 b/metadata/md5-cache/sys-apps/baselayout-2.13
new file mode 100644
index 000000000000..166a3ac5c8e7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-2.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst prepare setup
+DESCRIPTION=Filesystem baselayout and init scripts
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=multilib prefix
+IUSE=build +split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-2
+RDEPEND=!sys-apps/baselayout-prefix
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.13.tar.bz2
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=bd72eb18c705775c04facf81e15648e2
diff --git a/metadata/md5-cache/sys-apps/fwupd-efi-1.4 b/metadata/md5-cache/sys-apps/fwupd-efi-1.4
index bb8920a03202..c67f7ad552e0 100644
--- a/metadata/md5-cache/sys-apps/fwupd-efi-1.4
+++ b/metadata/md5-cache/sys-apps/fwupd-efi-1.4
@@ -5,10 +5,10 @@ DESCRIPTION=EFI executable for fwupd
 EAPI=8
 HOMEPAGE=https://fwupd.org
 INHERIT=meson python-any-r1
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=!<sys-apps/fwupd-1.6.0
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd-efi/releases/download/1.4/fwupd-efi-1.4.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=18af1ed0df7ec86b8b05ef16d033943f
+_md5_=583985cc6f0d6a0492bf33cebee3d016
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-252.4 b/metadata/md5-cache/sys-apps/systemd-utils-252.4
new file mode 100644
index 000000000000..89fd005de1f8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-utils-252.4
@@ -0,0 +1,18 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.1:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=Utilities split out from systemd for OpenRC users
+EAPI=8
+HOMEPAGE=https://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+IUSE=+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
+RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
+REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v252.4.tar.gz -> systemd-stable-252.4.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-252.4.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a
+_md5_=08c6b3b5940ae6e544d95a0dc3e197e1
diff --git a/metadata/md5-cache/sys-apps/usbguard-1.1.2 b/metadata/md5-cache/sys-apps/usbguard-1.1.2
index b21a321812b0..718da3c8d6f8 100644
--- a/metadata/md5-cache/sys-apps/usbguard-1.1.2
+++ b/metadata/md5-cache/sys-apps/usbguard-1.1.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.2/usbguard-1.1.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c43b49821b478fb07d5214b27f9bd752
+_md5_=4d0ce58ab2fc931a4e260face4e5e6ec
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d129ae27f9ad..e2ff4424781a 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230127 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230127
new file mode 100644
index 000000000000..3aafd2e74347
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230127
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20230127/gcc-11-20230127.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-8.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	41d05cbdd6da4da882a3c12e8af5e660	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=aa7867a9cdefc0ff541f9a963f047dcf
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 9b2cc6c7d73e..624f2971144a 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.15.10 b/metadata/md5-cache/sys-kernel/zen-sources-5.15.10
deleted file mode 100644
index 461e8a780aca..000000000000
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.15.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=The Zen Kernel Live Sources
-EAPI=8
-HOMEPAGE=https://github.com/zen-kernel
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.15.10
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-2.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.15.10-zen1/v5.15.10-zen1.patch.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3d90db27c54713b20652f542bdeb91c6
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.19.13 b/metadata/md5-cache/sys-kernel/zen-sources-5.19.13
deleted file mode 100644
index 2cfac18d580a..000000000000
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.19.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=The Zen Kernel Live Sources
-EAPI=8
-HOMEPAGE=https://github.com/zen-kernel
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19.13
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.19.13-zen1/v5.19.13-zen1.patch.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=95c873030eaccf7a04d03258a87f310a
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-6.0.12 b/metadata/md5-cache/sys-kernel/zen-sources-6.0.12
deleted file mode 100644
index d3d84d8026cb..000000000000
--- a/metadata/md5-cache/sys-kernel/zen-sources-6.0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=The Zen Kernel Live Sources
-EAPI=8
-HOMEPAGE=https://github.com/zen-kernel
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.0.12
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v6.0.12-zen1/v6.0.12-zen1.patch.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=95c873030eaccf7a04d03258a87f310a
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-6.1.8 b/metadata/md5-cache/sys-kernel/zen-sources-6.1.8
new file mode 100644
index 000000000000..53bd0895668d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/zen-sources-6.1.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=The Zen Kernel Live Sources
+EAPI=8
+HOMEPAGE=https://github.com/zen-kernel
+INHERIT=kernel-2
+IUSE=symlink build
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1.8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v6.1.8-zen1/v6.1.8-zen1.patch.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=2899d00d846aa681e25628943f174bc0
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 738b6b77a4a4..c50351133dab 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/talloc-2.4.0 b/metadata/md5-cache/sys-libs/talloc-2.4.0
new file mode 100644
index 000000000000..105c969d3f31
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/talloc-2.4.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/libxslt sys-devel/gettext
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) )
+DESCRIPTION=Samba talloc library
+EAPI=8
+HOMEPAGE=https://talloc.samba.org/
+INHERIT=waf-utils python-single-r1 multilib-minimal
+IUSE=compat +python python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-3 LGPL-3+ LGPL-2
+RDEPEND=!elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.4.0.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
+_md5_=a583a10186bdd6d09a772d6a4265ba69
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.8 b/metadata/md5-cache/sys-libs/tdb-1.4.8
new file mode 100644
index 000000000000..688c9011a9cb
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.8
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) app-text/docbook-xml-dtd:4.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) ) virtual/libcrypt
+DESCRIPTION=Simple database API
+EAPI=8
+HOMEPAGE=https://tdb.samba.org/
+INHERIT=waf-utils multilib-minimal python-single-r1
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://samba.org/ftp/tdb/tdb-1.4.8.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
+_md5_=4b3dd6cab1af9f0cb5fe237489680a4a
diff --git a/metadata/md5-cache/sys-libs/tevent-0.14.0 b/metadata/md5-cache/sys-libs/tevent-0.14.0
new file mode 100644
index 000000000000..34efbaa1fe45
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tevent-0.14.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=sys-libs/talloc-2.4.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) elibc_glibc? ( net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto ) test? ( >=dev-util/cmocka-1.1.3 )
+DESCRIPTION=Samba tevent library
+EAPI=8
+HOMEPAGE=https://tevent.samba.org/
+INHERIT=waf-utils multilib-minimal python-single-r1
+IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=sys-libs/talloc-2.4.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://samba.org/ftp/tevent/tevent-0.14.0.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
+_md5_=1c9b52c5cfe26c8b83a40d0f218eb8d7
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index e54389c9be06..f2363b531d28 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/rust-1.67.0 b/metadata/md5-cache/virtual/rust-1.67.0
new file mode 100644
index 000000000000..2274bc85e1fe
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.67.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=8
+INHERIT=multilib-build
+IUSE=rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+RDEPEND=|| ( ~dev-lang/rust-1.67.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.67.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/llvm-15
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=0f5e5b089e41e70a30478eafb8f395ab
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index c23d3aa99759..dadcdefbc0d9 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/gitea-1.17.4 b/metadata/md5-cache/www-apps/gitea-1.17.4
deleted file mode 100644
index e57b82ca1102..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.17.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam )
-DESCRIPTION=A painless self-hosted Git service
-EAPI=8
-HOMEPAGE=https://gitea.io https://github.com/go-gitea/gitea
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps go-module tmpfiles systemd flag-o-matic
-IUSE=+acct pam sqlite pie +filecaps
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git virtual/tmpfiles
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.17.4/gitea-src-1.17.4.tar.gz -> gitea-1.17.4.tar.gz
-_eclasses_=fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d4bf278c98eb388dfa49bff900fabdaf
diff --git a/metadata/md5-cache/www-apps/gitea-1.18.0 b/metadata/md5-cache/www-apps/gitea-1.18.0
deleted file mode 100644
index 477ff1bfa971..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.18.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam )
-DESCRIPTION=A painless self-hosted Git service
-EAPI=8
-HOMEPAGE=https://gitea.io https://github.com/go-gitea/gitea
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps go-module tmpfiles systemd flag-o-matic
-IUSE=+acct pam sqlite pie +filecaps
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git virtual/tmpfiles
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.18.0/gitea-src-1.18.0.tar.gz -> gitea-1.18.0.tar.gz
-_eclasses_=fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a68e1124f4de22fe45971037543dabbc
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0d84fdc9370d..86268089c7bf 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
-TIMESTAMP 2023-01-28T02:11:11Z
+TIMESTAMP 2023-01-28T08:09:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPUhD9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPU2FdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD2Kw//RYrJ3uHMEeeQEEoAaHeHhDxMpGmR83xiha93s99fiBTjMk6ndeHQmmVW
-rvQgL5Hnkvhx0BQa/s/Et7U+b9Z8xTzrAc3R20sMrEAg9Q/q+4kA7Dz6FIt4nyDa
-bcJIBIkoZDP9FRBar/eZwYTxgDEEgBSp7MDcwttkotx5mNQm/8RZi9RTIYOg87Jh
-rLUSjbGVSca9+9jWwJSXvQmG2hdJSvxK9LAVeVwUaoBqDdRvx+WJNw8U4veXyYxg
-vqcECXQT3tbm76+JHSB1qtU1a2yD9aGCN1VDmR1QjSJFiplFscRGsdQHyUernFFy
-PpttykdgTy5VRdaCt6hF3Voxxker9WAwOBJ2Mp3q7KUX/RBGaDz1rtlBSBY7zMUe
-kwEJJ/uFBDZ1iTHDgSadpAWO5ibuRilTcI6kN9Xj2xGaxrrxW5XdHn/idb5XCnqn
-0II7J5kpwIHajbc9qljkOzuQT1wUc+g+YhTmk77OWL/zt2OTbVxcu5OGlZSiDnfw
-00G0gr7QQPNBRV9d3+gRp2JTdjOfCmVDyUqaZ2GBRinyTxbDqA7lkKK1VT55J/Zk
-rZdpj2aD273QSkCY2AaIoqiYk+6toWAsmTMpVR0GLCkAV1CB5FxQicKKtrYLJ3Bh
-oiQd4Y7g0kROMHIj9oj+pTAHKTu6Lz4+mFwSm4olU+LS4Cq6p9o=
-=/BoF
+klBVrxAAk7OZmo6+FERJSbOoY1M1PMWy7Zqz/QZGOw/EIb1S6fNkKpMqAEibAAMv
+YAeHWSVGm7DU04XSJb6DAGdHY3MZYjMiMIz15jGh+l2b0gTTlYn5JyhLbnbnr9Z5
+JJt1AJXa2giWJDuYaKpxUpYx8hfnqRHBpMNTIEShtbLCZfsxFYcfm7E7VsZbwewE
+ej6NkPNkXreMZQlhHO9BJvoUfoDxNDLVC8n4zCYMNMzw/tc3rgc/DO1cgV3BtD6P
+4C3R6dg6c3JuQ0KuhoPyem0s++fAoNwPbZtkwu7IU/doMz4aGzL+izrh5MmtZ1Hr
+aI0EQOKncCQloPmLtTWqp6rkLG0wLTIehPAfyHY9K8EU+7dy6E/e9zejQJe8CuF7
+9vCGgSZL7oGgUxff/1LBvp4onKbCOS+Kh/HRQKu4eUwaS1exfyytEPOgpc1Jylg0
+IOddApsljjJKExx1Q+ZigV1qGQTpNLLRyhPUoNCc8q1B0edTnZlXKSUJHOizTsas
+nRtVINqhlFYJlonQYFv91pWU3Aqq8CXey0M1gIoxO9RZmo/W3n0x1sNa42ByKOCz
+HXaHCAw6EJwT4IDAK+31Ddmfa7cn4uDb3mNya1LBB8cfVwZPosWOXKpTwyNQyx0M
+7S8Pc+/NoLBNTnbkT2oTostxYr+M7jTl3ExKjkHxa7Dl/LXH2C8=
+=KlTp
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a79d2b6c1952..3ecf758954d5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 02:11:08 +0000
+Sat, 28 Jan 2023 08:09:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6522e9268513..7c7326330403 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jan 28 02:11:07 AM UTC 2023
+Sat Jan 28 08:09:56 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1278a34292dc..fa1fbe0ebdda 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 02:15:01 +0000
+Sat, 28 Jan 2023 08:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f9772a2ecdbf..f9fe01ecf24b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c8a8f3dfacc9e350d9dd25057de7b22406629940 1674870911 2023-01-28T01:55:11+00:00
+727429b31020c73898c663e0b1917c364aafd87f 1674892672 2023-01-28T07:57:52+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 71b3caaa6bc3..c23a799496c7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1674871801 Sat 28 Jan 2023 02:10:01 AM UTC
+1674893401 Sat 28 Jan 2023 08:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8d37332006cf..af2c6531c747 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 28 Jan 2023 02:11:07 +0000
+Sat, 28 Jan 2023 08:09:56 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9769131b7bde..369848543717 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index ad6bb74e32a6..a7474fc10f63 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -1,5 +1,7 @@
 DIST ena-driver-2.6.1-linux.tar.gz 542085 BLAKE2B 1509d3a22478d648426c788e8343ca121883a2d5fc241a8dbd95836ae48160795ae953a2327ea31190caaf8eaa69d72331a1cf250b56fe8af2fcfd98e3ecd313 SHA512 a24c2c062cd66cbfa8fb9b1fa7093650eda1061bd502a3e57bfdbf3b5b36064f457860e4d5cb045f11de6437e03ad2cfb3390be8876a0ee7a474be1d5cdd8f40
 DIST ena-driver-2.8.0-linux.tar.gz 1196967 BLAKE2B 2f4c5ebba357fbea42aee5f921f60d9b7f18558df6e955e39c81c4e4693b5fe39ae7de2123c6e74e0ea9c99888fcf143b68ce67de55efbd4b30a37cf805cde40 SHA512 549b33f913bc4fa48f27d24e66d77032e32992f7f9c6afb1ce82e89d343516201442c70f3146d919b81632b97baee699f1c60001cb2a1730720681fa28452e3e
+DIST ena-driver-2.8.2-linux.tar.gz 1199506 BLAKE2B b9c6ed91341f2475481556dcb7615f97e9701ad0fdd3452d193c334ae169e59a74f66d32d2a8d04c43024dee34282070b65201d635bc01e326a59e8d3aa698dc SHA512 3921dff857b1bbbd9d97401a8740c50d9849fcda71683ca8ba656affcc6df472836b109cb182703b85e2521bc59183a1204eac46f430522f1ba48c8d66e1db7e
 EBUILD ena-driver-2.6.1.ebuild 947 BLAKE2B 1ab5211b4d31be416aed0004d5835bbed4271b062b673c617509781722d7706459eda36dd90546d0e67ee4dbd9f7c658f4d61e8a3bca1ebc0e1bba446a7eaea5 SHA512 09c5b5c091b6495a4d03732bf9bd715e3cf856e97383a2b57013a33080617bee45df094972ed727b470ff7d2ecdd463b62510d0875872af91e6cfdef4795d6da
 EBUILD ena-driver-2.8.0.ebuild 958 BLAKE2B 5932fee468734f37cd2c9f3b3c9523ddceb6ca1b1060101f7230eb10ae6ac01eb2334a37b13f0751a69b2ae7b71071c6762ac611d800d6d972407a3e751b27d5 SHA512 fad5cdde5bc6da9c8473f3de789c21423e2c7d884717c76a0a8a258792ecb9bc4356b86e4ea6bf5870c63c895acefa6b1264b312147d23c2f8cdb6e71adcde10
+EBUILD ena-driver-2.8.2.ebuild 958 BLAKE2B b4ec2f64541d70a5318eb6955368341b04d8d7749bda2f8adc19b4c62d1a0685f69c6dad7644d2b7712c76b4e69b03be3abd57fdeb380f6ea5abc676429ba612 SHA512 3f56846056bfce63cb3a472cfc7c92fc7a10b5da1a8db797bc08bcef45793d81e1469bebb8abf99fd146b3c6df7c239e8e4cfc1ed8bba2d105df2e4bd21f4382
 MISC metadata.xml 347 BLAKE2B b9e95fc5342cb1467213a06e52049e0fe6c3a20069f46a0f9b8b2696ec36ecd8b1c5c01dc536cd644bf9468f0d71dad2db8e960958f217b4d185535db6522ca5 SHA512 4739339c1e6b03df00798098f8a0d55f2739508ce0136173cb449f0308feb06e9403b7c00031dbc63403ef213272ffea315c2e8f0a46515a9059c5676b789392
diff --git a/net-misc/ena-driver/ena-driver-2.8.2.ebuild b/net-misc/ena-driver/ena-driver-2.8.2.ebuild
new file mode 100644
index 000000000000..21df1541893f
--- /dev/null
+++ b/net-misc/ena-driver/ena-driver-2.8.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver"
+HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html"
+SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena"
+
+MODULE_NAMES="ena(net:${S}:${S})"
+BUILD_TARGETS="all"
+
+CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}"
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \
+		"Makefile" || die "Unable to fix Makefile"
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README.rst RELEASENOTES.md
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 83d7c2c0be53..56abcc1bf082 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index f16b9ca01132..b3833478eb3b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (2023-01-28)
+# No upstream releases since 2008.
+# No Gentoo maintainer since 2009.
+# Installs files in the wrong places (bug #455542)
+# and with the wrong mode (bug #892325).
+# Removal on 2023-02-27.
+app-admin/bastille
+
+# Ionen Wolkens <ionen@gentoo.org> (2023-01-28)
+# Recently broke at runtime, and its relationship with evolving
+# swig+python is likely to keep breaking this further without an
+# active upstream (no activty since 2018) to keep up with changes.
+# Removal: 2023-02-27. Bug #892323
+games-rpg/adonthell
+games-rpg/wastesedge
+
 # Michał Górny <mgorny@gentoo.org> (2023-01-27)
 # GKrellM and a variety of plugins.  It's unmaintained for some time.
 # Upstream homepage is gone, and the whole suite is collecting dust
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d9ca628cabe5..81b63e3081d8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1431,7 +1431,6 @@ dev-games/godot:bullet - Enable the sci-physics/bullet module
 dev-games/godot:deprecated - Enable support for deprecated features
 dev-games/godot:raycast - Enable the raycast Editor module using media-libs/embree
 dev-games/godot:runner - Build an additional binary optimized for running games (only relevant with USE=tools)
-dev-games/godot:speech - Enable text-to-speech support
 dev-games/godot:tools - Enable the Godot Editor for game development
 dev-games/godot:vulkan - Enable support for Vulkan
 dev-games/godot:webm - Enable the WebM module
@@ -2918,7 +2917,6 @@ games-action/supermariowar:server - Compile and install Super Mario War server f
 games-action/supertuxkart:nettle - Use dev-libs/nettle crypto backend
 games-action/supertuxkart:recorder - Enable recording with media-libs/libopenglrecorder
 games-action/supertuxkart:sqlite - Record IP bans, statistics in server mode with dev-db/sqlite
-games-action/supertuxkart:vulkan - Enable support for Vulkan
 games-action/supertuxkart:wiimote - Support for wiimote input devices
 games-action/swordandsworcery:bundled-libs - Use the upstream provided bundled libraries.
 games-action/trine:launcher - Install GTK+ launcher
@@ -3208,6 +3206,7 @@ games-strategy/wargus:bne - Support extracting data from the Battle.net Edition
 games-strategy/warzone2100:discord - Enable Discord presence/join integration
 games-strategy/warzone2100:vulkan - Enable vulkan backend
 games-strategy/wesnoth:server - Enable compilation of server
+games-util/basis_universal:opencl - Enable OpenCL support
 games-util/gslist:web - Enable the web interface
 games-util/lgogdownloader:gui - Enable GUI login support for passing reCAPTCHA
 games-util/slade:fluidsynth - Enable MIDI software synthesis using media-sound/fluidsynth
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 07a86aabb631..f599565f71f5 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 9e891f0ea434..d45ef354370d 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
-DIST baselayout-2.12.tar.bz2 29275 BLAKE2B 5708137748e484555ed7f91301c5bc079189e744fc14f708d8b95ab82ad9392166690af6424ee486d95c7b0ce85b6f23fcadd7f95c31920a3424e86431d9b41f SHA512 8c4ad7cf459254c07d1a05300b5e9a600aa259a0f38c55e74c0a60a1a1f9da92c9de5de58cfb735738b64deb6955d6f80ae174925cded07c61c3371323dce152
+DIST baselayout-2.13.tar.bz2 29423 BLAKE2B a399e515297d3a936c5821205f1f0d6de844580099936be50e80a463b9fa6239aead52b7b371136680e263e326f7e6a1faea8cd8db0f11462cf0e8166707fc91 SHA512 ff16f20cf2c65258ab6d48c403607113f84fc57ffee6650652202746095f402f8c6a4f22040d0bb9310180945131bed6a0fda3717b39080a987e4f5224339095
 DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02
-EBUILD baselayout-2.12.ebuild 12182 BLAKE2B 5fe1fc77b11ed2a707ee2d17eb71a69b5043f0357acf04fbf2d3de200117c67846c56a5cd9b4fd11438dbdfa0459b53c9a12885d8d4619a12da7f66b35bc1d85 SHA512 16150e29d1ce45b2f86c73c68164a067069bd6d73808f26f593fe419e31e86c23e749d535dd10e412a43bef634b24a52c5c60cd5cb27e4b6e3611122453c60d4
+EBUILD baselayout-2.13.ebuild 12075 BLAKE2B 88a8a009340fbb0ff7d2097e3d84ffbab7d6e26fcc40b41b726bc917156ece802ff5c21ecb6c851844c6fe926b34fbfbbc71b6d4df93c4afdbef4c8ed402f7f9 SHA512 5797dc61cede904f3991602be25e3636c714ddc92ae654ea23bd604b6cfc55c040fa9d0098781b12157cb483a717b8241eb8b489e3233704b2175e22f912ed18
 EBUILD baselayout-2.9.ebuild 11818 BLAKE2B f60a5ccef7e0e77177dc2ad7e15048e3c83bf94981f7274264c0a9d18d2ac0a102456f2c06116a6e3f39bc01a3275d702c3bf7df64a3f81ee34ef744787da321 SHA512 2b07ce978ad790e0f97021af002731015f40291f8b881c08586c856011ebde4b0e4941d7fb557ba413e3c422023412f441803e5ce8860a39e27c7193b1f69537
 EBUILD baselayout-9999.ebuild 12182 BLAKE2B 5fe1fc77b11ed2a707ee2d17eb71a69b5043f0357acf04fbf2d3de200117c67846c56a5cd9b4fd11438dbdfa0459b53c9a12885d8d4619a12da7f66b35bc1d85 SHA512 16150e29d1ce45b2f86c73c68164a067069bd6d73808f26f593fe419e31e86c23e749d535dd10e412a43bef634b24a52c5c60cd5cb27e4b6e3611122453c60d4
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.12.ebuild b/sys-apps/baselayout/baselayout-2.12.ebuild
deleted file mode 100644
index 845f7f7a8dfb..000000000000
--- a/sys-apps/baselayout/baselayout-2.12.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-RDEPEND="!sys-apps/baselayout-prefix"
-
-pkg_pretend() {
-	local stop=
-	if [[ ! -L ${EROOT}/var/run ]] && [[ -d ${EROOT}/var/run ]]; then
-		eerror "${EROOT}/var/run must be a symlink to ${EROOT}/run"
-		stop=1
-	fi
-	if [[ ! -L ${EROOT}/var/lock ]] && [[ -d ${EROOT}/var/lock ]]; then
-		eerror "${EROOT}/var/lock must be a symlink to ${EROOT}/run/lock"
-		stop=1
-	fi
-	[[ -z ${stop} ]] || die "please fix this before emerging baselayout"
-}
-
-pkg_setup() {
-	multilib_layout
-}
-
-riscv_compat_symlink() {
-	# Here we apply some special sauce for riscv.
-	# Two multilib layouts exist for now:
-	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
-	#    these are chosen by us to closely resemble other arches
-	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
-	#    this is the glibc/gcc default
-	# Unfortunately, the default has only one fallback, which is "lib"
-	# for both 32bit and 64bit. So things do not break in 1), we need
-	# to provide compatibility symlinks...
-
-	# This function has exactly two parameters:
-	# - the default libdir, to determine if 1) or 2) applies
-	# - the location of the symlink (which points to ".")
-
-	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
-	# there never was a ${SYMLINK_LIB} = yes riscv profile.
-
-	case ${CHOST} in
-	riscv*)
-		# are we on a one level libdir profile? is there no symlink yet?
-		if [[ ${1} != */* && ! -L ${2} ]] ; then
-			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
-		fi
-		;;
-	esac
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-		for prefix in "${prefix_lst[@]}"; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
-					libdir="${libdir%%/*}"
-					dir="${prefix}${libdir}"
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die "Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-			[[ -d "${prefix}${def_libdir}" ]] && riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep || die
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" || die #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep || die
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die "Unable to make ${EROOT}${libdir} symlink"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
-	default
-
-	# don't want symlinked directories in PATH on systems with usr-merge
-	if ! use split-usr && ! use prefix-guest; then
-		sed \
-			-e 's|:/usr/sbin:|:|g' \
-			-e 's|:/sbin:|:|g' \
-			-e 's|:/bin:|:|g' \
-			-i etc/env.d/50baselayout || die
-	fi
-
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/shells share.Linux/passwd
-		hprefixify -w '/PATH=/' etc/env.d/50baselayout
-		hprefixify -w 1 etc/env.d/50baselayout
-		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-
-		# change branding
-		sed -i \
-			-e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \
-			-e '/make_os_release/s/${OS}/Prefix/' \
-			Makefile || die
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		if use split-usr || use prefix-guest; then
-			ldpaths+=":${EPREFIX}/${libdir}"
-		fi
-		ldpaths+=":${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		install
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# add SDK path which contains development manpages
-		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
-			> "${ED}"/etc/env.d/98macos-sdk
-	fi
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	dodoc ChangeLog
-
-	# bug 858596
-	if use prefix-guest ; then
-		dodir sbin
-		cat > "${ED}"/sbin/runscript <<- EOF
-			#!/usr/bin/env sh
-			source "${EPREFIX}/lib/gentoo/functions.sh"
-
-			eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
-			exit 1
-		EOF
-		chmod 755 "${ED}"/sbin/runscript || die
-		cp "${ED}"/sbin/{runscript,openrc-run} || die
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		if [ -e "${EROOT}/etc/${x}" ] ; then
-			chmod o-rwx "${EROOT}/etc/${x}" || die
-		fi
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test 2.4 -lt ${x}; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . /etc/profile"
-		fi
-
-		if ver_test 2.6 -lt ${x}; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}/{,usr" || die
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.13.ebuild b/sys-apps/baselayout/baselayout-2.13.ebuild
new file mode 100644
index 000000000000..97ceb30c3290
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.13.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build +split-usr"
+
+RDEPEND="!sys-apps/baselayout-prefix"
+
+pkg_setup() {
+	multilib_layout
+}
+
+riscv_compat_symlink() {
+	# Here we apply some special sauce for riscv.
+	# Two multilib layouts exist for now:
+	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
+	#    these are chosen by us to closely resemble other arches
+	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
+	#    this is the glibc/gcc default
+	# Unfortunately, the default has only one fallback, which is "lib"
+	# for both 32bit and 64bit. So things do not break in 1), we need
+	# to provide compatibility symlinks...
+
+	# This function has exactly two parameters:
+	# - the default libdir, to determine if 1) or 2) applies
+	# - the location of the symlink (which points to ".")
+
+	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
+	# there never was a ${SYMLINK_LIB} = yes riscv profile.
+
+	case ${CHOST} in
+	riscv*)
+		# are we on a one level libdir profile? is there no symlink yet?
+		if [[ ${1} != */* && ! -L ${2} ]] ; then
+			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
+		fi
+		;;
+	esac
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+		for prefix in "${prefix_lst[@]}"; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
+					libdir="${libdir%%/*}"
+					dir="${prefix}${libdir}"
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die "Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+			[[ -d "${prefix}${def_libdir}" ]] && riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep || die
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" || die #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep || die
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die "Unable to make ${EROOT}${libdir} symlink"
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
+}
+
+src_prepare() {
+	default
+
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr && ! use prefix-guest; then
+		sed \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/shells share.Linux/passwd
+		hprefixify -w '/PATH=/' etc/env.d/50baselayout
+		hprefixify -w 1 etc/env.d/50baselayout
+		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+
+		# change branding
+		sed -i \
+			-e '/gentoo-release/s/Gentoo Base/Gentoo Prefix Base/' \
+			-e '/make_os_release/s/${OS}/Prefix/' \
+			Makefile || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		if use split-usr || use prefix-guest; then
+			ldpaths+=":${EPREFIX}/${libdir}"
+		fi
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		install
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# add SDK path which contains development manpages
+		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
+			> "${ED}"/etc/env.d/98macos-sdk
+	fi
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	dodoc ChangeLog
+
+	# bug 858596
+	if use prefix-guest ; then
+		dodir sbin
+		cat > "${ED}"/sbin/runscript <<- EOF
+			#!/usr/bin/env sh
+			source "${EPREFIX}/lib/gentoo/functions.sh"
+
+			eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
+			exit 1
+		EOF
+		chmod 755 "${ED}"/sbin/runscript || die
+		cp "${ED}"/sbin/{runscript,openrc-run} || die
+	fi
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		if [ -e "${EROOT}/etc/${x}" ] ; then
+			chmod o-rwx "${EROOT}/etc/${x}" || die
+		fi
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run || die
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test 2.4 -lt ${x}; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ver_test 2.6 -lt ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}/{,usr" || die
+		fi
+	done
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+
+	# Restore /var/run and /var/lock if we just removed them from 2.11 or 2.12
+	if [[ ! -L ${EROOT}/var/run && ! -e ${EROOT}/var/run ]]; then
+		ln -s ../run "${EROOT}"/var/run
+	fi
+	if [[ ! -L ${EROOT}/var/lock && ! -e ${EROOT}/var/lock ]]; then
+		ln -s ../run/lock "${EROOT}"/var/lock
+	fi
+}
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 6a6e4e2e0db9..eb4145f8c769 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,5 +1,5 @@
 DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb
 DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991
 EBUILD fwupd-efi-1.3.ebuild 1082 BLAKE2B 2106918286e351384b7a4a851062d9b73f3acdfa75d2f2fd098d9cc46164616bcd587f2721ae2390211a24a5ced69ac591770283efe93e7d933384479b6cc7ee SHA512 114686c628b89414fa26940c42065498436acd202aaa97e4f3b1abc1b51acfe888454db9e303bc92c24a02a03ae438158c1598fb186412b5d775ba6e4f5ad828
-EBUILD fwupd-efi-1.4.ebuild 1139 BLAKE2B c4ddecf06d05becb2447eb8f100436330e85d0f0a006f0979eb442bbf60bf5c516603a7abdd3cc6804dca659e102e944ccb1ff80e92d864d10001827fbd6d597 SHA512 fbdc5b351fd22f82f25e2cfc8e5d7800a11a6bb8c4cde50974b746c0e9a38293c3b2d433dbd373d046f85990ba559e83f63c0512496a73c7a54c845b8538e36e
+EBUILD fwupd-efi-1.4.ebuild 1146 BLAKE2B 552c82e281d6ec4db28edb9e49a832353e86b589b914eacd41dcb101b7cc33aee2e35c3d1207fffe769811f0b920cd61c15a7d8bda02e84f58b640bb400e1acd SHA512 7da2025343b4a4bd4412747b2c90405600e8a03542c31189eec2df7e69d6f222225828eb9bdfee9bac7c6d7c9bd4a67caaf1badf8c0e36ea42000000d16e6434
 MISC metadata.xml 502 BLAKE2B 37525a0056ad72eab2b2b7b15436181a8581075053704012670e1f0434c8af74bd0780f16f31fa5cd2c8836bc2e4d8f55dfd5a77140be83ebffda5ca9e1a1382 SHA512 70ccf403ddb8e4d33ee9cc6ba438583d42ab313784c3251919b74a6596c4e3593263a6400513605c1004bc0d3ebb1677febc31449096b825f688ed1cc7052c31
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
index 845fd79ccd63..6afdaf1dec4b 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
 else
 	SRC_URI="https://github.com/fwupd/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 8256d53ce7ea..d58a0465f11e 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,10 +1,14 @@
 AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
 AUX 251-tmpfiles-ub.patch 2892 BLAKE2B 0c65c90c0a631a48b7f3b8194350fb90e6915e0e7f32b0de87cfb83ca170f68576017efbe8a531fdeb01485ac6840a4c75628d1a384e750fc5094dff68dddcab SHA512 5c4fac1933a0b8443b80cff7069f21904773d486f30be24337f2b68234c708568ccd0f1ab216968ce71f760e4e27f85912971cdb9dd3ee724d7e6a2d8bc917d7
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
+AUX legacy.conf 97 BLAKE2B 6c3048ec4e3a54b1091d0b844b11549a0173eec749bb936fe344471330b767fe83b60945683439f2c3dba51c622cae3b51e5a48e03a4cc06d90e9bd5a2b02f90 SHA512 1defbf2cb3cc72f4c1ab2898dce13fccb6e0570b1e503ce563e55c0f21f00807a6e9330e559c51dc7bf7a483d3d5e77226aabce345a8e9af269465993d291184
 AUX systemd-tmpfiles-clean 58 BLAKE2B 6a33f92a136218f3a27ea31e5cdd519706b15a3bba368f6f900d1d540f50493905a2cdab35ee3d216c9cb45e821251bfacc4965ad5a2ca7b1e1ae5627f4a3680 SHA512 3084eb1623b56cb09e4c9bd3e314a3e1d6d88f002149bea75b1c506a30b6345c51c7a90a1330baa5eec86ae6b90116f9970d8ff5add91929167df84bef6e82fe
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
 DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
+DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
 DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
+DIST systemd-stable-252.4.tar.gz 11753300 BLAKE2B 8819ca6d3a64c110e5a245ae0369dc431079556e200d13d8edfc64fc35b2b04f1cdc215b81d9bf126245f315be3662ebd2c094167f88d2465f0dce25aa1fd196 SHA512 d4e99a67c59091dae78f654433a6c5e114ae66256b72d9d43292c43a986ee6a58e2d06f12866cbd7ec821b61580ec003af1725f60fd4b038b4a981b3ca839ee2
 EBUILD systemd-utils-251.10-r1.ebuild 12415 BLAKE2B bd2c1f0960921f5d30da85177f39bb640d349cc63fbd1a9dc88d6f1ea977bd0ed975b513efab12954a06de273608bee96c55af2388b06d93c6e830efbf7302f2 SHA512 9343eec81e5f93c2995f3b71f100efdded98615475a8cb65f42a884bded6806ec19cfa24b8e0b37e9cd37c8b294bc5e7b163c9f297ff0aafb11a0158fab60c74
+EBUILD systemd-utils-252.4.ebuild 12486 BLAKE2B ea8934243a03eb401e61cc142549e1458f7853beb0ce077090ea7933f9a378860a92e1c2b29cad4e6e7c7567f46ec9a6ed540ac32d0685fa6290db671bd36fca SHA512 2d52c728acd7cb563a5c66a77682d2e4b72a6c2da1afa8e2cf47fc268c72b6ed8dbdf02f132833d327822a98d768ca183e986df0b4bd29ac9e60e374e504ee19
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/files/legacy.conf b/sys-apps/systemd-utils/files/legacy.conf
new file mode 100644
index 000000000000..cbcac747e5d8
--- /dev/null
+++ b/sys-apps/systemd-utils/files/legacy.conf
@@ -0,0 +1,3 @@
+# Based on legacy.conf from systemd
+d /run/lock 0755 root root -
+L /var/lock - - - - ../run/lock
diff --git a/sys-apps/systemd-utils/systemd-utils-252.4.ebuild b/sys-apps/systemd-utils/systemd-utils-252.4.ebuild
new file mode 100644
index 000000000000..191d25923fb0
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-252.4.ebuild
@@ -0,0 +1,536 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+if [[ ${PV} != 25[12].* ]] ; then
+	# The F_S=3 issues should be fixed in 253.
+	# - https://github.com/systemd/systemd/issues/22801
+	# - https://github.com/systemd/systemd/pull/25967
+	# - https://github.com/systemd/systemd/commit/7929e180aa47a2692ad4f053afac2857d7198758
+	# - https://github.com/systemd/systemd/commit/4f79f545b3c46c358666c9f5f2b384fe50aac4b4
+	die "Please remove the FORTIFY_SOURCE hacks in src_configure."
+fi
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-252.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+	boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/251-tmpfiles-ub.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootpkglibdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+	# Broken with FORTIFY_SOURCE=3: bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot efi)
+		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool boot kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbpf-framework=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				kernel-install
+				man/bootctl.1
+				man/kernel-install.8
+				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-netlink
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+src_install() {
+	local rootprefix="$(usex split-usr '' /usr)"
+	meson-multilib_src_install
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl kernel-install
+			doman man/{bootctl.1,kernel-install.8}
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into "${rootprefix:-/}"
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into "${rootprefix:-/}"
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+			insinto /usr/lib/tmpfiles.d
+			doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+		fi
+		if use udev; then
+			into "${rootprefix:-/}"
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+			exeinto "${rootprefix}"/lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+			insinto "${rootprefix}"/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto "${rootprefix}"/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		exeinto /etc/cron.daily
+		doexe "${FILESDIR}"/systemd-tmpfiles-clean
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+		insinto /usr/lib/tmpfiles.d
+		doins tmpfiles.d/{tmp,x11}.conf
+		doins "${FILESDIR}"/legacy.conf
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto "${rootprefix}"/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto "${rootprefix}"/lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto "${rootprefix}"/lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index 300ebde2990f..b61efe8baf16 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -1,5 +1,6 @@
 AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f618e30b20f336cda6a11db480fdda65022c28ce84d6aa9e804c1344221f3aa4ab8a262094106bb677414c2b24e7971f9acad SHA512 f66bee161324610755371fa04199fcd81887c1a55ab73cc1922be719d61e8315b7a869e1d8af6c3df2d6922b07027dced3605e63b130e8f094fcb606aea20b9e
 AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09
+AUX usbguard-1.1.2-gcc-13.patch 460 BLAKE2B 100711b02a6198f149c2637f2f5926a66405bebeaaa02967c7a6a29fbf62f053f006a8b37f13425d4db75b4ac2aa21f3caaee6a976034076c3b640af575db2c4 SHA512 ed34efbc15cec047fa6aff29022dd68019939334d7b107b2110d24b1b888fcb5735449ca4f328be63b386f418cc90c5eca97409ae7e9617488f980d500df9ba0
 DIST usbguard-1.1.2.tar.gz 1695585 BLAKE2B 7aa1f6168b16bf3b67136dd927a69a097b29a276c604d2e7e4394be4c30682dcfe8d3fd78ca7af8e5275c42ff21b47562dd5b9a93cacf1b53c9945bdfbf5c7df SHA512 03b6dd026a0fe6a7a055208f09a56e2cc86985570388e33fde08671b8aa2d60ea4a0e59505e9646ddf50f42f5b6310d1b230379f9c26ec99c7ca736f3b4ad850
-EBUILD usbguard-1.1.2.ebuild 2496 BLAKE2B 7f41e2c85ac3b53b2f25a5b2a51c021769252bdd1eaf9abce72253e96a006c0b7a95659c5376e2194d4f638e0cf0d9cfe9272e3b8480e28e678c5d2e12bd0b05 SHA512 53b7981ad6a963bde890f3231a609e3b3c2d9653f927901425ba88c6f422a96078f2ccdd4f0166c72ae9863b3d392eb39e497427bc8816120a4a92348dd83e3d
+EBUILD usbguard-1.1.2.ebuild 2549 BLAKE2B 990be447b5e76257cefd0cfbb7ff681936c73f2ba4c0fdb7585a995acb65530275d0d9456be28a2ee8980aadc7cda2da1389dc816ea96d47e3e4e3a28ccc45d9 SHA512 0a752d94e69ec15f0ebc3205fd4fc1bc5a2a5152fd8f9b0227ca4df490c4bd5af5b846995048df4815761d72f0a08dc823767af68adddfce4d661b4d51c7ae5a
 MISC metadata.xml 427 BLAKE2B 8e6514509df32e294efed2a72f26de5803a1c09d592e7fcbb948d453bd7c0b15836664e9746286d03d53e4fd8a7008f4dfbbaed10f2a4b2614e7ac3084644c5d SHA512 efed3e1fd21a98454314571a08be65cff88ee1857a588d50832c0993372b8b4d05f19420700c15df405246a51af09a06d9d680857dadd0cd71fd289aedb07c19
diff --git a/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch b/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch
new file mode 100644
index 000000000000..79168f584ded
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-1.1.2-gcc-13.patch
@@ -0,0 +1,19 @@
+https://github.com/USBGuard/usbguard/pull/582
+
+From a0083fd0eea3a513613a37262d40dfbe96e02e46 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 24 Jan 2023 14:54:28 -0500
+Subject: [PATCH] Fix compile with GCC 13
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+--- a/src/Library/Base64.hpp
++++ b/src/Library/Base64.hpp
+@@ -24,6 +24,7 @@
+ 
+ #include <string>
+ #include <cstddef>
++#include <cstdint>
+ 
+ namespace usbguard
+ {
+
diff --git a/sys-apps/usbguard/usbguard-1.1.2.ebuild b/sys-apps/usbguard/usbguard-1.1.2.ebuild
index 77e050da627a..d3722e624db9 100644
--- a/sys-apps/usbguard/usbguard-1.1.2.ebuild
+++ b/sys-apps/usbguard/usbguard-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,6 +52,10 @@ DEPEND="${CDEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.2-gcc-13.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index fbb9568b765e..23296932ea7e 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index a6659ebdaa08..aef557fac45c 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -12,10 +12,12 @@ DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d2
 DIST gcc-10.5.0-patches-5.tar.xz 17324 BLAKE2B e97b471fb6115fd0421be8a6390f7d88312de7ac0132fde3aa43dbf2a49d3bc640ec05f766f20363f033adeaf0430e90c42b5a6f92a422d1a82128f119e769f6 SHA512 2589b8a3be0bc60dd7b205ef9955dfd1ba525508879b30ee8057779d2677783c7c13a0bf901bc2a126e15c52d440663e6fe22a299d935e0706a037406e1cfb31
 DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
 DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e
+DIST gcc-11-20230127.tar.xz 76128480 BLAKE2B 4fdff08bd120fbff1b1e87d09606a9049fa28f456444c07c5d0dc3738216be3c2b418137bbb57ac79e584b68cf277033707c63a5e2ecb75497f3778f7cf3fef6 SHA512 772f4ea802aba04a63a50272b59c293b0f1a143c00b88beae98c9bef4ef3a36ad4fd50ec670113d1d031e831262fe50e0b1017536f02c8553be61b05708678b8
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
 DIST gcc-11.4.0-musl-patches-1.tar.xz 4320 BLAKE2B 9f59aef44243b6d63bd9c4639b413523e74784dc0da931a9f1be75d2091f7e99c530b32b567315972a88816d6b30d2c404465a2f28138ba2cc894914d7a123fb SHA512 c174623bf40fb0cab53d1ca82fa7e0b05f0114c61c839e316dfff7678d202b850d4d5011432cf6fa40c54e563e28381e9a9f80667d9428b3f272ba8391c6ac84
 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
 DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3
+DIST gcc-11.4.0-patches-8.tar.xz 13788 BLAKE2B a1406d5dcd906ed51ef06bb6571c216d83f74ab5ba05d2f1783d20619ee4ae9a4aa60c15917c861c24b708621b1605411011df9d217472f92001ec1c59a22b5b SHA512 b18b068422911216063948e21f0ec01073edb45c828a351282730111642638a0a42b97394a3f7522f892fe79e30b391372c829b542ce64fd0dc58c2a83f091bf
 DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df
 DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349
 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
@@ -36,6 +38,7 @@ EBUILD gcc-10.4.1_p20230126.ebuild 1450 BLAKE2B 58a5ff72aa680c73e69ec677dee48042
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 5bb5bb1dfa617deb42fd1194fd51172e7865f6890bf430d2269ce0a5c27854b494e2ef2a997371dafd6328b2c59656718201ad0dae946911d18ddfae01ad9904 SHA512 d8242777dd4aec49d56319b7da0423a3d39a906cc78650e733db27a3021603fe7043cfd5f2e5497847ca64f7439ebaca20b01a2fb7264d790748d300d87377ab
 EBUILD gcc-11.3.1_p20230120-r1.ebuild 1288 BLAKE2B c396af7d86e9e73e3dd1b59d921050066f1918aefe5c1cf8917101d995aad083357fac704feec5948f3100158ecfe09d7ffc7d03f8947aca1a7186d32dabd823 SHA512 9f318f3c78085b1e0d09941781481126b28806a162dd050d6264b35b3397203138fc0621dc1878c0d478ef9a94caec171f0e03e081e8e637edbfafc3efeefed8
+EBUILD gcc-11.3.1_p20230127.ebuild 1291 BLAKE2B 1e29e740a7114f76ab230059612a9d6e5df6e7ced63b311430f51daecba1bb4482b8e7fff55a56a2c3e25595bcd0c00bdc693158f8b9c23d0d18d93d43efa675 SHA512 713c4d1f5addb112bd1f090083204153908696d4a56e3aa2c7d530bbdc69de476bf8e1bb84596ba84a09cbbaf72fa267b3baa3ea5014189c91f583aff1f7a058
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
 EBUILD gcc-12.2.1_p20221126.ebuild 1434 BLAKE2B c82a53ce99f8086c28b24382978b2c34b083bdfb01ccbcb893b56b210ffef770c1e534fc134835ded4362f32f447b5fc82dc75e7055ca9554bcd194e8b166225 SHA512 2cf47d4df36a26f96a7700e390766397520a4598037b7dfe5b4770a4b43fd6efce4f2c13b730c75ba014fb31465f4cc08a399aea7eb62eb46e9b11f8ecbfdfdc
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230127.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230127.ebuild
new file mode 100644
index 000000000000..4312113ca016
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20230127.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="8"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="1"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 2588b382ada8..a52a701b2c56 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 6971017aa070..e78650d266d4 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,16 +1,6 @@
-DIST genpatches-5.15-2.base.tar.xz 3920 BLAKE2B daaf8d0aff88921062186f2b45f070358492a0daaf65fcc33509ebd2c1a3840504f918c63aa0deedfda0e70b6bf313bbf33b2be768fdd74e81680de5e552b7c8 SHA512 aa00e8593fbadd7fa2bedf36dc9b806b6b3351c7488c8720fac47960ef2de7cba7c021acc599642f1979d67143d50524ea43303b52fabd8e26cbdfde5fbb3dea
-DIST genpatches-5.15-2.extras.tar.xz 3848 BLAKE2B b108b14fd532554a8baa91a623704a867c2df4a23597fb0576382e959e4586616dc2e5a094ca673a62faa80148cab041459e2a5b7bb2c2daf2c17297b42eaf6d SHA512 5800709ba9cbe1bbaa3b8999d9c8ac8377a45c6c1be61894fee51af6e506f3d603ab4640df4471db021f0d3747c35ae90f87b6a35aecb971aa0cbf6384ab79ba
-DIST genpatches-5.19-1.base.tar.xz 4080 BLAKE2B 27fe512fd700cc6fc1946ebe0b39b423f35fbdce3b6c2181e1e1c197dccf436c6ba285b8bbf74500c80c64c486831a88f0f548cbd787d925eefafe740764a839 SHA512 8ff90b26202ddb80890ce8a33debbb8b6b85432412e7f76fdbdd98e257e9be23ffa5c03c81cb8482b7a35099083dec800f766354b5886d4f8f7647e3354f97b6
-DIST genpatches-5.19-1.extras.tar.xz 3772 BLAKE2B 1d418c3d5d328e9704ba10d7483cd562e511f345a5cc6799abc52e6cdeca20efa61417f62eaf7aae2078a8bb05c7dbabe4f4ddba7ad4221b458bd5c589f29b47 SHA512 479d957a3348485baf6504a08cf06b334938656701b15067512c0f48e530c2e87ca281ad3af6e55c75a53d2e9e584d94fc030ee82c538a97a85cea9a9c8fe214
-DIST genpatches-6.0-1.base.tar.xz 4076 BLAKE2B a6806af2473247e53034e0df58fc217a14108c86e89d2611e7886459405b743e690b5fa9f682a3e8ad3215c821f4e04552978da0e309be9cb586f0e2fb53c50f SHA512 da56f7e72c400aa149d481fc42651debea9ff90144b4d731dbd167cd5061da63f34b1b4fc937c8a3508f9bcdbbe3b645d25cfa67ce05db1d5c25667214840d9d
-DIST genpatches-6.0-1.extras.tar.xz 3804 BLAKE2B 973be072083e8f23fb0e39856864c5e061e071d651bff1ecd6dc9d429688a074d9ef78f255edf4479e95b5e60c78034ee969d12a2e65c4c6a5a382daa1aba419 SHA512 b00123c8f910367cf2c68cc8c6a70139644add4adb0aa96ae34bf7e93162a19020ef91f6bac631c257f885928640c4f847f8c32b940c192238304edcc83d0b5c
-DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
-DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
-DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-DIST v5.15.10-zen1.patch.xz 758564 BLAKE2B 36948979a90ee57c131caa3500f669032bfb5e971a1a72a5847f5289fe8184961addab53f476ac0b8c5b271417115ad8a05ebf537dc91b9e86cb74f028faced5 SHA512 c0d11cc498fe97838e6caa5c1d9d628445729c15f2a16c089de5a50b41739925492476eb2819fad4a61db810b02cdb334f48fbcc6a2da849e7d07e1e65df6eca
-DIST v5.19.13-zen1.patch.xz 974944 BLAKE2B 3b3996617265674c04c92e27fe2dafca6aed54e6d1adf221eb5368a93abc2c8a2b5214b670183818d7f50edf46a86424da32a8fff922130741ab09a923ff4e9d SHA512 49bd30ea96037db655811cc94a61048bb552d57a7ff0abde5fa8adbfc622cc4cdc9154f6efdebd2b3db766b7118ca0b2b26092639d96cf7326943f535af14bc3
-DIST v6.0.12-zen1.patch.xz 868340 BLAKE2B 917fdaac33cf0c946ab29b2f0bdc19fa07b4c1559a2e60de5b5ab002aac61169c14800d079d98c79771c4ab0eea594894c15f5b7f2952edf5b85dbced58623cf SHA512 9e182c3becc9aef149dea03eb113ec34a5e7d3a75bb92eb688051e886ba7800e7e48bfbbbacf4e0adfb27c755a44da6654289ab8197562cca7145659ccb12675
-EBUILD zen-sources-5.15.10.ebuild 1125 BLAKE2B 756fe1384c827dbec95be9a4943955c75041b9dff175851f4a89e58c4b23c1dcc6842d730fc6972ba264f9bacc631bfc867526be87a6e5514d3e1c9777bfaf97 SHA512 55c8ad6863c8fd88b410bf4999d7a37cda0f1798bae42d490bf48210e676291aee14578ae5b090c00d1b00bd8eb6cde63f1d3dba4aa5dcfccf7f97bf26e6a017
-EBUILD zen-sources-5.19.13.ebuild 1118 BLAKE2B 1899d93d3888fcab9ab500ddec42e766e53f51a050f596a7d564d663c0d9ced97ab2c42b9ae8c18a00992fe917abbf5b308d33bb83122ccfa1e5f30caed252c8 SHA512 1798ba5a249e9d6919c195c47162c50931823051d7e6c6b1f88b4ebdafde83749dc3270966cc3eb389f63d598811ff9e94eec1a58fc07e85819d8993ca3fecd4
-EBUILD zen-sources-6.0.12.ebuild 1118 BLAKE2B 1899d93d3888fcab9ab500ddec42e766e53f51a050f596a7d564d663c0d9ced97ab2c42b9ae8c18a00992fe917abbf5b308d33bb83122ccfa1e5f30caed252c8 SHA512 1798ba5a249e9d6919c195c47162c50931823051d7e6c6b1f88b4ebdafde83749dc3270966cc3eb389f63d598811ff9e94eec1a58fc07e85819d8993ca3fecd4
+DIST genpatches-6.1-1.base.tar.xz 4304 BLAKE2B f58a4e46ba85da5bee55c6fa14a57e7546813d167ac3d78fa8bfe4b386ce2240279b7c936094271cffbabd9f6eafd76a7bd609fb2136400cef2eaf443b452cd3 SHA512 310c97fb844db4ffd7272144d1d2d3d5fee1ecc31527ef3a6f0b67f0fbf1f3b7f9f9db9ae52f6e309cb7a8e0790019707db24db5db670d58179b7648c677c1d2
+DIST genpatches-6.1-1.extras.tar.xz 3804 BLAKE2B 62ee97ed9142b41f415129dfb12d10387561258c6798f055ef5c8767ca0f31b36d785045df4207f704ea37f6764a0fb6e6fb78859c0679ca5a75a5aa5fc458cd SHA512 21b8f5a44809a9866063fbac676df25db709105c702a5b90e5acb21f6a01f60d3a559d8398dba1ec2b0ade89b3a45b587933cb7ded0621d8e4aa13b4d4eb5daa
+DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
+DIST v6.1.8-zen1.patch.xz 775344 BLAKE2B b519c1af0c8bd06e68062244e337d1eeefffd22b9feab236d083981908fc1edeaef8bcdfb37acda5d85b036ce740565bbb054bed45d74140499f4288e5fdccb5 SHA512 3a66512bdedc8dacb9744843e6c957182960949d9535daf475ced36c9a5b8c25d0e93ce0190608738878f580eac4f8ed38770df21e08b2b85a72a9627948f109
+EBUILD zen-sources-6.1.8.ebuild 1125 BLAKE2B e5aa3a4382c56fffc1b943fc98cd83546d4b0b8faa2de7c80cf2fef63cfba99266adba4f036d623781f2d47c2265f2631b59238566650820ea1b3c771829c8d0 SHA512 87aa724c607fb9ac86156c504d840ff5354fdb64b108d0b32474bf973ff9f223051b5e85737e3b517ff54cedfd68922209dd56feadcc97bec71901f6cc305c5d
 MISC metadata.xml 404 BLAKE2B 1836329a9cab0f03e4ee80056d5db141d5721875794ef39844c014c0426fd558b3a2bc6f1a7bbcb72d99ad81f4a071f451da9adc4a6fdb380e8c7bd7bb10ed2d SHA512 2c48e149eb08a53121a799256eec33895daa0dce32ea5325f5f3b055c3a661de8294e21f114f6c7ad609818215261c57c53d124fc0d3679f87168039905a9516
diff --git a/sys-kernel/zen-sources/zen-sources-5.15.10.ebuild b/sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
deleted file mode 100644
index 6c8404ab9ff7..000000000000
--- a/sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="2"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="The Zen Kernel Live Sources"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on oftc"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/zen-sources/zen-sources-5.19.13.ebuild b/sys-kernel/zen-sources/zen-sources-5.19.13.ebuild
deleted file mode 100644
index 795d10246fde..000000000000
--- a/sys-kernel/zen-sources/zen-sources-5.19.13.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="The Zen Kernel Live Sources"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on oftc"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/zen-sources/zen-sources-6.0.12.ebuild b/sys-kernel/zen-sources/zen-sources-6.0.12.ebuild
deleted file mode 100644
index 795d10246fde..000000000000
--- a/sys-kernel/zen-sources/zen-sources-6.0.12.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-DESCRIPTION="The Zen Kernel Live Sources"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on oftc"
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/zen-sources/zen-sources-6.1.8.ebuild b/sys-kernel/zen-sources/zen-sources-6.1.8.ebuild
new file mode 100644
index 000000000000..6e8697c4336d
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-6.1.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="1"
+K_SECURITY_UNSUPPORTED="1"
+K_NOSETEXTRAVERSION="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+HOMEPAGE="https://github.com/zen-kernel"
+IUSE=""
+
+DESCRIPTION="The Zen Kernel Live Sources"
+
+ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
+UNIPATCH_STRICTORDER="yes"
+
+K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on oftc"
+
+pkg_setup() {
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the zen developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 4d5a5a2c1767..7538c416c523 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 3fda0c6f497c..f8d7bb7e4427 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,3 +1,5 @@
 DIST talloc-2.3.4.tar.gz 674196 BLAKE2B 1fac0a45a4ba16c7741e6d810e1a1e56352c04f266b99de62770177c1218a8c8253be2d5d1793aae67ce61e6a1159cbcd4888a49702822e6817b86eb7a1fea31 SHA512 c46488deda99753fd79566d42cae88899b71196513a127813be2cb855e7f36b77132f0552297ee4153ba4d8f177cea3bb0dc93340caabf321c026657744684d9
+DIST talloc-2.4.0.tar.gz 676054 BLAKE2B 71b3f21fa7cd114579e1dc064aadda447c0d196beaa27a5919acebdce668f6b768dd7c293c056ae4c096f31d8e931255ee2b71728c4b7b0bbb7818169380e9ca SHA512 810d92a614d0b9e0ac6fe403c1643c4dda435f79c4627d3c3be228f94b4b2ee8e528efbbed07f7d1a16043d6e55bdf4f10826f31fb8ca1c649c4126ea09a3aff
 EBUILD talloc-2.3.4.ebuild 3404 BLAKE2B efa3e82dc854a7523bba7ebeca85241e45bd624d39c46f2a3875cffa1a92b3ade1ce5071fdac96047424a13f86700b40fe9f58f90928d505a2c7c22f161dfc0a SHA512 7bd3cc3a4a6be3d8e36352b044e128036a690acd4a1ac39c7fb5e579e06ffe4469fe787f872c9e61b71830f4cc7c504226cc77f96276b356b3531f3a9e7f6a3c
+EBUILD talloc-2.4.0.ebuild 3493 BLAKE2B eb221c8f679853b6e57076215c64ba90e8468c1c9eb5cbe14c4a502b33a3d771c46b82c83fc06c171a1c228dc5c4f9a0e4978b99222a1a2a3b683c601aadfd52 SHA512 c38cd248d25a717ad8fdd4a7223f597a7210d1f53996784e1236158afce7b5355fa2a647dcb60a12d2a9b503c04281b838f370f030fb0a56e510c22c2223a33c
 MISC metadata.xml 326 BLAKE2B 4788d8b536b43840fc3a6d6ef36d860589ebb1137cd07d11ce75c54869b8b65027f9332901c1882ce8fd97f446d90973cec03332b4e693283162f3c731b7627e SHA512 e700e6f5810ad2d6618f52ff3607a2dc3254751dc8172744512c956f001045accfa28d8aa79be67935c02aead13c2c22c54aa4e221f487ba3cb25ebe9273d57f
diff --git a/sys-libs/talloc/talloc-2.4.0.ebuild b/sys-libs/talloc/talloc-2.4.0.ebuild
new file mode 100644
index 000000000000..30e7c27271d8
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.4.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils python-single-r1 multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	!elibc_SunOS? (
+		!elibc_Darwin? (
+			dev-libs/libbsd[${MULTILIB_USEDEP}]
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Drop irritating ABI names (e.g. cpython-37m)
+		# We're only installing one implementation anyway
+		sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die
+		sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die
+	fi
+
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--disable-dependency-tracking
+		--disable-warnings-as-errors
+
+		$(usev compat --enable-talloc-compat1)
+		$(multilib_native_usex python '' --disable-python)
+		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
+	)
+
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die
+
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+		fi
+	fi
+}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index e9c5c8f9d3a4..18a3c22c4dbc 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,4 +1,6 @@
 AUX tdb-1.4.7-configure-clang16.patch 1180 BLAKE2B 6637b19f1f5db53212484b0f91a550932bbc89ae3dd37affc039a166610a15b837ed3f5b7ac898bcb4451186d43625414b812111e3396e10471add7fa5e3a22b SHA512 156f7acb774ae0a6f00ff2bee0817947e256c10b24d55c7f63720bfd52f83e42070a1838c42e20fbb78e73412507db80368165ccdf75b3bb729bc6e5dcbe2223
 DIST tdb-1.4.7.tar.gz 741714 BLAKE2B ec2f991bbaa61d46f16b7a68a4e47a2f690cda261dd0e9fd9708e51ad64eefeb54ac8b1102cde6935916f840d3c89d7a2903f58175cceb78ea4ef889e82ddbc6 SHA512 2b5b20c299b60545943f106d854b6e0d4a559e16f08a7ed62fe57ee962bebc888c2e663bd5fef907aace05b316826fe8fbbf3f323b6d3427531e59ffe47d48e4
+DIST tdb-1.4.8.tar.gz 742791 BLAKE2B dc2705cb16ee59f4d5bf25602032b25fd5338caa890db19939996a40cd19c4c999f9a74786d5754dbbd1de54d818541cf56844beeb33008aaee507d5dfcdba85 SHA512 763beebe923aa04303cbb91ce5970e6bbd13546888cff75ea9ab025afff3ef88fee539ae173fc2fb7ec661b6c337b0c2da361ce3d318f51ef6627bdb3fe6ca63
 EBUILD tdb-1.4.7-r1.ebuild 1573 BLAKE2B f3df2ac2041c3ae83434e6e25be73a9bcd503f32b23b16817803d7d1938c37f1637d2df80c5c6bd473515c06b14b14a1ca521f1981de9308fc9d5c0fc03c9b38 SHA512 9d2fc8eb4e29693f3a82d26f37d5c947d84fd21e93fb027eeac43e6e70917ded04936b8745457baa8162080aca6d5e51f18b380aab376bba9fb5a1b9b7788637
+EBUILD tdb-1.4.8.ebuild 1450 BLAKE2B 579a5be5da3d4d79ffc8e8a15fbc62fdd30523f5b1b8b1680406989875c899a27cbfb3cdf4e7ff8ee621d2f01f7740b3793e9a26babd85590d5ac0e95b246359 SHA512 a582df5897e3c94d623636fbc2cb46eb17b06dc15debc8341d6caee86ef361a0eb6b8b0d5f51af22593686e6f685592d2e6fe95ada24a4ed251b58f79bc8bd89
 MISC metadata.xml 245 BLAKE2B 015a6303c153dcdb4a4b6ec58ea97e6798d3316c6d211559022bd2a26d481356e481ba2ade200171bb182264ce9c132727cf8ce077fba38fabcef92c3431b6ba SHA512 5d1b6ef089165b3325df35b31d33f7c994bbc302399bb47abf3138885f0dd7b04176114de8ffea6ee1ae26a53fc83be9016426714e547fd6405c454b918e39da
diff --git a/sys-libs/tdb/tdb-1.4.8.ebuild b/sys-libs/tdb/tdb-1.4.8.ebuild
new file mode 100644
index 000000000000..56378155a7e0
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.4.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Simple database API"
+HOMEPAGE="https://tdb.samba.org/"
+SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/libcrypt
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+	default
+	python_fix_shebang .
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	MAKEOPTS+=" -j1"
+
+	local extra_opts=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--disable-dependency-tracking
+		--disable-warnings-as-errors
+	)
+
+	if ! multilib_is_native_abi || ! use python ; then
+		extra_opts+=( --disable-python )
+	fi
+
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	use python && python_optimize
+}
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index e3d72c2012de..a08431f596a4 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,5 +1,7 @@
 DIST tevent-0.12.1.tar.gz 879683 BLAKE2B 51521aa26dc3ac38dcf69cdb77a7ad33fede88947e3a91cc5917fae9746951643a70615db24449437e133b575ca41d961ed63c23a0b4f1a01edf090952672032 SHA512 ab70262702d70ce00e8b3aef41930c674b04c147fdbf0006e57cfa057d82f6049ba6da4b2c2b7b53aa191dd4f0f3d55e72b0666ae8f5b6948eeb9fde1988c938
 DIST tevent-0.13.0.tar.gz 880601 BLAKE2B 4e2a2c055bac28cecae1a95b7ddab349ed780f44427e74709eca497d6242bc4f46a91878d3d253c1af4819887ce7df522fe41f88f6059ec5f6c706c7e071ee35 SHA512 7aa05c09e3c708769e31cda88b319cee3629c88c51bda559193a85d4ab32204a8b4ba11f142861dbca06b578bf54953f2aca1ad847e99995a4fc40bf08618a93
+DIST tevent-0.14.0.tar.gz 878142 BLAKE2B 8c1c2b4cb683a3ca2630181904566c3cf9d0151c7e280f86e0ce24febfc5d0a1e85757e3ad9d635205bbcbe3e0d0a060dedb3207fb4e91ea76f36246f0a2704a SHA512 5e9525b2f8f8014d1147244dcccd6cf5ac49e383c49b19480ac1256dc7ccf60705960e87b8f63348fca3f4f496861f3d307ee5e0fde8189d93a596c5e689f2b1
 EBUILD tevent-0.12.1.ebuild 1649 BLAKE2B d9b36d619ee5ef4f02f596af5ba073056024fe0af0340b36aee0416fba6d223fa52beb2dd7122600a19ff540791d59c0757424715a7923ddfc00255fc0f58004 SHA512 2fa8321377d377bf3c81ab45410ec676643f833dd8a61c399e3af097c3878995602717b33dea9861712dbd28839a4d9983a8438a3032562874ea402ef88e4537
 EBUILD tevent-0.13.0.ebuild 2460 BLAKE2B 4ba27a51e44d83743bf48a109882a8b24a18d6c3e3d45f054754be7225c9a432064a641fe5e43454a08d3976523aa083484c5b3ed64185c615d4558953e3e2af SHA512 9afe14e9596a1591368beb6ade85fb515f5b60c239593fb507e65873edc02997f6559f72727c1bc78e485f60f5fec02316c0853f4dbe0e23a9f5e4423ea1da46
+EBUILD tevent-0.14.0.ebuild 2394 BLAKE2B 406ffbb4cc1fe6e0fddb01fee0d22ae2c887a8bdef7f9bd70349729c08a1ed57adc782e4206e6205981cf5b67f1f970ce0230b63a825ec515883e68b161999d3 SHA512 76ad5b726a22bf44be9c5a0baa7ef42f8e51d28908215391075b46346dbbc9f9f45404bd8eb75a621e43d04a78ecd7f8aba03ae1f886e934c40459abe63f1b59
 MISC metadata.xml 239 BLAKE2B 7127a2a67e79dc98a78fcaca706fd348389c7f08465112215855afe5978d2932ecbee93944efb1df528fbb6d09e884b277cb1d55a8b3926487b6ca07f9330b8a SHA512 4ea42efe4d083d013b85796ca25a132678bcefe6e3687fd6dd371814fd307118fbc8da8c15ce7f4d956e5f824cd0202f49d3469406c88008e84ff9f4d360f424
diff --git a/sys-libs/tevent/tevent-0.14.0.ebuild b/sys-libs/tevent/tevent-0.14.0.ebuild
new file mode 100644
index 000000000000..c178820999e5
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.14.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="https://tevent.samba.org/"
+SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test !test? ( test )"
+
+TALLOC_VERSION="2.4.0"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	python? (
+		${PYTHON_DEPS}
+		>=sys-libs/talloc-${TALLOC_VERSION}[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	elibc_glibc? (
+		net-libs/libtirpc[${MULTILIB_USEDEP}]
+		net-libs/rpcsvc-proto
+	)
+	test? ( >=dev-util/cmocka-1.1.3 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+	check_samba_dep_versions
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	MAKEOPTS+=" -j1"
+
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test ; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	waf-utils_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-dependency-tracking \
+		--disable-warnings-as-errors \
+		--bundled-libraries="${bundled_libs}" \
+		--builtin-libraries=NONE \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}
+
+multilib_src_install_all() {
+	insinto /usr/include
+	doins tevent_internal.h
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 43cf9878c842..e5cf0474e449 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 9992ec5b7b7c..d3c88f464c72 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,3 +1,4 @@
 EBUILD rust-1.65.0-r1.ebuild 601 BLAKE2B a94ce87582eebb39965295217fd22cdab31c803999fc259c7f63281c6ea4b74fe1d7cd731b53ba292490606282169bf5eddb1a86f51398572c5b760ac0579df2 SHA512 bfa5d6bd05cb06c72fd954090fd34b89ee3c64491b192c5de5815717b05672a6e301d81611cf31bfc4376c6b5b4ad8bb6582df8afe477ea6bd8b316db1fbb06e
 EBUILD rust-1.66.1.ebuild 603 BLAKE2B 07548d929ab434ec78859c2eef7f040ffaa8e9a95fd9217508c5683ebcfc94f7255181148bb2d0c4e31d13bc8148748599e23a6041f47a2e0c625065cd51867a SHA512 3fa21e8534447f6fde63671a0f8a5de3d52d0e84a7cf696f1065749988ae2c6f84aca74197fbaefdc12ab2784d5c66d321aefe14543c74468a3daa829993526d
+EBUILD rust-1.67.0.ebuild 608 BLAKE2B de30eb4061e7e9f4abe9f5a097e4c4462e81332676ff689ac8420b0139c58765851cb0af311fb1e36eb04934c286c7a31c81d6a3dd84016af5c7db595b492eef SHA512 ded4251aaa77de8053f2f398f0a63d88e122d9f9e15d772238c8cba9d079e7a2a808a66fa22a1780e59287dd189dd02c3672faf8f488680f1fb31a967abee330
 MISC metadata.xml 351 BLAKE2B cf3c7f2e804dbe6ddce9380d9c7b32e734df16a04ea867a474a4e6868edfaa72abb79dd6eb47f67128a1b60cb4872c999949e8237102bc2117e581309307f862 SHA512 d32137e0b4549baf85ffaff35d2c5fb058a44e3fbeb7f560db3ebbfc1d44d9ce3651e033cb8434f211994218a85d5bf89f42ea9e3ab76e361c1014dcc6f25997
diff --git a/virtual/rust/rust-1.67.0.ebuild b/virtual/rust/rust-1.67.0.ebuild
new file mode 100644
index 000000000000..ae12ed9a2d0f
--- /dev/null
+++ b/virtual/rust/rust-1.67.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+
+# adjust when rust upstream bumps internal llvm
+# we do not allow multiple llvm versions in dev-lang/rust for
+# neither system nor bundled, so we just hardcode it here.
+SLOT="0/llvm-15"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index bb06d627d548..2bcef94372a0 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 4b095ecf94da..4820878f8f68 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,10 +1,6 @@
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
-DIST gitea-1.17.4.tar.gz 52844862 BLAKE2B fe5f52be1c9697032fb7b8e84d90be9b540b4cede67ff4dcc3392621eb206efa0f273589e5fcd0f9f7f56de9dbd42804c9117c21ef2538d7aaaf8cbf13b984f4 SHA512 1bae6e11d441f4efe0b92882a5c2c1f4ada9015d49e6140bac87be1a103e23fd622543bf2d988fe9e9d57c26545b53c5acca31aac13034e01f41d5731ac02809
-DIST gitea-1.18.0.tar.gz 55508056 BLAKE2B bb6a5e98a087bc12e5afafa9c9d95fb381fd96cdd2823e411ab079c3797053c56951bfab1353bcfcee9d58234bb9a63cb029fee03f157b8f00ecc38687f7bb8e SHA512 b205d8d2d957b322e114621ca5c25500d5123d7df874d204e28e3a58c1e101e7849810f380b45957c6f504008d4632b75fc0adbc99ff13e0c8498640da3c42cd
 DIST gitea-1.18.3.tar.gz 55493166 BLAKE2B 6a0bb385244c212f577b99b54cd621bf4b9b4f7bdd77bf199e2667fcb5b77638136b2c26b0a46d755d5aea359f0eea251762f759b461377d459092c0017ed972 SHA512 4dabcafad5f4f9804f369cf248b351db68e80f193a4b2a5901f8c13b7cb6051b6b5ef1f283037376e545c3b76aabe703e947d1780ed4a4e630ec68adffa8afff
-EBUILD gitea-1.17.4.ebuild 3317 BLAKE2B fc94b9df66f3ac86dd27022cf4620b8b554b9ce500a0011d6683f13e4f8445967041335ff48e847c803406c08e9a7ca46504ac12551709ee7e890d028a727753 SHA512 62b06fe8e30338a0704e39d01dc8f9a82d3a6b390c80aa4f5c8f10830c7db21875c996a7d8f778382cce0e79297fb26aff32c414c0efab730a52066d3375c2eb
-EBUILD gitea-1.18.0.ebuild 3318 BLAKE2B 2442718948c1e3f7fbf59404c94f78243832d9584dd237e82988e4dbf50f47f255bb14afb21f9159dbc84ac68de8a4082151cb0da6a7ad9894ebc38cf6a1aa90 SHA512 0e5c8a43de3b0c3d33eedacb201612c202930d2494a11fe5cf0f22a0a0066925c02f25d32bef8da79445e69a3bc55fe2bf26d0e8001bdcbf1a318f773e65e6ed
 EBUILD gitea-1.18.3.ebuild 3317 BLAKE2B 373516970228b3d36fee0a00f18a702a27ba10494206bd91fef72d7701cd63091a52af2a89d68c9dd49e76321de2515c5d2e16d9b8ef0ca78e5b4f52e19cb4bd SHA512 5bd792b6b74dbc14347eb1b12bc2d189f7b8562e74f8b61f376d0b08a07e6937a06f318651b8f068b3e502ecd8471dd194ca565b4a134f4450471fb7ecfdf524
 MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
diff --git a/www-apps/gitea/gitea-1.17.4.ebuild b/www-apps/gitea/gitea-1.17.4.ebuild
deleted file mode 100644
index 6a27a8ad7547..000000000000
--- a/www-apps/gitea/gitea-1.17.4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd flag-o-matic
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
-else
-	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct pam sqlite pie"
-
-DEPEND="
-	acct? (
-		acct-group/git
-		acct-user/git[gitea] )
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=(
-	custom/conf/app.example.ini CONTRIBUTING.md README.md
-)
-FILECAPS=(
-	-m 711 cap_net_bind_service+ep usr/bin/gitea
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	local sedcmds=(
-		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-		-e "s#^MODE = console#MODE = file#"
-		-e "s#^LEVEL = Trace#LEVEL = Info#"
-		-e "s#^LOG_SQL = true#LOG_SQL = false#"
-		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-	)
-
-	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
-	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
-	fi
-}
-
-src_configure() {
-	# bug 832756 - PIE build issues
-	filter-flags -fPIE
-	filter-ldflags -fPIE -pie
-}
-
-src_compile() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		DRONE_TAG="${PV}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
-		TAGS="${gitea_tags[*]}"
-	)
-
-	GOFLAGS=""
-	if use pie ; then
-		GOFLAGS+="-buildmode=pie"
-	fi
-
-	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}/gitea.confd-r1" gitea
-	newinitd "${FILESDIR}/gitea.initd-r3" gitea
-	newtmpfiles - gitea.conf <<-EOF
-		d /run/gitea 0755 git git
-	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.example.ini app.ini
-	if use acct; then
-		fowners root:git /etc/gitea/{,app.ini}
-		fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-		diropts -m0750 -o git -g git
-		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-		keepdir /var/log/gitea
-	fi
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	tmpfiles_process gitea.conf
-
-	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
-	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
-	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
-	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
-}
diff --git a/www-apps/gitea/gitea-1.18.0.ebuild b/www-apps/gitea/gitea-1.18.0.ebuild
deleted file mode 100644
index c3facdc15fbb..000000000000
--- a/www-apps/gitea/gitea-1.18.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd flag-o-matic
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
-else
-	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct pam sqlite pie"
-
-DEPEND="
-	acct? (
-		acct-group/git
-		acct-user/git[gitea] )
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=(
-	custom/conf/app.example.ini CONTRIBUTING.md README.md
-)
-FILECAPS=(
-	-m 711 cap_net_bind_service+ep usr/bin/gitea
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	local sedcmds=(
-		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-		-e "s#^MODE = console#MODE = file#"
-		-e "s#^LEVEL = Trace#LEVEL = Info#"
-		-e "s#^LOG_SQL = true#LOG_SQL = false#"
-		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-	)
-
-	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
-	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
-	fi
-}
-
-src_configure() {
-	# bug 832756 - PIE build issues
-	filter-flags -fPIE
-	filter-ldflags -fPIE -pie
-}
-
-src_compile() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		DRONE_TAG="${PV}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
-		TAGS="${gitea_tags[*]}"
-	)
-
-	GOFLAGS=""
-	if use pie ; then
-		GOFLAGS+="-buildmode=pie"
-	fi
-
-	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}/gitea.confd-r1" gitea
-	newinitd "${FILESDIR}/gitea.initd-r3" gitea
-	newtmpfiles - gitea.conf <<-EOF
-		d /run/gitea 0755 git git
-	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.example.ini app.ini
-	if use acct; then
-		fowners root:git /etc/gitea/{,app.ini}
-		fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-		diropts -m0750 -o git -g git
-		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-		keepdir /var/log/gitea
-	fi
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	tmpfiles_process gitea.conf
-
-	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
-	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
-	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
-	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
-}
-- 
cgit v1.2.3