From a4a19f78acc305106f3b54bec9af212e38bfe7be Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 25 Jan 2024 04:44:48 +0000
Subject: gentoo auto-resync : 25:01:2024 - 04:44:48

---
 Manifest                                           |  30 +-
 Manifest.files.gz                                  | Bin 29773 -> 29748 bytes
 app-arch/Manifest.gz                               | Bin 17740 -> 17743 bytes
 app-arch/lzlib/Manifest                            |   2 +-
 app-arch/lzlib/lzlib-1.13-r2.ebuild                |   2 +-
 app-arch/tarlz/Manifest                            |   2 +-
 app-arch/tarlz/tarlz-0.25.ebuild                   |   2 +-
 app-cdr/Manifest.gz                                | Bin 7504 -> 7504 bytes
 app-cdr/xfburn/Manifest                            |   2 +-
 app-cdr/xfburn/xfburn-0.7.0.ebuild                 |   2 +-
 app-portage/Manifest.gz                            | Bin 9764 -> 9763 bytes
 app-portage/pycargoebuild/Manifest                 |   2 +-
 .../pycargoebuild/pycargoebuild-0.13.1.ebuild      |   2 +-
 app-text/Manifest.gz                               | Bin 49637 -> 49634 bytes
 app-text/poppler/Manifest                          |   2 +-
 app-text/poppler/poppler-23.12.0.ebuild            |   2 +-
 app-text/qpdf/Manifest                             |   2 +-
 app-text/qpdf/qpdf-11.7.0.ebuild                   |   2 +-
 dev-lang/Manifest.gz                               | Bin 21650 -> 21651 bytes
 dev-lang/ispc/Manifest                             |   2 +-
 dev-lang/ispc/ispc-1.22.0-r1.ebuild                |   2 +-
 dev-lang/php/Manifest                              |  12 +-
 dev-lang/php/php-8.1.20-r2.ebuild                  | 759 -------------------
 dev-lang/php/php-8.1.27.ebuild                     | 766 +++++++++++++++++++
 dev-lang/php/php-8.2.13-r2.ebuild                  | 835 --------------------
 dev-lang/php/php-8.2.15.ebuild                     | 839 +++++++++++++++++++++
 dev-lang/php/php-8.3.0-r2.ebuild                   | 790 -------------------
 dev-lang/php/php-8.3.2.ebuild                      | 801 ++++++++++++++++++++
 dev-python/Manifest.gz                             | Bin 268608 -> 268615 bytes
 dev-python/ddt/Manifest                            |   2 +-
 dev-python/ddt/ddt-1.7.1.ebuild                    |   2 +-
 dev-python/libsass/Manifest                        |   2 +-
 dev-python/libsass/libsass-0.23.0.ebuild           |   2 +-
 dev-python/miniupnpc/Manifest                      |   2 +-
 dev-python/miniupnpc/miniupnpc-2.2.6.ebuild        |   2 +-
 dev-python/pikepdf/Manifest                        |   2 +-
 dev-python/pikepdf/pikepdf-8.11.2.ebuild           |   2 +-
 dev-python/psycopg/Manifest                        |   2 +-
 dev-python/psycopg/psycopg-3.1.17.ebuild           |   2 +-
 dev-python/pyatspi/Manifest                        |   2 +-
 dev-python/pyatspi/pyatspi-2.46.1.ebuild           |   2 +-
 dev-python/pycryptodome/Manifest                   |   2 +-
 .../pycryptodome/pycryptodome-3.19.1-r2.ebuild     |   2 +-
 dev-python/pygraphviz/Manifest                     |   2 +-
 dev-python/pygraphviz/pygraphviz-1.12.ebuild       |   2 +-
 dev-python/python-xmp-toolkit/Manifest             |   2 +-
 .../python-xmp-toolkit-2.0.2.ebuild                |   2 +-
 dev-python/pythran/Manifest                        |   2 +-
 dev-python/pythran/pythran-0.15.0.ebuild           |   2 +-
 dev-python/sqlalchemy/Manifest                     |   2 +-
 dev-python/sqlalchemy/sqlalchemy-1.4.51.ebuild     |   2 +-
 dev-python/ytmusicapi/Manifest                     |   2 +-
 dev-python/ytmusicapi/ytmusicapi-1.4.2.ebuild      |   2 +-
 dev-qt/Manifest.gz                                 | Bin 11571 -> 11569 bytes
 dev-qt/qt5compat/Manifest                          |   2 +-
 dev-qt/qt5compat/qt5compat-6.6.1.ebuild            |   2 +-
 dev-qt/qtimageformats/Manifest                     |   2 +-
 dev-qt/qtimageformats/qtimageformats-6.6.1.ebuild  |   2 +-
 dev-qt/qtmultimedia/Manifest                       |   2 +-
 dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild   |   2 +-
 dev-qt/qtpositioning/Manifest                      |   2 +-
 dev-qt/qtpositioning/qtpositioning-6.6.1.ebuild    |   2 +-
 dev-qt/qtquicktimeline/Manifest                    |   2 +-
 .../qtquicktimeline/qtquicktimeline-6.6.1.ebuild   |   2 +-
 dev-qt/qtserialport/Manifest                       |   2 +-
 dev-qt/qtserialport/qtserialport-6.6.1.ebuild      |   2 +-
 dev-qt/qtsvg/Manifest                              |   2 +-
 dev-qt/qtsvg/qtsvg-6.6.1.ebuild                    |   2 +-
 dev-util/Manifest.gz                               | Bin 64279 -> 64279 bytes
 dev-util/intel_clc/Manifest                        |   2 +
 dev-util/intel_clc/intel_clc-23.3.4.ebuild         | 116 +++
 media-gfx/Manifest.gz                              | Bin 37690 -> 37698 bytes
 media-gfx/feh/Manifest                             |   2 -
 media-gfx/feh/feh-3.10.1.ebuild                    |  71 --
 media-libs/Manifest.gz                             | Bin 69136 -> 69148 bytes
 media-libs/harfbuzz/Manifest                       |   2 +-
 media-libs/harfbuzz/harfbuzz-8.3.0.ebuild          |   2 +-
 media-libs/mesa/Manifest                           |   2 +
 media-libs/mesa/mesa-23.3.4.ebuild                 | 448 +++++++++++
 media-sound/Manifest.gz                            | Bin 57726 -> 57728 bytes
 media-sound/musescore/Manifest                     |   6 +-
 media-sound/musescore/musescore-4.0.2-r1.ebuild    | 136 ++++
 media-sound/musescore/musescore-4.0.2.ebuild       | 137 ----
 media-sound/musescore/musescore-4.2.1-r1.ebuild    | 134 ++++
 media-sound/musescore/musescore-4.2.1.ebuild       | 135 ----
 media-sound/musescore/musescore-9999.ebuild        |   3 +-
 metadata/Manifest.gz                               | Bin 9837 -> 9836 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  28 +-
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 28417 -> 28419 bytes
 metadata/md5-cache/app-arch/Manifest.gz            | Bin 28380 -> 28380 bytes
 metadata/md5-cache/app-arch/lzlib-1.13-r2          |   4 +-
 metadata/md5-cache/app-arch/tarlz-0.25             |   4 +-
 metadata/md5-cache/app-cdr/Manifest.gz             | Bin 8974 -> 8971 bytes
 metadata/md5-cache/app-cdr/xfburn-0.7.0            |   4 +-
 metadata/md5-cache/app-portage/Manifest.gz         | Bin 19433 -> 19433 bytes
 .../md5-cache/app-portage/pycargoebuild-0.13.1     |   4 +-
 metadata/md5-cache/app-text/Manifest.gz            | Bin 78505 -> 78500 bytes
 metadata/md5-cache/app-text/poppler-23.12.0        |   4 +-
 metadata/md5-cache/app-text/qpdf-11.7.0            |   4 +-
 metadata/md5-cache/dev-lang/Manifest.gz            | Bin 46675 -> 46684 bytes
 metadata/md5-cache/dev-lang/ispc-1.22.0-r1         |   4 +-
 metadata/md5-cache/dev-lang/php-8.1.20-r2          |  18 -
 metadata/md5-cache/dev-lang/php-8.1.27             |  18 +
 metadata/md5-cache/dev-lang/php-8.2.13-r2          |  18 -
 metadata/md5-cache/dev-lang/php-8.2.15             |  18 +
 metadata/md5-cache/dev-lang/php-8.3.0-r2           |  18 -
 metadata/md5-cache/dev-lang/php-8.3.2              |  18 +
 metadata/md5-cache/dev-python/Manifest.gz          | Bin 345070 -> 345061 bytes
 metadata/md5-cache/dev-python/ddt-1.7.1            |   4 +-
 metadata/md5-cache/dev-python/libsass-0.23.0       |   4 +-
 metadata/md5-cache/dev-python/miniupnpc-2.2.6      |   4 +-
 metadata/md5-cache/dev-python/pikepdf-8.11.2       |   4 +-
 metadata/md5-cache/dev-python/psycopg-3.1.17       |   4 +-
 metadata/md5-cache/dev-python/pyatspi-2.46.1       |   4 +-
 .../md5-cache/dev-python/pycryptodome-3.19.1-r2    |   4 +-
 metadata/md5-cache/dev-python/pygraphviz-1.12      |   4 +-
 .../md5-cache/dev-python/python-xmp-toolkit-2.0.2  |   4 +-
 metadata/md5-cache/dev-python/pythran-0.15.0       |   4 +-
 metadata/md5-cache/dev-python/sqlalchemy-1.4.51    |   4 +-
 metadata/md5-cache/dev-python/ytmusicapi-1.4.2     |   4 +-
 metadata/md5-cache/dev-qt/Manifest.gz              | Bin 37843 -> 37848 bytes
 metadata/md5-cache/dev-qt/qt5compat-6.6.1          |   4 +-
 metadata/md5-cache/dev-qt/qtimageformats-6.6.1     |   4 +-
 metadata/md5-cache/dev-qt/qtmultimedia-6.6.1-r1    |   4 +-
 metadata/md5-cache/dev-qt/qtpositioning-6.6.1      |   4 +-
 metadata/md5-cache/dev-qt/qtquicktimeline-6.6.1    |   4 +-
 metadata/md5-cache/dev-qt/qtserialport-6.6.1       |   4 +-
 metadata/md5-cache/dev-qt/qtsvg-6.6.1              |   4 +-
 metadata/md5-cache/dev-util/Manifest.gz            | Bin 121714 -> 121870 bytes
 metadata/md5-cache/dev-util/intel_clc-23.3.4       |  15 +
 metadata/md5-cache/media-gfx/Manifest.gz           | Bin 59843 -> 59684 bytes
 metadata/md5-cache/media-gfx/feh-3.10.1            |  15 -
 metadata/md5-cache/media-libs/Manifest.gz          | Bin 119137 -> 119291 bytes
 metadata/md5-cache/media-libs/harfbuzz-8.3.0       |   4 +-
 metadata/md5-cache/media-libs/mesa-23.3.4          |  17 +
 metadata/md5-cache/media-sound/Manifest.gz         | Bin 74703 -> 74715 bytes
 metadata/md5-cache/media-sound/musescore-4.0.2     |  17 -
 metadata/md5-cache/media-sound/musescore-4.0.2-r1  |  17 +
 metadata/md5-cache/media-sound/musescore-4.2.1     |  17 -
 metadata/md5-cache/media-sound/musescore-4.2.1-r1  |  17 +
 metadata/md5-cache/media-sound/musescore-9999      |   6 +-
 metadata/md5-cache/net-dns/Manifest.gz             | Bin 14217 -> 14204 bytes
 metadata/md5-cache/net-dns/c-ares-1.25.0-r1        |   4 +-
 metadata/md5-cache/net-dns/libidn2-2.3.4-r2        |   4 +-
 metadata/md5-cache/net-libs/Manifest.gz            | Bin 59670 -> 59673 bytes
 metadata/md5-cache/net-libs/miniupnpc-2.2.6        |   4 +-
 metadata/md5-cache/net-misc/Manifest.gz            | Bin 92128 -> 92125 bytes
 metadata/md5-cache/net-misc/chrony-4.5             |   4 +-
 metadata/md5-cache/net-misc/curl-8.5.0             |   4 +-
 metadata/md5-cache/net-print/Manifest.gz           | Bin 8612 -> 8615 bytes
 metadata/md5-cache/net-print/cups-2.4.7-r2         |   4 +-
 metadata/md5-cache/net-print/cups-browsed-2.0.0    |   4 +-
 metadata/md5-cache/net-print/cups-filters-2.0.0    |   4 +-
 metadata/md5-cache/net-print/cups-meta-1           |   4 +-
 .../md5-cache/net-print/libcupsfilters-2.0.0-r3    |   4 +-
 metadata/md5-cache/net-print/libppd-2.0.0          |   4 +-
 metadata/md5-cache/net-wireless/Manifest.gz        | Bin 27824 -> 27834 bytes
 metadata/md5-cache/net-wireless/gnuradio-3.10.9.2  |  17 -
 .../md5-cache/net-wireless/gnuradio-3.10.9.2-r1    |  17 +
 metadata/md5-cache/net-wireless/gnuradio-9999      |   4 +-
 metadata/md5-cache/sci-mathematics/Manifest.gz     | Bin 29537 -> 29699 bytes
 metadata/md5-cache/sci-mathematics/coq-8.19.0      |  16 +
 metadata/md5-cache/sec-keys/Manifest.gz            | Bin 29750 -> 29750 bytes
 .../md5-cache/sec-keys/openpgp-keys-jberkenbilt-1  |   4 +-
 metadata/md5-cache/sys-fs/Manifest.gz              | Bin 35279 -> 35281 bytes
 .../md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3    |   4 +-
 metadata/md5-cache/sys-kernel/Manifest.gz          | Bin 19730 -> 19727 bytes
 .../md5-cache/sys-kernel/dracut-060_pre20240104    |   4 +-
 metadata/md5-cache/sys-kernel/installkernel-18     |   4 +-
 metadata/md5-cache/www-client/Manifest.gz          | Bin 12387 -> 12390 bytes
 .../www-client/vivaldi-snapshot-6.5.3222.3         |  16 -
 .../www-client/vivaldi-snapshot-6.6.3249.4         |  16 +
 metadata/md5-cache/x11-base/Manifest.gz            | Bin 2212 -> 2207 bytes
 metadata/md5-cache/x11-base/xorg-server-21.1.11    |   4 +-
 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-dns/Manifest.gz                                | Bin 8197 -> 8203 bytes
 net-dns/c-ares/Manifest                            |   2 +-
 net-dns/c-ares/c-ares-1.25.0-r1.ebuild             |   2 +-
 net-dns/libidn2/Manifest                           |   2 +-
 net-dns/libidn2/libidn2-2.3.4-r2.ebuild            |   2 +-
 net-libs/Manifest.gz                               | Bin 31816 -> 31816 bytes
 net-libs/miniupnpc/Manifest                        |   2 +-
 net-libs/miniupnpc/miniupnpc-2.2.6.ebuild          |   2 +-
 net-misc/Manifest.gz                               | Bin 55129 -> 55134 bytes
 net-misc/chrony/Manifest                           |   2 +-
 net-misc/chrony/chrony-4.5.ebuild                  |   2 +-
 net-misc/curl/Manifest                             |   2 +-
 net-misc/curl/curl-8.5.0.ebuild                    |   2 +-
 net-print/Manifest.gz                              | Bin 6411 -> 6418 bytes
 net-print/cups-browsed/Manifest                    |   2 +-
 net-print/cups-browsed/cups-browsed-2.0.0.ebuild   |   2 +-
 net-print/cups-filters/Manifest                    |   2 +-
 net-print/cups-filters/cups-filters-2.0.0.ebuild   |   2 +-
 net-print/cups-meta/Manifest                       |   2 +-
 net-print/cups-meta/cups-meta-1.ebuild             |   2 +-
 net-print/cups/Manifest                            |   2 +-
 net-print/cups/cups-2.4.7-r2.ebuild                |   2 +-
 net-print/libcupsfilters/Manifest                  |   2 +-
 .../libcupsfilters/libcupsfilters-2.0.0-r3.ebuild  |   2 +-
 net-print/libppd/Manifest                          |   2 +-
 net-print/libppd/libppd-2.0.0.ebuild               |   2 +-
 net-wireless/Manifest.gz                           | Bin 13906 -> 13908 bytes
 net-wireless/gnuradio/Manifest                     |   5 +-
 net-wireless/gnuradio/files/PR7093.patch           |  76 ++
 net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild  | 245 ++++++
 net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild     | 245 ------
 net-wireless/gnuradio/gnuradio-9999.ebuild         |   6 +-
 sci-mathematics/Manifest.gz                        | Bin 19159 -> 19159 bytes
 sci-mathematics/coq/Manifest                       |   2 +
 sci-mathematics/coq/coq-8.19.0.ebuild              | 122 +++
 sec-keys/Manifest.gz                               | Bin 24076 -> 24079 bytes
 sec-keys/openpgp-keys-jberkenbilt/Manifest         |   2 +-
 .../openpgp-keys-jberkenbilt-1.ebuild              |   2 +-
 sys-fs/Manifest.gz                                 | Bin 22222 -> 22220 bytes
 sys-fs/zfs-auto-snapshot/Manifest                  |   2 +-
 .../zfs-auto-snapshot-1.2.4-r3.ebuild              |   4 +-
 sys-kernel/Manifest.gz                             | Bin 4572 -> 4574 bytes
 sys-kernel/dracut/Manifest                         |   2 +-
 sys-kernel/dracut/dracut-060_pre20240104.ebuild    |   2 +-
 sys-kernel/installkernel/Manifest                  |   2 +-
 sys-kernel/installkernel/installkernel-18.ebuild   |   2 +-
 www-client/Manifest.gz                             | Bin 6028 -> 6030 bytes
 www-client/vivaldi-snapshot/Manifest               |   8 +-
 .../vivaldi-snapshot-6.5.3222.3.ebuild             | 224 ------
 .../vivaldi-snapshot-6.6.3249.4.ebuild             | 224 ++++++
 x11-base/Manifest.gz                               | Bin 1558 -> 1556 bytes
 x11-base/xorg-server/Manifest                      |   2 +-
 x11-base/xorg-server/xorg-server-21.1.11.ebuild    |   2 +-
 236 files changed, 4330 insertions(+), 3584 deletions(-)
 delete mode 100644 dev-lang/php/php-8.1.20-r2.ebuild
 create mode 100644 dev-lang/php/php-8.1.27.ebuild
 delete mode 100644 dev-lang/php/php-8.2.13-r2.ebuild
 create mode 100644 dev-lang/php/php-8.2.15.ebuild
 delete mode 100644 dev-lang/php/php-8.3.0-r2.ebuild
 create mode 100644 dev-lang/php/php-8.3.2.ebuild
 create mode 100644 dev-util/intel_clc/intel_clc-23.3.4.ebuild
 delete mode 100644 media-gfx/feh/feh-3.10.1.ebuild
 create mode 100644 media-libs/mesa/mesa-23.3.4.ebuild
 create mode 100644 media-sound/musescore/musescore-4.0.2-r1.ebuild
 delete mode 100644 media-sound/musescore/musescore-4.0.2.ebuild
 create mode 100644 media-sound/musescore/musescore-4.2.1-r1.ebuild
 delete mode 100644 media-sound/musescore/musescore-4.2.1.ebuild
 delete mode 100644 metadata/md5-cache/dev-lang/php-8.1.20-r2
 create mode 100644 metadata/md5-cache/dev-lang/php-8.1.27
 delete mode 100644 metadata/md5-cache/dev-lang/php-8.2.13-r2
 create mode 100644 metadata/md5-cache/dev-lang/php-8.2.15
 delete mode 100644 metadata/md5-cache/dev-lang/php-8.3.0-r2
 create mode 100644 metadata/md5-cache/dev-lang/php-8.3.2
 create mode 100644 metadata/md5-cache/dev-util/intel_clc-23.3.4
 delete mode 100644 metadata/md5-cache/media-gfx/feh-3.10.1
 create mode 100644 metadata/md5-cache/media-libs/mesa-23.3.4
 delete mode 100644 metadata/md5-cache/media-sound/musescore-4.0.2
 create mode 100644 metadata/md5-cache/media-sound/musescore-4.0.2-r1
 delete mode 100644 metadata/md5-cache/media-sound/musescore-4.2.1
 create mode 100644 metadata/md5-cache/media-sound/musescore-4.2.1-r1
 delete mode 100644 metadata/md5-cache/net-wireless/gnuradio-3.10.9.2
 create mode 100644 metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r1
 create mode 100644 metadata/md5-cache/sci-mathematics/coq-8.19.0
 delete mode 100644 metadata/md5-cache/www-client/vivaldi-snapshot-6.5.3222.3
 create mode 100644 metadata/md5-cache/www-client/vivaldi-snapshot-6.6.3249.4
 create mode 100644 net-wireless/gnuradio/files/PR7093.patch
 create mode 100644 net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild
 delete mode 100644 net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild
 create mode 100644 sci-mathematics/coq/coq-8.19.0.ebuild
 delete mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3222.3.ebuild
 create mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-6.6.3249.4.ebuild

diff --git a/Manifest b/Manifest
index d584c4041c62..a483d6068b0a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29773 BLAKE2B 682a1127d2307543b0c5e99be1842ba022a4c541db1b29b1b213a91f7830283b9e753f1e2d2a735d6c599c5b3ccc79c15525b85249aa1d0399c1ca563b196fb8 SHA512 740e468d9d7c12342739a66c1fe7dbf3c9428fa7ae5b743305f9d44661bc078633972af1880eee2bc6c9c52ca7373c0f16f6c69e11736c40610411e1a864af35
-TIMESTAMP 2024-01-24T22:10:04Z
+MANIFEST Manifest.files.gz 29748 BLAKE2B fb4814482f582c098f14d2d33eae2e124c5dd43a5bc419557b7c744c37c652eea820cf67126d0eff18881e4f27ca76711d0781ab963e8f56a02270bdee979de2 SHA512 69e716316c1399a5722506be92b5532f0972364fb7c98bf55a48424dfe8b2604a7ff849f491cb14a59fe1ae8d488e1362e54a5197c263fb40790feb647326845
+TIMESTAMP 2024-01-25T04:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWxirxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWx3yRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC+NRAAm441kONjMjo4puCjFPGsEewVzzmA2OR9xzVgaGKIV+YPzwUaYPUzVnTz
-lFhzMldTBntFQQz48SlI5ro17Go9Se5F9QkdyTRjLp5QFe6vaAUMu8+fMck95/Oz
-rtwa+WNOQUDlq7uuJ3OePJ+EmtO4SBZugmZO1eGB5rsrrVviOIFmkR6sRL0Yw4eg
-anpMFdmIHJI+WJJQ+oRkyyeAaQjBfRqtkPGjKTAnccmy7GJXjnjxqrTWupk4ImVm
-3ERoHXqT/pwxEwUconh/w9DWUWda2DtD3B7D6dsurpPPqBZNIQTOQMH8WpIulRbh
-IwiCMq4H7i7bdBBZa8koXRfuili3cNeaOXeWziv6RID+RGeRcIBaks1fr0HkcF8U
-lvTw9Nt/3HLIIAuiu04Ebw+UG4UVJER4tobu1QC7DbQLdw3SOS+ERRuK41pPHg3n
-fAZjGkUe/+740YWmxX1tgQrTHENF/NxIzJiHHsK/grR85Ri2ndWL4Dt4g1bwppLq
-gera1fH0qdazf27qVvTY3jD1/H8iuK6QuDcJAD5t3zEb6/Una3vvh18ijMvjgnBB
-Um4dPI2H+PZL6trR1vrt7l/wKieKkO7XWxYYHfvUqtsd+cHwo7ko/qVWTgJmevgw
-RGGKFxg48Ns/UmX3YBkonskShaNSGfdln8IfflQ7PQ+vEoJhHZI=
-=BK8/
+klDNGhAAsUtgvgOOAv+CoIEQleUdyyVoRinuhKG69PCtcdHPnpXDXHTuixX7NdHW
+8OUVjk2fLOF1CFwHvgwscnQ2aupeoxAW9BCQtM/1zcG73Ri3WkZZXEZjsbTwyYJG
+vR0+ucA8L3Sa9pTilpJIjvBYJK8wVaxb+XxVJswo+qrBubj+snlISJ/BhIh9BAP/
+PtDApSxD1HL6LMMpR4La6SHZRjfHw7vuY3BQBA+MS533Vs7cqCyj28jCQ0cPtCWK
+QJDJYDq/HDTT2/mk/f7D6DPLfjVm+aQOAbQTEXMOgVdL0Ch4iqWlBQaooqb9NOun
+22+lRMa5GyOi5yicitvpGMH+UflEjIq9y545YomDsDDqQbKPbNjIil0IC6dDeMpu
+cExvou7+zbswLNLx1hLJew26soAZmBw4ExQz9mhgWcZbNfkKRbRPNX9B/3I1V7Pg
+WRYtzOPwfRbMPKJvPwc7tslGsUvgJ7qsU1XxsdGIO9xuKud/GBUiS7fWbDbDfVm+
+tALiUeQWcRLEOrrYcrRByJRXLRHoK9uekXvsz33RCE5i3Cup6SXcGD7wCttshf6E
+ADmWSOJDOAybygKS5zO6+XDUlWHfssGH8cSBv2eUXfi5cLzfnDPggv55a2qVAmYN
+NnjTc3cyWqG5ir9GVvcBXt7rAbIisFT7s14BksUvOiNgCmEd7UI=
+=cbGe
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5c4eba6d3aad..b0ba195c9d37 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 2e15cd3755eb..8d0d42ec9f2e 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
index 1a3cf7f68552..1504953a680a 100644
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@@ -3,6 +3,6 @@ DIST lzlib-1.13.tar.gz.sig 72 BLAKE2B 66d7a9939a5e23874a6927545f265cf315d634a166
 DIST lzlib-1.14.tar.gz 131624 BLAKE2B d975fece48d92be354202581a5be5c709b8acdbb41b3782ec0a79939278ada42aa6765bcef7a1cb70bfb7808b8a88d5e6ed48924f13fcc291a4a0d2057f0f4bf SHA512 1582b99149af18ea119f015a9dbf224aa2ebc78240432415b2da20bd5a4e4dc3fdea2489789bc581bdccdba6f4eab13c69c5801e8a43ab9a829c2eb9b801797f
 DIST lzlib-1.14.tar.gz.sig 72 BLAKE2B 104d914d4b85bab0457017ab5663962ac1573dac421e11a94eaa9e77f6338501c96444d45e1e4101e9ea48409c2b30037a7b07c2a188cff6fcf47c6d067d1398 SHA512 852ebd4a460021e642a673a8c6d88b25a2b45dff4a45f7ccfc6bbb531be3c967b8e01308aa35088c843002561c1c4b813a47ff4b0fd4417ebf12f188af8d36be
 EBUILD lzlib-1.13-r1.ebuild 1109 BLAKE2B 740c854b9eb729a90cff9f150fefce1ce251805641d9dcf1b5912854257ff56b118d067a3a48f13cce6b5ae04bc3cd32da20155ee94db8a56936a7f4f71c8f5e SHA512 3cceff38ef253e6fcb8ae581a3a73c91e69f83be1c91e174f9717fb0a5e9c814cbbb8766c65ba92952b626e78566a09cc6d65dd1341db5b4273e227c0d805f59
-EBUILD lzlib-1.13-r2.ebuild 1131 BLAKE2B 66c2afba03eda5f7201c9a6cc24bacc340fea1dcaae581c738a6b4dee81bc06910f2352a2befcb4cb438808cf3a356d73b4d056f8faccd8ce2739687bba7b712 SHA512 af8d4f5c57ab86fdb7685bccfbd7a7e35168c5c689d4d0da52503ab3d4b0a3fb74391633be6673a00b3e64282f3e7c6856caf01b6e2632d022c6a9c605f40e00
+EBUILD lzlib-1.13-r2.ebuild 1129 BLAKE2B 96c0aff404ab8622cea99f7d9d3fbd8a3d00a1184ce67c714909f16f5bc3f686733f92845e0f68701ed99740d52993b92d0be3d7a0c4ef1751c88c06c473b910 SHA512 c1ac3d0ca3cbda2457a1ecab74b3c0c5ff26737adcc3f400f8cbe16f98498744e9492b548e3889b52a1dd987a1c1d4cc995927deb6a4f63b66be48365856f193
 EBUILD lzlib-1.14.ebuild 1136 BLAKE2B f5a2440418a4978abd17210f73624745f1b25cd3a84b88dad0969b1e5eeb4807f2686bc55eef7f79dc0f104da78ffb2f6b8b6f75084b218a2c70ad74dc6287ec SHA512 3fd154368a0e0ddde6e0bae70df089b3891817025dec7b2ea645611b3dd2fc83a0746d745b73271093ae00a0d5f1ad2978416fd6756a8e70f9df0698f2c3789e
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/lzlib/lzlib-1.13-r2.ebuild b/app-arch/lzlib/lzlib-1.13-r2.ebuild
index a358b85a1de6..1b4396a4f2b3 100644
--- a/app-arch/lzlib/lzlib-1.13-r2.ebuild
+++ b/app-arch/lzlib/lzlib-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$
 
 LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"
 
diff --git a/app-arch/tarlz/Manifest b/app-arch/tarlz/Manifest
index 18b80f65689d..7cf81a67dca5 100644
--- a/app-arch/tarlz/Manifest
+++ b/app-arch/tarlz/Manifest
@@ -3,5 +3,5 @@ DIST tarlz-0.24.tar.lz 113503 BLAKE2B 5d9f3a65c29ba5131faacaf0b519494e4ba659182a
 DIST tarlz-0.25.tar.lz 113783 BLAKE2B 56aad4c839ec4fe10bcd7101cea3300aae8e73630ac95de529401d308b23f8fb292d02a7817484259985fc079380e50219ea8d5002427f2bffad63137a1f03b1 SHA512 a55e89c3e701375d47f6fefd3cba5621f53371f3b3e59c174759e5d122f852b6eec02f5e71ce375b84d6af253841ad4b0d4c8a8af8fc12b81f877f0ab8c3b3c8
 EBUILD tarlz-0.23.ebuild 604 BLAKE2B 2c85673c45730ff37832e0543231ada768b747d9df453538f120f07c6d2ff7e3b3130a2b2691eb0dd64d2f5f1d6d96a5921620a4b2650f80bdb2504aac554166 SHA512 40f93fc0f73b51916d0718913150b09441644313eacab6389fba414badcb82cbe9ab6b4475724d51272f6f0af61f09c684535beacff872eac33300f3cd0ee0fe
 EBUILD tarlz-0.24.ebuild 604 BLAKE2B 241eba3750bea7552b1ccd04599de730e55e4c5ac0ecfda660aee46ea35d35e0fd1d0a3f845dba3c47a66a37bda13696d6b9f5fb396c4bcb304d34ab746c4b41 SHA512 a79ce2cb507f79054059c4a2cffdb021cc257a072e09fd3b1535863252c0b6493ad7fe56873372913d383b2ae1e82a8d4d753aa9f824fe86a0c75d958ee5d3f1
-EBUILD tarlz-0.25.ebuild 605 BLAKE2B 0b62b0d46fc977c3ec2657e71c6408e455904aa9ac4f2e68543168b9ed3bf9f26218abc914b26b74b993ec0abecdfbc379787c86a34daf24446ce70a4a8b67d7 SHA512 fd05555d44d9dd6c6dcce9a61228cfd9c3d8bb063d94f1545763d0ade478ae26ffccdc006719f70be28996c8ba01683b90d479aa65d4a1181654383197119c6e
+EBUILD tarlz-0.25.ebuild 604 BLAKE2B 12519ae6d1a53d506c9bc1dc848c1c382f7629199dda265d2622044a335265fa8b72c30ee518f3cee8b3cec00280cffc82b79318668088681cbe9360b51c9e2d SHA512 b75a58446446d1b1f09e6a9357c97d796a0788ed5657d9e1566622af17ba4fa86d85ca61cef7241f2ece7cf54a8297a3a2bfb6460c8e6baaf754cd383b35f845
 MISC metadata.xml 355 BLAKE2B 395fec08847b666d16f1b38e094844c5821076bb58688ce21277c2a798a7ffc1f029cb6e92a6dcd92f71f35715f7a55638c6d34224055df275970b1c06acd6e0 SHA512 8a88a29f6ed88692e554ef13820e1ab95f1da4854d13832cc839b29b3e3278cc479412fc22e021b4de696d92cf726181b8434eb19d479d9be36b621a69040ff6
diff --git a/app-arch/tarlz/tarlz-0.25.ebuild b/app-arch/tarlz/tarlz-0.25.ebuild
index 95861ad09d6c..6e55bf850642 100644
--- a/app-arch/tarlz/tarlz-0.25.ebuild
+++ b/app-arch/tarlz/tarlz-0.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=app-arch/lzlib-1.12
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 67f1bed3b23c..77f7860e3ed1 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index 99fa9cdd1ce9..b3e628fa6206 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,5 +1,5 @@
 DIST xfburn-0.6.2.tar.bz2 869745 BLAKE2B ed8658d729dc0cf1ee40773fa82baf9a5301225bce4c971201ae8d21bffb74e81fb9d1b674f8b9e0bc55585a3fc9f380a0aa3718173ce7425d40f3dfcd4e1fb6 SHA512 c74d21244b5029aaa72c4911ea7549458aea161623a6a020a165b8148f320053a83189de87f71192f006579ca435558d0c07e1a8aa4165db8cfb30581f8882b4
 DIST xfburn-0.7.0.tar.bz2 923498 BLAKE2B 27c80f20306b1097f4d9176c2b9278b6ec5628eda6c36779270eca4fb2387ca425450201d6a4ae171aa8ce2fa50243614ae30d4561c72e3b70727cfcf54c7c34 SHA512 5ac679926809839d36c94d918ebc9bb409b9940127eba1cae6daf6614288f5d18181be5b7b4d249f0f0e973c2a4a22b8b3ce5709a2d23e5d4dd3b412cf5846d1
 EBUILD xfburn-0.6.2.ebuild 1151 BLAKE2B dfb5e24c01a8e092c526501f47273f37818d6f06b183d356414b257cec3ce9e96c42a2637b4832175b050b300154ebc945e7c8e4ff01837a84369feb97e78521 SHA512 21960c7c85918176b28334a1d886aeb7f8039527daad665674e895e1e90c65a24e30d6d3dab06cfa09d8453cbbed3f72342bb05909dd34a3078ee9a33cbb18d4
-EBUILD xfburn-0.7.0.ebuild 1248 BLAKE2B f6f1c10f0aec8b5556aa5e2c2b20bb3b5262507bfaa800d340598472f89f4557e9bb940023277c0caf5020694a8670d0d5d6877498680877a5ee151c1dd7d521 SHA512 a670d6799f99daf4f1e81c7464f9dd8b1f8a12e6d30a9124463644fec8251a08af8e4950103a5118eb6b953c7b4d29f9f7006a16199701691a2d1eb3b0b578fa
+EBUILD xfburn-0.7.0.ebuild 1247 BLAKE2B d58c7763d08f9af5881fc8dcddad2cc7aae48e5957c1a0e543b23ad8c4724842ad3572200a3e0628e8fc7d7fdb9bd2f1e02454a55a35481744727957214b8fe2 SHA512 0e7be5ff0b36976ffc5def386e4fd4bfdce32a7bb69a168542ea0161d445c96cb3c2fab4a2836b5337513b12d207fb311d59d950eb741bf51ac23f399033a347
 MISC metadata.xml 482 BLAKE2B 644a750c09dc06f244719cb500f57a1c3c8f514f3ffb667248371b1ae1c0bcd32f87201485c042ac48963d20c45eadfd48f097699c9780c688adffad5adc2090 SHA512 7b523ee33b180c71c3cc3fe69f7c8ed456dbfa44957f6494283f153a7dbea924e4b7c84f1eec554b37b009a35194f4eb5b3c4ea2febe45ae899aa1f1df3a94bb
diff --git a/app-cdr/xfburn/xfburn-0.7.0.ebuild b/app-cdr/xfburn/xfburn-0.7.0.ebuild
index 2790ddd6a1f4..35be46c4bd8f 100644
--- a/app-cdr/xfburn/xfburn-0.7.0.ebuild
+++ b/app-cdr/xfburn/xfburn-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="gstreamer +udev"
 
 DEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index eb3b5a939c22..0429001db6aa 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/pycargoebuild/Manifest b/app-portage/pycargoebuild/Manifest
index 57a5f362a140..1f51b006b949 100644
--- a/app-portage/pycargoebuild/Manifest
+++ b/app-portage/pycargoebuild/Manifest
@@ -3,5 +3,5 @@ DIST pycargoebuild-0.13.0.gh.tar.gz 39250 BLAKE2B de03ab08cd4288f86e87b8e910fcfb
 DIST pycargoebuild-0.13.1.gh.tar.gz 40724 BLAKE2B 8332def693da15fa5bf76e36defc92d6be9ebb78f5f58763f1df0a3f5d03d24bcd3d467ef8e23fbbedf6cadffbdc61898d7d9d9a455f30a820b261398868f2cf SHA512 4a3eb0c703008a3ba226de24c7c5f444b1c9dee08def473b03e03112ad8f5d8d620f1d12e528c73c98fa46d2a18658a1f3862ac547ca1121e7834cd1c4ab65d0
 EBUILD pycargoebuild-0.12.1.ebuild 691 BLAKE2B 20a19d8068f30a27dad94f68461c2bdf6325e6a264cd2e18ae2c4b5cdbab761cb41a20fb17f5b0d167e103ecc3e1581c716105a68b6ba9e489eff860855bdcf4 SHA512 a7fdd493fe7b28c73c969cb2531c9ae8a4be9a86776753286ae1bfeadf9c5f47a4476eaf5ef9a5b1434a464e4f7915c04d5ff5389ae249702d521a333b8fea7c
 EBUILD pycargoebuild-0.13.0.ebuild 692 BLAKE2B 0a1157190f86538190ecd93088aac3162afaa82da943b78ebdaec97245060961715fa1a9013e84a65de4b4427ee2b74f8b421ec65cf8915c998e08c299518394 SHA512 c587a4a02854e518f69fbe3610230bb611543e9a62d2cb89991cb5205a7dabe99f88d0eefa6efa969cf2277a0363c09b34815e06c3ff62a83ff4f922be92df54
-EBUILD pycargoebuild-0.13.1.ebuild 692 BLAKE2B 14487a8b3a0a896e947d9d99e237cd339639b75fdb00f99394d06fd261cabdec73710a113e6ea5adf45e8447d46a90e14f47edca139400b16a7e1dcf2a952c14 SHA512 bcffcaac915497378d6be13d46b1b9baf99e166c19af8765630314f34b0f83df0a93f7a1f0d1b57b39716daf02f536acf56e117abf1045b98feed37a3147f0a6
+EBUILD pycargoebuild-0.13.1.ebuild 691 BLAKE2B e7e273d0e7d76da4cb5f2c4b2122bcd4e5bc28a1870ed5bf372cf8e710713587bc40253b039371e4fe1dacefa750fe0c8ffd7747e4058de04f8fc9c8b551b59f SHA512 74cdba4a9a5f6c89716f92adf10c21b7154973e0169d1ee061851c89e1db7646bcd4267e820aa4d4c54fa3a8f4eadfd0833556db8ac2d19f8eec6803e8cce5bd
 MISC metadata.xml 384 BLAKE2B a5c91cf81989cb7f2ff504cd9931e89cb85a2b17721818efbc436d13e68d673c4f384839c67eeec8fe24c1a78b112c3fe37ee1722d2d28f44c5a075ec8fe18ba SHA512 76ffa916e9630225aadb9a0d2073087fcb848b782f6e44c28c354533c5329ed337e609666ee7eba90ef1191be2a34e968d3bc06556cfafce32a43a22100cc6f0
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.13.1.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.13.1.ebuild
index a9cae3c559fb..6331efde71f4 100644
--- a/app-portage/pycargoebuild/pycargoebuild-0.13.1.ebuild
+++ b/app-portage/pycargoebuild/pycargoebuild-0.13.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64"
 
 RDEPEND="
 	dev-python/license-expression[${PYTHON_USEDEP}]
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 437c0d7e27d1..5f19d3eafd65 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9f687cac1440..e61820792e64 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -14,7 +14,7 @@ DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE
 DIST poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 5199251 BLAKE2B 6431b2aa4c60dec6202c737b4cfbbd4bf03808772c0adc6568454a04e713a2e869702f5c318e7799e7b1374252b5a956471b7cf6c9e2d6c8da5236e31a110f35 SHA512 bf5442601f453e601e0b368cc576bf0d5ca5509e9eecd8c7f0476802346834e9a9d3e0f32130c18d21807cd69a55e8168bca1cdb0292ad0215590a881a923c04
 EBUILD poppler-23.09.0.ebuild 4300 BLAKE2B 50d638a1313f901f0e12df981d6334e8692ef43505ecf4aae6affe1592ab76969ae750b9402249747ff15de2b7c259eeac1a1e5f42f1d9fe7f8475574def88e0 SHA512 18cbdce77f8d29af5d576742253836c7038968cc9a7efcd0beaa80c76796f432e14e2ff1372f50d18a66037895030180348ec7532e74a0af45090383e726fd4c
 EBUILD poppler-23.11.0.ebuild 4287 BLAKE2B c0f8de005723ab1230abcda79b74aa048e20a0d0a9865832e7bdec70972ee35d549df4d2dd7c8070b47570ce6505c24cc8e577bd69d550fe16d43071337a76b7 SHA512 f275532f8d33fb28c5204c8cc9e6d38c22b99f58ba6a123f3b5491c89b2e3d90007d55d977042fc659f9bbd27709857320b2fe154787dbe6e8ce8202d3423b59
-EBUILD poppler-23.12.0.ebuild 4418 BLAKE2B a1006efb315d1c6481d9ed6257fab53369162bfe0f02e5214acf30211108068c3a9ba70d9f8ff9ea718849e0f409b8c189bbff8006ad1b393e66cec2843a64b1 SHA512 cd2641610375ab70d8d8f07bd5caa5188cb8fe650bb98a35b987227dc158ff2a3c86a6199e65135a368d1921b17cf96b1b777918e490de63dc7018d90e51be83
+EBUILD poppler-23.12.0.ebuild 4417 BLAKE2B 4068f1033dfad1eec7197867b403acfc234cefabbd4251a87a0c430c0af7a913f4d1eb93240419b6bb2c1e033b47368046cc952357b717005b731c2462d2efa5 SHA512 0c957eca00c9fc801d0284ef57451805b379d669a7e92bdfe7ae49fdd8567453cb34b4eba4b439872ddea8e87187d0de8bd13640a5c3a81555e571089e6270f5
 EBUILD poppler-24.01.0.ebuild 4425 BLAKE2B 16a3409372152844fad309d7780b528445a8965512f1e58229f1d986561fca829b92222b0a2f48f4a32353b1e00d3c640b7c06a7097208f1637c54c5e0eefa80 SHA512 fd2d1219557068b071a2fe599b942e7b235b302b459f464d9da69013b4837a26c8bd57736b1e57a314dec2211a883b3ddfded7c0178c753265aab66e4488d7d2
 EBUILD poppler-9999.ebuild 4425 BLAKE2B 16a3409372152844fad309d7780b528445a8965512f1e58229f1d986561fca829b92222b0a2f48f4a32353b1e00d3c640b7c06a7097208f1637c54c5e0eefa80 SHA512 fd2d1219557068b071a2fe599b942e7b235b302b459f464d9da69013b4837a26c8bd57736b1e57a314dec2211a883b3ddfded7c0178c753265aab66e4488d7d2
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-23.12.0.ebuild b/app-text/poppler/poppler-23.12.0.ebuild
index 6f415d22e32f..a679d9b5226c 100644
--- a/app-text/poppler/poppler-23.12.0.ebuild
+++ b/app-text/poppler/poppler-23.12.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/133"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index dfa8b04c8ecd..947fff3b0078 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -14,6 +14,6 @@ DIST qpdf-11.8.0.tar.gz.asc 833 BLAKE2B 02c0cfec3bab48a3d49783cb68bd6b6c6382536f
 EBUILD qpdf-11.5.0.ebuild 1815 BLAKE2B bdbb5f1e63f8dcf2d18279231fbd6ed1045576ba63e71f0b5147d8f0c0de04add76f241439f9a5ee60ff2f23cf28638eedc3ecce2e41b450539693771c4422ce SHA512 1d293b365a2b64fdd653de98a21f49f86aca5f6c0f454597c759b7df817d04a8d706fa1301af755303bc432384caad8a9025592efc73fa41979f96493f76834a
 EBUILD qpdf-11.6.3-r1.ebuild 1928 BLAKE2B 67599b8713bada251f786da78d5ec3a05efc1d7a6124bba59b40feac29ba3225c4ac5c23540dc09e742a3d649aa9a056c1e461690b5072ccb5bd3547c59d8b50 SHA512 56e862cccc70e9ce92f0cf403c1dbf277d118c15023ab05b88f349a667cf1fe786ce1bcc8100bed88002a1db7f4b6e4342207ae8a76edee037e528731b4a04c0
 EBUILD qpdf-11.6.4.ebuild 2275 BLAKE2B c5d2d3f8d75a757cfabd23da66a89a054a1745b178884d7b3935a1d959c5157d536956e60b2e0cc1149b4217800ae269fb470a352bc883fa033c9c86419ddc90 SHA512 80c3406c3d44bdb80f226339b9165ea81b2f195bf1253bb893364f7bb24cdd816876828b09ad1d88ece67e3abda2bba3d3fbbf1da6dbbcbf4e21488f18608d15
-EBUILD qpdf-11.7.0.ebuild 2260 BLAKE2B 0fae75e6c2e52d1c6305efb714d51c746d5afc4a1216832dec93e87bfe2abe39f93c6fa976c658f5ce86b935cad302689615d4a14f4124558db380974b7d94b7 SHA512 d123c83cf73c5cbda53a6be6627fb98482ff6b3dc1db8cca203b734acbbac52bda5ea292b2193e4fd016c24803ce4ac213278d4f6ef7555a5a60f3b71c7eaba4
+EBUILD qpdf-11.7.0.ebuild 2259 BLAKE2B 32818e0fb63640328c1f9d71f9c869f6cb17c34fc9c15b396c73f6c5c5074f129345cf7f75091fa5be388fbd1a160e0628e44672fbf364dac7bc82f1fc4c98e9 SHA512 64de2e586bcda0b81aa78838d9d490ec33f731267afdb0fbbfbd0477d357c09fc4e034ee5a56ca3d1544dad464b8a55fee4f5b3d24f97f75c83e96e7b4b9c7f4
 EBUILD qpdf-11.8.0.ebuild 2267 BLAKE2B ca085253af322e80a5fecd4453ee71bd9d4fe1fe2c290a76b3658965f45704b4434a8921fa3f4a63f9e62f75049153c1b57adfe4e6d9a4482f362ae0d1d39777 SHA512 d2b95baa69ab421755708297e5e4f68a1436f797d73d849c40a7eb4427dff05d547f97f2fcbd9c43a4a100a68ca6c7c89c10c89eec5bee03ec4150a8603061ef
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.7.0.ebuild b/app-text/qpdf/qpdf-11.7.0.ebuild
index ee30debd4ee3..8139978232c7 100644
--- a/app-text/qpdf/qpdf-11.7.0.ebuild
+++ b/app-text/qpdf/qpdf-11.7.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # Subslot for libqpdf soname version (just represent via major version)
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gnutls test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c598e422b906..e1f18e2a501b 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 72c55785b0e0..f3c26916e21e 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -3,5 +3,5 @@ AUX ispc-1.19.0-gcc13.patch 777 BLAKE2B fa65718e6f15575fc2f0339e5e4c47c225a8423d
 DIST ispc-1.19.0.tar.gz 19577782 BLAKE2B 5ad6eeeeb0bb27f2a27267a26a729693bd16250ae5e8740728290fe6ad85c7ecd4da40f316f2ca6b1447ff3a13f6949db4ed2af6ebf2c6ce6ba43620dfb1943d SHA512 140f16bc0f9e0a94853b50a5433be9196ee09b6c70a1840d400d0d201143da8cb2b1b92a857acf5856ed3410bfffd17678eb1029996f9007fe947f5ac78bf1bb
 DIST ispc-1.22.0.gh.tar.gz 19618494 BLAKE2B 0dae95d792e4d629b38a9775c2c600131374c69dfa086d6a67100e40e5005ef054b9a651f418e0452a19ee4e64ffd830bfaa787b14e706473e8fab1d2380f0fd SHA512 4436ea37003b4cbfefcbf4c18212d0e98536243ae8f01053817d579e04205a4dcd4ab7b2b282fec99fc617009fdbea340b348cf4a2134240d2fcfc6bcaf6b60c
 EBUILD ispc-1.19.0.ebuild 1743 BLAKE2B bd54e0a29301594715c01f8638bc873cc1fabbcadd90614b2c261dde2a768c1dbe918ae9891edc71cf1d1fd70086d4691f01462898d5785bbc940616abc6d012 SHA512 f72ae9f32a1e31ec4592d21cd11576e163bdd78a42aadb847a3e141b89511884298afa3115045f5e43a8ceda08dc0794893c0bd6c9f8c25f4f2f4b071340443e
-EBUILD ispc-1.22.0-r1.ebuild 2291 BLAKE2B 2394e58ac4da80d087d82ca7012ea5585e20293dcef23ca1ac9b6304f3e3fae034c78c855ebac8ca5303364529d42efebf5f70c00f632e9a1e140e6904d2c163 SHA512 c90f59ac893daf2b4509b666c9a8a09d5c4a3de8bb06ade7460aa13fbc7c867e5116eec8ed57821e3afdb7d35b589a8f1cef8e20eacaa0a58fb24b136367e0e7
+EBUILD ispc-1.22.0-r1.ebuild 2290 BLAKE2B 7cf8a43e70237407bc7fb99e44c8b53ea0bb4ce63d2f4e6e21f5dc5a42d7e47f3cd02b5bbf1fbe80c55204573c5906899628bc9c3ecea9ccf1bc9d1316a7faf8 SHA512 bc67aab886b423087fd4c271d561c2c0f6b6b4f3517ee9bb2a06e1351d86b680b04b76e26692ba3172727d8a82506578105c8739ef3d0b35fe9a2043eba9374f
 MISC metadata.xml 509 BLAKE2B b605dfbff352fab4fcc58ad46f89f97d5db8522de237a0623021c521231798ad00b2b8cd82ce6840d86cfebbe185e6e767e8d0ec276b03a68554ecad20e6b96d SHA512 eae5fcfb0d56190f969ac83012624965b00bd757d8be0bbafce74ab1ea119dc4ee0c33076dd447fabf0a6a6d5f1e2783b54f6c59ebd7aa0a35a4a27df7db01f9
diff --git a/dev-lang/ispc/ispc-1.22.0-r1.ebuild b/dev-lang/ispc/ispc-1.22.0-r1.ebuild
index a3af019a1ebc..9fec0c98ea60 100644
--- a/dev-lang/ispc/ispc-1.22.0-r1.ebuild
+++ b/dev-lang/ispc/ispc-1.22.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="examples gpu openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ee54d117bb5b..8c12527a8101 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,12 +4,12 @@ AUX php-capstone-optional.patch 2497 BLAKE2B f23236130be88d28d933d5482f1925c4e32
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
-DIST php-8.1.20.tar.xz 11793228 BLAKE2B ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096 SHA512 d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1 SHA512 5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
-DIST php-8.2.13.tar.xz 12069092 BLAKE2B 24da2de8cb00bb2aac485360a14f75d6ce3df1bae78b4bf46e013888aa7f1e9d9e077ca40462fe36c59e19a7c45db05cbb0a64b140c07e4621baa99520a2865b SHA512 8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af
-DIST php-8.3.0.tar.xz 12431612 BLAKE2B c6c01b28edea15f05e8894bf69a9f4ea3ea6fb0a2bd70d9417ce9473d57636e08e19f62cac1dfee66d153e5aee4f1b99035ccc14bba1e41712971321deee264f SHA512 8758bb0789787dda04f3d4a175f4d4a0bffadc8c3d272fefa000d6fd7b0c0a7096347c829c1ddfb3b60cf6300803d68ba6d8379f2a343e02d935ba77d01c5cf1
-EBUILD php-8.1.20-r2.ebuild 21913 BLAKE2B 6b5de82a0618c5ff754cc85a53d2b4d1944573fe5cd266898176a5c06c87e65238d2574812ea4e9c763430f51ca1602ee9835940a3eed7910d4f7782378a7373 SHA512 e58bc7d046cf7d4c20948a6554395fce64eb10b7d454b59cc222a3136ced5ca5803507f8777486ac361d07738eb654b4507d70b098c6bcd2d1dcd4e2034cf66f
+DIST php-8.1.27.tar.xz 11915228 BLAKE2B 83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e SHA512 07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed
+DIST php-8.2.15.tar.xz 12075384 BLAKE2B cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4 SHA512 56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
+DIST php-8.3.2.tar.xz 12440200 BLAKE2B 90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab SHA512 acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c
 EBUILD php-8.1.26-r1.ebuild 21992 BLAKE2B 6a2d19aefc689f44603bf95a14b21e345ae739a5dd66a620a065f36e4b72233753a8144f41434211de28ee49ac0e3c0dda3dd712749215a721007126104cddfc SHA512 928b5d071618a69d398c15223c8885924c5dbe6581bacc93f041a27c6caf4384ae43e0aeeb6f2bf31582b5d1838a6656a8e6cb24d18ddddf44e9df1e18694c93
-EBUILD php-8.2.13-r2.ebuild 24927 BLAKE2B 5edf53e38b9fae6f66eec25449219785848f41482b56db464cf695bd691c1cd6f90015f1b9ea04dbb105f3dfb66385b9c2850421aa196be28a2109066b352cbd SHA512 1339718477268259d142f8fc169c13ee16a6237ffa138a1fd1749fcc5c05fbe4f46e91bc01ab606aa792b8a46ae97b9ce9ef857912c8c563ea6d319bf3af2f6d
-EBUILD php-8.3.0-r2.ebuild 23440 BLAKE2B 0bc9611348ada6f5db8e46956fd64c88da57981a2b858f9df89d5e13b4d8d5864e5bf23fbd2a19ecedb181f5b07d047b4ad628bec92b78083acd2c0389e11290 SHA512 948229bd177cc1344f2d96f9b583688341907aea09ae3e5163d346e99f41726ebf04952c51a63cfaccb294b849a58e3f82c8ff9deffa59c4b5306ca83cdf1bb7
+EBUILD php-8.1.27.ebuild 22144 BLAKE2B c3ef95c2923a6f28f2db8c4e06cd301d4969eea5c3aacbca5fd97a5e80194a713059c8be8462a4ec89775ae66c80d79fad3dd14fdc1fd95fd4fb202ce0991453 SHA512 837629e4a22d0ec7ef8a2f7debc8efcceaa5378dac2e8324656b4cbdeb4101c5b0f1ea2ee196fc763de191949b269dd3368f969a5ef6ad0cd870e1569f40285f
+EBUILD php-8.2.15.ebuild 25072 BLAKE2B 8c687ce7f1b81ef506d40586f1da832d0f5fde92c05f6f781b3deb67e510cf8a44a1d73b5553a27dc48037ec66eafb178cebe012c57a852d87e901e02bfbf121 SHA512 6ea5f259f7391b06bc760be5dca1b251a31c6162e48e969f28a48afd9c13dd58c79715791fb2e1a6ad56f57322f01d747634a4c6d00ddfcebadb0b589c630f08
+EBUILD php-8.3.2.ebuild 23786 BLAKE2B 19a772be50a0eca05a50d1012b0912bd09227dbdaa5a88393c3c9ce58c8960c4a843d3db88dae18589d12cc2fbbd62fb1d445a5d73af57636b12daa8ab8c5798 SHA512 8470ae9592b7d576f0565433a06c63d9cf0b56584d88ba8f1b23ec75aede135eedf75837de3980d0fc6928beb7e7aca89f2e4e80c3410b276032fc36ea998755
 MISC metadata.xml 3892 BLAKE2B 69f96654884695b15fd3caf260a8e9d7e1b1e004c7d72bba340e093dd981d1fed5c00dfb547fea3d58be8f1516e52a01a966abbbfb90f10bd9dc14421e18bd8f SHA512 f7d93f5213aceb33e95ad883ed7015b6ab22eef5b0749e137aad2ecb8fc5187a9aca2b7f095421ff12d6102d5087fc2280e6c3ced12eda14e9bda8f3241b29a5
diff --git a/dev-lang/php/php-8.1.20-r2.ebuild b/dev-lang/php/php-8.1.20-r2.ebuild
deleted file mode 100644
index 4de38b91c5c8..000000000000
--- a/dev-lang/php/php-8.1.20-r2.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-	cdb cjk coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	avif? ( gd zlib )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	virtual/libcrypt:=
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	avif? ( media-libs/libavif:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-	"${FILESDIR}/php-capstone-optional.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_with avif)
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.1.27.ebuild b/dev-lang/php/php-8.1.27.ebuild
new file mode 100644
index 000000000000..ae56343d00b2
--- /dev/null
+++ b/dev-lang/php/php-8.1.27.ebuild
@@ -0,0 +1,766 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+	cdb cjk coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	avif? ( gd zlib )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	virtual/libcrypt:=
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	avif? ( media-libs/libavif:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php-capstone-optional.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# Remove false positive test failures
+	# stream_isatty fails due to portage redirects
+	# curl tests here fail for network sandbox issues
+	# session tests here fail because we set the session directory to $T
+	rm tests/output/stream_isatty_err.phpt \
+	   tests/output/stream_isatty_out-err.phpt \
+	   tests/output/stream_isatty_out.phpt \
+	   ext/curl/tests/bug76675.phpt \
+	   ext/curl/tests/bug77535.phpt \
+	   ext/curl/tests/curl_error_basic.phpt \
+	   ext/session/tests/bug74514.phpt \
+	   ext/session/tests/bug74936.phpt || die
+
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+	filter-lto
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		$(use_enable threads zts)
+	)
+
+	# The slotted man/info pages will be missed by the default list of
+	# docompress paths.
+	docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_with avif)
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.2.13-r2.ebuild b/dev-lang/php/php-8.2.13-r2.ebuild
deleted file mode 100644
index e495796ce0d8..000000000000
--- a/dev-lang/php/php-8.2.13-r2.ebuild
+++ /dev/null
@@ -1,835 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-	cdb cjk +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
-	valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	avif? ( gd zlib )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-	test? ( cli )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	virtual/libcrypt:=
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	avif? ( media-libs/libavif:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	valgrind? ( dev-debug/valgrind )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-	"${FILESDIR}/php-capstone-optional.patch"
-	"${FILESDIR}/php-8.2.8-openssl-tests.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# missing skipif; fixed upstream already
-	rm sapi/cgi/tests/005.phpt || die
-
-	# These three get BORKED on no-ipv6 systems,
-	#
-	#   https://github.com/php/php-src/pull/11651
-	#
-	rm ext/sockets/tests/mcast_ipv6_recv.phpt \
-	   ext/sockets/tests/mcast_ipv6_recv_limited.phpt \
-	   ext/sockets/tests/mcast_ipv6_send.phpt \
-	   || die
-
-	# fails in a network sandbox,
-	#
-	#   https://github.com/php/php-src/issues/11662
-	#
-	rm ext/sockets/tests/bug63000.phpt || die
-
-	# expected output needs to be updated,
-	#
-	#   https://github.com/php/php-src/pull/11648
-	#
-	rm ext/dba/tests/dba_tcadb.phpt || die
-
-	# Two IMAP tests missing SKIPIFs,
-	#
-	#   https://github.com/php/php-src/pull/11654
-	#
-	rm ext/imap/tests/imap_mutf7_to_utf8.phpt \
-	   ext/imap/tests/imap_utf8_to_mutf7_basic.phpt \
-	   || die
-
-	# broken upstream with icu-73.x,
-	#
-	#   https://github.com/php/php-src/issues/11128
-	#
-	rm ext/intl/tests/calendar_clear_variation1.phpt || die
-
-	# overly sensitive to INI values; fixes sent upstream:
-	#
-	#  https://github.com/php/php-src/pull/11631
-	#
-	rm ext/session/tests/{bug74514,bug74936,gh7787}.phpt || die
-
-	# This is sensitive to the current "nice" level:
-	#
-	#   https://github.com/php/php-src/issues/11630
-	#
-	rm ext/standard/tests/general_functions/proc_nice_basic.phpt || die
-
-	# Tests ignoring the "-n" flag we pass to run-tests.php,
-	#
-	#   https://github.com/php/php-src/pull/11669
-	#
-	rm ext/standard/tests/file/bug60120.phpt \
-	   ext/standard/tests/general_functions/proc_open_null.phpt \
-	   ext/standard/tests/general_functions/proc_open_redirect.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets1.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets2.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets3.phpt \
-	   ext/standard/tests/ini_info/php_ini_loaded_file.phpt \
-	   sapi/cli/tests/016.phpt \
-	   sapi/cli/tests/023.phpt \
-	   sapi/cli/tests/bug65275.phpt \
-	   sapi/cli/tests/bug74600.phpt \
-	   sapi/cli/tests/bug78323.phpt \
-	   || die
-
-	# Same TEST_PHP_EXTRA_ARGS (-n) issue with this one, but it's
-	# already been fixed upstream.
-	rm sapi/cli/tests/017.phpt || die
-
-	# Most Oracle tests are borked,
-	#
-	#  * https://github.com/php/php-src/issues/11804
-	#  * https://github.com/php/php-src/pull/11820
-	#  * https://github.com/php/php-src/issues/11819
-	#
-	rm ext/oci8/tests/*.phpt || die
-
-	# https://github.com/php/php-src/issues/12801
-	rm ext/pcre/tests/gh11374.phpt || die
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
-	filter-lto
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# Don't allow ./configure to detect and use an existing version
-	# of PHP; this can lead to all sorts of weird unpredictability
-	# as in bug 900210.
-	export ac_cv_prog_PHP=""
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		--with-external-libcrypt
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_with avif)
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with selinux fpm-selinux)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-		$(use_with valgrind)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli) )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	# Create separate build trees for each enabled SAPI. The upstream
-	# build system doesn't do this, but we have to do it to use a
-	# different php.ini for each SAPI (see --with-config-file-path and
-	# --with-config-file-scan-dir below). The path winds up define'd
-	# in main/build-defs.h which is included in main/php.h which is
-	# included by basically everything; so, avoiding a rebuild after
-	# changing it is not an easy job.
-	local one_sapi
-	local sapi
-	mkdir "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		einfo "Running econf in ${BUILD_DIR}"
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	if use oci8-instant-client && use kerberos && use imap && use phar; then
-		# A conspiracy takes place when the first three of these flags
-		# are set together, causing the newly-built "php" to open
-		# /dev/urandom with mode rw when it starts. That's not actually
-		# a problem... unless you also have USE=phar, which runs that
-		# "php" to build some phar thingy in src_compile(). Later in
-		# src_test(), portage (at least) sets "addpredict /" so the
-		# problem does not repeat.
-		addpredict /dev/urandom #nowarn
-	fi
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-
-	# Sometimes when the sub-php launches a sub-sub-php, it uses these.
-	# Without an "-n" in all instances, the *live* php.ini can be loaded,
-	# pulling in *live* zend extensions. And those can be incompatible
-	# with the thing we just built.
-	export TEST_PHP_EXTRA_ARGS="-n"
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	# The sendmail override prevents ext/imap/tests/bug77020.phpt from
-	# actually trying to send mail, and will be fixed upstream soon:
-	#
-	#   https://github.com/php/php-src/issues/11629
-	#
-	# The IO capture tests need to be disabled because they fail when
-	# std{in,out,err} are redirected (as they are within portage).
-	#
-	# One -n applies to the top-level "php", while the other applies
-	# to any sub-php that get invoked by the test runner.
-	SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \
-		"${TEST_PHP_EXECUTABLE}" -n \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
-		-d "session.save_path=${T}" \
-		-d "sendmail_path=echo >/dev/null" \
-		|| die "tests failed"
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.2.15.ebuild b/dev-lang/php/php-8.2.15.ebuild
new file mode 100644
index 000000000000..a250eec54294
--- /dev/null
+++ b/dev-lang/php/php-8.2.15.ebuild
@@ -0,0 +1,839 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+	cdb cjk +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
+	valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	avif? ( gd zlib )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+	test? ( cli )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	virtual/libcrypt:=
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	avif? ( media-libs/libavif:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	valgrind? ( dev-debug/valgrind )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php-capstone-optional.patch"
+	"${FILESDIR}/php-8.2.8-openssl-tests.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# missing skipif; fixed upstream already
+	rm sapi/cgi/tests/005.phpt || die
+
+	# These three get BORKED on no-ipv6 systems,
+	#
+	#   https://github.com/php/php-src/pull/11651
+	#
+	rm ext/sockets/tests/mcast_ipv6_recv.phpt \
+	   ext/sockets/tests/mcast_ipv6_recv_limited.phpt \
+	   ext/sockets/tests/mcast_ipv6_send.phpt \
+	   || die
+
+	# fails in a network sandbox,
+	#
+	#   https://github.com/php/php-src/issues/11662
+	#
+	rm ext/sockets/tests/bug63000.phpt || die
+
+	# expected output needs to be updated,
+	#
+	#   https://github.com/php/php-src/pull/11648
+	#
+	rm ext/dba/tests/dba_tcadb.phpt || die
+
+	# Two IMAP tests missing SKIPIFs,
+	#
+	#   https://github.com/php/php-src/pull/11654
+	#
+	rm ext/imap/tests/imap_mutf7_to_utf8.phpt \
+	   ext/imap/tests/imap_utf8_to_mutf7_basic.phpt \
+	   || die
+
+	# broken upstream with icu-73.x,
+	#
+	#   https://github.com/php/php-src/issues/11128
+	#
+	rm ext/intl/tests/calendar_clear_variation1.phpt || die
+
+	# overly sensitive to INI values; fixes sent upstream:
+	#
+	#  https://github.com/php/php-src/pull/11631
+	#
+	rm ext/session/tests/{bug74514,bug74936,gh7787}.phpt || die
+
+	# This is sensitive to the current "nice" level:
+	#
+	#   https://github.com/php/php-src/issues/11630
+	#
+	rm ext/standard/tests/general_functions/proc_nice_basic.phpt || die
+
+	# Tests ignoring the "-n" flag we pass to run-tests.php,
+	#
+	#   https://github.com/php/php-src/pull/11669
+	#
+	rm ext/standard/tests/file/bug60120.phpt \
+	   ext/standard/tests/general_functions/proc_open_null.phpt \
+	   ext/standard/tests/general_functions/proc_open_redirect.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets1.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets2.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets3.phpt \
+	   ext/standard/tests/ini_info/php_ini_loaded_file.phpt \
+	   sapi/cli/tests/016.phpt \
+	   sapi/cli/tests/023.phpt \
+	   sapi/cli/tests/bug65275.phpt \
+	   sapi/cli/tests/bug74600.phpt \
+	   sapi/cli/tests/bug78323.phpt \
+	   || die
+
+	# Same TEST_PHP_EXTRA_ARGS (-n) issue with this one, but it's
+	# already been fixed upstream.
+	rm sapi/cli/tests/017.phpt || die
+
+	# Most Oracle tests are borked,
+	#
+	#  * https://github.com/php/php-src/issues/11804
+	#  * https://github.com/php/php-src/pull/11820
+	#  * https://github.com/php/php-src/issues/11819
+	#
+	rm ext/oci8/tests/*.phpt || die
+
+	# https://github.com/php/php-src/issues/12801
+	rm ext/pcre/tests/gh11374.phpt || die
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+	filter-lto
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# Don't allow ./configure to detect and use an existing version
+	# of PHP; this can lead to all sorts of weird unpredictability
+	# as in bug 900210.
+	export ac_cv_prog_PHP=""
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		--with-external-libcrypt
+		$(use_enable threads zts)
+	)
+
+	# The slotted man/info pages will be missed by the default list of
+	# docompress paths.
+	docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_with avif)
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with selinux fpm-selinux)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+		$(use_with valgrind)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli) )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	# Create separate build trees for each enabled SAPI. The upstream
+	# build system doesn't do this, but we have to do it to use a
+	# different php.ini for each SAPI (see --with-config-file-path and
+	# --with-config-file-scan-dir below). The path winds up define'd
+	# in main/build-defs.h which is included in main/php.h which is
+	# included by basically everything; so, avoiding a rebuild after
+	# changing it is not an easy job.
+	local one_sapi
+	local sapi
+	mkdir "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		einfo "Running econf in ${BUILD_DIR}"
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	if use oci8-instant-client && use kerberos && use imap && use phar; then
+		# A conspiracy takes place when the first three of these flags
+		# are set together, causing the newly-built "php" to open
+		# /dev/urandom with mode rw when it starts. That's not actually
+		# a problem... unless you also have USE=phar, which runs that
+		# "php" to build some phar thingy in src_compile(). Later in
+		# src_test(), portage (at least) sets "addpredict /" so the
+		# problem does not repeat.
+		addpredict /dev/urandom #nowarn
+	fi
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+
+	# Sometimes when the sub-php launches a sub-sub-php, it uses these.
+	# Without an "-n" in all instances, the *live* php.ini can be loaded,
+	# pulling in *live* zend extensions. And those can be incompatible
+	# with the thing we just built.
+	export TEST_PHP_EXTRA_ARGS="-n"
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	# The sendmail override prevents ext/imap/tests/bug77020.phpt from
+	# actually trying to send mail, and will be fixed upstream soon:
+	#
+	#   https://github.com/php/php-src/issues/11629
+	#
+	# The IO capture tests need to be disabled because they fail when
+	# std{in,out,err} are redirected (as they are within portage).
+	#
+	# One -n applies to the top-level "php", while the other applies
+	# to any sub-php that get invoked by the test runner.
+	SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \
+		"${TEST_PHP_EXECUTABLE}" -n \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
+		-d "session.save_path=${T}" \
+		-d "sendmail_path=echo >/dev/null" \
+		|| die "tests failed"
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.3.0-r2.ebuild b/dev-lang/php/php-8.3.0-r2.ebuild
deleted file mode 100644
index bbaa24f665a7..000000000000
--- a/dev-lang/php/php-8.3.0-r2.ebuild
+++ /dev/null
@@ -1,790 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-	capstone cdb cjk +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
-	valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	avif? ( gd zlib )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-	test? ( cli )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	app-eselect/eselect-php[apache2?,fpm?]
-	dev-libs/libpcre2[jit?,unicode]
-	virtual/libcrypt:=
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	avif? ( media-libs/libavif:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	capstone? ( dev-libs/capstone )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	curl? ( net-misc/curl )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( dev-libs/libffi:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
-	spell? ( app-text/aspell )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( media-libs/freetype )
-	unicode? ( dev-libs/oniguruma:= )
-	valgrind? ( dev-debug/valgrind )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( dev-libs/libxml2 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-IDEPEND="app-eselect/eselect-php[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-devel/bison"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR
-	# packages
-	local sed_src='^;include_path = ".:/php.*'
-	local include_path="."
-	include_path+=":${EPREFIX}/usr/share/php${PHP_MV}"
-	include_path+=":${EPREFIX}/usr/share/php"
-	local sed_dst="include_path = \"${include_path}\""
-	sed -e "s|${sed_src}|${sed_dst}|" -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# fails in a network sandbox,
-	#
-	#   https://github.com/php/php-src/issues/11662
-	#
-	rm ext/sockets/tests/bug63000.phpt || die
-
-	# Tests ignoring the "-n" flag we pass to run-tests.php,
-	#
-	#   https://github.com/php/php-src/pull/11669
-	#
-	rm ext/standard/tests/file/bug60120.phpt \
-	   ext/standard/tests/general_functions/proc_open_null.phpt \
-	   ext/standard/tests/general_functions/proc_open_redirect.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets1.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets2.phpt \
-	   ext/standard/tests/general_functions/proc_open_sockets3.phpt \
-	   ext/standard/tests/ini_info/php_ini_loaded_file.phpt \
-	   sapi/cli/tests/016.phpt \
-	   sapi/cli/tests/023.phpt \
-	   sapi/cli/tests/bug65275.phpt \
-	   sapi/cli/tests/bug74600.phpt \
-	   sapi/cli/tests/bug78323.phpt \
-	   || die
-
-	# Most Oracle tests are borked,
-	#
-	#  * https://github.com/php/php-src/issues/11804
-	#  * https://github.com/php/php-src/pull/11820
-	#  * https://github.com/php/php-src/issues/11819
-	#
-	rm ext/oci8/tests/*.phpt || die
-
-	# https://github.com/php/php-src/issues/12801
-	rm ext/pcre/tests/gh11374.phpt || die
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
-	filter-lto
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# Don't allow ./configure to detect and use an existing version
-	# of PHP; this can lead to all sorts of weird unpredictability
-	# as in bug 900210.
-	export ac_cv_prog_PHP=""
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		--with-external-libcrypt
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_with avif)
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_with capstone)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with selinux fpm-selinux)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-		$(use_with valgrind)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli) )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	# Create separate build trees for each enabled SAPI. The upstream
-	# build system doesn't do this, but we have to do it to use a
-	# different php.ini for each SAPI (see --with-config-file-path and
-	# --with-config-file-scan-dir below). The path winds up define'd
-	# in main/build-defs.h which is included in main/php.h which is
-	# included by basically everything; so, avoiding a rebuild after
-	# changing it is not an easy job.
-	local one_sapi
-	local sapi
-	mkdir "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		einfo "Running econf in ${BUILD_DIR}"
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	if use oci8-instant-client && use kerberos && use imap && use phar; then
-		# A conspiracy takes place when the first three of these flags
-		# are set together, causing the newly-built "php" to open
-		# /dev/urandom with mode rw when it starts. That's not actually
-		# a problem... unless you also have USE=phar, which runs that
-		# "php" to build some phar thingy in src_compile(). Later in
-		# src_test(), portage (at least) sets "addpredict /" so the
-		# problem does not repeat.
-		addpredict /dev/urandom #nowarn
-	fi
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-
-	# Sometimes when the sub-php launches a sub-sub-php, it uses these.
-	# Without an "-n" in all instances, the *live* php.ini can be loaded,
-	# pulling in *live* zend extensions. And those can be incompatible
-	# with the thing we just built.
-	export TEST_PHP_EXTRA_ARGS="-n"
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	# The sendmail override prevents ext/imap/tests/bug77020.phpt from
-	# actually trying to send mail, and will be fixed upstream soon:
-	#
-	#   https://github.com/php/php-src/issues/11629
-	#
-	# The IO capture tests need to be disabled because they fail when
-	# std{in,out,err} are redirected (as they are within portage).
-	#
-	# One -n applies to the top-level "php", while the other applies
-	# to any sub-php that get invoked by the test runner.
-	SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \
-		"${TEST_PHP_EXECUTABLE}" -n \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
-		-d "session.save_path=${T}" \
-		-d "sendmail_path=echo >/dev/null" \
-		|| die "tests failed"
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.3.2.ebuild b/dev-lang/php/php-8.3.2.ebuild
new file mode 100644
index 000000000000..2f308ebfbdf4
--- /dev/null
+++ b/dev-lang/php/php-8.3.2.ebuild
@@ -0,0 +1,801 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+	capstone cdb cjk +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
+	valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	avif? ( gd zlib )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+	test? ( cli )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	app-eselect/eselect-php[apache2?,fpm?]
+	dev-libs/libpcre2[jit?,unicode]
+	virtual/libcrypt:=
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	avif? ( media-libs/libavif:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	capstone? ( dev-libs/capstone )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	curl? ( net-misc/curl )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( dev-libs/libffi:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:=[-minimal(-)] )
+	spell? ( app-text/aspell )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( media-libs/freetype )
+	unicode? ( dev-libs/oniguruma:= )
+	valgrind? ( dev-debug/valgrind )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( dev-libs/libxml2 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+IDEPEND="app-eselect/eselect-php[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-devel/bison"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR
+	# packages
+	local sed_src='^;include_path = ".:/php.*'
+	local include_path="."
+	include_path+=":${EPREFIX}/usr/share/php${PHP_MV}"
+	include_path+=":${EPREFIX}/usr/share/php"
+	local sed_dst="include_path = \"${include_path}\""
+	sed -e "s|${sed_src}|${sed_dst}|" -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# fails in a network sandbox,
+	#
+	#   https://github.com/php/php-src/issues/11662
+	#
+	rm ext/sockets/tests/bug63000.phpt || die
+
+	# Tests ignoring the "-n" flag we pass to run-tests.php,
+	#
+	#   https://github.com/php/php-src/pull/11669
+	#
+	rm ext/standard/tests/file/bug60120.phpt \
+	   ext/standard/tests/general_functions/proc_open_null.phpt \
+	   ext/standard/tests/general_functions/proc_open_redirect.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets1.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets2.phpt \
+	   ext/standard/tests/general_functions/proc_open_sockets3.phpt \
+	   ext/standard/tests/ini_info/php_ini_loaded_file.phpt \
+	   sapi/cli/tests/016.phpt \
+	   sapi/cli/tests/023.phpt \
+	   sapi/cli/tests/bug65275.phpt \
+	   sapi/cli/tests/bug74600.phpt \
+	   sapi/cli/tests/bug78323.phpt \
+	   || die
+
+	# Most Oracle tests are borked,
+	#
+	#  * https://github.com/php/php-src/issues/11804
+	#  * https://github.com/php/php-src/pull/11820
+	#  * https://github.com/php/php-src/issues/11819
+	#
+	rm ext/oci8/tests/*.phpt || die
+
+	# https://github.com/php/php-src/issues/12801
+	rm ext/pcre/tests/gh11374.phpt || die
+
+	# A new test failure appearing in 8.3.2, mentioned on the PR
+	# where it was likely introduced:
+	#
+	#   https://github.com/php/php-src/pull/13017
+	#
+	rm ext/dom/tests/DOMNode_isEqualNode.phpt || die
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+	filter-lto
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# Don't allow ./configure to detect and use an existing version
+	# of PHP; this can lead to all sorts of weird unpredictability
+	# as in bug 900210.
+	export ac_cv_prog_PHP=""
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		--with-external-libcrypt
+		$(use_enable threads zts)
+	)
+
+	# The slotted man/info pages will be missed by the default list of
+	# docompress paths.
+	docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_with avif)
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_with capstone)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with selinux fpm-selinux)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+		$(use_with valgrind)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli) )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	# Create separate build trees for each enabled SAPI. The upstream
+	# build system doesn't do this, but we have to do it to use a
+	# different php.ini for each SAPI (see --with-config-file-path and
+	# --with-config-file-scan-dir below). The path winds up define'd
+	# in main/build-defs.h which is included in main/php.h which is
+	# included by basically everything; so, avoiding a rebuild after
+	# changing it is not an easy job.
+	local one_sapi
+	local sapi
+	mkdir "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		einfo "Running econf in ${BUILD_DIR}"
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	if use oci8-instant-client && use kerberos && use imap && use phar; then
+		# A conspiracy takes place when the first three of these flags
+		# are set together, causing the newly-built "php" to open
+		# /dev/urandom with mode rw when it starts. That's not actually
+		# a problem... unless you also have USE=phar, which runs that
+		# "php" to build some phar thingy in src_compile(). Later in
+		# src_test(), portage (at least) sets "addpredict /" so the
+		# problem does not repeat.
+		addpredict /dev/urandom #nowarn
+	fi
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+
+	# Sometimes when the sub-php launches a sub-sub-php, it uses these.
+	# Without an "-n" in all instances, the *live* php.ini can be loaded,
+	# pulling in *live* zend extensions. And those can be incompatible
+	# with the thing we just built.
+	export TEST_PHP_EXTRA_ARGS="-n"
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	# The sendmail override prevents ext/imap/tests/bug77020.phpt from
+	# actually trying to send mail, and will be fixed upstream soon:
+	#
+	#   https://github.com/php/php-src/issues/11629
+	#
+	# The IO capture tests need to be disabled because they fail when
+	# std{in,out,err} are redirected (as they are within portage).
+	#
+	# One -n applies to the top-level "php", while the other applies
+	# to any sub-php that get invoked by the test runner.
+	SKIP_IO_CAPTURE_TESTS=1 SKIP_PERF_SENSITIVE=1 REPORT_EXIT_STATUS=1 \
+		"${TEST_PHP_EXECUTABLE}" -n \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
+		-d "session.save_path=${T}" \
+		-d "sendmail_path=echo >/dev/null" \
+		|| die "tests failed"
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3bdb21e50510..75d02941bf0d 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 5d1d89afc56f..7b87b4466648 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -3,5 +3,5 @@ DIST ddt-1.7.0.gh.tar.gz 19742 BLAKE2B aafecea2363f9a1dc102dde1e19ce8f55def75557
 DIST ddt-1.7.1.gh.tar.gz 19770 BLAKE2B a2322e380d4e218fa81dae17c4bd057786ba38aa581015991c0eee8f250a0a94f36311e0fb638362b0db5ec56c0392dce54e8e69568ab90a936e6cb9b848fb78 SHA512 7b1f30c08c74fce514380d68b0d44aa1bf8ff1b8cdbbd52bde83e0bb46439cc7ae2fc7f32e0acc257cb3636f6aadefcbfe6815ea5e372a70503131d7fc869511
 EBUILD ddt-1.6.0.ebuild 679 BLAKE2B f9fbf57c975527be3a5a08e3f187066e6f4176e6bbaf205daaddca93442f9a0dea7a82b1cf7fcb5b4af258a84889d7cb3d78b8d43186947dcd58e44d9b1fc581 SHA512 c67793c746cf677a717ced7754417c891554a69435f397802ad81820eac769d5b7021cb630d624ab75c7518b817395e704bd14072a4e705e04646fc57423cc8a
 EBUILD ddt-1.7.0.ebuild 724 BLAKE2B 4e11840b7147bb942d6b0e989b9725a1a5c8f0c5c81e7b651414da1b65483d631ff00d8bdda7fa0416546e2abcf7f95cfee9119f08b9e066a3decf1a0d69beac SHA512 c59219638ba0781d611193497afb4f3136b0486e9e34f82899560eae5f31eff5171e1a4483d5367e9769508a3d353fb7e18ec93c88cb29e13532b8a7aad83d3c
-EBUILD ddt-1.7.1.ebuild 723 BLAKE2B 7e53852fe9a074826ce3817d8b5328981406a6dfbb5701f2f983721210f7c144f554ad526b1275c2027d984660c05f097d264e64642f21e63352e4746da99f01 SHA512 15099198200cb79d271afe8a95f6b52ca1c2261ccbda665a1db269aa6100663c94303930edd582a467cb595ee36112fd17e31bf5cec7b97e4b76274ceaf8c8d4
+EBUILD ddt-1.7.1.ebuild 722 BLAKE2B e7646771a75b72f9d1c68d4982fb24394a3f3a4081411d18ec4417c7a5323f4fddc0ad162445606395a158ecd14cef86f354d8370a5005d609154223791b7cbd SHA512 5dac0b42f05527363274325c69f3ba2718feea8068861eb7461b99fa346a0f17f90f712a5c91443d0105cea2eb8e91f03d698c5e3e20a2b3a9922649f0a16d06
 MISC metadata.xml 637 BLAKE2B d7aca1ac2fde8171ceb8fab19b6be2f32125d3ceb411adb504e66a024bbaebb3be0234f17ea0c07073c647d4e613cac889cb241c49ade87f168218056fb8afee SHA512 7416856917a9b619b7884f9a8fde9fb30ee03223e9c8dd45920c43f296a469ee70d79ba999bf495d97ac41d310d17949674f87c0d365ac940eae37aca2ef8d94
diff --git a/dev-python/ddt/ddt-1.7.1.ebuild b/dev-python/ddt/ddt-1.7.1.ebuild
index bd78d2983945..324f6de7e917 100644
--- a/dev-python/ddt/ddt-1.7.1.ebuild
+++ b/dev-python/ddt/ddt-1.7.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 74db113a89ef..4b26412c1e33 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,5 +1,5 @@
 DIST libsass-python-0.22.0.gh.tar.gz 55135 BLAKE2B 8495462fa8e6a68bf73ecdf68771c577bad1affa1121c1781dac41c912aae731df88c2b1d1a4ef363e50a98ff1b471e7c45562faa6f2425e8ec5f47f9cf76c6c SHA512 13914b60fe19fc70d197a948a2bc83f7646e4acaa45caed6df68bf2eb10e0a7ef811cdbbcc7a4338f9c1433cba8e316146c20072dc4ff34f51e094ead1bfdcd7
 DIST libsass-python-0.23.0.gh.tar.gz 54783 BLAKE2B b2113d295370391c6b92c2561873cc1c58c3acdcc5c4adb6c50e717bb963bbf5d4e29e97290e2b4743508c0f1a73be373233205a79c31b6f6a0262559adcf924 SHA512 fb0836cce26ef8cdfb90cb50842e66f83ed47d06327272a49db3f2cf4b7f1bc29560d0126f00ff13db626d0624ff154c342a0f2433802d4c1b582b8d74a50337
 EBUILD libsass-0.22.0-r1.ebuild 1397 BLAKE2B e4a6790307f98d5bfec3c8e818ef5eb933835705f50f9e24ac99df73e516e813cf3216e89fc935d4faf479e192ccba7a4ce90a027205fcfa8b82a885596afa8d SHA512 cd14b7d92d5dc3f5486aba0a16d6ebab9b24487f222fb0a1ca7b6bf780195807f6cd706a245effe03fd267ae1c34564765175b5b341387b0f6194443f6eda4db
-EBUILD libsass-0.23.0.ebuild 1350 BLAKE2B 29e043eb28b70d699453f7e403b5eb647ead6ad7bf41ce2f163b59e59d02381bc8945d547081a122237f52d119f8087a37ae6e31fa3e268136f1cbbdbe73400e SHA512 a812abdaeecd02aee4119ad7a507bc9470e0b437ee38678ff0a934f6f2dee6833eb3d608328a0f25425e7459571a29baf58d89e555cce71fab064c701290b680
+EBUILD libsass-0.23.0.ebuild 1348 BLAKE2B 5c3f71fb899be6a7ec5e2978ec84a489307b220e8acfe5a445270536bb52fbbb98db06e4ad1601bc838e856f275c055a212027395c558c993dd5ced7fdf57797 SHA512 c3430ec8e8048c0667c017a38b8d2d4b01ea875c343c503bace5faa1698ab8b9b84260dda4c62f08e9bb26cbd6d636ebec5fbf01c988f54532e23fa74ad8a6e2
 MISC metadata.xml 489 BLAKE2B 81f6227a151dbe09e04bc80d25fa9140a08e81d71c531ccf856073c799dbfcb28a0052c5ca8875eb0b52ac93c49098325c02502b7c8ca38e5185601187afe587 SHA512 110e06d1903247bfb00db8cce722d7654c528257e61bfb8281aad749fed6ef385b4aaee3f87f17a8c75eeeafae8f1818d86273900874a776dfa321254b63b67f
diff --git a/dev-python/libsass/libsass-0.23.0.ebuild b/dev-python/libsass/libsass-0.23.0.ebuild
index 38d537ef52ce..dd0a5ae116c7 100644
--- a/dev-python/libsass/libsass-0.23.0.ebuild
+++ b/dev-python/libsass/libsass-0.23.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 DEPEND="
 	>=dev-libs/libsass-3.6.5
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 599ccc2111df..94ee9407c6b5 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -4,5 +4,5 @@ DIST miniupnpc-2.2.5.tar.gz.sig 543 BLAKE2B ea7b5c254684f52485bc18ad4820c41e7c70
 DIST miniupnpc-2.2.6.tar.gz 103949 BLAKE2B bf5ea9ce0194dcff47763989da6eea0282fe2507bab79a14bb699aa1f843730c95b448030d8100241787b899d3cc5e4e7ab4633ee2a97b9121eea05c90b138b0 SHA512 012a7a7c96694890af458933f0bc14573f5c85cc5f3021854e1a965574f993be174ca15c1b0edb224333c2560c3a44cd68a067527db832475a16dbbaaaf48125
 DIST miniupnpc-2.2.6.tar.gz.sig 543 BLAKE2B 243d9eacab92a33c6c9bf064333c6d2620c88d2bfb5b6bd1dd5f8360f355e8e4b0c0af596ceccc5783e9beaeb21bc2ba0c24fbf3d7448e92235f4a1a0793859a SHA512 750d0ffef99210552d96383bc67d4200f1306c4200ecac8b0d91f6796882a2c8686e83dbc3fe103d01d957a4212258e660c91a79a76ff87b2a7b0498bc5a822e
 EBUILD miniupnpc-2.2.5.ebuild 1087 BLAKE2B af0cc49cce7b0f0c9d33b316d40ed1e50812e366133f74df0c3d5f986104e584e8e7ce6b1e2adaa41f8c62b2109842cff76e2a43dbedc2fc2e0c77954aea538e SHA512 698f2a9e2b76f037123ada47733a15e984154ad881ccab695866a18f64cdb7e07dc1771f579605efef614fd7a76b242b61367e81e668d42db5e6e42dbaea2fd0
-EBUILD miniupnpc-2.2.6.ebuild 1083 BLAKE2B 0ab55ce6eaf4138b0198766ba80f9b582bf98b19a17fa59d46b1027ef77edd17606ed80b015bd4d6a3ee1f8c55c7f9c0e7972f4cabfe752abe4c7d9f3d2c023d SHA512 a43048fc4fce07e5a23546bf5a77812a8400ea92894ad64971be3d92f5ddebb3c1be04463a60acbd6b3629c4d85b746cd64b2d79d9dbd89604946522daa927c2
+EBUILD miniupnpc-2.2.6.ebuild 1080 BLAKE2B 2fbec5bd8e87f306a911f9d69d36eb794c3f40a2600f0ab30630affeb02c30f43f8fa339bf5afd26ad9cf025bf9cfcc373f340bb4d5ced54ac4ddc26441c92d9 SHA512 fb9966954f052ae4c5a37c30cbf78feb03b09edd3082f4f22de411d64f074afabe8e543b2e1889655cc43c01291a9f10f50bc91e3879a68b16197cdf78108857
 MISC metadata.xml 377 BLAKE2B ea6ed68d8dc3db74e7f2c667a78a74538e5ad3540b1c1cd05c51309188d468a63cc0672f46a35f1815d7317c70481c414f832bddfc0e8b29a960f9e68faeaeeb SHA512 eeb47bbf1e29648cc00c7fa2adfa3faed52a888e943d7fe34e5fb20dbdb1e323fe6d9f102af5737fc73b70d0f596274ad7a8c54904c8b6a9d6af4973aa69a481
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.6.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.6.ebuild
index 5c48455711f1..9595c7c5307e 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.6.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.6.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 
 DEPEND="
 	>=net-libs/miniupnpc-${PV}:0=
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 71bb04be279f..a3ec3a0fcae4 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -3,7 +3,7 @@ DIST pikepdf-8.11.2.tar.gz 2870263 BLAKE2B 6cf3666baca5d20b125efc3f6d8cfe7f96b93
 DIST pikepdf-8.4.1.tar.gz 2853305 BLAKE2B 2298514159db17ba49b8e2fa2407d60de50273bea111ece704251d99193bdc4c8ed77f624237a49c3f4f129e3b14ac4ddd1006cf3024bcbf822bc5523e0fee35 SHA512 6989e8a3888f612e453ec1ea8425c0ca35ccfee19ae5e8c32df136ebc3fbb7728d9fe5beaacb4e392a20c9037a1009fc8f8d53d73634427fb0df9103626e34fa
 DIST pikepdf-8.8.0.tar.gz 2865070 BLAKE2B 78c26c577db858c27a1aa632c0e93a955eafc76f3e5928a5d4862408a71c02b66325e51728e81a5d6bd571655b2c96468592b3c591993e4cf6ecfa28fd997a89 SHA512 91bdf67a800c18559172c7a253859e6e5ef443b0f6e2d2f3af21042db2640f9d96a8fb5764e6ddd64ace248788e32b071ed624c95a6a0557ba19dc6fc33fdf76
 EBUILD pikepdf-8.10.1.ebuild 1703 BLAKE2B 5ac556f3681d27da33e7fa14b6e3fb583ab46d235ab1455dc2bb6fff8ba187b41edfc6165dc9234a4d889a00a1f82e92419a9ef15ca987e2af91988f631de5fc SHA512 ef96befd0ff087ebc9042a4733db7b00b2e067d5cebffef4c9edee7fba0faaabda3edbeeab23aaefa6203b5fa07ce6b1836420a1d065b83c6150d4c4e7f34caa
-EBUILD pikepdf-8.11.2.ebuild 1791 BLAKE2B f621a391953fcdda8e1678e7426c8aa9234a337db12e752ea29c97856e8387c3ee7850f0cc23d34504e3e56696579fa39111c5017da61a8e0da9349a496b7c2f SHA512 9d6e1a5c28f840a63e057bcae2b6481a312e714f6c7145643c5f637db626fe512135f4ac2472c08a1ea698607b25e745eb05cd03c59d61b37dc84b9d35be8818
+EBUILD pikepdf-8.11.2.ebuild 1786 BLAKE2B fb877e2bcbc3caec04576b5a915b259e73cf763da98ef8551380a6523c9003f70684f97fef853878185613e4e0e976485ddc16c607f29802c0f5e8915e671cab SHA512 25c03bbfc23d0386cf481093f9dbf67f903bad45d6effa1f0ebbc341bc764356d585adef37a5b015ec2515dcb42fc0d54cfaa0358ed70c49a7c5c55e0533c3b5
 EBUILD pikepdf-8.4.1.ebuild 1680 BLAKE2B 2d988c8345fe6642e1bf990dd385259ac9b8709e8e22b6b1dc74f3e7ecf88193fb9c06cc3085b82aefb811a5cf18f676dd23c2d75c27a4071903a291bf272f5a SHA512 05b25f5fafcb3999eee5c8f1c5f44e6b1c7dfd0397fdcf7e4f2a5c812a950cf00a87a502a4244cf01e775ee5b7360cffbf2dbcba64d5b203216be008400e4683
 EBUILD pikepdf-8.8.0.ebuild 1673 BLAKE2B da9ca57a521ff70715d3a8dedaf05b0a78724c8ed0eea956de294321cb8bcc2d0b691229851a1f14329a9b4eb82bd953485c843506a68cb658b58981b8c3dc6a SHA512 6458efb2b6652051a3cb7691c13ba67805b92333cd6133f5701a9386703fa480ddb4beee6745289423e2016f95e524bb1ee45c585414c7d693fa6d4bea3da4d1
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-8.11.2.ebuild b/dev-python/pikepdf/pikepdf-8.11.2.ebuild
index 6c91503b35c7..ce51a6a7f3a8 100644
--- a/dev-python/pikepdf/pikepdf-8.11.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-8.11.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
 # https://qpdf.readthedocs.io/en/stable/release-notes.html.
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index d9c0c6a2ff3e..3edb4f1a2f97 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -5,5 +5,5 @@ DIST psycopg2-2.9.9.tar.gz 384926 BLAKE2B 8418fca1329703cedfc86be74d85cae5133a06
 EBUILD psycopg-2.9.4.ebuild 1248 BLAKE2B 05090945297120771b3983ead32e88a6c178e631441a7fa3a3dea02c528650db938f39e0e8beed6bb46502e5c708efa32fa167285b7eacd214f587de5f8a53b4 SHA512 1e11a0c254f38c7e355d29a824b85546850b39dee02ef39a1275c2e461b3683793ed8c7dcae74cc4b8b70b9885203895e4b701ee39880f7de0fdb666d3826fec
 EBUILD psycopg-2.9.9.ebuild 1290 BLAKE2B f478219e54cc7f2c59790b82f72bd38e26a3d1181cedaa67444f7cfa283214c2f6402417099c426d329133e47a5f6e9043eeceeb7cfd2ebff10b4d7433229ece SHA512 8a3d087058f98b069b7326480d8063993ed4d1ae73792c5a5abf9b386bec586af52d015d49171a062c0c6407ec1fd062c8f27bfdcf6366d04bb64420db34836c
 EBUILD psycopg-3.1.16.ebuild 1781 BLAKE2B 087e1f67b6ababbf666651d3d9216cb0382507e07b03d2cdc694ea6cc45551126a1cf66cd275881012f8427a4bb31159eace9e0369d32a7e2ba8f2cd4877ecb5 SHA512 e2aefd6658d44d2e28adf5785e035bfdb1c1ff40fe1d275f7bd6aca35e89bcebf7dc1cd4fac24ebe8238067ad6be2e9bd2fb351cd44e83a7bcc3e23541d57521
-EBUILD psycopg-3.1.17.ebuild 1784 BLAKE2B 5758702f40a4a186356f6673220c28f31a95290193accbd5b1e2008cc1e91f76d1ac664f1f1c4459ac77c90a94fef1e7fb5b5a5a7530458a327e4d0697754f96 SHA512 885f15a37c35b26e213b8a4bfa5c14593aa44c81dee33fb02fa000a877c44e7ad2ed7eab28fbb33a5817571ab7998610c28bcff633871579bbda011e757c9abb
+EBUILD psycopg-3.1.17.ebuild 1783 BLAKE2B ffcd3b7f8032b4cf983c416aadd7067b27f68fb9eb4223b62d31fcfb2e09b019c2938abf1e1026750075b210fad9125b3978856094b81818b8024b4377d3d3c8 SHA512 43d7072ba28b50ff084d39b542f12222efa0c0dbc27b4a102c0021862061553ddef67740aab25e585d96103c6902c7509067d7c139e2e5ff749eaa08c46629c0
 MISC metadata.xml 426 BLAKE2B a573dbbef89ba2c3c7e7aa11e87005879fa823daa8d7e2080ce82dab7196429769b5e2ed0c4ffb363443469dfa47524d900fae75c4d7c8c9da901389e746838f SHA512 e3059428d8c00113696bfd232b2ad3fd4efccc304a31ff45801f30bb07c03acd58aafcab187fd85e4d89eff4db6c18a1395744eb1fd5cf8f11e43aca0f4e60cc
diff --git a/dev-python/psycopg/psycopg-3.1.17.ebuild b/dev-python/psycopg/psycopg-3.1.17.ebuild
index a03023b873ca..3d6106071574 100644
--- a/dev-python/psycopg/psycopg-3.1.17.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.17.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 350ff230c2ff..06ae264da648 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,5 +1,5 @@
 DIST pyatspi-2.46.0.tar.xz 324112 BLAKE2B 653e80be2d17f3246bb6bb60c2135f158185374c995ca37d4f132c90d0bf02b79cfcbc4f64d555c557e9f7fd1cf0720de2c5d177b303e35a84d8e4490ae2e660 SHA512 4e9d177c930db3ccb5aa41280e33a58b6700d9c45f08b6a2f32fce0ecf5f1faa3f91c57281a5661bb9ccaafd0935e90b44f328a62988ae838b4a008916d2aa0f
 DIST pyatspi-2.46.1.tar.xz 323392 BLAKE2B ee55f57616d58ead8bbf14193a984e2d268b0dafd67bdb638086fe531d7d031b6060f2c757036f67ad18ba6c1f774c8ef13a4844c5fb96878604f59903b2653a SHA512 69c1c4c31bef430083a1c9af98ba6b2f1b3d9eec0a5f03982b980838bcf86933069a90d7314d2e5501d5988a453d0a803ad239eca5b98f08cc3bf7dc8d4a7c0c
 EBUILD pyatspi-2.46.0.ebuild 1327 BLAKE2B 6fd0b434a311ef99e3783cdeb11cc98c8b062242746daa05515d79b693c55229a50fe250b725a0f48a69b60659483c1be7d6877477f72c2520bcdbc671201140 SHA512 947cb62126e7107311cb547ff601bd20f640a97e26eb7ce289917e93fd761c75c60b3a41e2562e928202c020ddba6f6b4a307ec7e604277be135ee6cde8a6e96
-EBUILD pyatspi-2.46.1.ebuild 1329 BLAKE2B c50112a0e8667228d1ee85f8520bd934ba200c84d818e45b17dd6213f7372d2053d25cabf35eefaf294209fff965fc6e6b8dd4fcfe1fc311233b549312c6981f SHA512 523cba366a4a23610e06ebb5c960d8befcfa975590c787125985b07641c9a904691ba428a69c28104b9571b5e0209c570449b133b0a3ea479241636dfa75ed32
+EBUILD pyatspi-2.46.1.ebuild 1328 BLAKE2B 1e1347c1a1ed3c21cefebbec3de0a01785f4d1280ecdb9c91b188c1610580e249ee79420698b330fc21ab218e33cfae2ffd2554c252d957d5705a65f79726d94 SHA512 bd69096d6a9e374dc7884b7fa3896746ff308872cd17f991602348ceb4446a6d54fc55343408ef902a0eb7dd3e214858d4584440dcae9a82bb4411f1f473b8bf
 MISC metadata.xml 349 BLAKE2B af48f6da9752ad965ab10c2bf3322d4321f084fc392c78e2c0fa1b48728f6b0f9e391b97ee9df9880fbba4c47ec798e0218f3800bb044ac8d9609066dc883580 SHA512 629ee6df4926ec37c3811388921ec024f7b1a50a819b74715dfac905b7830da3d7d64ae1886703b694049d06422d36e551d4296b2892cc43d60d45291d287840
diff --git a/dev-python/pyatspi/pyatspi-2.46.1.ebuild b/dev-python/pyatspi/pyatspi-2.46.1.ebuild
index f66eb8401482..290fc6c81bd0 100644
--- a/dev-python/pyatspi/pyatspi-2.46.1.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.46.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 0cf05ebb6c93..13b17f131ea4 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,7 +2,7 @@ AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e9
 AUX pycryptodome-3.19.1-gcc14-configure.patch 2114 BLAKE2B 5a2b9f3b22ec39b805b632c50ab6a244a725088b5dd35bba7e5ab2814727870360825e7e5c794af36c57c85a0e1d7bd1c1a878fd2000edb5b294884e0712c254 SHA512 fbbfb4dee2d44460d1079dea8971c54f2d641394d26628a50fe1cb03f62cf9c6e99e7e4926a38bab30475c28411d16a5ec4d4bf30d3014d26933e3988e7590dc
 DIST pycryptodome-3.19.1.gh.tar.gz 17158420 BLAKE2B 2180bb37e2295f0499c6d00237207513ad6c186ff8fd8fac466cc43efa9b068cf8a272b5ae30da08d37db88d354d41c0b426643743251ea8460abb6ff627e3be SHA512 103910b385578732e356145247d3c1a4a3b0fe8acf22ce91f1c1155500cce2342e5caa0dff0a30825b11d7a614853c2dcb8657628f4d65682f6e543adb4db240
 DIST pycryptodome-3.20.0.gh.tar.gz 17173888 BLAKE2B 7706a7f512579b4edf080b5074a9f226b2f0ef18a8f1faf74e890cfccff85d0599b4883cd5011a5cc0296b5a10cccce94cb2b948de29d785f6add04e54215a5a SHA512 0d65ccd93f9f78548c04aa3af01cb65b6a39e81bb3dfa4bb08acc5a5a731b17f9c5b07a1d1780739b3f358402a3596b04e446fc7b39345a4c6f03fd5a2de7ff9
-EBUILD pycryptodome-3.19.1-r2.ebuild 1427 BLAKE2B 36405d2d6193f005a29d8d9f64b41fdb3a7adc41922dcc8790274766bbc815405a4b8c14b8299c62268a98d7b982637c8240bc411b17de8b2305c620f1a5f954 SHA512 a6b268b0ea743b52ecc824a29578244dcfb850908aaa3d2426b6dbc643480da6d3f1e28ef9e5cf00bf2ccdb0a2357f779ae3ae1e8ff80032207a2a09fe35e638
+EBUILD pycryptodome-3.19.1-r2.ebuild 1425 BLAKE2B bbc013ae51852c0971d97695f1814c9262c0b7621544f377db6dc7d442915874cc2dbcb45d51aaa0298dcc286ab1f0a242e64b8b5286af95646d4e0fe5f77cd2 SHA512 23d4a7532d420617339ccd968a3bb89a858e4c1454f9ee0f2fcbfc9f1f8ac5311e722e67e80143775a6ed5edcd7987bd5e680ea0985a1e27505716ebdb150c44
 EBUILD pycryptodome-3.19.1.ebuild 1368 BLAKE2B 5eca123b120504866f88490be4a53f36bbd27ec4f40bff397bf0b89f92309cf62dd4e77e8b67a0db62fd2d6912f38733a8813832aba2f8c8465a26c26314ea8f SHA512 ba0b239319f25c26667d0fc51a600d716aa77d4519be17dc05a51b9adae759559f0a530f804d32f0d7a8bff1a500a88b9560d2857cec3bfad0e384efb3d9913a
 EBUILD pycryptodome-3.20.0.ebuild 1375 BLAKE2B 697d7ec480b7f46e55591bb1c137cf27a96c5453cb741a50a86a5ebedad7abde198dda94809858ae90af88404145098f20339c1bf396f237e9ef8d1731b476b7 SHA512 2e78a831fa42a13f066e439244b57836b296693a7369564ce393d3186a0c7f263a8864adf60bedf3d5287034d980fee9fb9e5ba04b4c020bae838dc03a698935
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild b/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild
index 50e713ee7251..5e5ee8256d02 100644
--- a/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	dev-libs/gmp:=
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index cc7bc3e80534..2458e246ed16 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,5 +1,5 @@
 DIST pygraphviz-1.11.zip 120803 BLAKE2B 004312750bcb9fab5c39af2c1de6c452489d9a2deea8211e6bb7cd722e9043070644b61c78047b01d649d41194441d82ffe2dde9fb17b6d9233bd0acee539c7e SHA512 3914d29fb214e1f7d59c7849e1e63e783902acd262912eccffbf6a67f8cbf6f540b9f2e84c9e7b4f0d90fae27f451a701a3b75a4dcb15b8a81bed463b34e2ef2
 DIST pygraphviz-1.12.tar.gz 104941 BLAKE2B 5c2d119c66837d13511ef4756093b159f45ccb2888eb2b86c1d016837059ed34bdc5cb7e69eeff013642d92ec0c2b4a1149316b0baaa742c49a34945fd2563e0 SHA512 2407fdd7de3b2f7f1d9f9e3e3fe0f19c4faad4a72db33a0b4341a01f98eecd4d240079f2d0ea5cf68a5e10236f11fd84e55fd44518611efde2fab7590e3aae90
 EBUILD pygraphviz-1.11.ebuild 1022 BLAKE2B a4765eb618bef2346105cf87a442a765678cf9ee5be8f52756a12fffd5f4a61ab7249ff7dea4bf7c0775892082169bbf40093013f4c02ced24cb4d47f87a321c SHA512 979208df0b327186f298076f14933edb319b3786a895729b491a394b9fef3dd3f0fb5a3561a9e6380af24f89eb5534746abe979f2e80a8a60237098647c6afc9
-EBUILD pygraphviz-1.12.ebuild 959 BLAKE2B 19f720036ff55574c7ac42850be2633968c1f3e04ed7120e72b5f40b6d6e7600ecfa5396090f530920003a0439007a7c9fd055d52ce7d1f79656c4795fb7b1f8 SHA512 400ad53b032385d0e34798c8eab5db48c4b1ecfb3b037f756755084ecc2d8e2607de7486643180545897c60c36edda7a2fa2f34d56e4ced51d124b29e29df90a
+EBUILD pygraphviz-1.12.ebuild 958 BLAKE2B 49e54d9e2005d6d95cb5325a30f8fac0f524ec6d556eb634cace432e776186763c49f1f1dfa408725a4c97221c8111799bfaf441fb0c5b9febdba4e3207427cf SHA512 ea1b6015ecdef136ea43b66ae4729879ae6ebbe8b4a74e3cf3ba149443b3ad8e33b327318918167743c2c48af09deb73ba07b735d328b0a85f6c3a8210fcc871
 MISC metadata.xml 682 BLAKE2B 50dc3c55cac525fce3a396c94bdb48eb6e2c0b43636ae53c8ddbce2c9d3f82d8a080d881d4e6ac61ee71f88779c560d38fba3e10424fcd30af0dc80f979df081 SHA512 87e124765948529b7444fb1ad1ae655e18478ca46631a11a6613b289e2ac39600cdc00cc7af82b40694fb1e90c0ccad98be2fb457c5d7f74d5b087a6b3319aff
diff --git a/dev-python/pygraphviz/pygraphviz-1.12.ebuild b/dev-python/pygraphviz/pygraphviz-1.12.ebuild
index 80edf1f996de..e6c6a4fb46d4 100644
--- a/dev-python/pygraphviz/pygraphviz-1.12.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.12.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 DEPEND="
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 9c6dd4425db8..73ef4efa4fce 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -2,5 +2,5 @@ AUX python-xmp-toolkit-2.0.1-test.patch 2953 BLAKE2B 84794d759a96cdd2d56f9b254a4
 DIST python-xmp-toolkit-2.0.1.gh.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
 DIST python-xmp-toolkit-2.0.2.gh.tar.gz 3577828 BLAKE2B bc24224c5dc789b0f66545a85b10bcab2dd64dcd5195ef04eae6cac94e1c377466aa40adc4aa42d014a7094df4dbe6f437b78e38b5a0e36e0f2eeeb0a08f1f4b SHA512 7ab70e78abe3f315863c444c5d841ff4ae9e95968ccef45e15d20df5206140939f0e857e6c987a643ba908aa8d92dc4870e77d94cfafc547208e4705fa9187e1
 EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 794 BLAKE2B 1c830dfcc5d45e1940ddf4b8138f5369a18b711f45e0b8787022423b508a3dc199886e6f800fe673644a4747da9f4c8353ecf9c2a4f1a5d93de1e0933175fa8c SHA512 09e0d93a378bd2ee46a1b2f22ba5c791864a241127aca688dd84d30434a1c35cd5d54718fe14ce3a576568e5de869365b5b13ad93002743b18c767a126d35b80
-EBUILD python-xmp-toolkit-2.0.2.ebuild 805 BLAKE2B c18d2602e0dfcb3d53f7e42b4ae4c0d94cdda5c532dd831d87a9e404c83d634204eb52f19326265311fc429b777a49c3bcaa3b44d1871371a31ed9bd4f99b614 SHA512 04cfdfd3314674be982acedf362234382c93cc2096be937f8a6589bc214b8e13d07f0ff8d296ad45c824538a29bf390c5f37e376f42379f7b9d32d5571dae552
+EBUILD python-xmp-toolkit-2.0.2.ebuild 803 BLAKE2B 69fca5a39bd634c63df674ab0d92ace80ad5b334d37ff872fefefafc9abe5c97a67bd6c43f5dadbed4914ecf7bbf55566995d7acfa76119620605d049ef2b5e6 SHA512 fdf5f3291df8dc2b692fe178736bf428c3a95bf2e79c707208e243545529c571818c19e2424ccc754ac9c2c652627e3373616071fc1c0ef04b7df897f0b39541
 MISC metadata.xml 417 BLAKE2B 818d54b619c9571b00493c9c463f4e2899c187071918f9e74189d8be23b97f4cd9a8ca0313c5f26507f9e581d8e268be3fe17f03c3f409b1eb333540fb48d380 SHA512 dc5ef8f44af10a54da69fc6bbd392c4da30ecc49c829f2f8c26022e2d42da3ab0a705f31bd72f404454fe76daf1162ecb72ea1e106c93a48cdf100b59f492a91
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.2.ebuild
index cfa2dd17eae7..c75f07abac08 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="
 	test? ( media-libs/exempi )
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 22ac196bde2f..11144518275b 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -3,5 +3,5 @@ DIST pythran-0.14.0.gh.tar.gz 3642431 BLAKE2B cd5eeca0c52b0c3d17862b38c176b435a6
 DIST pythran-0.15.0.gh.tar.gz 3676474 BLAKE2B 2b9c08d773f7848cf43c804ffa9a84eb19d20dbc40668657daea9698fb468e62ec86226f39aa3b8ff07b48a3120604b44a9d6a6c9e7f2b5f0f41ba2e9a201231 SHA512 2abba0ab5328e60d622512aa6c5442fcc28edb4da4209db50ede64961b58c91c2109b7bb90e5872c5c0d487542f669dc2ca3e721c28229e283f6e0130f95aee0
 EBUILD pythran-0.13.1.ebuild 1710 BLAKE2B 8c6bafdd9cf45c2952e5f4ca7b5d6d1362350dbdefa46d4c8ac1dacbe3ace1c6890b27c741250765690a15cd90f639fc9bbb3ef7047d963f40be091f403a5795 SHA512 4e404e3068c6d57cf6c5e7167eb6402e41d2fac8ac5429ff03a260bafc99dafe406635f8bfad9210f1a9ceb1aacccf17e2f06ebb18f2be77ac01c743b6080c4e
 EBUILD pythran-0.14.0.ebuild 2084 BLAKE2B 1c471d24c7e08e51e9f986dce498328ee592331b3ad527fd185fb850320b87f680ede0d93496ad41cc8e879cb44a8ad95ed59c18f55bb74293cdda841b610907 SHA512 7921a242c4ab3b632eb1a11a24ed6fb9726a97b579e26f9f3a4ce5141e8c3976c2c4960845b11f8b7c229fd37e9b6430041cef99abc3e9af293120b58f599888
-EBUILD pythran-0.15.0.ebuild 1551 BLAKE2B b4f807f0066b0d560af64e2a08d71bd60732dd452d7bd2616cfd4823a5fc1c4d9ef0631f57b5ed65b33be9020716f80ddd46259aa414076c5c9d1961189a9ed9 SHA512 80f593c532b40a3d8f3af8ab77e05eafe5c7afd830f1226847360e3ae9e83febda3dab10544062863a86638df5b21e7517a9ac8b01d7c7c6d166b584909738c2
+EBUILD pythran-0.15.0.ebuild 1550 BLAKE2B 0cec4263374364a3507f2ef503663b83387c7469753dd908a0dbfc0c3fbc300f5b1255a2a9c808071e777ecbe3d70fa9a1f1f227796bd1b9f3507b28d42b56db SHA512 970b25c3d2aed11eb04573ef916ee79ee4f438906f2d224a60b8763b1e58817199681a3a73203a544a2bc18895845e3ea3dbd93e3c8682900b17016af6b8b871
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.15.0.ebuild b/dev-python/pythran/pythran-0.15.0.ebuild
index 8a0fa26fe3c5..22219d49a4a3 100644
--- a/dev-python/pythran/pythran-0.15.0.ebuild
+++ b/dev-python/pythran/pythran-0.15.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index f60b36574867..ea8bdf68319b 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,7 +4,7 @@ DIST SQLAlchemy-2.0.23.tar.gz 9474103 BLAKE2B 9ebfbca68106249a8c6c5e2e187b57953d
 DIST SQLAlchemy-2.0.24.tar.gz 9490665 BLAKE2B f7e845aad5a8cbafc24dd2a057a860b5eceefcf699706d01f78db13038639abbdcb4530290b135c31178d010c37ca908758651f5e0fd8142e97f23ecd4a48d72 SHA512 74343a592941632fd04625bc0a13d2b4720c810b7ff422637dc8aa64f0e8f768db8006fca50827a228475247f28df94dd0b0c97b8143c5eb6ae69c6f19578b47
 DIST SQLAlchemy-2.0.25.tar.gz 9508797 BLAKE2B 88f8927af1a20bdc3697e90112d515a04c64879bc806ae655d326f22322210853c2995ad884cb510a15d14ae12eb7612d867f701ab8f938ec0227abaab642497 SHA512 60b31a167f46a623f76e349f6a3f5a1696e1a04aee8dec2750396c715831a242a96e281ee7fcbfa26f82e6318573ab58e97d21bd93d02bbe3ff962777d809146
 EBUILD sqlalchemy-1.4.50.ebuild 3436 BLAKE2B abdcc6fb1e0d44d9e54a54d7fb8c4970112b70086a3874c40fa5bb5484a4da4ed4068abcacd2ef2f32f6b57fbe35ecef2a8b19ac1e713bc69f6b15aa187b145a SHA512 2a126cc89c7d68aa4e9b3c725d65896e17603c10a7d79973f8c0f40b65f27adfbde929b2b665e1ecd823b61b0d20380f8e21aa33ecb00d24cb49416a1d752ade
-EBUILD sqlalchemy-1.4.51.ebuild 3437 BLAKE2B b29463c583151ce5576e042167b4239ab95a268e877fe9be77451a3bc3645b9b2aef3717eeb1d2a8b39167b813bc1fb27bd04f3e4b3da59409d6fbf0476afe93 SHA512 6435e554ad157727fa9b914e2d4e768cdc800eb54704d49494ce6f2fb15e912ebfd49b416ae8daf3b7c57c890356e2d09ffcef139ed8028414f9cd455cab091b
+EBUILD sqlalchemy-1.4.51.ebuild 3436 BLAKE2B 0c0290033a82c04b07cf97995a6f141cf0a35c5afdc9b1cb42c348f879306c31d21003941ad5eeb3f4c0da19c64f258045d6aa9668cac29391f08d90f34babcb SHA512 eaaf92b3300cc4571fba1d062580cc93cfb2c6c2678acbfc0785140b4c1fec2fdc9945140564f050b0d2ce5fff79298b87617e069ce880466792495a87b1c1fd
 EBUILD sqlalchemy-2.0.23.ebuild 3954 BLAKE2B 740aa280e123b67e95b0bb5feef7966a9ea33235c4a1120d7bb0515a3e8ff98978f3395fe13eddac86f09d34c0ad9ace81987f01010ec99e0fe7d20d7c1baea0 SHA512 f07db24c65f5315ea885c8268fcbdbf913685165e364252200b30cd8ee704404a825bb25230fa61594a7047b5339012ab14d500e1c64c873b0beff6fc63290fe
 EBUILD sqlalchemy-2.0.24.ebuild 3962 BLAKE2B 0e0afe117c8c7ca3e1da26edbf33a628758e68ea346cc0bb889048c74cfe8e7d1bfce05a2ec6cbce2a13c850120ffe905e992a355d8f3919ec5383a5ce4b4d65 SHA512 5756af0e3699eab96f248f313a1ce41dfaa31807d43ed197b8e38550404312428a11752f751441d30c141cfed192a31d1304f37b0e73f4d16f47989a49f89755
 EBUILD sqlalchemy-2.0.25.ebuild 3954 BLAKE2B 9bce2efb81f5909ecb56762d4ab38fa16384109148131c76389b5bdf4f7644e1a6ed01a388d11a1cc975d7b55380e17cc7256bd38237f3b1cfe3c4634067ae97 SHA512 b655ead9dbfd58766b379a9f6f546185fd497ef478de0e323a5d87d8d5bd5698e5d503cb151a5c57c3b60241800826d53ec9779a38a2f4ac629b567809379c33
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.51.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.51.ebuild
index 5e5cba63213f..bd3933bad9d6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.51.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.51.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 556044d0ab0a..0ef3998b4ce7 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -2,6 +2,6 @@ DIST ytmusicapi-1.3.2.tar.gz 71732 BLAKE2B 957c2b88ea2c9e59c81401762e4dfd4a52a2f
 DIST ytmusicapi-1.4.2.tar.gz 97077 BLAKE2B fe54fa253dec464b5112eb209b3b16929d87a93c360aded5d7ddd5598614f3c5a6c53be973a0c209d32b185effba81522fb17bed565511c3d7db0517f2bf5f8f SHA512 2fb87aa287c38fc1c5d6709bbcf0385205d2becdf1067ee7f8e50b57c9b8e974b457ab34039b1477e6890f0fc7e79b6291f4f2945dbde09294bb1f8c4822be3d
 DIST ytmusicapi-1.5.0.tar.gz 101082 BLAKE2B 682936a7e896cfe229945024a24370595f3e1c269bf15476e03224a62bf17ff38aa21ac9c940a7b2c9ab0dca69d51d560ba28d269489bb1bf3a831e384b79c5d SHA512 64fbac9a8600e86b046f210d677ec2b11349bd2ad9859eb0e67ea3c2b4f664e4087dcf51911911e249af957374fffb05997fc9863c1cbeb15958627e62716548
 EBUILD ytmusicapi-1.3.2.ebuild 504 BLAKE2B e94d0beaec9ff24ed842ea5d39bac5e426739752d84b2cc77ae3ab7733061f86d7cd225ce1f89f333447e0b2a474813c3d198c69e90bdf4a7e4d506d94fe0cbf SHA512 9150df9687f787c6f5dfbe2c81bacaeb9c1e57d98bef17963462f339b260a59e02c84b83d275341bc24400570ce9fd0ba4bb6a33ad054236f74e8df4bf5b158c
-EBUILD ytmusicapi-1.4.2.ebuild 521 BLAKE2B 6de42dfb36c4020602998b6c399bdce29071ca6117d137e528ca7a419bf403e40a5f97ed7fd7ba11e4ea0db396dc865fdc529726083690f68376e157ea725792 SHA512 4eb82c225a52fc44a77085c99373872b77ac6494d7dcb54ec513cde19f1c7d16ce2c9823d5e5dab9e5bc5ac50e733c670de8ba2963964fcbe9b3729fcaceafcb
+EBUILD ytmusicapi-1.4.2.ebuild 520 BLAKE2B f013e079cc3f63124096120069e5f648ba5d87892d3ccd767cf8e6e1d522404cd3ac7d3d0d2e02afa73f9ef74a4902daeafbf32d283b58b7e4d8ee01f1545c22 SHA512 dfc612a3c72aeb3e6914c7393aedc4602cb58bb8da5b218fa66752a52e2b1be3c7fc37ed439798b78334ff22e7cb756af4cece092ba8b79c7723d381ee7f5488
 EBUILD ytmusicapi-1.5.0.ebuild 521 BLAKE2B 6de42dfb36c4020602998b6c399bdce29071ca6117d137e528ca7a419bf403e40a5f97ed7fd7ba11e4ea0db396dc865fdc529726083690f68376e157ea725792 SHA512 4eb82c225a52fc44a77085c99373872b77ac6494d7dcb54ec513cde19f1c7d16ce2c9823d5e5dab9e5bc5ac50e733c670de8ba2963964fcbe9b3729fcaceafcb
 MISC metadata.xml 589 BLAKE2B bf51d5de92082a99ffb69839a9cadcea1d740f05d83194b951383713bcfbc4c95021ef27382cc6020298c3b8817553549ba150876c1398094dcc9a7de38bc04c SHA512 d34382f0041b2f74892661880ee7a318d7571254b18bf41d1152560e06f8d1b2da7432b4e9eb8a0d8b6cba645da9a3bf9c6a7c33002471a17d8c516c0aee8f70
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.4.2.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.4.2.ebuild
index 1537ab0e5d66..5fa2d4f3374a 100644
--- a/dev-python/ytmusicapi/ytmusicapi-1.4.2.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.4.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://ytmusicapi.readthedocs.io/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 6bc1bf420941..6dc805d68e81 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index 038428fb54fb..faed319adde8 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -1,5 +1,5 @@
 DIST qt5compat-everywhere-src-6.6.1.tar.xz 14640664 BLAKE2B f150da8e9be23858baf90680e9d8ce6f5738662070a817fb07c36236b16b44621fc36288f18216578cdcd60061ca226e80f046c82427d93542253bd1d64106e9 SHA512 2d5e2e40621590adb489dac4ae9a28fe8c2436de05dfe5aea47e449ae88ef82dd831e786d8290d04315c827f8adf217374ea5c6919ae12932496c5cd6ac28c01
-EBUILD qt5compat-6.6.1.ebuild 699 BLAKE2B d79662f1a2370c2ac788388e01e20f6538d4890396d9ddab7bbc4a720f59f49a5c2de4a3451a49c82f428472d3527d519604dc09109adec4dfb4360fe1bce295 SHA512 f4575d2764267eed05723a9971eef87cc8f660ebd7d8c4e5b043cf77bcbba7cfc07e9e2ac1c85d9bd85c3aa1319b7002c1b5481828a3695338ff424fca8a2480
+EBUILD qt5compat-6.6.1.ebuild 705 BLAKE2B 3a601fb81e43119b074cd189d9461801521e5f1f0403a17ab0c220e6bcac272a92bd948d880f212982a4d79eebc7b3fc4c57c54c05e6da501bd71b043ee85a02 SHA512 3356f5ae13a7febc5068103eb67c2a6a33ed60c16fef1d19c71c84d3df8879817059388d17996c185dad29f1beba4dab31bf0686712530480c27f1b8405090e9
 EBUILD qt5compat-6.6.9999.ebuild 652 BLAKE2B 26cc49e8f9d8a3eb8969c2d6718a96d401758bf51e992a3dcc1ff5be75093943451bb3341410710b419d0f7845bcccd67ced953b42898bcb457092d1e1cc84b4 SHA512 1855245e6b098ec3b38297a8d0ccc415bb5b7e531d20526e7d3e72146333e4615992ab4fda80d36856dac0f85a16dc700e5e95a775b092779a9d436e8d1f3050
 EBUILD qt5compat-6.7.9999.ebuild 652 BLAKE2B 26cc49e8f9d8a3eb8969c2d6718a96d401758bf51e992a3dcc1ff5be75093943451bb3341410710b419d0f7845bcccd67ced953b42898bcb457092d1e1cc84b4 SHA512 1855245e6b098ec3b38297a8d0ccc415bb5b7e531d20526e7d3e72146333e4615992ab4fda80d36856dac0f85a16dc700e5e95a775b092779a9d436e8d1f3050
 EBUILD qt5compat-6.9999.ebuild 652 BLAKE2B 26cc49e8f9d8a3eb8969c2d6718a96d401758bf51e992a3dcc1ff5be75093943451bb3341410710b419d0f7845bcccd67ced953b42898bcb457092d1e1cc84b4 SHA512 1855245e6b098ec3b38297a8d0ccc415bb5b7e531d20526e7d3e72146333e4615992ab4fda80d36856dac0f85a16dc700e5e95a775b092779a9d436e8d1f3050
diff --git a/dev-qt/qt5compat/qt5compat-6.6.1.ebuild b/dev-qt/qt5compat/qt5compat-6.6.1.ebuild
index 840db4caeb3f..60c6f6084bf6 100644
--- a/dev-qt/qt5compat/qt5compat-6.6.1.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="icu qml"
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 44c96c1026dd..1dd482a71f85 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -5,7 +5,7 @@ DIST qtimageformats-everywhere-opensource-src-5.15.12.tar.xz 1865016 BLAKE2B 74d
 DIST qtimageformats-everywhere-src-6.6.1.tar.xz 1972464 BLAKE2B 09b34763d0446bf6e115c9a0a8e15a3a74c54c26019077e114838aa850b0a535a53b354d8cedc44c03732dd5a016cc1026219b28785e729b55296cd63483609d SHA512 da72e093b86638da5e5a5bd78a4ca88b72675d6294ad2af4b516affe88212ccc797ea859784b1f548c75c82fe926d3cd8f96a88901b475d60dc0dc30cfedb5a0
 EBUILD qtimageformats-5.15.11.ebuild 705 BLAKE2B 4222a57660cc0730f376db02db94e3d82d36cf06566add5caf1ef5569ac92a023273e1374ee901e0010d1b8dde5ef1670400ac6d18cdcc2f9aaf71d60e277a1d SHA512 c735cb6de2811e5c2c8a7f8c97e6430263779025d7d5809ba665dc25fa66297c9cbca07aea2483e170d266876aa023a95ce045cb02b83f1c04ba47f5d7434e63
 EBUILD qtimageformats-5.15.12.ebuild 709 BLAKE2B 638aa093b3a9913cf94d8241c41841b046733dacfdb932bf1dc6a40fc2d74763e7a12b452dcfe409febdab4b5522ea291a6d82275186df72a619c7e142ac1a02 SHA512 dc96378d82a77766df7f40cf6a8cff17b43d04eabb0c90b2d230c48edc4b2a7a3c20c48260329d03f2d47dd697d7145e73f786ae274ab941996e769df11b955e
-EBUILD qtimageformats-6.6.1.ebuild 672 BLAKE2B 240e0f23aa147e03839d4533bd1cab09053baba9e40cc136b0f0db4f52fb850c5a5f7be89d72bcb0f55b1f2ce0df4e8b23cda6dbb680b2ee22f5f0be37d5234f SHA512 959ff72fd25d39851f0c5c4df8c225bb2fbad280a56f79435836613f70925ea739302b29b2d94339e1e1285c16fc4612c9ba8ab317e720832af3b4a799906460
+EBUILD qtimageformats-6.6.1.ebuild 678 BLAKE2B 758538b9892c4daeae03cb94e8c1dd758b0f0e6dd3593adfb96fcb8a46b5055ed63dda19db4b12b503405fa3dbaadbbe9497eeaf994ebd72100a026af300c689 SHA512 5f2b5841fb293f74a4e26e3fc11c8e04a90d4a074a0daf6e6085768c4a6ea57b49e8df4b5787d2cfd43fec339e0276482cb367acd23809cc8c39f7df315b8441
 EBUILD qtimageformats-6.6.9999.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a
 EBUILD qtimageformats-6.7.9999.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a
 EBUILD qtimageformats-6.9999.ebuild 635 BLAKE2B df95273018d1db06a2b72408fe4d411d0885fad219b8f995a4d7ad2e5e5289eb5a3962d7bed9ce770707552c015cdfa1d1d433527035cb6557660673a9e486fd SHA512 5e4b301d055ccf0966359f5c4d69eacd964ef22463ca4e9b1b1bc7d75295ae136a851f0b6897f288448f94900b1adb776e5c4a8879d103ee0982866559239a5a
diff --git a/dev-qt/qtimageformats/qtimageformats-6.6.1.ebuild b/dev-qt/qtimageformats/qtimageformats-6.6.1.ebuild
index 5be1f318cf6f..e0dfc42d99a7 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.6.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 0e14a0d1de26..ba6a04fb357d 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -5,7 +5,7 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.12.tar.xz 3830956 BLAKE2B c6fa2
 DIST qtmultimedia-everywhere-src-6.6.1.tar.xz 6723296 BLAKE2B 5257da8457f6fa16b7cb9ef9029b84edd6963dd084434918f1161398784d36c188c186b398d9877f337ac215c8dad665d902fbd56736f9032f52685f49ef3407 SHA512 11fb3e421a80fee82d30a817f20277505868de0c1a870c55dd488114a0302f6a1bf41694ed64d904e4d29b1a3ad1ba01ce8399ae11f03ae2f6994359698e9c94
 EBUILD qtmultimedia-5.15.11.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
 EBUILD qtmultimedia-5.15.12.ebuild 1517 BLAKE2B f58c9922692fdbcc42efab3ff9f7c02a1c6d77f809b4b828baf5765d6fe11301330b479ce1d1f610c1ca4bd8ddf91f717bee3307699d60beac354007a3b35e29 SHA512 eb2c7ff70d9efe5ad1753261e07f4c34f0f1736c39eb21c261ffb41627f87686355449a32d8df18418f1d2a1c66573049b79f7ee6731bc47e6483a671435a60a
-EBUILD qtmultimedia-6.6.1-r1.ebuild 2083 BLAKE2B b948e42f2415acce10c5a8d40aedc371d0ae8916596cc24de5df5c1f9126b4e26e9429f218f24de65b6b1cf72bd8b248d3177f0cfa725f4eac7a93546af9d1a8 SHA512 ecd10b83568c5803ae591fb72dbb0b7f2c8cb1126002b3c4d438febb4371f759f5f2920497cc5dc0b1446cd99fd40f90f89afccdfd80c54a66aed9cf43d1f6ac
+EBUILD qtmultimedia-6.6.1-r1.ebuild 2089 BLAKE2B f8b643c11f3b2dfa36720ddda4a901211b3a96e7af65a43f3afbb7f4cfc3243eda85930747cd4148a9eb4a0a53c79a591dab2c78111fc4a8a228b5d626c42423 SHA512 dfa01340ce67b0b16067042e17de4e382fb03ac83ab84099c0e17b57c1d281491048a6181875e1075413f33d438298c2b60aaf9fd4cde92b17bc6b80446759de
 EBUILD qtmultimedia-6.6.9999.ebuild 2073 BLAKE2B 14d2e0a1dd03b4bd962a9369d61290dfc31354a56609a3d871939d6dd5e273537d8d20f7e579b893cb3db5ae6be06bb3d5f922e12eec2f1640858fadf00d4c11 SHA512 79ac5c037a7e5d3d3c3cc5e1242a0b720fb6ee9b1a72979270f3255899b2a0415900e88ad4bee93439a852ab615cedad91ed9d9be3e8b4da987f6f8061505d7f
 EBUILD qtmultimedia-6.7.9999.ebuild 2073 BLAKE2B 14d2e0a1dd03b4bd962a9369d61290dfc31354a56609a3d871939d6dd5e273537d8d20f7e579b893cb3db5ae6be06bb3d5f922e12eec2f1640858fadf00d4c11 SHA512 79ac5c037a7e5d3d3c3cc5e1242a0b720fb6ee9b1a72979270f3255899b2a0415900e88ad4bee93439a852ab615cedad91ed9d9be3e8b4da987f6f8061505d7f
 EBUILD qtmultimedia-6.9999.ebuild 2073 BLAKE2B 14d2e0a1dd03b4bd962a9369d61290dfc31354a56609a3d871939d6dd5e273537d8d20f7e579b893cb3db5ae6be06bb3d5f922e12eec2f1640858fadf00d4c11 SHA512 79ac5c037a7e5d3d3c3cc5e1242a0b720fb6ee9b1a72979270f3255899b2a0415900e88ad4bee93439a852ab615cedad91ed9d9be3e8b4da987f6f8061505d7f
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild
index 50033d10ccd2..04dd435ce24a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 5be12275e6ad..9137ca0b8645 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -3,7 +3,7 @@ DIST qtlocation-everywhere-opensource-src-5.15.12.tar.xz 6553488 BLAKE2B e9cab8e
 DIST qtpositioning-everywhere-src-6.6.1.tar.xz 1513456 BLAKE2B 174aa45f9fbe120c0b1ff675447b42fa4cee1f50c4bf0ad6a01bbb181fd5de79ad091a353770862cf829ba7442ca9ae039fa985caa68835cea6a82608e158f35 SHA512 8114d9cec0e453ff51fdbe8b1a814c968e614e1f9aaf031bf00c0c48e732de728d925852789360411c594f63ae322404fc9403d0bc3a35500522d8dc403d79e2
 EBUILD qtpositioning-5.15.11.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
 EBUILD qtpositioning-5.15.12.ebuild 883 BLAKE2B d7f8c737a79e717f8677ade142899104d91d7f860db97ec162e1c9671e97120ee5dbd099237e5450dfd662f3ed28117e4794bffcc58ee555d6db8f946ff076fa SHA512 8dffbadfaa291bf49c93b7b14596af9a45284dddf98972938267560105aed5185908f27249ef6afc8f3c62e81d88b30d6a27985435ffa3b9b9dbd454495ebaf9
-EBUILD qtpositioning-6.6.1.ebuild 1486 BLAKE2B 91004cf41ae79b7e649c557257751433a6100ab517162f9a12f9bc0b2e1f4aa57debdf1d40519c3c3af382dec3c5f93d12b4ccb9f74db526ca366442ef223100 SHA512 5d342d7b45fd7fbce27af964cb4b123aeb26822c3781965de2489ed6203eb5911bd37ab049722828f33d73ffd935a05a80086bf842a7bd84817563a52ac40a8b
+EBUILD qtpositioning-6.6.1.ebuild 1492 BLAKE2B 7738b6a5c1f03a41f082eeb2626ae16c1f7f315142b678b5f5bdc403e54c4e17adfac6e6c75b3219c205c9a31e2eca529bb7d9b8e7031e8fecb180e468cd6481 SHA512 d4f9129796f4e87cb0d6bf0ca25333a75f6464eb51aa68161653ddb1b752b5a6e7ff4022dd70484b84e1247d110adaa0914e4a49d1e95b333ca0004fda0b7ead
 EBUILD qtpositioning-6.6.9999.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
 EBUILD qtpositioning-6.7.9999.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
 EBUILD qtpositioning-6.9999.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
diff --git a/dev-qt/qtpositioning/qtpositioning-6.6.1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.6.1.ebuild
index a80a35f8cfbd..ae54cdcda3ad 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.6.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Physical position determination library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="geoclue nmea +qml"
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 0cc6abc0bddb..aeb5205a7fe2 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -3,7 +3,7 @@ DIST qtquicktimeline-everywhere-opensource-src-5.15.12.tar.xz 105600 BLAKE2B f1d
 DIST qtquicktimeline-everywhere-src-6.6.1.tar.xz 113688 BLAKE2B 23ddc5e57335463def81d704e25abdaa87e59b157003a48d14dd70a20e476e66540d166f346b380131b3e0581cf119ac790f1c791de81103f1c51eba84e8df51 SHA512 c35c19d67ea0fcb3e052a35207a7e6a42a4c7b6784e2a33c7e9928735a56085f1cc3b4aeead428ccc9149bb74b7c70db1a94f6ab79101e6dd77dcffef937ba86
 EBUILD qtquicktimeline-5.15.11.ebuild 367 BLAKE2B 610cca42b4a262f7b3c1d9943187d179af7ba673232108dfd154d5c355af691f445f5eb39261ca5bd25d4788318beff0f58cb6042a4433a45d5e9d2108b30f75 SHA512 231e521de5b8274c074de45306b7f8a72085e7d4f10a7f9e6decf4d358fc82b991cb01c0163aaa96bc54b56ad0f7d2c0c2e71c24f51baea9c95809d0c40c3efa
 EBUILD qtquicktimeline-5.15.12.ebuild 367 BLAKE2B 177d100c4cd775817bc42b853190722920cf6453a773c12de253907fcf730af3e1b146b40e519619850162c1fd6a841b32ea99926276bf05f05d0f546b4edd13 SHA512 80c731f2b961d1191f8a3573748fafd23ed73bc93b5645e107d9c4138f07d8139b47484b15d1289b0c9546de46a5e4876e33cdd4e3a899d31d1de2ce65d7bb93
-EBUILD qtquicktimeline-6.6.1.ebuild 394 BLAKE2B cec51c57877408d02c193bd44032e1104dfacfaf23994d6f167d72a803af98aea5bbcc45c286a1e047e9f14a8391b2576e906ba7ef7114e28e70b41dcbde60a3 SHA512 69eb64545225f66e6f23818c7922a8577ce148da6d93c6a190a482fc90baa72dfcf65bc6fdc35aa4e6577c4f2b40ca76ab6e3d5a492633826f55073ba18df36f
+EBUILD qtquicktimeline-6.6.1.ebuild 400 BLAKE2B 47136f9b3f632ddfd5d2543f03d87dd572eb60bd599ab8b3febeb8559f28fe97da141f1b5373fc6c41412f3b76c5bbfc57da134c9829cadfa39eb3c279dc18e8 SHA512 4b3b6e7b65f57a69af7fa1cedbe9ceaf5fc2c2f1a8e6d0cd10b64d06fb4fe966f8c1223ceed1aab8687cdab0645084546b11f3f1432c2bcc1dd104226f5f817f
 EBUILD qtquicktimeline-6.6.9999.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09
 EBUILD qtquicktimeline-6.7.9999.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09
 EBUILD qtquicktimeline-6.9999.ebuild 352 BLAKE2B 7430d0ca1c9a88311fdfcea591396edc773ddfbdfae0b70bb076d688a166d1d503d7f49314a3c0fef65ae4897a744e8276d6de74f0bab7332e298b7b032fb4fd SHA512 338728e8809cccf99921dfced0f5bc5b18e8cd0b31259a2e65cbef923858ea242296ed95ea62def15f1d6ca593d90744496affab03f816b1febcd6799b171f09
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.6.1.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.6.1.ebuild
index 6178506223f9..976645c27948 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.6.1.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module for keyframe-based timeline construction"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 3b8e0abac0fd..df30e2b33b18 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -3,7 +3,7 @@ DIST qtserialport-everywhere-opensource-src-5.15.12.tar.xz 323500 BLAKE2B 313438
 DIST qtserialport-everywhere-src-6.6.1.tar.xz 279564 BLAKE2B cce7b21abf0dff0c346267f087850bb35ce026550c7d6a3411995c157a5577ba0a35b48fe701e3bf038bf95f00ba326d4712744b241967737b2bed55c8852530 SHA512 5841f6227725ed61a6e88f5359c0c75ff9192a66e916cc93a8028b03c2689dd10ea8f339a67cd0a26b55b44495880b3032ea1d5d99b716342912195a9b10516a
 EBUILD qtserialport-5.15.11.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df
 EBUILD qtserialport-5.15.12.ebuild 571 BLAKE2B ef342d4bbf1f5e9167fa472f4e72ff48a408de27e734c8a779a7c6d08c73471ff25fbadd71bc223d2f36d9ce7c0164d8e8bca3ffb2f376e5e6bcc90ac7500aa3 SHA512 9d40f1b3a1b8f9f8b48f93777afc3594f820e351a891ba4d5ae846df0dca4c247c620bb55876d062538ecf4b6f2e0d606ed887d1200845db1195d46c1b0f244e
-EBUILD qtserialport-6.6.1.ebuild 385 BLAKE2B 066f6213e084d6a5e7b75a312c21ed3e9105d2574bfb2f2f516adb22b85a313df751f4f2f21b432b081f01143bf5b4cb4f6915a0240c0689610c2b5ab200e716 SHA512 7e04eb98bdef0335b075c10edcfa4cc1f79ea7f2a659af2e4d4db769338f9feeb34eb506c74a9c1e3f8a8cba6d6ee35a92b048afedcd8d272758b25fe6ce420e
+EBUILD qtserialport-6.6.1.ebuild 391 BLAKE2B 8d8f9d1d54d0c84db795214287bd6840e08d0201e77360fce1094d547117b1470d0891e72f233e03d5b6c703090a0d0c561e134176c2a0a108c029a33d997e17 SHA512 508600b79d97acc62776c8f13a5829474a8a82011dfa0409f2b2ecb3b1cb6d92b8cbae041f00a9e92171853b5efcc5d951560f9f9db3e709a87326f91a934edf
 EBUILD qtserialport-6.6.9999.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
 EBUILD qtserialport-6.7.9999.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
 EBUILD qtserialport-6.9999.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
diff --git a/dev-qt/qtserialport/qtserialport-6.6.1.ebuild b/dev-qt/qtserialport/qtserialport-6.6.1.ebuild
index c922b13a8d83..55501d8695b0 100644
--- a/dev-qt/qtserialport/qtserialport-6.6.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Serial port abstraction library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 127971793e95..10da58c708e5 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -5,7 +5,7 @@ DIST qtsvg-everywhere-opensource-src-5.15.12.tar.xz 1890112 BLAKE2B 727ee7fc593b
 DIST qtsvg-everywhere-src-6.6.1.tar.xz 1651976 BLAKE2B 95dbe785afa34060d3527421e5a9a89e38b7ae8c7cac021b01152ba20e6bee5d4f046152fa282df4bf44cac64fbfda989a5a6decce03359379af3fd1f7c04e08 SHA512 46ca0e90a864678bbf46ac9618aacd1c2265eb336a798f6f09ab39cbfa7b16267b8d842f36b01c58d482a319bcd2172e7cbf09c08cd767a9e89d9b6d89b4a417
 EBUILD qtsvg-5.15.11.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069ec3917aca6c88c33345109bf127802e01fae1da95a5945fc7e44db8f3a2f3b7f6b699fcfbcc3367b082f2563 SHA512 b94101d98d128f952a0bdc6b14e04c76e492d6925e06d6c0d97d077f908196d944169a196a28e4aac384c261c93a6b5fa2dd94646c4186b392fd1ec57f885e15
 EBUILD qtsvg-5.15.12.ebuild 502 BLAKE2B 358b9357afa590a6ed6b39c3b7cc15646f2d4c7446b9b20289fed55ef393d14a3b6d940c6853e6fb29ff539c19733bfbdf79b2ed99f88e05c08ff236f01d17ee SHA512 2e928f12b9bb0510a7db953086e7ef99b560c62fde7a5c37654c9d309b8ac2d77395e9a88db5e9114e4c6832f9f0c70887451a57fd5a849e1431987d6130da7b
-EBUILD qtsvg-6.6.1.ebuild 386 BLAKE2B 00afaccfe459ccc36f3ea951e9ae266187d9811f20acf758c23c320ed3f6f109a9e89b28f2316c0cef9164efa8245ef5f3d1dc7525edfe747c2e198a2f09e88d SHA512 cb0cc1d94532fc3d0bcaa065ab26215f0072834553dbbec7eb8c53582ad01d86c16be0d36613d33d1ee5bb1b49470a5e3cb512d7e0bb9c3667fb38fe8a7d8a94
+EBUILD qtsvg-6.6.1.ebuild 392 BLAKE2B 6442140f8e750ef994761fcb340723c86a1ffc19d3e6fb63070f49a45e96bb7a819d63ecb96c82fa52fb8afa4ce56b61b06936ba8345235983bccb4f0ea2cd50 SHA512 32103fb4aca42f71e50d9571196d4a3857f8c7a8aed75db22cb2587b9ca374cd881dfa8b16c8864684af0fe97278dc5a31642424301d9e34e9d0d7a19f04a60d
 EBUILD qtsvg-6.6.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
 EBUILD qtsvg-6.7.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
 EBUILD qtsvg-6.9999.ebuild 344 BLAKE2B 3ee43ffd7160dd57f6799740fbb025516febcf1977d14c89fdba9f74aee784d0ce9b48f4215cdf307b42b15c48425d592beff37a03e30e86fdcb13768a0a3213 SHA512 05697ba3b4c95469017b81dbfd018a0ad35e913d791c9f5dafc87340b7215cda8e86884381aef1c237bfa2d7859b32277d460435277e16990eb4c80fb4505871
diff --git a/dev-qt/qtsvg/qtsvg-6.6.1.ebuild b/dev-qt/qtsvg/qtsvg-6.6.1.ebuild
index 5106e5533f24..f98534a89017 100644
--- a/dev-qt/qtsvg/qtsvg-6.6.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.6.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7b3b392be7de..a465c67fee4b 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index ea7c6e487485..59590b27246e 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,6 +1,8 @@
 DIST mesa-23.3.1.tar.xz 19337988 BLAKE2B 73696281868e5eba6493cc34786a6c30eaf256bed2495444be9a1a5ebf1a0d4b8f00bcc3fb91ce9de3ac8ff23663e41cab17b8fe42b1048366c8e9b95aefa905 SHA512 0861fb5083e37439ad8cc0a0d8372a7c84d8665ea298dc784e2dd893162e20ae072f5ef0b860be88ecf74bc123714acbc1dec312e139b892ff40ef1887c5f4a5
 DIST mesa-23.3.3.tar.xz 19379484 BLAKE2B 6b57e99356abccf398c5fb84953fc1490ddf516dbeed1feca8d16344a04c1c15183325752717447a34a61dd4cdda897147e3194f869d8dbadfa5c45a0c95dab5 SHA512 bed23e8324b026edd5d2b16a381ec563cf2fa9be9c8fbe8d9fb907cab9d87eef91f493fb9d4e3973d4b679e271d2a85ce48af491585638ab97f087532fc63c30
+DIST mesa-23.3.4.tar.xz 19415668 BLAKE2B 85687793853675a43da5135f41d0512cb4729f3dd824e2ad28d9bda129258adb00dd7da1e75e76cae71c1148e6a2ede84e1efda640c11aff233e5e12b0cea554 SHA512 026c424989a594dd840dc158ca09e0f57e604f0b1bd2a3981110b4b2b5a47c6cd9c7241c7f48957a781e2dd9f9760cc9db79b2fb7c7fe39b64eddb18dcf18412
 EBUILD intel_clc-23.3.1-r1.ebuild 2517 BLAKE2B 8cac945e2d7eef64a323e23370929f8405f343605efc9626c2cb0a93bba81e11292a251813e4b6046b8808183a803e4ccc6b291c4fbebd43e2db91257bdcea2c SHA512 2ecd6ed2217a414e7b2a6ca4c5d94b86fc388680a2ad3f76bca09fb6f217049330d550e3f1835415711157bfcdf29112da8f4058a87f9b7bc68ab603462e7d56
 EBUILD intel_clc-23.3.3.ebuild 2518 BLAKE2B e743dd64646d7ff479af1b9c71694e74a40eddcfc3f83400149e49d73c8af3cfba3dc67197b8bc2fb6c98b0f3604ce91ae7515c04d84ca8072bee9e5f1f5af5d SHA512 4ca6ab59227402ab4e2fc13cb340770efbfc77e66e22cea143b619370a473317cf73a59c298c9cd1d935de4c5f93bf55382418fcc51fb573c1e3de6c760c1f90
+EBUILD intel_clc-23.3.4.ebuild 2518 BLAKE2B e743dd64646d7ff479af1b9c71694e74a40eddcfc3f83400149e49d73c8af3cfba3dc67197b8bc2fb6c98b0f3604ce91ae7515c04d84ca8072bee9e5f1f5af5d SHA512 4ca6ab59227402ab4e2fc13cb340770efbfc77e66e22cea143b619370a473317cf73a59c298c9cd1d935de4c5f93bf55382418fcc51fb573c1e3de6c760c1f90
 EBUILD intel_clc-9999.ebuild 2518 BLAKE2B e743dd64646d7ff479af1b9c71694e74a40eddcfc3f83400149e49d73c8af3cfba3dc67197b8bc2fb6c98b0f3604ce91ae7515c04d84ca8072bee9e5f1f5af5d SHA512 4ca6ab59227402ab4e2fc13cb340770efbfc77e66e22cea143b619370a473317cf73a59c298c9cd1d935de4c5f93bf55382418fcc51fb573c1e3de6c760c1f90
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-23.3.4.ebuild b/dev-util/intel_clc/intel_clc-23.3.4.ebuild
new file mode 100644
index 000000000000..0df8ae0fd528
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-23.3.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17.
+# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15.
+LLVM_MAX_SLOT="17"
+LLVM_MIN_SLOT="15"
+PER_SLOT_DEPSTR="
+	(
+		dev-util/spirv-llvm-translator:@SLOT@
+		sys-devel/clang:@SLOT@
+		sys-devel/llvm:@SLOT@
+	)
+"
+LLVM_DEPSTR="
+	|| (
+		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
+			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
+		done)
+	)
+	<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=
+"
+RDEPEND="${RDEPEND}
+	${LLVM_DEPSTR}
+"
+unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
+
+llvm_check_deps() {
+	has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" &&
+	has_version "sys-devel/clang:${LLVM_SLOT}" &&
+	has_version "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 516eb18f0866..ec9b5a1f3e44 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 6a9c83f351b1..942685a47188 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,6 +1,4 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
-DIST feh-3.10.1.tar.bz2 2109459 BLAKE2B 1b63a49cf29f2c869ff99ce5bc92134943d7f0854b2c87c694ef3dce953687558330e453c67878b566b19e4b64212173119287d07291e9b81f47cba1d553549e SHA512 fed215f4c1e0c23fdf6454e07bb5a31d4bfe6473b5ac2240d85ce44fabfe5764b396e336154841f0d9e90fee78807ed10b7aa12b7dfcf53e520913cd41779421
 DIST feh-3.10.2.tar.bz2 2113183 BLAKE2B 0f4662068917628be6046d3f2ebd8177b7cc1699d693de31229d2ebc6188cc7a5170202188a426ec2e3d900f2c8fb34007395aecc151f8f034e5461d287f058f SHA512 698501347224887162631397bb3b6c5da81b88993876f001407dea87fdc4f458290272d75b400aea6c0927d3c53f290483b6a89cd2cb426f56957a4fe6267797
-EBUILD feh-3.10.1.ebuild 1542 BLAKE2B 9326445156d98511da76e97ac2b271613608bc9dc90f84743df0e2fbe3a2cf2417da149e0bbfb8fb50a4fb3fdbd6324681e6cdf2c5afbb37d18cade61a9bd609 SHA512 736fa888046c828d1b3e478df6497ff3402a251b2c51464d08cb87f1ef4b5a35420714b161d863313a5f6cd98485d5476b0b2de1b2d8448fd9379b50a832a341
 EBUILD feh-3.10.2.ebuild 1541 BLAKE2B 6bd62dbd6bc420ac828c1da5572483f63121a277e0462e54d9c89be01b8ea1d773923b4e947b45983a794bbbc81c6cab1da3efe44d425f3b0dcaec1a3a77c398 SHA512 b6790d6c01feebc5117039c4a077f566eb1b8c59ef51869e2693ab8a8fa0072947e95e83356015d6289fe698aae052a4e8925ab77dad39051679359464745541
 MISC metadata.xml 559 BLAKE2B 074f2a1c4a912ebf99cde3c7791ffccee8c19fe53e98794557d7807647d3c465e31fd95d855d7bfa43759d73c6deba365b24420624211355413bd13fe20bed1e SHA512 b811d6991505e777e858d88c26588d4e766a871895da586203565c7486d360d72d3514944caa483fe37c56211ea4a33a16313e1983a515aaf39b349935c73ddf
diff --git a/media-gfx/feh/feh-3.10.1.ebuild b/media-gfx/feh/feh-3.10.1.ebuild
deleted file mode 100644
index eaf83226e543..000000000000
--- a/media-gfx/feh/feh-3.10.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86"
-IUSE="debug curl exif test xinerama inotify"
-RESTRICT="test" # Tests are broken.
-
-COMMON_DEPEND="
-	media-libs/imlib2[X,text(+)]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/libjpeg-turbo:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-		inotify=$(use_feh inotify)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 357b0a7974c3..ad636ab17728 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index e5007e6b6f6e..27a96a9f1f8d 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -5,6 +5,6 @@ DIST harfbuzz-8.3.0.tar.xz 19002808 BLAKE2B 3749d2ff7955e135cf0d740bf6fe8b5c20a6
 EBUILD harfbuzz-8.2.0.ebuild 2705 BLAKE2B 4d83ad53365051b51e22f35f0e7a9176de13f82cca53f3b47c875a52acbe7c39e84cd00faf42c99c8551d571cc9c2f550789c73b041288e44fd9e061df749ef7 SHA512 f4a7d0001b5d79051b3e8c716ec134a9ddc8c1c9e020946fe7280775fc5097c6455f6ab210e6c0bb25ff7663ebe58d0be6f8b087a3b3193d0490619d6c291996
 EBUILD harfbuzz-8.2.1.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25
 EBUILD harfbuzz-8.2.2.ebuild 2709 BLAKE2B c83640fa4e7a16379e626ba20f3b7005aa2f89aa4cec7574e7906346a51131c827d157065672a7b081a283072d0e0a47ee0744dc3e16e20c6e19e0495b81d9d1 SHA512 d130eed03fcbf9b35145961615a941f4a918b76832760e7113c491a9221d3d9f9dff2cb5779670c54187e89fd60d0c0edc093313553c1e6aaa53e37d6753097a
-EBUILD harfbuzz-8.3.0.ebuild 2706 BLAKE2B 1662c84687cef1701825eb6bf8eca1c1f55d785754c248f4f75d06f21698c10282d3b696824300de600fdddc0bf2b7560633d3ed1e9bbe861e3725daff797d9f SHA512 0faf6f4e7a422b930c2c7ab19191b3789e610cadca138c3ed4f26c2853eaf3d64570c53e90554f3b7262103fe7140a42b99eda3be44f3b43bc14a5ebd411f3bf
+EBUILD harfbuzz-8.3.0.ebuild 2705 BLAKE2B c0f9db491cc91d193253c4e204f8c3979b27c3b132054a3ee7ffee6b31ee4ff452aafd3c70cb7a96662756950e7f824fe9cf60aef141c82f8fe48792069800ed SHA512 dbb493172e1e45a8ea0c22ffa6a1cebd05b30708f1a4c1445a499138e3ef897d4cfa79ddd4f11c363011a4d92bce89e8f04d491be95ed61dbfbdfd3fbf89ad30
 EBUILD harfbuzz-9999.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/harfbuzz-8.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.3.0.ebuild
index b9da305ade7a..420270b1ca1e 100644
--- a/media-libs/harfbuzz/harfbuzz-8.3.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-8.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2c2774e6bb4a..4c272559bf58 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,7 +3,9 @@ AUX 23.3.3-big-endian.patch 3392 BLAKE2B bd260b1776711c632e6e89d827b9b23b8e7b2d0
 AUX 23.3.3-symbols-check-Add-_GLOBAL_OFFSET_TABLE_.patch 896 BLAKE2B e271143147baa68c2d51a69a13888c2b4facc3d26d0d81e75ddfa7a8b37c99b900c043f334c795f199333876a0f97387bcc3ca53b6a93dad84ed8de25454b2d0 SHA512 580e9770f2d1d34d6358d171979fbc7c042d3b13da96cce4bba76e5a649c7758dfaf7bb314de4bd7879acef407151187c4b2a8c7b37ab7802b3cce22bd606316
 DIST mesa-23.3.1.tar.xz 19337988 BLAKE2B 73696281868e5eba6493cc34786a6c30eaf256bed2495444be9a1a5ebf1a0d4b8f00bcc3fb91ce9de3ac8ff23663e41cab17b8fe42b1048366c8e9b95aefa905 SHA512 0861fb5083e37439ad8cc0a0d8372a7c84d8665ea298dc784e2dd893162e20ae072f5ef0b860be88ecf74bc123714acbc1dec312e139b892ff40ef1887c5f4a5
 DIST mesa-23.3.3.tar.xz 19379484 BLAKE2B 6b57e99356abccf398c5fb84953fc1490ddf516dbeed1feca8d16344a04c1c15183325752717447a34a61dd4cdda897147e3194f869d8dbadfa5c45a0c95dab5 SHA512 bed23e8324b026edd5d2b16a381ec563cf2fa9be9c8fbe8d9fb907cab9d87eef91f493fb9d4e3973d4b679e271d2a85ce48af491585638ab97f087532fc63c30
+DIST mesa-23.3.4.tar.xz 19415668 BLAKE2B 85687793853675a43da5135f41d0512cb4729f3dd824e2ad28d9bda129258adb00dd7da1e75e76cae71c1148e6a2ede84e1efda640c11aff233e5e12b0cea554 SHA512 026c424989a594dd840dc158ca09e0f57e604f0b1bd2a3981110b4b2b5a47c6cd9c7241c7f48957a781e2dd9f9760cc9db79b2fb7c7fe39b64eddb18dcf18412
 EBUILD mesa-23.3.1.ebuild 12405 BLAKE2B 5de3b3e3351eace4405a8279aec2959848b733ac6ca38b5f462ea4ae991a8be4086ad5ec72d1931709d9872fcf0d308ec746285cbf7b2856b63346974142c9f2 SHA512 521fcc2630513b961e8225e468b4410f4cb473a463e7f83f0f86e924b57171ea588019e6ed24c32266c1d632aac8ec49bedaab11748903e7c717843121aa4a35
 EBUILD mesa-23.3.3.ebuild 12449 BLAKE2B 7ba9ccd4a2006cbaff89b5179cfa8ff03ca2947948d78164b7c56065e11ddf364b5811503b04ad294a0673662643e45f974d73ba2127640ce255d5af6aef1faa SHA512 eb15ad6e7d9a606e642460f8d5171a161f3650dea984ac3321089e5efe71a60ab5b8e2828229ec627377e9abae194ff691e8f83c18cacf3d3a53a3cecd9b581d
+EBUILD mesa-23.3.4.ebuild 12331 BLAKE2B cc6bec787020cbda9333823a94aeead4c0390492e4e10485e7bc823735a1e37098066b55f607c9688959936ac81337b2b5a8b1fafd3bb4bb73ccbb1c4b6af8f9 SHA512 71855871d00f4b07c7ccbf1f01d2ee1df3c49efff17460669da7d057ce7af62d761f815e6873a3d8a55859f0125c66e488be74d0d56f712fe4e1ab12f795e621
 EBUILD mesa-9999.ebuild 12207 BLAKE2B c3d278966e1a9cd1e6a09f774a8bf77a057c2b9463c7fe3a99aa119e22a1b18e0042dbe15676e00ae044f51b72ac7107fea0756c4a10b9173b182f118bf037d8 SHA512 7444562329a667725ef056296b1f4285ee46e4b3cd12b6184c4753010f8767252f80f47859a934462044fc0d7855534275f106c97d4d7e11e97e52af687dec16
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-23.3.4.ebuild b/media-libs/mesa/mesa-23.3.4.ebuild
new file mode 100644
index 000000000000..015ace3a31c5
--- /dev/null
+++ b/media-libs/mesa/mesa-23.3.4.ebuild
@@ -0,0 +1,448 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa zink +zstd"
+
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_intel
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_nouveau
+			video_cards_vmware
+		)
+	)
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	vdpau? ( X )
+	xa? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		dev-libs/libclc[spirv(-)]
+		>=dev-util/spirv-tools-1.3.231.0
+		virtual/libelf:0=
+	)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17.
+# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15.
+LLVM_MAX_SLOT="17"
+LLVM_MIN_SLOT="15"
+LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}"
+PER_SLOT_DEPSTR="
+	(
+		!opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] )
+		opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] )
+		opencl? ( dev-util/spirv-llvm-translator:@SLOT@ )
+	)
+"
+LLVM_DEPSTR="
+	|| (
+		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
+			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
+		done)
+	)
+	!opencl? ( <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
+	opencl? ( <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
+"
+RDEPEND="${RDEPEND}
+	llvm? ( ${LLVM_DEPSTR} )
+"
+unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( >=dev-util/directx-headers-1.610.0[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.30 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=dev-util/bindgen-0.58.0
+	)
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	vulkan? (
+		dev-util/glslang
+		llvm? (
+			video_cards_intel? (
+				amd64? (
+					$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+					~dev-util/intel_clc-${PV}
+					dev-libs/libclc[spirv(-)]
+				)
+			)
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib/libglapi.so.0.0.0
+	usr/lib/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1
+		has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	if use llvm && use vulkan && use video_cards_intel && use amd64; then
+		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die # bug #830728
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 && \
+		! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	if use llvm && use opencl; then
+		PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
+		emesonargs+=(
+			$(meson_native_true gallium-rusticl)
+			-Drust_std=2021
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	if use llvm && use vulkan && use video_cards_intel && use amd64; then
+		emesonargs+=(-Dintel-clc=system)
+	else
+		emesonargs+=(-Dintel-clc=disabled)
+	fi
+
+	# Workaround for bug #914905, can drop w/ > 23.3
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dexpat=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 8613c5cb9957..411959aec1ce 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index a2f490065bdf..36300b2a152f 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -11,7 +11,7 @@ DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c26800
 DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e SHA512 fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
 DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482 SHA512 db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
 EBUILD musescore-3.6.2-r1.ebuild 3058 BLAKE2B 5352d979ff5f5f7a704f589f747d8a04900976e8da82b62cd9d65de6feede64bd78d604f38264c1a3302b3084c9a00a14f542a0c3ecbfa08d5d07bf3e8b143fe SHA512 2f07e56fe6d81bc00590839d2d5a1f30bea863a5d36aa9c5ae159b8719f39abafe08edde4a43683c24c6bf67962a2dc67696921a0a7e5d458cbfdf10f6fdf525
-EBUILD musescore-4.0.2.ebuild 3238 BLAKE2B c2d958c37ecaaee685185cef2205839226e134da29219a7ce13bef26816777c44e07ac804b79225301e76466dfd7d840cd6e9ee886763d94b54e362e3575386e SHA512 8fb14f660f29a32b9b0b2cd287b0dad74859aa45ae4a46fc1bd37262d6979542250b5528eb6e7c766472f02d6014e7b6961ba67909528d2deb454bb25af2c3e3
-EBUILD musescore-4.2.1.ebuild 3240 BLAKE2B 5b2a759b7341b1c9ed5998c7dba5f04ba38b99f1bd5a31030b73ff51ece39aca42e2bae5593a80caea99461c80f096286f7b0afc9eab997fd125f5752c037807 SHA512 f1acda6bb62420068b419a97952aee00812d155a986e624bfcf354649031539bd252aa7d614ec33a70fd226b753829071cd400e34b79ba44a7a17f675853e1ec
-EBUILD musescore-9999.ebuild 3240 BLAKE2B 5b2a759b7341b1c9ed5998c7dba5f04ba38b99f1bd5a31030b73ff51ece39aca42e2bae5593a80caea99461c80f096286f7b0afc9eab997fd125f5752c037807 SHA512 f1acda6bb62420068b419a97952aee00812d155a986e624bfcf354649031539bd252aa7d614ec33a70fd226b753829071cd400e34b79ba44a7a17f675853e1ec
+EBUILD musescore-4.0.2-r1.ebuild 3228 BLAKE2B 8323a5e2cab3e7fecf38882501359d208b2f7e8a5492570174b8b8b9e01263d875892933dc1424d525d402aa554f8d683c01d43e54b6c4edb0650556a3c63bbd SHA512 f1a9ed6e0523609ca6418e93a7b38fc2e181c6241fb4618c974fba0fd0411e3f5fa85f00b97b7a795aa6055a4ce62ae521a585eba5e67a851794be0e1467c374
+EBUILD musescore-4.2.1-r1.ebuild 3230 BLAKE2B 69233dc9c270d6a0649688bc54e4a12329806c3949579d928902874300dde6054c0e41c53e03665dbf0904e68b4caad91d329eae480c9a2c66880b73c3c3148b SHA512 6e9756cc2b92f5699dd38be4fcd3f9ddeba61e47244edcd569d201df7a66fa17b4785df2f7e60cd382a026d85c66663275f204633f0e0832012ce03b67f30425
+EBUILD musescore-9999.ebuild 3230 BLAKE2B 69233dc9c270d6a0649688bc54e4a12329806c3949579d928902874300dde6054c0e41c53e03665dbf0904e68b4caad91d329eae480c9a2c66880b73c3c3148b SHA512 6e9756cc2b92f5699dd38be4fcd3f9ddeba61e47244edcd569d201df7a66fa17b4785df2f7e60cd382a026d85c66663275f204633f0e0832012ce03b67f30425
 MISC metadata.xml 1071 BLAKE2B be5b19a5f93c9a3c12a57de52873a0be0d1b32d000f28189746e3b529ccf35d1df29865ac68212ef4114fcb50b542a606565795fb811257b940ae86131a425fc SHA512 52db410ccfdd0bbfc4f6e67ee275b03b8247d29fe17994a396532622a22221f890c0f8e83cac7f6ef8a6b05022f4f18d4049496caa08b0ba61f5cbc23ec8798d
diff --git a/media-sound/musescore/musescore-4.0.2-r1.ebuild b/media-sound/musescore/musescore-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..306c6bf08537
--- /dev/null
+++ b/media-sound/musescore/musescore-4.0.2-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+VIRTUALX_REQUIRED="test"
+inherit cmake qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+else
+	SRC_URI="
+		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug jumbo-build test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/tinyxml2:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtnetworkauth:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5[widgets]
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+	dev-qt/qtsvg:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/alsa-lib-1.0.0
+	media-libs/flac:=
+	>=media-libs/freetype-2.5.2
+	media-libs/libopusenc
+	media-libs/libsndfile
+	media-libs/opus
+	media-sound/lame
+	sys-libs/zlib:=
+"
+# dev-cpp/gtest is required even when tests are disabled!
+DEPEND="
+	${RDEPEND}
+
+	dev-cpp/gtest
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-uncompressed-man-pages.patch"
+	"${FILESDIR}/${P}-unbundle-deps.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		unpack ${A}
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+
+	# Make sure we don't accidentally use bundled third party deps
+	# for which we want to use system packages instead.
+	rm -r thirdparty/{flac,freetype,googletest,lame,opus,opusenc} \
+		|| die "Failed to remove unused thirdparty directories"
+}
+
+src_configure() {
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local mycmakeargs=(
+		-DMUSESCORE_BUILD_CONFIG=release
+
+		-DBUILD_CRASHPAD_CLIENT=OFF
+		-DBUILD_AUTOUPDATE=OFF
+		# Jack support has been dropped in 4.0.0,
+		# but its remnants are still in the build system and cause trouble.
+		# https://github.com/musescore/MuseScore/issues/12775
+		-DBUILD_JACK=OFF
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DSOUNDFONT3=ON
+		-DBUILD_UNIT_TESTS="$(usex test)"
+		-DCMAKE_SKIP_RPATH=ON
+		-DTRY_USE_CCACHE=OFF
+		-DBUILD_UNITY="$(usex jumbo-build)"
+		-DUSE_SYSTEM_FREETYPE=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Hack to not install bundled libraries like libogg
+	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
diff --git a/media-sound/musescore/musescore-4.0.2.ebuild b/media-sound/musescore/musescore-4.0.2.ebuild
deleted file mode 100644
index 2d93d60af02b..000000000000
--- a/media-sound/musescore/musescore-4.0.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-#CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-VIRTUALX_REQUIRED="test"
-inherit cmake qmake-utils xdg check-reqs virtualx
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-else
-	SRC_URI="
-		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug jumbo-build test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/tinyxml2:=
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtnetworkauth:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/alsa-lib-1.0.0
-	media-libs/flac:=
-	>=media-libs/freetype-2.5.2
-	media-libs/libopusenc
-	media-libs/libsndfile
-	media-libs/opus
-	media-sound/lame
-	sys-libs/zlib:=
-"
-# dev-cpp/gtest is required even when tests are disabled!
-DEPEND="
-	${RDEPEND}
-
-	dev-cpp/gtest
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-uncompressed-man-pages.patch"
-	"${FILESDIR}/${P}-unbundle-deps.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-
-	# Make sure we don't accidentally use bundled third party deps
-	# for which we want to use system packages instead.
-	rm -r thirdparty/{flac,freetype,googletest,lame,opus,opusenc} \
-		|| die "Failed to remove unused thirdparty directories"
-}
-
-src_configure() {
-	# bug #766111
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local mycmakeargs=(
-		-DMUSESCORE_BUILD_CONFIG=release
-
-		-DBUILD_CRASHPAD_CLIENT=OFF
-		-DBUILD_AUTOUPDATE=OFF
-		# Jack support has been dropped in 4.0.0,
-		# but its remnants are still in the build system and cause trouble.
-		# https://github.com/musescore/MuseScore/issues/12775
-		-DBUILD_JACK=OFF
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DSOUNDFONT3=ON
-		-DBUILD_UNIT_TESTS="$(usex test)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DTRY_USE_CCACHE=OFF
-		-DBUILD_UNITY="$(usex jumbo-build)"
-		-DUSE_SYSTEM_FREETYPE=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Hack to not install bundled libraries like libogg
-	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
diff --git a/media-sound/musescore/musescore-4.2.1-r1.ebuild b/media-sound/musescore/musescore-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..cb7e3aaf3288
--- /dev/null
+++ b/media-sound/musescore/musescore-4.2.1-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD=3500M
+VIRTUALX_REQUIRED="test"
+inherit cmake qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
+else
+	SRC_URI="
+		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test video"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/tinyxml2:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtnetworkauth:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5[widgets]
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+	dev-qt/qtsvg:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/alsa-lib-1.0.0
+	media-libs/flac:=
+	>=media-libs/freetype-2.5.2
+	media-libs/libopusenc
+	media-libs/libsndfile
+	media-libs/opus
+	media-sound/lame
+	sys-libs/zlib:=
+	video? ( media-video/ffmpeg )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
+	"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
+	"${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
+	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_src_unpack
+		unpack ${A}
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+
+	# Make sure we don't accidentally use bundled third party deps
+	# for which we want to use system packages instead.
+	rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
+		|| die "Failed to remove unused thirdparty directories"
+}
+
+src_configure() {
+	# bug #766111
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
+		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_SKIP_RPATH=TRUE
+		-DMUE_BUILD_CRASHPAD_CLIENT=OFF
+		-DMUE_BUILD_UNIT_TESTS="$(usex test)"
+		-DMUE_BUILD_UPDATE_MODULE=OFF
+		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
+		-DMUE_COMPILE_USE_CCACHE=OFF
+		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+		-DMUE_DOWNLOAD_SOUNDFONT=OFF
+		-DMUSESCORE_BUILD_MODE=release
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build lrelease manpages
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Hack to not install bundled libraries
+	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
diff --git a/media-sound/musescore/musescore-4.2.1.ebuild b/media-sound/musescore/musescore-4.2.1.ebuild
deleted file mode 100644
index d6842c473993..000000000000
--- a/media-sound/musescore/musescore-4.2.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHECKREQS_DISK_BUILD=3500M
-VIRTUALX_REQUIRED="test"
-inherit cmake qmake-utils xdg check-reqs virtualx
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/musescore/MuseScore.git"
-else
-	SRC_URI="
-		https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test video"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/tinyxml2:=
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtnetworkauth:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/alsa-lib-1.0.0
-	media-libs/flac:=
-	>=media-libs/freetype-2.5.2
-	media-libs/libopusenc
-	media-libs/libsndfile
-	media-libs/opus
-	media-sound/lame
-	sys-libs/zlib:=
-	video? ( media-video/ffmpeg )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
-	"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
-	"${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
-	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-
-	# Make sure we don't accidentally use bundled third party deps
-	# for which we want to use system packages instead.
-	rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
-		|| die "Failed to remove unused thirdparty directories"
-}
-
-src_configure() {
-	# bug #766111
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
-		-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_SKIP_RPATH=TRUE
-		-DMUE_BUILD_CRASHPAD_CLIENT=OFF
-		-DMUE_BUILD_UNIT_TESTS="$(usex test)"
-		-DMUE_BUILD_UPDATE_MODULE=OFF
-		-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
-		-DMUE_COMPILE_USE_CCACHE=OFF
-		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
-		-DMUE_DOWNLOAD_SOUNDFONT=OFF
-		-DMUSESCORE_BUILD_MODE=release
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build lrelease manpages
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Hack to not install bundled libraries
-	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index d6842c473993..cb7e3aaf3288 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -35,7 +35,6 @@ BDEPEND="
 "
 RDEPEND="
 	dev-libs/tinyxml2:=
-	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -47,7 +46,7 @@ RDEPEND="
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5
+	dev-qt/qtquickcontrols2:5[widgets]
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
 	dev-qt/qtsvg:5
 	dev-qt/qtx11extras:5
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 56d4f749f552..6dc2f6622749 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 d572a3c3b1ed..433a59946a6f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jan 2024 22:09:59 +0000
+Thu, 25 Jan 2024 04:10:08 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3b99d94d8746..706ac7da9857 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 562804 BLAKE2B 118759e499ee06efcf469cd651c855c8e6025e7b662267a1b5da3bfe2ccef4c25c889a7a7567ac40f48ee9c0c76ce2d0b683994d7c8ea20d119f873560597ce6 SHA512 c0126932c2d8318cd86cdefffeb7cfd409d8e0d6bcc493ab0dcefe34d856d1802c7974fd3b803e43cbdf7049c64d457e8301dd8d89a6e659513c7d8786ec635a
-TIMESTAMP 2024-01-24T22:10:03Z
+TIMESTAMP 2024-01-25T04:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWxirtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWx3yRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCKrA/8DwKYBF1ZpNshuhfq3hFpH9Qca+Jlv/2PF7q3kHz34hbmzxkRg/O1Ixre
-301lbCNurTv9F41F80rlNc+C3o18z8wmP+HLAIUBqq2ZfDp02MAvRCkMYMEz+vXK
-DyohqbCcHZrqIn7lnEhBTkbkKhoQMR7r0ZeXaYhY1cnqiyLmgifoQFXzuzYc7lPl
-4xHD40KK/mjf/FuqIGP6zlB5anNvLrpEJieUZGyg2yjTuudKe0iFDuCK3so8hfjC
-cBFv0WbWxDNFOwds8d0BZpMSvebeb1UEM3VrdFwPVUlKDjV+v8F+jzcxN3LblH05
-Tu2S+3nfaJWw8K9LF9Q2S4kr21jjLJRteELG5XHDTTDTO5v2r4dAFVrHMAfw3SNh
-msRl2M7zjHmHCzeatykuEGEMQeL05KGEVWtLGfBJpQ3sRDT1gQ3iI6aO3xxDhu9K
-JH83eB8nh2nvFiCb3YQypvSEfX0SwpNWF3fQAT1IkMQ4+HK8h8ANIsP2Uj5Lprf+
-NaP0OUTiDDLP/NCpPBnQzjpF8LTt/i+DzL4nWX7PX0voo/PS+e41BH75ub1JFjD/
-m/n1m4zHyvQwBmZogWl7DQmEEwbY7uNfh2+np65EPrzsJl70wXp+eEncb5FVEnPT
-MGn8tVbCEJIUdW6xJJ5dRyhPvQld9qevtT0inPM/S80tUxNm6MQ=
-=5K2b
+klBdtw/+IjLBr6lSAm7jJAZ6B2l8CPu9yPwJJrSy8tOlP8U1pmePmjKvL2ye58VY
+NavUKlW0DBZdjcWhhwC079XLGhwFYZUZGwv9AMvmRclC60ENGV8GrAFT5vKIoFi/
+E7lgt/K5iGh4IdmPYCgP+5ckb7NgX0NovwsDIVvArLjB+H7bbueYNmycRbLQjmXX
+di5ay/uI9bMjcFn+9Y/ORVG2mF0Lsx0ciokbu1smk7xrU2LSXFaZhk8rRa0yswUs
+KGSHG/7K46l2bUQXPkr1xN+zR2Zk39ljz/msc0lMT6k6rRxR3GQyy8rbgh32sfT5
++PHWJ4ueYGmXM1vUBHQ7hpuDrnOYJVSB05YUwo1fQ1h3iPl49QpVunJu0+tGLzvV
+DrdLXS9T8oary5w3RNLxtgVgo1Lxtwadt1gxqpL2OTKvL0/xsTiOh1M16kuKL7C3
+3Z843l+/z2zX1rTbLxYSYjxFRlR17CCeuM/UHysM9iE2hFuE2mWFt+f3AxQobvms
+4583vBlecra31t4i4r1wL30Ao/3GEyQBcefhxe+YDU91QbDxatg/gCf3H8vN9CY4
+ydHoSDVDm+HJlQSDDzNCuY+o4wFizLCCJthNy8jPmqFNui9KxlyNgXy2w//ST7LW
+rtj08tePXjMzRi/ngeG1OSpItzSbIDyBG6l5T0R6+iXoJFNHvNU=
+=wypV
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d572a3c3b1ed..d0a67af14531 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jan 2024 22:09:59 +0000
+Thu, 25 Jan 2024 04:10:09 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 10a0d0d6ca67..4c552535e90d 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index de8afc080cb1..cdc43af353e2 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/lzlib-1.13-r2 b/metadata/md5-cache/app-arch/lzlib-1.13-r2
index e9b60eaa8857..c5e39ade9a4e 100644
--- a/metadata/md5-cache/app-arch/lzlib-1.13-r2
+++ b/metadata/md5-cache/app-arch/lzlib-1.13-r2
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/lzlib.html
 INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=libstdc++
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.13.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.13.tar.gz.sig )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=462b74525589e88a3bb49b14a0734844
+_md5_=491e1712b3298330d7adaaa2bd3b8b62
diff --git a/metadata/md5-cache/app-arch/tarlz-0.25 b/metadata/md5-cache/app-arch/tarlz-0.25
index 55415f18cd40..1224eaa071a9 100644
--- a/metadata/md5-cache/app-arch/tarlz-0.25
+++ b/metadata/md5-cache/app-arch/tarlz-0.25
@@ -5,10 +5,10 @@ DESCRIPTION=A parallel archiver combining tar and lzip
 EAPI=8
 HOMEPAGE=https://www.nongnu.org/lzip/tarlz.html
 INHERIT=toolchain-funcs unpacker
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=>=app-arch/lzlib-1.12
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-0.25.tar.lz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09
-_md5_=ca32fa7de7ca238529d35533c42eb3d6
+_md5_=aeaa5fdb7f43a3641ac179c6d1c6c485
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index a99f8a8ebcfe..1a364da6d2a0 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.7.0 b/metadata/md5-cache/app-cdr/xfburn-0.7.0
index 44efb28e11c4..687a53fbd16b 100644
--- a/metadata/md5-cache/app-cdr/xfburn-0.7.0
+++ b/metadata/md5-cache/app-cdr/xfburn-0.7.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/xfburn/start https://gitlab.xfce.org/apps/xfburn/
 INHERIT=xdg-utils
 IUSE=gstreamer +udev
-KEYWORDS=~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-3.20:3= >=xfce-base/exo-0.11.0:= >=xfce-base/libxfce4ui-4.12.0:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( dev-libs/libgudev:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfburn/0.7/xfburn-0.7.0.tar.bz2
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a6c7a46612b41a7f838d133a90dc6408
+_md5_=7fbc7811720e3d198391e98a64148dda
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index afe0bde15ccb..de65c215c978 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.13.1 b/metadata/md5-cache/app-portage/pycargoebuild-0.13.1
index 27c1313ecc47..8350ac671ca7 100644
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.13.1
+++ b/metadata/md5-cache/app-portage/pycargoebuild-0.13.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64
+KEYWORDS=amd64 ~arm64 ~loong ~ppc64
 LICENSE=MIT
 RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.13.1.tar.gz -> pycargoebuild-0.13.1.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6c506ded2b6b0afd47eaa340e4ae0e9e
+_md5_=4f7c32bb19e9fae11d1c0c5f0d76314e
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index bc5bfb0c1924..1c056989562c 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/poppler-23.12.0 b/metadata/md5-cache/app-text/poppler-23.12.0
index 6e95dd709dce..04fd19220218 100644
--- a/metadata/md5-cache/app-text/poppler-23.12.0
+++ b/metadata/md5-cache/app-text/poppler-23.12.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
 INHERIT=cmake flag-o-matic toolchain-funcs xdg-utils verify-sig
 IUSE=boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 ) gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) 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 ) qt6? ( dev-qt/qtbase:6[gui,xml] ) tiff? ( media-libs/tiff:= ) cjk? ( app-text/poppler-data )
 RESTRICT=!test? ( test )
 SLOT=0/133
 SRC_URI=https://poppler.freedesktop.org/poppler-23.12.0.tar.xz test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/e3cdc82782941a8d7b8112f83b4a81b3d334601a/test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 -> poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 ) verify-sig? ( https://poppler.freedesktop.org/poppler-23.12.0.tar.xz.sig )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9dd54cb3afad222ba31c72ac858629f1
+_md5_=34b961679cb1bf8905dbfc24764d722c
diff --git a/metadata/md5-cache/app-text/qpdf-11.7.0 b/metadata/md5-cache/app-text/qpdf-11.7.0
index b8bf6859c75d..ebf0d6505635 100644
--- a/metadata/md5-cache/app-text/qpdf-11.7.0
+++ b/metadata/md5-cache/app-text/qpdf-11.7.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://qpdf.sourceforge.io/ https://github.com/qpdf/qpdf/
 INHERIT=bash-completion-r1 cmake verify-sig
 IUSE=doc examples gnutls test verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= )
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/qpdf/qpdf/releases/download/v11.7.0/qpdf-11.7.0.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/v11.7.0/qpdf-11.7.0-doc.zip ) verify-sig? ( https://github.com/qpdf/qpdf/releases/download/v11.7.0/qpdf-11.7.0.tar.gz.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d700cc9c8615b97302104f1ae25cdcc8
+_md5_=586e39ba024ee3fc7e91a7121c29c982
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 4141be36d287..53254a8cf346 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/ispc-1.22.0-r1 b/metadata/md5-cache/dev-lang/ispc-1.22.0-r1
index f4d01d327234..8b4a7c494821 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.22.0-r1
+++ b/metadata/md5-cache/dev-lang/ispc-1.22.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://ispc.github.io/ https://github.com/ispc/ispc/
 INHERIT=cmake llvm multiprocessing python-any-r1 toolchain-funcs
 IUSE=examples gpu openmp test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=BSD BSD-2 UoI-NCSA
 RDEPEND=<sys-devel/clang-18:= sys-libs/ncurses:= gpu? ( dev-libs/level-zero:= ) !openmp? ( dev-cpp/tbb:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.22.0.tar.gz -> ispc-1.22.0.gh.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	llvm	203003e590307acca60eba586555388b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d4c257b7a983d85564158e9cad75324c
+_md5_=f74153f0d22d20d879d6af56e3996bd0
diff --git a/metadata/md5-cache/dev-lang/php-8.1.20-r2 b/metadata/md5-cache/dev-lang/php-8.1.20-r2
deleted file mode 100644
index 40dd7373c488..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.1.20-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic multilib systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.1
-SRC_URI=https://www.php.net/distributions/php-8.1.20.tar.xz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bedbea002d57cd023783de85b89a201e
diff --git a/metadata/md5-cache/dev-lang/php-8.1.27 b/metadata/md5-cache/dev-lang/php-8.1.27
new file mode 100644
index 000000000000..4c76814a7f63
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.1.27
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+INHERIT=flag-o-matic multilib systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.1
+SRC_URI=https://www.php.net/distributions/php-8.1.27.tar.xz
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=4d5aa0c2f3834c400a248855d908bea1
diff --git a/metadata/md5-cache/dev-lang/php-8.2.13-r2 b/metadata/md5-cache/dev-lang/php-8.2.13-r2
deleted file mode 100644
index 63eee43fa2ab..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.2.13-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic multilib systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar cdb cjk +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo ) test? ( cli )
-RESTRICT=!test? ( test )
-SLOT=8.2
-SRC_URI=https://www.php.net/distributions/php-8.2.13.tar.xz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f68bfce059b6ddc508abf6fd08454999
diff --git a/metadata/md5-cache/dev-lang/php-8.2.15 b/metadata/md5-cache/dev-lang/php-8.2.15
new file mode 100644
index 000000000000..e3356dc31dc9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.2.15
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+INHERIT=flag-o-matic multilib systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar cdb cjk +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo ) test? ( cli )
+RESTRICT=!test? ( test )
+SLOT=8.2
+SRC_URI=https://www.php.net/distributions/php-8.2.15.tar.xz
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=ad6254b7d2714e0f163ed322a93ae18b
diff --git a/metadata/md5-cache/dev-lang/php-8.3.0-r2 b/metadata/md5-cache/dev-lang/php-8.3.0-r2
deleted file mode 100644
index 56837fda7d6f..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.3.0-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-php[apache2?,fpm?] dev-libs/libpcre2[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) capstone? ( dev-libs/capstone ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) curl? ( net-misc/curl ) enchant? ( app-text/enchant:2 ) ffi? ( dev-libs/libffi:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( sys-libs/gdbm:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( app-text/aspell ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( media-libs/freetype ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) webp? ( media-libs/libwebp:0= ) xml? ( dev-libs/libxml2 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils sys-devel/bison
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=app-eselect/eselect-php[apache2?,fpm?]
-INHERIT=flag-o-matic multilib systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar capstone cdb cjk +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=app-eselect/eselect-php[apache2?,fpm?] dev-libs/libpcre2[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) capstone? ( dev-libs/capstone ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) curl? ( net-misc/curl ) enchant? ( app-text/enchant:2 ) ffi? ( dev-libs/libffi:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( sys-libs/gdbm:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( app-text/aspell ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( media-libs/freetype ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) webp? ( media-libs/libwebp:0= ) xml? ( dev-libs/libxml2 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo ) test? ( cli )
-RESTRICT=!test? ( test )
-SLOT=8.3
-SRC_URI=https://www.php.net/distributions/php-8.3.0.tar.xz
-_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=64af3679220c5fdacc6f3f3b116fbba7
diff --git a/metadata/md5-cache/dev-lang/php-8.3.2 b/metadata/md5-cache/dev-lang/php-8.3.2
new file mode 100644
index 000000000000..ef677c6577f9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.3.2
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 dev-build/automake || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-eselect/eselect-php[apache2?,fpm?] dev-libs/libpcre2[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) capstone? ( dev-libs/capstone ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) curl? ( net-misc/curl ) enchant? ( app-text/enchant:2 ) ffi? ( dev-libs/libffi:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( sys-libs/gdbm:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( app-text/aspell ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( media-libs/freetype ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) webp? ( media-libs/libwebp:0= ) xml? ( dev-libs/libxml2 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils sys-devel/bison
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+IDEPEND=app-eselect/eselect-php[apache2?,fpm?]
+INHERIT=flag-o-matic multilib systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar capstone cdb cjk +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=app-eselect/eselect-php[apache2?,fpm?] dev-libs/libpcre2[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) capstone? ( dev-libs/capstone ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) curl? ( net-misc/curl ) enchant? ( app-text/enchant:2 ) ffi? ( dev-libs/libffi:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( sys-libs/gdbm:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:=[-minimal(-)] ) spell? ( app-text/aspell ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( media-libs/freetype ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) webp? ( media-libs/libwebp:0= ) xml? ( dev-libs/libxml2 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo ) test? ( cli )
+RESTRICT=!test? ( test )
+SLOT=8.3
+SRC_URI=https://www.php.net/distributions/php-8.3.2.tar.xz
+_eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9f73117287ac164407ef5e6000c5ae6d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ae131849916e..192abb892759 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/ddt-1.7.1 b/metadata/md5-cache/dev-python/ddt-1.7.1
index 12b8b654e1cf..a7acd2508b82 100644
--- a/metadata/md5-cache/dev-python/ddt-1.7.1
+++ b/metadata/md5-cache/dev-python/ddt-1.7.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ddt/ https://github.com/datadriventests/ddt/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/datadriventests/ddt/archive/1.7.1.tar.gz -> ddt-1.7.1.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fce018935d22ecef7d9adaeafee809c0
+_md5_=ca2ae2eef9bbe2ca39e2589f0ab4f811
diff --git a/metadata/md5-cache/dev-python/libsass-0.23.0 b/metadata/md5-cache/dev-python/libsass-0.23.0
index 589c5d1e508d..23bd89e3b446 100644
--- a/metadata/md5-cache/dev-python/libsass-0.23.0
+++ b/metadata/md5-cache/dev-python/libsass-0.23.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sass/libsass-python/ https://pypi.org/project/libsass/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libsass-3.6.5 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sass/libsass-python/archive/0.23.0.tar.gz -> libsass-python-0.23.0.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9a6dc5bffee9a7733e50b99304f0069d
+_md5_=c72604a4fb66592040137516258b37b0
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.6 b/metadata/md5-cache/dev-python/miniupnpc-2.2.6
index 3a485cbab08a..fdec7e0c7a53 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.2.6
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://miniupnp.free.fr/ https://miniupnp.tuxfamily.org/ https://github.com/miniupnp/miniupnp/
 INHERIT=distutils-r1 verify-sig
 IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug verify-sig
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=net-libs/miniupnpc-2.2.6:0= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.6.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.6.tar.gz.sig )
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=6a6ad75da926a9ebf6346f42c926eb29
+_md5_=73fe7fb285cf4884df331aa5099e04ee
diff --git a/metadata/md5-cache/dev-python/pikepdf-8.11.2 b/metadata/md5-cache/dev-python/pikepdf-8.11.2
index 61a28b965b94..86ffb4f2aa03 100644
--- a/metadata/md5-cache/dev-python/pikepdf-8.11.2
+++ b/metadata/md5-cache/dev-python/pikepdf-8.11.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=app-text/qpdf-11.7.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-8.11.2.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=264336dbe850cc9e22b178e59c0a0b58
+_md5_=40b5d4bacc94132ef32d62a782a7eba1
diff --git a/metadata/md5-cache/dev-python/psycopg-3.1.17 b/metadata/md5-cache/dev-python/psycopg-3.1.17
index c87caacdca28..c5b5022ae896 100644
--- a/metadata/md5-cache/dev-python/psycopg-3.1.17
+++ b/metadata/md5-cache/dev-python/psycopg-3.1.17
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.psycopg.org/psycopg3/ https://github.com/psycopg/psycopg/ https://pypi.org/project/psycopg/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-db/postgresql-8.1:* >=dev-python/typing-extensions-4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psycopg/psycopg/archive/3.1.17.tar.gz -> psycopg-3.1.17.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=25e3399bbd9941a078f2de21957ae1a0
+_md5_=ff26b243966b5bcd80dada7d9a4e21c6
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.46.1 b/metadata/md5-cache/dev-python/pyatspi-2.46.1
index 5768ce34b027..0faf76650c85 100644
--- a/metadata/md5-cache/dev-python/pyatspi-2.46.1
+++ b/metadata/md5-cache/dev-python/pyatspi-2.46.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://wiki.gnome.org/Accessibility
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2 python-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2 GPL-2+
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pygobject-2.90.1:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.34[introspection]
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pyatspi/2.46/pyatspi-2.46.1.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	a75a1807753f5996e53291942e7b85d7	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=93762ddc12336605fdcd189ca70f1fa3
+_md5_=4032a8946365d2bb519da5aad1ae56f8
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.19.1-r2 b/metadata/md5-cache/dev-python/pycryptodome-3.19.1-r2
index f5fb98777a32..ec4121300ab4 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.19.1-r2
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.19.1-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.pycryptodome.org/ https://github.com/Legrandin/pycryptodome/ https://pypi.org/project/pycryptodome/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2 Unlicense
 RDEPEND=dev-libs/gmp:= >=dev-libs/libtomcrypt-1.18.2-r1:= python_targets_python3_10? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.19.1.tar.gz -> pycryptodome-3.19.1.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=50bbe73d975d081c000da7d722f0c85e
+_md5_=53fcc655ca69990700689b9321649074
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.12 b/metadata/md5-cache/dev-python/pygraphviz-1.12
index 1f5fb62395f5..13996f1de97e 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.12
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.12
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pygraphviz.github.io/ https://github.com/pygraphviz/pygraphviz/ https://pypi.org/project/pygraphviz/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=media-gfx/graphviz python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pygraphviz/pygraphviz-1.12.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=996dcadfe5757a6c40c191bade71ee82
+_md5_=fd4ffec63e889b2dc7907cf24c48a2da
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.2 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.2
index 0d6b3278c34f..c265815c14d3 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.2
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.2.tar.gz -> python-xmp-toolkit-2.0.2.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b6e377d14e78d25cf5d2992d121bb360
+_md5_=f060adbd341ad05dad91352e4b2a7b05
diff --git a/metadata/md5-cache/dev-python/pythran-0.15.0 b/metadata/md5-cache/dev-python/pythran-0.15.0
index 8988396a2999..dcfac26b18b2 100644
--- a/metadata/md5-cache/dev-python/pythran-0.15.0
+++ b/metadata/md5-cache/dev-python/pythran-0.15.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pythran/ https://github.com/serge-sans-paille/pythran/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost =dev-python/beniget-0.4*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] =dev-python/gast-0.5*[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ply-3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.15.0.tar.gz -> pythran-0.15.0.gh.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=657a6eea7d8fd79cc0bae645cbc67f47
+_md5_=e97eaf3b424255a70cf43947f05ab5e6
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.51 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.51
index c038eef1691b..3c8ac795f5a8 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.51
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.51
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
 INHERIT=distutils-r1 optfeature pypi
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:=[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) python_targets_python3_11? ( dev-lang/python:3.11[sqlite?] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.4.51.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=73b37b7ad82cb372b42ffe6cfdb79318
+_md5_=432a6d7940922121c34228e0db53c32e
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-1.4.2 b/metadata/md5-cache/dev-python/ytmusicapi-1.4.2
index c8becd3a545f..2f9d78ae78d5 100644
--- a/metadata/md5-cache/dev-python/ytmusicapi-1.4.2
+++ b/metadata/md5-cache/dev-python/ytmusicapi-1.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ytmusicapi.readthedocs.io/ https://github.com/sigma67/ytmusicapi/
 INHERIT=distutils-r1 pypi
 IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmusicapi/ytmusicapi-1.4.2.tar.gz
 _eclasses_=distutils-r1	b9318b5e40104e608d7e4582121fb561	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6a04018a1c05c3e3bb80372f9d1a248b
+_md5_=bb92aeab2595e864105f279a571dcb46
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index d8e19fa845fb..df75e05cd344 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.6.1 b/metadata/md5-cache/dev-qt/qt5compat-6.6.1
index 8366e3160da7..b8a197e3f576 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.6.1
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=icu qml test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.6.1:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml? ( ~dev-qt/qtdeclarative-6.6.1:6 ~dev-qt/qtshadertools-6.6.1:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.6.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qt5compat-everywhere-src-6.6.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	e3f3520badc72688b3084193369aa4b1	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=73999bc5ce5b5fa7a82ac495af4bfcb9
+_md5_=4c3a9257a560cc7c30f009481fb9d69f
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.6.1 b/metadata/md5-cache/dev-qt/qtimageformats-6.6.1
index 2525f6b532ea..8ad0e1c80087 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.6.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=mng test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.6.1:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.6.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtimageformats-everywhere-src-6.6.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	e3f3520badc72688b3084193369aa4b1	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dbc30138c80e0f0cd53568cc49c5f3a4
+_md5_=caba6122a588e516d5217988b0515b11
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.6.1-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-6.6.1-r1
index f09bfa281bee..3f898dbf735c 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.6.1-r1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.6.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=flag-o-matic qt6-build
 IUSE=+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.6.1:6[gui,network,opengl=,vulkan=,widgets] alsa? ( media-libs/alsa-lib ) ffmpeg? ( ~dev-qt/qtbase-6.6.1:6[X=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) ) gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0[X=,opengl?] media-libs/gstreamer:1.0 ) opengl? ( media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-6.6.1:6 ~dev-qt/qtquick3d-6.6.1:6 )
 REQUIRED_USE=|| ( ffmpeg gstreamer ) vaapi? ( ffmpeg opengl ) test? ( qml )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=6/6.6.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtmultimedia-everywhere-src-6.6.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	e3f3520badc72688b3084193369aa4b1	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=705e5a16f9c0b7a21e59ae164c638c82
+_md5_=4766ca81424a5c542cbf8343b45720e1
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.6.1 b/metadata/md5-cache/dev-qt/qtpositioning-6.6.1
index 7d151765ac2d..34492fe85f8d 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.6.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=geoclue nmea +qml test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.6.1:6 geoclue? ( ~dev-qt/qtbase-6.6.1:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.6.1:6[network] ~dev-qt/qtserialport-6.6.1:6 ) qml? ( ~dev-qt/qtdeclarative-6.6.1:6 ) geoclue? ( app-misc/geoclue:2.0 )
 RESTRICT=!test? ( test )
 SLOT=6/6.6.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtpositioning-everywhere-src-6.6.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	e3f3520badc72688b3084193369aa4b1	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=af70335aa42eb8b41b542682ce7c8cc9
+_md5_=443a14e7d95ed0d88ef71f85a2e605e3
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.6.1 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.6.1
index de1f3016dc19..1733a86ce79a 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.6.1
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.6.1:6 ~dev-qt/qtdeclarative-6.6.1:6
 RESTRICT=!test? ( test )
 SLOT=6/6.6.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtquicktimeline-everywhere-src-6.6.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	e3f3520badc72688b3084193369aa4b1	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=447a65a6af3fbebf431a03f34d042627
+_md5_=b9a4416af7df7a07abb7053129f694d3
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.6.1 b/metadata/md5-cache/dev-qt/qtserialport-6.6.1
index fd002d4a6b0b..1e8e3e51d21b 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.6.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.6.1:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6.6.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtserialport-everywhere-src-6.6.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	e3f3520badc72688b3084193369aa4b1	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c6fcfc588cdc0988caeb25daf13f42fa
+_md5_=96fab5909a3ff6cef22a73561ad090bb
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.6.1 b/metadata/md5-cache/dev-qt/qtsvg-6.6.1
index 9baf48bba892..c889fc87aeb4 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.6.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtbase-6.6.1:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.6.1
 SRC_URI=https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtsvg-everywhere-src-6.6.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qt6-build	e3f3520badc72688b3084193369aa4b1	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6309a0157553dd425dec9ee07f2fd4f9
+_md5_=4b1ce60705e147f82152f4028d762a64
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index f4f24a8af9b2..bb80bfa81d3c 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/intel_clc-23.3.4 b/metadata/md5-cache/dev-util/intel_clc-23.3.4
new file mode 100644
index 000000000000..95fc5c1a09aa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel_clc-23.3.4
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) virtual/pkgconfig >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=dev-libs/libclc dev-util/spirv-tools >=sys-libs/zlib-1.2.8:= x11-libs/libdrm dev-libs/expat !!sys-devel/llvm:0
+DESCRIPTION=intel_clc tool used for building OpenCL C to SPIR-V
+EAPI=8
+HOMEPAGE=https://mesa3d.org/
+INHERIT=llvm meson python-any-r1
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT SGI-B-2.0
+RDEPEND=dev-libs/libclc dev-util/spirv-tools >=sys-libs/zlib-1.2.8:= x11-libs/libdrm || ( ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17 sys-devel/llvm:17 ) ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16 sys-devel/llvm:16 ) ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15 sys-devel/llvm:15 ) ) <sys-devel/clang-18:= <sys-devel/llvm-18:=
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-23.3.4.tar.xz
+_eclasses_=llvm	203003e590307acca60eba586555388b	meson	e322276188f86eacb29ae081ba5485c8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f862fa01c0d814f543687bf8275c5a96
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index afcdaf73b4f1..744ef0ae64bb 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/feh-3.10.1 b/metadata/md5-cache/media-gfx/feh-3.10.1
deleted file mode 100644
index 54c1475efcaa..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-libs/imlib2[X,text(+)] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=8
-HOMEPAGE=https://feh.finalrewind.org/
-INHERIT=toolchain-funcs xdg-utils
-IUSE=debug curl exif test xinerama inotify
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X,text(+)] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) media-libs/libjpeg-turbo:0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.10.1.tar.bz2
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0ac7d532b78c36711f542c5b8841bebe
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7c6bf3ab2e36..dc2962f7628b 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/harfbuzz-8.3.0 b/metadata/md5-cache/media-libs/harfbuzz-8.3.0
index 69f337b4e829..52b92db951ab 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-8.3.0
+++ b/metadata/md5-cache/media-libs/harfbuzz-8.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype 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 ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6.0.0
 SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/8.3.0/harfbuzz-8.3.0.tar.xz
 _eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	meson	e322276188f86eacb29ae081ba5485c8	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=20f061c62ee02780772e3a283466a4c2
+_md5_=9ab396df3e872a49dcce7f3970b2ce53
diff --git a/metadata/md5-cache/media-libs/mesa-23.3.4 b/metadata/md5-cache/media-libs/mesa-23.3.4
new file mode 100644
index 000000000000..c149b8819697
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-23.3.4
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang llvm? ( video_cards_intel? ( amd64? ( || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ~dev-util/intel_clc-23.3.4 dev-libs/libclc[spirv(-)] ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.1 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,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/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( || ( ( !opencl? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:17 ) ) ( !opencl? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:16 ) ) ( !opencl? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:15 ) ) ) !opencl? ( <sys-devel/llvm-18:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( <sys-devel/clang-18:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_d3d12? ( >=dev-util/directx-headers-1.610.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.30 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=8
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+INHERIT=flag-o-matic llvm meson-multilib python-any-r1 linux-info
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=MIT SGI-B-2.0
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,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/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( || ( ( !opencl? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:17 ) ) ( !opencl? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:16 ) ) ( !opencl? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:15 ) ) ) !opencl? ( <sys-devel/llvm-18:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( <sys-devel/clang-18:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) vdpau? ( X ) xa? ( X ) zink? ( vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-23.3.4.tar.xz
+_eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	203003e590307acca60eba586555388b	meson	e322276188f86eacb29ae081ba5485c8	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5ce18db5d03b1fa89f85ddc828cb00e2
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 1a729d66567c..36b9f1de7de6 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/musescore-4.0.2 b/metadata/md5-cache/media-sound/musescore-4.0.2
deleted file mode 100644
index 37156dcb2475..000000000000
--- a/metadata/md5-cache/media-sound/musescore-4.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-libs/tinyxml2:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= dev-cpp/gtest
-DESCRIPTION=WYSIWYG Music Score Typesetter
-EAPI=8
-HOMEPAGE=https://musescore.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake qmake-utils xdg check-reqs virtualx
-IUSE=debug jumbo-build test test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/tinyxml2:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:=
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/musescore/MuseScore/archive/v4.0.2.tar.gz -> musescore-4.0.2.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9e7bf4f85d951e9f3f1a5e437012222e
diff --git a/metadata/md5-cache/media-sound/musescore-4.0.2-r1 b/metadata/md5-cache/media-sound/musescore-4.0.2-r1
new file mode 100644
index 000000000000..ee2c1a746ce5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/musescore-4.0.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=dev-libs/tinyxml2:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5[widgets] >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= dev-cpp/gtest
+DESCRIPTION=WYSIWYG Music Score Typesetter
+EAPI=8
+HOMEPAGE=https://musescore.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake qmake-utils xdg check-reqs virtualx
+IUSE=debug jumbo-build test test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/tinyxml2:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5[widgets] >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/musescore/MuseScore/archive/v4.0.2.tar.gz -> musescore-4.0.2.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d8bb0b6754aa4e8f6ca6fa35bd337300
diff --git a/metadata/md5-cache/media-sound/musescore-4.2.1 b/metadata/md5-cache/media-sound/musescore-4.2.1
deleted file mode 100644
index cefcc4253f6e..000000000000
--- a/metadata/md5-cache/media-sound/musescore-4.2.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-libs/tinyxml2:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= video? ( media-video/ffmpeg ) test? ( dev-cpp/gtest )
-DESCRIPTION=WYSIWYG Music Score Typesetter
-EAPI=8
-HOMEPAGE=https://musescore.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake qmake-utils xdg check-reqs virtualx
-IUSE=test video test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/tinyxml2:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= video? ( media-video/ffmpeg )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/musescore/MuseScore/archive/v4.2.1.tar.gz -> musescore-4.2.1.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dac2f36e07c042091be19f15dbefeca6
diff --git a/metadata/md5-cache/media-sound/musescore-4.2.1-r1 b/metadata/md5-cache/media-sound/musescore-4.2.1-r1
new file mode 100644
index 000000000000..59796d06238f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/musescore-4.2.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=dev-libs/tinyxml2:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5[widgets] >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= video? ( media-video/ffmpeg ) test? ( dev-cpp/gtest )
+DESCRIPTION=WYSIWYG Music Score Typesetter
+EAPI=8
+HOMEPAGE=https://musescore.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake qmake-utils xdg check-reqs virtualx
+IUSE=test video test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/tinyxml2:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5[widgets] >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= video? ( media-video/ffmpeg )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/musescore/MuseScore/archive/v4.2.1.tar.gz -> musescore-4.2.1.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=247951aacac3b8a554b9f4b623df2bcd
diff --git a/metadata/md5-cache/media-sound/musescore-9999 b/metadata/md5-cache/media-sound/musescore-9999
index 8f69c4f4dc87..bf990c24148d 100644
--- a/metadata/md5-cache/media-sound/musescore-9999
+++ b/metadata/md5-cache/media-sound/musescore-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-libs/tinyxml2:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= video? ( media-video/ffmpeg ) test? ( dev-cpp/gtest )
+DEPEND=dev-libs/tinyxml2:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5[widgets] >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= video? ( media-video/ffmpeg ) test? ( dev-cpp/gtest )
 DESCRIPTION=WYSIWYG Music Score Typesetter
 EAPI=8
 HOMEPAGE=https://musescore.org/
@@ -9,9 +9,9 @@ INHERIT=cmake qmake-utils xdg check-reqs virtualx git-r3
 IUSE=test video test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/tinyxml2:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= video? ( media-video/ffmpeg )
+RDEPEND=dev-libs/tinyxml2:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5[widgets] >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/alsa-lib-1.0.0 media-libs/flac:= >=media-libs/freetype-2.5.2 media-libs/libopusenc media-libs/libsndfile media-libs/opus media-sound/lame sys-libs/zlib:= video? ( media-video/ffmpeg )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dac2f36e07c042091be19f15dbefeca6
+_md5_=247951aacac3b8a554b9f4b623df2bcd
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 18113a1b9350..203b958d84ee 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/c-ares-1.25.0-r1 b/metadata/md5-cache/net-dns/c-ares-1.25.0-r1
index ed07d701d8d6..5c9a84c25bb9 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.25.0-r1
+++ b/metadata/md5-cache/net-dns/c-ares-1.25.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://c-ares.org/
 INHERIT=edo multilib-minimal verify-sig
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT ISC
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://c-ares.org/download/c-ares-1.25.0.tar.gz verify-sig? ( https://c-ares.org/download/c-ares-1.25.0.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=4994e13376c8c865b050878e33533760
+_md5_=047e5600df461fdddf68af1e7c4079e7
diff --git a/metadata/md5-cache/net-dns/libidn2-2.3.4-r2 b/metadata/md5-cache/net-dns/libidn2-2.3.4-r2
index df0e3850176a..6139d5e5c26e 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.3.4-r2
+++ b/metadata/md5-cache/net-dns/libidn2-2.3.4-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2/
 INHERIT=flag-o-matic multilib-minimal toolchain-funcs verify-sig
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( GPL-2+ LGPL-3+ ) GPL-3+ unicode
 RDEPEND=dev-libs/libunistring:=[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/2
 SRC_URI=mirror://gnu/libidn/libidn2-2.3.4.tar.gz verify-sig? ( mirror://gnu/libidn/libidn2-2.3.4.tar.gz.sig )
 _eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=66fd2d68ada3188f2923a2e0011a9521
+_md5_=31db7a7dc6a77692e5ebb17e2edc37bf
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b011dd35e999..12b13c313ab2 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.6 b/metadata/md5-cache/net-libs/miniupnpc-2.2.6
index 80000f6d4fb4..88cf9397c5ff 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.6
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.6
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=http://miniupnp.free.fr/ https://miniupnp.tuxfamily.org/ https://github.com/miniupnp/miniupnp/
 INHERIT=toolchain-funcs verify-sig
 IUSE=ipv6 verify-sig
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.6.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.6.tar.gz.sig )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=18f46a86e75583118452236984ea4bcd
+_md5_=f57cd976bbd4dd8a71df9a41163cc010
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index bd7721ab2b66..0b30cfd57c13 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/chrony-4.5 b/metadata/md5-cache/net-misc/chrony-4.5
index a9a86b5e5cf8..d554a579e03b 100644
--- a/metadata/md5-cache/net-misc/chrony-4.5
+++ b/metadata/md5-cache/net-misc/chrony-4.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://chrony-project.org/
 INHERIT=edo systemd tmpfiles toolchain-funcs verify-sig
 IUSE=+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libtomcrypt? ( dev-libs/libtomcrypt:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) readline? ( dev-libs/libedit ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) )
 SLOT=0
 SRC_URI=https://chrony-project.org/releases/chrony-4.5.tar.gz verify-sig? ( https://chrony-project.org/releases/chrony-4.5-tar-gz-asc.txt -> chrony-4.5.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=43c6ffa07088e2b0f6b62e9463928f10
+_md5_=8872a049cf77c2c26d25ae99743bf759
diff --git a/metadata/md5-cache/net-misc/curl-8.5.0 b/metadata/md5-cache/net-misc/curl-8.5.0
index f33bd6b2e274..79dcd9d60983 100644
--- a/metadata/md5-cache/net-misc/curl-8.5.0
+++ b/metadata/md5-cache/net-misc/curl-8.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://curl.se/
 INHERIT=autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
 IUSE=+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls 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=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD curl ISC test? ( BSD-4 )
 RDEPEND=>=sys-libs/zlib-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http2? ( >=net-libs/nghttp2-1.12.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(-)?] ) idn? ( net-dns/libidn2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( >=net-libs/nghttp3-0.15.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(-)?] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh2-1.0.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(-)?] ) ssl? ( gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-3.1.10:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( app-misc/ca-certificates net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rustls? ( net-libs/rustls-ffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_openssl curl_ssl_rustls ) ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) nghttp3? ( !openssl alt-svc )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-8.5.0.tar.xz verify-sig? ( https://curl.se/download/curl-8.5.0.tar.xz.asc )
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=11233f9ed4c9ba5f05f65c44a75658a3
+_md5_=b741de7c8fb621d60fbd29352d23cf9f
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 38789b003732..eab28091c62e 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-2.4.7-r2 b/metadata/md5-cache/net-print/cups-2.4.7-r2
index 8729d1bf406d..2d90f6342ead 100644
--- a/metadata/md5-cache/net-print/cups-2.4.7-r2
+++ b/metadata/md5-cache/net-print/cups-2.4.7-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
 IUSE=acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd 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 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.7/cups-2.4.7-source.tar.gz
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=489c40719e31567fc46b891079f093a4
+_md5_=32a294fec6fbc58bbabf39062c613893
diff --git a/metadata/md5-cache/net-print/cups-browsed-2.0.0 b/metadata/md5-cache/net-print/cups-browsed-2.0.0
index 5ac47ad51d10..eb6fc0fde22e 100644
--- a/metadata/md5-cache/net-print/cups-browsed-2.0.0
+++ b/metadata/md5-cache/net-print/cups-browsed-2.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/OpenPrinting/cups-browsed
 INHERIT=systemd
 IUSE=ldap test zeroconf
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/glib:2 >=net-print/cups-2 >=net-print/cups-filters-2.0.0 ldap? ( net-nds/openldap:= ) test? ( net-print/cups[zeroconf] ) zeroconf? ( net-dns/avahi[dbus] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups-browsed/releases/download/2.0.0/cups-browsed-2.0.0.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=56314705c11029980698a2df7e3fbbd3
+_md5_=a4092c65931d3633bf310ffdac059e3e
diff --git a/metadata/md5-cache/net-print/cups-filters-2.0.0 b/metadata/md5-cache/net-print/cups-filters-2.0.0
index cbeab51bd8df..0988f0ed1a50 100644
--- a/metadata/md5-cache/net-print/cups-filters-2.0.0
+++ b/metadata/md5-cache/net-print/cups-filters-2.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Cups filters
 EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=+foomatic
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=net-print/libcupsfilters net-print/libppd >=net-print/cups-1.7.3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups-filters/releases/download/2.0.0/cups-filters-2.0.0.tar.xz
-_md5_=c9fc898c8b8ba25f36d0e682fbf73c57
+_md5_=f58f54bd2071433b420a5b585997d12e
diff --git a/metadata/md5-cache/net-print/cups-meta-1 b/metadata/md5-cache/net-print/cups-meta-1
index 810005eb3e9c..13608643a5ce 100644
--- a/metadata/md5-cache/net-print/cups-meta-1
+++ b/metadata/md5-cache/net-print/cups-meta-1
@@ -3,8 +3,8 @@ DESCRIPTION=Metapackage for a fully configured cups printer setup
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=+browsed +foomatic pdf +postscript +poppler zeroconf
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=metapackage
 RDEPEND=net-print/cups[zeroconf?] net-print/libppd[postscript?,poppler?] net-print/libcupsfilters[pdf?,poppler?] net-print/cups-filters[foomatic?] browsed? ( net-print/cups-browsed ) pdf? ( app-text/mupdf ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
 SLOT=0
-_md5_=7a45eecba92469f0610b5dbd308d189e
+_md5_=2170f7cebc39510c49e67834a182008a
diff --git a/metadata/md5-cache/net-print/libcupsfilters-2.0.0-r3 b/metadata/md5-cache/net-print/libcupsfilters-2.0.0-r3
index f0b894683039..d6349b6be0b8 100644
--- a/metadata/md5-cache/net-print/libcupsfilters-2.0.0-r3
+++ b/metadata/md5-cache/net-print/libcupsfilters-2.0.0-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/OpenPrinting/libcupsfilters
 INHERIT=libtool
 IUSE=dbus exif jpeg pdf +poppler +postscript png test tiff
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-text/qpdf-8.3.0:= media-libs/fontconfig media-libs/lcms:2 >=net-print/cups-2 !<net-print/cups-filters-2.0.0 exif? ( media-libs/libexif ) dbus? ( sys-apps/dbus ) jpeg? ( media-libs/libjpeg-turbo:= ) pdf? ( app-text/mupdf ) postscript? ( app-text/ghostscript-gpl[cups] ) poppler? ( >=app-text/poppler-0.32[cxx] ) png? ( media-libs/libpng:= ) tiff? ( media-libs/tiff:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/libcupsfilters/releases/download/2.0.0/libcupsfilters-2.0.0.tar.xz
 _eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5c7fedd7af39f42fc7c2c5d8eda7323e
+_md5_=1f5869e9ccc05a8fdfb24dae8ef05933
diff --git a/metadata/md5-cache/net-print/libppd-2.0.0 b/metadata/md5-cache/net-print/libppd-2.0.0
index bc925b6cba8b..b93f67d44a85 100644
--- a/metadata/md5-cache/net-print/libppd-2.0.0
+++ b/metadata/md5-cache/net-print/libppd-2.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Legacy library for PPD files, split out of cups-filters
 EAPI=8
 HOMEPAGE=https://github.com/OpenPrinting/libppd
 IUSE=+postscript +poppler
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-print/cups-2 net-print/libcupsfilters !<net-print/cups-filters-2.0.0 postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) poppler? ( >=app-text/poppler-0.32[utils] )
 REQUIRED_USE=|| ( postscript poppler )
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/libppd/releases/download/2.0.0/libppd-2.0.0.tar.xz
-_md5_=e3fdd0a8e0db9195af16438260e6d511
+_md5_=aca0a83f9cba39bd5d72f0761123207d
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index ecb59d7e8253..3d672341da49 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2 b/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2
deleted file mode 100644
index 5b69d50a999e..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.7.1 <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygccxml[python_targets_python3_11(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=8
-HOMEPAGE=https://www.gnuradio.org/
-INHERIT=cmake desktop python-single-r1 virtualx xdg-utils
-IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~arm ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
-RESTRICT=test !test? ( test )
-SLOT=0/3.10.9.2
-SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.9.2.tar.gz -> gnuradio-3.10.9.2.tar.gz
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6fc7b7a88271d71d12d716c3e74e4fc6
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r1
new file mode 100644
index 000000000000..eb16ec2d01df
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.10.9.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) app-text/docbook-xml-dtd:4.2 python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) virtual/pkgconfig doc? ( >=app-text/doxygen-1.5.7.1 <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) modtool? ( python_single_target_python3_10? ( dev-python/pygccxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygccxml[python_targets_python3_11(-)] ) ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=8
+HOMEPAGE=https://www.gnuradio.org/
+INHERIT=cmake desktop python-single-r1 virtualx xdg-utils
+IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/3.10.9.2
+SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.9.2.tar.gz -> gnuradio-3.10.9.2.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ad4f27056161982f39c759fae678082c
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index b15ef9db645f..bed9a4a1e94c 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -10,7 +10,7 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] ) dev-libs/log4cpp:= python_single_target_python3_10? ( dev-python/jsonschema[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/jsonschema[python_targets_python3_11(-)] ) dev-libs/spdlog:= dev-libs/libfmt:= sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= media-libs/libsndfile sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/thrift[python_targets_python3_11(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyqtgraph[python_targets_python3_11(-)] ) ) grc? ( python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mako[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) iio? ( net-libs/libiio:= net-libs/libad9361-iio:= !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[opengl,python_targets_python3_11(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) soapy? ( python_single_target_python3_10? ( net-wireless/soapysdr:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-wireless/soapysdr:=[python_targets_python3_11(-)] ) ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) python_single_target_python3_11? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_11(-)] ) ) utils? ( python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/click[python_targets_python3_11(-)] dev-python/click-plugins[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
-RESTRICT=test !test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6fc7b7a88271d71d12d716c3e74e4fc6
+_md5_=3e38eb914682492f35ba6eaa9b3ac206
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 4039bbb994ee..8a3bc9569a29 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.19.0 b/metadata/md5-cache/sci-mathematics/coq-8.19.0
new file mode 100644
index 000000000000..5ca4b798c361
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/coq-8.19.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-ml/findlib doc? ( >=dev-java/antlr-4.7:4 dev-python/antlr4-python3-runtime dev-python/beautifulsoup4 dev-python/pexpect dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-bibtex dev-tex/latexmk dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-xetex media-fonts/freefont ) test? ( dev-ml/ounit2 ) dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-ml/num:= dev-ml/zarith:= gui? ( >=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?] >=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Proof assistant written in O'Caml
+EAPI=8
+HOMEPAGE=http://coq.inria.fr/ https://github.com/coq/coq/
+INHERIT=check-reqs desktop dune edo
+IUSE=debug doc gui +ocamlopt test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/num:= dev-ml/zarith:= gui? ( >=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?] >=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/8.19.0
+SRC_URI=https://github.com/coq/coq/archive/V8.19.0.tar.gz -> coq-8.19.0.tar.gz
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	desktop	021728fdc1b03b36357dbc89489e0f0d	dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=99086e6ff19a76199c9aa6d0564ada66
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 77675ea31252..734309e819d2 100644
Binary files a/metadata/md5-cache/sec-keys/Manifest.gz and b/metadata/md5-cache/sec-keys/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-jberkenbilt-1 b/metadata/md5-cache/sec-keys/openpgp-keys-jberkenbilt-1
index 2e628eba0e43..4d9350ec35ef 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-jberkenbilt-1
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-jberkenbilt-1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP key of Jay Berkenbilt (QPDF maintainer)
 EAPI=8
 HOMEPAGE=https://github.com/jberkenbilt/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/jberkenbilt.gpg -> jberkenbilt.asc
-_md5_=d781ffe23fe8368e35076a55c1aa4780
+_md5_=f97f955782838a3973d628c116935177
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 31e31f4e75c7..493b5176aa2e 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3 b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3
index de7913e8cd89..5b4710dfc2da 100644
--- a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3
+++ b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/zfsonlinux/zfs-auto-snapshot
 INHERIT=prefix readme.gentoo-r1 systemd
 IUSE=+cron +default-exclude systemd
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv
 LICENSE=GPL-2+
 RDEPEND=sys-fs/zfs !systemd? ( virtual/cron )
 REQUIRED_USE=!systemd? ( cron )
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs-auto-snapshot/archive/upstream/1.2.4.tar.gz -> zfs-auto-snapshot-upstream-1.2.4.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=59d138075b99adfc30698f98414d62f5
+_md5_=8241c54472061c5b33ce93dbba4a59ee
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4f27eaf311f7..7671c30777de 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/dracut-060_pre20240104 b/metadata/md5-cache/sys-kernel/dracut-060_pre20240104
index 653d3077c747..194b53d0e32a 100644
--- a/metadata/md5-cache/sys-kernel/dracut-060_pre20240104
+++ b/metadata/md5-cache/sys-kernel/dracut-060_pre20240104
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/dracutdevs/dracut/wiki
 INHERIT=bash-completion-r1 edo optfeature systemd toolchain-funcs
 IUSE=selinux test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=app-alternatives/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] sys-apps/s6-linux-init[sysv-utils(-)] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dracutdevs/dracut/archive/4980bad34775da715a2639b736cba5e65a8a2604.tar.gz -> dracut-060_pre20240104.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=674e5f659bfab0395897e7cd6aa906eb
+_md5_=ea83bcd1f349c98c132378ad5ca7082d
diff --git a/metadata/md5-cache/sys-kernel/installkernel-18 b/metadata/md5-cache/sys-kernel/installkernel-18
index 9fb55b6493c0..f81a61ab5565 100644
--- a/metadata/md5-cache/sys-kernel/installkernel-18
+++ b/metadata/md5-cache/sys-kernel/installkernel-18
@@ -3,9 +3,9 @@ DESCRIPTION=Gentoo fork of installkernel script from debianutils
 EAPI=8
 HOMEPAGE=https://github.com/projg2/installkernel-gentoo
 IUSE=dracut grub module-rebuild systemd uki ukify
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=!<=sys-kernel/installkernel-systemd-3 >=sys-apps/debianutils-4.9-r1 dracut? ( >=sys-kernel/dracut-060_pre20240104 ) grub? ( sys-boot/grub ) systemd? ( || ( sys-apps/systemd[kernel-install(-)] sys-apps/systemd-utils[kernel-install(-)] ) ) ukify? ( || ( sys-apps/systemd[ukify(-)] sys-apps/systemd-utils[ukify(-)] ) ) !=sys-apps/systemd-255.2-r1 !=sys-apps/systemd-255.2-r0 !~sys-apps/systemd-255.1 !~sys-apps/systemd-255.0 !=sys-apps/systemd-254.8-r0 !=sys-apps/systemd-254.7-r0 !~sys-apps/systemd-254.6 !<=sys-apps/systemd-254.5-r1
 SLOT=0
 SRC_URI=https://github.com/projg2/installkernel-gentoo/archive/v18.tar.gz -> installkernel-18.tar.gz
-_md5_=63d6692784858310a537705bc30bf338
+_md5_=de3c74822ca26c95c4d4b1017716b34f
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 05bb8d99ebde..708e689c38a8 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-6.5.3222.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-6.5.3222.3
deleted file mode 100644
index 1dce671b4723..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-6.5.3222.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DESCRIPTION=A browser for our friends
-EAPI=8
-HOMEPAGE=https://vivaldi.com/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=chromium-2 desktop linux-info unpacker xdg
-IUSE=ffmpeg-chromium gtk proprietary-codecs qt5 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:120 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) widevine? ( www-plugins/chrome-binary-plugins )
-REQUIRED_USE=ffmpeg-chromium? ( proprietary-codecs )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.5.3222.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.5.3222.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.5.3222.3-1_arm64.deb )
-_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8dce8971d2cfdd7ba9cdad8801c8ee22
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-6.6.3249.4 b/metadata/md5-cache/www-client/vivaldi-snapshot-6.6.3249.4
new file mode 100644
index 000000000000..3fd3a78cf1bb
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-6.6.3249.4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DESCRIPTION=A browser for our friends
+EAPI=8
+HOMEPAGE=https://vivaldi.com/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=chromium-2 desktop linux-info unpacker xdg
+IUSE=ffmpeg-chromium gtk proprietary-codecs qt5 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:120 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) widevine? ( www-plugins/chrome-binary-plugins )
+REQUIRED_USE=ffmpeg-chromium? ( proprietary-codecs )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.6.3249.4-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.6.3249.4-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.6.3249.4-1_arm64.deb )
+_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cb330756451fb499e5e54f40237da47e
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index a6b2b052ac72..09a508a019ea 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.11 b/metadata/md5-cache/x11-base/xorg-server-21.1.11
index 43076626e651..024e0819d084 100644
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.11
+++ b/metadata/md5-cache/x11-base/xorg-server-21.1.11
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 INHERIT=flag-o-matic xorg-3 meson
 IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
 RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/21.1.11
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.11.tar.xz
 _eclasses_=autotools	e4cf390b19033d5ca443765bc8537b81	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	meson	e322276188f86eacb29ae081ba5485c8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	042f4cc53680245bf99a84669b94155a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	2093d675f9b0882f91143352a79d06d7
-_md5_=1ff5be48ecbfe97fd77c916974540277
+_md5_=435c526a6173d68e108b1a0aae9159f8
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 76457695ce34..520c1894ed30 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 16585 BLAKE2B 2db21da22c0a0d99de0bc9f97f76e8fbfea104462a697d51546ec38beaae4606ae8da8459796ba13d4e5ffcfc61703a82121e4b4d21a76f3c180d6dd975cbd36 SHA512 314216e97dfe3e8ad6eec54a0eae3785690bee4abc7651791aecc0bcce96fcff6d3aa852d15b132277c0cd6d62e284d7ac8f619c618d627173f87afadf5d79ce
-TIMESTAMP 2024-01-24T22:10:03Z
+TIMESTAMP 2024-01-25T04:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWxirxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWx3yRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCjXw//eHRAoM122hmqR8/EAhXZqyCie8ffvfeyFHiitHeXRlh5seGnRWDW8f6Z
-DhnDfWg0G6AAFoAhPt2E64847IESmJQeofJiSP2SSE54qzoAwKzVvduO0256HNEH
-9u7X7d32fy9n0mNGPuMqPkaAo8L8zpLCypCguCvq0ni+uq6ds7S0xUX7kguHfa2b
-KFDgZb/UT7YXzLjyu9s2eghnWcVYc0qD2PJPTwYd8E2xutoOPRASCEDNOJqZ9TES
-IfapyWL2+IXTtVaWnajijH43I8AyA6NGS4zvmCMNh7SgyD/CBNQfHuwCybE5TwKR
-sPB1l6Qix8UwMemfiZdHqehvGxBcqgZBJV4nKeIrT2aeCATcyswa7exGnAOCdzmx
-jhZO1BinRyor2BFae4UaD7+NnhIPAFzuS0lovaFcL0pgvDxt7AO1Tk7+YinuBKIR
-cD2eKj8myyMIT1MwCroHyw8KKlSAmVWTBtnk7rWDd9Cz7nIbyJRQ70QJAal2VvJE
-KESorB8+N2PV/IS4kAyfPVJpSPmjMFqb6cC9dxFE8OqSSX2nUN2HlSb3FP1HkJYH
-fJ6cysbdn9F+GcBkVF4/acLxGmer7dnmz1kWc+lVW4ijP72LOWv4EQ8jhwlqBxKI
-z2zDl+diIYGRHsdRAf+xC7x1akc+MxnNRmpA1f5U3nWLMpZCWWE=
-=fzM1
+klDDcw/+L/7USW03v69dWxSBvYY7Pyg07xLYJqSV5Dr8d8YcpBlue1YbQQbFadGz
+CrX/jTkFG6gZCJa6RJIxuC83DCMcrpGxpqa43wUnnZ2qsqJgFrhTlTbTTUiUSlhB
+t8mhpeoNK5OfPHI89a5fp4lJDq645Su1tyjRkVfg4VgxwfgnuBLKw4rKL0THIauf
+l1nNM7SsxL4lT4Jrux2qD4Du8jYXsENtoSKxONs+7KL7MjFNAxKuSRDFgk0mlFz0
+v7knu6nOv53xnqf4rBb7xtW3ydHdiy41Q8jTQM4Id8PyJo1V6o0Yw9bs5R5uKCC+
+a2pz7H/Np/rbfacgd7P0SrW9kZH41qat8MO4InfX4OpDiUMeCmd7ES0oEyd5kyZe
+4sJLpiASxskiD9AFmLVDvKFgXr3db/rOjaTLK5WTK+yn7cB1xJ64Vk+gys4+vqYI
+QzlJaE1FYyq/tJtkLL5KF3dYmsPfiYf7ZLWCJGrhIYR9cgAqZvExU0yJmjd1lXAE
+cfwiOe4ChFdRqNfAH03jwoMVC1JaS24w+aEN44DfBS60yTIe1/9hvnOellYuzPYw
+/SZPqQimDZV4VJJl20xtQ9196kIeWWuCFfmg9x2MoFUnI3XkCg0B3VBkIE+mQzjw
+Rv51KwhIB+DXvQJEY/wUXVw3c3U/lqX8RiPY+7PDGBQS2LdJg4s=
+=xkqP
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3d28a9e9dff6..d0a67af14531 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jan 2024 22:10:00 +0000
+Thu, 25 Jan 2024 04:10:09 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 69f746187281..3a69c2ff3aef 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jan 24 10:09:59 PM UTC 2024
+Thu Jan 25 04:10:08 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 97f3cb92d78c..b252980649e1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jan 2024 22:15:01 +0000
+Thu, 25 Jan 2024 04:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7a4f11c5299f..2ab2111e2359 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-a6e381e5d0a8346a51c591a97a566c4143cc8dda 1706129739 2024-01-24T20:55:39+00:00
+668954e8975de950a0b7efaab0572eadbf1902ae 1706154033 2024-01-25T03:40:33+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9e14664f20bd..2401293e3545 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1706134202 Wed 24 Jan 2024 10:10:02 PM UTC
+1706155801 Thu 25 Jan 2024 04:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d572a3c3b1ed..d0a67af14531 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jan 2024 22:09:59 +0000
+Thu, 25 Jan 2024 04:10:09 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index a00daccc552f..2277ce025e20 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 5b5d9ed0e685..5604ffa40ac7 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -13,6 +13,6 @@ DIST c-ares-1.25.0.tar.gz.asc 488 BLAKE2B 45b07fc1ef14452b8a4fda63f134e389b66c12
 EBUILD c-ares-1.19.1.ebuild 1953 BLAKE2B 1ded6481a7ebecae276cf0be56591051b72ba20469590e1231b8c873cc9d3869fda7a36cc79f3cadf14f4fef27e05e68dadf683fe9a23b5884c6562f7f3db8c9 SHA512 cf383c805ba7f878afa5c1e75144fca115ee60f420fb257e42badd9d31eaefcb21e2ec9eccdce72d061287e67aa3fe38cfa4ad7168064b8e95318e041e651aa7
 EBUILD c-ares-1.21.0.ebuild 2320 BLAKE2B 0bf5577ca5af7eaaa7a0b1adb0acdc63b4a7c2a6be151c39742c6168ee8c44331f6918919d536967a34f527a3ee7b435979b5f4de27203b990a311d079731579 SHA512 fc5446f9b664a5fb93366877f86f029605842850a4aefc73d2c0138f7e5a4c7e61d2429e8c9be1256552805fce7220e26b3e9671dcaa1e561a465ddeceb96fdc
 EBUILD c-ares-1.24.0.ebuild 3242 BLAKE2B d0e98bad28950c4835670021048a10eea25998ecb2e67fbf078d0106d6509f750f4ceb4f39b45e719e8fbb05ab6ecda792b9d8e040681b3f64fb910e53234ede SHA512 af5de4f8ee25ad76516928d45c524d053c1621aebb852adf1fed3537266a72ee51441fddcdbfc407be94a6f2cd5b84ebf5239585a21feb7deec81461aea7d4e8
-EBUILD c-ares-1.25.0-r1.ebuild 2446 BLAKE2B 3a663bb5cc56a936440680f59fb80aa2441d90ee4fbf552b0a68acb890fe8fcdc37c75a26c818aac44a79ecab7957d9059b89b6095500651c95e5a2907dcbaf3 SHA512 176a4cf94fff527621f47ca782b64e0f1081aa8ef2c82d7873bfdcf9392d85481b557f174866cd5ca8f468bb30b1512db01768d81a1f6868e991edc3ea57bae8
+EBUILD c-ares-1.25.0-r1.ebuild 2445 BLAKE2B 33d0339ef5a9ca895d0a6aacc3b2653bbb89065735bdd5c6480a544ceac21b83e3f40c538a72ccb0e742a7587474a28ab259348ac7d0b778178cafc4538e4e94 SHA512 322dc2dea59b7ba3b6bcf4ced4f5073811b8b1e8a4dccc579db20d5fe1b03df666f13c3bb6273c8d1d683b9fec7210a102c7d5b1aba12682d7a66ea7cdc8c7e9
 EBUILD c-ares-1.25.0.ebuild 2394 BLAKE2B 2bf5e7d1d5539c987ce2550dc84d3cf900a195e61a8cc4ce37c13c8bfa1e7673fbc636861884999d636cf1b1b8b958369ccf8013feb48476de73d584cce77cf8 SHA512 a6fe90284147dde062d0586d3523e9fbcbe97dc4471405960821c27b90d45d152a2f7b5712769e1c046648db75d5011978eb0a29b4f7122eb8de17833ae70089
 MISC metadata.xml 402 BLAKE2B ab03bca92ec4073f5a877993558552136f0ae673f98619aa1f30eb94b6d8f2103b1cf77d23a9f2b3d56ee33af23d626ee230e480a3e3e0bc174df879082466bd SHA512 e02d13db5d10b1aaaae5680247a6b47610dda28a13b7754d2b97f08a760ce732957c96fb6e88ce7fd2076bfec275e72bfbb3dec802940f0159122364ab21acda
diff --git a/net-dns/c-ares/c-ares-1.25.0-r1.ebuild b/net-dns/c-ares/c-ares-1.25.0-r1.ebuild
index 92f0216ae970..e5dd49ff97fb 100644
--- a/net-dns/c-ares/c-ares-1.25.0-r1.ebuild
+++ b/net-dns/c-ares/c-ares-1.25.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="MIT ISC"
 # Subslot = SONAME of libcares.so.2
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 9f3fbc5b4671..c4dea56aef33 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,5 +1,5 @@
 DIST libidn2-2.3.4.tar.gz 2083823 BLAKE2B 26ef58894ad51ca9775cf07edb1353a8aeb7af0df36ce8698425be216a067903797cdbc50c7644292c7e05b23c7bba35c9fe5e38c70e6f55784d8bcdd9c2fdb2 SHA512 a6e90ccef56cfd0b37e3333ab3594bb3cec7ca42a138ca8c4f4ce142da208fa792f6c78ca00c01001c2bc02831abcbaf1cf9bcc346a5290fd7b30708f5a462f3
 DIST libidn2-2.3.4.tar.gz.sig 228 BLAKE2B 0aa25bbd58b76724dc7f6d7a40dd578bf28f4b786c32933fae330c4330da8fabd549c45b579bfc0ef0178b10122e59c6b33bd78a8425c744dff2ace7e75018dd SHA512 d2a575723326ae256a60e3edf7766af65434f716e11f963bb7ac29b6b2ff2872b41684a1bd1c6f3a3921e8a083512eff1faf2b0fc02513095c2bcf3563312fe0
 EBUILD libidn2-2.3.4-r1.ebuild 1615 BLAKE2B 0fd8234294588fd8f918963b293363bf89455e9002270f155838248b2de793875cbfc99ae7622fc336e1efef142dea7ea3527fd8572cd343d42cfdcfa2a37feb SHA512 f38e541b810cd24a3699d437484a4ca633e4fcfe5a11053343209c47e27626da10b53311947d29b4dc891b797c69d9e287d8d9ce0cbf37dd5a2c94f137b88275
-EBUILD libidn2-2.3.4-r2.ebuild 1417 BLAKE2B 22d04e7866aabcf25ab8cef98812333ae8857f9f35879b352f9997a103746aea48502396048e9083d2776e17a726cf00929133c241fc0d4b110235357d52c42e SHA512 7ff2dea8d37ed8a4eac5af9cb7ab91e8239af4c80f2e1998f0042907b8c1f3f8fc016fb280d39b85d11fb14259b6558b8113b5c3bb09bca5a48a76b61c146509
+EBUILD libidn2-2.3.4-r2.ebuild 1415 BLAKE2B 043a509eda3604daae9a4072e3951adc99ab3de29e52a0815dfe59595adb4b9e97db2e03869b899a3477aa7674135488d4b3a2e6eac582db0060db679506f9d9 SHA512 0f3975343c3e81bf3736f7ad04d86a84a6e23b4117708d8d0eb386404a0b686ec82755b0900dd848d4ae0cfe3902c577ef3177508d153ad6dfc85a73d5491c43
 MISC metadata.xml 616 BLAKE2B 8f655a4bf8a19dc46ad2c171a185418193042a5d94e7819cf7366c543f2bab24150715c9966f653cf6efbe1bfcaf4c7f0f2d2bc2cc4c876456e07ef823005953 SHA512 2f23e3e9efc8cabc33337a6c19b0b5d627327538ba3b4e669cac7aa7b424362eae6630249ae162df4d03c833c094affb223f80ee7f914ea87655a45576a11f70
diff --git a/net-dns/libidn2/libidn2-2.3.4-r2.ebuild b/net-dns/libidn2/libidn2-2.3.4-r2.ebuild
index 534f508713a6..055c3e33bac0 100644
--- a/net-dns/libidn2/libidn2-2.3.4-r2.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.4-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${P/a/}
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) GPL-3+ unicode"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7202dafe5f37..08340ed90e16 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 131102a9b3c6..843c39c3572a 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -4,5 +4,5 @@ DIST miniupnpc-2.2.5.tar.gz.sig 543 BLAKE2B ea7b5c254684f52485bc18ad4820c41e7c70
 DIST miniupnpc-2.2.6.tar.gz 103949 BLAKE2B bf5ea9ce0194dcff47763989da6eea0282fe2507bab79a14bb699aa1f843730c95b448030d8100241787b899d3cc5e4e7ab4633ee2a97b9121eea05c90b138b0 SHA512 012a7a7c96694890af458933f0bc14573f5c85cc5f3021854e1a965574f993be174ca15c1b0edb224333c2560c3a44cd68a067527db832475a16dbbaaaf48125
 DIST miniupnpc-2.2.6.tar.gz.sig 543 BLAKE2B 243d9eacab92a33c6c9bf064333c6d2620c88d2bfb5b6bd1dd5f8360f355e8e4b0c0af596ceccc5783e9beaeb21bc2ba0c24fbf3d7448e92235f4a1a0793859a SHA512 750d0ffef99210552d96383bc67d4200f1306c4200ecac8b0d91f6796882a2c8686e83dbc3fe103d01d957a4212258e660c91a79a76ff87b2a7b0498bc5a822e
 EBUILD miniupnpc-2.2.5.ebuild 1596 BLAKE2B e98edc33b2a8fdc8363294219e35cac2f3b88e143e576a1f9d9f2b0b900b4f11e1bae9f6a650b1a7bf699b2d3515a102132ce95ef166fa209ef9e95dc912a064 SHA512 2e74c0341cf5fbf578d3776ec6b78cc1af1bcd4cb70fc997efcef40ee24765439e9c835d3ef9bbe0433665616d57036a1435c29911b08750e2359194060feb12
-EBUILD miniupnpc-2.2.6.ebuild 1609 BLAKE2B 9ed6c9d76d60e332aa8ceced06b9bfc1996ea3815405b4f4485486fc5f654726e3ab94f1ff7890bc71d3387e9c993ab4fb53df2ea7521f206ecc3936a6dc2d0f SHA512 e3b1a83b612687b0a931719b3264053ac5a91fe348286e1cb7b7b15d6463d291c11dbc8f10603fbe6596887454631ee629b7ad40d1b719395efcac50d9c8ee22
+EBUILD miniupnpc-2.2.6.ebuild 1608 BLAKE2B 37f013acdb49dbb0ecbc5fb30e92b97dfc32eb5fee31325bfe7bf63615badd6bec3a411eb272b7e7f4422ca587ebdd4f2f2bc581c91dafb53c54365660f8026f SHA512 f29a2a3fb66e54fc64c0b4fc40a22465541a0524f4237217de8bb75c89b60706e675e69819cab584cf9dbe417620909b88fb31c7e5d642b20fa759f310a1ff5e
 MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.6.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.6.ebuild
index 4785cb219db2..9d379b60375f 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.6.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6"
 
 BDEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e914f290c827..b05ae583b9b5 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 8970db7baaaa..c6e955429aff 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -8,6 +8,6 @@ DIST chrony-4.4.tar.gz.asc 833 BLAKE2B 07f863381d37e30435c3796c7ff4ac628dd81b248
 DIST chrony-4.5.tar.gz 620287 BLAKE2B e89665e6ff700805b41f89e9349d280579aebab31a30817512a165da939c8f39dc55ef9a17a50e3d7e298015620667638ab119901a71868a9188093606a95d32 SHA512 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5
 DIST chrony-4.5.tar.gz.asc 833 BLAKE2B 7d680a4f5d86335b067b95cb900761615180701cabae5978d6f924063f7a43748534bb2e4f23cd9cd2e6919ed005014db6d396330fbfb5aa6d5f1c46f3c0c3a0 SHA512 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb
 EBUILD chrony-4.4.ebuild 6814 BLAKE2B 392707d5e5dd672eb18159911ad19645ff132cb25ca6ddd102eb17974e492c6370d87b6994ce40dc0191c74b184feba3ac5fe52dd28fe1fd545320841eb02a77 SHA512 699d6e4a24f6b5f0f7c1bcfdce728c3db694ae17684a91ad45d6360c71257db012d24d12bcd83ae3eb0df09c0cfbc23cbf113074894937cef3730baa2c935f43
-EBUILD chrony-4.5.ebuild 6815 BLAKE2B 4be4f2580ed927042b63339382ac45259430afc277ba2015477e417c872d1fb483c0024ab88908f0fec844bdddd726a0d93a28e31ff2e3bef624b276228c3ebe SHA512 b8dede4ce757fb6db86a296e14ab63f91241c39173ffc5078e4ad52c5dce5dfe6a9613010dccb2c7d1c8fcff12a09d633cf874acf14cecf3ee4623993e0f7e13
+EBUILD chrony-4.5.ebuild 6814 BLAKE2B 392707d5e5dd672eb18159911ad19645ff132cb25ca6ddd102eb17974e492c6370d87b6994ce40dc0191c74b184feba3ac5fe52dd28fe1fd545320841eb02a77 SHA512 699d6e4a24f6b5f0f7c1bcfdce728c3db694ae17684a91ad45d6360c71257db012d24d12bcd83ae3eb0df09c0cfbc23cbf113074894937cef3730baa2c935f43
 EBUILD chrony-9999.ebuild 6822 BLAKE2B 38c6b067e7f07b2045865b83c5064c9b26b02357d1718a8b1e67cb7cbafafac4b1f7425fb957d439c9793b34af4135c5d7d7fe6875394e06ed4c6f9e2f62df35 SHA512 2a2c83c5520ed3d38e9535898aeb6134a9ecda752c8ba5d7a71bea014403b7af758a35f546fd192b3b09b6d5769e9e1fd2eef1d8be9c6b44d34a966a75732e98
 MISC metadata.xml 2353 BLAKE2B c5a7458f2aabf443f01e670cf1e1a578c6d1095b607df07a6a979610f8446ad8fbbbc2b86ca79f8f06b49cfeba1a31cd05b2748c46e2d283863fd43d0b8e7a3a SHA512 1ec4023f55368e03158535d45239572e6bd160d94c85126d3c7d1ddd02fd5743d65ee9ea2bf2e6fbde5b010483928432b5d5848bed03bcc78e9f6924ee189b42
diff --git a/net-misc/chrony/chrony-4.5.ebuild b/net-misc/chrony/chrony-4.5.ebuild
index 4f20ef62f791..f6d81c3f64ff 100644
--- a/net-misc/chrony/chrony-4.5.ebuild
+++ b/net-misc/chrony/chrony-4.5.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 	fi
 fi
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d0ea8817156d..ef0b744cd5cb 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -8,6 +8,6 @@ DIST curl-8.5.0.tar.xz 2658520 BLAKE2B cfd591f9703b9c63712dbe74494b05a80ce5a4fc4
 DIST curl-8.5.0.tar.xz.asc 488 BLAKE2B d706c401aecf345398411b94c87b8f1ecc752d73d24e1a578c8c0e62732e8e476333a2a4772428c6425eb0d124b1ceee8e377cf41d60a54b6f2df5cccc0b9f23 SHA512 9c6a2e61860878cd731d951fac1bb52cd314db20439a5173a95b48da1742737e02bfb9978d65e25de6535f839e281235203599a29f252e78e0d7a83769727329
 EBUILD curl-8.4.0.ebuild 10695 BLAKE2B 66b7a3a2ed719bd945d67eb8cbe53f97526cbb0e4408045ea99c16996dc547576ffbfa6bef459b128dd2fc96ef734507eefc50f34d588ca489ad7e8d139c498a SHA512 c3abc0f3e4297aa84054c5fe6717610359afcb027ab2040b5d540d65b6552cb530cd37f85ef3e6522d35995494b2b3c29aa7a443d50ec8af0f637081314f26cc
 EBUILD curl-8.5.0-r3.ebuild 11033 BLAKE2B 70f9b8906e9ef537e44c00fb29201bc2d5508a2755427270cc83f1cc24710ac3b3758057a1b6b6b97d786f320f00769f1fb144221d0eba931936e8875e8bd104 SHA512 07f6f60a08b953d9347773292b166618c4148436236bc86828fdd9dda671dc27c77bd793fb2a9629a167838e62bb11ed7a16ed5eee57a34db10263144283d61e
-EBUILD curl-8.5.0.ebuild 10780 BLAKE2B 2db2e92dd3ce445d70d1ae5cdf98de1faab13b55927b189ea6ee9ea83618219ba61d3bd73695eee05433c9cc6672d1b897a332d9327d9775c2d6ff180beb151d SHA512 1757e3a2dd97fd02c7b7449ad849f403a8966e52b98b196be32742295f790c8f96b1fe7ac708b26bef6a5aacf930d18083c8fb2065402bdb83f821496277806e
+EBUILD curl-8.5.0.ebuild 10777 BLAKE2B 14fea8da51ac209f0fd9ef2665066a44504f0ceeaed838dfb41bc64c52951392e67f6adc23d01ca09c34610658171b9b83dda7c310ed3a62f558825718a97bba SHA512 0c7d812544f26a7f424efffbd5231f6ce958479933716f8638f99b83d097ac0cc5e09dbe7f32e75e0b6b4705d6705870cba2b64f24e982f6edc7d5ccb90844fc
 EBUILD curl-9999.ebuild 10714 BLAKE2B 0c584c3706885a6b4e1c12ed9983884efb1edecfc530c4fa18466fd36d27ee6cd25904504499de7a284a3707e6c3100b76f7f432cb7da0b4559bfb0d1fc9b70e SHA512 75f4920f88357be1d44993befcfd7c6fc5258c425df17614d7e404956f1ff1fadf6afd9d8af1cff809231b0f7eaacf898ed3320f5278dfab5aa5b83c1a57bdca
 MISC metadata.xml 2164 BLAKE2B 6633dc96c446b5c586d9dd20f14377ed5392cfc3e823672004898542a0ccb928782e47646133501e3669cb59be141c4155049d4f35f95cd2b1dec406358803f2 SHA512 efbc12298b8e5a512e7813e62cf97462826242697463fec06d63d0cd736df00b845a4e598ca84dd20dedd26adc8f57f7c66342d2a8239e9f7ae0da36917d4aef
diff --git a/net-misc/curl/curl-8.5.0.ebuild b/net-misc/curl/curl-8.5.0.ebuild
index 38a3f26d2dd2..9d7765b85566 100644
--- a/net-misc/curl/curl-8.5.0.ebuild
+++ b/net-misc/curl/curl-8.5.0.ebuild
@@ -17,7 +17,7 @@ else
 		https://curl.se/download/${P}.tar.xz
 		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index fff72b242b4a..45b5c0713bbf 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-browsed/Manifest b/net-print/cups-browsed/Manifest
index 5df1d948ea07..54133ec75020 100644
--- a/net-print/cups-browsed/Manifest
+++ b/net-print/cups-browsed/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch 915 BLAKE2B 2349ba5021b42ab896cf277c64052c1e593fe3e6ec0665ab20476aaede23290f83d6ec58e8ed8402c29f9cece0fd7c79c294512410213fe731455c1b76337592 SHA512 2c5f75b748477cd19711c7ab2c6b158de94cc14ee4e0344e303b1e7f2e3c07ee0b3c04d110896d8db9d94486a9d80c0643e79a70fe6b1d1e27c7b0d910628be7
 AUX cups-browsed.init.d 150 BLAKE2B c2098766ae08b38dead0a5bab2e30e1728ab93aa98e74edb6e20f8a885b62189f1368a041c4430ad24a1b92f0ae9cb317ac3390767db0a54ca1532022d44b0bd SHA512 c8a74ad0e5cfd3b565c12eeca50a55b7a6aa3ac92c689fc6632e2a6df5033e6fa7f16ce6c9c2cbf607ad4bd09453ab7d47448cdd04ad8c7e35f0e584b6d96d38
 DIST cups-browsed-2.0.0.tar.xz 426132 BLAKE2B e1724c03302d61cf131c8886a95f6ad8f0236b134f1deaadb783fa185141b83cd8ac5c5d993ded37d04c7fd806c5cde157a792a90a2f372075f24a5bd2423dc5 SHA512 592493ef82c65b2418b86b555c4d24bdf352f78516993a021d106240b8c399fd9f4fcc27e396e895d94da889a97f2bbc5e96bfa92c58c8be80802ee8df43db80
-EBUILD cups-browsed-2.0.0.ebuild 2223 BLAKE2B dd970571f3af22ce3dc01d3ef6edbd2f01fa99bd9a7031f694c4d6eb1f435bf77cf9f454a81be14ff2d1e6c360207eaec3b31ddfbfd1dfdce148a472db1ad4b2 SHA512 8242f53d85a18d1dff2a52693dd376ce78e57b0a49259ffd17a4d1e3c0a8eb6028c1873e0643c149476bb1742a5a762183dcbd55bc05eef4927a21fb0a687684
+EBUILD cups-browsed-2.0.0.ebuild 2229 BLAKE2B f8d52986965e40057521079a3e9e1b0eda4bebd9a9fbc42797b16a6978f3fdfe34757ea49ba50f98592d05e1a80f0848ea611446a34bc333fbfe960b23a75980 SHA512 6e3d5c35845547a958bd350f796a875960332c7e59c071f9b62aaf8efcfaac16ddea707777282331dd8c573db2514ab587f617b362483e9f45fd51344d71e0e9
 MISC metadata.xml 350 BLAKE2B d469f8a462c27bb1f22454a0141a67a6ac9c4c06058bf50576fd4d8324371042805464135777838a7ee787185c0f37e2ab06de00db9645b5737dcada51464f22 SHA512 53832a79e75d4ffb1896d3a984709cd06294b82ed7a0cab9a2c958a8fabf7d2d4252f09b4302336a42dbd3afd079b1688b86d04e63efbca5ee5065ac56c793ce
diff --git a/net-print/cups-browsed/cups-browsed-2.0.0.ebuild b/net-print/cups-browsed/cups-browsed-2.0.0.ebuild
index ee211ad219f6..25ea5f8b5267 100644
--- a/net-print/cups-browsed/cups-browsed-2.0.0.ebuild
+++ b/net-print/cups-browsed/cups-browsed-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/OpenPrinting/cups-browsed/releases/download/${PV}/${
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="ldap test zeroconf"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index a64d9e0e4e65..afb3905d8e99 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,5 +4,5 @@ AUX cups-filters-1.28.17-c++17.patch 1066 BLAKE2B 149001a37c5799210a7cbc6c79ab1b
 DIST cups-filters-1.28.17.tar.xz 1516052 BLAKE2B 87258391901d55d9e59b06d54603d014e54d224a373529bd70fcd38cded9dc96c88ca73bcea63d7633c065caea3f9e3274cd450aec5f1bd90130d9a88c0d3421 SHA512 320544a48206165581adafb28dbef58f39c66bebd3641be3d180a692605349d9e6af6d464044db9f7bda17a67f4a079370d8cc880cd7873d684b2209882deb35
 DIST cups-filters-2.0.0.tar.xz 447648 BLAKE2B be5e2aab4eb921aa67bfcc93aa5f95a9f1fe1a269ed73d18273a0e9a3e816187e9e32750ba6521c3ab083c3c7b7a60bb1fa679e16d4a5917f911a4ba8d4b7207 SHA512 fc8ba3bbf92d5ede295884023d1c42422c4c250dbbf21c948f160a04ded3259784df4bd17eea64492f9417f866e566be1a9fcde47d29655cd4204ef4cc7af134
 EBUILD cups-filters-1.28.17-r2.ebuild 3679 BLAKE2B 6f49716b9a904f063cf4356d856a87af14ce1d8536ff87aa92fe025f2df53d863373b8268524143500a17993b6dc98ede742c85a8ea931d279402e4dc70d5c36 SHA512 0e5d1a2d6c63ae020cab8f598d9b06e72712b95af8f3daf0b8a6eccbce311d89596e57ebcfa19dc9fcbc55c20714f22792ae84d29d1decdc07d20f1e7a03d1a3
-EBUILD cups-filters-2.0.0.ebuild 1423 BLAKE2B 9d3689d7098a328ef826bb697040b7d3a440fed8176797aef24a3bfa84021516b1f5ec1c8e4e8a4435eea4219801b86e7b86244f1aa3e8b44bce0d76bdeb186b SHA512 720cd33f5ff477ea3ea49da6f8bff21c952911ff843013ec2eaac7fbda54ea39a48792dfad3c6c0f3a19ff2e723ec1962f5dabd4bcc5372a2a4c854765c66b0b
+EBUILD cups-filters-2.0.0.ebuild 1429 BLAKE2B 94f9e4154a6b80d5baeeaae097881b005445ab1cb5302a5eaf19a2f397a9b7f836b15d6c8f1124df69f079eb2948f9536f94852033a92ef95b00715de0431d0a SHA512 17a929fc30d220a75e7fe4b001d61c09f67d42b6e06d1a22f4503c1bc8a0290aa8132431f49caa6789528f8ba210f27f1c48fd3da97d71b7c81ee33ed9fb2dca
 MISC metadata.xml 585 BLAKE2B c3ae887bff09343b882156b9020c185a9bd0d7bfabee240c71d714b8811761ef23176e4ee71f731022103a3da2255e1683b7ac4aca0f677afd994de5bedc96ca SHA512 313722d8912f26c1a7754a837b1d64dd122ac005cd9bb644ae65cac7b7a442845b25befa7891669abbf43011e9958988a6ad084dfa6ed393decbd198e852b196
diff --git a/net-print/cups-filters/cups-filters-2.0.0.ebuild b/net-print/cups-filters/cups-filters-2.0.0.ebuild
index 5638be4d8e53..456910db09cc 100644
--- a/net-print/cups-filters/cups-filters-2.0.0.ebuild
+++ b/net-print/cups-filters/cups-filters-2.0.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+foomatic"
 #IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	net-print/libcupsfilters
diff --git a/net-print/cups-meta/Manifest b/net-print/cups-meta/Manifest
index 3808306afbbc..457bf4334588 100644
--- a/net-print/cups-meta/Manifest
+++ b/net-print/cups-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD cups-meta-1.ebuild 673 BLAKE2B 406625a3ae9bf2b5b1a1ad28d11a71e3011851ca4992d223c51f7d76c35710948457e586ba7e8c9ebe3614978747486aac2fdf0e1c53122e079fd4131ec45b20 SHA512 497ffc96c28b28f30f58fabf7dbe5f424d12fde7f30832cf6e7f6c72d8b8cb711fe11287afe2e8744b7b1f5e83af49cf1c67d5dc46d7f7406c8edd270f3c66e4
+EBUILD cups-meta-1.ebuild 679 BLAKE2B 93b859b27dbaf8c59bc7f0d55eea913ed9333882c05f121cc1e865c902a3e15dab878a12c8536ec0002c73c46e003e995d800d55dd6e4936af97a51ad862f35e SHA512 e481edab6762b6675f79a03f58710ebf7812341871a58b2c4afe322538ef74eb06ede00e01af60992f2bbde53fc13c6cf23f159475c3f3187aeb3f38d834f9ee
 MISC metadata.xml 571 BLAKE2B a4a8482afa7c787f26b83743d67acce88f9315cd0ca8b58e5516c459bdacd619fa1ec80cd7da0750401ee3d75f6e7b06807c19a977aa91287934212b876ae8e9 SHA512 ba1c34a1acffbf35e404a14bfc4a83b2c48de274119cb5800920f7511ff054759d954f6fe8254de0c144fb28f7c69abf0e00c334b1407883e787ab338e005f26
diff --git a/net-print/cups-meta/cups-meta-1.ebuild b/net-print/cups-meta/cups-meta-1.ebuild
index 890f79b0578e..3783a1bf908c 100644
--- a/net-print/cups-meta/cups-meta-1.ebuild
+++ b/net-print/cups-meta/cups-meta-1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="metapackage"
 SLOT="0"
 IUSE="+browsed +foomatic pdf +postscript +poppler zeroconf"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	net-print/cups[zeroconf?]
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index e1198235a69b..6b82ba058c8b 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -5,6 +5,6 @@ DIST cups-2.4.6-source.tar.gz 8135135 BLAKE2B 4e61112ddaa46f20b1cfcb8f523dd07ba7
 DIST cups-2.4.7-source.tar.gz 8134809 BLAKE2B d81de62cff37c576ef8fb125b97568c2d86602cec6151d7030552fad421d7bc77a5df1e860d5ac5a241e739cc0d1fe5fcac44b8451ad2fc4dc675cf74fd41382 SHA512 914b574ff6d85de9f3471528b52d4a436c484c441f47651846e1bdfa00aec26774efd416ff466216d2bccf468f8a797b1e0d666b5c82abc87e77550ce8b00d39
 EBUILD cups-2.4.6.ebuild 9552 BLAKE2B 04227d32d232dabbf378d9dd4c254b04bf582e41c569295c50db2990b23f14824287c5158f792da2b9a64d146883b5c8b096f7fc55f88ffdc3b1288293def759 SHA512 4d8e8028a98f338d6775ee3ca07490efdfcd5f9ac9ca4a6fa59405045e25e2280598bab302b6d2cbc6c69878253cba035dbcee8a6f09c6c989ffc62d78408406
 EBUILD cups-2.4.7-r1.ebuild 9467 BLAKE2B f4d2c631a5c5af07ea5cbf525cf80353d60f46b37273f9b4a58def9a26cd3de5f733a87f4108b513be5a20cb1a33add83d428e9c35fd5a5c175e15e45052bfa6 SHA512 d0ddd06b8d121533025e5c74124fab77240e820e79ed189200e20f3faa60c1cf8ca3b29453cf74e733da673206fb5855a926e0bcb50f27269395a349a0f906dd
-EBUILD cups-2.4.7-r2.ebuild 9636 BLAKE2B 90b9ea9c309705264eef17683045603dc4d09998f56c6ade3a9d01fb144faf00a0f6b8b3276bec42ccec8f0c3c9a45f36684c85e8f2482347f7ab72d20fd83ed SHA512 d9d948f18a2bebd78db5818284628d42713074069c1dc8d8737b8a04dea108863360492c28b9df6eb6a0acea7298cbe316735cdd2bac36205547ee45e8d06e9a
+EBUILD cups-2.4.7-r2.ebuild 9642 BLAKE2B 4a33d6d3b9c67ddc18393f41a151745fb6824728dfae472b11702a11b4d62036460f74837a4eca9dbf23f93b527ae3f51a4d1a3a24e8a8f18f227be3c81ef595 SHA512 9d6a48e8d3953a61ba6332a13d75819d5a8de09940d45e412da9dc1c2deb2418228ed2e2e8b5215032e45c196fc65520ad1dbd888ab388cc9059ad0a0a48a7a3
 EBUILD cups-9999.ebuild 9475 BLAKE2B 6a86ce8658096636175e5f324e4d19b6ab2023f002495e6bff79f18122ea1bb7332bfdc9c642d26022a50ec72e9dd3d1d0f7329b92fc49e3da7abf038835fc92 SHA512 e0ece558491f66bcbd78fa4c10a84ef58b58a17fac7ce1f6a5fd6c6a6e7c2163b671b178da22fe92883c90a79a391f2f0735cd1f920fcac0e6e12f4c9b6b6077
 MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.7-r2.ebuild b/net-print/cups/cups-2.4.7-r2.ebuild
index 0858699c2c69..a5853547c217 100644
--- a/net-print/cups/cups-2.4.7-r2.ebuild
+++ b/net-print/cups/cups-2.4.7-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
diff --git a/net-print/libcupsfilters/Manifest b/net-print/libcupsfilters/Manifest
index be4a1afe64e2..b2f0b3b8c912 100644
--- a/net-print/libcupsfilters/Manifest
+++ b/net-print/libcupsfilters/Manifest
@@ -1,3 +1,3 @@
 DIST libcupsfilters-2.0.0.tar.xz 1279856 BLAKE2B ce9d839bb700017c303c1301c7a97fd02e3657a908e685377be49557d995574a7fc5a31d4fcbda5eeb9ba2d3cd07858224540dbf0bc9fa078cfd25a58ee15a41 SHA512 279bff6dcfa76312b10dae97480914345defd90eab79c4716d4553870f73e0f9db404786fd7e2948a86ae5aedb10dca0c2984ccb4222acbd4e835cd572030d6a
-EBUILD libcupsfilters-2.0.0-r3.ebuild 1566 BLAKE2B 309695e9c278275c4881aee0296a751e97b0ba6b3ad5b86f2262db9ed0fd3306ef55cf2a5c16c8d547d2b6b59758adc3856dbb8dc016ba0b0162f66d7623826a SHA512 4485553188e432258178264b2b88577c4a03563b824d0d328565432540f06f720ce1df326be71684b0aa3e480e32f0a89ebf2887fccacd74fa0e63465879ece9
+EBUILD libcupsfilters-2.0.0-r3.ebuild 1572 BLAKE2B ef80055efb2440fa816c694fe1b224de457b9fb57932dc13f8c3e55c5a1af61cf92750aafb7770c8a339e9651fa537631408dc714a86a026a88873e91c3da452 SHA512 c94cfefeb5d498346bd90cba310250386792f3a452146d2388fd67bee8c651bb13539dadcd6667a662c3605adf06e63b27a1c910909b3690d6921790c486963e
 MISC metadata.xml 426 BLAKE2B 60d605203c938ba35e60bc4dfa121d6fb0223d70fdd1bdea4ed02693034a46ff039a580f5c0a5925aa3c4c33220243503096b8de233f6031447a6425a974182a SHA512 04811e0d82ce0365308b4391a33e03da423dc924cc7ff16a2eeedbdb51705b9a62cffe67d7e25b9221a0b511caaa3b19c184301fbecc59056a282a811ad9df7e
diff --git a/net-print/libcupsfilters/libcupsfilters-2.0.0-r3.ebuild b/net-print/libcupsfilters/libcupsfilters-2.0.0-r3.ebuild
index 1edfc0729234..f0e98c6690ef 100644
--- a/net-print/libcupsfilters/libcupsfilters-2.0.0-r3.ebuild
+++ b/net-print/libcupsfilters/libcupsfilters-2.0.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/OpenPrinting/libcupsfilters/releases/download/${PV}/
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="dbus exif jpeg pdf +poppler +postscript png test tiff"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RESTRICT="!test? ( test )"
 
diff --git a/net-print/libppd/Manifest b/net-print/libppd/Manifest
index 24429bf42c46..302d3325b307 100644
--- a/net-print/libppd/Manifest
+++ b/net-print/libppd/Manifest
@@ -1,3 +1,3 @@
 DIST libppd-2.0.0.tar.xz 580716 BLAKE2B 8505c5ab5b515104308624a8f78505343b894df08ab8ac2727d7bd82d0d65d256d22ecaf384b212d9a5c45d2a619a6311722a8c5ed954b7a8a9780477aedb458 SHA512 8be9e67552528606fd804ba13b05710938ed7d02316c1c902ee657bc0e5fade663ffacb5b032609a1c1fdc80d976e7e54d2ca2f71db83cb8fdcee6a371e6bad4
-EBUILD libppd-2.0.0.ebuild 1439 BLAKE2B 23b0967979b8e865efd31ca6093280be8e9aae5896d4127bf08c16912ec857b1a5cd39999adb19ad71fc479d229e72f49e5c2b6cc616d3ad2301689996f950c4 SHA512 1dcff43952cf6fd1d408d79e2a006b726942e5dcbd5d13d01fa7ddf35d5b12f70528eaf79ccfea20db81bad707d80393d3eb082f075b2671b7a1e2f566727007
+EBUILD libppd-2.0.0.ebuild 1445 BLAKE2B a115f1a05848e50625d8e55ea3c6c3300069e78039e0ff35d8572720fd388362c6b08e41038b695395f08ba47b77087427d86ebcd708ca916ae1fd5c4608cbf5 SHA512 878f26000928fa3d6f4307a19a5e308ac3e34420b6d74ccd011a0f607f6dbfd7eb22a51d8a571dcb0ce45dcca22baa0f0482083f6602da94e4db720dc1fdc9ef
 MISC metadata.xml 440 BLAKE2B 8cc1e3fa25d2c12efb0253a37a0dedb484fcac5930deacd37bc09534e9210e72e58669a07efc0d40612a428d190b852064f6175083c852a8b3a4153101483905 SHA512 79801ac1a34f4e5fc46bd8c45c638dccde3168c701dfaffb51d626405e77fe0e8fa190b32c0b76150e51197223363dea0163086f172b0dccccd0c94fc5cb2d0b
diff --git a/net-print/libppd/libppd-2.0.0.ebuild b/net-print/libppd/libppd-2.0.0.ebuild
index 5874d2da7ea0..eecb96bbabee 100644
--- a/net-print/libppd/libppd-2.0.0.ebuild
+++ b/net-print/libppd/libppd-2.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/OpenPrinting/libppd/releases/download/${PV}/${P}.tar
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+postscript +poppler"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # pdftops has various possible implementations, but the default
 # really needs to be decent
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index e75c38aef7cf..06fd311e111b 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index f4aa692136ba..3209d7262026 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,4 +1,5 @@
+AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba
 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
-EBUILD gnuradio-3.10.9.2.ebuild 6784 BLAKE2B 30cbebc98a4450ce18493628ea1dc2b18a9f05d3d2d1cc3d3eb2b6602c7352ccd2bf2fcc151bc1278cdb40b077d284edf03da268850a5d7a11e3eacf2ee41e15 SHA512 810a5c05a57022a4be9a1b298ec93108462e37a49ff6006c4bc1124ad136c239ad769f2bea30a17ae89d785a2d593fc1d5e25f25d7cd3f48041d8c667d38aa3e
-EBUILD gnuradio-9999.ebuild 6784 BLAKE2B 30cbebc98a4450ce18493628ea1dc2b18a9f05d3d2d1cc3d3eb2b6602c7352ccd2bf2fcc151bc1278cdb40b077d284edf03da268850a5d7a11e3eacf2ee41e15 SHA512 810a5c05a57022a4be9a1b298ec93108462e37a49ff6006c4bc1124ad136c239ad769f2bea30a17ae89d785a2d593fc1d5e25f25d7cd3f48041d8c667d38aa3e
+EBUILD gnuradio-3.10.9.2-r1.ebuild 6776 BLAKE2B 1b0ced533f958d87767fbe38ed1836d221d9488e04bb6651778feeb1c13a1fcf8d5350dc8ecaa3df132ec0cdd5c84b6a0c0b2c50a813f68d0f6c7186f8cd3d66 SHA512 2dd06676aded58cb1f98662ae29d8842af037885fa5ac36b42091da42247a0d0e31570d82c3c144f80300f441d9e503758e4a6228dad9ea675ec209586986397
+EBUILD gnuradio-9999.ebuild 6736 BLAKE2B 1071027c522c8141e0ffe2028ebb0ee9e02f19ea94f17ee74a36787eb2682098128e464f6cdf170853410580e8bbc5954a26eabe75aec24531d197f73fa6cad4 SHA512 3cd7f489acc64fda572541d04334123364d8993824b0f9e6dd189f28a7a72276e25e3dbd7cbe6b75eeb6a16fa0082db60c1fdc5a9440e40f4254c56744ad16fc
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/files/PR7093.patch b/net-wireless/gnuradio/files/PR7093.patch
new file mode 100644
index 000000000000..98581054d49d
--- /dev/null
+++ b/net-wireless/gnuradio/files/PR7093.patch
@@ -0,0 +1,76 @@
+From 677d22b5226a3edb274c252cc3aa727a16de3c68 Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Tue, 23 Jan 2024 18:28:46 -0500
+Subject: [PATCH] filter: Fix undefined behaviour in fir_filter_with_buffer
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-filter/lib/fir_filter_with_buffer.cc    | 9 ++++++---
+ gr-filter/lib/qa_fir_filter_with_buffer.cc | 6 +++---
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc
+index 4fc571ec57d..f6cb3b20854 100644
+--- a/gr-filter/lib/fir_filter_with_buffer.cc
++++ b/gr-filter/lib/fir_filter_with_buffer.cc
+@@ -52,7 +52,8 @@ void fir_filter_with_buffer_fff::set_taps(const std::vector<float>& taps)
+     for (int i = 0; i < d_naligned; i++) {
+         d_aligned_taps[i].clear();
+         d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
+-        std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
++        std::copy(
++            std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
+     }
+ 
+     d_idx = 0;
+@@ -157,7 +158,8 @@ void fir_filter_with_buffer_ccc::set_taps(const std::vector<gr_complex>& taps)
+     for (int i = 0; i < d_naligned; i++) {
+         d_aligned_taps[i].clear();
+         d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
+-        std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
++        std::copy(
++            std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
+     }
+ 
+     d_idx = 0;
+@@ -261,7 +263,8 @@ void fir_filter_with_buffer_ccf::set_taps(const std::vector<float>& taps)
+     for (int i = 0; i < d_naligned; i++) {
+         d_aligned_taps[i].clear();
+         d_aligned_taps[i].resize(d_ntaps + d_naligned - 1);
+-        std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]);
++        std::copy(
++            std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i);
+     }
+ 
+     d_idx = 0;
+diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc
+index 32f5c6780fc..72cdd9fa1c0 100644
+--- a/gr-filter/lib/qa_fir_filter_with_buffer.cc
++++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc
+@@ -107,7 +107,7 @@ void test_decimate(unsigned int decimate)
+             }
+ 
+             // build filter
+-            vector<tap_type> f1_taps(&taps[0], &taps[n]);
++            vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
+             kernel::fir_filter_with_buffer_fff f1(f1_taps);
+ 
+             // zero the output, then do the filtering
+@@ -198,7 +198,7 @@ void test_decimate(unsigned int decimate)
+             }
+ 
+             // build filter
+-            vector<tap_type> f1_taps(&taps[0], &taps[n]);
++            vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
+             kernel::fir_filter_with_buffer_ccc f1(f1_taps);
+ 
+             // zero the output, then do the filtering
+@@ -287,7 +287,7 @@ void test_decimate(unsigned int decimate)
+             }
+ 
+             // build filter
+-            vector<tap_type> f1_taps(&taps[0], &taps[n]);
++            vector<tap_type> f1_taps(taps.begin(), taps.begin() + n);
+             kernel::fir_filter_with_buffer_ccf f1(f1_taps);
+ 
+             // zero the output, then do the filtering
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild
new file mode 100644
index 000000000000..bbbc55d8c42e
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake desktop python-single-r1 virtualx xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.10"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp:=
+	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
+	dev-libs/spdlog:=
+	dev-libs/libfmt:=
+	sci-libs/fftw:3.0=
+	sci-libs/mpir:=
+	sci-libs/volk:=
+	media-libs/libsndfile
+	sys-libs/libunwind
+	alsa? ( media-libs/alsa-lib:= )
+	ctrlport? (
+		$(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]')
+	)
+	fec? (
+		sci-libs/gsl:=
+		dev-python/scipy
+	)
+	filter? (
+		dev-python/scipy
+		$(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]')
+	)
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	iio? (
+		net-libs/libiio:=
+		net-libs/libad9361-iio:=
+		!net-wireless/gr-iio
+	)
+	jack? ( virtual/jack )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6=[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	soapy? (
+		$(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( dev-python/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1:=
+	)
+	wavelet? (
+		sci-libs/gsl:=
+		dev-libs/gmp:=
+		sci-libs/lapack
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11:= )
+"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	virtual/pkgconfig
+	doc? (
+		>=app-text/doxygen-1.5.7.1
+		<dev-libs/mathjax-3
+	)
+	grc? ( x11-misc/xdg-utils )
+	modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+PATCHES=( "${FILESDIR}/PR7093.patch" )
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_IIO="$(usex iio)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_GR_BLOCKTOOL="$(usex modtool)"
+		-DENABLE_GR_NETWORK="$(usex network)"
+		-DENABLE_GR_PDU=ON
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_SOAPY="$(usex soapy)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/${PN}-grc.desktop"
+		for size in 16 24 32 48 64 128 256; do
+			newicon -s $size "${fd_path}/"grc-icon-$size.png ${PN}-grc.png
+		done
+	fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test() {
+	# skip test which needs internet
+	virtx cmake_src_test -E metainfo_test --output-on-failure
+}
+
+pkg_postinst() {
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild
deleted file mode 100644
index 68eff59630d3..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.10.9.2.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake desktop python-single-r1 virtualx xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
-	EGIT_BRANCH="maint-3.10"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-fi
-
-IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
-
-#RESTRICT="!test? ( test )"
-# https://github.com/gnuradio/gnuradio/issues/7085
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	audio? ( || ( alsa oss jack portaudio ) )
-	alsa? ( audio )
-	jack? ( audio )
-	oss? ( audio )
-	portaudio? ( audio )
-	analog? ( filter )
-	channels? ( filter analog qt5 )
-	digital? ( filter analog )
-	dtv? ( filter analog fec )
-	modtool? ( utils )
-	qt5? ( filter )
-	trellis? ( analog digital )
-	uhd? ( filter analog )
-	vocoder? ( filter analog )
-	wavelet? ( analog )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]')
-	dev-libs/log4cpp:=
-	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
-	dev-libs/spdlog:=
-	dev-libs/libfmt:=
-	sci-libs/fftw:3.0=
-	sci-libs/mpir:=
-	sci-libs/volk:=
-	media-libs/libsndfile
-	sys-libs/libunwind
-	alsa? ( media-libs/alsa-lib:= )
-	ctrlport? (
-		$(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]')
-	)
-	fec? (
-		sci-libs/gsl:=
-		dev-python/scipy
-	)
-	filter? (
-		dev-python/scipy
-		$(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]')
-	)
-	grc? (
-		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]')
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-	iio? (
-		net-libs/libiio:=
-		net-libs/libad9361-iio:=
-		!net-wireless/gr-iio
-	)
-	jack? ( virtual/jack )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	qt5? (
-		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		x11-libs/qwt:6=[qt5(+)]
-		dev-qt/qtwidgets:5
-	)
-	soapy? (
-		$(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	trellis? ( dev-python/scipy )
-	uhd? (
-		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
-	)
-	utils? (
-		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
-		dev-python/click-plugins[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]')
-	)
-	vocoder? (
-		media-sound/gsm
-		>=media-libs/codec2-0.8.1:=
-	)
-	wavelet? (
-		sci-libs/gsl:=
-		dev-libs/gmp:=
-		sci-libs/lapack
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11:= )
-"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
-	virtual/pkgconfig
-	doc? (
-		>=app-text/doxygen-1.5.7.1
-		<dev-libs/mathjax-3
-	)
-	grc? ( x11-misc/xdg-utils )
-	modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	xdg_environment_reset #534582
-
-	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
-	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FEC="$(usex fec)"
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_IIO="$(usex iio)"
-		-DENABLE_GR_MODTOOL="$(usex modtool)"
-		-DENABLE_GR_BLOCKTOOL="$(usex modtool)"
-		-DENABLE_GR_NETWORK="$(usex network)"
-		-DENABLE_GR_PDU=ON
-		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DENABLE_GR_SOAPY="$(usex soapy)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="$(python_get_sitedir)"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# Remove duplicated icons, MIME and desktop files and installation script
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/${PN}-grc.desktop"
-		for size in 16 24 32 48 64 128 256; do
-			newicon -s $size "${fd_path}/"grc-icon-$size.png ${PN}-grc.png
-		done
-	fi
-
-	python_fix_shebang "${ED}"
-	# Remove incorrectly byte-compiled Python files and replace
-	find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
-	python_optimize
-}
-
-src_test() {
-	# skip test which needs internet
-	virtx cmake_src_test -E metainfo_test
-}
-
-pkg_postinst() {
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 68eff59630d3..6270b80fb9f0 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -23,9 +23,7 @@ fi
 
 IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
 
-#RESTRICT="!test? ( test )"
-# https://github.com/gnuradio/gnuradio/issues/7085
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	audio? ( || ( alsa oss jack portaudio ) )
@@ -225,7 +223,7 @@ src_install() {
 
 src_test() {
 	# skip test which needs internet
-	virtx cmake_src_test -E metainfo_test
+	virtx cmake_src_test -E metainfo_test --output-on-failure
 }
 
 pkg_postinst() {
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ed31110bc625..ae72824ca59a 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index e114e317f874..f084e09bf0d7 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,5 +1,7 @@
 DIST coq-8.17.1.tar.gz 7506035 BLAKE2B 29b5b11666185ec293f50264f5a8ad66433c3ce05d74128b524f6fc3c6810551fe76d11d6f9db7d3741b829ac8bacb66948aad522d0cd2c487692c3df8b563ff SHA512 9a35311acec2a806730b94ac7dceabc88837f235c52a14c026827d9b89433bd7fa9555a9fc6829aa49edfedb24c8bbaf1411ebf463b74a50aeb17cba47745b6b
 DIST coq-8.18.0.tar.gz 7612742 BLAKE2B 2fb9f6205465ded60d2e1f7943f53ad884aea121c8129bb30c3f66c172f51f97eb553f8a745fd3ab1ec4da80d4ca08a7aea22f65d372fda3322c0f9ca7862923 SHA512 46922d5f2eb6802a148a52fd3e7f0be8370c93e7bc33cee05cf4a2044290845b10ccddbaa306f29c808e7c5019700763e37e45ff6deb507b874a4348010fed50
+DIST coq-8.19.0.tar.gz 7674352 BLAKE2B 195040c01797ac9ce67611e0c96a4601e0a48966e094e868b9f3644aa9f75fa85adf0e2e6340a14ae0a0598b746f5ad989d8f10736cd2d3852a449f6f79d2c93 SHA512 02fb5b4fb575af79e092492cbec6dc0d15a1d74a07f827f657a72d4e6066532630e5a6d15be4acdb73314bd40b9a321f9ea0584e0ccfe51fd3a56353bd30db9b
 EBUILD coq-8.17.1.ebuild 2317 BLAKE2B ff2958b7e82400115ab634dd00bac13df99ba088d8d2ec48ad61663ba0aa3690e3cad26badedad5fd12958df4c7a343b5c9d2d827a2a7aac3ba35e9ddfe3f222 SHA512 4c04bb4aa2d97dfa21868e6246d8a35d96b55e80c7bf6206ce1c67f46102c449cad25f7062c93c7defdb0e118be57c8f86d3c3323df53ce3c794617a7d4ed6d5
 EBUILD coq-8.18.0.ebuild 2317 BLAKE2B 4bc94547c21f41a7edd33aae51eff50e7fd911394e185548e645c71b181e48810997bc38dd3fc50be290873a10122958802ad75479fd20fbdc15bec82b8c8d64 SHA512 16949a6e9140d280a7081237cc83a04a99f248fce57fe4f3eb7055cf2fdf22aed84d11caa52e7c4c344660f48552c72a5d13d659dac71e61b133e1259f4a239f
+EBUILD coq-8.19.0.ebuild 2493 BLAKE2B 277efc3bf5c38592e7729a7a2e46cd21a7b5a02934ab22e4c57c8da13b59dd63bc21552291efc88cd542debe7cb940f4f93ea5e2d51aae33bb3ccc32a1fd8b7a SHA512 4196e78ef5929e6ecf2381bb11b760ddb90e9a0be00a6ce30bd8feeec15adfcc7534178f306a23fc22871d37b7de7bdf8effb3dec19731ca77ae087c21ebe2b1
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.19.0.ebuild b/sci-mathematics/coq/coq-8.19.0.ebuild
new file mode 100644
index 000000000000..33c2b23fecf7
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.19.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/_p/pl}"
+MY_P="${PN}-${MY_PV}"
+
+inherit check-reqs desktop dune edo
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/
+	https://github.com/coq/coq/"
+SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc gui +ocamlopt test"
+
+# TODO: Lots of failing tests. Maybe investigate later.
+# RESTRICT="!test? ( test )"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/num:=
+	dev-ml/zarith:=
+	gui? (
+		>=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?]
+		>=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-ml/findlib
+	doc? (
+		>=dev-java/antlr-4.7:4
+		dev-python/antlr4-python3-runtime
+		dev-python/beautifulsoup4
+		dev-python/pexpect
+		dev-python/sphinx-rtd-theme
+		dev-python/sphinxcontrib-bibtex
+		dev-tex/latexmk
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+		media-fonts/freefont
+	)
+	test? (
+		dev-ml/ounit2
+	)
+"
+
+CHECKREQS_DISK_BUILD="2G"
+
+DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md CREDITS INSTALL.md README.md )
+declare -a DUNE_PACKAGES
+
+src_prepare() {
+	# Remove failing tests. bug #904186
+	rm -r test-suite/coq-makefile/timing || die
+
+	default
+}
+
+src_configure() {
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+
+	DUNE_PACKAGES=(
+		coq-core
+		coq-stdlib
+		coqide-server
+		coq
+	)
+	use gui && DUNE_PACKAGES+=( coqide )
+
+	emake clean
+
+	local -a myconf=(
+		-prefix /usr
+		-libdir "/usr/$(get_libdir)/coq"
+		-mandir /usr/share/man
+		-docdir "/usr/share/doc/${PF}"
+		-datadir /usr/share/coq
+		-configdir "/etc/xdg/${PN}"
+		-native-compiler "$(usex ocamlopt yes no)"
+	)
+	use debug && myconf+=( -debug )
+	edob sh ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	emake DUNEOPT="--display=short --profile release" VERBOSE=1 dunestrap
+
+	dune-compile "${DUNE_PACKAGES[@]}"
+
+	use doc && emake refman-html
+}
+
+src_install() {
+	dune-install "${DUNE_PACKAGES[@]}"
+
+	if use gui ; then
+		make_desktop_entry coqide "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+	fi
+
+	local ocamlc_where
+	ocamlc_where="$(ocamlc -where)"
+
+	# Dune installs into /usr/<libdir>/ocaml/<coq> but
+	# Coq wants /usr/<libdir>/<coq> ; symlink those directories
+	local sym
+	for sym in "${DUNE_PACKAGES[@]}" ; do
+		dosym "${ocamlc_where}/${sym}" "/usr/$(get_libdir)/${sym}"
+	done
+
+	einstalldocs
+}
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 30f0c129d124..e5146f5322ac 100644
Binary files a/sec-keys/Manifest.gz and b/sec-keys/Manifest.gz differ
diff --git a/sec-keys/openpgp-keys-jberkenbilt/Manifest b/sec-keys/openpgp-keys-jberkenbilt/Manifest
index f34277397629..696ffa093498 100644
--- a/sec-keys/openpgp-keys-jberkenbilt/Manifest
+++ b/sec-keys/openpgp-keys-jberkenbilt/Manifest
@@ -1,3 +1,3 @@
 DIST jberkenbilt.asc 3885 BLAKE2B 772fe8ac5377333b145c5a7e0b8c9f24b52f8bd3776070fc2d2d487de3709ee48faa71544b1677e7157c8aad8bce8b91205373fcf49dc46b41a2a3a9a0001d50 SHA512 31d8d4793f8792093141040b0f617bb488603288407e37aa74ffba1e8cf1039d3a7c98d011fe490f01cfdffbb4a04e8c615c363d9d9d5dae584b4d1b82453912
-EBUILD openpgp-keys-jberkenbilt-1.ebuild 539 BLAKE2B 7cb83ad69b2e2b0ab26e328da68bb29fe4211e1cd00429c386c2b426d8e0ec7a1711406ecf8ca1802c349ac6c2f24fff3c69a0420534c06f3de060381c5cf794 SHA512 55ac15de49e88e9f5b616198d3b9385d51beea408228b03b9e75da04988aa03a356c655395624bbd0fcfcd9441301342c013f207b935d01f60a826e79b66aac3
+EBUILD openpgp-keys-jberkenbilt-1.ebuild 538 BLAKE2B a4af76355cf9f9910adceecfa78220defa1eac85793cab6dc66fd187fe33cfdb42b95577d8986c6a4f7c820b96df8e8431f93392b75a9bc3af34ec8d515da430 SHA512 867fea7285b8e47e074e1517eb545552116d498387292448b0b69c4e6566bb17ed3684f507447290664a0346a802d2f71ef78e5ee7ae1948a57ac7966eed6ebd
 MISC metadata.xml 260 BLAKE2B ef27f93753b1b9b96d35941f8a39c7e3b1695a49bff8076cb92b718524ddf1449ffa97d26ae289ad493695a8bfbeadb6bee0030f649bef02e0ae155ca851713e SHA512 94c019f5d5e8bec9d817d4b192ae0b87effc9f73283800b6ee7b5fe50a85bf6e245eb9720c2d8f3b497b40c7e298969c5e23c5afe3af14384eee92e76afacc8c
diff --git a/sec-keys/openpgp-keys-jberkenbilt/openpgp-keys-jberkenbilt-1.ebuild b/sec-keys/openpgp-keys-jberkenbilt/openpgp-keys-jberkenbilt-1.ebuild
index 15f08fd78e24..3ab52268a078 100644
--- a/sec-keys/openpgp-keys-jberkenbilt/openpgp-keys-jberkenbilt-1.ebuild
+++ b/sec-keys/openpgp-keys-jberkenbilt/openpgp-keys-jberkenbilt-1.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 src_install() {
 	insinto /usr/share/openpgp-keys
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 67fbbaf25bb7..5f7280adb891 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index 75ee51855fa5..2cabe2d89a1d 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -13,6 +13,6 @@ AUX zfs-auto-snapshot-weekly.timer 150 BLAKE2B 655187add790017f8328edae33e88eb0a
 AUX zfs-auto-snapshot.target 360 BLAKE2B 17be6ab113a8849d5244fd36140d1165c4e919df2a04f4b16aa591c1c92b29243b1be4f2243bcc6a8ef015b0cc1fb53b183da1c83668e4e7e0b609f7301a3372 SHA512 f607dada27e4be409184152b93e2079eecf12f5eba76f2dbe42bdbf4793603063c23813e752bfd829a081eeb6d09c86bc18ab75d65bff87b2c1d4f998abac516
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
 EBUILD zfs-auto-snapshot-1.2.4-r2.ebuild 2589 BLAKE2B ae75763d83d7919ee78a695be66425cfd97c04036be844fc9582cc7ed49a3dd60ddcf7ce733c8464597f217370c6650cc78afcebafdf1da0bd9f4c4dcbd7a1dc SHA512 be518c8387dc7b4e5142bf094f9556aa05c39bec2c884bf9a3a5edd7f61f6533c743f75ed6cee0fd38a7037622c22f2c2196dd91419aff7ac61cb020cf6d669a
-EBUILD zfs-auto-snapshot-1.2.4-r3.ebuild 2632 BLAKE2B 28124f72de4d232c34f7d477d4ca02b7056c2495f857ac34b3426c474c84043e24983491b7a669d7e57f253daeed0a5e4427a9b6e4407de1c79c0d68692826c5 SHA512 624f81f5743be12598dc3cbfd8402dc0bd1dd6808f697881d1fa873d3cd3ae1266bfd2cf4d2bb8a6df7350575b25c0b1cf5f681d208a8191ed4e891ad078042f
+EBUILD zfs-auto-snapshot-1.2.4-r3.ebuild 2631 BLAKE2B 9be52bad0ffe967844824fc052489c399024e7ca5134d4d97d762d9eb06cfbac7ce56158b9d32fd6e0afb7366180e3cf2522c98430539186e874efbd58ace96b SHA512 3958a8345105f600d02ef9f091ad9c9b7ea04d919665ab6f9928e7d7627845649b331db1043ceeb1ed4da6087ec97c26ca0e5e3827c8cf8bc051872fde948cca
 EBUILD zfs-auto-snapshot-9999.ebuild 2592 BLAKE2B 4e1fe442bca545372a3c2c4a7ca7456fa134f3d994975bda29c504cf826063b54f0cdd14d49270a7272e0cd37e1785e59d33a0c5b7b916204797395c8a3f2848 SHA512 c5d895bfa2e784771952e0cbdb233db8baef0bebe6db37afc82e3bdd5f847da92780a0f5a788b275287594e7937c76a3683b228c1c93a5ff260806461e67a6b3
 MISC metadata.xml 965 BLAKE2B 4f9cc98f893bcaab842d31a7fe9d3db7d24e34a5cb612137830298bce8450a82636970ba20d69ad31bd36d121cf253deaea7ce3e9435df656a768b9922d2b2ff SHA512 0a816ae56452f48cfc286ae8f0c0ff17ba8e174ec6312ba97c09614568fbad07b4024722e3466406f590579bc614ab85731f6dcd3f873a7256d64f8c7054658e
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
index 8338ae98ab90..35cb47ad29d0 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 7004aab40b52..b9cf929dd9cd 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index b0daf651e423..9f7cfbdcb4d7 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -16,6 +16,6 @@ DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cb
 DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
 EBUILD dracut-059-r7.ebuild 4596 BLAKE2B 651b8e0d034698ae93fd0a226e45c50c09e5512ab72ef7594f52039294ba2e5e377421eb3a6d23653747e0a0bcf432bee3619221e9c519d857ecbd1800abe6b4 SHA512 ec073690a315ba7825008202dedc0a28bf4c72feaab136fcf6718381aeb79bdf08ead567a5529325e0797d136806d857ce3d102f7cf2e652b7ff8c239c4566bf
 EBUILD dracut-060_pre20231030-r2.ebuild 4413 BLAKE2B 929a215594fd5813bbd35e2fcaa5096ab972b86e534b0597e297ced93a431148774b1212942c2ff662440089eb37b9ec55271c7766f0c8b18f5785b1c534622f SHA512 d21a0cf8234b93e5f8a370f6ceae45dc661b56b89a6bd9a552a8a2133d72897bfe581565916fb5797f0cd558f852c8eeca7e0c705a001b08a9b2f3714d1cd4e0
-EBUILD dracut-060_pre20240104.ebuild 4451 BLAKE2B 02c2ade7bc19a5b9d974ecb7d80cc352d815494c8a0af333d514b0b9028cb5484b180768e19a51c27d61d37d49f4babc4b0cbec36aab7d11fd3ba9a196100338 SHA512 7963e11048e25bf43fb91063b8a3f24c97ea8a231aae63998170b9c9eb04f17bcbf6713b72c0a16b567caa41d3165a931ad579003b13ceff654b7bf95839a8e8
+EBUILD dracut-060_pre20240104.ebuild 4450 BLAKE2B 5df7c61ca3f40289c77fdb85cccffeff36ceffdadfa0f469f58860f834fc25c18c7b01c23556ee23e8cc119e8e0204440935c606df753a995d5128ba66c0ef09 SHA512 ea2f0135e07ff33162722391b7c20dd8737c3e09c00fe6ca0898b323828c58474135effee7855ec8b3d092ba32ef7cc699a33f79354be8b03d85382b459d3009
 EBUILD dracut-9999.ebuild 4249 BLAKE2B 651c02e56185b4e1fef8baa4920c4587ae50bcbd27451b1f8845ff08e630ddb3f70ed9508315222774bfde955957bb0c8589591de22da586691ac645e62fbf7a SHA512 b0d6c157c25783dd19901537df780a7aa2da421559477d15b4ed648a3cacd7fbe7df4e70b3b97bcd64d8f4b114fad9bbb2b544c0bb35914139bd9b8c965783d3
 MISC metadata.xml 451 BLAKE2B 34fe004c76ad1ec98a27c53451f51a15689bda1413bb1dae895d4e7be68d810388cbf46d739b04da3b7869835eb70c1b9c03957d60fc6217b12bc028bd011b40 SHA512 51c81f853ab1be8d8dc240d69b1b2c9c69992efa804a394246222466d774bf673f0cb32031d46a56fc2628cd148b0a5c733a8690b78bff70806ca7f563a2855a
diff --git a/sys-kernel/dracut/dracut-060_pre20240104.ebuild b/sys-kernel/dracut/dracut-060_pre20240104.ebuild
index c1aba55ea0b2..76367ce16dfe 100644
--- a/sys-kernel/dracut/dracut-060_pre20240104.ebuild
+++ b/sys-kernel/dracut/dracut-060_pre20240104.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://github.com/dracutdevs/dracut/wiki"
 LICENSE="GPL-2"
 SLOT="0"
 if [[ "${PV}" != *_rc* ]]; then
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 fi
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index fa80e4fcca73..3bb0545725b3 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,5 +1,5 @@
 DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
 DIST installkernel-18.tar.gz 7223 BLAKE2B b813cbab818674abde969378d66ccdf05ff296b32232c11c85f84292b6f7ab91f846d66cc2a34d8912fa731d70d6b8b87339eb75cbef9dd2672e58a1be310d40 SHA512 3afe20ee58cea986d2b8e8e2621d6b6c76a883b41105521f69822107b3fce11700839d0fefeea1ea1e8b2ad69df18ef4219e4db606bda2349e6eab0924625686
 EBUILD installkernel-12.ebuild 1443 BLAKE2B bdcd9e2070e1cab6c0be6bd779d35044499493eb01537765cfad6be9ad31e7aa043664208f4257dee7ab3e5c58dc6e4be7e55a80f0eaf7a43a21cc54a69ebe14 SHA512 5cdf701b82ff2efd1b1308638aa58ad8695f0fa52af7f2e6be254163540483b2543fa954b47f680424fc38e5387a9e4385b0f2c0a596ae8276f9c9a72f8a518d
-EBUILD installkernel-18.ebuild 3392 BLAKE2B d8889c4962314f52c553914037c14a1d24dc71f6b56705ad8c32a414e9648cb8c4829eec2f24fafd996189e843c1fc1ed78de545b0492cb03510460aa317f3ee SHA512 80c9dcff00c3c7fe3d3cc87fa00a51bcca38a4c2edeabb18dbca920e4df04c00522b58052052464f55cfbc67cd7852577389fd64b4b642fb66eb203c931c1181
+EBUILD installkernel-18.ebuild 3391 BLAKE2B 8c0d5e1561629670b48bc3ffaf4a79aec3fff16635fe3a6d58d92eb18ba0f1b181e470b790a49762735e93b52db2184116b0d7016e8970aa6dce27821f1b7732 SHA512 32f5aa383e816ea5352943e2ef37e1f63e58b52401249ac4a88e62bfa47458d2ad1bf8b8442a390826497238183c27fada1e60133bf2f3676bd5e505afeea2db
 MISC metadata.xml 962 BLAKE2B 1ba1170a97f339b8beaed27b0ace44bba35d5f00724492f5d10a5ff0974836af2c32a3763046f149f42626961a37655d5ebfae535302ba6d39527c99db028b7b SHA512 4f78a5e5698b7e86778c808777c429574580c44fddd6206d42785a1ae6ee217e0f69acfb7ac7489f3ee185c0158ea9eae1518bf2e186e2ccd4dce4f1abc4a56a
diff --git a/sys-kernel/installkernel/installkernel-18.ebuild b/sys-kernel/installkernel/installkernel-18.ebuild
index 211c4e124e5a..e47c848aa133 100644
--- a/sys-kernel/installkernel/installkernel-18.ebuild
+++ b/sys-kernel/installkernel/installkernel-18.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="dracut grub module-rebuild systemd uki ukify"
 
 RDEPEND="
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b7f4aefd8f1e..bd3e22f1837f 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index e43ffe0f8d13..03ad86782b37 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_6.5.3222.3-1_amd64.deb 106943152 BLAKE2B 402dd0f90c4605794e9328d70431afe69d8558f8fccb5cf64bc1e10be286775e74744f1088117cdcc3d11f3e353371762a6ac8b1f98a0080729517811ad669da SHA512 94e89d34b575241055c24a2a5e98223bd0f8b1a4f5aa446a216396ca1bbf3ff9dce9c18e493edf33ee2962659fb3453c20bd4965645dc6ba15b49168c88d9983
-DIST vivaldi-snapshot_6.5.3222.3-1_arm64.deb 100866008 BLAKE2B 2be78ea1b91ecafe43ca0203f81f9268ead10c230d044d05aaa2e90b67755e99066d5a2bed824e832db7cb63c670fadbf64ad233a182f908d988cab882531a69 SHA512 a9cb3b3e013f6ffab1c69543b5dd2b54a901d0c71cc133289f96db398ee555568013b20e9a78a3843ce1b1780201fb0cf9b2808b9e4ff09a17dd7d55f0963c1a
-DIST vivaldi-snapshot_6.5.3222.3-1_armhf.deb 102273384 BLAKE2B 8887387e266a2323cad5d409cba0871c42c31c831f1a1a518737fdd3378d1d27e91fe8602ffa1cc03a0a842241b209ece3f04573dc4198adfe98384f325a153a SHA512 2ee4eccec6ea6cedce2e71d75fb2cfb14cebce6c6b6167e00f26cb62061e186b3142974be2c01ad4ad5d2c48ef09aef7e39da781c791f966f6c4ff1a0bfe7880
 DIST vivaldi-snapshot_6.6.3238.3-1_amd64.deb 106991312 BLAKE2B 14273e885a5467fc2806f1153fe646244c910bfa9f9d50528328c50c7f233414c66c0b28c1e6cf1098aa0ec9e7e717ab95887ed36be7350855cbd2492cdcecbc SHA512 b412f05928cfee6ea5e443ad88fd0740635d298d4662689c3e7ff7f88be163071d8299cb7005b8622acd82a978b84641ed5f2ca028bce8989a7bd1c737567c4a
 DIST vivaldi-snapshot_6.6.3238.3-1_arm64.deb 100895020 BLAKE2B 5a96159d4cc96c9861e5765697e19bc1b0803df8f8dd7e86c945796970963731e4c43ed9bd611aee3f530b7b2c545f5bbbf8e8e08ef6a49d08ef916596f26fbd SHA512 b0274adf97e00669f3b384c66afa7fbd2a55c919fafb6bdc81c712e99708051e4defc971a51d31f6f719d4e51ef81d3aa320f7099c22e72361e9771ee636835a
 DIST vivaldi-snapshot_6.6.3238.3-1_armhf.deb 102312992 BLAKE2B fdfb1608ee97c2802af29507cc140f93eaa6fbe315c2087120f40d8c9b59e6773e8dafee21e79d9913787468918ceff517cb1f781b174e3975c7d434bc147caf SHA512 ab73a66d0f614287ea25f1930b9992b143c2be545e257b190b86dce8362870b8a88edaa1a052ea976c7aa059913fa37a37e3b9e2fcafe3a79ea0c3d76c1360ec
-EBUILD vivaldi-snapshot-6.5.3222.3.ebuild 3850 BLAKE2B e70579fbf7b800aa8ec4c448b00db4037cadc3916da8b0da87d12563d4e16f3fe0970fe6e49368e20f796a97640ac350b195d028148a5c656c054516e9254a61 SHA512 4345235531f9a9f0b0f0dae1de1b452aef84e38a036472de6b1c78ec886bd427ffe7e5d6f02b777b50bf2b4606e3efc4dbef0dff3a9fc68d0f471697e5f11b6b
+DIST vivaldi-snapshot_6.6.3249.4-1_amd64.deb 106532956 BLAKE2B d81731f975f3468e01155e41766035414a9f255c096f1182f3a19bc5c24adef5bea77bf1c9598d8bb7551d838d4ebfc299858536877f559c2091481786fb3f1c SHA512 24f4111c3d8f8bef1984d9099f13dc7f95606adda78d35c04246c0b060945cd1f195ead99561eb85d7a57cbd1920c222871e744c07596c3d84f9b45cbe806c01
+DIST vivaldi-snapshot_6.6.3249.4-1_arm64.deb 100396868 BLAKE2B ead2036ac61193b73a0acf77e04fae80d53fa1b1c17dbed879f5f96fd46e2e311aa9a6bd81fdac378211948c1a0f4de6ce2d4337470f730057f4e5db6071707a SHA512 ae874e619c90bca710bfcabac117bd80b939ed24a3596d53cf68bc0344f8d6f594b9326c3366f9e9887c6953e3ffb1c9c43256c076c557bfcceab2083491f538
+DIST vivaldi-snapshot_6.6.3249.4-1_armhf.deb 101822500 BLAKE2B 07881a9b7a9cae6957b54eb189b6ac82049d8563ca8cdb37a433194b47660ca9b398a5923e8e24677f7827950b03b5b4aa7041c9507ab9174fa936b41528d4ba SHA512 be706daee9e0c8acba675d32343bb31406756fc67965ae61d69a6c098f70164127666dbf8b2eb6d5cf7fb9e83cf6aafcaaf584dcd7888749b0659cffa0605d6e
 EBUILD vivaldi-snapshot-6.6.3238.3.ebuild 3850 BLAKE2B 9822a02920f837d4f510081a5a27a44fe60a7fa7ceb63ca57cd0056dbc51b554ecec3bea7f5c76ef1dc1a36833b1823e17c153e70cb4cc3a7f54352916350573 SHA512 7559b85ce408b564945d885e7b9b15714c82948b7324876034ff18a28ccd889e8a343627f16781b0f6a76ec0140a24bdbb12688ab82bf286b19abb722621c5ee
+EBUILD vivaldi-snapshot-6.6.3249.4.ebuild 3850 BLAKE2B 9822a02920f837d4f510081a5a27a44fe60a7fa7ceb63ca57cd0056dbc51b554ecec3bea7f5c76ef1dc1a36833b1823e17c153e70cb4cc3a7f54352916350573 SHA512 7559b85ce408b564945d885e7b9b15714c82948b7324876034ff18a28ccd889e8a343627f16781b0f6a76ec0140a24bdbb12688ab82bf286b19abb722621c5ee
 MISC metadata.xml 634 BLAKE2B fa3f150ffb5f5da3780098747f71d304c9ceb9828cd4dc7c586ba7032a7ba0b3065c25e5dd84fdab7b4302db8b4c848f116eb5b329f440f8a38837dca005a570 SHA512 f226a355a39cec36b5d6f3f88e7f2132693b5dcf51bdec4676d17f608f16ced52d6b9c5dfac2d38f2245cdf6ff7279286034e77ea119cfb4b7240500f612968e
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3222.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3222.3.ebuild
deleted file mode 100644
index 1cb4e268a82f..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.5.3222.3.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="120"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	az
-	be
-	bg
-	bn
-	ca
-	ca-valencia
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	eu
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gl
-	gu
-	he
-	hi
-	hr
-	hu
-	hy
-	id
-	io
-	is
-	it
-	ja
-	jbo
-	ka
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	mk
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pa
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sq
-	sr
-	sr-Latn
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	ur
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop linux-info unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 widevine"
-RESTRICT="bindist mirror"
-REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango[X]
-	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? (
-		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
-		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-CONFIG_CHECK="~CPU_FREQ"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	if ! use qt5; then
-		rm ${VIVALDI_HOME}/libqt5_shim.so || die
-	fi
-
-	if ! false; then # use qt6; then (TODO)
-		rm ${VIVALDI_HOME}/libqt6_shim.so || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	case ${PN} in
-		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
-		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
-	esac
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.6.3249.4.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.6.3249.4.ebuild
new file mode 100644
index 000000000000..44ff1d87e5a1
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.6.3249.4.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="120"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	ca-valencia
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	ur
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop linux-info unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 widevine"
+RESTRICT="bindist mirror"
+REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango[X]
+	gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 )
+	proprietary-codecs? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+CONFIG_CHECK="~CPU_FREQ"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	if ! use qt5; then
+		rm ${VIVALDI_HOME}/libqt5_shim.so || die
+	fi
+
+	if ! false; then # use qt6; then (TODO)
+		rm ${VIVALDI_HOME}/libqt6_shim.so || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	case ${PN} in
+		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
+		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
+	esac
+}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 82ab741ed1e1..058a79ac3afa 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e96d5abfc221..5202bcff6e06 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,6 +5,6 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d
 DIST xorg-server-21.1.10.tar.xz 4935984 BLAKE2B c06d5f09e79b608d9e37f43ed05a0932d9e195cc0da418621c2db45be85ccceef38b14631a4b90e78468c845e4852dc07c65208138b93975f091b2139e437a60 SHA512 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926
 DIST xorg-server-21.1.11.tar.xz 4985464 BLAKE2B 0a18840979bb8b20b02eca9d737f20ddcf92a4771386074c38692df8a1c9b0f471af2211f3006f845ad0dd887b3844b7e7aac761bc12fc4e4177f1ada32ec503 SHA512 ad5edacbe8c7e2ebe6b4a690af94c7ea5ebc781d00b0e58ae2d273c78ceee2fa00b86d10479ad69da1b3233490619bae5a33db64c967c24bbfc5d5d39ddce1cb
 EBUILD xorg-server-21.1.10-r1.ebuild 4597 BLAKE2B 542052bdedf6287ab13251ca04f6bf92511129eaeca2254630f05a3f22967e8f8c19ce0b8af148fa2a0b6172c48c6526d739984fb7f5df610b1887eab6f88933 SHA512 e98e8340a206d78d1ff68f13155be1ba87a2be1b325e30c8770c8f5717225a8802f723257435cdb951c963fb6ef9bb3aece8a0a2030a8e780f82eaf8d05b3a2f
-EBUILD xorg-server-21.1.11.ebuild 4599 BLAKE2B f02fb6235afbc245c2fc8f03e936d98c9f264fd0a09d818509094698aa35a94603fc1750f93b9eabb96573489f456b6b93ecb28bf5dc060da0babd15c68ec8fc SHA512 b4238a326a19931f87f530ed25ad503a012ab8f15b63332ead248d97efa24712b7db0c2f11d255bf12ce831573bf39d5d7ad5b12d471e35f0380dcf706676b9e
+EBUILD xorg-server-21.1.11.ebuild 4598 BLAKE2B 3700300673d0278598ebec95c5ece39dbf9810bc34375aa2f6ee58e7b54ca243811394a2e04d7924a7eb00003a43666c839a01e7279447c4f1ab0fbd99287b18 SHA512 661f5fddbe96fa029c8f478ebd8a6c17e4fc6c521aa47740a6eb7e3298b012a502f1935b0e34ead836465974626a4ddb40d5b70bde6008672b47129495ede0ce
 EBUILD xorg-server-9999.ebuild 4500 BLAKE2B c8418bb7588aba586b530becf16e5fecfe49b1537de2dd96c2637f5ec49cea91bab1fb69d44c25f1ca4e605b28823dd57454d0afb467913a92772e7471a9c423 SHA512 54bfbb6b71ac41707c359581ce13f9cbae59dfffea0499296ff666a252faf8e39da6b1751ef2458cb59d894c7c4c059d79eee7796afbf28aef2fed1430669f9f
 MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/xorg-server-21.1.11.ebuild b/x11-base/xorg-server/xorg-server-21.1.11.ebuild
index 5cabc51ccb0d..0f0e61384616 100644
--- a/x11-base/xorg-server/xorg-server-21.1.11.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.11.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
-- 
cgit v1.2.3